@team-agent/installer 0.5.126 → 0.5.128

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 (187) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/README.md +11 -0
  4. package/crates/team-agent/src/cli/adapters.rs +3 -13
  5. package/crates/team-agent/src/cli/arguments.rs +4 -0
  6. package/crates/team-agent/src/cli/diagnose.rs +68 -91
  7. package/crates/team-agent/src/cli/emit.rs +61 -28
  8. package/crates/team-agent/src/cli/grok_slot.rs +88 -3
  9. package/crates/team-agent/src/cli/intent/runtime.rs +38 -9
  10. package/crates/team-agent/src/cli/intent/runtime_tests.rs +147 -11
  11. package/crates/team-agent/src/cli/intent/tests.rs +10 -12
  12. package/crates/team-agent/src/cli/intent.rs +1 -1
  13. package/crates/team-agent/src/cli/mod.rs +38 -9
  14. package/crates/team-agent/src/cli/models.rs +789 -186
  15. package/crates/team-agent/src/cli/schedule.rs +175 -0
  16. package/crates/team-agent/src/cli/send/persist.rs +0 -36
  17. package/crates/team-agent/src/cli/send/presentation.rs +1 -1
  18. package/crates/team-agent/src/cli/send.rs +108 -110
  19. package/crates/team-agent/src/cli/spec.rs +6 -0
  20. package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
  21. package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
  22. package/crates/team-agent/src/cli/tests/mod.rs +3 -3
  23. package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
  24. package/crates/team-agent/src/cli/tests/run_delegation.rs +12 -9
  25. package/crates/team-agent/src/cli/tests/status_send.rs +70 -273
  26. package/crates/team-agent/src/compiler/tests.rs +39 -27
  27. package/crates/team-agent/src/compiler.rs +206 -6
  28. package/crates/team-agent/src/contract_runtime/backend.rs +181 -11
  29. package/crates/team-agent/src/contract_runtime/commands.rs +338 -7
  30. package/crates/team-agent/src/contract_runtime/config.rs +30 -19
  31. package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
  32. package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
  33. package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
  34. package/crates/team-agent/src/contract_runtime/framework.rs +28 -14
  35. package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
  36. package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
  37. package/crates/team-agent/src/contract_runtime/registry.rs +93 -130
  38. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  39. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +8 -29
  40. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  41. package/crates/team-agent/src/coordinator/tests/health_sync.rs +44 -2
  42. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  43. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  44. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  45. package/crates/team-agent/src/coordinator/tick.rs +1 -89
  46. package/crates/team-agent/src/db/message_store.rs +7 -65
  47. package/crates/team-agent/src/direct_delivery.rs +368 -0
  48. package/crates/team-agent/src/inbox_store.rs +169 -0
  49. package/crates/team-agent/src/leader/registry.rs +5 -0
  50. package/crates/team-agent/src/leader/start.rs +2 -1
  51. package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
  52. package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
  53. package/crates/team-agent/src/lib.rs +2 -0
  54. package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
  55. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
  56. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
  57. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +36 -179
  58. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
  59. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +13 -488
  60. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
  61. package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
  62. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +26 -2
  63. package/crates/team-agent/src/lifecycle/launch/spawn.rs +41 -31
  64. package/crates/team-agent/src/lifecycle/launch.rs +27 -12
  65. package/crates/team-agent/src/lifecycle/profile_launch.rs +318 -64
  66. package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
  67. package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
  68. package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
  69. package/crates/team-agent/src/lifecycle/restart/common.rs +298 -133
  70. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  71. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  72. package/crates/team-agent/src/lifecycle/restart.rs +4 -0
  73. package/crates/team-agent/src/lifecycle/role_config.rs +79 -27
  74. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  75. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  76. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
  77. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
  78. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
  79. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +329 -70
  80. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
  81. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +25 -39
  82. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
  83. package/crates/team-agent/src/lifecycle/tests/core.rs +39 -36
  84. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  85. package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
  86. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
  87. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
  88. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  89. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  90. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  91. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +164 -282
  92. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  93. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  94. package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
  95. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  96. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  97. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
  98. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
  99. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
  100. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
  101. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
  102. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
  103. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
  104. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
  105. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
  106. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +14 -15
  107. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  108. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  109. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  110. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  111. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
  112. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  113. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
  114. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  115. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
  116. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  117. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  118. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  119. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  120. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
  121. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +38 -39
  122. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +51 -88
  123. package/crates/team-agent/src/lifecycle/tests.rs +3 -4
  124. package/crates/team-agent/src/lifecycle/types.rs +18 -5
  125. package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
  126. package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
  127. package/crates/team-agent/src/mcp_server/readiness_tests.rs +86 -109
  128. package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
  129. package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
  130. package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
  131. package/crates/team-agent/src/mcp_server/tools.rs +70 -196
  132. package/crates/team-agent/src/messaging/delivery.rs +143 -253
  133. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  134. package/crates/team-agent/src/messaging/helpers.rs +1 -19
  135. package/crates/team-agent/src/messaging/mod.rs +1 -0
  136. package/crates/team-agent/src/messaging/reminders.rs +316 -0
  137. package/crates/team-agent/src/messaging/scheduler.rs +7 -1
  138. package/crates/team-agent/src/messaging/tests/dup_inject.rs +255 -150
  139. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  140. package/crates/team-agent/src/messaging/tests/runtime.rs +9 -115
  141. package/crates/team-agent/src/messaging/tests/spine.rs +44 -24
  142. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  143. package/crates/team-agent/src/messaging/types.rs +1 -0
  144. package/crates/team-agent/src/provider/adapter.rs +208 -254
  145. package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
  146. package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
  147. package/crates/team-agent/src/provider/adapters/mod.rs +7 -7
  148. package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
  149. package/crates/team-agent/src/provider/classify.rs +1 -66
  150. package/crates/team-agent/src/provider/model_catalog.rs +201 -13
  151. package/crates/team-agent/src/provider/session/capture.rs +111 -111
  152. package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
  153. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +10 -18
  154. package/crates/team-agent/src/provider/session/context_fork.rs +87 -74
  155. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  156. package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
  157. package/crates/team-agent/src/provider/session_scan/common.rs +47 -47
  158. package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
  159. package/crates/team-agent/src/provider/session_scan.rs +13 -13
  160. package/crates/team-agent/src/provider/tests/adapter.rs +127 -121
  161. package/crates/team-agent/src/provider/tests/classify.rs +0 -53
  162. package/crates/team-agent/src/provider/tests/command_helpers.rs +11 -19
  163. package/crates/team-agent/src/provider/tests/idle.rs +13 -19
  164. package/crates/team-agent/src/provider/types.rs +0 -4
  165. package/crates/team-agent/src/provider/wire.rs +34 -20
  166. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  167. package/crates/team-agent/src/state/persist.rs +6 -6
  168. package/crates/team-agent/src/state/projection.rs +1 -1
  169. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  170. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
  171. package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
  172. package/crates/team-agent/src/tmux_backend.rs +9 -43
  173. package/package.json +4 -4
  174. package/skills/team-agent/SKILL.md +7 -8
  175. package/skills/team-agent/command-coverage.json +15 -1
  176. package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
  177. package/skills/team-agent/references/team-agent-operator.md +5 -3
  178. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  179. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  180. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  181. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  182. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  183. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  184. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  185. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  186. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  187. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
