@team-agent/installer 0.5.124 → 0.5.125

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 (97) hide show
  1. package/Cargo.lock +1 -8
  2. package/Cargo.toml +1 -1
  3. package/README.md +2 -2
  4. package/README.zh.md +2 -2
  5. package/crates/team-agent/Cargo.toml +0 -1
  6. package/crates/team-agent/src/cli/diagnose.rs +39 -1
  7. package/crates/team-agent/src/cli/emit.rs +41 -15
  8. package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
  9. package/crates/team-agent/src/cli/intent/runtime_tests.rs +0 -120
  10. package/crates/team-agent/src/cli/leader.rs +2 -3
  11. package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
  12. package/crates/team-agent/src/cli/mod.rs +6 -5
  13. package/crates/team-agent/src/cli/models.rs +40 -119
  14. package/crates/team-agent/src/cli/route.rs +1 -1
  15. package/crates/team-agent/src/cli/send/persist.rs +36 -0
  16. package/crates/team-agent/src/cli/send/presentation.rs +7 -1
  17. package/crates/team-agent/src/cli/send.rs +3 -1
  18. package/crates/team-agent/src/cli/spec.rs +1 -2
  19. package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
  20. package/crates/team-agent/src/cli/tests/base.rs +4 -11
  21. package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
  22. package/crates/team-agent/src/compiler/tests.rs +21 -5
  23. package/crates/team-agent/src/compiler.rs +24 -1
  24. package/crates/team-agent/src/contract_runtime/backend.rs +22 -6
  25. package/crates/team-agent/src/contract_runtime/config.rs +34 -24
  26. package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
  27. package/crates/team-agent/src/contract_runtime/framework.rs +89 -34
  28. package/crates/team-agent/src/contract_runtime/registry.rs +258 -21
  29. package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
  30. package/crates/team-agent/src/coordinator/tick.rs +89 -1
  31. package/crates/team-agent/src/db/message_store.rs +78 -3
  32. package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
  33. package/crates/team-agent/src/leader/prompt.rs +1 -2
  34. package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
  35. package/crates/team-agent/src/leader/start.rs +0 -1
  36. package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
  37. package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
  38. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +14 -1
  39. package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
  40. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -1
  41. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +2 -2
  42. package/crates/team-agent/src/lifecycle/launch/spawn.rs +0 -28
  43. package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
  44. package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
  45. package/crates/team-agent/src/lifecycle/launch.rs +2 -20
  46. package/crates/team-agent/src/lifecycle/profile_launch.rs +11 -39
  47. package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
  48. package/crates/team-agent/src/lifecycle/restart/common.rs +1 -63
  49. package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
  50. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +38 -7
  51. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +6 -2
  52. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
  53. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -137
  54. package/crates/team-agent/src/lifecycle/tests.rs +0 -3
  55. package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
  56. package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
  57. package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
  58. package/crates/team-agent/src/messaging/delivery.rs +181 -35
  59. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +4 -4
  60. package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
  61. package/crates/team-agent/src/messaging/helpers.rs +19 -0
  62. package/crates/team-agent/src/messaging/tests/dup_inject.rs +66 -4
  63. package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
  64. package/crates/team-agent/src/messaging/tests/spine.rs +22 -6
  65. package/crates/team-agent/src/model/enums.rs +1 -8
  66. package/crates/team-agent/src/provider/adapter.rs +1 -67
  67. package/crates/team-agent/src/provider/adapters/mod.rs +0 -1
  68. package/crates/team-agent/src/provider/argv_route.rs +1 -5
  69. package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
  70. package/crates/team-agent/src/provider/classify.rs +68 -3
  71. package/crates/team-agent/src/provider/faults.rs +1 -1
  72. package/crates/team-agent/src/provider/model_catalog.rs +2 -73
  73. package/crates/team-agent/src/provider/session/capture.rs +1 -1
  74. package/crates/team-agent/src/provider/session/context_fork.rs +4 -4
  75. package/crates/team-agent/src/provider/session_scan/common.rs +1 -2
  76. package/crates/team-agent/src/provider/session_scan.rs +0 -4
  77. package/crates/team-agent/src/provider/submit_now.rs +5 -28
  78. package/crates/team-agent/src/provider/tests/adapter.rs +5 -184
  79. package/crates/team-agent/src/provider/tests/classify.rs +53 -0
  80. package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -4
  81. package/crates/team-agent/src/provider/types.rs +1 -1
  82. package/crates/team-agent/src/provider/wire.rs +48 -8
  83. package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
  84. package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
  85. package/crates/team-agent/src/tmux_backend.rs +43 -8
  86. package/crates/team-agent/src/transport/native_input.rs +2 -231
  87. package/package.json +4 -4
  88. package/skills/team-agent/SKILL.md +1 -1
  89. package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
  90. package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
  91. package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
  92. package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
  93. package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
  94. package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
  95. package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
  96. package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
  97. package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
