@team-agent/installer 0.3.1 → 0.3.2

package/Cargo.lock

@@ -555,7 +555,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -9,7 +9,7 @@ members = ["crates/team-agent"]
 
 [workspace.package]
 edition = "2021"
-version = "0.3.1"
+version = "0.3.2"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

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

@@ -85,7 +85,7 @@ pub fn cmd_init(args: &InitArgs) -> Result<CmdResult, CliError> {
 /// `cmd_quick_start`(`commands.py:18`)。`--json` 或 `!ok` → 整 dict;否则 `result["summary"]`。
 pub fn cmd_quick_start(args: &QuickStartArgs) -> Result<CmdResult, CliError> {
     let value = lifecycle_port::quick_start(
-        &args.agents_dir,
+        &args.workspace,
         &args.agents_dir,
         args.name.as_deref(),
         args.team_id.as_deref(),
@@ -123,6 +123,10 @@ pub fn cmd_compile(args: &CompileArgs) -> Result<CmdResult, CliError> {
 /// `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> {
+    cmd_status_for_team(args, None)
+}
+
+pub fn cmd_status_for_team(args: &StatusArgs, team: Option<&str>) -> Result<CmdResult, CliError> {
     if args.summary && args.json {
         return Err(CliError::Runtime(
             "--summary and --json are mutually exclusive".to_string(),
@@ -135,7 +139,7 @@ pub fn cmd_status(args: &StatusArgs) -> Result<CmdResult, CliError> {
     }
     let selected = match crate::state::selector::resolve_active_team(
         &args.workspace,
-        None,
+        team,
         crate::state::selector::SelectorMode::RuntimeOnly,
     ) {
         Ok(selected) => selected,
@@ -147,15 +151,29 @@ pub fn cmd_status(args: &StatusArgs) -> Result<CmdResult, CliError> {
         }
     };
     if args.summary {
-        let value = status_port::status(&selected.run_workspace, true, false)?;
+        let value = status_port::status_scoped(
+            &selected.run_workspace,
+            &selected.state,
+            Some(&selected.team_key),
+            true,
+            false,
+        )?;
         return Ok(CmdResult::human(format_status_summary(&value)));
     }
     if args.json {
-        let value = status_port::status(&selected.run_workspace, status_compact_flag(args.detail), args.detail)?;
+        let value = status_port::status_scoped(
+            &selected.run_workspace,
+            &selected.state,
+            Some(&selected.team_key),
+            status_compact_flag(args.detail),
+            args.detail,
+        )?;
         return Ok(CmdResult::from_json(value, true));
     }
-    Ok(CmdResult::human(status_port::format_status(
+    Ok(CmdResult::human(status_port::format_status_scoped(
         &selected.run_workspace,
+        &selected.state,
+        Some(&selected.team_key),
         args.agent.as_deref(),
     )?))
 }
@@ -252,9 +270,13 @@ pub fn cmd_validate_result(args: &ValidateResultArgs) -> Result<CmdResult, CliEr
 
 /// `cmd_collect`(`parser.py:292`)。
 pub fn cmd_collect(args: &CollectArgs) -> Result<CmdResult, CliError> {
+    cmd_collect_for_team(args, None)
+}
+
+pub fn cmd_collect_for_team(args: &CollectArgs, team: Option<&str>) -> Result<CmdResult, CliError> {
     let selected = match crate::state::selector::resolve_active_team(
         &args.workspace,
-        None,
+        team,
         crate::state::selector::SelectorMode::RuntimeOnly,
     ) {
         Ok(selected) => selected,
@@ -269,7 +291,16 @@ pub fn cmd_collect(args: &CollectArgs) -> Result<CmdResult, CliError> {
             ));
         }
     };
-    let value = match messaging::collect(&selected.run_workspace, args.result_file.as_deref(), false) {
+    let value = match if team.is_some() {
+        messaging::collect_for_team(
+            &selected.run_workspace,
+            args.result_file.as_deref(),
+            false,
+            Some(&selected.team_key),
+        )
+    } else {
+        messaging::collect(&selected.run_workspace, args.result_file.as_deref(), false)
+    } {
         Ok(value) => value,
         Err(error) => {
             return Ok(CmdResult::from_json(

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

@@ -79,7 +79,7 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
         "compile" => cmd_compile(&compile_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(&status_args(args, cwd)).map(emit_result),
+        "status" => cmd_status_for_team(&status_args(args, cwd), parse_args(args).team.as_deref()).map(emit_result),
         "stop" => cmd_shutdown(&shutdown_args(args, cwd)).map(emit_result),
         "shutdown" => cmd_shutdown(&shutdown_args(args, cwd)).map(emit_result),
         "restart" => cmd_restart(&restart_args(args, cwd)).map(emit_result),
@@ -108,7 +108,7 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
             Ok(ExitCode::Usage)
         }
         "validate-result" => cmd_validate_result(&validate_result_args(args)?).map(emit_result),
-        "collect" => cmd_collect(&collect_args(args, cwd)).map(emit_result),
+        "collect" => cmd_collect_for_team(&collect_args(args, cwd), parse_args(args).team.as_deref()).map(emit_result),
         "settle" => cmd_settle(&settle_args(args, cwd)).map(emit_result),
         "repair-state" => cmd_repair_state(&repair_state_args(args, cwd)?).map(emit_result),
         "diagnose" => cmd_diagnose(&diagnose_args(args, cwd)).map(emit_result),
@@ -195,7 +195,7 @@ fn command_help(command: Option<&str>) -> String {
         Some("compile") => "usage: team-agent compile --team TEAM [--out FILE] [--json]".to_string(),
         Some("send") => "usage: team-agent send TARGET MESSAGE... [--workspace WORKSPACE] [--team TEAM] [--targets AGENTS] [--task TASK] [--sender SENDER] [--watch-result] [--requires-ack|--no-ack] [--no-wait] [--timeout SECONDS] [--confirm-human] [--message-id ID] [--json]".to_string(),
         Some("allow-peer-talk") => "usage: team-agent allow-peer-talk A B [--workspace WORKSPACE] [--json]".to_string(),
-        Some("status") => "usage: team-agent status [AGENT] [--workspace WORKSPACE] [--summary|--json] [--detail]".to_string(),
+        Some("status") => "usage: team-agent status [AGENT] [--workspace WORKSPACE] [--team TEAM] [--summary|--json] [--detail]".to_string(),
         Some("stop") => "usage: team-agent stop [--workspace WORKSPACE] [--team TEAM] [--keep-logs] [--json]".to_string(),
         Some("shutdown") => "usage: team-agent shutdown [--workspace WORKSPACE] [--team TEAM] [--keep-logs] [--json]".to_string(),
         Some("restart") => "usage: team-agent restart [WORKSPACE] [--team TEAM] [--allow-fresh] [--json]".to_string(),
@@ -222,7 +222,7 @@ fn command_help(command: Option<&str>) -> String {
         Some("validate") => "usage: team-agent validate [SPEC] [--json]".to_string(),
         Some("profile") => "usage: team-agent profile COMMAND NAME [--workspace WORKSPACE] [--team TEAM] [--auth-mode MODE] [--json]".to_string(),
         Some("validate-result") => "usage: team-agent validate-result [ENVELOPE] [--file FILE|--result JSON] [--json]".to_string(),
-        Some("collect") => "usage: team-agent collect [--workspace WORKSPACE] [--result-file FILE] [--json]".to_string(),
+        Some("collect") => "usage: team-agent collect [--workspace WORKSPACE] [--team TEAM] [--result-file FILE] [--json]".to_string(),
         Some("settle") => "usage: team-agent settle [--workspace WORKSPACE] [--json]".to_string(),
         Some("repair-state") => "usage: team-agent repair-state --task TASK --status STATUS [SUMMARY] [--assignee AGENT] [--workspace WORKSPACE] [--json]".to_string(),
         Some("diagnose") => "usage: team-agent diagnose [--workspace WORKSPACE] [--json]".to_string(),
@@ -565,6 +565,7 @@ fn quick_start_args(args: &[String], cwd: &Path) -> Result<QuickStartArgs, CliEr
         workspace.join(agents_dir)
     };
     Ok(QuickStartArgs {
+        workspace,
         agents_dir,
         name: parsed.name,
         team_id: parsed.team_id.or(parsed.team),
@@ -1161,7 +1162,7 @@ mod tests {
         for (command, flags) in [
             ("quick-start", &["--workspace", "--team-id", "--yes", "--fresh", "--json"][..]),
             ("send", &["--workspace", "--team", "--targets", "--watch-result", "--timeout", "--json"][..]),
-            ("status", &["--workspace", "--summary", "--json", "--detail"][..]),
+            ("status", &["--workspace", "--team", "--summary", "--json", "--detail"][..]),
             ("shutdown", &["--workspace", "--team", "--keep-logs", "--json"][..]),
             ("restart", &["--team", "--allow-fresh", "--json"][..]),
             ("start-agent", &["--workspace", "--team", "--force", "--allow-fresh", "--no-display", "--json"][..]),
@@ -1170,7 +1171,7 @@ mod tests {
             ("fork-agent", &["--as", "--label", "--workspace", "--team", "--no-display", "--json"][..]),
             ("remove-agent", &["--workspace", "--team", "--from-spec", "--confirm", "--force", "--json"][..]),
             ("doctor", &["--workspace", "--team", "--gate", "--fix-schema", "--cleanup-orphans", "--json"][..]),
-            ("collect", &["--workspace", "--result-file", "--json"][..]),
+            ("collect", &["--workspace", "--team", "--result-file", "--json"][..]),
             ("repair-state", &["--task", "--status", "--assignee", "--workspace", "--json"][..]),
             ("wait-ready", &["--workspace", "--timeout", "--json"][..]),
             ("peek", &["--workspace", "--tail", "--allow-raw-screen", "--json"][..]),