@team-agent/installer 0.5.99 → 0.5.101

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

@@ -272,66 +272,6 @@ fn c1_runtime_commands_resolve_active_team_for_status_send_and_collect() {
     );
 }
 
-#[test]
-#[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
-fn c2_stop_team_level_command_exists_and_keeps_state_while_stopping_runtime() {
-    let ws = tmp_dir("c2-stop");
-    seed_runtime_state(&ws);
-
-    let out = run(
-        &["stop", "--workspace", ws.to_str().unwrap(), "--json"],
-        &ws,
-    );
-    let err = String::from_utf8_lossy(&out.stderr);
-    assert!(
-        !err.contains("invalid choice: 'stop'"),
-        "CR-005: canonical `team-agent stop --workspace <ws> --json` must be a registered team-level stop verb, not argparse invalid-choice; stderr={err:?}"
-    );
-    assert_eq!(
-        out.status.code(),
-        Some(0),
-        "CR-005: stop should stop the runtime while keeping state on a valid workspace; stdout={} stderr={}",
-        String::from_utf8_lossy(&out.stdout),
-        err
-    );
-    let value = stdout_json(&out);
-    assert_eq!(
-        value["ok"],
-        json!(true),
-        "stop must return a successful JSON envelope"
-    );
-    assert!(
-        team_agent::state::persist::runtime_state_path(&ws).exists(),
-        "stop keeps runtime state for later restart"
-    );
-}
-
-#[test]
-#[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
-fn c2_canonical_verbs_expose_help_instead_of_invalid_choice() {
-    let cwd = tmp_dir("c2-help-verbs");
-    let mut failures = Vec::new();
-    for verb in ["start", "restart-agent", "purge-agent"] {
-        let out = run(&[verb, "--help"], &cwd);
-        let stdout = String::from_utf8_lossy(&out.stdout);
-        let stderr = String::from_utf8_lossy(&out.stderr);
-        if out.status.code() != Some(0)
-            || stderr.contains("invalid choice:")
-            || !(stdout.contains("usage") || stderr.contains("usage"))
-        {
-            failures.push(format!(
-                "{verb}: code={:?} stdout={stdout:?} stderr={stderr:?}",
-                out.status.code()
-            ));
-        }
-    }
-    assert!(
-        failures.is_empty(),
-        "CR-030/032/035/063: canonical lifecycle verbs must be registered and expose help, not invalid-choice:\n{}",
-        failures.join("\n")
-    );
-}
-
 #[test]
 #[ignore = "real-machine: command-file gate uses real team-agent binary/lifecycle"]
 fn c2_quick_start_help_is_zero_token_help_only_and_does_not_compile_workspace() {

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

@@ -80,7 +80,7 @@ fn quick_start_workspace_override_is_not_dropped_before_runtime_state_write() {
     let quick_start_args = source_section(
         &cli_types,
         "pub struct QuickStartArgs",
-        "pub struct InitArgs",
+        "pub struct SendArgs",
     );
     assert!(
         quick_start_args.contains("pub workspace: PathBuf"),
@@ -97,7 +97,7 @@ fn quick_start_workspace_override_is_not_dropped_before_runtime_state_write() {
 
     let emit =
         std::fs::read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/src/cli/emit.rs")).unwrap();
-    let quick_start_args_fn = source_section(&emit, "fn quick_start_args", "fn init_args");
+    let quick_start_args_fn = source_section(&emit, "fn quick_start_args", "fn resolve_cli_path");
     assert!(
         quick_start_args_fn.contains("workspace: workspace.clone()")
             || quick_start_args_fn.contains("workspace,"),

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

@@ -82,6 +82,7 @@ mod pi_command_red;
 mod pi_compiler_red;
 mod pi_dual_entry_red;
 mod pi_executable_mcp_red;
+mod pi_fork_session_inheritance_red;
 mod pi_lifecycle_doctor_red;
 mod pi_session_delivery_red;
 mod quick_start_worker_readiness_red;

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

@@ -605,8 +605,8 @@ pub struct AddAgentReport {
     pub role_file: PathBuf,
 }
 
-/// `fork_agent(...)` 结果(`operations.py:402`)。native session fork(provider 须
-/// supports_session_fork ∧ auth_mode!=compatible_api)。
+/// `fork_agent(...)` 结果。Pi 的 snapshot fork 附带可审计的 source/target backing 细节；
+/// 已支持的其他 provider 保持既有报告字段。
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ForkAgentReport {
     pub source_agent_id: AgentId,
@@ -614,6 +614,14 @@ pub struct ForkAgentReport {
     pub env: AgentActionEnvelope,
     pub session_id: Option<SessionId>,
     pub backing_state: ForkBackingState,
+    pub pi_fork: Option<PiForkDetails>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PiForkDetails {
+    pub source_session_id: SessionId,
+    pub session_id: SessionId,
+    pub backing_path: RolloutPath,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]

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

@@ -551,11 +551,11 @@ fn coordinator_unavailable_outcome(
     );
     let warning = if persist {
         format!(
-            "coordinator is not running; message was queued for {recipient} and will retry. Run `team-agent diagnose` or restart the team."
+            "coordinator is not running; message was queued for {recipient} and will retry. Run `team-agent doctor` or restart the team."
         )
     } else {
         format!(
-            "coordinator protocol or schema is incompatible; message was not queued for {recipient}. Run `team-agent diagnose` or upgrade the runtime."
+            "coordinator protocol or schema is incompatible; message was not queued for {recipient}. Run `team-agent doctor` or upgrade the runtime."
         )
     };
     event_log.write(

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",

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`。
@@ -172,7 +174,7 @@ pub enum AuthHintStatus {
 pub enum NoPingReason {
     /// worker 从未 open 过 turn(`idle_predicate.py:61`)。
     NotArmedNoWorkerTurn,
-    /// suppress flag 置位(acknowledge-idle 后,`idle_predicate.py:63`)。
+    /// Suppress flag from a legacy idle acknowledgement (`idle_predicate.py:63`).
     Acknowledged,
     /// armed 但 elapsed < debounce(`idle_predicate.py:65`)。
     DebounceActive,

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.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),
@@ -163,7 +166,12 @@ impl<'a> StateRepository<'a> {
             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 +184,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 +267,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 +289,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 +304,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 +385,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
@@ -419,9 +540,6 @@ pub enum StateWriteIntent<'a> {
     SchedulerSuppression {
         owner_team_id: Option<&'a str>,
     },
-    IdleAck {
-        team_key: Option<&'a str>,
-    },
     TaskRepair {
         team_key: Option<&'a str>,
     },
@@ -650,8 +768,6 @@ fn route_direct(
         },
         // SchedulerSuppression -> root save (messaging/scheduler.rs:259).
         StateWriteIntent::SchedulerSuppression { .. } => helper_write_root(workspace, state),
-        // IdleAck -> root save (cli/mod.rs:2544).
-        StateWriteIntent::IdleAck { .. } => 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

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
         }))
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.5.99",
+  "version": "0.5.101",
   "description": "npx installer for Team Agent",
   "keywords": [
     "codex",
@@ -20,9 +20,9 @@
     "team-agent-installer": "npm/install.mjs"
   },
   "optionalDependencies": {
-    "@team-agent/cli-darwin-arm64": "0.5.99",
-    "@team-agent/cli-darwin-x64": "0.5.99",
-    "@team-agent/cli-linux-x64": "0.5.99"
+    "@team-agent/cli-darwin-arm64": "0.5.101",
+    "@team-agent/cli-darwin-x64": "0.5.101",
+    "@team-agent/cli-linux-x64": "0.5.101"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",