@team-agent/installer 0.5.125 → 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 (144) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/crates/team-agent/src/cli/diagnose.rs +0 -137
  4. package/crates/team-agent/src/cli/emit.rs +13 -8
  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 +55 -10
  8. package/crates/team-agent/src/cli/mod.rs +35 -29
  9. package/crates/team-agent/src/cli/models.rs +33 -944
  10. package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
  11. package/crates/team-agent/src/cli/tests/mod.rs +3 -3
  12. package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
  13. package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
  14. package/crates/team-agent/src/compiler/tests.rs +54 -12
  15. package/crates/team-agent/src/compiler.rs +7 -205
  16. package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
  17. package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
  18. package/crates/team-agent/src/contract_runtime/config.rs +12 -8
  19. package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
  20. package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
  21. package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
  22. package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
  23. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  24. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
  25. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  26. package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
  27. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  28. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  29. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  30. package/crates/team-agent/src/leader/start.rs +1 -1
  31. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
  32. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
  33. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +22 -200
  34. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
  35. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
  36. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
  37. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
  38. package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
  39. package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
  40. package/crates/team-agent/src/lifecycle/launch.rs +3 -34
  41. package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
  42. package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
  43. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  44. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  45. package/crates/team-agent/src/lifecycle/restart.rs +0 -2
  46. package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
  47. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  48. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  49. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
  50. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
  51. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +106 -186
  52. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
  53. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +19 -15
  54. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  55. package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
  56. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  57. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
  58. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
  59. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  60. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  61. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  62. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
  63. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  64. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  65. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  66. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  67. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
  68. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
  69. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
  70. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
  71. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
  72. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
  73. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
  74. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +15 -14
  75. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  76. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  77. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  78. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  79. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
  80. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  81. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
  82. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  83. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
  84. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  85. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  86. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  87. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  88. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
  89. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
  90. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
  91. package/crates/team-agent/src/lifecycle/tests.rs +0 -7
  92. package/crates/team-agent/src/lifecycle/types.rs +2 -21
  93. package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
  94. package/crates/team-agent/src/messaging/delivery.rs +14 -195
  95. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  96. package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
  97. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  98. package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
  99. package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
  100. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  101. package/crates/team-agent/src/provider/adapter.rs +71 -572
  102. package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
  103. package/crates/team-agent/src/provider/model_catalog.rs +13 -201
  104. package/crates/team-agent/src/provider/session/capture.rs +11 -211
  105. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
  106. package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
  107. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  108. package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
  109. package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
  110. package/crates/team-agent/src/provider/session_scan.rs +7 -23
  111. package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
  112. package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
  113. package/crates/team-agent/src/provider/tests/idle.rs +0 -68
  114. package/crates/team-agent/src/provider/types.rs +0 -4
  115. package/crates/team-agent/src/provider/wire.rs +77 -23
  116. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  117. package/crates/team-agent/src/state/persist.rs +6 -6
  118. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  119. package/crates/team-agent/src/tmux_backend.rs +4 -3
  120. package/package.json +4 -4
  121. package/skills/team-agent/SKILL.md +8 -5
  122. package/skills/team-agent/command-coverage.json +29 -1
  123. package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
  124. package/skills/team-agent/references/team-agent-operator.md +7 -3
  125. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  126. package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
  127. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
  128. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  129. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  130. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  131. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  132. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
  133. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
  134. package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
  135. package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
  136. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  137. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  138. package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
  139. package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
  140. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  141. package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
  142. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  143. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
  144. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
@@ -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,27 +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::Claude),
140
- Duration::from_secs(45)
141
- );
142
- assert_eq!(
143
- context_fork_convergence_deadline(Provider::Codex),
144
- Duration::from_secs(10)
145
- );
146
- assert_eq!(
147
- context_fork_convergence_deadline(Provider::Copilot),
148
- Duration::from_secs(5)
149
- );
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
+ }
150
141
  }
151
142
 
152
143
  #[test]
