@team-agent/installer 0.5.125 → 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 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- 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/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- 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/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- 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 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- 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/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 +22 -138
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -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_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 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -23
- 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/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- 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/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/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/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/test_support/models_timeout_fixture.rs +0 -144
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
//! Provider model discovery, bounded native catalog queries, and shared fuzzy search.
|
|
2
|
-
use std::collections::
|
|
2
|
+
use std::collections::HashSet;
|
|
3
3
|
use std::ffi::OsString;
|
|
4
4
|
use std::io::{Read, Write};
|
|
5
|
-
use std::path::
|
|
5
|
+
use std::path::Path;
|
|
6
6
|
use std::process::{Child, Command, ExitStatus, Stdio};
|
|
7
|
-
use std::sync::atomic::{AtomicU64, Ordering};
|
|
8
7
|
use std::sync::mpsc;
|
|
9
8
|
use std::time::{Duration, Instant};
|
|
10
9
|
|
|
@@ -13,8 +12,6 @@ use crate::provider::wire::{parse_canonical_provider, provider_wire};
|
|
|
13
12
|
|
|
14
13
|
const CATALOG_TIMEOUT: Duration = Duration::from_secs(10);
|
|
15
14
|
const MAX_CATALOG_BYTES: u64 = 1024 * 1024;
|
|
16
|
-
const CLAUDE_REQUEST_ID: &str = "team-agent-model-catalog";
|
|
17
|
-
static TEMP_DIR_SEQUENCE: AtomicU64 = AtomicU64::new(0);
|
|
18
15
|
|
|
19
16
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
20
17
|
pub struct ModelRecord {
|
|
@@ -130,20 +127,23 @@ pub fn parse_catalog_provider(name: &str) -> Option<Provider> {
|
|
|
130
127
|
|
|
131
128
|
#[derive(Clone, Copy)]
|
|
132
129
|
enum CatalogSource {
|
|
133
|
-
Pi,
|
|
134
130
|
Codex,
|
|
135
131
|
Grok,
|
|
136
|
-
Claude,
|
|
137
132
|
}
|
|
138
133
|
|
|
139
134
|
// Exhaustive by design: a new Provider variant must make an explicit catalog decision.
|
|
135
|
+
// `team-agent models --provider claude|claude_code|pi` reads the contract
|
|
136
|
+
// leaf's catalog (contract_runtime::discovery) before reaching this table.
|
|
140
137
|
fn catalog_source(provider: Provider) -> Option<CatalogSource> {
|
|
141
138
|
match provider {
|
|
142
|
-
Provider::Pi => Some(CatalogSource::Pi),
|
|
143
139
|
Provider::Codex => Some(CatalogSource::Codex),
|
|
144
|
-
Provider::Claude | Provider::ClaudeCode => Some(CatalogSource::Claude),
|
|
145
140
|
Provider::Grok => Some(CatalogSource::Grok),
|
|
146
|
-
Provider::
|
|
141
|
+
Provider::Claude
|
|
142
|
+
| Provider::ClaudeCode
|
|
143
|
+
| Provider::Pi
|
|
144
|
+
| Provider::Copilot
|
|
145
|
+
| Provider::GeminiCli
|
|
146
|
+
| Provider::Fake => None,
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
|
|
@@ -152,10 +152,6 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
|
|
|
152
152
|
let source = catalog_source(provider).ok_or(CatalogError::UnsupportedProvider)?;
|
|
153
153
|
let requested_provider = provider_wire(provider);
|
|
154
154
|
let records = match source {
|
|
155
|
-
CatalogSource::Pi => {
|
|
156
|
-
let bytes = run_native("pi", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
157
|
-
parse_pi_catalog(&bytes)?
|
|
158
|
-
}
|
|
159
155
|
CatalogSource::Codex => {
|
|
160
156
|
let bytes = run_native("codex", &["debug", "models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
161
157
|
parse_codex_catalog(&bytes, requested_provider)?
|
|
@@ -164,7 +160,6 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
|
|
|
164
160
|
let bytes = run_native("grok", &["models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
165
161
|
parse_grok_catalog(&bytes)?
|
|
166
162
|
}
|
|
167
|
-
CatalogSource::Claude => discover_claude_catalog(requested_provider)?,
|
|
168
163
|
};
|
|
169
164
|
Ok(records)
|
|
170
165
|
}
|
|
@@ -355,90 +350,6 @@ fn parse_codex_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>,
|
|
|
355
350
|
Ok(visible)
|
|
356
351
|
}
|
|
357
352
|
|
|
358
|
-
fn discover_claude_catalog(provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
359
|
-
let cwd = OwnedTempDir::create()?;
|
|
360
|
-
let args = [
|
|
361
|
-
"--print", "--input-format", "stream-json", "--output-format", "stream-json", "--verbose",
|
|
362
|
-
"--no-session-persistence", "--strict-mcp-config", "--mcp-config", r#"{"mcpServers":{}}"#,
|
|
363
|
-
"--setting-sources", "", "--settings", r#"{"disableAllHooks":true}"#, "--tools", "", "--no-chrome",
|
|
364
|
-
];
|
|
365
|
-
let request = serde_json::json!({"type":"control_request","request_id":CLAUDE_REQUEST_ID,"request":{"subtype":"initialize","hooks":{},"agents":{},"skills":[]}});
|
|
366
|
-
let mut input = serde_json::to_vec(&request).map_err(|_| CatalogError::InvalidProtocol)?;
|
|
367
|
-
input.push(b'\n');
|
|
368
|
-
let bytes = run_native("claude", &args, Some(&input), Some(&cwd.0), &["CLAUDECODE"], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
369
|
-
parse_claude_catalog(&bytes, provider)
|
|
370
|
-
}
|
|
371
|
-
|
|
372
|
-
fn parse_claude_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
373
|
-
let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
|
|
374
|
-
let mut response = None;
|
|
375
|
-
for line in text.lines() {
|
|
376
|
-
if line.is_empty() { return Err(CatalogError::InvalidProtocol); }
|
|
377
|
-
let frame: serde_json::Value = serde_json::from_str(line).map_err(|_| CatalogError::InvalidProtocol)?;
|
|
378
|
-
let frame_type = frame
|
|
379
|
-
.get("type")
|
|
380
|
-
.and_then(serde_json::Value::as_str)
|
|
381
|
-
.filter(|frame_type| !frame_type.is_empty())
|
|
382
|
-
.ok_or(CatalogError::InvalidProtocol)?;
|
|
383
|
-
if frame_type != "control_response" {
|
|
384
|
-
continue;
|
|
385
|
-
}
|
|
386
|
-
if response.is_some() {
|
|
387
|
-
return Err(CatalogError::InvalidProtocol);
|
|
388
|
-
}
|
|
389
|
-
let result = frame.get("response").ok_or(CatalogError::UnsupportedSchema)?;
|
|
390
|
-
let outer_request_id = frame.get("request_id").and_then(serde_json::Value::as_str);
|
|
391
|
-
let inner_request_id = result.get("request_id").and_then(serde_json::Value::as_str);
|
|
392
|
-
if (outer_request_id != Some(CLAUDE_REQUEST_ID) && inner_request_id != Some(CLAUDE_REQUEST_ID))
|
|
393
|
-
|| frame.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
|
|
394
|
-
|| result.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
|
|
395
|
-
{
|
|
396
|
-
return Err(CatalogError::InvalidProtocol);
|
|
397
|
-
}
|
|
398
|
-
if result.get("subtype").and_then(serde_json::Value::as_str) != Some("success") { return Err(CatalogError::InvalidProtocol); }
|
|
399
|
-
let rows = result.get("response").and_then(|v| v.get("models")).and_then(serde_json::Value::as_array).ok_or(CatalogError::UnsupportedSchema)?;
|
|
400
|
-
response = Some(rows.clone());
|
|
401
|
-
}
|
|
402
|
-
let rows = response.ok_or(CatalogError::InvalidProtocol)?;
|
|
403
|
-
if rows.is_empty() { return Err(CatalogError::Empty); }
|
|
404
|
-
let mut source_values = HashSet::new();
|
|
405
|
-
let mut by_id = HashMap::<String, usize>::new();
|
|
406
|
-
let mut records: Vec<ModelRecord> = Vec::new();
|
|
407
|
-
let mut group_defaults = Vec::<bool>::new();
|
|
408
|
-
let mut group_has_non_default_display = Vec::<bool>::new();
|
|
409
|
-
let mut any_default = false;
|
|
410
|
-
for row in rows {
|
|
411
|
-
let row = row.as_object().ok_or(CatalogError::Malformed)?;
|
|
412
|
-
let value = required_string(row.get("value"))?;
|
|
413
|
-
let resolved = required_string(row.get("resolvedModel")).map_err(|_| CatalogError::UnsupportedSchema)?;
|
|
414
|
-
let display = required_string(row.get("displayName")).map_err(|_| CatalogError::UnsupportedSchema)?;
|
|
415
|
-
validate_identity(value)?;
|
|
416
|
-
validate_identity(resolved)?;
|
|
417
|
-
validate_display(display)?;
|
|
418
|
-
if !source_values.insert(value.to_string()) { return Err(CatalogError::DuplicateIdentity(value.into())); }
|
|
419
|
-
let is_default = value == "default";
|
|
420
|
-
any_default |= is_default;
|
|
421
|
-
if let Some(index) = by_id.get(resolved).copied() {
|
|
422
|
-
let record = &mut records[index];
|
|
423
|
-
record.aliases.push(value.into());
|
|
424
|
-
if !is_default && !group_has_non_default_display[index] {
|
|
425
|
-
record.display_name = display.into();
|
|
426
|
-
group_has_non_default_display[index] = true;
|
|
427
|
-
}
|
|
428
|
-
group_defaults[index] |= is_default;
|
|
429
|
-
} else {
|
|
430
|
-
by_id.insert(resolved.into(), records.len());
|
|
431
|
-
records.push(ModelRecord { provider: provider.into(), vendor: "anthropic".into(), id: resolved.into(), display_name: display.into(), default: None, aliases: vec![value.into()] });
|
|
432
|
-
group_defaults.push(is_default);
|
|
433
|
-
group_has_non_default_display.push(!is_default);
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
for (record, is_default) in records.iter_mut().zip(group_defaults) {
|
|
437
|
-
record.default = any_default.then_some(is_default);
|
|
438
|
-
}
|
|
439
|
-
Ok(records)
|
|
440
|
-
}
|
|
441
|
-
|
|
442
353
|
fn required_string(value: Option<&serde_json::Value>) -> Result<&str, CatalogError> {
|
|
443
354
|
let value = value.and_then(serde_json::Value::as_str).ok_or(CatalogError::UnsupportedSchema)?;
|
|
444
355
|
if value.trim().is_empty() { return Err(CatalogError::UnsupportedSchema); }
|
|
@@ -621,54 +532,6 @@ fn terminate(child: &mut Child, pid: u32) {
|
|
|
621
532
|
let _ = child.wait();
|
|
622
533
|
}
|
|
623
534
|
|
|
624
|
-
pub(crate) fn finish_stdout_after_exit(
|
|
625
|
-
stdout: std::process::ChildStdout,
|
|
626
|
-
status: ExitStatus,
|
|
627
|
-
timeout: Duration,
|
|
628
|
-
max_bytes: u64,
|
|
629
|
-
observer: &mut dyn CatalogObserver,
|
|
630
|
-
) -> Result<Vec<u8>, CatalogError> {
|
|
631
|
-
if !status.success() { observer.exited(&status); return Err(CatalogError::CommandFailed); }
|
|
632
|
-
observer.exited(&status);
|
|
633
|
-
let (tx, rx) = mpsc::channel();
|
|
634
|
-
let reader = std::thread::Builder::new().name("model-catalog-reader".into()).spawn(move || {
|
|
635
|
-
let mut bytes = Vec::new();
|
|
636
|
-
let result = stdout.take(max_bytes.saturating_add(1)).read_to_end(&mut bytes);
|
|
637
|
-
let _ = tx.send(result.map(|_| bytes));
|
|
638
|
-
}).map_err(|_| CatalogError::OutputReadFailed)?;
|
|
639
|
-
let result = match rx.recv_timeout(timeout) {
|
|
640
|
-
Ok(Ok(bytes)) if bytes.len() as u64 <= max_bytes => Ok(bytes),
|
|
641
|
-
Ok(Ok(_)) => Err(CatalogError::OutputTooLarge),
|
|
642
|
-
Ok(Err(_)) | Err(mpsc::RecvTimeoutError::Disconnected) => Err(CatalogError::OutputReadFailed),
|
|
643
|
-
Err(mpsc::RecvTimeoutError::Timeout) => { observer.output_timeout(); Err(CatalogError::Timeout) }
|
|
644
|
-
};
|
|
645
|
-
if !matches!(&result, Err(CatalogError::Timeout)) { let _ = reader.join(); }
|
|
646
|
-
result
|
|
647
|
-
}
|
|
648
|
-
|
|
649
|
-
struct OwnedTempDir(PathBuf);
|
|
650
|
-
impl OwnedTempDir {
|
|
651
|
-
fn create() -> Result<Self, CatalogError> {
|
|
652
|
-
use std::os::unix::fs::DirBuilderExt;
|
|
653
|
-
let root = std::env::temp_dir();
|
|
654
|
-
for _ in 0..8 {
|
|
655
|
-
let id = TEMP_DIR_SEQUENCE.fetch_add(1, Ordering::Relaxed);
|
|
656
|
-
let path = root.join(format!("team-agent-claude-models-{}-{id}", std::process::id()));
|
|
657
|
-
let mut builder = std::fs::DirBuilder::new();
|
|
658
|
-
builder.mode(0o700);
|
|
659
|
-
match builder.create(&path) {
|
|
660
|
-
Ok(()) => return Ok(Self(path)),
|
|
661
|
-
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => continue,
|
|
662
|
-
Err(_) => return Err(CatalogError::TemporaryDirectoryUnavailable),
|
|
663
|
-
}
|
|
664
|
-
}
|
|
665
|
-
Err(CatalogError::TemporaryDirectoryUnavailable)
|
|
666
|
-
}
|
|
667
|
-
}
|
|
668
|
-
impl Drop for OwnedTempDir {
|
|
669
|
-
fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.0); }
|
|
670
|
-
}
|
|
671
|
-
|
|
672
535
|
#[cfg(all(test, unix))]
|
|
673
536
|
mod command_wait_regressions {
|
|
674
537
|
use super::*;
|
|
@@ -821,20 +684,18 @@ mod tests {
|
|
|
821
684
|
#[test]
|
|
822
685
|
fn provider_capability_is_explicit_and_exact() {
|
|
823
686
|
for (name, provider) in [
|
|
824
|
-
("pi", Provider::Pi),
|
|
825
687
|
("codex", Provider::Codex),
|
|
826
|
-
("claude", Provider::Claude),
|
|
827
|
-
("claude_code", Provider::ClaudeCode),
|
|
828
688
|
("grok", Provider::Grok),
|
|
829
689
|
] {
|
|
830
690
|
assert_eq!(parse_catalog_provider(name), Some(provider));
|
|
831
691
|
assert_eq!(provider_wire(provider), name);
|
|
832
692
|
assert!(catalog_source(provider).is_some());
|
|
833
693
|
}
|
|
834
|
-
|
|
694
|
+
// Claude Code and Pi catalogs are read through their contract leaves.
|
|
695
|
+
for name in ["", "cloud", "pi", "claude", "claude_code", "cursor", "cursor_agent", "agent", "claude-code", "copilot", "gemini_cli", "fake", "Pi", "CODEX", " pi", "pi ", "pi/model", "codex:model", "claude_code_extra"] {
|
|
835
696
|
assert_eq!(parse_catalog_provider(name), None);
|
|
836
697
|
}
|
|
837
|
-
for provider in [Provider::Copilot, Provider::GeminiCli, Provider::Fake] {
|
|
698
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Pi, Provider::Copilot, Provider::GeminiCli, Provider::Fake] {
|
|
838
699
|
assert!(catalog_source(provider).is_none());
|
|
839
700
|
}
|
|
840
701
|
}
|
|
@@ -850,55 +711,6 @@ mod tests {
|
|
|
850
711
|
assert!(matches!(parse_codex_catalog(duplicate, "codex"), Err(CatalogError::DuplicateIdentity(_))));
|
|
851
712
|
}
|
|
852
713
|
|
|
853
|
-
#[test]
|
|
854
|
-
fn claude_selectors_group_by_exact_resolved_id() {
|
|
855
|
-
let response = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
|
|
856
|
-
{"value":"default","resolvedModel":"claude-opus-5-5[1m]","displayName":"Default"},
|
|
857
|
-
{"value":"opus[1m]","resolvedModel":"claude-opus-5-5[1m]","displayName":"Opus 1M"},
|
|
858
|
-
{"value":"opus-alt","resolvedModel":"claude-opus-5-5[1m]","displayName":"Alternate display"},
|
|
859
|
-
{"value":"sonnet","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}
|
|
860
|
-
]}}});
|
|
861
|
-
let bytes = format!("{}\n", response).into_bytes();
|
|
862
|
-
let rows = parse_claude_catalog(&bytes, "claude_code").unwrap();
|
|
863
|
-
assert_eq!(rows.len(), 2);
|
|
864
|
-
assert_eq!(rows[0].provider, "claude_code");
|
|
865
|
-
assert_eq!(rows[0].id, "claude-opus-5-5[1m]");
|
|
866
|
-
assert_eq!(rows[0].display_name, "Opus 1M");
|
|
867
|
-
assert_eq!(rows[0].aliases, vec!["default", "opus[1m]", "opus-alt"]);
|
|
868
|
-
assert_eq!(rows[0].default, Some(true));
|
|
869
|
-
assert_eq!(rows[1].default, Some(false));
|
|
870
|
-
assert!(model_matches(&rows[0], "OPUS 1M"));
|
|
871
|
-
}
|
|
872
|
-
|
|
873
|
-
#[test]
|
|
874
|
-
fn claude_ignores_other_stream_frames_and_matches_nested_request_id() {
|
|
875
|
-
let models = serde_json::json!([{"value":"default","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}]);
|
|
876
|
-
let frames = [
|
|
877
|
-
serde_json::json!({"type":"system","subtype":"hook_started"}),
|
|
878
|
-
serde_json::json!({"type":"system","subtype":"hook_response"}),
|
|
879
|
-
serde_json::json!({"type":"stream_event","event":{"type":"message_start"}}),
|
|
880
|
-
serde_json::json!({"type":"control_response","response":{"subtype":"success","request_id":CLAUDE_REQUEST_ID,"response":{"models":models}}}),
|
|
881
|
-
];
|
|
882
|
-
let bytes = frames.iter().map(serde_json::Value::to_string).collect::<Vec<_>>().join("\n");
|
|
883
|
-
let rows = parse_claude_catalog(bytes.as_bytes(), "claude_code").unwrap();
|
|
884
|
-
assert_eq!(rows.len(), 1);
|
|
885
|
-
assert_eq!(rows[0].id, "claude-sonnet-5");
|
|
886
|
-
|
|
887
|
-
let conflicting = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","request_id":"wrong-id","response":{"models":[{"value":"default","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}]}}});
|
|
888
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", conflicting).as_bytes(), "claude_code"), Err(CatalogError::InvalidProtocol)));
|
|
889
|
-
}
|
|
890
|
-
|
|
891
|
-
#[test]
|
|
892
|
-
fn claude_missing_canonical_id_and_duplicate_selectors_fail_closed() {
|
|
893
|
-
let missing = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[{"value":"default","displayName":"Default"}]}}});
|
|
894
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", missing).as_bytes(), "claude"), Err(CatalogError::UnsupportedSchema)));
|
|
895
|
-
let duplicate = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
|
|
896
|
-
{"value":"opus","resolvedModel":"claude-opus","displayName":"Opus"},
|
|
897
|
-
{"value":"opus","resolvedModel":"claude-opus[1m]","displayName":"Opus 1M"}
|
|
898
|
-
]}}});
|
|
899
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", duplicate).as_bytes(), "claude"), Err(CatalogError::DuplicateIdentity(_))));
|
|
900
|
-
}
|
|
901
|
-
|
|
902
714
|
#[test]
|
|
903
715
|
fn matcher_uses_and_tokens_and_all_catalog_fields() {
|
|
904
716
|
let row = ModelRecord { provider: "codex".into(), vendor: "openai".into(), id: "gpt-6-luna".into(), display_name: "GPT Luna".into(), default: None, aliases: vec![] };
|
|
@@ -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 行
|
|
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
|
-
/// - claude
|
|
643
|
+
/// - 遗留 claude/pi worker 行由 adapter 判为不可 resume,修复不会落到它们身上
|
|
644
644
|
/// - 修复成功会清掉 attribution_ambiguous 标记
|
|
645
645
|
/// ---
|
|
646
646
|
pub fn recover_resume_session_from_events(
|
|
@@ -651,13 +651,6 @@ 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);
|
|
661
654
|
let events = crate::event_log::EventLog::new(workspace)
|
|
662
655
|
.tail(0)
|
|
663
656
|
.map_err(|e| ProviderError::Io(e.to_string()))?;
|
|
@@ -687,23 +680,6 @@ pub fn recover_resume_session_from_events(
|
|
|
687
680
|
let Some(rollout_path) = event_rollout_path(event).filter(|path| path.exists()) else {
|
|
688
681
|
continue;
|
|
689
682
|
};
|
|
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
|
-
}
|
|
707
683
|
let session = SessionId::new(session_id.to_string());
|
|
708
684
|
if !adapter.session_is_resumable(Some(&session), auth_mode)? {
|
|
709
685
|
continue;
|
|
@@ -900,15 +876,15 @@ mod stopped_capture_tests {
|
|
|
900
876
|
#[test]
|
|
901
877
|
fn explicit_stop_is_checked_before_adapter_or_backing_probes() {
|
|
902
878
|
for row in [
|
|
903
|
-
serde_json::json!({"status":"stopped","provider":"
|
|
904
|
-
serde_json::json!({"status":"running","explicit_stop":true,"provider":"
|
|
905
|
-
serde_json::json!({"status":"running","explicit_stop":"false","provider":"
|
|
879
|
+
serde_json::json!({"status":"stopped","provider":"copilot","spawn_cwd":"/controlled"}),
|
|
880
|
+
serde_json::json!({"status":"running","explicit_stop":true,"provider":"copilot","spawn_cwd":"/controlled"}),
|
|
881
|
+
serde_json::json!({"status":"running","explicit_stop":"false","provider":"copilot","spawn_cwd":"/controlled"}),
|
|
906
882
|
] {
|
|
907
883
|
assert!(incomplete_resumable_provider(&row, &mut |_| panic!("held seat reached adapter lookup")).is_none());
|
|
908
884
|
}
|
|
909
885
|
let mut calls = 0;
|
|
910
886
|
let _ = incomplete_resumable_provider(
|
|
911
|
-
&serde_json::json!({"status":"running","explicit_stop":false,"provider":"
|
|
887
|
+
&serde_json::json!({"status":"running","explicit_stop":false,"provider":"copilot","spawn_cwd":"/controlled"}),
|
|
912
888
|
&mut |provider| { calls += 1; crate::provider::get_adapter(provider) },
|
|
913
889
|
);
|
|
914
890
|
assert_eq!(calls, 1, "active control must still be eligible for capture");
|
|
@@ -2674,82 +2650,6 @@ mod u1_tests {
|
|
|
2674
2650
|
let _ = std::fs::remove_dir_all(&dir);
|
|
2675
2651
|
}
|
|
2676
2652
|
|
|
2677
|
-
/// E57 RED postflight (lane-046-capture-gap): `recover_resume_session_from_events`
|
|
2678
|
-
/// must refuse to repair a worker's session from a stale `session.captured`
|
|
2679
|
-
/// event whose rollout file is a Claude LEADER transcript
|
|
2680
|
-
/// (`customTitle == "claude leader"`). Without this filter, a fresh restart
|
|
2681
|
-
/// after a pre-fix run still pulls the leader transcript onto a worker via
|
|
2682
|
-
/// captured_via=event_log_repair (Mac mini evidence:
|
|
2683
|
-
/// resume.session_repaired session_id=ea059b82 → release-engineer).
|
|
2684
|
-
#[test]
|
|
2685
|
-
fn e57_recover_resume_refuses_claude_leader_marker_rollout() {
|
|
2686
|
-
use std::io::Write;
|
|
2687
|
-
use std::sync::atomic::{AtomicU64, Ordering};
|
|
2688
|
-
static COUNTER: AtomicU64 = AtomicU64::new(0);
|
|
2689
|
-
let uniq = COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
2690
|
-
let workspace =
|
|
2691
|
-
std::env::temp_dir().join(format!("ta-e57-recover-{}-{}", std::process::id(), uniq));
|
|
2692
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
2693
|
-
std::fs::create_dir_all(&workspace).expect("workspace");
|
|
2694
|
-
|
|
2695
|
-
// Write a leader-marker rollout file (claude TUI leader transcript).
|
|
2696
|
-
let rollout = workspace.join("ea059b82-leader.jsonl");
|
|
2697
|
-
let mut f = std::fs::File::create(&rollout).expect("rollout");
|
|
2698
|
-
writeln!(
|
|
2699
|
-
f,
|
|
2700
|
-
"{{\"customTitle\":\"claude leader\",\"sessionId\":\"ea059b82-c53e-4654-9590-9f3e6d46f0ca\",\"cwd\":\"/tmp/e57\"}}"
|
|
2701
|
-
)
|
|
2702
|
-
.unwrap();
|
|
2703
|
-
writeln!(f, "{{\"role\":\"user\",\"content\":\"hi\"}}").unwrap();
|
|
2704
|
-
drop(f);
|
|
2705
|
-
|
|
2706
|
-
// Write a `session.captured` event into events.jsonl pointing
|
|
2707
|
-
// release-engineer at the leader rollout — simulates the stale
|
|
2708
|
-
// pre-fix event that triggered the bug.
|
|
2709
|
-
let event_log = crate::event_log::EventLog::new(&workspace);
|
|
2710
|
-
event_log
|
|
2711
|
-
.write(
|
|
2712
|
-
"session.captured",
|
|
2713
|
-
serde_json::json!({
|
|
2714
|
-
"agent_id": "release-engineer",
|
|
2715
|
-
"provider": "claude",
|
|
2716
|
-
"session_id": "ea059b82-c53e-4654-9590-9f3e6d46f0ca",
|
|
2717
|
-
"rollout_path": rollout.to_string_lossy().to_string(),
|
|
2718
|
-
"captured_via": "fs_watch",
|
|
2719
|
-
}),
|
|
2720
|
-
)
|
|
2721
|
-
.expect("event write");
|
|
2722
|
-
|
|
2723
|
-
let previous = serde_json::json!({
|
|
2724
|
-
"provider": "claude",
|
|
2725
|
-
"session_id": null,
|
|
2726
|
-
"rollout_path": null,
|
|
2727
|
-
});
|
|
2728
|
-
let adapter = test_support::CaptureCandidatesAdapter::new(Provider::Claude, None, "");
|
|
2729
|
-
let exclude = BTreeSet::new();
|
|
2730
|
-
let result = recover_resume_session_from_events(
|
|
2731
|
-
&workspace,
|
|
2732
|
-
"release-engineer",
|
|
2733
|
-
&previous,
|
|
2734
|
-
&adapter,
|
|
2735
|
-
crate::provider::AuthMode::Subscription,
|
|
2736
|
-
&exclude,
|
|
2737
|
-
)
|
|
2738
|
-
.expect("recover call ok");
|
|
2739
|
-
|
|
2740
|
-
assert!(
|
|
2741
|
-
result.is_none(),
|
|
2742
|
-
"E57 postflight: recover_resume_session_from_events must REFUSE \
|
|
2743
|
-
to repair from a Claude leader-marker rollout (event_log_repair \
|
|
2744
|
-
cannot resurrect a stale leader-to-worker assignment); got {result:?}"
|
|
2745
|
-
);
|
|
2746
|
-
|
|
2747
|
-
let _ = std::fs::remove_file(&rollout);
|
|
2748
|
-
let _ = std::fs::remove_file(workspace.join(".team/logs/events.jsonl"));
|
|
2749
|
-
let _ = std::fs::remove_dir_all(workspace.join(".team"));
|
|
2750
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
2751
|
-
}
|
|
2752
|
-
|
|
2753
2653
|
/// S1-CAPTURE-001 (0.4.8): pending mismatch guard. When fresh-start has
|
|
2754
2654
|
/// written a new `_pending_session_id` but the old authoritative
|
|
2755
2655
|
/// `session_id` is still present and differs, `agent_session_complete`
|
|
@@ -135,10 +135,6 @@ mod tests {
|
|
|
135
135
|
|
|
136
136
|
#[test]
|
|
137
137
|
fn convergence_deadlines_are_provider_specific() {
|
|
138
|
-
assert_eq!(
|
|
139
|
-
context_fork_convergence_deadline(Provider::Claude),
|
|
140
|
-
Duration::from_secs(45)
|
|
141
|
-
);
|
|
142
138
|
assert_eq!(
|
|
143
139
|
context_fork_convergence_deadline(Provider::Codex),
|
|
144
140
|
Duration::from_secs(10)
|
|
@@ -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
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
//! - 不创建/改写 backing(codex 的物化改写在 context_fork/codex.rs,不在本文件)
|
|
23
23
|
//! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
|
|
24
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,10 +242,9 @@ 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(),
|
|
247
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => PathBuf::new(),
|
|
256
248
|
Provider::Grok | Provider::GeminiCli | Provider::Fake => home,
|
|
257
249
|
}
|
|
258
250
|
}
|
|
@@ -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
|
}
|