@team-agent/installer 0.5.124 → 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 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -69
- package/crates/team-agent/src/cli/emit.rs +45 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +28 -33
- package/crates/team-agent/src/cli/models.rs +44 -880
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- 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/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +39 -8
- package/crates/team-agent/src/compiler.rs +28 -204
- package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
- package/crates/team-agent/src/contract_runtime/config.rs +37 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- 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/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +1 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +15 -195
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
- 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 -61
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -43
- package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- 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 +60 -145
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -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_rebind_hotfix_252_red.rs +0 -1
- 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 -153
- package/crates/team-agent/src/lifecycle/tests.rs +0 -6
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +185 -168
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -5
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +33 -302
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +14 -273
- package/crates/team-agent/src/provider/session/capture.rs +7 -107
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
- package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -14
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +79 -11
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -5
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- 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/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- 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/cursor_agent.rs +0 -44
- 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/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
- 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,16 +354,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
360
354
|
native_mcp_config: false,
|
|
361
355
|
writes_global_settings: false,
|
|
362
356
|
},
|
|
363
|
-
//
|
|
364
|
-
//
|
|
365
|
-
Provider::
|
|
366
|
-
resume:
|
|
367
|
-
fork: false,
|
|
368
|
-
native_mcp_config: false,
|
|
369
|
-
writes_global_settings: false,
|
|
370
|
-
},
|
|
371
|
-
Provider::Pi => ProviderCaps {
|
|
372
|
-
resume: true,
|
|
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,
|
|
373
361
|
fork: false,
|
|
374
362
|
native_mcp_config: false,
|
|
375
363
|
writes_global_settings: false,
|
|
@@ -413,7 +401,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
413
401
|
|
|
414
402
|
fn auth_hint(&self, auth_mode: AuthMode) -> AuthHintStatus {
|
|
415
403
|
match self.provider {
|
|
416
|
-
Provider::Claude | Provider::ClaudeCode => claude_auth_hint(auth_mode),
|
|
417
404
|
// C-A-5 cr verdict v2(诚实 MUST-NOT-13) — copilot 无 auth status 子命令
|
|
418
405
|
// (main-help Commands 节仅 completion/help/init/login/mcp/plugin/update/
|
|
419
406
|
// version)。framework 只能弱检测(命令在 PATH + ~/.copilot/config.json
|
|
@@ -421,10 +408,8 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
421
408
|
// 标"weak / no auth-status command available";Compatible/Official 走 BYOK
|
|
422
409
|
// 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
|
|
423
410
|
Provider::Copilot => copilot_auth_hint(auth_mode),
|
|
424
|
-
//
|
|
425
|
-
|
|
426
|
-
Provider::CursorAgent => AuthHintStatus::Unknown,
|
|
427
|
-
Provider::Pi => AuthHintStatus::Unknown,
|
|
411
|
+
// No legacy worker probe remains for Claude Code or Pi.
|
|
412
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => AuthHintStatus::Unknown,
|
|
428
413
|
_ => match auth_mode {
|
|
429
414
|
AuthMode::Subscription => AuthHintStatus::Present,
|
|
430
415
|
AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
|
|
@@ -451,14 +436,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
451
436
|
dangerously_skip_permissions: bool,
|
|
452
437
|
) -> Result<Vec<String>, ProviderError> {
|
|
453
438
|
match self.provider {
|
|
454
|
-
Provider::Claude | Provider::ClaudeCode => Ok(claude_launch_command(
|
|
455
|
-
self,
|
|
456
|
-
auth_mode,
|
|
457
|
-
mcp_config,
|
|
458
|
-
system_prompt,
|
|
459
|
-
model,
|
|
460
|
-
dangerously_skip_permissions,
|
|
461
|
-
)?),
|
|
462
439
|
Provider::Codex => Ok(codex_base_command(
|
|
463
440
|
None,
|
|
464
441
|
auth_mode,
|
|
@@ -495,13 +472,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
495
472
|
model,
|
|
496
473
|
dangerously_skip_permissions,
|
|
497
474
|
)?),
|
|
498
|
-
Provider::
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
)?),
|
|
502
|
-
Provider::Pi => Err(ProviderError::Command(
|
|
503
|
-
"Pi commands require the shared lifecycle materializer".to_string(),
|
|
504
|
-
)),
|
|
475
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
476
|
+
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
477
|
+
}
|
|
505
478
|
Provider::Fake => Ok(fake_worker_command()),
|
|
506
479
|
}
|
|
507
480
|
}
|
|
@@ -511,61 +484,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
511
484
|
ctx: ProviderCommandContext<'_>,
|
|
512
485
|
) -> Result<CommandPlan, ProviderError> {
|
|
513
486
|
match self.provider {
|
|
514
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
515
|
-
// 0.4.7 (B1 verified, restart partial resume): RESTORE
|
|
516
|
-
// `--session-id <uuid>` on Claude fresh spawn. B1 confirmed
|
|
517
|
-
// Claude ≥ 2.1.185 honours the framework-supplied --session-id
|
|
518
|
-
// and creates a transcript at that id. The earlier 0.4.6
|
|
519
|
-
// P0 removal (commit 9feafc31) is reverted; the actual issue
|
|
520
|
-
// it tried to fix (leader-marker pollution) is addressed
|
|
521
|
-
// separately in commit d39b5104 (leader session exclusion
|
|
522
|
-
// in capture/repair).
|
|
523
|
-
//
|
|
524
|
-
// Fresh path: --session-id <expected> → Claude writes
|
|
525
|
-
// transcript at that id → capture/restart restore use the
|
|
526
|
-
// SAME id we predicted, so apply-time backing-store check
|
|
527
|
-
// passes immediately (no cwd+spawned_at attribution race).
|
|
528
|
-
//
|
|
529
|
-
// Resume path unchanged — `build_resume_command_plan` uses
|
|
530
|
-
// `--resume <existing_id>` on a session id that already has
|
|
531
|
-
// a real transcript.
|
|
532
|
-
let expected = next_session_token();
|
|
533
|
-
let managed = ctx
|
|
534
|
-
.profile_launch
|
|
535
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
536
|
-
let projects_root = ctx
|
|
537
|
-
.profile_launch
|
|
538
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
539
|
-
let model = claude_context_model(ctx);
|
|
540
|
-
let mut argv = claude_base_command(
|
|
541
|
-
self,
|
|
542
|
-
ctx.auth_mode,
|
|
543
|
-
ctx.mcp_config,
|
|
544
|
-
ctx.system_prompt,
|
|
545
|
-
model,
|
|
546
|
-
ctx.dangerously_skip_permissions,
|
|
547
|
-
managed,
|
|
548
|
-
ctx.effort,
|
|
549
|
-
)?;
|
|
550
|
-
argv.push("--session-id".to_string());
|
|
551
|
-
argv.push(expected.clone());
|
|
552
|
-
// Layer 1 self-healing (architect probe 2026-06-22, claude help
|
|
553
|
-
// `-n, --name <name>`): pass `--name <agent_id>` so the
|
|
554
|
-
// resume picker and on-disk `~/.claude/sessions/*.json name`
|
|
555
|
-
// field carry our role label.
|
|
556
|
-
if let Some(agent_id) = ctx.agent_id_hint {
|
|
557
|
-
if !agent_id.is_empty() {
|
|
558
|
-
argv.push("--name".to_string());
|
|
559
|
-
argv.push(agent_id.to_string());
|
|
560
|
-
}
|
|
561
|
-
}
|
|
562
|
-
Ok(CommandPlan {
|
|
563
|
-
argv,
|
|
564
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
565
|
-
provider_projects_root: projects_root,
|
|
566
|
-
managed_mcp_config: managed,
|
|
567
|
-
})
|
|
568
|
-
}
|
|
569
487
|
// codex.py:105-118 — the profile command overrides (codex_profile / codex_config)
|
|
570
488
|
// ride on `agent["_provider_profile"]`, which only the plan path carries.
|
|
571
489
|
//
|
|
@@ -630,23 +548,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
630
548
|
managed_mcp_config: false,
|
|
631
549
|
})
|
|
632
550
|
}
|
|
633
|
-
Provider::
|
|
634
|
-
|
|
635
|
-
// pending 只能是 CLI chatId,本拍不造假 uuid。
|
|
636
|
-
let argv = cursor_agent_base_command(
|
|
637
|
-
ctx.model,
|
|
638
|
-
ctx.dangerously_skip_permissions,
|
|
639
|
-
)?;
|
|
640
|
-
Ok(CommandPlan {
|
|
641
|
-
argv,
|
|
642
|
-
expected_session_id: None,
|
|
643
|
-
provider_projects_root: None,
|
|
644
|
-
managed_mcp_config: false,
|
|
645
|
-
})
|
|
551
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
552
|
+
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
646
553
|
}
|
|
647
|
-
Provider::Pi => Err(ProviderError::Command(
|
|
648
|
-
"Pi commands require the shared lifecycle materializer".to_string(),
|
|
649
|
-
)),
|
|
650
554
|
_ => self
|
|
651
555
|
.build_command_with_permissions(
|
|
652
556
|
ctx.auth_mode,
|
|
@@ -787,21 +691,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
787
691
|
argv.push(session_id.as_str().to_string());
|
|
788
692
|
Ok(argv)
|
|
789
693
|
}
|
|
790
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
791
|
-
let mut argv = claude_base_command(
|
|
792
|
-
self,
|
|
793
|
-
auth_mode,
|
|
794
|
-
mcp_config,
|
|
795
|
-
system_prompt,
|
|
796
|
-
model,
|
|
797
|
-
dangerously_skip_permissions,
|
|
798
|
-
false,
|
|
799
|
-
None,
|
|
800
|
-
)?;
|
|
801
|
-
argv.push("--resume".to_string());
|
|
802
|
-
argv.push(session_id.as_str().to_string());
|
|
803
|
-
Ok(argv)
|
|
804
|
-
}
|
|
805
694
|
// §C1 cr verdict:resume 同 base + `--resume <sid>`(去 --session-id,
|
|
806
695
|
// copilot --resume 接受 id|name)。
|
|
807
696
|
Provider::Copilot => {
|
|
@@ -823,18 +712,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
823
712
|
argv.push(session_id.as_str().to_string());
|
|
824
713
|
Ok(argv)
|
|
825
714
|
}
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
let mut argv = cursor_agent_base_command(model, dangerously_skip_permissions)?;
|
|
829
|
-
// Put --resume immediately after `agent` so the CLI treats it as
|
|
830
|
-
// the session mode rather than a trailing flag after --workspace.
|
|
831
|
-
argv.insert(1, "--resume".to_string());
|
|
832
|
-
argv.insert(2, session_id.as_str().to_string());
|
|
833
|
-
Ok(argv)
|
|
715
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
716
|
+
Err(ProviderError::ResumeUnavailable(retired_worker(self.provider)))
|
|
834
717
|
}
|
|
835
|
-
Provider::Pi => Err(ProviderError::ResumeUnavailable(
|
|
836
|
-
"pi resume requires the captured exact session path".to_string(),
|
|
837
|
-
)),
|
|
838
718
|
Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
|
|
839
719
|
"{} resume requires session_id",
|
|
840
720
|
provider_wire(self.provider)
|
|
@@ -848,44 +728,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
848
728
|
ctx: ProviderCommandContext<'_>,
|
|
849
729
|
) -> Result<CommandPlan, ProviderError> {
|
|
850
730
|
match self.provider {
|
|
851
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
852
|
-
let Some(session_id) = session_id else {
|
|
853
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
854
|
-
"resume requires session_id".to_string(),
|
|
855
|
-
));
|
|
856
|
-
};
|
|
857
|
-
let managed = ctx
|
|
858
|
-
.profile_launch
|
|
859
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
860
|
-
let model = claude_context_model(ctx);
|
|
861
|
-
let mut argv = claude_base_command(
|
|
862
|
-
self,
|
|
863
|
-
ctx.auth_mode,
|
|
864
|
-
ctx.mcp_config,
|
|
865
|
-
ctx.system_prompt,
|
|
866
|
-
model,
|
|
867
|
-
ctx.dangerously_skip_permissions,
|
|
868
|
-
managed,
|
|
869
|
-
ctx.effort,
|
|
870
|
-
)?;
|
|
871
|
-
argv.push("--resume".to_string());
|
|
872
|
-
argv.push(session_id.as_str().to_string());
|
|
873
|
-
// Layer 1 self-healing: keep the role name on resume too —
|
|
874
|
-
// makes resumed sessions findable in the picker by agent_id
|
|
875
|
-
// when state.json drifts.
|
|
876
|
-
if let Some(agent_id) = ctx.agent_id_hint {
|
|
877
|
-
if !agent_id.is_empty() {
|
|
878
|
-
argv.push("--name".to_string());
|
|
879
|
-
argv.push(agent_id.to_string());
|
|
880
|
-
}
|
|
881
|
-
}
|
|
882
|
-
let mut plan = CommandPlan::argv_only(argv);
|
|
883
|
-
plan.provider_projects_root = ctx
|
|
884
|
-
.profile_launch
|
|
885
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
886
|
-
plan.managed_mcp_config = managed;
|
|
887
|
-
Ok(plan)
|
|
888
|
-
}
|
|
889
731
|
Provider::Codex => {
|
|
890
732
|
if !self.session_is_resumable(session_id, ctx.auth_mode)? {
|
|
891
733
|
return Err(ProviderError::ResumeUnavailable(format!(
|
|
@@ -927,26 +769,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
927
769
|
argv.push(session_id.as_str().to_string());
|
|
928
770
|
Ok(CommandPlan::argv_only(argv))
|
|
929
771
|
}
|
|
930
|
-
Provider::CursorAgent => {
|
|
931
|
-
let Some(session_id) = session_id else {
|
|
932
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
933
|
-
"cursor_agent resume requires chatId; empty --resume is forbidden (picker)".to_string(),
|
|
934
|
-
));
|
|
935
|
-
};
|
|
936
|
-
let raw = session_id.as_str();
|
|
937
|
-
if raw.is_empty() || raw.contains('/') || raw.contains('\\') || raw.contains('\0') {
|
|
938
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
939
|
-
"cursor_agent resume rejected forged or empty chatId".to_string(),
|
|
940
|
-
));
|
|
941
|
-
}
|
|
942
|
-
let mut argv = cursor_agent_base_command(
|
|
943
|
-
ctx.model,
|
|
944
|
-
ctx.dangerously_skip_permissions,
|
|
945
|
-
)?;
|
|
946
|
-
argv.push("--resume".to_string());
|
|
947
|
-
argv.push(raw.to_string());
|
|
948
|
-
Ok(CommandPlan::argv_only(argv))
|
|
949
|
-
}
|
|
950
772
|
_ => self
|
|
951
773
|
.build_resume_command_with_context(
|
|
952
774
|
session_id,
|
|
@@ -1004,24 +826,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1004
826
|
argv.push(session_id.as_str().to_string());
|
|
1005
827
|
Ok(argv)
|
|
1006
828
|
}
|
|
1007
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1008
|
-
let mut argv = claude_base_command(
|
|
1009
|
-
self,
|
|
1010
|
-
auth_mode,
|
|
1011
|
-
mcp_config,
|
|
1012
|
-
system_prompt,
|
|
1013
|
-
model,
|
|
1014
|
-
dangerously_skip_permissions,
|
|
1015
|
-
false,
|
|
1016
|
-
None,
|
|
1017
|
-
)?;
|
|
1018
|
-
argv.push("--session-id".to_string());
|
|
1019
|
-
argv.push(next_session_token());
|
|
1020
|
-
argv.push("--resume".to_string());
|
|
1021
|
-
argv.push(session_id.as_str().to_string());
|
|
1022
|
-
argv.push("--fork-session".to_string());
|
|
1023
|
-
Ok(argv)
|
|
1024
|
-
}
|
|
1025
829
|
// Context-free adapter calls cannot materialize the Copilot store fork.
|
|
1026
830
|
// The lifecycle path uses `fork_plan`, which receives the prepared isolated
|
|
1027
831
|
// backing; never degrade this context-free call to a fresh spawn.
|
|
@@ -1044,7 +848,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1044
848
|
argv.push("--fork-session".to_string());
|
|
1045
849
|
Ok(argv)
|
|
1046
850
|
}
|
|
1047
|
-
Provider::
|
|
851
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
852
|
+
Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider)))
|
|
853
|
+
}
|
|
854
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
1048
855
|
Err(ProviderError::CapabilityUnsupported(format!(
|
|
1049
856
|
"{} does not support native session fork",
|
|
1050
857
|
provider_wire(self.provider)
|
|
@@ -1059,45 +866,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1059
866
|
ctx: ProviderCommandContext<'_>,
|
|
1060
867
|
) -> Result<CommandPlan, ProviderError> {
|
|
1061
868
|
match self.provider {
|
|
1062
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1063
|
-
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1064
|
-
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
1065
|
-
"{} does not support native session fork",
|
|
1066
|
-
provider_wire(self.provider)
|
|
1067
|
-
)));
|
|
1068
|
-
}
|
|
1069
|
-
if session_id.is_none() {
|
|
1070
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
1071
|
-
"fork requires session_id".to_string(),
|
|
1072
|
-
));
|
|
1073
|
-
}
|
|
1074
|
-
let expected = next_session_token();
|
|
1075
|
-
let managed = ctx
|
|
1076
|
-
.profile_launch
|
|
1077
|
-
.is_some_and(|profile| profile.managed_mcp_config);
|
|
1078
|
-
let projects_root = ctx
|
|
1079
|
-
.profile_launch
|
|
1080
|
-
.and_then(|profile| profile.claude_projects_root.clone());
|
|
1081
|
-
let model = claude_context_model(ctx);
|
|
1082
|
-
let mut argv = claude_base_command(
|
|
1083
|
-
self,
|
|
1084
|
-
ctx.auth_mode,
|
|
1085
|
-
ctx.mcp_config,
|
|
1086
|
-
ctx.system_prompt,
|
|
1087
|
-
model,
|
|
1088
|
-
ctx.dangerously_skip_permissions,
|
|
1089
|
-
managed,
|
|
1090
|
-
ctx.effort,
|
|
1091
|
-
)?;
|
|
1092
|
-
argv.push("--resume".to_string());
|
|
1093
|
-
argv.push(expected.clone());
|
|
1094
|
-
Ok(CommandPlan {
|
|
1095
|
-
argv,
|
|
1096
|
-
expected_session_id: Some(SessionId::new(expected)),
|
|
1097
|
-
provider_projects_root: projects_root,
|
|
1098
|
-
managed_mcp_config: managed,
|
|
1099
|
-
})
|
|
1100
|
-
}
|
|
1101
869
|
Provider::Codex => {
|
|
1102
870
|
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
1103
871
|
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
@@ -1229,9 +997,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1229
997
|
|
|
1230
998
|
fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
|
|
1231
999
|
match self.provider {
|
|
1232
|
-
Provider::Claude | Provider::ClaudeCode => {
|
|
1233
|
-
patterns(r"[>❯]\s", r"[✶✢✽✻✳·].*…", r"Error|Traceback")
|
|
1234
|
-
}
|
|
1235
1000
|
Provider::Codex => patterns(
|
|
1236
1001
|
r"(›|❯|codex>)",
|
|
1237
1002
|
r"•.*esc to interrupt",
|
|
@@ -1242,23 +1007,17 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1242
1007
|
r"working|processing",
|
|
1243
1008
|
r"Error|panic",
|
|
1244
1009
|
),
|
|
1245
|
-
// Pi
|
|
1246
|
-
|
|
1247
|
-
|
|
1248
|
-
r"
|
|
1249
|
-
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",
|
|
1250
1016
|
),
|
|
1251
1017
|
// Grok: 暂无专有 status 正则, 沿用 generic。
|
|
1252
1018
|
Provider::Grok | Provider::GeminiCli | Provider::Fake => {
|
|
1253
1019
|
patterns(r">", r"working|processing", r"Error|Traceback")
|
|
1254
1020
|
}
|
|
1255
|
-
// Cursor: U-15 未过前不得用 generic `>` 单独判已证实 idle。
|
|
1256
|
-
// 字面量 `cursor-idle-unset-until-u15` 不会出现在屏上。
|
|
1257
|
-
Provider::CursorAgent => patterns(
|
|
1258
|
-
r"cursor-idle-unset-until-u15",
|
|
1259
|
-
r"cursor-busy-unset-until-u15",
|
|
1260
|
-
r"Error|Traceback",
|
|
1261
|
-
),
|
|
1262
1021
|
}
|
|
1263
1022
|
}
|
|
1264
1023
|
|
|
@@ -1273,6 +1032,16 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1273
1032
|
|
|
1274
1033
|
use crate::provider::wire::{command_name, provider_wire};
|
|
1275
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
|
+
|
|
1276
1045
|
fn auth_mode_wire(auth_mode: AuthMode) -> &'static str {
|
|
1277
1046
|
match auth_mode {
|
|
1278
1047
|
AuthMode::Subscription => "subscription",
|
|
@@ -1302,38 +1071,6 @@ fn copilot_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
|
1302
1071
|
}
|
|
1303
1072
|
}
|
|
1304
1073
|
|
|
1305
|
-
fn claude_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
1306
|
-
if auth_mode != AuthMode::Subscription {
|
|
1307
|
-
return AuthHintStatus::MissingOrUnknown;
|
|
1308
|
-
}
|
|
1309
|
-
if !command_on_path("claude") {
|
|
1310
|
-
return AuthHintStatus::Missing;
|
|
1311
|
-
}
|
|
1312
|
-
let output = match Command::new("claude").args(["auth", "status"]).output() {
|
|
1313
|
-
Ok(output) => output,
|
|
1314
|
-
Err(_) => return AuthHintStatus::MissingOrUnknown,
|
|
1315
|
-
};
|
|
1316
|
-
let text = if output.stdout.is_empty() {
|
|
1317
|
-
String::from_utf8_lossy(&output.stderr).to_string()
|
|
1318
|
-
} else {
|
|
1319
|
-
String::from_utf8_lossy(&output.stdout).to_string()
|
|
1320
|
-
};
|
|
1321
|
-
let status = serde_json::from_str::<serde_json::Value>(text.trim()).unwrap_or_default();
|
|
1322
|
-
if status.get("loggedIn").and_then(serde_json::Value::as_bool) == Some(true)
|
|
1323
|
-
|| output.status.success()
|
|
1324
|
-
{
|
|
1325
|
-
AuthHintStatus::Present
|
|
1326
|
-
} else {
|
|
1327
|
-
AuthHintStatus::Missing
|
|
1328
|
-
}
|
|
1329
|
-
}
|
|
1330
|
-
|
|
1331
|
-
fn claude_context_model(ctx: ProviderCommandContext<'_>) -> Option<&str> {
|
|
1332
|
-
ctx.profile_launch
|
|
1333
|
-
.and_then(|profile| profile.command_overrides.model.as_deref())
|
|
1334
|
-
.or(ctx.model)
|
|
1335
|
-
}
|
|
1336
|
-
|
|
1337
1074
|
fn command_on_path(name: &str) -> bool {
|
|
1338
1075
|
let Some(path) = std::env::var_os("PATH") else {
|
|
1339
1076
|
return false;
|
|
@@ -1341,10 +1078,6 @@ fn command_on_path(name: &str) -> bool {
|
|
|
1341
1078
|
std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
|
|
1342
1079
|
}
|
|
1343
1080
|
|
|
1344
|
-
pub(crate) fn prompt_needs_native_mcp(prompt: &str) -> bool {
|
|
1345
|
-
prompt.contains('\n') || prompt.contains('"')
|
|
1346
|
-
}
|
|
1347
|
-
|
|
1348
1081
|
/// Shared JSON renderer used by the codex `-c mcp_servers.*=...` overrides
|
|
1349
1082
|
/// and any other adapter that wants inline JSON. String values are quoted
|
|
1350
1083
|
/// (with quote escape); other values use serde's default Display.
|
|
@@ -1359,10 +1092,8 @@ pub(crate) fn json_inline(value: &serde_json::Value) -> String {
|
|
|
1359
1092
|
// Only the entry points the trait impl actually calls are re-imported here;
|
|
1360
1093
|
// The per-provider command helpers and MCP renderers are called from within
|
|
1361
1094
|
// the extracted base-command functions, not directly by this file.
|
|
1362
|
-
use super::adapters::claude::{claude_base_command, claude_launch_command};
|
|
1363
1095
|
use super::adapters::codex::codex_base_command;
|
|
1364
1096
|
use super::adapters::copilot::copilot_base_command;
|
|
1365
|
-
use super::adapters::cursor_agent::cursor_agent_base_command;
|
|
1366
1097
|
use super::adapters::fake::fake_worker_command;
|
|
1367
1098
|
use super::adapters::grok::{grok_base_command, grok_launch_command};
|
|
1368
1099
|
|
|
@@ -8,24 +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 cursor_agent;
|
|
31
|
-
pub(crate) mod pi;
|
|
@@ -66,11 +66,7 @@ pub fn route_key(provider: Provider) -> Option<&'static str> {
|
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
pub fn parse_route_provider(raw: &str) -> Option<Provider> {
|
|
69
|
-
let provider =
|
|
70
|
-
Provider::CursorAgent
|
|
71
|
-
} else {
|
|
72
|
-
wire::parse_provider(raw)?
|
|
73
|
-
};
|
|
69
|
+
let provider = wire::parse_provider(raw)?;
|
|
74
70
|
route_key(provider).map(|_| provider)
|
|
75
71
|
}
|
|
76
72
|
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
//! - codex → `--dangerously-bypass-approvals-and-sandbox`
|
|
10
10
|
//! - copilot → `--allow-all`(0.3.27 P1 E54 symptom 2 起)
|
|
11
11
|
//! - grok → `--always-approve`
|
|
12
|
-
//! - cursor_agent → `--force`
|
|
13
12
|
//!
|
|
14
13
|
//! 未定义(返回 None)的 provider:调用侧必须 fail-loud,不得静默 fallback。
|
|
15
14
|
|
|
@@ -22,7 +21,6 @@ pub(crate) fn provider_bypass_flag(provider: Provider) -> Option<&'static str> {
|
|
|
22
21
|
Provider::Codex => Some("--dangerously-bypass-approvals-and-sandbox"),
|
|
23
22
|
Provider::Copilot => Some("--allow-all"),
|
|
24
23
|
Provider::Grok => Some("--always-approve"),
|
|
25
|
-
Provider::CursorAgent => Some("--force"),
|
|
26
24
|
Provider::Pi => None,
|
|
27
25
|
// TODO: 查 gemini_cli 的等价 bypass 参数;未定义前 fail-loud。
|
|
28
26
|
Provider::GeminiCli => None,
|
|
@@ -34,10 +32,8 @@ pub(crate) fn provider_bypass_flag(provider: Provider) -> Option<&'static str> {
|
|
|
34
32
|
/// 找已知 bypass flag。**只做检测,不做行为决策**(0.6.0 删)。
|
|
35
33
|
///
|
|
36
34
|
/// 不认 `--force`:那是 team-agent 自己的 CLI 旗(`init --force` /
|
|
37
|
-
/// `remove-agent --confirm --force` / `restart --force`)
|
|
38
|
-
///
|
|
39
|
-
/// 认 `--force` 会把既有非 grok/cursor 路径误判成 bypass。
|
|
40
|
-
/// cursor worker 的 bypass 仍走 [`provider_bypass_flag`],不走这条检测面。
|
|
35
|
+
/// `remove-agent --confirm --force` / `restart --force`)。
|
|
36
|
+
/// 认 `--force` 会把既有生命周期操作误判成 bypass。
|
|
41
37
|
/// `--always-approve` 可以认:team-agent 自己没有这个旗。
|
|
42
38
|
///
|
|
43
39
|
/// TODO(0.6.0): remove
|
|
@@ -93,15 +89,11 @@ mod tests {
|
|
|
93
89
|
}
|
|
94
90
|
|
|
95
91
|
#[test]
|
|
96
|
-
fn
|
|
92
|
+
fn grok_bypass_flag() {
|
|
97
93
|
assert_eq!(
|
|
98
94
|
provider_bypass_flag(Provider::Grok),
|
|
99
95
|
Some("--always-approve")
|
|
100
96
|
);
|
|
101
|
-
assert_eq!(
|
|
102
|
-
provider_bypass_flag(Provider::CursorAgent),
|
|
103
|
-
Some("--force")
|
|
104
|
-
);
|
|
105
97
|
}
|
|
106
98
|
|
|
107
99
|
#[test]
|
|
@@ -68,6 +68,71 @@ pub fn classify(
|
|
|
68
68
|
Ok(decide_state(fact, process))
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
/// #379: where an agent's Claude process keeps its live registry record and
|
|
72
|
+
/// under which session id. Beside the captured transcript
|
|
73
|
+
/// (`<config>/projects/<slug>/<sessionId>.jsonl`); before capture, under the
|
|
74
|
+
/// projects root it was launched with (profile, else the native
|
|
75
|
+
/// `$HOME/.claude/projects`) and the `--session-id` it was started under.
|
|
76
|
+
pub fn claude_registry_key(agent: &serde_json::Value) -> Option<(std::path::PathBuf, String)> {
|
|
77
|
+
let text = |key: &str| {
|
|
78
|
+
agent.get(key).and_then(serde_json::Value::as_str).filter(|value| !value.is_empty())
|
|
79
|
+
};
|
|
80
|
+
let (projects, session_id) = match text("rollout_path").map(std::path::Path::new) {
|
|
81
|
+
Some(rollout) => (rollout.parent()?.parent()?.to_path_buf(), rollout.file_stem()?.to_str()?),
|
|
82
|
+
None => (
|
|
83
|
+
text("claude_projects_root").map(std::path::PathBuf::from).or_else(|| {
|
|
84
|
+
std::env::var_os("HOME")
|
|
85
|
+
.map(|home| std::path::PathBuf::from(home).join(".claude").join("projects"))
|
|
86
|
+
})?,
|
|
87
|
+
text("_pending_session_id").or_else(|| text("session_id"))?,
|
|
88
|
+
),
|
|
89
|
+
};
|
|
90
|
+
if projects.file_name()? != "projects" {
|
|
91
|
+
return None;
|
|
92
|
+
}
|
|
93
|
+
Some((projects.parent()?.join("sessions"), session_id.to_owned()))
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/// #379: Claude Code's own live turn state. The CLI writes `status` into
|
|
97
|
+
/// `<config>/sessions/<pid>.json` at startup and on every transition
|
|
98
|
+
/// (`running`→`busy`, `requires_action`→`waiting`, `idle`→`idle`). A record
|
|
99
|
+
/// counts only with this session id, a live pid and, when it names one, the
|
|
100
|
+
/// same tmux pane. None = no decisive record.
|
|
101
|
+
pub fn claude_registry_turn_state(
|
|
102
|
+
sessions: &std::path::Path,
|
|
103
|
+
session_id: &str,
|
|
104
|
+
pane_id: Option<&str>,
|
|
105
|
+
) -> Option<TurnState> {
|
|
106
|
+
let entries = std::fs::read_dir(sessions).ok()?;
|
|
107
|
+
entries.flatten().find_map(|entry| {
|
|
108
|
+
let path = entry.path();
|
|
109
|
+
if path.extension()? != "json" || entry.metadata().ok()?.len() > 64 * 1024 {
|
|
110
|
+
return None;
|
|
111
|
+
}
|
|
112
|
+
let record: serde_json::Value = serde_json::from_slice(&std::fs::read(&path).ok()?).ok()?;
|
|
113
|
+
let field = |key: &str| record.get(key).and_then(serde_json::Value::as_str);
|
|
114
|
+
if field("sessionId") != Some(session_id) {
|
|
115
|
+
return None;
|
|
116
|
+
}
|
|
117
|
+
// `tmux` is `<session>:@<window>.%<pane>`.
|
|
118
|
+
if let (Some(pane), Some(tmux)) = (pane_id, field("tmux")) {
|
|
119
|
+
if tmux.rsplit_once('.').map(|(_, recorded)| recorded) != Some(pane) {
|
|
120
|
+
return None;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
let pid = u32::try_from(record.get("pid")?.as_u64()?).ok()?;
|
|
124
|
+
if !crate::platform::process::pid_is_alive(pid) {
|
|
125
|
+
return None;
|
|
126
|
+
}
|
|
127
|
+
match field("status")? {
|
|
128
|
+
"busy" => Some(TurnState::Working),
|
|
129
|
+
"waiting" => Some(TurnState::BlockedOnHuman),
|
|
130
|
+
"idle" => Some(TurnState::Idle),
|
|
131
|
+
_ => None,
|
|
132
|
+
}
|
|
133
|
+
})
|
|
134
|
+
}
|
|
135
|
+
|
|
71
136
|
/// Blocker-2 Layer-2: scan Claude transcript records for background task
|
|
72
137
|
/// lifecycle markers. Returns `Some(turn_id)` when at least one background
|
|
73
138
|
/// task is OPEN (started but not closed) — caller treats as `TurnOpen` with
|
|
@@ -215,7 +280,7 @@ fn latest_explicit_error_fact_for_record(
|
|
|
215
280
|
Provider::Claude | Provider::ClaudeCode => claude_latest_explicit_error_fact(record),
|
|
216
281
|
// C-3-5 cr verdict: copilot N35 通知不依赖 turn-state 分类;一期 Unknown,
|
|
217
282
|
// 与 GeminiCli/Fake 同精神。二期接 sqlite turns 表后再回填。
|
|
218
|
-
Provider::Copilot | Provider::Grok | Provider::
|
|
283
|
+
Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
|
|
219
284
|
| Provider::Fake => None,
|
|
220
285
|
}
|
|
221
286
|
}
|
|
@@ -379,7 +444,7 @@ fn extract_lifecycle_facts(
|
|
|
379
444
|
Provider::Codex => codex_lifecycle_fact(record),
|
|
380
445
|
// C-3-1 cr verdict: copilot lifecycle facts 一期不导出(classify→None,
|
|
381
446
|
// Unknown);二期读 sqlite turns 表(turn_index/assistant_response)。
|
|
382
|
-
Provider::Copilot | Provider::Grok | Provider::
|
|
447
|
+
Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
|
|
383
448
|
| Provider::Fake => None,
|
|
384
449
|
})
|
|
385
450
|
.collect()
|
|
@@ -419,7 +484,7 @@ fn decide_state(fact: &LifecycleFact, process: ProcessLiveness) -> ClassifyResul
|
|
|
419
484
|
ProcessLiveness::Alive => classify_result(
|
|
420
485
|
TurnState::Working,
|
|
421
486
|
fact.turn_id.clone(),
|
|
422
|
-
if fact.reason
|
|
487
|
+
if matches!(fact.reason.as_str(), "assistant_in_flight" | "background_task") {
|
|
423
488
|
&fact.reason
|
|
424
489
|
} else {
|
|
425
490
|
"open_turn"
|