Merge remote-tracking branch 'origin/main' into brillante

Intermediate agent text/thought rows between tool calls in the same
turn now render inside the collapsed tool group instead of after it,
preserving chronological order. The last agent text (no subsequent
tool) stays outside as the prominent final answer.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

crates/maestro-cli/src/sessions.rs

@@ -57,6 +57,7 @@ pub async fn run_spawn(client: &DaemonClient, args: SpawnArgs) -> Result<Session
         env,
         metadata,
         worktree,
+        auto_approve: false,
     };
     client.create_session(&body).await
 }

crates/maestro-cli/tests/against_mock_daemon.rs

@@ -28,6 +28,7 @@ async fn info_carries_version_and_presets() {
             id: "claude".into(),
             label: "Claude".into(),
             command: "claude".into(),
+            auto_approve: false,
         }],
         ..Default::default()
     });
@@ -97,6 +98,7 @@ async fn spawn_round_trips_through_the_daemon() {
             env: Default::default(),
             metadata: Default::default(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");

crates/maestro-config/src/lib.rs

@@ -313,16 +313,19 @@ pub fn builtin_presets() -> Vec<SpawnPreset> {
             id: "claude".into(),
             label: "Claude".into(),
             command: "claude".into(),
+            auto_approve: false,
         },
         SpawnPreset {
             id: "opencode".into(),
             label: "opencode".into(),
             command: "opencode".into(),
+            auto_approve: false,
         },
         SpawnPreset {
             id: "zsh".into(),
             label: "Shell".into(),
             command: "zsh".into(),
+            auto_approve: false,
         },
     ]
 }
@@ -334,6 +337,7 @@ pub fn custom_preset() -> SpawnPreset {
         id: CUSTOM_PRESET_ID.into(),
         label: "Custom…".into(),
         command: String::new(),
+        auto_approve: false,
     }
 }
 
@@ -515,6 +519,7 @@ auto_install = false
                 id: "fish".into(),
                 label: "fish".into(),
                 command: "fish".into(),
+                auto_approve: false,
             }]),
             ..Default::default()
         };
@@ -551,6 +556,7 @@ auto_install = false
                 id: "  ".into(),
                 label: "x".into(),
                 command: "x".into(),
+                auto_approve: false,
             }]),
             ..Default::default()
         };
@@ -561,6 +567,7 @@ auto_install = false
                 id: "x".into(),
                 label: "x".into(),
                 command: "".into(),
+                auto_approve: false,
             }]),
             ..Default::default()
         };
@@ -578,11 +585,13 @@ auto_install = false
                     id: "a".into(),
                     label: "a".into(),
                     command: "a".into(),
+                    auto_approve: false,
                 },
                 SpawnPreset {
                     id: "a".into(),
                     label: "a2".into(),
                     command: "a2".into(),
+                    auto_approve: false,
                 },
             ]),
             ..Default::default()
@@ -597,6 +606,7 @@ auto_install = false
                 id: "custom".into(),
                 label: "Custom".into(),
                 command: "whatever".into(),
+                auto_approve: false,
             }]),
             ..Default::default()
         };

crates/maestro-daemon/src/session.rs

@@ -122,6 +122,9 @@ pub struct SessionRecord {
     /// Completion signal for the task draining ACP notifications into the
     /// event log. Shutdown waits for it before returning.
     acp_event_pump: Option<watch::Receiver<bool>>,
+    /// When `true`, the permission pump auto-responds `AllowAlways` to every
+    /// ACP permission request without surfacing it to clients.
+    pub auto_approve: bool,
 }
 
 impl SessionRecord {
@@ -1444,7 +1447,7 @@ impl SessionManager {
             let mut sessions = self.inner.sessions.lock().await;
             let event_pump = event_pump.map(|(acp, events)| {
                 let done = start_acp_event_pump(&self.inner, id, &acp, events.clone());
-                start_acp_permission_pump(&self.inner, id, &acp, events);
+                start_acp_permission_pump(&self.inner, id, &acp, events, req.auto_approve);
                 done
             });
             sessions.insert(
@@ -1465,6 +1468,7 @@ impl SessionManager {
                     acp_events,
                     structured_activity_watermark: None,
                     acp_event_pump: event_pump,
+                    auto_approve: req.auto_approve,
                 },
             );
         }
@@ -1677,6 +1681,7 @@ impl SessionManager {
                     acp_events: None,
                     structured_activity_watermark: None,
                     acp_event_pump: None,
+                    auto_approve: false,
                 },
             );
             let _ = self