153
- fn codex_without_new_backing_is_typed_pending() {
144
+ fn retired_legacy_codex_fork_is_rejected_not_pending() {
154
145
  let root =
155
- std::env::temp_dir().join(format!("ta-codex-fork-pending-{}", std::process::id()));
156
- let _ = std::fs::remove_dir_all(&root);
157
- std::fs::create_dir_all(&root).unwrap();
146
+ std::env::temp_dir().join(format!("ta-codex-fork-retired-{}", std::process::id()));
158
147
  let plan = CommandPlan {
159
148
  argv: Vec::new(),
160
149
  expected_session_id: None,
@@ -174,11 +163,6 @@ mod tests {
174
163
  "2026-07-24T00:00:00Z",
175
164
  Duration::ZERO,
176
165
  );
177
- let ContextForkOutcome::Pending(pending) = outcome else {
178
- panic!("missing backing must remain a typed pending fork")
179
- };
180
- assert_eq!(pending.source_session_id.as_str(), "source-session");
181
- assert_eq!(pending.target_agent, "fork");
182
- let _ = std::fs::remove_dir_all(&root);
166
+ assert!(matches!(outcome, ContextForkOutcome::Rejected(_)), "{outcome:?}");
183
167
  }
184
168
  }
@@ -5,23 +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/claude 三条验证路径,成功给 ContextForkProof
8
+ //! what: 只有 copilot 一条验证路径,成功给 ContextForkProof
9
9
  //! - name: context_fork_convergence_deadline
10
- //! what: 每个 provider 各自的收敛预算(claude 45s / 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
22
+ //! - gemini / fake 没有可验证 backing,一律直接 Rejected
23
+ //! - Claude Code / Codex / Grok / Pi worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
25
24
  //! maturity: wired
26
25
  //! ---
27
26
  use std::collections::BTreeMap;
@@ -44,10 +43,7 @@ pub(crate) enum ContextForkTermination {
44
43
  Rejected(#[from] ProviderError),
45
44
  }
46
45
 
47
- mod claude;
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: Claude/ClaudeCode 45s、Codex 10s、其余(Copilot/Grok/GeminiCli/Fake) 5s
55
+ /// returns: 一律 5s(各 provider 仍逐一列出,新增 provider 必须显式决定)
60
56
  /// contract:
61
57
  /// provides:
62
58
  /// - name: context_fork_convergence_deadline
@@ -67,9 +63,13 @@ 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::Claude | Provider::ClaudeCode => Duration::from_secs(45),
71
- Provider::Codex => Duration::from_secs(10),
72
- Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
66
+ Provider::Claude
67
+ | Provider::ClaudeCode
68
+ | Provider::Codex
69
+ | Provider::Copilot
70
+ | Provider::Grok
71
+ | Provider::Pi
72
+ | Provider::GeminiCli
73
73
  | Provider::Fake => Duration::from_secs(5),
74
74
  }
75
75
  }
