@team-agent/installer 0.5.126 → 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 -69
- package/crates/team-agent/src/cli/emit.rs +10 -9
- 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 +45 -0
- package/crates/team-agent/src/cli/mod.rs +13 -1
- package/crates/team-agent/src/cli/models.rs +27 -181
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +2 -2
- package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +36 -9
- package/crates/team-agent/src/compiler.rs +3 -2
- package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +6 -5
- package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
- package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -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/lifecycle/launch/fork_agent.rs +17 -185
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
- package/crates/team-agent/src/lifecycle/launch.rs +3 -11
- package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
- package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- 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 +37 -240
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
- 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 +6 -124
- 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 +136 -256
- 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/quick_start_worker_readiness_red.rs +7 -7
- 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 +5 -5
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- 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 +70 -15
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
- package/crates/team-agent/src/lifecycle/tests.rs +0 -4
- package/crates/team-agent/src/lifecycle/types.rs +2 -5
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +9 -61
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
- 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 +5 -1
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +58 -356
- package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
- package/crates/team-agent/src/provider/session/capture.rs +5 -105
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
- package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
- package/crates/team-agent/src/provider/session_scan.rs +6 -16
- package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
- package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
- package/crates/team-agent/src/provider/tests/idle.rs +0 -43
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -8
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +3 -2
- package/skills/team-agent/command-coverage.json +14 -0
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
- package/skills/team-agent/references/team-agent-operator.md +3 -1
- 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
|
@@ -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,12 +278,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
323
278
|
|
|
324
279
|
fn caps(&self) -> ProviderCaps {
|
|
325
280
|
match self.provider {
|
|
326
|
-
Provider::Codex => ProviderCaps {
|
|
327
|
-
resume: true,
|
|
328
|
-
fork: true,
|
|
329
|
-
native_mcp_config: false,
|
|
330
|
-
writes_global_settings: false,
|
|
331
|
-
},
|
|
332
281
|
// Copilot resume 走 --resume <sid>;store fork 在隔离 COPILOT_HOME
|
|
333
282
|
// 复制并重键 session backing 后以 --resume <new sid> 启动。
|
|
334
283
|
// native_mcp_config=true(`--additional-mcp-config` 接 inline JSON 或 @file);
|
|
@@ -346,17 +295,14 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
346
295
|
native_mcp_config: false,
|
|
347
296
|
writes_global_settings: true,
|
|
348
297
|
},
|
|
349
|
-
// Grok
|
|
350
|
-
//
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
// Claude Code and Pi workers run only through their contract leaves.
|
|
358
|
-
// A persisted legacy row is neither resumable nor capture-pending.
|
|
359
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => ProviderCaps {
|
|
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 {
|
|
360
306
|
resume: false,
|
|
361
307
|
fork: false,
|
|
362
308
|
native_mcp_config: false,
|
|
@@ -408,8 +354,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
408
354
|
// 标"weak / no auth-status command available";Compatible/Official 走 BYOK
|
|
409
355
|
// 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
|
|
410
356
|
Provider::Copilot => copilot_auth_hint(auth_mode),
|
|
411
|
-
// No legacy worker probe remains for Claude Code or Pi.
|
|
412
|
-
Provider::Claude
|
|
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,
|
|
413
363
|
_ => match auth_mode {
|
|
414
364
|
AuthMode::Subscription => AuthHintStatus::Present,
|
|
415
365
|
AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
|
|
@@ -436,16 +386,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
436
386
|
dangerously_skip_permissions: bool,
|
|
437
387
|
) -> Result<Vec<String>, ProviderError> {
|
|
438
388
|
match self.provider {
|
|
439
|
-
Provider::Codex => Ok(codex_base_command(
|
|
440
|
-
None,
|
|
441
|
-
auth_mode,
|
|
442
|
-
mcp_config,
|
|
443
|
-
system_prompt,
|
|
444
|
-
model,
|
|
445
|
-
dangerously_skip_permissions,
|
|
446
|
-
None,
|
|
447
|
-
None,
|
|
448
|
-
)),
|
|
449
389
|
// §C1 worker argv 形态 + C-1/C-5/C-6 cr verdict:
|
|
450
390
|
// copilot --no-color --no-auto-update [<dangerous|granular>] [--model]
|
|
451
391
|
// --additional-mcp-config <inline json> --session-id <expected_uuid> -C <cwd>
|
|
@@ -467,14 +407,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
467
407
|
}
|
|
468
408
|
Ok(argv)
|
|
469
409
|
}
|
|
470
|
-
Provider::
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
)
|
|
475
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
476
|
-
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
477
|
-
}
|
|
410
|
+
Provider::Claude
|
|
411
|
+
| Provider::ClaudeCode
|
|
412
|
+
| Provider::Codex
|
|
413
|
+
| Provider::Grok
|
|
414
|
+
| Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
|
|
478
415
|
Provider::Fake => Ok(fake_worker_command()),
|
|
479
416
|
}
|
|
480
417
|
}
|
|
@@ -484,52 +421,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
484
421
|
ctx: ProviderCommandContext<'_>,
|
|
485
422
|
) -> Result<CommandPlan, ProviderError> {
|
|
486
423
|
match self.provider {
|
|
487
|
-
// codex.py:105-118 — the profile command overrides (codex_profile / codex_config)
|
|
488
|
-
// ride on `agent["_provider_profile"]`, which only the plan path carries.
|
|
489
|
-
//
|
|
490
|
-
// 0.3.31 Codex capture correction (reverts ad518f8): Codex CLI does
|
|
491
|
-
// NOT accept `--session-id`, so a framework-generated UUID is never
|
|
492
|
-
// matched against Codex's own session_meta.payload.id. Setting
|
|
493
|
-
// expected_session_id caused the apply-time Stage 1 guard to
|
|
494
|
-
// permanently reject the real Codex transcript. Codex capture must
|
|
495
|
-
// anchor on (cwd, spawned_at) instead — handled in
|
|
496
|
-
// `provider/session_scan/codex.rs`.
|
|
497
|
-
Provider::Codex => Ok(CommandPlan::argv_only(codex_base_command(
|
|
498
|
-
None,
|
|
499
|
-
ctx.auth_mode,
|
|
500
|
-
ctx.mcp_config,
|
|
501
|
-
ctx.system_prompt,
|
|
502
|
-
ctx.model,
|
|
503
|
-
ctx.dangerously_skip_permissions,
|
|
504
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
505
|
-
ctx.effort,
|
|
506
|
-
))),
|
|
507
424
|
// §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
|
|
508
425
|
// * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
|
|
509
426
|
// * `-C <workspace>`(双保险,即便 spawn cwd 漂移也能锚定)
|
|
510
427
|
// mcp_config inline 形态由 build_command 写入,launch 路径会用
|
|
511
428
|
// point_native_mcp_config_at_file 重写为 @<file> 形(§C1 note)。
|
|
512
|
-
Provider::Grok => {
|
|
513
|
-
// Align with Claude/Copilot: the UUID on `--session-id` is
|
|
514
|
-
// also the capture hint. `CommandPlan::argv_only` used to
|
|
515
|
-
// drop expected_session_id, so `_pending_session_id` was
|
|
516
|
-
// never written and restart could not resume.
|
|
517
|
-
let expected = next_session_token();
|
|
518
|
-
let mut argv = grok_base_command(
|
|
519
|
-
ctx.system_prompt,
|
|
520
|
-
ctx.model,
|
|
521
|
-
ctx.dangerously_skip_permissions,
|
|
522
|
-
ctx.effort,
|
|
523
|
-
)?;
|
|
524
|
-
argv.push("--session-id".to_string());
|
|
525
|
-
argv.push(expected.clone());
|
|
526
|
-
Ok(CommandPlan {
|
|
527
|
-
argv,
|
|
528
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
529
|
-
provider_projects_root: None,
|
|
530
|
-
managed_mcp_config: false,
|
|
531
|
-
})
|
|
532
|
-
}
|
|
533
429
|
Provider::Copilot => {
|
|
534
430
|
let expected = next_session_token();
|
|
535
431
|
let mut argv = copilot_base_command(
|
|
@@ -548,9 +444,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
548
444
|
managed_mcp_config: false,
|
|
549
445
|
})
|
|
550
446
|
}
|
|
551
|
-
Provider::Claude
|
|
552
|
-
|
|
553
|
-
|
|
447
|
+
Provider::Claude
|
|
448
|
+
| Provider::ClaudeCode
|
|
449
|
+
| Provider::Codex
|
|
450
|
+
| Provider::Grok
|
|
451
|
+
| Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
|
|
554
452
|
_ => self
|
|
555
453
|
.build_command_with_permissions(
|
|
556
454
|
ctx.auth_mode,
|
|
@@ -563,29 +461,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
563
461
|
}
|
|
564
462
|
}
|
|
565
463
|
|
|
566
|
-
fn materialize_fork_backing(
|
|
567
|
-
&self,
|
|
568
|
-
source_path: &Path,
|
|
569
|
-
source_session_id: &SessionId,
|
|
570
|
-
source_agent_id: &str,
|
|
571
|
-
target_agent_id: &str,
|
|
572
|
-
plan: &mut CommandPlan,
|
|
573
|
-
) -> Result<Option<Box<dyn ForkBackingMaterialization>>, ProviderError> {
|
|
574
|
-
match self.provider {
|
|
575
|
-
Provider::Codex => crate::provider::session::materialize_codex_fork(
|
|
576
|
-
source_path,
|
|
577
|
-
source_session_id,
|
|
578
|
-
source_agent_id,
|
|
579
|
-
target_agent_id,
|
|
580
|
-
plan,
|
|
581
|
-
)
|
|
582
|
-
.map(|materialized| {
|
|
583
|
-
Some(Box::new(materialized) as Box<dyn ForkBackingMaterialization>)
|
|
584
|
-
}),
|
|
585
|
-
_ => Ok(None),
|
|
586
|
-
}
|
|
587
|
-
}
|
|
588
|
-
|
|
589
464
|
fn capture_session_id(
|
|
590
465
|
&self,
|
|
591
466
|
agent_id: &str,
|
|
@@ -677,20 +552,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
677
552
|
));
|
|
678
553
|
};
|
|
679
554
|
match self.provider {
|
|
680
|
-
Provider::Codex => {
|
|
681
|
-
let mut argv = codex_base_command(
|
|
682
|
-
Some("resume"),
|
|
683
|
-
auth_mode,
|
|
684
|
-
mcp_config,
|
|
685
|
-
system_prompt,
|
|
686
|
-
model,
|
|
687
|
-
dangerously_skip_permissions,
|
|
688
|
-
None,
|
|
689
|
-
None,
|
|
690
|
-
);
|
|
691
|
-
argv.push(session_id.as_str().to_string());
|
|
692
|
-
Ok(argv)
|
|
693
|
-
}
|
|
694
555
|
// §C1 cr verdict:resume 同 base + `--resume <sid>`(去 --session-id,
|
|
695
556
|
// copilot --resume 接受 id|name)。
|
|
696
557
|
Provider::Copilot => {
|
|
@@ -700,21 +561,11 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
700
561
|
argv.push(session_id.as_str().to_string());
|
|
701
562
|
Ok(argv)
|
|
702
563
|
}
|
|
703
|
-
|
|
704
|
-
Provider::
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
dangerously_skip_permissions,
|
|
709
|
-
None,
|
|
710
|
-
)?;
|
|
711
|
-
argv.push("--resume".to_string());
|
|
712
|
-
argv.push(session_id.as_str().to_string());
|
|
713
|
-
Ok(argv)
|
|
714
|
-
}
|
|
715
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
716
|
-
Err(ProviderError::ResumeUnavailable(retired_worker(self.provider)))
|
|
717
|
-
}
|
|
564
|
+
Provider::Claude
|
|
565
|
+
| Provider::ClaudeCode
|
|
566
|
+
| Provider::Codex
|
|
567
|
+
| Provider::Grok
|
|
568
|
+
| Provider::Pi => Err(ProviderError::ResumeUnavailable(retired_worker(self.provider))),
|
|
718
569
|
Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
|
|
719
570
|
"{} resume requires session_id",
|
|
720
571
|
provider_wire(self.provider)
|
|
@@ -722,66 +573,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
722
573
|
}
|
|
723
574
|
}
|
|
724
575
|
|
|
725
|
-
fn build_resume_command_plan(
|
|
726
|
-
&self,
|
|
727
|
-
session_id: Option<&SessionId>,
|
|
728
|
-
ctx: ProviderCommandContext<'_>,
|
|
729
|
-
) -> Result<CommandPlan, ProviderError> {
|
|
730
|
-
match self.provider {
|
|
731
|
-
Provider::Codex => {
|
|
732
|
-
if !self.session_is_resumable(session_id, ctx.auth_mode)? {
|
|
733
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
734
|
-
"{} resume requires session_id",
|
|
735
|
-
provider_wire(self.provider)
|
|
736
|
-
)));
|
|
737
|
-
}
|
|
738
|
-
let Some(session_id) = session_id else {
|
|
739
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
740
|
-
"resume requires session_id".to_string(),
|
|
741
|
-
));
|
|
742
|
-
};
|
|
743
|
-
let mut argv = codex_base_command(
|
|
744
|
-
Some("resume"),
|
|
745
|
-
ctx.auth_mode,
|
|
746
|
-
ctx.mcp_config,
|
|
747
|
-
ctx.system_prompt,
|
|
748
|
-
ctx.model,
|
|
749
|
-
ctx.dangerously_skip_permissions,
|
|
750
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
751
|
-
ctx.effort,
|
|
752
|
-
);
|
|
753
|
-
argv.push(session_id.as_str().to_string());
|
|
754
|
-
Ok(CommandPlan::argv_only(argv))
|
|
755
|
-
}
|
|
756
|
-
Provider::Grok => {
|
|
757
|
-
let Some(session_id) = session_id else {
|
|
758
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
759
|
-
"resume requires session_id".to_string(),
|
|
760
|
-
));
|
|
761
|
-
};
|
|
762
|
-
let mut argv = grok_base_command(
|
|
763
|
-
ctx.system_prompt,
|
|
764
|
-
ctx.model,
|
|
765
|
-
ctx.dangerously_skip_permissions,
|
|
766
|
-
ctx.effort,
|
|
767
|
-
)?;
|
|
768
|
-
argv.push("--resume".to_string());
|
|
769
|
-
argv.push(session_id.as_str().to_string());
|
|
770
|
-
Ok(CommandPlan::argv_only(argv))
|
|
771
|
-
}
|
|
772
|
-
_ => self
|
|
773
|
-
.build_resume_command_with_context(
|
|
774
|
-
session_id,
|
|
775
|
-
ctx.auth_mode,
|
|
776
|
-
ctx.mcp_config,
|
|
777
|
-
ctx.system_prompt,
|
|
778
|
-
ctx.model,
|
|
779
|
-
ctx.dangerously_skip_permissions,
|
|
780
|
-
)
|
|
781
|
-
.map(CommandPlan::argv_only),
|
|
782
|
-
}
|
|
783
|
-
}
|
|
784
|
-
|
|
785
576
|
fn fork(
|
|
786
577
|
&self,
|
|
787
578
|
session_id: Option<&SessionId>,
|
|
@@ -795,10 +586,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
795
586
|
&self,
|
|
796
587
|
session_id: Option<&SessionId>,
|
|
797
588
|
auth_mode: AuthMode,
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
589
|
+
_mcp_config: Option<&McpConfig>,
|
|
590
|
+
_system_prompt: Option<&str>,
|
|
591
|
+
_model: Option<&str>,
|
|
592
|
+
_dangerously_skip_permissions: bool,
|
|
802
593
|
) -> Result<Vec<String>, ProviderError> {
|
|
803
594
|
if !self.caps().fork || auth_mode == AuthMode::CompatibleApi {
|
|
804
595
|
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
@@ -806,51 +597,23 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
806
597
|
provider_wire(self.provider)
|
|
807
598
|
)));
|
|
808
599
|
}
|
|
809
|
-
|
|
600
|
+
if session_id.is_none() {
|
|
810
601
|
return Err(ProviderError::ResumeUnavailable(
|
|
811
602
|
"fork requires session_id".to_string(),
|
|
812
603
|
));
|
|
813
|
-
}
|
|
604
|
+
}
|
|
814
605
|
match self.provider {
|
|
815
|
-
Provider::Codex => {
|
|
816
|
-
let mut argv = codex_base_command(
|
|
817
|
-
Some("fork"),
|
|
818
|
-
auth_mode,
|
|
819
|
-
mcp_config,
|
|
820
|
-
system_prompt,
|
|
821
|
-
model,
|
|
822
|
-
dangerously_skip_permissions,
|
|
823
|
-
None,
|
|
824
|
-
None,
|
|
825
|
-
);
|
|
826
|
-
argv.push(session_id.as_str().to_string());
|
|
827
|
-
Ok(argv)
|
|
828
|
-
}
|
|
829
606
|
// Context-free adapter calls cannot materialize the Copilot store fork.
|
|
830
607
|
// The lifecycle path uses `fork_plan`, which receives the prepared isolated
|
|
831
608
|
// backing; never degrade this context-free call to a fresh spawn.
|
|
832
609
|
Provider::Copilot => Err(ProviderError::CapabilityUnsupported(
|
|
833
610
|
"copilot CLI 无 fork 旗标,session-store 不支持 branched continuation".to_string(),
|
|
834
611
|
)),
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
Provider::
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
model,
|
|
841
|
-
dangerously_skip_permissions,
|
|
842
|
-
None,
|
|
843
|
-
)?;
|
|
844
|
-
argv.push("--session-id".to_string());
|
|
845
|
-
argv.push(next_session_token());
|
|
846
|
-
argv.push("--resume".to_string());
|
|
847
|
-
argv.push(session_id.as_str().to_string());
|
|
848
|
-
argv.push("--fork-session".to_string());
|
|
849
|
-
Ok(argv)
|
|
850
|
-
}
|
|
851
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
852
|
-
Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider)))
|
|
853
|
-
}
|
|
612
|
+
Provider::Claude
|
|
613
|
+
| Provider::ClaudeCode
|
|
614
|
+
| Provider::Codex
|
|
615
|
+
| Provider::Grok
|
|
616
|
+
| Provider::Pi => Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider))),
|
|
854
617
|
Provider::GeminiCli | Provider::Fake => {
|
|
855
618
|
Err(ProviderError::CapabilityUnsupported(format!(
|
|
856
619
|
"{} does not support native session fork",
|
|
@@ -866,31 +629,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
866
629
|
ctx: ProviderCommandContext<'_>,
|
|
867
630
|
) -> Result<CommandPlan, ProviderError> {
|
|
868
631
|
match self.provider {
|
|
869
|
-
Provider::Codex => {
|
|
870
|
-
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
871
|
-
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
872
|
-
"{} does not support native session fork",
|
|
873
|
-
provider_wire(self.provider)
|
|
874
|
-
)));
|
|
875
|
-
}
|
|
876
|
-
let Some(session_id) = session_id else {
|
|
877
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
878
|
-
"fork requires session_id".to_string(),
|
|
879
|
-
));
|
|
880
|
-
};
|
|
881
|
-
let mut argv = codex_base_command(
|
|
882
|
-
Some("fork"),
|
|
883
|
-
ctx.auth_mode,
|
|
884
|
-
ctx.mcp_config,
|
|
885
|
-
ctx.system_prompt,
|
|
886
|
-
ctx.model,
|
|
887
|
-
ctx.dangerously_skip_permissions,
|
|
888
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
889
|
-
ctx.effort,
|
|
890
|
-
);
|
|
891
|
-
argv.push(session_id.as_str().to_string());
|
|
892
|
-
Ok(CommandPlan::argv_only(argv))
|
|
893
|
-
}
|
|
894
632
|
Provider::Copilot => {
|
|
895
633
|
if ctx.auth_mode == AuthMode::CompatibleApi {
|
|
896
634
|
return Err(ProviderError::CapabilityUnsupported(
|
|
@@ -936,25 +674,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
936
674
|
managed_mcp_config: profile.managed_mcp_config,
|
|
937
675
|
})
|
|
938
676
|
}
|
|
939
|
-
Provider::Grok => {
|
|
940
|
-
let Some(session_id) = session_id else {
|
|
941
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
942
|
-
"fork requires session_id".to_string(),
|
|
943
|
-
));
|
|
944
|
-
};
|
|
945
|
-
let mut argv = grok_base_command(
|
|
946
|
-
ctx.system_prompt,
|
|
947
|
-
ctx.model,
|
|
948
|
-
ctx.dangerously_skip_permissions,
|
|
949
|
-
ctx.effort,
|
|
950
|
-
)?;
|
|
951
|
-
argv.push("--session-id".to_string());
|
|
952
|
-
argv.push(next_session_token());
|
|
953
|
-
argv.push("--resume".to_string());
|
|
954
|
-
argv.push(session_id.as_str().to_string());
|
|
955
|
-
argv.push("--fork-session".to_string());
|
|
956
|
-
Ok(CommandPlan::argv_only(argv))
|
|
957
|
-
}
|
|
958
677
|
_ => self
|
|
959
678
|
.fork_with_context(
|
|
960
679
|
session_id,
|
|
@@ -997,25 +716,23 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
997
716
|
|
|
998
717
|
fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
|
|
999
718
|
match self.provider {
|
|
1000
|
-
Provider::Codex => patterns(
|
|
1001
|
-
r"(›|❯|codex>)",
|
|
1002
|
-
r"•.*esc to interrupt",
|
|
1003
|
-
r"Error|Traceback|panic",
|
|
1004
|
-
),
|
|
1005
719
|
Provider::Copilot => patterns(
|
|
1006
720
|
r"(?m)^\s*❯\s*$| / commands · \? help",
|
|
1007
721
|
r"working|processing",
|
|
1008
722
|
r"Error|panic",
|
|
1009
723
|
),
|
|
1010
|
-
// Claude Code and Pi workers run only through their
|
|
1011
|
-
// these placeholders never match real pane chrome.
|
|
1012
|
-
Provider::Claude
|
|
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(
|
|
1013
731
|
r"legacy-worker-idle-retired",
|
|
1014
732
|
r"legacy-worker-busy-retired",
|
|
1015
733
|
r"legacy-worker-error-retired",
|
|
1016
734
|
),
|
|
1017
|
-
|
|
1018
|
-
Provider::Grok | Provider::GeminiCli | Provider::Fake => {
|
|
735
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
1019
736
|
patterns(r">", r"working|processing", r"Error|Traceback")
|
|
1020
737
|
}
|
|
1021
738
|
}
|
|
@@ -1032,8 +749,8 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1032
749
|
|
|
1033
750
|
use crate::provider::wire::{command_name, provider_wire};
|
|
1034
751
|
|
|
1035
|
-
/// Claude Code and Pi workers run only through their contract
|
|
1036
|
-
/// (`provider: claude
|
|
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
|
|
1037
754
|
/// excised. Only a pre-upgrade state row can still name the legacy key.
|
|
1038
755
|
fn retired_worker(provider: Provider) -> String {
|
|
1039
756
|
format!(
|
|
@@ -1078,27 +795,15 @@ fn command_on_path(name: &str) -> bool {
|
|
|
1078
795
|
std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
|
|
1079
796
|
}
|
|
1080
797
|
|
|
1081
|
-
/// Shared JSON renderer used by the codex `-c mcp_servers.*=...` overrides
|
|
1082
|
-
/// and any other adapter that wants inline JSON. String values are quoted
|
|
1083
|
-
/// (with quote escape); other values use serde's default Display.
|
|
1084
|
-
pub(crate) fn json_inline(value: &serde_json::Value) -> String {
|
|
1085
|
-
match value {
|
|
1086
|
-
serde_json::Value::String(s) => format!("\"{}\"", s.replace('"', "\\\"")),
|
|
1087
|
-
other => other.to_string(),
|
|
1088
|
-
}
|
|
1089
|
-
}
|
|
1090
|
-
|
|
1091
798
|
// 0.4.x decoupling step 2: provider-local command builders moved to provider/adapters/.
|
|
1092
799
|
// Only the entry points the trait impl actually calls are re-imported here;
|
|
1093
800
|
// The per-provider command helpers and MCP renderers are called from within
|
|
1094
801
|
// the extracted base-command functions, not directly by this file.
|
|
1095
|
-
use super::adapters::codex::codex_base_command;
|
|
1096
802
|
use super::adapters::copilot::copilot_base_command;
|
|
1097
803
|
use super::adapters::fake::fake_worker_command;
|
|
1098
|
-
use super::adapters::grok::{grok_base_command, grok_launch_command};
|
|
1099
804
|
|
|
1100
|
-
/// Contract C / MUST-8: the per-worker Team Agent MCP server config used by
|
|
1101
|
-
/// (`--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
|
|
1102
807
|
/// `{workspace}` / `{agent_id}` / `{team_id}` are substituted at spawn time by
|
|
1103
808
|
/// [`crate::lifecycle::launch::fill_spawn_placeholders`]; this template MUST NOT
|
|
1104
809
|
/// contain hardcoded paths or agent/team ids — the probe5 RED probe burned that.
|
|
@@ -1180,17 +885,14 @@ pub(crate) fn next_session_token() -> String {
|
|
|
1180
885
|
#[cfg(test)]
|
|
1181
886
|
mod fork_materialization_source_guard {
|
|
1182
887
|
#[test]
|
|
1183
|
-
fn
|
|
888
|
+
fn legacy_fork_neither_materializes_backing_nor_injects_into_the_source_pane() {
|
|
1184
889
|
let source = include_str!("../lifecycle/launch/fork_agent.rs");
|
|
1185
890
|
assert!(
|
|
1186
|
-
source.contains("
|
|
1187
|
-
"fork must
|
|
1188
|
-
);
|
|
1189
|
-
assert!(
|
|
1190
|
-
!source.contains(".materialize_fork_backing("),
|
|
1191
|
-
"session-file fork materialization must stay gone"
|
|
891
|
+
source.contains("is_retired_provider") && source.contains("unverified (未验证)"),
|
|
892
|
+
"legacy fork must refuse retired rows and unverified providers"
|
|
1192
893
|
);
|
|
1193
|
-
|
|
1194
|
-
|
|
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
|
+
}
|
|
1195
897
|
}
|
|
1196
898
|
}
|
|
@@ -8,23 +8,21 @@
|
|
|
8
8
|
//! dispatches into these helpers exactly as the inline forms did.
|
|
9
9
|
//!
|
|
10
10
|
//! Per-file scope:
|
|
11
|
-
//! * `codex` — Codex argv, profile flags, MCP `-c` injection with 600s
|
|
12
|
-
//! tool_timeout, developer-instructions escaping.
|
|
13
11
|
//! * `copilot` — Copilot argv (no-color/no-remote/disable-builtin-mcps),
|
|
14
12
|
//! MCP `type→transport` translation, resume base, weak auth hint.
|
|
15
13
|
//! * `fake` — Built-in scripted worker exec path.
|
|
16
14
|
//!
|
|
17
|
-
//! Claude Code and Pi workers run only through their contract
|
|
18
|
-
//! (`claude_tui`, `pi_tui`); their legacy
|
|
19
|
-
//! leader's fresh launch lives in
|
|
15
|
+
//! Claude Code, Codex, Grok and Pi workers run only through their contract
|
|
16
|
+
//! leaves (`claude_tui`, `codex_tui`, `grok_build`, `pi_tui`); their legacy
|
|
17
|
+
//! worker builders were excised. The Pi leader's fresh launch lives in
|
|
18
|
+
//! `lifecycle/launch/pi_mcp.rs`; the Codex and Grok leaders exec their bare
|
|
19
|
+
//! public command (`leader/start.rs`).
|
|
20
20
|
//!
|
|
21
21
|
//! Behavior is byte-identical to pre-split. Future steps may move
|
|
22
22
|
//! `pre_spawn_adjust_plan`, `profile_env`, `session_backing_probe`, and
|
|
23
23
|
//! `session_candidates` into provider-owned hooks following the same
|
|
24
24
|
//! per-file layout.
|
|
25
25
|
|
|
26
|
-
pub(crate) mod codex;
|
|
27
26
|
pub(crate) mod copilot;
|
|
28
27
|
pub(crate) mod copilot_fork;
|
|
29
28
|
pub(crate) mod fake;
|
|
30
|
-
pub(crate) mod grok;
|