@team-agent/installer 0.5.126 → 0.5.127

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (107) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/crates/team-agent/src/cli/diagnose.rs +0 -69
  4. package/crates/team-agent/src/cli/emit.rs +10 -9
  5. package/crates/team-agent/src/cli/grok_slot.rs +88 -3
  6. package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
  7. package/crates/team-agent/src/cli/intent/runtime_tests.rs +45 -0
  8. package/crates/team-agent/src/cli/mod.rs +13 -1
  9. package/crates/team-agent/src/cli/models.rs +27 -181
  10. package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
  11. package/crates/team-agent/src/cli/tests/mod.rs +2 -2
  12. package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
  13. package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
  14. package/crates/team-agent/src/compiler/tests.rs +36 -9
  15. package/crates/team-agent/src/compiler.rs +3 -2
  16. package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
  17. package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
  18. package/crates/team-agent/src/contract_runtime/config.rs +6 -5
  19. package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
  20. package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
  21. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  22. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
  23. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  24. package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -2
  25. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  26. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  27. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  28. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +17 -185
  29. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
  30. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
  31. package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
  32. package/crates/team-agent/src/lifecycle/launch.rs +3 -11
  33. package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
  34. package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
  35. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  36. package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
  37. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  38. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  39. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
  40. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
  41. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
  42. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  43. package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
  44. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  45. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +6 -124
  46. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  47. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  48. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  49. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +136 -256
  50. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  51. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  52. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  53. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  54. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +7 -7
  55. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  56. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  57. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  58. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  59. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
  60. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  61. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +5 -5
  62. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  63. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  64. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  65. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  66. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  67. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +70 -15
  68. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
  69. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
  70. package/crates/team-agent/src/lifecycle/tests.rs +0 -4
  71. package/crates/team-agent/src/lifecycle/types.rs +2 -5
  72. package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
  73. package/crates/team-agent/src/messaging/delivery.rs +9 -61
  74. package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
  75. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  76. package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
  77. package/crates/team-agent/src/messaging/tests/spine.rs +5 -1
  78. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  79. package/crates/team-agent/src/provider/adapter.rs +58 -356
  80. package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
  81. package/crates/team-agent/src/provider/session/capture.rs +5 -105
  82. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
  83. package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
  84. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  85. package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
  86. package/crates/team-agent/src/provider/session_scan.rs +6 -16
  87. package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
  88. package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
  89. package/crates/team-agent/src/provider/tests/idle.rs +0 -43
  90. package/crates/team-agent/src/provider/types.rs +0 -4
  91. package/crates/team-agent/src/provider/wire.rs +34 -8
  92. package/crates/team-agent/src/tmux_backend.rs +4 -3
  93. package/package.json +4 -4
  94. package/skills/team-agent/SKILL.md +3 -2
  95. package/skills/team-agent/command-coverage.json +14 -0
  96. package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
  97. package/skills/team-agent/references/team-agent-operator.md +3 -1
  98. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  99. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  100. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  101. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  102. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  103. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  104. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  105. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  106. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  107. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