@@ -121,13 +121,13 @@ impl ContextBackingSnapshot {
121
121
  /// ---
122
122
  /// purpose: fork 后按 provider 分派验证,只有拿到「新会话 backing 可读且不等于源会话」的实证才返回证明
123
123
  /// params:
124
- /// provider: 决定走 copilot(sqlite 行存在) / codex(候选扫描认领) / claude(轮询双路径) 三条路之一
124
+ /// provider: 只有 copilot(sqlite 行存在) 一条路,其余一律拒绝
125
125
  /// source_session_id: 被 fork 的源会话 id;新会话等于它即判失败
126
126
  /// plan: 提供 expected_session_id 与隔离 backing 根
127
127
  /// before: spawn 前的 ContextBackingSnapshot 基线,用于判「文件变过」
128
- /// expected_backing_path: 精确快照路径。claude 必需,缺失即拒绝;codex 仅在 plan 带 expected id 时必需(无 expected id 走 legacy「唯一变过的新 rollout」认领,可为 None);两者都不做同目录猜测
129
- /// spawn_cwd: codex 分支据此构造扫描上下文;claude 分支据此推导 provider 侧 projects 目录
130
- /// spawned_at: codex 候选扫描的时间边界
128
+ /// expected_backing_path: 精确快照路径;copilot 不使用
129
+ /// spawn_cwd: 保留调用形状
130
+ /// spawned_at: 保留调用形状
131
131
  /// deadline: 轮询预算,来自 context_fork_convergence_deadline
132
132
  /// returns: ContextForkProof——新旧 session id、backing 路径、captured_via、attribution_confidence
133
133
  /// errors: Timeout 表示预算内没看到可验证的新 backing;Rejected 包装 ProviderError(缺 expected id、路径不匹配、无可验证 backing 的 provider)
@@ -137,47 +137,24 @@ impl ContextBackingSnapshot {
137
137
  /// what: 分派 + 兜底拒绝;本函数自身不轮询,轮询在各 provider 分支内
138
138
  /// boundary:
139
139
  /// - 不修改 backing、不写 state、不发事件
140
- /// - _source_agent_id 当前不参与任何判定(仅 codex 用 agent_id 做 embedded 身份比对)
141
- /// - 未列入三条路径的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
140
+ /// - _source_agent_id / agent_id 当前不参与任何判定
141
+ /// - 非 copilot 的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
142
142
  /// ---
143
143
  pub(crate) fn verify_context_fork(
144
144
  provider: Provider,
145
145
  source_session_id: &SessionId,
146
146
  plan: &CommandPlan,
147
- before: &ContextBackingSnapshot,
148
- expected_backing_path: Option<&Path>,
147
+ _before: &ContextBackingSnapshot,
148
+ _expected_backing_path: Option<&Path>,
149
149
  _source_agent_id: &str,
150
- agent_id: &str,
151
- spawn_cwd: &Path,
152
- spawned_at: &str,
153
- deadline: Duration,
150
+ _agent_id: &str,
151
+ _spawn_cwd: &Path,
152
+ _spawned_at: &str,
153
+ _deadline: Duration,
154
154
  ) -> Result<ContextForkProof, ContextForkTermination> {
155
155
  if provider == Provider::Copilot {
156
156
  return verify_copilot_fork(source_session_id, plan).map_err(Into::into);
157
157
  }
158
- if provider == Provider::Codex {
159
- return codex::verify_codex_fork(
160
- source_session_id,
161
- plan,
162
- before,
163
- expected_backing_path,
164
- agent_id,
165
- spawn_cwd,
166
- spawned_at,
167
- deadline,
168
- );
169
- }
170
- if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
171
- return claude::verify_claude_fork(
172
- provider,
173
- source_session_id,
174
- plan,
175
- before,
176
- expected_backing_path,
177
- spawn_cwd,
178
- deadline,
179
- );
180
- }
181
158
  Err(ProviderError::CaptureFailed(format!(
182
159
  "context_fork_unverified: {provider:?} has no verifiable fork backing"
183
160
  ))
@@ -249,11 +226,11 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
249
226
  .map(PathBuf::from)
250
227
  .unwrap_or_else(|| PathBuf::from("."));
251
228
  match provider {
252
- Provider::Claude | Provider::ClaudeCode => home.join(".claude").join("projects"),
253
- Provider::Codex => home.join(".codex").join("sessions"),
254
229
  Provider::Copilot => home.join(".copilot").join("session-state"),
255
- Provider::Pi => PathBuf::new(),
256
- 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,
257
234
  }
258
235
  }
259
236
 
@@ -285,191 +262,3 @@ fn file_stamp(path: &Path) -> Option<FileStamp> {
285
262
  modified: meta.modified().ok(),
286
263
  })
287
264
  }
