@team-agent/installer 0.5.100 → 0.5.102

package/crates/team-agent/src/messaging/tests/runtime.rs

@@ -979,32 +979,6 @@ fn requeue_delivery_exhausted_watchers_reopens_only_exhausted() {
     );
 }
 
-// ════════════════════════════════════════════════════════════════════════
-// GROUP P — stuck_cancel owner-gate + invalid alert type refusal.
-// scheduler.py:262-294.
-// ════════════════════════════════════════════════════════════════════════
-
-#[test]
-fn stuck_cancel_none_alert_type_expands_to_all() {
-    // alert_type None == Python "all" → sorted(_ALERT_TYPES) expansion.
-    let ws = tmp_ws("stuckcancel");
-    let out = stuck_cancel(&ws, "w1", None, "leader").unwrap();
-    // The suppression result must enumerate all three alert types.
-    let types = out.get("alert_types").and_then(|v| v.as_array()).map(|a| {
-        a.iter()
-            .filter_map(|x| x.as_str().map(str::to_string))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(
-        types,
-        Some(vec![
-            "cross_worker_deadlock".to_string(),
-            "idle_fallback".to_string(),
-            "stuck".to_string()
-        ])
-    );
-}
-
 // ════════════════════════════════════════════════════════════════════════
 // GROUP Q — collect intake (results.py:45-167): valid result advances task,
 // returns collected_results + delivered_messages + results counts shape.

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

@@ -219,26 +219,6 @@ impl WorkerRuntimeState {
     }
 }
 
-/// 告警类型 (card §49;`scheduler.py:38` `_ALERT_TYPES`)。`stuck_cancel` 还接 `all` (展开全集)。
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AlertType {
-    Stuck,
-    IdleFallback,
-    CrossWorkerDeadlock,
-}
-
-impl AlertType {
-    /// `stuck_cancel(alert_type="all")` → `sorted(_ALERT_TYPES)` 全集 (`scheduler.py:269`)。
-    pub fn all() -> [AlertType; 3] {
-        [
-            AlertType::CrossWorkerDeadlock,
-            AlertType::IdleFallback,
-            AlertType::Stuck,
-        ]
-    }
-}
-
 /// selftest check 状态 (card §47;`diagnose/comms.py`)。§19 必变 enum。
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]

package/crates/team-agent/src/model/spec.rs

@@ -406,6 +406,7 @@ fn check_agent(agent: &Yaml, path: &str, errors: &mut Vec<String>) {
     ];
     let allowed = &[
         "id",
+        "label",
         "role",
         "provider",
         "model",
@@ -1134,19 +1135,10 @@ mod tests {
         );
     }
 
-    // 0.5.66 bypass 单源 §4.1:7 触发面共用同一 spec 校验层——compile_team 是它们的共同
-    // 必经点(quick-start/restart/add/fork 都调用),缺字段一律 fail-loud。此处验证
-    // compile 级校验确实 fail-loud,即各触发面(经 compile_team)都被覆盖。
+    // 0.5.66 bypass 单源 §4.1:7 个生命周期入口共享编译后的 spec。
+    // 缺失 role frontmatter 值时由编译器注入 true；此处锁定公共编译入口的默认结果。
     #[test]
