@team-agent/installer 0.5.105 → 0.5.107

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

@@ -1,15 +1,8 @@
 //! U1 波2 contracts (RED-first → GREEN after fix).
 //!
-//! Wave-2 closes three hardening gaps the wave-1 7-acute audit identified but
-//! left untouched:
+//! Wave-2 covers the U1-B and U1-C hardening gaps the wave-1 7-acute audit
+//! identified, while retaining U1-A fail-closed regression guards:
 //!
-//!   * U1-A — `resolve_inject_target` LEADER branch had no liveness/fallback
-//!     gate: a stale `leader_receiver.pane_id` would be returned verbatim, and
-//!     the upstream `leader_receiver_pane_is_usable` would also fail (pane_id
-//!     no longer in `list_targets`, liveness Dead) → message goes terminal
-//!     `failed:leader_not_attached` on a mere pane-id drift. The wave-2 fix
-//!     widens "usable" to include "leader session+window exists" and lets the
-//!     resolver fall back to that live pane.
 //!   * U1-B — `transport.list_targets().unwrap_or_default()` SWALLOWED server
 //!     jitter (`Err` ≡ subprocess fork failed) as an empty vec. With the cache
 //!     codepath at :513-516 (`if live_targets.is_empty() && !known_dead { reuse }`)
@@ -56,71 +49,6 @@ fn pane_info_w(pane_id: &str, session: &str, window: &str) -> PaneInfo {
 // U1-A — LEADER pane_id drift fallback chain
 // ═════════════════════════════════════════════════════════════════════════════
 
-/// **Scenario**: state binds leader to `%old`, but tmux replaced it with `%new`
-/// in the same `leader-session`/`leader` window (pane drift — leader is ALIVE,
-/// just at a new id; this happens on tmux respawn-pane, `kill-pane` of an
-/// inner shell, panel resize, etc.).
-///
-/// **Pre-fix behaviour**: `leader_receiver_pane_is_usable` returns false (old
-/// pane gone from list, liveness Dead) → mark failed leader_not_attached.
-/// We never even reach `resolve_inject_target`.
-///
-/// **Post-fix expectation**: usable widens to "leader session+window exists";
-/// resolver falls back to the new live pane; delivery either delivers or fails
-/// for an unrelated reason — but NOT `leader_not_attached`.
-#[test]
-#[ignore = "U1-A drift fallback excised for 0.3.24 (macmini RED v2, res_e4b40473d36f). \
-            Mock contract preserved verbatim for v0.3.25 fix-forward — the real-machine \
-            fix requires writer-shape + projection + rediscover-writer triad, NOT the \
-            wave-2 single-fn fallback. See .team/artifacts/u1-a-realmachine-v2-fix-or-excise.md."]
-fn u1_a_leader_pane_drift_falls_back_to_live_session_window_not_failed() {
-    let ws = tmp_ws("u1a-drift");
-    let store = store_for(&ws);
-    let log = EventLog::new(&ws);
-    let state = serde_json::json!({
-        "session_name": "leader-session",
-        "leader_receiver": {
-            "pane_id": "%old",
-            "session_name": "leader-session",
-            "window_name": "leader",
-        },
-    });
-    crate::state::persist::save_runtime_state(&ws, &state).unwrap();
-    let message_id = store
-        .create_message(None, "coordinator", "leader", "hi", None, false, None)
-        .unwrap();
-
-    // Drift: %old is GONE; %new took its place under the same session/window.
-    let transport = OfflineTransport::new()
-        .with_targets(vec![pane_info_w("%new", "leader-session", "leader")])
-        .with_session_present(true)
-        .with_liveness("%old", PaneLiveness::Dead)
-        .with_liveness("%new", PaneLiveness::Live);
-
-    let out = deliver_pending_message(&ws, &store, &transport, &message_id, &log, &state).unwrap();
-
-    assert!(
-        out.reason != Some(DeliveryRefusal::LeaderNotAttached),
-        "U1-A: pane DRIFT (not leader death) must not terminal-fail as \
-         leader_not_attached; got reason={:?} status={:?}",
-        out.reason,
-        out.message_status.0
-    );
-    assert_ne!(
-        out.message_status.0, "failed",
-        "U1-A: drift must not be terminal; got status={}",
-        out.message_status.0
-    );
-    let inject_targets = transport.inject_targets();
-    assert!(
-        inject_targets
-            .iter()
-            .any(|t| matches!(t, Target::Pane(p) if p.as_str() == "%new")),
-        "U1-A: fallback chain must inject into the LIVE pane (%new), not the stale \
-         %old; injected targets={inject_targets:?}"
-    );
-}
-
 /// **Scenario**: state has no `leader_receiver.pane_id` AND no leader session
 /// metadata. Leader is genuinely not attached.
 ///
@@ -427,215 +355,6 @@ Do you trust the contents of this directory?
     );
 }
 