288
-
289
- fn readable_jsonl(path: &Path) -> bool {
290
- std::fs::read_to_string(path)
291
- .ok()
292
- .and_then(|text| {
293
- text.lines()
294
- .find(|line| !line.trim().is_empty())
295
- .map(str::to_string)
296
- })
297
- .is_some_and(|line| serde_json::from_str::<serde_json::Value>(&line).is_ok())
298
- }
299
-
300
- fn session_id_from_jsonl(path: &Path) -> Option<String> {
301
- let text = std::fs::read_to_string(path).ok()?;
302
- text.lines()
303
- .filter_map(|line| serde_json::from_str::<serde_json::Value>(line).ok())
304
- .find_map(|record| {
305
- record
306
- .get("sessionId")
307
- .or_else(|| record.get("session_id"))
308
- .and_then(serde_json::Value::as_str)
309
- .map(ToString::to_string)
310
- .or_else(|| {
311
- record
312
- .get("session_meta")
313
- .and_then(|value| value.get("payload"))
314
- .or_else(|| record.get("payload"))
315
- .and_then(|value| value.get("id"))
316
- .and_then(serde_json::Value::as_str)
317
- .map(ToString::to_string)
318
- })
319
- })
320
- }
321
-
322
- #[cfg(test)]
323
- mod tests {
324
- use super::*;
325
- use std::io::Write;
326
-
327
- #[test]
328
- fn codex_fork_proof_ignores_changed_stale_and_foreign_rollouts() {
329
- let root =
330
- std::env::temp_dir().join(format!("ta-codex-fork-proof-dirty-{}", std::process::id()));
331
- let _ = std::fs::remove_dir_all(&root);
332
- let current_cwd = root.join("current");
333
- let foreign_cwd = root.join("foreign");
334
- std::fs::create_dir_all(&current_cwd).unwrap();
335
- std::fs::create_dir_all(&foreign_cwd).unwrap();
336
- let stale = root.join(
337
- "2026/07/16/rollout-2026-07-16T08-05-43-019f6686-e2b6-7000-8000-000000000001.jsonl",
338
- );
339
- let fresh = root.join(
340
- "2026/07/22/rollout-2026-07-22T04-01-01-019f8644-7450-7000-8000-000000000002.jsonl",
341
- );
342
- let foreign = root.join(
343
- "2026/07/22/rollout-2026-07-22T04-01-02-019f8644-7838-7000-8000-000000000003.jsonl",
344
- );
345
- let write_rollout = |path: &Path, cwd: &Path, id: &str| {
346
- std::fs::create_dir_all(path.parent().unwrap()).unwrap();
347
- std::fs::write(
348
- path,
349
- format!(
350
- "{{\"type\":\"session_meta\",\"payload\":{{\"id\":\"{id}\",\"cwd\":\"{}\"}}}}\n",
351
- cwd.to_string_lossy()
352
- ),
353
- )
354
- .unwrap();
355
- };
356
- write_rollout(&stale, &current_cwd, "stale-session");
357
- let plan = CommandPlan {
358
- argv: Vec::new(),
359
- expected_session_id: None,
360
- provider_projects_root: Some(root.clone()),
361
- managed_mcp_config: false,
362
- };
363
- let before = ContextBackingSnapshot::capture(Provider::Codex, &plan);
364
- std::fs::OpenOptions::new()
365
- .append(true)
366
- .open(&stale)
367
- .unwrap()
368
- .write_all(b"{\"type\":\"event_msg\"}\n")
369
- .unwrap();
370
- write_rollout(&foreign, &foreign_cwd, "foreign-session");
371
- write_rollout(&fresh, &current_cwd, "fresh-session");
372
-
373
- let proof = verify_context_fork(
374
- Provider::Codex,
375
- &SessionId::new("source-session"),
376
- &plan,
377
- &before,
378
- None,
379
- "source",
380
- "fork",
381
- &current_cwd,
382
- "2026-07-21T20:00:00+00:00",
383
- Duration::ZERO,
384
- )
385
- .unwrap();
386
-
387
- assert_eq!(proof.new_session_id.as_str(), "fresh-session");
388
- assert_eq!(proof.backing_path, fresh);
389
- let _ = std::fs::remove_dir_all(&root);
390
- }
391
-
392
- #[test]
393
- fn claude_fork_proof_is_partitioned_by_exact_snapshot_path() {
394
- let root = std::env::temp_dir().join(format!(
395
- "ta-claude-fork-proof-partition-{}",
396
- std::process::id()
397
- ));
398
- let _ = std::fs::remove_dir_all(&root);
399
- std::fs::create_dir_all(root.join(".team/logs")).unwrap();
400
- let expected = SessionId::new("22222222-2222-4222-8222-222222222222");
401
- let plan = CommandPlan {
402
- argv: Vec::new(),
403
- expected_session_id: Some(expected.clone()),
404
- provider_projects_root: Some(root.clone()),
405
- managed_mcp_config: false,
406
- };
407
- let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
408
- std::fs::write(
409
- root.join(".team/logs/events.jsonl"),
410
- "{\"event\":\"noise\"}\n",
411
- )
412
- .unwrap();
413
- std::fs::write(
414
- root.join("11111111-1111-4111-8111-111111111111.jsonl"),
415
- "{\"type\":\"sibling-snapshot\"}\n",
416
- )
417
- .unwrap();
418
- let expected_path = root.join(format!("{}.jsonl", expected.as_str()));
419
- std::fs::write(&expected_path, "{\"type\":\"own-snapshot\"}\n").unwrap();
420
- let proof = verify_context_fork(
421
- Provider::Claude,
422
- &SessionId::new("source-session"),
423
- &plan,
424
- &before,
425
- Some(&expected_path),
426
- "source",
427
- "fork",
428
- &root,
429
- "2026-07-22T00:00:00Z",
430
- Duration::ZERO,
431
- )
432
- .unwrap();
433
- assert_eq!(proof.new_session_id, expected);
434
- assert_eq!(proof.backing_path, expected_path);
435
- let _ = std::fs::remove_dir_all(&root);
436
- }
437
- #[test]
438
- fn claude_fork_proof_never_uses_events_jsonl_as_backing() {
439
- let root = std::env::temp_dir().join(format!(
440
- "ta-claude-fork-proof-no-events-{}",
441
- std::process::id()
442
- ));
443
- let _ = std::fs::remove_dir_all(&root);
444
- std::fs::create_dir_all(root.join(".team/logs")).unwrap();
445
- let expected = SessionId::new("33333333-3333-4333-8333-333333333333");
446
- let plan = CommandPlan {
447
- argv: Vec::new(),
448
- expected_session_id: Some(expected.clone()),
449
- provider_projects_root: Some(root.clone()),
450
- managed_mcp_config: false,
451
- };
452
- let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
453
- std::fs::write(
454
- root.join(".team/logs/events.jsonl"),
455
- "{\"event\":\"noise\"}\n",
456
- )
457
- .unwrap();
458
- let missing = root.join(format!("{}.jsonl", expected.as_str()));
459
- let error = verify_context_fork(
460
- Provider::Claude,
461
- &SessionId::new("source-session"),
462
- &plan,
463
- &before,
464
- Some(&missing),
465
- "source",
466
- "fork",
467
- &root,
468
- "2026-07-22T00:00:00Z",
469
- Duration::ZERO,
470
- )
471
- .unwrap_err();
472
- assert!(error.to_string().contains("context_fork_unverified"));
473
- let _ = std::fs::remove_dir_all(&root);
474
- }
475
- }
@@ -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,9 +3,9 @@
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
- //! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配、embedded 身份、claude cwd 字段与 leader marker 四道排除
8
+ //! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配与 embedded 身份两道排除
9
9
  //! - name: apply_spawned_at_filter
