@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
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
//! ---
|
|
2
|
+
//! purpose: claude 家族的 fork 验证——在预算内轮询「精确快照路径」与「provider 侧 projects 路径」两处,任一处出现可读的新 backing 即出证明
|
|
3
|
+
//! contract:
|
|
4
|
+
//! provides:
|
|
5
|
+
//! - name: verify_claude_fork
|
|
6
|
+
//! what: 双路径轮询验证,成功给 ContextForkProof(captured_via=context_fork_verified)
|
|
7
|
+
//! requires:
|
|
8
|
+
//! - name: crate::provider::session_scan::claude::projects_dir_for_cwd
|
|
9
|
+
//! what: 第二条探测路径由 HOME + spawn_cwd 推导出 ~/.claude/projects 下的目录
|
|
10
|
+
//! - name: super::ContextBackingSnapshot
|
|
11
|
+
//! what: 判「文件变过」的基线
|
|
12
|
+
//! boundary:
|
|
13
|
+
//! - 只服务 Provider::Claude / ClaudeCode
|
|
14
|
+
//! - 文件名必须精确等于 <expected_session_id>.jsonl,不做同目录最新文件回落
|
|
15
|
+
//! - 不解析会话正文语义,只验「首行可解析 JSON」与「sessionId 记录(若有)一致」
|
|
16
|
+
//! - 未在 deadline 内满足条件即 Timeout,不降级放行
|
|
17
|
+
//! maturity: wired
|
|
18
|
+
//! ---
|
|
19
|
+
use super::*;
|
|
20
|
+
|
|
21
|
+
/// ---
|
|
22
|
+
/// purpose: 轮询等待 claude fork 的新 transcript 落盘并验明身份
|
|
23
|
+
/// params:
|
|
24
|
+
/// provider: 写进证明的 provider 标记(Claude 或 ClaudeCode)
|
|
25
|
+
/// source_session_id: 源会话;新会话等于它即不出证明
|
|
26
|
+
/// plan: 必须带 expected_session_id,否则立即拒绝
|
|
27
|
+
/// before: spawn 前基线,用于判 stamp 变化
|
|
28
|
+
/// expected_backing_path: 必需的精确快照路径;文件名不等于 <expected>.jsonl 即拒绝
|
|
29
|
+
/// spawn_cwd: 用于推导第二条 provider 侧探测路径
|
|
30
|
+
/// deadline: 轮询预算,每轮间隔 50ms
|
|
31
|
+
/// returns: 证明中 backing_path 是命中的那一条路径,attribution_confidence 固定 "high"
|
|
32
|
+
/// errors: Rejected(CaptureFailed) 当 plan 缺 expected id / 缺快照路径 / 文件名不匹配;Timeout 当预算内两条路径都没满足
|
|
33
|
+
/// contract:
|
|
34
|
+
/// provides:
|
|
35
|
+
/// - name: verify_claude_fork
|
|
36
|
+
/// what: 只读文件元数据与首行/sessionId 记录,不写任何文件
|
|
37
|
+
/// boundary:
|
|
38
|
+
/// - 两条路径的严格程度不同:快照路径用 is_none_or(无 sessionId 记录时视为匹配),provider 路径用 is_some_and(必须读到 sessionId)
|
|
39
|
+
/// - 不排除 .team/logs/events.jsonl 之外的无关写入方——硬绑定只有「文件名等于 expected uuid」这一条
|
|
40
|
+
/// ---
|
|
41
|
+
pub(super) fn verify_claude_fork(
|
|
42
|
+
provider: Provider,
|
|
43
|
+
source_session_id: &SessionId,
|
|
44
|
+
plan: &CommandPlan,
|
|
45
|
+
before: &ContextBackingSnapshot,
|
|
46
|
+
expected_backing_path: Option<&Path>,
|
|
47
|
+
spawn_cwd: &Path,
|
|
48
|
+
deadline: Duration,
|
|
49
|
+
) -> Result<ContextForkProof, ContextForkTermination> {
|
|
50
|
+
let expected = plan.expected_session_id.as_ref().ok_or_else(|| {
|
|
51
|
+
ProviderError::CaptureFailed(
|
|
52
|
+
"context_fork_unverified: Claude plan has no expected session id".to_string(),
|
|
53
|
+
)
|
|
54
|
+
})?;
|
|
55
|
+
let path = expected_backing_path.ok_or_else(|| {
|
|
56
|
+
ProviderError::CaptureFailed(
|
|
57
|
+
"context_fork_unverified: Claude plan has no exact snapshot backing".to_string(),
|
|
58
|
+
)
|
|
59
|
+
})?;
|
|
60
|
+
let expected_name = format!("{}.jsonl", expected.as_str());
|
|
61
|
+
if path.file_name().and_then(|name| name.to_str()) != Some(expected_name.as_str()) {
|
|
62
|
+
return Err(ProviderError::CaptureFailed(format!(
|
|
63
|
+
"context_fork_unverified: Claude snapshot backing does not match expected session {}",
|
|
64
|
+
expected.as_str()
|
|
65
|
+
))
|
|
66
|
+
.into());
|
|
67
|
+
}
|
|
68
|
+
let started = std::time::Instant::now();
|
|
69
|
+
loop {
|
|
70
|
+
if let Some(stamp) = file_stamp(path) {
|
|
71
|
+
let changed = before.files.get(path).is_none_or(|old| *old != stamp);
|
|
72
|
+
let observed_matches =
|
|
73
|
+
session_id_from_jsonl(path).is_none_or(|observed| observed == expected.as_str());
|
|
74
|
+
if changed && readable_jsonl(path) && observed_matches && expected != source_session_id
|
|
75
|
+
{
|
|
76
|
+
return Ok(ContextForkProof {
|
|
77
|
+
provider,
|
|
78
|
+
source_session_id: source_session_id.clone(),
|
|
79
|
+
new_session_id: expected.clone(),
|
|
80
|
+
backing_path: path.to_path_buf(),
|
|
81
|
+
captured_via: "context_fork_verified".to_string(),
|
|
82
|
+
attribution_confidence: "high".to_string(),
|
|
83
|
+
managed_backing_root: None,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
if let Some(provider_path) = std::env::var_os("HOME")
|
|
88
|
+
.map(PathBuf::from)
|
|
89
|
+
.and_then(|home| {
|
|
90
|
+
crate::provider::session_scan::claude::projects_dir_for_cwd(&home, spawn_cwd)
|
|
91
|
+
})
|
|
92
|
+
.map(|root| root.join(&expected_name))
|
|
93
|
+
{
|
|
94
|
+
let observed_matches = session_id_from_jsonl(&provider_path)
|
|
95
|
+
.is_some_and(|observed| observed == expected.as_str());
|
|
96
|
+
let changed = file_stamp(&provider_path)
|
|
97
|
+
.is_some_and(|stamp| before.files.get(&provider_path) != Some(&stamp));
|
|
98
|
+
if changed
|
|
99
|
+
&& readable_jsonl(&provider_path)
|
|
100
|
+
&& observed_matches
|
|
101
|
+
&& expected != source_session_id
|
|
102
|
+
{
|
|
103
|
+
return Ok(ContextForkProof {
|
|
104
|
+
provider,
|
|
105
|
+
source_session_id: source_session_id.clone(),
|
|
106
|
+
new_session_id: expected.clone(),
|
|
107
|
+
backing_path: provider_path,
|
|
108
|
+
captured_via: "context_fork_verified".to_string(),
|
|
109
|
+
attribution_confidence: "high".to_string(),
|
|
110
|
+
managed_backing_root: None,
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
if started.elapsed() >= deadline {
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
std::thread::sleep(Duration::from_millis(50));
|
|
118
|
+
}
|
|
119
|
+
Err(ContextForkTermination::Timeout {
|
|
120
|
+
provider,
|
|
121
|
+
deadline_ms: deadline.as_millis(),
|
|
122
|
+
})
|
|
123
|
+
}
|
|
@@ -71,7 +71,7 @@ pub(crate) fn transition_pending_context_fork(
|
|
|
71
71
|
/// before: spawn 前 backing 基线
|
|
72
72
|
/// expected_backing_path: 精确快照路径,透传
|
|
73
73
|
/// source_agent_id: 透传给 verify_context_fork(当前该参数不参与判定)
|
|
74
|
-
/// agent_id: 目标席位 id
|
|
74
|
+
/// agent_id: 目标席位 id,写进 Pending.target_agent
|
|
75
75
|
/// spawn_cwd: 目标席位工作目录,透传并写进 Pending 的扫描上下文
|
|
76
76
|
/// spawned_at: 时间边界,透传并写进 Pending
|
|
77
77
|
/// deadline: 轮询预算
|
|
@@ -134,23 +134,20 @@ mod tests {
|
|
|
134
134
|
use super::*;
|
|
135
135
|
|
|
136
136
|
#[test]
|
|
137
|
-
fn
|
|
137
|
+
fn convergence_deadlines_are_bounded_for_every_provider() {
|
|
138
138
|
assert_eq!(
|
|
139
|
-
context_fork_convergence_deadline(Provider::
|
|
140
|
-
Duration::from_secs(
|
|
141
|
-
);
|
|
142
|
-
assert_eq!(
|
|
143
|
-
context_fork_convergence_deadline(Provider::Copilot),
|
|
144
|
-
Duration::from_secs(5)
|
|
139
|
+
context_fork_convergence_deadline(Provider::Claude),
|
|
140
|
+
Duration::from_secs(45)
|
|
145
141
|
);
|
|
142
|
+
for provider in [Provider::Codex, Provider::Copilot, Provider::Grok] {
|
|
143
|
+
assert_eq!(context_fork_convergence_deadline(provider), Duration::from_secs(5));
|
|
144
|
+
}
|
|
146
145
|
}
|
|
147
146
|
|
|
148
147
|
#[test]
|
|
149
|
-
fn
|
|
148
|
+
fn retired_legacy_codex_fork_is_rejected_not_pending() {
|
|
150
149
|
let root =
|
|
151
|
-
std::env::temp_dir().join(format!("ta-codex-fork-
|
|
152
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
153
|
-
std::fs::create_dir_all(&root).unwrap();
|
|
150
|
+
std::env::temp_dir().join(format!("ta-codex-fork-retired-{}", std::process::id()));
|
|
154
151
|
let plan = CommandPlan {
|
|
155
152
|
argv: Vec::new(),
|
|
156
153
|
expected_session_id: None,
|
|
@@ -170,11 +167,6 @@ mod tests {
|
|
|
170
167
|
"2026-07-24T00:00:00Z",
|
|
171
168
|
Duration::ZERO,
|
|
172
169
|
);
|
|
173
|
-
|
|
174
|
-
panic!("missing backing must remain a typed pending fork")
|
|
175
|
-
};
|
|
176
|
-
assert_eq!(pending.source_session_id.as_str(), "source-session");
|
|
177
|
-
assert_eq!(pending.target_agent, "fork");
|
|
178
|
-
let _ = std::fs::remove_dir_all(&root);
|
|
170
|
+
assert!(matches!(outcome, ContextForkOutcome::Rejected(_)), "{outcome:?}");
|
|
179
171
|
}
|
|
180
172
|
}
|
|
@@ -5,24 +5,22 @@
|
|
|
5
5
|
//! - name: ContextBackingSnapshot
|
|
6
6
|
//! what: spawn 前对 provider backing 根下 .jsonl 的 (len, mtime) 基线快照,用于判「变过」
|
|
7
7
|
//! - name: verify_context_fork
|
|
8
|
-
//! what: 按 provider 路由到 copilot/
|
|
8
|
+
//! what: 按 provider 路由到 copilot/claude 两条验证路径,成功给 ContextForkProof
|
|
9
9
|
//! - name: context_fork_convergence_deadline
|
|
10
|
-
//! what: 每个 provider 各自的收敛预算(
|
|
10
|
+
//! what: 每个 provider 各自的收敛预算(claude 45s / 其余 5s)
|
|
11
11
|
//! - name: ContextForkProof
|
|
12
12
|
//! what: 已验证的 fork 证明:新旧 session id、backing 路径、captured_via、归属置信度
|
|
13
13
|
//! - name: ContextForkTermination
|
|
14
14
|
//! what: 两种失败:Timeout(未在预算内看到新 backing) 与 Rejected(provider 侧错误)
|
|
15
15
|
//! requires:
|
|
16
|
-
//! - name: crate::provider::session_scan
|
|
17
|
-
//! what: codex 分支复用一次性候选扫描来认领新 rollout
|
|
18
16
|
//! - name: crate::provider::CommandPlan
|
|
19
17
|
//! what: expected_session_id 与 provider_projects_root 两个关键输入都来自 plan
|
|
20
18
|
//! boundary:
|
|
21
19
|
//! - 只回答「fork 有没有产生一个可读的、不等于源会话的新 backing」,不回答会话内容对不对
|
|
22
|
-
//! - 不创建/改写 backing
|
|
20
|
+
//! - 不创建/改写 backing
|
|
23
21
|
//! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
|
|
24
|
-
//! -
|
|
25
|
-
//! -
|
|
22
|
+
//! - gemini / fake 没有可验证 backing,一律直接 Rejected
|
|
23
|
+
//! - Codex / Grok worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
|
|
26
24
|
//! maturity: wired
|
|
27
25
|
//! ---
|
|
28
26
|
use std::collections::BTreeMap;
|
|
@@ -45,9 +43,8 @@ pub(crate) enum ContextForkTermination {
|
|
|
45
43
|
Rejected(#[from] ProviderError),
|
|
46
44
|
}
|
|
47
45
|
|
|
48
|
-
mod
|
|
46
|
+
mod claude;
|
|
49
47
|
mod outcome;
|
|
50
|
-
pub(crate) use codex::materialize_codex_fork;
|
|
51
48
|
pub(crate) use outcome::{
|
|
52
49
|
observe_context_fork, transition_pending_context_fork, ContextForkOutcome, PendingContextFork,
|
|
53
50
|
};
|
|
@@ -56,7 +53,7 @@ pub(crate) use outcome::{
|
|
|
56
53
|
/// purpose: 给出该 provider 等待 fork backing 落盘的收敛预算
|
|
57
54
|
/// params:
|
|
58
55
|
/// provider: 目标 provider;全枚举穷举,无兜底臂
|
|
59
|
-
/// returns:
|
|
56
|
+
/// returns: Claude/ClaudeCode 45s、其余(Codex/Copilot/Grok/Pi/GeminiCli/Fake) 5s
|
|
60
57
|
/// contract:
|
|
61
58
|
/// provides:
|
|
62
59
|
/// - name: context_fork_convergence_deadline
|
|
@@ -67,9 +64,8 @@ pub(crate) use outcome::{
|
|
|
67
64
|
pub(crate) fn context_fork_convergence_deadline(provider: Provider) -> Duration {
|
|
68
65
|
// Expiration is consumed by ContextForkOutcome::Pending(PendingContextFork).
|
|
69
66
|
match provider {
|
|
70
|
-
Provider::
|
|
71
|
-
Provider::
|
|
72
|
-
| Provider::ClaudeCode
|
|
67
|
+
Provider::Claude | Provider::ClaudeCode => Duration::from_secs(45),
|
|
68
|
+
Provider::Codex
|
|
73
69
|
| Provider::Copilot
|
|
74
70
|
| Provider::Grok
|
|
75
71
|
| Provider::Pi
|
|
@@ -125,13 +121,13 @@ impl ContextBackingSnapshot {
|
|
|
125
121
|
/// ---
|
|
126
122
|
/// purpose: fork 后按 provider 分派验证,只有拿到「新会话 backing 可读且不等于源会话」的实证才返回证明
|
|
127
123
|
/// params:
|
|
128
|
-
/// provider: 决定走 copilot(sqlite 行存在) /
|
|
124
|
+
/// provider: 决定走 copilot(sqlite 行存在) / claude(轮询双路径) 两条路之一
|
|
129
125
|
/// source_session_id: 被 fork 的源会话 id;新会话等于它即判失败
|
|
130
126
|
/// plan: 提供 expected_session_id 与隔离 backing 根
|
|
131
127
|
/// before: spawn 前的 ContextBackingSnapshot 基线,用于判「文件变过」
|
|
132
|
-
/// expected_backing_path: 精确快照路径。
|
|
133
|
-
/// spawn_cwd:
|
|
134
|
-
/// spawned_at:
|
|
128
|
+
/// expected_backing_path: 精确快照路径。claude 必需,缺失即拒绝;不做同目录猜测
|
|
129
|
+
/// spawn_cwd: claude 分支据此推导 provider 侧 projects 目录
|
|
130
|
+
/// spawned_at: 保留调用形状
|
|
135
131
|
/// deadline: 轮询预算,来自 context_fork_convergence_deadline
|
|
136
132
|
/// returns: ContextForkProof——新旧 session id、backing 路径、captured_via、attribution_confidence
|
|
137
133
|
/// errors: Timeout 表示预算内没看到可验证的新 backing;Rejected 包装 ProviderError(缺 expected id、路径不匹配、无可验证 backing 的 provider)
|
|
@@ -141,7 +137,7 @@ impl ContextBackingSnapshot {
|
|
|
141
137
|
/// what: 分派 + 兜底拒绝;本函数自身不轮询,轮询在各 provider 分支内
|
|
142
138
|
/// boundary:
|
|
143
139
|
/// - 不修改 backing、不写 state、不发事件
|
|
144
|
-
/// - _source_agent_id
|
|
140
|
+
/// - _source_agent_id / agent_id 当前不参与任何判定
|
|
145
141
|
/// - 未列入两条路径的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
|
|
146
142
|
/// ---
|
|
147
143
|
pub(crate) fn verify_context_fork(
|
|
@@ -151,23 +147,22 @@ pub(crate) fn verify_context_fork(
|
|
|
151
147
|
before: &ContextBackingSnapshot,
|
|
152
148
|
expected_backing_path: Option<&Path>,
|
|
153
149
|
_source_agent_id: &str,
|
|
154
|
-
|
|
150
|
+
_agent_id: &str,
|
|
155
151
|
spawn_cwd: &Path,
|
|
156
|
-
|
|
152
|
+
_spawned_at: &str,
|
|
157
153
|
deadline: Duration,
|
|
158
154
|
) -> Result<ContextForkProof, ContextForkTermination> {
|
|
159
155
|
if provider == Provider::Copilot {
|
|
160
156
|
return verify_copilot_fork(source_session_id, plan).map_err(Into::into);
|
|
161
157
|
}
|
|
162
|
-
if provider
|
|
163
|
-
return
|
|
158
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
159
|
+
return claude::verify_claude_fork(
|
|
160
|
+
provider,
|
|
164
161
|
source_session_id,
|
|
165
162
|
plan,
|
|
166
163
|
before,
|
|
167
164
|
expected_backing_path,
|
|
168
|
-
agent_id,
|
|
169
165
|
spawn_cwd,
|
|
170
|
-
spawned_at,
|
|
171
166
|
deadline,
|
|
172
167
|
);
|
|
173
168
|
}
|
|
@@ -242,10 +237,10 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
|
|
|
242
237
|
.map(PathBuf::from)
|
|
243
238
|
.unwrap_or_else(|| PathBuf::from("."));
|
|
244
239
|
match provider {
|
|
245
|
-
Provider::
|
|
240
|
+
Provider::Claude | Provider::ClaudeCode => home.join(".claude").join("projects"),
|
|
246
241
|
Provider::Copilot => home.join(".copilot").join("session-state"),
|
|
247
|
-
Provider::
|
|
248
|
-
Provider::
|
|
242
|
+
Provider::Codex | Provider::Grok | Provider::Pi => PathBuf::new(),
|
|
243
|
+
Provider::GeminiCli | Provider::Fake => home,
|
|
249
244
|
}
|
|
250
245
|
}
|
|
251
246
|
|
|
@@ -314,70 +309,88 @@ fn session_id_from_jsonl(path: &Path) -> Option<String> {
|
|
|
314
309
|
#[cfg(test)]
|
|
315
310
|
mod tests {
|
|
316
311
|
use super::*;
|
|
317
|
-
use std::io::Write;
|
|
318
312
|
|
|
319
313
|
#[test]
|
|
320
|
-
fn
|
|
321
|
-
let root =
|
|
322
|
-
|
|
314
|
+
fn claude_fork_proof_is_partitioned_by_exact_snapshot_path() {
|
|
315
|
+
let root = std::env::temp_dir().join(format!(
|
|
316
|
+
"ta-claude-fork-proof-partition-{}",
|
|
317
|
+
std::process::id()
|
|
318
|
+
));
|
|
323
319
|
let _ = std::fs::remove_dir_all(&root);
|
|
324
|
-
|
|
325
|
-
let
|
|
326
|
-
std::fs::create_dir_all(¤t_cwd).unwrap();
|
|
327
|
-
std::fs::create_dir_all(&foreign_cwd).unwrap();
|
|
328
|
-
let stale = root.join(
|
|
329
|
-
"2026/07/16/rollout-2026-07-16T08-05-43-019f6686-e2b6-7000-8000-000000000001.jsonl",
|
|
330
|
-
);
|
|
331
|
-
let fresh = root.join(
|
|
332
|
-
"2026/07/22/rollout-2026-07-22T04-01-01-019f8644-7450-7000-8000-000000000002.jsonl",
|
|
333
|
-
);
|
|
334
|
-
let foreign = root.join(
|
|
335
|
-
"2026/07/22/rollout-2026-07-22T04-01-02-019f8644-7838-7000-8000-000000000003.jsonl",
|
|
336
|
-
);
|
|
337
|
-
let write_rollout = |path: &Path, cwd: &Path, id: &str| {
|
|
338
|
-
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
|
|
339
|
-
std::fs::write(
|
|
340
|
-
path,
|
|
341
|
-
format!(
|
|
342
|
-
"{{\"type\":\"session_meta\",\"payload\":{{\"id\":\"{id}\",\"cwd\":\"{}\"}}}}\n",
|
|
343
|
-
cwd.to_string_lossy()
|
|
344
|
-
),
|
|
345
|
-
)
|
|
346
|
-
.unwrap();
|
|
347
|
-
};
|
|
348
|
-
write_rollout(&stale, ¤t_cwd, "stale-session");
|
|
320
|
+
std::fs::create_dir_all(root.join(".team/logs")).unwrap();
|
|
321
|
+
let expected = SessionId::new("22222222-2222-4222-8222-222222222222");
|
|
349
322
|
let plan = CommandPlan {
|
|
350
323
|
argv: Vec::new(),
|
|
351
|
-
expected_session_id:
|
|
324
|
+
expected_session_id: Some(expected.clone()),
|
|
352
325
|
provider_projects_root: Some(root.clone()),
|
|
353
326
|
managed_mcp_config: false,
|
|
354
327
|
};
|
|
355
|
-
let before = ContextBackingSnapshot::capture(Provider::
|
|
356
|
-
std::fs::
|
|
357
|
-
.
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
328
|
+
let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
|
|
329
|
+
std::fs::write(
|
|
330
|
+
root.join(".team/logs/events.jsonl"),
|
|
331
|
+
"{\"event\":\"noise\"}\n",
|
|
332
|
+
)
|
|
333
|
+
.unwrap();
|
|
334
|
+
std::fs::write(
|
|
335
|
+
root.join("11111111-1111-4111-8111-111111111111.jsonl"),
|
|
336
|
+
"{\"type\":\"sibling-snapshot\"}\n",
|
|
337
|
+
)
|
|
338
|
+
.unwrap();
|
|
339
|
+
let expected_path = root.join(format!("{}.jsonl", expected.as_str()));
|
|
340
|
+
std::fs::write(&expected_path, "{\"type\":\"own-snapshot\"}\n").unwrap();
|
|
365
341
|
let proof = verify_context_fork(
|
|
366
|
-
Provider::
|
|
342
|
+
Provider::Claude,
|
|
367
343
|
&SessionId::new("source-session"),
|
|
368
344
|
&plan,
|
|
369
345
|
&before,
|
|
370
|
-
|
|
346
|
+
Some(&expected_path),
|
|
371
347
|
"source",
|
|
372
348
|
"fork",
|
|
373
|
-
&
|
|
374
|
-
"2026-07-
|
|
349
|
+
&root,
|
|
350
|
+
"2026-07-22T00:00:00Z",
|
|
375
351
|
Duration::ZERO,
|
|
376
352
|
)
|
|
377
353
|
.unwrap();
|
|
378
|
-
|
|
379
|
-
assert_eq!(proof.
|
|
380
|
-
|
|
354
|
+
assert_eq!(proof.new_session_id, expected);
|
|
355
|
+
assert_eq!(proof.backing_path, expected_path);
|
|
356
|
+
let _ = std::fs::remove_dir_all(&root);
|
|
357
|
+
}
|
|
358
|
+
#[test]
|
|
359
|
+
fn claude_fork_proof_never_uses_events_jsonl_as_backing() {
|
|
360
|
+
let root = std::env::temp_dir().join(format!(
|
|
361
|
+
"ta-claude-fork-proof-no-events-{}",
|
|
362
|
+
std::process::id()
|
|
363
|
+
));
|
|
364
|
+
let _ = std::fs::remove_dir_all(&root);
|
|
365
|
+
std::fs::create_dir_all(root.join(".team/logs")).unwrap();
|
|
366
|
+
let expected = SessionId::new("33333333-3333-4333-8333-333333333333");
|
|
367
|
+
let plan = CommandPlan {
|
|
368
|
+
argv: Vec::new(),
|
|
369
|
+
expected_session_id: Some(expected.clone()),
|
|
370
|
+
provider_projects_root: Some(root.clone()),
|
|
371
|
+
managed_mcp_config: false,
|
|
372
|
+
};
|
|
373
|
+
let before = ContextBackingSnapshot::capture(Provider::Claude, &plan);
|
|
374
|
+
std::fs::write(
|
|
375
|
+
root.join(".team/logs/events.jsonl"),
|
|
376
|
+
"{\"event\":\"noise\"}\n",
|
|
377
|
+
)
|
|
378
|
+
.unwrap();
|
|
379
|
+
let missing = root.join(format!("{}.jsonl", expected.as_str()));
|
|
380
|
+
let error = verify_context_fork(
|
|
381
|
+
Provider::Claude,
|
|
382
|
+
&SessionId::new("source-session"),
|
|
383
|
+
&plan,
|
|
384
|
+
&before,
|
|
385
|
+
Some(&missing),
|
|
386
|
+
"source",
|
|
387
|
+
"fork",
|
|
388
|
+
&root,
|
|
389
|
+
"2026-07-22T00:00:00Z",
|
|
390
|
+
Duration::ZERO,
|
|
391
|
+
)
|
|
392
|
+
.unwrap_err();
|
|
393
|
+
assert!(error.to_string().contains("context_fork_unverified"));
|
|
381
394
|
let _ = std::fs::remove_dir_all(&root);
|
|
382
395
|
}
|
|
383
396
|
}
|
|
@@ -29,9 +29,8 @@ pub mod resume;
|
|
|
29
29
|
|
|
30
30
|
pub use context_fork::ContextForkProof;
|
|
31
31
|
pub(crate) use context_fork::{
|
|
32
|
-
context_fork_convergence_deadline,
|
|
33
|
-
|
|
34
|
-
PendingContextFork,
|
|
32
|
+
context_fork_convergence_deadline, observe_context_fork, transition_pending_context_fork,
|
|
33
|
+
ContextBackingSnapshot, ContextForkOutcome, PendingContextFork,
|
|
35
34
|
};
|
|
36
35
|
|
|
37
36
|
pub use resume::{RecoveryHint, ResumeRefusalReason};
|