@team-agent/installer 0.5.65 → 0.5.68

package/crates/team-agent/src/lifecycle/tests/phase_golden.rs

@@ -102,18 +102,10 @@ fn phase_b_golden_events_state_status_zero_drift() {
         team_key: "teamdir",
         lifecycle_op: phase_b_reset_discard_session,
     });
-    if std::env::var_os("TEAM_AGENT_UPDATE_GOLDEN").is_some() {
-        std::fs::create_dir_all(baseline.parent().expect("baseline parent")).unwrap();
-        std::fs::write(&baseline, pretty(&actual)).unwrap();
-        return;
-    }
-    let expected = std::fs::read_to_string(&baseline)
-        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", baseline.display()));
-    let expected: Value = serde_json::from_str(&expected).expect("parse golden baseline");
+    let expected = load_phase_golden(&baseline);
     assert_eq!(
-        actual,
-        expected,
-        "phase B golden drift; update intentionally with TEAM_AGENT_UPDATE_GOLDEN=1 only after review"
+        actual, expected,
+        "phase B golden drift; surgical key edits only — do not regenerate the file"
     );
 }
 
@@ -126,18 +118,10 @@ fn phase_c_golden_events_state_status_zero_drift() {
         team_key: "teamdir",
         lifecycle_op: phase_b_reset_discard_session,
     });
-    if std::env::var_os("TEAM_AGENT_UPDATE_GOLDEN").is_some() {
-        std::fs::create_dir_all(baseline.parent().expect("baseline parent")).unwrap();
-        std::fs::write(&baseline, pretty(&actual)).unwrap();
-        return;
-    }
-    let expected = std::fs::read_to_string(&baseline)
-        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", baseline.display()));
-    let expected: Value = serde_json::from_str(&expected).expect("parse golden baseline");
+    let expected = load_phase_golden(&baseline);
     assert_eq!(
-        actual,
-        expected,
-        "phase C golden drift; update intentionally with TEAM_AGENT_UPDATE_GOLDEN=1 only after review"
+        actual, expected,
+        "phase C golden drift; surgical key edits only — do not regenerate the file"
     );
 }
 
@@ -150,18 +134,10 @@ fn phase_d_golden_events_state_status_zero_drift() {
         team_key: "teamdir",
         lifecycle_op: phase_b_reset_discard_session,
     });
-    if std::env::var_os("TEAM_AGENT_UPDATE_GOLDEN").is_some() {
-        std::fs::create_dir_all(baseline.parent().expect("baseline parent")).unwrap();
-        std::fs::write(&baseline, pretty(&actual)).unwrap();
-        return;
-    }
-    let expected = std::fs::read_to_string(&baseline)
-        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", baseline.display()));
-    let expected: Value = serde_json::from_str(&expected).expect("parse golden baseline");
+    let expected = load_phase_golden(&baseline);
     assert_eq!(
-        actual,
-        expected,
-        "phase D golden drift; update intentionally with TEAM_AGENT_UPDATE_GOLDEN=1 only after review"
+        actual, expected,
+        "phase D golden drift; surgical key edits only — do not regenerate the file"
     );
 }
 
@@ -174,18 +150,10 @@ fn phase_e_golden_events_state_status_zero_drift() {
         team_key: "teamdir",
         lifecycle_op: phase_b_reset_discard_session,
     });
-    if std::env::var_os("TEAM_AGENT_UPDATE_GOLDEN").is_some() {
-        std::fs::create_dir_all(baseline.parent().expect("baseline parent")).unwrap();
-        std::fs::write(&baseline, pretty(&actual)).unwrap();
-        return;
-    }
-    let expected = std::fs::read_to_string(&baseline)
-        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", baseline.display()));
-    let expected: Value = serde_json::from_str(&expected).expect("parse golden baseline");
+    let expected = load_phase_golden(&baseline);
     assert_eq!(
-        actual,
-        expected,
-        "phase E golden drift; update intentionally with TEAM_AGENT_UPDATE_GOLDEN=1 only after review"
+        actual, expected,
+        "phase E golden drift; surgical key edits only — do not regenerate the file"
     );
 }
 
