@team-agent/installer 0.5.98 → 0.5.100

package/crates/team-agent/src/lifecycle/restart/rebuild.rs

@@ -14,7 +14,6 @@
 //!       what: 按 team 参数或唯一性选出重启目标
 //!   depends:
 //!     - crate::lifecycle::lock
-//!     - crate::lifecycle::display
 //!     - crate::lifecycle::restart::selection
 //!     - crate::lifecycle::restart::preflight
 //!     - crate::lifecycle::restart::remove
@@ -337,7 +336,7 @@ fn restart_with_selected_team_and_transport(
                 .first()
                 .cloned()
                 .unwrap_or_else(|| "dirty_topology".to_string()),
-            error: "restart refused: tmux endpoint/socket topology is inconsistent; run diagnose from the intended leader socket before restarting".to_string(),
+            error: "restart refused: tmux endpoint/socket topology is inconsistent; run doctor from the intended leader socket before restarting".to_string(),
             issue_ids: topology_issue_ids,
         });
     }
@@ -1367,14 +1366,6 @@ fn restart_with_selected_team_and_transport(
             Some(selected.team_key.as_str()),
             &state,
         );
-    if let Ok(probe) = crate::lifecycle::display::probe_display_capabilities(&selected.run_workspace)
-    {
-        let _ = crate::lifecycle::display::rebuild_adaptive_display_after_rebind(
-            &selected.run_workspace,
-            &session_name,
-            &probe,
-        );
-    }
     // 0.3.28 Step 1: topology invariant guard (warn-only). Same pattern as
     // `lifecycle::launch::launch_with_transport_in_workspace` — logs to stderr,
     // never panics. Hard error path is deferred to Step 10.
