address agent comments

Author: harryalbert

app/src/ai/agent_management/agent_management_model.rs

@@ -165,26 +165,27 @@ impl AgentNotificationsModel {
                         CLIAgent::Codex => "Notification from Codex",
                         _ => "Task completed.",
                     };
-                    let is_ambient = is_terminal_view_ambient(*terminal_view_id, ctx);
+                    let metadata = TerminalViewMetadata::lookup(*terminal_view_id, ctx);
                     self.add_notification(
                         title,
                         message.to_owned(),
                         NotificationCategory::Complete,
                         NotificationSourceAgent::CLI {
                             agent: *agent,
-                            is_ambient,
+                            is_ambient: metadata.is_ambient,
                         },
                         NotificationOrigin::CLISession(*terminal_view_id),
                         *terminal_view_id,
                         vec![],
+                        metadata.branch,
                         ctx,
                     );
                 }
                 CLIAgentSessionStatus::Blocked { message } => {
                     let title = session_context
                         .display_title()
                         .unwrap_or_else(|| format!("{} needs attention", agent.display_name()));
-                    let is_ambient = is_terminal_view_ambient(*terminal_view_id, ctx);
+                    let metadata = TerminalViewMetadata::lookup(*terminal_view_id, ctx);
                     self.add_notification(
                         title,
                         message
@@ -193,11 +194,12 @@ impl AgentNotificationsModel {
                         NotificationCategory::Request,
                         NotificationSourceAgent::CLI {
                             agent: *agent,
-                            is_ambient,
+                            is_ambient: metadata.is_ambient,
                         },
                         NotificationOrigin::CLISession(*terminal_view_id),
                         *terminal_view_id,
                         vec![],
+                        metadata.branch,
                         ctx,
                     );
                 }
@@ -318,8 +320,10 @@ impl AgentNotificationsModel {
         }
 
         let title = latest_query.unwrap_or_else(|| "Agent task".to_owned());
-        let is_ambient = is_terminal_view_ambient(terminal_view_id, ctx);
-        let oz_agent = NotificationSourceAgent::Oz { is_ambient };
+        let metadata = TerminalViewMetadata::lookup(terminal_view_id, ctx);
+        let oz_agent = NotificationSourceAgent::Oz {
+            is_ambient: metadata.is_ambient,
+        };
 
         match status {
             // When the agent resumes its work, clear stale notifications.
@@ -336,6 +340,7 @@ impl AgentNotificationsModel {
                     origin,
                     terminal_view_id,
                     artifacts,
+                    metadata.branch,
                     ctx,
                 );
             }
@@ -349,6 +354,7 @@ impl AgentNotificationsModel {
                     origin,
                     terminal_view_id,
                     artifacts,
+                    metadata.branch,
                     ctx,
                 );
             }
@@ -361,6 +367,7 @@ impl AgentNotificationsModel {
                     origin,
                     terminal_view_id,
                     vec![],
+                    metadata.branch,
                     ctx,
                 );
             }
@@ -374,6 +381,7 @@ impl AgentNotificationsModel {
                     origin,
                     terminal_view_id,
                     artifacts,
+                    metadata.branch,
                     ctx,
                 );
             }
@@ -411,14 +419,14 @@ impl AgentNotificationsModel {
         origin: NotificationOrigin,
         terminal_view_id: EntityId,
         artifacts: Vec<Artifact>,
+        branch: Option<String>,
         ctx: &mut ModelContext<Self>,
     ) {
         if !*AISettings::as_ref(ctx).show_agent_notifications {
             return;
         }
 
         let is_visible = is_terminal_view_visible(terminal_view_id, ctx);
-        let branch = resolve_git_branch_for_terminal_view(terminal_view_id, ctx);
         let item = NotificationItem::new(
             title,
             message,
@@ -512,6 +520,30 @@ fn window_and_tab_idx_id_for_conversation(
         })
 }
 
