@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,326 +0,0 @@
1
- //! ---
2
- //! purpose: codex rollout 的时间与归属过滤——用「创建时间」而非 mtime 判新旧,用 rollout 头里的 cwd 判是不是本席位的
3
- //! contract:
4
- //! provides:
5
- //! - name: parse_spawned_at
6
- //! what: RFC3339 文本 → SystemTime,解析不了给 None(调用方据此 fail-closed 清空候选)
7
- //! - name: truncate_to_uuid_precision
8
- //! what: 把时间截到毫秒,与 uuid-v7 里能表达的精度对齐,避免亚毫秒误差把自己的会话判成"太旧"
9
- //! - name: rollout_created_at
10
- //! what: 三级取创建时间:uuid-v7 时间戳 → 头记录 created_at → 文件名里的时间戳
11
- //! - name: apply_expected_session_filter
12
- //! what: 有 pending id 时只留 session id 精确相等的候选
13
- //! - name: retain_spawn_cwd
14
- //! what: 只留 rollout 头记录里 cwd 与席位 spawn_cwd 等价的候选
15
- //! requires:
16
- //! - name: super::common
17
- //! what: 读头、解析记录、record_cwd、paths_equivalent 均复用 common
18
- //! - name: chrono
19
- //! what: RFC3339 解析
20
- //! boundary:
21
- //! - 只服务 Provider::Codex
22
- //! - 一律只读:不写盘、不改 plan、不改 state
23
- //! - 创建时间刻意不取文件 mtime——邻席活动会抬升 mtime,把别人的会话冒充成新的
24
- //! - 头窗口之外的记录读不到;三级取值全失败时 rollout_created_at 给 None,调用方按"不通过"处理
25
- //! maturity: wired
26
- //! ---
27
- /// ---
28
- /// purpose: 把持久化在 state 上的 spawned_at 文本解析成时间点
29
- /// params:
30
- /// raw: RFC3339 时间串
31
- /// returns: 解析成功给 UTC SystemTime;失败给 None
32
- /// contract:
33
- /// provides:
34
- /// - name: parse_spawned_at
35
- /// what: 纯解析,无 I/O、不读系统时钟
36
- /// boundary:
37
- /// - 只认 RFC3339;不接受 epoch 秒、不做宽松格式回落
38
- /// - 返回 None 的处置由调用方定:common::apply_spawned_at_filter 选择清空候选(fail-closed)
39
- /// ---
40
- pub(super) fn parse_spawned_at(raw: &str) -> Option<std::time::SystemTime> {
41
- chrono::DateTime::parse_from_rfc3339(raw)
42
- .ok()
43
- .map(|dt| std::time::SystemTime::from(dt.with_timezone(&chrono::Utc)))
44
- }
45
-
46
- /// ---
47
- /// purpose: 把时间点截到毫秒,与 uuid-v7 能表达的精度对齐
48
- /// params:
49
- /// timestamp: 待截断的时间点
50
- /// returns: 同一毫秒的起点;早于 UNIX 纪元或毫秒数溢出 u64 时 None
51
- /// contract:
52
- /// provides:
53
- /// - name: truncate_to_uuid_precision
54
- /// what: 纯算术,无 I/O
55
- /// boundary:
56
- /// - 只向下截断,绝不向上取整——否则会把自己刚开的会话判成"早于 spawn"
57
- /// - 只在「Codex 且有 expected id」的比较里使用,不是通用时间归一
58
- /// ---
59
- pub(super) fn truncate_to_uuid_precision(
60
- timestamp: std::time::SystemTime,
61
- ) -> Option<std::time::SystemTime> {
62
- let since_epoch = timestamp
63
- .duration_since(std::time::SystemTime::UNIX_EPOCH)
64
- .ok()?;
65
- std::time::SystemTime::UNIX_EPOCH.checked_add(std::time::Duration::from_millis(
66
- u64::try_from(since_epoch.as_millis()).ok()?,
67
- ))
68
- }
69
-
70
- /// ---
71
- /// purpose: 取 codex rollout 的创建时间,作为「这条存档是不是本次 spawn 之后产生的」的判据
72
- /// params:
73
- /// path: rollout 文件路径
74
- /// returns: 三级依次尝试:文件名尾部 uuid-v7 的时间戳 → 头记录里的 created_at → 文件名中的时间戳;全失败给 None
75
- /// contract:
76
- /// provides:
77
- /// - name: rollout_created_at
78
- /// what: 只读文件名与头 64KB
79
- /// boundary:
80
- /// - 刻意不取文件 mtime:mtime 会被后续追加与邻席活动抬升,不是创建时间
81
- /// - uuid 分支要求版本位为 '7';非 v7 的 uuid 直接落到下一级
82
- /// - 返回 None 时调用方按"不满足时间窗"处理,不做放行
83
- /// ---
84
- pub(super) fn rollout_created_at(path: &std::path::Path) -> Option<std::time::SystemTime> {
85
- created_at_from_rollout_uuid(path)
86
- .or_else(|| created_at_from_rollout_head(path))
87
- .or_else(|| created_at_from_rollout_filename(path))
88
- }
89
-
90
- /// ---
91
- /// purpose: 有 pending id 时把候选收窄到 session id 精确相等的那些
92
- /// params:
93
- /// context: 无 expected_session_id 时原样返回,不做任何过滤
94
- /// out: 候选列表,按值传入并就地 retain
95
- /// returns: 过滤后的候选;无一条命中则空向量
96
- /// contract:
97
- /// provides:
98
- /// - name: apply_expected_session_filter
99
- /// what: 纯内存过滤,无 I/O
100
- /// boundary:
101
- /// - 判据是 session id 全等;session_id 为 None 的候选一律剔除
102
- /// - 与 claude 同名函数语义不同:此处未命中即空,不退到"身份阳性子集"
103
- /// ---
104
- pub(super) fn apply_expected_session_filter(
105
- context: &super::CaptureSessionContext,
106
- mut out: Vec<super::CapturedSessionCandidate>,
107
- ) -> Vec<super::CapturedSessionCandidate> {
108
- let Some(expected) = context.expected_session_id.as_ref() else {
109
- return out;
110
- };
111
- out.retain(|candidate| {
112
- candidate
113
- .captured
114
- .session_id
115
- .as_ref()
116
- .is_some_and(|session| session.as_str() == expected.as_str())
117
- });
118
- out
119
- }
120
-
121
- /// ---
122
- /// purpose: 只保留 rollout 头里记着的 cwd 与本席位 spawn_cwd 等价的候选,挡掉其它工作目录的会话
123
- /// params:
124
- /// context: 提供 spawn_cwd 基准
125
- /// out: 就地过滤的候选列表
126
- /// contract:
127
- /// provides:
128
- /// - name: retain_spawn_cwd
129
- /// what: 逐个候选读头 64KB 后比对 cwd
130
- /// boundary:
131
- /// - 无 rollout_path、读不出头、头里一条 cwd 都没有 → 剔除(fail-closed)
132
- /// - 等价判定走 common::paths_equivalent,它把「记录 cwd 的父目录等于 spawn_cwd」也算等价
133
- /// - 只看头窗口内的记录;窗口之外的 cwd 记录看不见
134
- /// ---
135
- pub(super) fn retain_spawn_cwd(
136
- context: &super::CaptureSessionContext,
137
- out: &mut Vec<super::CapturedSessionCandidate>,
138
- ) {
139
- out.retain(|candidate| {
140
- let Some(path) = candidate.captured.rollout_path.as_ref() else {
141
- return false;
142
- };
143
- let Ok(text) =
144
- super::common::read_head_text(path.as_path(), super::common::CAPTURE_HEAD_BYTES)
145
- else {
146
- return false;
147
- };
148
- super::common::parse_session_records(&text)
149
- .iter()
150
- .filter_map(super::common::record_cwd)
151
- .any(|cwd| {
152
- super::common::paths_equivalent(std::path::Path::new(&cwd), &context.spawn_cwd)
153
- })
154
- });
155
- }
156
-
157
- fn created_at_from_rollout_uuid(path: &std::path::Path) -> Option<std::time::SystemTime> {
158
- let name = path.file_name()?.to_str()?;
159
- let stem = name.strip_suffix(".jsonl")?;
160
- let uuid = stem.get(stem.len().checked_sub(36)?..)?;
161
- if uuid.as_bytes().get(14).copied() != Some(b'7') {
162
- return None;
163
- }
164
- let millis =
165
- u64::from_str_radix(&format!("{}{}", uuid.get(..8)?, uuid.get(9..13)?), 16).ok()?;
166
- std::time::SystemTime::UNIX_EPOCH.checked_add(std::time::Duration::from_millis(millis))
167
- }
168
-
169
- fn created_at_from_rollout_head(path: &std::path::Path) -> Option<std::time::SystemTime> {
170
- let text = super::common::read_head_text(path, super::common::CAPTURE_HEAD_BYTES).ok()?;
171
- super::common::parse_session_records(&text)
172
- .iter()
173
- .find_map(record_created_at)
174
- .and_then(|raw| parse_spawned_at(&raw))
175
- }
176
-
177
- fn record_created_at(record: &serde_json::Value) -> Option<String> {
178
- record
179
- .get("created_at")
180
- .and_then(serde_json::Value::as_str)
181
- .or_else(|| {
182
- record
183
- .get("session_meta")
184
- .and_then(|v| v.get("payload"))
185
- .or_else(|| record.get("payload"))
186
- .and_then(|v| v.get("created_at"))
187
- .and_then(serde_json::Value::as_str)
188
- })
189
- .map(ToString::to_string)
190
- }
191
-
192
- fn created_at_from_rollout_filename(path: &std::path::Path) -> Option<std::time::SystemTime> {
193
- let name = path.file_name()?.to_str()?;
194
- let start = name.find("rollout-")? + "rollout-".len();
195
- let stamp = name.get(start..start + 19)?;
196
- if stamp.as_bytes().get(10).copied() != Some(b'T') {
197
- return None;
198
- }
199
- let raw = format!(
200
- "{}T{}:{}:{}+00:00",
201
- &stamp[0..10],
202
- &stamp[11..13],
203
- &stamp[14..16],
204
- &stamp[17..19]
205
- );
206
- parse_spawned_at(&raw)
207
- }
208
-
209
- #[cfg(test)]
210
- mod tests {
211
- use super::*;
212
- use crate::provider::session_scan::{common, CaptureSessionContext, CapturedSessionCandidate};
213
- use crate::provider::Provider;
214
- use crate::provider::{CaptureVia, CapturedSession, Confidence, RolloutPath, SessionId};
215
- use std::path::PathBuf;
216
-
217
- #[test]
218
- fn parse_spawned_at_rfc3339_roundtrips_and_rejects_junk() {
219
- assert!(parse_spawned_at("2026-06-10T21:40:00+00:00").is_some());
220
- assert!(parse_spawned_at("not-a-date").is_none());
221
- assert!(parse_spawned_at("").is_none());
222
- }
223
-
224
- fn candidate(path: PathBuf, session_id: &str) -> CapturedSessionCandidate {
225
- CapturedSessionCandidate {
226
- captured: CapturedSession {
227
- session_id: Some(SessionId::new(session_id)),
228
- rollout_path: Some(RolloutPath::new(path)),
229
- captured_via: CaptureVia::FsWatch,
230
- attribution_confidence: Confidence::High,
231
- spawn_cwd: PathBuf::from("/tmp"),
232
- },
233
- embedded_agent_id: None,
234
- positive_agent_id_match: false,
235
- agent_path_match: false,
236
- }
237
- }
238
-
239
- #[test]
240
- fn spawned_at_filter_rejects_prior_round_and_accepts_current_rollout() {
241
- let dir =
242
- std::env::temp_dir().join(format!("ta-codex-spawn-filter-{}", std::process::id()));
243
- let _ = std::fs::remove_dir_all(&dir);
244
- std::fs::create_dir_all(&dir).unwrap();
245
- let stale =
246
- dir.join("rollout-2026-07-21T22-45-40-11111111-1111-4111-8111-111111111111.jsonl");
247
- let fresh =
248
- dir.join("rollout-2026-07-21T23-20-01-22222222-2222-4222-8222-222222222222.jsonl");
249
- std::fs::write(&stale, "{}\n").unwrap();
250
- std::fs::write(&fresh, "{}\n").unwrap();
251
- let context = CaptureSessionContext {
252
- agent_id: "worker".to_string(),
253
- spawn_cwd: dir.clone(),
254
- pane_id: None,
255
- pane_pid: None,
256
- spawned_at: Some("2026-07-21T23:20:00+00:00".to_string()),
257
- expected_session_id: None,
258
- provider_projects_root: None,
259
- };
260
- let mut out = vec![
261
- candidate(stale, "11111111-1111-4111-8111-111111111111"),
262
- candidate(fresh.clone(), "22222222-2222-4222-8222-222222222222"),
263
- ];
264
- common::apply_spawned_at_filter(Provider::Codex, &context, &mut out);
265
- assert_eq!(out.len(), 1);
266
- assert_eq!(
267
- out[0].captured.rollout_path.as_ref().unwrap().as_path(),
268
- fresh
269
- );
270
- let _ = std::fs::remove_dir_all(&dir);
271
- }
272
-
273
- #[test]
274
- fn spawned_at_filter_fails_closed_with_an_invalid_boundary() {
275
- let mut out = vec![candidate(PathBuf::from("/tmp/old.jsonl"), "old")];
276
- let mut context = CaptureSessionContext {
277
- agent_id: "worker".to_string(),
278
- spawn_cwd: PathBuf::from("/tmp"),
279
- pane_id: None,
280
- pane_pid: None,
281
- spawned_at: None,
282
- expected_session_id: None,
283
- provider_projects_root: None,
284
- };
285
- common::apply_spawned_at_filter(Provider::Codex, &context, &mut out);
286
- assert_eq!(out.len(), 1, "legacy direct scan has no cohort boundary");
287
-
288
- context.spawned_at = Some("not-a-date".to_string());
289
- common::apply_spawned_at_filter(Provider::Codex, &context, &mut out);
290
- assert!(out.is_empty());
291
- }
292
-
293
- #[test]
294
- fn unique_window_uses_created_at_not_active_sibling_mtime() {
295
- let dir =
296
- std::env::temp_dir().join(format!("ta-codex-created-window-{}", std::process::id()));
297
- let _ = std::fs::remove_dir_all(&dir);
298
- std::fs::create_dir_all(&dir).unwrap();
299
- let stale =
300
- dir.join("rollout-2026-07-22T03-12-13-11111111-1111-4111-8111-111111111111.jsonl");
301
- let fresh =
302
- dir.join("rollout-2026-07-22T03-15-30-22222222-2222-4222-8222-222222222222.jsonl");
303
- std::fs::write(&stale, "{}\n").unwrap();
304
- std::fs::write(&fresh, "{}\n").unwrap();
305
- let context = CaptureSessionContext {
306
- agent_id: "clone".to_string(),
307
- spawn_cwd: dir.clone(),
308
- pane_id: None,
309
- pane_pid: None,
310
- spawned_at: Some("2026-07-22T03:15:29+00:00".to_string()),
311
- expected_session_id: None,
312
- provider_projects_root: None,
313
- };
314
- let mut out = vec![
315
- candidate(stale, "11111111-1111-4111-8111-111111111111"),
316
- candidate(fresh.clone(), "22222222-2222-4222-8222-222222222222"),
317
- ];
318
- common::apply_spawn_time_window_if_unique(Provider::Codex, &context, &mut out);
319
- assert_eq!(out.len(), 1);
320
- assert_eq!(
321
- out[0].captured.rollout_path.as_ref().unwrap().as_path(),
322
- fresh
323
- );
324
- let _ = std::fs::remove_dir_all(&dir);
325
- }
326
- }
@@ -1,288 +0,0 @@
1
- //! ---
2
- //! purpose: 按 pending uuid 捕获 ~/.grok/sessions/<urlencoded-cwd>/<uuid>/,不读会话正文
3
- //! contract:
4
- //! provides:
5
- //! - name: grok_session_dir
6
- //! what: 由 spawn cwd + session id 派生磁盘存档目录
7
- //! - name: grok_session_archive_present
8
- //! what: 只凭 marker 文件存在性判定 backing,不打开正文
9
- //! - name: scan_session_store
10
- //! what: expected_session_id 命中存档则返回唯一候选,否则空
11
- //! requires:
12
- //! - name: expected_session_id
13
- //! what: 无 pending id 不扫描、不拾取同 cwd 其它会话
14
- //! boundary:
15
- //! - 只服务 Provider::Grok
16
- //! - 不读 chat_history/events 正文,不改 claude/codex/copilot 扫描
17
- //! maturity: wired
18
- //! ---
19
-
20
- use std::path::{Path, PathBuf};
21
-
22
- use crate::provider::types::{CaptureVia, CapturedSession, Confidence, RolloutPath};
23
-
24
- use super::{CaptureSessionContext, CapturedSessionCandidate};
25
-
26
- /// RFC 3986 unreserved set — same as Python `urllib.parse.quote(path, safe='')`.
27
- fn percent_encode_unreserved(raw: &str) -> String {
28
- let mut out = String::with_capacity(raw.len() * 3);
29
- for &byte in raw.as_bytes() {
30
- match byte {
31
- b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'.' | b'_' | b'~' => {
32
- out.push(byte as char);
33
- }
34
- _ => {
35
- out.push('%');
36
- const HEX: &[u8; 16] = b"0123456789ABCDEF";
37
- out.push(HEX[(byte >> 4) as usize] as char);
38
- out.push(HEX[(byte & 0x0F) as usize] as char);
39
- }
40
- }
41
- }
42
- out
43
- }
44
-
45
- /// ---
46
- /// purpose: 由 spawn cwd 与 session id 派生 ~/.grok/sessions 下的存档目录
47
- /// params:
48
- /// spawn_cwd: 席位工作目录;canonicalize 后再 percent-encode
49
- /// session_id: 框架预定 uuid;空或含路径分隔则拒绝
50
- /// returns: HOME 下对应目录路径;HOME 缺失或 id 非法则 None
51
- /// contract:
52
- /// provides:
53
- /// - name: grok_session_dir
54
- /// what: 只派生路径,不创建目录、不读存档
55
- /// boundary:
56
- /// - 不枚举其它 uuid,不读会话文件
57
- /// ---
58
- pub(crate) fn grok_session_dir(spawn_cwd: &Path, session_id: &str) -> Option<PathBuf> {
59
- if session_id.is_empty()
60
- || session_id.contains('/')
61
- || session_id.contains('\\')
62
- || session_id.contains('\0')
63
- {
64
- return None;
65
- }
66
- let home = std::env::var_os("HOME").map(PathBuf::from)?;
67
- let canonical = std::fs::canonicalize(spawn_cwd).unwrap_or_else(|_| spawn_cwd.to_path_buf());
68
- let encoded = percent_encode_unreserved(&canonical.to_string_lossy());
69
- if encoded.is_empty() {
70
- return None;
71
- }
72
- Some(
73
- home.join(".grok")
74
- .join("sessions")
75
- .join(encoded)
76
- .join(session_id),
77
- )
78
- }
79
-
80
- /// ---
81
- /// purpose: 只凭 marker 文件存在性判断 grok 会话存档是否可 resume
82
- /// params:
83
- /// dir: grok_session_dir 给出的目录
84
- /// returns: 目录存在且含 events.jsonl 或 chat_history.jsonl 或 summary.json
85
- /// contract:
86
- /// provides:
87
- /// - name: grok_session_archive_present
88
- /// what: 用 is_file 判 backing,不打开正文
89
- /// boundary:
90
- /// - 不读 jsonl / summary 内容
91
- /// ---
92
- pub(crate) fn grok_session_archive_present(dir: &Path) -> bool {
93
- if !dir.is_dir() {
94
- return false;
95
- }
96
- ["events.jsonl", "chat_history.jsonl", "summary.json"]
97
- .iter()
98
- .any(|name| dir.join(name).is_file())
99
- }
100
-
101
- /// ---
102
- /// purpose: 按 pending expected_session_id 捕获唯一 grok 磁盘存档
103
- /// params:
104
- /// context: 含 spawn_cwd 与 expected_session_id 的捕获上下文
105
- /// returns: 命中则一条 FsWatch 候选,否则空向量
106
- /// contract:
107
- /// provides:
108
- /// - name: scan_session_store
109
- /// what: expected id 与目录对齐才捕获
110
- /// boundary:
111
- /// - 无 pending id 不扫描;不拾取同 cwd 其它会话
112
- /// ---
113
- pub(super) fn scan_session_store(context: &CaptureSessionContext) -> Vec<CapturedSessionCandidate> {
114
- let Some(expected) = context.expected_session_id.as_ref() else {
115
- return Vec::new();
116
- };
117
- let Some(dir) = grok_session_dir(&context.spawn_cwd, expected.as_str()) else {
118
- return Vec::new();
119
- };
120
- if !grok_session_archive_present(&dir) {
121
- return Vec::new();
122
- }
123
- vec![CapturedSessionCandidate {
124
- captured: CapturedSession {
125
- session_id: Some(expected.clone()),
126
- rollout_path: Some(RolloutPath::new(dir)),
127
- captured_via: CaptureVia::FsWatch,
128
- attribution_confidence: Confidence::High,
129
- spawn_cwd: context.spawn_cwd.clone(),
130
- },
131
- embedded_agent_id: None,
132
- positive_agent_id_match: false,
133
- agent_path_match: false,
134
- }]
135
- }
136
-
137
- #[cfg(test)]
138
- mod tests {
139
- #![allow(clippy::unwrap_used)]
140
-
141
- use super::*;
142
- use crate::provider::types::SessionId;
143
- use std::sync::atomic::{AtomicU64, Ordering};
144
-
145
- struct HomeGuard {
146
- prev: Option<std::ffi::OsString>,
147
- }
148
-
149
- impl HomeGuard {
150
- fn set(home: &Path) -> Self {
151
- let prev = std::env::var_os("HOME");
152
- std::env::set_var("HOME", home);
153
- Self { prev }
154
- }
155
- }
156
-
157
- impl Drop for HomeGuard {
158
- fn drop(&mut self) {
159
- match &self.prev {
160
- Some(v) => std::env::set_var("HOME", v),
161
- None => std::env::remove_var("HOME"),
162
- }
163
- }
164
- }
165
-
166
- fn tmp_root(tag: &str) -> PathBuf {
167
- static CTR: AtomicU64 = AtomicU64::new(0);
168
- let dir = std::env::temp_dir().join(format!(
169
- "ta-d111-grok-scan-{}-{}-{}",
170
- tag,
171
- std::process::id(),
172
- CTR.fetch_add(1, Ordering::Relaxed)
173
- ));
174
- let _ = std::fs::remove_dir_all(&dir);
175
- std::fs::create_dir_all(&dir).unwrap();
176
- std::fs::canonicalize(&dir).unwrap()
177
- }
178
-
179
- fn seed_archive(home: &Path, cwd: &Path, session_id: &str) -> PathBuf {
180
- let dir = grok_session_dir(cwd, session_id).expect("dir");
181
- std::fs::create_dir_all(&dir).unwrap();
182
- std::fs::write(dir.join("events.jsonl"), b"").unwrap();
183
- dir
184
- }
185
-
186
- fn ctx(cwd: &Path, expected: Option<&str>) -> CaptureSessionContext {
187
- CaptureSessionContext {
188
- agent_id: "w1".to_string(),
189
- spawn_cwd: cwd.to_path_buf(),
190
- pane_id: None,
191
- pane_pid: None,
192
- spawned_at: None,
193
- expected_session_id: expected.map(SessionId::new),
194
- provider_projects_root: None,
195
- }
196
- }
197
-
198
- #[test]
199
- fn grok_cwd_encoding_matches_python_quote_empty_safe() {
200
- assert_eq!(
201
- percent_encode_unreserved("/private/tmp/ta-t105-repro-83327/ws"),
202
- "%2Fprivate%2Ftmp%2Fta-t105-repro-83327%2Fws"
203
- );
204
- }
205
-
206
- #[test]
207
- #[serial_test::serial(env)]
208
- fn grok_expected_id_captures_archive_without_reading_body() {
209
- let base = tmp_root("hit");
210
- let home = base.join("home");
211
- let cwd = base.join("ws");
212
- std::fs::create_dir_all(&home).unwrap();
213
- std::fs::create_dir_all(&cwd).unwrap();
214
- let sid = "75fce302-0ce9-4635-a788-f4aec11a3f6a";
215
- let _guard = HomeGuard::set(&home);
216
- let dir = seed_archive(&home, &cwd, sid);
217
- std::fs::write(
218
- dir.join("chat_history.jsonl"),
219
- b"THIS-BODY-MUST-NOT-BE-PARSED\n",
220
- )
221
- .unwrap();
222
- let out = scan_session_store(&ctx(&cwd, Some(sid)));
223
- assert_eq!(out.len(), 1);
224
- assert_eq!(out[0].captured.session_id.as_ref().unwrap().as_str(), sid);
225
- assert_eq!(
226
- out[0]
227
- .captured
228
- .rollout_path
229
- .as_ref()
230
- .map(|p| p.as_path().to_path_buf()),
231
- Some(dir)
232
- );
233
- let _ = std::fs::remove_dir_all(&base);
234
- }
235
-
236
- #[test]
237
- #[serial_test::serial(env)]
238
- fn grok_expected_id_does_not_steal_foreign_cwd_archive() {
239
- let base = tmp_root("foreign");
240
- let home = base.join("home");
241
- let cwd = base.join("ws");
242
- let foreign = base.join("other");
243
- std::fs::create_dir_all(&home).unwrap();
244
- std::fs::create_dir_all(&cwd).unwrap();
245
- std::fs::create_dir_all(&foreign).unwrap();
246
- let sid = "4e7b5a6e-e09a-4291-9c75-563107105185";
247
- let _guard = HomeGuard::set(&home);
248
- seed_archive(&home, &foreign, sid);
249
- let out = scan_session_store(&ctx(&cwd, Some(sid)));
250
- assert!(
251
- out.is_empty(),
252
- "foreign cwd archive must not bind; got {out:?}"
253
- );
254
- let _ = std::fs::remove_dir_all(&base);
255
- }
256
-
257
- #[test]
258
- #[serial_test::serial(env)]
259
- fn grok_scan_without_expected_id_returns_empty() {
260
- let base = tmp_root("no-pending");
261
- let home = base.join("home");
262
- let cwd = base.join("ws");
263
- std::fs::create_dir_all(&home).unwrap();
264
- std::fs::create_dir_all(&cwd).unwrap();
265
- let _guard = HomeGuard::set(&home);
266
- seed_archive(&home, &cwd, "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa");
267
- let out = scan_session_store(&ctx(&cwd, None));
268
- assert!(out.is_empty());
269
- let _ = std::fs::remove_dir_all(&base);
270
- }
271
-
272
- #[test]
273
- #[serial_test::serial(env)]
274
- fn grok_scan_empty_dir_without_marker_is_not_backing() {
275
- let base = tmp_root("empty");
276
- let home = base.join("home");
277
- let cwd = base.join("ws");
278
- std::fs::create_dir_all(&home).unwrap();
279
- std::fs::create_dir_all(&cwd).unwrap();
280
- let sid = "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb";
281
- let _guard = HomeGuard::set(&home);
282
- let dir = grok_session_dir(&cwd, sid).unwrap();
283
- std::fs::create_dir_all(&dir).unwrap();
284
- assert!(!grok_session_archive_present(&dir));
285
- assert!(scan_session_store(&ctx(&cwd, Some(sid))).is_empty());
286
- let _ = std::fs::remove_dir_all(&base);
287
- }
288
- }