@team-agent/installer 0.5.127 → 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 -22
- package/crates/team-agent/src/cli/emit.rs +58 -26
- package/crates/team-agent/src/cli/intent/runtime.rs +32 -5
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +102 -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 +25 -8
- package/crates/team-agent/src/cli/models.rs +764 -7
- 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 +1 -1
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +9 -6
- package/crates/team-agent/src/cli/tests/status_send.rs +68 -271
- package/crates/team-agent/src/compiler/tests.rs +3 -18
- package/crates/team-agent/src/compiler.rs +205 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +145 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +7 -7
- package/crates/team-agent/src/contract_runtime/config.rs +26 -16
- 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 -11
- 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 +56 -92
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +11 -11
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +16 -54
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +42 -0
- 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 +38 -13
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +9 -1
- 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 +24 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +36 -13
- package/crates/team-agent/src/lifecycle/launch.rs +24 -1
- package/crates/team-agent/src/lifecycle/profile_launch.rs +321 -11
- 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 +345 -35
- 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 +39 -14
- 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 +236 -13
- 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 +5 -4
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +47 -18
- 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 +14 -14
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +28 -26
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- 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 +10 -11
- 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 +254 -2
- 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 +5 -6
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +16 -7
- package/crates/team-agent/src/lifecycle/tests.rs +3 -0
- package/crates/team-agent/src/lifecycle/types.rs +18 -2
- 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 +98 -119
- 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 +160 -218
- 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 +191 -85
- package/crates/team-agent/src/messaging/tests/runtime.rs +4 -110
- package/crates/team-agent/src/messaging/tests/spine.rs +40 -24
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +303 -51
- 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 -5
- 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 +106 -6
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +4 -0
- package/crates/team-agent/src/provider/session/context_fork.rs +150 -18
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +44 -8
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +16 -6
- package/crates/team-agent/src/provider/tests/adapter.rs +104 -17
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +12 -3
- package/crates/team-agent/src/provider/tests/idle.rs +37 -0
- package/crates/team-agent/src/provider/wire.rs +22 -34
- 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 +5 -40
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +5 -7
- package/skills/team-agent/command-coverage.json +1 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -3
- package/skills/team-agent/references/team-agent-operator.md +3 -3
|
@@ -626,7 +626,7 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
|
|
|
626
626
|
/// params:
|
|
627
627
|
/// workspace: event log 所在工作区
|
|
628
628
|
/// agent_id: 目标席位;事件的 agent_id 或 worker_id 命中即算该席位
|
|
629
|
-
/// previous: 修复前的 agent
|
|
629
|
+
/// previous: 修复前的 agent 行;provider 字段决定要不要套 claude leader-marker 过滤
|
|
630
630
|
/// adapter: 用于二次确认候选会话确实可 resume
|
|
631
631
|
/// auth_mode: 传给 session_is_resumable 的鉴权模式
|
|
632
632
|
/// exclude_session_ids: 调用方给出的黑名单(例如刚被判为不可用的会话)
|
|
@@ -640,7 +640,7 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
|
|
|
640
640
|
/// - 只读 event log 与 rollout 路径存在性,不扫 provider 存档、不调分配器
|
|
641
641
|
/// - 不走分配器的 claimed-key 冲突检查,只看 exclude_session_ids 与 tombstone
|
|
642
642
|
/// - rollout_path 存在性用 exists()——对目录型 backing(grok)只要目录在就为真
|
|
643
|
-
/// -
|
|
643
|
+
/// - claude 家族额外过滤 leader-marker transcript;其它 provider 无等价归属过滤
|
|
644
644
|
/// - 修复成功会清掉 attribution_ambiguous 标记
|
|
645
645
|
/// ---
|
|
646
646
|
pub fn recover_resume_session_from_events(
|
|
@@ -651,6 +651,13 @@ pub fn recover_resume_session_from_events(
|
|
|
651
651
|
auth_mode: crate::provider::AuthMode,
|
|
652
652
|
exclude_session_ids: &BTreeSet<String>,
|
|
653
653
|
) -> Result<Option<Value>, ProviderError> {
|
|
654
|
+
// E57 postflight: read the agent's provider once; needed for the Claude
|
|
655
|
+
// leader-marker filter below. Falls back to None on non-string / missing,
|
|
656
|
+
// in which case the marker filter is skipped (only meaningful for Claude).
|
|
657
|
+
let provider = previous
|
|
658
|
+
.get("provider")
|
|
659
|
+
.and_then(Value::as_str)
|
|
660
|
+
.and_then(parse_provider);
|
|
654
661
|
let events = crate::event_log::EventLog::new(workspace)
|
|
655
662
|
.tail(0)
|
|
656
663
|
.map_err(|e| ProviderError::Io(e.to_string()))?;
|
|
@@ -680,6 +687,23 @@ pub fn recover_resume_session_from_events(
|
|
|
680
687
|
let Some(rollout_path) = event_rollout_path(event).filter(|path| path.exists()) else {
|
|
681
688
|
continue;
|
|
682
689
|
};
|
|
690
|
+
// E57 postflight (lane-046-capture-gap): the capture allocator already
|
|
691
|
+
// refuses Claude leader transcripts (P0 d39b5104,
|
|
692
|
+
// provider/session_scan/claude.rs leader marker). Event-log
|
|
693
|
+
// repair must apply the SAME filter — otherwise a stale `session.captured`
|
|
694
|
+
// event from a pre-fix run (or from a window where the allocator was
|
|
695
|
+
// bypassed) still pulls the 590MB leader transcript onto a worker on the
|
|
696
|
+
// next restart (Mac mini repro: session_id=ea059b82 reassigned to
|
|
697
|
+
// release-engineer via captured_via=event_log_repair). The check is
|
|
698
|
+
// a no-op for non-Claude providers.
|
|
699
|
+
if let Some(p) = provider {
|
|
700
|
+
if crate::provider::session_scan::rollout_path_has_claude_leader_marker(
|
|
701
|
+
p,
|
|
702
|
+
&rollout_path,
|
|
703
|
+
) {
|
|
704
|
+
continue;
|
|
705
|
+
}
|
|
706
|
+
}
|
|
683
707
|
let session = SessionId::new(session_id.to_string());
|
|
684
708
|
if !adapter.session_is_resumable(Some(&session), auth_mode)? {
|
|
685
709
|
continue;
|
|
@@ -876,15 +900,15 @@ mod stopped_capture_tests {
|
|
|
876
900
|
#[test]
|
|
877
901
|
fn explicit_stop_is_checked_before_adapter_or_backing_probes() {
|
|
878
902
|
for row in [
|
|
879
|
-
serde_json::json!({"status":"stopped","provider":"
|
|
880
|
-
serde_json::json!({"status":"running","explicit_stop":true,"provider":"
|
|
881
|
-
serde_json::json!({"status":"running","explicit_stop":"false","provider":"
|
|
903
|
+
serde_json::json!({"status":"stopped","provider":"pi","spawn_cwd":"/controlled"}),
|
|
904
|
+
serde_json::json!({"status":"running","explicit_stop":true,"provider":"pi","spawn_cwd":"/controlled"}),
|
|
905
|
+
serde_json::json!({"status":"running","explicit_stop":"false","provider":"pi","spawn_cwd":"/controlled"}),
|
|
882
906
|
] {
|
|
883
907
|
assert!(incomplete_resumable_provider(&row, &mut |_| panic!("held seat reached adapter lookup")).is_none());
|
|
884
908
|
}
|
|
885
909
|
let mut calls = 0;
|
|
886
910
|
let _ = incomplete_resumable_provider(
|
|
887
|
-
&serde_json::json!({"status":"running","explicit_stop":false,"provider":"
|
|
911
|
+
&serde_json::json!({"status":"running","explicit_stop":false,"provider":"pi","spawn_cwd":"/controlled"}),
|
|
888
912
|
&mut |provider| { calls += 1; crate::provider::get_adapter(provider) },
|
|
889
913
|
);
|
|
890
914
|
assert_eq!(calls, 1, "active control must still be eligible for capture");
|
|
@@ -2550,6 +2574,82 @@ mod u1_tests {
|
|
|
2550
2574
|
let _ = std::fs::remove_dir_all(&dir);
|
|
2551
2575
|
}
|
|
2552
2576
|
|
|
2577
|
+
/// E57 RED postflight (lane-046-capture-gap): `recover_resume_session_from_events`
|
|
2578
|
+
/// must refuse to repair a worker's session from a stale `session.captured`
|
|
2579
|
+
/// event whose rollout file is a Claude LEADER transcript
|
|
2580
|
+
/// (`customTitle == "claude leader"`). Without this filter, a fresh restart
|
|
2581
|
+
/// after a pre-fix run still pulls the leader transcript onto a worker via
|
|
2582
|
+
/// captured_via=event_log_repair (Mac mini evidence:
|
|
2583
|
+
/// resume.session_repaired session_id=ea059b82 → release-engineer).
|
|
2584
|
+
#[test]
|
|
2585
|
+
fn e57_recover_resume_refuses_claude_leader_marker_rollout() {
|
|
2586
|
+
use std::io::Write;
|
|
2587
|
+
use std::sync::atomic::{AtomicU64, Ordering};
|
|
2588
|
+
static COUNTER: AtomicU64 = AtomicU64::new(0);
|
|
2589
|
+
let uniq = COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
2590
|
+
let workspace =
|
|
2591
|
+
std::env::temp_dir().join(format!("ta-e57-recover-{}-{}", std::process::id(), uniq));
|
|
2592
|
+
let _ = std::fs::remove_dir_all(&workspace);
|
|
2593
|
+
std::fs::create_dir_all(&workspace).expect("workspace");
|
|
2594
|
+
|
|
2595
|
+
// Write a leader-marker rollout file (claude TUI leader transcript).
|
|
2596
|
+
let rollout = workspace.join("ea059b82-leader.jsonl");
|
|
2597
|
+
let mut f = std::fs::File::create(&rollout).expect("rollout");
|
|
2598
|
+
writeln!(
|
|
2599
|
+
f,
|
|
2600
|
+
"{{\"customTitle\":\"claude leader\",\"sessionId\":\"ea059b82-c53e-4654-9590-9f3e6d46f0ca\",\"cwd\":\"/tmp/e57\"}}"
|
|
2601
|
+
)
|
|
2602
|
+
.unwrap();
|
|
2603
|
+
writeln!(f, "{{\"role\":\"user\",\"content\":\"hi\"}}").unwrap();
|
|
2604
|
+
drop(f);
|
|
2605
|
+
|
|
2606
|
+
// Write a `session.captured` event into events.jsonl pointing
|
|
2607
|
+
// release-engineer at the leader rollout — simulates the stale
|
|
2608
|
+
// pre-fix event that triggered the bug.
|
|
2609
|
+
let event_log = crate::event_log::EventLog::new(&workspace);
|
|
2610
|
+
event_log
|
|
2611
|
+
.write(
|
|
2612
|
+
"session.captured",
|
|
2613
|
+
serde_json::json!({
|
|
2614
|
+
"agent_id": "release-engineer",
|
|
2615
|
+
"provider": "claude",
|
|
2616
|
+
"session_id": "ea059b82-c53e-4654-9590-9f3e6d46f0ca",
|
|
2617
|
+
"rollout_path": rollout.to_string_lossy().to_string(),
|
|
2618
|
+
"captured_via": "fs_watch",
|
|
2619
|
+
}),
|
|
2620
|
+
)
|
|
2621
|
+
.expect("event write");
|
|
2622
|
+
|
|
2623
|
+
let previous = serde_json::json!({
|
|
2624
|
+
"provider": "claude",
|
|
2625
|
+
"session_id": null,
|
|
2626
|
+
"rollout_path": null,
|
|
2627
|
+
});
|
|
2628
|
+
let adapter = test_support::CaptureCandidatesAdapter::new(Provider::Claude, None, "");
|
|
2629
|
+
let exclude = BTreeSet::new();
|
|
2630
|
+
let result = recover_resume_session_from_events(
|
|
2631
|
+
&workspace,
|
|
2632
|
+
"release-engineer",
|
|
2633
|
+
&previous,
|
|
2634
|
+
&adapter,
|
|
2635
|
+
crate::provider::AuthMode::Subscription,
|
|
2636
|
+
&exclude,
|
|
2637
|
+
)
|
|
2638
|
+
.expect("recover call ok");
|
|
2639
|
+
|
|
2640
|
+
assert!(
|
|
2641
|
+
result.is_none(),
|
|
2642
|
+
"E57 postflight: recover_resume_session_from_events must REFUSE \
|
|
2643
|
+
to repair from a Claude leader-marker rollout (event_log_repair \
|
|
2644
|
+
cannot resurrect a stale leader-to-worker assignment); got {result:?}"
|
|
2645
|
+
);
|
|
2646
|
+
|
|
2647
|
+
let _ = std::fs::remove_file(&rollout);
|
|
2648
|
+
let _ = std::fs::remove_file(workspace.join(".team/logs/events.jsonl"));
|
|
2649
|
+
let _ = std::fs::remove_dir_all(workspace.join(".team"));
|
|
2650
|
+
let _ = std::fs::remove_dir_all(&workspace);
|
|
2651
|
+
}
|
|
2652
|
+
|
|
2553
2653
|
/// S1-CAPTURE-001 (0.4.8): pending mismatch guard. When fresh-start has
|
|
2554
2654
|
/// written a new `_pending_session_id` but the old authoritative
|
|
2555
2655
|
/// `session_id` is still present and differs, `agent_session_complete`
|
|
@@ -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
|
+
}
|
|
@@ -135,6 +135,10 @@ mod tests {
|
|
|
135
135
|
|
|
136
136
|
#[test]
|
|
137
137
|
fn convergence_deadlines_are_bounded_for_every_provider() {
|
|
138
|
+
assert_eq!(
|
|
139
|
+
context_fork_convergence_deadline(Provider::Claude),
|
|
140
|
+
Duration::from_secs(45)
|
|
141
|
+
);
|
|
138
142
|
for provider in [Provider::Codex, Provider::Copilot, Provider::Grok] {
|
|
139
143
|
assert_eq!(context_fork_convergence_deadline(provider), Duration::from_secs(5));
|
|
140
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:
|
|
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
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
//! - 不创建/改写 backing
|
|
21
21
|
//! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
|
|
22
22
|
//! - gemini / fake 没有可验证 backing,一律直接 Rejected
|
|
23
|
-
//! -
|
|
23
|
+
//! - Codex / Grok worker 只走 contract leaf 的原生 new-seat fork;遗留 worker 行一律 Rejected
|
|
24
24
|
//! maturity: wired
|
|
25
25
|
//! ---
|
|
26
26
|
use std::collections::BTreeMap;
|
|
@@ -43,6 +43,7 @@ pub(crate) enum ContextForkTermination {
|
|
|
43
43
|
Rejected(#[from] ProviderError),
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
+
mod claude;
|
|
46
47
|
mod outcome;
|
|
47
48
|
pub(crate) use outcome::{
|
|
48
49
|
observe_context_fork, transition_pending_context_fork, ContextForkOutcome, PendingContextFork,
|
|
@@ -52,7 +53,7 @@ pub(crate) use outcome::{
|
|
|
52
53
|
/// purpose: 给出该 provider 等待 fork backing 落盘的收敛预算
|
|
53
54
|
/// params:
|
|
54
55
|
/// provider: 目标 provider;全枚举穷举,无兜底臂
|
|
55
|
-
/// returns:
|
|
56
|
+
/// returns: Claude/ClaudeCode 45s、其余(Codex/Copilot/Grok/Pi/GeminiCli/Fake) 5s
|
|
56
57
|
/// contract:
|
|
57
58
|
/// provides:
|
|
58
59
|
/// - name: context_fork_convergence_deadline
|
|
@@ -63,9 +64,8 @@ pub(crate) use outcome::{
|
|
|
63
64
|
pub(crate) fn context_fork_convergence_deadline(provider: Provider) -> Duration {
|
|
64
65
|
// Expiration is consumed by ContextForkOutcome::Pending(PendingContextFork).
|
|
65
66
|
match provider {
|
|
66
|
-
Provider::Claude
|
|
67
|
-
|
|
68
|
-
| Provider::Codex
|
|
67
|
+
Provider::Claude | Provider::ClaudeCode => Duration::from_secs(45),
|
|
68
|
+
Provider::Codex
|
|
69
69
|
| Provider::Copilot
|
|
70
70
|
| Provider::Grok
|
|
71
71
|
| Provider::Pi
|
|
@@ -121,12 +121,12 @@ impl ContextBackingSnapshot {
|
|
|
121
121
|
/// ---
|
|
122
122
|
/// purpose: fork 后按 provider 分派验证,只有拿到「新会话 backing 可读且不等于源会话」的实证才返回证明
|
|
123
123
|
/// params:
|
|
124
|
-
/// provider:
|
|
124
|
+
/// provider: 决定走 copilot(sqlite 行存在) / claude(轮询双路径) 两条路之一
|
|
125
125
|
/// source_session_id: 被 fork 的源会话 id;新会话等于它即判失败
|
|
126
126
|
/// plan: 提供 expected_session_id 与隔离 backing 根
|
|
127
127
|
/// before: spawn 前的 ContextBackingSnapshot 基线,用于判「文件变过」
|
|
128
|
-
/// expected_backing_path:
|
|
129
|
-
/// spawn_cwd:
|
|
128
|
+
/// expected_backing_path: 精确快照路径。claude 必需,缺失即拒绝;不做同目录猜测
|
|
129
|
+
/// spawn_cwd: claude 分支据此推导 provider 侧 projects 目录
|
|
130
130
|
/// spawned_at: 保留调用形状
|
|
131
131
|
/// deadline: 轮询预算,来自 context_fork_convergence_deadline
|
|
132
132
|
/// returns: ContextForkProof——新旧 session id、backing 路径、captured_via、attribution_confidence
|
|
@@ -138,23 +138,34 @@ impl ContextBackingSnapshot {
|
|
|
138
138
|
/// boundary:
|
|
139
139
|
/// - 不修改 backing、不写 state、不发事件
|
|
140
140
|
/// - _source_agent_id / agent_id 当前不参与任何判定
|
|
141
|
-
/// -
|
|
141
|
+
/// - 未列入两条路径的 provider 一律 CaptureFailed,绝不返回「无法验证但放行」
|
|
142
142
|
/// ---
|
|
143
143
|
pub(crate) fn verify_context_fork(
|
|
144
144
|
provider: Provider,
|
|
145
145
|
source_session_id: &SessionId,
|
|
146
146
|
plan: &CommandPlan,
|
|
147
|
-
|
|
148
|
-
|
|
147
|
+
before: &ContextBackingSnapshot,
|
|
148
|
+
expected_backing_path: Option<&Path>,
|
|
149
149
|
_source_agent_id: &str,
|
|
150
150
|
_agent_id: &str,
|
|
151
|
-
|
|
151
|
+
spawn_cwd: &Path,
|
|
152
152
|
_spawned_at: &str,
|
|
153
|
-
|
|
153
|
+
deadline: Duration,
|
|
154
154
|
) -> Result<ContextForkProof, ContextForkTermination> {
|
|
155
155
|
if provider == Provider::Copilot {
|
|
156
156
|
return verify_copilot_fork(source_session_id, plan).map_err(Into::into);
|
|
157
157
|
}
|
|
158
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
159
|
+
return claude::verify_claude_fork(
|
|
160
|
+
provider,
|
|
161
|
+
source_session_id,
|
|
162
|
+
plan,
|
|
163
|
+
before,
|
|
164
|
+
expected_backing_path,
|
|
165
|
+
spawn_cwd,
|
|
166
|
+
deadline,
|
|
167
|
+
);
|
|
168
|
+
}
|
|
158
169
|
Err(ProviderError::CaptureFailed(format!(
|
|
159
170
|
"context_fork_unverified: {provider:?} has no verifiable fork backing"
|
|
160
171
|
))
|
|
@@ -226,10 +237,9 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
|
|
|
226
237
|
.map(PathBuf::from)
|
|
227
238
|
.unwrap_or_else(|| PathBuf::from("."));
|
|
228
239
|
match provider {
|
|
240
|
+
Provider::Claude | Provider::ClaudeCode => home.join(".claude").join("projects"),
|
|
229
241
|
Provider::Copilot => home.join(".copilot").join("session-state"),
|
|
230
|
-
Provider::
|
|
231
|
-
PathBuf::new()
|
|
232
|
-
}
|
|
242
|
+
Provider::Codex | Provider::Grok | Provider::Pi => PathBuf::new(),
|
|
233
243
|
Provider::GeminiCli | Provider::Fake => home,
|
|
234
244
|
}
|
|
235
245
|
}
|
|
@@ -262,3 +272,125 @@ fn file_stamp(path: &Path) -> Option<FileStamp> {
|
|
|
262
272
|
modified: meta.modified().ok(),
|
|
263
273
|
})
|
|
264
274
|
}
|
|
275
|
+
|
|
276
|
+
fn readable_jsonl(path: &Path) -> bool {
|
|
277
|
+
std::fs::read_to_string(path)
|
|
278
|
+
.ok()
|
|
279
|
+
.and_then(|text| {
|
|
280
|
+
text.lines()
|
|
281
|
+
.find(|line| !line.trim().is_empty())
|
|
282
|
+
.map(str::to_string)
|
|
283
|
+
})
|
|
284
|
+
.is_some_and(|line| serde_json::from_str::<serde_json::Value>(&line).is_ok())
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
fn session_id_from_jsonl(path: &Path) -> Option<String> {
|
|
288
|
+
let text = std::fs::read_to_string(path).ok()?;
|
|
289
|
+
text.lines()
|
|
290
|
+
.filter_map(|line| serde_json::from_str::<serde_json::Value>(line).ok())
|
|
291
|
+
.find_map(|record| {
|
|
292
|
+
record
|
|
293
|
+
.get("sessionId")
|
|
294
|
+
.or_else(|| record.get("session_id"))
|
|
295
|
+
.and_then(serde_json::Value::as_str)
|
|
296
|
+
.map(ToString::to_string)
|
|
297
|
+
.or_else(|| {
|
|
298
|
+
record
|
|
299
|
+
.get("session_meta")
|
|
300
|
+
.and_then(|value| value.get("payload"))
|
|
301
|
+
.or_else(|| record.get("payload"))
|
|
302
|
+
.and_then(|value| value.get("id"))
|
|
303
|
+
.and_then(serde_json::Value::as_str)
|
|
304
|
+
.map(ToString::to_string)
|
|
305
|
+
})
|
|
306
|
+
})
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
#[cfg(test)]
|
|
310
|
+
mod tests {
|
|
311
|
+
use super::*;
|
|
312
|
+
|
|
313
|
+
#[test]
|
|
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
|
+
));
|
|
319
|
+
let _ = std::fs::remove_dir_all(&root);
|
|
320
|
+
std::fs::create_dir_all(root.join(".team/logs")).unwrap();
|
|
321
|
+
let expected = SessionId::new("22222222-2222-4222-8222-222222222222");
|
|
322
|
+
let plan = CommandPlan {
|
|
323
|
+
argv: Vec::new(),
|
|
324
|
+
expected_session_id: Some(expected.clone()),
|
|
325
|
+
provider_projects_root: Some(root.clone()),
|
|
326
|
+
managed_mcp_config: false,
|
|
327
|
+
};
|
|
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();
|
|
341
|
+
let proof = verify_context_fork(
|
|
342
|
+
Provider::Claude,
|
|
343
|
+
&SessionId::new("source-session"),
|
|
344
|
+
&plan,
|
|
345
|
+
&before,
|
|
346
|
+
Some(&expected_path),
|
|
347
|
+
"source",
|
|
348
|
+
"fork",
|
|
349
|
+
&root,
|
|
350
|
+
"2026-07-22T00:00:00Z",
|
|
351
|
+
Duration::ZERO,
|
|
352
|
+
)
|
|
353
|
+
.unwrap();
|
|
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"));
|
|
394
|
+
let _ = std::fs::remove_dir_all(&root);
|
|
395
|
+
}
|
|
396
|
+
}
|