@@ -1255,6 +1255,8 @@ fn fire_due_scheduled_events_fires_each_scheduled_kind() {
1255
1255
 
1256
1256
  struct UnverifiedInjectTransport {
1257
1257
  readback_visible: bool,
1258
+ /// #379: the recipient's transcript, written at submit like a native CLI.
1259
+ receipt: Option<PathBuf>,
1258
1260
  }
1259
1261
  impl Transport for UnverifiedInjectTransport {
1260
1262
  fn kind(&self) -> BackendKind {
@@ -1283,10 +1285,14 @@ impl Transport for UnverifiedInjectTransport {
1283
1285
  fn inject(
1284
1286
  &self,
1285
1287
  _t: &Target,
1286
- _p: &InjectPayload,
1288
+ p: &InjectPayload,
1287
1289
  _s: Key,
1288
1290
  _b: bool,
1289
1291
  ) -> Result<InjectReport, TransportError> {
1292
+ if let (Some(path), Some(text)) = (&self.receipt, p.text()) {
1293
+ let row = serde_json::json!({"type": "queue-operation", "operation": "enqueue", "content": text});
1294
+ std::fs::write(path, format!("{row}\n")).unwrap();
1295
+ }
1290
1296
  Ok(InjectReport {
1291
1297
  stage_reached: crate::transport::InjectStage::Submit,
1292
1298
  inject_verification: if self.readback_visible {
@@ -1575,6 +1581,7 @@ fn deliver_pending_submit_unverified_is_not_saved_by_readback() {
1575
1581
  &store,
1576
1582
  &UnverifiedInjectTransport {
1577
1583
  readback_visible: true,
1584
+ receipt: None,
1578
1585
  },
1579
1586
  &message_id,
1580
1587
  &log,
@@ -1619,12 +1626,21 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
1619
1626
  let message_id = store
1620
1627
  .create_message(None, "leader", "w1", "ping", None, false, None)
1621
1628
  .unwrap();
1629
+ // #379: exhaustion is the outer delivery budget; this is its last attempt.
1630
+ crate::db::schema::open_db(store.db_path())
1631
+ .unwrap()
1632
+ .execute(
1633
+ "update messages set delivery_attempts = ?2 where message_id = ?1",
1634
+ rusqlite::params![message_id, i64::from(SEND_RETRY_MAX_ATTEMPTS) - 1],
1635
+ )
1636
+ .unwrap();
1622
1637
 
1623
1638
  let out = deliver_pending_message(
1624
1639
  &ws,
1625
1640
  &store,
1626
1641
  &UnverifiedInjectTransport {
1627
1642
  readback_visible: false,
1643
+ receipt: None,
1628
1644
  },
1629
1645
  &message_id,
1630
1646
  &log,
@@ -1636,9 +1652,10 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
1636
1652
  assert_eq!(out.message_status.0, "failed");
1637
1653
  let events = log.tail(0).unwrap();
1638
1654
  assert!(
1639
- events.iter().any(
1640
- |event| event.get("event").and_then(serde_json::Value::as_str) == Some("send.failed")
1641
- ),
1655
+ events.iter().any(|event| {
1656
+ event.get("event").and_then(serde_json::Value::as_str) == Some("send.failed")
1657
+ && event.get("attempts") == Some(&serde_json::json!(SEND_RETRY_MAX_ATTEMPTS))
1658
+ }),
1642
1659
  "exhausted unverified send must emit send.failed; got {events:?}"
1643
1660
  );
1644
1661
  assert!(
@@ -1650,6 +1667,95 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
1650
1667
  );
1651
1668
  }
1652
1669
 
1670
+ #[test]
1671
+ fn issue379_inner_enter_presses_do_not_spend_the_delivery_budget() {
1672
+ let ws = tmp_ws("innerenters");
1673
+ let store = store_for(&ws);
1674
+ let log = EventLog::new(&ws);
1675
+ let state = serde_json::json!({
1676
+ "session_name": "team-innerenters",
1677
+ "leader_receiver": {"pane_id": "%leader"},
1678
+ "agents": {"w1": {"provider": "fake", "pane_id": "%1"}}
1679
+ });
1680
+ crate::state::persist::save_runtime_state(&ws, &state).unwrap();
1681
+ let message_id = store
1682
+ .create_message(None, "leader", "w1", "ping", None, false, None)
1683
+ .unwrap();
1684
+
1685
+ // One delivery whose verifier pressed Enter SEND_RETRY_MAX_ATTEMPTS times.
1686
+ let out = deliver_pending_message(
1687
+ &ws,
1688
+ &store,
1689
+ &UnverifiedInjectTransport {
1690
+ readback_visible: false,
1691
+ receipt: None,
1692
+ },
1693
+ &message_id,
1694
+ &log,
1695
+ &state,
1696
+ )
1697
+ .unwrap();
1698
+
1699
+ assert_eq!(out.message_status.0, "submitted_unverified", "{out:?}");
1700
+ let events = log.tail(0).unwrap();
1701
+ let event = |name: &str| {
1702
+ events
1703
+ .iter()
1704
+ .find(|event| event.get("event").and_then(serde_json::Value::as_str) == Some(name))
1705
+ };
1706
+ assert!(event("send.failed").is_none(), "first attempt is not exhausted; got {events:?}");
1707
+ let unverified = event("send.unverified").expect("send.unverified");
1708
+ assert_eq!(unverified.get("attempts"), Some(&serde_json::json!(SEND_RETRY_MAX_ATTEMPTS)));
1709
+ assert_eq!(unverified.get("delivery_attempt"), Some(&serde_json::json!(1)));
1710
+ }
1711
+
1712
+ #[test]
1713
+ fn issue379_recipient_transcript_receipt_upgrades_an_unread_pane_to_delivered() {
1714
+ let ws = tmp_ws("transcriptreceipt");
1715
+ let store = store_for(&ws);
1716
+ let log = EventLog::new(&ws);
1717
+ let rollout = ws.join("w1-transcript.jsonl");
1718
+ let state = serde_json::json!({
1719
+ "session_name": "team-transcriptreceipt",
1720
+ "leader_receiver": {"pane_id": "%leader"},
1721
+ "agents": {"w1": {"provider": "fake", "pane_id": "%1", "rollout_path": rollout}}
1722
+ });
1723
+ crate::state::persist::save_runtime_state(&ws, &state).unwrap();
1724
+ let message_id = store
1725
+ .create_message(None, "leader", "w1", "ping", None, false, None)
1726
+ .unwrap();
1727
+ crate::db::schema::open_db(store.db_path())
1728
+ .unwrap()
1729
+ .execute(
1730
+ "update messages set delivery_attempts = ?2 where message_id = ?1",
1731
+ rusqlite::params![message_id, i64::from(SEND_RETRY_MAX_ATTEMPTS) - 1],
1732
+ )
1733
+ .unwrap();
1734
+
1735
+ let out = deliver_pending_message(
1736
+ &ws,
1737
+ &store,
1738
+ &UnverifiedInjectTransport {
1739
+ readback_visible: false,
1740
+ receipt: Some(rollout),
1741
+ },
1742
+ &message_id,
1743
+ &log,
1744
+ &state,
1745
+ )
1746
+ .unwrap();
1747
+
1748
+ assert!(out.ok, "{out:?}");
1749
+ assert_eq!(out.message_status.0, "delivered");
1750
+ let events = log.tail(0).unwrap();
1751
+ let names: Vec<_> = events
1752
+ .iter()
1753
+ .filter_map(|event| event.get("event").and_then(serde_json::Value::as_str))
1754
+ .collect();
1755
+ assert!(names.contains(&"send.unverified_reconciled"), "{names:?}");
1756
+ assert!(!names.contains(&"send.unverified") && !names.contains(&"send.failed"), "{names:?}");
1757
+ }
1758
+
1653
1759
  #[test]
1654
1760
  fn slice1_inject_failures_are_bounded_and_stop_retrying_same_message() {
1655
1761
  let ws = tmp_ws("injectstorm");
@@ -377,8 +377,8 @@ fn spine_delivery_busy_recipient_is_injected_without_idle_deferral() {
377
377
  }
378
378
 
379
379
  #[test]
380
- fn spine_delivery_pi_cursor_uses_v113_direct_input_without_idle_scope() {
381
- for provider in ["pi", "cursor_agent"] {
380
+ fn spine_delivery_pi_uses_v113_direct_input_without_idle_scope() {
381
+ for provider in ["pi"] {
382
382
  let ws = tmp_ws(&format!("direct-input-{provider}"));
383
383
  let store = store_for(&ws);
384
384
  let log = EventLog::new(&ws);
@@ -404,10 +404,6 @@ fn spine_delivery_pi_cursor_uses_v113_direct_input_without_idle_scope() {
404
404
  }}});
405
405
  state["teams"] = serde_json::json!({"spine-team": state.clone()});
406
406
  crate::state::persist::save_runtime_state(&ws, &state).unwrap();
407
- #[cfg(unix)]
408
- if provider == "cursor_agent" {
409
- crate::mcp_server::readiness::publish(&ws, "spine-team", "w1", chrono::Utc::now()).unwrap();
410
- }
411
407
  let transport = DeliverOkTransport { targets: vec![PaneInfo {
412
408
  pane_id: PaneId::new("%spine"), session: SessionName::new("spine"),
413
409
  window_index: None, window_name: Some(WindowName::new("w1")), pane_index: None, tty: None,
@@ -821,3 +817,23 @@ fn e47_iron_law_no_signal_in_bottom_region_stays_uncertain_not_idle() {
821
817
  composer → Uncertain, never silently Idle. Got {a:?}"
822
818
  );
823
819
  }
820
+
821
+ // #379: Claude Code's spinner row sits above its composer box (outside the
822
+ // bottom five rows) while a finished turn's `✻ Worked for 3s` sits inside them.
823
+ fn claude_379_scrollback(above: &str) -> String {
824
+ let rule = "─".repeat(56);
825
+ format!(
826
+ "❯ do the task\n\n⏺ Working through the files.\n\n{above}\n ◐ medium · /effort\n{rule}\n❯ \n{rule}\n ⏵⏵ bypass permissions on (shift+tab to cycle)\n"
827
+ )
828
+ }
829
+
830
+ #[test]
831
+ fn issue379_claude_spinner_above_the_box_is_working_and_a_finished_turn_is_idle() {
832
+ let st = serde_json::json!({});
833
+ for spinner in ["· Waddling…", "✢ Boondoggling… (3s · thinking)"] {
834
+ let a = classify_agent_activity(&st, &claude_379_scrollback(spinner), false, None, None);
835
+ assert_eq!(a.status, ActivityStatus::Working, "{spinner}: {a:?}");
836
+ }
837
+ let a = classify_agent_activity(&st, &claude_379_scrollback("✻ Worked for 3s"), false, None, None);
838
+ assert_eq!(a.status, ActivityStatus::Idle, "{a:?}");
839
+ }
@@ -24,9 +24,6 @@ pub enum Provider {
24
24
  /// Grok CLI (0.5.67 provider-adapter). Append system prompt via `--rules`,
25
25
  /// bypass `--always-approve`, session `--session-id`.
26
26
  Grok,
27
- /// Cursor `agent` CLI (0.5.67 provider-adapter). Append system prompt via
28
- /// workspace `.cursor/rules/*.mdc` (方案 1 变体), bypass `--force`.
29
- CursorAgent,
30
27
  /// Pi coding agent CLI. Models are selected from its live catalog.
31
28
  Pi,
32
29
  Fake,
@@ -45,7 +42,6 @@ pub enum Provider {
45
42
  /// - pi: low|medium|high|xhigh|max → `--thinking <level>`
46
43
  /// - grok: low|medium|high|xhigh → `--effort <level>`; max/ultra rejected
47
44
  /// - copilot / gemini_cli / fake: low..xhigh ignored with warning; max/ultra rejected
48
- /// - cursor_agent: all effort rejected
49
45
  #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
50
46
  pub enum ProviderEffort {
51
47
  #[serde(rename = "low")]
@@ -95,7 +91,7 @@ impl ProviderEffort {
95
91
  Provider::Codex => true,
96
92
  Provider::Claude | Provider::ClaudeCode | Provider::Pi => self != Self::Ultra,
97
93
  Provider::Grok => !matches!(self, Self::Max | Self::Ultra),
98
- Provider::Copilot | Provider::GeminiCli | Provider::CursorAgent | Provider::Fake => {
94
+ Provider::Copilot | Provider::GeminiCli | Provider::Fake => {
99
95
  false
100
96
  }
101
97
  }
@@ -104,9 +100,6 @@ impl ProviderEffort {
104
100
  /// One admission policy for compiler, direct specs and runtime commands.
105
101
  /// Ok(None) preserves the legacy warning-and-ignore providers.
106
102
  pub fn resolve_for_provider(self, provider: Provider) -> Result<Option<Self>, &'static str> {
107
- if provider == Provider::CursorAgent {
108
- return Err("cursor_agent does not support effort; the Cursor CLI has no --effort flag");
109
- }
110
103
  if self.is_supported_by(provider) {
111
104
  Ok(Some(self))
112
105
  } else if self == Self::Ultra {
@@ -360,14 +360,6 @@ impl ProviderAdapter for BasicProviderAdapter {
360
360
  native_mcp_config: false,
361
361
  writes_global_settings: false,
362
362
  },
363
- // Cursor agent: --resume [chatId] 有 → resume true; 无 fork flag →
364
- // fork false; 无 --mcp-config → native_mcp_config false。
365
- Provider::CursorAgent => ProviderCaps {
366
- resume: true,
367
- fork: false,
368
- native_mcp_config: false,
369
- writes_global_settings: false,
370
- },
371
363
  Provider::Pi => ProviderCaps {
372
364
  resume: true,
373
365
  fork: false,
@@ -421,9 +413,6 @@ impl ProviderAdapter for BasicProviderAdapter {
421
413
  // 标"weak / no auth-status command available";Compatible/Official 走 BYOK
422
414
  // 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
423
415
  Provider::Copilot => copilot_auth_hint(auth_mode),
424
- // Cursor: 登录探测未接。U-17 前不得把未观测写成 Present(shim 对
425
- // `cursor-agent status` 会假绿 Logged in)。缺键 ≠ 已知未登录,故不用 Missing。
426
- Provider::CursorAgent => AuthHintStatus::Unknown,
427
416
  Provider::Pi => AuthHintStatus::Unknown,
428
417
  _ => match auth_mode {
429
418
  AuthMode::Subscription => AuthHintStatus::Present,
@@ -495,10 +484,6 @@ impl ProviderAdapter for BasicProviderAdapter {
495
484
  model,
496
485
  dangerously_skip_permissions,
497
486
  )?),
498
- Provider::CursorAgent => Ok(cursor_agent_base_command(
499
- model,
500
- dangerously_skip_permissions,
501
- )?),
502
487
  Provider::Pi => Err(ProviderError::Command(
503
488
  "Pi commands require the shared lifecycle materializer".to_string(),
504
489
  )),
@@ -630,20 +615,6 @@ impl ProviderAdapter for BasicProviderAdapter {
630
615
  managed_mcp_config: false,
631
616
  })
632
617
  }
633
- Provider::CursorAgent => {
634
- // U-01 create-chat 无登录超时;禁止发明 --session-id。
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
- })
646
- }
647
618
  Provider::Pi => Err(ProviderError::Command(
648
619
  "Pi commands require the shared lifecycle materializer".to_string(),
649
620
  )),
@@ -823,15 +794,6 @@ impl ProviderAdapter for BasicProviderAdapter {
823
794
  argv.push(session_id.as_str().to_string());
824
795
  Ok(argv)
825
796
  }
826
- // Cursor resume: base + `--resume <chatId>`。
827
- Provider::CursorAgent => {
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)
834
- }
835
797
  Provider::Pi => Err(ProviderError::ResumeUnavailable(
836
798
  "pi resume requires the captured exact session path".to_string(),
837
799
  )),
@@ -927,26 +889,6 @@ impl ProviderAdapter for BasicProviderAdapter {
927
889
  argv.push(session_id.as_str().to_string());
928
890
  Ok(CommandPlan::argv_only(argv))
929
891
  }
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
892
  _ => self
951
893
  .build_resume_command_with_context(
952
894
  session_id,
@@ -1044,7 +986,7 @@ impl ProviderAdapter for BasicProviderAdapter {
1044
986
  argv.push("--fork-session".to_string());
1045
987
  Ok(argv)
1046
988
  }
1047
- Provider::Pi | Provider::CursorAgent | Provider::GeminiCli | Provider::Fake => {
989
+ Provider::Pi | Provider::GeminiCli | Provider::Fake => {
1048
990
  Err(ProviderError::CapabilityUnsupported(format!(
1049
991
  "{} does not support native session fork",
1050
992
  provider_wire(self.provider)
@@ -1252,13 +1194,6 @@ impl ProviderAdapter for BasicProviderAdapter {
1252
1194
  Provider::Grok | Provider::GeminiCli | Provider::Fake => {
1253
1195
  patterns(r">", r"working|processing", r"Error|Traceback")
1254
1196
  }
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
1197
  }
1263
1198
  }
1264
1199
 
@@ -1362,7 +1297,6 @@ pub(crate) fn json_inline(value: &serde_json::Value) -> String {
1362
1297
  use super::adapters::claude::{claude_base_command, claude_launch_command};
1363
1298
  use super::adapters::codex::codex_base_command;
1364
1299
  use super::adapters::copilot::copilot_base_command;
1365
- use super::adapters::cursor_agent::cursor_agent_base_command;
1366
1300
  use super::adapters::fake::fake_worker_command;
1367
1301
  use super::adapters::grok::{grok_base_command, grok_launch_command};
1368
1302
 
@@ -27,5 +27,4 @@ pub(crate) mod copilot;
27
27
  pub(crate) mod copilot_fork;
28
28
  pub(crate) mod fake;
29
29
  pub(crate) mod grok;
30
- pub(crate) mod cursor_agent;
31
30
  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 = if raw == "cursor" {
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`),与 cursor worker
38
- /// 的 `--force` 撞名。本函数看不到「当前在看哪个 provider 的 argv」,
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 grok_and_cursor_bypass_flags() {
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::CursorAgent | Provider::Pi | Provider::GeminiCli
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::CursorAgent | Provider::Pi | Provider::GeminiCli
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 == "assistant_in_flight" {
487
+ if matches!(fact.reason.as_str(), "assistant_in_flight" | "background_task") {
423
488
  &fact.reason
424
489
  } else {
425
490
  "open_turn"
@@ -46,7 +46,7 @@ fn fault_fact(provider: Provider, record: &serde_json::Value) -> Option<FaultFac
46
46
  match provider {
47
47
  Provider::Claude | Provider::ClaudeCode => claude_fault_fact(record),
48
48
  Provider::Codex => codex_fault_fact(record),
49
- Provider::Copilot | Provider::Grok | Provider::CursorAgent | Provider::Pi | Provider::GeminiCli
49
+ Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
50
50
  | Provider::Fake => None,
51
51
  }
52
52
  }