@team-agent/installer 0.5.98 → 0.5.100

package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs

@@ -1382,13 +1382,12 @@ fn quick_start_default_adaptive_groups_workers_into_layout_panes() {
     let report = quick_start_with_transport(&team, None, true, None, &transport)
         .expect("quick_start_with_transport must reach Ready");
 
-    let (launch, attach_commands, display_backend) = match report {
+    let (launch, attach_commands) = match report {
         QuickStartReport::Ready {
             launch,
             attach_commands,
-            display_backend,
             ..
-        } => (*launch, attach_commands, display_backend),
+        } => (*launch, attach_commands),
         other => panic!("quick_start must reach Ready; got {other:?}"),
     };
     // 0.3.28 Step 4b: adaptive 3-pane tiling replaced with 1-window-per-agent
@@ -1424,7 +1423,6 @@ fn quick_start_default_adaptive_groups_workers_into_layout_panes() {
         attach_commands.iter().any(|cmd| cmd.contains(":w1")),
         "attach commands must include the per-agent windows: {attach_commands:?}"
     );
-    let _ = display_backend; // display_backend value preserved by upstream
 }
 
 #[test]
@@ -1602,50 +1600,6 @@ fn attach_window_names_for_state_agents_include_managed_leader_and_layout_window
     assert_eq!(windows, vec!["leader", "team-w1", "team-w2"]);
 }
 
-#[test]
-#[serial(env)]
-fn quick_start_no_display_keeps_one_window_per_agent() {
-    let _hermetic = enter_hermetic("launch-spawn-no-display");
-    let roles = ["w1", "w2"]
-        .into_iter()
-        .map(|id| (format!("{id}.md"), role_doc(id)))
-        .collect::<Vec<_>>();
-    let role_refs = roles
-        .iter()
-        .map(|(file, doc)| (file.as_str(), doc.as_str()))
-        .collect::<Vec<_>>();
-    let team = quick_start_team_dir_with_roles(&role_refs);
-    let workspace = team.parent().expect("team_workspace(team_dir) = parent");
-    seed_healthy_coordinator(workspace);
-    let transport = OfflineTransport::new();
-
-    let report = quick_start_with_transport_in_workspace_with_display(
-        workspace, &team, None, true, None, &transport, false,
-    )
-    .expect("quick_start_with_transport must reach Ready");
-
-    let display_backend = match report {
-        QuickStartReport::Ready {
-            display_backend, ..
-        } => display_backend,
-        other => panic!("quick_start must reach Ready; got {other:?}"),
-    };
-    assert_eq!(display_backend, "none");
-    assert_eq!(
-        transport
-            .spawn_records()
-            .iter()
-            .map(|(kind, _)| kind.as_str())
-            .collect::<Vec<_>>(),
-        vec!["spawn_first", "spawn_into"],
-        "--no-display must use the legacy one-worker-window spawn path"
-    );
-    let (_raw, state) = raw_runtime_state(workspace);
-    assert_eq!(state["display_backend"], json!("none"));
-    assert_eq!(state.pointer("/agents/w1/window"), Some(&json!("w1")));
-    assert_eq!(state.pointer("/agents/w1/layout_window"), None);
-}
-
 // REAL-MACHINE residency boundary (acceptance framework): the PUBLIC quick_start (real TmuxBackend +
 // real start_coordinator) on a fresh ws must leave a LIVE tmux session AND a ps-verifiable resident
 // coordinator daemon (start_coordinator -> live pid). The framework verifies residency via ps; here we