-    fn test_all_7_triggers_run_field_check() {
-        // compile_team 是 7 触发面的 spec 校验必经点:
-        //   quick-start(quick_start.rs:233 compile_team)
-        //   restart(rebuild.rs:3245 rebuild_runtime_spec_from_roles → compile_team)
-        //   add-agent(add_agent.rs:331 compile_role_agent)
-        //   clone-agent(clone_agent.rs:62 → add_agent)
-        //   fork-agent(fork_agent.rs:96 validate_spec)
-        //   start-agent / reset-agent(操作已编译 spec,团队创建时经 compile_team 校验)
-        // 验证 compile_team 对缺字段的角色文档 fail-loud。
+    fn test_all_7_triggers_use_compiled_default_bypass() {
         let team = std::env::temp_dir().join(format!(
             "ta-spec-7trigger-{}",
             std::process::id()
@@ -1158,17 +1150,22 @@ mod tests {
             "---\nname: t7\nobjective: 7 trigger.\nprovider: codex\n---\n\nteam.\n",
         )
         .unwrap();
-        // 角色文档故意缺 dangerously_skip_permissions
+        // 角色文档故意省略该字段；纯文本默认必须写入 compiled spec。
         std::fs::write(
             team.join("agents").join("w.md"),
             "---\nname: w\nrole: Worker\nprovider: codex\ntools:\n  - mcp_team\n---\n\nw.\n",
         )
         .unwrap();
-        let err = crate::compiler::compile_team(&team).unwrap_err().to_string();
-        assert!(
-            err.contains("missing front matter field dangerously_skip_permissions")
-                && err.contains("This field must be declared explicitly; it controls whether the agent launches with permission prompts bypassed."),
-            "compile_team must fail-loud on missing field (shared by all 7 triggers); got {err}"
+        let spec = crate::compiler::compile_team(&team)
+            .expect("compile_team must materialize the default bypass value");
+        let agent = spec
+            .get("agents")
+            .and_then(Yaml::as_list)
+            .and_then(|agents| agents.first())
+            .expect("compiled spec has a worker");
+        assert_eq!(
+            agent.get("dangerously_skip_permissions"),
+            Some(&Yaml::Bool(true))
         );
         let _ = std::fs::remove_dir_all(&team);
     }

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

@@ -132,6 +132,8 @@ pub enum CaptureVia {
     FsWatch,
     FsMtimeFallback,
     FsRepair,
+    SessionScan,
+    ForkSnapshot,
 }
 
 /// attribution confidence(doc §56)。bug-085 fallback 固定 `Low`。

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

@@ -232,6 +232,7 @@ pub fn save_runtime_state(workspace: &Path, state: &Value) -> Result<(), StateEr
         &[],
         None,
         None,
+        false,
     )
 }
 
@@ -251,6 +252,7 @@ pub(crate) fn save_runtime_state_with_receiver_authority(
         &[],
         Some(receiver_team_key),
         exact_owner_seed_to_clear,
+        false,
     )
 }
 
@@ -289,6 +291,7 @@ pub(crate) fn save_runtime_state_with_lifecycle_topology_authority(
         agent_ids,
         None,
         None,
+        false,
     )
 }
 
@@ -309,6 +312,7 @@ pub(crate) fn save_runtime_state_with_lifecycle_topology_authority_and_capture_b
         topology_agent_ids,
         None,
         None,
+        false,
     )
 }
 
@@ -327,6 +331,7 @@ pub(crate) fn save_runtime_state_with_deleted_agents(
         &[],
         None,
         None,
+        true,
     )
 }
 
@@ -346,6 +351,7 @@ pub(crate) fn save_runtime_state_with_team_tombstoned_agents(
         &[],
         None,
         None,
+        false,
     )
 }
 
@@ -365,6 +371,7 @@ pub(crate) fn save_runtime_state_with_team_tombstone_lifecycle_topology_authorit
         agent_ids,
         None,
         None,
+        false,
     )
 }
 
@@ -378,6 +385,7 @@ fn save_runtime_state_with_merge_options(
     topology_update_agent_ids: &[&str],
     receiver_update_team_key: Option<&str>,
     exact_owner_seed_to_clear: Option<&Value>,
+    preserve_latest_fork_targets: bool,
 ) -> Result<(), StateError> {
     persist_runtime_state_with_merge_options_and_expected(
         workspace,
@@ -392,6 +400,7 @@ fn save_runtime_state_with_merge_options(
         None,
         None,
         None,
+        preserve_latest_fork_targets,
     )
 }
 
@@ -415,6 +424,7 @@ pub(crate) fn save_runtime_state_with_receiver_authority_and_expected(
         Some((expected_owner, expected_receiver)),
         None,
         None,
+        false,
     )
 }
 
@@ -438,6 +448,7 @@ pub(crate) fn save_runtime_state_with_exact_owner_receiver_cleanup(
         None,
         Some((team_key, expected_owner, expected_receiver)),
         None,
+        false,
     )
 }
 
