@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.
Files changed (151) 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 -69
  7. package/crates/team-agent/src/cli/emit.rs +45 -15
  8. package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
  9. package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
  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 +28 -33
  13. package/crates/team-agent/src/cli/models.rs +44 -880
  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/mod.rs +1 -1
  22. package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
  23. package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
  24. package/crates/team-agent/src/compiler/tests.rs +39 -8
  25. package/crates/team-agent/src/compiler.rs +28 -204
  26. package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
  27. package/crates/team-agent/src/contract_runtime/config.rs +37 -24
  28. package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
  29. package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
  30. package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
  31. package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
  32. package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
  33. package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
  34. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
  35. package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
  36. package/crates/team-agent/src/coordinator/tick.rs +89 -1
  37. package/crates/team-agent/src/db/message_store.rs +78 -3
  38. package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
  39. package/crates/team-agent/src/leader/prompt.rs +1 -2
  40. package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
  41. package/crates/team-agent/src/leader/start.rs +1 -2
  42. package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
  43. package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
  44. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +15 -195
  45. package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
  46. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
  47. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
  48. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
  49. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
  50. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
  51. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
  52. package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
  53. package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -61
  54. package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
  55. package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
  56. package/crates/team-agent/src/lifecycle/launch.rs +2 -43
  57. package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
  58. package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
  59. package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
  60. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  61. package/crates/team-agent/src/lifecycle/restart.rs +0 -2
  62. package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
  63. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
  64. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
  65. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +60 -145
  66. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -334
  67. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
  68. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  69. package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
  70. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
  71. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
  72. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
  73. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
  74. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
  75. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
  76. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
  77. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
  78. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
  79. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
  80. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
  81. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
  82. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
  83. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
  84. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
  85. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
  86. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
  87. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -153
  88. package/crates/team-agent/src/lifecycle/tests.rs +0 -6
  89. package/crates/team-agent/src/lifecycle/types.rs +2 -18
  90. package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
  91. package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
  92. package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
  93. package/crates/team-agent/src/messaging/delivery.rs +185 -168
  94. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  95. package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
  96. package/crates/team-agent/src/messaging/helpers.rs +19 -0
  97. package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -5
  98. package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
  99. package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
  100. package/crates/team-agent/src/model/enums.rs +1 -8
  101. package/crates/team-agent/src/provider/adapter.rs +33 -302
  102. package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
  103. package/crates/team-agent/src/provider/argv_route.rs +1 -5
  104. package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
  105. package/crates/team-agent/src/provider/classify.rs +68 -3
  106. package/crates/team-agent/src/provider/faults.rs +1 -1
  107. package/crates/team-agent/src/provider/model_catalog.rs +14 -273
  108. package/crates/team-agent/src/provider/session/capture.rs +7 -107
  109. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
  110. package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
  111. package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
  112. package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
  113. package/crates/team-agent/src/provider/session_scan.rs +4 -14
  114. package/crates/team-agent/src/provider/submit_now.rs +5 -28
  115. package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
  116. package/crates/team-agent/src/provider/tests/classify.rs +53 -0
  117. package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
  118. package/crates/team-agent/src/provider/tests/idle.rs +0 -25
  119. package/crates/team-agent/src/provider/types.rs +1 -1
  120. package/crates/team-agent/src/provider/wire.rs +79 -11
  121. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  122. package/crates/team-agent/src/state/persist.rs +6 -6
  123. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  124. package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
  125. package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
  126. package/crates/team-agent/src/tmux_backend.rs +43 -8
  127. package/crates/team-agent/src/transport/native_input.rs +2 -231
  128. package/package.json +4 -4
  129. package/skills/team-agent/SKILL.md +7 -5
  130. package/skills/team-agent/command-coverage.json +15 -1
  131. package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
  132. package/skills/team-agent/references/team-agent-operator.md +5 -3
  133. package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
  134. package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
  135. package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
  136. package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
  137. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
  138. package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
  139. package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
  140. package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
  141. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
  142. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
  143. package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
  144. package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
  145. package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
  146. package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
  147. package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
  148. package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
  149. package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
  150. package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
  151. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
@@ -3,7 +3,7 @@
3
3
  //! contract:
4
4
  //! provides:
5
5
  //! - name: deliver_stored_message
6
- //! what: 单次物理注入;grok 队列默认再按回车顶出;cursor 打开单回车闸且不 flush send-now
6
+ //! what: 单次物理注入;grok 队列默认再按回车顶出
7
7
  //! boundary:
