@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
@@ -78,14 +78,13 @@ impl CatalogError {
78
78
  pub fn action(&self, provider: &str) -> String {
79
79
  let executable = match provider {
80
80
  "pi" => "pi",
81
- "cursor_agent" => "agent",
82
81
  "codex" => "codex",
83
82
  "claude" | "claude_code" => "claude",
84
83
  "grok" => "grok",
85
84
  _ => "provider CLI",
86
85
  };
87
86
  match self {
88
- Self::UnsupportedProvider => "choose a supported provider: pi, cursor_agent, codex, claude, claude_code, or grok".into(),
87
+ Self::UnsupportedProvider => "choose a supported provider: pi, codex, claude, claude_code, or grok".into(),
89
88
  Self::ExecutableUnavailable => format!("install or repair the PATH-first `{executable}` executable, then retry `team-agent models --provider {provider}`"),
90
89
  Self::UnsupportedSchema => format!("upgrade `{executable}` to a version that supports its model catalog protocol, then retry `team-agent models --provider {provider}`"),
91
90
  Self::CommandFailed => format!("run `{executable}` directly to check catalog/account access, then retry `team-agent models --provider {provider}`"),
@@ -117,7 +116,6 @@ impl CatalogError {
117
116
  fn display_provider(provider: &str) -> &str {
118
117
  match provider {
119
118
  "pi" => "Pi",
120
- "cursor_agent" => "Cursor",
121
119
  "codex" => "Codex",
122
120
  "claude" | "claude_code" => "Claude",
123
121
  "grok" => "Grok",
@@ -133,7 +131,6 @@ pub fn parse_catalog_provider(name: &str) -> Option<Provider> {
133
131
  #[derive(Clone, Copy)]
134
132
  enum CatalogSource {
135
133
  Pi,
136
- CursorAgent,
137
134
  Codex,
138
135
  Grok,
139
136
  Claude,
@@ -143,7 +140,6 @@ enum CatalogSource {
143
140
  fn catalog_source(provider: Provider) -> Option<CatalogSource> {
144
141
  match provider {
145
142
  Provider::Pi => Some(CatalogSource::Pi),
146
- Provider::CursorAgent => Some(CatalogSource::CursorAgent),
147
143
  Provider::Codex => Some(CatalogSource::Codex),
148
144
  Provider::Claude | Provider::ClaudeCode => Some(CatalogSource::Claude),
149
145
  Provider::Grok => Some(CatalogSource::Grok),
@@ -160,10 +156,6 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
160
156
  let bytes = run_native("pi", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
161
157
  parse_pi_catalog(&bytes)?
162
158
  }
163
- CatalogSource::CursorAgent => {
164
- let bytes = run_native("agent", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
165
- parse_cursor_catalog(&bytes)?
166
- }
167
159
  CatalogSource::Codex => {
168
160
  let bytes = run_native("codex", &["debug", "models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
169
161
  parse_codex_catalog(&bytes, requested_provider)?
@@ -228,38 +220,6 @@ pub(crate) fn parse_pi_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, Catalog
228
220
  Ok(records)
229
221
  }
230
222
 
231
- pub(crate) fn parse_cursor_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, CatalogError> {
232
- let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
233
- let lines = text.lines().collect::<Vec<_>>();
234
- let tip_line = lines
235
- .iter()
236
- .rposition(|line| !line.trim().is_empty())
237
- .filter(|index| {
238
- lines[*index]
239
- .strip_prefix("Tip: use --model ")
240
- .is_some_and(|tip| !tip.is_empty())
241
- });
242
- let mut records: Vec<ModelRecord> = Vec::new();
243
- for (index, line) in lines.into_iter().enumerate() {
244
- if Some(index) == tip_line {
245
- continue;
246
- }
247
- let line = line.trim();
248
- if line.is_empty() || line.trim_end_matches(':').eq_ignore_ascii_case("available models") { continue; }
249
- let Some((id, display)) = line.split_once(" - ") else { return Err(CatalogError::Malformed); };
250
- let id = id.trim();
251
- if id.is_empty() || id.chars().any(char::is_whitespace) || display.trim().is_empty() { return Err(CatalogError::Malformed); }
252
- if records.iter().any(|record| record.id == id) { return Err(CatalogError::DuplicateIdentity(id.into())); }
253
- let display = display.trim();
254
- let default = display.ends_with("(default)");
255
- let display_name = display.strip_suffix("(default)").map_or(display, str::trim).to_string();
256
- let vendor = id.split_once('-').map_or("cursor", |(vendor, _)| vendor).to_string();
257
- records.push(ModelRecord { provider: "cursor_agent".into(), vendor, id: id.into(), display_name, default: Some(default), aliases: Vec::new() });
258
- }
259
- if records.is_empty() { return Err(CatalogError::Empty); }
260
- Ok(records)
261
- }
262
-
263
223
  fn parse_grok_catalog(bytes: &[u8]) -> Result<Vec<ModelRecord>, CatalogError> {
264
224
  let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
265
225
  let mut has_auth_notice = false;
@@ -862,7 +822,6 @@ mod tests {
862
822
  fn provider_capability_is_explicit_and_exact() {
863
823
  for (name, provider) in [
864
824
  ("pi", Provider::Pi),
865
- ("cursor_agent", Provider::CursorAgent),
866
825
  ("codex", Provider::Codex),
867
826
  ("claude", Provider::Claude),
868
827
  ("claude_code", Provider::ClaudeCode),
@@ -872,7 +831,7 @@ mod tests {
872
831
  assert_eq!(provider_wire(provider), name);
873
832
  assert!(catalog_source(provider).is_some());
874
833
  }
875
- for name in ["", "cloud", "cursor", "agent", "claude-code", "copilot", "gemini_cli", "fake", "Pi", "CODEX", " pi", "pi ", "pi/model", "codex:model", "claude_code_extra"] {
834
+ for name in ["", "cloud", "cursor", "cursor_agent", "agent", "claude-code", "copilot", "gemini_cli", "fake", "Pi", "CODEX", " pi", "pi ", "pi/model", "codex:model", "claude_code_extra"] {
876
835
  assert_eq!(parse_catalog_provider(name), None);
877
836
  }
878
837
  for provider in [Provider::Copilot, Provider::GeminiCli, Provider::Fake] {
@@ -948,34 +907,4 @@ mod tests {
948
907
  assert!(model_matches(&row, " "));
949
908
  }
950
909
 
951
- #[test]
952
- fn frozen_cursor_catalog_skips_only_its_native_trailing_tip() {
953
- let frozen = include_bytes!("testdata/cursor-list-models-native.stdout");
954
- let records = parse_cursor_catalog(frozen).unwrap();
955
- let low = records.iter().find(|row| row.id == "gpt-5.6-luna-low").unwrap();
956
- assert_eq!(low.provider.as_str(), "cursor_agent");
957
- assert_eq!(low.vendor.as_str(), "gpt");
958
- assert_eq!(low.display_name, "GPT-5.6 Luna 1M Low (current)");
959
- assert_eq!(low.default, Some(false));
960
- assert!(low.aliases.is_empty());
961
- let xhigh = records.iter().find(|row| row.id == "gpt-5.6-luna-xhigh").unwrap();
962
- assert_eq!(xhigh.id.as_str(), "gpt-5.6-luna-xhigh");
963
- assert_eq!(xhigh.display_name, "GPT-5.6 Luna 1M Extra High");
964
- let auto = records.iter().find(|row| row.id == "auto").unwrap();
965
- assert_eq!(auto.default, Some(true));
966
-
967
- let text = std::str::from_utf8(frozen).unwrap();
968
- let without_tip = text.split_once("\nTip: use --model ").unwrap().0;
969
- assert_eq!(parse_cursor_catalog(without_tip.as_bytes()).unwrap(), parse_cursor_catalog(frozen).unwrap());
970
- }
971
-
972
- #[test]
973
- fn cursor_tip_compatibility_keeps_fail_closed_row_validation() {
974
- let duplicate = b"Available models\na - A\na - A\n";
975
- assert!(matches!(parse_cursor_catalog(duplicate), Err(CatalogError::DuplicateIdentity(_))));
976
- assert!(matches!(parse_cursor_catalog(b"Available models\n"), Err(CatalogError::Empty)));
977
- assert!(matches!(parse_cursor_catalog(&[b'A', 0xff]), Err(CatalogError::InvalidUtf8)));
978
- assert!(matches!(parse_cursor_catalog(b"Available models\na - A\nnot a model row\n"), Err(CatalogError::Malformed)));
979
- assert!(matches!(parse_cursor_catalog(b"Available models\na - A\nTip: use --model a to switch.\nunexpected tail\n"), Err(CatalogError::Malformed)));
980
- }
981
910
  }
@@ -639,7 +639,7 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
639
639
  /// boundary:
640
640
  /// - 只读 event log 与 rollout 路径存在性,不扫 provider 存档、不调分配器
641
641
  /// - 不走分配器的 claimed-key 冲突检查,只看 exclude_session_ids 与 tombstone
642
- /// - rollout_path 存在性用 exists()——对目录型 backing(grok/cursor)只要目录在就为真
642
+ /// - rollout_path 存在性用 exists()——对目录型 backing(grok)只要目录在就为真
643
643
  /// - claude 家族额外过滤 leader-marker transcript;其它 provider 无等价归属过滤
644
644
  /// - 修复成功会清掉 attribution_ambiguous 标记
645
645
  /// ---
@@ -21,7 +21,7 @@
21
21
  //! - 只回答「fork 有没有产生一个可读的、不等于源会话的新 backing」,不回答会话内容对不对
22
22
  //! - 不创建/改写 backing(codex 的物化改写在 context_fork/codex.rs,不在本文件)
23
23
  //! - 未证明即 Timeout/Rejected,绝不退化成「假定成功」
24
- //! - grok / cursor / gemini / fake 没有可验证 backing,一律直接 Rejected
24
+ //! - grok / gemini / fake 没有可验证 backing,一律直接 Rejected
25
25
  //! maturity: wired
26
26
  //! ---
27
27
  use std::collections::BTreeMap;
@@ -56,7 +56,7 @@ pub(crate) use outcome::{
56
56
  /// purpose: 给出该 provider 等待 fork backing 落盘的收敛预算
57
57
  /// params:
58
58
  /// provider: 目标 provider;全枚举穷举,无兜底臂
59
- /// returns: Claude/ClaudeCode 45s、Codex 10s、其余(Copilot/Grok/CursorAgent/GeminiCli/Fake) 5s
59
+ /// returns: Claude/ClaudeCode 45s、Codex 10s、其余(Copilot/Grok/GeminiCli/Fake) 5s
60
60
  /// contract:
61
61
  /// provides:
62
62
  /// - name: context_fork_convergence_deadline
@@ -69,7 +69,7 @@ pub(crate) fn context_fork_convergence_deadline(provider: Provider) -> Duration
69
69
  match provider {
70
70
  Provider::Claude | Provider::ClaudeCode => Duration::from_secs(45),
71
71
  Provider::Codex => Duration::from_secs(10),
72
- Provider::Copilot | Provider::Grok | Provider::CursorAgent | Provider::Pi | Provider::GeminiCli
72
+ Provider::Copilot | Provider::Grok | Provider::Pi | Provider::GeminiCli
73
73
  | Provider::Fake => Duration::from_secs(5),
74
74
  }
75
75
  }
@@ -253,7 +253,7 @@ fn provider_backing_root(provider: Provider, plan: &CommandPlan) -> PathBuf {
253
253
  Provider::Codex => home.join(".codex").join("sessions"),
254
254
  Provider::Copilot => home.join(".copilot").join("session-state"),
255
255
  Provider::Pi => PathBuf::new(),
256
- Provider::Grok | Provider::CursorAgent | Provider::GeminiCli | Provider::Fake => home,
256
+ Provider::Grok | Provider::GeminiCli | Provider::Fake => home,
257
257
  }
258
258
  }
259
259
 
@@ -78,7 +78,7 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
78
78
  /// - spawn_cwd 递归最深 4 层;工作区是用户代码仓,任何名含 session 的 json 都会被列进来
79
79
  /// - .team 运行时目录一律排除,除非它就在 claude 的隔离根之下
80
80
  /// - 超过 300 条按 mtime 由新到旧截断;被截掉的候选不产生任何信号
81
- /// - Copilot / Grok / CursorAgent / GeminiCli / Fake 不走 HOME 分支——它们各有专属扫描
81
+ /// - Copilot / Grok / GeminiCli / Fake 不走 HOME 分支——它们各有专属扫描
82
82
  /// ---
83
83
  pub(super) fn candidate_session_files(
84
84
  provider: Provider,
@@ -121,7 +121,6 @@ pub(super) fn candidate_session_files(
121
121
  }
122
122
  Provider::Copilot
123
123
  | Provider::Grok
124
- | Provider::CursorAgent
125
124
  | Provider::Pi
126
125
  | Provider::GeminiCli
127
126
  | Provider::Fake => {}
@@ -14,7 +14,6 @@ pub(crate) mod claude;
14
14
  pub(crate) mod codex;
15
15
  pub(crate) mod common;
16
16
  pub(crate) mod copilot;
17
- pub(crate) mod cursor;
18
17
  pub(crate) mod grok;
19
18
  pub(crate) mod pi;
20
19
 
@@ -47,9 +46,6 @@ pub(crate) fn scan_session_candidates_once(
47
46
  if matches!(provider, Provider::Grok) {
48
47
  return Ok(grok::scan_session_store(context));
49
48
  }
50
- if matches!(provider, Provider::CursorAgent) {
51
- return Ok(cursor::scan_session_store(context));
52
- }
53
49
  if matches!(provider, Provider::Pi) {
54
50
  return pi::scan_session_store(context);
55
51
  }
@@ -3,14 +3,13 @@
3
3
  //! contract:
4
4
  //! provides:
5
5
  //! - name: flush_explicit_queue
6
- //! what: 屏幕出现 grok `Enter:send now` 时只重按回车直到消失;默认不认 cursor 页脚
6
+ //! what: 屏幕出现 grok `Enter:send now` 时只重按回车直到消失
7
7
  //! depends:
8
8
  //! - crate::transport::Transport
9
9
  //! boundary:
10
10
  //! - 不重粘文本、不用 Escape、不用 Ctrl-C、不加自动重投
11
11
  //! - 不按忙闲决定发不发;只在已经注入之后确认队列态
12
12
  //! - 无标记时不改 claude/codex 提交行为
13
- //! - cursor 第二下 Enter 会打断进行中回合;生产 flush 不带 cursor 标记
14
13
  //! maturity: wired
15
14
  //! ---
16
15
 
@@ -21,15 +20,7 @@ use crate::transport::{CaptureRange, Key, Target, Transport, TransportError};
21
20
  /// grok 1.0.4 实测:页脚出现这串就是显式队列。
22
21
  pub const GROK_SEND_NOW_MARK: &str = "Enter:send now";
23
22
 
24
- /// 2026-08-18 真机,cursor-agent 2026.08.11-e8db854。
25
- /// 忙时 follow-ups 盒页脚原文(大小写按屏上):
26
- /// `enter send now · ↑ select/edit · esc cancel`
27
- /// 出处:`.team/scripts/cursor_send.sh` 的 `QUEUE_MARK='enter send now'`
28
- /// (脚本头 2026-08-18 真机段)。与 grok 的 `Enter:send now`(大写 E、冒号)
29
- /// 不是同一串。
30
- pub const CURSOR_SEND_NOW_MARK: &str = "enter send now";
31
-
32
- /// 与 grok_send.sh / cursor_send.sh 对齐:最多再按 8 次回车。
23
+ /// 最多再按 8 次回车。
33
24
  pub const GROK_SEND_NOW_MAX_ENTERS: u32 = 8;
34
25
 
35
26
  pub struct FlushReport {
@@ -42,21 +33,11 @@ pub struct FlushReport {
42
33
  pub fn flush_explicit_queue(
43
34
  transport: &dyn Transport,
44
35
  target: &Target,
45
- ) -> Result<FlushReport, TransportError> {
46
- flush_explicit_queue_for(transport, target, &[GROK_SEND_NOW_MARK])
47
- }
48
-
49
- /// One detector path at a time. Production flush is grok-only.
50
- /// Tests enable a single mark so a false-positive cannot hide behind the other path.
51
- pub fn flush_explicit_queue_for(
52
- transport: &dyn Transport,
53
- target: &Target,
54
- marks: &[&str],
55
36
  ) -> Result<FlushReport, TransportError> {
56
37
  let mut extra_enters = 0;
57
38
  for _ in 0..GROK_SEND_NOW_MAX_ENTERS {
58
39
  let captured = transport.capture(target, CaptureRange::Tail(40))?;
59
- if !queue_mark_visible_for(&captured.text, marks) {
40
+ if !queue_mark_visible(&captured.text) {
60
41
  return Ok(FlushReport {
61
42
  extra_enters,
62
43
  mark_cleared: true,
@@ -69,7 +50,7 @@ pub fn flush_explicit_queue_for(
69
50
  let captured = transport.capture(target, CaptureRange::Tail(40))?;
70
51
  Ok(FlushReport {
71
52
  extra_enters,
72
- mark_cleared: !queue_mark_visible_for(&captured.text, marks),
53
+ mark_cleared: !queue_mark_visible(&captured.text),
73
54
  })
74
55
  }
75
56
 
@@ -81,11 +62,7 @@ pub fn keep_provider_queue_requested() -> bool {
81
62
  }
82
63
 
83
64
  pub fn queue_mark_visible(text: &str) -> bool {
84
- queue_mark_visible_for(text, &[GROK_SEND_NOW_MARK])
85
- }
86
-
87
- pub fn queue_mark_visible_for(text: &str, marks: &[&str]) -> bool {
88
- marks.iter().any(|mark| text.contains(mark))
65
+ text.contains(GROK_SEND_NOW_MARK)
89
66
  }
90
67
 
91
68
  #[allow(dead_code)]
@@ -5,10 +5,6 @@ fn trimmed_provider_builders_preserve_fresh_and_resume_argv() {
5
5
  Provider::Grok,
6
6
  vec!["grok", "--model", "test-model", "--rules", "role"],
7
7
  ),
8
- (
9
- Provider::CursorAgent,
10
- vec!["agent", "--model", "test-model", "--workspace", "{workspace}"],
11
- ),
12
8
  (
13
9
  Provider::Copilot,
14
10
  vec![
@@ -31,14 +27,10 @@ fn trimmed_provider_builders_preserve_fresh_and_resume_argv() {
31
27
  };
32
28
  let mut expected = base.iter().map(|s| s.to_string()).collect::<Vec<_>>();
33
29
  let fresh = adapter.build_command_plan(ctx).expect("fresh plan");
34
- if provider != Provider::CursorAgent {
35
- expected.push("--session-id".to_string());
36
- expected.push(
37
- fresh.expected_session_id.as_ref().expect("session hint").as_str().to_string(),
38
- );
39
- } else {
40
- assert!(fresh.expected_session_id.is_none());
41
- }
30
+ expected.push("--session-id".to_string());
31
+ expected.push(
32
+ fresh.expected_session_id.as_ref().expect("session hint").as_str().to_string(),
33
+ );
42
34
  assert_eq!(fresh.argv, expected, "{provider:?} fresh argv");
43
35
  let session = SessionId::new("existing-session");
44
36
  let mut expected = base.iter().map(|s| s.to_string()).collect::<Vec<_>>();
@@ -51,20 +43,6 @@ fn trimmed_provider_builders_preserve_fresh_and_resume_argv() {
51
43
  expected,
52
44
  "{provider:?} resume argv"
53
45
  );
54
- if provider == Provider::CursorAgent {
55
- let mut expected = base.iter().map(|s| s.to_string()).collect::<Vec<_>>();
56
- expected.insert(1, "--resume".to_string());
57
- expected.insert(2, session.as_str().to_string());
58
- assert_eq!(
59
- adapter
60
- .build_resume_command_with_context(
61
- Some(&session), ctx.auth_mode, None, ctx.system_prompt, ctx.model, false,
62
- )
63
- .expect("legacy resume"),
64
- expected,
65
- "legacy Cursor resume must retain its distinct flag order"
66
- );
67
- }
68
46
  }
69
47
  }
70
48
 
@@ -332,7 +310,7 @@ fn unsupported_provider_capability_error_message_shape() {
332
310
  // Lock the CORRECT Python v0.2.11 behavior the strengthened contracts missed.
333
311
  // Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
334
312
 
335
- // ═══════════════ 0.5.67 provider-adapter (Grok + CursorAgent) ═══════════════
313
+ // ═══════════════ 0.5.67 provider-adapter (Grok) ═══════════════
336
314
  // 仿 claude build_command tests 结构 (见 build_command_includes_model_and_system_prompt)。
337
315
  // 不跑 cargo (禁 cargo 红线), 静态编码 + leader verify 时执行。
338
316
 
@@ -398,81 +376,6 @@ fn test_grok_build_command_omits_missing_model() {
398
376
  );
399
377
  }
400
378
 
401
- #[test]
402
- fn test_cursor_agent_build_command_includes_workspace_flag() {
403
- let adapter = get_adapter(Provider::CursorAgent);
404
- let argv = adapter
405
- .build_command(AuthMode::Subscription, None, Some("be helpful"), Some("sonnet-4-thinking"))
406
- .expect("build_command ok");
407
- // system_prompt 不入 argv (方案 1 变体走 workspace rules 文件), argv 只带
408
- // --workspace {workspace} placeholder (spawn 时 fill_spawn_placeholders 替换)。
409
- assert!(
410
- argv_contains_adjacent(&argv, &["--workspace", "{workspace}"]),
411
- "cursor argv must carry `--workspace {{workspace}}`: {argv:?}"
412
- );
413
- assert!(
414
- !argv.iter().any(|arg| arg == "--trust" || arg == "--sandbox"),
415
- "safe Cursor command must not opt into trust or disabled sandbox: {argv:?}"
416
- );
417
- assert!(
418
- !argv.iter().any(|a| a == "--rules" || a == "--append-system-prompt"),
419
- "cursor append-system-prompt must NOT go on argv (workspace rules file): {argv:?}"
420
- );
421
- assert!(
422
- !argv.iter().any(|a| a == "--system-prompt" || a == "--allowed-tools"),
423
- "undocumented flags must stay off the main path: {argv:?}"
424
- );
425
- }
426
-
427
- #[test]
428
- fn test_cursor_agent_build_command_bypass_flag_when_dangerous() {
429
- let adapter = get_adapter(Provider::CursorAgent);
430
- let dangerous = adapter
431
- .build_command_with_permissions(
432
- AuthMode::Subscription,
433
- None,
434
- None,
435
- None,
436
- true,
437
- )
438
- .expect("dangerous build_command ok");
439
- assert!(
440
- argv_contains_adjacent(&dangerous, &["--force"]),
441
- "dangerous cursor must include `--force`: {dangerous:?}"
442
- );
443
- let safe = adapter
444
- .build_command(AuthMode::Subscription, None, None, None)
445
- .expect("safe build_command ok");
446
- assert!(
447
- !safe.iter().any(|a| a == "--force"),
448
- "non-dangerous cursor must not include --force: {safe:?}"
449
- );
450
- }
451
-
452
- #[test]
453
- fn test_cursor_agent_accepts_mcp_config_without_putting_it_on_argv() {
454
- let adapter = get_adapter(Provider::CursorAgent);
455
- let cfg = McpConfig {
456
- raw: serde_json::json!({
457
- "team_orchestrator": {
458
- "command": "/bin/team-agent",
459
- "args": ["mcp-server"]
460
- }
461
- }),
462
- };
463
- let argv = adapter
464
- .build_command(AuthMode::Subscription, Some(&cfg), None, None)
465
- .expect("cursor MCP is launch overlay, not an argv capability hole");
466
- assert!(
467
- !argv.iter().any(|a| a == "--mcp-config" || a.contains("mcp")),
468
- "cursor has no --mcp-config flag; overlay writes .cursor/mcp.json: {argv:?}"
469
- );
470
- assert!(
471
- argv_contains_adjacent(&argv, &["--workspace", "{workspace}"]),
472
- "workspace flag must survive an mcp_config argument: {argv:?}"
473
- );
474
- }
475
-
476
379
  #[test]
477
380
  fn test_grok_build_command_plan_binds_expected_session_id_to_argv() {
478
381
  let adapter = get_adapter(Provider::Grok);
@@ -509,88 +412,6 @@ fn test_grok_build_command_plan_binds_expected_session_id_to_argv() {
509
412
  );
510
413
  }
511
414
 
512
- #[test]
513
- fn test_cursor_auth_hint_subscription_is_unknown_not_present() {
514
- let adapter = get_adapter(Provider::CursorAgent);
515
- let hint = adapter.auth_hint(AuthMode::Subscription);
516
- assert_ne!(
517
- hint,
518
- crate::provider::types::AuthHintStatus::Present,
519
- "U-17 前不得把未观测写成 Present"
520
- );
521
- assert_ne!(hint, crate::provider::types::AuthHintStatus::PresentWeak);
522
- assert_eq!(hint, crate::provider::types::AuthHintStatus::Unknown);
523
- }
524
-
525
- #[test]
526
- fn test_cursor_fresh_plan_has_no_session_id_and_no_resume() {
527
- let adapter = get_adapter(Provider::CursorAgent);
528
- let plan = adapter
529
- .build_command_plan(ProviderCommandContext {
530
- auth_mode: AuthMode::Subscription,
531
- mcp_config: None,
532
- system_prompt: None,
533
- model: Some("sonnet-4-thinking"),
534
- dangerously_skip_permissions: false,
535
- profile_launch: None,
536
- agent_id_hint: Some("w1"),
537
- effort: None,
538
- })
539
- .expect("cursor plan");
540
- assert!(
541
- plan.expected_session_id.is_none(),
542
- "U-01 未过不得造假 pending; got {:?}",
543
- plan.expected_session_id
544
- );
545
- assert!(
546
- !plan.argv.iter().any(|a| a == "--session-id" || a == "--resume" || a == "--continue"),
547
- "fresh cursor argv must not invent session flags; argv={:?}",
548
- plan.argv
549
- );
550
- assert!(
551
- !plan
552
- .argv
553
- .iter()
554
- .any(|arg| arg == "--trust" || arg == "--sandbox"),
555
- "default Cursor plan must not opt into trust or disabled sandbox; argv={:?}",
556
- plan.argv
557
- );
558
- }
559
-
560
- #[test]
561
- fn test_cursor_resume_plan_requires_chat_id_and_never_emits_empty_resume() {
562
- let adapter = get_adapter(Provider::CursorAgent);
563
- let ctx = ProviderCommandContext {
564
- auth_mode: AuthMode::Subscription,
565
- mcp_config: None,
566
- system_prompt: None,
567
- model: Some("sonnet-4-thinking"),
568
- dangerously_skip_permissions: false,
569
- profile_launch: None,
570
- agent_id_hint: Some("w1"),
571
- effort: None,
572
- };
573
- let missing = adapter.build_resume_command_plan(None, ctx);
574
- assert!(
575
- matches!(missing, Err(ProviderError::ResumeUnavailable(_))),
576
- "no chatId must not emit empty --resume; got {missing:?}"
577
- );
578
- let sid = SessionId::new("502896a1-72ba-4c53-9a86-b2da28780806");
579
- let plan = adapter
580
- .build_resume_command_plan(Some(&sid), ctx)
581
- .expect("resume plan");
582
- assert!(
583
- argv_contains_adjacent(&plan.argv, &["--resume", sid.as_str()]),
584
- "resume plan must hit CursorAgent --resume arm; argv={:?}",
585
- plan.argv
586
- );
587
- assert!(
588
- !plan.argv.iter().any(|a| a == "--session-id" || a == "--continue"),
589
- "resume must not mint --session-id/--continue; argv={:?}",
590
- plan.argv
591
- );
592
- }
593
-
594
415
  #[test]
595
416
  fn pi_wire_roundtrip_requires_backing() {
596
417
  use crate::provider::wire::{
@@ -146,3 +146,56 @@ fn classify_open_turn_dead_is_abnormal_crashed_mid_turn() {
146
146
  // Golden via /tmp/probe_idle.py (idle_predicate.evaluate_takeover_reminder).
147
147
  // Nodes / monitor_state passed as serde_json::Value dicts (Python dict shape).
148
148
 
149
+
150
+ // #379: Claude Code's live session registry, located before and after capture.
151
+ #[cfg(unix)]
152
+ #[test]
153
+ fn claude_registry_turn_state_reads_the_live_record_for_this_transcript() {
154
+ let config = std::env::temp_dir().join(format!("ta-claude-registry-{}", std::process::id()));
155
+ let _ = std::fs::remove_dir_all(&config);
156
+ let sid = "11111111-2222-4333-8444-555555555555";
157
+ let projects = config.join("projects").join("-owned-cwd");
158
+ std::fs::create_dir_all(&projects).unwrap();
159
+ std::fs::create_dir_all(config.join("sessions")).unwrap();
160
+ let rollout = projects.join(format!("{sid}.jsonl"));
161
+ std::fs::write(&rollout, "").unwrap();
162
+ let sessions = config.join("sessions");
163
+ let expected_key = Some((sessions.clone(), sid.to_string()));
164
+ assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": rollout})), expected_key);
165
+ // Cold start: the launch's `--session-id` and projects root, before any capture.
166
+ assert_eq!(
167
+ claude_registry_key(&serde_json::json!({
168
+ "_pending_session_id": sid, "session_id": "stale", "claude_projects_root": config.join("projects"),
169
+ })),
170
+ expected_key
171
+ );
172
+ // Only `<config>/projects/<slug>/<id>.jsonl` names a registry.
173
+ assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": config.join(format!("{sid}.jsonl"))})), None);
174
+ let live = std::process::id();
175
+ let write = |pid: u32, session: &str, tmux: &str, status: &str| {
176
+ let record = serde_json::json!({"pid": pid, "sessionId": session, "tmux": tmux, "status": status});
177
+ std::fs::write(sessions.join(format!("{pid}.json")), record.to_string()).unwrap();
178
+ };
179
+ let read = |pane: Option<&str>| claude_registry_turn_state(&sessions, sid, pane);
180
+ for (status, expected) in [
181
+ ("busy", Some(TurnState::Working)),
182
+ ("waiting", Some(TurnState::BlockedOnHuman)),
183
+ ("idle", Some(TurnState::Idle)),
184
+ ("starting", None),
185
+ ] {
186
+ write(live, sid, "team-x:@3.%7", status);
187
+ assert_eq!(read(Some("%7")), expected, "{status}");
188
+ }
189
+ write(live, sid, "team-x:@3.%7", "busy");
190
+ assert_eq!(read(None), Some(TurnState::Working));
191
+ assert_eq!(read(Some("%8")), None, "another pane's record");
192
+ write(live, "99999999-2222-4333-8444-555555555555", "team-x:@3.%7", "busy");
193
+ assert_eq!(read(Some("%7")), None, "another session's record");
194
+ std::fs::remove_file(sessions.join(format!("{live}.json"))).unwrap();
195
+ let mut child = std::process::Command::new("true").spawn().unwrap();
196
+ let dead = child.id();
197
+ child.wait().unwrap();
198
+ write(dead, sid, "team-x:@3.%7", "busy");
199
+ assert_eq!(read(Some("%7")), None, "a dead process is no evidence");
200
+ let _ = std::fs::remove_dir_all(&config);
201
+ }
@@ -2,7 +2,7 @@
2
2
  #![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
3
3
  use super::*;
4
4
  use crate::model::enums::ProviderEffort;
5
- use crate::provider::adapters::{claude, codex, copilot, cursor_agent, grok, pi};
5
+ use crate::provider::adapters::{claude, codex, copilot, grok, pi};
6
6
  use crate::provider::ProviderCommandOverrides;
7
7
 
8
8
  #[test]
@@ -27,8 +27,6 @@ fn command_helpers_keep_provider_argv_bytes_and_order() {
27
27
  assert_eq!(copilot::copilot_base_command(
28
28
  AuthMode::Subscription, Some(&mcp), Some(raw), Some(""), true,
29
29
  ), ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-all", "--allow-tool", "team_orchestrator", "--model", "", "--additional-mcp-config", "{}"]);
30
- assert_eq!(cursor_agent::cursor_agent_base_command(Some(raw), true).expect("cursor"),
31
- ["agent", "--trust", "--sandbox", "disabled", "--force", "--model", raw, "--workspace", "{workspace}"]);
32
30
  assert_eq!(grok::grok_base_command(Some(raw), Some(" model-id "), true, Some(ProviderEffort::Medium)).expect("grok"),
33
31
  ["grok", "--always-approve", "--model", "model-id", "--effort", "medium", "--rules", raw]);
34
32
  assert_eq!(grok::grok_base_command(Some(""), Some(" "), false, None).expect("grok empty"), ["grok", "--rules", ""]);
@@ -50,6 +48,5 @@ fn command_helpers_keep_absent_options_and_safe_defaults() {
50
48
  ["codex", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps"]);
51
49
  assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
52
50
  ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-tool", "team_orchestrator"]);
53
- assert_eq!(cursor_agent::cursor_agent_base_command(None, false).expect("cursor"), ["agent", "--workspace", "{workspace}"]);
54
51
  assert_eq!(grok::grok_base_command(None, None, false, None).expect("grok"), ["grok"]);
55
52
  }
@@ -359,7 +359,7 @@ pub struct ProviderCommandContext<'a> {
359
359
  /// - Pi: low|medium|high|xhigh|max → `--thinking <level>`; ultra rejected
360
360
  /// - Grok: low|medium|high|xhigh → `--effort <level>`; max/ultra rejected
361
361
  /// - Copilot / Gemini / Fake: low..xhigh ignored with a caller warning;
362
- /// max/ultra rejected. CursorAgent rejects all effort.
362
+ /// max/ultra rejected.
363
363
  pub effort: Option<crate::model::enums::ProviderEffort>,
364
364
  }
365
365