@team-agent/installer 0.5.125 → 0.5.127
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 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -137
- package/crates/team-agent/src/cli/emit.rs +13 -8
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +55 -10
- package/crates/team-agent/src/cli/mod.rs +35 -29
- package/crates/team-agent/src/cli/models.rs +33 -944
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +54 -12
- package/crates/team-agent/src/compiler.rs +7 -205
- package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +12 -8
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +22 -200
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
- package/crates/team-agent/src/lifecycle/launch.rs +3 -34
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
- package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +106 -186
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +19 -15
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +15 -14
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
- package/crates/team-agent/src/lifecycle/tests.rs +0 -7
- package/crates/team-agent/src/lifecycle/types.rs +2 -21
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +14 -195
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
- package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +71 -572
- package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +11 -211
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
- package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +7 -23
- package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
- package/crates/team-agent/src/provider/tests/idle.rs +0 -68
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +77 -23
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +8 -5
- package/skills/team-agent/command-coverage.json +29 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
- package/skills/team-agent/references/team-agent-operator.md +7 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -19,7 +19,6 @@
|
|
|
19
19
|
|
|
20
20
|
use std::cell::{Cell, RefCell};
|
|
21
21
|
use std::path::Path;
|
|
22
|
-
use std::time::Duration;
|
|
23
22
|
|
|
24
23
|
use rusqlite::{params, OptionalExtension};
|
|
25
24
|
|
|
@@ -27,9 +26,7 @@ use crate::event_log::EventLog;
|
|
|
27
26
|
use crate::message_store::MessageStore;
|
|
28
27
|
use crate::model::enums::{PaneLiveness, Provider};
|
|
29
28
|
use crate::model::ids::TeamKey;
|
|
30
|
-
use crate::provider::wire::
|
|
31
|
-
is_claude_family, parse_canonical_provider, parse_provider, provider_wire,
|
|
32
|
-
};
|
|
29
|
+
use crate::provider::wire::parse_canonical_provider;
|
|
33
30
|
use crate::transport::{
|
|
34
31
|
submit_verification_wire, turn_verification_wire, BusySignalKind, CaptureRange,
|
|
35
32
|
CaptureSampleOutcome, InjectPayload, InjectReport, InjectVerification, InputSurfaceProbe, Key,
|
|
@@ -839,30 +836,18 @@ fn deliver_prepared_message(
|
|
|
839
836
|
);
|
|
840
837
|
// v0.5.113 delivery: address/owner and pane serialization are authoritative;
|
|
841
838
|
// composer appearance is not admission. Native CLIs buffer/queue input.
|
|
842
|
-
let inject_attempt =
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
transport.inject_with_submit_observer(
|
|
849
|
-
&target,
|
|
850
|
-
&payload,
|
|
851
|
-
Key::Enter,
|
|
852
|
-
true,
|
|
853
|
-
Some(&submit_observer),
|
|
854
|
-
)
|
|
855
|
-
},
|
|
856
|
-
)
|
|
857
|
-
},
|
|
839
|
+
let inject_attempt = transport.inject_with_submit_observer(
|
|
840
|
+
&target,
|
|
841
|
+
&payload,
|
|
842
|
+
Key::Enter,
|
|
843
|
+
true,
|
|
844
|
+
Some(&submit_observer),
|
|
858
845
|
);
|
|
859
846
|
let inject_report = match inject_attempt {
|
|
860
847
|
Ok(report) => {
|
|
861
848
|
// grok 忙时第一次回车只入显式队列。默认 send-now:只重按回车顶出去。
|
|
862
849
|
// 无 `Enter:send now` 时零次额外按键,claude/codex 行为不变。
|
|
863
|
-
if !crate::provider::submit_now::keep_provider_queue_requested()
|
|
864
|
-
&& recipient_allows_explicit_queue_flush(state, &message.recipient)
|
|
865
|
-
{
|
|
850
|
+
if !crate::provider::submit_now::keep_provider_queue_requested() {
|
|
866
851
|
match crate::provider::submit_now::flush_explicit_queue(transport, &target) {
|
|
867
852
|
Ok(flush) if flush.extra_enters > 0 => {
|
|
868
853
|
let _ = event_log.write(
|
|
@@ -1102,76 +1087,6 @@ fn deliver_prepared_message(
|
|
|
1102
1087
|
turn_verification: Some(turn_verification),
|
|
1103
1088
|
});
|
|
1104
1089
|
}
|
|
1105
|
-
// S1-CAPTURE-001 (0.4.8, CR M4 Claude phase-1): for Claude/ClaudeCode
|
|
1106
|
-
// recipients with a known authoritative rollout_path, verify the message
|
|
1107
|
-
// token actually reached the worker's transcript before marking
|
|
1108
|
-
// delivered. This catches the gate's mis-attribution: pane inject
|
|
1109
|
-
// succeeded but the token landed in the leader/unassigned transcript,
|
|
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 —
|
|
1112
|
-
// codex/copilot keep the pre-fix behaviour (will be addressed in
|
|
1113
|
-
// phase-2 once Claude phase-1 is field-validated).
|
|
1114
|
-
if let Some((rollout_path, provider_wire_str)) =
|
|
1115
|
-
claude_recipient_rollout(state, &message.recipient)
|
|
1116
|
-
{
|
|
1117
|
-
let token_marker = format!("[team-agent-token:{message_id}]");
|
|
1118
|
-
let grace = std::time::Duration::from_millis(200);
|
|
1119
|
-
let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
|
|
1120
|
-
let transcript_has_token = loop {
|
|
1121
|
-
let found =
|
|
1122
|
-
rollout_tail_contains(&rollout_path, &token_marker, TRANSCRIPT_RECEIPT_TAIL_BYTES);
|
|
1123
|
-
if found || std::time::Instant::now() >= deadline {
|
|
1124
|
-
break found;
|
|
1125
|
-
}
|
|
1126
|
-
std::thread::sleep(grace);
|
|
1127
|
-
};
|
|
1128
|
-
if !transcript_has_token {
|
|
1129
|
-
// Loud but non-fatal: emit a mismatch event for diagnose/status
|
|
1130
|
-
// observability. Do NOT mark delivered — degrade to
|
|
1131
|
-
// submitted_unverified so capture is forced to re-attribute.
|
|
1132
|
-
let reason = format!(
|
|
1133
|
-
"transcript_missing:provider={provider_wire_str},rollout={}",
|
|
1134
|
-
rollout_path.display()
|
|
1135
|
-
);
|
|
1136
|
-
event_log.write(
|
|
1137
|
-
"provider.session.transcript_mismatch",
|
|
1138
|
-
serde_json::json!({
|
|
1139
|
-
"message_id": message_id,
|
|
1140
|
-
"recipient": message.recipient,
|
|
1141
|
-
"provider": provider_wire_str,
|
|
1142
|
-
"rollout_path": rollout_path.to_string_lossy(),
|
|
1143
|
-
"pane_id": state
|
|
1144
|
-
.get("agents")
|
|
1145
|
-
.and_then(|a| a.get(&message.recipient))
|
|
1146
|
-
.and_then(|a| a.get("pane_id"))
|
|
1147
|
-
.and_then(serde_json::Value::as_str)
|
|
1148
|
-
.unwrap_or(""),
|
|
1149
|
-
"spawn_epoch": state
|
|
1150
|
-
.get("agents")
|
|
1151
|
-
.and_then(|a| a.get(&message.recipient))
|
|
1152
|
-
.and_then(|a| a.get("spawn_epoch"))
|
|
1153
|
-
.and_then(serde_json::Value::as_u64)
|
|
1154
|
-
.unwrap_or(0),
|
|
1155
|
-
"reason": "transcript_missing",
|
|
1156
|
-
}),
|
|
1157
|
-
)?;
|
|
1158
|
-
store.mark(message_id, "submitted_unverified", Some(&reason))?;
|
|
1159
|
-
bind_enter_watchdog(store, transport, state, &target, message_id, &message,
|
|
1160
|
-
canonical_owner_team_id.as_deref(), event_log)?;
|
|
1161
|
-
return Ok(DeliveryOutcome {
|
|
1162
|
-
ok: false,
|
|
1163
|
-
status: DeliveryStatus::Failed,
|
|
1164
|
-
message_status: MessageStatusShadow("submitted_unverified".to_string()),
|
|
1165
|
-
message_id: Some(message_id.to_string()),
|
|
1166
|
-
verification: Some(reason),
|
|
1167
|
-
stage: Some(DeliveryStage::Submit),
|
|
1168
|
-
reason: None,
|
|
1169
|
-
channel: None,
|
|
1170
|
-
ack_forced_off: false,
|
|
1171
|
-
turn_verification: Some(turn_verification),
|
|
1172
|
-
});
|
|
1173
|
-
}
|
|
1174
|
-
}
|
|
1175
1090
|
if is_leader_recipient {
|
|
1176
1091
|
store.record_delivery_submission(message_id, readback_verified)?;
|
|
1177
1092
|
match observe_leader_receipt(state, message_id) {
|
|
@@ -2632,20 +2547,16 @@ fn recipient_pane_has_actionable_startup_prompt(
|
|
|
2632
2547
|
_ => return false,
|
|
2633
2548
|
};
|
|
2634
2549
|
match provider {
|
|
2635
|
-
Provider::Codex => matches!(
|
|
2636
|
-
crate::provider::classify_codex_startup_screen(&captured),
|
|
2637
|
-
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2638
|
-
| crate::provider::StartupScreenDecision::SkipUpdatePrompt
|
|
2639
|
-
),
|
|
2640
|
-
Provider::Claude | Provider::ClaudeCode => matches!(
|
|
2641
|
-
crate::provider::classify_claude_startup_screen(&captured),
|
|
2642
|
-
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2643
|
-
),
|
|
2644
2550
|
Provider::Copilot => matches!(
|
|
2645
2551
|
crate::provider::classify_copilot_startup_screen(&captured),
|
|
2646
2552
|
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2647
2553
|
),
|
|
2648
|
-
|
|
2554
|
+
// Claude Code, Codex, Grok and Pi workers run only through their
|
|
2555
|
+
// contract leaves; a legacy row was refused before this peek.
|
|
2556
|
+
Provider::Claude
|
|
2557
|
+
| Provider::ClaudeCode
|
|
2558
|
+
| Provider::Codex
|
|
2559
|
+
| Provider::Pi
|
|
2649
2560
|
| Provider::Grok
|
|
2650
2561
|
| Provider::GeminiCli
|
|
2651
2562
|
| Provider::Fake => false,
|
|
@@ -2662,48 +2573,6 @@ fn recipient_provider(state: &serde_json::Value, recipient: &str) -> Option<Prov
|
|
|
2662
2573
|
.and_then(parse_canonical_provider)
|
|
2663
2574
|
}
|
|
2664
2575
|
|
|
2665
|
-
/// ---
|
|
2666
|
-
/// purpose: paste→Enter 地板按收件人 provider 选择
|
|
2667
|
-
/// contract: Grok 为 1s;其余(含 claude)为 ZERO
|
|
2668
|
-
/// boundary: 不把地板套到 claude/codex
|
|
2669
|
-
/// ---
|
|
2670
|
-
pub(crate) fn paste_to_submit_floor_for_recipient(
|
|
2671
|
-
state: &serde_json::Value,
|
|
2672
|
-
recipient: &str,
|
|
2673
|
-
) -> Duration {
|
|
2674
|
-
match recipient_provider(state, recipient) {
|
|
2675
|
-
Some(Provider::Grok) => {
|
|
2676
|
-
crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR
|
|
2677
|
-
}
|
|
2678
|
-
_ => Duration::ZERO,
|
|
2679
|
-
}
|
|
2680
|
-
}
|
|
2681
|
-
|
|
2682
|
-
/// ---
|
|
2683
|
-
/// purpose: 判断收件 provider 是否必须禁止 submit observer 重按 Enter
|
|
2684
|
-
/// returns: Pi 为 true,其余为 false
|
|
2685
|
-
/// ---
|
|
2686
|
-
pub(crate) fn recipient_requires_single_enter(state: &serde_json::Value, recipient: &str) -> bool {
|
|
2687
|
-
matches!(
|
|
2688
|
-
recipient_provider(state, recipient),
|
|
2689
|
-
Some(Provider::Pi)
|
|
2690
|
-
)
|
|
2691
|
-
}
|
|
2692
|
-
|
|
2693
|
-
/// ---
|
|
2694
|
-
/// purpose: 判断收件 provider 是否允许 Grok send-now 显式队列 flush
|
|
2695
|
-
/// returns: Pi 为 false,其余为 true
|
|
2696
|
-
/// ---
|
|
2697
|
-
pub(crate) fn recipient_allows_explicit_queue_flush(
|
|
2698
|
-
state: &serde_json::Value,
|
|
2699
|
-
recipient: &str,
|
|
2700
|
-
) -> bool {
|
|
2701
|
-
!matches!(
|
|
2702
|
-
recipient_provider(state, recipient),
|
|
2703
|
-
Some(Provider::Pi)
|
|
2704
|
-
)
|
|
2705
|
-
}
|
|
2706
|
-
|
|
2707
2576
|
fn leader_rollout_path(state: &serde_json::Value) -> Option<std::path::PathBuf> {
|
|
2708
2577
|
if let Some(receiver) = leader_receiver_value(state).filter(|receiver| {
|
|
2709
2578
|
receiver.get("provider").and_then(serde_json::Value::as_str) == Some("pi")
|
|
@@ -3595,30 +3464,6 @@ pub fn retry_injection_after_trust_auto_answer(
|
|
|
3595
3464
|
})
|
|
3596
3465
|
}
|
|
3597
3466
|
|
|
3598
|
-
/// S1-CAPTURE-001 (0.4.8 phase-1): returns (rollout_path, provider_wire) when
|
|
3599
|
-
/// the recipient agent is Claude/ClaudeCode with a known authoritative
|
|
3600
|
-
/// rollout_path; otherwise None (skip transcript verify). Phase-1 Claude only —
|
|
3601
|
-
/// codex/copilot return None and keep pre-fix delivery semantics.
|
|
3602
|
-
fn claude_recipient_rollout(
|
|
3603
|
-
state: &serde_json::Value,
|
|
3604
|
-
recipient: &str,
|
|
3605
|
-
) -> Option<(std::path::PathBuf, &'static str)> {
|
|
3606
|
-
let agent = state.get("agents")?.get(recipient)?;
|
|
3607
|
-
let provider = agent
|
|
3608
|
-
.get("provider")
|
|
3609
|
-
.and_then(serde_json::Value::as_str)
|
|
3610
|
-
.and_then(parse_provider)?;
|
|
3611
|
-
if !is_claude_family(provider) {
|
|
3612
|
-
return None;
|
|
3613
|
-
}
|
|
3614
|
-
let provider_wire_str = provider_wire(provider);
|
|
3615
|
-
let rollout = agent
|
|
3616
|
-
.get("rollout_path")
|
|
3617
|
-
.and_then(serde_json::Value::as_str)
|
|
3618
|
-
.filter(|s| !s.is_empty())?;
|
|
3619
|
-
Some((std::path::PathBuf::from(rollout), provider_wire_str))
|
|
3620
|
-
}
|
|
3621
|
-
|
|
3622
3467
|
/// S1-CAPTURE-001 (0.4.8 phase-1): bounded tail read of the rollout file
|
|
3623
3468
|
/// searching for `needle`. Reads up to `tail_bytes` from the end of the file
|
|
3624
3469
|
/// (default 64KB budget). Returns true iff the needle appears in the tail.
|
|
@@ -3859,32 +3704,6 @@ mod consumption_tests;
|
|
|
3859
3704
|
#[cfg(test)]
|
|
3860
3705
|
mod paste_floor_tests {
|
|
3861
3706
|
use super::*;
|
|
3862
|
-
use std::time::Duration;
|
|
3863
|
-
|
|
3864
|
-
fn state_with_provider(provider: &str) -> serde_json::Value {
|
|
3865
|
-
serde_json::json!({
|
|
3866
|
-
"agents": { "w1": { "provider": provider } }
|
|
3867
|
-
})
|
|
3868
|
-
}
|
|
3869
|
-
|
|
3870
|
-
#[test]
|
|
3871
|
-
fn grok_paste_to_submit_floor_is_one_second() {
|
|
3872
|
-
let grok = paste_to_submit_floor_for_recipient(&state_with_provider("grok"), "w1");
|
|
3873
|
-
assert_eq!(grok, crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR);
|
|
3874
|
-
assert_eq!(grok, Duration::from_secs(1));
|
|
3875
|
-
}
|
|
3876
|
-
|
|
3877
|
-
#[test]
|
|
3878
|
-
fn claude_and_codex_paste_to_submit_floor_stays_zero() {
|
|
3879
|
-
assert_eq!(
|
|
3880
|
-
paste_to_submit_floor_for_recipient(&state_with_provider("claude"), "w1"),
|
|
3881
|
-
Duration::ZERO
|
|
3882
|
-
);
|
|
3883
|
-
assert_eq!(
|
|
3884
|
-
paste_to_submit_floor_for_recipient(&state_with_provider("codex"), "w1"),
|
|
3885
|
-
Duration::ZERO
|
|
3886
|
-
);
|
|
3887
|
-
}
|
|
3888
3707
|
|
|
3889
3708
|
fn empty_report() -> InjectReport {
|
|
3890
3709
|
InjectReport {
|
|
@@ -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("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("
|
|
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("
|
|
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("
|
|
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("
|
|
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",
|
|
@@ -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", "copilot");
|
|
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();
|
|
@@ -69,7 +69,7 @@ fn eager_mcp_waits_without_spending_input_attempts_then_delivers_the_same_messag
|
|
|
69
69
|
#[test]
|
|
70
70
|
#[cfg(unix)]
|
|
71
71
|
fn issue372_bounded_handshake_wait_parks_notifies_once_then_publish_delivers() {
|
|
72
|
-
let mut case = WorkerCase::new("mcp-handshake-park", "
|
|
72
|
+
let mut case = WorkerCase::new("mcp-handshake-park", "copilot");
|
|
73
73
|
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
74
74
|
let config = case.workspace.join(".team/runtime/mcp/w1.json");
|
|
75
75
|
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
@@ -131,7 +131,7 @@ fn issue372_bounded_handshake_wait_parks_notifies_once_then_publish_delivers() {
|
|
|
131
131
|
#[test]
|
|
132
132
|
#[cfg(unix)]
|
|
133
133
|
fn issue345_missing_eager_config_defers_without_input_or_attempts() {
|
|
134
|
-
let mut case = WorkerCase::new("missing-mcp-config", "
|
|
134
|
+
let mut case = WorkerCase::new("missing-mcp-config", "copilot");
|
|
135
135
|
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
136
136
|
case.state["team_key"] = serde_json::json!("dup-team");
|
|
137
137
|
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
@@ -226,76 +226,75 @@ fn observer_state_save_failure_after_enter_does_not_return_err() {
|
|
|
226
226
|
}
|
|
227
227
|
|
|
228
228
|
#[test]
|
|
229
|
-
fn
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
}
|
|
229
|
+
fn pane_token_refuses_second_inject_for_copilot() {
|
|
230
|
+
let provider = "copilot";
|
|
231
|
+
let mut case = WorkerCase::new(&format!("token-{provider}"), provider);
|
|
232
|
+
#[cfg(unix)]
|
|
233
|
+
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
234
|
+
#[cfg(not(unix))]
|
|
235
|
+
let carrier = std::process::id();
|
|
236
|
+
let config = case.workspace.join(".team/runtime/mcp/w1.json");
|
|
237
|
+
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
238
|
+
std::fs::write(&config, serde_json::to_vec(&serde_json::json!({
|
|
239
|
+
"mcpServers": {"team_orchestrator": {
|
|
240
|
+
"command": std::env::current_exe().unwrap().canonicalize().unwrap(),
|
|
241
|
+
"env": {"TEAM_AGENT_WORKSPACE": case.workspace, "TEAM_AGENT_ID": "w1", "TEAM_AGENT_OWNER_TEAM_ID": "dup-team"}
|
|
242
|
+
}}
|
|
243
|
+
})).unwrap()).unwrap();
|
|
244
|
+
case.state["team_key"] = serde_json::json!("dup-team");
|
|
245
|
+
case.state["agents"]["w1"]["mcp_config"] = serde_json::json!(config);
|
|
246
|
+
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
247
|
+
case.state["agents"]["w1"]["spawned_at"] = serde_json::json!((chrono::Utc::now() - chrono::Duration::seconds(10)).to_rfc3339());
|
|
248
|
+
case.state["teams"] = serde_json::json!({"dup-team": case.state.clone()});
|
|
249
|
+
crate::state::persist::save_runtime_state(&case.workspace, &case.state).unwrap();
|
|
250
|
+
#[cfg(unix)]
|
|
251
|
+
crate::mcp_server::readiness::publish(&case.workspace, "dup-team", "w1", chrono::Utc::now()).unwrap();
|
|
252
|
+
let transport = RecordingTransport { carrier: Some(carrier), ..RecordingTransport::new("") };
|
|
253
|
+
let message_id = case.store.create_message(None, "leader", "w1", &format!("{provider} canary"), None, false, Some("dup-team")).unwrap();
|
|
254
|
+
let first = deliver_pending_message(
|
|
255
|
+
&case.workspace,
|
|
256
|
+
&case.store,
|
|
257
|
+
&transport,
|
|
258
|
+
&message_id,
|
|
259
|
+
&case.event_log,
|
|
260
|
+
&case.state,
|
|
261
|
+
)
|
|
262
|
+
.expect("first inject");
|
|
263
|
+
assert_eq!(
|
|
264
|
+
transport.inject_count(),
|
|
265
|
+
1,
|
|
266
|
+
"provider={provider} first inject failed: {first:?}"
|
|
267
|
+
);
|
|
268
|
+
|
|
269
|
+
case.store
|
|
270
|
+
.mark(&message_id, "target_resolved", Some("probe_failed"))
|
|
271
|
+
.unwrap();
|
|
272
|
+
let second = deliver_pending_message(
|
|
273
|
+
&case.workspace,
|
|
274
|
+
&case.store,
|
|
275
|
+
&transport,
|
|
276
|
+
&message_id,
|
|
277
|
+
&case.event_log,
|
|
278
|
+
&case.state,
|
|
279
|
+
)
|
|
280
|
+
.expect("second deliver");
|
|
281
|
+
assert_eq!(
|
|
282
|
+
transport.inject_count(),
|
|
283
|
+
1,
|
|
284
|
+
"provider={provider} pane token must refuse second inject: {second:?}"
|
|
285
|
+
);
|
|
286
|
+
assert!(
|
|
287
|
+
second.status == DeliveryStatus::AlreadyDelivered
|
|
288
|
+
|| second.reason == Some(DeliveryRefusal::MessageAlreadyClaimed)
|
|
289
|
+
|| case.events().contains("delivery.duplicate_token_refused"),
|
|
290
|
+
"provider={provider} missing duplicate refuse. outcome={second:?} events={}",
|
|
291
|
+
case.events()
|
|
292
|
+
);
|
|
294
293
|
}
|
|
295
294
|
|
|
296
295
|
#[test]
|
|
297
296
|
fn transcript_token_refuses_second_inject() {
|
|
298
|
-
let case = WorkerCase::new("transcript", "
|
|
297
|
+
let case = WorkerCase::new("transcript", "copilot");
|
|
299
298
|
let message_id = case.seed_leader_to_worker("transcript canary");
|
|
300
299
|
std::fs::write(
|
|
301
300
|
&case.rollout,
|
|
@@ -21,7 +21,7 @@ fn collect_result_file_ingests_valid_known_task_envelope_into_results() {
|
|
|
21
21
|
.unwrap();
|
|
22
22
|
std::fs::write(
|
|
23
23
|
team.join("agents").join("w1.md"),
|
|
24
|
-
"---\nname: w1\nrole: Worker\nprovider:
|
|
24
|
+
"---\nname: w1\nrole: Worker\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nW1.\n",
|
|
25
25
|
)
|
|
26
26
|
.unwrap();
|
|
27
27
|
let spec = crate::compiler::compile_team(&team).expect("compile collect team");
|
|
@@ -35,7 +35,7 @@ fn collect_result_file_ingests_valid_known_task_envelope_into_results() {
|
|
|
35
35
|
&team,
|
|
36
36
|
&serde_json::json!({
|
|
37
37
|
"spec_path": team.join("team.spec.yaml").to_string_lossy(),
|
|
38
|
-
"agents": {"w1": {"status": "running", "provider": "
|
|
38
|
+
"agents": {"w1": {"status": "running", "provider": "fake"}},
|
|
39
39
|
"tasks": [{"id": "task-1", "title": "t", "type": "impl", "assignee": "w1",
|
|
40
40
|
"deps": [], "acceptance": "x", "status": "pending"}]
|
|
41
41
|
}),
|
|
@@ -2508,7 +2508,7 @@ fn collect_task_scoped_result_collects_and_marks_task_done() {
|
|
|
2508
2508
|
&ws,
|
|
2509
2509
|
&serde_json::json!({
|
|
2510
2510
|
"session_name": "team-x",
|
|
2511
|
-
"agents": { "w1": { "provider": "
|
|
2511
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
2512
2512
|
"tasks": [ { "id": "t2", "assignee": "w1", "title": "t2", "status": "pending" } ]
|
|
2513
2513
|
}),
|
|
2514
2514
|
)
|
|
@@ -2571,7 +2571,7 @@ fn collect_output_matches_golden_collected_shape() {
|
|
|
2571
2571
|
&ws,
|
|
2572
2572
|
&serde_json::json!({
|
|
2573
2573
|
"session_name": "team-x",
|
|
2574
|
-
"agents": { "w1": { "provider": "
|
|
2574
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
2575
2575
|
"tasks": [ { "id": "t2", "assignee": "w1", "title": "t2", "status": "pending" } ]
|
|
2576
2576
|
}),
|
|
2577
2577
|
)
|
|
@@ -2653,7 +2653,7 @@ fn send_with_unknown_task_id_raises_unknown_task() {
|
|
|
2653
2653
|
&ws,
|
|
2654
2654
|
&serde_json::json!({
|
|
2655
2655
|
"session_name": "team-x",
|
|
2656
|
-
"agents": { "w1": { "provider": "
|
|
2656
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
2657
2657
|
"tasks": []
|
|
2658
2658
|
}),
|
|
2659
2659
|
)
|
|
@@ -2698,7 +2698,7 @@ fn send_route_task_id_false_skips_task_validation_and_queues() {
|
|
|
2698
2698
|
let ws = tmp_ws("sendroutefalse");
|
|
2699
2699
|
crate::state::persist::save_runtime_state(
|
|
2700
2700
|
&ws,
|
|
2701
|
-
&serde_json::json!({ "session_name": "team-x", "agents": { "w1": { "provider": "
|
|
2701
|
+
&serde_json::json!({ "session_name": "team-x", "agents": { "w1": { "provider": "copilot" } }, "tasks": [] }),
|
|
2702
2702
|
).unwrap();
|
|
2703
2703
|
let _ = store_for(&ws);
|
|
2704
2704
|
let opts = SendOptions {
|
|
@@ -2729,7 +2729,7 @@ fn send_route_task_id_true_known_task_succeeds() {
|
|
|
2729
2729
|
&ws,
|
|
2730
2730
|
&serde_json::json!({
|
|
2731
2731
|
"session_name": "team-x",
|
|
2732
|
-
"agents": { "w1": { "provider": "
|
|
2732
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
2733
2733
|
"tasks": [ { "id": "t-known", "assignee": "w1", "title": "t", "status": "pending" } ]
|
|
2734
2734
|
}),
|
|
2735
2735
|
)
|
|
@@ -377,42 +377,40 @@ fn spine_delivery_busy_recipient_is_injected_without_idle_deferral() {
|
|
|
377
377
|
}
|
|
378
378
|
|
|
379
379
|
#[test]
|
|
380
|
-
fn
|
|
381
|
-
for provider in [
|
|
382
|
-
|
|
380
|
+
fn spine_delivery_refuses_retired_legacy_rows_before_input() {
|
|
381
|
+
for (provider, expected) in [
|
|
382
|
+
("pi", "legacy pi seat has no runtime in this release"),
|
|
383
|
+
("claude", "legacy claude seat has no runtime in this release"),
|
|
384
|
+
("claude_code", "legacy claude seat has no runtime in this release"),
|
|
385
|
+
("codex", "legacy codex seat has no runtime in this release"),
|
|
386
|
+
("codex_cli", "legacy codex seat has no runtime in this release"),
|
|
387
|
+
("codex-cli", "legacy codex seat has no runtime in this release"),
|
|
388
|
+
("grok", "legacy grok seat has no runtime in this release"),
|
|
389
|
+
] {
|
|
390
|
+
let ws = tmp_ws(&format!("retired-{provider}"));
|
|
383
391
|
let store = store_for(&ws);
|
|
384
392
|
let log = EventLog::new(&ws);
|
|
385
393
|
let mid = store
|
|
386
|
-
.create_message(Some("t"), "leader", "w1", "hi", None, true,
|
|
394
|
+
.create_message(Some("t"), "leader", "w1", "hi", None, true, None)
|
|
387
395
|
.unwrap();
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
let
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
crate::state::persist::save_runtime_state(&ws, &state).unwrap();
|
|
407
|
-
let transport = DeliverOkTransport { targets: vec![PaneInfo {
|
|
408
|
-
pane_id: PaneId::new("%spine"), session: SessionName::new("spine"),
|
|
409
|
-
window_index: None, window_name: Some(WindowName::new("w1")), pane_index: None, tty: None,
|
|
410
|
-
current_command: None, current_path: None, active: true,
|
|
411
|
-
pane_pid: Some(carrier), leader_env: BTreeMap::new(),
|
|
412
|
-
}] };
|
|
413
|
-
let delivered = deliver_pending_messages(&ws, &state, &transport, &log).unwrap();
|
|
414
|
-
assert!(delivered.contains(&mid), "{provider}: {:?}", read_event_log(&ws));
|
|
415
|
-
assert_eq!(message_status_of(&store, &mid), "delivered");
|
|
396
|
+
let state = serde_json::json!({"agents": {"w1": {"provider": provider, "status": "running"}}});
|
|
397
|
+
|
|
398
|
+
// NoopTransport panics on any call: the refusal precedes every pane effect.
|
|
399
|
+
let delivered = deliver_pending_messages(&ws, &state, &NoopTransport, &log).unwrap();
|
|
400
|
+
|
|
401
|
+
assert!(delivered.is_empty(), "{provider}");
|
|
402
|
+
assert_ne!(message_status_of(&store, &mid), "delivered", "{provider}");
|
|
403
|
+
let blocked = read_event_log(&ws)
|
|
404
|
+
.into_iter()
|
|
405
|
+
.find(|e| e.get("event").and_then(|v| v.as_str()) == Some("delivery.item_blocked"));
|
|
406
|
+
assert!(
|
|
407
|
+
blocked
|
|
408
|
+
.as_ref()
|
|
409
|
+
.and_then(|e| e.get("error"))
|
|
410
|
+
.and_then(|v| v.as_str())
|
|
411
|
+
.is_some_and(|error| error.contains(expected)),
|
|
412
|
+
"{provider}: {blocked:?}"
|
|
413
|
+
);
|
|
416
414
|
}
|
|
417
415
|
}
|
|
418
416
|
|