@team-agent/installer 0.5.127 → 0.5.128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (145) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/README.md +11 -0
  4. package/crates/team-agent/src/cli/adapters.rs +3 -13
  5. package/crates/team-agent/src/cli/arguments.rs +4 -0
  6. package/crates/team-agent/src/cli/diagnose.rs +68 -22
  7. package/crates/team-agent/src/cli/emit.rs +58 -26
  8. package/crates/team-agent/src/cli/intent/runtime.rs +32 -5
  9. package/crates/team-agent/src/cli/intent/runtime_tests.rs +102 -11
  10. package/crates/team-agent/src/cli/intent/tests.rs +10 -12
  11. package/crates/team-agent/src/cli/intent.rs +1 -1
  12. package/crates/team-agent/src/cli/mod.rs +25 -8
  13. package/crates/team-agent/src/cli/models.rs +764 -7
  14. package/crates/team-agent/src/cli/schedule.rs +175 -0
  15. package/crates/team-agent/src/cli/send/persist.rs +0 -36
  16. package/crates/team-agent/src/cli/send/presentation.rs +1 -1
  17. package/crates/team-agent/src/cli/send.rs +108 -110
  18. package/crates/team-agent/src/cli/spec.rs +6 -0
  19. package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
  20. package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
  21. package/crates/team-agent/src/cli/tests/mod.rs +1 -1
  22. package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
  23. package/crates/team-agent/src/cli/tests/run_delegation.rs +9 -6
  24. package/crates/team-agent/src/cli/tests/status_send.rs +68 -271
  25. package/crates/team-agent/src/compiler/tests.rs +3 -18
  26. package/crates/team-agent/src/compiler.rs +205 -6
  27. package/crates/team-agent/src/contract_runtime/backend.rs +145 -11
  28. package/crates/team-agent/src/contract_runtime/commands.rs +7 -7
  29. package/crates/team-agent/src/contract_runtime/config.rs +26 -16
  30. package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
  31. package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
  32. package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
  33. package/crates/team-agent/src/contract_runtime/framework.rs +28 -11
  34. package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
  35. package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
  36. package/crates/team-agent/src/contract_runtime/registry.rs +56 -92
  37. package/crates/team-agent/src/coordinator/steps/abnormal.rs +11 -11
  38. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +16 -54
  39. package/crates/team-agent/src/coordinator/tests/health_sync.rs +42 -0
  40. package/crates/team-agent/src/coordinator/tick.rs +1 -89
  41. package/crates/team-agent/src/db/message_store.rs +7 -65
  42. package/crates/team-agent/src/direct_delivery.rs +368 -0
  43. package/crates/team-agent/src/inbox_store.rs +169 -0
  44. package/crates/team-agent/src/leader/registry.rs +5 -0
  45. package/crates/team-agent/src/leader/start.rs +2 -1
  46. package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
  47. package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
  48. package/crates/team-agent/src/lib.rs +2 -0
  49. package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
  50. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
  51. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
  52. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +38 -13
  53. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
  54. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +9 -1
  55. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
  56. package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
  57. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +24 -0
  58. package/crates/team-agent/src/lifecycle/launch/spawn.rs +36 -13
  59. package/crates/team-agent/src/lifecycle/launch.rs +24 -1
  60. package/crates/team-agent/src/lifecycle/profile_launch.rs +321 -11
  61. package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
  62. package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
  63. package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
  64. package/crates/team-agent/src/lifecycle/restart/common.rs +345 -35
  65. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  66. package/crates/team-agent/src/lifecycle/restart.rs +4 -0
  67. package/crates/team-agent/src/lifecycle/role_config.rs +39 -14
  68. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
  69. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
  70. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +236 -13
  71. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
  72. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +5 -4
  73. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
  74. package/crates/team-agent/src/lifecycle/tests/core.rs +47 -18
  75. package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
  76. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +14 -14
  77. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
  78. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +28 -26
  79. package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
  80. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
  81. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
  82. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
  83. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
  84. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
  85. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
  86. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
  87. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
  88. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
  89. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +10 -11
  90. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
  91. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
  92. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
  93. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +5 -6
  94. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +16 -7
  95. package/crates/team-agent/src/lifecycle/tests.rs +3 -0
  96. package/crates/team-agent/src/lifecycle/types.rs +18 -2
  97. package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
  98. package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
  99. package/crates/team-agent/src/mcp_server/readiness_tests.rs +98 -119
  100. package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
  101. package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
  102. package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
  103. package/crates/team-agent/src/mcp_server/tools.rs +70 -196
  104. package/crates/team-agent/src/messaging/delivery.rs +160 -218
  105. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  106. package/crates/team-agent/src/messaging/helpers.rs +1 -19
  107. package/crates/team-agent/src/messaging/mod.rs +1 -0
  108. package/crates/team-agent/src/messaging/reminders.rs +316 -0
  109. package/crates/team-agent/src/messaging/scheduler.rs +7 -1
  110. package/crates/team-agent/src/messaging/tests/dup_inject.rs +191 -85
  111. package/crates/team-agent/src/messaging/tests/runtime.rs +4 -110
  112. package/crates/team-agent/src/messaging/tests/spine.rs +40 -24
  113. package/crates/team-agent/src/messaging/types.rs +1 -0
  114. package/crates/team-agent/src/provider/adapter.rs +303 -51
  115. package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
  116. package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
  117. package/crates/team-agent/src/provider/adapters/mod.rs +7 -5
  118. package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
  119. package/crates/team-agent/src/provider/classify.rs +1 -66
  120. package/crates/team-agent/src/provider/model_catalog.rs +201 -13
  121. package/crates/team-agent/src/provider/session/capture.rs +106 -6
  122. package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
  123. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +4 -0
  124. package/crates/team-agent/src/provider/session/context_fork.rs +150 -18
  125. package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
  126. package/crates/team-agent/src/provider/session_scan/common.rs +44 -8
  127. package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
  128. package/crates/team-agent/src/provider/session_scan.rs +16 -6
  129. package/crates/team-agent/src/provider/tests/adapter.rs +104 -17
  130. package/crates/team-agent/src/provider/tests/classify.rs +0 -53
  131. package/crates/team-agent/src/provider/tests/command_helpers.rs +12 -3
  132. package/crates/team-agent/src/provider/tests/idle.rs +37 -0
  133. package/crates/team-agent/src/provider/wire.rs +22 -34
  134. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  135. package/crates/team-agent/src/state/persist.rs +6 -6
  136. package/crates/team-agent/src/state/projection.rs +1 -1
  137. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  138. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
  139. package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
  140. package/crates/team-agent/src/tmux_backend.rs +5 -40
  141. package/package.json +4 -4
  142. package/skills/team-agent/SKILL.md +5 -7
  143. package/skills/team-agent/command-coverage.json +1 -1
  144. package/skills/team-agent/docs/reference/team-agent-operator.md +3 -3
  145. package/skills/team-agent/references/team-agent-operator.md +3 -3