@@ -198,18 +166,39 @@ fn phase_f_golden_events_state_status_zero_drift() {
         team_key: "teamdir",
         lifecycle_op: phase_b_reset_discard_session,
     });
-    if std::env::var_os("TEAM_AGENT_UPDATE_GOLDEN").is_some() {
-        std::fs::create_dir_all(baseline.parent().expect("baseline parent")).unwrap();
-        std::fs::write(&baseline, pretty(&actual)).unwrap();
-        return;
-    }
-    let expected = std::fs::read_to_string(&baseline)
-        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", baseline.display()));
-    let expected: Value = serde_json::from_str(&expected).expect("parse golden baseline");
+    let expected = load_phase_golden(&baseline);
     assert_eq!(
-        actual,
-        expected,
-        "phase F golden drift; update intentionally with TEAM_AGENT_UPDATE_GOLDEN=1 only after review"
+        actual, expected,
+        "phase F golden drift; surgical key edits only — do not regenerate the file"
+    );
+}
+
+#[test]
+#[serial_test::serial(env)]
+fn phase_golden_unbound_not_ready_requires_claim_leader() {
+    // 已废除的行为：旧实现只说不 ready、不说怎么恢复，把人晾在原地。此断言证明它确实没了。
+    // Independent of golden.json so a later regenerate cannot erase it.
+    // Companion status keys grok_slot ← 77bddb95 / 0c319cca; next_action ← 080903a2.
+    let compact = run_compact_status_after_quick_start();
+    let not_ready = compact
+        .get("not_ready")
+        .and_then(Value::as_object)
+        .unwrap_or_else(|| panic!("compact must carry not_ready; got {compact}"));
+    let reasons = not_ready
+        .get("reasons")
+        .and_then(Value::as_array)
+        .cloned()
+        .unwrap_or_default();
+    assert!(
+        reasons
+            .iter()
+            .any(|reason| reason.as_str() == Some("leader_receiver_unbound")),
+        "tombstone fixture must still produce leader_receiver_unbound; not_ready={not_ready:?}"
+    );
+    assert_eq!(
+        not_ready.get("next_action").and_then(Value::as_str),
+        Some("claim-leader"),
+        "when not_ready.reasons contains leader_receiver_unbound, next_action must be claim-leader; not_ready={not_ready:?}"
     );
 }
 
