@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.
- package/Cargo.lock +1 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -1
- package/crates/team-agent/src/cli/emit.rs +41 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +0 -120
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +6 -5
- package/crates/team-agent/src/cli/models.rs +40 -119
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +21 -5
- package/crates/team-agent/src/compiler.rs +24 -1
- package/crates/team-agent/src/contract_runtime/backend.rs +22 -6
- package/crates/team-agent/src/contract_runtime/config.rs +34 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +89 -34
- package/crates/team-agent/src/contract_runtime/registry.rs +258 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +0 -1
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +14 -1
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +0 -28
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -20
- package/crates/team-agent/src/lifecycle/profile_launch.rs +11 -39
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +1 -63
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +38 -7
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +6 -2
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -137
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +181 -35
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +4 -4
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +66 -4
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +22 -6
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +1 -67
- package/crates/team-agent/src/provider/adapters/mod.rs +0 -1
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +2 -73
- package/crates/team-agent/src/provider/session/capture.rs +1 -1
- package/crates/team-agent/src/provider/session/context_fork.rs +4 -4
- package/crates/team-agent/src/provider/session_scan/common.rs +1 -2
- package/crates/team-agent/src/provider/session_scan.rs +0 -4
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +5 -184
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -4
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +48 -8
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +1 -1
- package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: deliver_stored_message
|
|
6
|
-
//! what: 单次物理注入;grok
|
|
6
|
+
//! what: 单次物理注入;grok 队列默认再按回车顶出
|
|
7
7
|
//! boundary:
|
|
8
8
|
//! - 不把物理 success 写成 delivered
|
|
9
9
|
//! - 不重粘文本
|
|
@@ -302,33 +302,92 @@ fn prepare_message_state(
|
|
|
302
302
|
Ok(Ok(prepared))
|
|
303
303
|
}
|
|
304
304
|
|
|
305
|
+
/// #372: how long a seat may wait for its MCP handshake, counted from its
|
|
306
|
+
/// spawn or the message's creation (whichever is later), before the message
|
|
307
|
+
/// parks instead of re-polling every tick.
|
|
305
308
|
#[cfg(unix)]
|
|
309
|
+
const MCP_HANDSHAKE_WAIT_LIMIT_SECS: i64 = 300;
|
|
310
|
+
|
|
311
|
+
#[cfg(unix)]
|
|
312
|
+
#[allow(clippy::too_many_arguments)]
|
|
306
313
|
fn mcp_handshake_pending_outcome(
|
|
314
|
+
workspace: &Path,
|
|
307
315
|
store: &MessageStore,
|
|
308
316
|
event_log: &EventLog,
|
|
317
|
+
state: &serde_json::Value,
|
|
318
|
+
owner: Option<&str>,
|
|
309
319
|
message_id: &str,
|
|
320
|
+
message: &PendingMessage,
|
|
310
321
|
attempt: u32,
|
|
311
322
|
reason: &str,
|
|
312
323
|
) -> Result<DeliveryOutcome, MessagingError> {
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
324
|
+
let already_claimed = || DeliveryOutcome {
|
|
325
|
+
ok: false,
|
|
326
|
+
status: DeliveryStatus::Refused,
|
|
327
|
+
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
328
|
+
message_id: Some(message_id.to_string()),
|
|
329
|
+
verification: None,
|
|
330
|
+
stage: None,
|
|
331
|
+
reason: Some(DeliveryRefusal::MessageAlreadyClaimed),
|
|
332
|
+
channel: None,
|
|
333
|
+
ack_forced_off: false,
|
|
334
|
+
turn_verification: None,
|
|
335
|
+
};
|
|
336
|
+
let spawned_at = state["agents"][message.recipient.as_str()]["spawned_at"].as_str();
|
|
337
|
+
let waited_s = [spawned_at, message.created_at.as_deref()]
|
|
338
|
+
.into_iter()
|
|
339
|
+
.flatten()
|
|
340
|
+
.filter_map(|at| chrono::DateTime::parse_from_rfc3339(at).ok())
|
|
341
|
+
.max()
|
|
342
|
+
.map_or(0, |since| {
|
|
343
|
+
(chrono::Utc::now() - since.with_timezone(&chrono::Utc)).num_seconds()
|
|
344
|
+
});
|
|
345
|
+
if waited_s >= MCP_HANDSHAKE_WAIT_LIMIT_SECS {
|
|
346
|
+
if !store.park_delivery_before_input(message_id, attempt)? {
|
|
347
|
+
return Ok(already_claimed());
|
|
348
|
+
}
|
|
349
|
+
// A receipt published between this preflight and the park found no
|
|
350
|
+
// parked row to resume; one re-check keeps that publication from being lost.
|
|
351
|
+
let published_meanwhile = owner.is_some_and(|owner| {
|
|
352
|
+
crate::mcp_server::readiness::preflight(workspace, Some(owner), &message.recipient, state)
|
|
353
|
+
.is_ok()
|
|
354
|
+
});
|
|
355
|
+
if published_meanwhile {
|
|
356
|
+
store.requeue_parked_deliveries(&message.recipient, owner.unwrap_or_default())?;
|
|
357
|
+
} else {
|
|
358
|
+
event_log.write("delivery.mcp_handshake_parked", serde_json::json!({
|
|
359
|
+
"message_id": message_id,
|
|
360
|
+
"recipient": message.recipient,
|
|
361
|
+
"reason": reason,
|
|
362
|
+
"waited_s": waited_s,
|
|
363
|
+
}))?;
|
|
364
|
+
notify_mcp_handshake_parked(workspace, store, event_log, state, &message.recipient, reason, waited_s)?;
|
|
365
|
+
}
|
|
316
366
|
return Ok(DeliveryOutcome {
|
|
317
367
|
ok: false,
|
|
318
|
-
status: DeliveryStatus::
|
|
319
|
-
message_status: MessageStatusShadow(
|
|
368
|
+
status: DeliveryStatus::Blocked,
|
|
369
|
+
message_status: MessageStatusShadow(
|
|
370
|
+
if published_meanwhile { "accepted" } else { "queued_until_start" }.to_string(),
|
|
371
|
+
),
|
|
320
372
|
message_id: Some(message_id.to_string()),
|
|
321
|
-
verification:
|
|
373
|
+
verification: Some(format!("{}:{reason}", crate::message_store::MCP_HANDSHAKE_TIMEOUT)),
|
|
322
374
|
stage: None,
|
|
323
|
-
reason:
|
|
375
|
+
reason: None,
|
|
324
376
|
channel: None,
|
|
325
377
|
ack_forced_off: false,
|
|
326
378
|
turn_verification: None,
|
|
327
379
|
});
|
|
328
380
|
}
|
|
381
|
+
// No paste/key has occurred. Only this exact claim may be released; a
|
|
382
|
+
// concurrent cancellation or newer delivery must never be overwritten.
|
|
383
|
+
if !store.release_delivery_before_input(message_id, attempt, reason)? {
|
|
384
|
+
return Ok(already_claimed());
|
|
385
|
+
}
|
|
329
386
|
event_log.write("delivery.deferred_mcp_handshake", serde_json::json!({
|
|
330
387
|
"message_id": message_id,
|
|
388
|
+
"recipient": message.recipient,
|
|
331
389
|
"reason": reason,
|
|
390
|
+
"waited_s": waited_s,
|
|
332
391
|
"effect": "none",
|
|
333
392
|
}))?;
|
|
334
393
|
Ok(DeliveryOutcome {
|
|
@@ -345,6 +404,54 @@ fn mcp_handshake_pending_outcome(
|
|
|
345
404
|
})
|
|
346
405
|
}
|
|
347
406
|
|
|
407
|
+
/// One leader notice per seat spawn; later parks of the same spawn stay quiet.
|
|
408
|
+
#[cfg(unix)]
|
|
409
|
+
fn notify_mcp_handshake_parked(
|
|
410
|
+
workspace: &Path,
|
|
411
|
+
store: &MessageStore,
|
|
412
|
+
event_log: &EventLog,
|
|
413
|
+
state: &serde_json::Value,
|
|
414
|
+
recipient: &str,
|
|
415
|
+
reason: &str,
|
|
416
|
+
waited_s: i64,
|
|
417
|
+
) -> Result<(), MessagingError> {
|
|
418
|
+
let agent = &state["agents"][recipient];
|
|
419
|
+
let result_id = format!(
|
|
420
|
+
"mcp_handshake.timeout:{recipient}:{}",
|
|
421
|
+
agent["spawned_at"].as_str().unwrap_or("unknown")
|
|
422
|
+
);
|
|
423
|
+
let notified = crate::db::schema::open_db(store.db_path())?
|
|
424
|
+
.query_row(
|
|
425
|
+
"select 1 from leader_notification_log where result_id = ?1 limit 1",
|
|
426
|
+
params![result_id],
|
|
427
|
+
|_| Ok(()),
|
|
428
|
+
)
|
|
429
|
+
.optional()?
|
|
430
|
+
.is_some();
|
|
431
|
+
if notified {
|
|
432
|
+
return Ok(());
|
|
433
|
+
}
|
|
434
|
+
let live = agent["pane_pid"]
|
|
435
|
+
.as_u64()
|
|
436
|
+
.and_then(|pid| u32::try_from(pid).ok())
|
|
437
|
+
.map(crate::mcp_server::readiness::live_servers_under)
|
|
438
|
+
.unwrap_or_default();
|
|
439
|
+
let live = if live.is_empty() { "none".to_string() } else { format!("{live:?}") };
|
|
440
|
+
let content = format!(
|
|
441
|
+
"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"
|
|
442
|
+
);
|
|
443
|
+
let outcome = crate::messaging::send_to_leader_receiver(
|
|
444
|
+
workspace, state, "leader", &content, None, "coordinator", false, Some(&result_id), event_log,
|
|
445
|
+
);
|
|
446
|
+
event_log.write("delivery.mcp_handshake_parked_notification", serde_json::json!({
|
|
447
|
+
"recipient": recipient,
|
|
448
|
+
"result_id": result_id,
|
|
449
|
+
"live_mcp_servers": live,
|
|
450
|
+
"error": outcome.err().map(|error| error.to_string()),
|
|
451
|
+
}))?;
|
|
452
|
+
Ok(())
|
|
453
|
+
}
|
|
454
|
+
|
|
348
455
|
fn deliver_prepared_message(
|
|
349
456
|
workspace: &Path,
|
|
350
457
|
store: &MessageStore,
|
|
@@ -357,6 +464,8 @@ fn deliver_prepared_message(
|
|
|
357
464
|
) -> Result<DeliveryOutcome, MessagingError> {
|
|
358
465
|
let canonical_owner_team_id = prepared.canonical_owner_team_id;
|
|
359
466
|
let state = prepared.scoped.as_ref().unwrap_or(fallback);
|
|
467
|
+
crate::provider::wire::require_active_state_providers(state, Some(&message.recipient))
|
|
468
|
+
.map_err(|error| MessagingError::Provider(error.into()))?;
|
|
360
469
|
if message.recipient == "leader"
|
|
361
470
|
&& matches!(
|
|
362
471
|
message.status.as_str(),
|
|
@@ -701,7 +810,10 @@ fn deliver_prepared_message(
|
|
|
701
810
|
Ok(())
|
|
702
811
|
});
|
|
703
812
|
if let Err(reason) = admission {
|
|
704
|
-
return mcp_handshake_pending_outcome(
|
|
813
|
+
return mcp_handshake_pending_outcome(
|
|
814
|
+
workspace, store, event_log, state, canonical_owner_team_id.as_deref(),
|
|
815
|
+
message_id, &message, attempt, reason,
|
|
816
|
+
);
|
|
705
817
|
}
|
|
706
818
|
}
|
|
707
819
|
let rendered = render_message(
|
|
@@ -748,7 +860,6 @@ fn deliver_prepared_message(
|
|
|
748
860
|
Ok(report) => {
|
|
749
861
|
// grok 忙时第一次回车只入显式队列。默认 send-now:只重按回车顶出去。
|
|
750
862
|
// 无 `Enter:send now` 时零次额外按键,claude/codex 行为不变。
|
|
751
|
-
// cursor:第二下 Enter 打断进行中回合,不走 flush。
|
|
752
863
|
if !crate::provider::submit_now::keep_provider_queue_requested()
|
|
753
864
|
&& recipient_allows_explicit_queue_flush(state, &message.recipient)
|
|
754
865
|
{
|
|
@@ -891,7 +1002,31 @@ fn deliver_prepared_message(
|
|
|
891
1002
|
// worker delivery both require post-submit evidence; leader additionally
|
|
892
1003
|
// waits for its authoritative provider transcript below.
|
|
893
1004
|
let native_consumed = observed_token_consumed(transport, state, &message.recipient, &target, message_id);
|
|
894
|
-
let verified = submit_verified && native_consumed != Some(false);
|
|
1005
|
+
let mut verified = submit_verified && native_consumed != Some(false);
|
|
1006
|
+
// #379: a pane the verifier could not read is not a failed send. The
|
|
1007
|
+
// recipient's own transcript row (user turn or queued enqueue) is the
|
|
1008
|
+
// provider's receipt; native observers keep their veto.
|
|
1009
|
+
if !verified
|
|
1010
|
+
&& native_consumed.is_none()
|
|
1011
|
+
&& recipient_transcript_contains_within(
|
|
1012
|
+
state,
|
|
1013
|
+
&message.recipient,
|
|
1014
|
+
&message_token_marker(message_id),
|
|
1015
|
+
TRANSCRIPT_RECEIPT_TAIL_BYTES,
|
|
1016
|
+
)
|
|
1017
|
+
{
|
|
1018
|
+
verified = true;
|
|
1019
|
+
event_log.write(
|
|
1020
|
+
"send.unverified_reconciled",
|
|
1021
|
+
serde_json::json!({
|
|
1022
|
+
"message_id": message_id,
|
|
1023
|
+
"recipient": message.recipient,
|
|
1024
|
+
"source": "recipient_transcript",
|
|
1025
|
+
"submit_verification": submit_verification_wire(inject_report.submit_verification),
|
|
1026
|
+
"attempts": inject_report.attempts,
|
|
1027
|
+
}),
|
|
1028
|
+
)?;
|
|
1029
|
+
}
|
|
895
1030
|
if !verified {
|
|
896
1031
|
let reason = if native_consumed == Some(false) {
|
|
897
1032
|
"submit_unverified:current_composer_or_consumption_unknown".to_string()
|
|
@@ -914,6 +1049,7 @@ fn deliver_prepared_message(
|
|
|
914
1049
|
"recipient": message.recipient,
|
|
915
1050
|
"reason": reason,
|
|
916
1051
|
"attempts": inject_report.attempts,
|
|
1052
|
+
"delivery_attempt": attempt,
|
|
917
1053
|
"submit_attempts_detail": submit_attempts_detail,
|
|
918
1054
|
});
|
|
919
1055
|
merge_inject_readback_fields(
|
|
@@ -923,7 +1059,8 @@ fn deliver_prepared_message(
|
|
|
923
1059
|
resolved.metadata.as_ref(),
|
|
924
1060
|
);
|
|
925
1061
|
event_log.write("send.unverified", unverified)?;
|
|
926
|
-
|
|
1062
|
+
// #379: the budget is delivery attempts, not Enter presses inside one.
|
|
1063
|
+
if attempt >= u32::from(SEND_RETRY_MAX_ATTEMPTS) {
|
|
927
1064
|
store.mark(message_id, "failed", Some("send_unverified_exhausted"))?;
|
|
928
1065
|
emit_send_failed_exhausted(
|
|
929
1066
|
workspace,
|
|
@@ -931,7 +1068,7 @@ fn deliver_prepared_message(
|
|
|
931
1068
|
event_log,
|
|
932
1069
|
message_id,
|
|
933
1070
|
&message.recipient,
|
|
934
|
-
|
|
1071
|
+
attempt,
|
|
935
1072
|
"send_unverified_exhausted",
|
|
936
1073
|
&reason,
|
|
937
1074
|
Some(&inject_report),
|
|
@@ -970,8 +1107,8 @@ fn deliver_prepared_message(
|
|
|
970
1107
|
// token actually reached the worker's transcript before marking
|
|
971
1108
|
// delivered. This catches the gate's mis-attribution: pane inject
|
|
972
1109
|
// succeeded but the token landed in the leader/unassigned transcript,
|
|
973
|
-
// not the worker's. Budget
|
|
974
|
-
//
|
|
1110
|
+
// not the worker's. Budget: receipt-window tail (#379: the user row can
|
|
1111
|
+
// trail seconds of tool output) / short grace window. Phase-1 Claude only —
|
|
975
1112
|
// codex/copilot keep the pre-fix behaviour (will be addressed in
|
|
976
1113
|
// phase-2 once Claude phase-1 is field-validated).
|
|
977
1114
|
if let Some((rollout_path, provider_wire_str)) =
|
|
@@ -981,7 +1118,8 @@ fn deliver_prepared_message(
|
|
|
981
1118
|
let grace = std::time::Duration::from_millis(200);
|
|
982
1119
|
let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
|
|
983
1120
|
let transcript_has_token = loop {
|
|
984
|
-
let found =
|
|
1121
|
+
let found =
|
|
1122
|
+
rollout_tail_contains(&rollout_path, &token_marker, TRANSCRIPT_RECEIPT_TAIL_BYTES);
|
|
985
1123
|
if found || std::time::Instant::now() >= deadline {
|
|
986
1124
|
break found;
|
|
987
1125
|
}
|
|
@@ -2409,6 +2547,7 @@ struct PendingMessage {
|
|
|
2409
2547
|
status: String,
|
|
2410
2548
|
error: Option<String>,
|
|
2411
2549
|
delivery_attempts: u32,
|
|
2550
|
+
created_at: Option<String>,
|
|
2412
2551
|
}
|
|
2413
2552
|
|
|
2414
2553
|
fn message_for_delivery(
|
|
@@ -2418,7 +2557,7 @@ fn message_for_delivery(
|
|
|
2418
2557
|
let conn = crate::db::schema::open_db(store.db_path())?;
|
|
2419
2558
|
let message = conn
|
|
2420
2559
|
.query_row(
|
|
2421
|
-
"select sender, recipient, content, task_id, owner_team_id, status, error, delivery_attempts from messages where message_id = ?1",
|
|
2560
|
+
"select sender, recipient, content, task_id, owner_team_id, status, error, delivery_attempts, created_at from messages where message_id = ?1",
|
|
2422
2561
|
params![message_id],
|
|
2423
2562
|
|row| {
|
|
2424
2563
|
Ok(PendingMessage {
|
|
@@ -2430,6 +2569,7 @@ fn message_for_delivery(
|
|
|
2430
2569
|
status: row.get::<_, String>(5)?,
|
|
2431
2570
|
error: row.get::<_, Option<String>>(6)?,
|
|
2432
2571
|
delivery_attempts: row.get::<_, i64>(7)?.max(0) as u32,
|
|
2572
|
+
created_at: row.get::<_, Option<String>>(8)?,
|
|
2433
2573
|
})
|
|
2434
2574
|
},
|
|
2435
2575
|
)
|
|
@@ -2507,7 +2647,6 @@ fn recipient_pane_has_actionable_startup_prompt(
|
|
|
2507
2647
|
),
|
|
2508
2648
|
Provider::Pi
|
|
2509
2649
|
| Provider::Grok
|
|
2510
|
-
| Provider::CursorAgent
|
|
2511
2650
|
| Provider::GeminiCli
|
|
2512
2651
|
| Provider::Fake => false,
|
|
2513
2652
|
}
|
|
@@ -2525,15 +2664,15 @@ fn recipient_provider(state: &serde_json::Value, recipient: &str) -> Option<Prov
|
|
|
2525
2664
|
|
|
2526
2665
|
/// ---
|
|
2527
2666
|
/// purpose: paste→Enter 地板按收件人 provider 选择
|
|
2528
|
-
/// contract:
|
|
2529
|
-
/// boundary:
|
|
2667
|
+
/// contract: Grok 为 1s;其余(含 claude)为 ZERO
|
|
2668
|
+
/// boundary: 不把地板套到 claude/codex
|
|
2530
2669
|
/// ---
|
|
2531
2670
|
pub(crate) fn paste_to_submit_floor_for_recipient(
|
|
2532
2671
|
state: &serde_json::Value,
|
|
2533
2672
|
recipient: &str,
|
|
2534
2673
|
) -> Duration {
|
|
2535
2674
|
match recipient_provider(state, recipient) {
|
|
2536
|
-
Some(Provider::
|
|
2675
|
+
Some(Provider::Grok) => {
|
|
2537
2676
|
crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR
|
|
2538
2677
|
}
|
|
2539
2678
|
_ => Duration::ZERO,
|
|
@@ -2542,18 +2681,18 @@ pub(crate) fn paste_to_submit_floor_for_recipient(
|
|
|
2542
2681
|
|
|
2543
2682
|
/// ---
|
|
2544
2683
|
/// purpose: 判断收件 provider 是否必须禁止 submit observer 重按 Enter
|
|
2545
|
-
/// returns:
|
|
2684
|
+
/// returns: Pi 为 true,其余为 false
|
|
2546
2685
|
/// ---
|
|
2547
2686
|
pub(crate) fn recipient_requires_single_enter(state: &serde_json::Value, recipient: &str) -> bool {
|
|
2548
2687
|
matches!(
|
|
2549
2688
|
recipient_provider(state, recipient),
|
|
2550
|
-
Some(Provider::
|
|
2689
|
+
Some(Provider::Pi)
|
|
2551
2690
|
)
|
|
2552
2691
|
}
|
|
2553
2692
|
|
|
2554
2693
|
/// ---
|
|
2555
2694
|
/// purpose: 判断收件 provider 是否允许 Grok send-now 显式队列 flush
|
|
2556
|
-
/// returns:
|
|
2695
|
+
/// returns: Pi 为 false,其余为 true
|
|
2557
2696
|
/// ---
|
|
2558
2697
|
pub(crate) fn recipient_allows_explicit_queue_flush(
|
|
2559
2698
|
state: &serde_json::Value,
|
|
@@ -2561,7 +2700,7 @@ pub(crate) fn recipient_allows_explicit_queue_flush(
|
|
|
2561
2700
|
) -> bool {
|
|
2562
2701
|
!matches!(
|
|
2563
2702
|
recipient_provider(state, recipient),
|
|
2564
|
-
Some(Provider::
|
|
2703
|
+
Some(Provider::Pi)
|
|
2565
2704
|
)
|
|
2566
2705
|
}
|
|
2567
2706
|
|
|
@@ -3597,12 +3736,21 @@ pub(crate) fn token_already_visible(
|
|
|
3597
3736
|
}
|
|
3598
3737
|
|
|
3599
3738
|
fn recipient_transcript_contains(state: &serde_json::Value, recipient: &str, marker: &str) -> bool {
|
|
3600
|
-
|
|
3601
|
-
|
|
3602
|
-
|
|
3603
|
-
|
|
3604
|
-
|
|
3605
|
-
|
|
3739
|
+
recipient_transcript_contains_within(state, recipient, marker, 64 * 1024)
|
|
3740
|
+
}
|
|
3741
|
+
|
|
3742
|
+
/// The receipt row can sit behind seconds of tool output by verdict time.
|
|
3743
|
+
const TRANSCRIPT_RECEIPT_TAIL_BYTES: u64 = 1024 * 1024;
|
|
3744
|
+
|
|
3745
|
+
fn recipient_transcript_contains_within(
|
|
3746
|
+
state: &serde_json::Value,
|
|
3747
|
+
recipient: &str,
|
|
3748
|
+
marker: &str,
|
|
3749
|
+
tail_bytes: u64,
|
|
3750
|
+
) -> bool {
|
|
3751
|
+
recipient_transcript_paths(state, recipient)
|
|
3752
|
+
.iter()
|
|
3753
|
+
.any(|path| rollout_tail_contains(path, marker, tail_bytes))
|
|
3606
3754
|
}
|
|
3607
3755
|
|
|
3608
3756
|
fn recipient_transcript_paths(
|
|
@@ -3720,12 +3868,10 @@ mod paste_floor_tests {
|
|
|
3720
3868
|
}
|
|
3721
3869
|
|
|
3722
3870
|
#[test]
|
|
3723
|
-
fn
|
|
3871
|
+
fn grok_paste_to_submit_floor_is_one_second() {
|
|
3724
3872
|
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
3873
|
assert_eq!(grok, crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR);
|
|
3727
|
-
assert_eq!(
|
|
3728
|
-
assert_eq!(grok, cursor);
|
|
3874
|
+
assert_eq!(grok, Duration::from_secs(1));
|
|
3729
3875
|
}
|
|
3730
3876
|
|
|
3731
3877
|
#[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("
|
|
106
|
+
let f = Fixture::new("pi");
|
|
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("
|
|
125
|
+
let mut f = Fixture::new("pi");
|
|
126
126
|
#[cfg(unix)]
|
|
127
127
|
let panes = vec![crate::mcp_server::readiness::test_ready_worker(
|
|
128
128
|
&f.workspace,
|
|
@@ -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("
|
|
170
|
+
let f = Fixture::new("pi");
|
|
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("
|
|
183
|
+
let f = Fixture::new("pi");
|
|
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"] = "
|
|
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()
|
|
@@ -31,7 +31,7 @@ use crate::transport::{
|
|
|
31
31
|
#[test]
|
|
32
32
|
#[cfg(unix)]
|
|
33
33
|
fn eager_mcp_waits_without_spending_input_attempts_then_delivers_the_same_message() {
|
|
34
|
-
let mut case = WorkerCase::new("mcp-handshake", "
|
|
34
|
+
let mut case = WorkerCase::new("mcp-handshake", "grok");
|
|
35
35
|
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
36
36
|
let config = case.workspace.join(".team/runtime/mcp/w1.json");
|
|
37
37
|
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
@@ -66,10 +66,72 @@ fn eager_mcp_waits_without_spending_input_attempts_then_delivers_the_same_messag
|
|
|
66
66
|
assert_eq!(transport.inject_count(), 1, "same queued row proceeds after the real receipt");
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
+
#[test]
|
|
70
|
+
#[cfg(unix)]
|
|
71
|
+
fn issue372_bounded_handshake_wait_parks_notifies_once_then_publish_delivers() {
|
|
72
|
+
let mut case = WorkerCase::new("mcp-handshake-park", "grok");
|
|
73
|
+
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
74
|
+
let config = case.workspace.join(".team/runtime/mcp/w1.json");
|
|
75
|
+
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
76
|
+
std::fs::write(&config, serde_json::to_vec(&serde_json::json!({
|
|
77
|
+
"mcpServers": {"team_orchestrator": {
|
|
78
|
+
"command": std::env::current_exe().unwrap().canonicalize().unwrap(),
|
|
79
|
+
"env": {"TEAM_AGENT_WORKSPACE": case.workspace, "TEAM_AGENT_ID": "w1", "TEAM_AGENT_OWNER_TEAM_ID": "dup-team"}
|
|
80
|
+
}}
|
|
81
|
+
})).unwrap()).unwrap();
|
|
82
|
+
let long_ago = (chrono::Utc::now() - chrono::Duration::seconds(400)).to_rfc3339();
|
|
83
|
+
case.state["team_key"] = serde_json::json!("dup-team");
|
|
84
|
+
case.state["agents"]["w1"]["mcp_config"] = serde_json::json!(config);
|
|
85
|
+
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
86
|
+
case.state["agents"]["w1"]["spawned_at"] = serde_json::json!(long_ago);
|
|
87
|
+
case.state["teams"] = serde_json::json!({"dup-team": case.state.clone()});
|
|
88
|
+
crate::state::persist::save_runtime_state(&case.workspace, &case.state).unwrap();
|
|
89
|
+
let transport = RecordingTransport { carrier: Some(carrier), ..RecordingTransport::new("") };
|
|
90
|
+
let ids: Vec<String> = (0..2)
|
|
91
|
+
.map(|n| case.store.create_message(None, "leader", "w1", &format!("parked canary {n}"), None, false, Some("dup-team")).unwrap())
|
|
92
|
+
.collect();
|
|
93
|
+
let connection = rusqlite::Connection::open(case.store.db_path()).unwrap();
|
|
94
|
+
connection.execute("update messages set created_at = ?1", [&long_ago]).unwrap();
|
|
95
|
+
for id in &ids {
|
|
96
|
+
let outcome = deliver_pending_message(&case.workspace, &case.store, &transport,
|
|
97
|
+
id, &case.event_log, &case.state).unwrap();
|
|
98
|
+
assert_eq!(outcome.message_status.0, "queued_until_start", "{outcome:?}");
|
|
99
|
+
assert!(outcome.verification.as_deref().unwrap().starts_with("mcp_handshake_timeout:mcp_handshake_"));
|
|
100
|
+
}
|
|
101
|
+
assert_eq!(transport.inject_count(), 0, "a parked wait never reaches input");
|
|
102
|
+
let row = |id: &str| -> (String, Option<String>, i64) {
|
|
103
|
+
connection.query_row(
|
|
104
|
+
"select status, error, delivery_attempts from messages where message_id = ?1",
|
|
105
|
+
[id], |r| Ok((r.get(0)?, r.get(1)?, r.get(2)?)),
|
|
106
|
+
).unwrap()
|
|
107
|
+
};
|
|
108
|
+
for id in &ids {
|
|
109
|
+
assert_eq!(row(id.as_str()), ("queued_until_start".to_string(), Some("mcp_handshake_timeout".to_string()), 0));
|
|
110
|
+
}
|
|
111
|
+
let events = case.events();
|
|
112
|
+
assert_eq!(events.matches("\"delivery.mcp_handshake_parked\"").count(), 2, "{events}");
|
|
113
|
+
assert_eq!(events.matches("\"delivery.mcp_handshake_parked_notification\"").count(), 1,
|
|
114
|
+
"one leader notice per seat spawn: {events}");
|
|
115
|
+
let notices: i64 = connection.query_row(
|
|
116
|
+
"select count(*) from leader_notification_log where result_id like 'mcp_handshake.timeout:w1:%'",
|
|
117
|
+
[], |r| r.get(0),
|
|
118
|
+
).unwrap();
|
|
119
|
+
assert_eq!(notices, 1);
|
|
120
|
+
|
|
121
|
+
crate::mcp_server::readiness::publish(&case.workspace, "dup-team", "w1", chrono::Utc::now()).unwrap();
|
|
122
|
+
for id in &ids {
|
|
123
|
+
assert_eq!(row(id.as_str()).0, "accepted", "a fresh receipt resumes parked rows");
|
|
124
|
+
}
|
|
125
|
+
let outcome = deliver_pending_message(&case.workspace, &case.store, &transport,
|
|
126
|
+
&ids[0], &case.event_log, &case.state).unwrap();
|
|
127
|
+
assert_eq!(outcome.message_id.as_deref(), Some(ids[0].as_str()));
|
|
128
|
+
assert_eq!(transport.inject_count(), 1, "the same parked row is delivered after the receipt");
|
|
129
|
+
}
|
|
130
|
+
|
|
69
131
|
#[test]
|
|
70
132
|
#[cfg(unix)]
|
|
71
133
|
fn issue345_missing_eager_config_defers_without_input_or_attempts() {
|
|
72
|
-
let mut case = WorkerCase::new("missing-mcp-config", "
|
|
134
|
+
let mut case = WorkerCase::new("missing-mcp-config", "grok");
|
|
73
135
|
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
74
136
|
case.state["team_key"] = serde_json::json!("dup-team");
|
|
75
137
|
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
@@ -164,8 +226,8 @@ fn observer_state_save_failure_after_enter_does_not_return_err() {
|
|
|
164
226
|
}
|
|
165
227
|
|
|
166
228
|
#[test]
|
|
167
|
-
fn
|
|
168
|
-
for provider in ["claude", "grok"
|
|
229
|
+
fn pane_token_refuses_second_inject_for_claude_grok() {
|
|
230
|
+
for provider in ["claude", "grok"] {
|
|
169
231
|
let mut case = WorkerCase::new(&format!("token-{provider}"), provider);
|
|
170
232
|
#[cfg(unix)]
|
|
171
233
|
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|