@team-agent/installer 0.5.124 → 0.5.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -69
- package/crates/team-agent/src/cli/emit.rs +45 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +28 -33
- package/crates/team-agent/src/cli/models.rs +44 -880
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +39 -8
- package/crates/team-agent/src/compiler.rs +28 -204
- package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
- package/crates/team-agent/src/contract_runtime/config.rs +37 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +1 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +15 -195
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -61
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -43
- package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +60 -145
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -153
- package/crates/team-agent/src/lifecycle/tests.rs +0 -6
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +185 -168
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -5
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +33 -302
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +14 -273
- package/crates/team-agent/src/provider/session/capture.rs +7 -107
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
- package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -14
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +79 -11
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -5
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -46,7 +46,7 @@ fn fault_fact(provider: Provider, record: &serde_json::Value) -> Option<FaultFac
|
|
|
46
46
|
match provider {
|
|
47
47
|
Provider::Claude | Provider::ClaudeCode => claude_fault_fact(record),
|
|
48
48
|
Provider::Codex => codex_fault_fact(record),
|
|
49
|
-
Provider::Copilot | Provider::Grok | Provider::
|
|
49
|
+
Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
|
|
50
50
|
| Provider::Fake => None,
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -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 {
|
|
@@ -78,14 +75,13 @@ impl CatalogError {
|
|
|
78
75
|
pub fn action(&self, provider: &str) -> String {
|
|
79
76
|
let executable = match provider {
|
|
80
77
|
"pi" => "pi",
|
|
81
|
-
"cursor_agent" => "agent",
|
|
82
78
|
"codex" => "codex",
|
|
83
79
|
"claude" | "claude_code" => "claude",
|
|
84
80
|
"grok" => "grok",
|
|
85
81
|
_ => "provider CLI",
|
|
86
82
|
};
|
|
87
83
|
match self {
|
|
88
|
-
Self::UnsupportedProvider => "choose a supported provider: pi,
|
|
84
|
+
Self::UnsupportedProvider => "choose a supported provider: pi, codex, claude, claude_code, or grok".into(),
|
|
89
85
|
Self::ExecutableUnavailable => format!("install or repair the PATH-first `{executable}` executable, then retry `team-agent models --provider {provider}`"),
|
|
90
86
|
Self::UnsupportedSchema => format!("upgrade `{executable}` to a version that supports its model catalog protocol, then retry `team-agent models --provider {provider}`"),
|
|
91
87
|
Self::CommandFailed => format!("run `{executable}` directly to check catalog/account access, then retry `team-agent models --provider {provider}`"),
|
|
@@ -117,7 +113,6 @@ impl CatalogError {
|
|
|
117
113
|
fn display_provider(provider: &str) -> &str {
|
|
118
114
|
match provider {
|
|
119
115
|
"pi" => "Pi",
|
|
120
|
-
"cursor_agent" => "Cursor",
|
|
121
116
|
"codex" => "Codex",
|
|
122
117
|
"claude" | "claude_code" => "Claude",
|
|
123
118
|
"grok" => "Grok",
|
|
@@ -132,22 +127,23 @@ pub fn parse_catalog_provider(name: &str) -> Option<Provider> {
|
|
|
132
127
|
|
|
133
128
|
#[derive(Clone, Copy)]
|
|
134
129
|
enum CatalogSource {
|
|
135
|
-
Pi,
|
|
136
|
-
CursorAgent,
|
|
137
130
|
Codex,
|
|
138
131
|
Grok,
|
|
139
|
-
Claude,
|
|
140
132
|
}
|
|
141
133
|
|
|
142
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.
|
|
143
137
|
fn catalog_source(provider: Provider) -> Option<CatalogSource> {
|
|
144
138
|
match provider {
|
|
145
|
-
Provider::Pi => Some(CatalogSource::Pi),
|
|
146
|
-
Provider::CursorAgent => Some(CatalogSource::CursorAgent),
|
|
147
139
|
Provider::Codex => Some(CatalogSource::Codex),
|
|
148
|
-
Provider::Claude | Provider::ClaudeCode => Some(CatalogSource::Claude),
|
|
149
140
|
Provider::Grok => Some(CatalogSource::Grok),
|
|
150
|
-
Provider::
|
|
141
|
+
Provider::Claude
|
|
142
|
+
| Provider::ClaudeCode
|
|
143
|
+
| Provider::Pi
|
|
144
|
+
| Provider::Copilot
|
|
145
|
+
| Provider::GeminiCli
|
|
146
|
+
| Provider::Fake => None,
|
|
151
147
|
}
|
|
152
148
|
}
|
|
153
149
|
|
|
@@ -156,14 +152,6 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
|
|
|
156
152
|
let source = catalog_source(provider).ok_or(CatalogError::UnsupportedProvider)?;
|
|
157
153
|
let requested_provider = provider_wire(provider);
|
|
158
154
|
let records = match source {
|
|
159
|
-
CatalogSource::Pi => {
|
|
160
|
-
let bytes = run_native("pi", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
161
|
-
parse_pi_catalog(&bytes)?
|
|
162
|
-
}
|
|
163
|
-
CatalogSource::CursorAgent => {
|
|
164
|
-
let bytes = run_native("agent", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
165
|
-
parse_cursor_catalog(&bytes)?
|
|
166
|
-
}
|
|
167
155
|
CatalogSource::Codex => {
|
|
168
156
|
let bytes = run_native("codex", &["debug", "models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
169
157
|
parse_codex_catalog(&bytes, requested_provider)?
|
|
@@ -172,7 +160,6 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
|
|
|
172
160
|
let bytes = run_native("grok", &["models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
173
161
|
parse_grok_catalog(&bytes)?
|
|
174
162
|
}
|
|
175
|
-
CatalogSource::Claude => discover_claude_catalog(requested_provider)?,
|
|
176
163
|
};
|
|
177
164
|
Ok(records)
|
|
178
165
|
}
|
|
@@ -228,38 +215,6 @@ pub(crate) fn parse_pi_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, Catalog
|
|
|
228
215
|
Ok(records)
|
|
229
216
|
}
|
|
230
217
|
|
|
231
|
-
pub(crate) fn parse_cursor_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
232
|
-
let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
|
|
233
|
-
let lines = text.lines().collect::<Vec<_>>();
|
|
234
|
-
let tip_line = lines
|
|
235
|
-
.iter()
|
|
236
|
-
.rposition(|line| !line.trim().is_empty())
|
|
237
|
-
.filter(|index| {
|
|
238
|
-
lines[*index]
|
|
239
|
-
.strip_prefix("Tip: use --model ")
|
|
240
|
-
.is_some_and(|tip| !tip.is_empty())
|
|
241
|
-
});
|
|
242
|
-
let mut records: Vec<ModelRecord> = Vec::new();
|
|
243
|
-
for (index, line) in lines.into_iter().enumerate() {
|
|
244
|
-
if Some(index) == tip_line {
|
|
245
|
-
continue;
|
|
246
|
-
}
|
|
247
|
-
let line = line.trim();
|
|
248
|
-
if line.is_empty() || line.trim_end_matches(':').eq_ignore_ascii_case("available models") { continue; }
|
|
249
|
-
let Some((id, display)) = line.split_once(" - ") else { return Err(CatalogError::Malformed); };
|
|
250
|
-
let id = id.trim();
|
|
251
|
-
if id.is_empty() || id.chars().any(char::is_whitespace) || display.trim().is_empty() { return Err(CatalogError::Malformed); }
|
|
252
|
-
if records.iter().any(|record| record.id == id) { return Err(CatalogError::DuplicateIdentity(id.into())); }
|
|
253
|
-
let display = display.trim();
|
|
254
|
-
let default = display.ends_with("(default)");
|
|
255
|
-
let display_name = display.strip_suffix("(default)").map_or(display, str::trim).to_string();
|
|
256
|
-
let vendor = id.split_once('-').map_or("cursor", |(vendor, _)| vendor).to_string();
|
|
257
|
-
records.push(ModelRecord { provider: "cursor_agent".into(), vendor, id: id.into(), display_name, default: Some(default), aliases: Vec::new() });
|
|
258
|
-
}
|
|
259
|
-
if records.is_empty() { return Err(CatalogError::Empty); }
|
|
260
|
-
Ok(records)
|
|
261
|
-
}
|
|
262
|
-
|
|
263
218
|
fn parse_grok_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
264
219
|
let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
|
|
265
220
|
let mut has_auth_notice = false;
|
|
@@ -395,90 +350,6 @@ fn parse_codex_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>,
|
|
|
395
350
|
Ok(visible)
|
|
396
351
|
}
|
|
397
352
|
|
|
398
|
-
fn discover_claude_catalog(provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
399
|
-
let cwd = OwnedTempDir::create()?;
|
|
400
|
-
let args = [
|
|
401
|
-
"--print", "--input-format", "stream-json", "--output-format", "stream-json", "--verbose",
|
|
402
|
-
"--no-session-persistence", "--strict-mcp-config", "--mcp-config", r#"{"mcpServers":{}}"#,
|
|
403
|
-
"--setting-sources", "", "--settings", r#"{"disableAllHooks":true}"#, "--tools", "", "--no-chrome",
|
|
404
|
-
];
|
|
405
|
-
let request = serde_json::json!({"type":"control_request","request_id":CLAUDE_REQUEST_ID,"request":{"subtype":"initialize","hooks":{},"agents":{},"skills":[]}});
|
|
406
|
-
let mut input = serde_json::to_vec(&request).map_err(|_| CatalogError::InvalidProtocol)?;
|
|
407
|
-
input.push(b'\n');
|
|
408
|
-
let bytes = run_native("claude", &args, Some(&input), Some(&cwd.0), &["CLAUDECODE"], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
|
|
409
|
-
parse_claude_catalog(&bytes, provider)
|
|
410
|
-
}
|
|
411
|
-
|
|
412
|
-
fn parse_claude_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
|
|
413
|
-
let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
|
|
414
|
-
let mut response = None;
|
|
415
|
-
for line in text.lines() {
|
|
416
|
-
if line.is_empty() { return Err(CatalogError::InvalidProtocol); }
|
|
417
|
-
let frame: serde_json::Value = serde_json::from_str(line).map_err(|_| CatalogError::InvalidProtocol)?;
|
|
418
|
-
let frame_type = frame
|
|
419
|
-
.get("type")
|
|
420
|
-
.and_then(serde_json::Value::as_str)
|
|
421
|
-
.filter(|frame_type| !frame_type.is_empty())
|
|
422
|
-
.ok_or(CatalogError::InvalidProtocol)?;
|
|
423
|
-
if frame_type != "control_response" {
|
|
424
|
-
continue;
|
|
425
|
-
}
|
|
426
|
-
if response.is_some() {
|
|
427
|
-
return Err(CatalogError::InvalidProtocol);
|
|
428
|
-
}
|
|
429
|
-
let result = frame.get("response").ok_or(CatalogError::UnsupportedSchema)?;
|
|
430
|
-
let outer_request_id = frame.get("request_id").and_then(serde_json::Value::as_str);
|
|
431
|
-
let inner_request_id = result.get("request_id").and_then(serde_json::Value::as_str);
|
|
432
|
-
if (outer_request_id != Some(CLAUDE_REQUEST_ID) && inner_request_id != Some(CLAUDE_REQUEST_ID))
|
|
433
|
-
|| frame.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
|
|
434
|
-
|| result.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
|
|
435
|
-
{
|
|
436
|
-
return Err(CatalogError::InvalidProtocol);
|
|
437
|
-
}
|
|
438
|
-
if result.get("subtype").and_then(serde_json::Value::as_str) != Some("success") { return Err(CatalogError::InvalidProtocol); }
|
|
439
|
-
let rows = result.get("response").and_then(|v| v.get("models")).and_then(serde_json::Value::as_array).ok_or(CatalogError::UnsupportedSchema)?;
|
|
440
|
-
response = Some(rows.clone());
|
|
441
|
-
}
|
|
442
|
-
let rows = response.ok_or(CatalogError::InvalidProtocol)?;
|
|
443
|
-
if rows.is_empty() { return Err(CatalogError::Empty); }
|
|
444
|
-
let mut source_values = HashSet::new();
|
|
445
|
-
let mut by_id = HashMap::<String, usize>::new();
|
|
446
|
-
let mut records: Vec<ModelRecord> = Vec::new();
|
|
447
|
-
let mut group_defaults = Vec::<bool>::new();
|
|
448
|
-
let mut group_has_non_default_display = Vec::<bool>::new();
|
|
449
|
-
let mut any_default = false;
|
|
450
|
-
for row in rows {
|
|
451
|
-
let row = row.as_object().ok_or(CatalogError::Malformed)?;
|
|
452
|
-
let value = required_string(row.get("value"))?;
|
|
453
|
-
let resolved = required_string(row.get("resolvedModel")).map_err(|_| CatalogError::UnsupportedSchema)?;
|
|
454
|
-
let display = required_string(row.get("displayName")).map_err(|_| CatalogError::UnsupportedSchema)?;
|
|
455
|
-
validate_identity(value)?;
|
|
456
|
-
validate_identity(resolved)?;
|
|
457
|
-
validate_display(display)?;
|
|
458
|
-
if !source_values.insert(value.to_string()) { return Err(CatalogError::DuplicateIdentity(value.into())); }
|
|
459
|
-
let is_default = value == "default";
|
|
460
|
-
any_default |= is_default;
|
|
461
|
-
if let Some(index) = by_id.get(resolved).copied() {
|
|
462
|
-
let record = &mut records[index];
|
|
463
|
-
record.aliases.push(value.into());
|
|
464
|
-
if !is_default && !group_has_non_default_display[index] {
|
|
465
|
-
record.display_name = display.into();
|
|
466
|
-
group_has_non_default_display[index] = true;
|
|
467
|
-
}
|
|
468
|
-
group_defaults[index] |= is_default;
|
|
469
|
-
} else {
|
|
470
|
-
by_id.insert(resolved.into(), records.len());
|
|
471
|
-
records.push(ModelRecord { provider: provider.into(), vendor: "anthropic".into(), id: resolved.into(), display_name: display.into(), default: None, aliases: vec![value.into()] });
|
|
472
|
-
group_defaults.push(is_default);
|
|
473
|
-
group_has_non_default_display.push(!is_default);
|
|
474
|
-
}
|
|
475
|
-
}
|
|
476
|
-
for (record, is_default) in records.iter_mut().zip(group_defaults) {
|
|
477
|
-
record.default = any_default.then_some(is_default);
|
|
478
|
-
}
|
|
479
|
-
Ok(records)
|
|
480
|
-
}
|
|
481
|
-
|
|
482
353
|
fn required_string(value: Option<&serde_json::Value>) -> Result<&str, CatalogError> {
|
|
483
354
|
let value = value.and_then(serde_json::Value::as_str).ok_or(CatalogError::UnsupportedSchema)?;
|
|
484
355
|
if value.trim().is_empty() { return Err(CatalogError::UnsupportedSchema); }
|
|
@@ -661,54 +532,6 @@ fn terminate(child: &mut Child, pid: u32) {
|
|
|
661
532
|
let _ = child.wait();
|
|
662
533
|
}
|
|
663
534
|
|
|
664
|
-
pub(crate) fn finish_stdout_after_exit(
|
|
665
|
-
stdout: std::process::ChildStdout,
|
|
666
|
-
status: ExitStatus,
|
|
667
|
-
timeout: Duration,
|
|
668
|
-
max_bytes: u64,
|
|
669
|
-
observer: &mut dyn CatalogObserver,
|
|
670
|
-
) -> Result<Vec<u8>, CatalogError> {
|
|
671
|
-
if !status.success() { observer.exited(&status); return Err(CatalogError::CommandFailed); }
|
|
672
|
-
observer.exited(&status);
|
|
673
|
-
let (tx, rx) = mpsc::channel();
|
|
674
|
-
let reader = std::thread::Builder::new().name("model-catalog-reader".into()).spawn(move || {
|
|
675
|
-
let mut bytes = Vec::new();
|
|
676
|
-
let result = stdout.take(max_bytes.saturating_add(1)).read_to_end(&mut bytes);
|
|
677
|
-
let _ = tx.send(result.map(|_| bytes));
|
|
678
|
-
}).map_err(|_| CatalogError::OutputReadFailed)?;
|
|
679
|
-
let result = match rx.recv_timeout(timeout) {
|
|
680
|
-
Ok(Ok(bytes)) if bytes.len() as u64 <= max_bytes => Ok(bytes),
|
|
681
|
-
Ok(Ok(_)) => Err(CatalogError::OutputTooLarge),
|
|
682
|
-
Ok(Err(_)) | Err(mpsc::RecvTimeoutError::Disconnected) => Err(CatalogError::OutputReadFailed),
|
|
683
|
-
Err(mpsc::RecvTimeoutError::Timeout) => { observer.output_timeout(); Err(CatalogError::Timeout) }
|
|
684
|
-
};
|
|
685
|
-
if !matches!(&result, Err(CatalogError::Timeout)) { let _ = reader.join(); }
|
|
686
|
-
result
|
|
687
|
-
}
|
|
688
|
-
|
|
689
|
-
struct OwnedTempDir(PathBuf);
|
|
690
|
-
impl OwnedTempDir {
|
|
691
|
-
fn create() -> Result<Self, CatalogError> {
|
|
692
|
-
use std::os::unix::fs::DirBuilderExt;
|
|
693
|
-
let root = std::env::temp_dir();
|
|
694
|
-
for _ in 0..8 {
|
|
695
|
-
let id = TEMP_DIR_SEQUENCE.fetch_add(1, Ordering::Relaxed);
|
|
696
|
-
let path = root.join(format!("team-agent-claude-models-{}-{id}", std::process::id()));
|
|
697
|
-
let mut builder = std::fs::DirBuilder::new();
|
|
698
|
-
builder.mode(0o700);
|
|
699
|
-
match builder.create(&path) {
|
|
700
|
-
Ok(()) => return Ok(Self(path)),
|
|
701
|
-
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => continue,
|
|
702
|
-
Err(_) => return Err(CatalogError::TemporaryDirectoryUnavailable),
|
|
703
|
-
}
|
|
704
|
-
}
|
|
705
|
-
Err(CatalogError::TemporaryDirectoryUnavailable)
|
|
706
|
-
}
|
|
707
|
-
}
|
|
708
|
-
impl Drop for OwnedTempDir {
|
|
709
|
-
fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.0); }
|
|
710
|
-
}
|
|
711
|
-
|
|
712
535
|
#[cfg(all(test, unix))]
|
|
713
536
|
mod command_wait_regressions {
|
|
714
537
|
use super::*;
|
|
@@ -861,21 +684,18 @@ mod tests {
|
|
|
861
684
|
#[test]
|
|
862
685
|
fn provider_capability_is_explicit_and_exact() {
|
|
863
686
|
for (name, provider) in [
|
|
864
|
-
("pi", Provider::Pi),
|
|
865
|
-
("cursor_agent", Provider::CursorAgent),
|
|
866
687
|
("codex", Provider::Codex),
|
|
867
|
-
("claude", Provider::Claude),
|
|
868
|
-
("claude_code", Provider::ClaudeCode),
|
|
869
688
|
("grok", Provider::Grok),
|
|
870
689
|
] {
|
|
871
690
|
assert_eq!(parse_catalog_provider(name), Some(provider));
|
|
872
691
|
assert_eq!(provider_wire(provider), name);
|
|
873
692
|
assert!(catalog_source(provider).is_some());
|
|
874
693
|
}
|
|
875
|
-
|
|
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"] {
|
|
876
696
|
assert_eq!(parse_catalog_provider(name), None);
|
|
877
697
|
}
|
|
878
|
-
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] {
|
|
879
699
|
assert!(catalog_source(provider).is_none());
|
|
880
700
|
}
|
|
881
701
|
}
|
|
@@ -891,55 +711,6 @@ mod tests {
|
|
|
891
711
|
assert!(matches!(parse_codex_catalog(duplicate, "codex"), Err(CatalogError::DuplicateIdentity(_))));
|
|
892
712
|
}
|
|
893
713
|
|
|
894
|
-
#[test]
|
|
895
|
-
fn claude_selectors_group_by_exact_resolved_id() {
|
|
896
|
-
let response = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
|
|
897
|
-
{"value":"default","resolvedModel":"claude-opus-5-5[1m]","displayName":"Default"},
|
|
898
|
-
{"value":"opus[1m]","resolvedModel":"claude-opus-5-5[1m]","displayName":"Opus 1M"},
|
|
899
|
-
{"value":"opus-alt","resolvedModel":"claude-opus-5-5[1m]","displayName":"Alternate display"},
|
|
900
|
-
{"value":"sonnet","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}
|
|
901
|
-
]}}});
|
|
902
|
-
let bytes = format!("{}\n", response).into_bytes();
|
|
903
|
-
let rows = parse_claude_catalog(&bytes, "claude_code").unwrap();
|
|
904
|
-
assert_eq!(rows.len(), 2);
|
|
905
|
-
assert_eq!(rows[0].provider, "claude_code");
|
|
906
|
-
assert_eq!(rows[0].id, "claude-opus-5-5[1m]");
|
|
907
|
-
assert_eq!(rows[0].display_name, "Opus 1M");
|
|
908
|
-
assert_eq!(rows[0].aliases, vec!["default", "opus[1m]", "opus-alt"]);
|
|
909
|
-
assert_eq!(rows[0].default, Some(true));
|
|
910
|
-
assert_eq!(rows[1].default, Some(false));
|
|
911
|
-
assert!(model_matches(&rows[0], "OPUS 1M"));
|
|
912
|
-
}
|
|
913
|
-
|
|
914
|
-
#[test]
|
|
915
|
-
fn claude_ignores_other_stream_frames_and_matches_nested_request_id() {
|
|
916
|
-
let models = serde_json::json!([{"value":"default","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}]);
|
|
917
|
-
let frames = [
|
|
918
|
-
serde_json::json!({"type":"system","subtype":"hook_started"}),
|
|
919
|
-
serde_json::json!({"type":"system","subtype":"hook_response"}),
|
|
920
|
-
serde_json::json!({"type":"stream_event","event":{"type":"message_start"}}),
|
|
921
|
-
serde_json::json!({"type":"control_response","response":{"subtype":"success","request_id":CLAUDE_REQUEST_ID,"response":{"models":models}}}),
|
|
922
|
-
];
|
|
923
|
-
let bytes = frames.iter().map(serde_json::Value::to_string).collect::<Vec<_>>().join("\n");
|
|
924
|
-
let rows = parse_claude_catalog(bytes.as_bytes(), "claude_code").unwrap();
|
|
925
|
-
assert_eq!(rows.len(), 1);
|
|
926
|
-
assert_eq!(rows[0].id, "claude-sonnet-5");
|
|
927
|
-
|
|
928
|
-
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"}]}}});
|
|
929
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", conflicting).as_bytes(), "claude_code"), Err(CatalogError::InvalidProtocol)));
|
|
930
|
-
}
|
|
931
|
-
|
|
932
|
-
#[test]
|
|
933
|
-
fn claude_missing_canonical_id_and_duplicate_selectors_fail_closed() {
|
|
934
|
-
let missing = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[{"value":"default","displayName":"Default"}]}}});
|
|
935
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", missing).as_bytes(), "claude"), Err(CatalogError::UnsupportedSchema)));
|
|
936
|
-
let duplicate = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
|
|
937
|
-
{"value":"opus","resolvedModel":"claude-opus","displayName":"Opus"},
|
|
938
|
-
{"value":"opus","resolvedModel":"claude-opus[1m]","displayName":"Opus 1M"}
|
|
939
|
-
]}}});
|
|
940
|
-
assert!(matches!(parse_claude_catalog(format!("{}\n", duplicate).as_bytes(), "claude"), Err(CatalogError::DuplicateIdentity(_))));
|
|
941
|
-
}
|
|
942
|
-
|
|
943
714
|
#[test]
|
|
944
715
|
fn matcher_uses_and_tokens_and_all_catalog_fields() {
|
|
945
716
|
let row = ModelRecord { provider: "codex".into(), vendor: "openai".into(), id: "gpt-6-luna".into(), display_name: "GPT Luna".into(), default: None, aliases: vec![] };
|
|
@@ -948,34 +719,4 @@ mod tests {
|
|
|
948
719
|
assert!(model_matches(&row, " "));
|
|
949
720
|
}
|
|
950
721
|
|
|
951
|
-
#[test]
|
|
952
|
-
fn frozen_cursor_catalog_skips_only_its_native_trailing_tip() {
|
|
953
|
-
let frozen = include_bytes!("testdata/cursor-list-models-native.stdout");
|
|
954
|
-
let records = parse_cursor_catalog(frozen).unwrap();
|
|
955
|
-
let low = records.iter().find(|row| row.id == "gpt-5.6-luna-low").unwrap();
|
|
956
|
-
assert_eq!(low.provider.as_str(), "cursor_agent");
|
|
957
|
-
assert_eq!(low.vendor.as_str(), "gpt");
|
|
958
|
-
assert_eq!(low.display_name, "GPT-5.6 Luna 1M Low (current)");
|
|
959
|
-
assert_eq!(low.default, Some(false));
|
|
960
|
-
assert!(low.aliases.is_empty());
|
|
961
|
-
let xhigh = records.iter().find(|row| row.id == "gpt-5.6-luna-xhigh").unwrap();
|
|
962
|
-
assert_eq!(xhigh.id.as_str(), "gpt-5.6-luna-xhigh");
|
|
963
|
-
assert_eq!(xhigh.display_name, "GPT-5.6 Luna 1M Extra High");
|
|
964
|
-
let auto = records.iter().find(|row| row.id == "auto").unwrap();
|
|
965
|
-
assert_eq!(auto.default, Some(true));
|
|
966
|
-
|
|
967
|
-
let text = std::str::from_utf8(frozen).unwrap();
|
|
968
|
-
let without_tip = text.split_once("\nTip: use --model ").unwrap().0;
|
|
969
|
-
assert_eq!(parse_cursor_catalog(without_tip.as_bytes()).unwrap(), parse_cursor_catalog(frozen).unwrap());
|
|
970
|
-
}
|
|
971
|
-
|
|
972
|
-
#[test]
|
|
973
|
-
fn cursor_tip_compatibility_keeps_fail_closed_row_validation() {
|
|
974
|
-
let duplicate = b"Available models\na - A\na - A\n";
|
|
975
|
-
assert!(matches!(parse_cursor_catalog(duplicate), Err(CatalogError::DuplicateIdentity(_))));
|
|
976
|
-
assert!(matches!(parse_cursor_catalog(b"Available models\n"), Err(CatalogError::Empty)));
|
|
977
|
-
assert!(matches!(parse_cursor_catalog(&[b'A', 0xff]), Err(CatalogError::InvalidUtf8)));
|
|
978
|
-
assert!(matches!(parse_cursor_catalog(b"Available models\na - A\nnot a model row\n"), Err(CatalogError::Malformed)));
|
|
979
|
-
assert!(matches!(parse_cursor_catalog(b"Available models\na - A\nTip: use --model a to switch.\nunexpected tail\n"), Err(CatalogError::Malformed)));
|
|
980
|
-
}
|
|
981
722
|
}
|
|
@@ -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: 调用方给出的黑名单(例如刚被判为不可用的会话)
|
|
@@ -639,8 +639,8 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
|
|
|
639
639
|
/// boundary:
|
|
640
640
|
/// - 只读 event log 与 rollout 路径存在性,不扫 provider 存档、不调分配器
|
|
641
641
|
/// - 不走分配器的 claimed-key 冲突检查,只看 exclude_session_ids 与 tombstone
|
|
642
|
-
/// - rollout_path 存在性用 exists()——对目录型 backing(grok
|
|
643
|
-
/// - claude
|
|
642
|
+
/// - rollout_path 存在性用 exists()——对目录型 backing(grok)只要目录在就为真
|
|
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)
|