@team-agent/installer 0.5.84 → 0.5.86

package/crates/team-agent/src/provider/adapters/grok.rs

@@ -9,7 +9,7 @@
 //!   这是 Provider::Grok 的能力边界，不是框架对所有 provider 的限制。
 //! boundary: 只服务 Provider::Grok。不改 claude/codex/copilot 路径
 //!
-//! Grok CLI provider-local command builders + permission helpers.
+//! Grok CLI provider-local command builders.
 //!
 //! Mirrors `adapters/claude.rs` (0.5.67 provider-adapter step). Pure
 //! flag-name adaptation over the claude skeleton — no new abstraction
@@ -24,7 +24,6 @@
 //!   fork    → `--fork-session` (with --resume)
 //!   effort  → `--effort <level>` (alias of `--reasoning-effort`)
 //!             grok accepts low|medium|high|xhigh; CLI rejects `max`
-//!   deny    → `--disallowed-tools` (compat alias `--disallowedTools`)
 //!   cwd     → `--cwd <CWD>` / `-w, --worktree [<WORKTREE>]`
 //!
 //! No native `--mcp-config` flag on the Grok CLI (`grok mcp` is a subcommand)
@@ -41,7 +40,7 @@ pub(crate) fn grok_launch_command(
     mcp_config: Option<&McpConfig>,
     system_prompt: Option<&str>,
     model: Option<&str>,
-    tools: &[&str],
+    dangerously_skip_permissions: bool,
 ) -> Result<Vec<String>, ProviderError> {
     let mut argv = grok_base_command(
         adapter,
@@ -49,7 +48,7 @@ pub(crate) fn grok_launch_command(
         mcp_config,
         system_prompt,
         model,
-        tools,
+        dangerously_skip_permissions,
         false,
         None,
     )?;
@@ -64,12 +63,12 @@ pub(crate) fn grok_base_command(
     mcp_config: Option<&McpConfig>,
     system_prompt: Option<&str>,
     model: Option<&str>,
-    tools: &[&str],
+    dangerously_skip_permissions: bool,
     managed_mcp_config: bool,
     effort: Option<crate::model::enums::ProviderEffort>,
 ) -> Result<Vec<String>, ProviderError> {
     let mut argv = vec!["grok".to_string()];
-    if grok_dangerous_auto_approve(tools) {
+    if dangerously_skip_permissions {
         argv.push("--always-approve".to_string());
     }
     let model = match model.map(str::trim).filter(|value| !value.is_empty()) {
@@ -101,57 +100,5 @@ model: grok-4.6"
     // Grok CLI has no `--mcp-config` flag — the claude inline-MCP block is
     // intentionally absent. Launch writes `<cwd>/.grok/config.toml`.
     let _ = (adapter, auth_mode, mcp_config, managed_mcp_config);
-    for tool in grok_disallowed_tools(tools) {
-        argv.push("--disallowedTools".to_string());
-        argv.push(tool.to_string());
-    }
     Ok(argv)
 }
-
-pub(crate) fn grok_dangerous_auto_approve(tools: &[&str]) -> bool {
-    tools.contains(&"dangerous_auto_approve")
-}
-
-pub(crate) fn grok_disallowed_tools(tools: &[&str]) -> Vec<&'static str> {
-    let mut disallowed = Vec::new();
-    for tool in [
-        "execute_bash",
-        "fs_read",
-        "fs_write",
-        "fs_list",
-        "network",
-        "git_diff",
-        "mcp_team",
-        "provider_builtin",
-    ] {
-        if tools.contains(&tool) {
-            continue;
-        }
-        match grok_tool_mapping(tool) {
-            GrokToolMapping::Deny(names) => disallowed.extend(names),
-            GrokToolMapping::Unsupported | GrokToolMapping::Bypass => {}
-        }
-    }
-    disallowed
-}
-
-/// Canonical tool → grok CLI deny names. Unknown tools stay Unsupported
-/// (no invented `--disallowedTools` token).
-pub(crate) fn grok_tool_mapping(tool: &str) -> GrokToolMapping {
-    match tool {
-        "execute_bash" => GrokToolMapping::Deny(&["Bash"]),
-        "fs_read" => GrokToolMapping::Deny(&["Read"]),
-        "fs_write" => GrokToolMapping::Deny(&["Edit", "Write", "MultiEdit", "NotebookEdit"]),
-        "fs_list" => GrokToolMapping::Deny(&["Glob", "Grep"]),
-        "dangerous_auto_approve" => GrokToolMapping::Bypass,
-        "network" | "git_diff" | "mcp_team" | "provider_builtin" => GrokToolMapping::Unsupported,
-        _ => GrokToolMapping::Unsupported,
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum GrokToolMapping {
-    Deny(&'static [&'static str]),
-    Bypass,
-    Unsupported,
-}

package/crates/team-agent/src/provider/adapters/mod.rs

@@ -1,20 +1,18 @@
 //!
 //! Provider-local adapter implementations. Split from the monolithic
 //! `provider/adapter.rs` as 0.4.x decoupling step 2. Each file owns its
-//! provider's command builders, permission/sandbox/auth helpers, and
+//! provider's command builders and auth helpers,
 //! anything else that varies by provider but doesn't need shared
 //! capture/scan utilities. The `ProviderAdapter` trait and the
 //! `BasicProviderAdapter` registry stay in `adapter.rs`; the trait impl
 //! dispatches into these helpers exactly as the inline forms did.
 //!
 //! Per-file scope:
-//!   * `claude` — Claude/ClaudeCode argv, dangerous-skip flag, disallowed
-//!     tools mapping, auth hint, model passthrough.
-//!   * `codex`  — Codex argv, profile/sandbox flags, MCP `-c` injection
-//!     with 600s tool_timeout, developer-instructions escaping.
+//!   * `claude` — Claude/ClaudeCode argv, bypass flag, auth hint, model passthrough.
+//!   * `codex`  — Codex argv, profile flags, MCP `-c` injection with 600s
+//!     tool_timeout, developer-instructions escaping.
 //!   * `copilot` — Copilot argv (no-color/no-remote/disable-builtin-mcps),
-//!     allow/deny flag matrix, MCP `type→transport` translation, resume
-//!     base, weak auth hint.
+//!     MCP `type→transport` translation, resume base, weak auth hint.
 //!   * `fake`   — Built-in scripted worker exec path.
 //!
 //! Behavior is byte-identical to pre-split. Future steps may move

package/crates/team-agent/src/provider/adapters/pi.rs

@@ -15,42 +15,6 @@ use std::path::Path;
 use crate::model::enums::ProviderEffort;
 use crate::provider::ProviderError;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum PiToolMapping {
-    Mcp,
-    Builtin(&'static [&'static str]),
-    Unsupported,
-}
-
-/// ---
-/// purpose: 把 Team tool category 映射为 exact Pi builtin/proxy names
-/// returns: 单个或多个 builtin、MCP proxy 或 Unsupported
-/// ---
-pub(crate) fn pi_tool_mapping(category: &str) -> PiToolMapping {
-    match category {
-        "mcp_team" => PiToolMapping::Mcp,
-        "fs_read" => PiToolMapping::Builtin(&["read"]),
-        "fs_list" => PiToolMapping::Builtin(&["grep", "find", "ls"]),
-        "fs_write" => PiToolMapping::Builtin(&["edit", "write"]),
-        "execute_bash" => PiToolMapping::Builtin(&["bash"]),
-        _ => PiToolMapping::Unsupported,
-    }
-}
-
-/// Return the first canonical category that Pi cannot map. Callers own alias
-/// expansion and generic unknown-category validation; this keeps the provider
-/// mapping itself as the only Pi capability contract.
-pub(crate) fn first_unsupported_pi_tool_category<'a, I>(
-    categories: I,
-) -> Option<&'a str>
-where
-    I: IntoIterator<Item = &'a str>,
-{
-    categories
-        .into_iter()
-        .find(|category| matches!(pi_tool_mapping(category), PiToolMapping::Unsupported))
-}
-
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum PiSessionSelector<'a> {
     Fresh { session_id: &'a str },
@@ -62,7 +26,6 @@ pub(crate) struct PiCommandRequest<'a> {
     pub model: Option<&'a str>,
     pub effort: Option<ProviderEffort>,
     pub system_prompt: &'a str,
-    pub tool_categories: &'a [&'a str],
     /// Team-owned session root for isolated seats; `None` preserves Pi's native default.
     pub session_dir: Option<&'a Path>,
     pub session: PiSessionSelector<'a>,
@@ -72,7 +35,7 @@ pub(crate) struct PiCommandRequest<'a> {
 /// ---
 /// purpose: 从已验证 semantic request 构造仅追加 Team Agent MCP/提示/session 的 Pi argv
 /// returns: exact ordered fresh/resume argv，argv[0] 固定为裸 `pi`
-/// errors: 必需字段、mcp_team 或工具 category 非法时返回 ProviderError
+/// errors: 必需字段时返回 ProviderError
 /// ---
 pub(crate) fn build_pi_command_argv(
     request: PiCommandRequest<'_>,
@@ -90,24 +53,6 @@ pub(crate) fn build_pi_command_argv(
         ));
     }
 
-    let mut has_mcp = false;
-    for category in request.tool_categories {
-        match pi_tool_mapping(category) {
-            PiToolMapping::Mcp => has_mcp = true,
-            PiToolMapping::Builtin(_) => {}
-            PiToolMapping::Unsupported => {
-                return Err(ProviderError::Command(format!(
-                    "Pi does not support Team Agent tool category {category:?}"
-                )));
-            }
-        }
-    }
-    if !has_mcp {
-        return Err(ProviderError::Command(
-            "Pi command requires mcp_team".to_string(),
-        ));
-    }
-
     // Executable discovery/preflight belongs to the lifecycle materializer;
     // the actual command must remain PATH-resolved at spawn time.
     let mut argv = vec![

package/crates/team-agent/src/provider/bypass_flags.rs

@@ -11,8 +11,7 @@
 //!   - grok → `--always-approve`
 //!   - cursor_agent → `--force`
 //!
-//! 未定义(返回 None)的 provider:调用侧必须 fail-loud(见
-//! `resolved_tool_strings_for_command`),不得静默 fallback。
+//! 未定义(返回 None)的 provider:调用侧必须 fail-loud,不得静默 fallback。
 
 use crate::model::enums::Provider;
 

package/crates/team-agent/src/provider/session/capture.rs

@@ -1607,13 +1607,13 @@ pub(crate) mod test_support {
             ))
         }
 