-// ═════════════════════════════════════════════════════════════════════════════
-// U1-A wave-2 follow-on — REAL-MACHINE-FAITHFUL contracts for the projection-null
-// regression that escaped the original wave-2 fix (macmini fixture
-// `res_dc8f8c8e20f6`, see `.team/artifacts/u1-a-realmachine-fail-fix-spec.md`).
-//
-// The original U1-A test at line 72 of this file uses a SYNTHETIC state shape
-// that pre-populates BOTH `state.session_name` AND `leader_receiver.session_name`
-// AND omits `owner_team_id` on the message. All three are simultaneously WRONG
-// for the real-machine isolated-team scenario, which is exactly why the wave-2
-// fix shipped GREEN here but the bug reproduced on the device.
-//
-// The real-machine writer
-// (`lifecycle/launch.rs::seed_launched_owner_from_caller_with_provider_lookup`,
-// lines 4440-4468) builds the `leader_receiver` JSON WITHOUT `session_name`
-// and `window_name`. Real-machine messages from worker_b → leader DO carry
-// `owner_team_id` on the row at send time, so the delivery path at
-// `messaging/delivery.rs:140-162` re-projects the runtime state through
-// `project_state_for_owner_team` → `project_top_level_view`
-// (`state/projection.rs:301-306`). The projection's `setdefault(null)` contract
-// converts a missing `state.session_name` on the team entry to a JSON null at
-// the projected top level. From there the fallback chain at `delivery.rs:604-606`
-// (`leader_receiver_session_name`) hits null on both the receiver AND the
-// projected root, returns None, the `!session.is_empty()` gate at
-// `delivery.rs:542` is skipped, and the U1-A drift fallback in
-// `leader_receiver_pane_is_usable` ALSO short-circuits with empty session —
-// back to `LeaderNotAttached` on a live %new.
-// ═════════════════════════════════════════════════════════════════════════════
-
-/// **Real-machine scenario** (macmini fixture `res_dc8f8c8e20f6`):
-///   * Isolated team `t1` launched via quick-start; tmux session = `team-iso`.
-///   * `leader_receiver` written by the isolated-team seed path carries
-///     `pane_id` / `mode` / `status` / `discovery` / `tmux_socket` but
-///     **NO** `session_name` and **NO** `window_name` (writer never sets them
-///     — see `lifecycle/launch.rs:4440-4468`).
-///   * worker_b → leader message carries `owner_team_id = "t1"` on the SQLite
-///     row (real-machine sender always populates this for isolated teams).
-///   * On delivery tick, `tmux respawn-pane -k -t %old` had already drifted
-///     the leader pane: `%old` is Dead, `%new` lives at session `team-iso`,
-///     window `leader`.
-///
-/// **Pre-fix behaviour (the bug that shipped in dd85ba7)**:
-///   delivery.rs:140 projects state via `project_top_level_view` → projection
-///   inserts `session_name: null` at projected top level
-///   (`state/projection.rs:301-302` `unwrap_or(Value::Null)` branch).
-///   Receiver lacks session_name → fallback at `delivery.rs:606` reads
-///   projected `state.session_name` → null → `.as_str()` → None.
-///   `leader_receiver_pane_is_usable` sees session=`""` → skips drift probe →
-///   returns false → message terminal-fails `LeaderNotAttached`, even though
-///   %new is alive at the right session+window.
-///
-/// **Post-fix expectation**: projection.rs:300-306 falls back to the ROOT
-/// `state.session_name` before inserting null. The drift probe then succeeds
-/// and %new is selected as inject target.
-///
-/// **0.3.24 status**: IGNORED. The wave-2 single-fn fallback (whose mock this
-/// asserted) was excised after macmini RED v2 (res_e4b40473d36f) proved that
-/// projection+drift-fallback alone do not close the real-machine gap. The
-/// v0.3.25 fix-forward will re-enable this contract with a real-tmux macmini
-/// counterpart — see `.team/artifacts/u1-a-realmachine-v2-fix-or-excise.md`.
-#[test]
-#[ignore = "U1-A deferred to v0.3.25 — wave-2 single-fn fallback excised for 0.3.24 ship"]
-fn u1_a_projected_team_state_with_null_session_still_finds_drifted_leader_pane() {
-    let ws = tmp_ws("u1a-proj-null-session");
-    let store = store_for(&ws);
-    let log = EventLog::new(&ws);
-
-    // Real-machine state shape: nested `teams.t1` entry, receiver as the writer
-    // at lifecycle/launch.rs:4440-4468 produces it (NO session_name, NO window_name).
-    // Top-level `session_name` is the canonical isolated-team session; the team
-    // entry does NOT carry it (matches real-machine `state.json` snapshots).
-    let state = serde_json::json!({
-        "active_team_key": "t1",
-        "session_name": "team-iso",
-        "teams": {
-            "t1": {
-                // NOTE: no session_name on the team entry — this is exactly the
-                // projection-trigger condition. Real machine relies on the root
-                // session_name; the projection setdefault(null) destroys it.
-                "leader_receiver": {
-                    "mode": "direct_tmux",
-                    "status": "attached",
-                    "pane_id": "%old",
-                    "pane": "%old",
-                    "leader_session_uuid": "00000000-0000-0000-0000-000000000001",
-                    "owner_epoch": 1,
-                    "discovery": "quick_start",
-                    // NOTE: no tmux_socket (the isolated-team seed path at
-                    // lifecycle/launch.rs:4440-4468 marks it OPTIONAL; setting a
-                    // foreign socket here would route us through
-                    // `delivery_transport_for_recipient`'s real-tmux endpoint
-                    // backend, which is correct production behaviour but bypasses
-                    // OfflineTransport and is asserted on by the real-machine
-                    // gated stub at the end of this section).
-                    // NOTE: no session_name. No window_name. Faithful to
-                    // seed_launched_owner_from_caller_with_provider_lookup
-                    // (lifecycle/launch.rs:4440-4468) which never writes them.
-                },
-                "team_owner": {
-                    "pane_id": "%old",
-                    "leader_session_uuid": "00000000-0000-0000-0000-000000000001",
-                    "owner_epoch": 1,
-                    "claimed_via": "quick-start",
-                },
-                "owner_epoch": 1,
-                "agents": {},
-            }
-        }
-    });
-    crate::state::persist::save_runtime_state(&ws, &state).unwrap();
-
-    // Critical faithfulness knob: owner_team_id IS set on the row, exactly as
-    // the real-machine sender (worker_b → leader on isolated team) writes it.
-    // This is what triggers the projection path at delivery.rs:140-162 that
-    // the pre-existing u1_a test above silently skipped by passing None.
-    let message_id = store
-        .create_message(None, "worker_b", "leader", "hi", None, false, Some("t1"))
-        .unwrap();
-
-    // Drift: %old is Dead; %new took its place under session "team-iso", window "leader".
-    let transport = OfflineTransport::new()
-        .with_targets(vec![pane_info_w("%new", "team-iso", "leader")])
-        .with_session_present(true)
-        .with_liveness("%old", PaneLiveness::Dead)
-        .with_liveness("%new", PaneLiveness::Live);
-
-    let out = deliver_pending_message(&ws, &store, &transport, &message_id, &log, &state).unwrap();
-
-    assert!(
-        out.reason != Some(DeliveryRefusal::LeaderNotAttached),
-        "U1-A projection-null escape (real-machine fixture res_dc8f8c8e20f6): \
-         worker_b → leader on isolated team with owner_team_id projects state \
-         through project_top_level_view, which setdefault(null)s session_name \
-         when the team entry lacks it; the U1-A fallback chain then sees empty \
-         session and terminal-fails. Got reason={:?} status={:?} — must NOT be \
-         LeaderNotAttached when %new is live at session+window.",
-        out.reason,
-        out.message_status.0
-    );
-    assert_ne!(
-        out.message_status.0, "failed",
-        "U1-A projection-null escape: drift via projected state must not be \
-         terminal; got status={}",
-        out.message_status.0
-    );
-    let inject_targets = transport.inject_targets();
-    assert!(
-        inject_targets
-            .iter()
-            .any(|t| matches!(t, Target::Pane(p) if p.as_str() == "%new")),
-        "U1-A projection-null escape: fallback chain must inject into the LIVE \
-         pane (%new) reachable via session+window probe; injected={inject_targets:?}"
-    );
-}
-
-/// **Projection-primitive contract**: direct test on
-/// `state::projection::project_top_level_view` that exposes the
-/// `unwrap_or(Value::Null)` bug at `state/projection.rs:301-306` in isolation.
-///
-/// **Pre-fix behaviour**: when the team entry lacks `session_name`, the
-/// projection inserts JSON null at the projected top level, regardless of
-/// whether the ROOT state has a valid `session_name`. Every downstream consumer
-/// uses `.and_then(Value::as_str)` which treats null and missing identically,
-/// so the bug is silent at projection time and only manifests at delivery time.
-///
-/// **Post-fix expectation**: when the team entry lacks `session_name`, fall
-/// back to the ROOT `state.session_name` before inserting null. This is the
-/// minimal-blast-radius fix — when the team entry HAS session_name the
-/// behaviour is bit-identical (entry branch wins), and when both lack it the
-/// projected value is still null (unchanged → `project_top_level_view_golden`
-/// + `project_top_level_view_does_not_fall_to_toplevel_owner_when_teams_exist`
-/// in `state/projection.rs` stay green).
-///
-/// **0.3.24 status**: IGNORED. The projection or_else fallback was reverted
-/// along with the wave-2 U1-A drift fallback because it had no other consumer.
-/// v0.3.25 will re-introduce it as part of the writer-shape + projection +
-/// rediscover-writer triad.
-#[test]
-#[ignore = "U1-A deferred to v0.3.25 — projection or_else fallback reverted with the wave-2 excision"]
-fn u1_a_project_top_level_view_falls_back_to_root_session_name_when_entry_lacks_it() {
-    let state = serde_json::json!({
-        "session_name": "root-sess",
-        "teams": {
-            "t1": {
-                "agents": {},
-                // NO session_name on the entry — projection must fall back to root.
-            }
-        }
-    });
-
-    let projected = crate::state::projection::project_top_level_view(&state, "t1");
-
-    let session = projected.get("session_name");
-    assert!(
-        session.is_some(),
-        "projection must produce a session_name key (matches Python setdefault \
-         contract); got {projected:?}"
-    );
-    assert_eq!(
-        session.and_then(serde_json::Value::as_str),
-        Some("root-sess"),
-        "U1-A projection contract: when team entry lacks session_name, the \
-         projection MUST fall back to ROOT state.session_name; instead it \
-         inserted {:?}. This is the root cause of the U1-A real-machine FAIL — \
-         every delivery.rs fallback that calls .and_then(Value::as_str) treats \
-         null as missing.",
-        session
-    );
-}
-
 /// **Regression guard**: when NEITHER the team entry NOR the root state has
 /// `session_name`, projection must still produce a `session_name` key with
 /// JSON null (Python `setdefault(null)` contract — keeps the existing
