@team-agent/installer 0.5.92 → 0.5.97

package/crates/team-agent/src/cli/models.rs

@@ -902,6 +902,7 @@ mod tests {
 
     #[cfg(unix)]
     #[test]
+    #[serial_test::serial(env)]
     fn command_boundary_connects_runner_parser_search_and_contract() {
         let path = fixture(
             "printf 'provider model\\nopenai-codex gpt-5.6-sol\\nopenai-codex gpt-5.6-luna\\n'",

package/crates/team-agent/src/cli/spec.rs

@@ -176,7 +176,7 @@ pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "start-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::StartAgent), summary: "start an existing worker", usage: "usage: team-agent start-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--force] [--allow-fresh] [--no-display] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "stop-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::StopAgent), summary: "stop a worker", usage: "usage: team-agent stop-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "reset-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::ResetAgent), summary: "reset a worker session", usage: "usage: team-agent reset-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--no-display] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },
-    CommandSpec { name: "diagnose", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Diagnose), summary: "inspect this workspace runtime and suggested repairs", usage: "usage: team-agent diagnose [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
+    CommandSpec { name: "diagnose", tier: CommandTier::CompatHidden, category: CommandCategory::Compat, kind: CommandKind::Dispatch(DispatchKind::Diagnose), summary: "compatibility alias for doctor", usage: "usage: team-agent doctor [SPEC] [--workspace WORKSPACE] [--team TEAM] [--gate orphans|comms] [--comms] [--fix] [--fix-schema] [--cleanup-orphans] [--confirm] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: Some("doctor"), sunset: None, action: None, governance: None },
     CommandSpec { name: "claim-leader", tier: CommandTier::Guided, category: CommandCategory::GuidedRecovery, kind: CommandKind::Dispatch(DispatchKind::ClaimLeader), summary: "bind this pane when diagnose reports rebind_required", usage: "usage: team-agent claim-leader [--workspace WORKSPACE] [--team TEAM] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "takeover", tier: CommandTier::Guided, category: CommandCategory::GuidedRecovery, kind: CommandKind::Dispatch(DispatchKind::Takeover), summary: "replace a live leader binding with explicit consent", usage: "usage: team-agent takeover [--workspace WORKSPACE] [--team TEAM] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "attach-leader", tier: CommandTier::Guided, category: CommandCategory::GuidedRecovery, kind: CommandKind::Dispatch(DispatchKind::AttachLeader), summary: "bind an external leader pane", usage: "usage: team-agent attach-leader [--workspace WORKSPACE] [--team TEAM] [--pane PANE] [--provider PROVIDER] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
@@ -196,7 +196,7 @@ pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "stuck-cancel", tier: CommandTier::CompatHidden, category: CommandCategory::Compat, kind: CommandKind::Dispatch(DispatchKind::StuckCancel), summary: "legacy stuck alert suppression", usage: "usage: team-agent stuck-cancel AGENT [--workspace WORKSPACE] [--alert-type stuck|idle_fallback|cross_worker_deadlock|all] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: Some("C2"), action: Some("use the concrete notification action or `team-agent diagnose`"), governance: None },
     CommandSpec { name: "acknowledge-idle", tier: CommandTier::CompatHidden, category: CommandCategory::Compat, kind: CommandKind::Dispatch(DispatchKind::AcknowledgeIdle), summary: "legacy idle acknowledgement", usage: "usage: team-agent acknowledge-idle [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: Some("C2"), action: Some("use the concrete idle notification action or `team-agent diagnose`"), governance: None },
     CommandSpec { name: "leaders", tier: CommandTier::Secondary, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Leaders), summary: "list live, stale, or ambiguous host leaders", usage: "usage: team-agent leaders [QUERY|--search TEXT] [--all|--stale] [--json] | --prune [--dry-run] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
-    CommandSpec { name: "doctor", tier: CommandTier::Secondary, category: CommandCategory::Setup, kind: CommandKind::Dispatch(DispatchKind::Doctor), summary: "run host maintenance checks", usage: "usage: team-agent doctor [SPEC] [--workspace WORKSPACE] [--team TEAM] [--gate orphans|comms] [--comms] [--fix] [--fix-schema] [--cleanup-orphans] [--confirm] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
+    CommandSpec { name: "doctor", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Doctor), summary: "inspect environment and Team runtime health", usage: "usage: team-agent doctor [SPEC] [--workspace WORKSPACE] [--team TEAM] [--gate orphans|comms] [--comms] [--fix] [--fix-schema] [--cleanup-orphans] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "attach-app-server-leader", tier: CommandTier::Guided, category: CommandCategory::GuidedRecovery, kind: CommandKind::Dispatch(DispatchKind::AttachAppServerLeader), summary: "bind an app-server leader receiver", usage: "usage: team-agent attach-app-server-leader [--workspace WORKSPACE] [--team TEAM] --socket unix:///path.sock --thread-id THREAD_ID [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "remove-agent", tier: CommandTier::Secondary, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::RemoveAgent), summary: "remove a worker", usage: "usage: team-agent remove-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--from-spec] [--confirm] [--force] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "fork-agent", tier: CommandTier::Secondary, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::ForkAgent), summary: "fork a worker", usage: "usage: team-agent fork-agent SOURCE_AGENT --as AGENT [--label LABEL] [--workspace WORKSPACE] [--team TEAM] [--no-display] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },

package/crates/team-agent/src/cli/tests/base.rs

@@ -671,13 +671,12 @@ fn exit_code_numeric() {
 }
 
 // =========================================================================
-// cmd_doctor 分派(commands.py:218-260):--fix 缺 gate -> Usage err
+// cmd_doctor: --fix without --gate is a structured failure in both renderers.
 // =========================================================================
 
 #[test]
-fn cmd_doctor_fix_without_gate_is_usage_error() {
-    // commands.py:220-221: --fix and not gate -> TeamAgentError("--fix requires --gate")
-    let args = DoctorArgs {
+fn cmd_doctor_fix_without_gate_reports_usage_failure() {
+    let mut args = DoctorArgs {
         spec: None,
         workspace: PathBuf::from("."),
         gate: None,
@@ -689,12 +688,23 @@ fn cmd_doctor_fix_without_gate_is_usage_error() {
         confirm: false,
         json: false,
     };
-    let err = cmd_doctor(&args).unwrap_err();
-    let msg = err.to_string();
-    assert!(
-        msg.contains("--fix requires --gate"),
-        "expected '--fix requires --gate', got: {msg}"
-    );
+    let human = cmd_doctor(&args).expect("structured usage failure");
+    assert_eq!(human.exit, ExitCode::Error);
+    let CmdOutput::Human(text) = human.output else {
+        panic!("expected human triage");
+    };
+    assert!(text.contains("fix_requires_gate"), "{text}");
+    assert!(text.contains("add --gate orphans|comms"), "{text}");
+
+    args.json = true;
+    let result = cmd_doctor(&args).expect("structured JSON usage failure");
+    assert_eq!(result.exit, ExitCode::Error);
+    let CmdOutput::Json(value) = result.output else {
+        panic!("expected JSON usage failure");
+    };
+    assert_eq!(value["ok"], false);
+    assert_eq!(value["error"], "--fix requires --gate");
+    assert_eq!(value["issues"], json!(["fix_requires_gate"]));
 }
 
 // =========================================================================

package/crates/team-agent/src/cli/tests/divergence.rs

@@ -457,14 +457,10 @@ fn red_send_target_none_is_not_broadcast() {
     assert_eq!(send_target(None, Some("*")), MessageTarget::Broadcast);
 }
 
-// ---- #23: cmd_doctor comms (human) returns COMMS_BOUNDARY_TEXT + sorted indented JSON ----
-// golden: for --comms WITHOUT --json, cmd_doctor returns the STRING
-//   f"{COMMS_BOUNDARY_TEXT}\n{json.dumps(result, indent=2, ensure_ascii=False, sort_keys=True)}".
-// Rust always does CmdResult::from_json -> CmdOutput::Json (wrong shape).
+// Unified doctor human output is triage only, including the comms gate.
 #[test]
-fn red_cmd_doctor_comms_human_is_boundary_text_plus_sorted_json() {
-    const COMMS_BOUNDARY_TEXT: &str = "validates live pane binding consistency and zero-token comms contracts. Does NOT perform live runtime message round-trip. (zero token, zero pollution)";
-    let args = DoctorArgs {
+fn cmd_doctor_comms_human_is_compact_triage_without_boundary_prefix() {
+    let mut args = DoctorArgs {
         spec: None,
         workspace: PathBuf::from("."),
         gate: None,
@@ -479,21 +475,16 @@ fn red_cmd_doctor_comms_human_is_boundary_text_plus_sorted_json() {
     let result = cmd_doctor(&args).expect("comms doctor returns CmdResult");
     let text = match result.output {
         CmdOutput::Human(s) => s,
-        other => panic!(
-            "comms WITHOUT --json MUST be a Human boundary-text + JSON string, got {other:?}"
-        ),
+        other => panic!("comms WITHOUT --json must be human triage, got {other:?}"),
     };
-    assert!(
-            text.starts_with(&format!("{COMMS_BOUNDARY_TEXT}\n")),
-            "comms human output MUST start with COMMS_BOUNDARY_TEXT then a newline (golden commands.py:231); got: {text:?}"
-        );
-    // the tail is the selftest result rendered as sort_keys+indent=2 JSON (parseable, sorted).
-    let json_tail = text
-        .strip_prefix(&format!("{COMMS_BOUNDARY_TEXT}\n"))
-        .unwrap();
-    let parsed: Value = serde_json::from_str(json_tail)
-        .expect("comms human tail MUST be indent=2 sort_keys JSON of the selftest result");
-    assert!(parsed.is_object(), "comms selftest JSON tail is an object");
+    args.json = true;
+    let CmdOutput::Json(report) = cmd_doctor(&args).unwrap().output else {
+        panic!("--json must preserve the structured report");
+    };
+    assert_eq!(text, crate::cli::triage::render("doctor", &report));
+    assert!(text.starts_with("doctor:"));
+    assert_eq!(text.lines().count(), 1 + report["issues"].as_array().unwrap().len()
+        + report["suggested_repairs"].as_array().unwrap().len());
 }
 
 // ---- #13 / #27 (P2): run() must NOT treat 'claude_code' as a passthrough trigger ----

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

@@ -368,12 +368,17 @@ fn ux_doctor_secret_scan_findings_name_the_exact_trigger() {
         .pointer("/secret_scan/findings/0")
         .and_then(serde_json::Value::as_object)
         .expect("secret-scan must report the concrete trigger");
-    for key in ["path", "line", "rule", "match_excerpt"] {
+    for key in ["path", "line", "rule"] {
         assert!(
             finding.contains_key(key),
             "secret-scan finding missing `{key}`: {finding:?}"
         );
     }
+    assert_eq!(finding["path"], "leaky-role.md");
+    assert_eq!(finding["line"], 1);
+    assert_eq!(finding["rule"], "api_key_assignment");
+    assert!(!finding.contains_key("match_excerpt"));
+    assert!(!value.to_string().contains("sk-test-red-contract"));
     let _ = std::fs::remove_dir_all(&ws);
 }
 #[test]

package/crates/team-agent/src/cli/tests/missing_subcommands.rs

@@ -299,7 +299,7 @@ fn dispatch_routes_sessions_subcommand() {
 // + NO session_name + NO agents -> issues=[] -> EXIT 0.
 #[test]
 #[serial(env)]
-fn dispatch_routes_diagnose_healthy_leader() {
+fn dispatch_routes_diagnose_checks_runtime_beyond_healthy_leader() {
     let _env = EnvUnsetGuard::unset(&[
         "TMUX",
         "TMUX_PANE",
@@ -332,17 +332,26 @@ fn dispatch_routes_diagnose_healthy_leader() {
             pane_pid: None,
             leader_env: Default::default(),
         }]);
-    let code = crate::transport_factory::with_leader_endpoint_transport(endpoint, transport, || {
-        run(
-            &cli_argv(&["diagnose", "--workspace", &ws.to_string_lossy(), "--json"]),
-            &ws,
-        )
+    crate::transport_factory::with_leader_endpoint_transport(endpoint, transport, || {
+        for command in ["doctor", "diagnose"] {
+            let code = run(
+                &cli_argv(&[command, "--workspace", &ws.to_string_lossy(), "--json"]),
+                &ws,
+            );
+            assert_eq!(code, ExitCode::Error, "healthy binding alone cannot hide missing coordinator");
+        }
+        let result = cmd_diagnose(&DiagnoseArgs {
+            workspace: ws.clone(), json: true, team: None,
+        }).expect("diagnostic report");
+        let CmdOutput::Json(report) = result.output else {
+            panic!("expected JSON diagnostic report");
+        };
+        assert_eq!(report["coordinator"]["ok"], false, "{report}");
+        let issues = report["issues"].to_string();
+        for binding_failure in ["leader_not_attached", "leader_receiver_unbound", "leader_workspace_mismatch"] {
+            assert!(!issues.contains(binding_failure), "healthy binding regressed: {report}");
+        }
     });
-    assert_eq!(
-        code,
-        ExitCode::Ok,
-        "`diagnose` must be Ok when canonical owner/receiver, production registry, and live align; got {code:?}"
-    );
     let _ = std::fs::remove_dir_all(&ws);
 }