@team-agent/installer 0.5.124 → 0.5.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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 -69
- package/crates/team-agent/src/cli/emit.rs +45 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
- 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 +28 -33
- package/crates/team-agent/src/cli/models.rs +44 -880
- 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/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +39 -8
- package/crates/team-agent/src/compiler.rs +28 -204
- package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
- package/crates/team-agent/src/contract_runtime/config.rs +37 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- 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 +1 -2
- 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 +15 -195
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -61
- 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 -43
- package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
- 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 +42 -3
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- 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 +60 -145
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- 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 +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -153
- package/crates/team-agent/src/lifecycle/tests.rs +0 -6
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- 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 +185 -168
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- 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 +67 -5
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +33 -302
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
- 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 +14 -273
- package/crates/team-agent/src/provider/session/capture.rs +7 -107
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
- package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -14
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +79 -11
- 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/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 +7 -5
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- 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/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/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/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/cursor_agent.rs +0 -44
- 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_scan/claude.rs +0 -523
- 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
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -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 ["
|
|
229
|
+
fn pane_token_refuses_second_inject_for_copilot_grok() {
|
|
230
|
+
for provider in ["copilot", "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();
|
|
@@ -233,7 +295,7 @@ fn pane_token_refuses_second_inject_for_claude_grok_cursor() {
|
|
|
233
295
|
|
|
234
296
|
#[test]
|
|
235
297
|
fn transcript_token_refuses_second_inject() {
|
|
236
|
-
let case = WorkerCase::new("transcript", "
|
|
298
|
+
let case = WorkerCase::new("transcript", "copilot");
|
|
237
299
|
let message_id = case.seed_leader_to_worker("transcript canary");
|
|
238
300
|
std::fs::write(
|
|
239
301
|
&case.rollout,
|
|
@@ -1255,6 +1255,8 @@ fn fire_due_scheduled_events_fires_each_scheduled_kind() {
|
|
|
1255
1255
|
|
|
1256
1256
|
struct UnverifiedInjectTransport {
|
|
1257
1257
|
readback_visible: bool,
|
|
1258
|
+
/// #379: the recipient's transcript, written at submit like a native CLI.
|
|
1259
|
+
receipt: Option<PathBuf>,
|
|
1258
1260
|
}
|
|
1259
1261
|
impl Transport for UnverifiedInjectTransport {
|
|
1260
1262
|
fn kind(&self) -> BackendKind {
|
|
@@ -1283,10 +1285,14 @@ impl Transport for UnverifiedInjectTransport {
|
|
|
1283
1285
|
fn inject(
|
|
1284
1286
|
&self,
|
|
1285
1287
|
_t: &Target,
|
|
1286
|
-
|
|
1288
|
+
p: &InjectPayload,
|
|
1287
1289
|
_s: Key,
|
|
1288
1290
|
_b: bool,
|
|
1289
1291
|
) -> Result<InjectReport, TransportError> {
|
|
1292
|
+
if let (Some(path), Some(text)) = (&self.receipt, p.text()) {
|
|
1293
|
+
let row = serde_json::json!({"type": "queue-operation", "operation": "enqueue", "content": text});
|
|
1294
|
+
std::fs::write(path, format!("{row}\n")).unwrap();
|
|
1295
|
+
}
|
|
1290
1296
|
Ok(InjectReport {
|
|
1291
1297
|
stage_reached: crate::transport::InjectStage::Submit,
|
|
1292
1298
|
inject_verification: if self.readback_visible {
|
|
@@ -1575,6 +1581,7 @@ fn deliver_pending_submit_unverified_is_not_saved_by_readback() {
|
|
|
1575
1581
|
&store,
|
|
1576
1582
|
&UnverifiedInjectTransport {
|
|
1577
1583
|
readback_visible: true,
|
|
1584
|
+
receipt: None,
|
|
1578
1585
|
},
|
|
1579
1586
|
&message_id,
|
|
1580
1587
|
&log,
|
|
@@ -1619,12 +1626,21 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
|
|
|
1619
1626
|
let message_id = store
|
|
1620
1627
|
.create_message(None, "leader", "w1", "ping", None, false, None)
|
|
1621
1628
|
.unwrap();
|
|
1629
|
+
// #379: exhaustion is the outer delivery budget; this is its last attempt.
|
|
1630
|
+
crate::db::schema::open_db(store.db_path())
|
|
1631
|
+
.unwrap()
|
|
1632
|
+
.execute(
|
|
1633
|
+
"update messages set delivery_attempts = ?2 where message_id = ?1",
|
|
1634
|
+
rusqlite::params![message_id, i64::from(SEND_RETRY_MAX_ATTEMPTS) - 1],
|
|
1635
|
+
)
|
|
1636
|
+
.unwrap();
|
|
1622
1637
|
|
|
1623
1638
|
let out = deliver_pending_message(
|
|
1624
1639
|
&ws,
|
|
1625
1640
|
&store,
|
|
1626
1641
|
&UnverifiedInjectTransport {
|
|
1627
1642
|
readback_visible: false,
|
|
1643
|
+
receipt: None,
|
|
1628
1644
|
},
|
|
1629
1645
|
&message_id,
|
|
1630
1646
|
&log,
|
|
@@ -1636,9 +1652,10 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
|
|
|
1636
1652
|
assert_eq!(out.message_status.0, "failed");
|
|
1637
1653
|
let events = log.tail(0).unwrap();
|
|
1638
1654
|
assert!(
|
|
1639
|
-
events.iter().any(
|
|
1640
|
-
|
|
1641
|
-
|
|
1655
|
+
events.iter().any(|event| {
|
|
1656
|
+
event.get("event").and_then(serde_json::Value::as_str) == Some("send.failed")
|
|
1657
|
+
&& event.get("attempts") == Some(&serde_json::json!(SEND_RETRY_MAX_ATTEMPTS))
|
|
1658
|
+
}),
|
|
1642
1659
|
"exhausted unverified send must emit send.failed; got {events:?}"
|
|
1643
1660
|
);
|
|
1644
1661
|
assert!(
|
|
@@ -1650,6 +1667,95 @@ fn deliver_pending_exhausted_unverified_send_emits_failed_event() {
|
|
|
1650
1667
|
);
|
|
1651
1668
|
}
|
|
1652
1669
|
|
|
1670
|
+
#[test]
|
|
1671
|
+
fn issue379_inner_enter_presses_do_not_spend_the_delivery_budget() {
|
|
1672
|
+
let ws = tmp_ws("innerenters");
|
|
1673
|
+
let store = store_for(&ws);
|
|
1674
|
+
let log = EventLog::new(&ws);
|
|
1675
|
+
let state = serde_json::json!({
|
|
1676
|
+
"session_name": "team-innerenters",
|
|
1677
|
+
"leader_receiver": {"pane_id": "%leader"},
|
|
1678
|
+
"agents": {"w1": {"provider": "fake", "pane_id": "%1"}}
|
|
1679
|
+
});
|
|
1680
|
+
crate::state::persist::save_runtime_state(&ws, &state).unwrap();
|
|
1681
|
+
let message_id = store
|
|
1682
|
+
.create_message(None, "leader", "w1", "ping", None, false, None)
|
|
1683
|
+
.unwrap();
|
|
1684
|
+
|
|
1685
|
+
// One delivery whose verifier pressed Enter SEND_RETRY_MAX_ATTEMPTS times.
|
|
1686
|
+
let out = deliver_pending_message(
|
|
1687
|
+
&ws,
|
|
1688
|
+
&store,
|
|
1689
|
+
&UnverifiedInjectTransport {
|
|
1690
|
+
readback_visible: false,
|
|
1691
|
+
receipt: None,
|
|
1692
|
+
},
|
|
1693
|
+
&message_id,
|
|
1694
|
+
&log,
|
|
1695
|
+
&state,
|
|
1696
|
+
)
|
|
1697
|
+
.unwrap();
|
|
1698
|
+
|
|
1699
|
+
assert_eq!(out.message_status.0, "submitted_unverified", "{out:?}");
|
|
1700
|
+
let events = log.tail(0).unwrap();
|
|
1701
|
+
let event = |name: &str| {
|
|
1702
|
+
events
|
|
1703
|
+
.iter()
|
|
1704
|
+
.find(|event| event.get("event").and_then(serde_json::Value::as_str) == Some(name))
|
|
1705
|
+
};
|
|
1706
|
+
assert!(event("send.failed").is_none(), "first attempt is not exhausted; got {events:?}");
|
|
1707
|
+
let unverified = event("send.unverified").expect("send.unverified");
|
|
1708
|
+
assert_eq!(unverified.get("attempts"), Some(&serde_json::json!(SEND_RETRY_MAX_ATTEMPTS)));
|
|
1709
|
+
assert_eq!(unverified.get("delivery_attempt"), Some(&serde_json::json!(1)));
|
|
1710
|
+
}
|
|
1711
|
+
|
|
1712
|
+
#[test]
|
|
1713
|
+
fn issue379_recipient_transcript_receipt_upgrades_an_unread_pane_to_delivered() {
|
|
1714
|
+
let ws = tmp_ws("transcriptreceipt");
|
|
1715
|
+
let store = store_for(&ws);
|
|
1716
|
+
let log = EventLog::new(&ws);
|
|
1717
|
+
let rollout = ws.join("w1-transcript.jsonl");
|
|
1718
|
+
let state = serde_json::json!({
|
|
1719
|
+
"session_name": "team-transcriptreceipt",
|
|
1720
|
+
"leader_receiver": {"pane_id": "%leader"},
|
|
1721
|
+
"agents": {"w1": {"provider": "fake", "pane_id": "%1", "rollout_path": rollout}}
|
|
1722
|
+
});
|
|
1723
|
+
crate::state::persist::save_runtime_state(&ws, &state).unwrap();
|
|
1724
|
+
let message_id = store
|
|
1725
|
+
.create_message(None, "leader", "w1", "ping", None, false, None)
|
|
1726
|
+
.unwrap();
|
|
1727
|
+
crate::db::schema::open_db(store.db_path())
|
|
1728
|
+
.unwrap()
|
|
1729
|
+
.execute(
|
|
1730
|
+
"update messages set delivery_attempts = ?2 where message_id = ?1",
|
|
1731
|
+
rusqlite::params![message_id, i64::from(SEND_RETRY_MAX_ATTEMPTS) - 1],
|
|
1732
|
+
)
|
|
1733
|
+
.unwrap();
|
|
1734
|
+
|
|
1735
|
+
let out = deliver_pending_message(
|
|
1736
|
+
&ws,
|
|
1737
|
+
&store,
|
|
1738
|
+
&UnverifiedInjectTransport {
|
|
1739
|
+
readback_visible: false,
|
|
1740
|
+
receipt: Some(rollout),
|
|
1741
|
+
},
|
|
1742
|
+
&message_id,
|
|
1743
|
+
&log,
|
|
1744
|
+
&state,
|
|
1745
|
+
)
|
|
1746
|
+
.unwrap();
|
|
1747
|
+
|
|
1748
|
+
assert!(out.ok, "{out:?}");
|
|
1749
|
+
assert_eq!(out.message_status.0, "delivered");
|
|
1750
|
+
let events = log.tail(0).unwrap();
|
|
1751
|
+
let names: Vec<_> = events
|
|
1752
|
+
.iter()
|
|
1753
|
+
.filter_map(|event| event.get("event").and_then(serde_json::Value::as_str))
|
|
1754
|
+
.collect();
|
|
1755
|
+
assert!(names.contains(&"send.unverified_reconciled"), "{names:?}");
|
|
1756
|
+
assert!(!names.contains(&"send.unverified") && !names.contains(&"send.failed"), "{names:?}");
|
|
1757
|
+
}
|
|
1758
|
+
|
|
1653
1759
|
#[test]
|
|
1654
1760
|
fn slice1_inject_failures_are_bounded_and_stop_retrying_same_message() {
|
|
1655
1761
|
let ws = tmp_ws("injectstorm");
|
|
@@ -377,46 +377,36 @@ 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_claude_and_pi_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
|
+
] {
|
|
386
|
+
let ws = tmp_ws(&format!("retired-{provider}"));
|
|
383
387
|
let store = store_for(&ws);
|
|
384
388
|
let log = EventLog::new(&ws);
|
|
385
389
|
let mid = store
|
|
386
|
-
.create_message(Some("t"), "leader", "w1", "hi", None, true,
|
|
390
|
+
.create_message(Some("t"), "leader", "w1", "hi", None, true, None)
|
|
387
391
|
.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
|
-
#[cfg(unix)]
|
|
408
|
-
if provider == "cursor_agent" {
|
|
409
|
-
crate::mcp_server::readiness::publish(&ws, "spine-team", "w1", chrono::Utc::now()).unwrap();
|
|
410
|
-
}
|
|
411
|
-
let transport = DeliverOkTransport { targets: vec![PaneInfo {
|
|
412
|
-
pane_id: PaneId::new("%spine"), session: SessionName::new("spine"),
|
|
413
|
-
window_index: None, window_name: Some(WindowName::new("w1")), pane_index: None, tty: None,
|
|
414
|
-
current_command: None, current_path: None, active: true,
|
|
415
|
-
pane_pid: Some(carrier), leader_env: BTreeMap::new(),
|
|
416
|
-
}] };
|
|
417
|
-
let delivered = deliver_pending_messages(&ws, &state, &transport, &log).unwrap();
|
|
418
|
-
assert!(delivered.contains(&mid), "{provider}: {:?}", read_event_log(&ws));
|
|
419
|
-
assert_eq!(message_status_of(&store, &mid), "delivered");
|
|
392
|
+
let state = serde_json::json!({"agents": {"w1": {"provider": provider, "status": "running"}}});
|
|
393
|
+
|
|
394
|
+
// NoopTransport panics on any call: the refusal precedes every pane effect.
|
|
395
|
+
let delivered = deliver_pending_messages(&ws, &state, &NoopTransport, &log).unwrap();
|
|
396
|
+
|
|
397
|
+
assert!(delivered.is_empty(), "{provider}");
|
|
398
|
+
assert_ne!(message_status_of(&store, &mid), "delivered", "{provider}");
|
|
399
|
+
let blocked = read_event_log(&ws)
|
|
400
|
+
.into_iter()
|
|
401
|
+
.find(|e| e.get("event").and_then(|v| v.as_str()) == Some("delivery.item_blocked"));
|
|
402
|
+
assert!(
|
|
403
|
+
blocked
|
|
404
|
+
.as_ref()
|
|
405
|
+
.and_then(|e| e.get("error"))
|
|
406
|
+
.and_then(|v| v.as_str())
|
|
407
|
+
.is_some_and(|error| error.contains(expected)),
|
|
408
|
+
"{provider}: {blocked:?}"
|
|
409
|
+
);
|
|
420
410
|
}
|
|
421
411
|
}
|
|
422
412
|
|
|
@@ -821,3 +811,23 @@ fn e47_iron_law_no_signal_in_bottom_region_stays_uncertain_not_idle() {
|
|
|
821
811
|
composer → Uncertain, never silently Idle. Got {a:?}"
|
|
822
812
|
);
|
|
823
813
|
}
|
|
814
|
+
|
|
815
|
+
// #379: Claude Code's spinner row sits above its composer box (outside the
|
|
816
|
+
// bottom five rows) while a finished turn's `✻ Worked for 3s` sits inside them.
|
|
817
|
+
fn claude_379_scrollback(above: &str) -> String {
|
|
818
|
+
let rule = "─".repeat(56);
|
|
819
|
+
format!(
|
|
820
|
+
"❯ do the task\n\n⏺ Working through the files.\n\n{above}\n ◐ medium · /effort\n{rule}\n❯ \n{rule}\n ⏵⏵ bypass permissions on (shift+tab to cycle)\n"
|
|
821
|
+
)
|
|
822
|
+
}
|
|
823
|
+
|
|
824
|
+
#[test]
|
|
825
|
+
fn issue379_claude_spinner_above_the_box_is_working_and_a_finished_turn_is_idle() {
|
|
826
|
+
let st = serde_json::json!({});
|
|
827
|
+
for spinner in ["· Waddling…", "✢ Boondoggling… (3s · thinking)"] {
|
|
828
|
+
let a = classify_agent_activity(&st, &claude_379_scrollback(spinner), false, None, None);
|
|
829
|
+
assert_eq!(a.status, ActivityStatus::Working, "{spinner}: {a:?}");
|
|
830
|
+
}
|
|
831
|
+
let a = classify_agent_activity(&st, &claude_379_scrollback("✻ Worked for 3s"), false, None, None);
|
|
832
|
+
assert_eq!(a.status, ActivityStatus::Idle, "{a:?}");
|
|
833
|
+
}
|
|
@@ -24,9 +24,6 @@ pub enum Provider {
|
|
|
24
24
|
/// Grok CLI (0.5.67 provider-adapter). Append system prompt via `--rules`,
|
|
25
25
|
/// bypass `--always-approve`, session `--session-id`.
|
|
26
26
|
Grok,
|
|
27
|
-
/// Cursor `agent` CLI (0.5.67 provider-adapter). Append system prompt via
|
|
28
|
-
/// workspace `.cursor/rules/*.mdc` (方案 1 变体), bypass `--force`.
|
|
29
|
-
CursorAgent,
|
|
30
27
|
/// Pi coding agent CLI. Models are selected from its live catalog.
|
|
31
28
|
Pi,
|
|
32
29
|
Fake,
|
|
@@ -45,7 +42,6 @@ pub enum Provider {
|
|
|
45
42
|
/// - pi: low|medium|high|xhigh|max → `--thinking <level>`
|
|
46
43
|
/// - grok: low|medium|high|xhigh → `--effort <level>`; max/ultra rejected
|
|
47
44
|
/// - copilot / gemini_cli / fake: low..xhigh ignored with warning; max/ultra rejected
|
|
48
|
-
/// - cursor_agent: all effort rejected
|
|
49
45
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
|
50
46
|
pub enum ProviderEffort {
|
|
51
47
|
#[serde(rename = "low")]
|
|
@@ -95,7 +91,7 @@ impl ProviderEffort {
|
|
|
95
91
|
Provider::Codex => true,
|
|
96
92
|
Provider::Claude | Provider::ClaudeCode | Provider::Pi => self != Self::Ultra,
|
|
97
93
|
Provider::Grok => !matches!(self, Self::Max | Self::Ultra),
|
|
98
|
-
Provider::Copilot | Provider::GeminiCli | Provider::
|
|
94
|
+
Provider::Copilot | Provider::GeminiCli | Provider::Fake => {
|
|
99
95
|
false
|
|
100
96
|
}
|
|
101
97
|
}
|
|
@@ -104,9 +100,6 @@ impl ProviderEffort {
|
|
|
104
100
|
/// One admission policy for compiler, direct specs and runtime commands.
|
|
105
101
|
/// Ok(None) preserves the legacy warning-and-ignore providers.
|
|
106
102
|
pub fn resolve_for_provider(self, provider: Provider) -> Result<Option<Self>, &'static str> {
|
|
107
|
-
if provider == Provider::CursorAgent {
|
|
108
|
-
return Err("cursor_agent does not support effort; the Cursor CLI has no --effort flag");
|
|
109
|
-
}
|
|
110
103
|
if self.is_supported_by(provider) {
|
|
111
104
|
Ok(Some(self))
|
|
112
105
|
} else if self == Self::Ultra {
|