@@ -387,7 +376,7 @@ fn codex_ready_transport() -> OfflineTransport {
 
 fn role_doc(id: &str) -> String {
     format!(
-        "---\nname: {id}\nrole: {id} Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{id} worker.\n"
+        "---\nname: {id}\nrole: {id} Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{id} worker.\n"
     )
 }
 
@@ -466,6 +455,59 @@ fn phase_fixture_path(phase: &str) -> PathBuf {
         .join(phase)
 }
 
+fn load_phase_golden(path: &Path) -> Value {
+    let text = std::fs::read_to_string(path)
+        .unwrap_or_else(|e| panic!("missing golden baseline {}: {e}", path.display()));
+    let stripped = strip_full_line_json_comments(&text);
+    serde_json::from_str(&stripped).unwrap_or_else(|e| {
+        panic!(
+            "parse golden baseline {} after stripping // review comments: {e}",
+            path.display()
+        )
+    })
+}
+
+fn strip_full_line_json_comments(text: &str) -> String {
+    text.lines()
+        .filter(|line| !line.trim_start().starts_with("//"))
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+fn run_compact_status_after_quick_start() -> Value {
+    let hermetic = HermeticTestEnv::enter("tombstone-claim-leader");
+    let _permission_mode = EnvVarGuard::set(ANCESTRY_ENV, "[]");
+    let team = two_worker_team_dir(&hermetic);
+    let workspace = team.parent().expect("workspace").to_path_buf();
+    seed_healthy_coordinator(&workspace);
+    let launch_transport = codex_ready_transport();
+    quick_start_with_transport_in_workspace_with_display(
+        &workspace,
+        &team,
+        None,
+        true,
+        None,
+        &launch_transport,
+        false,
+    )
+    .expect("tombstone fixture must quick-start");
+    let status = cmd_status(&StatusArgs {
+        agent: None,
+        workspace,
+        detail: false,
+        summary: false,
+        json: true,
+        team: Some("teamdir".to_string()),
+    });
+    match cmd_value(status) {
+        Value::Object(map) => map
+            .get("output")
+            .cloned()
+            .unwrap_or_else(|| panic!("compact status missing output")),
+        other => panic!("compact status must be a JSON object, got {other}"),
+    }
+}
+
 struct EnvVarGuard {
     key: &'static str,
     previous: Option<String>,
@@ -843,12 +885,6 @@ fn key_is_id(key: &str, text: &str) -> bool {
         || text.starts_with("msg_")
 }
 
-fn pretty(value: &Value) -> String {
-    let mut text = serde_json::to_string_pretty(value).unwrap();
-    text.push('\n');
-    text
-}
-
 #[test]
 fn phase_golden_normalizer_maps_custom_cargo_target_deps_binary_before_tmp_aliasing() {
     let ctx = NormalizeCtx {

package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs

@@ -38,9 +38,9 @@ use hermetic::HermeticTestEnv;
 const TEAM_MD: &str =
     "---\nname: bug7\nobjective: BUG-7 worker readiness honesty contract.\nprovider: codex\n---\n\nTeam.\n";
 
-const CODEX_ROLE: &str = "---\nname: codexer\nrole: Codex Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nCodex worker.\n";
+const CODEX_ROLE: &str = "---\nname: codexer\nrole: Codex Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nCodex worker.\n";
 
-const CLAUDE_ROLE: &str = "---\nname: clauder\nrole: Claude Worker\nprovider: claude\nmodel: claude-sonnet-4-6\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nClaude worker.\n";
+const CLAUDE_ROLE: &str = "---\nname: clauder\nrole: Claude Worker\nprovider: claude\nmodel: claude-sonnet-4-6\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nClaude worker.\n";
 
 #[test]
 #[ignore = "real-machine: quick-start worker readiness gate"]

package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs

@@ -218,7 +218,7 @@ fn write_team_docs(team_dir: &Path, workers: &[String], provider: ProviderShape)
         fs::write(
             team_dir.join("agents").join(format!("{worker}.md")),
             format!(
-                "---\nname: {worker}\nrole: Worker {worker}\nprovider: {}\nmodel: {}\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{worker}.\n",
+                "---\nname: {worker}\nrole: Worker {worker}\nprovider: {}\nmodel: {}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{worker}.\n",
                 provider.provider(),
                 provider.model()
             ),

package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs

@@ -492,7 +492,7 @@ impl RestartFixture {
             std::fs::write(
                 team.join("agents").join(format!("{agent}.md")),
                 format!(
-                    "---\nname: {agent}\nrole: Worker {agent}\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n"
+                    "---\nname: {agent}\nrole: Worker {agent}\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n"
                 ),
             )
             .unwrap();

package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs

@@ -342,7 +342,7 @@ impl HotfixCase {
         std::fs::write(
             dir.join("agents").join(format!("{agent_id}.md")),
             format!(
-                "---\nname: {agent_id}\nrole: Greeter\nprovider: {}\nmodel: test\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+                "---\nname: {agent_id}\nrole: Greeter\nprovider: {}\nmodel: test\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n",
                 provider_name(provider)
             ),
         )
@@ -1066,6 +1066,8 @@ fn provider_name(provider: Provider) -> &'static str {
         Provider::Codex => "codex",
         Provider::Copilot => "copilot",
         Provider::GeminiCli => "gemini",
+        Provider::Grok => "grok",
+        Provider::CursorAgent => "cursor_agent",
         Provider::Fake => "fake",
     }
 }

package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs

@@ -1371,7 +1371,7 @@ impl RestartFixture {
         std::fs::write(
             team.join("agents/worker_a.md"),
             format!(
-                "---\nname: worker_a\nrole: Worker\nprovider: {provider}\nmodel: {}\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+                "---\nname: worker_a\nrole: Worker\nprovider: {provider}\nmodel: {}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n",
                 if provider == "claude" {
                     "claude-sonnet-4-6"
                 } else {
@@ -1409,7 +1409,7 @@ impl RestartFixture {
         std::fs::write(
             team.join("agents/worker_a.md"),
             format!(
-                "---\nname: worker_a\nrole: Worker\nprovider: {provider}\nmodel: {}\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+                "---\nname: worker_a\nrole: Worker\nprovider: {provider}\nmodel: {}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n",
                 if provider == "claude" {
                     "claude-sonnet-4-6"
                 } else {

package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs

@@ -151,7 +151,7 @@ impl ResumeFixture {
         .unwrap();
         std::fs::write(
             team.join("agents").join("worker_a.md"),
-            "---\nname: worker_a\nrole: Worker A\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+            "---\nname: worker_a\nrole: Worker A\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n",
         )
         .unwrap();
         let spec = team_agent::compiler::compile_team(&team).unwrap();

package/crates/team-agent/src/lifecycle/tests/stale_team_saveconflict_contract.rs

@@ -291,7 +291,7 @@ fn agent(id: &str, status: &str, topology: bool) -> Value {
 }
 
 fn role_doc(id: &str) -> String {
-    format!("---\nname: {id}\nrole: {id}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{id}.\n")
+    format!("---\nname: {id}\nrole: {id}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{id}.\n")
 }
 
 fn assert_no_standards(case: &Case) {

package/crates/team-agent/src/lifecycle/tests/startup_latency_contract.rs

@@ -1,3 +1,18 @@
+//! ---
+//! purpose: restart spawn overlap and identity contracts
+//! contract:
+//!   provides:
+//!     - name: restart_spawn_overlap_identity
+//!       what: controlled transport facts prove overlapping worker spawns and stable persisted identities
+//!   depends:
+//!     - crate::lifecycle::restart
+//!     - hermetic fake transport with spawn trace
+//!   boundary:
+//!     - overlap/max-in-flight facts replace scheduler-sensitive total-time thresholds
+//!     - no production scheduler, pool, or state-machine changes
+//! maturity: wired
+//! ---
+//!
 //! 0.5.38 RED contract: startup latency instrumentation and bounded worker spawn.
 //!
 //! References:
@@ -83,6 +98,10 @@ fn restart_records_parallel_spawn_overlap_and_deterministic_state() {
             "expected at least two new-window spawns to overlap after the initial session creator; calls={calls:?}"
         ));
     }
+    assert!(
+        transport.max_in_flight() >= 2,
+        "expected at least two concurrent spawn calls; calls={calls:?}"
+    );
     let agent_keys = state
         .pointer("/agents")
         .and_then(Value::as_object)
@@ -272,7 +291,6 @@ fn eight_worker_restart_with_100ms_spawn_delay_beats_serial_baseline() {
     let delay = Duration::from_millis(100);
     let transport = StartupLatencyTransport::new().with_spawn_delay(delay);
 
-    let started = Instant::now();
     let report = restart_with_transport_with_readiness_deadline(
         &case.workspace,
         true,
@@ -281,7 +299,6 @@ fn eight_worker_restart_with_100ms_spawn_delay_beats_serial_baseline() {
         Some(2_000),
     )
     .expect("R4 setup: restart should complete against delayed transport");
-    let elapsed = started.elapsed();
     assert!(
         matches!(report, RestartReport::Restarted { .. }),
         "R4 setup: restart must reach Restarted; report={report:?}"
@@ -293,14 +310,18 @@ fn eight_worker_restart_with_100ms_spawn_delay_beats_serial_baseline() {
         8,
         "R4 setup: timing smoke must exercise all 8 workers; calls={calls:?}"
     );
-    let serial_baseline = delay * calls.len() as u32;
     assert!(
-        serial_baseline >= Duration::from_millis(800),
-        "R4 setup: serial baseline must represent 8 workers * 100ms; baseline={serial_baseline:?}"
+        has_overlap(
+            &calls
+                .iter()
+                .filter(|call| call.kind == "spawn_into")
+                .collect::<Vec<_>>(),
+        ),
+        "R4: bounded-concurrency restart must overlap spawn calls; calls={calls:?}"
     );
     assert!(
-        elapsed < serial_baseline - Duration::from_millis(150),
-        "R4: bounded-concurrency restart should complete below the serial spawn sum; elapsed={elapsed:?} serial_baseline={serial_baseline:?} calls={calls:?}"
+        transport.max_in_flight() >= 2,
+        "R4: max in-flight spawn count must prove overlap; calls={calls:?}"
     );
     assert_phase_events(&case.events(), "restart.phase", &["spawn_all", "completed"]);
 }
@@ -488,7 +509,7 @@ fn write_team_docs(team_dir: &Path, workers: usize) {
 
 fn role_doc(worker: &str) -> String {
     format!(
-        "---\nname: {worker}\nrole: Worker {worker}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{worker}.\n"
+        "---\nname: {worker}\nrole: Worker {worker}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{worker}.\n"
     )
 }
 
@@ -583,6 +604,8 @@ struct TransportState {
     calls: Vec<SpawnCall>,
     panes: BTreeMap<String, PaneInfo>,
     next_pane: usize,
+    in_flight: usize,
+    max_in_flight: usize,
 }
 
 #[derive(Clone)]
@@ -625,6 +648,10 @@ impl StartupLatencyTransport {
         self.state.lock().unwrap().calls.clone()
     }
 
+    fn max_in_flight(&self) -> usize {
+        self.state.lock().unwrap().max_in_flight
+    }
+
     fn pane_snapshot(&self) -> Vec<Value> {
         self.state
             .lock()
@@ -648,11 +675,17 @@ impl StartupLatencyTransport {
         window: &WindowName,
     ) -> Result<SpawnResult, TransportError> {
         let start = Instant::now();
+        {
+            let mut state = self.state.lock().unwrap();
+            state.in_flight += 1;
+            state.max_in_flight = state.max_in_flight.max(state.in_flight);
+        }
         if !self.spawn_delay.is_zero() {
             std::thread::sleep(self.spawn_delay);
         }
         let end = Instant::now();
         let mut state = self.state.lock().unwrap();
+        state.in_flight -= 1;
         let pane_id = PaneId::new(format!("%{}", state.next_pane));
         state.next_pane += 1;
         state.calls.push(SpawnCall {

package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs

@@ -368,7 +368,7 @@ fn red6_cli_restart_reports_and_top_level_error_logs_are_redacted() {
 }
 
 #[test]
-#[serial(env)]
+#[serial(env, pid_probe)]
 fn red7_pane_and_profile_scrubbers_converge_without_losing_existing_policy() {
     let root = Path::new(env!("CARGO_MANIFEST_DIR"));
     let tmux = fs::read_to_string(root.join("src/tmux_backend.rs")).unwrap();
@@ -685,12 +685,12 @@ fn write_profile_fixture(root: &Path, base_url: &str, token: &str) -> PathBuf {
     .unwrap();
     fs::write(
         team.join("TEAM.md"),
-        "---\nname: redact-profile\nobjective: Synthetic redaction profile contract.\nprovider: claude\nauth_mode: compatible_api\n---\n\nTeam.\n",
+        "---\nname: redact-profile\nobjective: Synthetic redaction profile contract.\nprovider: claude\nauth_mode: compatible_api\ndangerously_skip_permissions: false\n---\n\nTeam.\n",
     )
     .unwrap();
     fs::write(
         team.join("agents/worker.md"),
-        "---\nname: worker\nrole: Worker\nprovider: claude\nauth_mode: compatible_api\nprofile: local\nmodel: null\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+        "---\nname: worker\nrole: Worker\nprovider: claude\nauth_mode: compatible_api\ndangerously_skip_permissions: false\nprofile: local\nmodel: null\ntools:\n  - mcp_team\n---\n\nWorker.\n",
     )
     .unwrap();
     team

package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs

@@ -861,7 +861,7 @@ fn contract_c_lifecycle_launch_command_carries_role_tools_and_real_mcp_context()
     .unwrap();
     std::fs::write(
         teamdir.join("agents").join("w1.md"),
-        "---\nname: w1\nrole: Worker must call report_result exactly once.\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nAlways use report_result for completion.\n",
+        "---\nname: w1\nrole: Worker must call report_result exactly once.\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nAlways use report_result for completion.\n",
     )
     .unwrap();
     let spec = team_agent::compiler::compile_team(&teamdir).unwrap();

package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs

@@ -172,7 +172,7 @@ fn write_claude_compatible_team(ws: &Path) -> PathBuf {
     .unwrap();
     std::fs::write(
         team.join("agents/worker_a.md"),
-        "---\nname: worker_a\nrole: Compat Worker\nprovider: claude\nmodel: claude-haiku\nauth_mode: compatible_api\nprofile: relay\ntools:\n  - mcp_team\n---\n\nCompat worker.\n",
+        "---\nname: worker_a\nrole: Compat Worker\nprovider: claude\nmodel: claude-haiku\nauth_mode: compatible_api\ndangerously_skip_permissions: false\nprofile: relay\ntools:\n  - mcp_team\n---\n\nCompat worker.\n",
     )
     .unwrap();
     std::fs::write(

package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs

@@ -244,7 +244,7 @@ fn write_team_dir(root: &Path, dir_name: &str, agent: &str) -> PathBuf {
 
 fn role_doc(agent: &str) -> String {
     format!(
-        "---\nname: {agent}\nrole: Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n"
+        "---\nname: {agent}\nrole: Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n"
     )
 }
 

package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs

@@ -881,7 +881,7 @@ fn team_dir_with_name(root: &Path, dir_name: &str, spec_name: &str, agent_id: &s
 
 fn role_doc(name: &str) -> String {
     format!(
-        "---\nname: {name}\nrole: Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n"
+        "---\nname: {name}\nrole: Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n"
     )
 }
 

package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs

@@ -1057,7 +1057,7 @@ fn team_dir(root: &Path, name: &str, agents: &[(&str, &str)]) -> PathBuf {
 
 fn role_doc(name: &str, role: &str) -> String {
     format!(
-        "---\nname: {name}\nrole: {role}\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{role}.\n"
+        "---\nname: {name}\nrole: {role}\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{role}.\n"
     )
 }
 

package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs

@@ -390,7 +390,7 @@ impl RollbackFixture {
 
 fn agent_doc(name: &str, role: &str) -> String {
     format!(
-        "---\nname: {name}\nrole: {role}\nprovider: codex\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\n{role}.\n"
+        "---\nname: {name}\nrole: {role}\nprovider: codex\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\n{role}.\n"
     )
 }
 

package/crates/team-agent/src/lifecycle/tests/test_isolation_escape_contract.rs

@@ -1,3 +1,7 @@
+//! purpose: contracts that tests touching product side effects stay inside one hermetic HOME/registry/socket/env boundary
+//! contract: R1-R6 source guards; R6 needles match as identifiers, not as substrings of longer names
+//! boundary: does not own HermeticTestEnv; does not drop or whitelist R6 needles
+//!
 //! task#8 RED contract: tests that exercise Team Agent product side effects
 //! must run inside one HOME/registry/socket/env hermetic boundary.
 //!
@@ -233,6 +237,40 @@ fn r6_static_guard_rejects_dangerous_tests_without_hermetic_boundary() {
     );
 }
 
+#[test]
+fn r6_mcp_tool_name_literal_is_not_message_plane_send() {
+    let source = r#"
+        assert!(prompt.contains("mcp__team_orchestrator__send_message"));
+        assert!(prompt.contains("team_orchestrator__send_message"));
+    "#;
+    assert!(
+        static_guard_offenders([(
+            "synthetic_mcp_tool_name_literal.rs".to_string(),
+            source.to_string()
+        )])
+        .is_empty(),
+        "MCP tool-name literals are not the send_message surface"
+    );
+}
+
+#[test]
+fn r6_bare_send_message_identifier_without_hermetic_is_still_offender() {
+    let source = r#"
+        fn tap() {
+            let _ = send_message("to", "body");
+        }
+    "#;
+    let offenders = static_guard_offenders([(
+        "synthetic_bare_send_message.rs".to_string(),
+        source.to_string(),
+    )]);
+    assert!(
+        offenders.iter().any(|offender| offender.path == "synthetic_bare_send_message.rs"
+            && offender.signals.contains(&"send_message")),
+        "bare send_message identifier without HermeticTestEnv must remain an offender; offenders={offenders:?}"
+    );
+}
+
 fn assert_contains_all(label: &str, source: &str, needles: &[&str], message: &str) {
     let missing = needles
         .iter()
@@ -315,10 +353,30 @@ fn dangerous_signals(source: &str) -> Vec<&'static str> {
         "attach-leader",
     ]
     .into_iter()
-    .filter(|needle| source.contains(needle))
+    .filter(|needle| contains_identifier(source, needle))
     .collect()
 }
 
+fn contains_identifier(source: &str, ident: &str) -> bool {
+    let bytes = source.as_bytes();
+    let mut start = 0;
+    while let Some(rel) = source[start..].find(ident) {
+        let idx = start + rel;
+        let before_ok = idx == 0 || !is_ident_char(bytes[idx - 1]);
+        let after = idx + ident.len();
+        let after_ok = after == bytes.len() || !is_ident_char(bytes[after]);
+        if before_ok && after_ok {
+            return true;
+        }
+        start = idx + 1;
+    }
+    false
+}
+
+fn is_ident_char(b: u8) -> bool {
+    matches!(b, b'0'..=b'9' | b'A'..=b'Z' | b'a'..=b'z' | b'_')
+}
+
 fn dangerous_test_files() -> Vec<(String, String)> {
     let root = repo_root();
     let mut files = Vec::new();
@@ -393,7 +451,7 @@ impl RestartAutoAttachCase {
         std::fs::write(
             workspace.join("agents").join(format!("{WORKER}.md")),
             format!(
-                "---\nname: {WORKER}\nrole: Worker {WORKER}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n"
+                "---\nname: {WORKER}\nrole: Worker {WORKER}\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n"
             ),
         )
         .expect("write worker role");

package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs

@@ -456,7 +456,7 @@ impl UpgradeFixture {
         std::fs::create_dir_all(self.team_dir.join("agents")).unwrap();
         std::fs::write(
             self.team_dir.join("agents").join("upgrade_worker.md"),
-            "---\nname: upgrade_worker\nrole: Upgrade Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nWorker.\n",
+            "---\nname: upgrade_worker\nrole: Upgrade Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nWorker.\n",
         )
         .unwrap();
         let spec = team_agent::compiler::compile_team(&self.team_dir).unwrap();

package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs

@@ -39,9 +39,9 @@ use hermetic::HermeticTestEnv;
 const TEAM_MD: &str =
     "---\nname: verify031\nobjective: Verify mixed provider windows.\nprovider: codex\n---\n\nTeam.\n";
 
-const CODEX_ROLE: &str = "---\nname: codexer\nrole: Codex Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nCodex worker.\n";
+const CODEX_ROLE: &str = "---\nname: codexer\nrole: Codex Worker\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nCodex worker.\n";
 
-const CLAUDE_ROLE: &str = "---\nname: clauder\nrole: Claude Worker\nprovider: claude\nmodel: claude-sonnet-4-6\nauth_mode: subscription\ntools:\n  - mcp_team\n---\n\nClaude worker.\n";
+const CLAUDE_ROLE: &str = "---\nname: clauder\nrole: Claude Worker\nprovider: claude\nmodel: claude-sonnet-4-6\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n  - mcp_team\n---\n\nClaude worker.\n";
 
 #[test]
 #[serial(env)]