@team-agent/installer 0.5.110 → 0.5.112

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

@@ -20,9 +20,8 @@
 //! ---
 //!
 //! coordinator 共享数据面:常量 / newtype / 穷尽 enum / metadata / schema health /
-//! report 结构 / abnormal-track 数据型 / WatchCursor / cross-dep 占位。
+//! report 结构 / abnormal-track 数据型 / cross-dep 占位。
 
-use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
 
 use serde::{Deserialize, Serialize};
@@ -49,10 +48,6 @@ pub const DEFAULT_TICK_INTERVAL_SEC: f64 = 5.0;
 /// 指数退避封顶(`__main__.py:65` `min(.., 60.0)`)。bug-084 崩溃循环防护。
 pub const BACKOFF_MAX_SEC: f64 = 60.0;
 
-/// watch log rotation marker(`watch.py:22`,字节级一致 —— 测试钉死)。
-pub const ROTATION_MARKER: &str =
-    "[watch] log rotated; archived segment events.jsonl.1 not replayed — historical replay deferred to a future --replay flag";
-
 // ===========================================================================
 // NEWTYPES(§3:Pid / WorkspacePath 不与裸 int/PathBuf 混传)
 // ===========================================================================
@@ -445,21 +440,6 @@ pub struct TeamPresenceSnapshot {
     pub restart_in_progress: bool,
 }
 
-// ===========================================================================
-// WatchCursor(watch/__init__.py)
-// ===========================================================================
-
-/// watch tail 游标(`watch.py:14-19`)。rotation 检测靠 `archive_signature` 变化 + `offset > size`
-/// (`watch.py:73-83`)。`archive_signature = Some((size, mtime_ns))`。
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub struct WatchCursor {
-    pub event_offset: u64,
-    pub seen_result_ids: BTreeSet<String>,
-    pub initialized: bool,
-    /// `(size, mtime_ns)`;`mtime_ns: i128`(防溢出)。
-    pub archive_signature: Option<(u64, i128)>,
-}
-
 // ===========================================================================
 // CROSS-DEP placeholders(其他并行 lane 拥有真名;leader 集成时 reconcile)
 // ===========================================================================

package/crates/team-agent/src/db/message_store.rs

@@ -830,22 +830,6 @@ impl MessageStore {
         Ok(rows.into_iter().rev().collect())
     }
 
-    /// Allow direct peer messages in both directions. Golden stores `(a,b)` and
-    /// `(b,a)` so either sender/recipient lookup can use a single ordered key.
-    pub fn allow_peer(&self, a: &str, b: &str) -> Result<(), MessageStoreError> {
-        let conn = crate::db::schema::open_db(&self.path)?;
-        let now = now_ts();
-        conn.execute(
-            "insert or ignore into peer_allowlist(a, b, created_at) values (?1, ?2, ?3)",
-            params![a, b, now.as_str()],
-        )?;
-        conn.execute(
-            "insert or ignore into peer_allowlist(a, b, created_at) values (?1, ?2, ?3)",
-            params![b, a, now.as_str()],
-        )?;
-        Ok(())
-    }
-
     /// `claim_leader_notification_delivery` (`leader_notification_log.py:30-101`):
     /// `INSERT OR IGNORE` on PK `(result_id, owner_team_id, owner_epoch)`. rowcount==1
     /// → `claimed_by_you`; else read the existing winner row → `already_notified_by`.
@@ -1421,32 +1405,6 @@ mod tests {
         assert_eq!(legacy_epoch_from_uuid(Some("uuid-BBB")), 122688376);
     }
 
-    #[test]
-    fn allow_peer_inserts_bidirectional_rows_idempotently() {
-        let s = store();
-        s.allow_peer("alice", "bob").unwrap();
-        s.allow_peer("alice", "bob").unwrap();
-
-        let c = read(&s);
-        let mut rows = c
-            .prepare("select a, b from peer_allowlist order by a, b")
-            .unwrap()
-            .query_map([], |row| {
-                Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
-            })
-            .unwrap()
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
-        rows.sort();
-        assert_eq!(
-            rows,
-            vec![
-                ("alice".to_string(), "bob".to_string()),
-                ("bob".to_string(), "alice".to_string()),
-            ]
-        );
-    }
-
     // ════════════════════════ FIX-LOOP (wave-1) RED test ════════════════════════
     // B1: mark() error column = coalesce(?, error) — a NEW error overwrites, but a
     // mark WITHOUT an error must PRESERVE the existing error (current impl clobbers

package/crates/team-agent/src/db/migration.rs