8
8
  //! - 不把物理 success 写成 delivered
9
9
  //! - 不重粘文本
@@ -27,9 +27,7 @@ use crate::event_log::EventLog;
27
27
  use crate::message_store::MessageStore;
28
28
  use crate::model::enums::{PaneLiveness, Provider};
29
29
  use crate::model::ids::TeamKey;
30
- use crate::provider::wire::{
31
- is_claude_family, parse_canonical_provider, parse_provider, provider_wire,
32
- };
30
+ use crate::provider::wire::parse_canonical_provider;
33
31
  use crate::transport::{
34
32
  submit_verification_wire, turn_verification_wire, BusySignalKind, CaptureRange,
35
33
  CaptureSampleOutcome, InjectPayload, InjectReport, InjectVerification, InputSurfaceProbe, Key,
@@ -302,33 +300,92 @@ fn prepare_message_state(
302
300
  Ok(Ok(prepared))
303
301
  }
304
302
 
303
+ /// #372: how long a seat may wait for its MCP handshake, counted from its
304
+ /// spawn or the message's creation (whichever is later), before the message
305
+ /// parks instead of re-polling every tick.
306
+ #[cfg(unix)]
307
+ const MCP_HANDSHAKE_WAIT_LIMIT_SECS: i64 = 300;
308
+
305
309
  #[cfg(unix)]
310
+ #[allow(clippy::too_many_arguments)]
306
311
  fn mcp_handshake_pending_outcome(
312
+ workspace: &Path,
307
313
  store: &MessageStore,
308
314
  event_log: &EventLog,
315
+ state: &serde_json::Value,
316
+ owner: Option<&str>,
309
317
  message_id: &str,
318
+ message: &PendingMessage,
310
319
  attempt: u32,
311
320
  reason: &str,
312
321
  ) -> Result<DeliveryOutcome, MessagingError> {
313
- // No paste/key has occurred. Only this exact claim may be released; a
314
- // concurrent cancellation or newer delivery must never be overwritten.
315
- if !store.release_delivery_before_input(message_id, attempt, reason)? {
322
+ let already_claimed = || DeliveryOutcome {
323
+ ok: false,
324
+ status: DeliveryStatus::Refused,
325
+ message_status: MessageStatusShadow("target_resolved".to_string()),
326
+ message_id: Some(message_id.to_string()),
327
+ verification: None,
328
+ stage: None,
329
+ reason: Some(DeliveryRefusal::MessageAlreadyClaimed),
330
+ channel: None,
331
+ ack_forced_off: false,
332
+ turn_verification: None,
333
+ };
334
+ let spawned_at = state["agents"][message.recipient.as_str()]["spawned_at"].as_str();
335
+ let waited_s = [spawned_at, message.created_at.as_deref()]
336
+ .into_iter()
337
+ .flatten()
338
+ .filter_map(|at| chrono::DateTime::parse_from_rfc3339(at).ok())
339
+ .max()
340
+ .map_or(0, |since| {
341
+ (chrono::Utc::now() - since.with_timezone(&chrono::Utc)).num_seconds()
342
+ });
343
+ if waited_s >= MCP_HANDSHAKE_WAIT_LIMIT_SECS {
344
+ if !store.park_delivery_before_input(message_id, attempt)? {
345
+ return Ok(already_claimed());
346
+ }
347
+ // A receipt published between this preflight and the park found no
348
+ // parked row to resume; one re-check keeps that publication from being lost.
349
+ let published_meanwhile = owner.is_some_and(|owner| {
350
+ crate::mcp_server::readiness::preflight(workspace, Some(owner), &message.recipient, state)
351
+ .is_ok()
352
+ });
353
+ if published_meanwhile {
354
+ store.requeue_parked_deliveries(&message.recipient, owner.unwrap_or_default())?;
355
+ } else {
356
+ event_log.write("delivery.mcp_handshake_parked", serde_json::json!({
357
+ "message_id": message_id,
358
+ "recipient": message.recipient,
359
+ "reason": reason,
360
+ "waited_s": waited_s,
361
+ }))?;
362
+ notify_mcp_handshake_parked(workspace, store, event_log, state, &message.recipient, reason, waited_s)?;
363
+ }
316
364
  return Ok(DeliveryOutcome {
317
365
  ok: false,
318
- status: DeliveryStatus::Refused,
319
- message_status: MessageStatusShadow("target_resolved".to_string()),
366
+ status: DeliveryStatus::Blocked,
367
+ message_status: MessageStatusShadow(
368
+ if published_meanwhile { "accepted" } else { "queued_until_start" }.to_string(),
369
+ ),
320
370
  message_id: Some(message_id.to_string()),
321
- verification: None,
371
+ verification: Some(format!("{}:{reason}", crate::message_store::MCP_HANDSHAKE_TIMEOUT)),
322
372
  stage: None,
323
- reason: Some(DeliveryRefusal::MessageAlreadyClaimed),
373
+ reason: None,
324
374
  channel: None,
325
375
  ack_forced_off: false,
326
376
  turn_verification: None,
327
377
  });
328
378
  }
379
+ // No paste/key has occurred. Only this exact claim may be released; a
380
+ // concurrent cancellation or newer delivery must never be overwritten.
381
+ if !store.release_delivery_before_input(message_id, attempt, reason)? {
382
+ return Ok(already_claimed());
383
+ }
329
384
  event_log.write("delivery.deferred_mcp_handshake", serde_json::json!({
330
385
  "message_id": message_id,
386
+ "recipient": message.recipient,
331
387
  "reason": reason,
388
+ "waited_s": waited_s,
332
389
  "effect": "none",
333
390
  }))?;
334
391
  Ok(DeliveryOutcome {
@@ -345,6 +402,54 @@ fn mcp_handshake_pending_outcome(
345
402
  })
346
403
  }
347
404
 
405
+ /// One leader notice per seat spawn; later parks of the same spawn stay quiet.
406
+ #[cfg(unix)]
407
+ fn notify_mcp_handshake_parked(
408
+ workspace: &Path,
409
+ store: &MessageStore,
410
+ event_log: &EventLog,
411
+ state: &serde_json::Value,
412
+ recipient: &str,
413
+ reason: &str,
414
+ waited_s: i64,
415
+ ) -> Result<(), MessagingError> {
416
+ let agent = &state["agents"][recipient];
417
+ let result_id = format!(
418
+ "mcp_handshake.timeout:{recipient}:{}",
419
+ agent["spawned_at"].as_str().unwrap_or("unknown")
420
+ );
421
+ let notified = crate::db::schema::open_db(store.db_path())?
422
+ .query_row(
423
+ "select 1 from leader_notification_log where result_id = ?1 limit 1",
424
+ params![result_id],
425
+ |_| Ok(()),
426
+ )
427
+ .optional()?
428
+ .is_some();
429
+ if notified {
430
+ return Ok(());
431
+ }
432
+ let live = agent["pane_pid"]
433
+ .as_u64()
434
+ .and_then(|pid| u32::try_from(pid).ok())
435
+ .map(crate::mcp_server::readiness::live_servers_under)
436
+ .unwrap_or_default();
437
+ let live = if live.is_empty() { "none".to_string() } else { format!("{live:?}") };
438
+ let content = format!(
439
+ "mcp_handshake.timeout\nerror: messages to {recipient} are parked after waiting {waited_s}s for its MCP handshake ({reason}); live mcp-server pids under its pane: {live}\naction: run team-agent restart {recipient}; parked messages resume automatically once its MCP server publishes a handshake\nlog: .team/logs/events.jsonl"
440
+ );
441
+ let outcome = crate::messaging::send_to_leader_receiver(
442
+ workspace, state, "leader", &content, None, "coordinator", false, Some(&result_id), event_log,
443
+ );
444
+ event_log.write("delivery.mcp_handshake_parked_notification", serde_json::json!({
445
+ "recipient": recipient,
446
+ "result_id": result_id,
447
+ "live_mcp_servers": live,
448
+ "error": outcome.err().map(|error| error.to_string()),
449
+ }))?;
450
+ Ok(())
451
+ }
452
+
348
453
  fn deliver_prepared_message(
349
454
  workspace: &Path,
350
455
  store: &MessageStore,
@@ -357,6 +462,8 @@ fn deliver_prepared_message(
357
462
  ) -> Result<DeliveryOutcome, MessagingError> {
358
463
  let canonical_owner_team_id = prepared.canonical_owner_team_id;
359
464
  let state = prepared.scoped.as_ref().unwrap_or(fallback);
465
+ crate::provider::wire::require_active_state_providers(state, Some(&message.recipient))
466
+ .map_err(|error| MessagingError::Provider(error.into()))?;
360
467
  if message.recipient == "leader"
361
468
  && matches!(
362
469
  message.status.as_str(),
@@ -701,7 +808,10 @@ fn deliver_prepared_message(
701
808
  Ok(())
702
809
  });
703
810
  if let Err(reason) = admission {
704
- return mcp_handshake_pending_outcome(store, event_log, message_id, attempt, reason);
811
+ return mcp_handshake_pending_outcome(
812
+ workspace, store, event_log, state, canonical_owner_team_id.as_deref(),
813
+ message_id, &message, attempt, reason,
814
+ );
705
815
  }
706
816
  }
707
817
  let rendered = render_message(
@@ -730,17 +840,12 @@ fn deliver_prepared_message(
730
840
  let inject_attempt = crate::tmux_backend::with_paste_to_submit_floor(
731
841
  paste_to_submit_floor_for_recipient(state, &message.recipient),
732
842
  || {
733
- crate::tmux_backend::with_cursor_single_enter(
734
- recipient_requires_single_enter(state, &message.recipient),
735
- || {
736
- transport.inject_with_submit_observer(
737
- &target,
738
- &payload,
739
- Key::Enter,
740
- true,
741
- Some(&submit_observer),
742
- )
743
- },
843
+ transport.inject_with_submit_observer(
844
+ &target,
845
+ &payload,
846
+ Key::Enter,
847
+ true,
848
+ Some(&submit_observer),
744
849
  )
745
850
  },
746
851
  );
@@ -748,10 +853,7 @@ fn deliver_prepared_message(
748
853
  Ok(report) => {
749
854
  // grok 忙时第一次回车只入显式队列。默认 send-now:只重按回车顶出去。
750
855
  // 无 `Enter:send now` 时零次额外按键,claude/codex 行为不变。
751
- // cursor:第二下 Enter 打断进行中回合,不走 flush。
752
- if !crate::provider::submit_now::keep_provider_queue_requested()
753
- && recipient_allows_explicit_queue_flush(state, &message.recipient)
754
- {
856
+ if !crate::provider::submit_now::keep_provider_queue_requested() {
755
857
  match crate::provider::submit_now::flush_explicit_queue(transport, &target) {
756
858
  Ok(flush) if flush.extra_enters > 0 => {
757
859
  let _ = event_log.write(
@@ -891,7 +993,31 @@ fn deliver_prepared_message(
891
993
  // worker delivery both require post-submit evidence; leader additionally
892
994
  // waits for its authoritative provider transcript below.
893
995
  let native_consumed = observed_token_consumed(transport, state, &message.recipient, &target, message_id);
894
- let verified = submit_verified && native_consumed != Some(false);
996
+ let mut verified = submit_verified && native_consumed != Some(false);
997
+ // #379: a pane the verifier could not read is not a failed send. The
998
+ // recipient's own transcript row (user turn or queued enqueue) is the
999
+ // provider's receipt; native observers keep their veto.
1000
+ if !verified
1001
+ && native_consumed.is_none()
1002
+ && recipient_transcript_contains_within(
1003
+ state,
1004
+ &message.recipient,
1005
+ &message_token_marker(message_id),
1006
+ TRANSCRIPT_RECEIPT_TAIL_BYTES,
1007
+ )
1008
+ {
1009
+ verified = true;
1010
+ event_log.write(
1011
+ "send.unverified_reconciled",
1012
+ serde_json::json!({
1013
+ "message_id": message_id,
1014
+ "recipient": message.recipient,
1015
+ "source": "recipient_transcript",
1016
+ "submit_verification": submit_verification_wire(inject_report.submit_verification),
1017
+ "attempts": inject_report.attempts,
1018
+ }),
1019
+ )?;
1020
+ }
895
1021
  if !verified {
896
1022
  let reason = if native_consumed == Some(false) {
897
1023
  "submit_unverified:current_composer_or_consumption_unknown".to_string()
@@ -914,6 +1040,7 @@ fn deliver_prepared_message(
914
1040
  "recipient": message.recipient,
915
1041
  "reason": reason,
916
1042
  "attempts": inject_report.attempts,
1043
+ "delivery_attempt": attempt,
917
1044
  "submit_attempts_detail": submit_attempts_detail,
918
1045
  });
919
1046
  merge_inject_readback_fields(
@@ -923,7 +1050,8 @@ fn deliver_prepared_message(
923
1050
  resolved.metadata.as_ref(),
924
1051
  );
925
1052
  event_log.write("send.unverified", unverified)?;
926
- if inject_report.attempts >= u32::from(SEND_RETRY_MAX_ATTEMPTS) {
1053
+ // #379: the budget is delivery attempts, not Enter presses inside one.
1054
+ if attempt >= u32::from(SEND_RETRY_MAX_ATTEMPTS) {
927
1055
  store.mark(message_id, "failed", Some("send_unverified_exhausted"))?;
928
1056
  emit_send_failed_exhausted(
929
1057
  workspace,
@@ -931,7 +1059,7 @@ fn deliver_prepared_message(
931
1059
  event_log,
932
1060
  message_id,
933
1061
  &message.recipient,
934
- inject_report.attempts,
1062
+ attempt,
935
1063
  "send_unverified_exhausted",
936
1064
  &reason,
937
1065
  Some(&inject_report),
@@ -965,75 +1093,6 @@ fn deliver_prepared_message(
965
1093
  turn_verification: Some(turn_verification),
966
1094
  });
967
1095
  }
968
- // S1-CAPTURE-001 (0.4.8, CR M4 Claude phase-1): for Claude/ClaudeCode
969
- // recipients with a known authoritative rollout_path, verify the message
970
- // token actually reached the worker's transcript before marking
971
- // delivered. This catches the gate's mis-attribution: pane inject
972
- // succeeded but the token landed in the leader/unassigned transcript,
973
- // not the worker's. Budget per architect plan: 64KB tail / single
974
- // per-delivery check / short grace window. Phase-1 Claude only —
975
- // codex/copilot keep the pre-fix behaviour (will be addressed in
976
- // phase-2 once Claude phase-1 is field-validated).
977
- if let Some((rollout_path, provider_wire_str)) =
978
- claude_recipient_rollout(state, &message.recipient)
979
- {
980
- let token_marker = format!("[team-agent-token:{message_id}]");
981
- let grace = std::time::Duration::from_millis(200);
982
- let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
983
- let transcript_has_token = loop {
984
- let found = rollout_tail_contains(&rollout_path, &token_marker, 64 * 1024);
985
- if found || std::time::Instant::now() >= deadline {
986
- break found;
987
- }
988
- std::thread::sleep(grace);
989
- };
990
- if !transcript_has_token {
991
- // Loud but non-fatal: emit a mismatch event for diagnose/status
992
- // observability. Do NOT mark delivered — degrade to
993
- // submitted_unverified so capture is forced to re-attribute.
994
- let reason = format!(
995
- "transcript_missing:provider={provider_wire_str},rollout={}",
996
- rollout_path.display()
997
- );
998
- event_log.write(
999
- "provider.session.transcript_mismatch",
1000
- serde_json::json!({
1001
- "message_id": message_id,
1002
- "recipient": message.recipient,
1003
- "provider": provider_wire_str,
1004
- "rollout_path": rollout_path.to_string_lossy(),
1005
- "pane_id": state
1006
- .get("agents")
1007
- .and_then(|a| a.get(&message.recipient))
1008
- .and_then(|a| a.get("pane_id"))
1009
- .and_then(serde_json::Value::as_str)
1010
- .unwrap_or(""),
1011
- "spawn_epoch": state
1012
- .get("agents")
1013
- .and_then(|a| a.get(&message.recipient))
1014
- .and_then(|a| a.get("spawn_epoch"))
1015
- .and_then(serde_json::Value::as_u64)
1016
- .unwrap_or(0),
1017
- "reason": "transcript_missing",
1018
- }),
1019
- )?;
1020
- store.mark(message_id, "submitted_unverified", Some(&reason))?;
1021
- bind_enter_watchdog(store, transport, state, &target, message_id, &message,
1022
- canonical_owner_team_id.as_deref(), event_log)?;
1023
- return Ok(DeliveryOutcome {
1024
- ok: false,
1025
- status: DeliveryStatus::Failed,
1026
- message_status: MessageStatusShadow("submitted_unverified".to_string()),
1027
- message_id: Some(message_id.to_string()),
1028
- verification: Some(reason),
1029
- stage: Some(DeliveryStage::Submit),
1030
- reason: None,
1031
- channel: None,
1032
- ack_forced_off: false,
1033
- turn_verification: Some(turn_verification),
1034
- });
1035
- }
1036
- }
1037
1096
  if is_leader_recipient {
1038
1097
  store.record_delivery_submission(message_id, readback_verified)?;
1039
1098
  match observe_leader_receipt(state, message_id) {
@@ -2409,6 +2468,7 @@ struct PendingMessage {
2409
2468
  status: String,
2410
2469
  error: Option<String>,
2411
2470
  delivery_attempts: u32,
2471
+ created_at: Option<String>,
2412
2472
  }
2413
2473
 
2414
2474
  fn message_for_delivery(
@@ -2418,7 +2478,7 @@ fn message_for_delivery(
2418
2478
  let conn = crate::db::schema::open_db(store.db_path())?;
2419
2479
  let message = conn
2420
2480
  .query_row(
2421
- "select sender, recipient, content, task_id, owner_team_id, status, error, delivery_attempts from messages where message_id = ?1",
2481
+ "select sender, recipient, content, task_id, owner_team_id, status, error, delivery_attempts, created_at from messages where message_id = ?1",
2422
2482
  params![message_id],
2423
2483
  |row| {
2424
2484
  Ok(PendingMessage {
@@ -2430,6 +2490,7 @@ fn message_for_delivery(
2430
2490
  status: row.get::<_, String>(5)?,
2431
2491
  error: row.get::<_, Option<String>>(6)?,
2432
2492
  delivery_attempts: row.get::<_, i64>(7)?.max(0) as u32,
2493
+ created_at: row.get::<_, Option<String>>(8)?,
2433
2494
  })
2434
2495
  },
2435
2496
  )
@@ -2497,17 +2558,15 @@ fn recipient_pane_has_actionable_startup_prompt(
2497
2558
  crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
2498
2559
  | crate::provider::StartupScreenDecision::SkipUpdatePrompt
2499
2560
  ),
2500
- Provider::Claude | Provider::ClaudeCode => matches!(
2501
- crate::provider::classify_claude_startup_screen(&captured),
2502
- crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
2503
- ),
2504
2561
  Provider::Copilot => matches!(
2505
2562
  crate::provider::classify_copilot_startup_screen(&captured),
2506
2563
  crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
2507
2564
  ),
2508
- Provider::Pi
2565
+ // Claude Code and Pi workers run only through their contract leaves.
2566
+ Provider::Claude
2567
+ | Provider::ClaudeCode
2568
+ | Provider::Pi
2509
2569
  | Provider::Grok
2510
- | Provider::CursorAgent
2511
2570
  | Provider::GeminiCli
2512
2571
  | Provider::Fake => false,
2513
2572
  }
@@ -2525,46 +2584,21 @@ fn recipient_provider(state: &serde_json::Value, recipient: &str) -> Option<Prov
2525
2584
 
2526
2585
  /// ---
2527
2586
  /// purpose: paste→Enter 地板按收件人 provider 选择
2528
- /// contract: CursorAgent 与 Grok 为 1s;其余(含 claude)为 ZERO
2529
- /// boundary: 不改 cursor 单回车闸;不把地板套到 claude/codex
2587
+ /// contract: Grok 为 1s;其余(含 claude)为 ZERO
2588
+ /// boundary: 不把地板套到 claude/codex
2530
2589
  /// ---
2531
2590
  pub(crate) fn paste_to_submit_floor_for_recipient(
2532
2591
  state: &serde_json::Value,
2533
2592
  recipient: &str,
2534
2593
  ) -> Duration {
2535
2594
  match recipient_provider(state, recipient) {
2536
- Some(Provider::CursorAgent) | Some(Provider::Grok) => {
2595
+ Some(Provider::Grok) => {
2537
2596
  crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR
2538
2597
  }
2539
2598
  _ => Duration::ZERO,
2540
2599
  }
2541
2600
  }
2542
2601
 
2543
- /// ---
2544
- /// purpose: 判断收件 provider 是否必须禁止 submit observer 重按 Enter
2545
- /// returns: CursorAgent 与 Pi 为 true,其余为 false
2546
- /// ---
2547
- pub(crate) fn recipient_requires_single_enter(state: &serde_json::Value, recipient: &str) -> bool {
2548
- matches!(
2549
- recipient_provider(state, recipient),
2550
- Some(Provider::CursorAgent | Provider::Pi)
2551
- )
2552
- }
2553
-
2554
- /// ---
2555
- /// purpose: 判断收件 provider 是否允许 Grok send-now 显式队列 flush
2556
- /// returns: CursorAgent 与 Pi 为 false,其余为 true
2557
- /// ---
2558
- pub(crate) fn recipient_allows_explicit_queue_flush(
2559
- state: &serde_json::Value,
2560
- recipient: &str,
2561
- ) -> bool {
2562
- !matches!(
2563
- recipient_provider(state, recipient),
2564
- Some(Provider::CursorAgent | Provider::Pi)
2565
- )
2566
- }
2567
-
2568
2602
  fn leader_rollout_path(state: &serde_json::Value) -> Option<std::path::PathBuf> {
2569
2603
  if let Some(receiver) = leader_receiver_value(state).filter(|receiver| {
2570
2604
  receiver.get("provider").and_then(serde_json::Value::as_str) == Some("pi")
@@ -3456,30 +3490,6 @@ pub fn retry_injection_after_trust_auto_answer(
3456
3490
  })
3457
3491
  }
3458
3492
 
3459
- /// S1-CAPTURE-001 (0.4.8 phase-1): returns (rollout_path, provider_wire) when
3460
- /// the recipient agent is Claude/ClaudeCode with a known authoritative
3461
- /// rollout_path; otherwise None (skip transcript verify). Phase-1 Claude only —
3462
- /// codex/copilot return None and keep pre-fix delivery semantics.
3463
- fn claude_recipient_rollout(
3464
- state: &serde_json::Value,
3465
- recipient: &str,
3466
- ) -> Option<(std::path::PathBuf, &'static str)> {
3467
- let agent = state.get("agents")?.get(recipient)?;
3468
- let provider = agent
3469
- .get("provider")
3470
- .and_then(serde_json::Value::as_str)
3471
- .and_then(parse_provider)?;
3472
- if !is_claude_family(provider) {
3473
- return None;
3474
- }
3475
- let provider_wire_str = provider_wire(provider);
3476
- let rollout = agent
3477
- .get("rollout_path")
3478
- .and_then(serde_json::Value::as_str)
3479
- .filter(|s| !s.is_empty())?;
3480
- Some((std::path::PathBuf::from(rollout), provider_wire_str))
3481
- }
3482
-
3483
3493
  /// S1-CAPTURE-001 (0.4.8 phase-1): bounded tail read of the rollout file
3484
3494
  /// searching for `needle`. Reads up to `tail_bytes` from the end of the file
3485
3495
  /// (default 64KB budget). Returns true iff the needle appears in the tail.
@@ -3597,12 +3607,21 @@ pub(crate) fn token_already_visible(
3597
3607
  }
3598
3608
 
3599
3609
  fn recipient_transcript_contains(state: &serde_json::Value, recipient: &str, marker: &str) -> bool {
3600
- for path in recipient_transcript_paths(state, recipient) {
3601
- if rollout_tail_contains(&path, marker, 64 * 1024) {
3602
- return true;
3603
- }
3604
- }
3605
- false
3610
+ recipient_transcript_contains_within(state, recipient, marker, 64 * 1024)
3611
+ }
3612
+
3613
+ /// The receipt row can sit behind seconds of tool output by verdict time.
3614
+ const TRANSCRIPT_RECEIPT_TAIL_BYTES: u64 = 1024 * 1024;
3615
+
3616
+ fn recipient_transcript_contains_within(
3617
+ state: &serde_json::Value,
3618
+ recipient: &str,
3619
+ marker: &str,
3620
+ tail_bytes: u64,
3621
+ ) -> bool {
3622
+ recipient_transcript_paths(state, recipient)
3623
+ .iter()
3624
+ .any(|path| rollout_tail_contains(path, marker, tail_bytes))
3606
3625
  }
3607
3626
 
3608
3627
  fn recipient_transcript_paths(
@@ -3720,12 +3739,10 @@ mod paste_floor_tests {
3720
3739
  }
3721
3740
 
3722
3741
  #[test]
3723
- fn grok_paste_to_submit_floor_matches_cursor() {
3742
+ fn grok_paste_to_submit_floor_is_one_second() {
3724
3743
  let grok = paste_to_submit_floor_for_recipient(&state_with_provider("grok"), "w1");
3725
- let cursor = paste_to_submit_floor_for_recipient(&state_with_provider("cursor_agent"), "w1");
3726
3744
  assert_eq!(grok, crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR);
3727
- assert_eq!(cursor, crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR);
3728
- assert_eq!(grok, cursor);
3745
+ assert_eq!(grok, Duration::from_secs(1));
3729
3746
  }
3730
3747
 
3731
3748
  #[test]
@@ -103,7 +103,7 @@ fn frame(composer: &str, transcript: &str) -> InputFrame {
103
103
 
104
104
  #[test]
105
105
  fn current_token_in_composer_is_not_duplicate_delivered_or_repasted() {
106
- let f = Fixture::new("cursor_agent");
106
+ let f = Fixture::new("fake");
107
107
  let marker = message_token_marker("msg_one");
108
108
  let t = f
109
109
  .transport()
@@ -122,7 +122,7 @@ fn successful_transport_report_does_not_override_unconsumed_composer() {
122
122
  "[Pasted text #1 +25 lines]",
123
123
  "foreign draft",
124
124
  ] {
125
- let mut f = Fixture::new("cursor_agent");
125
+ let mut f = Fixture::new("fake");
126
126
  #[cfg(unix)]
127
127
  let panes = vec![crate::mcp_server::readiness::test_ready_worker(
128
128
  &f.workspace,
@@ -146,7 +146,7 @@ fn successful_transport_report_does_not_override_unconsumed_composer() {
146
146
 
147
147
  #[test]
148
148
  fn unknown_current_native_surface_is_unverified_not_success() {
149
- let f = Fixture::new("pi");
149
+ let f = Fixture::new("fake");
150
150
  let t = f
151
151
  .transport()
152
152
  .with_native_input_error("native_surface_unknown");
@@ -167,7 +167,7 @@ fn pane_visibility_without_an_observation_protocol_is_not_duplicate_acceptance()
167
167
 
168
168
  #[test]
169
169
  fn current_empty_composer_and_unique_transcript_token_prove_consumption() {
170
- let f = Fixture::new("cursor_agent");
170
+ let f = Fixture::new("fake");
171
171
  let marker = message_token_marker("msg_one");
172
172
  let t = f
173
173
  .transport()
@@ -180,7 +180,7 @@ fn current_empty_composer_and_unique_transcript_token_prove_consumption() {
180
180
 
181
181
  #[test]
182
182
  fn busy_answers_or_duplicate_history_tokens_do_not_prove_consumption() {
183
- let f = Fixture::new("cursor_agent");
183
+ let f = Fixture::new("fake");
184
184
  let target = Target::Pane(PaneId::new("%1"));
185
185
  for transcript in [
186
186
  "answer is 5535",
@@ -474,7 +474,7 @@ fn current_canonical_message_and_original_owner_recipient_remain_required() {
474
474
  serde_json::from_str(&std::fs::read_to_string(&p).unwrap()).unwrap();
475
475
  match field {
476
476
  "pid" => state["agents"]["worker"]["pane_pid"] = 3.into(),
477
- "provider" => state["agents"]["worker"]["provider"] = "cursor_agent".into(),
477
+ "provider" => state["agents"]["worker"]["provider"] = "grok".into(),
478
478
  "session" => state["session_name"] = "other".into(),
479
479
  _ => state["agents"]["worker"]["window"] = "other".into(),
480
480
  };
@@ -158,6 +158,25 @@ pub(crate) fn latest_prompt_signal(scrollback: &str) -> Option<AgentActivity> {
158
158
  // IRON LAW (activity.rs:3 / bug-071/077/085): no-signal in the bottom
159
159
  // region must be Uncertain (caller treats None here as "no decisive
160
160
  // signal" and surfaces Uncertain), NEVER silently flipped to Idle.
161
+ // #379: Claude Code's spinner sits above its composer box, outside the
162
+ // bottom five rows, and its finished-turn `✻ Worked for 3s` sits inside
163
+ // them. The box's own grammar (shared with delivery) decides instead.
164
+ if let Some((surface, _)) =
165
+ team_agent_contract::providers::claude::interaction::inspect_legacy_composer(scrollback)
166
+ {
167
+ use team_agent_contract::contract::delivery::InputSurface;
168
+ match surface {
169
+ InputSurface::Busy => {
170
+ return Some(AgentActivity {
171
+ status: ActivityStatus::Working,
172
+ confidence: 0.9,
173
+ rationale: "claude_spinner_row".to_string(),
174
+ })
175
+ }
176
+ InputSurface::ComposerReady => return Some(idle_activity()),
177
+ _ => {}
178
+ }
179
+ }
161
180
  let active_region: Vec<&str> = scrollback
162
181
  .lines()
163
182
  .rev()