@@ -667,22 +386,3 @@ fn u1_a_project_top_level_view_inserts_null_session_name_when_neither_root_nor_e
         projected.get("session_name")
     );
 }
-
-// Real-machine integration stub (#[ignore]) — macmini scenario res_dc8f8c8e20f6.
-// The deterministic source of truth is the three OfflineTransport contracts above.
-// This stub claims the test name so the macmini harness can link it.
-#[test]
-#[ignore = "real-machine: macmini fixture res_dc8f8c8e20f6 — requires real tmux + isolated team launch + respawn-pane drift"]
-fn u1_a_macmini_res_dc8f8c8e20f6_isolated_team_respawn_pane_drift_delivers() {
-    if std::env::var("TEAMAGENT_MACMINI_E2E").as_deref() != Ok("1") {
-        eprintln!("skipping: TEAMAGENT_MACMINI_E2E != 1");
-        return;
-    }
-    panic!(
-        "stub: implement against tools/macmini-ssh/run_macmini_gap32_u1a_drift_e2e.sh \
-         (follow-up). The OfflineTransport unit contracts above are the deterministic \
-         source of truth; a real-machine replay was observed manually on the macmini \
-         host (worker_b → leader, %old dead, %new alive, projection nulls \
-         session_name, terminal-fails leader_not_attached pre-fix)."
-    );
-}

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