@@ -469,6 +480,7 @@ pub(crate) fn save_runtime_state_with_exact_owner_receiver_restore(
             previous_owner,
             previous_receiver,
         )),
+        false,
     )
 }
 
@@ -485,6 +497,7 @@ fn persist_runtime_state_with_merge_options_and_expected(
     expected_owner_receiver: Option<(&Value, &Value)>,
     exact_owner_receiver_to_clear: Option<(&str, &Value, &Value)>,
     exact_owner_receiver_to_restore: Option<(&str, &Value, &Value, &Value, &Value)>,
+    preserve_latest_fork_targets: bool,
 ) -> Result<(), StateError> {
     let path = runtime_state_path(workspace);
     // Python `state.py:497`:先对入参 state 跑 `_migrate_state_identity`(就地填缺失 leader uuid)。
@@ -585,7 +598,7 @@ fn persist_runtime_state_with_merge_options_and_expected(
             .filter(|team_key| !team_key.is_empty())
             .map(str::to_string)
             .collect::<BTreeSet<_>>();
-        apply_persist_merge_contract(
+        apply_persist_merge_contract_with_fork_target_preservation(
             &mut migrated,
             latest,
             &deleted,
@@ -596,6 +609,7 @@ fn persist_runtime_state_with_merge_options_and_expected(
             receiver_update_team_key.zip(exact_owner_seed_to_clear),
             exact_owner_receiver_to_clear,
             exact_owner_receiver_to_restore,
+            preserve_latest_fork_targets,
         )?;
     }
     super::abnormal_watch::compact_after_merge(&mut migrated, latest.as_ref(), deleted_agent_ids);
@@ -707,6 +721,34 @@ fn apply_persist_merge_contract(
     exact_owner_seed_to_clear: Option<(&str, &Value)>,
     exact_owner_receiver_to_clear: Option<(&str, &Value, &Value)>,
     exact_owner_receiver_to_restore: Option<(&str, &Value, &Value, &Value, &Value)>,
+) -> Result<(), StateError> {
+    apply_persist_merge_contract_with_fork_target_preservation(
+        incoming,
+        latest,
+        deleted_agent_ids,
+        skip_capture_backfill_team_key,
+        skip_capture_backfill_agent_ids,
+        topology_updates,
+        receiver_updates,
+        exact_owner_seed_to_clear,
+        exact_owner_receiver_to_clear,
+        exact_owner_receiver_to_restore,
+        false,
+    )
+}
+
+fn apply_persist_merge_contract_with_fork_target_preservation(
+    incoming: &mut Value,
+    latest: &Value,
+    deleted_agent_ids: &BTreeSet<String>,
+    skip_capture_backfill_team_key: Option<&str>,
+    skip_capture_backfill_agent_ids: &BTreeSet<String>,
+    topology_updates: &BTreeSet<(String, String)>,
+    receiver_updates: &BTreeSet<String>,
+    exact_owner_seed_to_clear: Option<(&str, &Value)>,
+    exact_owner_receiver_to_clear: Option<(&str, &Value, &Value)>,
+    exact_owner_receiver_to_restore: Option<(&str, &Value, &Value, &Value, &Value)>,
+    preserve_latest_fork_targets: bool,
 ) -> Result<(), StateError> {
     // A0/R1: the projection gate only guards the TOP-LEVEL passes (top-level agents and
     // the top-level<->active-team cross projections depend on which team is active); the
@@ -740,6 +782,7 @@ fn apply_persist_merge_contract(
             skip_capture_backfill_agent_ids,
             &topology_update_agent_ids,
             None,
+            preserve_latest_fork_targets,
         )?;
         // Stage 3c (identity-boundary unified plan, architect direction
         // 2026-06-23): top-level owner copy-back removed. Pre-3c this
@@ -818,6 +861,7 @@ fn apply_persist_merge_contract(
                 skip_capture_backfill_agent_ids,
                 &topology_update_agent_ids,
                 team_alive,
+                preserve_latest_fork_targets,
             )?;
             preserve_latest_ownership_fields(
                 incoming_entry,
@@ -1196,6 +1240,7 @@ fn merge_agent_projection(
     //   the merge must NOT protect stale topology so a live sibling's write
     //   can go through.
     team_alive: Option<bool>,
+    preserve_latest_fork_targets: bool,
 ) -> Result<(), StateError> {
     let Some(incoming_agents) = incoming_agents else {
         return Ok(());
@@ -1212,8 +1257,17 @@ fn merge_agent_projection(
         }
         let tombstoned_for_projection =
             skip_capture_backfill && skip_capture_backfill_agent_ids.contains(agent_id);
+        let fork_target = preserve_latest_fork_targets
+            && latest_agent
+                .get("forked_from")
+                .and_then(Value::as_str)
+                .is_some_and(|source| !source.is_empty());
         match incoming_map.entry(agent_id.clone()) {
             serde_json::map::Entry::Vacant(slot) => {
+                if fork_target {
+                    slot.insert(latest_agent.clone());
+                    continue;
+                }
                 if topology_update_agent_ids.contains(agent_id) {
                     continue;
                 }
@@ -1244,7 +1298,9 @@ fn merge_agent_projection(
                 if !tombstoned_for_projection && !topology_update_agent_ids.contains(agent_id) {
                     let fields = topology_conflict_fields(existing.get(), latest_agent, team_alive);
                     if !fields.is_empty() {
-                        if !topology_update_agent_ids.is_empty()
+                        if fork_target {
+                            preserve_latest_topology(existing.get_mut(), latest_agent);
+                        } else if !topology_update_agent_ids.is_empty()
                             && lifecycle_peer_snapshot_is_stale(existing.get(), latest_agent)
                         {
                             // A lifecycle writer may have loaded a complete

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

@@ -972,7 +972,11 @@ fn save_team_scoped_state_with_merge_options(
             );
         }
         if tombstoned_agent_ids.is_empty() {
-            return save_runtime_state_with_deleted_agents(workspace, &merged, deleted_agent_ids);
+            return save_runtime_state_with_deleted_agents(
+                workspace,
+                &merged,
+                deleted_agent_ids,
+            );
         }
         return save_runtime_state_with_team_tombstoned_agents(
             workspace,

package/crates/team-agent/src/state/repository/tests.rs

@@ -1,20 +1,5 @@
 
-use super::{reapply_scope, ReapplyScope, StateWriteIntent};
-
-#[test]
-fn mcp_reapply_scope_matches_legacy_helpers() {
-    assert!(
-        reapply_scope(&StateWriteIntent::McpUpdateStateNote {
-            team_key: Some("team-a"),
-        }) == ReapplyScope::Team
-    );
-    assert!(
-        reapply_scope(&StateWriteIntent::McpAssignTask {
-            team_key: Some("team-a"),
-            task_id: "task-a",
-        }) == ReapplyScope::Root
-    );
-}
+use super::StateWriteIntent;
 
 #[test]
 fn optional_unmigrated_read_preserves_missing_corrupt_and_valid_shapes(

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

@@ -128,6 +128,9 @@ impl<'a> StateRepository<'a> {
     /// forward call to the same legacy helper family that the caller used
     /// before S1a; the intent selects the family, not the merge semantics.
     pub fn save(&self, intent: StateWriteIntent<'_>, state: &Value) -> Result<(), StateError> {
+        if let StateWriteIntent::CoordinatorTick { team_key } = &intent {
+            return self.save_coordinator_tick(team_key, state);
+        }
         route_direct(self.workspace, intent, state)
     }
 
@@ -149,8 +152,8 @@ impl<'a> StateRepository<'a> {
         route_reapply(self.workspace, intent, state, reapply)
     }
 
-    /// Commit a task/note delta once against latest under state-save. Return
-    /// the committed Team view for callers that produce Markdown afterwards.
+    /// Commit a bounded Team delta once against latest under state-save.
+    /// Return the committed Team view for callers that produce Markdown afterwards.
     pub fn commit<F>(&self, intent: StateWriteIntent<'_>, update: F) -> Result<Value, StateError>
     where
         F: FnOnce(&mut Value),
@@ -158,12 +161,13 @@ impl<'a> StateRepository<'a> {
         #[cfg(test)]
         test_support::before_commit();
         let team_key = match intent {
-            // Assignment's existing reconcile helper updates the root task
-            // array and the explicit Team array independently (legacy parity).
-            StateWriteIntent::McpAssignTask { .. } => None,
-            StateWriteIntent::McpUpdateStateNote { team_key } => team_key,
             StateWriteIntent::ResultCollection { owner_team_id } => owner_team_id,
-            _ => return Err(StateError::SaveFailed("intent does not accept a task/note delta".into())),
+            StateWriteIntent::ForkAgent { team_key, .. } => Some(team_key),
+            _ => {
+                return Err(StateError::SaveFailed(
+                    "intent does not accept a bounded Team delta".into(),
+                ))
+            }
         };
         let committed = super::persist::update_runtime_state(self.workspace, |latest| {
             let mut selected = bounded_team_view(latest, team_key)?;
@@ -176,6 +180,64 @@ impl<'a> StateRepository<'a> {
         bounded_team_view(&committed, team_key)
     }
 
+    /// Atomically replace only the fork target row in the selected team.
+    pub(crate) fn commit_fork_agent(
+        &self,
+        intent: StateWriteIntent<'_>,
+        target_row: &Value,
+    ) -> Result<(), StateError> {
+        let (team_key, agent_id) = match &intent {
+            StateWriteIntent::ForkAgent {
+                team_key,
+                agent_id,
+            } => (*team_key, *agent_id),
+            _ => {
+                return Err(StateError::SaveFailed(
+                    "fork target delta requires ForkAgent intent".into(),
+                ))
+            }
+        };
+        let target_row = target_row.clone();
+        let mut found = false;
+        self.commit(
+            StateWriteIntent::ForkAgent { team_key, agent_id },
+            |selected| {
+                if let Some(row) = selected
+                    .get_mut("agents")
+                    .and_then(Value::as_object_mut)
+                    .and_then(|agents| agents.get_mut(agent_id))
+                {
+                    *row = target_row;
+                    found = true;
+                }
+            },
+        )?;
+        if found {
+            Ok(())
+        } else {
+            Err(StateError::SaveFailed(
+                "ForkAgent target row is missing from selected team".into(),
+            ))
+        }
+    }
+
+    fn save_coordinator_tick(&self, team_key: &str, state: &Value) -> Result<(), StateError> {
+        let incoming = state.clone();
+        super::persist::update_runtime_state(self.workspace, |latest| {
+            let mut incoming_team = bounded_team_view(&incoming, Some(team_key))?;
+            let latest_team = bounded_team_view(latest, Some(team_key))?;
+            preserve_latest_fork_rows(&mut incoming_team, &latest_team);
+            let mut checked =
+                super::projection::merge_committed_team(latest, &incoming_team, team_key);
+            super::persist::merge_ordinary_state(&mut checked, latest)?;
+            let checked = bounded_team_view(&checked, Some(team_key))?;
+            Ok(super::projection::merge_committed_team(
+                latest, &checked, team_key,
+            ))
+        })?;
+        Ok(())
+    }
+
     /// Fence the sampled incarnation with the existing persist guards, then
     /// commit only this tick's agent observations and coordinator bookkeeping.
     pub fn commit_observations(
@@ -201,6 +263,7 @@ impl<'a> StateRepository<'a> {
                     ));
                 }
                 let mut checked = observed.clone();
+                preserve_latest_fork_rows(&mut checked, latest);
                 super::persist::merge_ordinary_state(&mut checked, latest)?;
                 if !legacy_single_team_state(&checked)
                     || sampled_identity != legacy_team_identity(&checked)
@@ -222,7 +285,13 @@ impl<'a> StateRepository<'a> {
                 }
                 return Ok(selected);
             }
-            let mut checked = super::projection::merge_committed_team(latest, observed, team_key);
+            let mut observed_with_delta = observed.clone();
+            sync_team_observation_delta(before, &mut observed_with_delta, team_key);
+            let mut observed_team = bounded_team_view(&observed_with_delta, Some(team_key))?;
+            let latest_team = bounded_team_view(latest, Some(team_key))?;
+            preserve_latest_fork_rows(&mut observed_team, &latest_team);
+            let mut checked =
+                super::projection::merge_committed_team(latest, &observed_team, team_key);
             super::persist::merge_ordinary_state(&mut checked, latest)?;
             let checked = bounded_team_view(&checked, Some(team_key))?;
             let mut selected = bounded_team_view(latest, Some(team_key))?;
@@ -231,12 +300,32 @@ impl<'a> StateRepository<'a> {
                     apply_observation_delta(&before[field], &checked[field], &mut selected[field]);
                 }
             }
+            sync_team_observation_delta(before, &mut selected, team_key);
             Ok(super::projection::merge_committed_team(latest, &selected, team_key))
         })?;
         Ok(())
     }
 }
 
+// Coordinator observations do not own fork-target lifecycle rows.
+fn preserve_latest_fork_rows(incoming: &mut Value, latest: &Value) {
+    let Some(latest_agents) = latest.get("agents").and_then(Value::as_object) else {
+        return;
+    };
+    let Some(incoming_agents) = incoming.get_mut("agents").and_then(Value::as_object_mut) else {
+        return;
+    };
+    for (agent_id, latest_agent) in latest_agents {
+        if latest_agent
+            .get("forked_from")
+            .and_then(Value::as_str)
+            .is_some_and(|source| !source.is_empty())
+        {
+            incoming_agents.insert(agent_id.clone(), latest_agent.clone());
+        }
+    }
+}
+
 fn legacy_single_team_state(state: &Value) -> bool {
     match state.get("teams") {
         None => true,
@@ -292,6 +381,34 @@ fn apply_observation_delta(before: &Value, observed: &Value, latest: &mut Value)
     }
 }
 
+// The coordinator observes a projected team view, while its nested `teams`
+// snapshot remains stale. Carry only observation deltas back to the canonical
+// team entry before `bounded_team_view` projects it again.
+fn sync_team_observation_delta(before: &Value, observed: &mut Value, team_key: &str) {
+    for field in ["agents", "coordinator"] {
+        let before_value = before.get(field).cloned().unwrap_or(Value::Null);
+        let observed_value = observed.get(field).cloned().unwrap_or(Value::Null);
+        if before_value == observed_value {
+            continue;
+        }
+        let Some(team_entry) = observed
+            .get_mut("teams")
+            .and_then(Value::as_object_mut)
+            .and_then(|teams| teams.get_mut(team_key))
+            .and_then(Value::as_object_mut)
+        else {
+            continue;
+        };
+        if field == "coordinator" && !team_entry.contains_key(field) {
+            team_entry.insert(field.to_string(), serde_json::json!({}));
+        }
+        let slot = team_entry
+            .entry(field.to_string())
+            .or_insert_with(|| before_value.clone());
+        apply_observation_delta(&before_value, &observed_value, slot);
+    }
+}
+
 /// Closed semantic catalog of workspace state writes. Every allowlisted
 /// callsite maps to exactly one variant, and there is intentionally no
 /// generic escape bucket. Any new state write must earn its own variant so
@@ -396,16 +513,6 @@ pub enum StateWriteIntent<'a> {
     CoordinatorConptyShim {
         team_key: Option<&'a str>,
     },
-    McpAssignTask {
-        team_key: Option<&'a str>,
-        task_id: &'a str,
-    },
-    McpLifecycleAgentOps {
-        team_key: Option<&'a str>,
-    },
-    McpUpdateStateNote {
-        team_key: Option<&'a str>,
-    },
     MessagingDeliveryState {
         owner_team_id: Option<&'a str>,
     },
@@ -416,9 +523,6 @@ pub enum StateWriteIntent<'a> {
     ResultCollection {
         owner_team_id: Option<&'a str>,
     },
-    SchedulerSuppression {
-        owner_team_id: Option<&'a str>,
-    },
     TaskRepair {
         team_key: Option<&'a str>,
     },
@@ -614,15 +718,6 @@ fn route_direct(
         // CoordinatorConptyShim -> root save
         // (coordinator/conpty_shim.rs:426/674).
         StateWriteIntent::CoordinatorConptyShim { .. } => helper_write_root(workspace, state),
-        // McpAssignTask uses the reapply variant today; direct save routes
-        // to the root helper for parity.
-        StateWriteIntent::McpAssignTask { .. } => helper_write_root(workspace, state),
-        // McpLifecycleAgentOps -> root save
-        // (mcp_server/lifecycle_tools/agent_ops.rs:385).
-        StateWriteIntent::McpLifecycleAgentOps { .. } => helper_write_root(workspace, state),
-        // McpUpdateStateNote -> root save
-        // (mcp_server/lifecycle_tools/state_status.rs:29/69).
-        StateWriteIntent::McpUpdateStateNote { .. } => helper_write_root(workspace, state),
         // MessagingDeliveryState direct writes cover team-scoped, root
         // fallback, and root (messaging/delivery.rs:2356/2358/2361).
         StateWriteIntent::MessagingDeliveryState { owner_team_id } => match owner_team_id {
@@ -645,8 +740,6 @@ fn route_direct(
             Some(_) => helper_write_team_scoped(workspace, state),
             None => helper_write_root(workspace, state),
         },
-        // SchedulerSuppression -> root save (messaging/scheduler.rs:259).
-        StateWriteIntent::SchedulerSuppression { .. } => helper_write_root(workspace, state),
         // TaskRepair -> `save_team_scoped_state` (cli/adapters.rs:675).
         StateWriteIntent::TaskRepair { .. } => helper_write_team_scoped(workspace, state),
         // FakeE2eSeed / SelfMigration are diagnostic seams. The current
@@ -677,9 +770,6 @@ fn reapply_scope(intent: &StateWriteIntent<'_>) -> ReapplyScope {
                 owner_team_id: Some(_),
             }
             | StateWriteIntent::CoordinatorTick { .. }
-            | StateWriteIntent::McpUpdateStateNote {
-                team_key: Some(_),
-            }
     ) {
         ReapplyScope::Team
     } else {
@@ -696,8 +786,7 @@ fn route_reapply<F>(
 where
     F: FnOnce(&mut Value),
 {
-    if matches!(&intent, StateWriteIntent::McpAssignTask { .. }
-        | StateWriteIntent::McpUpdateStateNote { .. } | StateWriteIntent::ResultCollection { .. })
+    if matches!(&intent, StateWriteIntent::ResultCollection { .. })
     {
         return StateRepository::new(workspace).commit(intent, reapply).map(|_| ());
     }

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

@@ -360,7 +360,20 @@ impl OfflineTransport {
             if kind == "spawn_first" && !state.session_absent_after_spawn_first {
                 state.session_present = true;
             }
-            let pane_index = state.spawns.len().saturating_sub(1);
+            let mut pane_index = state.spawns.len().saturating_sub(1);
+            // Existing sessions reserve `%0` for the already-running pane.
+            if kind == "spawn_into" {
+                pane_index = pane_index.max(1);
+            }
+            while state.pane_presence.contains_key(&format!("%{pane_index}"))
+                || state
+                    .targets
+                    .iter()
+                    .chain(state.target_snapshots.iter().flatten())
+                    .any(|target| target.pane_id.as_str() == format!("%{pane_index}"))
+            {
+                pane_index = pane_index.saturating_add(1);
+            }
             state
                 .pane_presence
                 .insert(format!("%{pane_index}"), state.spawned_panes_addressable);
@@ -541,10 +554,17 @@ impl Transport for OfflineTransport {
             });
         }
         Ok(self.with_state(|state| {
-            state
+            let targets = state
                 .target_snapshots
                 .pop_front()
-                .unwrap_or_else(|| state.targets.clone())
+                .unwrap_or_else(|| state.targets.clone());
+            for target in &targets {
+                state
+                    .pane_presence
+                    .entry(target.pane_id.as_str().to_string())
+                    .or_insert(true);
+            }
+            targets
         }))
     }