@team-agent/installer 0.4.9 → 0.4.11

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

@@ -128,3 +128,82 @@ fn read_and_remove(path: &std::path::Path) -> Vec<u8> {
     let _ = std::fs::remove_file(path);
     stdout
 }
+
+/// 0.4.x Phase 1 (fg-pgrp): terminal foreground process-group probe.
+///
+/// macOS probe confirmed (2026-06-29, .team/artifacts/fg-pgrp-probe.md):
+/// `TIOCGPGRP` ioctl returns Errno 25 on tmux slave PTYs opened from a
+/// non-controlling process. We use `ps -o tpgid,pgid -p <pid>` instead —
+/// reliable on macOS AND Linux, no platform-specific cfg needed.
+///
+/// Returns `Ok(Some((tpgid, pgid)))` on success, `Ok(None)` when the PID
+/// is gone / ps returned no row / values unparseable. The caller maps
+/// `None` to `WorkerRuntimeState::Unknown` (never to idle — Iron Law).
+///
+/// `tpgid` = terminal foreground process group ID.
+/// `pgid`  = the agent root's own process group ID.
+/// `tpgid != pgid` means a child process owns the foreground (BUSY signal).
+///
+/// Bounded via [`run_bounded_command`] so a wedged ps cannot stall the
+/// coordinator tick.
+pub(crate) fn pane_foreground_and_root_pgrp(pane_pid: u32) -> io::Result<Option<(u32, u32)>> {
+    let mut command = Command::new("ps");
+    command.args(["-o", "tpgid=,pgid=", "-p", &pane_pid.to_string()]);
+    let output = bounded_command_output_with_probe(
+        &mut command,
+        "pane_foreground_and_root_pgrp",
+        Some(pane_pid),
+    )?;
+    if probe_timed_out() {
+        return Ok(None);
+    }
+    if !output.status.success() {
+        return Ok(None);
+    }
+    let text = String::from_utf8_lossy(&output.stdout);
+    let first_line = text.lines().next().unwrap_or("").trim();
+    if first_line.is_empty() {
+        return Ok(None);
+    }
+    let parts: Vec<&str> = first_line.split_whitespace().collect();
+    if parts.len() < 2 {
+        return Ok(None);
+    }
+    let tpgid = parts[0].parse::<i64>().ok();
+    let pgid = parts[1].parse::<i64>().ok();
+    match (tpgid, pgid) {
+        // ps prints `-1` for tpgid when there is no controlling terminal —
+        // treat as unknown rather than fabricating a u32.
+        (Some(t), Some(p)) if t > 0 && p > 0 => Ok(Some((t as u32, p as u32))),
+        _ => Ok(None),
+    }
+}
+
+#[cfg(test)]
+mod fg_pgrp_tests {
+    use super::*;
+
+    #[test]
+    fn pane_foreground_and_root_pgrp_self_returns_some_or_none() {
+        // The current test process is not necessarily attached to a
+        // controlling terminal (CI runs detached), so we accept Some OR
+        // None. The contract is: never panic, return io::Result.
+        let pid = std::process::id();
+        match pane_foreground_and_root_pgrp(pid) {
+            Ok(Some((tpgid, pgid))) => {
+                assert!(tpgid > 0 && pgid > 0, "positive pgid/tpgid");
+            }
+            Ok(None) => {} // headless / no tty — acceptable
+            Err(e) => panic!("probe must not error in normal env: {e}"),
+        }
+    }
+
+    #[test]
+    fn pane_foreground_and_root_pgrp_missing_pid_returns_none() {
+        // PID 1 is init/launchd — exists but we read fields; non-existent
+        // PIDs return Ok(None) (ps exits non-zero).
+        let result =
+            pane_foreground_and_root_pgrp(0xFFFF_FFFE).expect("must not error on missing pid");
+        assert!(result.is_none(), "missing pid → None");
+    }
+}

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

@@ -1321,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()));
@@ -1333,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());
@@ -1378,6 +1389,8 @@ pub fn leader_shell_wrapper_command(
     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());
@@ -1389,8 +1402,13 @@ pub fn leader_shell_wrapper_command(
         parts.push(key.clone());
         parts.push("&&".to_string());
     }
-    // 3. env exports + provider (NO `exec` so the provider is a child)
+    // 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)));

package/package.json

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