@@ -1854,11 +1859,14 @@ impl SessionManager {
                     acp_events,
                     structured_activity_watermark: None,
                     acp_event_pump: None,
+                    // Recovery cannot know the original preset's flag; the
+                    // operator re-enables it by restarting with the preset.
+                    auto_approve: false,
                 },
             );
             if let Some((acp, events)) = event_pump {
                 let done = start_acp_event_pump(&self.inner, id, &acp, events.clone());
-                start_acp_permission_pump(&self.inner, id, &acp, events);
+                start_acp_permission_pump(&self.inner, id, &acp, events, false);
                 if let Some(record) = self.inner.sessions.lock().await.get_mut(&id) {
                     record.acp_event_pump = Some(done);
                 }
@@ -2357,6 +2365,7 @@ fn start_acp_permission_pump(
     id: Uuid,
     acp: &Arc<AcpSession>,
     events: Arc<Mutex<AcpEventStream>>,
+    auto_approve: bool,
 ) {
     let Some(mut requests) = acp.take_permission_requests() else {
         return;
@@ -2370,6 +2379,12 @@ fn start_acp_permission_pump(
             response,
         }) = requests.recv().await
         {
+            if auto_approve {
+                let outcome =
+                    permission_outcome(ApprovalDecision::AllowForSession, &request.options);
+                let _ = response.send(outcome);
+                continue;
+            }
             let mut events = events.lock().await;
             if events.projection.active_turn() != Some(turn) {
                 let _ = response.send(maestro_acp::schema::RequestPermissionOutcome::Cancelled);
@@ -3090,6 +3105,7 @@ mod tests {
             env: std::collections::HashMap::new(),
             metadata: std::collections::HashMap::new(),
             worktree: None,
+            auto_approve: false,
         }
     }
 

crates/maestro-daemon/tests/acp.rs

@@ -112,6 +112,7 @@ fn structured_command(
         env,
         metadata: HashMap::new(),
         worktree: None,
+        auto_approve: false,
     }
 }
 
@@ -705,6 +706,7 @@ async fn shutdown_preserves_a_pristine_structured_worktree_for_recovery() {
                 branch: branch.into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1187,6 +1189,7 @@ async fn cancelling_a_structured_handshake_rolls_back_and_settles_admission() {
             branch: "cancelled-create".into(),
             create_branch: true,
         }),
+        auto_approve: false,
     };
 
     let create = {

crates/maestro-daemon/tests/activity_report.rs

@@ -48,6 +48,7 @@ async fn spawn_sleeping(manager: &SessionManager) -> Uuid {
             env: Default::default(),
             metadata: Default::default(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap()

crates/maestro-daemon/tests/attach.rs

@@ -81,6 +81,7 @@ async fn create_bash_session(h: &Harness) -> Uuid {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();

crates/maestro-daemon/tests/autoname.rs

@@ -56,6 +56,7 @@ async fn spawn(manager: &SessionManager, name: Option<&str>) -> Uuid {
             env: Default::default(),
             metadata,
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap()

crates/maestro-daemon/tests/blocked_work_cost.rs

@@ -29,6 +29,7 @@ fn request(cwd: &std::path::Path, repo: &std::path::Path, branch: &str) -> Creat
             branch: branch.into(),
             create_branch: true,
         }),
+        auto_approve: false,
     }
 }
 

crates/maestro-daemon/tests/local_api.rs

@@ -162,6 +162,7 @@ async fn structured_session_with_env(h: &Harness, env: HashMap<String, String>)
             env,
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap()
@@ -547,6 +548,7 @@ async fn structured_prompt_rejects_unknown_and_unavailable_sessions() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -680,6 +682,7 @@ async fn structured_replay_rejects_unknown_terminal_and_dead_sessions() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -822,6 +825,7 @@ async fn list_sessions_starts_empty_and_reflects_creates() {
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: None,
+        auto_approve: false,
     };
     let created: Session = reqwest::Client::new()
         .post(url(h.addr, "/api/sessions"))
@@ -1039,6 +1043,7 @@ async fn patch_session_renames_it() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1082,6 +1087,7 @@ async fn post_focus_stamps_last_focused_at() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1116,6 +1122,7 @@ async fn delete_owned_session_kills_it() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1138,6 +1145,7 @@ async fn spawn_via_manager(h: &Harness) -> Uuid {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap()
@@ -1252,6 +1260,7 @@ async fn delete_a_session_whose_worktree_holds_unsaved_work_returns_409_with_the
                 branch: "feat/guarded".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1305,6 +1314,7 @@ async fn delete_with_force_ends_the_session_and_keeps_the_worktree() {
                 branch: "feat/guarded".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1335,6 +1345,7 @@ async fn attach_ws_streams_pty_bytes() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -1437,6 +1448,7 @@ async fn events_ws_sends_a_snapshot_then_streams_deltas() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1549,6 +1561,7 @@ async fn every_events_subscriber_gets_its_own_snapshot() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");

crates/maestro-daemon/tests/rename.rs

@@ -57,6 +57,7 @@ async fn spawn_named(manager: &SessionManager, name: Option<&str>) -> Uuid {
             env: Default::default(),
             metadata,
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap()

crates/maestro-daemon/tests/session_decisions.rs

@@ -70,6 +70,7 @@ impl Fx {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         }
     }
 }

crates/maestro-daemon/tests/session_manager.rs

@@ -28,6 +28,7 @@ async fn create_then_kill_round_trip() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -70,6 +71,7 @@ async fn create_appends_to_spawn_history() {
             env: HashMap::new(),
             metadata: HashMap::from([("name".into(), serde_json::json!("neon-drifter"))]),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -100,6 +102,7 @@ async fn create_without_history_logs_nothing() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -123,6 +126,7 @@ async fn recover_adopts_existing_tmux_sessions() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -166,6 +170,7 @@ async fn create_captures_initial_output_in_replay_buffer() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -215,6 +220,7 @@ async fn attach_replay_is_the_current_screen_not_the_byte_tail() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -273,6 +279,7 @@ async fn attach_replay_carries_the_panes_mouse_modes() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -324,6 +331,7 @@ async fn recover_re_pipes_pane_so_output_reaches_subscribers() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -387,6 +395,7 @@ async fn pty_broadcast_delivers_bytes_to_subscribers() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .unwrap();
@@ -438,6 +447,7 @@ async fn liveness_watcher_marks_dead_sessions_and_keeps_them_until_dismissed() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -508,6 +518,7 @@ async fn watcher_refreshes_the_blocked_work_indicator() {
                 branch: "feat/indicator".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -601,6 +612,7 @@ async fn kill_removes_worktree_even_when_spec_says_keep() {
                 branch: "feat/keep".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -639,6 +651,7 @@ async fn killing_refuses_a_worktree_with_unsaved_work_and_keeps_the_session() {
                 branch: "feat/guarded".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -703,6 +716,7 @@ async fn killing_refuses_until_the_branch_is_pushed() {
                 branch: "feat/pushed".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -753,6 +767,7 @@ async fn force_killing_a_guarded_worktree_leaves_it_on_disk() {
                 branch: "feat/forced".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -799,6 +814,7 @@ async fn force_on_a_clear_worktree_removes_it_as_usual() {
                 branch: "feat/clear".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -840,6 +856,7 @@ async fn killing_an_ignored_only_worktree_succeeds() {
                 branch: "feat/rusty".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -882,6 +899,7 @@ async fn natural_exit_of_a_guarded_worktree_leaves_it_on_disk() {
                 branch: "feat/exited".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -944,6 +962,7 @@ async fn natural_exit_of_a_pristine_worktree_removes_it() {
                 branch: "feat/clean".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1001,6 +1020,7 @@ async fn liveness_watcher_leaves_running_sessions_alone() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1040,6 +1060,7 @@ async fn worktree_base_repo_records_the_main_checkout_not_the_request() {
                 branch: "feat/one".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create first");
@@ -1058,6 +1079,7 @@ async fn worktree_base_repo_records_the_main_checkout_not_the_request() {
                 branch: "feat/two".into(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
         .await
         .expect("create second");
@@ -1093,6 +1115,7 @@ async fn spawned_sessions_export_maestro_session_id_and_url() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1132,6 +1155,7 @@ async fn a_freshly_created_session_has_never_been_focused() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1158,6 +1182,7 @@ async fn set_focused_true_stamps_last_focused_at() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");
@@ -1207,6 +1232,7 @@ async fn attaching_stamps_last_focused_at() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("create");

crates/maestro-e2e/tests/e2e.rs

@@ -33,6 +33,7 @@ fn create_req(cwd: &std::path::Path, command: &str) -> CreateSessionRequest {
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: None,
+        auto_approve: false,
     }
 }
 
@@ -111,6 +112,7 @@ fn worktree_req(base: &std::path::Path, branch: &str, create_branch: bool) -> Cr
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: Some(worktree_spec(base, branch, create_branch)),
+        auto_approve: false,
     }
 }
 
@@ -206,6 +208,7 @@ async fn kill_removes_clean_worktree() {
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: Some(worktree_spec(base.path(), "feature/e2e", true)),
+        auto_approve: false,
     };
 
     let s = client.spawn_session(&req).await.expect("spawn worktree");
@@ -260,6 +263,7 @@ async fn kill_refuses_worktree_with_uncommitted_changes() {
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: Some(worktree_spec(base.path(), "feature/unsaved", true)),
+        auto_approve: false,
     };
 
     let s = client.spawn_session(&req).await.expect("spawn worktree");
@@ -319,6 +323,7 @@ async fn spawn_on_existing_branch_checks_it_out() {
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: Some(worktree_spec(base.path(), "feature/existing", false)),
+        auto_approve: false,
     };
 
     let s = client
@@ -827,6 +832,7 @@ async fn natural_exit_settles_dirty_and_pristine_worktrees_differently() {
             env: HashMap::new(),
             metadata: HashMap::new(),
             worktree: Some(worktree_spec(dirty_repo.path(), "feature/messy", true)),
+            auto_approve: false,
         })
         .await
         .expect("spawn dirty");
@@ -876,6 +882,7 @@ fn create_req_cmd(cwd: &std::path::Path, command: &str, branch: &str) -> CreateS
         env: HashMap::new(),
         metadata: HashMap::new(),
         worktree: Some(worktree_spec(cwd, branch, true)),
+        auto_approve: false,
     }
 }
 
@@ -1068,6 +1075,7 @@ async fn sigterm_stops_structured_child_before_events_ws_drains() {
             env: fake.env.clone(),
             metadata: HashMap::new(),
             worktree: None,
+            auto_approve: false,
         })
         .await
         .expect("spawn structured session");

crates/maestro-protocol/src/lib.rs

@@ -383,6 +383,10 @@ pub struct CreateSessionRequest {
     /// untouched.
     #[serde(default)]
     pub view: SessionView,
+    /// When `true`, the daemon auto-approves every ACP permission request
+    /// for this structured session.
+    #[serde(default)]
+    pub auto_approve: bool,
 }
 
 /// Result of `GET /api/dirs`: the immediate subdirectories of one directory.
@@ -522,6 +526,11 @@ pub struct SpawnPreset {
     pub id: String,
     pub label: String,
     pub command: String,
+    /// When `true`, the daemon auto-approves every ACP permission request
+    /// for structured sessions spawned from this preset instead of surfacing
+    /// them to the client.
+    #[serde(default)]
+    pub auto_approve: bool,
 }
 
 /// Build provenance of the running daemon: the commit it was compiled
@@ -1251,6 +1260,7 @@ mod tests {
                 create_branch: true,
             }),
             view: SessionView::Terminal,
+            auto_approve: false,
         };
         assert_eq!(req, round_trip(&req));
     }

crates/maestro-tui/src/app.rs

@@ -11,6 +11,7 @@
 //! `dispatch` / the overlay routing.
 
 use std::collections::{HashMap, HashSet};
+use std::io::Write;
 use std::path::PathBuf;
 use std::time::Duration;
 
@@ -54,6 +55,36 @@ enum OverlayDecision {
     Pass,
 }
 
+fn copy_to_terminal_clipboard(text: &str) -> std::io::Result<()> {
+    let encoded = base64_encode(text.as_bytes());
+    let mut output = std::io::stdout();
+    write!(output, "\x1b]52;c;{encoded}\x07")?;
+    output.flush()
+}
+
+fn base64_encode(bytes: &[u8]) -> String {
+    const TABLE: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    let mut output = String::with_capacity(bytes.len().div_ceil(3) * 4);
+    for chunk in bytes.chunks(3) {
+        let bits = (u32::from(chunk[0]) << 16)
+            | (u32::from(*chunk.get(1).unwrap_or(&0)) << 8)
+            | u32::from(*chunk.get(2).unwrap_or(&0));
+        output.push(TABLE[((bits >> 18) & 0x3f) as usize] as char);
+        output.push(TABLE[((bits >> 12) & 0x3f) as usize] as char);
+        output.push(if chunk.len() > 1 {
+            TABLE[((bits >> 6) & 0x3f) as usize] as char
+        } else {
+            '='
+        });
+        output.push(if chunk.len() > 2 {
+            TABLE[(bits & 0x3f) as usize] as char
+        } else {
+            '='
+        });
+    }
+    output
+}
+
 pub struct App {
     cfg: TuiConfig,
     home_dir: String,
@@ -340,6 +371,10 @@ impl App {
             return Ok(false);
         }
 
+        if self.handle_structured_mouse(&key) {
+            return Ok(false);
+        }
+
         if let Some(effects) = self.handle_structured_key(&key) {
             self.perform(effects).await;
             return Ok(false);
@@ -423,6 +458,61 @@ impl App {
         true
     }
 
+    /// Transcript blocks are pointer targets: click selects the whole block,
+    /// gives it the selection surface, and copies its complete text.
+    fn handle_structured_mouse(&mut self, key: &InputKey) -> bool {
+        let InputKey::Mouse {
+            kind,
+            region: Region::Pane,
+            row,
+            ..
+        } = key
+        else {
+            return false;
+        };
+        if !matches!(kind, MouseKind::Click | MouseKind::Hover) {
+            return false;
+        }
+        let Some(sid) = self.state.active_session() else {
+            return false;
+        };
+        let Some(handle) = self.structured.get(&sid) else {
+            return false;
+        };
+        let Some(pane) = self.region.pane else {
+            return false;
+        };
+        let offset = usize::from(row.saturating_sub(pane.y));
+        let transcript_height = pane.height.saturating_sub(pane.height.min(3));
+        if offset >= usize::from(transcript_height) {
+            return true;
+        }
+        let mut state = handle.state.lock().expect("structured state mutex");
+        let rendered_line = state.scroll.saturating_add(offset);
+        if !state.select_rendered_line(rendered_line) {
+            return true;
+        }
+        let Some(id) = state.selected.as_deref() else {
+            return true;
+        };
+        let Some(transcript) = state.rows.iter().find(|item| item.id == id) else {
+            return true;
+        };
+        if *kind == MouseKind::Hover {
+            return true;
+        }
+        let text = crate::structured_pane::copy_text(transcript);
+        drop(state);
+        if text.is_empty() {
+            return true;
+        }
+        match copy_to_terminal_clipboard(&text) {
+            Ok(()) => self.state.toast("copied transcript block"),
+            Err(error) => self.state.toast(format!("copy failed: {error}")),
+        }
+        true
+    }
+
     /// Carry out what `dispatch` decided. The only place in `App` that talks to
     /// the daemon.
     async fn perform(&mut self, effects: Vec<Effect>) {
@@ -1905,6 +1995,12 @@ async fn fetch_branches(
 #[cfg(test)]
 mod tests {
     use super::*;
+
+    #[test]
+    fn clipboard_payload_uses_standard_base64() {
+        assert_eq!(base64_encode(b"hello"), "aGVsbG8=");
+        assert_eq!(base64_encode("✓".as_bytes()), "4pyT");
+    }
     use crate::action::Action;
     use crate::draft::DraftField;
     use crate::keymap::Mode;
@@ -3009,6 +3105,7 @@ mod tests {
             env: Default::default(),
             metadata: Default::default(),
             worktree: None,
+            auto_approve: false,
         };
         app.submit_spawn(req).await;
 
@@ -3057,6 +3154,7 @@ mod tests {
             env: Default::default(),
             metadata: Default::default(),
             worktree: None,
+            auto_approve: false,
         };
 
         let structured_id = Uuid::from_u128(188);

crates/maestro-tui/src/draft.rs

@@ -734,6 +734,10 @@ impl DraftPane {
             );
         }
         let worktree = self.build_worktree()?;
+        let auto_approve = self
+            .presets
+            .get(self.selected_preset)
+            .is_some_and(|p| p.auto_approve);
         Ok(CreateSessionRequest {
             view: if self.structured_view && self.supports_structured_view() {
                 SessionView::Structured
@@ -745,6 +749,7 @@ impl DraftPane {
             env: Default::default(),
             metadata,
             worktree,
+            auto_approve,
         })
     }
 
@@ -1792,6 +1797,7 @@ mod tests {
             id: "aider".into(),
             label: "Aider".into(),
             command: "aider".into(),
+            auto_approve: false,
         }]);
         assert_eq!(
             draft.command(),
@@ -1814,11 +1820,13 @@ mod tests {
                 id: "claude".into(),
                 label: "Claude".into(),
                 command: "claude".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "aider".into(),
                 label: "Aider".into(),
                 command: "aider".into(),
+                auto_approve: false,
             },
         ]);
         assert_eq!(draft.command(), "aider");
@@ -1838,6 +1846,7 @@ mod tests {
             id: "claude".into(),
             label: "Claude".into(),
             command: "claude".into(),
+            auto_approve: false,
         }]);
         assert!(draft.is_custom());
         assert_eq!(draft.command(), "bash -l");
@@ -1914,16 +1923,19 @@ mod tests {
                 id: "claude".into(),
                 label: "Claude".into(),
                 command: "claude".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "codex".into(),
                 label: "Codex".into(),
                 command: "codex".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "opencode".into(),
                 label: "OpenCode".into(),
                 command: "opencode".into(),
+                auto_approve: false,
             },
         ]);
         assert!(draft.structured_view, "on by default for a supported agent");
@@ -2066,16 +2078,19 @@ mod tests {
                 id: "claude-wrapped".into(),
                 label: "Claude (npx)".into(),
                 command: "npx claude-code --resume".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "codex-wrapped".into(),
                 label: "Codex (npx)".into(),
                 command: "npx codex exec".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "aider".into(),
                 label: "Aider".into(),
                 command: "aider".into(),
+                auto_approve: false,
             },
         ]);
 
@@ -2115,11 +2130,13 @@ mod tests {
                 id: "claude".into(),
                 label: "Claude".into(),
                 command: "claude".into(),
+                auto_approve: false,
             },
             SpawnPreset {
                 id: "codex".into(),
                 label: "Codex".into(),
                 command: "codex".into(),
+                auto_approve: false,
             },
         ]);
         assert!(draft.structured_view);