@@ -1,514 +0,0 @@
1
- //! ---
2
- //! purpose: codex 的 fork 两件事——把源 rollout 改写成新身份的快照物化出来(materialize),再验证 CLI 确实认领了它(verify)
3
- //! contract:
4
- //! provides:
5
- //! - name: materialize_codex_fork
6
- //! what: 读源 rollout 完整记录 → 改 session_meta.id 与 worker 身份 marker → no-clobber 硬链接发布 → 读回自证 → 把 plan 从 `codex fork` 改写成 `codex resume <新 id>`
7
- //! - name: CodexForkMaterialization
8
- //! what: 物化产物的 RAII 句柄:未 handoff 就 Drop 时删除目标文件
9
- //! - name: verify_codex_fork
10
- //! what: 有 expected id 时按精确路径+embedded 身份认领;无 expected id 时退到 legacy「唯一变过的新 rollout」路径
11
- //! requires:
12
- //! - name: crate::provider::session_scan
13
- //! what: 认领新 rollout 靠一次性候选扫描,不自己解析目录
14
- //! - name: crate::provider::adapter::ForkBackingMaterialization
15
- //! what: 句柄实现的对外 trait(path/handoff)
16
- //! boundary:
17
- //! - 改写只动 session_meta.payload.id 与恰好一处 worker 身份 marker;二者数量不是恰好各 1 就整体拒绝,绝不部分改写
18
- //! - 发布用 create_new 临时文件 + hard_link,绝不覆盖已存在的目标路径
19
- //! - 只服务 Provider::Codex
20
- //! - 新 session id 是本地生成的 uuid-v7 形状串,不问 CLI 要
21
- //! maturity: wired
22
- //! ---
23
- use super::*;
24
- use std::collections::BTreeSet;
25
- use std::fs::{File, OpenOptions};
26
- use std::io::{Read, Write};
27
-
28
- #[derive(Debug)]
29
- pub(crate) struct CodexForkMaterialization {
30
- path: PathBuf,
31
- keep: bool,
32
- }
33
-
34
- impl CodexForkMaterialization {
35
- /// ---
36
- /// purpose: 暴露已物化的目标 rollout 路径,供调用方拼 resume 参数与做 fork 验证
37
- /// returns: 物化目标文件的绝对路径;句柄还活着时该路径必然存在
38
- /// contract:
39
- /// provides:
40
- /// - name: path
41
- /// what: 只借出路径,不转移所有权、不影响 Drop 时的删除决定
42
- /// boundary:
43
- /// - 拿到路径不等于拿到保留承诺——不调 handoff 就仍会在 Drop 时被删
44
- /// ---
45
- pub(crate) fn path(&self) -> &Path {
46
- &self.path
47
- }
48
-
49
- fn mark_handoff(&mut self) {
50
- self.keep = true;
51
- }
52
- }
53
-
54
- impl crate::provider::adapter::ForkBackingMaterialization for CodexForkMaterialization {
55
- fn path(&self) -> &Path {
56
- self.path()
57
- }
58
-
59
- fn handoff(&mut self) {
60
- self.mark_handoff();
61
- }
62
- }
63
-
64
- impl Drop for CodexForkMaterialization {
65
- fn drop(&mut self) {
66
- if !self.keep {
67
- let _ = std::fs::remove_file(&self.path);
68
- }
69
- }
70
- }
71
-
72
- /// ---
73
- /// purpose: 为 codex fork 物化一份改写了会话身份的新 rollout,并把命令计划改成对该新会话的精确 resume
74
- /// params:
75
- /// source_path: 源 rollout 文件;新文件发布在它的同一父目录
76
- /// source_session_id: 源会话 id;源快照的 session_meta.payload.id 必须与之相等,否则拒绝
77
- /// source_agent_id: 源席位 id,用于定位待替换的 worker 身份 marker
78
- /// target_agent_id: 目标席位 id,替换后的 marker 内容,并参与读回自证
79
- /// plan: 就地改写;要求形如 `codex fork ... <source_session_id>`,会被改成 `codex resume ... <新 id>` 并设上 expected_session_id
80
- /// returns: RAII 句柄——未 handoff 即 Drop 时删除新文件,避免留下半成品存档
81
- /// errors: Io(源无父目录/源无完整 JSONL 记录/源某行非法 JSON/session_meta 缺 payload.id/id 与源不符/session_meta 或 marker 命中数不是恰好各 1/发布失败/读回身份不符);Command(plan 形状不是可转换的 codex fork)
82
- /// contract:
83
- /// provides:
84
- /// - name: materialize_codex_fork
85
- /// what: 写盘发生在此;读回校验失败会先删目标文件再返回错误
86
- /// boundary:
87
- /// - 只截到源文件最后一个换行处,绝不把半条正在写入的记录带进新快照
88
- /// - 不改源文件
89
- /// - 不启动进程、不调 codex CLI——只准备好 backing 与 argv
90
- /// ---
91
- pub(crate) fn materialize_codex_fork(
92
- source_path: &Path,
93
- source_session_id: &SessionId,
94
- source_agent_id: &str,
95
- target_agent_id: &str,
96
- plan: &mut CommandPlan,
97
- ) -> Result<CodexForkMaterialization, ProviderError> {
98
- let target_session_id = SessionId::new(codex_session_v7());
99
- let parent = source_path.parent().ok_or_else(|| {
100
- ProviderError::Io(format!(
101
- "codex source backing has no parent: {}",
102
- source_path.display()
103
- ))
104
- })?;
105
- let timestamp = chrono::Utc::now().format("%Y-%m-%dT%H-%M-%S");
106
- let target_path = parent.join(format!(
107
- "rollout-{timestamp}-{}.jsonl",
108
- target_session_id.as_str()
109
- ));
110
- let source = complete_source_snapshot(source_path)?;
111
- let rewritten = rewrite_snapshot(
112
- &source,
113
- source_session_id,
114
- &target_session_id,
115
- source_agent_id,
116
- target_agent_id,
117
- )?;
118
- publish_target_no_clobber(&target_path, rewritten.as_bytes())?;
119
- if let Err(error) =
120
- validate_materialized_target(&target_path, &target_session_id, target_agent_id)
121
- {
122
- let _ = std::fs::remove_file(&target_path);
123
- return Err(error);
124
- }
125
- apply_resume_target(plan, source_session_id, &target_session_id)?;
126
- Ok(CodexForkMaterialization {
127
- path: target_path,
128
- keep: false,
129
- })
130
- }
131
-
132
- fn complete_source_snapshot(path: &Path) -> Result<String, ProviderError> {
133
- let file = File::open(path).map_err(|error| ProviderError::Io(error.to_string()))?;
134
- let visible_len = file
135
- .metadata()
136
- .map_err(|error| ProviderError::Io(error.to_string()))?
137
- .len();
138
- let mut bytes = Vec::new();
139
- file.take(visible_len)
140
- .read_to_end(&mut bytes)
141
- .map_err(|error| ProviderError::Io(error.to_string()))?;
142
- let Some(boundary) = bytes.iter().rposition(|byte| *byte == b'\n') else {
143
- return Err(ProviderError::Io(
144
- "codex fork source has no complete JSONL record".to_string(),
145
- ));
146
- };
147
- bytes.truncate(boundary + 1);
148
- String::from_utf8(bytes).map_err(|error| ProviderError::Io(error.to_string()))
149
- }
150
-
151
- fn rewrite_snapshot(
152
- source: &str,
153
- source_session_id: &SessionId,
154
- target_session_id: &SessionId,
155
- source_agent_id: &str,
156
- target_agent_id: &str,
157
- ) -> Result<String, ProviderError> {
158
- let source_marker = format!("You are Team Agent worker `{source_agent_id}`");
159
- let target_marker = format!("You are Team Agent worker `{target_agent_id}`");
160
- let mut meta_count = 0_usize;
161
- let mut marker_count = 0_usize;
162
- let mut output = String::new();
163
- for (index, line) in source.lines().enumerate() {
164
- if line.trim().is_empty() {
165
- continue;
166
- }
167
- let mut record = serde_json::from_str::<serde_json::Value>(line).map_err(|error| {
168
- ProviderError::Io(format!(
169
- "codex fork source has invalid JSONL at line {}: {error}",
170
- index + 1
171
- ))
172
- })?;
173
- if record.get("type").and_then(serde_json::Value::as_str) == Some("session_meta") {
174
- let id = record
175
- .get_mut("payload")
176
- .and_then(serde_json::Value::as_object_mut)
177
- .and_then(|payload| payload.get_mut("id"))
178
- .and_then(|id| id.as_str())
179
- .ok_or_else(|| {
180
- ProviderError::Io(
181
- "codex fork session_meta has no string payload.id".to_string(),
182
- )
183
- })?;
184
- if id != source_session_id.as_str() {
185
- return Err(ProviderError::Io(
186
- "codex fork session_meta id does not match source".to_string(),
187
- ));
188
- }
189
- record["payload"]["id"] =
190
- serde_json::Value::String(target_session_id.as_str().to_string());
191
- meta_count += 1;
192
- }
193
- marker_count += replace_exact_marker(&mut record, &source_marker, &target_marker);
194
- output.push_str(
195
- &serde_json::to_string(&record)
196
- .map_err(|error| ProviderError::Io(error.to_string()))?,
197
- );
198
- output.push('\n');
199
- }
200
- if meta_count != 1 || marker_count != 1 {
201
- return Err(ProviderError::Io(format!(
202
- "codex fork source identity is ambiguous: session_meta={meta_count}, marker={marker_count}"
203
- )));
204
- }
205
- Ok(output)
206
- }
207
-
208
- fn replace_exact_marker(value: &mut serde_json::Value, source: &str, target: &str) -> usize {
209
- match value {
210
- serde_json::Value::String(text) => {
211
- let count = text.matches(source).count();
212
- if count == 1 {
213
- *text = text.replacen(source, target, 1);
214
- }
215
- count
216
- }
217
- serde_json::Value::Array(items) => items
218
- .iter_mut()
219
- .map(|item| replace_exact_marker(item, source, target))
220
- .sum(),
221
- serde_json::Value::Object(fields) => fields
222
- .values_mut()
223
- .map(|item| replace_exact_marker(item, source, target))
224
- .sum(),
225
- _ => 0,
226
- }
227
- }
228
-
229
- fn publish_target_no_clobber(path: &Path, bytes: &[u8]) -> Result<(), ProviderError> {
230
- let parent = path.parent().ok_or_else(|| {
231
- ProviderError::Io(format!("codex target has no parent: {}", path.display()))
232
- })?;
233
- let temp = parent.join(format!(
234
- ".{}.tmp-{}",
235
- path.file_name()
236
- .and_then(|name| name.to_str())
237
- .unwrap_or("codex-fork"),
238
- std::process::id()
239
- ));
240
- let result = (|| -> std::io::Result<()> {
241
- let mut file = OpenOptions::new()
242
- .write(true)
243
- .create_new(true)
244
- .open(&temp)?;
245
- file.write_all(bytes)?;
246
- file.sync_all()?;
247
- std::fs::hard_link(&temp, path)?;
248
- File::open(parent)?.sync_all()?;
249
- std::fs::remove_file(&temp)?;
250
- Ok(())
251
- })();
252
- if let Err(error) = result {
253
- let _ = std::fs::remove_file(&temp);
254
- return Err(ProviderError::Io(error.to_string()));
255
- }
256
- Ok(())
257
- }
258
-
259
- fn validate_materialized_target(
260
- path: &Path,
261
- session_id: &SessionId,
262
- target_agent_id: &str,
263
- ) -> Result<(), ProviderError> {
264
- let text =
265
- std::fs::read_to_string(path).map_err(|error| ProviderError::Io(error.to_string()))?;
266
- let actual = session_id_from_jsonl(path);
267
- let marker = format!("You are Team Agent worker `{target_agent_id}`");
268
- if actual.as_deref() != Some(session_id.as_str())
269
- || !path
270
- .file_stem()
271
- .and_then(|name| name.to_str())
272
- .is_some_and(|name| name.ends_with(session_id.as_str()))
273
- || text.matches(&marker).count() != 1
274
- {
275
- return Err(ProviderError::Io(
276
- "codex fork target read-back identity mismatch".to_string(),
277
- ));
278
- }
279
- Ok(())
280
- }
281
-
282
- fn apply_resume_target(
283
- plan: &mut CommandPlan,
284
- source_session_id: &SessionId,
285
- target_session_id: &SessionId,
286
- ) -> Result<(), ProviderError> {
287
- if plan.argv.first().map(String::as_str) != Some("codex")
288
- || plan.argv.get(1).map(String::as_str) != Some("fork")
289
- || plan.argv.last().map(String::as_str) != Some(source_session_id.as_str())
290
- {
291
- return Err(ProviderError::Command(
292
- "codex fork command shape cannot be converted to exact resume".to_string(),
293
- ));
294
- }
295
- plan.argv[1] = "resume".to_string();
296
- *plan.argv.last_mut().expect("validated non-empty argv") =
297
- target_session_id.as_str().to_string();
298
- plan.expected_session_id = Some(target_session_id.clone());
299
- Ok(())
300
- }
301
-
302
- fn codex_session_v7() -> String {
303
- use sha2::Digest;
304
-
305
- static COUNTER: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
306
-
307
- let millis = std::time::SystemTime::now()
308
- .duration_since(std::time::UNIX_EPOCH)
309
- .map_or(0, |duration| duration.as_millis() as u64);
310
- let mut hasher = sha2::Sha256::new();
311
- hasher.update(millis.to_le_bytes());
312
- hasher.update(std::process::id().to_le_bytes());
313
- hasher.update(
314
- COUNTER
315
- .fetch_add(1, std::sync::atomic::Ordering::Relaxed)
316
- .to_le_bytes(),
317
- );
318
- let digest = hasher.finalize();
319
- let mut bytes = [0_u8; 16];
320
- bytes[..6].copy_from_slice(&millis.to_be_bytes()[2..]);
321
- bytes[6..].copy_from_slice(&digest[..10]);
322
- bytes[6] = (bytes[6] & 0x0f) | 0x70;
323
- bytes[8] = (bytes[8] & 0x3f) | 0x80;
324
- format!(
325
- "{:08x}-{:04x}-{:04x}-{:04x}-{:012x}",
326
- u32::from_be_bytes(bytes[0..4].try_into().expect("fixed slice")),
327
- u16::from_be_bytes(bytes[4..6].try_into().expect("fixed slice")),
328
- u16::from_be_bytes(bytes[6..8].try_into().expect("fixed slice")),
329
- u16::from_be_bytes(bytes[8..10].try_into().expect("fixed slice")),
330
- u64::from_be_bytes([
331
- 0, 0, bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15]
332
- ])
333
- )
334
- }
335
-
336
- /// ---
337
- /// purpose: 验证 codex 已经在物化出来的那条 rollout 上开出了新会话,且该会话的 embedded 身份就是目标席位
338
- /// params:
339
- /// source_session_id: 源会话;目标等于它即拒绝
340
- /// plan: 无 expected_session_id 时整体退到 legacy 路径(靠「唯一一条变过的新 rollout」认领)
341
- /// before: spawn 前基线;legacy 路径用它排除源会话所在文件与未变文件
342
- /// expected_backing_path: 有 expected id 时必需——候选路径必须逐字节等于它,不做同目录择新
343
- /// agent_id: 候选的 embedded worker id 必须等于它,且 positive_agent_id_match 必须为真
344
- /// spawn_cwd: 构造扫描上下文
345
- /// spawned_at: 扫描的时间边界
346
- /// deadline: 轮询预算,每轮间隔 50ms
347
- /// returns: ContextForkProof,captured_via="context_fork_verified"、attribution_confidence="high"
348
- /// errors: Rejected(CaptureFailed) 当目标等于源 / 缺物化目标路径;Rejected 亦透传扫描期的 ProviderError;Timeout 当预算内没有满足全部条件的候选
349
- /// contract:
350
- /// provides:
351
- /// - name: verify_codex_fork
352
- /// what: 只读;认领判据是路径精确相等 + session id 等于 expected + embedded 身份等于 agent_id 三条同时成立
353
- /// boundary:
354
- /// - 不写 backing、不改 plan
355
- /// - legacy 路径(无 expected id)不做身份比对,只要求「不是源会话、不是基线里未变的文件、且全场恰好一条」——多于一条即不认领
356
- /// ---
357
- pub(super) fn verify_codex_fork(
358
- source_session_id: &SessionId,
359
- plan: &CommandPlan,
360
- before: &ContextBackingSnapshot,
361
- expected_backing_path: Option<&Path>,
362
- agent_id: &str,
363
- spawn_cwd: &Path,
364
- spawned_at: &str,
365
- deadline: Duration,
366
- ) -> Result<ContextForkProof, ContextForkTermination> {
367
- let Some(expected) = plan.expected_session_id.as_ref() else {
368
- return verify_legacy_codex_fork(
369
- source_session_id,
370
- plan,
371
- before,
372
- agent_id,
373
- spawn_cwd,
374
- spawned_at,
375
- deadline,
376
- );
377
- };
378
- if expected == source_session_id {
379
- return Err(ProviderError::CaptureFailed(
380
- "context_fork_unverified: codex target session equals source".to_string(),
381
- )
382
- .into());
383
- }
384
- let expected_path = expected_backing_path.ok_or_else(|| {
385
- ProviderError::CaptureFailed(
386
- "context_fork_unverified: codex plan has no materialized target backing".to_string(),
387
- )
388
- })?;
389
- let context = crate::provider::session_scan::CaptureSessionContext {
390
- agent_id: agent_id.to_string(),
391
- spawn_cwd: spawn_cwd.to_path_buf(),
392
- pane_id: None,
393
- pane_pid: None,
394
- spawned_at: Some(spawned_at.to_string()),
395
- expected_session_id: plan.expected_session_id.clone(),
396
- provider_projects_root: plan.provider_projects_root.clone(),
397
- };
398
- let started = std::time::Instant::now();
399
- loop {
400
- for candidate in
401
- crate::provider::session_scan::scan_session_candidates_once(Provider::Codex, &context)?
402
- {
403
- let Some(path) = candidate.captured.rollout_path.as_ref() else {
404
- continue;
405
- };
406
- if path.as_path() != expected_path {
407
- continue;
408
- }
409
- let Some(new_session_id) = candidate.captured.session_id else {
410
- continue;
411
- };
412
- if &new_session_id != expected || &new_session_id == source_session_id {
413
- continue;
414
- }
415
- if !candidate.positive_agent_id_match
416
- || candidate.embedded_agent_id.as_deref() != Some(agent_id)
417
- {
418
- continue;
419
- }
420
- return Ok(ContextForkProof {
421
- provider: Provider::Codex,
422
- source_session_id: source_session_id.clone(),
423
- new_session_id,
424
- backing_path: path.as_path().to_path_buf(),
425
- captured_via: "context_fork_verified".to_string(),
426
- attribution_confidence: "high".to_string(),
427
- managed_backing_root: None,
428
- });
429
- }
430
- if started.elapsed() >= deadline {
431
- break;
432
- }
433
- std::thread::sleep(Duration::from_millis(50));
434
- }
435
- Err(ContextForkTermination::Timeout {
436
- provider: Provider::Codex,
437
- deadline_ms: deadline.as_millis(),
438
- })
439
- }
440
-
441
- fn verify_legacy_codex_fork(
442
- source_session_id: &SessionId,
443
- plan: &CommandPlan,
444
- before: &ContextBackingSnapshot,
445
- agent_id: &str,
446
- spawn_cwd: &Path,
447
- spawned_at: &str,
448
- deadline: Duration,
449
- ) -> Result<ContextForkProof, ContextForkTermination> {
450
- let mut excluded_session_ids = BTreeSet::new();
451
- excluded_session_ids.insert(source_session_id.as_str().to_string());
452
- let mut excluded_backing_paths = BTreeSet::new();
453
- for path in before.files.keys() {
454
- if session_id_from_jsonl(path).as_deref() == Some(source_session_id.as_str()) {
455
- excluded_backing_paths.insert(path.clone());
456
- }
457
- }
458
- let context = crate::provider::session_scan::CaptureSessionContext {
459
- agent_id: agent_id.to_string(),
460
- spawn_cwd: spawn_cwd.to_path_buf(),
461
- pane_id: None,
462
- pane_pid: None,
463
- spawned_at: Some(spawned_at.to_string()),
464
- expected_session_id: None,
465
- provider_projects_root: plan.provider_projects_root.clone(),
466
- };
467
- let started = std::time::Instant::now();
468
- loop {
469
- let current = jsonl_files(&provider_backing_root(Provider::Codex, plan));
470
- let mut matches = Vec::new();
471
- for candidate in
472
- crate::provider::session_scan::scan_session_candidates_once(Provider::Codex, &context)?
473
- {
474
- let Some(path) = candidate.captured.rollout_path.as_ref() else {
475
- continue;
476
- };
477
- if excluded_backing_paths.contains(path.as_path()) {
478
- continue;
479
- }
480
- let Some(stamp) = current.get(path.as_path()) else {
481
- continue;
482
- };
483
- if before.files.get(path.as_path()) == Some(stamp) {
484
- continue;
485
- }
486
- let Some(session_id) = candidate.captured.session_id else {
487
- continue;
488
- };
489
- if excluded_session_ids.contains(session_id.as_str()) {
490
- continue;
491
- }
492
- matches.push((session_id, path.as_path().to_path_buf()));
493
- }
494
- if let [(new_session_id, backing_path)] = matches.as_slice() {
495
- return Ok(ContextForkProof {
496
- provider: Provider::Codex,
497
- source_session_id: source_session_id.clone(),
498
- new_session_id: new_session_id.clone(),
499
- backing_path: backing_path.clone(),
500
- captured_via: "context_fork_verified".to_string(),
501
- attribution_confidence: "high".to_string(),
502
- managed_backing_root: None,
503
- });
504
- }
505
- if started.elapsed() >= deadline {
506
- break;
507
- }
508
- std::thread::sleep(Duration::from_millis(50));
509
- }
510
- Err(ContextForkTermination::Timeout {
511
- provider: Provider::Codex,
512
- deadline_ms: deadline.as_millis(),
513
- })
514
- }