@team-agent/installer 0.5.126 → 0.5.128
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -1
- package/Cargo.toml +1 -1
- package/README.md +11 -0
- package/crates/team-agent/src/cli/adapters.rs +3 -13
- package/crates/team-agent/src/cli/arguments.rs +4 -0
- package/crates/team-agent/src/cli/diagnose.rs +68 -91
- package/crates/team-agent/src/cli/emit.rs +61 -28
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +38 -9
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +147 -11
- package/crates/team-agent/src/cli/intent/tests.rs +10 -12
- package/crates/team-agent/src/cli/intent.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +38 -9
- package/crates/team-agent/src/cli/models.rs +789 -186
- package/crates/team-agent/src/cli/schedule.rs +175 -0
- package/crates/team-agent/src/cli/send/persist.rs +0 -36
- package/crates/team-agent/src/cli/send/presentation.rs +1 -1
- package/crates/team-agent/src/cli/send.rs +108 -110
- package/crates/team-agent/src/cli/spec.rs +6 -0
- package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
- package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +12 -9
- package/crates/team-agent/src/cli/tests/status_send.rs +70 -273
- package/crates/team-agent/src/compiler/tests.rs +39 -27
- package/crates/team-agent/src/compiler.rs +206 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +181 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +338 -7
- package/crates/team-agent/src/contract_runtime/config.rs +30 -19
- package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
- package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
- package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
- package/crates/team-agent/src/contract_runtime/framework.rs +28 -14
- package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
- package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
- package/crates/team-agent/src/contract_runtime/registry.rs +93 -130
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +8 -29
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +44 -2
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/coordinator/tick.rs +1 -89
- package/crates/team-agent/src/db/message_store.rs +7 -65
- package/crates/team-agent/src/direct_delivery.rs +368 -0
- package/crates/team-agent/src/inbox_store.rs +169 -0
- package/crates/team-agent/src/leader/registry.rs +5 -0
- package/crates/team-agent/src/leader/start.rs +2 -1
- package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
- package/crates/team-agent/src/lib.rs +2 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +36 -179
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +13 -488
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +26 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +41 -31
- package/crates/team-agent/src/lifecycle/launch.rs +27 -12
- package/crates/team-agent/src/lifecycle/profile_launch.rs +318 -64
- package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +298 -133
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +4 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +79 -27
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +329 -70
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +25 -39
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +39 -36
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +164 -282
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +14 -15
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +38 -39
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +51 -88
- package/crates/team-agent/src/lifecycle/tests.rs +3 -4
- package/crates/team-agent/src/lifecycle/types.rs +18 -5
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
- package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +86 -109
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
- package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
- package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
- package/crates/team-agent/src/mcp_server/tools.rs +70 -196
- package/crates/team-agent/src/messaging/delivery.rs +143 -253
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/helpers.rs +1 -19
- package/crates/team-agent/src/messaging/mod.rs +1 -0
- package/crates/team-agent/src/messaging/reminders.rs +316 -0
- package/crates/team-agent/src/messaging/scheduler.rs +7 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +255 -150
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +9 -115
- package/crates/team-agent/src/messaging/tests/spine.rs +44 -24
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +208 -254
- package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +7 -7
- package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
- package/crates/team-agent/src/provider/classify.rs +1 -66
- package/crates/team-agent/src/provider/model_catalog.rs +201 -13
- package/crates/team-agent/src/provider/session/capture.rs +111 -111
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +10 -18
- package/crates/team-agent/src/provider/session/context_fork.rs +87 -74
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +47 -47
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +13 -13
- package/crates/team-agent/src/provider/tests/adapter.rs +127 -121
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +11 -19
- package/crates/team-agent/src/provider/tests/idle.rs +13 -19
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -20
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/projection.rs +1 -1
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
- package/crates/team-agent/src/tmux_backend.rs +9 -43
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -8
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
|
@@ -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
|
+
// claude.py:73-106 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::ClaudeCode);
|
|
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(claude fallback): compatible_api 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::ClaudeCode);
|
|
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
|
+
// claude.py:111-113 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::ClaudeCode);
|
|
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,10 +166,10 @@ 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
|
-
// legacy row must never become capture-pending or resumable.
|
|
176
|
-
for provider in [Provider::
|
|
169
|
+
fn retired_worker_caps_are_neither_resumable_nor_forkable() {
|
|
170
|
+
// Codex and Grok workers run only through their contract leaves; a
|
|
171
|
+
// pre-upgrade legacy row must never become capture-pending or resumable.
|
|
172
|
+
for provider in [Provider::Codex, Provider::Grok] {
|
|
177
173
|
let adapter = get_adapter(provider);
|
|
178
174
|
assert_eq!(
|
|
179
175
|
adapter.caps(),
|
|
@@ -190,9 +186,58 @@ fn retired_claude_worker_caps_are_neither_resumable_nor_forkable() {
|
|
|
190
186
|
adapter.build_command(AuthMode::Subscription, None, Some("worker"), Some("opus")),
|
|
191
187
|
Err(ProviderError::Command(_))
|
|
192
188
|
));
|
|
189
|
+
let ctx = ProviderCommandContext {
|
|
190
|
+
auth_mode: AuthMode::Subscription,
|
|
191
|
+
mcp_config: None,
|
|
192
|
+
system_prompt: Some("worker"),
|
|
193
|
+
model: Some("opus"),
|
|
194
|
+
dangerously_skip_permissions: false,
|
|
195
|
+
profile_launch: None,
|
|
196
|
+
agent_id_hint: Some("worker"),
|
|
197
|
+
effort: None,
|
|
198
|
+
};
|
|
199
|
+
match adapter.build_command_plan(ctx) {
|
|
200
|
+
Err(ProviderError::Command(text)) => assert!(
|
|
201
|
+
text.contains("worker runtime was excised"),
|
|
202
|
+
"{provider:?}: {text}"
|
|
203
|
+
),
|
|
204
|
+
other => panic!("{provider:?} legacy plan must be refused, got {other:?}"),
|
|
205
|
+
}
|
|
206
|
+
let session = SessionId::new("legacy-session");
|
|
207
|
+
assert!(
|
|
208
|
+
matches!(
|
|
209
|
+
adapter.build_resume_command(Some(&session), AuthMode::Subscription, None),
|
|
210
|
+
Err(ProviderError::ResumeUnavailable(_))
|
|
211
|
+
),
|
|
212
|
+
"{provider:?} resume"
|
|
213
|
+
);
|
|
214
|
+
assert!(
|
|
215
|
+
matches!(
|
|
216
|
+
adapter.fork(Some(&session), AuthMode::Subscription, None),
|
|
217
|
+
Err(ProviderError::CapabilityUnsupported(_))
|
|
218
|
+
),
|
|
219
|
+
"{provider:?} fork"
|
|
220
|
+
);
|
|
193
221
|
}
|
|
194
222
|
}
|
|
195
223
|
|
|
224
|
+
#[test]
|
|
225
|
+
fn claude_caps_resume_and_fork_and_native_mcp() {
|
|
226
|
+
// doc §59 + claude.py: claude supports resume + fork (static cap true,
|
|
227
|
+
// runtime auth-gated) + native --mcp-config; does NOT write a global settings file.
|
|
228
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
229
|
+
let caps = adapter.caps();
|
|
230
|
+
assert_eq!(
|
|
231
|
+
caps,
|
|
232
|
+
ProviderCaps {
|
|
233
|
+
resume: true,
|
|
234
|
+
fork: true,
|
|
235
|
+
native_mcp_config: true,
|
|
236
|
+
writes_global_settings: false,
|
|
237
|
+
}
|
|
238
|
+
);
|
|
239
|
+
}
|
|
240
|
+
|
|
196
241
|
#[test]
|
|
197
242
|
fn gemini_writes_global_settings_cap() {
|
|
198
243
|
// gemini.py:40-78 — install_mcp writes ~/.gemini/settings.json →
|
|
@@ -203,10 +248,26 @@ fn gemini_writes_global_settings_cap() {
|
|
|
203
248
|
assert!(!caps.native_mcp_config, "gemini has no native --mcp-config flag");
|
|
204
249
|
}
|
|
205
250
|
|
|
251
|
+
#[test]
|
|
252
|
+
fn claude_fork_blocked_under_compatible_api() {
|
|
253
|
+
// claude.py:54 supports_session_fork == (auth_mode != compatible_api).
|
|
254
|
+
// fork under CompatibleApi must Err (never silently empty) — capability path.
|
|
255
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
256
|
+
let sid = SessionId::new("src-1");
|
|
257
|
+
let res = adapter.fork(Some(&sid), AuthMode::CompatibleApi, None);
|
|
258
|
+
assert!(
|
|
259
|
+
matches!(
|
|
260
|
+
res,
|
|
261
|
+
Err(ProviderError::CapabilityUnsupported(_)) | Err(ProviderError::ResumeUnavailable(_))
|
|
262
|
+
),
|
|
263
|
+
"fork under compatible_api must Err, got {res:?}"
|
|
264
|
+
);
|
|
265
|
+
}
|
|
266
|
+
|
|
206
267
|
#[test]
|
|
207
268
|
fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
208
|
-
//
|
|
209
|
-
let adapter = get_adapter(Provider::
|
|
269
|
+
// claude.py:41-42 — no session_id → ResumeUnavailable, never a bare crash.
|
|
270
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
210
271
|
let res = adapter.build_resume_command(None, AuthMode::Subscription, None);
|
|
211
272
|
assert!(
|
|
212
273
|
matches!(res, Err(ProviderError::ResumeUnavailable(_))),
|
|
@@ -216,13 +277,12 @@ fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
|
216
277
|
|
|
217
278
|
#[test]
|
|
218
279
|
fn session_is_resumable_none_session_is_false_not_panic() {
|
|
219
|
-
// session_id falsy → not resumable; bug-085 None穿透.
|
|
220
|
-
let adapter = get_adapter(Provider::
|
|
280
|
+
// claude.py:116-118 — session_id falsy → not resumable; bug-085 None穿透.
|
|
281
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
221
282
|
let res = adapter.session_is_resumable(None, AuthMode::CompatibleApi);
|
|
222
283
|
assert!(matches!(res, Ok(false)), "None session → Ok(false), never panic (bug-085)");
|
|
223
284
|
}
|
|
224
285
|
|
|
225
|
-
/// true iff `needle` (e.g. ["--model","opus"]) appears as a contiguous run in `hay`.
|
|
226
286
|
fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
227
287
|
if needle.is_empty() {
|
|
228
288
|
return true;
|
|
@@ -232,128 +292,75 @@ fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
|
232
292
|
}
|
|
233
293
|
|
|
234
294
|
#[test]
|
|
235
|
-
fn
|
|
236
|
-
//
|
|
237
|
-
//
|
|
238
|
-
//
|
|
239
|
-
|
|
240
|
-
let e = ProviderError::CapabilityUnsupported("opencode:start".to_string());
|
|
241
|
-
assert_eq!(
|
|
242
|
-
e.to_string(),
|
|
243
|
-
"provider capability unsupported: opencode:start"
|
|
244
|
-
);
|
|
245
|
-
let e2 = ProviderError::ResumeUnavailable("claude resume requires session_id".to_string());
|
|
246
|
-
assert_eq!(
|
|
247
|
-
e2.to_string(),
|
|
248
|
-
"resume unavailable: claude resume requires session_id"
|
|
249
|
-
);
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
// ═══════════════ P2 FIX-LOOP RED (复绿即对抗 cross-model findings) ═══════════════
|
|
253
|
-
// Lock the CORRECT Python v0.2.11 behavior the strengthened contracts missed.
|
|
254
|
-
// Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
|
|
255
|
-
|
|
256
|
-
// ═══════════════ 0.5.67 provider-adapter (Grok) ═══════════════
|
|
257
|
-
// 不跑 cargo (禁 cargo 红线), 静态编码 + leader verify 时执行。
|
|
258
|
-
|
|
259
|
-
#[test]
|
|
260
|
-
fn test_grok_build_command_includes_rules_flag_when_system_prompt_set() {
|
|
261
|
-
let adapter = get_adapter(Provider::Grok);
|
|
295
|
+
fn build_command_includes_model_and_system_prompt() {
|
|
296
|
+
// claude.py:175-199 — _base_command appends --model <m> + --append-system-prompt <p>;
|
|
297
|
+
// --strict-mcp-config only appears when mcp_config is present. With mcp_config=None,
|
|
298
|
+
// assert both flag pairs present adjacently AND --strict-mcp-config ABSENT.
|
|
299
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
262
300
|
let argv = adapter
|
|
263
|
-
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("
|
|
301
|
+
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("opus"))
|
|
264
302
|
.expect("build_command ok");
|
|
265
303
|
assert!(
|
|
266
|
-
argv_contains_adjacent(&argv, &["--model", "
|
|
267
|
-
"argv must contain `--model
|
|
268
|
-
);
|
|
269
|
-
assert!(
|
|
270
|
-
argv_contains_adjacent(&argv, &["--rules", "be helpful"]),
|
|
271
|
-
"grok append-system-prompt must be `--rules 'be helpful'`: {argv:?}"
|
|
304
|
+
argv_contains_adjacent(&argv, &["--model", "opus"]),
|
|
305
|
+
"argv must contain `--model opus` adjacency: {argv:?}"
|
|
272
306
|
);
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
#[test]
|
|
276
|
-
fn test_grok_build_command_bypass_flag_when_dangerous() {
|
|
277
|
-
let adapter = get_adapter(Provider::Grok);
|
|
278
|
-
let dangerous = adapter
|
|
279
|
-
.build_command_with_permissions(
|
|
280
|
-
AuthMode::Subscription,
|
|
281
|
-
None,
|
|
282
|
-
None,
|
|
283
|
-
Some("grok-4"),
|
|
284
|
-
true,
|
|
285
|
-
)
|
|
286
|
-
.expect("dangerous build_command ok");
|
|
287
307
|
assert!(
|
|
288
|
-
argv_contains_adjacent(&
|
|
289
|
-
"
|
|
308
|
+
argv_contains_adjacent(&argv, &["--append-system-prompt", "be helpful"]),
|
|
309
|
+
"argv must contain `--append-system-prompt 'be helpful'`: {argv:?}"
|
|
290
310
|
);
|
|
291
|
-
let safe = adapter
|
|
292
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4"))
|
|
293
|
-
.expect("safe build_command ok");
|
|
294
311
|
assert!(
|
|
295
|
-
!
|
|
296
|
-
"
|
|
312
|
+
!argv.iter().any(|a| a == "--strict-mcp-config"),
|
|
313
|
+
"no mcp_config → --strict-mcp-config must be absent: {argv:?}"
|
|
297
314
|
);
|
|
298
315
|
}
|
|
299
316
|
|
|
300
317
|
#[test]
|
|
301
|
-
fn
|
|
302
|
-
let adapter = get_adapter(Provider::
|
|
318
|
+
fn claude_mcp_config_does_not_enable_strict_mode() {
|
|
319
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
320
|
+
let config = adapter
|
|
321
|
+
.mcp_config(AuthMode::Subscription)
|
|
322
|
+
.expect("mcp config");
|
|
303
323
|
let argv = adapter
|
|
304
|
-
.build_command(
|
|
305
|
-
|
|
324
|
+
.build_command(
|
|
325
|
+
AuthMode::Subscription,
|
|
326
|
+
Some(&config),
|
|
327
|
+
Some("worker"),
|
|
328
|
+
Some("opus"),
|
|
329
|
+
)
|
|
330
|
+
.expect("build command with mcp config");
|
|
331
|
+
|
|
306
332
|
assert!(
|
|
307
|
-
|
|
308
|
-
"
|
|
333
|
+
argv_contains_adjacent(&argv, &["--mcp-config"]),
|
|
334
|
+
"Claude worker argv must still pass Team Agent MCP config: {argv:?}"
|
|
309
335
|
);
|
|
310
336
|
assert!(
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4.6"))
|
|
314
|
-
.expect("explicit model must build"),
|
|
315
|
-
&["--model", "grok-4.6"]
|
|
316
|
-
),
|
|
317
|
-
"explicit model must still become adjacent `--model grok-4.6`"
|
|
337
|
+
!argv.iter().any(|arg| arg == "--strict-mcp-config"),
|
|
338
|
+
"--mcp-config must merge with user-level Claude MCP; strict mode hides user MCP: {argv:?}"
|
|
318
339
|
);
|
|
319
340
|
}
|
|
320
341
|
|
|
321
342
|
#[test]
|
|
322
|
-
fn
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
profile_launch: None,
|
|
332
|
-
agent_id_hint: Some("w1"),
|
|
333
|
-
effort: None,
|
|
334
|
-
})
|
|
335
|
-
.expect("grok plan");
|
|
336
|
-
let sid = plan
|
|
337
|
-
.expected_session_id
|
|
338
|
-
.as_ref()
|
|
339
|
-
.map(|s| s.as_str())
|
|
340
|
-
.expect("grok fresh plan must carry expected_session_id");
|
|
341
|
-
assert!(
|
|
342
|
-
!sid.is_empty(),
|
|
343
|
-
"expected_session_id must be a non-empty uuid"
|
|
344
|
-
);
|
|
345
|
-
assert!(
|
|
346
|
-
argv_contains_adjacent(&plan.argv, &["--session-id", sid]),
|
|
347
|
-
"argv --session-id must match expected_session_id; argv={:?}",
|
|
348
|
-
plan.argv
|
|
343
|
+
fn unsupported_provider_capability_error_message_shape() {
|
|
344
|
+
// unsupported.py:31 ProviderCapabilityError — placeholder providers reject
|
|
345
|
+
// on call. The skeleton Provider enum has no Copilot/Opencode variant, so
|
|
346
|
+
// the unsupported path is exercised through ProviderError::CapabilityUnsupported
|
|
347
|
+
// construction (message contract) here; full plug dispatch deferred.
|
|
348
|
+
let e = ProviderError::CapabilityUnsupported("opencode:start".to_string());
|
|
349
|
+
assert_eq!(
|
|
350
|
+
e.to_string(),
|
|
351
|
+
"provider capability unsupported: opencode:start"
|
|
349
352
|
);
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
353
|
+
let e2 = ProviderError::ResumeUnavailable("claude resume requires session_id".to_string());
|
|
354
|
+
assert_eq!(
|
|
355
|
+
e2.to_string(),
|
|
356
|
+
"resume unavailable: claude resume requires session_id"
|
|
354
357
|
);
|
|
355
358
|
}
|
|
356
359
|
|
|
360
|
+
// ═══════════════ P2 FIX-LOOP RED (复绿即对抗 cross-model findings) ═══════════════
|
|
361
|
+
// Lock the CORRECT Python v0.2.11 behavior the strengthened contracts missed.
|
|
362
|
+
// Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
|
|
363
|
+
|
|
357
364
|
#[test]
|
|
358
365
|
fn pi_wire_roundtrip_requires_backing() {
|
|
359
366
|
use crate::provider::wire::{
|
|
@@ -371,13 +378,12 @@ fn pi_wire_roundtrip_requires_backing() {
|
|
|
371
378
|
}
|
|
372
379
|
|
|
373
380
|
#[test]
|
|
374
|
-
fn
|
|
375
|
-
// Pi workers run only through the contract leaf; a legacy row is not resumable.
|
|
381
|
+
fn pi_caps_resume_true_fork_false_native_mcp_false_auth_unknown() {
|
|
376
382
|
let adapter = get_adapter(Provider::Pi);
|
|
377
383
|
assert_eq!(
|
|
378
384
|
adapter.caps(),
|
|
379
385
|
ProviderCaps {
|
|
380
|
-
resume:
|
|
386
|
+
resume: true,
|
|
381
387
|
fork: false,
|
|
382
388
|
native_mcp_config: false,
|
|
383
389
|
writes_global_settings: false,
|
|
@@ -146,56 +146,3 @@ fn classify_open_turn_dead_is_abnormal_crashed_mid_turn() {
|
|
|
146
146
|
// Golden via /tmp/probe_idle.py (idle_predicate.evaluate_takeover_reminder).
|
|
147
147
|
// Nodes / monitor_state passed as serde_json::Value dicts (Python dict shape).
|
|
148
148
|
|
|
149
|
-
|
|
150
|
-
// #379: Claude Code's live session registry, located before and after capture.
|
|
151
|
-
#[cfg(unix)]
|
|
152
|
-
#[test]
|
|
153
|
-
fn claude_registry_turn_state_reads_the_live_record_for_this_transcript() {
|
|
154
|
-
let config = std::env::temp_dir().join(format!("ta-claude-registry-{}", std::process::id()));
|
|
155
|
-
let _ = std::fs::remove_dir_all(&config);
|
|
156
|
-
let sid = "11111111-2222-4333-8444-555555555555";
|
|
157
|
-
let projects = config.join("projects").join("-owned-cwd");
|
|
158
|
-
std::fs::create_dir_all(&projects).unwrap();
|
|
159
|
-
std::fs::create_dir_all(config.join("sessions")).unwrap();
|
|
160
|
-
let rollout = projects.join(format!("{sid}.jsonl"));
|
|
161
|
-
std::fs::write(&rollout, "").unwrap();
|
|
162
|
-
let sessions = config.join("sessions");
|
|
163
|
-
let expected_key = Some((sessions.clone(), sid.to_string()));
|
|
164
|
-
assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": rollout})), expected_key);
|
|
165
|
-
// Cold start: the launch's `--session-id` and projects root, before any capture.
|
|
166
|
-
assert_eq!(
|
|
167
|
-
claude_registry_key(&serde_json::json!({
|
|
168
|
-
"_pending_session_id": sid, "session_id": "stale", "claude_projects_root": config.join("projects"),
|
|
169
|
-
})),
|
|
170
|
-
expected_key
|
|
171
|
-
);
|
|
172
|
-
// Only `<config>/projects/<slug>/<id>.jsonl` names a registry.
|
|
173
|
-
assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": config.join(format!("{sid}.jsonl"))})), None);
|
|
174
|
-
let live = std::process::id();
|
|
175
|
-
let write = |pid: u32, session: &str, tmux: &str, status: &str| {
|
|
176
|
-
let record = serde_json::json!({"pid": pid, "sessionId": session, "tmux": tmux, "status": status});
|
|
177
|
-
std::fs::write(sessions.join(format!("{pid}.json")), record.to_string()).unwrap();
|
|
178
|
-
};
|
|
179
|
-
let read = |pane: Option<&str>| claude_registry_turn_state(&sessions, sid, pane);
|
|
180
|
-
for (status, expected) in [
|
|
181
|
-
("busy", Some(TurnState::Working)),
|
|
182
|
-
("waiting", Some(TurnState::BlockedOnHuman)),
|
|
183
|
-
("idle", Some(TurnState::Idle)),
|
|
184
|
-
("starting", None),
|
|
185
|
-
] {
|
|
186
|
-
write(live, sid, "team-x:@3.%7", status);
|
|
187
|
-
assert_eq!(read(Some("%7")), expected, "{status}");
|
|
188
|
-
}
|
|
189
|
-
write(live, sid, "team-x:@3.%7", "busy");
|
|
190
|
-
assert_eq!(read(None), Some(TurnState::Working));
|
|
191
|
-
assert_eq!(read(Some("%8")), None, "another pane's record");
|
|
192
|
-
write(live, "99999999-2222-4333-8444-555555555555", "team-x:@3.%7", "busy");
|
|
193
|
-
assert_eq!(read(Some("%7")), None, "another session's record");
|
|
194
|
-
std::fs::remove_file(sessions.join(format!("{live}.json"))).unwrap();
|
|
195
|
-
let mut child = std::process::Command::new("true").spawn().unwrap();
|
|
196
|
-
let dead = child.id();
|
|
197
|
-
child.wait().unwrap();
|
|
198
|
-
write(dead, sid, "team-x:@3.%7", "busy");
|
|
199
|
-
assert_eq!(read(Some("%7")), None, "a dead process is no evidence");
|
|
200
|
-
let _ = std::fs::remove_dir_all(&config);
|
|
201
|
-
}
|
|
@@ -1,43 +1,35 @@
|
|
|
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;
|
|
5
4
|
use crate::model::enums::ProviderEffort;
|
|
6
|
-
use crate::provider::adapters::{
|
|
7
|
-
use crate::provider::ProviderCommandOverrides;
|
|
5
|
+
use crate::provider::adapters::{claude, copilot, pi};
|
|
8
6
|
|
|
9
7
|
#[test]
|
|
10
8
|
fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
11
9
|
let raw = " \"'\\\n ";
|
|
12
10
|
let mcp = McpConfig { raw: serde_json::json!({}) };
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
};
|
|
18
|
-
assert_eq!(codex::codex_base_command(
|
|
19
|
-
Some("resume"), AuthMode::Subscription, Some(&mcp), Some(raw), Some(""),
|
|
20
|
-
true, Some(&overrides), Some(ProviderEffort::Max),
|
|
21
|
-
), ["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 \""]);
|
|
11
|
+
assert_eq!(claude::claude_base_command(
|
|
12
|
+
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
13
|
+
Some(&mcp), Some(raw), Some(""), false, false, Some(ProviderEffort::High),
|
|
14
|
+
).expect("claude"), ["claude", "--permission-mode", "default", "--model", "", "--effort", "high", "--append-system-prompt", raw, "--mcp-config", "{\"mcpServers\":{}}"]);
|
|
22
15
|
|
|
23
16
|
assert_eq!(copilot::copilot_base_command(
|
|
24
17
|
AuthMode::Subscription, Some(&mcp), Some(raw), Some(""), true,
|
|
25
18
|
), ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-all", "--allow-tool", "team_orchestrator", "--model", "", "--additional-mcp-config", "{}"]);
|
|
26
|
-
assert_eq!(grok::grok_base_command(Some(raw), Some(" model-id "), true, Some(ProviderEffort::Medium)).expect("grok"),
|
|
27
|
-
["grok", "--always-approve", "--model", "model-id", "--effort", "medium", "--rules", raw]);
|
|
28
|
-
assert_eq!(grok::grok_base_command(Some(""), Some(" "), false, None).expect("grok empty"), ["grok", "--rules", ""]);
|
|
29
19
|
assert_eq!(pi::build_pi_command_argv(pi::PiCommandRequest {
|
|
30
20
|
extension: std::path::Path::new("extension.ts"), model: Some("vendor/model"),
|
|
31
21
|
effort: Some(ProviderEffort::XHigh), system_prompt: raw,
|
|
32
|
-
session_dir: Some(std::path::Path::new("sessions")),
|
|
22
|
+
session_dir: Some(std::path::Path::new("sessions")),
|
|
23
|
+
session: pi::PiSessionSelector::Fresh, agent_id: "worker",
|
|
33
24
|
}).expect("pi"), ["pi", "-e", "extension.ts", "--model", "vendor/model", "--thinking", "xhigh", "--append-system-prompt", raw, "--session-dir", "sessions", "--name", "worker"]);
|
|
34
25
|
}
|
|
35
26
|
|
|
36
27
|
#[test]
|
|
37
28
|
fn command_helpers_keep_absent_options_and_safe_defaults() {
|
|
38
|
-
assert_eq!(
|
|
39
|
-
|
|
29
|
+
assert_eq!(claude::claude_base_command(
|
|
30
|
+
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
31
|
+
None, None, None, false, false, None,
|
|
32
|
+
).expect("claude"), ["claude", "--permission-mode", "default"]);
|
|
40
33
|
assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
|
|
41
34
|
["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-tool", "team_orchestrator"]);
|
|
42
|
-
assert_eq!(grok::grok_base_command(None, None, false, None).expect("grok"), ["grok"]);
|
|
43
35
|
}
|
|
@@ -141,38 +141,32 @@ fn idle_leader_activity_never_arms_but_leader_idle_allows_ping() {
|
|
|
141
141
|
// Full own-vs-foreign realpath judgement + truncated-workspace logic deferred.
|
|
142
142
|
|
|
143
143
|
// Real fixtures (mirrored into the rust workspace from team-agent-public).
|
|
144
|
-
const
|
|
144
|
+
const CLAUDE_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
145
145
|
env!("CARGO_MANIFEST_DIR"),
|
|
146
|
-
"/../../snapshot/fixtures/idle_prompts/
|
|
146
|
+
"/../../snapshot/fixtures/idle_prompts/claude_code_idle.txt"
|
|
147
147
|
));
|
|
148
|
-
const CODEX_WORKING_FIXTURE: &str = include_str!(concat!(
|
|
149
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
150
|
-
"/../../snapshot/fixtures/idle_prompts/codex_working.txt"
|
|
151
|
-
));
|
|
152
|
-
|
|
153
148
|
fn fixture_matches(re: ®ex::Regex, fixture: &str) -> bool {
|
|
154
149
|
fixture.lines().any(|l| re.is_match(l))
|
|
155
150
|
}
|
|
156
151
|
|
|
157
152
|
#[test]
|
|
158
|
-
fn
|
|
159
|
-
// provider_cli/
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
let adapter = get_adapter(Provider::
|
|
153
|
+
fn claude_status_patterns_compile() {
|
|
154
|
+
// provider_cli/claude.py:225 status_patterns idle=r"[>❯]\s".
|
|
155
|
+
// The real fixture has prompt lines like "❯ /compact" → idle MUST match.
|
|
156
|
+
// The processing pattern r"[✶✢✽✻✳·].*…" must NOT match those idle prompt lines.
|
|
157
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
163
158
|
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
164
159
|
assert!(
|
|
165
|
-
fixture_matches(&pats.idle,
|
|
166
|
-
"
|
|
160
|
+
fixture_matches(&pats.idle, CLAUDE_IDLE_FIXTURE),
|
|
161
|
+
"claude idle pattern must match a '❯ ' prompt line in the idle fixture"
|
|
167
162
|
);
|
|
168
163
|
assert!(
|
|
169
|
-
|
|
170
|
-
"
|
|
164
|
+
pats.idle.is_match("❯ /compact"),
|
|
165
|
+
"claude idle pattern matches the canonical prompt line"
|
|
171
166
|
);
|
|
172
|
-
// The discriminator: a pure working-status footer line carries no prompt char.
|
|
173
167
|
assert!(
|
|
174
|
-
!pats.
|
|
175
|
-
"
|
|
168
|
+
!pats.processing.is_match("❯ /compact"),
|
|
169
|
+
"claude processing pattern must NOT match an idle prompt line"
|
|
176
170
|
);
|
|
177
171
|
}
|
|
178
172
|
|
|
@@ -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)]
|
|
@@ -25,30 +25,28 @@
|
|
|
25
25
|
use crate::model::enums::Provider;
|
|
26
26
|
|
|
27
27
|
/// A state row written by a release that still ran a legacy worker engine:
|
|
28
|
-
/// Cursor's `cursor_agent`/`agent
|
|
29
|
-
///
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
///
|
|
28
|
+
/// Cursor's `cursor_agent`/`agent` or Codex's `codex`/`codex_cli`.
|
|
29
|
+
/// No legacy worker runtime exists for it now; it must never fall back
|
|
30
|
+
/// to another provider. Role and CLI declarations of these names select the
|
|
31
|
+
/// contract leaf, whose state row carries the leaf id instead. A leader is not
|
|
32
|
+
/// an `agents` row, so its own provider key is unaffected. Claude Code
|
|
33
|
+
/// (`claude`/`claude_code`) and Pi (`pi`) rows keep their legacy runtimes.
|
|
33
34
|
pub(crate) const RETIRED_PROVIDER_ERROR: &str =
|
|
34
35
|
"legacy cursor_agent seat has no runtime in this release; stop or remove it, then add it again (provider: cursor)";
|
|
35
|
-
const
|
|
36
|
-
"legacy
|
|
37
|
-
const RETIRED_PI_ERROR: &str =
|
|
38
|
-
"legacy pi seat has no runtime in this release; stop or remove it, then add it again (provider: pi)";
|
|
36
|
+
const RETIRED_CODEX_ERROR: &str =
|
|
37
|
+
"legacy codex seat has no runtime in this release; stop or remove it, then add it again (provider: codex)";
|
|
39
38
|
|
|
40
39
|
pub(crate) fn is_retired_provider(raw: &str) -> bool {
|
|
41
40
|
matches!(
|
|
42
41
|
raw.trim().to_ascii_lowercase().as_str(),
|
|
43
|
-
"cursor_agent" | "agent" | "
|
|
42
|
+
"cursor_agent" | "agent" | "codex" | "codex_cli" | "codex-cli"
|
|
44
43
|
)
|
|
45
44
|
}
|
|
46
45
|
|
|
47
46
|
/// The refusal for a retired state row, naming the provider to re-add it with.
|
|
48
47
|
pub(crate) fn retired_provider_error(raw: &str) -> &'static str {
|
|
49
48
|
match raw.trim().to_ascii_lowercase().as_str() {
|
|
50
|
-
"
|
|
51
|
-
"pi" => RETIRED_PI_ERROR,
|
|
49
|
+
"codex" | "codex_cli" | "codex-cli" => RETIRED_CODEX_ERROR,
|
|
52
50
|
_ => RETIRED_PROVIDER_ERROR,
|
|
53
51
|
}
|
|
54
52
|
}
|
|
@@ -258,7 +256,9 @@ mod tests {
|
|
|
258
256
|
"compiler must validate providers through typed helpers"
|
|
259
257
|
);
|
|
260
258
|
assert!(
|
|
261
|
-
delivery_rs.contains("parse_canonical_provider")
|
|
259
|
+
delivery_rs.contains("parse_canonical_provider")
|
|
260
|
+
&& delivery_rs.contains("parse_provider")
|
|
261
|
+
&& delivery_rs.contains("provider_wire"),
|
|
262
262
|
"message delivery provider dispatch must use wire helpers"
|
|
263
263
|
);
|
|
264
264
|
for (path, source) in [
|
|
@@ -334,28 +334,42 @@ mod tests {
|
|
|
334
334
|
#[test]
|
|
335
335
|
fn retired_state_guard_is_scoped_to_the_addressed_seat() {
|
|
336
336
|
let state = serde_json::json!({"agents": {
|
|
337
|
-
"pi": {"provider": "
|
|
338
|
-
"claude": {"provider": "
|
|
337
|
+
"pi": {"provider": "pi"},
|
|
338
|
+
"claude": {"provider": "claude"},
|
|
339
|
+
"claude_code": {"provider": "claude_code"},
|
|
339
340
|
"copilot": {"provider": "copilot"},
|
|
340
341
|
"retired": {"provider": "cursor_agent"},
|
|
341
|
-
"
|
|
342
|
-
"
|
|
342
|
+
"codex": {"provider": "codex_tui"},
|
|
343
|
+
"grok": {"provider": "grok_build"},
|
|
344
|
+
"legacy_codex": {"provider": "codex"},
|
|
345
|
+
"legacy_codex_cli": {"provider": "codex-cli"},
|
|
346
|
+
"legacy_grok": {"provider": "grok"}
|
|
343
347
|
}});
|
|
344
348
|
assert!(require_active_state_providers(&state, Some("pi")).is_ok());
|
|
345
349
|
assert!(require_active_state_providers(&state, Some("claude")).is_ok());
|
|
350
|
+
assert!(require_active_state_providers(&state, Some("claude_code")).is_ok());
|
|
346
351
|
assert!(require_active_state_providers(&state, Some("copilot")).is_ok());
|
|
352
|
+
assert!(require_active_state_providers(&state, Some("codex")).is_ok());
|
|
353
|
+
assert!(require_active_state_providers(&state, Some("grok")).is_ok());
|
|
347
354
|
assert_eq!(require_active_state_providers(&state, Some("retired")), Err(RETIRED_PROVIDER_ERROR));
|
|
348
|
-
assert_eq!(require_active_state_providers(&state, Some("
|
|
349
|
-
assert_eq!(require_active_state_providers(&state, Some("
|
|
355
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_codex")), Err(RETIRED_CODEX_ERROR));
|
|
356
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_codex_cli")), Err(RETIRED_CODEX_ERROR));
|
|
357
|
+
assert!(require_active_state_providers(&state, Some("legacy_grok")).is_ok());
|
|
358
|
+
assert!(!is_retired_provider("grok"));
|
|
350
359
|
assert!(require_active_state_providers(&state, None).is_err());
|
|
351
360
|
for retired in ["cursor_agent", "agent"] {
|
|
352
361
|
assert_eq!(parse_provider(retired), None, "no legacy engine to parse into");
|
|
353
362
|
}
|
|
354
363
|
// The leader keys still parse: a leader is never an `agents` row.
|
|
355
|
-
for leader in ["
|
|
364
|
+
for leader in ["codex"] {
|
|
356
365
|
assert!(is_retired_provider(leader), "{leader}");
|
|
357
366
|
assert!(parse_provider(leader).is_some(), "{leader}");
|
|
358
367
|
}
|
|
368
|
+
// Claude Code and Pi keep their legacy worker runtimes.
|
|
369
|
+
for legacy in ["claude", "claude_code", "claude-code", "pi"] {
|
|
370
|
+
assert!(!is_retired_provider(legacy), "{legacy}");
|
|
371
|
+
assert!(parse_provider(legacy).is_some(), "{legacy}");
|
|
372
|
+
}
|
|
359
373
|
}
|
|
360
374
|
|
|
361
375
|
#[test]
|