@team-agent/installer 0.4.8 → 0.4.10

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

@@ -410,7 +410,7 @@ impl ProviderAdapter for BasicProviderAdapter {
             Provider::Claude | Provider::ClaudeCode => {
                 Ok(claude_launch_command(self, auth_mode, mcp_config, system_prompt, model, tools)?)
             }
-            Provider::Codex => Ok(codex_base_command(None, auth_mode, mcp_config, system_prompt, model, tools, None)),
+            Provider::Codex => Ok(codex_base_command(None, auth_mode, mcp_config, system_prompt, model, tools, None, None)),
             // §C1 worker argv 形态 + C-1/C-5/C-6 cr verdict:
             //   copilot --no-color --no-auto-update [<dangerous|granular>] [--model]
             //          --additional-mcp-config <inline json> --session-id <expected_uuid> -C <cwd>
@@ -469,6 +469,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                     model,
                     ctx.tools,
                     managed,
+                    ctx.effort,
                 )?;
                 argv.push("--session-id".to_string());
                 argv.push(expected.clone());
@@ -507,6 +508,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                 ctx.model,
                 ctx.tools,
                 ctx.profile_launch.map(|profile| &profile.command_overrides),
+                ctx.effort,
             ))),
             // §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
             //   * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
@@ -638,13 +640,14 @@ impl ProviderAdapter for BasicProviderAdapter {
                     model,
                     tools,
                     None,
+                    None,
                 );
                 argv.push(session_id.as_str().to_string());
                 Ok(argv)
             }
             Provider::Claude | Provider::ClaudeCode => {
                 let mut argv =
-                    claude_base_command(self, auth_mode, mcp_config, system_prompt, model, tools, false)?;
+                    claude_base_command(self, auth_mode, mcp_config, system_prompt, model, tools, false, None)?;
                 argv.push("--resume".to_string());
                 argv.push(session_id.as_str().to_string());
                 Ok(argv)
@@ -686,6 +689,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                     model,
                     ctx.tools,
                     managed,
+                    ctx.effort,
                 )?;
                 argv.push("--resume".to_string());
                 argv.push(session_id.as_str().to_string());
@@ -725,6 +729,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                     ctx.model,
                     ctx.tools,
                     ctx.profile_launch.map(|profile| &profile.command_overrides),
+                    ctx.effort,
                 );
                 argv.push(session_id.as_str().to_string());
                 Ok(CommandPlan::argv_only(argv))
@@ -779,13 +784,14 @@ impl ProviderAdapter for BasicProviderAdapter {
                     model,
                     tools,
                     None,
+                    None,
                 );
                 argv.push(session_id.as_str().to_string());
                 Ok(argv)
             }
             Provider::Claude | Provider::ClaudeCode => {
                 let mut argv =
-                    claude_base_command(self, auth_mode, mcp_config, system_prompt, model, tools, false)?;
+                    claude_base_command(self, auth_mode, mcp_config, system_prompt, model, tools, false, None)?;
                 argv.push("--session-id".to_string());
                 argv.push(next_session_token());
                 argv.push("--resume".to_string());
@@ -837,6 +843,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                     model,
                     ctx.tools,
                     managed,
+                    ctx.effort,
                 )?;
                 argv.push("--session-id".to_string());
                 argv.push(expected.clone());
@@ -870,6 +877,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                     ctx.model,
                     ctx.tools,
                     ctx.profile_launch.map(|profile| &profile.command_overrides),
+                    ctx.effort,
                 );
                 argv.push(session_id.as_str().to_string());
                 Ok(CommandPlan::argv_only(argv))

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

@@ -34,6 +34,7 @@ pub(crate) fn claude_launch_command(
         model,
         tools,
         false,
+        None,
     )?;
     argv.push("--session-id".to_string());
     argv.push(next_session_token());