@@ -88,7 +88,6 @@ pub const MANAGED_TABLE_LAYOUTS: &[(&str, &[&str])] = &[
             "updated_at",
         ],
     ),
-    ("peer_allowlist", &["a", "b", "created_at"]),
     (
         "result_watchers",
         &[
@@ -129,7 +128,6 @@ const CREATE_TABLE_TEMPLATES: &[(&str, &str)] = &[
     ("scheduled_events", "create table if not exists __TABLE__ (\n          id integer primary key,\n          owner_team_id text,\n          due_at text not null,\n          target text not null,\n          kind text not null,\n          payload_json text not null,\n          status text not null,\n          created_at text not null,\n          fired_at text,\n          result_json text\n        )"),
     ("delivery_tokens", "create table if not exists __TABLE__ (\n          message_id text primary key,\n          unique_token text not null,\n          injected_at text not null,\n          visible_at text,\n          consumed_at text,\n          failed_at text,\n          failure_reason text\n        )"),
     ("agent_health", "create table if not exists __TABLE__ (\n          owner_team_id text,\n          agent_id text not null,\n          status text not null,\n          last_output_at text,\n          context_usage_pct integer,\n          current_task_id text,\n          updated_at text not null,\n          unique(owner_team_id, agent_id)\n        )"),
-    ("peer_allowlist", "create table if not exists __TABLE__ (\n          a text not null,\n          b text not null,\n          created_at text not null,\n          primary key (a, b)\n        )"),
     ("result_watchers", "create table if not exists __TABLE__ (\n          watcher_id text primary key,\n          owner_team_id text,\n          task_id text,\n          agent_id text,\n          message_id text,\n          leader_id text not null,\n          recipient text,\n          status text not null,\n          created_at text not null,\n          completed_at text,\n          result_id text,\n          notified_message_id text,\n          error text\n        )"),
     ("leader_notification_log", "create table if not exists __TABLE__ (\n          result_id text not null,\n          owner_team_id text not null default '',\n          owner_epoch integer not null default 0,\n          leader_session_uuid text,\n          notified_message_id text not null,\n          notified_at text not null,\n          leader_pane_id_at_notify text,\n          envelope_content_hash text,\n          primary key (result_id, owner_team_id, owner_epoch)\n        )"),
 ];
@@ -630,12 +628,12 @@ mod tests {
         let path = temp_db();
         build_legacy(&path);
 
-        // 迁移前:diagnosis = schema_repair_available,全 8 表 diff(4 漂移 + 4 缺失)。
+        // 迁移前:diagnosis = schema_repair_available,全 7 表 diff(4 漂移 + 3 缺失)。
         let before = schema_diagnosis(&path, SCHEMA_VERSION).unwrap();
         assert_eq!(before.status, "schema_repair_available");
         assert!(!before.ok);
         assert_eq!(before.user_version, 1);
-        assert_eq!(before.layout_diffs.len(), 8);
+        assert_eq!(before.layout_diffs.len(), MANAGED_TABLE_LAYOUTS.len());
 
         // initialize_schema 走 ensure_table_layout(rebuild)+ 建表 + user_version=3。
         let conn = crate::db::schema::open_db(&path).unwrap();
@@ -697,6 +695,48 @@ mod tests {
         assert_eq!(d.user_version, SCHEMA_VERSION);
     }
 
+    // A drifted legacy peer table is inert: no diagnosis, rebuild, backup or row loss.
+    #[test]
+    fn legacy_peer_allowlist_is_inert_and_preserved() {
+        let path = temp_db();
+        let conn = crate::db::schema::open_db(&path).unwrap();
+        initialize_schema(&conn, Some(&path)).unwrap();
+        conn.execute_batch(
+            "create table peer_allowlist (created_at text not null, b text not null, a text not null, primary key (a, b));
+             insert into peer_allowlist(a, b, created_at) values ('worker', 'reviewer', 'v4');",
+        )
+        .unwrap();
+        assert!(layout_diffs(&conn).unwrap().is_empty());
+        initialize_schema(&conn, Some(&path)).unwrap();
+        assert_eq!(layout(&conn, "peer_allowlist"), ["created_at", "b", "a"]);
+        let row: (String, String, String) = conn
+            .query_row("select a, b, created_at from peer_allowlist", [], |r| {
+                Ok((r.get(0)?, r.get(1)?, r.get(2)?))
+            })
+            .unwrap();
+        assert_eq!(
+            row,
+            (
+                "worker".to_string(),
+                "reviewer".to_string(),
+                "v4".to_string()
+            )
+        );
+        drop(conn);
+        let diagnosis = schema_diagnosis(&path, SCHEMA_VERSION).unwrap();
+        assert!(
+            diagnosis.ok,
+            "legacy peer table must remain inert: {diagnosis:?}"
+        );
+        assert!(
+            !std::fs::read_dir(path.parent().unwrap())
+                .unwrap()
+                .filter_map(|entry| entry.ok())
+                .any(|entry| entry.file_name().to_string_lossy().contains("pre-migration")),
+            "legacy peer table must not trigger a migration backup"
+        );
+    }
+
     #[test]
     fn diagnosis_missing_db() {
         let path = temp_db(); // 未创建文件
@@ -713,7 +753,7 @@ mod tests {
         build_legacy(&path);
         let conn = crate::db::schema::open_db(&path).unwrap();
         let events1 = ensure_table_layout(&conn, SCHEMA_VERSION, Some(&path)).unwrap();
-        assert_eq!(events1.len(), 8); // 4 漂移 rebuild + 4 缺失建表
+        assert_eq!(events1.len(), MANAGED_TABLE_LAYOUTS.len()); // 4 漂移 rebuild + 3 缺失建表
         for e in &events1 {
             assert_eq!(e.row_count_before, e.row_count_after);
         }
@@ -759,7 +799,7 @@ mod tests {
         build_legacy(&path);
         let conn = crate::db::schema::open_db(&path).unwrap();
         let events = ensure_table_layout(&conn, SCHEMA_VERSION, None).unwrap(); // None 不再 Err
-        assert_eq!(events.len(), 8);
+        assert_eq!(events.len(), MANAGED_TABLE_LAYOUTS.len());
         assert_eq!(
             table_layout(&conn, "messages").unwrap()[..2],
             ["message_id", "owner_team_id"]
@@ -871,7 +911,7 @@ mod tests {
             } => {
                 assert!(diagnosis.ok);
                 assert_eq!(diagnosis.user_version, SCHEMA_VERSION);
-                assert_eq!(rebuilds.len(), 8);
+                assert_eq!(rebuilds.len(), MANAGED_TABLE_LAYOUTS.len());
             }
             other => panic!("expected Fixed, got {other:?}"),
         }
@@ -921,8 +961,8 @@ mod tests {
             .collect();
         assert_eq!(
             rebuilds.len(),
-            8,
-            "8 张 managed 表各一条 schema.layout_rebuild"
+            MANAGED_TABLE_LAYOUTS.len(),
+            "每张 managed 表各一条 schema.layout_rebuild"
         );
         for e in &rebuilds {
             assert_eq!(

package/crates/team-agent/src/db/schema.rs

@@ -1,7 +1,7 @@
 //!
 //! `team.db` schema 初始化(真相源 `message_store/schema.py` + `schema_migration.py`)。
 //!
-//! slice 1:fresh DB schema —— 8 表 DDL、6 索引、ALTER 式列迁移、agent_health 重建、
+//! slice 1:fresh DB schema —— 7 表 DDL、6 索引、ALTER 式列迁移、agent_health 重建、
 //! WAL/busy_timeout pragmas、`user_version = SCHEMA_VERSION`。
 //! slice 2(待做):列**顺序**漂移的整表 rebuild(`ensure_table_layout`/`_rebuild_tables`)
 //! 与 `schema_diagnosis`,验 legacy_team_db_fixture + schema_migration 契约。
@@ -15,14 +15,13 @@ use crate::db::DbError;
 /// `schema.py:90`。
 pub const SCHEMA_VERSION: i64 = 5;
 
-/// 8 张表的 DDL(逐字照搬 `schema.py:initialize_schema` 的内联建表;含 `if not exists`)。
+/// 7 张表的 DDL(逐字照搬 `schema.py:initialize_schema` 的内联建表;含 `if not exists`)。
 /// 顺序与 Python 一致(leader_notification_log 在 ensure 块后创建)。
 const CREATE_MESSAGES: &str = "create table if not exists messages (\n              message_id text primary key,\n              owner_team_id text,\n              task_id text,\n              sender text,\n              recipient text,\n              reply_to text,\n              requires_ack integer,\n              status text,\n              content text,\n              presentation text not null default '{\"sink\":\"leader\",\"class\":\"message\"}',\n              artifact_refs text,\n              created_at text,\n              updated_at text,\n              delivered_at text,\n              acknowledged_at text,\n              error text,\n              delivery_attempts integer not null default 0\n            )";
 const CREATE_RESULTS: &str = "create table if not exists results (\n              result_id text primary key,\n              owner_team_id text,\n              task_id text not null,\n              agent_id text not null,\n              envelope text not null,\n              status text not null,\n              created_at text not null\n            )";
 const CREATE_SCHEDULED_EVENTS: &str = "create table if not exists scheduled_events (\n              id integer primary key,\n              owner_team_id text,\n              due_at text not null,\n              target text not null,\n              kind text not null,\n              payload_json text not null,\n              status text not null,\n              created_at text not null,\n              fired_at text,\n              result_json text\n            )";
 const CREATE_DELIVERY_TOKENS: &str = "create table if not exists delivery_tokens (\n              message_id text primary key,\n              unique_token text not null,\n              injected_at text not null,\n              visible_at text,\n              consumed_at text,\n              failed_at text,\n              failure_reason text\n            )";
 const CREATE_AGENT_HEALTH: &str = "create table if not exists agent_health (\n              owner_team_id text,\n              agent_id text not null,\n              status text not null,\n              last_output_at text,\n              context_usage_pct integer,\n              current_task_id text,\n              updated_at text not null,\n              unique(owner_team_id, agent_id)\n            )";
-const CREATE_PEER_ALLOWLIST: &str = "create table if not exists peer_allowlist (\n              a text not null,\n              b text not null,\n              created_at text not null,\n              primary key (a, b)\n            )";
 const CREATE_RESULT_WATCHERS: &str = "create table if not exists result_watchers (\n              watcher_id text primary key,\n              owner_team_id text,\n              task_id text,\n              agent_id text,\n              message_id text,\n              leader_id text not null,\n              recipient text,\n              status text not null,\n              created_at text not null,\n              completed_at text,\n              result_id text,\n              notified_message_id text,\n              error text\n            )";
 const CREATE_LEADER_NOTIFICATION_LOG: &str = "create table if not exists leader_notification_log (\n              result_id text not null,\n              owner_team_id text not null default '',\n              owner_epoch integer not null default 0,\n              leader_session_uuid text,\n              notified_message_id text not null,\n              notified_at text not null,\n              leader_pane_id_at_notify text,\n              envelope_content_hash text,\n              primary key (result_id, owner_team_id, owner_epoch)\n            )";
 const CREATE_AGENT_HEALTH_NEW: &str = "create table agent_health_new (\n              owner_team_id text,\n              agent_id text not null,\n              status text not null,\n              last_output_at text,\n              context_usage_pct integer,\n              current_task_id text,\n              updated_at text not null,\n              unique(owner_team_id, agent_id)\n            )";
@@ -96,7 +95,6 @@ const AGENT_HEALTH_COLUMNS: &[&str] = &[
     "current_task_id",
     "updated_at",
 ];
-const PEER_ALLOWLIST_COLUMNS: &[&str] = &["a", "b", "created_at"];
 const RESULT_WATCHER_COLUMNS: &[&str] = &[
     "owner_team_id",
     "watcher_id",
@@ -249,7 +247,6 @@ pub fn initialize_schema(
         CREATE_SCHEDULED_EVENTS,
         CREATE_DELIVERY_TOKENS,
         CREATE_AGENT_HEALTH,
-        CREATE_PEER_ALLOWLIST,
         CREATE_RESULT_WATCHERS,
     ] {
         tx.execute(ddl, [])?;
@@ -293,7 +290,6 @@ pub fn initialize_schema(
     )?;
     ensure_table_columns(&tx, "delivery_tokens", DELIVERY_TOKEN_COLUMNS, &[])?;
     migrate_agent_health_owner_team_id(&tx)?;
-    ensure_table_columns(&tx, "peer_allowlist", PEER_ALLOWLIST_COLUMNS, &[])?;
     ensure_table_columns(
         &tx,
         "result_watchers",
@@ -333,7 +329,28 @@ mod tests {
         conn
     }
 
-    // golden 由 Python initialize_schema 新建 DB 取(team-agent-public@439bef8)。
+    #[test]
+    fn retired_peer_allowlist_is_neither_created_nor_managed() {
+        let conn = fresh();
+        assert!(table_layout(&conn, "peer_allowlist").unwrap().is_empty());
+        // Legacy residue may have an obsolete layout. Initialization must leave
+        // its data alone, not rebuild/drop it or require it for schema health.
+        conn.execute_batch(
+            "create table peer_allowlist (legacy_payload text);\n             insert into peer_allowlist values ('preserve-this-row');",
+        )
+        .unwrap();
+        initialize_schema(&conn, None).unwrap();
+        assert!(crate::db::migration::ensure_table_layout(&conn, SCHEMA_VERSION, None)
+            .unwrap()
+            .is_empty());
+        assert_eq!(table_layout(&conn, "peer_allowlist").unwrap(), ["legacy_payload"]);
+        let value: String = conn.query_row("select legacy_payload from peer_allowlist", [], |row| row.get(0)).unwrap();
+        assert_eq!(value, "preserve-this-row");
+        let version: i64 = conn.query_row("pragma user_version", [], |row| row.get(0)).unwrap();
+        assert_eq!(version, 5);
+    }
+
+    // Fresh managed schema, excluding retired legacy tables.
     #[test]
     fn fresh_schema_matches_python_sqlite_master() {
         let conn = fresh();
@@ -356,7 +373,6 @@ mod tests {
             ("idx_scheduled_events_owner_team_id", "index"),
             ("leader_notification_log", "table"),
             ("messages", "table"),
-            ("peer_allowlist", "table"),
             ("result_watchers", "table"),
             ("results", "table"),
             ("scheduled_events", "table"),
@@ -419,9 +435,9 @@ mod tests {
         assert_eq!(idx, 6, "二次 init 后 6 个 named index 仍在");
     }
 
-    // 全 8 表逐列 (name, type, notnull, dflt, pk) golden(Python initialize_schema table_info)。
+    // Managed tables: (name, type, notnull, dflt, pk).
     #[test]
-    fn per_column_table_info_all_eight_tables() {
+    fn per_column_table_info_managed_tables() {
         type Col = (&'static str, &'static str, i64, Option<&'static str>, i64);
         let golden: &[(&str, &[Col])] = &[
             (
@@ -503,14 +519,6 @@ mod tests {
                     ("updated_at", "TEXT", 1, None, 0),
                 ],
             ),
-            (
-                "peer_allowlist",
-                &[
-                    ("a", "TEXT", 1, None, 1),
-                    ("b", "TEXT", 1, None, 2),
-                    ("created_at", "TEXT", 1, None, 0),
-                ],
-            ),
             (
                 "result_watchers",
                 &[
@@ -582,7 +590,7 @@ mod tests {
         ];
         let got: Vec<(&str, &str)> = idx.iter().map(|(n, s)| (n.as_str(), s.as_str())).collect();
         assert_eq!(got, want);
-        // 7 个 sqlite_autoindex(每个有 pk/unique 约束的表各一)。
+        // 6 个 sqlite_autoindex(每个有 pk/unique 约束的表各一)。
         let auto: Vec<String> = conn
             .prepare(
                 "select name from sqlite_master where type='index' and sql is null order by name",
@@ -599,7 +607,6 @@ mod tests {
                 "sqlite_autoindex_delivery_tokens_1",
                 "sqlite_autoindex_leader_notification_log_1",
                 "sqlite_autoindex_messages_1",
-                "sqlite_autoindex_peer_allowlist_1",
                 "sqlite_autoindex_result_watchers_1",
                 "sqlite_autoindex_results_1",
             ]

package/crates/team-agent/src/leader/owner_bind.rs

@@ -17,30 +17,6 @@ use super::{
     OwnerBindResult, TeamOwner,
 };
 
-// ── leader::identity — leader_identity / 身份上下文 ──
-
-/// `leader_identity`(card §47;`__init__.py:355`)。`team-agent identity` 入口。
-/// 返回 uuid_prefix + 身份字段(JSON dict,CLI 直出)。
-pub fn leader_identity(workspace: &Path, team: Option<&str>) -> Result<Value, LeaderError> {
-    let state = crate::state::persist::load_runtime_state(workspace)?;
-    let identity = leader_identity_context(workspace, team, Some(&state))?;
-    Ok(json!({
-        "ok": true,
-        "uuid_prefix": prefix(identity.leader_session_uuid.as_str(), 12),
-        "machine_fingerprint": identity.machine_fingerprint,
-        "workspace_abspath": identity.workspace_abspath.to_string_lossy(),
-        "os_user": identity.os_user,
-        "team_id": identity.team_id.as_str(),
-        "current_pane_id": std::env::var("TEAM_AGENT_LEADER_PANE_ID")
-            .ok()
-            .filter(|v| !v.is_empty())
-            .or_else(|| std::env::var("TMUX_PANE").ok().filter(|v| !v.is_empty())),
-        "last_seen_at": get_path_str(&state, &["leader_receiver", "attached_at"])
-            .or_else(|| get_path_str(&state, &["leader_receiver", "last_seen_at"])),
-        "source": serde_json::to_value(identity.leader_session_uuid_source)?,
-    }))
-}
-
 /// `_leader_identity_context`(`__init__.py:192`)。派生 leader 身份上下文(override / state / derive)。
 pub fn leader_identity_context(
     workspace: &Path,

package/crates/team-agent/src/leader/registry.rs

@@ -816,7 +816,7 @@ mod tests {
     }
 
     #[test]
-    #[serial]
+    #[serial(env)]
     fn prune_removes_team_proven_terminal() {
         let (_home_guard, _home, workspace) = test_home("terminal");
         write_state(
@@ -834,7 +834,7 @@ mod tests {
     }
 
     #[test]
-    #[serial]
+    #[serial(env)]
     fn prune_removes_missing_key_only_from_valid_teams_map() {
         let (_home_guard, _home, workspace) = test_home("missing-key");
         write_state(&workspace, json!({"teams": {"other": {"status": "alive"}}}));
@@ -850,7 +850,7 @@ mod tests {
     }
 
     #[test]
-    #[serial]
+    #[serial(env)]
     fn prune_keeps_null_nonobject_and_legacy_teams_shapes() {
         for (label, state) in [
             ("null", json!({"teams": null})),

package/crates/team-agent/src/leader/tests/byte_findings.rs

@@ -353,23 +353,3 @@ fn attach_leader_to_state_nonfirst_does_not_overwrite_owner_or_advance_epoch() {
         "non-first-time attach must NOT advance owner_epoch (golden keeps 3); Rust bumps to 4"
     );
 }
-
-// C3 [WARN] — leader_identity.current_pane_id honors TEAM_AGENT_LEADER_PANE_ID priority (golden
-// :366 = env(TEAM_AGENT_LEADER_PANE_ID) or env(TMUX_PANE) or None). Rust owner_bind.rs:32 reads
-// TMUX_PANE only. RED: with TEAM_AGENT_LEADER_PANE_ID set + TMUX_PANE unset, current_pane_id must be
-// the LEADER_PANE_ID. (Sibling gap, noted: last_seen_at = receiver.attached_at OR receiver.last_seen_at;
-// Rust reads attached_at only.)
-#[test]
-#[serial_test::serial(env)]
-fn c3_leader_identity_current_pane_honors_leader_pane_id_env() {
-    let _g = ENV_LOCK.lock().unwrap_or_else(|p| p.into_inner());
-    let _e = EnvGuard::apply(&[
-        ("TEAM_AGENT_LEADER_SESSION_UUID_OVERRIDE", None),
-        ("TEAM_AGENT_LEADER_PANE_ID", Some("%foo")),
-        ("TMUX_PANE", None),
-    ]);
-    let ws = p2_temp_ws("c3_pane_env");
-    let v = leader_identity(&ws, None).unwrap();
-    assert_eq!(v["current_pane_id"], serde_json::json!("%foo"),
-            "golden :366 current_pane_id = TEAM_AGENT_LEADER_PANE_ID or TMUX_PANE or None; Rust reads TMUX_PANE only");
-}

package/crates/team-agent/src/leader/tests/identity.rs

@@ -23,38 +23,6 @@ fn leader_identity_context_derives_when_no_override_no_state() {
     assert_eq!(id.leader_session_uuid.as_str().len(), 32);
 }
 
-// leader_identity:CLI 直出 dict(__init__.py:355-369)。unimplemented → RED。
-// 强化:uuid_prefix 必须 == leader_identity_context 派生 uuid 的前 12 hex(绑到真值,
-// 而非任意 12 字符);整个 dict 的 machine_fingerprint/os_user/team_id/source 必须与 context 一致。
-#[test]
-#[serial_test::serial(env)]
-fn leader_identity_dict_ties_prefix_and_fields_to_derived_context() {
-    let ws = std::env::temp_dir().join(format!("ta_rs_lid_{}", std::process::id()));
-    std::fs::create_dir_all(&ws).unwrap();
-    // 空 state → context 走 derive(无 override/无 state uuid)。
-    let ctx = leader_identity_context(&ws, None, Some(&serde_json::json!({}))).unwrap();
-    let expected_prefix = &ctx.leader_session_uuid.as_str()[..12];
-    let v = leader_identity(&ws, None).unwrap();
-    assert_eq!(v["ok"], serde_json::json!(true));
-    // uuid_prefix 绑到派生真值的前 12 hex(错的 12 字符串会被抓)。
-    assert_eq!(v["uuid_prefix"].as_str().unwrap(), expected_prefix);
-    // 其余身份字段与 context 字节一致。
-    assert_eq!(
-        v["machine_fingerprint"].as_str().unwrap(),
-        ctx.machine_fingerprint
-    );
-    assert_eq!(v["os_user"].as_str().unwrap(), ctx.os_user);
-    assert_eq!(v["team_id"].as_str().unwrap(), ctx.team_id.as_str());
-    // source == 派生侧 "derived"(无 override → 不是 "override"/"env")。
-    assert_eq!(v["source"], serde_json::json!("derived"));
-    assert_eq!(
-        ctx.leader_session_uuid_source,
-        LeaderSessionUuidSource::Derived
-    );
-    // CLI 直出形态:current_pane_id / last_seen_at 在无 env/无 receiver 时为 null。
-    assert_eq!(v["last_seen_at"], serde_json::Value::Null);
-}
-
 // =====================================================================
 // 13. leader_start_plan(unimplemented → RED):钉 mode 选择 + leader_env 导出键。
 // =====================================================================

package/crates/team-agent/src/leader/tests/lease_claim.rs

@@ -398,61 +398,6 @@ fn claim_lease_no_incident_caller_not_live_refused_under_n_rn3_any_live_pane() {
     assert_eq!(r.reason, Some(LeaseReason::CallerPaneNotLive));
 }
 
-// ── 14b. leader_identity dict — workspace_abspath key (golden __init__.py:363) ──
-//
-// LOCK→RED: leader_identity IS implemented (owner_bind.rs:22) but its dict
-// OMITS the golden `workspace_abspath` key (probe_lid.py shows it sits between
-// machine_fingerprint and os_user). This pins the missing key so the porter
-// must add it. Fails today (key absent → null) = RED against the omission.
-#[test]
-#[serial_test::serial(env)]
-fn leader_identity_dict_includes_workspace_abspath_key() {
-    let _g = ENV_LOCK.lock().unwrap_or_else(|p| p.into_inner());
-    let _e = EnvGuard::apply(&[("TEAM_AGENT_LEADER_SESSION_UUID_OVERRIDE", None)]);
-    let ws = p2_temp_ws("lid_wsabs");
-    let v = leader_identity(&ws, None).unwrap();
-    let ctx = leader_identity_context(&ws, None, Some(&serde_json::json!({}))).unwrap();
-    // golden key present + equals the resolved workspace abspath from context.
-    assert!(
-        v.get("workspace_abspath").is_some(),
-        "golden leader_identity dict carries 'workspace_abspath' (probe_lid.py)"
-    );
-    assert_eq!(
-        v["workspace_abspath"].as_str().unwrap(),
-        ctx.workspace_abspath.to_string_lossy(),
-        "workspace_abspath must equal the context's resolved abspath"
-    );
-}
-
-// LOCK — leader_identity key ORDER & full key set (golden probe_lid.py):
-// [ok, uuid_prefix, machine_fingerprint, workspace_abspath, os_user, team_id,
-//  current_pane_id, last_seen_at, source]. Pins the 9-key surface CLI emits.
-#[test]
-#[serial_test::serial(env)]
-fn leader_identity_dict_has_exact_nine_golden_keys() {
-    let _g = ENV_LOCK.lock().unwrap_or_else(|p| p.into_inner());
-    let _e = EnvGuard::apply(&[("TEAM_AGENT_LEADER_SESSION_UUID_OVERRIDE", None)]);
-    let ws = p2_temp_ws("lid_keys");
-    let v = leader_identity(&ws, None).unwrap();
-    let obj = v.as_object().expect("leader_identity → JSON object");
-    for key in [
-        "ok",
-        "uuid_prefix",
-        "machine_fingerprint",
-        "workspace_abspath",
-        "os_user",
-        "team_id",
-        "current_pane_id",
-        "last_seen_at",
-        "source",
-    ] {
-        assert!(
-            obj.contains_key(key),
-            "golden leader_identity dict must carry '{key}'"
-        );
-    }
-}
-
 // ═════════════════════════════════════════════════════════════════════════
 // WAVE-2 Lane B — leader-lease DIVERGENCE round (adversarial review @ 2cd71ce).
 // The lease gate is green but NOT byte-parity. Golden: leader/__init__.py

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

@@ -153,7 +153,8 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
     );
     assert!(
         crate::cli::emit::default_help()
-            .contains("team-agent codex|claude|copilot|grok|cursor|pi ..."),
+            .lines()
+            .any(|line| { line.split_whitespace().next() == Some("pi") }),
         "default help must advertise the dispatchable Pi launcher"
     );
     let leader = parse_pi_leader_args(&leader_argv[2..])
@@ -221,14 +222,8 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
     .expect("write provider-default teammate role");
     let defaults = compile_role_agent(&role, &Value::Map(Vec::new()), "/workspace")
         .expect("provider: pi teammate may preserve provider-native defaults");
-    assert_eq!(
-        defaults.agent.get("model"),
-        Some(&Value::Null)
-    );
-    assert_eq!(
-        defaults.agent.get("effort"),
-        None
-    );
+    assert_eq!(defaults.agent.get("model"), Some(&Value::Null));
+    assert_eq!(defaults.agent.get("effort"), None);
     assert_eq!(
         defaults.agent.get("dangerously_skip_permissions"),
         Some(&Value::Bool(false))

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

@@ -21,7 +21,6 @@ use std::sync::Mutex;
 
 use serde_json::{json, Value};
 use serial_test::serial;
-use team_agent::cli::{cmd_wait_ready, CmdOutput, WaitReadyArgs};
 use team_agent::lifecycle::{
     classify_restart_plan, restart_with_transport, RestartReport, ResumeDecision, StartMode,
 };
@@ -448,48 +447,7 @@ fn restart_refuses_first_send_at_null_running_resumable_session_incomplete_when_
 }
 
 #[test]
-#[ignore = "real-machine: provider session filesystem + restart/shutdown lifecycle convergence"]
-#[serial(env)]
-fn wait_ready_reports_session_capture_incomplete_for_running_resumable_worker_without_session() {
-    let fixture = RestartFixture::new("wait-ready-session-incomplete", "codex");
-    seed_running_state_without_session(&fixture.team, "codex", &fixture.spawn_cwd);
-    let mut state = load_runtime_state(&fixture.team).unwrap();
-    let mcp_config = fixture.team.join(".team/runtime/worker_a.mcp.json");
-    std::fs::create_dir_all(mcp_config.parent().unwrap()).unwrap();
-    std::fs::write(&mcp_config, "{}").unwrap();
-    state["agents"]["worker_a"]["pane_id"] = json!("%1");
-    state["agents"]["worker_a"]["mcp_config"] = json!(mcp_config.to_string_lossy().to_string());
-    save_runtime_state(&fixture.team, &state).unwrap();
-
-    let out = json_result(
-        cmd_wait_ready(&WaitReadyArgs {
-            workspace: fixture.team.clone(),
-            timeout: 0.0,
-            json: true,
-            team: None,
-        })
-        .expect("wait-ready should return structured JSON"),
-    );
-
-    assert_eq!(
-        out["ok"],
-        json!(false),
-        "wait-ready cannot report ready while a running Codex/Claude worker is missing captured session context; out={out}"
-    );
-    assert_eq!(
-        out["reason"],
-        json!("session_capture_incomplete"),
-        "readiness reason must distinguish missing resumable session from generic workers_not_ready; out={out}"
-    );
-    assert!(
-        out["readiness"]["session_capture_incomplete"].as_bool() == Some(true)
-            && out["readiness"]["all_resumable_have_session"].as_bool() == Some(false),
-        "readiness truth table must include all_resumable_have_session and session_capture_incomplete; out={out}"
-    );
-}
-
-#[test]
-fn status_quick_start_and_wait_ready_surfaces_include_session_capture_completeness() {
+fn status_and_quick_start_surfaces_include_session_capture_completeness() {
     let diagnose =
         std::fs::read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/src/cli/diagnose.rs"))
             .unwrap();
@@ -500,7 +458,7 @@ fn status_quick_start_and_wait_ready_surfaces_include_session_capture_completene
             .unwrap();
 
     for (name, source) in [
-        ("wait-ready", diagnose.as_str()),
+        ("status readiness formula", diagnose.as_str()),
         ("status --json", status.as_str()),
         ("quick-start readiness", launch.as_str()),
         ("quick-start --json", adapters.as_str()),
@@ -945,13 +903,6 @@ fn read_events(team: &Path) -> String {
     std::fs::read_to_string(team.join(".team/logs/events.jsonl")).unwrap_or_default()
 }
 
-fn json_result(result: team_agent::cli::CmdResult) -> Value {
-    match result.output {
-        CmdOutput::Json(value) => value,
-        other => panic!("expected JSON command output, got {other:?}"),
-    }
-}
-
 fn assert_no_agent_attribution_ambiguous<const N: usize>(
     state: &Value,
     expected_agents: [&str; N],

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

@@ -170,7 +170,9 @@ fn purge_agent_help_and_dispatch_are_consistent() {
         );
     } else {
         assert!(
-            command.contains("unknown subcommand") || command.contains("invalid choice"),
+            command.contains("unknown subcommand")
+                || command.contains("invalid choice")
+                || command.contains("没有这个操作"),
             "RED6: if purge-agent is not implemented, help and dispatch must agree it is absent; help={help} command={command}"
         );
     }