@team-agent/installer 0.5.61 → 0.5.62

package/Cargo.lock

@@ -575,7 +575,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.5.61"
+version = "0.5.62"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -9,7 +9,7 @@ members = ["crates/team-agent", "crates/win-conpty-phase0", "crates/conpty-trans
 
 [workspace.package]
 edition = "2021"
-version = "0.5.61"
+version = "0.5.62"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

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

@@ -1,3 +1,4 @@
+//!
 //! cli · adapters — 每子命令的薄壳 `cmd_*`(commands.py)。委派 status/lifecycle/diagnose/
 //! leader/messaging port,把委派结果包成 [`CmdResult`]。含逻辑的:`cmd_status`(三态互斥)、
 //! `cmd_doctor`(gate/comms/fix-schema/cleanup-orphans 分派)。
@@ -221,7 +222,8 @@ fn warn_ignored_owner_team_id(team_dir: &std::path::Path) {
 
 /// `cmd_status`(`commands.py:90`)。三态:`--summary`(xor json,xor agent)→五行文本;
 /// `--json`→`status_port::status(compact=!detail)`;else→`status_port::format_status(agent)`。
-pub fn cmd_status(args: &StatusArgs) -> Result<CmdResult, CliError> {
+#[cfg(test)]
+pub(crate) fn cmd_status(args: &StatusArgs) -> Result<CmdResult, CliError> {
     cmd_status_for_team(args, args.team.as_deref())
 }
 
@@ -408,7 +410,8 @@ pub fn cmd_sessions(args: &SessionsArgs) -> Result<CmdResult, CliError> {
 }
 
 /// `cmd_collect`(`parser.py:292`)。
-pub fn cmd_collect(args: &CollectArgs) -> Result<CmdResult, CliError> {
+#[cfg(test)]
+pub(crate) fn cmd_collect(args: &CollectArgs) -> Result<CmdResult, CliError> {
     cmd_collect_for_team(args, args.team.as_deref())
 }
 

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

@@ -1,3 +1,4 @@
+//!
 use super::*;
 
 /// `team-agent attach-app-server-leader` writes a typed codex_app_server

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

@@ -1,3 +1,4 @@
+//!
 //! diagnose/preflight/wait-ready CLI helpers.
 use super::*;
 use crate::model::pane_authority_refusal::{

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

@@ -1,3 +1,4 @@
+//!
 //! cli · emit — `emit`(--json vs 人读 dict 逐键)+ 顶层 `run` 调度(parser.py `main`)+
 //! 人读标量/集合渲染(`human_value` / `json_dumps_like`)。
 
@@ -5,6 +6,7 @@ use super::spec::{command_spec, CommandKind, CommandTier, ALL_DISPATCH_KINDS, CO
 use super::*;
 use std::io::{ErrorKind, Write as _};
 
+///
 /// `emit`(`helpers.py:12-23`):`--json`→`json.dumps(indent=2, ensure_ascii=False, sort_keys=True)`;
 /// 否则 dict 逐键 `key: value`(嵌套 dict/list 内联 compact json,`ensure_ascii=False`)、非 dict 直接 print。
 /// 返回应打印到 stdout 的字符串(bin main 负责实际 println)。
@@ -42,6 +44,7 @@ fn emit_with_json_order(
     }
 }
 
+///
 /// `main(argv)`(`parser.py:84`):**CLI 唯一进程入口**。codex/claude/copilot passthrough 早返回 →
 /// 解析 argv 到 subcommand → 调对应 handler → 异常落盘 + 信封 + `ExitCode::Error` →
 /// `consume_leader_inbox_summary` → `emit` → `result.ok is False ? Error : Ok`。
@@ -333,6 +336,7 @@ fn compat_hidden_help(command: &str, usage: &str) -> String {
     format!("{usage}\n\nstatus: hidden compatibility command\nsunset: {sunset}\naction: {action}")
 }
 
+///
 /// Test-only public accessor for `command_help` — allows integration
 /// tests to grep the help copy without depending on internal parser
 /// machinery.
@@ -340,6 +344,7 @@ pub fn __test_command_help(command: Option<&str>) -> String {
     command_help(command)
 }
 
+///
 /// Test-only public accessor for `quick_start_args` — allows
 /// integration tests to exercise the parser without going through
 /// stdio + the full `main` entrypoint.
@@ -1094,6 +1099,7 @@ fn send_args(args: &[String], cwd: &Path) -> Result<SendArgs, CliError> {
     };
     let message_start = usize::from(target.is_some());
     let workspace = workspace(&parsed, cwd);
+    let sender = trusted_cli_sender(&workspace, parsed.team.as_deref())?;
     let presentation_value = if parsed.presentation_sink.is_some()
         || parsed.message_class.is_some()
         || parsed.case_id.is_some()
@@ -1127,7 +1133,7 @@ fn send_args(args: &[String], cwd: &Path) -> Result<SendArgs, CliError> {
         workspace,
         team: parsed.team,
         task: None,
-        sender: trusted_cli_sender(),
+        sender,
         no_ack: false,
         no_wait: true,
         watch_result: false,
@@ -1142,14 +1148,42 @@ fn send_args(args: &[String], cwd: &Path) -> Result<SendArgs, CliError> {
     })
 }
 
-fn trusted_cli_sender() -> TrustedSender {
-    std::env::var("TEAM_AGENT_ID")
+fn trusted_cli_sender(workspace: &Path, team: Option<&str>) -> Result<TrustedSender, CliError> {
+    let agent_id = std::env::var("TEAM_AGENT_ID")
         .ok()
         .map(|value| value.trim().to_string())
-        .filter(|value| !value.is_empty())
-        .map(crate::model::ids::AgentId::new)
-        .map(TrustedSender::from_runtime_identity)
-        .unwrap_or_else(TrustedSender::leader)
+        .filter(|value| !value.is_empty());
+    let worker_context = ["TEAM_AGENT_OWNER_TEAM_ID", "TEAM_AGENT_AGENT_ID"]
+        .into_iter()
+        .any(|key| {
+            std::env::var(key)
+                .ok()
+                .is_some_and(|value| !value.trim().is_empty())
+        });
+    let Some(agent_id) = agent_id else {
+        if worker_context {
+            return Err(CliError::Usage(
+                "send requires framework-injected TEAM_AGENT_ID; refusing leader identity fallback"
+                    .to_string(),
+            ));
+        }
+        return Ok(TrustedSender::leader());
+    };
+    let source_workspace = std::env::var("TEAM_AGENT_WORKSPACE")
+        .ok()
+        .filter(|value| !value.trim().is_empty())
+        .unwrap_or_else(|| workspace.display().to_string());
+    let source_team = std::env::var("TEAM_AGENT_OWNER_TEAM_ID")
+        .ok()
+        .or_else(|| std::env::var("TEAM_AGENT_TEAM_ID").ok())
+        .or_else(|| team.map(ToOwned::to_owned))
+        .filter(|value| !value.trim().is_empty())
+        .unwrap_or_else(|| "unknown".to_string());
+    Ok(TrustedSender::from_runtime_identity_with_source(
+        crate::model::ids::AgentId::new(agent_id),
+        source_workspace,
+        &source_team,
+    ))
 }
 
 fn warn_send_legacy_delivery_flags(args: &[String]) {

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

@@ -1,3 +1,4 @@
+//!
 //! cli · helpers — 跨子模块共用的小工具:tmux 冲突解析、Python 真值/falsy-or 语义、
 //! 字符级截断、相对 age 文本、稳定 key-sorted JSON。
 

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

@@ -1,3 +1,4 @@
+//!
 //! cli · leader — `codex`/`claude`/`copilot` passthrough(`cmd_leader_passthrough` + `_provider_args` /
 //! `_leader_launcher_args`)+ leader fallback inbox 摘要(`consume_leader_inbox_summary` 及
 //! `_leader_inbox_entries` / `_leader_inbox_summary` / `_leader_inbox_entry_title`)。
@@ -8,6 +9,7 @@ use super::*;
 // `codex`/`claude` passthrough 解析(helpers.py `_provider_args`/`_leader_launcher_args`)
 // =============================================================================
 
+///
 /// `_provider_args`(`helpers.py:190-193`):剥掉前导 `--`(REMAINDER 第一个 token)。
 pub fn provider_args(values: &[String]) -> Vec<String> {
     match values.first().map(String::as_str) {
@@ -16,8 +18,9 @@ pub fn provider_args(values: &[String]) -> Vec<String> {
     }
 }
 
+///
 /// `_leader_launcher_args`(`helpers.py:196-226`):解析 attach 旗标;`--attach-session` 缺值 → Err。
-pub fn leader_launcher_args(values: &[String]) -> Result<LeaderLauncherArgs, CliError> {
+pub(super) fn leader_launcher_args(values: &[String]) -> Result<LeaderLauncherArgs, CliError> {
     let mut out = LeaderLauncherArgs::default();
     let mut idx = 0;
     while idx < values.len() {
@@ -92,6 +95,7 @@ fn without_leader_json(values: &[String]) -> Vec<String> {
     out
 }
 
+///
 /// `codex`/`claude`/`copilot` passthrough(`parser.py:86`/`_run_leader_passthrough`):leader 早返回,
 /// **不**进 subparser。`-h`/`--help` 打 usage 直接返回 [`CmdResult::none`]。否则解析 attach
 /// 旗标 + `lifecycle_port::start_leader`。`command` ∈ {codex, claude, copilot}。
@@ -120,6 +124,7 @@ pub(crate) fn leader_passthrough_provider(command: &str) -> crate::model::enums:
 // leader fallback inbox 摘要(helpers.py `consume_leader_inbox_summary`)
 // =============================================================================
 
+///
 /// `consume_leader_inbox_summary`(`helpers.py:26-55`):每条命令后读
 /// `.team/runtime/leader-inbox.log`,从游标 `.cursor` 起读新增字节,渲染 N 条 fallback 条目摘要
 /// (`_leader_inbox_summary`,字节预算 budget=500 截断 + `Hint: team-agent inbox leader`),

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

@@ -1,3 +1,4 @@
+//!
 //! E7 (0.5.9 host-leader-registry-design §4.1): `team-agent leaders` command.
 //!
 //! Enumerates entries under `~/.team-agent/leaders`, re-validates each
@@ -13,6 +14,7 @@
 use super::{types::LeadersArgs, CliError, CmdResult};
 use serde_json::{json, Value};
 
+///
 /// E7 CLI entry point (E7 test 2 marker: `cmd_leaders`).
 ///
 /// Reads registry entries, canonical-validates each, and groups by

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

@@ -1,3 +1,4 @@
+//!
 //! step 14b · cli — `team-agent <subcommand>` clap 命令面(真相源 `cli/`)。
 //!
 //! Card: `docs/phase0/subsystems/14-mcp_cli.md`(CLI 半边)。
@@ -78,6 +79,7 @@ pub use send::*;
 pub use status::*;
 pub use types::*;
 
+///
 /// Public `attach-leader` CLI handler. It consumes the typed pane/provider args and
 /// writes/returns a `leader_receiver` binding via the leader lease port.
 pub fn cmd_attach_leader(args: &AttachLeaderArgs) -> Result<CmdResult, CliError> {
@@ -117,6 +119,7 @@ pub mod lifecycle_port {
     use super::*;
     use crate::model::enums::Provider;
 
+    ///
     /// `runtime.quick_start`(`cmd_quick_start` 委派)。返回 `{ok, summary, ...}` 稳定形状。
     pub fn quick_start(
         workspace: &Path,
@@ -140,6 +143,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.start_leader`(`codex`/`claude` passthrough + `cmd_codex`/`cmd_claude`)。
     pub fn start_leader(
         provider: Provider,
@@ -456,6 +460,7 @@ pub mod lifecycle_port {
         let window = plan.leader_window.as_ref()?;
         crate::tmux_backend::attach_command_for_workspace(cwd, session, window.as_str())
     }
+    ///
     /// `runtime.shutdown`(`cmd_shutdown`)。
     ///
     /// 0.5.x Phase 1d Batch 5: the workspace-transport branch now routes
@@ -547,6 +552,7 @@ pub mod lifecycle_port {
         },
     }
 
+    ///
     /// E12 纯决策(单测下沉):spare = `anchor_sessions` ∪ `team-agent-leader-*` 前缀(并集,锚优先)。
     /// 全部 session 都不 spare 且非空 → `KillServerExclusive`(独享 socket 兜底);否则逐 session
     /// kill 非 spare 的(共享 socket / leader 在 → 绝不整 server 拆)。空 session 集 → 逐 kill(no-op)。
@@ -2019,6 +2025,7 @@ pub mod lifecycle_port {
         }
     }
 
+    ///
     /// E4 真机 grounded(任何 team 的 shutdown 都不杀任何 team 的 leader 锚 pane):
     /// 扫 state.json 收集所有 leader-anchor pane_id(top-level team_owner /
     /// leader_receiver + teams[<key>].* 嵌套形态)。返非空 BTreeSet 给
@@ -2230,6 +2237,7 @@ pub mod lifecycle_port {
         protected
     }
 
+    ///
     /// B5/F2 + E4 真机 grounded(任何 team 的 shutdown 都不杀任何 team 的 leader 锚 pane):
     /// the leader terminal's pane process tree joins the protected set (same set, same
     /// mechanism as the invoker ancestry) so the workspace residual sweep's cmdline/cwd
@@ -2595,6 +2603,7 @@ pub mod lifecycle_port {
         let root = root.canonicalize().unwrap_or_else(|_| root.to_path_buf());
         path == root || path.starts_with(root)
     }
+    ///
     /// `runtime.restart`(`cmd_restart`)。
     pub fn restart(
         workspace: &Path,
@@ -2612,6 +2621,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.start_agent`(`cmd_start_agent`)。
     pub fn start_agent(
         workspace: &Path,
@@ -2636,6 +2646,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.stop_agent`(`cmd_stop_agent`)。
     pub fn stop_agent(
         workspace: &Path,
@@ -2648,6 +2659,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.reset_agent`(`cmd_reset_agent`;`--discard-session` 必需)。
     pub fn reset_agent(
         workspace: &Path,
@@ -2698,6 +2710,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.add_agent`(`cmd_add_agent`;`--role-file` 必需)。
     pub fn add_agent(
         workspace: &Path,
@@ -2724,6 +2737,7 @@ pub mod lifecycle_port {
             Err(e) => Ok(error_value(e)),
         }
     }
+    ///
     /// `runtime.fork_agent`(`cmd_fork_agent`;`--as` 必需)。
     pub fn fork_agent(
         workspace: &Path,
@@ -2771,6 +2785,7 @@ pub mod lifecycle_port {
             Err(error) => Ok(error_value(error)),
         }
     }
+    ///
     /// `runtime.remove_agent`(`cmd_remove_agent`;`--from-spec` 须配 `--confirm`)。
     pub fn remove_agent(
         workspace: &Path,
@@ -2942,6 +2957,7 @@ pub mod lifecycle_port {
             format!("'{}'", raw.replace('\'', "'\\''"))
         }
     }
+    ///
     /// `runtime.acknowledge_idle`(`cmd_acknowledge_idle`)。
     pub fn acknowledge_idle(workspace: &Path, team: Option<&str>) -> Result<Value, CliError> {
         let mut state = crate::state::persist::load_runtime_state(workspace)
@@ -4067,6 +4083,7 @@ pub mod lifecycle_port {
 pub mod diagnose_port {
     use super::*;
 
+    ///
     /// `runtime.doctor(spec)` + schema 注入(`cmd_doctor` 默认分支)。
     pub fn doctor(workspace: &Path, spec: Option<&Path>) -> Result<Value, CliError> {
         let tmux_path = which_path("tmux");
@@ -4334,8 +4351,10 @@ pub mod diagnose_port {
             }
         }
     }
+    ///
     /// `run_comms_selftest`(`--comms`/`--gate comms`)。**纯 state-read,零 token**(MUST-NOT-13)。
-    pub fn comms_selftest(
+    #[cfg(test)]
+    pub(super) fn comms_selftest(
         workspace: &Path,
         team: Option<&str>,
         gate: Option<&str>,
@@ -4343,14 +4362,19 @@ pub mod diagnose_port {
         crate::diagnose::comms::doctor_comms_json(workspace, team, gate)
     }
 
+    ///
     /// `orphan_gate(fix, confirm)`(`--gate orphans`)。CI gate。
-    pub fn orphan_gate(workspace: &Path, fix: bool, confirm: bool) -> Result<Value, CliError> {
+    #[cfg(test)]
+    pub(super) fn orphan_gate(workspace: &Path, fix: bool, confirm: bool) -> Result<Value, CliError> {
         crate::diagnose::orphans::orphan_gate_json(workspace, fix, confirm)
     }
+    ///
     /// `cleanup_orphan_coordinators(confirm)`(`--cleanup-orphans`;dry-run unless `--confirm`)。
-    pub fn cleanup_orphans(workspace: &Path, confirm: bool) -> Result<Value, CliError> {
+    #[cfg(test)]
+    pub(super) fn cleanup_orphans(workspace: &Path, confirm: bool) -> Result<Value, CliError> {
         crate::diagnose::orphans::cleanup_orphans_json(workspace, confirm)
     }
+    ///
     /// `fix_schema_layout`(`--fix-schema`)/`schema_diagnosis`。
     pub fn fix_schema(workspace: &Path) -> Result<Value, CliError> {
         let db_path = workspace.join(".team").join("runtime").join("team.db");
@@ -4520,6 +4544,7 @@ pub mod diagnose_port {
 pub mod leader_port {
     use super::*;
 
+    ///
     /// `runtime.takeover(workspace, team, confirm)` 的 CLI `--json` 投影。
     pub fn takeover(
         workspace: &Path,
@@ -4575,6 +4600,7 @@ pub mod leader_port {
         }
         Ok(value)
     }
+    ///
     /// `runtime.claim_leader(...)` 的 CLI `--json` 投影(`cmd_claim_leader`;含 inbox_hint)。
     pub fn claim_leader(
         workspace: &Path,
@@ -4624,6 +4650,7 @@ pub mod leader_port {
         Ok(value)
     }
 
+    ///
     /// `runtime.attach_leader(...)` 的 CLI `--json` 投影。
     pub fn attach_leader(
         workspace: &Path,
@@ -4651,6 +4678,7 @@ 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)
@@ -4720,6 +4748,7 @@ pub mod leader_port {
         );
     }
 
+    ///
     /// E7 GC hook: called from shutdown/unbind success paths.
     pub(crate) fn unregister_after_shutdown_success(
         workspace: &Path,
@@ -4991,6 +5020,7 @@ pub mod leader_port {
         Ok(json!([]))
     }
 
+    ///
     /// R8 D6 (decoupled for offline byte-lock — c-lite): project the requeued-exhausted event into the
     /// CLI `requeued_exhausted_watchers` return. golden (leader/__init__.py:56): the `watcher_ids`
     /// STRING list. (Current divergent body — the `requeued` Vec<WatcherNotice> objects — kept until

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

@@ -1,3 +1,4 @@
+//!
 //! CLI-local stable name resolver for `team-agent send --to-name`.
 
 use std::path::{Path, PathBuf};
@@ -193,6 +194,7 @@ impl NamedAddressError {
         self.with_scoped_suggestions(requested_display, candidate_values, best)
     }
 
+    ///
     /// 0.5.45 naming-addressing (design §3.3/§3.4): attach an
     /// advisory suggestion payload. `requested` is the original typo
     /// (surfaced verbatim in JSON + N38 Action); `ranked_candidates`
@@ -469,6 +471,7 @@ fn normalize_bare_with_team_scope(
     }
 }
 
+///
 /// E6 wiring helper (`cli::send::maybe_enqueue_offline_leader_mailbox`):
 /// re-parse a `<workspace>::<team>/leader` name and return the resolved
 /// target workspace + canonical team_key so send.rs can enqueue the
@@ -500,10 +503,14 @@ struct ParsedNamedAddress {
 
 impl ParsedNamedAddress {
     fn display_name(&self) -> String {
-        match &self.target {
+        let target = match &self.target {
             ParsedTarget::BareAgent(agent) => agent.clone(),
             ParsedTarget::TeamEntity { team, entity } => format!("{team}/{entity}"),
             ParsedTarget::SessionWindow { session, window } => format!("{session}:{window}"),
+        };
+        match &self.workspace {
+            Some(workspace) => format!("{}::{target}", workspace.display()),
+            None => target,
         }
     }
 }

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

@@ -1,3 +1,4 @@
+//!
 //! `profile {init,doctor,show}` CLI verb.
 
 use super::*;
@@ -159,7 +160,7 @@ fn validate_auth_mode(auth_mode: &str) -> Result<(), CliError> {
 fn profile_template(name: &str, auth_mode: &str) -> String {
     match auth_mode {
         "compatible_api" | "official_api" => {
-            format!("AUTH_MODE={auth_mode}\nPROFILE_NAME={name}\nAPI_KEY=\nMODEL=\n")
+            format!("AUTH_MODE={auth_mode}\nPROFILE_NAME={name}\nBASE_URL=\nAPI_KEY=\nMODEL=\n")
         }
         _ => format!("AUTH_MODE=subscription\nPROFILE_NAME={name}\n"),
     }

package/crates/team-agent/src/cli/send/coordinator.rs

@@ -1,3 +1,4 @@
+//!
 use super::*;
 
 pub(super) fn dirty_topology_refusal_value(

package/crates/team-agent/src/cli/send/mailbox.rs

@@ -1,3 +1,4 @@
+//!
 use super::*;
 
 pub(super) fn maybe_enqueue_offline_leader_mailbox(
@@ -64,6 +65,7 @@ pub(super) fn maybe_enqueue_offline_leader_mailbox(
             "to_name": to_name,
             "target_workspace": target_workspace.display().to_string(),
             "team_key": team_key,
+            "sender": sender,
             "recipient": "leader",
             "leader_attached": false,
             "message_id": message_id,
@@ -78,6 +80,7 @@ pub(super) fn maybe_enqueue_offline_leader_mailbox(
             "to_name": to_name,
             "target_workspace": target_workspace.display().to_string(),
             "team_key": team_key,
+            "sender": sender,
             "recipient": "leader",
             "leader_attached": false,
             "message_id": message_id,

package/crates/team-agent/src/cli/send/persist.rs

@@ -1,3 +1,4 @@
+//!
 use super::coordinator::{
     append_loud_ensure_fields, dirty_topology_refusal_value, loud_ensure_coordinator,
     target_has_known_worker,

package/crates/team-agent/src/cli/send/presentation.rs

@@ -1,3 +1,4 @@
+//!
 use crate::cli::{CliError, CmdOutput, CmdResult, ExitCode};
 use crate::messaging::{
     DeliveryOutcome, DeliveryRefusal, DeliveryStage, DeliveryStatus, MessageTarget, SendOptions,