@@ -1813,7 +1804,7 @@ fn restart_readiness_timeout_message(
          - tmux session created: {session}\n\
          - worker pane addressable: {pane}\n\
          - coordinator alive: {coordinator}\n\
-         Action: check coordinator log {log}, then inspect this workspace with `team-agent diagnose --workspace '{workspace}'`\n\
+         Action: check coordinator log {log}, then inspect this workspace with `team-agent doctor --workspace '{workspace}'`\n\
          Log: coordinator_log={log} state={state} pid_file={pid}",
         missing = restart_readiness_missing_summary(readiness),
         session = yes_no(readiness.session_created),
@@ -2712,7 +2703,7 @@ fn restart_failure_phase(
     // 0.5.39 Slice 1 (tmux-server-death-locate §11.1 B): promote
     // spawn/readiness errors whose stderr contains "server exited
     // unexpectedly" to `tmux_server_crashed`, so downstream event
-    // classification and diagnose next_actions ("team-agent diagnose")
+    // classification and doctor next_actions ("team-agent doctor")
     // don't misattribute a whole-server death to a per-agent provider
     // failure. Restart itself does not recover from server crashes in
     // 0.5.39 (§11.1 C is Slice 3, later car); it just classifies clearly.
@@ -2785,7 +2776,7 @@ fn write_restart_agent_failed_event(
                 "phase": phase,
                 "error": error,
                 "action": format!(
-                    "inspect worker {} output, then restart that worker with `team-agent restart-agent {}` or rerun `team-agent restart --allow-fresh`",
+                    "inspect worker {} output, then reset that worker with `team-agent reset-agent {} --discard-session` or rerun `team-agent restart --allow-fresh`",
                     decision.agent_id,
                     decision.agent_id
                 ),
@@ -3271,7 +3262,7 @@ fn restart_failure_next_actions(failed_agents: &[RestartFailedAgent]) -> Vec<Str
         .iter()
         .map(|failure| {
             format!(
-                "inspect worker {} output, then restart that worker with `team-agent restart-agent {}` or rerun `team-agent restart --allow-fresh`",
+                "inspect worker {} output, then reset that worker with `team-agent reset-agent {} --discard-session` or rerun `team-agent restart --allow-fresh`",
                 failure.agent_id, failure.agent_id
             )
         })
@@ -4920,7 +4911,7 @@ tasks:
             },
             std::time::Duration::from_secs(30),
         );
-        assert!(message.contains("team-agent diagnose --workspace"));
+        assert!(message.contains("team-agent doctor --workspace"));
         assert!(message.contains(workspace.to_string_lossy().as_ref()));
         assert!(!message.contains("--allow-fresh"));
         assert!(!message.contains("restart <agent>"));

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

@@ -122,7 +122,7 @@ fn stale_snapshot_cannot_flip_status_or_diagnose_ok_readiness() {
         "--json",
     ]);
     let diagnose_before = case.run_json(&[
-        "diagnose",
+        "doctor",
         "--workspace",
         case.workspace_str(),
         "--team",
@@ -142,7 +142,7 @@ fn stale_snapshot_cannot_flip_status_or_diagnose_ok_readiness() {
         "--json",
     ]);
     let diagnose_after = case.run_json(&[
-        "diagnose",
+        "doctor",
         "--workspace",
         case.workspace_str(),
         "--team",

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

@@ -182,7 +182,7 @@ fn diagnose_missing_profile_is_rc1_ok_false_and_zero_token() {
     .unwrap();
 
     let output = Command::new(crate::lifecycle::tests::test_binary_path())
-        .args(["diagnose", team.to_str().unwrap(), "--workspace", ws.to_str().unwrap(), "--json"])
+        .args(["doctor", team.to_str().unwrap(), "--workspace", ws.to_str().unwrap(), "--json"])
         .current_dir(&team)
         .output()
         .expect("diagnose subprocess should run");

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

@@ -184,7 +184,7 @@ fn write_team_docs(workspace: &Path) {
     std::fs::write(
         workspace.join("TEAM.md"),
         format!(
-            "---\nname: {TEAM_NAME}\nobjective: clone-agent tools preservation\nprovider: fake\ndisplay_backend: none\n---\n"
+            "---\nname: {TEAM_NAME}\nobjective: clone-agent tools preservation\nprovider: fake\n---\n"
         ),
     )
     .expect("TEAM.md");
@@ -324,7 +324,6 @@ fn clone_ok(case: &Case, source: &str, dest: &str, phase: &str) {
         case.ws(),
         "--team",
         TEAM_NAME,
-        "--no-display",
         "--json",
     ]);
     let stderr = String::from_utf8_lossy(&out.stderr);

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

@@ -293,7 +293,6 @@ impl Case {
             self.ws(),
             "--team",
             TEAM_NAME,
-            "--no-display",
             "--json",
         ]);
         let stderr = String::from_utf8_lossy(&out.stderr).to_string();

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

@@ -211,159 +211,6 @@ fn plan_condition_rejects_out_of_grammar() {
     }
 }
 
-// ───────────────────────────────────────────────────────────────────────
-// resolve_display_backend — display/backend.py
-// 默认 adaptive;显式 none 是逃生口。
-// ───────────────────────────────────────────────────────────────────────
-
-#[test]
-fn resolve_backend_defaults_to_adaptive_when_none_requested() {
-    let r = resolve_display_backend(None, None);
-    assert_eq!(r.backend, DisplayBackend::Adaptive);
-    assert!(!r.non_default, "默认 adaptive 不应标记 non_default");
-}
-
-#[test]
-fn resolve_backend_explicit_none_is_escape_hatch() {
-    let r = resolve_display_backend(Some(DisplayBackend::None), None);
-    assert_eq!(r.backend, DisplayBackend::None);
-    assert!(r.non_default, "显式 none 是偏离默认 adaptive 的逃生口");
-}
-
-#[test]
-fn resolve_backend_requested_overrides_and_marks_non_default() {
-    // 显式 requested 非 adaptive → 采用且 non_default=true(非静默发事件)。
-    let r = resolve_display_backend(Some(DisplayBackend::GhosttyWindow), None);
-    assert_eq!(r.backend, DisplayBackend::GhosttyWindow);
-    assert!(r.non_default);
-}
-
-#[test]
-fn resolve_backend_recorded_used_when_no_request() {
-    // 无 requested 但 state 有 recorded → 复用 recorded(restart 一致性)。
-    let r = resolve_display_backend(None, Some(DisplayBackend::GhosttyWorkspace));
-    assert_eq!(r.backend, DisplayBackend::GhosttyWorkspace);
-    assert!(r.non_default);
-}
-
-// ───────────────────────────────────────────────────────────────────────
-// probe_display_capabilities — display/adaptive.py:31 (C13)
-// 分支只看 probe 结果,NOT cfg!(target_os)。golden 实跑:
-//   linux no-tmux : in_tmux=false, adaptive_status=leader_not_in_tmux, reason=leader_not_in_tmux
-//   linux in-tmux : in_tmux=true,  adaptive_status=available(opened),  reason=None, caps both true
-//   windows/wsl   : in_tmux=false, adaptive_status=not_implemented_this_platform, caps both false
-// blocked 是 typed outcome(DisplayStatus::Blocked + reason),NOT error。
-// 注:RUST 入口签名为 probe_display_capabilities(workspace) —— 它内部读环境/平台;
-// 本测试在干净 CI workspace 上跑,只断言"不是 Err(平台降级是 typed outcome)"
-// 以及 reason 必属封闭集(若有)。
-// ───────────────────────────────────────────────────────────────────────
-
-#[test]
-fn probe_never_errors_platform_degradation_is_typed_outcome() {
-    // C13:能力性降级绝不走 LifecycleError —— 它是 DisplayStatus::Blocked + reason。
-    let ws = temp_ws();
-    let probe =
-        probe_display_capabilities(&ws).expect("probe 平台降级必须是 typed outcome,不是 Err");
-    // 若 blocked,reason 必属 AdaptiveBlockReason 封闭集且与 status 一致。
-    match probe.adaptive_status {
-        DisplayStatus::Blocked => {
-            assert!(probe.reason.is_some(), "blocked 必带 reason(C16 封闭集)")
-        }
-        DisplayStatus::Opened => assert!(probe.reason.is_none(), "opened 不应带 block reason"),
-        DisplayStatus::Stopped => {}
-    }
-}
-
-#[test]
-fn probe_caps_consistent_with_in_tmux() {
-    // caps.adaptive_display == (in_tmux && 平台支持);不在 tmux → caps 全 false。
-    let ws = temp_ws();
-    let probe = probe_display_capabilities(&ws).expect("probe 不应 Err");
-    if !probe.in_tmux {
-        assert!(!probe.caps.adaptive_display);
-        assert!(!probe.caps.tmux_append_windows);
-    }
-}
-
-// ───────────────────────────────────────────────────────────────────────
-// AdaptiveBlockReason 封闭集 — ADAPTIVE_BLOCK_REASONS (adaptive.py:21)
-// golden 实跑(6 个,无更多无更少):
-//   aggregator_rebuild_failed, leader_not_in_tmux, not_implemented_this_platform,
-//   split_failed, window_create_failed, worker_session_missing
-// serde rename = snake_case,JSON 名与 Python 字符串一致。
-// ───────────────────────────────────────────────────────────────────────
-
-/// 封闭集 ALL — 一处穷举所有 AdaptiveBlockReason 变体(新增第 7 个变体会编译错此 match,
-/// 把 cardinality 锁成编译期事实)。golden ADAPTIVE_BLOCK_REASONS 恰 6 个(adaptive.py:21)。
-const ALL_BLOCK_REASONS: [AdaptiveBlockReason; 6] = [
-    AdaptiveBlockReason::LeaderNotInTmux,
-    AdaptiveBlockReason::SplitFailed,
-    AdaptiveBlockReason::WindowCreateFailed,
-    AdaptiveBlockReason::WorkerSessionMissing,
-    AdaptiveBlockReason::NotImplementedThisPlatform,
-    AdaptiveBlockReason::AggregatorRebuildFailed,
-];
-
-#[test]
-fn adaptive_block_reason_serde_names_match_python_and_set_is_exactly_six() {
-    // (a) 每个变体 wire-name 与 Python 字符串一致。
-    let expected = [
-        "\"leader_not_in_tmux\"",
-        "\"split_failed\"",
-        "\"window_create_failed\"",
-        "\"worker_session_missing\"",
-        "\"not_implemented_this_platform\"",
-        "\"aggregator_rebuild_failed\"",
-    ];
-    for (variant, want) in ALL_BLOCK_REASONS.iter().zip(expected.iter()) {
-        assert_eq!(&serde_json::to_string(variant).unwrap(), want);
-    }
-    // (b) 封闭集 CARDINALITY == 6(无多无少;rogue 第 7 变体使 ALL_BLOCK_REASONS match 编译失败)。
-    let mut names: Vec<String> = ALL_BLOCK_REASONS
-        .iter()
-        .map(|r| serde_json::to_string(r).unwrap())
-        .collect();
-    names.sort();
-    names.dedup();
-    assert_eq!(
-        names.len(),
-        6,
-        "ADAPTIVE_BLOCK_REASONS 恰 6 个,无重复无遗漏"
-    );
-}
-
-#[test]
-fn adaptive_blocked_out_of_set_reason_bottoms_to_aggregator_rebuild_failed() {
-    // adaptive.py 兜底:越界 / aggregator 重建失败 → AggregatorRebuildFailed(documented overflow)。
-    // RED:经真实路径 —— probe 在 blocked 平台 open_worker_displays,worker display 必属封闭集;
-    // 这里用 probe.reason 越界场景驱动 open_worker_displays 而非静态枚举,捕获 reason 发射回归。
-    let ws = temp_ws();
-    let probe = DisplayProbe {
-        in_tmux: true,
-        platform: "linux".to_string(),
-        leader_session: Some(sess("leader")),
-        leader_pane: None,
-        caps: CapsFlags {
-            tmux_append_windows: true,
-            adaptive_display: true,
-        },
-        // 模拟 aggregator 重建失败封闭:open 必把 worker display 兜底成 AggregatorRebuildFailed。
-        adaptive_status: DisplayStatus::Blocked,
-        reason: Some(AdaptiveBlockReason::AggregatorRebuildFailed),
-    };
-    let rep = open_worker_displays(&ws, &sess("team-a"), DisplayBackend::Adaptive, &probe)
-        .expect("C14:显示失败不阻塞 readiness");
-    for (id, d) in rep.displays.iter() {
-        match d {
-            WorkerDisplay::Blocked { reason } => assert!(
-                ALL_BLOCK_REASONS.contains(reason),
-                "worker {id} 的 block reason 必属封闭集:{reason:?}"
-            ),
-            other => panic!("blocked probe 下 worker {id} 应 Blocked:{other:?}"),
-        }
-    }
-}
-
 #[test]
 fn start_mode_serde_names_match_python_start_mode_strings() {
     // 低价值 wire-format 守卫:start_mode ∈ {"resumed","fresh","fresh_after_missing_rollout","noop"}。
@@ -1300,66 +1147,6 @@ impl Drop for EnvVarGuard {
     }
 }
 
-// ───────────────────────────────────────────────────────────────────────
-// open_worker_displays — worker_window.py (C14)
-// 显示失败不阻塞 readiness:probe 为 blocked 平台时,returns typed Blocked displays,
-// 绝不 Err。这里用 backend=None(无 worker views)验证至少不 panic 成 Err。
-// ───────────────────────────────────────────────────────────────────────
-
-#[test]
-fn open_worker_displays_blocked_probe_yields_typed_blocked_not_error() {
-    let ws = temp_ws();
-    let probe = DisplayProbe {
-        in_tmux: false,
-        platform: "windows".to_string(),
-        leader_session: None,
-        leader_pane: None,
-        caps: CapsFlags {
-            tmux_append_windows: false,
-            adaptive_display: false,
-        },
-        adaptive_status: DisplayStatus::Blocked,
-        reason: Some(AdaptiveBlockReason::NotImplementedThisPlatform),
-    };
-    let rep = open_worker_displays(&ws, &sess("team-a"), DisplayBackend::Adaptive, &probe)
-        .expect("C14:显示失败不阻塞 readiness —— 不得 Err");
-    // 每个 worker 的 display 在 blocked 平台上应是 Blocked 变体(若有 worker)。
-    for (id, d) in rep.displays.iter() {
-        assert!(
-            matches!(
-                d,
-                WorkerDisplay::Blocked {
-                    reason: AdaptiveBlockReason::NotImplementedThisPlatform
-                }
-            ),
-            "worker {id} 在 windows 平台应 Blocked(not_implemented):{d:?}"
-        );
-    }
-}
-
-// ───────────────────────────────────────────────────────────────────────
-// close_team_display_backends — display/close.py (C9 close-by-recorded-backend)
-// 空 workspace 无 recorded backend 无 session → 空 closed / 空 orphans(不 Err)。
-// adaptive 只删带 team-tag 的窗口(C2 leader pane 安全)。
-// ───────────────────────────────────────────────────────────────────────
-
-#[test]
-fn close_team_display_empty_workspace_closes_nothing_not_error() {
-    let ws = temp_ws();
-    let rep = close_team_display_backends(&ws, &sess("team-a"))
-        .expect("C9:无 recorded backend 应 Ok(空报告),不是 Err");
-    assert!(
-        rep.closed.is_empty(),
-        "无 recorded backend 不应关任何东西:{:?}",
-        rep.closed
-    );
-    assert!(
-        rep.orphans_cleaned.is_empty(),
-        "空 workspace 无 orphan:{:?}",
-        rep.orphans_cleaned
-    );
-}
-
 // ───────────────────────────────────────────────────────────────────────
 // fork_agent — operations.py:284 (native session fork eligibility)
 // 资格门(adapter.supports_session_fork = auth_mode != "compatible_api"):

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

@@ -0,0 +1,96 @@
+//! Issue #238 lifecycle-side contracts for persisted/recovered effort and Pi
+//! leader argument admission. This module deliberately calls the same
+//! lifecycle helpers used by spawn/restart instead of duplicating resolution.
+
+#![allow(clippy::expect_used, clippy::panic, clippy::unwrap_used)]
+
+use crate::lifecycle::launch::{
+    provider_effort_for_spawn, provider_effort_for_spawn_json, provider_effort_from_raw,
+};
+use crate::lifecycle::launch::pi_mcp::parse_pi_leader_args;
+use crate::model::enums::{Provider, ProviderEffort};
+use crate::model::yaml::Value as Yaml;
+use serde_json::json;
+
+fn args(items: &[&str]) -> Vec<String> {
+    items.iter().map(|item| (*item).to_string()).collect()
+}
+
+#[test]
+fn r6_spawn_and_persisted_recovery_preserve_codex_effort_literals() {
+    for raw in ["max", "ultra"] {
+        let yaml_agent = Yaml::Map(vec![(
+            "effort".to_string(),
+            Yaml::Str(raw.to_string()),
+        )]);
+        let json_agent = json!({"effort": raw});
+
+        let direct = provider_effort_from_raw(Some(raw), Provider::Codex)
+            .expect("direct lifecycle resolution")
+            .expect("Codex effort");
+        let spawned = provider_effort_for_spawn(&yaml_agent, Provider::Codex)
+            .expect("YAML spawn resolution")
+            .expect("spawned Codex effort");
+        let recovered = provider_effort_for_spawn_json(&json_agent, Provider::Codex)
+            .expect("JSON recovery resolution")
+            .expect("recovered Codex effort");
+        assert_eq!(direct.as_str(), raw);
+        assert_eq!(spawned.as_str(), raw);
+        assert_eq!(recovered.as_str(), raw);
+    }
+}
+
+#[test]
+fn r6_unsupported_ultra_is_not_silently_dropped_on_legacy_provider() {
+    let error = provider_effort_from_raw(Some("ultra"), Provider::Fake)
+        .expect_err("ultra must not be silently ignored")
+        .to_string();
+    assert!(error.contains("effort 'ultra' is only supported by codex"), "{error}");
+}
+
+#[test]
+fn r7_pi_leader_parser_resolves_thinking_by_provider_semantics() {
+    let parsed = parse_pi_leader_args(&args(&[
+        "--",
+        "--model",
+        "openai-codex/gpt-5.6-luna",
+        "--thinking",
+        "max",
+    ]))
+    .expect("Pi max arguments");
+    assert_eq!(parsed.model.as_deref(), Some("openai-codex/gpt-5.6-luna"));
+    assert_eq!(parsed.effort, Some(ProviderEffort::Max));
+
+    let error = parse_pi_leader_args(&args(&[
+        "--model",
+        "openai-codex/gpt-5.6-luna",
+        "--thinking",
+        "ultra",
+    ]))
+    .expect_err("Pi ultra must be rejected by shared resolver")
+    .to_string();
+    assert!(error.contains("effort 'ultra' is only supported by codex"), "{error}");
+}
+
+#[test]
+fn r7_pi_leader_parser_keeps_boundary_errors_fail_closed() {
+    for invalid in [
+        args(&["--thinking"]),
+        args(&["--unknown", "value"]),
+        args(&["--model", "codex"]),
+        args(&["--model", "openai-codex/gpt-5.6-luna", "--model", "other/x"]),
+    ] {
+        assert!(parse_pi_leader_args(&invalid).is_err(), "must reject {invalid:?}");
+    }
+
+    let no_effort = parse_pi_leader_args(&args(&["--model", "openai-codex/gpt-5.6-luna"]))
+        .expect("Pi model-only arguments");
+    assert_eq!(no_effort.effort, None);
+}
+
+#[test]
+fn r7_pi_provider_authority_is_not_model_namespace_authority() {
+    let error = provider_effort_from_raw(Some("ultra"), Provider::Pi)
+        .expect_err("Pi ultra");
+    assert!(error.to_string().contains("effort 'ultra' is only supported by codex"));
+}

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

@@ -1284,6 +1284,7 @@ fn lanea_stop_window_present_kills_and_stopped_true() {
 // touches the display (mark_agent_stopped leaves it as-is) and hardcodes display_closed:false. RED: the
 // persisted display.status/pane_title are the in-process observable.
 #[test]
+#[ignore = "legacy external display contract removed; runtime is silent tmux only"]
 fn lanea_stop_ghostty_workspace_relabels_slot_to_stopped() {
     let ws = lanea_ws_agents(json!({
         "alpha": { "status": "running", "provider": "codex", "window": "alpha",