@team-agent/installer 0.5.125 → 0.5.127
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 -137
- package/crates/team-agent/src/cli/emit.rs +13 -8
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +55 -10
- package/crates/team-agent/src/cli/mod.rs +35 -29
- package/crates/team-agent/src/cli/models.rs +33 -944
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +54 -12
- package/crates/team-agent/src/compiler.rs +7 -205
- package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +12 -8
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/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 +22 -200
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
- package/crates/team-agent/src/lifecycle/launch.rs +3 -34
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
- package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
- 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 +106 -186
- 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 +19 -15
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +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 +15 -14
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
- package/crates/team-agent/src/lifecycle/tests.rs +0 -7
- package/crates/team-agent/src/lifecycle/types.rs +2 -21
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +14 -195
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
- package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +71 -572
- package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +11 -211
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
- package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +7 -23
- package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
- package/crates/team-agent/src/provider/tests/idle.rs +0 -68
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +77 -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/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +8 -5
- package/skills/team-agent/command-coverage.json +29 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
- package/skills/team-agent/references/team-agent-operator.md +7 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- 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/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/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/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- 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/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
//! ---
|
|
2
|
-
//! purpose: 在记录的 Pi
|
|
2
|
+
//! purpose: 在记录的 Pi session root 内按真实 header 捕获 exact JSONL backing(Pi leader 的投递回执用)
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: scan_session_store
|
|
6
6
|
//! what: 只读每个 JSONL 的首个完整 header;有预期 id 时按 id/cwd/spawned_at,否则按 cwd/spawned_at 读取 Pi 自己的 id
|
|
7
|
-
//! - name: validate_exact_backing
|
|
8
|
-
//! what: restart 前重验 exact path 的 id/cwd header
|
|
9
7
|
//! boundary:
|
|
10
8
|
//! - 只递归 recorded provider_projects_root,不扫描 HOME 或消息正文
|
|
11
9
|
//! - 不以文件名、mtime 或唯一文件替代 header 匹配
|
|
@@ -97,37 +95,6 @@ fn collect_jsonl(root: &Path, out: &mut Vec<PathBuf>) -> Result<(), ProviderErro
|
|
|
97
95
|
Ok(())
|
|
98
96
|
}
|
|
99
97
|
|
|
100
|
-
/// ---
|
|
101
|
-
/// purpose: restart 前重验调用方给出的 exact Pi JSONL backing
|
|
102
|
-
/// returns: header type/version/id/cwd 全匹配时成功
|
|
103
|
-
/// errors: 文件缺失、header 不完整或 identity 不匹配时返回 ResumeUnavailable
|
|
104
|
-
/// ---
|
|
105
|
-
pub(crate) fn validate_exact_backing(
|
|
106
|
-
path: &Path,
|
|
107
|
-
expected_session_id: &SessionId,
|
|
108
|
-
spawn_cwd: &Path,
|
|
109
|
-
) -> Result<(), ProviderError> {
|
|
110
|
-
if !path.is_file() {
|
|
111
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
112
|
-
"Pi exact session backing is missing: {}",
|
|
113
|
-
path.display()
|
|
114
|
-
)));
|
|
115
|
-
}
|
|
116
|
-
let header = read_header(path).ok_or_else(|| {
|
|
117
|
-
ProviderError::ResumeUnavailable(format!(
|
|
118
|
-
"Pi exact session backing has no complete session header: {}",
|
|
119
|
-
path.display()
|
|
120
|
-
))
|
|
121
|
-
})?;
|
|
122
|
-
if !header_matches(&header, expected_session_id, spawn_cwd, None) {
|
|
123
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
124
|
-
"Pi exact session backing header does not match id/cwd: {}",
|
|
125
|
-
path.display()
|
|
126
|
-
)));
|
|
127
|
-
}
|
|
128
|
-
Ok(())
|
|
129
|
-
}
|
|
130
|
-
|
|
131
98
|
/// ---
|
|
132
99
|
/// purpose: 仅在 recorded seat root 内递归捕获 Pi session header 候选
|
|
133
100
|
/// returns: 有预期 id 时按 id/cwd/timestamp 匹配;否则读取 Pi header 自己的 id,并按 cwd/timestamp 匹配
|
|
@@ -10,11 +10,8 @@ use std::path::PathBuf;
|
|
|
10
10
|
use crate::provider::types::{CapturedSession, ProviderError, SessionId};
|
|
11
11
|
use crate::provider::Provider;
|
|
12
12
|
|
|
13
|
-
pub(crate) mod claude;
|
|
14
|
-
pub(crate) mod codex;
|
|
15
13
|
pub(crate) mod common;
|
|
16
14
|
pub(crate) mod copilot;
|
|
17
|
-
pub(crate) mod grok;
|
|
18
15
|
pub(crate) mod pi;
|
|
19
16
|
|
|
20
17
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
@@ -43,35 +40,22 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
43
40
|
if matches!(provider, Provider::Copilot) {
|
|
44
41
|
return Ok(copilot::scan_session_store(context));
|
|
45
42
|
}
|
|
46
|
-
if matches!(provider, Provider::Grok) {
|
|
47
|
-
return Ok(grok::scan_session_store(context));
|
|
48
|
-
}
|
|
49
43
|
if matches!(provider, Provider::Pi) {
|
|
50
44
|
return pi::scan_session_store(context);
|
|
51
45
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
46
|
+
// Claude Code, Codex and Grok workers run only through their contract
|
|
47
|
+
// leaves; a pre-upgrade legacy row has nothing left to capture.
|
|
48
|
+
if matches!(
|
|
49
|
+
provider,
|
|
50
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok
|
|
51
|
+
) {
|
|
52
|
+
return Ok(Vec::new());
|
|
56
53
|
}
|
|
57
54
|
|
|
58
55
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
59
56
|
let mut out = common::parse_candidate_files(provider, context, candidates);
|
|
60
|
-
if matches!(provider, Provider::Codex) {
|
|
61
|
-
codex::retain_spawn_cwd(context, &mut out);
|
|
62
|
-
}
|
|
63
57
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
64
|
-
|
|
65
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
66
|
-
return claude::apply_expected_session_filter(context, out);
|
|
67
|
-
}
|
|
68
|
-
if matches!(provider, Provider::Codex) {
|
|
69
|
-
out = codex::apply_expected_session_filter(context, out);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
58
|
common::apply_spawn_time_window_if_unique(provider, context, &mut out);
|
|
73
59
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
74
60
|
Ok(out)
|
|
75
61
|
}
|
|
76
|
-
|
|
77
|
-
pub(crate) use claude::rollout_path_has_leader_marker as rollout_path_has_claude_leader_marker;
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
#[test]
|
|
2
2
|
fn trimmed_provider_builders_preserve_fresh_and_resume_argv() {
|
|
3
3
|
for (provider, base) in [
|
|
4
|
-
(
|
|
5
|
-
Provider::Grok,
|
|
6
|
-
vec!["grok", "--model", "test-model", "--rules", "role"],
|
|
7
|
-
),
|
|
8
4
|
(
|
|
9
5
|
Provider::Copilot,
|
|
10
6
|
vec![
|
|
@@ -106,7 +102,7 @@ fn abnormal_dedup_key_uses_signature_and_optional_turn_id() {
|
|
|
106
102
|
|
|
107
103
|
#[test]
|
|
108
104
|
fn capture_session_id_success_payload_fields() {
|
|
109
|
-
//
|
|
105
|
+
// Shared spawn_cwd scan success → CapturedSession high confidence, fs_watch,
|
|
110
106
|
// session_id Some, rollout_path Some. Drive the real fn against a temp cwd
|
|
111
107
|
// that contains a discoverable transcript; assert ALL 5 typed fields.
|
|
112
108
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -119,7 +115,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
119
115
|
&transcript,
|
|
120
116
|
r#"{"type":"user","sessionId":"sess-1","cwd":"PLACEHOLDER","message":{"content":"hi"}}"#,
|
|
121
117
|
);
|
|
122
|
-
let adapter = get_adapter(Provider::
|
|
118
|
+
let adapter = get_adapter(Provider::Fake);
|
|
123
119
|
let cs = adapter
|
|
124
120
|
.capture_session_id("agentX", &dir, 3)
|
|
125
121
|
.expect("capture ok")
|
|
@@ -133,7 +129,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
133
129
|
|
|
134
130
|
#[test]
|
|
135
131
|
fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_session() {
|
|
136
|
-
// probe(
|
|
132
|
+
// probe(shared scan fallback): transcript w/o a session_id →
|
|
137
133
|
// session_id=None, captured_via=fs_mtime_fallback, confidence=low,
|
|
138
134
|
// rollout_path SET. The half-state is LEGAL and must not panic (bug-085).
|
|
139
135
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -143,7 +139,7 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
143
139
|
let _ = std::fs::create_dir_all(&dir);
|
|
144
140
|
let transcript = dir.join("nosession.jsonl");
|
|
145
141
|
let _ = std::fs::write(&transcript, r#"{"type":"user","message":{"content":"hi"}}"#);
|
|
146
|
-
let adapter = get_adapter(Provider::
|
|
142
|
+
let adapter = get_adapter(Provider::Fake);
|
|
147
143
|
let cs = adapter
|
|
148
144
|
.capture_session_id("agentX", &dir, 3)
|
|
149
145
|
.expect("capture ok")
|
|
@@ -157,10 +153,10 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
157
153
|
|
|
158
154
|
#[test]
|
|
159
155
|
fn capture_session_id_no_match_returns_none() {
|
|
160
|
-
//
|
|
156
|
+
// Deadline with no match → Ok(None), explicitly NOT Err.
|
|
161
157
|
let empty = std::env::temp_dir().join(format!("ta-cap-empty-{}", std::process::id()));
|
|
162
158
|
let _ = std::fs::create_dir_all(&empty);
|
|
163
|
-
let adapter = get_adapter(Provider::
|
|
159
|
+
let adapter = get_adapter(Provider::Fake);
|
|
164
160
|
let res = adapter.capture_session_id("agentX", &empty, 0);
|
|
165
161
|
// ProviderError 非 PartialEq(携 Io)→ 用 matches! 而非 ==。
|
|
166
162
|
assert!(matches!(res, Ok(None)), "no transcript + timeout 0 → Ok(None), never Err");
|
|
@@ -170,20 +166,60 @@ fn capture_session_id_no_match_returns_none() {
|
|
|
170
166
|
// ---- resume / fork / build_command / caps — command-build core ----
|
|
171
167
|
|
|
172
168
|
#[test]
|
|
173
|
-
fn
|
|
174
|
-
//
|
|
175
|
-
//
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
169
|
+
fn retired_worker_caps_are_neither_resumable_nor_forkable() {
|
|
170
|
+
// Claude Code, Codex and Grok workers run only through their contract
|
|
171
|
+
// leaves; a pre-upgrade legacy row must never become capture-pending or
|
|
172
|
+
// resumable.
|
|
173
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok] {
|
|
174
|
+
let adapter = get_adapter(provider);
|
|
175
|
+
assert_eq!(
|
|
176
|
+
adapter.caps(),
|
|
177
|
+
ProviderCaps {
|
|
178
|
+
resume: false,
|
|
179
|
+
fork: false,
|
|
180
|
+
native_mcp_config: false,
|
|
181
|
+
writes_global_settings: false,
|
|
182
|
+
},
|
|
183
|
+
"{provider:?}"
|
|
184
|
+
);
|
|
185
|
+
assert_eq!(adapter.auth_hint(AuthMode::Subscription), AuthHintStatus::Unknown);
|
|
186
|
+
assert!(matches!(
|
|
187
|
+
adapter.build_command(AuthMode::Subscription, None, Some("worker"), Some("opus")),
|
|
188
|
+
Err(ProviderError::Command(_))
|
|
189
|
+
));
|
|
190
|
+
let ctx = ProviderCommandContext {
|
|
191
|
+
auth_mode: AuthMode::Subscription,
|
|
192
|
+
mcp_config: None,
|
|
193
|
+
system_prompt: Some("worker"),
|
|
194
|
+
model: Some("opus"),
|
|
195
|
+
dangerously_skip_permissions: false,
|
|
196
|
+
profile_launch: None,
|
|
197
|
+
agent_id_hint: Some("worker"),
|
|
198
|
+
effort: None,
|
|
199
|
+
};
|
|
200
|
+
match adapter.build_command_plan(ctx) {
|
|
201
|
+
Err(ProviderError::Command(text)) => assert!(
|
|
202
|
+
text.contains("worker runtime was excised"),
|
|
203
|
+
"{provider:?}: {text}"
|
|
204
|
+
),
|
|
205
|
+
other => panic!("{provider:?} legacy plan must be refused, got {other:?}"),
|
|
185
206
|
}
|
|
186
|
-
|
|
207
|
+
let session = SessionId::new("legacy-session");
|
|
208
|
+
assert!(
|
|
209
|
+
matches!(
|
|
210
|
+
adapter.build_resume_command(Some(&session), AuthMode::Subscription, None),
|
|
211
|
+
Err(ProviderError::ResumeUnavailable(_))
|
|
212
|
+
),
|
|
213
|
+
"{provider:?} resume"
|
|
214
|
+
);
|
|
215
|
+
assert!(
|
|
216
|
+
matches!(
|
|
217
|
+
adapter.fork(Some(&session), AuthMode::Subscription, None),
|
|
218
|
+
Err(ProviderError::CapabilityUnsupported(_))
|
|
219
|
+
),
|
|
220
|
+
"{provider:?} fork"
|
|
221
|
+
);
|
|
222
|
+
}
|
|
187
223
|
}
|
|
188
224
|
|
|
189
225
|
#[test]
|
|
@@ -196,26 +232,10 @@ fn gemini_writes_global_settings_cap() {
|
|
|
196
232
|
assert!(!caps.native_mcp_config, "gemini has no native --mcp-config flag");
|
|
197
233
|
}
|
|
198
234
|
|
|
199
|
-
#[test]
|
|
200
|
-
fn claude_fork_blocked_under_compatible_api() {
|
|
201
|
-
// claude.py:54 supports_session_fork == (auth_mode != compatible_api).
|
|
202
|
-
// fork under CompatibleApi must Err (never silently empty) — capability path.
|
|
203
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
204
|
-
let sid = SessionId::new("src-1");
|
|
205
|
-
let res = adapter.fork(Some(&sid), AuthMode::CompatibleApi, None);
|
|
206
|
-
assert!(
|
|
207
|
-
matches!(
|
|
208
|
-
res,
|
|
209
|
-
Err(ProviderError::CapabilityUnsupported(_)) | Err(ProviderError::ResumeUnavailable(_))
|
|
210
|
-
),
|
|
211
|
-
"fork under compatible_api must Err, got {res:?}"
|
|
212
|
-
);
|
|
213
|
-
}
|
|
214
|
-
|
|
215
235
|
#[test]
|
|
216
236
|
fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
217
|
-
//
|
|
218
|
-
let adapter = get_adapter(Provider::
|
|
237
|
+
// No session_id → ResumeUnavailable, never a bare crash.
|
|
238
|
+
let adapter = get_adapter(Provider::Copilot);
|
|
219
239
|
let res = adapter.build_resume_command(None, AuthMode::Subscription, None);
|
|
220
240
|
assert!(
|
|
221
241
|
matches!(res, Err(ProviderError::ResumeUnavailable(_))),
|
|
@@ -225,69 +245,12 @@ fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
|
225
245
|
|
|
226
246
|
#[test]
|
|
227
247
|
fn session_is_resumable_none_session_is_false_not_panic() {
|
|
228
|
-
//
|
|
229
|
-
let adapter = get_adapter(Provider::
|
|
248
|
+
// session_id falsy → not resumable; bug-085 None穿透.
|
|
249
|
+
let adapter = get_adapter(Provider::Copilot);
|
|
230
250
|
let res = adapter.session_is_resumable(None, AuthMode::CompatibleApi);
|
|
231
251
|
assert!(matches!(res, Ok(false)), "None session → Ok(false), never panic (bug-085)");
|
|
232
252
|
}
|
|
233
253
|
|
|
234
|
-
/// true iff `needle` (e.g. ["--model","opus"]) appears as a contiguous run in `hay`.
|
|
235
|
-
fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
236
|
-
if needle.is_empty() {
|
|
237
|
-
return true;
|
|
238
|
-
}
|
|
239
|
-
hay.windows(needle.len())
|
|
240
|
-
.any(|w| w.iter().zip(needle).all(|(a, b)| a == b))
|
|
241
|
-
}
|
|
242
|
-
|
|
243
|
-
#[test]
|
|
244
|
-
fn build_command_includes_model_and_system_prompt() {
|
|
245
|
-
// claude.py:175-199 — _base_command appends --model <m> + --append-system-prompt <p>;
|
|
246
|
-
// --strict-mcp-config only appears when mcp_config is present. With mcp_config=None,
|
|
247
|
-
// assert both flag pairs present adjacently AND --strict-mcp-config ABSENT.
|
|
248
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
249
|
-
let argv = adapter
|
|
250
|
-
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("opus"))
|
|
251
|
-
.expect("build_command ok");
|
|
252
|
-
assert!(
|
|
253
|
-
argv_contains_adjacent(&argv, &["--model", "opus"]),
|
|
254
|
-
"argv must contain `--model opus` adjacency: {argv:?}"
|
|
255
|
-
);
|
|
256
|
-
assert!(
|
|
257
|
-
argv_contains_adjacent(&argv, &["--append-system-prompt", "be helpful"]),
|
|
258
|
-
"argv must contain `--append-system-prompt 'be helpful'`: {argv:?}"
|
|
259
|
-
);
|
|
260
|
-
assert!(
|
|
261
|
-
!argv.iter().any(|a| a == "--strict-mcp-config"),
|
|
262
|
-
"no mcp_config → --strict-mcp-config must be absent: {argv:?}"
|
|
263
|
-
);
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
#[test]
|
|
267
|
-
fn claude_mcp_config_does_not_enable_strict_mode() {
|
|
268
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
269
|
-
let config = adapter
|
|
270
|
-
.mcp_config(AuthMode::Subscription)
|
|
271
|
-
.expect("mcp config");
|
|
272
|
-
let argv = adapter
|
|
273
|
-
.build_command(
|
|
274
|
-
AuthMode::Subscription,
|
|
275
|
-
Some(&config),
|
|
276
|
-
Some("worker"),
|
|
277
|
-
Some("opus"),
|
|
278
|
-
)
|
|
279
|
-
.expect("build command with mcp config");
|
|
280
|
-
|
|
281
|
-
assert!(
|
|
282
|
-
argv_contains_adjacent(&argv, &["--mcp-config"]),
|
|
283
|
-
"Claude worker argv must still pass Team Agent MCP config: {argv:?}"
|
|
284
|
-
);
|
|
285
|
-
assert!(
|
|
286
|
-
!argv.iter().any(|arg| arg == "--strict-mcp-config"),
|
|
287
|
-
"--mcp-config must merge with user-level Claude MCP; strict mode hides user MCP: {argv:?}"
|
|
288
|
-
);
|
|
289
|
-
}
|
|
290
|
-
|
|
291
254
|
#[test]
|
|
292
255
|
fn unsupported_provider_capability_error_message_shape() {
|
|
293
256
|
// unsupported.py:31 ProviderCapabilityError — placeholder providers reject
|
|
@@ -310,108 +273,6 @@ fn unsupported_provider_capability_error_message_shape() {
|
|
|
310
273
|
// Lock the CORRECT Python v0.2.11 behavior the strengthened contracts missed.
|
|
311
274
|
// Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
|
|
312
275
|
|
|
313
|
-
// ═══════════════ 0.5.67 provider-adapter (Grok) ═══════════════
|
|
314
|
-
// 仿 claude build_command tests 结构 (见 build_command_includes_model_and_system_prompt)。
|
|
315
|
-
// 不跑 cargo (禁 cargo 红线), 静态编码 + leader verify 时执行。
|
|
316
|
-
|
|
317
|
-
#[test]
|
|
318
|
-
fn test_grok_build_command_includes_rules_flag_when_system_prompt_set() {
|
|
319
|
-
let adapter = get_adapter(Provider::Grok);
|
|
320
|
-
let argv = adapter
|
|
321
|
-
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("grok-4"))
|
|
322
|
-
.expect("build_command ok");
|
|
323
|
-
assert!(
|
|
324
|
-
argv_contains_adjacent(&argv, &["--model", "grok-4"]),
|
|
325
|
-
"argv must contain `--model grok-4` adjacency: {argv:?}"
|
|
326
|
-
);
|
|
327
|
-
assert!(
|
|
328
|
-
argv_contains_adjacent(&argv, &["--rules", "be helpful"]),
|
|
329
|
-
"grok append-system-prompt must be `--rules 'be helpful'`: {argv:?}"
|
|
330
|
-
);
|
|
331
|
-
}
|
|
332
|
-
|
|
333
|
-
#[test]
|
|
334
|
-
fn test_grok_build_command_bypass_flag_when_dangerous() {
|
|
335
|
-
let adapter = get_adapter(Provider::Grok);
|
|
336
|
-
let dangerous = adapter
|
|
337
|
-
.build_command_with_permissions(
|
|
338
|
-
AuthMode::Subscription,
|
|
339
|
-
None,
|
|
340
|
-
None,
|
|
341
|
-
Some("grok-4"),
|
|
342
|
-
true,
|
|
343
|
-
)
|
|
344
|
-
.expect("dangerous build_command ok");
|
|
345
|
-
assert!(
|
|
346
|
-
argv_contains_adjacent(&dangerous, &["--always-approve"]),
|
|
347
|
-
"dangerous grok must include `--always-approve`: {dangerous:?}"
|
|
348
|
-
);
|
|
349
|
-
let safe = adapter
|
|
350
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4"))
|
|
351
|
-
.expect("safe build_command ok");
|
|
352
|
-
assert!(
|
|
353
|
-
!safe.iter().any(|a| a == "--always-approve"),
|
|
354
|
-
"non-dangerous grok must not include --always-approve: {safe:?}"
|
|
355
|
-
);
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
#[test]
|
|
359
|
-
fn test_grok_build_command_omits_missing_model() {
|
|
360
|
-
let adapter = get_adapter(Provider::Grok);
|
|
361
|
-
let argv = adapter
|
|
362
|
-
.build_command(AuthMode::Subscription, None, None, None)
|
|
363
|
-
.expect("missing model preserves the provider-native default");
|
|
364
|
-
assert!(
|
|
365
|
-
!argv.iter().any(|arg| arg == "--model"),
|
|
366
|
-
"missing model must not fabricate a --model argument: {argv:?}"
|
|
367
|
-
);
|
|
368
|
-
assert!(
|
|
369
|
-
argv_contains_adjacent(
|
|
370
|
-
&adapter
|
|
371
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4.6"))
|
|
372
|
-
.expect("explicit model must build"),
|
|
373
|
-
&["--model", "grok-4.6"]
|
|
374
|
-
),
|
|
375
|
-
"explicit model must still become adjacent `--model grok-4.6`"
|
|
376
|
-
);
|
|
377
|
-
}
|
|
378
|
-
|
|
379
|
-
#[test]
|
|
380
|
-
fn test_grok_build_command_plan_binds_expected_session_id_to_argv() {
|
|
381
|
-
let adapter = get_adapter(Provider::Grok);
|
|
382
|
-
let plan = adapter
|
|
383
|
-
.build_command_plan(ProviderCommandContext {
|
|
384
|
-
auth_mode: AuthMode::Subscription,
|
|
385
|
-
mcp_config: None,
|
|
386
|
-
system_prompt: None,
|
|
387
|
-
model: Some("grok-4.6"),
|
|
388
|
-
dangerously_skip_permissions: false,
|
|
389
|
-
profile_launch: None,
|
|
390
|
-
agent_id_hint: Some("w1"),
|
|
391
|
-
effort: None,
|
|
392
|
-
})
|
|
393
|
-
.expect("grok plan");
|
|
394
|
-
let sid = plan
|
|
395
|
-
.expected_session_id
|
|
396
|
-
.as_ref()
|
|
397
|
-
.map(|s| s.as_str())
|
|
398
|
-
.expect("grok fresh plan must carry expected_session_id");
|
|
399
|
-
assert!(
|
|
400
|
-
!sid.is_empty(),
|
|
401
|
-
"expected_session_id must be a non-empty uuid"
|
|
402
|
-
);
|
|
403
|
-
assert!(
|
|
404
|
-
argv_contains_adjacent(&plan.argv, &["--session-id", sid]),
|
|
405
|
-
"argv --session-id must match expected_session_id; argv={:?}",
|
|
406
|
-
plan.argv
|
|
407
|
-
);
|
|
408
|
-
assert!(
|
|
409
|
-
!plan.argv.iter().any(|a| a == "--resume"),
|
|
410
|
-
"fresh grok plan must not include --resume; argv={:?}",
|
|
411
|
-
plan.argv
|
|
412
|
-
);
|
|
413
|
-
}
|
|
414
|
-
|
|
415
276
|
#[test]
|
|
416
277
|
fn pi_wire_roundtrip_requires_backing() {
|
|
417
278
|
use crate::provider::wire::{
|
|
@@ -429,12 +290,13 @@ fn pi_wire_roundtrip_requires_backing() {
|
|
|
429
290
|
}
|
|
430
291
|
|
|
431
292
|
#[test]
|
|
432
|
-
fn
|
|
293
|
+
fn pi_caps_resume_false_fork_false_native_mcp_false_auth_unknown() {
|
|
294
|
+
// Pi workers run only through the contract leaf; a legacy row is not resumable.
|
|
433
295
|
let adapter = get_adapter(Provider::Pi);
|
|
434
296
|
assert_eq!(
|
|
435
297
|
adapter.caps(),
|
|
436
298
|
ProviderCaps {
|
|
437
|
-
resume:
|
|
299
|
+
resume: false,
|
|
438
300
|
fork: false,
|
|
439
301
|
native_mcp_config: false,
|
|
440
302
|
writes_global_settings: false,
|
|
@@ -1,52 +1,26 @@
|
|
|
1
1
|
//! Exact argv characterization: no helper may trim, escape or reorder caller values.
|
|
2
2
|
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
|
|
3
3
|
use super::*;
|
|
4
|
+
use crate::lifecycle::launch::pi_mcp as pi;
|
|
4
5
|
use crate::model::enums::ProviderEffort;
|
|
5
|
-
use crate::provider::adapters::
|
|
6
|
-
use crate::provider::ProviderCommandOverrides;
|
|
6
|
+
use crate::provider::adapters::copilot;
|
|
7
7
|
|
|
8
8
|
#[test]
|
|
9
9
|
fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
10
10
|
let raw = " \"'\\\n ";
|
|
11
11
|
let mcp = McpConfig { raw: serde_json::json!({}) };
|
|
12
|
-
assert_eq!(claude::claude_base_command(
|
|
13
|
-
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
14
|
-
Some(&mcp), Some(raw), Some(""), false, false, Some(ProviderEffort::High),
|
|
15
|
-
).expect("claude"), ["claude", "--permission-mode", "default", "--model", "", "--effort", "high", "--append-system-prompt", raw, "--mcp-config", "{\"mcpServers\":{}}"]);
|
|
16
|
-
|
|
17
|
-
let overrides = ProviderCommandOverrides {
|
|
18
|
-
codex_profile: Some("".to_string()),
|
|
19
|
-
codex_config: vec!["model_reasoning_effort=low".to_string()],
|
|
20
|
-
..Default::default()
|
|
21
|
-
};
|
|
22
|
-
assert_eq!(codex::codex_base_command(
|
|
23
|
-
Some("resume"), AuthMode::Subscription, Some(&mcp), Some(raw), Some(""),
|
|
24
|
-
true, Some(&overrides), Some(ProviderEffort::Max),
|
|
25
|
-
), ["codex", "resume", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps", "--profile", "", "--dangerously-bypass-approvals-and-sandbox", "--model", "", "-c", "model_reasoning_effort=low", "-c", "model_reasoning_effort=max", "-c", "developer_instructions=\" \\\"'\\\\\\n \""]);
|
|
26
|
-
|
|
27
12
|
assert_eq!(copilot::copilot_base_command(
|
|
28
13
|
AuthMode::Subscription, Some(&mcp), Some(raw), Some(""), true,
|
|
29
14
|
), ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-all", "--allow-tool", "team_orchestrator", "--model", "", "--additional-mcp-config", "{}"]);
|
|
30
|
-
assert_eq!(grok::grok_base_command(Some(raw), Some(" model-id "), true, Some(ProviderEffort::Medium)).expect("grok"),
|
|
31
|
-
["grok", "--always-approve", "--model", "model-id", "--effort", "medium", "--rules", raw]);
|
|
32
|
-
assert_eq!(grok::grok_base_command(Some(""), Some(" "), false, None).expect("grok empty"), ["grok", "--rules", ""]);
|
|
33
15
|
assert_eq!(pi::build_pi_command_argv(pi::PiCommandRequest {
|
|
34
16
|
extension: std::path::Path::new("extension.ts"), model: Some("vendor/model"),
|
|
35
17
|
effort: Some(ProviderEffort::XHigh), system_prompt: raw,
|
|
36
|
-
session_dir: Some(std::path::Path::new("sessions")),
|
|
37
|
-
session: pi::PiSessionSelector::Fresh, agent_id: "worker",
|
|
18
|
+
session_dir: Some(std::path::Path::new("sessions")), agent_id: "worker",
|
|
38
19
|
}).expect("pi"), ["pi", "-e", "extension.ts", "--model", "vendor/model", "--thinking", "xhigh", "--append-system-prompt", raw, "--session-dir", "sessions", "--name", "worker"]);
|
|
39
20
|
}
|
|
40
21
|
|
|
41
22
|
#[test]
|
|
42
23
|
fn command_helpers_keep_absent_options_and_safe_defaults() {
|
|
43
|
-
assert_eq!(claude::claude_base_command(
|
|
44
|
-
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
45
|
-
None, None, None, false, false, None,
|
|
46
|
-
).expect("claude"), ["claude", "--permission-mode", "default"]);
|
|
47
|
-
assert_eq!(codex::codex_base_command(None, AuthMode::Subscription, None, None, None, false, None, None),
|
|
48
|
-
["codex", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps"]);
|
|
49
24
|
assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
|
|
50
25
|
["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-tool", "team_orchestrator"]);
|
|
51
|
-
assert_eq!(grok::grok_base_command(None, None, false, None).expect("grok"), ["grok"]);
|
|
52
26
|
}
|
|
@@ -133,74 +133,6 @@ fn idle_leader_activity_never_arms_but_leader_idle_allows_ping() {
|
|
|
133
133
|
assert_eq!(r2.reason, NoPingReason::AllIdleDebounceElapsed);
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
-
// ---- (c) trust-prompt recognizer (REAL fixtures, own-vs-foreign) ----
|
|
137
|
-
//
|
|
138
|
-
// NOTE: the own-vs-foreign trust recognizer lives in messaging/leader_panes.py
|
|
139
|
-
// (step 9/10 owns it per card §42). The provider.rs skeleton exposes only
|
|
140
|
-
// `status_patterns()` (idle/processing/trust regex set) — driven RED below.
|
|
141
|
-
// Full own-vs-foreign realpath judgement + truncated-workspace logic deferred.
|
|
142
|
-
|
|
143
|
-
// Real fixtures (mirrored into the rust workspace from team-agent-public).
|
|
144
|
-
const CLAUDE_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
145
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
146
|
-
"/../../snapshot/fixtures/idle_prompts/claude_code_idle.txt"
|
|
147
|
-
));
|
|
148
|
-
const CODEX_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
149
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
150
|
-
"/../../snapshot/fixtures/idle_prompts/codex_idle.txt"
|
|
151
|
-
));
|
|
152
|
-
const CODEX_WORKING_FIXTURE: &str = include_str!(concat!(
|
|
153
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
154
|
-
"/../../snapshot/fixtures/idle_prompts/codex_working.txt"
|
|
155
|
-
));
|
|
156
|
-
|
|
157
|
-
fn fixture_matches(re: ®ex::Regex, fixture: &str) -> bool {
|
|
158
|
-
fixture.lines().any(|l| re.is_match(l))
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
#[test]
|
|
162
|
-
fn claude_status_patterns_compile() {
|
|
163
|
-
// provider_cli/claude.py:225 status_patterns idle=r"[>❯]\s".
|
|
164
|
-
// The real fixture has prompt lines like "❯ /compact" → idle MUST match.
|
|
165
|
-
// The processing pattern r"[✶✢✽✻✳·].*…" must NOT match those idle prompt lines.
|
|
166
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
167
|
-
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
168
|
-
assert!(
|
|
169
|
-
fixture_matches(&pats.idle, CLAUDE_IDLE_FIXTURE),
|
|
170
|
-
"claude idle pattern must match a '❯ ' prompt line in the idle fixture"
|
|
171
|
-
);
|
|
172
|
-
assert!(
|
|
173
|
-
pats.idle.is_match("❯ /compact"),
|
|
174
|
-
"claude idle pattern matches the canonical prompt line"
|
|
175
|
-
);
|
|
176
|
-
assert!(
|
|
177
|
-
!pats.processing.is_match("❯ /compact"),
|
|
178
|
-
"claude processing pattern must NOT match an idle prompt line"
|
|
179
|
-
);
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
#[test]
|
|
183
|
-
fn codex_status_patterns_compile() {
|
|
184
|
-
// provider_cli/codex.py:140 idle=r"(›|❯|codex>)" processing=r"•.*esc to interrupt".
|
|
185
|
-
// codex_idle.txt has a "› Find and fix a bug…" prompt → idle matches.
|
|
186
|
-
// codex_working.txt has a "• …esc to interrupt" spinner → processing matches.
|
|
187
|
-
let adapter = get_adapter(Provider::Codex);
|
|
188
|
-
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
189
|
-
assert!(
|
|
190
|
-
fixture_matches(&pats.idle, CODEX_IDLE_FIXTURE),
|
|
191
|
-
"codex idle pattern must match a '›' prompt line"
|
|
192
|
-
);
|
|
193
|
-
assert!(
|
|
194
|
-
CODEX_WORKING_FIXTURE.lines().any(|l| pats.processing.is_match(l)),
|
|
195
|
-
"codex processing pattern must match the 'esc to interrupt' spinner"
|
|
196
|
-
);
|
|
197
|
-
// The discriminator: a pure working-status footer line carries no prompt char.
|
|
198
|
-
assert!(
|
|
199
|
-
!pats.idle.is_match(" gpt-5.5 medium · /private/tmp/working"),
|
|
200
|
-
"codex idle pattern must NOT match a bare status footer"
|
|
201
|
-
);
|
|
202
|
-
}
|
|
203
|
-
|
|
204
136
|
// ---- (d) abnormal dedup key (signature, Option<TurnId>) ----
|
|
205
137
|
//
|
|
206
138
|
// NOTE: read_fault_facts lives in provider_state; not on the skeleton trait.
|
|
@@ -321,10 +321,6 @@ pub struct ProviderCaps {
|
|
|
321
321
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
|
|
322
322
|
pub struct ProviderCommandOverrides {
|
|
323
323
|
pub model: Option<String>,
|
|
324
|
-
/// Python `provider_env.py:62-65` — profile CODEX_PROFILE/NATIVE_PROFILE → `--profile <x>`.
|
|
325
|
-
pub codex_profile: Option<String>,
|
|
326
|
-
/// Python `provider_env.py:66-79` — compatible_api model_provider `-c` items, verbatim.
|
|
327
|
-
pub codex_config: Vec<String>,
|
|
328
324
|
}
|
|
329
325
|
|
|
330
326
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
|