@team-agent/installer 0.5.111 → 0.5.112

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

@@ -251,7 +251,6 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
                 | "clone-agent"
                 | "fork-agent"
                 | "remove-agent"
-                | "allow-peer-talk"
                 | "profile"
         )
     {
@@ -262,9 +261,6 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
     match command {
         "quick-start" => cmd_quick_start(&quick_start_args(args, cwd)?).map(emit_result),
         "send" => cmd_send(&send_args(args, cwd)?).map(emit_result),
-        "allow-peer-talk" => {
-            cmd_allow_peer_talk(&allow_peer_talk_args(args, cwd)?).map(emit_result)
-        }
         "status" => cmd_status_for_team(&status_args(args, cwd), parse_args(args).team.as_deref())
             .map(emit_result),
         "shutdown" => cmd_shutdown(&shutdown_args(args, cwd)?).map(emit_result),
@@ -306,33 +302,13 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
 fn is_machine_command(command: &str) -> bool {
     matches!(
         command,
-        "results"
-            | "wait"
-            | "wait-ready"
-            | "preflight"
-            | "validate"
-            | "identity"
-            | "sessions"
-            | "watch"
-            | "e2e"
-            | "peek"
-            | "coordinator"
-            | "attach-app-server-leader"
+        "wait" | "coordinator" | "attach-app-server-leader"
     )
 }
 
 fn dispatch_machine(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliError> {
     match command {
-        "results" => cmd_results(&results_args(args, cwd)?).map(emit_result),
         "wait" => cmd_wait(&wait_args(args, cwd)?).map(emit_result),
-        "wait-ready" => cmd_wait_ready(&wait_ready_args(args, cwd)).map(emit_result),
-        "preflight" => cmd_preflight(&preflight_args(args, cwd)).map(emit_result),
-        "validate" => cmd_validate(&validate_args(args, cwd)).map(emit_result),
-        "identity" => cmd_identity(&identity_args(args, cwd)).map(emit_result),
-        "sessions" => cmd_sessions(&sessions_args(args, cwd)).map(emit_result),
-        "watch" => cmd_watch(&watch_args(args, cwd)).map(emit_result),
-        "e2e" => cmd_e2e(&e2e_args(args, cwd)).map(emit_result),
-        "peek" => cmd_peek(&peek_args(args, cwd)?).map(emit_result),
         "coordinator" => run_coordinator(args, cwd),
         "attach-app-server-leader" => {
             cmd_attach_app_server_leader(&attach_app_server_leader_args(args, cwd)?)
@@ -387,7 +363,7 @@ pub(crate) fn default_help() -> String {
     append_help_section(
         &mut out,
         "观察与协作",
-        &["leaders", "doctor", "approvals", "allow-peer-talk"],
+        &["leaders", "doctor", "approvals"],
     );
     append_help_section(&mut out, "设置", &["route", "profile", "install-skill"]);
     append_help_section(
@@ -487,8 +463,6 @@ pub(super) fn command_help(command: Option<&str>) -> String {
             "team-agent doctor --workspace .\nteam-agent doctor --workspace . --team help-demo --json", "按实际问题与所选队伍范围处理；不要把体检建议当成已执行的修复。"),
         "approvals" => ("可选 <agent> 查看一位队友；仅观察权限询问，不自动批准。",
             "team-agent approvals\nteam-agent approvals worker --json", "确认权限用途后，在工具的实际权限询问处处理，再看 status。"),
-        "allow-peer-talk" => ("指定两位现有队友；--workspace 选择项目。此命令不支持 --team。",
-            "team-agent allow-peer-talk worker reviewer\nteam-agent allow-peer-talk worker reviewer --workspace . --json", "再向队友发送交流任务；允许交流不等于已经互发消息。"),
         "profile" => ("init 创建配置，doctor 检查配置，show 显示设置；NAME 是配置名。\n--auth-mode 登录方式；--proxy-mode direct 不走代理、inherit 沿用环境代理。\n配置存放在所选工作区，不因 --team 自动变成队伍独立配置；不要输出凭证。",
             "team-agent profile init local --auth-mode subscription\nteam-agent profile doctor local\nteam-agent profile show local", "检查通过后用 add-agent/start-agent --profile local；需要登录时使用工具原生登录入口。"),
         "install-skill" => ("--source 必须是已核实的指南目录；--target 选择 codex/claude/copilot/all。\n--dest 覆盖安装位置；--dry-run 只预览；--uninstall 移除目标指南。此项不是起队前提。",
@@ -572,7 +546,6 @@ fn emit_usage_error(message: &str) {
     eprintln!("错误：{message}");
 }
 
-/// `cmd_validate` delegates to runtime validate_file.
 /// `install-skill` 参数(RED-1 根治:把 skill 安装单源收敛到二进制,install.mjs 调它)。
 struct InstallSkillArgs {
     target: crate::packaging::SkillTarget,
@@ -688,93 +661,10 @@ fn cmd_install_skill(args: &InstallSkillArgs) -> Result<CmdResult, CliError> {
     ))
 }
 
-pub fn cmd_validate(args: &ValidateArgs) -> Result<CmdResult, CliError> {
-    let spec = resolve_path(&args.spec);
-    let value = if spec.is_dir() {
-        validate_team_dir(&spec)?
-    } else {
-        validate_spec_file(&spec)?
-    };
-    Ok(CmdResult::from_json(value, args.json))
-}
-
-fn validate_spec_file(spec_path: &Path) -> Result<Value, CliError> {
-    let text = std::fs::read_to_string(spec_path)?;
-    let base_dir = spec_path.parent().unwrap_or_else(|| Path::new("."));
-    let spec =
-        crate::model::spec::load_and_validate_spec(&text, base_dir).map_err(model_error_to_cli)?;
-    let team = spec
-        .get("team")
-        .and_then(|team| team.get("name"))
-        .and_then(crate::model::yaml::Value::as_str)
-        .unwrap_or("");
-    let workspace = spec
-        .get("team")
-        .and_then(|team| team.get("workspace"))
-        .and_then(crate::model::yaml::Value::as_str)
-        .map(PathBuf::from)
-        .unwrap_or_else(|| base_dir.to_path_buf());
-    let mut obj = Map::new();
-    obj.insert("ok".to_string(), Value::Bool(true));
-    obj.insert("team".to_string(), Value::String(team.to_string()));
-    obj.insert(
-        "workspace".to_string(),
-        Value::String(workspace.to_string_lossy().to_string()),
-    );
-    Ok(Value::Object(obj))
-}
-
-fn validate_team_dir(team_dir: &Path) -> Result<Value, CliError> {
-    let spec = crate::compiler::compile_team(team_dir).map_err(model_error_to_cli)?;
-    let team = spec
-        .get("team")
-        .and_then(|team| team.get("name"))
-        .and_then(crate::model::yaml::Value::as_str)
-        .unwrap_or("");
-    let workspace = spec
-        .get("team")
-        .and_then(|team| team.get("workspace"))
-        .and_then(crate::model::yaml::Value::as_str)
-        .map(PathBuf::from)
-        .unwrap_or_else(|| team_dir.to_path_buf());
-    let agents = spec
-        .get("agents")
-        .and_then(crate::model::yaml::Value::as_list)
-        .map(|agents| {
-            agents
-                .iter()
-                .filter_map(|agent| {
-                    agent
-                        .get("id")
-                        .and_then(crate::model::yaml::Value::as_str)
-                        .map(|id| Value::String(id.to_string()))
-                })
-                .collect::<Vec<_>>()
-        })
-        .unwrap_or_default();
-    let mut obj = Map::new();
-    obj.insert("ok".to_string(), Value::Bool(true));
-    obj.insert("type".to_string(), Value::String("team_dir".to_string()));
-    obj.insert(
-        "workspace".to_string(),
-        Value::String(workspace.to_string_lossy().to_string()),
-    );
-    obj.insert("team".to_string(), Value::String(team.to_string()));
-    obj.insert("agents".to_string(), Value::Array(agents));
-    Ok(Value::Object(obj))
-}
-
 fn resolve_path(path: &Path) -> PathBuf {
     std::fs::canonicalize(path).unwrap_or_else(|_| path.to_path_buf())
 }
 
-fn model_error_to_cli(error: crate::model::errors::ModelError) -> CliError {
-    match error {
-        crate::model::errors::ModelError::Validation(message) => CliError::Runtime(message),
-        other => CliError::Runtime(other.to_string()),
-    }
-}
-
 fn emit_cli_error(command: &str, args: &[String], cwd: &Path, error: &CliError) -> ExitCode {
     let parsed = parse_args(args);
     let workspace = workspace(&parsed, cwd);
@@ -951,14 +841,9 @@ struct ParsedArgs {
     once: bool,
     tick_interval: Option<f64>,
     status_value: Option<String>,
-    providers: Option<String>,
-    allow_raw_screen: bool,
-    tail: Option<usize>,
-    head: Option<usize>,
     search: Option<String>,
     file: Option<PathBuf>,
     result: Option<String>,
-    real: bool,
     assignee: Option<String>,
     auth_mode: Option<String>,
     proxy_mode: Option<String>,
@@ -1045,14 +930,9 @@ fn parse_args(args: &[String]) -> ParsedArgs {
                 parsed.tick_interval = next_arg(args, &mut i).and_then(|v| v.parse::<f64>().ok())
             }
             "--status" => parsed.status_value = next_arg(args, &mut i),
-            "--providers" => parsed.providers = next_arg(args, &mut i),
-            "--allow-raw-screen" => parsed.allow_raw_screen = true,
-            "--tail" => parsed.tail = next_arg(args, &mut i).and_then(|v| v.parse::<usize>().ok()),
-            "--head" => parsed.head = next_arg(args, &mut i).and_then(|v| v.parse::<usize>().ok()),
             "--search" => parsed.search = next_arg(args, &mut i),
             "--file" => parsed.file = next_arg(args, &mut i).map(PathBuf::from),
             "--result" => parsed.result = next_arg(args, &mut i),
-            "--real" => parsed.real = true,
             "--assignee" => parsed.assignee = next_arg(args, &mut i),
             "--auth-mode" => parsed.auth_mode = next_arg(args, &mut i),
             "--proxy-mode" => parsed.proxy_mode = next_arg(args, &mut i),
@@ -1458,17 +1338,6 @@ fn refuse_if_multi_alive_team_missing_scope(
     Ok(())
 }
 
-fn allow_peer_talk_args(args: &[String], cwd: &Path) -> Result<AllowPeerTalkArgs, CliError> {
-    let parsed = parse_args(args);
-    Ok(AllowPeerTalkArgs {
-        a: required_pos(&parsed, 0, "a")?,
-        b: required_pos(&parsed, 1, "b")?,
-        workspace: workspace(&parsed, cwd),
-        json: parsed.json,
-        team: parsed.team,
-    })
-}
-
 fn status_args(args: &[String], cwd: &Path) -> StatusArgs {
     let parsed = parse_args(args);
     StatusArgs {
@@ -1481,14 +1350,6 @@ fn status_args(args: &[String], cwd: &Path) -> StatusArgs {
     }
 }
 
-fn watch_args(args: &[String], cwd: &Path) -> WatchArgs {
-    let parsed = parse_args(args);
-    WatchArgs {
-        workspace: workspace(&parsed, cwd),
-        team: parsed.team,
-    }
-}
-
 fn wait_args(args: &[String], cwd: &Path) -> Result<WaitArgs, CliError> {
     let parsed = parse_args(args);
     let workspace = workspace(&parsed, cwd);
@@ -1586,15 +1447,6 @@ fn attach_app_server_leader_args(
     })
 }
 
-fn identity_args(args: &[String], cwd: &Path) -> IdentityArgs {
-    let parsed = parse_args(args);
-    IdentityArgs {
-        workspace: workspace(&parsed, cwd),
-        team: parsed.team,
-        json: parsed.json,
-    }
-}
-
 fn shutdown_args(args: &[String], cwd: &Path) -> Result<ShutdownArgs, CliError> {
     let parsed = parse_args(args);
     let workspace = workspace(&parsed, cwd);
@@ -1917,15 +1769,6 @@ fn doctor_gate(raw: Option<&str>) -> Option<DoctorGate> {
     }
 }
 
-fn sessions_args(args: &[String], cwd: &Path) -> SessionsArgs {
-    let parsed = parse_args(args);
-    SessionsArgs {
-        workspace: workspace(&parsed, cwd),
-        json: parsed.json,
-        team: parsed.team,
-    }
-}
-
 fn leaders_args(args: &[String], _cwd: &Path) -> Result<LeadersArgs, CliError> {
     let mut view = None;
     let mut query = None;
@@ -2031,18 +1874,6 @@ fn leaders_args(args: &[String], _cwd: &Path) -> Result<LeadersArgs, CliError> {
     })
 }
 
-fn validate_args(args: &[String], cwd: &Path) -> ValidateArgs {
-    let parsed = parse_args(args);
-    ValidateArgs {
-        spec: parsed
-            .positionals
-            .first()
-            .map(PathBuf::from)
-            .unwrap_or_else(|| cwd.join("team.spec.yaml")),
-        json: parsed.json,
-    }
-}
-
 fn profile_args(args: &[String], cwd: &Path) -> Result<ProfileArgs, CliError> {
     let parsed = parse_args(args);
     let workspace = resolve_cli_path(cwd, &workspace(&parsed, cwd));
@@ -2057,106 +1888,6 @@ fn profile_args(args: &[String], cwd: &Path) -> Result<ProfileArgs, CliError> {
     })
 }
 
-fn results_args(args: &[String], cwd: &Path) -> Result<ResultsArgs, CliError> {
-    if args
-        .iter()
-        .any(|arg| arg == "--to" || arg.starts_with("--to="))
-    {
-        return Err(CliError::Usage(
-            "results does not accept --to; it is a read-only command".to_string(),
-        ));
-    }
-    let parsed = parse_args(args);
-    let case_id = option_value(args, "--case")
-        .filter(|value| !value.is_empty())
-        .ok_or_else(|| CliError::Usage("missing --case".to_string()))?;
-    Ok(ResultsArgs {
-        case_id,
-        workspace: workspace(&parsed, cwd),
-        team: parsed.team,
-        json: parsed.json,
-    })
-}
-
-fn option_value(args: &[String], flag: &str) -> Option<String> {
-    let prefix = format!("{flag}=");
-    let mut i = 0usize;
-    while i < args.len() {
-        let arg = args.get(i)?;
-        if let Some(value) = arg.strip_prefix(&prefix) {
-            return Some(value.to_string());
-        }
-        if arg == flag {
-            return args
-                .get(i.saturating_add(1))
-                .filter(|value| !value.starts_with('-'))
-                .cloned();
-        }
-        i = i.saturating_add(1);
-    }
-    None
-}
-
-fn preflight_args(args: &[String], cwd: &Path) -> PreflightArgs {
-    let parsed = parse_args(args);
-    let team = parsed
-        .team
-        .as_deref()
-        .map(PathBuf::from)
-        .or_else(|| parsed.positionals.first().map(PathBuf::from))
-        .unwrap_or_else(|| cwd.to_path_buf());
-    PreflightArgs {
-        team,
-        json: parsed.json,
-    }
-}
-
-fn wait_ready_args(args: &[String], cwd: &Path) -> WaitReadyArgs {
-    let parsed = parse_args(args);
-    WaitReadyArgs {
-        workspace: workspace(&parsed, cwd),
-        timeout: parsed.timeout.unwrap_or(60.0),
-        json: parsed.json,
-        team: parsed.team,
-    }
-}
-
-fn e2e_args(args: &[String], cwd: &Path) -> E2eArgs {
-    let parsed = parse_args(args);
-    let providers = parsed
-        .providers
-        .as_deref()
-        .unwrap_or("fake")
-        .split(',')
-        .filter_map(|p| {
-            let trimmed = p.trim();
-            if trimmed.is_empty() {
-                None
-            } else {
-                Some(trimmed.to_string())
-            }
-        })
-        .collect();
-    E2eArgs {
-        workspace: workspace(&parsed, cwd),
-        providers,
-        real: parsed.real,
-        json: parsed.json,
-    }
-}
-
-fn peek_args(args: &[String], cwd: &Path) -> Result<PeekArgs, CliError> {
-    let parsed = parse_args(args);
-    Ok(PeekArgs {
-        agent: required_pos(&parsed, 0, "agent")?,
-        workspace: workspace(&parsed, cwd),
-        tail: parsed.tail.unwrap_or(80),
-        head: parsed.head,
-        search: parsed.search,
-        allow_raw_screen: parsed.allow_raw_screen,
-        json: parsed.json,
-    })
-}
 fn run_coordinator(args: &[String], cwd: &Path) -> Result<ExitCode, CliError> {
     let parsed = parse_args(args);
     let workspace = crate::coordinator::WorkspacePath::new(workspace(&parsed, cwd));
@@ -2343,7 +2074,7 @@ mod tests {
             .filter(|spec| spec.default_help)
             .map(|spec| spec.name)
             .collect();
-        assert_eq!(expected.len(), 30, "the public catalog is Human30");
+        assert_eq!(expected.len(), 29, "the public catalog is Human29");
         for spec_name in &expected {
             assert!(
                 visible.iter().any(|command| command == spec_name),
@@ -2357,7 +2088,7 @@ mod tests {
         expected_sorted.sort();
         assert_eq!(
             actual, expected_sorted,
-            "default help must match the exact Human30 public spec set, not a slack threshold; got {visible:?}"
+            "default help must match the exact Human29 public spec set, not a slack threshold; got {visible:?}"
         );
         assert!(
             top_help.contains("copilot"),
@@ -2392,6 +2123,32 @@ mod tests {
         }
     }
 
+    #[test]
+    fn retired_commands_have_no_catalog_machine_or_help_gate() {
+        for command in [
+            "e2e",
+            "allow-peer-talk",
+            "results",
+            "validate",
+            "identity",
+            "sessions",
+            "watch",
+            "peek",
+            "wait-ready",
+            "preflight",
+        ] {
+            assert!(
+                command_spec(command).is_none(),
+                "retired catalog entry: {command}"
+            );
+            assert!(
+                !is_machine_command(command),
+                "retired Machine route: {command}"
+            );
+            assert!(!is_known_subcommand(command), "retired help gate: {command}");
+        }
+    }
+
     #[test]
     fn leaders_help_publishes_selectors_and_prune() {
         let help = command_help(Some("leaders"));
@@ -2405,7 +2162,6 @@ mod tests {
     #[test]
     fn observation_a_commands_have_terminal_tiers() {
         for (command, tier) in [
-            ("allow-peer-talk", CommandTier::Core),
             ("approvals", CommandTier::Core),
             ("profile", CommandTier::Core),
             ("install-skill", CommandTier::Core),
@@ -2547,7 +2303,7 @@ mod tests {
             }
         }
         let cwd = tmp_workspace();
-        for command in ["sessions", "wait-ready", "peek", "coordinator"] {
+        for command in ["wait", "attach-app-server-leader", "coordinator"] {
             assert_eq!(
                 run(&cli_argv(&[command, "--help"]), &cwd),
                 ExitCode::Usage,

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

@@ -5629,8 +5629,8 @@ pub mod diagnose_port {
     }
 }
 
-/// PLACEHOLDER → leader lane(`runtime.{takeover,claim_leader,leader_identity}` 的 CLI 视图)。
-/// leader.rs 已有 `claim_leader`/`leader_identity`(返 `LeaseResult`/`Value`);CLI 需 `takeover` +
+/// PLACEHOLDER → leader lane(`runtime.{takeover,claim_leader}` 的 CLI 视图)。
+/// leader.rs 已有 `claim_leader`(返 `LeaseResult`);CLI 需 `takeover` +
 /// 把 `LeaseResult` 投影成稳定 `--json` 形状。这两步由 leader 集成收口,本层仅声明 CLI 委派面。
 pub mod leader_port {
     use super::*;
@@ -5769,13 +5769,6 @@ pub mod leader_port {
         Ok(value)
     }
 
-    ///
-    /// `runtime.leader_identity(workspace, team)`(`cmd_identity`)。
-    pub fn leader_identity(workspace: &Path, team: Option<&str>) -> Result<Value, CliError> {
-        crate::leader::leader_identity(workspace, team)
-            .map_err(|e| CliError::Runtime(e.to_string()))
-    }
-
     /// E7 (0.5.9 host-leader-registry-design §14 step 3): after a
     /// canonical binding command succeeds, write a derived discovery
     /// entry to `~/.team-agent/leaders`. Registry write failure is

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

@@ -49,7 +49,6 @@ pub(crate) enum DispatchKind {
     Leaders,
     Doctor,
     Approvals,
-    AllowPeerTalk,
     Route,
     Profile,
     InstallSkill,
@@ -75,7 +74,6 @@ pub(crate) const ALL_DISPATCH_KINDS: &[DispatchKind] = &[
     DispatchKind::Leaders,
     DispatchKind::Doctor,
     DispatchKind::Approvals,
-    DispatchKind::AllowPeerTalk,
     DispatchKind::Route,
     DispatchKind::Profile,
     DispatchKind::InstallSkill,
@@ -125,7 +123,6 @@ pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "leaders", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Leaders), summary: "查看本机可用的主控及其所属队伍", usage: "team-agent leaders [QUERY|--search TEXT] [--all|--stale] [--json] | --prune [--dry-run] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "doctor", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Doctor), summary: "检查队伍并给出恢复建议，默认不修复", usage: "team-agent doctor [SPEC] [--workspace WORKSPACE] [--team TEAM] [--comms] [--gate orphans|comms] [--fix] [--fix-schema] [--cleanup-orphans] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "approvals", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Approvals), summary: "查看队友正在等待的权限确认", usage: "team-agent approvals [<agent>] [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
-    CommandSpec { name: "allow-peer-talk", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::AllowPeerTalk), summary: "允许两位队友直接交流", usage: "team-agent allow-peer-talk <agent> OTHER_AGENT [--workspace WORKSPACE] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "route", tier: CommandTier::Core, category: CommandCategory::Setup, kind: CommandKind::Dispatch(DispatchKind::Route), summary: "设置工具启动时额外使用的命令行参数", usage: "team-agent route [status|enable|disable|show [TOOL]|set TOOL -- ARG...|add TOOL -- ARG...|clear TOOL] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "profile", tier: CommandTier::Core, category: CommandCategory::Setup, kind: CommandKind::Dispatch(DispatchKind::Profile), summary: "管理登录方式和代理设置", usage: "team-agent profile init|doctor|show NAME [--workspace WORKSPACE] [--team TEAM] [--auth-mode MODE] [--proxy-mode direct|inherit] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "install-skill", tier: CommandTier::Core, category: CommandCategory::Setup, kind: CommandKind::Dispatch(DispatchKind::InstallSkill), summary: "可选：安装已有的公开操作指南", usage: "team-agent install-skill (--source DIR|--uninstall) [--target codex|claude|copilot|all] [--dest DIR] [--dry-run] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },

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

@@ -100,11 +100,10 @@ fn cli_shutdown_kills_team_session_real_teardown() {
 
 // =========================================================================
 // WAVE-2 Lane B — CLI leader handler delegation byte-parity (leader_port::*).
-//   The three CLI verbs are thin pass-throughs (cli/commands.py:152-161):
+//   The retained CLI verbs are thin pass-throughs (cli/commands.py:152-157):
 //     cmd_takeover     -> runtime.takeover(ws, team, confirm)
 //     cmd_claim_leader -> runtime.claim_leader(ws, team, confirm)  (Family A)
-//     cmd_identity     -> runtime.leader_identity(ws, team)
-//   leader_port::{takeover,claim_leader,leader_identity} are STUBS returning
+//   leader_port::{takeover,claim_leader} are STUBS returning
 //   the WRONG shape today -> these LOCK the golden dict so the porter wires
 //   them into leader::* / runtime.* and matches byte-for-byte.
 //   Golden re-probed @ team-agent-public (probe_claim.py / probe_rtclaim.py /
@@ -297,89 +296,6 @@ fn leader_port_claim_leader_no_pane_refuses_caller_pane_missing_family_a() {
         );
 }
 
-// RED — leader_identity(): CLI directly emits leader.leader_identity's 9-key
-// dict (runtime.leader_identity is imported from leader). golden probe_lid.py
-// keys: ok, uuid_prefix, machine_fingerprint, workspace_abspath, os_user,
-// team_id, current_pane_id, last_seen_at, source. Current stub returns
-// {ok:true, team:...} (wrong shape) -> RED.
-#[test]
-fn leader_port_leader_identity_emits_nine_key_dict() {
-    let ws = leader_port_ws("identity");
-    std::fs::create_dir_all(crate::model::paths::runtime_dir(&ws)).unwrap();
-    let v = super::leader_port::leader_identity(&ws, None).unwrap();
-    assert_eq!(v["ok"], json!(true));
-    let obj = v.as_object().expect("identity → JSON object");
-    for key in [
-        "ok",
-        "uuid_prefix",
-        "machine_fingerprint",
-        "workspace_abspath",
-        "os_user",
-        "team_id",
-        "current_pane_id",
-        "last_seen_at",
-        "source",
-    ] {
-        assert!(
-            obj.contains_key(key),
-            "golden identity dict must carry '{key}', got {obj:?}"
-        );
-    }
-    // no override/state uuid → source is the leader-plan "derived" string.
-    assert_eq!(v["source"], json!("derived"));
-    // uuid_prefix is exactly 12 hex chars (derive[:12]).
-    let prefix = v["uuid_prefix"].as_str().expect("uuid_prefix str");
-    assert_eq!(prefix.len(), 12, "uuid_prefix == derived[:12]");
-    assert!(prefix.chars().all(|c| c.is_ascii_hexdigit()));
-    // no team registered + no TMUX_PANE/receiver → these are JSON null.
-    if std::env::var_os("TMUX_PANE").is_none() {
-        assert_eq!(v["current_pane_id"], serde_json::Value::Null);
-    }
-    assert_eq!(v["last_seen_at"], serde_json::Value::Null);
-}
-
-// ── cmd_watch (cli/adapters.rs:58) [RED] — today a CmdResult::none() no-op ───────────────────────
-// Golden cmd_watch (cli/commands.py:103-109) DELEGATES to run_watch(workspace.resolve(), team) and
-// exits 0. Golden run_watch (watch/__init__.py:25-37) is a `while True` LIVE TAIL that streams
-// render_event_line output (collect_watch_lines) for the watched team. The Rust cmd_watch returns
-// CmdResult::none() — a no-op that never touches the watch subsystem. The watch LINE SHAPE is itself
-// byte-locked by coordinator::render_event_line (coordinator/tests.rs GROUP H); the cli contract here
-// is that cmd_watch must DELEGATE and surface those rendered lines. Seeded a result_received event ->
-// golden render = "result_received: <agent> -> <summary>" (render_event_line: agent_id + summary[:80]).
-//
-// RED confirmed TODAY: cmd_watch=none() returns immediately (no watch line) -> the assertion fails
-// (and does NOT hang). PORTER: wire cmd_watch -> coordinator::run_watch(resolved workspace, team,
-// interval, sink). Since golden's tail is `while True`, the cli port needs a TERMINATING / bounded
-// entry to be both byte-parity AND unit-testable (collect the current watch lines into the CmdResult,
-// or stream to stdout with a bounded test seam) — a blocking unit test is unacceptable.
-#[test]
-fn cmd_watch_delegates_and_surfaces_rendered_watch_lines_not_noop() {
-    let ws = tmp_workspace();
-    let logs = crate::model::paths::logs_dir(&ws);
-    std::fs::create_dir_all(&logs).unwrap();
-    std::fs::write(
-        logs.join("events.jsonl"),
-        "{\"event\":\"result_received\",\"agent_id\":\"alpha\",\"summary\":\"did the thing\"}\n",
-    )
-    .unwrap();
-    let r = cmd_watch(&WatchArgs {
-        workspace: ws.clone(),
-        team: None,
-    })
-    .expect("cmd_watch returns a CmdResult");
-    let text = match &r.output {
-        CmdOutput::Human(s) => s.clone(),
-        CmdOutput::Json(v) => v.to_string(),
-        CmdOutput::None => String::new(),
-    };
-    assert!(
-            text.contains("result_received: alpha -> did the thing"),
-            "cmd_watch must DELEGATE to the watch subsystem (run_watch -> render_event_line) and surface the \
-             rendered watch line; today it is a CmdResult::none() no-op. got output={:?}",
-            r.output
-        );
-}
-
 // D7 [WARN] — WAVE-2 Lane B: empty caller binds refuse as caller_pane_missing.
 #[test]
 #[serial_test::serial(env)]