@team-agent/installer 0.5.123 → 0.5.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -1
- package/crates/team-agent/src/cli/emit.rs +41 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +30 -54
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +59 -118
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +6 -5
- package/crates/team-agent/src/cli/models.rs +93 -128
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +21 -5
- package/crates/team-agent/src/compiler.rs +24 -1
- package/crates/team-agent/src/contract_runtime/backend.rs +30 -6
- package/crates/team-agent/src/contract_runtime/config.rs +34 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +79 -56
- package/crates/team-agent/src/contract_runtime/framework.rs +89 -34
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -24
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +0 -1
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +14 -1
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +19 -101
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +0 -28
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -20
- package/crates/team-agent/src/lifecycle/profile_launch.rs +11 -39
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +1 -63
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +43 -13
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +6 -2
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +1 -3
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +4 -16
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +1 -3
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +84 -53
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +19 -1
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +21 -0
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -137
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +186 -38
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +4 -4
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +66 -4
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +22 -6
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +1 -67
- package/crates/team-agent/src/provider/adapters/mod.rs +0 -1
- package/crates/team-agent/src/provider/adapters/pi.rs +4 -4
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +2 -73
- package/crates/team-agent/src/provider/session/capture.rs +1 -1
- package/crates/team-agent/src/provider/session/context_fork.rs +4 -4
- package/crates/team-agent/src/provider/session_scan/common.rs +1 -2
- package/crates/team-agent/src/provider/session_scan/pi.rs +32 -19
- package/crates/team-agent/src/provider/session_scan.rs +0 -4
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +5 -184
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -6
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +48 -8
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/npm/install.mjs +40 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +1 -1
- package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
|
@@ -5,7 +5,7 @@ use std::fs::{File, OpenOptions};
|
|
|
5
5
|
use std::io::{Read, Write};
|
|
6
6
|
use std::os::unix::fs::{DirBuilderExt, MetadataExt, OpenOptionsExt};
|
|
7
7
|
use std::path::{Path, PathBuf};
|
|
8
|
-
use std::time::
|
|
8
|
+
use std::time::Duration;
|
|
9
9
|
|
|
10
10
|
use chrono::{DateTime, Utc};
|
|
11
11
|
use serde::{Deserialize, Serialize};
|
|
@@ -105,34 +105,26 @@ fn read_json(path: &Path, require_private: bool) -> Result<Value> {
|
|
|
105
105
|
serde_json::from_slice(&data).map_err(|_| "mcp_handshake_invalid")
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
108
|
+
/// Per-server receipts plus the pre-#372 single-slot file, if one remains.
|
|
109
|
+
fn receipt_paths(dir: &Path, name: &str) -> Vec<PathBuf> {
|
|
110
|
+
let Ok(entries) = std::fs::read_dir(dir) else {
|
|
111
|
+
return Vec::new();
|
|
112
|
+
};
|
|
113
|
+
entries
|
|
114
|
+
.flatten()
|
|
115
|
+
.filter_map(|entry| {
|
|
116
|
+
let file = entry.file_name().into_string().ok()?;
|
|
117
|
+
let rest = file.strip_prefix(name)?.strip_suffix(".json")?;
|
|
118
|
+
let per_server = rest
|
|
119
|
+
.strip_prefix('.')
|
|
120
|
+
.is_some_and(|pid| pid.parse::<u32>().is_ok());
|
|
121
|
+
(rest.is_empty() || per_server).then(|| entry.path())
|
|
122
|
+
})
|
|
123
|
+
.collect()
|
|
113
124
|
}
|
|
114
125
|
|
|
115
|
-
fn
|
|
116
|
-
|
|
117
|
-
.create(true)
|
|
118
|
-
.truncate(false)
|
|
119
|
-
.read(true)
|
|
120
|
-
.write(true)
|
|
121
|
-
.mode(0o600)
|
|
122
|
-
.custom_flags(libc::O_NOFOLLOW)
|
|
123
|
-
.open(path)
|
|
124
|
-
.map_err(|_| "mcp_handshake_lock")?;
|
|
125
|
-
private_metadata(path, false)?;
|
|
126
|
-
let start = Instant::now();
|
|
127
|
-
loop {
|
|
128
|
-
match crate::platform::file_lock::try_lock_once_nonblocking(&file) {
|
|
129
|
-
Ok(true) => return Ok(ReceiptLock(file)),
|
|
130
|
-
Ok(false) if start.elapsed() < Duration::from_millis(500) => {
|
|
131
|
-
std::thread::sleep(Duration::from_millis(10));
|
|
132
|
-
}
|
|
133
|
-
_ => return Err("mcp_handshake_lock"),
|
|
134
|
-
}
|
|
135
|
-
}
|
|
126
|
+
fn read_receipt(path: &Path) -> Result<Handshake> {
|
|
127
|
+
serde_json::from_value(read_json(path, true)?).map_err(|_| "mcp_handshake_invalid")
|
|
136
128
|
}
|
|
137
129
|
|
|
138
130
|
/// Only the actual stdio writer calls this after initialize and tools/list flush.
|
|
@@ -198,28 +190,28 @@ pub(crate) fn publish(
|
|
|
198
190
|
let dir = directory(&workspace, true)?;
|
|
199
191
|
let before = private_metadata(&dir, true)?;
|
|
200
192
|
let name = key(owner, agent);
|
|
201
|
-
|
|
202
|
-
|
|
193
|
+
// #372: each server owns its receipt, so a foreign or exited server that
|
|
194
|
+
// inherited this seat's identity can never erase the seat's live evidence.
|
|
195
|
+
let path = dir.join(format!("{name}.{}.json", std::process::id()));
|
|
203
196
|
match std::fs::symlink_metadata(&path) {
|
|
204
197
|
Ok(_) => {
|
|
205
|
-
|
|
206
|
-
.map_err(|_| "mcp_handshake_invalid")?;
|
|
207
|
-
if old.workspace != workspace
|
|
208
|
-
|| old.owner != owner
|
|
209
|
-
|| old.agent != agent
|
|
210
|
-
|| old.schema != 1
|
|
211
|
-
{
|
|
212
|
-
return Err("mcp_handshake_scope_mismatch");
|
|
213
|
-
}
|
|
214
|
-
let old_started = DateTime::parse_from_rfc3339(&old.started_at)
|
|
215
|
-
.map_err(|_| "mcp_handshake_invalid")?;
|
|
216
|
-
if old_started > started_at {
|
|
217
|
-
return Ok(());
|
|
218
|
-
}
|
|
198
|
+
private_metadata(&path, false)?;
|
|
219
199
|
}
|
|
220
200
|
Err(error) if error.kind() == std::io::ErrorKind::NotFound => {}
|
|
221
201
|
Err(_) => return Err("mcp_handshake_invalid"),
|
|
222
202
|
}
|
|
203
|
+
for sibling in receipt_paths(&dir, &name) {
|
|
204
|
+
let exited = sibling != path
|
|
205
|
+
&& read_receipt(&sibling).is_ok_and(|old| {
|
|
206
|
+
matches!(
|
|
207
|
+
sample_process(&old.server),
|
|
208
|
+
ProcessState::Exited | ProcessState::Replaced
|
|
209
|
+
)
|
|
210
|
+
});
|
|
211
|
+
if exited {
|
|
212
|
+
let _ = std::fs::remove_file(&sibling);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
223
215
|
let temp = dir.join(format!(
|
|
224
216
|
"{name}.{}-{}.tmp",
|
|
225
217
|
std::process::id(),
|
|
@@ -247,10 +239,23 @@ pub(crate) fn publish(
|
|
|
247
239
|
})();
|
|
248
240
|
if result.is_err() {
|
|
249
241
|
let _ = std::fs::remove_file(&temp);
|
|
242
|
+
return result;
|
|
250
243
|
}
|
|
244
|
+
resume_parked(&workspace, owner, agent);
|
|
251
245
|
result
|
|
252
246
|
}
|
|
253
247
|
|
|
248
|
+
/// A fresh receipt resumes this seat's parked messages. A foreign server's
|
|
249
|
+
/// receipt only causes one cheap re-park: delivery re-runs full preflight.
|
|
250
|
+
fn resume_parked(workspace: &Path, owner: &str, agent: &str) {
|
|
251
|
+
if !workspace.join(".team/runtime/team.db").exists() {
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
if let Ok(store) = crate::message_store::MessageStore::open(workspace) {
|
|
255
|
+
let _ = store.requeue_parked_deliveries(agent, owner);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
|
|
254
259
|
#[derive(Debug)]
|
|
255
260
|
pub(crate) struct Admission {
|
|
256
261
|
server: ProcessStamp,
|
|
@@ -293,30 +298,11 @@ pub(crate) fn preflight(
|
|
|
293
298
|
.canonicalize()
|
|
294
299
|
.map_err(|_| "mcp_handshake_workspace")?;
|
|
295
300
|
let dir = directory(&workspace, false)?;
|
|
296
|
-
let receipt: Handshake = serde_json::from_value(read_json(
|
|
297
|
-
&dir.join(format!("{}.json", key(owner, agent_id))),
|
|
298
|
-
true,
|
|
299
|
-
)?)
|
|
300
|
-
.map_err(|_| "mcp_handshake_invalid")?;
|
|
301
|
-
if receipt.schema != 1
|
|
302
|
-
|| receipt.workspace != workspace
|
|
303
|
-
|| receipt.owner != owner
|
|
304
|
-
|| receipt.agent != agent_id
|
|
305
|
-
{
|
|
306
|
-
return Err("mcp_handshake_scope_mismatch");
|
|
307
|
-
}
|
|
308
301
|
let spawned_at = agent
|
|
309
302
|
.get("spawned_at")
|
|
310
303
|
.and_then(Value::as_str)
|
|
311
304
|
.and_then(|s| DateTime::parse_from_rfc3339(s).ok())
|
|
312
305
|
.ok_or("mcp_handshake_spawn_missing")?;
|
|
313
|
-
let started_at =
|
|
314
|
-
DateTime::parse_from_rfc3339(&receipt.started_at).map_err(|_| "mcp_handshake_invalid")?;
|
|
315
|
-
let flushed_at =
|
|
316
|
-
DateTime::parse_from_rfc3339(&receipt.flushed_at).map_err(|_| "mcp_handshake_invalid")?;
|
|
317
|
-
if started_at < spawned_at || flushed_at < started_at {
|
|
318
|
-
return Err("mcp_handshake_stale_spawn");
|
|
319
|
-
}
|
|
320
306
|
let expected_config = workspace
|
|
321
307
|
.join(".team/runtime/mcp")
|
|
322
308
|
.join(format!("{agent_id}.json"));
|
|
@@ -341,14 +327,12 @@ pub(crate) fn preflight(
|
|
|
341
327
|
.get("command")
|
|
342
328
|
.and_then(Value::as_str)
|
|
343
329
|
.ok_or("mcp_handshake_config_missing")?;
|
|
344
|
-
if !Path::new(expected).is_absolute()
|
|
345
|
-
|| Path::new(expected)
|
|
346
|
-
.canonicalize()
|
|
347
|
-
.map_err(|_| "mcp_handshake_image")?
|
|
348
|
-
!= receipt.server.identity.executable
|
|
349
|
-
{
|
|
330
|
+
if !Path::new(expected).is_absolute() {
|
|
350
331
|
return Err("mcp_handshake_image");
|
|
351
332
|
}
|
|
333
|
+
let expected = Path::new(expected)
|
|
334
|
+
.canonicalize()
|
|
335
|
+
.map_err(|_| "mcp_handshake_image")?;
|
|
352
336
|
let env = server_config
|
|
353
337
|
.get("env")
|
|
354
338
|
.ok_or("mcp_handshake_config_missing")?;
|
|
@@ -375,32 +359,99 @@ pub(crate) fn preflight(
|
|
|
375
359
|
.ok_or("mcp_handshake_carrier_missing")?;
|
|
376
360
|
let carrier_birth =
|
|
377
361
|
process_birth_identity(carrier).map_err(|_| "mcp_handshake_carrier_missing")?;
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
for ancestor in receipt.ancestors.iter().take(MAX_NATIVE_PARENT_HOPS) {
|
|
384
|
-
if ancestor.pid != parent
|
|
385
|
-
|| process_birth_identity(parent).ok().as_deref() != Some(ancestor.birth.as_str())
|
|
362
|
+
let admit = |receipt: &Handshake| -> Result<()> {
|
|
363
|
+
if receipt.schema != 1
|
|
364
|
+
|| receipt.workspace != workspace
|
|
365
|
+
|| receipt.owner != owner
|
|
366
|
+
|| receipt.agent != agent_id
|
|
386
367
|
{
|
|
368
|
+
return Err("mcp_handshake_scope_mismatch");
|
|
369
|
+
}
|
|
370
|
+
let started_at = DateTime::parse_from_rfc3339(&receipt.started_at)
|
|
371
|
+
.map_err(|_| "mcp_handshake_invalid")?;
|
|
372
|
+
let flushed_at = DateTime::parse_from_rfc3339(&receipt.flushed_at)
|
|
373
|
+
.map_err(|_| "mcp_handshake_invalid")?;
|
|
374
|
+
if started_at < spawned_at || flushed_at < started_at {
|
|
375
|
+
return Err("mcp_handshake_stale_spawn");
|
|
376
|
+
}
|
|
377
|
+
if receipt.server.identity.executable != expected {
|
|
378
|
+
return Err("mcp_handshake_image");
|
|
379
|
+
}
|
|
380
|
+
if sample_process(&receipt.server) != ProcessState::Alive {
|
|
381
|
+
return Err("mcp_handshake_server_not_live");
|
|
382
|
+
}
|
|
383
|
+
let mut parent = receipt.server.parent;
|
|
384
|
+
let mut matched = false;
|
|
385
|
+
for ancestor in receipt.ancestors.iter().take(MAX_NATIVE_PARENT_HOPS) {
|
|
386
|
+
if ancestor.pid != parent
|
|
387
|
+
|| process_birth_identity(parent).ok().as_deref() != Some(ancestor.birth.as_str())
|
|
388
|
+
{
|
|
389
|
+
return Err("mcp_handshake_ancestry");
|
|
390
|
+
}
|
|
391
|
+
if parent == carrier {
|
|
392
|
+
matched = true;
|
|
393
|
+
break;
|
|
394
|
+
}
|
|
395
|
+
parent = crate::platform::argv::parent_pid(parent).unwrap_or(0);
|
|
396
|
+
}
|
|
397
|
+
if !matched || sample_process(&receipt.server) != ProcessState::Alive {
|
|
387
398
|
return Err("mcp_handshake_ancestry");
|
|
388
399
|
}
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
400
|
+
Ok(())
|
|
401
|
+
};
|
|
402
|
+
// #372: admit the newest live receipt descended from this seat's pane.
|
|
403
|
+
// Receipts of foreign servers (inherited identity, other process trees)
|
|
404
|
+
// are dropped before any process probe; they cannot mask the seat's own.
|
|
405
|
+
let mut receipts: Vec<_> = receipt_paths(&dir, &key(owner, agent_id))
|
|
406
|
+
.into_iter()
|
|
407
|
+
.map(|path| read_receipt(&path))
|
|
408
|
+
.collect();
|
|
409
|
+
receipts.sort_by_key(|receipt| {
|
|
410
|
+
std::cmp::Reverse(
|
|
411
|
+
receipt
|
|
412
|
+
.as_ref()
|
|
413
|
+
.ok()
|
|
414
|
+
.and_then(|r| DateTime::parse_from_rfc3339(&r.started_at).ok()),
|
|
415
|
+
)
|
|
416
|
+
});
|
|
417
|
+
let (mut own_refusal, mut refusal) = (None, None);
|
|
418
|
+
for receipt in receipts {
|
|
419
|
+
let receipt = match receipt {
|
|
420
|
+
Ok(receipt) => receipt,
|
|
421
|
+
Err(reason) => {
|
|
422
|
+
refusal = refusal.or(Some(reason));
|
|
423
|
+
continue;
|
|
424
|
+
}
|
|
425
|
+
};
|
|
426
|
+
if !receipt.ancestors.iter().any(|ancestor| ancestor.pid == carrier) {
|
|
427
|
+
refusal = refusal.or(Some("mcp_handshake_ancestry"));
|
|
428
|
+
continue;
|
|
429
|
+
}
|
|
430
|
+
match admit(&receipt) {
|
|
431
|
+
Ok(()) => {
|
|
432
|
+
return Ok(Some(Admission {
|
|
433
|
+
server: receipt.server,
|
|
434
|
+
carrier,
|
|
435
|
+
carrier_birth,
|
|
436
|
+
pane_id: pane_id.to_string(),
|
|
437
|
+
}))
|
|
438
|
+
}
|
|
439
|
+
Err(reason) => own_refusal = own_refusal.or(Some(reason)),
|
|
392
440
|
}
|
|
393
|
-
parent = crate::platform::argv::parent_pid(parent).unwrap_or(0);
|
|
394
|
-
}
|
|
395
|
-
if !matched || sample_process(&receipt.server) != ProcessState::Alive {
|
|
396
|
-
return Err("mcp_handshake_ancestry");
|
|
397
441
|
}
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
442
|
+
Err(own_refusal.or(refusal).unwrap_or("mcp_handshake_missing"))
|
|
443
|
+
}
|
|
444
|
+
|
|
445
|
+
/// Diagnostic only, never admission: live `mcp-server` processes under a pane.
|
|
446
|
+
pub(crate) fn live_servers_under(carrier: u32) -> Vec<u32> {
|
|
447
|
+
crate::platform::process::process_tree(carrier)
|
|
448
|
+
.unwrap_or_default()
|
|
449
|
+
.into_iter()
|
|
450
|
+
.filter(|pid| {
|
|
451
|
+
crate::platform::argv::argv_tokens(*pid)
|
|
452
|
+
.is_some_and(|argv| argv.iter().any(|arg| arg == "mcp-server"))
|
|
453
|
+
})
|
|
454
|
+
.collect()
|
|
404
455
|
}
|
|
405
456
|
|
|
406
457
|
/// Recheck against the actual resolved target immediately before the input path.
|
|
@@ -478,15 +529,15 @@ pub(crate) fn test_ready_worker(
|
|
|
478
529
|
pane_pid: Some(carrier),
|
|
479
530
|
leader_env: Default::default(),
|
|
480
531
|
};
|
|
481
|
-
|
|
482
|
-
|
|
532
|
+
// Like delivery, a provider without a worker handshake gate has nothing to revalidate.
|
|
533
|
+
if let Some(admission) = preflight(&workspace, Some(owner), agent, state).unwrap() {
|
|
534
|
+
revalidate(
|
|
535
|
+
&admission,
|
|
536
|
+
&Target::Pane(target.pane_id.clone()),
|
|
537
|
+
std::slice::from_ref(&target),
|
|
538
|
+
)
|
|
483
539
|
.unwrap();
|
|
484
|
-
|
|
485
|
-
&admission,
|
|
486
|
-
&Target::Pane(target.pane_id.clone()),
|
|
487
|
-
std::slice::from_ref(&target),
|
|
488
|
-
)
|
|
489
|
-
.unwrap();
|
|
540
|
+
}
|
|
490
541
|
target
|
|
491
542
|
}
|
|
492
543
|
|
|
@@ -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": "grok", "mcp_config": config,
|
|
43
43
|
"spawned_at": (started - chrono::Duration::seconds(10)).to_rfc3339(),
|
|
44
44
|
"pane_id": "%1", "pane_pid": carrier
|
|
45
45
|
}}});
|
|
@@ -66,9 +66,27 @@ impl Case {
|
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
fn path(&self) -> PathBuf {
|
|
69
|
-
self.
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
self.sibling(&std::process::id().to_string())
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/// `<key>.<suffix>.json`; an empty suffix names the pre-#372 single slot.
|
|
73
|
+
fn sibling(&self, suffix: &str) -> PathBuf {
|
|
74
|
+
let name = key("owner", "worker");
|
|
75
|
+
let file = if suffix.is_empty() {
|
|
76
|
+
format!("{name}.json")
|
|
77
|
+
} else {
|
|
78
|
+
format!("{name}.{suffix}.json")
|
|
79
|
+
};
|
|
80
|
+
self.ws.join(".team/runtime/mcp-handshakes").join(file)
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
fn write_private(&self, path: &Path, value: &Value) {
|
|
84
|
+
std::fs::write(path, serde_json::to_vec(value).unwrap()).unwrap();
|
|
85
|
+
std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600)).unwrap();
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
fn receipt(&self) -> Value {
|
|
89
|
+
serde_json::from_slice(&std::fs::read(self.path()).unwrap()).unwrap()
|
|
72
90
|
}
|
|
73
91
|
|
|
74
92
|
fn publish(&self) {
|
|
@@ -96,7 +114,7 @@ impl Drop for Case {
|
|
|
96
114
|
|
|
97
115
|
#[test]
|
|
98
116
|
fn issue345_missing_mcp_config_does_not_disable_eager_admission() {
|
|
99
|
-
for provider in ["
|
|
117
|
+
for provider in ["grok", "codex", "claude"] {
|
|
100
118
|
let mut case = Case::new();
|
|
101
119
|
case.state["agents"]["worker"]["provider"] = json!(provider);
|
|
102
120
|
case.state["agents"]["worker"]
|
|
@@ -193,19 +211,100 @@ fn changed_current_target_and_new_spawn_do_not_reuse_a_handshake() {
|
|
|
193
211
|
assert!(case.admission().is_err());
|
|
194
212
|
}
|
|
195
213
|
|
|
214
|
+
// Receipt pids beyond any real pid_max, so they never collide with this test.
|
|
215
|
+
const EXITED: &str = "4000000001";
|
|
216
|
+
const FOREIGN: &str = "4000000002";
|
|
217
|
+
|
|
218
|
+
/// A server outside the seat pane (inherited TEAM_AGENT_ID) or an exited one
|
|
219
|
+
/// may hold a newer receipt; neither can mask the seat's live server (#372).
|
|
220
|
+
fn foreign_and_exited(case: &Case) -> (Value, Value) {
|
|
221
|
+
let newer = (case.started + chrono::Duration::seconds(5)).to_rfc3339();
|
|
222
|
+
let mut foreign = case.receipt();
|
|
223
|
+
foreign["started_at"] = json!(newer);
|
|
224
|
+
foreign["flushed_at"] = json!(newer);
|
|
225
|
+
foreign["ancestors"] = json!([{"pid": 1_000_000_001_u32, "birth": "fixture-tmux"}]);
|
|
226
|
+
let mut exited = case.receipt();
|
|
227
|
+
exited["started_at"] = json!(newer);
|
|
228
|
+
exited["flushed_at"] = json!(newer);
|
|
229
|
+
exited["server"]["identity"]["birth_identity"] = json!("exited-server");
|
|
230
|
+
(foreign, exited)
|
|
231
|
+
}
|
|
232
|
+
|
|
196
233
|
#[test]
|
|
197
|
-
fn
|
|
234
|
+
fn issue372_foreign_or_exited_receipts_cannot_mask_the_live_seat_server() {
|
|
198
235
|
let case = Case::new();
|
|
199
236
|
case.publish();
|
|
200
|
-
let
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
.unwrap();
|
|
208
|
-
assert_eq!(
|
|
237
|
+
let (foreign, exited) = foreign_and_exited(&case);
|
|
238
|
+
case.write_private(&case.sibling(EXITED), &exited);
|
|
239
|
+
case.write_private(&case.sibling(FOREIGN), &foreign);
|
|
240
|
+
let admission = case.admission().unwrap().expect("live seat receipt admits");
|
|
241
|
+
assert_eq!(admission.server.identity.pid, std::process::id());
|
|
242
|
+
revalidate(&admission, &case.target, &case.panes).unwrap();
|
|
243
|
+
|
|
244
|
+
std::fs::remove_file(case.path()).unwrap();
|
|
245
|
+
assert_eq!(case.admission().unwrap_err(), "mcp_handshake_server_not_live");
|
|
246
|
+
std::fs::remove_file(case.sibling(EXITED)).unwrap();
|
|
247
|
+
assert_eq!(case.admission().unwrap_err(), "mcp_handshake_ancestry");
|
|
248
|
+
std::fs::remove_file(case.sibling(FOREIGN)).unwrap();
|
|
249
|
+
assert_eq!(case.admission().unwrap_err(), "mcp_handshake_missing");
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
#[test]
|
|
253
|
+
fn issue372_pre_upgrade_single_slot_receipt_still_admits() {
|
|
254
|
+
let case = Case::new();
|
|
255
|
+
case.publish();
|
|
256
|
+
std::fs::rename(case.path(), case.sibling("")).unwrap();
|
|
257
|
+
assert!(case.admission().unwrap().is_some());
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
#[test]
|
|
261
|
+
fn issue372_publish_prunes_exited_receipts_and_keeps_live_ones() {
|
|
262
|
+
let case = Case::new();
|
|
263
|
+
case.publish();
|
|
264
|
+
let (foreign, exited) = foreign_and_exited(&case);
|
|
265
|
+
case.write_private(&case.sibling(""), &exited);
|
|
266
|
+
case.write_private(&case.sibling(EXITED), &exited);
|
|
267
|
+
case.write_private(&case.sibling(FOREIGN), &foreign);
|
|
268
|
+
case.publish();
|
|
269
|
+
assert!(!case.sibling("").exists());
|
|
270
|
+
assert!(!case.sibling(EXITED).exists());
|
|
271
|
+
assert!(case.sibling(FOREIGN).exists(), "a live foreign receipt is only ignored");
|
|
272
|
+
assert!(case.admission().unwrap().is_some());
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
#[test]
|
|
276
|
+
fn issue372_publish_resumes_only_this_seats_parked_messages() {
|
|
277
|
+
let case = Case::new();
|
|
278
|
+
let store = crate::message_store::MessageStore::open(&case.ws).unwrap();
|
|
279
|
+
let parked = store
|
|
280
|
+
.create_message(None, "leader", "worker", "parked", None, false, Some("owner"))
|
|
281
|
+
.unwrap();
|
|
282
|
+
let other = store
|
|
283
|
+
.create_message(None, "leader", "worker", "other team", None, false, Some("other"))
|
|
284
|
+
.unwrap();
|
|
285
|
+
for id in [&parked, &other] {
|
|
286
|
+
assert!(store.claim_for_delivery(id).unwrap());
|
|
287
|
+
assert!(store.park_delivery_before_input(id, 1).unwrap());
|
|
288
|
+
}
|
|
289
|
+
case.publish();
|
|
290
|
+
let row = |id: &str| -> (String, Option<String>) {
|
|
291
|
+
rusqlite::Connection::open(store.db_path())
|
|
292
|
+
.unwrap()
|
|
293
|
+
.query_row(
|
|
294
|
+
"select status, error from messages where message_id = ?1",
|
|
295
|
+
[id],
|
|
296
|
+
|r| Ok((r.get(0)?, r.get(1)?)),
|
|
297
|
+
)
|
|
298
|
+
.unwrap()
|
|
299
|
+
};
|
|
300
|
+
assert_eq!(row(parked.as_str()), ("accepted".to_string(), None));
|
|
301
|
+
assert_eq!(
|
|
302
|
+
row(other.as_str()),
|
|
303
|
+
(
|
|
304
|
+
"queued_until_start".to_string(),
|
|
305
|
+
Some("mcp_handshake_timeout".to_string())
|
|
306
|
+
)
|
|
307
|
+
);
|
|
209
308
|
}
|
|
210
309
|
|
|
211
310
|
#[test]
|
|
@@ -253,7 +352,7 @@ fn config_scope_and_authorized_executable_cannot_be_substituted() {
|
|
|
253
352
|
fn fake_and_pi_keep_their_existing_non_eager_or_runtime_registry_admission() {
|
|
254
353
|
assert!(!crate::provider::get_adapter(Provider::Fake).requires_worker_mcp_handshake());
|
|
255
354
|
assert!(!crate::provider::get_adapter(Provider::Pi).requires_worker_mcp_handshake());
|
|
256
|
-
assert!(crate::provider::get_adapter(Provider::
|
|
355
|
+
assert!(crate::provider::get_adapter(Provider::Grok).requires_worker_mcp_handshake());
|
|
257
356
|
let case = Case::new();
|
|
258
357
|
for provider in ["fake", "pi"] {
|
|
259
358
|
let mut state = case.state.clone();
|