@team-agent/installer 0.5.126 → 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 -69
- package/crates/team-agent/src/cli/emit.rs +10 -9
- 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 +45 -0
- package/crates/team-agent/src/cli/mod.rs +13 -1
- package/crates/team-agent/src/cli/models.rs +27 -181
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +2 -2
- package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +36 -9
- package/crates/team-agent/src/compiler.rs +3 -2
- package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +6 -5
- package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
- package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -2
- 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/lifecycle/launch/fork_agent.rs +17 -185
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
- package/crates/team-agent/src/lifecycle/launch.rs +3 -11
- package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
- package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- 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 +37 -240
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
- 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 +6 -124
- 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 +136 -256
- 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/quick_start_worker_readiness_red.rs +7 -7
- 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 -1374
- 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 +5 -5
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- 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 +70 -15
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
- package/crates/team-agent/src/lifecycle/tests.rs +0 -4
- package/crates/team-agent/src/lifecycle/types.rs +2 -5
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +9 -61
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
- 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 +5 -1
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +58 -356
- package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
- package/crates/team-agent/src/provider/session/capture.rs +5 -105
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
- package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
- package/crates/team-agent/src/provider/session_scan.rs +6 -16
- package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
- package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
- package/crates/team-agent/src/provider/tests/idle.rs +0 -43
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -8
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +3 -2
- package/skills/team-agent/command-coverage.json +14 -0
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
- package/skills/team-agent/references/team-agent-operator.md +3 -1
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- 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/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
|
@@ -61,9 +61,6 @@ pub mod event_names {
|
|
|
61
61
|
pub const DISPLAY_ADAPTIVE_BLOCKED: &str = "display.adaptive_blocked";
|
|
62
62
|
pub const DISPLAY_ADAPTIVE_REBUILT: &str = "display.adaptive_rebuilt";
|
|
63
63
|
pub const DISPLAY_ADAPTIVE_CLOSED: &str = "display.adaptive_closed";
|
|
64
|
-
/// Directory-scoped grok toml dropped leftover per-seat `TEAM_AGENT_*` keys.
|
|
65
|
-
/// Fields: `path` (file), `keys` (names only — never values).
|
|
66
|
-
pub const GROK_TOML_PER_SEAT_KEYS_CLEARED: &str = "lifecycle.grok_toml.per_seat_keys_cleared";
|
|
67
64
|
}
|
|
68
65
|
|
|
69
66
|
// ===========================================================================
|
|
@@ -610,8 +607,8 @@ pub struct AddAgentReport {
|
|
|
610
607
|
pub role_file: PathBuf,
|
|
611
608
|
}
|
|
612
609
|
|
|
613
|
-
/// `fork_agent(...)`
|
|
614
|
-
/// 由 contract 管道直接给出回执,不经过这里。
|
|
610
|
+
/// `fork_agent(...)` 结果。legacy 席位不再 fork;Claude Code / Codex / Grok /
|
|
611
|
+
/// Pi 的新席位 fork 由 contract 管道直接给出回执,不经过这里。
|
|
615
612
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
616
613
|
pub struct ForkAgentReport {
|
|
617
614
|
pub source_agent_id: AgentId,
|
|
@@ -39,7 +39,7 @@ impl Case {
|
|
|
39
39
|
assert!(carrier > 1);
|
|
40
40
|
let started = Utc::now();
|
|
41
41
|
let state = json!({"agents": {"worker": {
|
|
42
|
-
"provider": "
|
|
42
|
+
"provider": "copilot", "mcp_config": config,
|
|
43
43
|
"spawned_at": (started - chrono::Duration::seconds(10)).to_rfc3339(),
|
|
44
44
|
"pane_id": "%1", "pane_pid": carrier
|
|
45
45
|
}}});
|
|
@@ -114,24 +114,22 @@ impl Drop for Case {
|
|
|
114
114
|
|
|
115
115
|
#[test]
|
|
116
116
|
fn issue345_missing_mcp_config_does_not_disable_eager_admission() {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
117
|
+
// The Case seat is Copilot, the surviving eager-handshake legacy worker.
|
|
118
|
+
let mut case = Case::new();
|
|
119
|
+
case.state["agents"]["worker"]
|
|
120
|
+
.as_object_mut()
|
|
121
|
+
.unwrap()
|
|
122
|
+
.remove("mcp_config");
|
|
123
|
+
assert!(
|
|
124
|
+
case.admission().is_err(),
|
|
125
|
+
"missing config cannot disable copilot admission"
|
|
126
|
+
);
|
|
127
|
+
for value in [Value::Null, json!(false), json!(""), json!(" ")] {
|
|
128
|
+
case.state["agents"]["worker"]["mcp_config"] = value;
|
|
124
129
|
assert!(
|
|
125
130
|
case.admission().is_err(),
|
|
126
|
-
"
|
|
131
|
+
"invalid config cannot disable copilot admission"
|
|
127
132
|
);
|
|
128
|
-
for value in [Value::Null, json!(false), json!(""), json!(" ")] {
|
|
129
|
-
case.state["agents"]["worker"]["mcp_config"] = value;
|
|
130
|
-
assert!(
|
|
131
|
-
case.admission().is_err(),
|
|
132
|
-
"invalid config cannot disable {provider} admission"
|
|
133
|
-
);
|
|
134
|
-
}
|
|
135
133
|
}
|
|
136
134
|
}
|
|
137
135
|
|
|
@@ -352,7 +350,7 @@ fn config_scope_and_authorized_executable_cannot_be_substituted() {
|
|
|
352
350
|
fn fake_and_pi_keep_their_existing_non_eager_or_runtime_registry_admission() {
|
|
353
351
|
assert!(!crate::provider::get_adapter(Provider::Fake).requires_worker_mcp_handshake());
|
|
354
352
|
assert!(!crate::provider::get_adapter(Provider::Pi).requires_worker_mcp_handshake());
|
|
355
|
-
assert!(crate::provider::get_adapter(Provider::
|
|
353
|
+
assert!(crate::provider::get_adapter(Provider::Copilot).requires_worker_mcp_handshake());
|
|
356
354
|
let case = Case::new();
|
|
357
355
|
for provider in ["fake", "pi"] {
|
|
358
356
|
let mut state = case.state.clone();
|
|
@@ -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
|
|
|
@@ -837,17 +836,12 @@ fn deliver_prepared_message(
|
|
|
837
836
|
);
|
|
838
837
|
// v0.5.113 delivery: address/owner and pane serialization are authoritative;
|
|
839
838
|
// composer appearance is not admission. Native CLIs buffer/queue input.
|
|
840
|
-
let inject_attempt =
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
Key::Enter,
|
|
847
|
-
true,
|
|
848
|
-
Some(&submit_observer),
|
|
849
|
-
)
|
|
850
|
-
},
|
|
839
|
+
let inject_attempt = transport.inject_with_submit_observer(
|
|
840
|
+
&target,
|
|
841
|
+
&payload,
|
|
842
|
+
Key::Enter,
|
|
843
|
+
true,
|
|
844
|
+
Some(&submit_observer),
|
|
851
845
|
);
|
|
852
846
|
let inject_report = match inject_attempt {
|
|
853
847
|
Ok(report) => {
|
|
@@ -2553,18 +2547,15 @@ fn recipient_pane_has_actionable_startup_prompt(
|
|
|
2553
2547
|
_ => return false,
|
|
2554
2548
|
};
|
|
2555
2549
|
match provider {
|
|
2556
|
-
Provider::Codex => matches!(
|
|
2557
|
-
crate::provider::classify_codex_startup_screen(&captured),
|
|
2558
|
-
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2559
|
-
| crate::provider::StartupScreenDecision::SkipUpdatePrompt
|
|
2560
|
-
),
|
|
2561
2550
|
Provider::Copilot => matches!(
|
|
2562
2551
|
crate::provider::classify_copilot_startup_screen(&captured),
|
|
2563
2552
|
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2564
2553
|
),
|
|
2565
|
-
// Claude Code and Pi workers run only through their
|
|
2554
|
+
// Claude Code, Codex, Grok and Pi workers run only through their
|
|
2555
|
+
// contract leaves; a legacy row was refused before this peek.
|
|
2566
2556
|
Provider::Claude
|
|
2567
2557
|
| Provider::ClaudeCode
|
|
2558
|
+
| Provider::Codex
|
|
2568
2559
|
| Provider::Pi
|
|
2569
2560
|
| Provider::Grok
|
|
2570
2561
|
| Provider::GeminiCli
|
|
@@ -2582,23 +2573,6 @@ fn recipient_provider(state: &serde_json::Value, recipient: &str) -> Option<Prov
|
|
|
2582
2573
|
.and_then(parse_canonical_provider)
|
|
2583
2574
|
}
|
|
2584
2575
|
|
|
2585
|
-
/// ---
|
|
2586
|
-
/// purpose: paste→Enter 地板按收件人 provider 选择
|
|
2587
|
-
/// contract: Grok 为 1s;其余(含 claude)为 ZERO
|
|
2588
|
-
/// boundary: 不把地板套到 claude/codex
|
|
2589
|
-
/// ---
|
|
2590
|
-
pub(crate) fn paste_to_submit_floor_for_recipient(
|
|
2591
|
-
state: &serde_json::Value,
|
|
2592
|
-
recipient: &str,
|
|
2593
|
-
) -> Duration {
|
|
2594
|
-
match recipient_provider(state, recipient) {
|
|
2595
|
-
Some(Provider::Grok) => {
|
|
2596
|
-
crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR
|
|
2597
|
-
}
|
|
2598
|
-
_ => Duration::ZERO,
|
|
2599
|
-
}
|
|
2600
|
-
}
|
|
2601
|
-
|
|
2602
2576
|
fn leader_rollout_path(state: &serde_json::Value) -> Option<std::path::PathBuf> {
|
|
2603
2577
|
if let Some(receiver) = leader_receiver_value(state).filter(|receiver| {
|
|
2604
2578
|
receiver.get("provider").and_then(serde_json::Value::as_str) == Some("pi")
|
|
@@ -3730,32 +3704,6 @@ mod consumption_tests;
|
|
|
3730
3704
|
#[cfg(test)]
|
|
3731
3705
|
mod paste_floor_tests {
|
|
3732
3706
|
use super::*;
|
|
3733
|
-
use std::time::Duration;
|
|
3734
|
-
|
|
3735
|
-
fn state_with_provider(provider: &str) -> serde_json::Value {
|
|
3736
|
-
serde_json::json!({
|
|
3737
|
-
"agents": { "w1": { "provider": provider } }
|
|
3738
|
-
})
|
|
3739
|
-
}
|
|
3740
|
-
|
|
3741
|
-
#[test]
|
|
3742
|
-
fn grok_paste_to_submit_floor_is_one_second() {
|
|
3743
|
-
let grok = paste_to_submit_floor_for_recipient(&state_with_provider("grok"), "w1");
|
|
3744
|
-
assert_eq!(grok, crate::tmux_backend::CURSOR_PASTE_TO_SUBMIT_FLOOR);
|
|
3745
|
-
assert_eq!(grok, Duration::from_secs(1));
|
|
3746
|
-
}
|
|
3747
|
-
|
|
3748
|
-
#[test]
|
|
3749
|
-
fn claude_and_codex_paste_to_submit_floor_stays_zero() {
|
|
3750
|
-
assert_eq!(
|
|
3751
|
-
paste_to_submit_floor_for_recipient(&state_with_provider("claude"), "w1"),
|
|
3752
|
-
Duration::ZERO
|
|
3753
|
-
);
|
|
3754
|
-
assert_eq!(
|
|
3755
|
-
paste_to_submit_floor_for_recipient(&state_with_provider("codex"), "w1"),
|
|
3756
|
-
Duration::ZERO
|
|
3757
|
-
);
|
|
3758
|
-
}
|
|
3759
3707
|
|
|
3760
3708
|
fn empty_report() -> InjectReport {
|
|
3761
3709
|
InjectReport {
|
|
@@ -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,71 +226,70 @@ 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]
|
|
@@ -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,11 +377,15 @@ fn spine_delivery_busy_recipient_is_injected_without_idle_deferral() {
|
|
|
377
377
|
}
|
|
378
378
|
|
|
379
379
|
#[test]
|
|
380
|
-
fn
|
|
380
|
+
fn spine_delivery_refuses_retired_legacy_rows_before_input() {
|
|
381
381
|
for (provider, expected) in [
|
|
382
382
|
("pi", "legacy pi seat has no runtime in this release"),
|
|
383
383
|
("claude", "legacy claude seat has no runtime in this release"),
|
|
384
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"),
|
|
385
389
|
] {
|
|
386
390
|
let ws = tmp_ws(&format!("retired-{provider}"));
|
|
387
391
|
let store = store_for(&ws);
|
|
@@ -262,8 +262,8 @@ fn u1_c_delivery_peek_uses_tail_eighty_not_full() {
|
|
|
262
262
|
"session_name": "team-tail-range",
|
|
263
263
|
"agents": {
|
|
264
264
|
"w1": {
|
|
265
|
-
"provider": "
|
|
266
|
-
"pane_id": "%
|
|
265
|
+
"provider": "copilot",
|
|
266
|
+
"pane_id": "%cop",
|
|
267
267
|
"window": "w1",
|
|
268
268
|
"startup_prompts": "pending", // NOT handled — triggers peek path
|
|
269
269
|
}
|
|
@@ -274,20 +274,20 @@ fn u1_c_delivery_peek_uses_tail_eighty_not_full() {
|
|
|
274
274
|
.create_message(None, "leader", "w1", "ping", None, false, None)
|
|
275
275
|
.unwrap();
|
|
276
276
|
|
|
277
|
-
//
|
|
277
|
+
// A ready Copilot screen → classify returns Ready → peek returns false → inject
|
|
278
278
|
// proceeds. We only care about WHICH range the peek site asked for.
|
|
279
279
|
let transport = OfflineTransport::new()
|
|
280
|
-
.with_targets(vec![pane_info_w("%
|
|
280
|
+
.with_targets(vec![pane_info_w("%cop", "team-tail-range", "w1")])
|
|
281
281
|
.with_session_present(true)
|
|
282
282
|
.with_default_liveness(PaneLiveness::Live)
|
|
283
|
-
.with_capture_for_pane("%
|
|
283
|
+
.with_capture_for_pane("%cop", crate::provider::COPILOT_READY_MARKER);
|
|
284
284
|
|
|
285
285
|
let _ = deliver_pending_message(&ws, &store, &transport, &message_id, &log, &state).unwrap();
|
|
286
286
|
|
|
287
287
|
let ranges = transport.capture_ranges();
|
|
288
288
|
assert!(
|
|
289
289
|
!ranges.is_empty(),
|
|
290
|
-
"U1-C: delivery peek must call capture() for
|
|
290
|
+
"U1-C: delivery peek must call capture() for copilot worker with non-terminal \
|
|
291
291
|
startup_prompts; got no capture calls"
|
|
292
292
|
);
|
|
293
293
|
assert!(
|
|
@@ -304,12 +304,12 @@ fn u1_c_delivery_peek_uses_tail_eighty_not_full() {
|
|
|
304
304
|
);
|
|
305
305
|
}
|
|
306
306
|
|
|
307
|
-
/// **Regression guard**: a TRULY actionable
|
|
307
|
+
/// **Regression guard**: a TRULY actionable copilot trust modal — startup_prompts
|
|
308
308
|
/// pending, Tail(80) capture shows the live trust modal in the visible region.
|
|
309
309
|
///
|
|
310
310
|
/// **Expectation (unchanged)**: still parks as `queued_until_trust`. Wave-2 must
|
|
311
311
|
/// not regress the legitimate trust-defer path: a live modal in Tail(80) is
|
|
312
|
-
/// still detected by the
|
|
312
|
+
/// still detected by the Copilot trust recognizer.
|
|
313
313
|
#[test]
|
|
314
314
|
fn u1_c_delivery_real_trust_modal_still_parks_queued_until_trust() {
|
|
315
315
|
let ws = tmp_ws("u1c-realtrust");
|
|
@@ -319,8 +319,8 @@ fn u1_c_delivery_real_trust_modal_still_parks_queued_until_trust() {
|
|
|
319
319
|
"session_name": "team-realtrust",
|
|
320
320
|
"agents": {
|
|
321
321
|
"w1": {
|
|
322
|
-
"provider": "
|
|
323
|
-
"pane_id": "%
|
|
322
|
+
"provider": "copilot",
|
|
323
|
+
"pane_id": "%cop",
|
|
324
324
|
"window": "w1",
|
|
325
325
|
"startup_prompts": "pending",
|
|
326
326
|
}
|
|
@@ -331,19 +331,12 @@ fn u1_c_delivery_real_trust_modal_still_parks_queued_until_trust() {
|
|
|
331
331
|
.create_message(None, "leader", "w1", "ping", None, false, None)
|
|
332
332
|
.unwrap();
|
|
333
333
|
|
|
334
|
-
// Live trust modal — fits well inside Tail(80).
|
|
335
|
-
let live_trust = "\
|
|
336
|
-
Loading codex...
|
|
337
|
-
Do you trust the contents of this directory?
|
|
338
|
-
› 1. Yes, continue
|
|
339
|
-
› 2. No, exit
|
|
340
|
-
";
|
|
341
|
-
|
|
334
|
+
// Live Copilot trust modal — fits well inside Tail(80).
|
|
342
335
|
let transport = OfflineTransport::new()
|
|
343
|
-
.with_targets(vec![pane_info_w("%
|
|
336
|
+
.with_targets(vec![pane_info_w("%cop", "team-realtrust", "w1")])
|
|
344
337
|
.with_session_present(true)
|
|
345
338
|
.with_default_liveness(PaneLiveness::Live)
|
|
346
|
-
.with_capture_for_pane("%
|
|
339
|
+
.with_capture_for_pane("%cop", crate::provider::COPILOT_TRUST_PROMPT_MARKER);
|
|
347
340
|
|
|
348
341
|
let out = deliver_pending_message(&ws, &store, &transport, &message_id, &log, &state).unwrap();
|
|
349
342
|
|