@team-agent/installer 0.5.112 → 0.5.114

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

@@ -0,0 +1,261 @@
+//! Early, host-global command dispatch: never select or initialize a workspace.
+use super::ExitCode;
+use crate::leader::prompt::{self, Mutation, PromptError};
+use serde_json::json;
+use std::io::{self, Write};
+use std::path::PathBuf;
+
+pub(crate) const HELP: &str = "Purpose:\nPersist supplemental system instructions for future Team Agent Leader launches only.\nUsage: team-agent leader-prompt [show|set|append|clear] [--json] [--file PATH | -- TEXT]\n\nOptions:\nshow (default) prints the exact text; set replaces it; append joins old and new text with two newlines; clear removes it.\nset/append require exactly one TEXT token after --, or --file PATH containing UTF-8 text. No implicit stdin.\nEverything after -- is literal text, including --json and --help. Empty text and NUL are rejected.\nConfiguration: ~/.team-agent/leader-prompt.txt, independent of the workspace. Mutations do not echo the text.\nOnly new Pi, Claude, Codex and Grok Leaders apply it; Worker launches never read it. Cursor/Copilot are refused when configured.\nCodex merges explicit argv developer_instructions, but overrides that user/profile configuration slot; migrate its existing text here.\nNative core prompts and unrelated launch arguments remain unchanged. Attach does not update an existing session.\nExamples:\nteam-agent leader-prompt show\nteam-agent leader-prompt set -- 'Keep replies concise.'\nteam-agent leader-prompt clear\n\nNext Action:\nUse show to inspect the text, then start a new Leader with team-agent pi (or claude/codex/grok).\nset/append/clear affect the next new process, not running Leaders or their conversation history.";
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum Operation {
+    Show,
+    Set,
+    Append,
+    Clear,
+}
+impl Operation {
+    fn name(self) -> &'static str {
+        match self {
+            Self::Show => "show",
+            Self::Set => "set",
+            Self::Append => "append",
+            Self::Clear => "clear",
+        }
+    }
+}
+#[derive(Debug, Eq, PartialEq)]
+enum Input {
+    Text(String),
+    File(PathBuf),
+}
+#[derive(Debug)]
+struct Request {
+    operation: Operation,
+    input: Option<Input>,
+    json: bool,
+    help: bool,
+}
+fn usage() -> PromptError {
+    PromptError::new(
+        "leader_prompt_invalid_input",
+        "Invalid or incomplete leader-prompt arguments; use one input for set/append",
+        None,
+    )
+}
+fn parse(args: &[String]) -> Result<Request, PromptError> {
+    let end = args
+        .iter()
+        .position(|arg| arg == "--")
+        .unwrap_or(args.len());
+    let mut json = false;
+    let mut help = false;
+    let mut file = None;
+    let mut positional = None;
+    let mut i = 0;
+    while i < end {
+        match args[i].as_str() {
+            "--json" if !json => json = true,
+            "--help" | "-h" if !help => help = true,
+            "--stdin" => {
+                return Err(PromptError::new(
+                    "leader_prompt_invalid_input",
+                    "--stdin is not supported for leader-prompt; use -- TEXT or --file PATH instead",
+                    None,
+                ));
+            }
+            "--file" if file.is_none() && i + 1 < end => {
+                i += 1;
+                if matches!(args[i].as_str(), "--json" | "--help" | "-h" | "--file") {
+                    return Err(usage());
+                }
+                file = Some(PathBuf::from(&args[i]));
+            }
+            token if !token.starts_with('-') && positional.is_none() => positional = Some(token),
+            _ => return Err(usage()),
+        }
+        i += 1;
+    }
+    let operation = match positional.unwrap_or("show") {
+        "show" => Operation::Show,
+        "set" => Operation::Set,
+        "append" => Operation::Append,
+        "clear" => Operation::Clear,
+        _ => return Err(usage()),
+    };
+    let text = if end < args.len() {
+        if args.len() != end + 2 {
+            return Err(usage());
+        }
+        Some(args[end + 1].clone())
+    } else {
+        None
+    };
+    if (file.is_some() && text.is_some()) || (help && (file.is_some() || text.is_some())) {
+        return Err(usage());
+    }
+    let input = file.map(Input::File).or_else(|| text.map(Input::Text));
+    if !help && (matches!(operation, Operation::Set | Operation::Append) != input.is_some()) {
+        return Err(usage());
+    }
+    Ok(Request {
+        operation,
+        input,
+        json,
+        help,
+    })
+}
+fn execute(request: Request) -> Result<(), PromptError> {
+    let path = prompt::config_path()?;
+    if request.operation == Operation::Show {
+        let text = prompt::read(&path)?.unwrap_or_default();
+        if request.json {
+            println!(
+                "{}",
+                json!({"configured": !text.is_empty(), "config_path": path, "prompt": text})
+            );
+        } else {
+            // Unlike mutation diagnostics, explicit show must preserve every byte.
+            io::stdout()
+                .write_all(text.as_bytes())
+                .and_then(|_| io::stdout().flush())
+                .map_err(|error| PromptError::io("leader_prompt_write_failed", &path, error))?;
+        }
+        return Ok(());
+    }
+    let mutation = match request.operation {
+        Operation::Clear => Mutation::Clear,
+        _ => {
+            let text = match request.input {
+                Some(Input::Text(text)) => text,
+                Some(Input::File(input)) => std::fs::read_to_string(&input).map_err(|error| {
+                    PromptError::io("leader_prompt_unreadable", &input, error).at_config(&path)
+                })?,
+                None => return Err(usage()),
+            };
+            if request.operation == Operation::Set {
+                Mutation::Set(text)
+            } else {
+                Mutation::Append(text)
+            }
+        }
+    };
+    let configured = prompt::mutate(&path, mutation)?;
+    if request.json {
+        println!(
+            "{}",
+            json!({"operation": request.operation.name(), "configured": configured, "config_path": path})
+        );
+    } else {
+        println!(
+            "Leader prompt {}: configured={configured}; config={}",
+            request.operation.name(),
+            path.display()
+        );
+    }
+    Ok(())
+}
+pub(crate) fn run(args: &[String]) -> ExitCode {
+    let end = args
+        .iter()
+        .position(|arg| arg == "--")
+        .unwrap_or(args.len());
+    let as_json = args[..end].iter().any(|arg| arg == "--json");
+    let result = match parse(args) {
+        Ok(request) if request.help => {
+            println!("{HELP}");
+            return ExitCode::Ok;
+        }
+        Ok(request) => execute(request),
+        Err(error) => Err(error),
+    };
+    match result {
+        Ok(()) => ExitCode::Ok,
+        Err(error) => {
+            if as_json {
+                println!("{}", error.report());
+            } else {
+                eprintln!("{error}");
+            }
+            if error.reason == "leader_prompt_invalid_input" {
+                ExitCode::Usage
+            } else {
+                ExitCode::Error
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod tests {
+    use super::*;
+    fn args(tokens: &[&str]) -> Vec<String> {
+        tokens.iter().map(|text| text.to_string()).collect()
+    }
+    #[test]
+    fn leader_prompt_controls_stop_at_delimiter() {
+        for text in ["--json", "--help", "--file", "--stdin", "multi\nline🙂", ""] {
+            let request = parse(&args(&["set", "--", text])).unwrap();
+            assert!(!request.json && !request.help);
+            assert_eq!(request.input, Some(Input::Text(text.into())));
+        }
+        assert!(parse(&args(&[])).unwrap().operation == Operation::Show);
+        let request = parse(&args(&["--json", "append", "--file", "path with 中文"])).unwrap();
+        assert_eq!(
+            request.input,
+            Some(Input::File(PathBuf::from("path with 中文")))
+        );
+        assert!(request.json);
+    }
+    #[test]
+    fn leader_prompt_stdin_control_reports_unsupported_input_with_usage_exit() {
+        for tokens in [
+            vec!["set", "--stdin"],
+            vec!["set", "--json", "--stdin"],
+            vec!["append", "--json", "--stdin"],
+        ] {
+            let tokens = args(&tokens);
+            let error = parse(&tokens).unwrap_err();
+            assert_eq!(error.reason, "leader_prompt_invalid_input");
+            assert_eq!(
+                error.error,
+                "--stdin is not supported for leader-prompt; use -- TEXT or --file PATH instead"
+            );
+            assert!(error.config_path.is_none());
+            assert_eq!(error.report()["reason"], "leader_prompt_invalid_input");
+            assert_eq!(error.report()["error"], error.error);
+            assert!(error.to_string().contains("--stdin is not supported"));
+            assert_eq!(run(&tokens).code(), 2);
+        }
+    }
+    #[test]
+    fn leader_prompt_stdin_file_value_is_not_reclassified_as_a_control() {
+        for operation in ["set", "append"] {
+            let request = parse(&args(&[operation, "--file", "--stdin"])).unwrap();
+            assert_eq!(request.input, Some(Input::File(PathBuf::from("--stdin"))));
+        }
+    }
+    #[test]
+    fn leader_prompt_rejects_duplicate_missing_unknown_or_extra_controls() {
+        for tokens in [
+            vec!["set"],
+            vec!["append", "--"],
+            vec!["set", "--", "one", "two"],
+            vec!["set", "--file"],
+            vec!["set", "--file", "input", "--", "text"],
+            vec!["show", "--", "text"],
+            vec!["clear", "--file", "input"],
+            vec!["show", "--json", "--json"],
+            vec!["set", "--file", "one", "--file", "two"],
+            vec!["show", "--unknown"],
+            vec!["show", "clear"],
+            vec!["unknown", "--help"],
+        ] {
+            assert_eq!(
+                parse(&args(&tokens)).unwrap_err().reason,
+                "leader_prompt_invalid_input"
+            );
+        }
+    }
+}

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

@@ -124,7 +124,7 @@ fn send_hint(entry: &LeaderRegistryEntry) -> String {
     format!(
         "team-agent send {} {}",
         quote_cli_arg(&to),
-        quote_cli_arg("消息")
+        quote_cli_arg("message")
     )
 }
 
@@ -183,19 +183,19 @@ fn format_leaders_human(rows: &[LeaderRow], view: LeadersView) -> String {
     if rows.is_empty() {
         return match view {
             LeadersView::Live => {
-                "没有可用主控；运行 team-agent doctor --workspace . 检查当前队伍。\n".to_string()
+                "No live leaders. Run team-agent doctor --workspace . for the current team.\n".to_string()
             }
-            LeadersView::All => "没有已登记主控；首次协作用 team-agent pi 打开主控。\n".to_string(),
-            LeadersView::Stale => "没有已失效的主控登记。\n".to_string(),
+            LeadersView::All => "No registered leaders. Open a leader with team-agent pi for first-time collaboration.\n".to_string(),
+            LeadersView::Stale => "No stale leader registrations.\n".to_string(),
         };
     }
-    let mut out = String::from("主控\t状态\t项目\t队伍\t发送命令\n");
+    let mut out = String::from("leader\tstatus\tworkspace\tteam\tsend command\n");
     for row in rows {
         out.push_str("leader\t");
         out.push_str(match row.status {
-            "LIVE" => "可用",
-            "STALE" => "已失效",
-            "AMBIGUOUS" => "需确认归属",
+            "LIVE" => "LIVE",
+            "STALE" => "STALE",
+            "AMBIGUOUS" => "AMBIGUOUS",
             other => other,
         });
         out.push('\t');
@@ -212,7 +212,7 @@ fn format_leaders_human(rows: &[LeaderRow], view: LeadersView) -> String {
                     &row.entry.workspace,
                     Some(&row.entry.team_key),
                 )
-                .unwrap_or_else(|| "请核对项目路径".to_string()),
+                .unwrap_or_else(|| "Verify the workspace path".to_string()),
             );
         }
         out.push('\n');
@@ -240,33 +240,33 @@ fn prune_json(report: &RegistryPruneReport) -> Value {
 }
 
 fn format_prune_human(report: &RegistryPruneReport) -> String {
-    let mut out = format!("仅预览：{}\n", report.dry_run);
+    let mut out = format!("dry_run: {}\n", report.dry_run);
     for (label, items) in [
-        ("可清理登记", &report.candidates),
-        ("已清理", &report.removed),
-        ("保留", &report.kept),
-        ("跳过", &report.skipped),
-        ("错误", &report.errors),
+        ("candidates", &report.candidates),
+        ("removed", &report.removed),
+        ("kept", &report.kept),
+        ("skipped", &report.skipped),
+        ("errors", &report.errors),
     ] {
         out.push_str(&format!("{label}: {}\n", items.len()));
         for item in items {
             out.push_str("  ");
             out.push_str(&item.workspace.display().to_string());
-            out.push_str("，队伍：");
+            out.push_str(", team: ");
             out.push_str(&item.team_key);
             out.push_str(" [");
             out.push_str(match item.reason.as_str() {
-                "LIVE" => "仍可用，保留登记",
-                "team_key_not_found" => "队伍已不在项目中",
-                "team_not_alive" => "队伍已停止",
-                "registry_entry_missing" => "登记已不存在",
+                "LIVE" => "still live; registration retained",
+                "team_key_not_found" => "team no longer exists in the workspace",
+                "team_not_alive" => "team is stopped",
+                "registry_entry_missing" => "registration no longer exists",
                 "registry_entry_changed" | "canonical_state_changed" => {
-                    "登记或队伍已变化，停止清理"
+                    "registration or team changed; cleanup refused"
                 }
-                "canonical_state_unavailable" => "无法读取队伍状态，保留登记",
-                "registry_lock_unavailable" => "登记正被其他操作使用，停止清理",
-                "remove_failed" => "删除登记失败，请查看文件权限",
-                _ => "无法安全确认该登记；请体检所选项目",
+                "canonical_state_unavailable" => "team state unavailable; registration retained",
+                "registry_lock_unavailable" => "registry lock unavailable; cleanup refused",
+                "remove_failed" => "registration removal failed; inspect file permissions",
+                _ => "registration could not be verified safely; diagnose the selected workspace",
             });
             out.push_str("]\n");
         }
@@ -337,13 +337,13 @@ mod tests {
         assert_eq!(lines.len(), 3, "one header and both selected rows: {out}");
         let header = lines[0];
         assert_eq!(header.split('\t').count(), 5);
-        assert!(header.contains("状态") && header.contains("项目") && header.contains("队伍"));
+        assert!(header.contains("status") && header.contains("workspace") && header.contains("team"));
         let live: Vec<_> = lines[1].split('\t').collect();
         assert_eq!(
             &live[..4],
             &[
                 "leader",
-                "可用",
+                "LIVE",
                 "/Volumes/nvme/Projects/讨论team-agent",
                 "wiki-team"
             ]
@@ -354,7 +354,7 @@ mod tests {
                 "team-agent",
                 "send",
                 "leader",
-                "请完成任务并把答案回复给 leader。",
+                "Complete the task and reply to the leader.",
                 "--workspace",
                 "/Volumes/nvme/Projects/讨论team-agent",
                 "--team",
@@ -364,7 +364,7 @@ mod tests {
         let stale: Vec<_> = lines[2].split('\t').collect();
         assert_eq!(
             &stale[..4],
-            &["leader", "已失效", "/Users/alauda/stale", "old-team"]
+            &["leader", "STALE", "/Users/alauda/stale", "old-team"]
         );
         assert_eq!(stale[4], "-", "stale rows must never suggest a send: {out}");
     }
@@ -404,9 +404,9 @@ mod tests {
     #[test]
     fn empty_view_names_are_explicit() {
         for (view, empty, next) in [
-            (LeadersView::Live, "没有可用主控", Some("team-agent doctor")),
-            (LeadersView::Stale, "没有已失效的主控登记", None),
-            (LeadersView::All, "没有已登记主控", Some("team-agent pi")),
+            (LeadersView::Live, "No live leaders", Some("team-agent doctor")),
+            (LeadersView::Stale, "No stale leader registrations", None),
+            (LeadersView::All, "No registered leaders", Some("team-agent pi")),
         ] {
             let out = format_leaders_human(&[], view);
             assert!(out.contains(empty) && out.ends_with('\n'), "{out}");