10
10
  //! what: 剔除早于席位进程世代边界(spawned_at)的存档;spawned_at 存在但解析不了则清空候选
11
11
  //! - name: apply_spawn_time_window_if_unique
@@ -29,14 +29,10 @@
29
29
  //! requires:
30
30
  //! - name: crate::provider::helpers
31
31
  //! what: find_session_id 与 parse_jsonl_records
32
- //! - name: super::claude
33
- //! what: claude 家族的 projects 目录推导、cwd 字段判据与 leader marker 判据
34
- //! - name: super::codex
35
- //! what: spawned_at 解析、uuid 精度截断与 rollout 创建时间
36
32
  //! boundary:
37
33
  //! - 一律只读:不写盘、不改 state、不发事件
38
34
  //! - 只产出候选与事实;归属最终由上游分配器裁定,本文件不写会话
39
- //! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录(claude 的隔离根例外)
35
+ //! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
40
36
  //! - 候选上限 300 条,超出按 mtime 由新到旧截断——截掉的部分不留痕迹
41
37
  //! - "看起来像会话文件"的判据很宽(.json/.jsonl 后缀,或名字含 session/rollout/席位 id),收窄靠后续 provider 专属过滤
42
38
  //! maturity: wired
@@ -66,10 +62,10 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
66
62
  /// ---
