@team-agent/installer 0.5.124 → 0.5.126
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 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -69
- package/crates/team-agent/src/cli/emit.rs +45 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +28 -33
- package/crates/team-agent/src/cli/models.rs +44 -880
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +39 -8
- package/crates/team-agent/src/compiler.rs +28 -204
- package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
- package/crates/team-agent/src/contract_runtime/config.rs +37 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +1 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +15 -195
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -61
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -43
- package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +60 -145
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -153
- package/crates/team-agent/src/lifecycle/tests.rs +0 -6
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +185 -168
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -5
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +33 -302
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +14 -273
- package/crates/team-agent/src/provider/session/capture.rs +7 -107
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
- package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -14
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +79 -11
- 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/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -5
- 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/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
//! - name: ContextBackingSnapshot
|
|
6
6
|
//! what: spawn 前对 provider backing 根下 .jsonl 的 (len, mtime) 基线快照,用于判「变过」
|
|
7
7
|
//! - name: verify_context_fork
|
|
8
|
-
//! what: 按 provider 路由到 copilot/codex
|
|
8
|
+
//! what: 按 provider 路由到 copilot/codex 两条验证路径,成功给 ContextForkProof
|
|
9
9
|
//! - name: context_fork_convergence_deadline
|
|
10
|
-
//! what: 每个 provider 各自的收敛预算(
|
|
10
|
+
//! what: 每个 provider 各自的收敛预算(codex 10s / 其余 5s)
|
|
11
11
|
//! - name: ContextForkProof
|
|
12
12
|
//! what: 已验证的 fork 证明:新旧 session id、backing 路径、captured_via、归属置信度
|
|
13
13
|
//! - name: ContextForkTermination
|
|
@@ -21,7 +21,8 @@
|
|
|
21
21
|
//! - 只回答「fork 有没有产生一个可读的、不等于源会话的新 backing」,不回答会话内容对不对
|
|
22
22
|
//! - 不创建/改写 backing(codex 的物化改写在 context_fork/codex.rs,不在本文件)
|
|
23
23
|
//! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
|
|
24
|
-
//! - grok /
|
|
24
|
+
//! - grok / gemini / fake 没有可验证 backing,一律直接 Rejected
|
|
25
|
+
//! - Claude Code / Pi worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
|
|
25
26
|
//! maturity: wired
|
|
26
27
|
//! ---
|
|
27
28
|
use std::collections::BTreeMap;
|
|
@@ -44,7 +45,6 @@ pub(crate) enum ContextForkTermination {
|
|
|
44
45
|
Rejected(#[from] ProviderError),
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
mod claude;
|
|
48
48
|
mod codex;
|
|
49
49
|
mod outcome;
|
|
50
50
|
pub(crate) use codex::materialize_codex_fork;
|
|
@@ -56,7 +56,7 @@ pub(crate) use outcome::{
|
|
|
56
56
|
/// purpose: 给出该 provider 等待 fork backing 落盘的收敛预算
|
|
57
57
|
/// params:
|
|
58
58
|
/// provider: 目标 provider;全枚举穷举,无兜底臂
|
|
59
|
-
/// returns:
|
|
59
|
+
/// returns: Codex 10s、其余(Claude/ClaudeCode/Copilot/Grok/Pi/GeminiCli/Fake) 5s
|
|
60
60
|
/// contract:
|
|
61
61
|
/// provides:
|
|
62
62
|
/// - name: context_fork_convergence_deadline
|
|
@@ -67,9 +67,13 @@ pub(crate) use outcome::{
|
|
|
67
67
|
pub(crate) fn context_fork_convergence_deadline(provider: Provider) -> Duration {
|
|
68
68
|
// Expiration is consumed by ContextForkOutcome::Pending(PendingContextFork).
|
|
69
69
|
match provider {
|
|
70
|
-
Provider::Claude | Provider::ClaudeCode => Duration::from_secs(45),
|
|
71
70
|
Provider::Codex => Duration::from_secs(10),
|
|
72
|
-
Provider::
|
|
71
|
+
Provider::Claude
|
|
72
|
+
| Provider::ClaudeCode
|
|
73
|
+
| Provider::Copilot
|
|
74
|
+
| Provider::Grok
|
|
75
|
+
| Provider::Pi
|
|
76
|
+
| Provider::GeminiCli
|
|
73
77
|
| Provider::Fake => Duration::from_secs(5),
|
|
74
78
|
}
|
|
75
79
|
}
|
|
@@ -121,12 +125,12 @@ impl ContextBackingSnapshot {
|
|
|
121
125
|
/// ---
|
|
122
126
|
/// purpose: fork 后按 provider 分派验证,只有拿到「新会话 backing 可读且不等于源会话」的实证才返回证明
|
|
123
127
|
/// params:
|
|
124
|
-
/// provider: 决定走 copilot(sqlite 行存在) / codex(候选扫描认领)
|
|
128
|
+
/// provider: 决定走 copilot(sqlite 行存在) / codex(候选扫描认领) 两条路之一
|
|
125
129
|
/// source_session_id: 被 fork 的源会话 id;新会话等于它即判失败
|
|
126
130
|
/// plan: 提供 expected_session_id 与隔离 backing 根
|
|
127
131
|
/// before: spawn 前的 ContextBackingSnapshot 基线,用于判「文件变过」
|
|
128
|
-
/// expected_backing_path: 精确快照路径。
|
|
129
|
-
/// spawn_cwd: codex
|
|
132
|
+
/// expected_backing_path: 精确快照路径。codex 仅在 plan 带 expected id 时必需(无 expected id 走 legacy「唯一变过的新 rollout」认领,可为 None);不做同目录猜测
|
|
133
|
+
/// spawn_cwd: codex 分支据此构造扫描上下文
|
|
130
134
|
/// spawned_at: codex 候选扫描的时间边界
|
|
131
135
|
/// deadline: 轮询预算,来自 context_fork_convergence_deadline
|
|
132
136
|
/// returns: ContextForkProof——新旧 session id、backing 路径、captured_via、attribution_confidence
|
|
@@ -138,7 +142,7 @@ impl ContextBackingSnapshot {
|
|
|
138
142
|
/// boundary:
|
|
139
143
|
/// - 不修改 backing、不写 state、不发事件
|
|
140
144
|
/// - _source_agent_id 当前不参与任何判定(仅 codex 用 agent_id 做 embedded 身份比对)
|
|
141
|
-
/// -
|
|
145
|
+
/// - 未列入两条路径的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
|
|
142
146
|
/// ---
|
|
143
147
|
pub(crate) fn verify_context_fork(
|
|
144
148
|
provider: Provider,
|
|
@@ -167,17 +171,6 @@ pub(crate) fn verify_context_fork(
|
|
|
167
171
|
deadline,
|
|
168
172
|
);
|
|
169
173
|
}
|
|
170
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
171
|
-
return claude::verify_claude_fork(
|
|
172
|
-
provider,
|
|
173
|
-
source_session_id,
|
|
174
|
-
plan,
|
|
175
|
-
before,
|
|
176
|
-
expected_backing_path,
|
|
177
|
-
spawn_cwd,
|
|
178
|
-
deadline,
|
|
179
|
-
);
|
|
180
|
-
}
|
|
181
174
|
Err(ProviderError::CaptureFailed(format!(
|
|
182
175
|
"context_fork_unverified: {provider:?} has no verifiable fork backing"
|
|
183
176
|
))
|
|
@@ -249,11 +242,10 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
|
|
|
249
242
|
.map(PathBuf::from)
|
|
250
243
|
.unwrap_or_else(|| PathBuf::from("."));
|
|
251
244
|
match provider {
|
|
252
|
-
Provider::Claude | Provider::ClaudeCode => home.join(".claude").join("projects"),
|
|
253
245
|
Provider::Codex => home.join(".codex").join("sessions"),
|
|
254
246
|
Provider::Copilot => home.join(".copilot").join("session-state"),
|
|
255
|
-
Provider::Pi => PathBuf::new(),
|
|
256
|
-
Provider::Grok | Provider::
|
|
247
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => PathBuf::new(),
|
|
248
|
+
Provider::Grok | Provider::GeminiCli | Provider::Fake => home,
|
|
257
249
|
}
|
|
258
250
|
}
|
|
259
251
|
|
|
@@ -388,88 +380,4 @@ mod tests {
|
|
|
388
380
|
assert_eq!(proof.backing_path, fresh);
|
|
389
381
|
let _ = std::fs::remove_dir_all(&root);
|
|
390
382
|
}
|
|
391
|
-
|
|
392
|
-
#[test]
|
|
393
|
-
fn claude_fork_proof_is_partitioned_by_exact_snapshot_path() {
|
|
394
|
-
let root = std::env::temp_dir().join(format!(
|
|
395
|
-
"ta-claude-fork-proof-partition-{}",
|
|
396
|
-
std::process::id()
|
|
397
|
-
));
|
|
398
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
399
|
-
std::fs::create_dir_all(root.join(".team/logs")).unwrap();
|
|
400
|
-
let expected = SessionId::new("22222222-2222-4222-8222-222222222222");
|
|
401
|
-
let plan = CommandPlan {
|
|
402
|
-
argv: Vec::new(),
|
|
403
|
-
expected_session_id: Some(expected.clone()),
|
|
404
|
-
provider_projects_root: Some(root.clone()),
|
|
405
|
-
managed_mcp_config: false,
|
|
406
|
-
};
|
|
407
|
-
let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
|
|
408
|
-
std::fs::write(
|
|
409
|
-
root.join(".team/logs/events.jsonl"),
|
|
410
|
-
"{\"event\":\"noise\"}\n",
|
|
411
|
-
)
|
|
412
|
-
.unwrap();
|
|
413
|
-
std::fs::write(
|
|
414
|
-
root.join("11111111-1111-4111-8111-111111111111.jsonl"),
|
|
415
|
-
"{\"type\":\"sibling-snapshot\"}\n",
|
|
416
|
-
)
|
|
417
|
-
.unwrap();
|
|
418
|
-
let expected_path = root.join(format!("{}.jsonl", expected.as_str()));
|
|
419
|
-
std::fs::write(&expected_path, "{\"type\":\"own-snapshot\"}\n").unwrap();
|
|
420
|
-
let proof = verify_context_fork(
|
|
421
|
-
Provider::Claude,
|
|
422
|
-
&SessionId::new("source-session"),
|
|
423
|
-
&plan,
|
|
424
|
-
&before,
|
|
425
|
-
Some(&expected_path),
|
|
426
|
-
"source",
|
|
427
|
-
"fork",
|
|
428
|
-
&root,
|
|
429
|
-
"2026-07-22T00:00:00Z",
|
|
430
|
-
Duration::ZERO,
|
|
431
|
-
)
|
|
432
|
-
.unwrap();
|
|
433
|
-
assert_eq!(proof.new_session_id, expected);
|
|
434
|
-
assert_eq!(proof.backing_path, expected_path);
|
|
435
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
436
|
-
}
|
|
437
|
-
#[test]
|
|
438
|
-
fn claude_fork_proof_never_uses_events_jsonl_as_backing() {
|
|
439
|
-
let root = std::env::temp_dir().join(format!(
|
|
440
|
-
"ta-claude-fork-proof-no-events-{}",
|
|
441
|
-
std::process::id()
|
|
442
|
-
));
|
|
443
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
444
|
-
std::fs::create_dir_all(root.join(".team/logs")).unwrap();
|
|
445
|
-
let expected = SessionId::new("33333333-3333-4333-8333-333333333333");
|
|
446
|
-
let plan = CommandPlan {
|
|
447
|
-
argv: Vec::new(),
|
|
448
|
-
expected_session_id: Some(expected.clone()),
|
|
449
|
-
provider_projects_root: Some(root.clone()),
|
|
450
|
-
managed_mcp_config: false,
|
|
451
|
-
};
|
|
452
|
-
let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
|
|
453
|
-
std::fs::write(
|
|
454
|
-
root.join(".team/logs/events.jsonl"),
|
|
455
|
-
"{\"event\":\"noise\"}\n",
|
|
456
|
-
)
|
|
457
|
-
.unwrap();
|
|
458
|
-
let missing = root.join(format!("{}.jsonl", expected.as_str()));
|
|
459
|
-
let error = verify_context_fork(
|
|
460
|
-
Provider::Claude,
|
|
461
|
-
&SessionId::new("source-session"),
|
|
462
|
-
&plan,
|
|
463
|
-
&before,
|
|
464
|
-
Some(&missing),
|
|
465
|
-
"source",
|
|
466
|
-
"fork",
|
|
467
|
-
&root,
|
|
468
|
-
"2026-07-22T00:00:00Z",
|
|
469
|
-
Duration::ZERO,
|
|
470
|
-
)
|
|
471
|
-
.unwrap_err();
|
|
472
|
-
assert!(error.to_string().contains("context_fork_unverified"));
|
|
473
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
474
|
-
}
|
|
475
383
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
//! - name: candidate_session_files
|
|
6
6
|
//! what: 按 provider 枚举候选文件(隔离根 + spawn_cwd 递归 + provider HOME 目录),去重排序并按 mtime 截到 300 条
|
|
7
7
|
//! - name: parse_candidate_files
|
|
8
|
-
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd
|
|
8
|
+
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配与 embedded 身份两道排除
|
|
9
9
|
//! - name: apply_spawned_at_filter
|
|
10
10
|
//! what: 剔除早于席位进程世代边界(spawned_at)的存档;spawned_at 存在但解析不了则清空候选
|
|
11
11
|
//! - name: apply_spawn_time_window_if_unique
|
|
@@ -29,14 +29,12 @@
|
|
|
29
29
|
//! requires:
|
|
30
30
|
//! - name: crate::provider::helpers
|
|
31
31
|
//! what: find_session_id 与 parse_jsonl_records
|
|
32
|
-
//! - name: super::claude
|
|
33
|
-
//! what: claude 家族的 projects 目录推导、cwd 字段判据与 leader marker 判据
|
|
34
32
|
//! - name: super::codex
|
|
35
33
|
//! what: spawned_at 解析、uuid 精度截断与 rollout 创建时间
|
|
36
34
|
//! boundary:
|
|
37
35
|
//! - 一律只读:不写盘、不改 state、不发事件
|
|
38
36
|
//! - 只产出候选与事实;归属最终由上游分配器裁定,本文件不写会话
|
|
39
|
-
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
|
|
37
|
+
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
|
|
40
38
|
//! - 候选上限 300 条,超出按 mtime 由新到旧截断——截掉的部分不留痕迹
|
|
41
39
|
//! - "看起来像会话文件"的判据很宽(.json/.jsonl 后缀,或名字含 session/rollout/席位 id),收窄靠后续 provider 专属过滤
|
|
42
40
|
//! maturity: wired
|
|
@@ -66,7 +64,7 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
|
|
|
66
64
|
/// ---
|
|
67
65
|
/// purpose: 枚举本席位可能对应的会话文件,产出待解析的候选路径表
|
|
68
66
|
/// params:
|
|
69
|
-
/// provider: 决定要不要去 ~/.codex/sessions
|
|
67
|
+
/// provider: 决定要不要去 ~/.codex/sessions 找
|
|
70
68
|
/// context: provider_projects_root(隔离根)、spawn_cwd(必扫)、agent_id(参与文件名匹配)
|
|
71
69
|
/// returns: 去重并排序后的候选;requires_cwd_match=false 的排前面,同组按路径字典序
|
|
72
70
|
/// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;provider HOME 侧目录读失败静默跳过
|
|
@@ -78,7 +76,7 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
|
|
|
78
76
|
/// - spawn_cwd 递归最深 4 层;工作区是用户代码仓,任何名含 session 的 json 都会被列进来
|
|
79
77
|
/// - .team 运行时目录一律排除,除非它就在 claude 的隔离根之下
|
|
80
78
|
/// - 超过 300 条按 mtime 由新到旧截断;被截掉的候选不产生任何信号
|
|
81
|
-
/// - Copilot / Grok /
|
|
79
|
+
/// - Copilot / Grok / GeminiCli / Fake 不走 HOME 分支——它们各有专属扫描
|
|
82
80
|
/// ---
|
|
83
81
|
pub(super) fn candidate_session_files(
|
|
84
82
|
provider: Provider,
|
|
@@ -86,9 +84,7 @@ pub(super) fn candidate_session_files(
|
|
|
86
84
|
) -> Result<Vec<SessionCandidate>, ProviderError> {
|
|
87
85
|
let mut out = Vec::new();
|
|
88
86
|
if let Some(root) = context.provider_projects_root.as_ref() {
|
|
89
|
-
|
|
90
|
-
matches!(provider, Provider::Claude | Provider::ClaudeCode).then_some(root.as_path());
|
|
91
|
-
collect_optional_candidate_files(root, &context.agent_id, allowed_team_root, &mut out)?;
|
|
87
|
+
collect_optional_candidate_files(root, &context.agent_id, None, &mut out)?;
|
|
92
88
|
}
|
|
93
89
|
collect_candidate_files(
|
|
94
90
|
&context.spawn_cwd,
|
|
@@ -108,20 +104,10 @@ pub(super) fn candidate_session_files(
|
|
|
108
104
|
&mut out,
|
|
109
105
|
)?;
|
|
110
106
|
}
|
|
111
|
-
Provider::Claude
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
115
|
-
collect_optional_candidate_files(
|
|
116
|
-
&home.join(".claude").join("projects"),
|
|
117
|
-
&context.agent_id,
|
|
118
|
-
None,
|
|
119
|
-
&mut out,
|
|
120
|
-
)?;
|
|
121
|
-
}
|
|
122
|
-
Provider::Copilot
|
|
107
|
+
Provider::Claude
|
|
108
|
+
| Provider::ClaudeCode
|
|
109
|
+
| Provider::Copilot
|
|
123
110
|
| Provider::Grok
|
|
124
|
-
| Provider::CursorAgent
|
|
125
111
|
| Provider::Pi
|
|
126
112
|
| Provider::GeminiCli
|
|
127
113
|
| Provider::Fake => {}
|
|
@@ -140,7 +126,7 @@ pub(super) fn candidate_session_files(
|
|
|
140
126
|
/// ---
|
|
141
127
|
/// purpose: 把候选路径读头解析成结构化候选,并在解析途中就滤掉明显不属于本席位的
|
|
142
128
|
/// params:
|
|
143
|
-
///
|
|
129
|
+
/// _provider: 保留调用形状;不再有 provider 专属排除
|
|
144
130
|
/// context: 提供 spawn_cwd 与 agent_id 两个比对基准
|
|
145
131
|
/// candidates: candidate_session_files 的产物
|
|
146
132
|
/// returns: 通过全部排除的候选;每条带 embedded 身份、positive_agent_id_match 与 agent_path_match
|
|
@@ -149,12 +135,12 @@ pub(super) fn candidate_session_files(
|
|
|
149
135
|
/// - name: parse_candidate_files
|
|
150
136
|
/// what: 每个文件只读头 64KB,且只取到最后一个完整行
|
|
151
137
|
/// boundary:
|
|
152
|
-
/// -
|
|
138
|
+
/// - 三道排除:读不出头 / 解析不出记录 → 跳过;requires_cwd_match 的候选 cwd 对不上 → 跳过;embedded 身份存在且不等于本席位 → 跳过
|
|
153
139
|
/// - 无 session id 的候选不丢弃,降级为 FsMtimeFallback + Confidence::Low
|
|
154
140
|
/// - 身份判定用两套文本:正文 text 判 TEAM_AGENT_ID,未截行的原始字节判 embedded worker id
|
|
155
141
|
/// ---
|
|
156
142
|
pub(super) fn parse_candidate_files(
|
|
157
|
-
|
|
143
|
+
_provider: Provider,
|
|
158
144
|
context: &CaptureSessionContext,
|
|
159
145
|
candidates: Vec<SessionCandidate>,
|
|
160
146
|
) -> Vec<CapturedSessionCandidate> {
|
|
@@ -176,12 +162,6 @@ pub(super) fn parse_candidate_files(
|
|
|
176
162
|
continue;
|
|
177
163
|
}
|
|
178
164
|
let session_id = records.iter().find_map(find_session_id);
|
|
179
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
180
|
-
&& session_id.is_some()
|
|
181
|
-
&& !records.iter().any(super::claude::has_cwd_field)
|
|
182
|
-
{
|
|
183
|
-
continue;
|
|
184
|
-
}
|
|
185
165
|
let captured_via = if session_id.is_some() {
|
|
186
166
|
CaptureVia::FsWatch
|
|
187
167
|
} else {
|
|
@@ -202,11 +182,6 @@ pub(super) fn parse_candidate_files(
|
|
|
202
182
|
let positive_agent_id_match = candidate_text_has_team_agent_id(&text, context)
|
|
203
183
|
|| embedded_agent_id.as_deref() == Some(context.agent_id.as_str());
|
|
204
184
|
let agent_path_match = candidate_path_matches_agent_id(&path, context);
|
|
205
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
206
|
-
&& super::claude::records_have_leader_marker(&records)
|
|
207
|
-
{
|
|
208
|
-
continue;
|
|
209
|
-
}
|
|
210
185
|
out.push(CapturedSessionCandidate {
|
|
211
186
|
captured: CapturedSession {
|
|
212
187
|
session_id: session_id.map(SessionId::new),
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
//! ---
|
|
2
|
-
//! purpose: 在记录的 Pi
|
|
2
|
+
//! purpose: 在记录的 Pi session root 内按真实 header 捕获 exact JSONL backing(Pi leader 的投递回执用)
|
|
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
|
|
9
7
|
//! boundary:
|
|
10
8
|
//! - 只递归 recorded provider_projects_root,不扫描 HOME 或消息正文
|
|
11
9
|
//! - 不以文件名、mtime 或唯一文件替代 header 匹配
|
|
@@ -97,37 +95,6 @@ fn collect_jsonl(root: &Path, out: &mut Vec<PathBuf>) -> Result<(), ProviderErro
|
|
|
97
95
|
Ok(())
|
|
98
96
|
}
|
|
99
97
|
|
|
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
|
-
|
|
131
98
|
/// ---
|
|
132
99
|
/// purpose: 仅在 recorded seat root 内递归捕获 Pi session header 候选
|
|
133
100
|
/// returns: 有预期 id 时按 id/cwd/timestamp 匹配;否则读取 Pi header 自己的 id,并按 cwd/timestamp 匹配
|
|
@@ -10,11 +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 claude;
|
|
14
13
|
pub(crate) mod codex;
|
|
15
14
|
pub(crate) mod common;
|
|
16
15
|
pub(crate) mod copilot;
|
|
17
|
-
pub(crate) mod cursor;
|
|
18
16
|
pub(crate) mod grok;
|
|
19
17
|
pub(crate) mod pi;
|
|
20
18
|
|
|
@@ -47,16 +45,13 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
47
45
|
if matches!(provider, Provider::Grok) {
|
|
48
46
|
return Ok(grok::scan_session_store(context));
|
|
49
47
|
}
|
|
50
|
-
if matches!(provider, Provider::CursorAgent) {
|
|
51
|
-
return Ok(cursor::scan_session_store(context));
|
|
52
|
-
}
|
|
53
48
|
if matches!(provider, Provider::Pi) {
|
|
54
49
|
return pi::scan_session_store(context);
|
|
55
50
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
{
|
|
59
|
-
return Ok(
|
|
51
|
+
// Claude Code workers run only through the contract leaf; a pre-upgrade
|
|
52
|
+
// legacy row has nothing left to capture.
|
|
53
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
54
|
+
return Ok(Vec::new());
|
|
60
55
|
}
|
|
61
56
|
|
|
62
57
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
@@ -66,9 +61,6 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
66
61
|
}
|
|
67
62
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
68
63
|
|
|
69
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
70
|
-
return claude::apply_expected_session_filter(context, out);
|
|
71
|
-
}
|
|
72
64
|
if matches!(provider, Provider::Codex) {
|
|
73
65
|
out = codex::apply_expected_session_filter(context, out);
|
|
74
66
|
}
|
|
@@ -77,5 +69,3 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
77
69
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
78
70
|
Ok(out)
|
|
79
71
|
}
|
|
80
|
-
|
|
81
|
-
pub(crate) use claude::rollout_path_has_leader_marker as rollout_path_has_claude_leader_marker;
|
|
@@ -3,14 +3,13 @@
|
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: flush_explicit_queue
|
|
6
|
-
//! what: 屏幕出现 grok `Enter:send now`
|
|
6
|
+
//! what: 屏幕出现 grok `Enter:send now` 时只重按回车直到消失
|
|
7
7
|
//! depends:
|
|
8
8
|
//! - crate::transport::Transport
|
|
9
9
|
//! boundary:
|
|
10
10
|
//! - 不重粘文本、不用 Escape、不用 Ctrl-C、不加自动重投
|
|
11
11
|
//! - 不按忙闲决定发不发;只在已经注入之后确认队列态
|
|
12
12
|
//! - 无标记时不改 claude/codex 提交行为
|
|
13
|
-
//! - cursor 第二下 Enter 会打断进行中回合;生产 flush 不带 cursor 标记
|
|
14
13
|
//! maturity: wired
|
|
15
14
|
//! ---
|
|
16
15
|
|
|
@@ -21,15 +20,7 @@ use crate::transport::{CaptureRange, Key, Target, Transport, TransportError};
|
|
|
21
20
|
/// grok 1.0.4 实测:页脚出现这串就是显式队列。
|
|
22
21
|
pub const GROK_SEND_NOW_MARK: &str = "Enter:send now";
|
|
23
22
|
|
|
24
|
-
///
|
|
25
|
-
/// 忙时 follow-ups 盒页脚原文(大小写按屏上):
|
|
26
|
-
/// `enter send now · ↑ select/edit · esc cancel`
|
|
27
|
-
/// 出处:`.team/scripts/cursor_send.sh` 的 `QUEUE_MARK='enter send now'`
|
|
28
|
-
/// (脚本头 2026-08-18 真机段)。与 grok 的 `Enter:send now`(大写 E、冒号)
|
|
29
|
-
/// 不是同一串。
|
|
30
|
-
pub const CURSOR_SEND_NOW_MARK: &str = "enter send now";
|
|
31
|
-
|
|
32
|
-
/// 与 grok_send.sh / cursor_send.sh 对齐:最多再按 8 次回车。
|
|
23
|
+
/// 最多再按 8 次回车。
|
|
33
24
|
pub const GROK_SEND_NOW_MAX_ENTERS: u32 = 8;
|
|
34
25
|
|
|
35
26
|
pub struct FlushReport {
|
|
@@ -42,21 +33,11 @@ pub struct FlushReport {
|
|
|
42
33
|
pub fn flush_explicit_queue(
|
|
43
34
|
transport: &dyn Transport,
|
|
44
35
|
target: &Target,
|
|
45
|
-
) -> Result<FlushReport, TransportError> {
|
|
46
|
-
flush_explicit_queue_for(transport, target, &[GROK_SEND_NOW_MARK])
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
/// One detector path at a time. Production flush is grok-only.
|
|
50
|
-
/// Tests enable a single mark so a false-positive cannot hide behind the other path.
|
|
51
|
-
pub fn flush_explicit_queue_for(
|
|
52
|
-
transport: &dyn Transport,
|
|
53
|
-
target: &Target,
|
|
54
|
-
marks: &[&str],
|
|
55
36
|
) -> Result<FlushReport, TransportError> {
|
|
56
37
|
let mut extra_enters = 0;
|
|
57
38
|
for _ in 0..GROK_SEND_NOW_MAX_ENTERS {
|
|
58
39
|
let captured = transport.capture(target, CaptureRange::Tail(40))?;
|
|
59
|
-
if !
|
|
40
|
+
if !queue_mark_visible(&captured.text) {
|
|
60
41
|
return Ok(FlushReport {
|
|
61
42
|
extra_enters,
|
|
62
43
|
mark_cleared: true,
|
|
@@ -69,7 +50,7 @@ pub fn flush_explicit_queue_for(
|
|
|
69
50
|
let captured = transport.capture(target, CaptureRange::Tail(40))?;
|
|
70
51
|
Ok(FlushReport {
|
|
71
52
|
extra_enters,
|
|
72
|
-
mark_cleared: !
|
|
53
|
+
mark_cleared: !queue_mark_visible(&captured.text),
|
|
73
54
|
})
|
|
74
55
|
}
|
|
75
56
|
|
|
@@ -81,11 +62,7 @@ pub fn keep_provider_queue_requested() -> bool {
|
|
|
81
62
|
}
|
|
82
63
|
|
|
83
64
|
pub fn queue_mark_visible(text: &str) -> bool {
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
pub fn queue_mark_visible_for(text: &str, marks: &[&str]) -> bool {
|
|
88
|
-
marks.iter().any(|mark| text.contains(mark))
|
|
65
|
+
text.contains(GROK_SEND_NOW_MARK)
|
|
89
66
|
}
|
|
90
67
|
|
|
91
68
|
#[allow(dead_code)]
|