@team-agent/installer 0.5.26 → 0.5.28

package/Cargo.lock

@@ -575,7 +575,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.5.26"
+version = "0.5.28"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -9,7 +9,7 @@ members = ["crates/team-agent", "crates/win-conpty-phase0", "crates/conpty-trans
 
 [workspace.package]
 edition = "2021"
-version = "0.5.26"
+version = "0.5.28"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

package/crates/team-agent/src/cli/mod.rs

@@ -3463,9 +3463,16 @@ pub mod lifecycle_port {
         out
     }
 
-    /// 0.5.26 (`.team/artifacts/stale-team-saveconflict-locate.md` §7.2):
-    /// scoped shutdown 只有一队,`state.active_team_key` 指向被关的那队。
+    /// 0.5.26 (`.team/artifacts/stale-team-saveconflict-locate.md` §7.2) /
+    /// 0.5.27 (`.team/artifacts/0526-supermarket-shutdown-status-real-fail-locate.md` §5.1):
+    /// scoped shutdown 只有一队,`state.active_team_key` 指向被关的那队;
     /// 只在 session_killed && !verification_degraded 时被调用。
+    ///
+    /// 同时 stamp 顶层 `state["status"]` 与 `teams[active_key]["status"]`:
+    /// scoped 关队走 `save_team_scoped_state`,反写盘的源是 `compact(top-level)`
+    /// (见 `state/persist.rs::save_team_scoped_state` +
+    /// `projection::compact_team_state`),只标 nested 会被顶层视图 clobber 丢盘。
+    /// 保留 nested 写入以维持同 tick 内的 in-memory 一致(其他 read-back 立即看到)。
     fn mark_active_team_shutdown(state: &mut Value, status: &str) {
         let Some(active_key) = state
             .get("active_team_key")
@@ -3474,6 +3481,9 @@ pub mod lifecycle_port {
         else {
             return;
         };
+        if let Some(obj) = state.as_object_mut() {
+            obj.insert("status".to_string(), json!(status));
+        }
         let Some(teams) = state.get_mut("teams").and_then(Value::as_object_mut) else {
             return;
         };

package/crates/team-agent/src/cli/tests/shutdown_kill_plan.rs

@@ -331,6 +331,129 @@ fn scoped_shutdown_keeps_owned_endpoint_when_sibling_session_remains() {
     );
 }
 
+#[test]
+fn scoped_clean_shutdown_persists_team_shutdown_status_after_disk_roundtrip() {
+    let ws = tmp_shutdown_workspace("scoped-clean-status-roundtrip");
+    crate::state::persist::save_runtime_state(
+        &ws,
+        &json!({
+            "schema_version": 1,
+            "active_team_key": "current",
+            "team_key": "current",
+            "session_name": "team-current",
+            "team_dir": ws.display().to_string(),
+            "workspace": ws.display().to_string(),
+            "agents": {
+                "adminweb": {
+                    "agent_id": "adminweb",
+                    "status": "running",
+                    "provider": "fake",
+                    "window": "adminweb"
+                }
+            },
+            "teams": {
+                "current": {
+                    "team_key": "current",
+                    "session_name": "team-current",
+                    "team_dir": ws.display().to_string(),
+                    "workspace": ws.display().to_string(),
+                    "agents": {
+                        "adminweb": {
+                            "agent_id": "adminweb",
+                            "status": "running",
+                            "provider": "fake",
+                            "window": "adminweb"
+                        }
+                    }
+                }
+            }
+        }),
+    )
+    .unwrap();
+
+    let out = crate::cli::lifecycle_port::shutdown_with_transport(
+        &ws,
+        true,
+        Some("current"),
+        &CleanShutdownTransport::new(),
+    )
+    .expect("shutdown should complete");
+
+    assert_eq!(out["ok"], json!(true), "shutdown report: {out}");
+    assert_eq!(out["session_killed"], json!(true), "shutdown report: {out}");
+    assert_eq!(out["verification_degraded"], json!(false), "shutdown report: {out}");
+    let saved = crate::state::persist::load_runtime_state(&ws).unwrap();
+    assert_eq!(
+        saved.pointer("/teams/current/status").and_then(serde_json::Value::as_str),
+        Some("shutdown"),
+        "0.5.27 RED: clean scoped shutdown returned session_killed=true and not degraded, \
+         so disk state must persist teams.current.status=shutdown. The compact projected \
+         save path must not drop the tombstone; saved={saved}"
+    );
+    assert_eq!(
+        saved
+            .pointer("/teams/current/agents/adminweb/status")
+            .and_then(serde_json::Value::as_str),
+        Some("stopped"),
+        "0.5.27 RED: clean shutdown must also persist stopped agents under the retained team; saved={saved}"
+    );
+}
+
+#[test]
+fn scoped_degraded_shutdown_does_not_persist_team_shutdown_status() {
+    let ws = tmp_shutdown_workspace("scoped-degraded-no-status");
+    crate::state::persist::save_runtime_state(
+        &ws,
+        &json!({
+            "schema_version": 1,
+            "active_team_key": "current",
+            "team_key": "current",
+            "session_name": "team-current",
+            "agents": {
+                "adminweb": {
+                    "agent_id": "adminweb",
+                    "status": "running",
+                    "provider": "fake",
+                    "window": "adminweb"
+                }
+            },
+            "teams": {
+                "current": {
+                    "team_key": "current",
+                    "session_name": "team-current",
+                    "agents": {
+                        "adminweb": {
+                            "agent_id": "adminweb",
+                            "status": "running",
+                            "provider": "fake",
+                            "window": "adminweb"
+                        }
+                    }
+                }
+            }
+        }),
+    )
+    .unwrap();
+
+    let out = crate::cli::lifecycle_port::shutdown_with_transport(
+        &ws,
+        true,
+        Some("current"),
+        &CleanShutdownTransport::new().with_probe_timeout("ps_table"),
+    )
+    .expect("shutdown should complete");
+
+    assert_eq!(out["session_killed"], json!(true), "shutdown report: {out}");
+    assert_eq!(out["verification_degraded"], json!(true), "shutdown report: {out}");
+    let saved = crate::state::persist::load_runtime_state(&ws).unwrap();
+    assert_ne!(
+        saved.pointer("/teams/current/status").and_then(serde_json::Value::as_str),
+        Some("shutdown"),
+        "degraded shutdown must remain dirty/diagnostic and must not stamp \
+         teams.current.status=shutdown; saved={saved}"
+    );
+}
+
 #[test]
 fn repeated_owned_endpoint_shutdowns_leave_no_socket_file_growth() {
     let ws = tmp_shutdown_workspace("owned-loop-no-growth");

package/crates/team-agent/src/lifecycle/restart/common.rs

@@ -672,9 +672,16 @@ pub(super) fn sync_restart_team_projections(state: &mut serde_json::Value, team_
     else {
         return;
     };
+    // 0.5.28 (`.team/artifacts/0527-realfail-layer2-leader-locate.md` §3):
+    // 显式 team_key = 操作目标,始终允许覆盖 / 新建(该 helper 的正当职责)。
+    // active/derived/"current" 三种别名兜底 = alias-identity 家族第三例,只有
+    // 「盘上已有该 alias 条目」且「其身份与 compact 不冲突」时才允许写,
+    // 避免 0.5.26 起死 sibling 保留时被活队 compact 硬克隆。禁止 alias 新建条目。
     let mut keys = Vec::new();
+    let mut explicit = false;
     if !team_key.is_empty() {
         keys.push(team_key.to_string());
+        explicit = true;
     }
     if let Some(active_key) = active_key {
         keys.push(active_key);
@@ -688,8 +695,41 @@ pub(super) fn sync_restart_team_projections(state: &mut serde_json::Value, team_
     keys.sort();
     keys.dedup();
     for key in keys {
-        teams.insert(key, compact.clone());
+        let is_operation_target = explicit && key == team_key;
+        if is_operation_target {
+            teams.insert(key, compact.clone());
+            continue;
+        }
+        let Some(existing) = teams.get(&key) else {
+            // 别名条目不存在:不新建,避免把 hack alias 变成真队。
+            continue;
+        };
+        if json_team_identity_matches(existing, &compact) {
+            teams.insert(key, compact.clone());
+        }
+    }
+}
+
+/// 0.5.28: 别名同步身份门。比较 existing 条目与 compact(即将写入)四个身份字段:
+/// `team_key`/`session_name`/`team_dir`/`spec_path`。legacy 缺字段容忍(两侧任一
+/// 缺则该字段不参与判定);已有字段必须相等,冲突即拒绝覆盖。
+fn json_team_identity_matches(existing: &serde_json::Value, compact: &serde_json::Value) -> bool {
+    const FIELDS: &[&str] = &["team_key", "session_name", "team_dir", "spec_path"];
+    for field in FIELDS {
+        let lhs = existing
+            .get(field)
+            .and_then(serde_json::Value::as_str)
+            .filter(|s| !s.is_empty());
+        let rhs = compact
+            .get(field)
+            .and_then(serde_json::Value::as_str)
+            .filter(|s| !s.is_empty());
+        match (lhs, rhs) {
+            (Some(a), Some(b)) if a != b => return false,
+            _ => {}
+        }
     }
+    true
 }
 
 pub(super) fn state_session_name(state: &serde_json::Value) -> SessionName {

package/package.json

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