@team-agent/installer 0.5.125 → 0.5.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/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 +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- 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/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +22 -138
- 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 +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -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/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- 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/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/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/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -323,12 +323,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
323
323
|
|
|
324
324
|
fn caps(&self) -> ProviderCaps {
|
|
325
325
|
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
326
|
Provider::Codex => ProviderCaps {
|
|
333
327
|
resume: true,
|
|
334
328
|
fork: true,
|
|
@@ -360,8 +354,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
360
354
|
native_mcp_config: false,
|
|
361
355
|
writes_global_settings: false,
|
|
362
356
|
},
|
|
363
|
-
|
|
364
|
-
|
|
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 {
|
|
360
|
+
resume: false,
|
|
365
361
|
fork: false,
|
|
366
362
|
native_mcp_config: false,
|
|
367
363
|
writes_global_settings: false,
|
|
@@ -405,7 +401,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
405
401
|
|
|
406
402
|
fn auth_hint(&self, auth_mode: AuthMode) -> AuthHintStatus {
|
|
407
403
|
match self.provider {
|
|
408
|
-
Provider::Claude | Provider::ClaudeCode => claude_auth_hint(auth_mode),
|
|
409
404
|
// C-A-5 cr verdict v2(诚实 MUST-NOT-13) — copilot 无 auth status 子命令
|
|
410
405
|
// (main-help Commands 节仅 completion/help/init/login/mcp/plugin/update/
|
|
411
406
|
// version)。framework 只能弱检测(命令在 PATH + ~/.copilot/config.json
|
|
@@ -413,7 +408,8 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
413
408
|
// 标"weak / no auth-status command available";Compatible/Official 走 BYOK
|
|
414
409
|
// 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
|
|
415
410
|
Provider::Copilot => copilot_auth_hint(auth_mode),
|
|
416
|
-
|
|
411
|
+
// No legacy worker probe remains for Claude Code or Pi.
|
|
412
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => AuthHintStatus::Unknown,
|
|
417
413
|
_ => match auth_mode {
|
|
418
414
|
AuthMode::Subscription => AuthHintStatus::Present,
|
|
419
415
|
AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
|
|
@@ -440,14 +436,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
440
436
|
dangerously_skip_permissions: bool,
|
|
441
437
|
) -> Result<Vec<String>, ProviderError> {
|
|
442
438
|
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
439
|
Provider::Codex => Ok(codex_base_command(
|
|
452
440
|
None,
|
|
453
441
|
auth_mode,
|
|
@@ -484,9 +472,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
484
472
|
model,
|
|
485
473
|
dangerously_skip_permissions,
|
|
486
474
|
)?),
|
|
487
|
-
Provider::Pi =>
|
|
488
|
-
|
|
489
|
-
|
|
475
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
476
|
+
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
477
|
+
}
|
|
490
478
|
Provider::Fake => Ok(fake_worker_command()),
|
|
491
479
|
}
|
|
492
480
|
}
|
|
@@ -496,61 +484,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
496
484
|
ctx: ProviderCommandContext<'_>,
|
|
497
485
|
) -> Result<CommandPlan, ProviderError> {
|
|
498
486
|
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
487
|
// codex.py:105-118 — the profile command overrides (codex_profile / codex_config)
|
|
555
488
|
// ride on `agent["_provider_profile"]`, which only the plan path carries.
|
|
556
489
|
//
|
|
@@ -615,9 +548,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
615
548
|
managed_mcp_config: false,
|
|
616
549
|
})
|
|
617
550
|
}
|
|
618
|
-
Provider::Pi =>
|
|
619
|
-
|
|
620
|
-
|
|
551
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
552
|
+
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
553
|
+
}
|
|
621
554
|
_ => self
|
|
622
555
|
.build_command_with_permissions(
|
|
623
556
|
ctx.auth_mode,
|
|
@@ -758,21 +691,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
758
691
|
argv.push(session_id.as_str().to_string());
|
|
759
692
|
Ok(argv)
|
|
760
693
|
}
|
|
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
694
|
// §C1 cr verdict:resume 同 base + `--resume <sid>`(去 --session-id,
|
|
777
695
|
// copilot --resume 接受 id|name)。
|
|
778
696
|
Provider::Copilot => {
|
|
@@ -794,9 +712,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
794
712
|
argv.push(session_id.as_str().to_string());
|
|
795
713
|
Ok(argv)
|
|
796
714
|
}
|
|
797
|
-
Provider::Pi =>
|
|
798
|
-
|
|
799
|
-
|
|
715
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
716
|
+
Err(ProviderError::ResumeUnavailable(retired_worker(self.provider)))
|
|
717
|
+
}
|
|
800
718
|
Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
|
|
801
719
|
"{} resume requires session_id",
|
|
802
720
|
provider_wire(self.provider)
|
|
@@ -810,44 +728,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
810
728
|
ctx: ProviderCommandContext<'_>,
|
|
811
729
|
) -> Result<CommandPlan, ProviderError> {
|
|
812
730
|
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
731
|
Provider::Codex => {
|
|
852
732
|
if !self.session_is_resumable(session_id, ctx.auth_mode)? {
|
|
853
733
|
return Err(ProviderError::ResumeUnavailable(format!(
|
|
@@ -946,24 +826,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
946
826
|
argv.push(session_id.as_str().to_string());
|
|
947
827
|
Ok(argv)
|
|
948
828
|
}
|
|
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
829
|
// Context-free adapter calls cannot materialize the Copilot store fork.
|
|
968
830
|
// The lifecycle path uses `fork_plan`, which receives the prepared isolated
|
|
969
831
|
// backing; never degrade this context-free call to a fresh spawn.
|
|
@@ -986,7 +848,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
986
848
|
argv.push("--fork-session".to_string());
|
|
987
849
|
Ok(argv)
|
|
988
850
|
}
|
|
989
|
-
Provider::
|
|
851
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
852
|
+
Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider)))
|
|
853
|
+
}
|
|
854
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
990
855
|
Err(ProviderError::CapabilityUnsupported(format!(
|
|
991
856
|
"{} does not support native session fork",
|
|
992
857
|
provider_wire(self.provider)
|
|
@@ -1001,45 +866,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1001
866
|
ctx: ProviderCommandContext<'_>,
|
|
1002
867
|
) -> Result<CommandPlan, ProviderError> {
|
|
1003
868
|
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
869
|
Provider::Codex => {
|
|
1044
870
|
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1045
871
|
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
@@ -1171,9 +997,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1171
997
|
|
|
1172
998
|
fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
|
|
1173
999
|
match self.provider {
|
|
1174
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1175
|
-
patterns(r"[>❯]\s", r"[✶✢✽✻✳·].*…", r"Error|Traceback")
|
|
1176
|
-
}
|
|
1177
1000
|
Provider::Codex => patterns(
|
|
1178
1001
|
r"(›|❯|codex>)",
|
|
1179
1002
|
r"•.*esc to interrupt",
|
|
@@ -1184,11 +1007,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1184
1007
|
r"working|processing",
|
|
1185
1008
|
r"Error|panic",
|
|
1186
1009
|
),
|
|
1187
|
-
// Pi
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
r"
|
|
1191
|
-
r"
|
|
1010
|
+
// Claude Code and Pi workers run only through their contract leaves;
|
|
1011
|
+
// these placeholders never match real pane chrome.
|
|
1012
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => patterns(
|
|
1013
|
+
r"legacy-worker-idle-retired",
|
|
1014
|
+
r"legacy-worker-busy-retired",
|
|
1015
|
+
r"legacy-worker-error-retired",
|
|
1192
1016
|
),
|
|
1193
1017
|
// Grok: 暂无专有 status 正则, 沿用 generic。
|
|
1194
1018
|
Provider::Grok | Provider::GeminiCli | Provider::Fake => {
|
|
@@ -1208,6 +1032,16 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1208
1032
|
|
|
1209
1033
|
use crate::provider::wire::{command_name, provider_wire};
|
|
1210
1034
|
|
|
1035
|
+
/// Claude Code and Pi workers run only through their contract leaves
|
|
1036
|
+
/// (`provider: claude` / `provider: pi`); their legacy worker builders were
|
|
1037
|
+
/// excised. Only a pre-upgrade state row can still name the legacy key.
|
|
1038
|
+
fn retired_worker(provider: Provider) -> String {
|
|
1039
|
+
format!(
|
|
1040
|
+
"legacy {} worker runtime was excised; workers run only through the contract leaf",
|
|
1041
|
+
provider_wire(provider)
|
|
1042
|
+
)
|
|
1043
|
+
}
|
|
1044
|
+
|
|
1211
1045
|
fn auth_mode_wire(auth_mode: AuthMode) -> &'static str {
|
|
1212
1046
|
match auth_mode {
|
|
1213
1047
|
AuthMode::Subscription => "subscription",
|
|
@@ -1237,38 +1071,6 @@ fn copilot_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
|
1237
1071
|
}
|
|
1238
1072
|
}
|
|
1239
1073
|
|
|
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
1074
|
fn command_on_path(name: &str) -> bool {
|
|
1273
1075
|
let Some(path) = std::env::var_os("PATH") else {
|
|
1274
1076
|
return false;
|
|
@@ -1276,10 +1078,6 @@ fn command_on_path(name: &str) -> bool {
|
|
|
1276
1078
|
std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
|
|
1277
1079
|
}
|
|
1278
1080
|
|
|
1279
|
-
pub(crate) fn prompt_needs_native_mcp(prompt: &str) -> bool {
|
|
1280
|
-
prompt.contains('\n') || prompt.contains('"')
|
|
1281
|
-
}
|
|
1282
|
-
|
|
1283
1081
|
/// Shared JSON renderer used by the codex `-c mcp_servers.*=...` overrides
|
|
1284
1082
|
/// and any other adapter that wants inline JSON. String values are quoted
|
|
1285
1083
|
/// (with quote escape); other values use serde's default Display.
|
|
@@ -1294,7 +1092,6 @@ pub(crate) fn json_inline(value: &serde_json::Value) -> String {
|
|
|
1294
1092
|
// Only the entry points the trait impl actually calls are re-imported here;
|
|
1295
1093
|
// The per-provider command helpers and MCP renderers are called from within
|
|
1296
1094
|
// the extracted base-command functions, not directly by this file.
|
|
1297
|
-
use super::adapters::claude::{claude_base_command, claude_launch_command};
|
|
1298
1095
|
use super::adapters::codex::codex_base_command;
|
|
1299
1096
|
use super::adapters::copilot::copilot_base_command;
|
|
1300
1097
|
use super::adapters::fake::fake_worker_command;
|
|
@@ -8,23 +8,23 @@
|
|
|
8
8
|
//! dispatches into these helpers exactly as the inline forms did.
|
|
9
9
|
//!
|
|
10
10
|
//! Per-file scope:
|
|
11
|
-
//! * `claude` — Claude/ClaudeCode argv, bypass flag, auth hint, model passthrough.
|
|
12
11
|
//! * `codex` — Codex argv, profile flags, MCP `-c` injection with 600s
|
|
13
12
|
//! tool_timeout, developer-instructions escaping.
|
|
14
13
|
//! * `copilot` — Copilot argv (no-color/no-remote/disable-builtin-mcps),
|
|
15
14
|
//! MCP `type→transport` translation, resume base, weak auth hint.
|
|
16
15
|
//! * `fake` — Built-in scripted worker exec path.
|
|
17
16
|
//!
|
|
17
|
+
//! Claude Code and Pi workers run only through their contract leaves
|
|
18
|
+
//! (`claude_tui`, `pi_tui`); their legacy worker builders were excised. The Pi
|
|
19
|
+
//! leader's fresh launch lives in `lifecycle/launch/pi_mcp.rs`.
|
|
20
|
+
//!
|
|
18
21
|
//! Behavior is byte-identical to pre-split. Future steps may move
|
|
19
22
|
//! `pre_spawn_adjust_plan`, `profile_env`, `session_backing_probe`, and
|
|
20
23
|
//! `session_candidates` into provider-owned hooks following the same
|
|
21
24
|
//! per-file layout.
|
|
22
25
|
|
|
23
|
-
pub(crate) mod claude;
|
|
24
|
-
pub(crate) mod claude_fork;
|
|
25
26
|
pub(crate) mod codex;
|
|
26
27
|
pub(crate) mod copilot;
|
|
27
28
|
pub(crate) mod copilot_fork;
|
|
28
29
|
pub(crate) mod fake;
|
|
29
30
|
pub(crate) mod grok;
|
|
30
|
-
pub(crate) mod pi;
|