@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
|
@@ -13,11 +13,6 @@ use super::{AuthMode, Provider};
|
|
|
13
13
|
|
|
14
14
|
pub use crate::provider::session_scan::{CaptureSessionContext, CapturedSessionCandidate};
|
|
15
15
|
|
|
16
|
-
pub trait ForkBackingMaterialization {
|
|
17
|
-
fn path(&self) -> &Path;
|
|
18
|
-
fn handoff(&mut self);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
16
|
// ===========================================================================
|
|
22
17
|
// TRAIT: ProviderAdapter (method SIGNATURES only — 无 body)
|
|
23
18
|
// ===========================================================================
|
|
@@ -192,24 +187,6 @@ pub trait ProviderAdapter {
|
|
|
192
187
|
.map(CommandPlan::argv_only)
|
|
193
188
|
}
|
|
194
189
|
|
|
195
|
-
fn materialize_fork_backing(
|
|
196
|
-
&self,
|
|
197
|
-
source_path: &Path,
|
|
198
|
-
source_session_id: &SessionId,
|
|
199
|
-
source_agent_id: &str,
|
|
200
|
-
target_agent_id: &str,
|
|
201
|
-
plan: &mut CommandPlan,
|
|
202
|
-
) -> Result<Option<Box<dyn ForkBackingMaterialization>>, ProviderError> {
|
|
203
|
-
let _ = (
|
|
204
|
-
source_path,
|
|
205
|
-
source_session_id,
|
|
206
|
-
source_agent_id,
|
|
207
|
-
target_agent_id,
|
|
208
|
-
plan,
|
|
209
|
-
);
|
|
210
|
-
Ok(None)
|
|
211
|
-
}
|
|
212
|
-
|
|
213
190
|
/// 计算本 provider 该用的 MCP server 配置(`adapter.py` mcp_config;claude
|
|
214
191
|
/// compatible_api 走 `ensure_compatible_claude_mcp_config`)。
|
|
215
192
|
fn mcp_config(&self, auth_mode: AuthMode) -> Result<McpConfig, ProviderError>;
|
|
@@ -272,28 +249,6 @@ pub trait ProviderAdapter {
|
|
|
272
249
|
}))
|
|
273
250
|
.unwrap_or_default()
|
|
274
251
|
}
|
|
275
|
-
|
|
276
|
-
/// Python launch/core.py:235-237 + tmux_prompt.py:124-129 — `runtime.fast` toggles
|
|
277
|
-
/// codex fast mode by sending `/fast` + Enter to the worker pane after spawn.
|
|
278
|
-
/// Providers without a fast-mode toggle are a no-op so upper layers stay
|
|
279
|
-
/// provider-agnostic (F032). Returns whether a toggle was sent.
|
|
280
|
-
fn enable_fast_mode(
|
|
281
|
-
&self,
|
|
282
|
-
transport: &dyn crate::transport::Transport,
|
|
283
|
-
target: &crate::transport::Target,
|
|
284
|
-
) -> bool {
|
|
285
|
-
match self.provider() {
|
|
286
|
-
Provider::Codex => {
|
|
287
|
-
let keys: Vec<crate::transport::Key> = "/fast"
|
|
288
|
-
.chars()
|
|
289
|
-
.map(crate::transport::Key::Char)
|
|
290
|
-
.chain([crate::transport::Key::Enter])
|
|
291
|
-
.collect();
|
|
292
|
-
transport.send_keys(target, &keys).is_ok()
|
|
293
|
-
}
|
|
294
|
-
_ => false,
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
252
|
}
|
|
298
253
|
|
|
299
254
|
// ===========================================================================
|
|
@@ -323,18 +278,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
323
278
|
|
|
324
279
|
fn caps(&self) -> ProviderCaps {
|
|
325
280
|
match self.provider {
|
|
326
|
-
Provider::Claude | Provider::ClaudeCode => ProviderCaps {
|
|
327
|
-
resume: true,
|
|
328
|
-
fork: true,
|
|
329
|
-
native_mcp_config: true,
|
|
330
|
-
writes_global_settings: false,
|
|
331
|
-
},
|
|
332
|
-
Provider::Codex => ProviderCaps {
|
|
333
|
-
resume: true,
|
|
334
|
-
fork: true,
|
|
335
|
-
native_mcp_config: false,
|
|
336
|
-
writes_global_settings: false,
|
|
337
|
-
},
|
|
338
281
|
// Copilot resume 走 --resume <sid>;store fork 在隔离 COPILOT_HOME
|
|
339
282
|
// 复制并重键 session backing 后以 --resume <new sid> 启动。
|
|
340
283
|
// native_mcp_config=true(`--additional-mcp-config` 接 inline JSON 或 @file);
|
|
@@ -352,16 +295,15 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
352
295
|
native_mcp_config: false,
|
|
353
296
|
writes_global_settings: true,
|
|
354
297
|
},
|
|
355
|
-
// Grok
|
|
356
|
-
//
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
resume: true,
|
|
298
|
+
// Claude Code, Codex, Grok and Pi workers run only through their
|
|
299
|
+
// contract leaves. A persisted legacy row is neither resumable nor
|
|
300
|
+
// capture-pending.
|
|
301
|
+
Provider::Claude
|
|
302
|
+
| Provider::ClaudeCode
|
|
303
|
+
| Provider::Codex
|
|
304
|
+
| Provider::Grok
|
|
305
|
+
| Provider::Pi => ProviderCaps {
|
|
306
|
+
resume: false,
|
|
365
307
|
fork: false,
|
|
366
308
|
native_mcp_config: false,
|
|
367
309
|
writes_global_settings: false,
|
|
@@ -405,7 +347,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
405
347
|
|
|
406
348
|
fn auth_hint(&self, auth_mode: AuthMode) -> AuthHintStatus {
|
|
407
349
|
match self.provider {
|
|
408
|
-
Provider::Claude | Provider::ClaudeCode => claude_auth_hint(auth_mode),
|
|
409
350
|
// C-A-5 cr verdict v2(诚实 MUST-NOT-13) — copilot 无 auth status 子命令
|
|
410
351
|
// (main-help Commands 节仅 completion/help/init/login/mcp/plugin/update/
|
|
411
352
|
// version)。framework 只能弱检测(命令在 PATH + ~/.copilot/config.json
|
|
@@ -413,7 +354,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
413
354
|
// 标"weak / no auth-status command available";Compatible/Official 走 BYOK
|
|
414
355
|
// 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
|
|
415
356
|
Provider::Copilot => copilot_auth_hint(auth_mode),
|
|
416
|
-
|
|
357
|
+
// No legacy worker probe remains for Claude Code, Codex, Grok or Pi.
|
|
358
|
+
Provider::Claude
|
|
359
|
+
| Provider::ClaudeCode
|
|
360
|
+
| Provider::Codex
|
|
361
|
+
| Provider::Grok
|
|
362
|
+
| Provider::Pi => AuthHintStatus::Unknown,
|
|
417
363
|
_ => match auth_mode {
|
|
418
364
|
AuthMode::Subscription => AuthHintStatus::Present,
|
|
419
365
|
AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
|
|
@@ -440,24 +386,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
440
386
|
dangerously_skip_permissions: bool,
|
|
441
387
|
) -> Result<Vec<String>, ProviderError> {
|
|
442
388
|
match self.provider {
|
|
443
|
-
Provider::Claude | Provider::ClaudeCode => Ok(claude_launch_command(
|
|
444
|
-
self,
|
|
445
|
-
auth_mode,
|
|
446
|
-
mcp_config,
|
|
447
|
-
system_prompt,
|
|
448
|
-
model,
|
|
449
|
-
dangerously_skip_permissions,
|
|
450
|
-
)?),
|
|
451
|
-
Provider::Codex => Ok(codex_base_command(
|
|
452
|
-
None,
|
|
453
|
-
auth_mode,
|
|
454
|
-
mcp_config,
|
|
455
|
-
system_prompt,
|
|
456
|
-
model,
|
|
457
|
-
dangerously_skip_permissions,
|
|
458
|
-
None,
|
|
459
|
-
None,
|
|
460
|
-
)),
|
|
461
389
|
// §C1 worker argv 形态 + C-1/C-5/C-6 cr verdict:
|
|
462
390
|
// copilot --no-color --no-auto-update [<dangerous|granular>] [--model]
|
|
463
391
|
// --additional-mcp-config <inline json> --session-id <expected_uuid> -C <cwd>
|
|
@@ -479,14 +407,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
479
407
|
}
|
|
480
408
|
Ok(argv)
|
|
481
409
|
}
|
|
482
|
-
Provider::
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
)
|
|
487
|
-
Provider::Pi => Err(ProviderError::Command(
|
|
488
|
-
"Pi commands require the shared lifecycle materializer".to_string(),
|
|
489
|
-
)),
|
|
410
|
+
Provider::Claude
|
|
411
|
+
| Provider::ClaudeCode
|
|
412
|
+
| Provider::Codex
|
|
413
|
+
| Provider::Grok
|
|
414
|
+
| Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
|
|
490
415
|
Provider::Fake => Ok(fake_worker_command()),
|
|
491
416
|
}
|
|
492
417
|
}
|
|
@@ -496,107 +421,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
496
421
|
ctx: ProviderCommandContext<'_>,
|
|
497
422
|
) -> Result<CommandPlan, ProviderError> {
|
|
498
423
|
match self.provider {
|
|
499
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
500
|
-
// 0.4.7 (B1 verified, restart partial resume): RESTORE
|
|
501
|
-
// `--session-id <uuid>` on Claude fresh spawn. B1 confirmed
|
|
502
|
-
// Claude ≥ 2.1.185 honours the framework-supplied --session-id
|
|
503
|
-
// and creates a transcript at that id. The earlier 0.4.6
|
|
504
|
-
// P0 removal (commit 9feafc31) is reverted; the actual issue
|
|
505
|
-
// it tried to fix (leader-marker pollution) is addressed
|
|
506
|
-
// separately in commit d39b5104 (leader session exclusion
|
|
507
|
-
// in capture/repair).
|
|
508
|
-
//
|
|
509
|
-
// Fresh path: --session-id <expected> → Claude writes
|
|
510
|
-
// transcript at that id → capture/restart restore use the
|
|
511
|
-
// SAME id we predicted, so apply-time backing-store check
|
|
512
|
-
// passes immediately (no cwd+spawned_at attribution race).
|
|
513
|
-
//
|
|
514
|
-
// Resume path unchanged — `build_resume_command_plan` uses
|
|
515
|
-
// `--resume <existing_id>` on a session id that already has
|
|
516
|
-
// a real transcript.
|
|
517
|
-
let expected = next_session_token();
|
|
518
|
-
let managed = ctx
|
|
519
|
-
.profile_launch
|
|
520
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
521
|
-
let projects_root = ctx
|
|
522
|
-
.profile_launch
|
|
523
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
524
|
-
let model = claude_context_model(ctx);
|
|
525
|
-
let mut argv = claude_base_command(
|
|
526
|
-
self,
|
|
527
|
-
ctx.auth_mode,
|
|
528
|
-
ctx.mcp_config,
|
|
529
|
-
ctx.system_prompt,
|
|
530
|
-
model,
|
|
531
|
-
ctx.dangerously_skip_permissions,
|
|
532
|
-
managed,
|
|
533
|
-
ctx.effort,
|
|
534
|
-
)?;
|
|
535
|
-
argv.push("--session-id".to_string());
|
|
536
|
-
argv.push(expected.clone());
|
|
537
|
-
// Layer 1 self-healing (architect probe 2026-06-22, claude help
|
|
538
|
-
// `-n, --name <name>`): pass `--name <agent_id>` so the
|
|
539
|
-
// resume picker and on-disk `~/.claude/sessions/*.json name`
|
|
540
|
-
// field carry our role label.
|
|
541
|
-
if let Some(agent_id) = ctx.agent_id_hint {
|
|
542
|
-
if !agent_id.is_empty() {
|
|
543
|
-
argv.push("--name".to_string());
|
|
544
|
-
argv.push(agent_id.to_string());
|
|
545
|
-
}
|
|
546
|
-
}
|
|
547
|
-
Ok(CommandPlan {
|
|
548
|
-
argv,
|
|
549
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
550
|
-
provider_projects_root: projects_root,
|
|
551
|
-
managed_mcp_config: managed,
|
|
552
|
-
})
|
|
553
|
-
}
|
|
554
|
-
// codex.py:105-118 — the profile command overrides (codex_profile / codex_config)
|
|
555
|
-
// ride on `agent["_provider_profile"]`, which only the plan path carries.
|
|
556
|
-
//
|
|
557
|
-
// 0.3.31 Codex capture correction (reverts ad518f8): Codex CLI does
|
|
558
|
-
// NOT accept `--session-id`, so a framework-generated UUID is never
|
|
559
|
-
// matched against Codex's own session_meta.payload.id. Setting
|
|
560
|
-
// expected_session_id caused the apply-time Stage 1 guard to
|
|
561
|
-
// permanently reject the real Codex transcript. Codex capture must
|
|
562
|
-
// anchor on (cwd, spawned_at) instead — handled in
|
|
563
|
-
// `provider/session_scan/codex.rs`.
|
|
564
|
-
Provider::Codex => Ok(CommandPlan::argv_only(codex_base_command(
|
|
565
|
-
None,
|
|
566
|
-
ctx.auth_mode,
|
|
567
|
-
ctx.mcp_config,
|
|
568
|
-
ctx.system_prompt,
|
|
569
|
-
ctx.model,
|
|
570
|
-
ctx.dangerously_skip_permissions,
|
|
571
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
572
|
-
ctx.effort,
|
|
573
|
-
))),
|
|
574
424
|
// §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
|
|
575
425
|
// * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
|
|
576
426
|
// * `-C <workspace>`(双保险,即便 spawn cwd 漂移也能锚定)
|
|
577
427
|
// mcp_config inline 形态由 build_command 写入,launch 路径会用
|
|
578
428
|
// point_native_mcp_config_at_file 重写为 @<file> 形(§C1 note)。
|
|
579
|
-
Provider::Grok => {
|
|
580
|
-
// Align with Claude/Copilot: the UUID on `--session-id` is
|
|
581
|
-
// also the capture hint. `CommandPlan::argv_only` used to
|
|
582
|
-
// drop expected_session_id, so `_pending_session_id` was
|
|
583
|
-
// never written and restart could not resume.
|
|
584
|
-
let expected = next_session_token();
|
|
585
|
-
let mut argv = grok_base_command(
|
|
586
|
-
ctx.system_prompt,
|
|
587
|
-
ctx.model,
|
|
588
|
-
ctx.dangerously_skip_permissions,
|
|
589
|
-
ctx.effort,
|
|
590
|
-
)?;
|
|
591
|
-
argv.push("--session-id".to_string());
|
|
592
|
-
argv.push(expected.clone());
|
|
593
|
-
Ok(CommandPlan {
|
|
594
|
-
argv,
|
|
595
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
596
|
-
provider_projects_root: None,
|
|
597
|
-
managed_mcp_config: false,
|
|
598
|
-
})
|
|
599
|
-
}
|
|
600
429
|
Provider::Copilot => {
|
|
601
430
|
let expected = next_session_token();
|
|
602
431
|
let mut argv = copilot_base_command(
|
|
@@ -615,9 +444,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
615
444
|
managed_mcp_config: false,
|
|
616
445
|
})
|
|
617
446
|
}
|
|
618
|
-
Provider::
|
|
619
|
-
|
|
620
|
-
|
|
447
|
+
Provider::Claude
|
|
448
|
+
| Provider::ClaudeCode
|
|
449
|
+
| Provider::Codex
|
|
450
|
+
| Provider::Grok
|
|
451
|
+
| Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
|
|
621
452
|
_ => self
|
|
622
453
|
.build_command_with_permissions(
|
|
623
454
|
ctx.auth_mode,
|
|
@@ -630,29 +461,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
630
461
|
}
|
|
631
462
|
}
|
|
632
463
|
|
|
633
|
-
fn materialize_fork_backing(
|
|
634
|
-
&self,
|
|
635
|
-
source_path: &Path,
|
|
636
|
-
source_session_id: &SessionId,
|
|
637
|
-
source_agent_id: &str,
|
|
638
|
-
target_agent_id: &str,
|
|
639
|
-
plan: &mut CommandPlan,
|
|
640
|
-
) -> Result<Option<Box<dyn ForkBackingMaterialization>>, ProviderError> {
|
|
641
|
-
match self.provider {
|
|
642
|
-
Provider::Codex => crate::provider::session::materialize_codex_fork(
|
|
643
|
-
source_path,
|
|
644
|
-
source_session_id,
|
|
645
|
-
source_agent_id,
|
|
646
|
-
target_agent_id,
|
|
647
|
-
plan,
|
|
648
|
-
)
|
|
649
|
-
.map(|materialized| {
|
|
650
|
-
Some(Box::new(materialized) as Box<dyn ForkBackingMaterialization>)
|
|
651
|
-
}),
|
|
652
|
-
_ => Ok(None),
|
|
653
|
-
}
|
|
654
|
-
}
|
|
655
|
-
|
|
656
464
|
fn capture_session_id(
|
|
657
465
|
&self,
|
|
658
466
|
agent_id: &str,
|
|
@@ -744,35 +552,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
744
552
|
));
|
|
745
553
|
};
|
|
746
554
|
match self.provider {
|
|
747
|
-
Provider::Codex => {
|
|
748
|
-
let mut argv = codex_base_command(
|
|
749
|
-
Some("resume"),
|
|
750
|
-
auth_mode,
|
|
751
|
-
mcp_config,
|
|
752
|
-
system_prompt,
|
|
753
|
-
model,
|
|
754
|
-
dangerously_skip_permissions,
|
|
755
|
-
None,
|
|
756
|
-
None,
|
|
757
|
-
);
|
|
758
|
-
argv.push(session_id.as_str().to_string());
|
|
759
|
-
Ok(argv)
|
|
760
|
-
}
|
|
761
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
762
|
-
let mut argv = claude_base_command(
|
|
763
|
-
self,
|
|
764
|
-
auth_mode,
|
|
765
|
-
mcp_config,
|
|
766
|
-
system_prompt,
|
|
767
|
-
model,
|
|
768
|
-
dangerously_skip_permissions,
|
|
769
|
-
false,
|
|
770
|
-
None,
|
|
771
|
-
)?;
|
|
772
|
-
argv.push("--resume".to_string());
|
|
773
|
-
argv.push(session_id.as_str().to_string());
|
|
774
|
-
Ok(argv)
|
|
775
|
-
}
|
|
776
555
|
// §C1 cr verdict:resume 同 base + `--resume <sid>`(去 --session-id,
|
|
777
556
|
// copilot --resume 接受 id|name)。
|
|
778
557
|
Provider::Copilot => {
|
|
@@ -782,21 +561,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
782
561
|
argv.push(session_id.as_str().to_string());
|
|
783
562
|
Ok(argv)
|
|
784
563
|
}
|
|
785
|
-
|
|
786
|
-
Provider::
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
dangerously_skip_permissions,
|
|
791
|
-
None,
|
|
792
|
-
)?;
|
|
793
|
-
argv.push("--resume".to_string());
|
|
794
|
-
argv.push(session_id.as_str().to_string());
|
|
795
|
-
Ok(argv)
|
|
796
|
-
}
|
|
797
|
-
Provider::Pi => Err(ProviderError::ResumeUnavailable(
|
|
798
|
-
"pi resume requires the captured exact session path".to_string(),
|
|
799
|
-
)),
|
|
564
|
+
Provider::Claude
|
|
565
|
+
| Provider::ClaudeCode
|
|
566
|
+
| Provider::Codex
|
|
567
|
+
| Provider::Grok
|
|
568
|
+
| Provider::Pi => Err(ProviderError::ResumeUnavailable(retired_worker(self.provider))),
|
|
800
569
|
Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
|
|
801
570
|
"{} resume requires session_id",
|
|
802
571
|
provider_wire(self.provider)
|
|
@@ -804,104 +573,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
804
573
|
}
|
|
805
574
|
}
|
|
806
575
|
|
|
807
|
-
fn build_resume_command_plan(
|
|
808
|
-
&self,
|
|
809
|
-
session_id: Option<&SessionId>,
|
|
810
|
-
ctx: ProviderCommandContext<'_>,
|
|
811
|
-
) -> Result<CommandPlan, ProviderError> {
|
|
812
|
-
match self.provider {
|
|
813
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
814
|
-
let Some(session_id) = session_id else {
|
|
815
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
816
|
-
"resume requires session_id".to_string(),
|
|
817
|
-
));
|
|
818
|
-
};
|
|
819
|
-
let managed = ctx
|
|
820
|
-
.profile_launch
|
|
821
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
822
|
-
let model = claude_context_model(ctx);
|
|
823
|
-
let mut argv = claude_base_command(
|
|
824
|
-
self,
|
|
825
|
-
ctx.auth_mode,
|
|
826
|
-
ctx.mcp_config,
|
|
827
|
-
ctx.system_prompt,
|
|
828
|
-
model,
|
|
829
|
-
ctx.dangerously_skip_permissions,
|
|
830
|
-
managed,
|
|
831
|
-
ctx.effort,
|
|
832
|
-
)?;
|
|
833
|
-
argv.push("--resume".to_string());
|
|
834
|
-
argv.push(session_id.as_str().to_string());
|
|
835
|
-
// Layer 1 self-healing: keep the role name on resume too —
|
|
836
|
-
// makes resumed sessions findable in the picker by agent_id
|
|
837
|
-
// when state.json drifts.
|
|
838
|
-
if let Some(agent_id) = ctx.agent_id_hint {
|
|
839
|
-
if !agent_id.is_empty() {
|
|
840
|
-
argv.push("--name".to_string());
|
|
841
|
-
argv.push(agent_id.to_string());
|
|
842
|
-
}
|
|
843
|
-
}
|
|
844
|
-
let mut plan = CommandPlan::argv_only(argv);
|
|
845
|
-
plan.provider_projects_root = ctx
|
|
846
|
-
.profile_launch
|
|
847
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
848
|
-
plan.managed_mcp_config = managed;
|
|
849
|
-
Ok(plan)
|
|
850
|
-
}
|
|
851
|
-
Provider::Codex => {
|
|
852
|
-
if !self.session_is_resumable(session_id, ctx.auth_mode)? {
|
|
853
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
854
|
-
"{} resume requires session_id",
|
|
855
|
-
provider_wire(self.provider)
|
|
856
|
-
)));
|
|
857
|
-
}
|
|
858
|
-
let Some(session_id) = session_id else {
|
|
859
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
860
|
-
"resume requires session_id".to_string(),
|
|
861
|
-
));
|
|
862
|
-
};
|
|
863
|
-
let mut argv = codex_base_command(
|
|
864
|
-
Some("resume"),
|
|
865
|
-
ctx.auth_mode,
|
|
866
|
-
ctx.mcp_config,
|
|
867
|
-
ctx.system_prompt,
|
|
868
|
-
ctx.model,
|
|
869
|
-
ctx.dangerously_skip_permissions,
|
|
870
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
871
|
-
ctx.effort,
|
|
872
|
-
);
|
|
873
|
-
argv.push(session_id.as_str().to_string());
|
|
874
|
-
Ok(CommandPlan::argv_only(argv))
|
|
875
|
-
}
|
|
876
|
-
Provider::Grok => {
|
|
877
|
-
let Some(session_id) = session_id else {
|
|
878
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
879
|
-
"resume requires session_id".to_string(),
|
|
880
|
-
));
|
|
881
|
-
};
|
|
882
|
-
let mut argv = grok_base_command(
|
|
883
|
-
ctx.system_prompt,
|
|
884
|
-
ctx.model,
|
|
885
|
-
ctx.dangerously_skip_permissions,
|
|
886
|
-
ctx.effort,
|
|
887
|
-
)?;
|
|
888
|
-
argv.push("--resume".to_string());
|
|
889
|
-
argv.push(session_id.as_str().to_string());
|
|
890
|
-
Ok(CommandPlan::argv_only(argv))
|
|
891
|
-
}
|
|
892
|
-
_ => self
|
|
893
|
-
.build_resume_command_with_context(
|
|
894
|
-
session_id,
|
|
895
|
-
ctx.auth_mode,
|
|
896
|
-
ctx.mcp_config,
|
|
897
|
-
ctx.system_prompt,
|
|
898
|
-
ctx.model,
|
|
899
|
-
ctx.dangerously_skip_permissions,
|
|
900
|
-
)
|
|
901
|
-
.map(CommandPlan::argv_only),
|
|
902
|
-
}
|
|
903
|
-
}
|
|
904
|
-
|
|
905
576
|
fn fork(
|
|
906
577
|
&self,
|
|
907
578
|
session_id: Option<&SessionId>,
|
|
@@ -915,10 +586,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
915
586
|
&self,
|
|
916
587
|
session_id: Option<&SessionId>,
|
|
917
588
|
auth_mode: AuthMode,
|
|
918
|
-
|
|
919
|
-
|
|
920
|
-
|
|
921
|
-
|
|
589
|
+
_mcp_config: Option<&McpConfig>,
|
|
590
|
+
_system_prompt: Option<&str>,
|
|
591
|
+
_model: Option<&str>,
|
|
592
|
+
_dangerously_skip_permissions: bool,
|
|
922
593
|
) -> Result<Vec<String>, ProviderError> {
|
|
923
594
|
if !self.caps().fork || auth_mode == AuthMode::CompatibleApi {
|
|
924
595
|
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
@@ -926,67 +597,24 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
926
597
|
provider_wire(self.provider)
|
|
927
598
|
)));
|
|
928
599
|
}
|
|
929
|
-
|
|
600
|
+
if session_id.is_none() {
|
|
930
601
|
return Err(ProviderError::ResumeUnavailable(
|
|
931
602
|
"fork requires session_id".to_string(),
|
|
932
603
|
));
|
|
933
|
-
}
|
|
604
|
+
}
|
|
934
605
|
match self.provider {
|
|
935
|
-
Provider::Codex => {
|
|
936
|
-
let mut argv = codex_base_command(
|
|
937
|
-
Some("fork"),
|
|
938
|
-
auth_mode,
|
|
939
|
-
mcp_config,
|
|
940
|
-
system_prompt,
|
|
941
|
-
model,
|
|
942
|
-
dangerously_skip_permissions,
|
|
943
|
-
None,
|
|
944
|
-
None,
|
|
945
|
-
);
|
|
946
|
-
argv.push(session_id.as_str().to_string());
|
|
947
|
-
Ok(argv)
|
|
948
|
-
}
|
|
949
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
950
|
-
let mut argv = claude_base_command(
|
|
951
|
-
self,
|
|
952
|
-
auth_mode,
|
|
953
|
-
mcp_config,
|
|
954
|
-
system_prompt,
|
|
955
|
-
model,
|
|
956
|
-
dangerously_skip_permissions,
|
|
957
|
-
false,
|
|
958
|
-
None,
|
|
959
|
-
)?;
|
|
960
|
-
argv.push("--session-id".to_string());
|
|
961
|
-
argv.push(next_session_token());
|
|
962
|
-
argv.push("--resume".to_string());
|
|
963
|
-
argv.push(session_id.as_str().to_string());
|
|
964
|
-
argv.push("--fork-session".to_string());
|
|
965
|
-
Ok(argv)
|
|
966
|
-
}
|
|
967
606
|
// Context-free adapter calls cannot materialize the Copilot store fork.
|
|
968
607
|
// The lifecycle path uses `fork_plan`, which receives the prepared isolated
|
|
969
608
|
// backing; never degrade this context-free call to a fresh spawn.
|
|
970
609
|
Provider::Copilot => Err(ProviderError::CapabilityUnsupported(
|
|
971
610
|
"copilot CLI 无 fork 旗标,session-store 不支持 branched continuation".to_string(),
|
|
972
611
|
)),
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
Provider::
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
dangerously_skip_permissions,
|
|
980
|
-
None,
|
|
981
|
-
)?;
|
|
982
|
-
argv.push("--session-id".to_string());
|
|
983
|
-
argv.push(next_session_token());
|
|
984
|
-
argv.push("--resume".to_string());
|
|
985
|
-
argv.push(session_id.as_str().to_string());
|
|
986
|
-
argv.push("--fork-session".to_string());
|
|
987
|
-
Ok(argv)
|
|
988
|
-
}
|
|
989
|
-
Provider::Pi | Provider::GeminiCli | Provider::Fake => {
|
|
612
|
+
Provider::Claude
|
|
613
|
+
| Provider::ClaudeCode
|
|
614
|
+
| Provider::Codex
|
|
615
|
+
| Provider::Grok
|
|
616
|
+
| Provider::Pi => Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider))),
|
|
617
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
990
618
|
Err(ProviderError::CapabilityUnsupported(format!(
|
|
991
619
|
"{} does not support native session fork",
|
|
992
620
|
provider_wire(self.provider)
|
|
@@ -1001,70 +629,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1001
629
|
ctx: ProviderCommandContext<'_>,
|
|
1002
630
|
) -> Result<CommandPlan, ProviderError> {
|
|
1003
631
|
match self.provider {
|
|
1004
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1005
|
-
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1006
|
-
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
1007
|
-
"{} does not support native session fork",
|
|
1008
|
-
provider_wire(self.provider)
|
|
1009
|
-
)));
|
|
1010
|
-
}
|
|
1011
|
-
if session_id.is_none() {
|
|
1012
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
1013
|
-
"fork requires session_id".to_string(),
|
|
1014
|
-
));
|
|
1015
|
-
}
|
|
1016
|
-
let expected = next_session_token();
|
|
1017
|
-
let managed = ctx
|
|
1018
|
-
.profile_launch
|
|
1019
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
1020
|
-
let projects_root = ctx
|
|
1021
|
-
.profile_launch
|
|
1022
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
1023
|
-
let model = claude_context_model(ctx);
|
|
1024
|
-
let mut argv = claude_base_command(
|
|
1025
|
-
self,
|
|
1026
|
-
ctx.auth_mode,
|
|
1027
|
-
ctx.mcp_config,
|
|
1028
|
-
ctx.system_prompt,
|
|
1029
|
-
model,
|
|
1030
|
-
ctx.dangerously_skip_permissions,
|
|
1031
|
-
managed,
|
|
1032
|
-
ctx.effort,
|
|
1033
|
-
)?;
|
|
1034
|
-
argv.push("--resume".to_string());
|
|
1035
|
-
argv.push(expected.clone());
|
|
1036
|
-
Ok(CommandPlan {
|
|
1037
|
-
argv,
|
|
1038
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
1039
|
-
provider_projects_root: projects_root,
|
|
1040
|
-
managed_mcp_config: managed,
|
|
1041
|
-
})
|
|
1042
|
-
}
|
|
1043
|
-
Provider::Codex => {
|
|
1044
|
-
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1045
|
-
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
1046
|
-
"{} does not support native session fork",
|
|
1047
|
-
provider_wire(self.provider)
|
|
1048
|
-
)));
|
|
1049
|
-
}
|
|
1050
|
-
let Some(session_id) = session_id else {
|
|
1051
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
1052
|
-
"fork requires session_id".to_string(),
|
|
1053
|
-
));
|
|
1054
|
-
};
|
|
1055
|
-
let mut argv = codex_base_command(
|
|
1056
|
-
Some("fork"),
|
|
1057
|
-
ctx.auth_mode,
|
|
1058
|
-
ctx.mcp_config,
|
|
1059
|
-
ctx.system_prompt,
|
|
1060
|
-
ctx.model,
|
|
1061
|
-
ctx.dangerously_skip_permissions,
|
|
1062
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
1063
|
-
ctx.effort,
|
|
1064
|
-
);
|
|
1065
|
-
argv.push(session_id.as_str().to_string());
|
|
1066
|
-
Ok(CommandPlan::argv_only(argv))
|
|
1067
|
-
}
|
|
1068
632
|
Provider::Copilot => {
|
|
1069
633
|
if ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1070
634
|
return Err(ProviderError::CapabilityUnsupported(
|
|
@@ -1110,25 +674,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1110
674
|
managed_mcp_config: profile.managed_mcp_config,
|
|
1111
675
|
})
|
|
1112
676
|
}
|
|
1113
|
-
Provider::Grok => {
|
|
1114
|
-
let Some(session_id) = session_id else {
|
|
1115
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
1116
|
-
"fork requires session_id".to_string(),
|
|
1117
|
-
));
|
|
1118
|
-
};
|
|
1119
|
-
let mut argv = grok_base_command(
|
|
1120
|
-
ctx.system_prompt,
|
|
1121
|
-
ctx.model,
|
|
1122
|
-
ctx.dangerously_skip_permissions,
|
|
1123
|
-
ctx.effort,
|
|
1124
|
-
)?;
|
|
1125
|
-
argv.push("--session-id".to_string());
|
|
1126
|
-
argv.push(next_session_token());
|
|
1127
|
-
argv.push("--resume".to_string());
|
|
1128
|
-
argv.push(session_id.as_str().to_string());
|
|
1129
|
-
argv.push("--fork-session".to_string());
|
|
1130
|
-
Ok(CommandPlan::argv_only(argv))
|
|
1131
|
-
}
|
|
1132
677
|
_ => self
|
|
1133
678
|
.fork_with_context(
|
|
1134
679
|
session_id,
|
|
@@ -1171,27 +716,23 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1171
716
|
|
|
1172
717
|
fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
|
|
1173
718
|
match self.provider {
|
|
1174
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1175
|
-
patterns(r"[>❯]\s", r"[✶✢✽✻✳·].*…", r"Error|Traceback")
|
|
1176
|
-
}
|
|
1177
|
-
Provider::Codex => patterns(
|
|
1178
|
-
r"(›|❯|codex>)",
|
|
1179
|
-
r"•.*esc to interrupt",
|
|
1180
|
-
r"Error|Traceback|panic",
|
|
1181
|
-
),
|
|
1182
719
|
Provider::Copilot => patterns(
|
|
1183
720
|
r"(?m)^\s*❯\s*$| / commands · \? help",
|
|
1184
721
|
r"working|processing",
|
|
1185
722
|
r"Error|panic",
|
|
1186
723
|
),
|
|
1187
|
-
// Pi
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
|
|
1191
|
-
|
|
724
|
+
// Claude Code, Codex, Grok and Pi workers run only through their
|
|
725
|
+
// contract leaves; these placeholders never match real pane chrome.
|
|
726
|
+
Provider::Claude
|
|
727
|
+
| Provider::ClaudeCode
|
|
728
|
+
| Provider::Codex
|
|
729
|
+
| Provider::Grok
|
|
730
|
+
| Provider::Pi => patterns(
|
|
731
|
+
r"legacy-worker-idle-retired",
|
|
732
|
+
r"legacy-worker-busy-retired",
|
|
733
|
+
r"legacy-worker-error-retired",
|
|
1192
734
|
),
|
|
1193
|
-
|
|
1194
|
-
Provider::Grok | Provider::GeminiCli | Provider::Fake => {
|
|
735
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
1195
736
|
patterns(r">", r"working|processing", r"Error|Traceback")
|
|
1196
737
|
}
|
|
1197
738
|
}
|
|
@@ -1208,6 +749,16 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1208
749
|
|
|
1209
750
|
use crate::provider::wire::{command_name, provider_wire};
|
|
1210
751
|
|
|
752
|
+
/// Claude Code, Codex, Grok and Pi workers run only through their contract
|
|
753
|
+
/// leaves (`provider: claude|codex|grok|pi`); their legacy worker builders were
|
|
754
|
+
/// excised. Only a pre-upgrade state row can still name the legacy key.
|
|
755
|
+
fn retired_worker(provider: Provider) -> String {
|
|
756
|
+
format!(
|
|
757
|
+
"legacy {} worker runtime was excised; workers run only through the contract leaf",
|
|
758
|
+
provider_wire(provider)
|
|
759
|
+
)
|
|
760
|
+
}
|
|
761
|
+
|
|
1211
762
|
fn auth_mode_wire(auth_mode: AuthMode) -> &'static str {
|
|
1212
763
|
match auth_mode {
|
|
1213
764
|
AuthMode::Subscription => "subscription",
|
|
@@ -1237,38 +788,6 @@ fn copilot_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
|
1237
788
|
}
|
|
1238
789
|
}
|
|
1239
790
|
|
|
1240
|
-
fn claude_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
1241
|
-
if auth_mode != AuthMode::Subscription {
|
|
1242
|
-
return AuthHintStatus::MissingOrUnknown;
|
|
1243
|
-
}
|
|
1244
|
-
if !command_on_path("claude") {
|
|
1245
|
-
return AuthHintStatus::Missing;
|
|
1246
|
-
}
|
|
1247
|
-
let output = match Command::new("claude").args(["auth", "status"]).output() {
|
|
1248
|
-
Ok(output) => output,
|
|
1249
|
-
Err(_) => return AuthHintStatus::MissingOrUnknown,
|
|
1250
|
-
};
|
|
1251
|
-
let text = if output.stdout.is_empty() {
|
|
1252
|
-
String::from_utf8_lossy(&output.stderr).to_string()
|
|
1253
|
-
} else {
|
|
1254
|
-
String::from_utf8_lossy(&output.stdout).to_string()
|
|
1255
|
-
};
|
|
1256
|
-
let status = serde_json::from_str::<serde_json::Value>(text.trim()).unwrap_or_default();
|
|
1257
|
-
if status.get("loggedIn").and_then(serde_json::Value::as_bool) == Some(true)
|
|
1258
|
-
|| output.status.success()
|
|
1259
|
-
{
|
|
1260
|
-
AuthHintStatus::Present
|
|
1261
|
-
} else {
|
|
1262
|
-
AuthHintStatus::Missing
|
|
1263
|
-
}
|
|
1264
|
-
}
|
|
1265
|
-
|
|
1266
|
-
fn claude_context_model(ctx: ProviderCommandContext<'_>) -> Option<&str> {
|
|
1267
|
-
ctx.profile_launch
|
|
1268
|
-
.and_then(|profile| profile.command_overrides.model.as_deref())
|
|
1269
|
-
.or(ctx.model)
|
|
1270
|
-
}
|
|
1271
|
-
|
|
1272
791
|
fn command_on_path(name: &str) -> bool {
|
|
1273
792
|
let Some(path) = std::env::var_os("PATH") else {
|
|
1274
793
|
return false;
|
|
@@ -1276,32 +795,15 @@ fn command_on_path(name: &str) -> bool {
|
|
|
1276
795
|
std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
|
|
1277
796
|
}
|
|
1278
797
|
|
|
1279
|
-
pub(crate) fn prompt_needs_native_mcp(prompt: &str) -> bool {
|
|
1280
|
-
prompt.contains('\n') || prompt.contains('"')
|
|
1281
|
-
}
|
|
1282
|
-
|
|
1283
|
-
/// Shared JSON renderer used by the codex `-c mcp_servers.*=...` overrides
|
|
1284
|
-
/// and any other adapter that wants inline JSON. String values are quoted
|
|
1285
|
-
/// (with quote escape); other values use serde's default Display.
|
|
1286
|
-
pub(crate) fn json_inline(value: &serde_json::Value) -> String {
|
|
1287
|
-
match value {
|
|
1288
|
-
serde_json::Value::String(s) => format!("\"{}\"", s.replace('"', "\\\"")),
|
|
1289
|
-
other => other.to_string(),
|
|
1290
|
-
}
|
|
1291
|
-
}
|
|
1292
|
-
|
|
1293
798
|
// 0.4.x decoupling step 2: provider-local command builders moved to provider/adapters/.
|
|
1294
799
|
// Only the entry points the trait impl actually calls are re-imported here;
|
|
1295
800
|
// The per-provider command helpers and MCP renderers are called from within
|
|
1296
801
|
// the extracted base-command functions, not directly by this file.
|
|
1297
|
-
use super::adapters::claude::{claude_base_command, claude_launch_command};
|
|
1298
|
-
use super::adapters::codex::codex_base_command;
|
|
1299
802
|
use super::adapters::copilot::copilot_base_command;
|
|
1300
803
|
use super::adapters::fake::fake_worker_command;
|
|
1301
|
-
use super::adapters::grok::{grok_base_command, grok_launch_command};
|
|
1302
804
|
|
|
1303
|
-
/// Contract C / MUST-8: the per-worker Team Agent MCP server config used by
|
|
1304
|
-
/// (`--mcp-config`)
|
|
805
|
+
/// Contract C / MUST-8: the per-worker Team Agent MCP server config used by the
|
|
806
|
+
/// remaining legacy workers (Copilot `--additional-mcp-config`). Placeholders
|
|
1305
807
|
/// `{workspace}` / `{agent_id}` / `{team_id}` are substituted at spawn time by
|
|
1306
808
|
/// [`crate::lifecycle::launch::fill_spawn_placeholders`]; this template MUST NOT
|
|
1307
809
|
/// contain hardcoded paths or agent/team ids — the probe5 RED probe burned that.
|
|
@@ -1383,17 +885,14 @@ pub(crate) fn next_session_token() -> String {
|
|
|
1383
885
|
#[cfg(test)]
|
|
1384
886
|
mod fork_materialization_source_guard {
|
|
1385
887
|
#[test]
|
|
1386
|
-
fn
|
|
888
|
+
fn legacy_fork_neither_materializes_backing_nor_injects_into_the_source_pane() {
|
|
1387
889
|
let source = include_str!("../lifecycle/launch/fork_agent.rs");
|
|
1388
890
|
assert!(
|
|
1389
|
-
source.contains("
|
|
1390
|
-
"fork must
|
|
891
|
+
source.contains("is_retired_provider") && source.contains("unverified (未验证)"),
|
|
892
|
+
"legacy fork must refuse retired rows and unverified providers"
|
|
1391
893
|
);
|
|
1392
|
-
|
|
1393
|
-
!source.contains("
|
|
1394
|
-
|
|
1395
|
-
);
|
|
1396
|
-
assert!(!source.contains("materialize_codex_fork"));
|
|
1397
|
-
assert!(!source.contains("codex_fork"));
|
|
894
|
+
for gone in [".materialize_fork_backing(", "materialize_codex_fork", "codex_fork", ".inject(", "send_keys"] {
|
|
895
|
+
assert!(!source.contains(gone), "legacy fork must not use {gone}");
|
|
896
|
+
}
|
|
1398
897
|
}
|
|
1399
898
|
}
|