@@ -278,6 +278,12 @@ impl ProviderAdapter for BasicProviderAdapter {
278
278
 
279
279
  fn caps(&self) -> ProviderCaps {
280
280
  match self.provider {
281
+ Provider::Claude | Provider::ClaudeCode => ProviderCaps {
282
+ resume: true,
283
+ fork: true,
284
+ native_mcp_config: true,
285
+ writes_global_settings: false,
286
+ },
281
287
  // Copilot resume 走 --resume <sid>;store fork 在隔离 COPILOT_HOME
282
288
  // 复制并重键 session backing 后以 --resume <new sid> 启动。
283
289
  // native_mcp_config=true(`--additional-mcp-config` 接 inline JSON 或 @file);
@@ -295,19 +301,20 @@ impl ProviderAdapter for BasicProviderAdapter {
295
301
  native_mcp_config: false,
296
302
  writes_global_settings: true,
297
303
  },
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 {
304
+ // Codex and Grok workers run only through their contract leaves. A
305
+ // persisted legacy row is neither resumable nor capture-pending.
306
+ Provider::Codex | Provider::Grok => ProviderCaps {
306
307
  resume: false,
307
308
  fork: false,
308
309
  native_mcp_config: false,
309
310
  writes_global_settings: false,
310
311
  },
312
+ Provider::Pi => ProviderCaps {
313
+ resume: true,
314
+ fork: false,
315
+ native_mcp_config: false,
316
+ writes_global_settings: false,
317
+ },
311
318
  Provider::Fake => ProviderCaps {
312
319
  resume: false,
313
320
  fork: false,
@@ -347,6 +354,7 @@ impl ProviderAdapter for BasicProviderAdapter {
347
354
 
348
355
  fn auth_hint(&self, auth_mode: AuthMode) -> AuthHintStatus {
349
356
  match self.provider {
357
+ Provider::Claude | Provider::ClaudeCode => claude_auth_hint(auth_mode),
350
358
  // C-A-5 cr verdict v2(诚实 MUST-NOT-13) — copilot 无 auth status 子命令
351
359
  // (main-help Commands 节仅 completion/help/init/login/mcp/plugin/update/
352
360
  // version)。framework 只能弱检测(命令在 PATH + ~/.copilot/config.json
@@ -354,12 +362,8 @@ impl ProviderAdapter for BasicProviderAdapter {
354
362
  // 标"weak / no auth-status command available";Compatible/Official 走 BYOK
355
363
  // 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
356
364
  Provider::Copilot => copilot_auth_hint(auth_mode),
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,
365
+ // No legacy worker probe remains for Codex or Grok.
366
+ Provider::Codex | Provider::Grok | Provider::Pi => AuthHintStatus::Unknown,
363
367
  _ => match auth_mode {
364
368
  AuthMode::Subscription => AuthHintStatus::Present,
365
369
  AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
@@ -386,6 +390,14 @@ impl ProviderAdapter for BasicProviderAdapter {
386
390
  dangerously_skip_permissions: bool,
387
391
  ) -> Result<Vec<String>, ProviderError> {
388
392
  match self.provider {
393
+ Provider::Claude | Provider::ClaudeCode => Ok(claude_launch_command(
394
+ self,
395
+ auth_mode,
396
+ mcp_config,
397
+ system_prompt,
398
+ model,
399
+ dangerously_skip_permissions,
400
+ )?),
389
401
  // §C1 worker argv 形态 + C-1/C-5/C-6 cr verdict:
390
402
  // copilot --no-color --no-auto-update [<dangerous|granular>] [--model]
391
403
  // --additional-mcp-config <inline json> --session-id <expected_uuid> -C <cwd>
@@ -407,11 +419,12 @@ impl ProviderAdapter for BasicProviderAdapter {
407
419
  }
408
420
  Ok(argv)
409
421
  }
410
- Provider::Claude
411
- | Provider::ClaudeCode
412
- | Provider::Codex
413
- | Provider::Grok
414
- | Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
422
+ Provider::Codex | Provider::Grok => {
423
+ Err(ProviderError::Command(retired_worker(self.provider)))
424
+ }
425
+ Provider::Pi => Err(ProviderError::Command(
426
+ "Pi commands require the shared lifecycle materializer".to_string(),
427
+ )),
415
428
  Provider::Fake => Ok(fake_worker_command()),
416
429
  }
417
430
  }
@@ -421,6 +434,61 @@ impl ProviderAdapter for BasicProviderAdapter {
421
434
  ctx: ProviderCommandContext<'_>,
422
435
  ) -> Result<CommandPlan, ProviderError> {
423
436
  match self.provider {
437
+ Provider::Claude | Provider::ClaudeCode => {
438
+ // 0.4.7 (B1 verified, restart partial resume): RESTORE
439
+ // `--session-id <uuid>` on Claude fresh spawn. B1 confirmed
440
+ // Claude ≥ 2.1.185 honours the framework-supplied --session-id
441
+ // and creates a transcript at that id. The earlier 0.4.6
442
+ // P0 removal (commit 9feafc31) is reverted; the actual issue
443
+ // it tried to fix (leader-marker pollution) is addressed
444
+ // separately in commit d39b5104 (leader session exclusion
445
+ // in capture/repair).
446
+ //
447
+ // Fresh path: --session-id <expected> → Claude writes
448
+ // transcript at that id → capture/restart restore use the
449
+ // SAME id we predicted, so apply-time backing-store check
450
+ // passes immediately (no cwd+spawned_at attribution race).
451
+ //
452
+ // Resume path unchanged — `build_resume_command_plan` uses
453
+ // `--resume <existing_id>` on a session id that already has
454
+ // a real transcript.
455
+ let expected = next_session_token();
456
+ let managed = ctx
457
+ .profile_launch
458
+ .is_some_and(|profile| profile.managed_mcp_config);
459
+ let projects_root = ctx
460
+ .profile_launch
461
+ .and_then(|profile| profile.claude_projects_root.clone());
462
+ let model = claude_context_model(ctx);
463
+ let mut argv = claude_base_command(
464
+ self,
465
+ ctx.auth_mode,
466
+ ctx.mcp_config,
467
+ ctx.system_prompt,
468
+ model,
469
+ ctx.dangerously_skip_permissions,
470
+ managed,
471
+ ctx.effort,
472
+ )?;
473
+ argv.push("--session-id".to_string());
474
+ argv.push(expected.clone());
475
+ // Layer 1 self-healing (architect probe 2026-06-22, claude help
476
+ // `-n, --name <name>`): pass `--name <agent_id>` so the
477
+ // resume picker and on-disk `~/.claude/sessions/*.json name`
478
+ // field carry our role label.
479
+ if let Some(agent_id) = ctx.agent_id_hint {
480
+ if !agent_id.is_empty() {
481
+ argv.push("--name".to_string());
482
+ argv.push(agent_id.to_string());
483
+ }
484
+ }
485
+ Ok(CommandPlan {
486
+ argv,
487
+ expected_session_id: Some(SessionId::new(expected)),
488
+ provider_projects_root: projects_root,
489
+ managed_mcp_config: managed,
490
+ })
491
+ }
424
492
  // §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
425
493
  // * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
426
494
  // * `-C <workspace>`(双保险,即便 spawn cwd 漂移也能锚定)
@@ -444,11 +512,12 @@ impl ProviderAdapter for BasicProviderAdapter {
444
512
  managed_mcp_config: false,
445
513
  })
446
514
  }
447
- Provider::Claude
448
- | Provider::ClaudeCode
449
- | Provider::Codex
450
- | Provider::Grok
451
- | Provider::Pi => Err(ProviderError::Command(retired_worker(self.provider))),
515
+ Provider::Codex | Provider::Grok => {
516
+ Err(ProviderError::Command(retired_worker(self.provider)))
517
+ }
518
+ Provider::Pi => Err(ProviderError::Command(
519
+ "Pi commands require the shared lifecycle materializer".to_string(),
520
+ )),
452
521
  _ => self
453
522
  .build_command_with_permissions(
454
523
  ctx.auth_mode,
@@ -552,6 +621,21 @@ impl ProviderAdapter for BasicProviderAdapter {
552
621
  ));
553
622
  };
554
623
  match self.provider {
624
+ Provider::Claude | Provider::ClaudeCode => {
625
+ let mut argv = claude_base_command(
626
+ self,
627
+ auth_mode,
628
+ mcp_config,
629
+ system_prompt,
630
+ model,
631
+ dangerously_skip_permissions,
632
+ false,
633
+ None,
634
+ )?;
635
+ argv.push("--resume".to_string());
636
+ argv.push(session_id.as_str().to_string());
637
+ Ok(argv)
638
+ }
555
639
  // §C1 cr verdict:resume 同 base + `--resume <sid>`(去 --session-id,
556
640
  // copilot --resume 接受 id|name)。
557
641
  Provider::Copilot => {
@@ -561,11 +645,12 @@ impl ProviderAdapter for BasicProviderAdapter {
561
645
  argv.push(session_id.as_str().to_string());
562
646
  Ok(argv)
563
647
  }
564
- Provider::Claude
565
- | Provider::ClaudeCode
566
- | Provider::Codex
567
- | Provider::Grok
568
- | Provider::Pi => Err(ProviderError::ResumeUnavailable(retired_worker(self.provider))),
648
+ Provider::Codex | Provider::Grok => {
649
+ Err(ProviderError::ResumeUnavailable(retired_worker(self.provider)))
650
+ }
651
+ Provider::Pi => Err(ProviderError::ResumeUnavailable(
652
+ "pi resume requires the captured exact session path".to_string(),
653
+ )),
569
654
  Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
570
655
  "{} resume requires session_id",
571
656
  provider_wire(self.provider)
@@ -573,6 +658,63 @@ impl ProviderAdapter for BasicProviderAdapter {
573
658
  }
574
659
  }
575
660
 
661
+ fn build_resume_command_plan(
662
+ &self,
663
+ session_id: Option<&SessionId>,
664
+ ctx: ProviderCommandContext<'_>,
665
+ ) -> Result<CommandPlan, ProviderError> {
666
+ match self.provider {
667
+ Provider::Claude | Provider::ClaudeCode => {
668
+ let Some(session_id) = session_id else {
669
+ return Err(ProviderError::ResumeUnavailable(
670
+ "resume requires session_id".to_string(),
671
+ ));
672
+ };
673
+ let managed = ctx
674
+ .profile_launch
675
+ .is_some_and(|profile| profile.managed_mcp_config);
676
+ let model = claude_context_model(ctx);
677
+ let mut argv = claude_base_command(
678
+ self,
679
+ ctx.auth_mode,
680
+ ctx.mcp_config,
681
+ ctx.system_prompt,
682
+ model,
683
+ ctx.dangerously_skip_permissions,
684
+ managed,
685
+ ctx.effort,
686
+ )?;
687
+ argv.push("--resume".to_string());
688
+ argv.push(session_id.as_str().to_string());
689
+ // Layer 1 self-healing: keep the role name on resume too —
690
+ // makes resumed sessions findable in the picker by agent_id
691
+ // when state.json drifts.
692
+ if let Some(agent_id) = ctx.agent_id_hint {
693
+ if !agent_id.is_empty() {
694
+ argv.push("--name".to_string());
695
+ argv.push(agent_id.to_string());
696
+ }
697
+ }
698
+ let mut plan = CommandPlan::argv_only(argv);
699
+ plan.provider_projects_root = ctx
700
+ .profile_launch
701
+ .and_then(|profile| profile.claude_projects_root.clone());
702
+ plan.managed_mcp_config = managed;
703
+ Ok(plan)
704
+ }
705
+ _ => self
706
+ .build_resume_command_with_context(
707
+ session_id,
708
+ ctx.auth_mode,
709
+ ctx.mcp_config,
710
+ ctx.system_prompt,
711
+ ctx.model,
712
+ ctx.dangerously_skip_permissions,
713
+ )
714
+ .map(CommandPlan::argv_only),
715
+ }
716
+ }
717
+
576
718
  fn fork(
577
719
  &self,
578
720
  session_id: Option<&SessionId>,
@@ -586,10 +728,10 @@ impl ProviderAdapter for BasicProviderAdapter {
586
728
  &self,
587
729
  session_id: Option<&SessionId>,
588
730
  auth_mode: AuthMode,
589
- _mcp_config: Option<&McpConfig>,
590
- _system_prompt: Option<&str>,
591
- _model: Option<&str>,
592
- _dangerously_skip_permissions: bool,
731
+ mcp_config: Option<&McpConfig>,
732
+ system_prompt: Option<&str>,
733
+ model: Option<&str>,
734
+ dangerously_skip_permissions: bool,
593
735
  ) -> Result<Vec<String>, ProviderError> {
594
736
  if !self.caps().fork || auth_mode == AuthMode::CompatibleApi {
595
737
  return Err(ProviderError::CapabilityUnsupported(format!(
@@ -597,24 +739,40 @@ impl ProviderAdapter for BasicProviderAdapter {
597
739
  provider_wire(self.provider)
598
740
  )));
599
741
  }
600
- if session_id.is_none() {
742
+ let Some(session_id) = session_id else {
601
743
  return Err(ProviderError::ResumeUnavailable(
602
744
  "fork requires session_id".to_string(),
603
745
  ));
604
- }
746
+ };
605
747
  match self.provider {
748
+ Provider::Claude | Provider::ClaudeCode => {
749
+ let mut argv = claude_base_command(
750
+ self,
751
+ auth_mode,
752
+ mcp_config,
753
+ system_prompt,
754
+ model,
755
+ dangerously_skip_permissions,
756
+ false,
757
+ None,
758
+ )?;
759
+ argv.push("--session-id".to_string());
760
+ argv.push(next_session_token());
761
+ argv.push("--resume".to_string());
762
+ argv.push(session_id.as_str().to_string());
763
+ argv.push("--fork-session".to_string());
764
+ Ok(argv)
765
+ }
606
766
  // Context-free adapter calls cannot materialize the Copilot store fork.
607
767
  // The lifecycle path uses `fork_plan`, which receives the prepared isolated
608
768
  // backing; never degrade this context-free call to a fresh spawn.
609
769
  Provider::Copilot => Err(ProviderError::CapabilityUnsupported(
610
770
  "copilot CLI 无 fork 旗标,session-store 不支持 branched continuation".to_string(),
611
771
  )),
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 => {
772
+ Provider::Codex | Provider::Grok => {
773
+ Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider)))
774
+ }
775
+ Provider::Pi | Provider::GeminiCli | Provider::Fake => {
618
776
  Err(ProviderError::CapabilityUnsupported(format!(
619
777
  "{} does not support native session fork",
620
778
  provider_wire(self.provider)
@@ -629,6 +787,58 @@ impl ProviderAdapter for BasicProviderAdapter {
629
787
  ctx: ProviderCommandContext<'_>,
630
788
  ) -> Result<CommandPlan, ProviderError> {
631
789
  match self.provider {
790
+ Provider::Claude | Provider::ClaudeCode => {
791
+ if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
792
+ return Err(ProviderError::CapabilityUnsupported(format!(
793
+ "{} does not support native session fork",
794
+ provider_wire(self.provider)
795
+ )));
796
+ }
797
+ let Some(session_id) = session_id else {
798
+ return Err(ProviderError::ResumeUnavailable(
799
+ "fork requires session_id".to_string(),
800
+ ));
801
+ };
802
+ let expected = next_session_token();
803
+ let managed = ctx
804
+ .profile_launch
805
+ .is_some_and(|profile| profile.managed_mcp_config);
806
+ let projects_root = ctx
807
+ .profile_launch
808
+ .and_then(|profile| profile.claude_projects_root.clone());
809
+ let model = claude_context_model(ctx);
810
+ let mut argv = claude_base_command(
811
+ self,
812
+ ctx.auth_mode,
813
+ ctx.mcp_config,
814
+ ctx.system_prompt,
815
+ model,
816
+ ctx.dangerously_skip_permissions,
817
+ managed,
818
+ ctx.effort,
819
+ )?;
820
+ // Native new-seat fork: Claude copies the parent (only read)
821
+ // into the preassigned child, so capture binds the child
822
+ // exactly as a fresh spawn. `--session-id` with `--resume` is
823
+ // admitted only together with `--fork-session`.
824
+ argv.push("--session-id".to_string());
825
+ argv.push(expected.clone());
826
+ argv.push("--resume".to_string());
827
+ argv.push(session_id.as_str().to_string());
828
+ argv.push("--fork-session".to_string());
829
+ if let Some(agent_id) = ctx.agent_id_hint {
830
+ if !agent_id.is_empty() {
831
+ argv.push("--name".to_string());
832
+ argv.push(agent_id.to_string());
833
+ }
834
+ }
835
+ Ok(CommandPlan {
836
+ argv,
837
+ expected_session_id: Some(SessionId::new(expected)),
838
+ provider_projects_root: projects_root,
839
+ managed_mcp_config: managed,
840
+ })
841
+ }
632
842
  Provider::Copilot => {
633
843
  if ctx.auth_mode == AuthMode::CompatibleApi {
634
844
  return Err(ProviderError::CapabilityUnsupported(
@@ -716,22 +926,27 @@ impl ProviderAdapter for BasicProviderAdapter {
716
926
 
717
927
  fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
718
928
  match self.provider {
929
+ Provider::Claude | Provider::ClaudeCode => {
930
+ patterns(r"[>❯]\s", r"[✶✢✽✻✳·].*…", r"Error|Traceback")
931
+ }
719
932
  Provider::Copilot => patterns(
720
933
  r"(?m)^\s*❯\s*$| / commands · \? help",
721
934
  r"working|processing",
722
935
  r"Error|panic",
723
936
  ),
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(
937
+ // Codex and Grok workers run only through their contract leaves;
938
+ // these placeholders never match real pane chrome.
939
+ Provider::Codex | Provider::Grok => patterns(
731
940
  r"legacy-worker-idle-retired",
732
941
  r"legacy-worker-busy-retired",
733
942
  r"legacy-worker-error-retired",
734
943
  ),
944
+ // Pi: 无已验证 turn-state 检测;占位串不会匹配真实 pane chrome。
945
+ Provider::Pi => patterns(
946
+ r"pi-idle-unset-until-turn-state",
947
+ r"pi-busy-unset-until-turn-state",
948
+ r"pi-error-unset-until-turn-state",
949
+ ),
735
950
  Provider::GeminiCli | Provider::Fake => {
736
951
  patterns(r">", r"working|processing", r"Error|Traceback")
737
952
  }
@@ -749,9 +964,9 @@ impl ProviderAdapter for BasicProviderAdapter {
749
964
 
750
965
  use crate::provider::wire::{command_name, provider_wire};
751
966
 
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.
967
+ /// Codex and Grok workers run only through their contract leaves
968
+ /// (`provider: codex|grok`); their legacy worker builders were excised. Only a
969
+ /// pre-upgrade state row can still name the legacy key.
755
970
  fn retired_worker(provider: Provider) -> String {
756
971
  format!(
757
972
  "legacy {} worker runtime was excised; workers run only through the contract leaf",
@@ -788,6 +1003,38 @@ fn copilot_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
788
1003
  }
789
1004
  }
790
1005
 
1006
+ fn claude_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
1007
+ if auth_mode != AuthMode::Subscription {
1008
+ return AuthHintStatus::MissingOrUnknown;
1009
+ }
1010
+ if !command_on_path("claude") {
1011
+ return AuthHintStatus::Missing;
1012
+ }
1013
+ let output = match Command::new("claude").args(["auth", "status"]).output() {
1014
+ Ok(output) => output,
1015
+ Err(_) => return AuthHintStatus::MissingOrUnknown,
1016
+ };
1017
+ let text = if output.stdout.is_empty() {
1018
+ String::from_utf8_lossy(&output.stderr).to_string()
1019
+ } else {
1020
+ String::from_utf8_lossy(&output.stdout).to_string()
1021
+ };
1022
+ let status = serde_json::from_str::<serde_json::Value>(text.trim()).unwrap_or_default();
1023
+ if status.get("loggedIn").and_then(serde_json::Value::as_bool) == Some(true)
1024
+ || output.status.success()
1025
+ {
1026
+ AuthHintStatus::Present
1027
+ } else {
1028
+ AuthHintStatus::Missing
1029
+ }
1030
+ }
1031
+
1032
+ fn claude_context_model(ctx: ProviderCommandContext<'_>) -> Option<&str> {
1033
+ ctx.profile_launch
1034
+ .and_then(|profile| profile.command_overrides.model.as_deref())
1035
+ .or(ctx.model)
1036
+ }
1037
+
791
1038
  fn command_on_path(name: &str) -> bool {
792
1039
  let Some(path) = std::env::var_os("PATH") else {
793
1040
  return false;
@@ -795,10 +1042,15 @@ fn command_on_path(name: &str) -> bool {
795
1042
  std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
796
1043
  }
797
1044
 
1045
+ pub(crate) fn prompt_needs_native_mcp(prompt: &str) -> bool {
1046
+ prompt.contains('\n') || prompt.contains('"')
1047
+ }
1048
+
798
1049
  // 0.4.x decoupling step 2: provider-local command builders moved to provider/adapters/.
799
1050
  // Only the entry points the trait impl actually calls are re-imported here;
800
1051
  // The per-provider command helpers and MCP renderers are called from within
801
1052
  // the extracted base-command functions, not directly by this file.
1053
+ use super::adapters::claude::{claude_base_command, claude_launch_command};
802
1054
  use super::adapters::copilot::copilot_base_command;
803
1055
  use super::adapters::fake::fake_worker_command;
804
1056
 
@@ -0,0 +1,78 @@
1
+ //!
2
+ //! Claude / ClaudeCode provider-local command builders + permission helpers.
3
+ //!
4
+ //! Extracted from `provider/adapter.rs` (0.4.x decoupling step 2). Pure
5
+ //! extraction — byte-identical to the original inline forms. Scope kept
6
+ //! small on purpose: base command + launch wrapper +
7
+ //! launch wrapper. Auth hints (`claude_auth_hint`) and the context-aware model
8
+ //! resolver (`claude_context_model`) stay in `adapter.rs`; capture scanning
9
+ //! helpers now live under `provider/session_scan/claude.rs`.
10
+
11
+ use crate::model::enums::{AuthMode, Provider};
12
+ use crate::provider::adapter::{next_session_token, prompt_needs_native_mcp, BasicProviderAdapter};
13
+ use crate::provider::{McpConfig, ProviderAdapter, ProviderError};
14
+ use crate::provider::command_helpers::{append_opt_pair, append_pair};
15
+
16
+ pub(crate) fn claude_launch_command(
17
+ adapter: &BasicProviderAdapter,
18
+ auth_mode: AuthMode,
19
+ mcp_config: Option<&McpConfig>,
20
+ system_prompt: Option<&str>,
21
+ model: Option<&str>,
22
+ dangerously_skip_permissions: bool,
23
+ ) -> Result<Vec<String>, ProviderError> {
24
+ let mut argv = claude_base_command(
25
+ adapter,
26
+ auth_mode,
27
+ mcp_config,
28
+ system_prompt,
29
+ model,
30
+ dangerously_skip_permissions,
31
+ false,
32
+ None,
33
+ )?;
34
+ append_pair(&mut argv, "--session-id", next_session_token());
35
+ Ok(argv)
36
+ }
37
+
38
+ pub(crate) fn claude_base_command(
39
+ adapter: &BasicProviderAdapter,
40
+ auth_mode: AuthMode,
41
+ mcp_config: Option<&McpConfig>,
42
+ system_prompt: Option<&str>,
43
+ model: Option<&str>,
44
+ dangerously_skip_permissions: bool,
45
+ managed_mcp_config: bool,
46
+ // 0.4.x provider effort MVP step 5: when Some, inject `--effort <level>`
47
+ // immediately after the model (before prompt/MCP).
48
+ effort: Option<crate::model::enums::ProviderEffort>,
49
+ ) -> Result<Vec<String>, ProviderError> {
50
+ let mut argv = vec!["claude".to_string()];
51
+ if dangerously_skip_permissions {
52
+ // 0.5.66 bypass 单源:flag 由 provider_bypass_flag 表供给(单源)。
53
+ let flag = crate::provider::bypass_flags::provider_bypass_flag(Provider::Claude)
54
+ .expect("claude provider must define a bypass flag");
55
+ argv.push(flag.to_string());
56
+ } else {
57
+ append_pair(&mut argv, "--permission-mode", "default");
58
+ }
59
+ append_opt_pair(&mut argv, "--model", model);
60
+ if let Some(effort) = effort {
61
+ argv.push("--effort".to_string());
62
+ argv.push(effort.as_str().to_string());
63
+ }
64
+ append_opt_pair(&mut argv, "--append-system-prompt", system_prompt);
65
+ if !managed_mcp_config
66
+ && (mcp_config.is_some()
67
+ || auth_mode == AuthMode::CompatibleApi
68
+ || system_prompt.is_some_and(prompt_needs_native_mcp))
69
+ {
70
+ let raw = if let Some(config) = mcp_config {
71
+ serde_json::json!({"mcpServers": config.raw.clone()})
72
+ } else {
73
+ serde_json::json!({"mcpServers": adapter.mcp_config(auth_mode)?.raw})
74
+ };
75
+ append_pair(&mut argv, "--mcp-config", raw.to_string());
76
+ }
77
+ Ok(argv)
78
+ }