@@ -2192,7 +2192,7 @@ mod u1_tests {
2192
2192
  #[test]
2193
2193
  fn canonical_pending_capture_preserves_legacy_missing_boundary() {
2194
2194
  let agent = serde_json::json!({
2195
- "provider": "codex",
2195
+ "provider": "copilot",
2196
2196
  "status": "running",
2197
2197
  "spawn_cwd": "/tmp/u1-cwd",
2198
2198
  "capture_state": "pending_first_turn"
@@ -2203,113 +2203,13 @@ mod u1_tests {
2203
2203
  assert_eq!(pending.context.spawned_at, None);
2204
2204
  }
2205
2205
 
2206
- #[test]
2207
- fn canonical_delayed_capture_rejects_prior_round_codex_rollout() {
2208
- let dir =
2209
- std::env::temp_dir().join(format!("ta-delayed-stale-codex-{}", std::process::id()));
2210
- let _ = std::fs::remove_dir_all(&dir);
2211
- std::fs::create_dir_all(&dir).unwrap();
2212
- let stale =
2213
- dir.join("rollout-2026-07-21T23-18-28-019f8541-c986-7f50-b9e6-6503c89df98c.jsonl");
2214
- std::fs::write(
2215
- &stale,
2216
- format!(
2217
- "{{\"session_meta\":{{\"payload\":{{\"id\":\"019f8541-c986-7f50-b9e6-6503c89df98c\",\"cwd\":\"{}\",\"created_at\":\"2026-07-21T23:18:28+00:00\"}}}}}}\n",
2218
- dir.to_string_lossy()
2219
- ),
2220
- )
2221
- .unwrap();
2222
- let mut state = serde_json::json!({
2223
- "agents": {
2224
- "clone": {
2225
- "provider": "codex",
2226
- "status": "running",
2227
- "spawn_cwd": dir.to_string_lossy(),
2228
- "spawned_at": "2026-07-22T02:12:27+00:00",
2229
- "capture_state": "pending_first_turn"
2230
- }
2231
- }
2232
- });
2233
- let mut adapter_for = crate::provider::get_adapter;
2234
-
2235
- let report = capture_missing_provider_sessions_once(&mut state, &mut adapter_for, true, 0)
2236
- .expect("delayed capture pass");
2237
-
2238
- assert!(report.assigned.is_empty());
2239
- assert!(state["agents"]["clone"]["session_id"].is_null());
2240
- assert_ne!(
2241
- state["agents"]["clone"]["capture_state"],
2242
- serde_json::json!("captured")
2243
- );
2244
- let _ = std::fs::remove_dir_all(&dir);
2245
- }
2246
-
2247
- #[test]
2248
- fn canonical_delayed_capture_ignores_active_foreign_cwd_rollouts() {
2249
- use std::io::Write;
2250
-
2251
- let root =
2252
- std::env::temp_dir().join(format!("ta-codex-dirty-domain-{}", std::process::id()));
2253
- let _ = std::fs::remove_dir_all(&root);
2254
- let current_cwd = root.join("current");
2255
- let foreign_cwd = root.join("foreign");
2256
- std::fs::create_dir_all(&current_cwd).unwrap();
2257
- std::fs::create_dir_all(&foreign_cwd).unwrap();
2258
- let stale_current = current_cwd.join(
2259
- "cache/current/rollout-2026-07-21T23-18-28-019f8541-c986-7f50-b9e6-6503c89df98c.jsonl",
2260
- );
2261
- let fresh_foreign = current_cwd.join(
2262
- "cache/foreign/rollout-2026-07-22T04-01-00-019f8644-7060-7000-8000-000000000001.jsonl",
2263
- );
2264
- let fresh_current = current_cwd.join(
2265
- "cache/current/rollout-2026-07-22T04-01-01-019f8644-7450-7000-8000-000000000002.jsonl",
2266
- );
2267
- let write_rollout = |path: &std::path::Path, cwd: &std::path::Path, id: &str| {
2268
- std::fs::create_dir_all(path.parent().unwrap()).unwrap();
2269
- std::fs::write(
2270
- path,
2271
- format!(
2272
- "{{\"type\":\"session_meta\",\"payload\":{{\"id\":\"{id}\",\"cwd\":\"{}\"}}}}\n",
2273
- cwd.to_string_lossy()
2274
- ),
2275
- )
2276
- .unwrap();
2277
- };
2278
- write_rollout(&stale_current, &current_cwd, "stale-current");
2279
- write_rollout(&fresh_foreign, &foreign_cwd, "fresh-foreign");
2280
- write_rollout(&fresh_current, &current_cwd, "fresh-current");
2281
- std::fs::OpenOptions::new()
2282
- .append(true)
2283
- .open(&stale_current)
2284
- .unwrap()
2285
- .write_all(b"{\"type\":\"event_msg\"}\n")
2286
- .unwrap();
2287
- let mut state = serde_json::json!({
2288
- "agents": {"clone": {
2289
- "provider": "codex", "status": "running",
2290
- "spawn_cwd": current_cwd.to_string_lossy(),
2291
- "spawned_at": "2026-07-21T20:00:00+00:00",
2292
- "capture_state": "pending_first_turn"
2293
- }}
2294
- });
2295
- let mut adapter_for = crate::provider::get_adapter;
2296
-
2297
- let report = capture_missing_provider_sessions_once(&mut state, &mut adapter_for, true, 0)
2298
- .expect("canonical delayed capture");
2299
-
2300
- assert_eq!(report.candidate_count_by_agent.get("clone"), Some(&1));
2301
- assert_eq!(state["agents"]["clone"]["session_id"], "fresh-current");
2302
- assert_eq!(state["agents"]["clone"]["capture_state"], "captured");
2303
- let _ = std::fs::remove_dir_all(&root);
2304
- }
2305
-
2306
2206
  #[test]
2307
2207
  fn existing_team_session_is_rejected_while_fresh_candidate_is_accepted() {
2308
2208
  let mut state = serde_json::json!({
2309
2209
  "session_name": "current",
2310
2210
  "agents": {
2311
2211
  "clone": {
2312
- "provider": "codex",
2212
+ "provider": "copilot",
2313
2213
  "status": "running",
2314
2214
  "spawn_cwd": "/tmp/u1-cwd"
2315
2215
  }
@@ -2318,7 +2218,7 @@ mod u1_tests {
2318
2218
  "archived": {
2319
2219
  "agents": {
2320
2220
  "old-seat": {
2321
- "provider": "codex",
2221
+ "provider": "copilot",
2322
2222
  "session_id": "stale-session",
2323
2223
  "rollout_path": "/tmp/stale.jsonl"
2324
2224
  }
@@ -2357,12 +2257,12 @@ mod u1_tests {
2357
2257
  let mut state = serde_json::json!({
2358
2258
  "agents": {
2359
2259
  "bad": {
2360
- "provider": "codex",
2260
+ "provider": "copilot",
2361
2261
  "status": "running",
2362
2262
  "spawn_cwd": "/tmp/u1-bad"
2363
2263
  },
2364
2264
  "good": {
2365
- "provider": "codex",
2265
+ "provider": "copilot",
2366
2266
  "status": "running",
2367
2267
  "spawn_cwd": "/tmp/u1-good"
2368
2268
  }
@@ -71,7 +71,7 @@ pub(crate) fn transition_pending_context_fork(
71
71
  /// before: spawn 前 backing 基线
72
72
  /// expected_backing_path: 精确快照路径,透传
73
73
  /// source_agent_id: 透传给 verify_context_fork(当前该参数不参与判定)
74
- /// agent_id: 目标席位 id;既用于 codex 身份比对,也写进 Pending.target_agent
74
+ /// agent_id: 目标席位 id,写进 Pending.target_agent
75
75
  /// spawn_cwd: 目标席位工作目录,透传并写进 Pending 的扫描上下文
76
76
  /// spawned_at: 时间边界,透传并写进 Pending
77
77
  /// deadline: 轮询预算
@@ -134,23 +134,16 @@ mod tests {
134
134
  use super::*;
135
135
 
136
136
  #[test]
137
- fn convergence_deadlines_are_provider_specific() {
138
- assert_eq!(
139
- context_fork_convergence_deadline(Provider::Codex),
140
- Duration::from_secs(10)
141
- );
142
- assert_eq!(
143
- context_fork_convergence_deadline(Provider::Copilot),
144
- Duration::from_secs(5)
145
- );
137
+ fn convergence_deadlines_are_bounded_for_every_provider() {
138
+ for provider in [Provider::Codex, Provider::Copilot, Provider::Grok] {
139
+ assert_eq!(context_fork_convergence_deadline(provider), Duration::from_secs(5));
140
+ }
146
141
  }
147
142
 
148
143
  #[test]
149
- fn codex_without_new_backing_is_typed_pending() {
144
+ fn retired_legacy_codex_fork_is_rejected_not_pending() {
150
145
  let root =
151
- std::env::temp_dir().join(format!("ta-codex-fork-pending-{}", std::process::id()));
152
- let _ = std::fs::remove_dir_all(&root);
153
- std::fs::create_dir_all(&root).unwrap();
146
+ std::env::temp_dir().join(format!("ta-codex-fork-retired-{}", std::process::id()));
154
147
  let plan = CommandPlan {
155
148
  argv: Vec::new(),
156
149
  expected_session_id: None,
@@ -170,11 +163,6 @@ mod tests {
170
163
  "2026-07-24T00:00:00Z",
171
164
  Duration::ZERO,
172
165
  );
173
- let ContextForkOutcome::Pending(pending) = outcome else {
174
- panic!("missing backing must remain a typed pending fork")
175
- };
176
- assert_eq!(pending.source_session_id.as_str(), "source-session");
177
- assert_eq!(pending.target_agent, "fork");
178
- let _ = std::fs::remove_dir_all(&root);
166
+ assert!(matches!(outcome, ContextForkOutcome::Rejected(_)), "{outcome:?}");
179
167
  }
180
168
  }
@@ -5,24 +5,22 @@
5
5
  //! - name: ContextBackingSnapshot
6
6
  //! what: spawn 前对 provider backing 根下 .jsonl 的 (len, mtime) 基线快照,用于判「变过」
7
7
  //! - name: verify_context_fork
8
- //! what: 按 provider 路由到 copilot/codex 两条验证路径,成功给 ContextForkProof
8
+ //! what: 只有 copilot 一条验证路径,成功给 ContextForkProof
9
9
  //! - name: context_fork_convergence_deadline
10
- //! what: 每个 provider 各自的收敛预算(codex 10s / 其余 5s)
10
+ //! what: 每个 provider 的收敛预算(一律 5s)
11
11
  //! - name: ContextForkProof
12
12
  //! what: 已验证的 fork 证明:新旧 session id、backing 路径、captured_via、归属置信度
13
13
  //! - name: ContextForkTermination
14
14
  //! what: 两种失败:Timeout(未在预算内看到新 backing) 与 Rejected(provider 侧错误)
15
15
  //! requires:
16
- //! - name: crate::provider::session_scan
17
- //! what: codex 分支复用一次性候选扫描来认领新 rollout
18
16
  //! - name: crate::provider::CommandPlan
19
17
  //! what: expected_session_id 与 provider_projects_root 两个关键输入都来自 plan
20
18
  //! boundary:
21
19
  //! - 只回答「fork 有没有产生一个可读的、不等于源会话的新 backing」,不回答会话内容对不对
22
- //! - 不创建/改写 backing(codex 的物化改写在 context_fork/codex.rs,不在本文件)
20
+ //! - 不创建/改写 backing
23
21
  //! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
24
- //! - grok / gemini / fake 没有可验证 backing,一律直接 Rejected
25
- //! - Claude Code / Pi worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
22
+ //! - gemini / fake 没有可验证 backing,一律直接 Rejected
23
+ //! - Claude Code / Codex / Grok / Pi worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
26
24
  //! maturity: wired
27
25
  //! ---
28
26
  use std::collections::BTreeMap;
@@ -45,9 +43,7 @@ pub(crate) enum ContextForkTermination {
45
43
  Rejected(#[from] ProviderError),
46
44
  }
47
45
 
48
- mod codex;
49
46
  mod outcome;
50
- pub(crate) use codex::materialize_codex_fork;
51
47
  pub(crate) use outcome::{
52
48
  observe_context_fork, transition_pending_context_fork, ContextForkOutcome, PendingContextFork,
53
49
  };
@@ -56,7 +52,7 @@ pub(crate) use outcome::{
56
52
  /// purpose: 给出该 provider 等待 fork backing 落盘的收敛预算
57
53
  /// params:
58
54
  /// provider: 目标 provider;全枚举穷举,无兜底臂
59
- /// returns: Codex 10s、其余(Claude/ClaudeCode/Copilot/Grok/Pi/GeminiCli/Fake) 5s
55
+ /// returns: 一律 5s(各 provider 仍逐一列出,新增 provider 必须显式决定)
60
56
  /// contract:
61
57
  /// provides:
62
58
  /// - name: context_fork_convergence_deadline
@@ -67,9 +63,9 @@ pub(crate) use outcome::{
67
63
  pub(crate) fn context_fork_convergence_deadline(provider: Provider) -> Duration {
68
64
  // Expiration is consumed by ContextForkOutcome::Pending(PendingContextFork).
69
65
  match provider {
70
- Provider::Codex => Duration::from_secs(10),
71
66
  Provider::Claude
72
67
  | Provider::ClaudeCode
68
+ | Provider::Codex
73
69
  | Provider::Copilot
74
70
  | Provider::Grok
75
71
  | Provider::Pi
@@ -125,13 +121,13 @@ impl ContextBackingSnapshot {
125
121
  /// ---
126
122
  /// purpose: fork 后按 provider 分派验证,只有拿到「新会话 backing 可读且不等于源会话」的实证才返回证明
127
123
  /// params:
128
- /// provider: 决定走 copilot(sqlite 行存在) / codex(候选扫描认领) 两条路之一
124
+ /// provider: 只有 copilot(sqlite 行存在) 一条路,其余一律拒绝
129
125
  /// source_session_id: 被 fork 的源会话 id;新会话等于它即判失败
130
126
  /// plan: 提供 expected_session_id 与隔离 backing 根
131
127
  /// before: spawn 前的 ContextBackingSnapshot 基线,用于判「文件变过」
132
- /// expected_backing_path: 精确快照路径。codex 仅在 plan 带 expected id 时必需(无 expected id 走 legacy「唯一变过的新 rollout」认领,可为 None);不做同目录猜测
133
- /// spawn_cwd: codex 分支据此构造扫描上下文
134
- /// spawned_at: codex 候选扫描的时间边界
128
+ /// expected_backing_path: 精确快照路径;copilot 不使用
129
+ /// spawn_cwd: 保留调用形状
130
+ /// spawned_at: 保留调用形状
135
131
  /// deadline: 轮询预算,来自 context_fork_convergence_deadline
136
132
  /// returns: ContextForkProof——新旧 session id、backing 路径、captured_via、attribution_confidence
137
133
  /// errors: Timeout 表示预算内没看到可验证的新 backing;Rejected 包装 ProviderError(缺 expected id、路径不匹配、无可验证 backing 的 provider)
@@ -141,36 +137,24 @@ impl ContextBackingSnapshot {
141
137
  /// what: 分派 + 兜底拒绝;本函数自身不轮询,轮询在各 provider 分支内
142
138
  /// boundary:
143
139
  /// - 不修改 backing、不写 state、不发事件
144
- /// - _source_agent_id 当前不参与任何判定(仅 codex 用 agent_id 做 embedded 身份比对)
145
- /// - 未列入两条路径的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
140
+ /// - _source_agent_id / agent_id 当前不参与任何判定
141
+ /// - 非 copilot 的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
146
142
  /// ---
147
143
  pub(crate) fn verify_context_fork(
148
144
  provider: Provider,
149
145
  source_session_id: &SessionId,
150
146
  plan: &CommandPlan,
151
- before: &ContextBackingSnapshot,
152
- expected_backing_path: Option<&Path>,
147
+ _before: &ContextBackingSnapshot,
148
+ _expected_backing_path: Option<&Path>,
153
149
  _source_agent_id: &str,
154
- agent_id: &str,
155
- spawn_cwd: &Path,
156
- spawned_at: &str,
157
- deadline: Duration,
150
+ _agent_id: &str,
151
+ _spawn_cwd: &Path,
152
+ _spawned_at: &str,
153
+ _deadline: Duration,
158
154
  ) -> Result<ContextForkProof, ContextForkTermination> {
159
155
  if provider == Provider::Copilot {
160
156
  return verify_copilot_fork(source_session_id, plan).map_err(Into::into);
161
157
  }
162
- if provider == Provider::Codex {
163
- return codex::verify_codex_fork(
164
- source_session_id,
165
- plan,
166
- before,
167
- expected_backing_path,
168
- agent_id,
169
- spawn_cwd,
170
- spawned_at,
171
- deadline,
172
- );
173
- }
174
158
  Err(ProviderError::CaptureFailed(format!(
175
159
  "context_fork_unverified: {provider:?} has no verifiable fork backing"
176
160
  ))
@@ -242,10 +226,11 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
242
226
  .map(PathBuf::from)
243
227
  .unwrap_or_else(|| PathBuf::from("."));
244
228
  match provider {
245
- Provider::Codex => home.join(".codex").join("sessions"),
246
229
  Provider::Copilot => home.join(".copilot").join("session-state"),
247
- Provider::Claude | Provider::ClaudeCode | Provider::Pi => PathBuf::new(),
248
- Provider::Grok | Provider::GeminiCli | Provider::Fake => home,
230
+ Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok | Provider::Pi => {
231
+ PathBuf::new()
232
+ }
233
+ Provider::GeminiCli | Provider::Fake => home,
249
234
  }
250
235
  }
251
236
 
@@ -277,107 +262,3 @@ fn file_stamp(path: &Path) -> Option<FileStamp> {
277
262
  modified: meta.modified().ok(),
278
263
  })
279
264
  }
280
-
281
- fn readable_jsonl(path: &Path) -> bool {
282
- std::fs::read_to_string(path)
283
- .ok()
284
- .and_then(|text| {
285
- text.lines()
286
- .find(|line| !line.trim().is_empty())
287
- .map(str::to_string)
288
- })
289
- .is_some_and(|line| serde_json::from_str::<serde_json::Value>(&line).is_ok())
290
- }
291
-
292
- fn session_id_from_jsonl(path: &Path) -> Option<String> {
293
- let text = std::fs::read_to_string(path).ok()?;
294
- text.lines()
295
- .filter_map(|line| serde_json::from_str::<serde_json::Value>(line).ok())
296
- .find_map(|record| {
297
- record
298
- .get("sessionId")
299
- .or_else(|| record.get("session_id"))
300
- .and_then(serde_json::Value::as_str)
301
- .map(ToString::to_string)
302
- .or_else(|| {
303
- record
304
- .get("session_meta")
305
- .and_then(|value| value.get("payload"))
306
- .or_else(|| record.get("payload"))
307
- .and_then(|value| value.get("id"))
308
- .and_then(serde_json::Value::as_str)
309
- .map(ToString::to_string)
310
- })
311
- })
312
- }
313
-
314
- #[cfg(test)]
315
- mod tests {
316
- use super::*;
317
- use std::io::Write;
318
-
319
- #[test]
320
- fn codex_fork_proof_ignores_changed_stale_and_foreign_rollouts() {
321
- let root =
322
- std::env::temp_dir().join(format!("ta-codex-fork-proof-dirty-{}", std::process::id()));
323
- let _ = std::fs::remove_dir_all(&root);
324
- let current_cwd = root.join("current");
325
- let foreign_cwd = root.join("foreign");
326
- std::fs::create_dir_all(&current_cwd).unwrap();
327
- std::fs::create_dir_all(&foreign_cwd).unwrap();
328
- let stale = root.join(
329
- "2026/07/16/rollout-2026-07-16T08-05-43-019f6686-e2b6-7000-8000-000000000001.jsonl",
330
- );
331
- let fresh = root.join(
332
- "2026/07/22/rollout-2026-07-22T04-01-01-019f8644-7450-7000-8000-000000000002.jsonl",
333
- );
334
- let foreign = root.join(
335
- "2026/07/22/rollout-2026-07-22T04-01-02-019f8644-7838-7000-8000-000000000003.jsonl",
336
- );
337
- let write_rollout = |path: &Path, cwd: &Path, id: &str| {
338
- std::fs::create_dir_all(path.parent().unwrap()).unwrap();
339
- std::fs::write(
340
- path,
341
- format!(
342
- "{{\"type\":\"session_meta\",\"payload\":{{\"id\":\"{id}\",\"cwd\":\"{}\"}}}}\n",
343
- cwd.to_string_lossy()
344
- ),
345
- )
346
- .unwrap();
347
- };
348
- write_rollout(&stale, &current_cwd, "stale-session");
349
- let plan = CommandPlan {
350
- argv: Vec::new(),
351
- expected_session_id: None,
352
- provider_projects_root: Some(root.clone()),
353
- managed_mcp_config: false,
354
- };
355
- let before = ContextBackingSnapshot::capture(Provider::Codex, &plan);
356
- std::fs::OpenOptions::new()
357
- .append(true)
358
- .open(&stale)
359
- .unwrap()
360
- .write_all(b"{\"type\":\"event_msg\"}\n")
361
- .unwrap();
362
- write_rollout(&foreign, &foreign_cwd, "foreign-session");
363
- write_rollout(&fresh, &current_cwd, "fresh-session");
364
-
365
- let proof = verify_context_fork(
366
- Provider::Codex,
367
- &SessionId::new("source-session"),
368
- &plan,
369
- &before,
370
- None,
371
- "source",
372
- "fork",
373
- &current_cwd,
374
- "2026-07-21T20:00:00+00:00",
375
- Duration::ZERO,
376
- )
377
- .unwrap();
378
-
379
- assert_eq!(proof.new_session_id.as_str(), "fresh-session");
380
- assert_eq!(proof.backing_path, fresh);
381
- let _ = std::fs::remove_dir_all(&root);
382
- }
383
- }
@@ -29,9 +29,8 @@ pub mod resume;
29
29
 
30
30
  pub use context_fork::ContextForkProof;
31
31
  pub(crate) use context_fork::{
32
- context_fork_convergence_deadline, materialize_codex_fork, observe_context_fork,
33
- transition_pending_context_fork, ContextBackingSnapshot, ContextForkOutcome,
34
- PendingContextFork,
32
+ context_fork_convergence_deadline, observe_context_fork, transition_pending_context_fork,
33
+ ContextBackingSnapshot, ContextForkOutcome, PendingContextFork,
35
34
  };
36
35
 
37
36
  pub use resume::{RecoveryHint, ResumeRefusalReason};
@@ -3,7 +3,7 @@
3
3
  //! contract:
4
4
  //! provides:
5
5
  //! - name: candidate_session_files
6
- //! what: 按 provider 枚举候选文件(隔离根 + spawn_cwd 递归 + provider HOME 目录),去重排序并按 mtime 截到 300 条
6
+ //! what: 枚举候选文件(隔离根 + spawn_cwd 递归),去重排序并按 mtime 截到 300 条
7
7
  //! - name: parse_candidate_files
8
8
  //! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配与 embedded 身份两道排除
9
9
  //! - name: apply_spawned_at_filter
@@ -29,8 +29,6 @@
29
29
  //! requires:
30
30
  //! - name: crate::provider::helpers
31
31
  //! what: find_session_id 与 parse_jsonl_records
32
- //! - name: super::codex
33
- //! what: spawned_at 解析、uuid 精度截断与 rollout 创建时间
34
32
  //! boundary:
35
33
  //! - 一律只读:不写盘、不改 state、不发事件
36
34
  //! - 只产出候选与事实;归属最终由上游分配器裁定,本文件不写会话
@@ -64,10 +62,10 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
64
62
  /// ---
65
63
  /// purpose: 枚举本席位可能对应的会话文件,产出待解析的候选路径表
66
64
  /// params:
67
- /// provider: 决定要不要去 ~/.codex/sessions 找
65
+ /// _provider: 保留调用形状;不再有 provider HOME 目录分支
68
66
  /// context: provider_projects_root(隔离根)、spawn_cwd(必扫)、agent_id(参与文件名匹配)
69
67
  /// returns: 去重并排序后的候选;requires_cwd_match=false 的排前面,同组按路径字典序
70
- /// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;provider HOME 侧目录读失败静默跳过
68
+ /// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;隔离根读失败静默跳过
71
69
  /// contract:
72
70
  /// provides:
73
71
  /// - name: candidate_session_files
@@ -76,10 +74,10 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
76
74
  /// - spawn_cwd 递归最深 4 层;工作区是用户代码仓,任何名含 session 的 json 都会被列进来
77
75
  /// - .team 运行时目录一律排除,除非它就在 claude 的隔离根之下
78
76
  /// - 超过 300 条按 mtime 由新到旧截断;被截掉的候选不产生任何信号
79
- /// - Copilot / Grok / GeminiCli / Fake 不走 HOME 分支——它们各有专属扫描
77
+ /// - 任何 provider 都不走 HOME 分支——Copilot / Pi 各有专属扫描,退役的 legacy 席位不扫描
80
78
  /// ---
81
79
  pub(super) fn candidate_session_files(
82
- provider: Provider,
80
+ _provider: Provider,
83
81
  context: &CaptureSessionContext,
84
82
  ) -> Result<Vec<SessionCandidate>, ProviderError> {
85
83
  let mut out = Vec::new();
@@ -94,25 +92,6 @@ pub(super) fn candidate_session_files(
94
92
  None,
95
93
  &mut out,
96
94
  )?;
97
- if let Some(home) = std::env::var_os("HOME").map(PathBuf::from) {
98
- match provider {
99
- Provider::Codex => {
100
- collect_optional_candidate_files(
101
- &home.join(".codex").join("sessions"),
102
- &context.agent_id,
103
- None,
104
- &mut out,
105
- )?;
106
- }
107
- Provider::Claude
108
- | Provider::ClaudeCode
109
- | Provider::Copilot
110
- | Provider::Grok
111
- | Provider::Pi
112
- | Provider::GeminiCli
113
- | Provider::Fake => {}
114
- }
115
- }
116
95
  out.sort_by(|a, b| {
117
96
  a.requires_cwd_match
118
97
  .cmp(&b.requires_cwd_match)
@@ -202,20 +181,19 @@ pub(super) fn parse_candidate_files(
202
181
  /// ---
203
182
  /// purpose: 用席位的进程世代边界剔除上一代/别人留下的旧存档
204
183
  /// params:
205
- /// provider: Codex 走 rollout 创建时间,其余走文件 mtime
206
- /// context: spawned_at 缺失则不过滤(legacy 行);expected id 存在且是 Codex 时把边界截到毫秒
184
+ /// _provider: 保留调用形状;所有 provider 都按文件 mtime 判定
185
+ /// context: spawned_at 缺失则不过滤(legacy 行)
207
186
  /// out: 就地过滤的候选列表
208
187
  /// contract:
209
188
  /// provides:
210
189
  /// - name: apply_spawned_at_filter
211
- /// what: fail-closed —— spawned_at 存在但解析不了(或截断失败)时清空候选,绝不放行
190
+ /// what: fail-closed —— spawned_at 存在但解析不了时清空候选,绝不放行
212
191
  /// boundary:
213
192
  /// - 无 spawned_at 时整体跳过过滤,把守卫让给分配器的身份与唯一性判据
214
193
  /// - 无 rollout_path、取不到时间的候选一律剔除
215
- /// - Codex 刻意不用 mtime:追加写与邻席活动都会抬升 mtime
216
194
  /// ---
217
195
  pub(super) fn apply_spawned_at_filter(
218
- provider: Provider,
196
+ _provider: Provider,
219
197
  context: &CaptureSessionContext,
220
198
  out: &mut Vec<CapturedSessionCandidate>,
221
199
  ) {
@@ -224,32 +202,25 @@ pub(super) fn apply_spawned_at_filter(
224
202
  // the canonical runtime capture path rejects such rows before scan.
225
203
  return;
226
204
  };
227
- let Some(spawned_at) = super::codex::parse_spawned_at(raw_spawned_at) else {
205
+ let Some(spawned_at) = parse_spawned_at(raw_spawned_at) else {
228
206
  out.clear();
229
207
  return;
230
208
  };
231
- let codex_spawned_at =
232
- if matches!(provider, Provider::Codex) && context.expected_session_id.is_some() {
233
- let Some(timestamp) = super::codex::truncate_to_uuid_precision(spawned_at) else {
234
- out.clear();
235
- return;
236
- };
237
- timestamp
238
- } else {
239
- spawned_at
240
- };
241
209
  out.retain(|candidate| {
242
210
  let Some(path) = candidate.captured.rollout_path.as_ref() else {
243
211
  return false;
244
212
  };
245
- if matches!(provider, Provider::Codex) {
246
- return super::codex::rollout_created_at(path.as_path())
247
- .is_some_and(|created_at| created_at >= codex_spawned_at);
248
- }
249
213
  candidate_mtime(path.as_path()).is_some_and(|mtime| mtime >= spawned_at)
250
214
  });
251
215
  }
252
216
 
217
+ /// RFC3339 only; the caller decides what `None` means (the filter clears).
218
+ pub(super) fn parse_spawned_at(raw: &str) -> Option<std::time::SystemTime> {
219
+ chrono::DateTime::parse_from_rfc3339(raw)
220
+ .ok()
221
+ .map(|dt| std::time::SystemTime::from(dt.with_timezone(&chrono::Utc)))
222
+ }
223
+
253
224
  fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
254
225
  std::fs::metadata(path)
255
226
  .and_then(|meta| meta.modified())
@@ -259,7 +230,7 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
259
230
  /// ---
260
231
  /// purpose: 在时间窗只能唯一确定一条候选时才据此收窄,避免用弱判据在多条候选间乱挑
261
232
  /// params:
262
- /// provider: Codex 用 rollout 创建时间,其余用 mtime
233
+ /// _provider: 保留调用形状;所有 provider 都用 mtime
263
234
  /// context: 需要 spawned_at;有 expected id 且候选不超过 1 条时直接不动
264
235
  /// out: 就地可能被替换的候选列表
265
236
  /// contract:
@@ -271,18 +242,14 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
271
242
  /// - 不排序、不去重;只做"唯一即取"的收窄
272
243
  /// ---
273
244
  pub(super) fn apply_spawn_time_window_if_unique(
274
- provider: Provider,
245
+ _provider: Provider,
275
246
  context: &CaptureSessionContext,
276
247
  out: &mut Vec<CapturedSessionCandidate>,
277
248
  ) {
278
249
  if context.expected_session_id.is_some() && out.len() <= 1 {
279
250
  return;
280
251
  }
281
- let Some(spawned_at) = context
282
- .spawned_at
283
- .as_deref()
284
- .and_then(super::codex::parse_spawned_at)
285
- else {
252
+ let Some(spawned_at) = context.spawned_at.as_deref().and_then(parse_spawned_at) else {
286
253
  return;
287
254
  };
288
255
  let within: Vec<CapturedSessionCandidate> = out
@@ -292,10 +259,7 @@ pub(super) fn apply_spawn_time_window_if_unique(
292
259
  .captured
293
260
  .rollout_path
294
261
  .as_ref()
295
- .and_then(|p| match provider {
296
- Provider::Codex => super::codex::rollout_created_at(p.as_path()),
297
- _ => candidate_mtime(p.as_path()),
298
- })
262
+ .and_then(|p| candidate_mtime(p.as_path()))
299
263
  .is_some_and(|created_at| created_at >= spawned_at)
300
264
  })
301
265
  .cloned()