-        fn build_command_with_tools(
+        fn build_command_with_permissions(
             &self,
             _auth_mode: crate::provider::AuthMode,
             _mcp_config: Option<&crate::provider::McpConfig>,
             _system_prompt: Option<&str>,
             _model: Option<&str>,
-            _tools: &[&str],
+            _dangerously_skip_permissions: bool,
         ) -> Result<Vec<String>, ProviderError> {
             Err(ProviderError::CapabilityUnsupported(
                 "test adapter".to_string(),
@@ -1683,7 +1683,7 @@ pub(crate) mod test_support {
             _mcp_config: Option<&crate::provider::McpConfig>,
             _system_prompt: Option<&str>,
             _model: Option<&str>,
-            _tools: &[&str],
+            _dangerously_skip_permissions: bool,
         ) -> Result<Vec<String>, ProviderError> {
             Err(ProviderError::CapabilityUnsupported(
                 "test adapter".to_string(),
@@ -1708,7 +1708,7 @@ pub(crate) mod test_support {
             _mcp_config: Option<&crate::provider::McpConfig>,
             _system_prompt: Option<&str>,
             _model: Option<&str>,
-            _tools: &[&str],
+            _dangerously_skip_permissions: bool,
         ) -> Result<Vec<String>, ProviderError> {
             Err(ProviderError::CapabilityUnsupported(
                 "test adapter".to_string(),

package/crates/team-agent/src/provider/tests/adapter.rs

@@ -286,12 +286,12 @@ fn test_grok_build_command_includes_rules_flag_when_system_prompt_set() {
 fn test_grok_build_command_bypass_flag_when_dangerous() {
     let adapter = get_adapter(Provider::Grok);
     let dangerous = adapter
-        .build_command_with_tools(
+        .build_command_with_permissions(
             AuthMode::Subscription,
             None,
             None,
             Some("grok-4"),
-            &["dangerous_auto_approve"],
+            true,
         )
         .expect("dangerous build_command ok");
     assert!(
@@ -369,12 +369,12 @@ fn test_cursor_agent_build_command_includes_workspace_flag() {
 fn test_cursor_agent_build_command_bypass_flag_when_dangerous() {
     let adapter = get_adapter(Provider::CursorAgent);
     let dangerous = adapter
-        .build_command_with_tools(
+        .build_command_with_permissions(
             AuthMode::Subscription,
             None,
             None,
             None,
-            &["dangerous_auto_approve"],
+            true,
         )
         .expect("dangerous build_command ok");
     assert!(
@@ -443,7 +443,7 @@ fn test_grok_build_command_plan_binds_expected_session_id_to_argv() {
             mcp_config: None,
             system_prompt: None,
             model: Some("grok-4.6"),
-            tools: &[],
+            dangerously_skip_permissions: false,
             profile_launch: None,
             agent_id_hint: Some("w1"),
             effort: None,
@@ -492,7 +492,7 @@ fn test_cursor_fresh_plan_has_no_session_id_and_no_resume() {
             mcp_config: None,
             system_prompt: None,
             model: Some("sonnet-4-thinking"),
-            tools: &[],
+            dangerously_skip_permissions: false,
             profile_launch: None,
             agent_id_hint: Some("w1"),
             effort: None,
@@ -523,7 +523,7 @@ fn test_cursor_resume_plan_requires_chat_id_and_never_emits_empty_resume() {
         mcp_config: None,
         system_prompt: None,
         model: Some("sonnet-4-thinking"),
-        tools: &[],
+        dangerously_skip_permissions: false,
         profile_launch: None,
         agent_id_hint: Some("w1"),
         effort: None,
@@ -549,23 +549,6 @@ fn test_cursor_resume_plan_requires_chat_id_and_never_emits_empty_resume() {
     );
 }
 
-#[test]
-fn test_grok_unknown_tool_mapping_is_explicitly_unsupported() {
-    use crate::provider::adapters::grok::{grok_tool_mapping, GrokToolMapping};
-    assert_eq!(
-        grok_tool_mapping("network"),
-        GrokToolMapping::Unsupported
-    );
-    assert_eq!(
-        grok_tool_mapping("not_a_real_tool"),
-        GrokToolMapping::Unsupported
-    );
-    assert!(
-        !matches!(grok_tool_mapping("execute_bash"), GrokToolMapping::Unsupported),
-        "known tools must stay mapped"
-    );
-}
-
 #[test]
 fn pi_wire_roundtrip_requires_backing_and_has_no_builtin_model() {
     use crate::provider::wire::{

package/crates/team-agent/src/provider/types.rs

@@ -341,7 +341,7 @@ pub struct ProviderCommandContext<'a> {
     pub mcp_config: Option<&'a McpConfig>,
     pub system_prompt: Option<&'a str>,
     pub model: Option<&'a str>,
-    pub tools: &'a [&'a str],
+    pub dangerously_skip_permissions: bool,
     pub profile_launch: Option<&'a ProviderProfileLaunch>,
     /// Optional agent id, used as a launch-time display-name hint for
     /// providers that accept `--name <name>` (Claude, Copilot). Codex has

package/crates/team-agent/src/state/persist.rs

@@ -157,7 +157,7 @@ fn errno_name(errno: Option<i32>) -> Option<&'static str> {
 /// semantic mapping. The Batch 0 non-Unix `not_yet_implemented`
 /// fallback is now removed (CR C-2 fallback burn-down; grep guard
 /// `platform_fallback_burndown_batch0.rs` flipped in this batch).
-struct RuntimeLock {
+pub(crate) struct RuntimeLock {
     #[allow(dead_code)]
     file: std::fs::File,
 }
@@ -204,6 +204,20 @@ impl Drop for RuntimeLock {
     }
 }
 
+pub(crate) fn acquire_result_collection_lock(
+    run_workspace: &Path,
+) -> Result<RuntimeLock, StateError> {
+    RuntimeLock::acquire(run_workspace, "result-collection", 2.0)
+}
+
+#[cfg(test)]
+pub(crate) fn acquire_state_save_lock(
+    workspace: &Path,
+    timeout: f64,
+) -> Result<RuntimeLock, StateError> {
+    RuntimeLock::acquire(workspace, "state-save", timeout)
+}
+
 ///
 /// `save_runtime_state`(bug-084)。`state` 是 state.json 的内存 Value(插入序保留)。
 /// 注:Python 在此还调 `_migrate_state_identity`(identity slice 落地后接入;本 slice 不改 state 内容)。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.5.84",
+  "version": "0.5.86",
   "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.5.84",
-    "@team-agent/cli-darwin-x64": "0.5.84",
-    "@team-agent/cli-linux-x64": "0.5.84"
+    "@team-agent/cli-darwin-arm64": "0.5.86",
+    "@team-agent/cli-darwin-x64": "0.5.86",
+    "@team-agent/cli-linux-x64": "0.5.86"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",

package/schemas/team.schema.json

@@ -108,14 +108,14 @@
   "$defs": {
     "leader": {
       "type": "object",
-      "required": ["id", "role", "provider", "model", "tools", "context_policy"],
+      "required": ["id", "role", "provider", "model", "context_policy"],
       "additionalProperties": false,
       "properties": {
         "id": { "type": "string", "minLength": 1 },
         "role": { "type": "string", "minLength": 1 },
         "provider": { "type": "string", "minLength": 1 },
         "model": { "type": ["string", "null"] },
-        "tools": { "$ref": "#/$defs/tools" },
+        "tools": {},
         "context_policy": {
           "type": "object",
           "required": ["keep_user_thread", "receive_worker_outputs", "max_worker_result_tokens"],
@@ -130,7 +130,7 @@
     },
     "agent": {
       "type": "object",
-      "required": ["id", "role", "provider", "model", "working_directory", "system_prompt", "tools", "permission_mode", "preferred_for", "avoid_for", "output_contract"],
+      "required": ["id", "role", "provider", "model", "working_directory", "system_prompt", "permission_mode", "preferred_for", "avoid_for", "output_contract"],
       "additionalProperties": false,
       "properties": {
         "id": { "type": "string", "minLength": 1 },
@@ -152,7 +152,7 @@
             "file": { "type": ["string", "null"] }
           }
         },
-        "tools": { "$ref": "#/$defs/tools" },
+        "tools": {},
         "permission_mode": { "enum": ["restricted", "ask", "trusted"] },
         "preferred_for": {
           "type": "array",
@@ -233,11 +233,6 @@
         "human_confirmation": { "type": "boolean" }
       }
     },
-    "tools": {
-      "type": "array",
-      "items": { "type": "string" },
-      "uniqueItems": true
-    },
     "stringOrList": {
       "oneOf": [
         { "type": "string" },