@@ -174,62 +174,58 @@ mod tests {
     }
 
     #[test]
-    fn prefix_hit_beats_lower_distance_non_prefix() {
-        // "stat" is a prefix of "status" (distance 2) but "slat" is
-        // distance 1 (mid-word substitution). Prefix wins.
-        let out = rank("stat", &[c("slat"), c("status")]);
-        assert_eq!(out, vec!["status".to_string(), "slat".to_string()]);
-    }
-
-    #[test]
-    fn distance_orders_non_prefix() {
-        let out = rank("btea", &[c("bota"), c("beta")]);
-        assert_eq!(out[0], "beta"); // 1 edit
-        assert_eq!(out[1], "bota"); // 2 edits
-    }
-
-    #[test]
-    fn stable_key_decides_tie() {
-        // Both "beta" and "bota" are distance 2 from "bata".
-        let out = rank("bata", &[c("bota"), c("beta")]);
-        assert_eq!(out, vec!["beta".to_string(), "bota".to_string()]);
-    }
-
-    #[test]
-    fn caps_at_three() {
-        let out = rank("aaaa", &[c("aaab"), c("aaac"), c("aaad"), c("aaae")]);
-        assert_eq!(out.len(), 3);
-        assert_eq!(out, vec!["aaab", "aaac", "aaad"]);
-    }
-
-    #[test]
-    fn case_preserved_in_payload() {
-        // "BTEA" normalized matches "Beta" (distance 1); the
-        // canonical payload preserves original casing.
-        let out = rank("BTEA", &[c("Beta")]);
-        assert_eq!(out, vec!["Beta".to_string()]);
-    }
-
-    #[test]
-    fn far_request_returns_empty() {
-        let out = rank("zzzzzz", &[c("beta")]);
-        assert!(out.is_empty());
-    }
-
-    #[test]
-    fn threshold_widens_with_length() {
-        assert_eq!(threshold_for_len(0), 1);
-        assert_eq!(threshold_for_len(3), 1);
-        assert_eq!(threshold_for_len(4), 2);
-        assert_eq!(threshold_for_len(6), 2);
-        assert_eq!(threshold_for_len(7), 3);
-        assert_eq!(threshold_for_len(20), 3);
-    }
-
-    #[test]
-    fn empty_request_returns_empty() {
-        let out = rank("", &[c("beta")]);
-        assert!(out.is_empty());
+    fn name_similarity_cases() {
+        enum Expected {
+            Exact(&'static [&'static str]),
+            Prefix(&'static [&'static str]),
+            Capped(usize, &'static [&'static str]),
+        }
+        enum Check {
+            Rank(&'static str, &'static [&'static str], Expected),
+            Thresholds(&'static [(usize, usize)]),
+        }
+        // (old case-id, check); Prefix deliberately does not assert the full output.
+        const CASES: &[(&str, Check)] = &[
+            // "stat" prefixes "status" (distance 2), ahead of "slat" (distance 1).
+            ("prefix_hit_beats_lower_distance_non_prefix", Check::Rank("stat", &["slat", "status"], Expected::Exact(&["status", "slat"]))),
+            // "beta" is 1 edit away; "bota" is 2 edits away. Only these first two were asserted.
+            ("distance_orders_non_prefix", Check::Rank("btea", &["bota", "beta"], Expected::Prefix(&["beta", "bota"]))),
+            // Both "beta" and "bota" are distance 2 from "bata"; stable_key breaks the tie.
+            ("stable_key_decides_tie", Check::Rank("bata", &["bota", "beta"], Expected::Exact(&["beta", "bota"]))),
+            ("caps_at_three", Check::Rank("aaaa", &["aaab", "aaac", "aaad", "aaae"], Expected::Capped(3, &["aaab", "aaac", "aaad"]))),
+            // Normalized "BTEA" matches "Beta" (distance 1); payload preserves canonical casing.
+            ("case_preserved_in_payload", Check::Rank("BTEA", &["Beta"], Expected::Exact(&["Beta"]))),
+            ("far_request_returns_empty", Check::Rank("zzzzzz", &["beta"], Expected::Exact(&[]))),
+            ("threshold_widens_with_length", Check::Thresholds(&[(0, 1), (3, 1), (4, 2), (6, 2), (7, 3), (20, 3)])),
+            ("empty_request_returns_empty", Check::Rank("", &["beta"], Expected::Exact(&[]))),
+            // Byte-lock existing emit.rs behavior: `statu` → `status`, checking only the first element.
+            ("statu_still_maps_to_status", Check::Rank("statu", &["status", "send", "start", "restart"], Expected::Prefix(&["status"]))),
+        ];
+        for (id, check) in CASES {
+            match check {
+                Check::Rank(request, candidates, expected) => {
+                    let candidates: Vec<_> = candidates.iter().map(|name| c(name)).collect();
+                    let out = rank(request, &candidates);
+                    let values = match expected {
+                        Expected::Exact(values) | Expected::Prefix(values) | Expected::Capped(_, values) => values,
+                    };
+                    let values: Vec<String> = values.iter().map(|value| (*value).to_string()).collect();
+                    match expected {
+                        Expected::Exact(_) => assert_eq!(out, values, "{id}"),
+                        Expected::Prefix(_) => assert_eq!(out.get(..values.len()), Some(values.as_slice()), "{id}: prefix"),
+                        Expected::Capped(limit, _) => {
+                            assert_eq!(out.len(), *limit, "{id}: cap");
+                            assert_eq!(out, values, "{id}");
+                        }
+                    }
+                }
+                Check::Thresholds(cases) => {
+                    for &(len, expected) in cases.iter() {
+                        assert_eq!(threshold_for_len(len), expected, "{id}: len={len}");
+                    }
+                }
+            }
+        }
     }
 
     #[test]
@@ -253,15 +249,4 @@ mod tests {
         assert_eq!(best_name("btea", &["beta", "bota"]), Some("beta"));
         assert_eq!(best_name("zzzzzz", &["beta"]), None);
     }
-
-    #[test]
-    fn statu_still_maps_to_status() {
-        // Byte-lock the existing emit.rs behavior: `statu` → `status`
-        // with the shared helper.
-        let out = rank(
-            "statu",
-            &[c("status"), c("send"), c("start"), c("restart")],
-        );
-        assert_eq!(out[0], "status");
-    }
 }

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

@@ -191,137 +191,50 @@ mod tests {
     // ---- find_dependency_cycle:golden 来自 Python 真相源(§4.2 双跑) ----
 
     #[test]
-    fn cycle_linear_chain_has_no_cycle() {
-        // Python C1 -> []
-        let tasks = [
-            t("a", &[], TaskStatus::Pending),
-            t("b", &["a"], TaskStatus::Pending),
-            t("c", &["b"], TaskStatus::Pending),
-        ];
-        assert!(find_dependency_cycle(&tasks).is_empty());
-    }
-
-    #[test]
-    fn cycle_two_node() {
-        // Python C2 -> ['a','b','a']
-        let tasks = [
-            t("a", &["b"], TaskStatus::Pending),
-            t("b", &["a"], TaskStatus::Pending),
-        ];
-        assert_eq!(
-            cycle_ids(&find_dependency_cycle(&tasks)),
-            vec!["a", "b", "a"]
-        );
-    }
-
-    #[test]
-    fn cycle_three_node() {
-        // Python C3 -> ['a','b','c','a']
-        let tasks = [
-            t("a", &["b"], TaskStatus::Pending),
-            t("b", &["c"], TaskStatus::Pending),
-            t("c", &["a"], TaskStatus::Pending),
-        ];
-        assert_eq!(
-            cycle_ids(&find_dependency_cycle(&tasks)),
-            vec!["a", "b", "c", "a"]
-        );
-    }
-
-    #[test]
-    fn cycle_self_loop() {
-        // Python C4 -> ['a','a'](走 stack.index 分支,非 [node,node] 退化分支)
-        let tasks = [t("a", &["a"], TaskStatus::Pending)];
-        assert_eq!(cycle_ids(&find_dependency_cycle(&tasks)), vec!["a", "a"]);
-    }
-
-    #[test]
-    fn cycle_reached_from_acyclic_prefix() {
-        // Python C5:x->a->b->a -> ['a','b','a'](前缀 x 不在环里,被 stack.index 切掉)
-        let tasks = [
-            t("x", &["a"], TaskStatus::Pending),
-            t("a", &["b"], TaskStatus::Pending),
-            t("b", &["a"], TaskStatus::Pending),
+    fn dependency_cycle_python_golden_cases() {
+        // (Python id, 旧函数名, note, tasks, 完整环路径)。保持输入和发现顺序。
+        let cases = [
+            ("C1", "cycle_linear_chain_has_no_cycle", "Python C1 -> []",
+                vec![t("a", &[], TaskStatus::Pending), t("b", &["a"], TaskStatus::Pending), t("c", &["b"], TaskStatus::Pending)], vec![]),
+            ("C2", "cycle_two_node", "Python C2 -> ['a','b','a']",
+                vec![t("a", &["b"], TaskStatus::Pending), t("b", &["a"], TaskStatus::Pending)], vec!["a", "b", "a"]),
+            ("C3", "cycle_three_node", "Python C3 -> ['a','b','c','a']",
+                vec![t("a", &["b"], TaskStatus::Pending), t("b", &["c"], TaskStatus::Pending), t("c", &["a"], TaskStatus::Pending)], vec!["a", "b", "c", "a"]),
+            ("C4", "cycle_self_loop", "Python C4 -> ['a','a'](走 stack.index 分支,非 [node,node] 退化分支)",
+                vec![t("a", &["a"], TaskStatus::Pending)], vec!["a", "a"]),
+            ("C5", "cycle_reached_from_acyclic_prefix", "Python C5:x->a->b->a -> ['a','b','a'](前缀 x 不在环里,被 stack.index 切掉)",
+                vec![t("x", &["a"], TaskStatus::Pending), t("a", &["b"], TaskStatus::Pending), t("b", &["a"], TaskStatus::Pending)], vec!["a", "b", "a"]),
+            ("C6", "cycle_missing_dep_is_ignored", "Python C6:a 依赖图外 'zzz' -> 不入环 -> []",
+                vec![t("a", &["zzz"], TaskStatus::Pending), t("b", &["a"], TaskStatus::Pending)], vec![]),
+            ("C7", "cycle_empty_input", "Python C7 -> []", vec![], vec![]),
         ];
-        assert_eq!(
-            cycle_ids(&find_dependency_cycle(&tasks)),
-            vec!["a", "b", "a"]
-        );
-    }
-
-    #[test]
-    fn cycle_missing_dep_is_ignored() {
-        // Python C6:a 依赖图外 'zzz' -> 不入环 -> []
-        let tasks = [
-            t("a", &["zzz"], TaskStatus::Pending),
-            t("b", &["a"], TaskStatus::Pending),
-        ];
-        assert!(find_dependency_cycle(&tasks).is_empty());
-    }
-
-    #[test]
-    fn cycle_empty_input() {
-        // Python C7 -> []
-        assert!(find_dependency_cycle(&[]).is_empty());
+        for (id, name, note, tasks, expected) in cases {
+            assert_eq!(cycle_ids(&find_dependency_cycle(&tasks)), expected, "case={id}/{name}; {note}");
+        }
     }
 
     // ---- ready_tasks:golden 来自 Python 真相源 ----
 
     #[test]
-    fn ready_pending_no_deps() {
-        // Python R1 -> ['a'](running 不在白名单)
-        let tasks = [
-            t("a", &[], TaskStatus::Pending),
-            t("b", &[], TaskStatus::Running),
+    fn ready_tasks_python_golden_cases() {
+        // (Python id, 旧函数名, note, tasks, 完整就绪列表)。不改变状态白名单或顺序。
+        let cases = [
+            ("R1", "ready_pending_no_deps", "Python R1 -> ['a'](running 不在白名单)",
+                vec![t("a", &[], TaskStatus::Pending), t("b", &[], TaskStatus::Running)], vec!["a"]),
+            ("R2", "ready_default_pending", "Python R2:无 status key 视作 pending -> ['a']。本类型用显式 Pending 表达缺省。",
+                vec![t("a", &[], TaskStatus::Pending)], vec!["a"]),
+            ("R3", "ready_requires_deps_done", "Python R3:a done -> b 就绪;c 依赖未完成的 b -> 不就绪 -> ['b']",
+                vec![t("a", &[], TaskStatus::Done), t("b", &["a"], TaskStatus::Pending), t("c", &["b"], TaskStatus::Pending)], vec!["b"]),
+            ("R4", "ready_status_whitelist", "Python R4:needs_retry / ready 在白名单,blocked 不在 -> ['a','b']",
+                vec![t("a", &[], TaskStatus::NeedsRetry), t("b", &[], TaskStatus::Ready), t("c", &[], TaskStatus::Blocked)], vec!["a", "b"]),
+            ("R5", "ready_missing_dep_not_done", "Python R5:依赖查无此 id -> 视作非 done -> 不就绪 -> []",
+                vec![t("b", &["missing"], TaskStatus::Pending)], vec![]),
+            ("R6", "ready_terminal_statuses_excluded", "Python R6:done/failed/cancelled 均不在白名单 -> []",
+                vec![t("a", &[], TaskStatus::Done), t("b", &[], TaskStatus::Failed), t("c", &[], TaskStatus::Cancelled)], vec![]),
         ];
-        assert_eq!(ready_ids(&ready_tasks(&tasks)), vec!["a"]);
-    }
-
-    #[test]
-    fn ready_default_pending() {
-        // Python R2:无 status key 视作 pending -> ['a']。本类型用显式 Pending 表达缺省。
-        let tasks = [t("a", &[], TaskStatus::Pending)];
-        assert_eq!(ready_ids(&ready_tasks(&tasks)), vec!["a"]);
-    }
-
-    #[test]
-    fn ready_requires_deps_done() {
-        // Python R3:a done -> b 就绪;c 依赖未完成的 b -> 不就绪 -> ['b']
-        let tasks = [
-            t("a", &[], TaskStatus::Done),
-            t("b", &["a"], TaskStatus::Pending),
-            t("c", &["b"], TaskStatus::Pending),
-        ];
-        assert_eq!(ready_ids(&ready_tasks(&tasks)), vec!["b"]);
-    }
-
-    #[test]
-    fn ready_status_whitelist() {
-        // Python R4:needs_retry / ready 在白名单,blocked 不在 -> ['a','b']
-        let tasks = [
-            t("a", &[], TaskStatus::NeedsRetry),
-            t("b", &[], TaskStatus::Ready),
-            t("c", &[], TaskStatus::Blocked),
-        ];
-        assert_eq!(ready_ids(&ready_tasks(&tasks)), vec!["a", "b"]);
-    }
-
-    #[test]
-    fn ready_missing_dep_not_done() {
-        // Python R5:依赖查无此 id -> 视作非 done -> 不就绪 -> []
-        let tasks = [t("b", &["missing"], TaskStatus::Pending)];
-        assert!(ready_tasks(&tasks).is_empty());
-    }
-
-    #[test]
-    fn ready_terminal_statuses_excluded() {
-        // Python R6:done/failed/cancelled 均不在白名单 -> []
-        let tasks = [
-            t("a", &[], TaskStatus::Done),
-            t("b", &[], TaskStatus::Failed),
-            t("c", &[], TaskStatus::Cancelled),
-        ];
-        assert!(ready_tasks(&tasks).is_empty());
+        for (id, name, note, tasks, expected) in cases {
+            assert_eq!(ready_ids(&ready_tasks(&tasks)), expected, "case={id}/{name}; {note}");
+        }
     }
 
     // ---- update_task_status:golden 来自 Python 真相源 ----