@team-agent/installer 0.3.9 → 0.3.10

package/crates/team-agent/src/provider/approvals/parsing.rs

@@ -10,6 +10,8 @@ pub struct ApprovalPrompt {
     pub prompt: String,
     pub choices: Vec<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub server: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub tool: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub command: Option<String>,
@@ -21,6 +23,9 @@ impl ApprovalPrompt {
         map.insert("agent_id".to_string(), serde_json::json!(self.agent_id));
         map.insert("state".to_string(), serde_json::json!(self.state));
         map.insert("kind".to_string(), serde_json::json!(self.kind));
+        if let Some(server) = &self.server {
+            map.insert("server".to_string(), serde_json::json!(server));
+        }
         if let Some(tool) = &self.tool {
             map.insert("tool".to_string(), serde_json::json!(tool));
         }
@@ -54,17 +59,17 @@ pub fn extract_approval_prompt(agent_id: &str, capture: &str) -> Option<Approval
     let lines: Vec<&str> = capture.lines().collect();
     let control_idx = active_approval_control_index(&lines)?;
 
-    if let Some((matched_idx, prompt, tool)) = explicit_mcp_prompt(&lines, control_idx) {
+    if let Some((matched_idx, prompt, server, tool)) = explicit_mcp_prompt(&lines, control_idx) {
         let choices = approval_choices_between(&lines, matched_idx, control_idx);
-        return Some(approval(agent_id, ApprovalKind::McpTool, prompt, choices, Some(tool), None));
+        return Some(approval(agent_id, ApprovalKind::McpTool, prompt, choices, Some(server), Some(tool), None));
     }
-    if let Some((matched_idx, prompt, tool)) = short_mcp_prompt(&lines, control_idx) {
+    if let Some((matched_idx, prompt, server, tool)) = short_mcp_prompt(&lines, control_idx) {
         let choices = approval_choices_between(&lines, matched_idx, control_idx);
-        return Some(approval(agent_id, ApprovalKind::McpTool, prompt, choices, Some(tool), None));
+        return Some(approval(agent_id, ApprovalKind::McpTool, prompt, choices, Some(server), Some(tool), None));
     }
     if let Some((matched_idx, prompt, command)) = command_prompt(&lines, control_idx) {
         let choices = approval_choices_between(&lines, matched_idx, control_idx);
-        return Some(approval(agent_id, ApprovalKind::Command, prompt, choices, None, Some(command)));
+        return Some(approval(agent_id, ApprovalKind::Command, prompt, choices, None, None, Some(command)));
     }
     let choices = approval_choices_between(&lines, 0, control_idx);
     Some(approval(
@@ -74,6 +79,7 @@ pub fn extract_approval_prompt(agent_id: &str, capture: &str) -> Option<Approval
         choices,
         None,
         None,
+        None,
     ))
 }
 
@@ -117,6 +123,7 @@ fn approval(
     kind: ApprovalKind,
     prompt: String,
     choices: Vec<String>,
+    server: Option<String>,
     tool: Option<String>,
     command: Option<String>,
 ) -> ApprovalPrompt {
@@ -126,6 +133,7 @@ fn approval(
         kind,
         prompt,
         choices,
+        server,
         tool,
         command,
     }
@@ -137,15 +145,18 @@ fn is_control_line(line: &str) -> bool {
         || (lower.contains("esc to cancel") && lower.contains("tab to amend"))
 }
 
-fn explicit_mcp_prompt(lines: &[&str], control_idx: usize) -> Option<(usize, String, String)> {
+fn explicit_mcp_prompt(lines: &[&str], control_idx: usize) -> Option<(usize, String, String, String)> {
     for (idx, raw) in lines.iter().enumerate().take(control_idx).rev() {
         let line = clean_line(raw);
-        let prefix = "Allow the team_orchestrator MCP server to run tool \"";
+        let prefix = "Allow the ";
         if let Some(rest) = line.strip_prefix(prefix) {
-            if let Some((tool, _)) = rest.split_once('"') {
-                if !tool.is_empty() {
-                    let tool = tool.to_string();
-                    return Some((idx, line, tool));
+            if let Some((server, rest)) = rest.split_once(" MCP server to run tool \"") {
+                if let Some((tool, _)) = rest.split_once('"') {
+                    if !server.is_empty() && !tool.is_empty() {
+                        let server = server.to_string();
+                        let tool = tool.to_string();
+                        return Some((idx, line, server, tool));
+                    }
                 }
             }
         }
@@ -153,17 +164,17 @@ fn explicit_mcp_prompt(lines: &[&str], control_idx: usize) -> Option<(usize, Str
     None
 }
 
-fn short_mcp_prompt(lines: &[&str], control_idx: usize) -> Option<(usize, String, String)> {
+fn short_mcp_prompt(lines: &[&str], control_idx: usize) -> Option<(usize, String, String, String)> {
     for (idx, raw) in lines.iter().enumerate().take(control_idx).rev() {
         let line = clean_line(raw);
         if parse_choice_line(&line).is_some() {
             continue;
         }
         if let Some(tool) = team_orchestrator_tool(&line, '-') {
-            return Some((idx, format!("team_orchestrator - {tool}"), tool));
+            return Some((idx, format!("team_orchestrator - {tool}"), "team_orchestrator".to_string(), tool));
         }
         if let Some(tool) = team_orchestrator_tool(&line, '.') {
-            return Some((idx, format!("team_orchestrator - {tool}"), tool));
+            return Some((idx, format!("team_orchestrator - {tool}"), "team_orchestrator".to_string(), tool));
         }
     }
     None
@@ -287,6 +298,7 @@ mod tests {
         assert_eq!(prompt.agent_id, "agent-x");
         assert_eq!(prompt.state, "waiting_approval");
         assert_eq!(prompt.kind, ApprovalKind::McpTool);
+        assert_eq!(prompt.server.as_deref(), Some("team_orchestrator"));
         assert_eq!(prompt.tool.as_deref(), Some("send_message"));
         assert_eq!(prompt.prompt, "Allow the team_orchestrator MCP server to run tool \"send_message\"?");
         assert_eq!(prompt.choices, vec!["Allow for this session", "Deny"]);
@@ -300,10 +312,23 @@ mod tests {
         )
         .unwrap();
         assert_eq!(prompt.kind, ApprovalKind::McpTool);
+        assert_eq!(prompt.server.as_deref(), Some("team_orchestrator"));
         assert_eq!(prompt.tool.as_deref(), Some("assign_task"));
         assert_eq!(prompt.prompt, "team_orchestrator - assign_task");
     }
 
+    #[test]
+    fn explicit_mcp_prompt_preserves_custom_server_name() {
+        let prompt = extract_approval_prompt(
+            "agent-x",
+            "Allow the custom_server MCP server to run tool \"write_file\"?\n  1. Allow\nEnter to submit | Esc to cancel\n",
+        )
+        .unwrap();
+        assert_eq!(prompt.kind, ApprovalKind::McpTool);
+        assert_eq!(prompt.server.as_deref(), Some("custom_server"));
+        assert_eq!(prompt.tool.as_deref(), Some("write_file"));
+    }
+
     #[test]
     fn command_prompt_extracts_command_before_prompt() {
         let prompt = extract_approval_prompt(
@@ -354,6 +379,7 @@ mod tests {
             ],
             None,
             None,
+            None,
         );
         assert_eq!(choose_internal_mcp_approval_choice(&prompt), "Allow for this session");
         prompt.choices = vec!["Maybe".to_string()];
@@ -374,6 +400,7 @@ mod tests {
             vec!["Allow".to_string(), "Deny".to_string()],
             None,
             None,
+            None,
         );
         assert_eq!(approval_choice_keys(&prompt, "❯ 1. Allow\n", "Missing"), vec!["Down", "Enter"]);
         assert_eq!(approval_choice_keys(&prompt, "  1. Allow\n  2. Deny\n", "Deny"), vec!["2", "Enter"]);
@@ -413,6 +440,7 @@ mod tests {
             ApprovalKind::McpTool,
             "p".to_string(),
             vec!["Allow".to_string()],
+            None,
             Some("send_message".to_string()),
             None,
         )
@@ -426,6 +454,7 @@ mod tests {
             "p".to_string(),
             vec!["Yes".to_string()],
             None,
+            None,
             Some("Bash(echo hi)".to_string()),
         )
         .to_ordered_value();

package/crates/team-agent/src/provider/approvals/runtime_prompts.rs

@@ -5,15 +5,15 @@ use sha2::{Digest, Sha256};
 
 use crate::provider::{ApprovalFingerprint, ApprovalKind, ApprovalPrompt};
 
-pub const RUNTIME_MCP_APPROVAL_ALLOWLIST: &[&str] = &[
-    "send_message",
-    "report_result",
-    "get_team_status",
-    "request_human",
-];
+pub const RUNTIME_MCP_APPROVAL_SERVER: &str = "team_orchestrator";
 
 pub fn runtime_mcp_tool_allowlisted(tool: &str) -> bool {
-    RUNTIME_MCP_APPROVAL_ALLOWLIST.contains(&tool)
+    !tool.trim().is_empty()
+}
+
+pub fn runtime_mcp_prompt_allowlisted(prompt: &ApprovalPrompt) -> bool {
+    prompt.server.as_deref() == Some(RUNTIME_MCP_APPROVAL_SERVER)
+        && prompt.tool.as_deref().is_some_and(runtime_mcp_tool_allowlisted)
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -79,8 +79,7 @@ pub fn awaiting_human_confirm_reason(
 ) -> Option<&'static str> {
     match prompt.kind {
         ApprovalKind::McpTool => {
-            let tool = prompt.tool.as_deref()?;
-            if !runtime_mcp_tool_allowlisted(tool) {
+            if !runtime_mcp_prompt_allowlisted(prompt) {
                 Some("tool_not_allowlisted")
             } else if !leader_auto_approval_allowed {
                 Some("leader_restricted")
@@ -105,6 +104,10 @@ pub fn approval_prompt_fingerprint(team: &str, agent_id: &str, prompt: &Approval
         hasher.update(tool.as_bytes());
     }
     hasher.update([0]);
+    if let Some(server) = prompt.server.as_deref() {
+        hasher.update(server.as_bytes());
+    }
+    hasher.update([0]);
     if let Some(command) = prompt.command.as_deref() {
         hasher.update(command.as_bytes());
     }

package/crates/team-agent/src/transport/test_support.rs

@@ -25,6 +25,7 @@ struct OfflineState {
     targets: Vec<PaneInfo>,
     windows: Vec<WindowName>,
     pane_presence: BTreeMap<String, bool>,
+    spawned_panes_addressable: bool,
     liveness: BTreeMap<String, PaneLiveness>,
     default_liveness: PaneLiveness,
     calls: Vec<&'static str>,
@@ -41,6 +42,7 @@ impl Default for OfflineState {
             targets: Vec::new(),
             windows: Vec::new(),
             pane_presence: BTreeMap::new(),
+            spawned_panes_addressable: true,
             liveness: BTreeMap::new(),
             default_liveness: PaneLiveness::Unknown,
             calls: Vec::new(),
@@ -100,6 +102,11 @@ impl OfflineTransport {
         self
     }
 
+    pub fn with_spawned_panes_addressable(self, present: bool) -> Self {
+        self.with_state(|state| state.spawned_panes_addressable = present);
+        self
+    }
+
     pub fn calls(&self) -> Vec<&'static str> {
         self.with_state(|state| state.calls.clone())
     }
@@ -149,7 +156,11 @@ impl OfflineTransport {
             if kind == "spawn_first" && !state.session_absent_after_spawn_first {
                 state.session_present = true;
             }
-            state.spawns.len().saturating_sub(1)
+            let pane_index = state.spawns.len().saturating_sub(1);
+            state
+                .pane_presence
+                .insert(format!("%{pane_index}"), state.spawned_panes_addressable);
+            pane_index
         });
         SpawnResult {
             pane_id: PaneId::new(format!("%{pane_index}")),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "npx installer for Team Agent",
   "keywords": [
     "codex",
@@ -20,9 +20,9 @@
     "team-agent-installer": "npm/install.mjs"
   },
   "optionalDependencies": {
-    "@team-agent/cli-darwin-arm64": "0.3.9",
-    "@team-agent/cli-darwin-x64": "0.3.9",
-    "@team-agent/cli-linux-x64": "0.3.9"
+    "@team-agent/cli-darwin-arm64": "0.3.10",
+    "@team-agent/cli-darwin-x64": "0.3.10",
+    "@team-agent/cli-linux-x64": "0.3.10"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",