@team-agent/installer 0.5.50 → 0.5.52

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

@@ -40,11 +40,13 @@ use super::StateError;
 // `save_team_scoped_state(` tokens that the governance scanner counts.
 #[allow(unused_imports)]
 use super::persist::{
-    load_runtime_state as helper_load_workspace, save_runtime_state as helper_write_root,
+    load_runtime_state as helper_load_workspace,
+    runtime_state_path as helper_workspace_path, save_runtime_state as helper_write_root,
     save_runtime_state_reapplying_after_conflict as helper_write_root_reapply,
     save_runtime_state_with_deleted_agents as helper_write_root_with_deleted_agents,
     save_runtime_state_with_lifecycle_topology_authority as helper_write_root_with_lifecycle_topology_authority,
     save_runtime_state_with_lifecycle_topology_authority_and_capture_backfill_skip as helper_write_root_with_lifecycle_topology_authority_and_capture_backfill_skip,
+    save_runtime_state_with_receiver_authority as helper_write_root_with_receiver_authority,
     save_runtime_state_with_team_tombstone_lifecycle_topology_authority as helper_write_root_with_team_tombstone_lifecycle_topology_authority,
     save_runtime_state_with_team_tombstoned_agents as helper_write_root_with_team_tombstoned_agents,
     save_runtime_state_without_migrations as helper_write_root_without_migrations,
@@ -59,6 +61,8 @@ use super::projection::{
     save_team_scoped_state_with_tombstone_lifecycle_topology_authority as helper_write_team_scoped_with_tombstone_lifecycle_topology_authority,
 };
 
+mod intent;
+
 /// Repository facade for workspace state reads and writes.
 ///
 /// S1a scope: hold the workspace path, expose `load_workspace`/`load_team`
@@ -79,6 +83,19 @@ impl<'a> StateRepository<'a> {
         helper_load_workspace(self.workspace)
     }
 
+    /// Load the canonical workspace document without running read-time
+    /// migrations. `None` preserves the legacy raw-reader distinction between
+    /// a missing file and a present empty/default document.
+    pub fn load_workspace_if_exists_without_migrations(
+        &self,
+    ) -> Result<Option<Value>, StateError> {
+        if !helper_workspace_path(self.workspace).exists() {
+            return Ok(None);
+        }
+        let text = std::fs::read_to_string(helper_workspace_path(self.workspace))?;
+        serde_json::from_str(&text).map(Some).map_err(StateError::from)
+    }
+
     /// Resolve a team-scoped projection using the existing projection selector.
     /// `team_key = None` selects the ambient team the same way as pre-S1a.
     pub fn load_team(&self, team_key: Option<&str>) -> Result<Value, StateError> {
@@ -127,6 +144,10 @@ pub enum StateWriteIntent<'a> {
     LaunchTeam {
         team_key: &'a str,
     },
+    AddAgent {
+        team_key: &'a str,
+        agent_id: &'a str,
+    },
     AnnotateTeamDepth {
         team_key: &'a str,
     },
@@ -171,6 +192,10 @@ pub enum StateWriteIntent<'a> {
         team_key: Option<&'a str>,
         agent_id: &'a str,
     },
+    ForceRecreateRollback {
+        team_key: &'a str,
+        agent_id: &'a str,
+    },
     ClaimLeader {
         team_key: &'a str,
     },
@@ -193,7 +218,7 @@ pub enum StateWriteIntent<'a> {
     /// so future S1b migration can route it deliberately.
     CoordinatorApiErrorRecovery {
         team_key: Option<&'a str>,
-        agent_id: &'a str,
+        agent_id: Option<&'a str>,
     },
     McpAssignTask {
         team_key: Option<&'a str>,
@@ -227,9 +252,8 @@ pub enum StateWriteIntent<'a> {
     SelfMigration,
 }
 
-// S1a dispatch: every intent forwards to exactly the same helper family the
-// pre-S1a caller used, so behavior is bit-identical and only the naming has
-// shifted. When S1b migrates a writer cluster, only the arms below change;
+// S1a dispatch: every intent forwards to the same pre-S1a helper family; only naming shifted.
+// When S1b migrates a writer cluster, only the arms below change;
 // the callsites and tests keep talking to `StateRepository`.
 fn route_direct(
     workspace: &Path,
@@ -240,6 +264,14 @@ fn route_direct(
         // LaunchTeam -> the launch writer path uses the root helper today
         // (`save_runtime_state` at lifecycle/launch.rs:996).
         StateWriteIntent::LaunchTeam { .. } => helper_write_root(workspace, state),
+        StateWriteIntent::AddAgent { team_key, agent_id } => {
+            helper_write_team_scoped_with_lifecycle_topology_authority(
+                workspace,
+                state,
+                team_key,
+                &[agent_id],
+            )
+        }
         // AnnotateTeamDepth also lives on the root save path.
         StateWriteIntent::AnnotateTeamDepth { .. } => helper_write_root(workspace, state),
         // ShutdownTeam: scoped clean shutdown uses `save_team_scoped_state`;
@@ -259,12 +291,13 @@ fn route_direct(
         // `save_team_scoped_state_with_lifecycle_topology_authority_and_capture_backfill_skip`
         // at lifecycle/restart/common.rs:633.
         StateWriteIntent::RestartTeam {
+            team_key,
             topology_authority_agent_ids,
             skip_capture_backfill_agent_ids,
-            ..
         } => helper_write_team_scoped_with_lifecycle_topology_authority_and_capture_backfill_skip(
             workspace,
             state,
+            team_key,
             skip_capture_backfill_agent_ids,
             topology_authority_agent_ids,
         ),
@@ -274,16 +307,17 @@ fn route_direct(
         StateWriteIntent::RestartSessionRepair { .. } => helper_write_team_scoped(workspace, state),
         // StartAgent - the launch add-agent tail lands via
         // `save_team_scoped_state_with_lifecycle_topology_authority` today.
-        StateWriteIntent::StartAgent { .. } => {
-            helper_write_team_scoped_with_lifecycle_topology_authority(workspace, state, &[])
+        StateWriteIntent::StartAgent { team_key, .. } => {
+            helper_write_team_scoped_with_lifecycle_topology_authority(workspace, state, team_key, &[])
         }
         // StopAgent uses the legacy helper family
         // `save_team_scoped_state_with_lifecycle_topology_authority`,
         // matching lifecycle/restart/agent.rs:911.
-        StateWriteIntent::StopAgent { agent_id, .. } => {
+        StateWriteIntent::StopAgent { team_key, agent_id } => {
             helper_write_team_scoped_with_lifecycle_topology_authority(
                 workspace,
                 state,
+                team_key,
                 &[agent_id],
             )
         }
@@ -292,20 +326,22 @@ fn route_direct(
         // matching lifecycle/restart/agent.rs:1355. Non-discard falls back to
         // the same lifecycle topology-authority helper as StopAgent.
         StateWriteIntent::ResetAgent {
+            team_key,
             agent_id,
             discard_session,
-            ..
         } => {
             if discard_session {
                 helper_write_team_scoped_with_tombstone_lifecycle_topology_authority(
                     workspace,
                     state,
+                    team_key,
                     &[agent_id],
                 )
             } else {
                 helper_write_team_scoped_with_lifecycle_topology_authority(
                     workspace,
                     state,
+                    team_key,
                     &[agent_id],
                 )
             }
@@ -317,10 +353,11 @@ fn route_direct(
         }
         // ForkAgent mutates a selected team projection, so persist it back to
         // that projection with the forked row as lifecycle topology authority.
-        StateWriteIntent::ForkAgent { agent_id, .. } => {
+        StateWriteIntent::ForkAgent { team_key, agent_id } => {
             helper_write_team_scoped_with_lifecycle_topology_authority(
                 workspace,
                 state,
+                team_key,
                 &[agent_id],
             )
         }
@@ -331,16 +368,31 @@ fn route_direct(
             Some(_) => helper_write_team_scoped_with_deleted_agents(workspace, state, &[agent_id]),
             None => helper_write_root_with_deleted_agents(workspace, state, &[agent_id]),
         },
+        // Force-recreate rollback restores an existing row after the
+        // replacement spawn has advanced its lifecycle tuple. The selected
+        // row is therefore the explicit topology authority.
+        StateWriteIntent::ForceRecreateRollback { team_key, agent_id } => {
+            helper_write_team_scoped_with_lifecycle_topology_authority(
+                workspace,
+                state,
+                team_key,
+                &[agent_id],
+            )
+        }
         // ClaimLeader -> leader/lease.rs:1625 uses the root helper, and the
         // scoped preserve-claim-fields variant at :1702 uses the team-tombstoned
         // agents helper.
-        StateWriteIntent::ClaimLeader { .. } => helper_write_root(workspace, state),
+        StateWriteIntent::ClaimLeader { team_key } => {
+            helper_write_root_with_receiver_authority(workspace, state, team_key)
+        }
         StateWriteIntent::LeaderBindingRestoreNonTargetTeams { .. } => {
             helper_write_root_without_migrations(workspace, state)
         }
         // LeaderStartBinding -> managed/exec/external all root-save at
         // leader/start.rs:795/903/946.
-        StateWriteIntent::LeaderStartBinding { .. } => helper_write_root(workspace, state),
+        StateWriteIntent::LeaderStartBinding { team_key, .. } => {
+            helper_write_root_with_receiver_authority(workspace, state, team_key)
+        }
         // CoordinatorTick dispatches to the existing scoped helper
         // (`save_team_scoped_state`) preserving coordinator/tick.rs:427.
         StateWriteIntent::CoordinatorTick { .. } => helper_write_team_scoped(workspace, state),
@@ -396,16 +448,14 @@ fn route_direct(
 // Route intents that historically used the `_reapplying_after_conflict`
 // helper family. Behavior stays identical: S1a chooses the same helper the
 // legacy caller would have chosen for a reapply.
-fn route_reapply<F>(
-    workspace: &Path,
-    intent: StateWriteIntent<'_>,
-    state: &Value,
-    reapply: F,
-) -> Result<(), StateError>
-where
-    F: FnOnce(&mut Value),
-{
-    let use_team_scoped = matches!(
+#[derive(Clone, Copy, Eq, PartialEq)]
+enum ReapplyScope {
+    Root,
+    Team,
+}
+
+fn reapply_scope(intent: &StateWriteIntent<'_>) -> ReapplyScope {
+    if matches!(
         intent,
         StateWriteIntent::RestartSessionRepair { .. }
             | StateWriteIntent::MessagingDeliveryState {
@@ -415,14 +465,31 @@ where
                 owner_team_id: Some(_),
             }
             | StateWriteIntent::CoordinatorTick { .. }
-            | StateWriteIntent::McpAssignTask {
+            | StateWriteIntent::McpUpdateStateNote {
                 team_key: Some(_),
-                ..
             }
-    );
-    if use_team_scoped {
+    ) {
+        ReapplyScope::Team
+    } else {
+        ReapplyScope::Root
+    }
+}
+
+fn route_reapply<F>(
+    workspace: &Path,
+    intent: StateWriteIntent<'_>,
+    state: &Value,
+    reapply: F,
+) -> Result<(), StateError>
+where
+    F: FnOnce(&mut Value),
+{
+    if reapply_scope(&intent) == ReapplyScope::Team {
         helper_write_team_scoped_reapply(workspace, state, reapply)
     } else {
         helper_write_root_reapply(workspace, state, reapply)
     }
 }
+
+#[cfg(test)]
+mod tests;

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

@@ -5,8 +5,8 @@ use std::path::{Path, PathBuf};
 use serde_json::Value;
 
 use crate::model::paths::{canonical_run_workspace, runtime_spec_path, team_workspace};
-use crate::state::persist::{load_runtime_state, runtime_state_path};
-use crate::state::projection::{select_runtime_state, team_state_key};
+use crate::state::persist::runtime_state_path;
+use crate::state::projection::resolve_runtime_team_scope;
 use crate::state::StateError;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -36,15 +36,15 @@ pub fn resolve_active_team(
     mode: SelectorMode,
 ) -> Result<SelectedTeam, StateError> {
     let explicit_spec = input.join("team.spec.yaml");
-    let (run_workspace, state) = if explicit_spec.exists() {
+    let (run_workspace, resolved) = if explicit_spec.exists() {
         let team_run = team_workspace(input).map_err(|e| StateError::TeamSelect(e.to_string()))?;
         let run = if runtime_state_path(input).exists() || !runtime_state_path(&team_run).exists() {
             input.to_path_buf()
         } else {
             team_run
         };
-        let state = select_runtime_state(&run, team).or_else(|_| load_runtime_state(&run))?;
-        (run, state)
+        let resolved = resolve_runtime_team_scope(&run, team)?;
+        (run, resolved)
     } else {
         let run =
             canonical_run_workspace(input).map_err(|e| StateError::TeamSelect(e.to_string()))?;
@@ -58,15 +58,16 @@ pub fn resolve_active_team(
                 input.display()
             )));
         }
-        let state = select_runtime_state(&run, team).or_else(|_| load_runtime_state(&run))?;
-        (run, state)
+        let resolved = resolve_runtime_team_scope(&run, team)?;
+        (run, resolved)
     };
+    let state = resolved.state;
 
     // E5 spec 迁移·读序 B(architect+leader 裁定):
     //   1) runtime spec 优先严格:<run_ws>/.team/runtime/<team_key>/team.spec.yaml 存在即必用。
     //   2) 缺失才**只读回落**用户目录旧 spec(过渡腿;绝不在此写/迁移——迁移+清理只属启动重建)。
     // TODO(E5 后续版本):新 team 永不写用户目录(G1),回落腿可在 legacy 清零后移除。
-    let team_key = selected_team_key(&state, team);
+    let team_key = resolved.canonical_team_key;
     let runtime_spec = runtime_spec_path(&run_workspace, &team_key);
     let (spec_workspace, spec_path) = if runtime_spec.exists() {
         (
@@ -136,13 +137,3 @@ fn spec_workspace_from_state(state: &Value) -> Option<PathBuf> {
                 .map(PathBuf::from)
         })
 }
-
-fn selected_team_key(state: &Value, team: Option<&str>) -> String {
-    state
-        .get("active_team_key")
-        .and_then(Value::as_str)
-        .filter(|s| !s.is_empty())
-        .map(ToString::to_string)
-        .or_else(|| team.filter(|s| !s.is_empty()).map(ToString::to_string))
-        .unwrap_or_else(|| team_state_key(state))
-}

package/package.json

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