+/// Per-notification metadata derived from a single [`TerminalView`] lookup. Both fields
+/// are read on the same emit path, so we resolve the view once and pass the projection
+/// down rather than walking the workspace tree for each.
+struct TerminalViewMetadata {
+    is_ambient: bool,
+    branch: Option<String>,
+}
+
+impl TerminalViewMetadata {
+    fn lookup(terminal_view_id: EntityId, app: &AppContext) -> Self {
+        let Some(terminal_view) = find_terminal_view_by_id(terminal_view_id, app) else {
+            return Self {
+                is_ambient: false,
+                branch: None,
+            };
+        };
+        let view = terminal_view.as_ref(app);
+        Self {
+            is_ambient: view.is_ambient_agent_session(app),
+            branch: view.current_git_branch(app),
+        }
+    }
+}
+
 fn find_terminal_view_by_id(
     terminal_view_id: EntityId,
     app: &AppContext,
@@ -531,26 +563,6 @@ fn find_terminal_view_by_id(
     None
 }
 
-fn resolve_git_branch_for_terminal_view(
-    terminal_view_id: EntityId,
-    app: &AppContext,
-) -> Option<String> {
-    find_terminal_view_by_id(terminal_view_id, app)
-        .and_then(|terminal_view| terminal_view.as_ref(app).current_git_branch(app))
-}
-
-fn is_terminal_view_ambient(terminal_view_id: EntityId, app: &AppContext) -> bool {
-    find_terminal_view_by_id(terminal_view_id, app)
-        .map(|terminal_view| {
-            terminal_view
-                .as_ref(app)
-                .ambient_agent_view_model()
-                .as_ref(app)
-                .is_ambient_agent()
-        })
-        .unwrap_or(false)
-}
-
 fn active_focused_terminal_id(app: &AppContext) -> Option<EntityId> {
     let active_window = app.windows().active_window()?;
     let workspace = app

app/src/ai/ambient_agents/task.rs

@@ -83,30 +83,17 @@ impl HarnessConfig {
     }
 }
 
-/// Parses a harness type name (e.g. `"claude"`) into a [`Harness`] variant.
-/// Unknown values fall back to [`Harness::Unknown`] so we don't
-/// misrepresent a future-server harness as Oz; UI surfaces should treat
-/// `Unknown` as a non-Oz, non-runnable harness.
-pub(crate) fn harness_from_name(name: &str) -> Harness {
-    match name {
-        "claude" => Harness::Claude,
-        "opencode" => Harness::OpenCode,
-        "gemini" => Harness::Gemini,
-        "oz" => Harness::Oz,
-        other => {
-            log::warn!("Unknown harness config name: {other:?}; treating as Unknown");
-            Harness::Unknown
-        }
-    }
-}
-
 fn serialize_harness<S: Serializer>(harness: &Harness, serializer: S) -> Result<S::Ok, S::Error> {
-    serializer.serialize_str(&harness.to_string())
+    serializer.serialize_str(harness.config_name())
 }
 
 fn deserialize_harness<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Harness, D::Error> {
     let name = String::deserialize(deserializer)?;
-    Ok(harness_from_name(&name))
+    let harness = Harness::from_config_name(&name);
+    if matches!(harness, Harness::Unknown) && name != Harness::Unknown.config_name() {
+        log::warn!("Unknown harness config name: {name:?}; treating as Unknown");
+    }
+    Ok(harness)
 }
 
 /// Authentication secrets for third-party harnesses.

app/src/terminal/view/ambient_agent/model.rs

@@ -261,14 +261,10 @@ impl AmbientAgentViewModel {
     }
 
     /// Returns the [`CLIAgent`] corresponding to the currently selected harness when it is a
-    /// third-party harness (e.g. Claude, Gemini).
-    /// Returns `None` for [`Harness::Oz`] and when [`FeatureFlag::AgentHarness`] is disabled.
+    /// third-party harness (e.g. Claude, Gemini). Returns `None` for [`Harness::Oz`].
     /// Used to drive the correct tab icon for a cloud run as soon as a non-oz harness is
     /// selected, even before the CLI session is registered with [`CLIAgentSessionsModel`].
     pub fn selected_third_party_cli_agent(&self) -> Option<CLIAgent> {
-        if !self.is_third_party_harness() {
-            return None;
-        }
         CLIAgent::from_harness(self.harness)
     }
 

app/src/terminal/view/pane_impl.rs

@@ -937,21 +937,19 @@ impl TerminalView {
     }
 
     /// Returns the conversation status for display purposes, suppressing the status when the
-    /// conversation is empty (no exchanges yet). This avoids showing a misleading "In progress"
-    /// indicator when a new conversation hasn't started streaming, except when a shell command
-    /// is actively long-running or the cloud environment is still spinning up — those
-    /// InProgress states are real and should always surface.
+    /// conversation is empty (no exchanges yet) AND nothing else makes the run "busy". This
+    /// avoids showing a misleading "In progress" indicator on a brand-new conversation; real
+    /// InProgress states (long-running shell commands, cloud-environment setup) come through
+    /// because [`Self::selected_conversation_status`] surfaces them as `InProgress`.
     pub fn selected_conversation_status_for_display(
         &self,
         ctx: &AppContext,
     ) -> Option<ConversationStatus> {
-        if self.selected_conversation_is_empty(ctx)
-            && !self.is_long_running()
-            && !self.is_in_cloud_agent_setup_phase(ctx)
-        {
-            None
+        let status = self.selected_conversation_status(ctx)?;
+        if matches!(status, ConversationStatus::InProgress) || !self.selected_conversation_is_empty(ctx) {
+            Some(status)
         } else {
-            self.selected_conversation_status(ctx)
+            None
         }
     }