@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.
- package/Cargo.lock +1 -1
- package/Cargo.toml +1 -1
- package/README.md +11 -0
- package/crates/team-agent/src/cli/adapters.rs +3 -13
- package/crates/team-agent/src/cli/arguments.rs +4 -0
- package/crates/team-agent/src/cli/diagnose.rs +68 -91
- package/crates/team-agent/src/cli/emit.rs +61 -28
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +38 -9
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +147 -11
- package/crates/team-agent/src/cli/intent/tests.rs +10 -12
- package/crates/team-agent/src/cli/intent.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +38 -9
- package/crates/team-agent/src/cli/models.rs +789 -186
- package/crates/team-agent/src/cli/schedule.rs +175 -0
- package/crates/team-agent/src/cli/send/persist.rs +0 -36
- package/crates/team-agent/src/cli/send/presentation.rs +1 -1
- package/crates/team-agent/src/cli/send.rs +108 -110
- package/crates/team-agent/src/cli/spec.rs +6 -0
- package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
- package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +12 -9
- package/crates/team-agent/src/cli/tests/status_send.rs +70 -273
- package/crates/team-agent/src/compiler/tests.rs +39 -27
- package/crates/team-agent/src/compiler.rs +206 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +181 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +338 -7
- package/crates/team-agent/src/contract_runtime/config.rs +30 -19
- package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
- package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
- package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
- package/crates/team-agent/src/contract_runtime/framework.rs +28 -14
- package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
- package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
- package/crates/team-agent/src/contract_runtime/registry.rs +93 -130
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +8 -29
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +44 -2
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/coordinator/tick.rs +1 -89
- package/crates/team-agent/src/db/message_store.rs +7 -65
- package/crates/team-agent/src/direct_delivery.rs +368 -0
- package/crates/team-agent/src/inbox_store.rs +169 -0
- package/crates/team-agent/src/leader/registry.rs +5 -0
- package/crates/team-agent/src/leader/start.rs +2 -1
- package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
- package/crates/team-agent/src/lib.rs +2 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +36 -179
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +13 -488
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +26 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +41 -31
- package/crates/team-agent/src/lifecycle/launch.rs +27 -12
- package/crates/team-agent/src/lifecycle/profile_launch.rs +318 -64
- package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +298 -133
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +4 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +79 -27
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +329 -70
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +25 -39
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +39 -36
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +164 -282
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +14 -15
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +38 -39
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +51 -88
- package/crates/team-agent/src/lifecycle/tests.rs +3 -4
- package/crates/team-agent/src/lifecycle/types.rs +18 -5
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
- package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +86 -109
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
- package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
- package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
- package/crates/team-agent/src/mcp_server/tools.rs +70 -196
- package/crates/team-agent/src/messaging/delivery.rs +143 -253
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/helpers.rs +1 -19
- package/crates/team-agent/src/messaging/mod.rs +1 -0
- package/crates/team-agent/src/messaging/reminders.rs +316 -0
- package/crates/team-agent/src/messaging/scheduler.rs +7 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +255 -150
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +9 -115
- package/crates/team-agent/src/messaging/tests/spine.rs +44 -24
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +208 -254
- package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +7 -7
- package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
- package/crates/team-agent/src/provider/classify.rs +1 -66
- package/crates/team-agent/src/provider/model_catalog.rs +201 -13
- package/crates/team-agent/src/provider/session/capture.rs +111 -111
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +10 -18
- package/crates/team-agent/src/provider/session/context_fork.rs +87 -74
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +47 -47
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +13 -13
- package/crates/team-agent/src/provider/tests/adapter.rs +127 -121
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +11 -19
- package/crates/team-agent/src/provider/tests/idle.rs +13 -19
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -20
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/projection.rs +1 -1
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
- package/crates/team-agent/src/tmux_backend.rs +9 -43
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -8
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: candidate_session_files
|
|
6
|
-
//! what:
|
|
6
|
+
//! what: 枚举候选文件(隔离根 + spawn_cwd 递归),去重排序并按 mtime 截到 300 条
|
|
7
7
|
//! - name: parse_candidate_files
|
|
8
|
-
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd
|
|
8
|
+
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配、embedded 身份、claude cwd 字段与 leader marker 四道排除
|
|
9
9
|
//! - name: apply_spawned_at_filter
|
|
10
10
|
//! what: 剔除早于席位进程世代边界(spawned_at)的存档;spawned_at 存在但解析不了则清空候选
|
|
11
11
|
//! - name: apply_spawn_time_window_if_unique
|
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
//! requires:
|
|
30
30
|
//! - name: crate::provider::helpers
|
|
31
31
|
//! what: find_session_id 与 parse_jsonl_records
|
|
32
|
-
//! - name: super::
|
|
33
|
-
//! what:
|
|
32
|
+
//! - name: super::claude
|
|
33
|
+
//! what: claude 家族的 projects 目录推导、cwd 字段判据与 leader marker 判据
|
|
34
34
|
//! boundary:
|
|
35
35
|
//! - 一律只读:不写盘、不改 state、不发事件
|
|
36
36
|
//! - 只产出候选与事实;归属最终由上游分配器裁定,本文件不写会话
|
|
37
|
-
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
|
|
37
|
+
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录(claude 的隔离根例外)
|
|
38
38
|
//! - 候选上限 300 条,超出按 mtime 由新到旧截断——截掉的部分不留痕迹
|
|
39
39
|
//! - "看起来像会话文件"的判据很宽(.json/.jsonl 后缀,或名字含 session/rollout/席位 id),收窄靠后续 provider 专属过滤
|
|
40
40
|
//! maturity: wired
|
|
@@ -64,10 +64,10 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
|
|
|
64
64
|
/// ---
|
|
65
65
|
/// purpose: 枚举本席位可能对应的会话文件,产出待解析的候选路径表
|
|
66
66
|
/// params:
|
|
67
|
-
/// provider: 决定要不要去 ~/.
|
|
67
|
+
/// provider: 决定要不要去 ~/.claude/projects 找
|
|
68
68
|
/// context: provider_projects_root(隔离根)、spawn_cwd(必扫)、agent_id(参与文件名匹配)
|
|
69
69
|
/// returns: 去重并排序后的候选;requires_cwd_match=false 的排前面,同组按路径字典序
|
|
70
|
-
/// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io
|
|
70
|
+
/// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;隔离根读失败静默跳过
|
|
71
71
|
/// contract:
|
|
72
72
|
/// provides:
|
|
73
73
|
/// - name: candidate_session_files
|
|
@@ -76,7 +76,7 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
|
|
|
76
76
|
/// - spawn_cwd 递归最深 4 层;工作区是用户代码仓,任何名含 session 的 json 都会被列进来
|
|
77
77
|
/// - .team 运行时目录一律排除,除非它就在 claude 的隔离根之下
|
|
78
78
|
/// - 超过 300 条按 mtime 由新到旧截断;被截掉的候选不产生任何信号
|
|
79
|
-
/// -
|
|
79
|
+
/// - 任何 provider 都不走 HOME 分支——Copilot / Pi 各有专属扫描,退役的 legacy 席位不扫描
|
|
80
80
|
/// ---
|
|
81
81
|
pub(super) fn candidate_session_files(
|
|
82
82
|
provider: Provider,
|
|
@@ -84,7 +84,9 @@ pub(super) fn candidate_session_files(
|
|
|
84
84
|
) -> Result<Vec<SessionCandidate>, ProviderError> {
|
|
85
85
|
let mut out = Vec::new();
|
|
86
86
|
if let Some(root) = context.provider_projects_root.as_ref() {
|
|
87
|
-
|
|
87
|
+
let allowed_team_root =
|
|
88
|
+
matches!(provider, Provider::Claude | Provider::ClaudeCode).then_some(root.as_path());
|
|
89
|
+
collect_optional_candidate_files(root, &context.agent_id, allowed_team_root, &mut out)?;
|
|
88
90
|
}
|
|
89
91
|
collect_candidate_files(
|
|
90
92
|
&context.spawn_cwd,
|
|
@@ -96,16 +98,18 @@ pub(super) fn candidate_session_files(
|
|
|
96
98
|
)?;
|
|
97
99
|
if let Some(home) = std::env::var_os("HOME").map(PathBuf::from) {
|
|
98
100
|
match provider {
|
|
99
|
-
Provider::
|
|
101
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
102
|
+
if let Some(dir) = super::claude::projects_dir_for_cwd(&home, &context.spawn_cwd) {
|
|
103
|
+
collect_optional_candidate_files(&dir, &context.agent_id, None, &mut out)?;
|
|
104
|
+
}
|
|
100
105
|
collect_optional_candidate_files(
|
|
101
|
-
&home.join(".
|
|
106
|
+
&home.join(".claude").join("projects"),
|
|
102
107
|
&context.agent_id,
|
|
103
108
|
None,
|
|
104
109
|
&mut out,
|
|
105
110
|
)?;
|
|
106
111
|
}
|
|
107
|
-
Provider::
|
|
108
|
-
| Provider::ClaudeCode
|
|
112
|
+
Provider::Codex
|
|
109
113
|
| Provider::Copilot
|
|
110
114
|
| Provider::Grok
|
|
111
115
|
| Provider::Pi
|
|
@@ -126,7 +130,7 @@ pub(super) fn candidate_session_files(
|
|
|
126
130
|
/// ---
|
|
127
131
|
/// purpose: 把候选路径读头解析成结构化候选,并在解析途中就滤掉明显不属于本席位的
|
|
128
132
|
/// params:
|
|
129
|
-
///
|
|
133
|
+
/// provider: 决定是否套用 claude 专属的两道排除
|
|
130
134
|
/// context: 提供 spawn_cwd 与 agent_id 两个比对基准
|
|
131
135
|
/// candidates: candidate_session_files 的产物
|
|
132
136
|
/// returns: 通过全部排除的候选;每条带 embedded 身份、positive_agent_id_match 与 agent_path_match
|
|
@@ -135,12 +139,12 @@ pub(super) fn candidate_session_files(
|
|
|
135
139
|
/// - name: parse_candidate_files
|
|
136
140
|
/// what: 每个文件只读头 64KB,且只取到最后一个完整行
|
|
137
141
|
/// boundary:
|
|
138
|
-
/// -
|
|
142
|
+
/// - 四道排除:读不出头 / 解析不出记录 → 跳过;requires_cwd_match 的候选 cwd 对不上 → 跳过;embedded 身份存在且不等于本席位 → 跳过;claude 家族有 session id 却无 cwd 字段、或含 leader marker → 跳过
|
|
139
143
|
/// - 无 session id 的候选不丢弃,降级为 FsMtimeFallback + Confidence::Low
|
|
140
144
|
/// - 身份判定用两套文本:正文 text 判 TEAM_AGENT_ID,未截行的原始字节判 embedded worker id
|
|
141
145
|
/// ---
|
|
142
146
|
pub(super) fn parse_candidate_files(
|
|
143
|
-
|
|
147
|
+
provider: Provider,
|
|
144
148
|
context: &CaptureSessionContext,
|
|
145
149
|
candidates: Vec<SessionCandidate>,
|
|
146
150
|
) -> Vec<CapturedSessionCandidate> {
|
|
@@ -162,6 +166,12 @@ pub(super) fn parse_candidate_files(
|
|
|
162
166
|
continue;
|
|
163
167
|
}
|
|
164
168
|
let session_id = records.iter().find_map(find_session_id);
|
|
169
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
170
|
+
&& session_id.is_some()
|
|
171
|
+
&& !records.iter().any(super::claude::has_cwd_field)
|
|
172
|
+
{
|
|
173
|
+
continue;
|
|
174
|
+
}
|
|
165
175
|
let captured_via = if session_id.is_some() {
|
|
166
176
|
CaptureVia::FsWatch
|
|
167
177
|
} else {
|
|
@@ -182,6 +192,11 @@ pub(super) fn parse_candidate_files(
|
|
|
182
192
|
let positive_agent_id_match = candidate_text_has_team_agent_id(&text, context)
|
|
183
193
|
|| embedded_agent_id.as_deref() == Some(context.agent_id.as_str());
|
|
184
194
|
let agent_path_match = candidate_path_matches_agent_id(&path, context);
|
|
195
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
196
|
+
&& super::claude::records_have_leader_marker(&records)
|
|
197
|
+
{
|
|
198
|
+
continue;
|
|
199
|
+
}
|
|
185
200
|
out.push(CapturedSessionCandidate {
|
|
186
201
|
captured: CapturedSession {
|
|
187
202
|
session_id: session_id.map(SessionId::new),
|
|
@@ -202,20 +217,19 @@ pub(super) fn parse_candidate_files(
|
|
|
202
217
|
/// ---
|
|
203
218
|
/// purpose: 用席位的进程世代边界剔除上一代/别人留下的旧存档
|
|
204
219
|
/// params:
|
|
205
|
-
///
|
|
206
|
-
/// context: spawned_at 缺失则不过滤(legacy 行)
|
|
220
|
+
/// _provider: 保留调用形状;所有 provider 都按文件 mtime 判定
|
|
221
|
+
/// context: spawned_at 缺失则不过滤(legacy 行)
|
|
207
222
|
/// out: 就地过滤的候选列表
|
|
208
223
|
/// contract:
|
|
209
224
|
/// provides:
|
|
210
225
|
/// - name: apply_spawned_at_filter
|
|
211
|
-
/// what: fail-closed —— spawned_at
|
|
226
|
+
/// what: fail-closed —— spawned_at 存在但解析不了时清空候选,绝不放行
|
|
212
227
|
/// boundary:
|
|
213
228
|
/// - 无 spawned_at 时整体跳过过滤,把守卫让给分配器的身份与唯一性判据
|
|
214
229
|
/// - 无 rollout_path、取不到时间的候选一律剔除
|
|
215
|
-
/// - Codex 刻意不用 mtime:追加写与邻席活动都会抬升 mtime
|
|
216
230
|
/// ---
|
|
217
231
|
pub(super) fn apply_spawned_at_filter(
|
|
218
|
-
|
|
232
|
+
_provider: Provider,
|
|
219
233
|
context: &CaptureSessionContext,
|
|
220
234
|
out: &mut Vec<CapturedSessionCandidate>,
|
|
221
235
|
) {
|
|
@@ -224,32 +238,25 @@ pub(super) fn apply_spawned_at_filter(
|
|
|
224
238
|
// the canonical runtime capture path rejects such rows before scan.
|
|
225
239
|
return;
|
|
226
240
|
};
|
|
227
|
-
let Some(spawned_at) =
|
|
241
|
+
let Some(spawned_at) = parse_spawned_at(raw_spawned_at) else {
|
|
228
242
|
out.clear();
|
|
229
243
|
return;
|
|
230
244
|
};
|
|
231
|
-
let codex_spawned_at =
|
|
232
|
-
if matches!(provider, Provider::Codex) && context.expected_session_id.is_some() {
|
|
233
|
-
let Some(timestamp) = super::codex::truncate_to_uuid_precision(spawned_at) else {
|
|
234
|
-
out.clear();
|
|
235
|
-
return;
|
|
236
|
-
};
|
|
237
|
-
timestamp
|
|
238
|
-
} else {
|
|
239
|
-
spawned_at
|
|
240
|
-
};
|
|
241
245
|
out.retain(|candidate| {
|
|
242
246
|
let Some(path) = candidate.captured.rollout_path.as_ref() else {
|
|
243
247
|
return false;
|
|
244
248
|
};
|
|
245
|
-
if matches!(provider, Provider::Codex) {
|
|
246
|
-
return super::codex::rollout_created_at(path.as_path())
|
|
247
|
-
.is_some_and(|created_at| created_at >= codex_spawned_at);
|
|
248
|
-
}
|
|
249
249
|
candidate_mtime(path.as_path()).is_some_and(|mtime| mtime >= spawned_at)
|
|
250
250
|
});
|
|
251
251
|
}
|
|
252
252
|
|
|
253
|
+
/// RFC3339 only; the caller decides what `None` means (the filter clears).
|
|
254
|
+
pub(super) fn parse_spawned_at(raw: &str) -> Option<std::time::SystemTime> {
|
|
255
|
+
chrono::DateTime::parse_from_rfc3339(raw)
|
|
256
|
+
.ok()
|
|
257
|
+
.map(|dt| std::time::SystemTime::from(dt.with_timezone(&chrono::Utc)))
|
|
258
|
+
}
|
|
259
|
+
|
|
253
260
|
fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
|
|
254
261
|
std::fs::metadata(path)
|
|
255
262
|
.and_then(|meta| meta.modified())
|
|
@@ -259,7 +266,7 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
|
|
|
259
266
|
/// ---
|
|
260
267
|
/// purpose: 在时间窗只能唯一确定一条候选时才据此收窄,避免用弱判据在多条候选间乱挑
|
|
261
268
|
/// params:
|
|
262
|
-
///
|
|
269
|
+
/// _provider: 保留调用形状;所有 provider 都用 mtime
|
|
263
270
|
/// context: 需要 spawned_at;有 expected id 且候选不超过 1 条时直接不动
|
|
264
271
|
/// out: 就地可能被替换的候选列表
|
|
265
272
|
/// contract:
|
|
@@ -271,18 +278,14 @@ fn candidate_mtime(path: &Path) -> Option<std::time::SystemTime> {
|
|
|
271
278
|
/// - 不排序、不去重;只做"唯一即取"的收窄
|
|
272
279
|
/// ---
|
|
273
280
|
pub(super) fn apply_spawn_time_window_if_unique(
|
|
274
|
-
|
|
281
|
+
_provider: Provider,
|
|
275
282
|
context: &CaptureSessionContext,
|
|
276
283
|
out: &mut Vec<CapturedSessionCandidate>,
|
|
277
284
|
) {
|
|
278
285
|
if context.expected_session_id.is_some() && out.len() <= 1 {
|
|
279
286
|
return;
|
|
280
287
|
}
|
|
281
|
-
let Some(spawned_at) = context
|
|
282
|
-
.spawned_at
|
|
283
|
-
.as_deref()
|
|
284
|
-
.and_then(super::codex::parse_spawned_at)
|
|
285
|
-
else {
|
|
288
|
+
let Some(spawned_at) = context.spawned_at.as_deref().and_then(parse_spawned_at) else {
|
|
286
289
|
return;
|
|
287
290
|
};
|
|
288
291
|
let within: Vec<CapturedSessionCandidate> = out
|
|
@@ -292,10 +295,7 @@ pub(super) fn apply_spawn_time_window_if_unique(
|
|
|
292
295
|
.captured
|
|
293
296
|
.rollout_path
|
|
294
297
|
.as_ref()
|
|
295
|
-
.and_then(|p|
|
|
296
|
-
Provider::Codex => super::codex::rollout_created_at(p.as_path()),
|
|
297
|
-
_ => candidate_mtime(p.as_path()),
|
|
298
|
-
})
|
|
298
|
+
.and_then(|p| candidate_mtime(p.as_path()))
|
|
299
299
|
.is_some_and(|created_at| created_at >= spawned_at)
|
|
300
300
|
})
|
|
301
301
|
.cloned()
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
//! ---
|
|
2
|
-
//! purpose: 在记录的 Pi session root 内按真实 header 捕获 exact JSONL backing
|
|
2
|
+
//! purpose: 在记录的 Pi 席位 session root 内按真实 header 捕获 exact JSONL backing
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: scan_session_store
|
|
6
6
|
//! what: 只读每个 JSONL 的首个完整 header;有预期 id 时按 id/cwd/spawned_at,否则按 cwd/spawned_at 读取 Pi 自己的 id
|
|
7
|
+
//! - name: validate_exact_backing
|
|
8
|
+
//! what: restart 前重验 exact path 的 id/cwd header
|
|
7
9
|
//! boundary:
|
|
8
10
|
//! - 只递归 recorded provider_projects_root,不扫描 HOME 或消息正文
|
|
9
11
|
//! - 不以文件名、mtime 或唯一文件替代 header 匹配
|
|
@@ -95,6 +97,37 @@ fn collect_jsonl(root: &Path, out: &mut Vec<PathBuf>) -> Result<(), ProviderErro
|
|
|
95
97
|
Ok(())
|
|
96
98
|
}
|
|
97
99
|
|
|
100
|
+
/// ---
|
|
101
|
+
/// purpose: restart 前重验调用方给出的 exact Pi JSONL backing
|
|
102
|
+
/// returns: header type/version/id/cwd 全匹配时成功
|
|
103
|
+
/// errors: 文件缺失、header 不完整或 identity 不匹配时返回 ResumeUnavailable
|
|
104
|
+
/// ---
|
|
105
|
+
pub(crate) fn validate_exact_backing(
|
|
106
|
+
path: &Path,
|
|
107
|
+
expected_session_id: &SessionId,
|
|
108
|
+
spawn_cwd: &Path,
|
|
109
|
+
) -> Result<(), ProviderError> {
|
|
110
|
+
if !path.is_file() {
|
|
111
|
+
return Err(ProviderError::ResumeUnavailable(format!(
|
|
112
|
+
"Pi exact session backing is missing: {}",
|
|
113
|
+
path.display()
|
|
114
|
+
)));
|
|
115
|
+
}
|
|
116
|
+
let header = read_header(path).ok_or_else(|| {
|
|
117
|
+
ProviderError::ResumeUnavailable(format!(
|
|
118
|
+
"Pi exact session backing has no complete session header: {}",
|
|
119
|
+
path.display()
|
|
120
|
+
))
|
|
121
|
+
})?;
|
|
122
|
+
if !header_matches(&header, expected_session_id, spawn_cwd, None) {
|
|
123
|
+
return Err(ProviderError::ResumeUnavailable(format!(
|
|
124
|
+
"Pi exact session backing header does not match id/cwd: {}",
|
|
125
|
+
path.display()
|
|
126
|
+
)));
|
|
127
|
+
}
|
|
128
|
+
Ok(())
|
|
129
|
+
}
|
|
130
|
+
|
|
98
131
|
/// ---
|
|
99
132
|
/// purpose: 仅在 recorded seat root 内递归捕获 Pi session header 候选
|
|
100
133
|
/// returns: 有预期 id 时按 id/cwd/timestamp 匹配;否则读取 Pi header 自己的 id,并按 cwd/timestamp 匹配
|
|
@@ -10,10 +10,9 @@ use std::path::PathBuf;
|
|
|
10
10
|
use crate::provider::types::{CapturedSession, ProviderError, SessionId};
|
|
11
11
|
use crate::provider::Provider;
|
|
12
12
|
|
|
13
|
-
pub(crate) mod
|
|
13
|
+
pub(crate) mod claude;
|
|
14
14
|
pub(crate) mod common;
|
|
15
15
|
pub(crate) mod copilot;
|
|
16
|
-
pub(crate) mod grok;
|
|
17
16
|
pub(crate) mod pi;
|
|
18
17
|
|
|
19
18
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
@@ -42,30 +41,31 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
42
41
|
if matches!(provider, Provider::Copilot) {
|
|
43
42
|
return Ok(copilot::scan_session_store(context));
|
|
44
43
|
}
|
|
45
|
-
if matches!(provider, Provider::Grok) {
|
|
46
|
-
return Ok(grok::scan_session_store(context));
|
|
47
|
-
}
|
|
48
44
|
if matches!(provider, Provider::Pi) {
|
|
49
45
|
return pi::scan_session_store(context);
|
|
50
46
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
47
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
48
|
+
&& context.expected_session_id.is_some()
|
|
49
|
+
{
|
|
50
|
+
return Ok(claude::scan_expected_session(context));
|
|
51
|
+
}
|
|
52
|
+
// Codex and Grok workers run only through their contract leaves; a
|
|
53
|
+
// pre-upgrade legacy row has nothing left to capture.
|
|
54
|
+
if matches!(provider, Provider::Codex | Provider::Grok) {
|
|
54
55
|
return Ok(Vec::new());
|
|
55
56
|
}
|
|
56
57
|
|
|
57
58
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
58
59
|
let mut out = common::parse_candidate_files(provider, context, candidates);
|
|
59
|
-
if matches!(provider, Provider::Codex) {
|
|
60
|
-
codex::retain_spawn_cwd(context, &mut out);
|
|
61
|
-
}
|
|
62
60
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
63
61
|
|
|
64
|
-
if matches!(provider, Provider::
|
|
65
|
-
|
|
62
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
63
|
+
return claude::apply_expected_session_filter(context, out);
|
|
66
64
|
}
|
|
67
65
|
|
|
68
66
|
common::apply_spawn_time_window_if_unique(provider, context, &mut out);
|
|
69
67
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
70
68
|
Ok(out)
|
|
71
69
|
}
|
|
70
|
+
|
|
71
|
+
pub(crate) use claude::rollout_path_has_leader_marker as rollout_path_has_claude_leader_marker;
|