67
63
  /// purpose: 枚举本席位可能对应的会话文件,产出待解析的候选路径表
68
64
  /// params:
69
- /// provider: 决定要不要去 ~/.codex/sessions 或 ~/.claude/projects 找
65
+ /// _provider: 保留调用形状;不再有 provider HOME 目录分支
70
66
  /// context: provider_projects_root(隔离根)、spawn_cwd(必扫)、agent_id(参与文件名匹配)
71
67
  /// returns: 去重并排序后的候选;requires_cwd_match=false 的排前面,同组按路径字典序
72
- /// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;provider HOME 侧目录读失败静默跳过
68
+ /// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;隔离根读失败静默跳过
73
69
  /// contract:
74
70
  /// provides:
75
71
  /// - name: candidate_session_files
@@ -78,17 +74,15 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
78
74
  /// - spawn_cwd 递归最深 4 层;工作区是用户代码仓,任何名含 session 的 json 都会被列进来
79
75
  /// - .team 运行时目录一律排除,除非它就在 claude 的隔离根之下
80
76
  /// - 超过 300 条按 mtime 由新到旧截断;被截掉的候选不产生任何信号
81
- /// - Copilot / Grok / GeminiCli / Fake 不走 HOME 分支——它们各有专属扫描
77
+ /// - 任何 provider 都不走 HOME 分支——Copilot / Pi 各有专属扫描,退役的 legacy 席位不扫描
82
78
  /// ---