@@ -2778,6 +2732,7 @@ fn fork_refuses_source_with_partial_tuple() {
 }
 
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn add_agent_adaptive_splits_last_non_full_layout_window() {
     let roles = [("w1.md", role_doc("w1")), ("w2.md", role_doc("w2"))];
     let role_refs = roles
@@ -2790,7 +2745,7 @@ fn add_agent_adaptive_splits_last_non_full_layout_window() {
         &team,
         &json!({
             "session_name": session,
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "active_team_key": "teamdir",
             "agents": {
                 "w1": {"status": "running", "provider": "codex", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 0, "pane_id": "%1"},
@@ -2835,6 +2790,7 @@ fn add_agent_adaptive_splits_last_non_full_layout_window() {
 }
 
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn add_agent_adaptive_creates_suffix_window_when_last_layout_full_and_name_collides() {
     let roles = [
         ("w1.md", role_doc("w1")),
@@ -2851,7 +2807,7 @@ fn add_agent_adaptive_creates_suffix_window_when_last_layout_full_and_name_colli
         &team,
         &json!({
             "session_name": session,
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "active_team_key": "teamdir",
             "agents": {
                 "w1": {"status": "running", "provider": "codex", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 0, "pane_id": "%1"},
@@ -2918,7 +2874,7 @@ fn stop_agent_adaptive_kills_target_pane_not_shared_layout_window() {
         &team,
         &json!({
             "session_name": session,
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "agents": {
                 "w1": {"status": "running", "provider": "codex", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 0, "pane_id": "%1"},
                 "w2": {"status": "running", "provider": "codex", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 1, "pane_id": "%2"}
@@ -2954,13 +2910,14 @@ fn stop_agent_adaptive_kills_target_pane_not_shared_layout_window() {
 }
 
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn start_agent_adaptive_restarts_missing_pane_in_existing_layout_window() {
     let ws = temp_ws();
     crate::state::persist::save_runtime_state(
         &ws,
         &json!({
             "session_name": "team-layout-restart",
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "agents": {
                 "w1": {"status": "running", "provider": "codex", "role": "w1", "model": "gpt-5.5", "auth_mode": "subscription", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 0, "pane_id": "%1"},
                 "w2": {"status": "running", "provider": "codex", "role": "w2", "model": "gpt-5.5", "auth_mode": "subscription", "window": "team-w1", "layout_window": "team-w1", "layout_index": 0, "pane_index": 1, "pane_id": "%2"}
@@ -3050,9 +3007,9 @@ fn quick_start_seeds_tasks_key_from_compiled_spec() {
 }
 
 // Stage A — golden launch/core.py:62-71 seeded top-level runtime state in insertion order:
-// spec_path, workspace, team_dir, team_key, session_name, leader, agents, tasks, display_backend.
+// spec_path, workspace, team_dir, team_key, session_name, leader, agents, tasks.
 //
-// OLD (Python parity): the top-level shape ended at `display_backend`.
+// The runtime state is tmux-only; no display backend is persisted.
 // NEW (Bug 1/2 — team-in-team state scope, see tests/team_in_team_state_scope_red.rs):
 //   `active_team_key` and `teams` are appended at the tail so the runtime can carry the
 //   nested team-in-team scope alongside the original flat fields. Owner-binding fields
@@ -3065,11 +3022,10 @@ fn quick_start_seeds_tasks_key_from_compiled_spec() {
 //   R1: topology is explicit; fresh managed teams carry `is_external_leader=false`
 //   before the team-in-team suffix. Canonical `team_key` is seeded before owner
 //   binding; the remaining order stays the golden prefix + topology marker + new
-//   suffix (active_team_key, teams). display_backend stays the resolved backend from display/backend.py:12-29
-//   (default adaptive), not the raw optional spec field.
+//   suffix (active_team_key, teams).
 #[test]
 #[serial(env)]
-fn quick_start_state_seeds_spec_path_workspace_leader_display_backend() {
+fn quick_start_state_seeds_spec_path_workspace_leader() {
     let _hermetic = enter_hermetic("launch-spawn-state-seeds");
     // Bug 2 owner team-scope: top-level owner triple is dropped when the seeded
     // pane is empty; an ambient TMUX_PANE (tests run inside the dev's tmux session)
@@ -3106,7 +3062,6 @@ fn quick_start_state_seeds_spec_path_workspace_leader_display_backend() {
             "leader",
             "agents",
             "tasks",
-            "display_backend",
             "is_external_leader",
             // 0.5.x Phase 1d hot-path 接线 (裁决1 msg_76e1d98202b8):
             // `transport = { kind, source }` inserted here by
@@ -3155,11 +3110,6 @@ fn quick_start_state_seeds_spec_path_workspace_leader_display_backend() {
         "existing tasks value must remain seeded from compiled spec; got {:?}",
         state["tasks"]
     );
-    assert_eq!(
-        state["display_backend"],
-        json!("adaptive"),
-        "adaptive layout directive: resolve_display_backend(None, source='launch') defaults to adaptive"
-    );
     assert_eq!(state["is_external_leader"], json!(false));
 }
 
@@ -3602,7 +3552,7 @@ fn add_agent_reachability_gate_passes_when_spawn_pane_addressable() {
 // ═════════════════════════════════════════════════════════════════════════════
 // E43 add-agent window layout drift (0.3.24 bug#3, demo-director startup blocker).
 //
-// Root cause (architect res_f27ff9b29957): with `display_backend=adaptive` in
+// Root cause (architect res_f27ff9b29957): with `legacy_display_key=adaptive` in
 // state AND stale `agents.<id>.layout_window="team-w2"` residue, the existing
 // `adaptive_placement_for_agent` validates a layout_window claim by checking
 // whether the existing agent's `pane_id` is in `live_panes` — but it does NOT
@@ -3641,7 +3591,7 @@ fn e43_adaptive_placement_skips_existing_agent_whose_live_pane_window_name_diffe
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "architect": {
@@ -3698,13 +3648,14 @@ fn e43_adaptive_placement_skips_existing_agent_whose_live_pane_window_name_diffe
 /// behaviour (groups the new agent into that window). This is the canonical
 /// adaptive 1-window-multiple-panes use case.
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn e43_adaptive_placement_groups_into_layout_window_when_live_pane_matches_claim() {
     use crate::lifecycle::launch::adaptive_placement_for_agent;
     use crate::model::ids::AgentId;
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "alpha": {
@@ -3750,13 +3701,14 @@ fn e43_adaptive_placement_groups_into_layout_window_when_live_pane_matches_claim
 /// agent_id itself — so the subsequent spawn opens a new window, not a split
 /// of a phantom.
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn e43_adaptive_existing_placement_falls_back_to_agent_id_window_when_claim_missing_from_live() {
     use crate::lifecycle::launch::adaptive_existing_placement_for_agent;
     use crate::model::ids::AgentId;
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "demo-director": {
@@ -3814,13 +3766,14 @@ fn e43_adaptive_existing_placement_falls_back_to_agent_id_window_when_claim_miss
 /// (return a starts_window=false placement that splits into the existing
 /// window).
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn e43_adaptive_existing_placement_keeps_starts_window_false_when_claim_in_live_windows() {
     use crate::lifecycle::launch::adaptive_existing_placement_for_agent;
     use crate::model::ids::AgentId;
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "alpha": {
@@ -3861,7 +3814,7 @@ fn e43_adaptive_existing_placement_keeps_starts_window_false_when_claim_in_live_
 
 /// **RED — Fix C end-to-end**: `add_agent` end-to-end must NOT emit a
 /// spawn_split with the stale window name. With state carrying
-/// `display_backend=adaptive` + stale `layout_window=team-w2` residue and
+/// `legacy_display_key=adaptive` + stale `layout_window=team-w2` residue and
 /// live tmux windows named per-agent, the spawn must be a `spawn_into`
 /// (new window) — NOT `spawn_split` against the missing 'team-w2'.
 #[test]
@@ -3885,7 +3838,7 @@ fn e43_add_agent_does_not_split_against_phantom_layout_window() {
         &team,
         &json!({
             "session_name": "team-iso",
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "agents": {
                 "architect": {
                     "status": "running",
@@ -3939,7 +3892,7 @@ fn e43_add_agent_does_not_split_against_phantom_layout_window() {
 // E45 per-agent window drift (0.3.24 task#326 P0).
 //
 // Surfaced AFTER E43 (c5ed576) fixed the team-w2 phantom split. New repro:
-// state has display_backend=adaptive + an existing `developer` worker whose
+// state has legacy_display_key=adaptive + an existing `developer` worker whose
 // state row carries `layout_window=developer, layout_index=0, pane_id=%519`,
 // live tmux shows `developer` window with that pane. add-agent demo-director
 // resolves placement via `adaptive_placement_for_agent`, which finds the
@@ -3971,7 +3924,7 @@ fn e45_adaptive_placement_returns_none_when_no_real_team_w_window_present_in_sta
     // literally `developer` (per-agent name, NOT team-wN), pane_id %519
     // lives under the `developer` window.
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "developer": {
@@ -4014,7 +3967,7 @@ fn e45_adaptive_placement_returns_none_when_no_real_team_w_window_present_in_sta
         "E45 (0.3.24 bug#4): placement must return None when the live \
          session has NO real `team-w<N>` adaptive window. Per-agent windows \
          like `developer` are NOT adaptive layout windows — they are \
-         per-agent topology, even if display_backend=adaptive lingers in \
+         per-agent topology, even if legacy_display_key=adaptive lingers in \
          state. With no real adaptive layout, the caller falls back to \
          opening a new per-agent window named after agent_id. Got \
          {placement:?} — must be None to prevent split-window -t :developer \
@@ -4033,7 +3986,7 @@ fn e45_adaptive_existing_placement_returns_none_when_claim_is_per_agent_window()
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "developer": {
@@ -4087,14 +4040,14 @@ fn e45_add_agent_opens_new_window_does_not_split_into_per_agent_window() {
     let role_file = team.join("worker2-role.md");
     std::fs::write(&role_file, DELEG_ROLE_WORKER2).unwrap();
 
-    // Real-machine state: display_backend=adaptive, but the existing
+    // Real-machine state: legacy_display_key=adaptive, but the existing
     // `developer` worker carries per-agent layout_window=developer with
     // layout_index=0. macmini-equivalent state shape.
     crate::state::persist::save_runtime_state(
         &team,
         &json!({
             "session_name": "team-iso",
-            "display_backend": "adaptive",
+            "legacy_display_key": "adaptive",
             "agents": {
                 "developer": {
                     "status": "running",
@@ -4159,13 +4112,14 @@ fn e45_add_agent_opens_new_window_does_not_split_into_per_agent_window() {
 /// existing E43+adaptive grouping behaviour is preserved (split into team-w1
 /// as before). E45 only changes behaviour for per-agent windows.
 #[test]
+#[ignore = "legacy adaptive display layout contract removed; runtime is silent tmux only"]
 fn e45_real_team_w_adaptive_layout_still_groups_into_layout_window() {
     use crate::lifecycle::launch::adaptive_placement_for_agent;
     use crate::model::ids::AgentId;
     use crate::transport::{SessionName, WindowName};
 
     let state = json!({
-        "display_backend": "adaptive",
+        "legacy_display_key": "adaptive",
         "session_name": "team-iso",
         "agents": {
             "alpha": {

package/crates/team-agent/src/lifecycle/tests/main_preserved.rs

@@ -350,10 +350,10 @@ fn reset_agent_discard_session_syncs_projection_epoch_inputs_for_restart_agent_c
     };
     let outcome =
         reset_agent_with_transport(&ws, &AgentId::new("alpha"), true, false, None, &transport)
-            .expect("reset-agent alpha --discard-session --no-display");
+            .expect("reset-agent alpha --discard-session");
     assert!(
         matches!(outcome, ResetAgentOutcome::Reset { .. }),
-        "restart-agent alpha --discard-session --no-display must complete reset; got {outcome:?}"
+        "restart-agent alpha --discard-session must complete reset; got {outcome:?}"
     );
 
     let state = crate::state::persist::load_runtime_state(&ws).expect("reload state");

package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs

@@ -47,14 +47,13 @@ fn concurrent_reset_discard_session_serializes() {
     seed_healthy_coordinator(&workspace);
 
     let launch_transport = codex_ready_transport();
-    let quick_start = quick_start_with_transport_in_workspace_with_display(
+    let quick_start = quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         None,
         true,
         None,
         &launch_transport,
-        false,
     )
     .expect("quick-start fixture");
     assert!(
@@ -484,14 +483,13 @@ fn breal_workspace() -> (PathBuf, PathBuf) {
     let workspace = team.parent().expect("team workspace").to_path_buf();
     seed_healthy_coordinator(&workspace);
     let launch_transport = codex_ready_transport();
-    quick_start_with_transport_in_workspace_with_display(
+    quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         None,
         true,
         None,
         &launch_transport,
-        false,
     )
     .expect("quick-start breal fixture");
     (workspace, team)
@@ -503,14 +501,13 @@ fn breal_one_worker_workspace() -> (PathBuf, PathBuf) {
     let workspace = team.parent().expect("team workspace").to_path_buf();
     seed_healthy_coordinator(&workspace);
     let launch_transport = codex_ready_transport();
-    quick_start_with_transport_in_workspace_with_display(
+    quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         None,
         true,
         None,
         &launch_transport,
-        false,
     )
     .expect("quick-start breal one-worker fixture");
     (workspace, team)
@@ -550,14 +547,13 @@ fn add_fixture() -> (PathBuf, PathBuf, PathBuf, OfflineTransport) {
     let workspace = team.parent().expect("team workspace").to_path_buf();
     seed_healthy_coordinator(&workspace);
     let launch_transport = codex_ready_transport();
-    quick_start_with_transport_in_workspace_with_display(
+    quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         Some("teamdir"),
         true,
         None,
         &launch_transport,
-        false,
     )
     .expect("quick-start add fixture");
     let role = workspace.join("w2-role.md");

package/crates/team-agent/src/lifecycle/tests/phase_golden.rs

@@ -1,7 +1,7 @@
 use super::launch_spawn::seed_healthy_coordinator;
 use super::*;
 use crate::cli::{
-    cmd_diagnose, cmd_send, cmd_status, lifecycle_port, CmdOutput, CmdResult, DiagnoseArgs,
+    cmd_doctor, cmd_send, cmd_status, lifecycle_port, CmdOutput, CmdResult, DoctorArgs,
     SendArgs, StatusArgs,
 };
 use crate::transport::test_support::OfflineTransport;
@@ -97,6 +97,7 @@ fn hermetic_caller_envs() -> &'static [&'static str] {
 }
 
 #[test]
+#[ignore = "legacy display-backed phase golden fixture superseded by silent tmux runtime"]
 #[serial_test::serial(env)]
 fn phase_b_golden_events_state_status_zero_drift() {
     let baseline = phase_fixture_path("phase_b").join("golden.json");
@@ -113,6 +114,7 @@ fn phase_b_golden_events_state_status_zero_drift() {
 }
 
 #[test]
+#[ignore = "legacy display-backed phase golden fixture superseded by silent tmux runtime"]
 #[serial_test::serial(env)]
 fn phase_c_golden_events_state_status_zero_drift() {
     let baseline = phase_fixture_path("phase_c").join("golden.json");
@@ -129,6 +131,7 @@ fn phase_c_golden_events_state_status_zero_drift() {
 }
 
 #[test]
+#[ignore = "legacy display-backed phase golden fixture superseded by silent tmux runtime"]
 #[serial_test::serial(env)]
 fn phase_d_golden_events_state_status_zero_drift() {
     let baseline = phase_fixture_path("phase_d").join("golden.json");
@@ -145,6 +148,7 @@ fn phase_d_golden_events_state_status_zero_drift() {
 }
 
 #[test]
+#[ignore = "legacy display-backed phase golden fixture superseded by silent tmux runtime"]
 #[serial_test::serial(env)]
 fn phase_e_golden_events_state_status_zero_drift() {
     let baseline = phase_fixture_path("phase_e").join("golden.json");
@@ -161,6 +165,7 @@ fn phase_e_golden_events_state_status_zero_drift() {
 }
 
 #[test]
+#[ignore = "legacy display-backed phase golden fixture superseded by silent tmux runtime"]
 #[serial_test::serial(env)]
 fn phase_f_golden_events_state_status_zero_drift() {
     let baseline = phase_fixture_path("phase_f").join("golden.json");
@@ -244,14 +249,13 @@ fn run_phase_golden(spec: PhaseGolden) -> Value {
         leader_env: BTreeMap::new(),
     }])
     .with_pane_current_command("%caller", "codex");
-    let quick_start = quick_start_with_transport_in_workspace_with_display(
+    let quick_start = quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         None,
         true,
         None,
         &launch_transport,
-        false,
     );
     let status_compact = cmd_status(&StatusArgs {
         agent: None,
@@ -446,7 +450,6 @@ fn quick_start_value(result: Result<QuickStartReport, LifecycleError>) -> Value
         Ok(QuickStartReport::Ready {
             session_name,
             launch,
-            display_backend,
             worker_readiness,
             ..
         }) => {
@@ -460,7 +463,6 @@ fn quick_start_value(result: Result<QuickStartReport, LifecycleError>) -> Value
                         "start_mode": format!("{:?}", started.start_mode),
                         "session_id": started.session_id.as_ref().map(|id| id.as_str().to_string()),
                         "rollout_path": started.rollout_path.as_ref().map(|path| path.as_path().to_string_lossy().to_string()),
-                        "layout_window": started.layout_window.as_ref().map(|window| window.as_str().to_string()),
                     })
                 })
                 .collect::<Vec<_>>();
@@ -468,7 +470,6 @@ fn quick_start_value(result: Result<QuickStartReport, LifecycleError>) -> Value
                 "ok": true,
                 "status": "ready",
                 "session_name": session_name.as_str(),
-                "display_backend": display_backend,
                 "worker_readiness": format!("{worker_readiness:?}"),
                 "started": agents,
             })
@@ -542,14 +543,13 @@ fn run_diagnose_after_quick_start() -> Value {
     let workspace = team.parent().expect("workspace").to_path_buf();
     seed_healthy_coordinator(&workspace);
     let launch_transport = codex_ready_transport();
-    quick_start_with_transport_in_workspace_with_display(
+    quick_start_with_transport_in_workspace(
         &workspace,
         &team,
         None,
         true,
         None,
         &launch_transport,
-        false,
     )
     .expect("tombstone fixture must quick-start");
     let mut state = crate::state::persist::load_runtime_state(&workspace)
@@ -582,10 +582,17 @@ fn run_diagnose_after_quick_start() -> Value {
             .is_some(),
         "index-missing diagnose requires a persisted seeded owner"
     );
-    let diagnose = cmd_diagnose(&DiagnoseArgs {
+    let diagnose = cmd_doctor(&DoctorArgs {
         workspace,
         json: true,
         team: Some("teamdir".to_string()),
+        spec: None,
+        gate: None,
+        comms: false,
+        fix: false,
+        fix_schema: false,
+        cleanup_orphans: false,
+        confirm: false,
     });
     match cmd_value(diagnose) {
         Value::Object(map) => map

package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs

@@ -720,7 +720,7 @@ fn pi_materializer_and_worker_routes_body(hermetic: &HermeticTestEnv) {
     std::fs::create_dir_all(spec_path.parent().expect("worker Pi spec parent"))
         .expect("create worker Pi spec parent");
     let spec = crate::model::yaml::loads(
-        "team:\n  name: team-a\nruntime:\n  session_name: team-workers\n  display_backend: tmux_attach\nagents:\n  - id: worker-a\n    role: Worker A\n    provider: pi\n    model: team-agent/qwen3.8-27b\n    auth_mode: subscription\n    dangerously_skip_permissions: false\n    tools:\n      - mcp_team\n  - id: worker-b\n    role: Worker B\n    provider: pi\n    model: team-agent/qwen3.8-27b\n    auth_mode: subscription\n    dangerously_skip_permissions: false\n    tools:\n      - mcp_team\n",
+        "team:\n  name: team-a\nruntime:\n  session_name: team-workers\nagents:\n  - id: worker-a\n    role: Worker A\n    provider: pi\n    model: team-agent/qwen3.8-27b\n    auth_mode: subscription\n    dangerously_skip_permissions: false\n    tools:\n      - mcp_team\n  - id: worker-b\n    role: Worker B\n    provider: pi\n    model: team-agent/qwen3.8-27b\n    auth_mode: subscription\n    dangerously_skip_permissions: false\n    tools:\n      - mcp_team\n",
     )
     .expect("parse worker Pi spec");
     std::fs::write(&spec_path, crate::model::yaml::dumps(&spec)).expect("write worker Pi spec");

package/crates/team-agent/src/lifecycle/tests/realmachine_clusters_1_6_red.rs

@@ -272,66 +272,6 @@ fn c1_runtime_commands_resolve_active_team_for_status_send_and_collect() {
     );
 }
 
-#[test]
-#[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
-fn c2_stop_team_level_command_exists_and_keeps_state_while_stopping_runtime() {
-    let ws = tmp_dir("c2-stop");
-    seed_runtime_state(&ws);
-
-    let out = run(
-        &["stop", "--workspace", ws.to_str().unwrap(), "--json"],
-        &ws,
-    );
-    let err = String::from_utf8_lossy(&out.stderr);
-    assert!(
-        !err.contains("invalid choice: 'stop'"),
-        "CR-005: canonical `team-agent stop --workspace <ws> --json` must be a registered team-level stop verb, not argparse invalid-choice; stderr={err:?}"
-    );
-    assert_eq!(
-        out.status.code(),
-        Some(0),
-        "CR-005: stop should stop the runtime while keeping state on a valid workspace; stdout={} stderr={}",
-        String::from_utf8_lossy(&out.stdout),
-        err
-    );
-    let value = stdout_json(&out);
-    assert_eq!(
-        value["ok"],
-        json!(true),
-        "stop must return a successful JSON envelope"
-    );
-    assert!(
-        team_agent::state::persist::runtime_state_path(&ws).exists(),
-        "stop keeps runtime state for later restart"
-    );
-}
-
-#[test]
-#[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
-fn c2_canonical_verbs_expose_help_instead_of_invalid_choice() {
-    let cwd = tmp_dir("c2-help-verbs");
-    let mut failures = Vec::new();
-    for verb in ["start", "restart-agent", "purge-agent"] {
-        let out = run(&[verb, "--help"], &cwd);
-        let stdout = String::from_utf8_lossy(&out.stdout);
-        let stderr = String::from_utf8_lossy(&out.stderr);
-        if out.status.code() != Some(0)
-            || stderr.contains("invalid choice:")
-            || !(stdout.contains("usage") || stderr.contains("usage"))
-        {
-            failures.push(format!(
-                "{verb}: code={:?} stdout={stdout:?} stderr={stderr:?}",
-                out.status.code()
-            ));
-        }
-    }
-    assert!(
-        failures.is_empty(),
-        "CR-030/032/035/063: canonical lifecycle verbs must be registered and expose help, not invalid-choice:\n{}",
-        failures.join("\n")
-    );
-}
-
 #[test]
 #[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
 fn c2_quick_start_help_is_zero_token_help_only_and_does_not_compile_workspace() {

package/crates/team-agent/src/lifecycle/tests/startup_latency_contract.rs

@@ -44,8 +44,8 @@ use serial_test::serial;
 use team_agent::coordinator::{MetadataSource, Pid, WorkspacePath};
 use team_agent::event_log::EventLog;
 use team_agent::lifecycle::{
-    quick_start_with_transport_in_workspace_with_display,
-    restart_with_transport_with_readiness_deadline, QuickStartReport, RestartReport,
+    quick_start_with_transport_in_workspace, restart_with_transport_with_readiness_deadline,
+    QuickStartReport, RestartReport,
 };
 use team_agent::message_store::MessageStore;
 use team_agent::model::paths::{runtime_dir, runtime_spec_path};
@@ -364,14 +364,13 @@ fn restart_and_launch_emit_structured_latency_events_without_fake_ready() {
 
     let launch_case = LaunchLatencyCase::new("events-launch", 2);
     let launch_transport = StartupLatencyTransport::new();
-    let quick_start = quick_start_with_transport_in_workspace_with_display(
+    let quick_start = quick_start_with_transport_in_workspace(
         &launch_case.workspace,
         &launch_case.team_dir,
         None,
         true,
         Some(TEAM),
         &launch_transport,
-        false,
     )
     .expect("event setup: quick-start should complete");
     assert!(

package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs

@@ -80,7 +80,7 @@ fn quick_start_workspace_override_is_not_dropped_before_runtime_state_write() {
     let quick_start_args = source_section(
         &cli_types,
         "pub struct QuickStartArgs",
-        "pub struct InitArgs",
+        "pub struct SendArgs",
     );
     assert!(
         quick_start_args.contains("pub workspace: PathBuf"),
@@ -97,7 +97,7 @@ fn quick_start_workspace_override_is_not_dropped_before_runtime_state_write() {
 
     let emit =
         std::fs::read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/src/cli/emit.rs")).unwrap();
-    let quick_start_args_fn = source_section(&emit, "fn quick_start_args", "fn init_args");
+    let quick_start_args_fn = source_section(&emit, "fn quick_start_args", "fn resolve_cli_path");
     assert!(
         quick_start_args_fn.contains("workspace: workspace.clone()")
             || quick_start_args_fn.contains("workspace,"),