crates/maestro-tui/src/fast_forward.rs

@@ -121,6 +121,7 @@ impl FastForwardDefaults {
                 branch: handle.to_string(),
                 create_branch: true,
             }),
+            auto_approve: false,
         })
     }
 
@@ -184,6 +185,7 @@ mod tests {
             id: id.into(),
             label: id.into(),
             command: command.into(),
+            auto_approve: false,
         }
     }
 

crates/maestro-tui/src/input.rs

@@ -55,6 +55,7 @@ pub enum MouseKind {
     Click,
     DblClick,
     Drag,
+    Hover,
     ScrollUp,
     ScrollDown,
 }
@@ -148,6 +149,7 @@ impl InputKey {
                     MouseKind::Click => "click",
                     MouseKind::DblClick => "dblclick",
                     MouseKind::Drag => "drag",
+                    MouseKind::Hover => "hover",
                     MouseKind::ScrollUp => "scrollup",
                     MouseKind::ScrollDown => "scrolldown",
                 };
@@ -178,6 +180,7 @@ impl InputKey {
                 "click" => MouseKind::Click,
                 "dblclick" => MouseKind::DblClick,
                 "drag" => MouseKind::Drag,
+                "hover" => MouseKind::Hover,
                 "scrollup" => MouseKind::ScrollUp,
                 "scrolldown" => MouseKind::ScrollDown,
                 other => return Err(InputParseError::UnknownMouseKind(other.into())),
@@ -297,6 +300,7 @@ where
             let mk = match kind {
                 MouseEventKind::Down(MouseButton::Left) => MouseKind::Click,
                 MouseEventKind::Drag(MouseButton::Left) => MouseKind::Drag,
+                MouseEventKind::Moved => MouseKind::Hover,
                 MouseEventKind::ScrollUp => MouseKind::ScrollUp,
                 MouseEventKind::ScrollDown => MouseKind::ScrollDown,
                 _ => return None,
@@ -681,6 +685,9 @@ mod tests {
         let s = "mouse:dblclick(sidebar-row)";
         let k = InputKey::parse(s).unwrap();
         assert_eq!(k.canonical(), s);
+        let s = "mouse:hover(pane)";
+        let k = InputKey::parse(s).unwrap();
+        assert_eq!(k.canonical(), s);
     }
 
     #[test]

crates/maestro-tui/src/structured_pane.rs

@@ -308,11 +308,12 @@ fn fallback_after_removal(
 
 fn build_lines(state: &StructuredState, width: usize) -> Vec<VisualLine> {
     let mut out = Vec::new();
-    for row in &state.rows {
+    for (index, row) in state.rows.iter().enumerate() {
         if row.kind == TranscriptRowKind::Plan {
             continue;
         }
         let row_width = width.saturating_sub(1).max(1);
+        let start = out.len();
         match row.kind {
             TranscriptRowKind::User => push_wrapped(
                 &mut out,
@@ -356,10 +357,53 @@ fn build_lines(state: &StructuredState, width: usize) -> Vec<VisualLine> {
             ),
             TranscriptRowKind::Plan => {}
         }
+        if out.len() > start
+            && state.rows[index + 1..]
+                .iter()
+                .any(|next| next.kind != TranscriptRowKind::Plan)
+        {
+            // A blank surface line is the vertical padding that keeps adjacent
+            // transcript blocks readable at a glance.
+            out.push(VisualLine {
+                text: String::new(),
+                row_id: None,
+                rail: false,
+                tone: Tone::Normal,
+            });
+        }
     }
     out
 }
 
+/// Text supplied to the terminal clipboard when a transcript block is
+/// clicked. It preserves the full tool detail rather than its compact preview.
+pub fn copy_text(row: &TranscriptRow) -> String {
+    match row.kind {
+        TranscriptRowKind::User
+        | TranscriptRowKind::AgentText
+        | TranscriptRowKind::AgentThought => content_text(row),
+        TranscriptRowKind::ToolCall | TranscriptRowKind::ToolDiff => {
+            let (name, argument) = tool_title(row);
+            let mut lines = vec![if argument.is_empty() {
+                name
+            } else {
+                format!("{name}  {argument}")
+            }];
+            lines.extend(tool_content_lines(row, None));
+            lines.join("\n")
+        }
+        TranscriptRowKind::Approval => row
+            .data
+            .get("toolCall")
+            .and_then(|tool| tool.get("title"))
+            .and_then(serde_json::Value::as_str)
+            .unwrap_or("permission requested")
+            .into(),
+        TranscriptRowKind::Notice => "[notice]".into(),
+        TranscriptRowKind::Plan => String::new(),
+    }
+}
+
 fn push_wrapped(
     out: &mut Vec<VisualLine>,
     row: &TranscriptRow,
@@ -1000,6 +1044,39 @@ mod tests {
         );
     }
 
+    #[test]
+    fn transcript_blocks_have_a_padding_line_between_them() {
+        let mut state = StructuredState::default();
+        state.rows = vec![
+            row(
+                "one",
+                TranscriptRowKind::User,
+                json!({"content":{"type":"text","text":"first"}}),
+            ),
+            row(
+                "two",
+                TranscriptRowKind::AgentText,
+                json!({"content":{"type":"text","text":"second"}}),
+            ),
+        ];
+
+        let lines = build_lines(&state, 80);
+        assert_eq!(lines.len(), 3);
+        assert_eq!(lines[1].text, "");
+        assert!(lines[1].row_id.is_none());
+    }
+
+    #[test]
+    fn copying_a_tool_keeps_its_full_detail() {
+        let tool = row(
+            "t",
+            TranscriptRowKind::ToolCall,
+            json!({"title":"Bash(cargo test)","content":[{"type":"content","content":{"type":"text","text":"all green"}}]}),
+        );
+
+        assert_eq!(copy_text(&tool), "Bash  cargo test\nall green");
+    }
+
     #[test]
     fn tool_is_compact_until_selected_row_expands() {
         let mut state = StructuredState::default();
@@ -1420,7 +1497,7 @@ mod tests {
         let mut state = StructuredState::default();
         state.follow_selection = false;
         numbered_rows(&mut state, 20);
-        state.scroll = 10;
+        state.scroll = 20;
 
         let before = render_transcript_lines(&pane, &mut state, 30, 5);
         assert!(before[0].contains("line 10"), "{before:?}");
@@ -1439,7 +1516,7 @@ mod tests {
         let mut state = StructuredState::default();
         state.follow_selection = false;
         numbered_rows(&mut state, 20);
-        state.scroll = 10;
+        state.scroll = 20;
 
         let before = render_transcript_lines(&pane, &mut state, 30, 5);
         assert!(before[0].contains("line 10"), "{before:?}");
@@ -1459,7 +1536,7 @@ mod tests {
         let mut state = StructuredState::default();
         state.follow_selection = false;
         numbered_rows(&mut state, 20);
-        state.scroll = 10;
+        state.scroll = 20;
 
         let before = render_transcript_lines(&pane, &mut state, 30, 5);
         assert!(before[0].contains("line 10"), "{before:?}");
@@ -1478,7 +1555,7 @@ mod tests {
         let mut state = StructuredState::default();
         state.follow_selection = false;
         numbered_rows(&mut state, 20);
-        state.scroll = 10;
+        state.scroll = 20;
 
         let before = render_transcript_lines(&pane, &mut state, 30, 5);
         assert!(before[0].contains("line 10"), "{before:?}");
@@ -1497,7 +1574,7 @@ mod tests {
         let mut state = StructuredState::default();
         state.follow_selection = false;
         numbered_rows(&mut state, 20);
-        state.scroll = 10;
+        state.scroll = 20;
 
         render_transcript_lines(&pane, &mut state, 30, 5);
         // Simulate a `TranscriptDelta::Patch` on a collapsed tool row above the

crates/maestro-tui/src/structured_task.rs

@@ -199,6 +199,18 @@ impl StructuredState {
         self.follow_selection = true;
     }
 
+    /// Select the transcript block under a rendered transcript line. Pointer
+    /// input uses the same row identity map as scroll reconciliation, so a
+    /// wrapped block behaves as one target.
+    pub fn select_rendered_line(&mut self, line: usize) -> bool {
+        let Some(id) = self.line_rows.get(line).and_then(Clone::clone) else {
+            return false;
+        };
+        self.selected = Some(id);
+        self.follow_selection = false;
+        true
+    }
+
     pub fn toggle_selected(&mut self) {
         let Some(id) = self.selected.clone() else {
             return;
@@ -657,6 +669,25 @@ mod tests {
         assert_eq!(state.composer.value(), "hi");
     }
 
+    #[test]
+    fn selecting_a_rendered_line_selects_its_whole_block() {
+        let mut state = StructuredState {
+            line_rows: vec![
+                Some("one".into()),
+                Some("one".into()),
+                None,
+                Some("two".into()),
+            ],
+            ..Default::default()
+        };
+
+        assert!(state.select_rendered_line(1));
+        assert_eq!(state.selected.as_deref(), Some("one"));
+        assert!(!state.follow_selection);
+        assert!(!state.select_rendered_line(2));
+        assert_eq!(state.selected.as_deref(), Some("one"));
+    }
+
     #[test]
     fn authoritative_idle_snapshot_reconciles_a_wholly_missed_turn() {
         let mut state = StructuredState::default();

docs/STRUCTURED-VIEW.md

@@ -190,9 +190,13 @@ choices, not daemon ones.
   from the transcript; the TUI may show the current plan in its status line,
   while the web client deliberately has no stats or plan rail.
 - The web client groups two or more tool rows after the same `User` row into
-  one collapsed turn activity block. Opening it reveals independently
-  expandable tool calls, including any raw command, input, output, and diff
-  content the adapter supplied.
+  one collapsed turn activity block. `AgentText` and `AgentThought` rows that
+  appear *between* tool rows in the same turn are absorbed into the group
+  (intermediate narration); the last `AgentText` with no subsequent tool stays
+  outside as the prominent final answer. The header still reads
+  "N tool calls" (counting only tool rows). Opening the group reveals tools
+  and intermediate text in chronological order, with the text rendered in a
+  subdued style.
 - The web client's user, agent, thought, tool-detail, and notice text blocks
   copy their complete source text when clicked or keyboard-activated.
 - The web client consumes `available_commands_update` notices as the live

web/src/spawnForm.test.ts

@@ -7,6 +7,7 @@ const base: SpawnFormValues = {
   cwd: "/home/user/project",
   name: "amber-fox",
   structuredView: false,
+  autoApprove: false,
   worktreeEnabled: false,
   worktreeBranch: "",
   worktreeBranchMode: "new",

web/src/spawnForm.ts

@@ -49,6 +49,7 @@ export interface SpawnFormValues {
   cwd: string;
   name: string;
   structuredView: boolean;
+  autoApprove: boolean;
   worktreeEnabled: boolean;
   worktreeBranch: string;
   worktreeBranchEdited: boolean;
@@ -79,6 +80,10 @@ export function buildSpawnRequest(
     req.view = "Structured";
   }
 
+  if (values.autoApprove) {
+    req.auto_approve = true;
+  }
+
   if (values.worktreeEnabled) {
     const mode = values.worktreeBranchMode ?? "new";
     const branch = values.worktreeBranch.trim();
@@ -152,20 +157,20 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
       <input class="raw-input cmd-raw" name="command_raw" type="text" hidden
              placeholder="bash -l" autocomplete="off" />
     </div>
-    <div class="field">
-      <span class="field-label">Name</span>
-      <div class="name-row">
-        <input name="name" type="text" autocomplete="off"
-               placeholder="named after your first prompt" />
-      </div>
-    </div>
-    <fieldset class="worktree">
+    <div class="advanced">
       <button type="button" class="tree-folder-header wt-toggle" aria-expanded="false">
         <span class="chevron">▾</span>
-        <span class="folder-name">Advanced options</span>
+        <span class="folder-name">Advanced</span>
         <span class="wt-summary"></span>
       </button>
       <div class="wt-collapsible" hidden>
+        <div class="field">
+          <span class="field-label">Session name</span>
+          <div class="name-row">
+            <input name="name" type="text" autocomplete="off"
+                   placeholder="named after your first prompt" />
+          </div>
+        </div>
         <label class="row-inline structured-view" hidden>
           <input type="checkbox" name="structured_view" />
           Structured view
@@ -174,34 +179,36 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
           <span class="field-label">Worktree</span>
           <div class="picker wt-choices"></div>
         </div>
-        <label class="row-inline">
-          <input type="checkbox" name="worktree_enabled" />
-          Create git worktree
-        </label>
-        <p class="wt-hint" hidden></p>
-        <div class="wt-body" hidden>
-          <p class="wt-repo"></p>
-          <div class="wt-mode" role="radiogroup" aria-label="Branch source">
-            <label class="row-inline">
-              <input type="radio" name="worktree_branch_mode" value="new" />
-              New branch
+        <div class="adv-group">
+          <label class="row-inline">
+            <input type="checkbox" name="worktree_enabled" />
+            Create git worktree
+          </label>
+          <p class="wt-hint" hidden></p>
+          <div class="wt-body" hidden>
+            <p class="wt-repo"></p>
+            <div class="wt-mode" role="radiogroup" aria-label="Branch source">
+              <label class="row-inline">
+                <input type="radio" name="worktree_branch_mode" value="new" />
+                New branch
+              </label>
+              <label class="row-inline">
+                <input type="radio" name="worktree_branch_mode" value="existing" />
+                Existing branch
+              </label>
+            </div>
+            <label class="wt-new-wrap">
+              New branch name
+              <input name="worktree_branch" type="text" placeholder="feat/foo" autocomplete="off" />
             </label>
-            <label class="row-inline">
-              <input type="radio" name="worktree_branch_mode" value="existing" />
-              Existing branch
+            <label class="wt-exist-wrap" hidden>
+              Pick a branch
+              <select class="branch-select"></select>
             </label>
           </div>
-          <label class="wt-new-wrap">
-            New branch name
-            <input name="worktree_branch" type="text" placeholder="feat/foo" autocomplete="off" />
-          </label>
-          <label class="wt-exist-wrap" hidden>
-            Pick a branch
-            <select class="branch-select"></select>
-          </label>
         </div>
       </div>
-    </fieldset>
+    </div>
     <p class="form-error" role="alert" aria-live="polite"></p>
     <div class="form-actions">
       <button type="submit" class="btn btn-primary">Spawn</button>
@@ -261,6 +268,8 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
   let ready = false;
   let destroyed = false;
   const branchValue = () => (branchMode === "existing" ? branchSelect.value : branchInput.value);
+  const selectedAutoApprove = () =>
+    presets.find((p) => p.id === selectedPresetId)?.auto_approve ?? false;
   const emit = () => {
     if (!ready || destroyed) return;
     opts.onChange?.({
@@ -268,6 +277,7 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
       cwd,
       name: nameInput.value,
       structuredView: structuredView.checked,
+      autoApprove: selectedAutoApprove(),
       worktreeEnabled: wtEnabled.checked,
       worktreeBranch: branchValue(),
       worktreeBranchEdited: branchEdited,
@@ -927,6 +937,7 @@ export function createSpawnForm(opts: SpawnFormOptions): SpawnFormHandle {
         cwd,
         name: nameInput.value,
         structuredView: structuredView.checked,
+        autoApprove: selectedAutoApprove(),
         worktreeEnabled: wtEnabled.checked,
         worktreeBranch: branchValue(),
         worktreeBranchEdited: branchEdited,

web/src/structured.test.ts

@@ -413,6 +413,39 @@ describe("structured connection: data flow", () => {
     conn.dispose();
   });
 
+  it("absorbs intermediate agent text into tool group, keeps final text outside", () => {
+    const ws = new FakeSocket();
+    const conn = mount({ sockets: [ws] });
+    ws.open();
+    ws.emit({
+      type: "transcript_snapshot",
+      snapshot: {
+        cursor: 8,
+        rows: [
+          row("user:1", "user", { content: { type: "text", text: "do it" } }),
+          row("agent:1", "agent_text", { content: { type: "text", text: "Let me check" } }),
+          toolRow("tool:1", "one"),
+          toolRow("tool:2", "two"),
+          row("agent:2", "agent_text", { content: { type: "text", text: "Found issues, fixing" } }),
+          toolRow("tool:3", "three"),
+          toolRow("tool:4", "four"),
+          row("agent:3", "agent_text", { content: { type: "text", text: "All done" } }),
+        ],
+      },
+    });
+    const groups = conn.el.querySelectorAll<HTMLElement>(".st-tool-group");
+    expect(groups).toHaveLength(1);
+    // Header counts only tool rows, not intermediate text.
+    expect(groups[0].querySelector(".st-tool-group-head")!.textContent).toContain("4 tool calls");
+    // Intermediate text (agent:2) is inside the group.
+    expect(conn.el.querySelector('[data-row-id="agent:2"]')?.closest(".st-tool-group")).not.toBeNull();
+    // First text (agent:1) is outside — it precedes all tools.
+    expect(conn.el.querySelector('[data-row-id="agent:1"]')?.closest(".st-tool-group")).toBeNull();
+    // Final text (agent:3) is outside — no tool follows it.
+    expect(conn.el.querySelector('[data-row-id="agent:3"]')?.closest(".st-tool-group")).toBeNull();
+    conn.dispose();
+  });
+
   it("keeps an expanded running tool open without emitting a click when patched", () => {
     const ws = new FakeSocket();
     const conn = mount({ sockets: [ws] });

web/src/structured.ts

@@ -393,17 +393,53 @@ export function createStructuredConnection(
     return el;
   }
 
-  function toolGroupsByTurn(): Map<string, TranscriptRow[]> {
-    const groups = new Map<string, TranscriptRow[]>();
+  /** Group tool rows (and intermediate agent text between them) by turn.
+   *  An agent_text/agent_thought row is "intermediate" when a tool row follows
+   *  it in the same turn — it gets absorbed into the group so the collapsed
+   *  block preserves chronological order.  The *last* agent text with no
+   *  subsequent tool stays standalone (the prominent final answer).
+   *  Returns groups keyed by `turn:<userId>`, each with `toolCount` (for the
+   *  header label) and `rows` (tools + intermediate text, in order). */
+  function activityGroupsByTurn(): Map<string, { toolCount: number; rows: TranscriptRow[] }> {
+    // First: count tools per turn to know which turns qualify for grouping.
+    const toolCounts = new Map<string, number>();
     let turnId = "before-first-message";
     for (const row of rows) {
       if (row.kind === "user") turnId = row.id;
       if (row.kind !== "tool_call" && row.kind !== "tool_diff") continue;
-      const id = `turn:${turnId}`;
-      const group = groups.get(id) ?? [];
-      group.push(row);
-      groups.set(id, group);
+      const gid = `turn:${turnId}`;
+      toolCounts.set(gid, (toolCounts.get(gid) ?? 0) + 1);
     }
+    // Second: build groups with interleaved text for turns with 2+ tools.
+    const groups = new Map<string, { toolCount: number; rows: TranscriptRow[] }>();
+    turnId = "before-first-message";
+    // Pending text rows that might be intermediate (not yet confirmed by a
+    // following tool). If no tool follows, they stay standalone.
+    let pendingText: TranscriptRow[] = [];
+    let currentGid = `turn:${turnId}`;
+    for (const row of rows) {
+      if (row.kind === "user") {
+        turnId = row.id;
+        currentGid = `turn:${turnId}`;
+        pendingText = [];
+        continue;
+      }
+      const count = toolCounts.get(currentGid) ?? 0;
+      if (count < 2) continue;
+      if (row.kind === "agent_text" || row.kind === "agent_thought") {
+        pendingText.push(row);
+        continue;
+      }
+      if (row.kind === "tool_call" || row.kind === "tool_diff") {
+        const group = groups.get(currentGid) ?? { toolCount: count, rows: [] };
+        // Flush any pending text — a tool follows, so it's intermediate.
+        group.rows.push(...pendingText);
+        pendingText = [];
+        group.rows.push(row);
+        groups.set(currentGid, group);
+      }
+    }
+    // pendingText at end of a turn = final text, stays outside (not flushed).
     return groups;
   }
 
@@ -413,9 +449,9 @@ export function createStructuredConnection(
     const focusedGroupId = active?.closest<HTMLElement>("[data-tool-group-id]")?.dataset.toolGroupId;
     const restoreToolFocus = active?.classList.contains("st-tool-head") ?? false;
     const restoreGroupFocus = active?.classList.contains("st-tool-group-head") ?? false;
-    const groups = toolGroupsByTurn();
+    const groups = activityGroupsByTurn();
     const groupedRowIds = new Set<string>();
-    const liveGroupIds = new Set([...groups].filter(([, tools]) => tools.length > 1).map(([id]) => id));
+    const liveGroupIds = new Set([...groups.keys()]);
     for (const id of expandedGroupIds) if (!liveGroupIds.has(id)) expandedGroupIds.delete(id);
 
     rowEls.clear();
@@ -425,28 +461,30 @@ export function createStructuredConnection(
     for (const row of rows) {
       if (row.kind === "user") turnId = row.id;
       const groupId = `turn:${turnId}`;
-      const groupRows = groups.get(groupId) ?? [];
-      if ((row.kind === "tool_call" || row.kind === "tool_diff") && groupRows.length > 1) {
-        if (groupedRowIds.has(row.id)) continue;
-        const toolEls = groupRows.flatMap((toolRow) => {
-          groupedRowIds.add(toolRow.id);
-          const toolEl = buildRowElement(toolRow);
-          if (!toolEl) return [];
-          rowEls.set(toolRow.id, toolEl);
-          return [toolEl];
+      const group = groups.get(groupId);
+      if (group && groupedRowIds.has(row.id)) continue;
+      if (group && (row.kind === "tool_call" || row.kind === "tool_diff") && !groupedRowIds.has(row.id)) {
+        // First ungrouped tool in this turn — render the whole activity group.
+        const memberEls = group.rows.flatMap((memberRow) => {
+          groupedRowIds.add(memberRow.id);
+          const memberEl = buildRowElement(memberRow);
+          if (!memberEl) return [];
+          rowEls.set(memberRow.id, memberEl);
+          return [memberEl];
         });
         const groupEl = buildToolGroup(
           groupId,
-          groupRows,
-          toolEls,
+          group.rows,
+          memberEls,
           expandedGroupIds.has(groupId),
           (expanded) => {
             if (expanded) expandedGroupIds.add(groupId);
             else expandedGroupIds.delete(groupId);
             settleDisclosureLayout();
           },
+          group.toolCount,
         );
-        if (groupRows.some((toolRow) => enteringRowIds.has(toolRow.id))) {
+        if (group.rows.some((r) => enteringRowIds.has(r.id))) {
           groupEl.classList.add("st-row-enter");
         }
         groupEls.set(groupId, groupEl);

web/src/structuredRender.ts

@@ -581,7 +581,9 @@ export function buildToolGroup(
   children: HTMLElement[],
   expanded: boolean,
   onExpandedChange?: (expanded: boolean) => void,
+  toolCount?: number,
 ): HTMLElement {
+  const count = toolCount ?? rows.length;
   const wrap = el("div", "st-tool-group");
   wrap.dataset.toolGroupId = id;
   const head = document.createElement("button");
@@ -593,15 +595,8 @@ export function buildToolGroup(
   glyph.textContent = "›";
   glyph.setAttribute("aria-hidden", "true");
   const title = el("span", "st-tool-group-title");
-  title.textContent = `${rows.length} tool calls`;
-  const names = el("span", "st-tool-group-names");
-  names.textContent = rows
-    .map((row) => {
-      const tool = (row.data ?? {}) as AcpToolCallLike;
-      return splitToolTitle(tool.title, tool.name, tool.kind).label;
-    })
-    .join(" · ");
-  head.append(glyph, title, names);
+  title.textContent = `${count} tool calls`;
+  head.append(glyph, title);
 
   const body = el("div", "st-tool-group-body st-disclosure");
   const bodyClip = el("div", "st-disclosure-clip");

web/src/styles.css

@@ -2306,6 +2306,9 @@ input.leaf-rename:focus {
   display: flex;
   flex-direction: column;
   min-width: 0;
+  max-width: 820px;
+  margin-inline: auto;
+  width: 100%;
 }
 
 .structured-activity {
@@ -2828,12 +2831,12 @@ input.leaf-rename:focus {
   border: 1px solid var(--border);
   border-radius: var(--r-2);
   background: color-mix(in oklab, var(--surface-2) 55%, transparent);
-  padding: var(--sp-2) var(--sp-3);
+  padding: var(--sp-1) var(--sp-2);
   transition: background var(--dur-fast) var(--ease-out);
 }
 
 .st-tool-group:hover {
-  background: var(--surface-2);
+  background: color-mix(in oklab, var(--surface-2) 70%, transparent);
 }
 
 .st-tool-group-head {
@@ -2870,15 +2873,6 @@ input.leaf-rename:focus {
   font-weight: 500;
 }
 
-.st-tool-group-names {
-  min-width: 0;
-  overflow: hidden;
-  color: var(--muted);
-  text-align: left;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .st-tool-group-body {
   padding-top: 0;
 }
@@ -2886,11 +2880,42 @@ input.leaf-rename:focus {
 .st-tool-group-body .st-disclosure-inner {
   display: flex;
   flex-direction: column;
-  padding-top: var(--sp-2);
+  padding-top: var(--sp-1);
 }
 
 .st-tool-group-body .st-disclosure-inner > .st-row-tool {
-  padding: var(--sp-1) 0;
+  padding: 0;
+}
+
+/* inside a group, tool cards lose their border and background —
+   the group container already provides the visual boundary. */
+.st-tool-group-body .st-tool {
+  border: 0;
+}
+
+.st-tool-group-body .st-tool-head {
+  padding: var(--sp-1) var(--sp-2);
+  border-radius: var(--r-1);
+}
+
+/* intermediate agent text inside a tool group — subdued so the final
+   answer outside the group stays the prominent one. */
+.st-tool-group-body .st-row-agent {
+  color: var(--muted);
+  font-size: var(--fs-12);
+  padding: var(--sp-1) var(--sp-2);
+}
+
+.st-tool-group-body .st-row-agent .st-body > :first-child {
+  margin-top: 0;
+}
+
+.st-tool-group-body .st-row-agent .st-body > :last-child {
+  margin-bottom: 0;
+}
+
+.st-tool-group-body .st-row-thought {
+  padding: var(--sp-1) var(--sp-2);
 }
 
 .st-tool-group-body[hidden] {
@@ -3441,14 +3466,9 @@ input.leaf-rename:focus {
     overflow-y: visible;
   }
 
-  /* Rides the bottom of the scroll box: reachable at any scroll position, and
-     `margin-top: auto` keeps it at the screen's foot when the form is short. */
   .spawn-modal .form-actions {
-    position: sticky;
-    bottom: 0;
     margin-top: auto;
-    padding: var(--sp-2) 0 calc(var(--sp-2) + env(safe-area-inset-bottom, 0px));
-    background: var(--surface);
+    padding-bottom: calc(var(--sp-2) + env(safe-area-inset-bottom, 0px));
     box-shadow: 0 -8px 12px -8px oklch(0 0 0 / 0.5);
   }
 
@@ -3530,20 +3550,16 @@ input.leaf-rename:focus {
   flex: 0 0 auto;
 }
 
-.worktree {
-  border: 1px solid var(--border);
-  border-radius: var(--r-2);
-  padding: 0 var(--sp-3);
-  margin: 0;
+.advanced {
   display: flex;
   flex-direction: column;
-  background: color-mix(in oklab, var(--surface-2) 50%, transparent);
 }
 
-.worktree .wt-toggle {
-  margin: 0 calc(var(--sp-3) * -1);
-  padding-left: var(--sp-3);
-  width: calc(100% + var(--sp-3) * 2);
+.advanced .wt-toggle {
+  border-top: 1px solid var(--border);
+  border-radius: 0;
+  padding-top: var(--sp-2);
+  padding-bottom: var(--sp-2);
 }
 
 .wt-summary {
@@ -3555,13 +3571,27 @@ input.leaf-rename:focus {
   display: flex;
   flex-direction: column;
   gap: var(--sp-3);
-  padding-bottom: var(--sp-3);
+  padding: var(--sp-2) 0 var(--sp-1);
 }
 
 .wt-collapsible[hidden] {
   display: none;
 }
 
+/* Worktree sub-group: left accent border when expanded, visually nested. */
+.adv-group {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-3);
+  padding-left: var(--sp-3);
+  border-left: 2px solid var(--border);
+  margin-top: var(--sp-1);
+}
+
+.adv-group:has(input[name="worktree_enabled"]:checked) {
+  border-left-color: var(--accent);
+}
+
 .form-error {
   color: var(--danger);
   margin: 0;
@@ -3879,6 +3909,11 @@ input.leaf-rename:focus {
   gap: var(--sp-2);
   justify-content: flex-end;
   margin-top: var(--sp-2);
+  position: sticky;
+  bottom: 0;
+  padding: var(--sp-2) 0;
+  background: var(--surface);
+  z-index: 1;
 }
 
 .reroll {

web/src/types.ts

@@ -91,6 +91,7 @@ export interface SpawnPreset {
   id: string;
   label: string;
   command: string;
+  auto_approve?: boolean;
 }
 
 /** `GET /api/info` — the daemon's identity plus its spawn presets (#26).
@@ -277,6 +278,7 @@ export interface CreateSessionRequest {
   metadata?: Record<string, unknown>;
   worktree?: WorktreeSpec;
   view?: SessionView;
+  auto_approve?: boolean;
 }
 
 export type CatalogEvent =