83
79
  pub(super) fn candidate_session_files(
84
- provider: Provider,
80
+ _provider: Provider,
85
81
  context: &CaptureSessionContext,
86
82
  ) -> Result<Vec<SessionCandidate>, ProviderError> {
87
83
  let mut out = Vec::new();
88
84
  if let Some(root) = context.provider_projects_root.as_ref() {
89
- let allowed_team_root =
90
- matches!(provider, Provider::Claude | Provider::ClaudeCode).then_some(root.as_path());
91
- collect_optional_candidate_files(root, &context.agent_id, allowed_team_root, &mut out)?;
85
+ collect_optional_candidate_files(root, &context.agent_id, None, &mut out)?;
92
86
  }
93
87
  collect_candidate_files(
94
88
  &context.spawn_cwd,
@@ -98,34 +92,6 @@ pub(super) fn candidate_session_files(
98
92
  None,
99
93
  &mut out,
100
94
  )?;
101
- if let Some(home) = std::env::var_os("HOME").map(PathBuf::from) {
102
- match provider {
103
- Provider::Codex => {
104
- collect_optional_candidate_files(
105
- &home.join(".codex").join("sessions"),
106
- &context.agent_id,
107
- None,
108
- &mut out,
109
- )?;
110
- }
111
- Provider::Claude | Provider::ClaudeCode => {
112
- if let Some(dir) = super::claude::projects_dir_for_cwd(&home, &context.spawn_cwd) {
113
- collect_optional_candidate_files(&dir, &context.agent_id, None, &mut out)?;
114
- }
115
- collect_optional_candidate_files(
116
- &home.join(".claude").join("projects"),
117
- &context.agent_id,
118
- None,
119
- &mut out,
120
- )?;
121
- }
122
- Provider::Copilot
123
- | Provider::Grok
124
- | Provider::Pi
125
- | Provider::GeminiCli
126
- | Provider::Fake => {}
127
- }
128
- }
129
95
  out.sort_by(|a, b| {
130
96
  a.requires_cwd_match
131
97
  .cmp(&b.requires_cwd_match)
@@ -139,7 +105,7 @@ pub(super) fn candidate_session_files(
139
105
  /// ---
140
106
  /// purpose: 把候选路径读头解析成结构化候选,并在解析途中就滤掉明显不属于本席位的
141
107
  /// params:
142
- /// provider: 决定是否套用 claude 专属的两道排除
108
+ /// _provider: 保留调用形状;不再有 provider 专属排除
143
109
  /// context: 提供 spawn_cwd 与 agent_id 两个比对基准
144
110
  /// candidates: candidate_session_files 的产物
145
111
  /// returns: 通过全部排除的候选;每条带 embedded 身份、positive_agent_id_match 与 agent_path_match
@@ -148,12 +114,12 @@ pub(super) fn candidate_session_files(
148
114
  /// - name: parse_candidate_files
149
115
  /// what: 每个文件只读头 64KB,且只取到最后一个完整行
150
116
  /// boundary:
151
- /// - 四道排除:读不出头 / 解析不出记录 → 跳过;requires_cwd_match 的候选 cwd 对不上 → 跳过;embedded 身份存在且不等于本席位 → 跳过;claude 家族有 session id 却无 cwd 字段、或含 leader marker → 跳过
117
+ /// - 三道排除:读不出头 / 解析不出记录 → 跳过;requires_cwd_match 的候选 cwd 对不上 → 跳过;embedded 身份存在且不等于本席位 → 跳过
152
118
  /// - 无 session id 的候选不丢弃,降级为 FsMtimeFallback + Confidence::Low
153
119
  /// - 身份判定用两套文本:正文 text 判 TEAM_AGENT_ID,未截行的原始字节判 embedded worker id
154
120
  /// ---
155
121
  pub(super) fn parse_candidate_files(
156
- provider: Provider,
122
+ _provider: Provider,
157
123
  context: &CaptureSessionContext,
158
124
  candidates: Vec<SessionCandidate>,
159
125
  ) -> Vec<CapturedSessionCandidate> {
@@ -175,12 +141,6 @@ pub(super) fn parse_candidate_files(
175
141
  continue;
176
142
  }
177
143
  let session_id = records.iter().find_map(find_session_id);
178
- if matches!(provider, Provider::Claude | Provider::ClaudeCode)
179
- && session_id.is_some()
180
- && !records.iter().any(super::claude::has_cwd_field)
181
- {
182
- continue;
183
- }
184
144
  let captured_via = if session_id.is_some() {
185
145
  CaptureVia::FsWatch
186
146
  } else {
@@ -201,11 +161,6 @@ pub(super) fn parse_candidate_files(
201
161
  let positive_agent_id_match = candidate_text_has_team_agent_id(&text, context)
202
162
  || embedded_agent_id.as_deref() == Some(context.agent_id.as_str());
203
163
  let agent_path_match = candidate_path_matches_agent_id(&path, context);
204
- if matches!(provider, Provider::Claude | Provider::ClaudeCode)
205
- && super::claude::records_have_leader_marker(&records)
206
- {
207
- continue;
208
- }
209
164
  out.push(CapturedSessionCandidate {
210
165
  captured: CapturedSession {
211
166
  session_id: session_id.map(SessionId::new),
@@ -226,20 +181,19 @@ pub(super) fn parse_candidate_files(
226
181
  /// ---
227
182
  /// purpose: 用席位的进程世代边界剔除上一代/别人留下的旧存档
228
183
  /// params:
229
- /// provider: Codex 走 rollout 创建时间,其余走文件 mtime
230
- /// context: spawned_at 缺失则不过滤(legacy 行);expected id 存在且是 Codex 时把边界截到毫秒
184
+ /// _provider: 保留调用形状;所有 provider 都按文件 mtime 判定
185
+ /// context: spawned_at 缺失则不过滤(legacy 行)
231
186
  /// out: 就地过滤的候选列表
232
187
  /// contract:
233
188
  /// provides:
234
189
  /// - name: apply_spawned_at_filter
235
- /// what: fail-closed —— spawned_at 存在但解析不了(或截断失败)时清空候选,绝不放行
190
+ /// what: fail-closed —— spawned_at 存在但解析不了时清空候选,绝不放行
236
191
  /// boundary:
237
192
  /// - 无 spawned_at 时整体跳过过滤,把守卫让给分配器的身份与唯一性判据
238
193
  /// - 无 rollout_path、取不到时间的候选一律剔除
239
- /// - Codex 刻意不用 mtime:追加写与邻席活动都会抬升 mtime
240
194
  /// ---
241
195
  pub(super) fn apply_spawned_at_filter(
242
- provider: Provider,
196
+ _provider: Provider,
243
197
  context: &CaptureSessionContext,
244
198
  out: &mut Vec<CapturedSessionCandidate>,
245
199
  ) {
@@ -248,32 +202,25 @@ pub(super) fn apply_spawned_at_filter(
248
202
  // the canonical runtime capture path rejects such rows before scan.
249
203
  return;
250
204
  };
251
- 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 {
252
206
  out.clear();
253
207
  return;
254
208
  };
255
- let codex_spawned_at =
256
- if matches!(provider, Provider::Codex) && context.expected_session_id.is_some() {
257
- let Some(timestamp) = super::codex::truncate_to_uuid_precision(spawned_at) else {
258
- out.clear();
259
- return;
260
- };
261
- timestamp
262
- } else {
263
- spawned_at
264
- };
265
209
  out.retain(|candidate| {
266
210
  let Some(path) = candidate.captured.rollout_path.as_ref() else {
267
211
  return false;
268
212
  };
269
- if matches!(provider, Provider::Codex) {
270
- return super::codex::rollout_created_at(path.as_path())
271
- .is_some_and(|created_at| created_at >= codex_spawned_at);
272
- }
273
213
  candidate_mtime(path.as_path()).is_some_and(|mtime| mtime >= spawned_at)
274
214
  });
275
215
  }
276
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
+
277
224
  fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
278
225
  std::fs::metadata(path)
279
226
  .and_then(|meta| meta.modified())
@@ -283,7 +230,7 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
283
230
  /// ---
284
231
  /// purpose: 在时间窗只能唯一确定一条候选时才据此收窄,避免用弱判据在多条候选间乱挑
285
232
  /// params:
286
- /// provider: Codex 用 rollout 创建时间,其余用 mtime
233
+ /// _provider: 保留调用形状;所有 provider 都用 mtime
287
234
  /// context: 需要 spawned_at;有 expected id 且候选不超过 1 条时直接不动
288
235
  /// out: 就地可能被替换的候选列表
289
236
  /// contract:
@@ -295,18 +242,14 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
295
242
  /// - 不排序、不去重;只做"唯一即取"的收窄
296
243
  /// ---
297
244
  pub(super) fn apply_spawn_time_window_if_unique(
298
- provider: Provider,
245
+ _provider: Provider,
299
246
  context: &CaptureSessionContext,
300
247
  out: &mut Vec<CapturedSessionCandidate>,
301
248
  ) {
302
249
  if context.expected_session_id.is_some() && out.len() <= 1 {
303
250
  return;
304
251
  }
305
- let Some(spawned_at) = context
306
- .spawned_at
307
- .as_deref()
308
- .and_then(super::codex::parse_spawned_at)
309
- else {
252
+ let Some(spawned_at) = context.spawned_at.as_deref().and_then(parse_spawned_at) else {
310
253
  return;
311
254
  };
312
255
  let within: Vec<CapturedSessionCandidate> = out
@@ -316,10 +259,7 @@ pub(super) fn apply_spawn_time_window_if_unique(
316
259
  .captured
317
260
  .rollout_path
318
261
  .as_ref()
319
- .and_then(|p| match provider {
320
- Provider::Codex => super::codex::rollout_created_at(p.as_path()),
321
- _ => candidate_mtime(p.as_path()),
322
- })
262
+ .and_then(|p| candidate_mtime(p.as_path()))
323
263
  .is_some_and(|created_at| created_at >= spawned_at)
324
264
  })
325
265
  .cloned()