@@ -48,6 +49,9 @@ pub(crate) fn claude_base_command(
     model: Option<&str>,
     tools: &[&str],
     managed_mcp_config: bool,
+    // 0.4.x provider effort MVP step 5: when Some, inject `--effort <level>`
+    // immediately after the model (before prompt/MCP).
+    effort: Option<crate::model::enums::ProviderEffort>,
 ) -> Result<Vec<String>, ProviderError> {
     let mut argv = vec!["claude".to_string()];
     if claude_dangerous_auto_approve(tools) {
@@ -60,6 +64,10 @@ pub(crate) fn claude_base_command(
         argv.push("--model".to_string());
         argv.push(model.to_string());
     }
+    if let Some(effort) = effort {
+        argv.push("--effort".to_string());
+        argv.push(effort.as_str().to_string());
+    }
     if let Some(prompt) = system_prompt {
         argv.push("--append-system-prompt".to_string());
         argv.push(prompt.to_string());

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

@@ -17,6 +17,12 @@ pub(crate) fn codex_base_command(
     model: Option<&str>,
     tools: &[&str],
     overrides: Option<&ProviderCommandOverrides>,
+    // 0.4.x provider effort MVP step 6: when Some, inject
+    // `-c model_reasoning_effort=<level>` AFTER existing profile
+    // codex_config overrides — explicit launch effort wins over profile.
+    // Codex does not support `max`; the caller filters that case via
+    // `ProviderEffort::is_supported_by` before reaching this point.
+    effort: Option<crate::model::enums::ProviderEffort>,
 ) -> Vec<String> {
     let mut argv = vec!["codex".to_string()];
     if let Some(subcommand) = subcommand {
@@ -51,6 +57,10 @@ pub(crate) fn codex_base_command(
             argv.push(config.clone());
         }
     }
+    if let Some(effort) = effort {
+        argv.push("-c".to_string());
+        argv.push(format!("model_reasoning_effort={}", effort.as_str()));
+    }
     if let Some(prompt) = system_prompt {
         // codex.py:120 — escape order matters: backslash first, then quote, then newline.
         let escaped = prompt

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

@@ -347,6 +347,14 @@ pub struct ProviderCommandContext<'a> {
     /// no `--name` CLI flag (probe verdict 2026-06-22) and ignores this
     /// field. None = legacy callers (the field is purely additive).
     pub agent_id_hint: Option<&'a str>,
+    /// 0.4.x provider effort MVP step 4: reasoning effort level resolved
+    /// from role doc / TEAM.md / provider default. `None` means the
+    /// framework passes no effort flag (provider default).
+    ///   - Claude / ClaudeCode: low|medium|high|xhigh|max → `--effort <level>`
+    ///   - Codex: low|medium|high|xhigh → `-c model_reasoning_effort=<level>`
+    ///   - Copilot / Gemini / Fake: ignored, warning event emitted at the
+    ///     caller (lifecycle/launch.rs / lifecycle/restart) before construct.
+    pub effort: Option<crate::model::enums::ProviderEffort>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

package/crates/team-agent/src/tmux_backend.rs

@@ -636,7 +636,21 @@ impl TmuxBackend {
         first: bool,
     ) -> Result<SpawnResult, TransportError> {
         let command = shell_command(argv, cwd, env, env_unset);
-        let spawn_argv = tmux_spawn_argv(session, window, &command, first);
+        self.spawn_with_command(session, window, &command, first)
+    }
+
+    /// 0.4.x (CR C-2): spawn variant that takes a pre-built shell command
+    /// (used by `spawn_first_with_leader_shell_wrapper` /
+    /// `spawn_into_with_leader_shell_wrapper` to inject the leader wrapper
+    /// shape without going through `shell_command`'s `exec`-only template).
+    fn spawn_with_command(
+        &self,
+        session: &SessionName,
+        window: &WindowName,
+        command: &str,
+        first: bool,
+    ) -> Result<SpawnResult, TransportError> {
+        let spawn_argv = tmux_spawn_argv(session, window, command, first);
         self.run_spawn(&spawn_argv)?;
         let pane_argv = vec![
             "tmux".to_string(),
@@ -1307,6 +1321,8 @@ fn shell_command(
     env: &BTreeMap<String, String>,
     env_unset: &[String],
 ) -> String {
+    let unset_set: std::collections::BTreeSet<&str> =
+        env_unset.iter().map(String::as_str).collect();
     let mut parts = Vec::new();
     parts.push("cd".to_string());
     parts.push(shell_quote(&cwd.to_string_lossy()));
@@ -1319,7 +1335,16 @@ fn shell_command(
         parts.push(key.clone());
         parts.push("&&".to_string());
     }
+    // 0.4.x ordering fix (env-leak symptom #3): KEY=val exports must NOT
+    // re-introduce any key that was just unset. Filter env entries whose key
+    // appears in env_unset so the unset wins on the final shell line. This
+    // matters when inherited env (worker_spawn_env / apply_profile_launch_env)
+    // contains the very keys we want to scrub (e.g. CLAUDE_EFFORT carried
+    // forward from the launching shell into the env map).
     for (key, value) in env {
+        if unset_set.contains(key.as_str()) {
+            continue;
+        }
         parts.push(format!("{key}={}", shell_quote(value)));
     }
     parts.push("exec".to_string());
@@ -1327,6 +1352,82 @@ fn shell_command(
     parts.join(" ")
 }
 
+/// 0.4.x (CR R6): single-source marker prefix. The exit marker emitted by
+/// `leader_shell_wrapper_command` and the substring detected by
+/// `leader_provider_health` MUST share this prefix exactly. Format:
+/// `"[team-agent] {provider_label} exited with {rc}"`.
+pub const LEADER_PROVIDER_EXIT_MARKER_PREFIX: &str = "[team-agent]";
+pub const LEADER_PROVIDER_EXIT_MARKER_SUFFIX: &str = "exited with";
+
+/// 0.4.x (CR R6): build the leader exit marker text for `provider_label`.
+/// Used by both the shell wrapper (printf source) and the health check
+/// (capture substring) so they cannot drift.
+pub fn leader_provider_exit_marker(provider_label: &str) -> String {
+    format!(
+        "{LEADER_PROVIDER_EXIT_MARKER_PREFIX} {provider_label} {LEADER_PROVIDER_EXIT_MARKER_SUFFIX}"
+    )
+}
+
+/// 0.4.x (CR C-2): leader shell wrapper — provider runs as a CHILD of a
+/// long-lived shell, not as the pane's primary process. When the provider
+/// exits, the pane returns to an interactive shell with an explicit exit
+/// marker, matching manual `tmux new-session` then `claude` behaviour.
+///
+/// Four required envelope sections (CR C-2):
+///   1. cd <cwd>                    — same as `shell_command`
+///   2. unset <KEY> ...             — provider env_unset block
+///   3. KEY=val ... <provider>      — env exports + provider invocation
+///                                    (NO `exec` — runs as child)
+///   4. printf exit marker; exec shell -l
+///
+/// `provider_label` is a human-readable provider name (e.g. "claude",
+/// "codex") embedded in the exit marker for diagnostics.
+pub fn leader_shell_wrapper_command(
+    argv: &[String],
+    cwd: &Path,
+    env: &BTreeMap<String, String>,
+    env_unset: &[String],
+    provider_label: &str,
+) -> String {
+    let unset_set: std::collections::BTreeSet<&str> =
+        env_unset.iter().map(String::as_str).collect();
+    let mut parts = Vec::new();
+    // 1. cd
+    parts.push("cd".to_string());
+    parts.push(shell_quote(&cwd.to_string_lossy()));
+    parts.push("&&".to_string());
+    // 2. unset
+    for key in env_unset {
+        parts.push("unset".to_string());
+        parts.push(key.clone());
+        parts.push("&&".to_string());
+    }
+    // 3. env exports + provider (NO `exec` so the provider is a child).
+    // 0.4.x ordering fix: skip keys present in env_unset so KEY=val does not
+    // re-introduce a just-unset variable from the inherited env map.
+    for (key, value) in env {
+        if unset_set.contains(key.as_str()) {
+            continue;
+        }
+        parts.push(format!("{key}={}", shell_quote(value)));
+    }
+    parts.extend(argv.iter().map(|arg| shell_quote(arg)));
+    parts.push(";".to_string());
+    // 4. exit marker + fall back to interactive shell
+    parts.push("rc=$?;".to_string());
+    parts.push("printf".to_string());
+    // CR R6: marker text comes from single-source `leader_provider_exit_marker`.
+    parts.push(shell_quote(&format!(
+        "\n{} %s\n",
+        leader_provider_exit_marker(provider_label)
+    )));
+    parts.push("\"$rc\";".to_string());
+    parts.push("exec".to_string());
+    parts.push("\"${SHELL:-/bin/zsh}\"".to_string());
+    parts.push("-l".to_string());
+    parts.join(" ")
+}
+
 fn shell_quote(raw: &str) -> String {
     if raw.is_empty() {
         return "''".to_string();
@@ -1422,6 +1523,38 @@ impl Transport for TmuxBackend {
         self.spawn_split(session, window, argv, cwd, env, env_unset)
     }
 
+    /// 0.4.x (CR C-2): TmuxBackend override of the leader-shell-wrapper
+    /// variant. Builds the wrapper shell line via
+    /// `leader_shell_wrapper_command` and runs it through
+    /// `spawn_with_command` (bypassing the default `exec <cmd>` shape).
+    fn spawn_first_with_leader_shell_wrapper(
+        &self,
+        session: &SessionName,
+        window: &WindowName,
+        argv: &[String],
+        cwd: &Path,
+        env: &BTreeMap<String, String>,
+        env_unset: &[String],
+        provider_label: &str,
+    ) -> Result<SpawnResult, TransportError> {
+        let command = leader_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
+        self.spawn_with_command(session, window, &command, true)
+    }
+
+    fn spawn_into_with_leader_shell_wrapper(
+        &self,
+        session: &SessionName,
+        window: &WindowName,
+        argv: &[String],
+        cwd: &Path,
+        env: &BTreeMap<String, String>,
+        env_unset: &[String],
+        provider_label: &str,
+    ) -> Result<SpawnResult, TransportError> {
+        let command = leader_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
+        self.spawn_with_command(session, window, &command, false)
+    }
+
     fn inject(
         &self,
         target: &Target,

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

@@ -50,6 +50,9 @@ struct OfflineState {
     /// U1-C Tail-peek contract: every `capture()` call records its `CaptureRange`,
     /// in order, so a test can prove the delivery peek site narrowed Full → Tail(80).
     capture_ranges: Vec<CaptureRange>,
+    /// 0.4.x (CR C-3 / CR C-5): pre-staged `query(PaneField::PaneCurrentCommand)`
+    /// answer keyed by pane id. Used by leader provider health tests.
+    pane_current_commands: BTreeMap<String, String>,
 }
 
 impl Default for OfflineState {
@@ -73,6 +76,7 @@ impl Default for OfflineState {
             list_targets_error: None,
             capture_text: BTreeMap::new(),
             capture_ranges: Vec::new(),
+            pane_current_commands: BTreeMap::new(),
         }
     }
 }
@@ -163,6 +167,52 @@ impl OfflineTransport {
         self
     }
 
+    /// 0.4.x (CR C-3 / CR C-5): pre-stage a `pane_current_command` answer
+    /// for `query(PaneField::PaneCurrentCommand)`. Used by leader provider
+    /// health tests to simulate "pane is now in a shell" vs
+    /// "pane is running the provider".
+    pub fn with_pane_current_command(
+        self,
+        pane_id: impl Into<String>,
+        command: impl Into<String>,
+    ) -> Self {
+        self.with_state(|state| {
+            state.pane_current_commands.insert(pane_id.into(), command.into());
+        });
+        self
+    }
+
+    /// 0.4.x (CR C-3 / CR C-5): mutable setters for fluent test seeding
+    /// (alternative to builder chain when the transport already exists).
+    pub fn set_pane_addressable(&self, pane: &PaneId, addressable: bool) {
+        self.with_state(|state| {
+            state.liveness.insert(
+                pane.as_str().to_string(),
+                if addressable {
+                    PaneLiveness::Live
+                } else {
+                    PaneLiveness::Dead
+                },
+            );
+        });
+    }
+
+    pub fn set_pane_current_command(&self, pane: &PaneId, command: &str) {
+        self.with_state(|state| {
+            state
+                .pane_current_commands
+                .insert(pane.as_str().to_string(), command.to_string());
+        });
+    }
+
+    pub fn set_pane_capture(&self, pane: &PaneId, text: &str) {
+        self.with_state(|state| {
+            state
+                .capture_text
+                .insert(pane.as_str().to_string(), text.to_string());
+        });
+    }
+
     /// Pre-stage `capture()` output for a `Target::SessionWindow{session,window}` key.
     pub fn with_capture_for_session_window(
         self,
@@ -378,11 +428,20 @@ impl Transport for OfflineTransport {
 
     fn query(
         &self,
-        _target: &Target,
-        _field: PaneField,
+        target: &Target,
+        field: PaneField,
     ) -> Result<Option<String>, TransportError> {
         self.record("query");
-        Ok(None)
+        if !matches!(field, PaneField::PaneCurrentCommand) {
+            return Ok(None);
+        }
+        let pane_id = match target {
+            Target::Pane(p) => p.as_str().to_string(),
+            Target::SessionWindow { .. } => return Ok(None),
+        };
+        Ok(self.with_state(|state| {
+            state.pane_current_commands.get(&pane_id).cloned()
+        }))
     }
 
     fn liveness(&self, pane: &PaneId) -> Result<PaneLiveness, TransportError> {

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

@@ -584,6 +584,44 @@ pub trait Transport: Send + Sync {
         self.spawn_into(session, window, argv, cwd, env)
     }
 
+    /// 0.4.x (CR C-2): leader-specific spawn variant. Instead of `exec <cmd>`
+    /// (which makes the provider the pane's primary process and turns the
+    /// pane into `[exited]` when the provider exits), build a shell line
+    /// that runs the provider as a CHILD of a long-lived shell:
+    /// `cd ... && unset ... && KEY=val ... <cmd>; rc=$?; printf '\n[team-agent] <provider> exited with %s\n' "$rc"; exec "${SHELL:-/bin/zsh}" -l`.
+    /// When the provider exits, the pane returns to an interactive shell with
+    /// an explicit exit marker — matching manual `tmux new-session` then
+    /// `claude` behaviour. Default falls back to plain `spawn_first_with_env_unset`
+    /// for backends that have no shell layer (test-only `OfflineTransport`).
+    fn spawn_first_with_leader_shell_wrapper(
+        &self,
+        session: &SessionName,
+        window: &WindowName,
+        argv: &[String],
+        cwd: &Path,
+        env: &BTreeMap<String, String>,
+        env_unset: &[String],
+        provider_label: &str,
+    ) -> Result<SpawnResult, TransportError> {
+        let _ = provider_label;
+        self.spawn_first_with_env_unset(session, window, argv, cwd, env, env_unset)
+    }
+
+    /// 同 [`Transport::spawn_first_with_leader_shell_wrapper`],对应 `spawn_into`。
+    fn spawn_into_with_leader_shell_wrapper(
+        &self,
+        session: &SessionName,
+        window: &WindowName,
+        argv: &[String],
+        cwd: &Path,
+        env: &BTreeMap<String, String>,
+        env_unset: &[String],
+        provider_label: &str,
+    ) -> Result<SpawnResult, TransportError> {
+        let _ = provider_label;
+        self.spawn_into_with_env_unset(session, window, argv, cwd, env, env_unset)
+    }
+
     // —— INJECT / CAPTURE / QUERY(RIE):按稳定 Target 寻址 ——
 
     /// 归并 set/load-buffer + paste-buffer + send submit;空文本走纯 send-keys

package/package.json

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