@team-agent/installer 0.5.121 → 0.5.123
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 +8 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +176 -10
- package/crates/team-agent/src/cli/intent/runtime.rs +78 -42
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +137 -0
- package/crates/team-agent/src/cli/intent/tests.rs +37 -0
- package/crates/team-agent/src/cli/intent.rs +22 -0
- package/crates/team-agent/src/contract_runtime/backend.rs +490 -2
- package/crates/team-agent/src/contract_runtime/commands.rs +38 -24
- package/crates/team-agent/src/contract_runtime/forward.rs +59 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +23 -17
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +27 -8
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +6 -17
- package/crates/team-agent/src/lifecycle/launch/quick_start_transport.rs +26 -19
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +19 -2
- package/crates/team-agent/src/lifecycle/restart/agent.rs +3 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +3 -0
- package/crates/team-agent/src/lifecycle/restart/rebuild.rs +100 -31
- package/crates/team-agent/src/lifecycle/restart.rs +1 -0
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +16 -3
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +132 -1
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +7 -5
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +8 -2
- package/crates/team-agent/src/mcp_server/readiness.rs +66 -3
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +30 -0
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +12 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +48 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +45 -14
- package/crates/team-agent/src/provider/wire.rs +2 -1
- package/npm/install.mjs +17 -97
- package/package.json +4 -4
|
@@ -66,6 +66,30 @@ 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 issue345_missing_eager_config_defers_without_input_or_attempts() {
|
|
72
|
+
let mut case = WorkerCase::new("missing-mcp-config", "cursor_agent");
|
|
73
|
+
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
74
|
+
case.state["team_key"] = serde_json::json!("dup-team");
|
|
75
|
+
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
76
|
+
case.state["agents"]["w1"]["spawned_at"] = serde_json::json!(chrono::Utc::now().to_rfc3339());
|
|
77
|
+
case.state["teams"] = serde_json::json!({"dup-team": case.state.clone()});
|
|
78
|
+
crate::state::persist::save_runtime_state(&case.workspace, &case.state).unwrap();
|
|
79
|
+
let transport = RecordingTransport { carrier: Some(carrier), ..RecordingTransport::new("") };
|
|
80
|
+
let message_id = case.store.create_message(None, "leader", "w1", "missing config canary", None, false, Some("dup-team")).unwrap();
|
|
81
|
+
for _ in 0..3 {
|
|
82
|
+
let outcome = deliver_pending_message(&case.workspace, &case.store, &transport,
|
|
83
|
+
&message_id, &case.event_log, &case.state).unwrap();
|
|
84
|
+
assert!(!outcome.ok);
|
|
85
|
+
assert!(outcome.verification.as_deref().unwrap().starts_with("mcp_handshake_"));
|
|
86
|
+
assert_eq!(transport.inject_count(), 0, "missing metadata must never reach input");
|
|
87
|
+
}
|
|
88
|
+
let connection = rusqlite::Connection::open(case.store.db_path()).unwrap();
|
|
89
|
+
let attempts: i64 = connection.query_row("select delivery_attempts from messages where message_id=?1", [&message_id], |row| row.get(0)).unwrap();
|
|
90
|
+
assert_eq!(attempts, 0, "metadata wait is not an input attempt");
|
|
91
|
+
}
|
|
92
|
+
|
|
69
93
|
#[test]
|
|
70
94
|
fn error_retry_claim_is_single_winner_across_two_delivers() {
|
|
71
95
|
let case = WorkerCase::new("claim-gate", "fake");
|
|
@@ -141,10 +165,30 @@ fn observer_state_save_failure_after_enter_does_not_return_err() {
|
|
|
141
165
|
|
|
142
166
|
#[test]
|
|
143
167
|
fn pane_token_refuses_second_inject_for_claude_grok_cursor() {
|
|
144
|
-
for provider in ["claude", "grok", "
|
|
145
|
-
let case = WorkerCase::new(&format!("token-{provider}"), provider);
|
|
146
|
-
|
|
147
|
-
let
|
|
168
|
+
for provider in ["claude", "grok", "cursor_agent"] {
|
|
169
|
+
let mut case = WorkerCase::new(&format!("token-{provider}"), provider);
|
|
170
|
+
#[cfg(unix)]
|
|
171
|
+
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
172
|
+
#[cfg(not(unix))]
|
|
173
|
+
let carrier = std::process::id();
|
|
174
|
+
let config = case.workspace.join(".team/runtime/mcp/w1.json");
|
|
175
|
+
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
176
|
+
std::fs::write(&config, serde_json::to_vec(&serde_json::json!({
|
|
177
|
+
"mcpServers": {"team_orchestrator": {
|
|
178
|
+
"command": std::env::current_exe().unwrap().canonicalize().unwrap(),
|
|
179
|
+
"env": {"TEAM_AGENT_WORKSPACE": case.workspace, "TEAM_AGENT_ID": "w1", "TEAM_AGENT_OWNER_TEAM_ID": "dup-team"}
|
|
180
|
+
}}
|
|
181
|
+
})).unwrap()).unwrap();
|
|
182
|
+
case.state["team_key"] = serde_json::json!("dup-team");
|
|
183
|
+
case.state["agents"]["w1"]["mcp_config"] = serde_json::json!(config);
|
|
184
|
+
case.state["agents"]["w1"]["pane_pid"] = serde_json::json!(carrier);
|
|
185
|
+
case.state["agents"]["w1"]["spawned_at"] = serde_json::json!((chrono::Utc::now() - chrono::Duration::seconds(10)).to_rfc3339());
|
|
186
|
+
case.state["teams"] = serde_json::json!({"dup-team": case.state.clone()});
|
|
187
|
+
crate::state::persist::save_runtime_state(&case.workspace, &case.state).unwrap();
|
|
188
|
+
#[cfg(unix)]
|
|
189
|
+
crate::mcp_server::readiness::publish(&case.workspace, "dup-team", "w1", chrono::Utc::now()).unwrap();
|
|
190
|
+
let transport = RecordingTransport { carrier: Some(carrier), ..RecordingTransport::new("") };
|
|
191
|
+
let message_id = case.store.create_message(None, "leader", "w1", &format!("{provider} canary"), None, false, Some("dup-team")).unwrap();
|
|
148
192
|
let first = deliver_pending_message(
|
|
149
193
|
&case.workspace,
|
|
150
194
|
&case.store,
|
|
@@ -169,7 +169,10 @@ fn p2_scheduler_unknown_kind_surfaces_error() {
|
|
|
169
169
|
|
|
170
170
|
/// A delivery transport whose `inject` RECORDS-and-succeeds (the real deliver loop legitimately
|
|
171
171
|
/// injects; the §84-guard NoopTransport panics). Only `inject` is reached by deliver_pending_message.
|
|
172
|
-
|
|
172
|
+
#[derive(Default)]
|
|
173
|
+
struct DeliverOkTransport {
|
|
174
|
+
targets: Vec<PaneInfo>,
|
|
175
|
+
}
|
|
173
176
|
impl Transport for DeliverOkTransport {
|
|
174
177
|
fn kind(&self) -> BackendKind {
|
|
175
178
|
BackendKind::Tmux
|
|
@@ -232,7 +235,7 @@ impl Transport for DeliverOkTransport {
|
|
|
232
235
|
Ok(PaneLiveness::Unknown)
|
|
233
236
|
}
|
|
234
237
|
fn list_targets(&self) -> Result<Vec<PaneInfo>, TransportError> {
|
|
235
|
-
Ok(
|
|
238
|
+
Ok(self.targets.clone())
|
|
236
239
|
}
|
|
237
240
|
fn has_session(&self, _s: &SessionName) -> Result<bool, TransportError> {
|
|
238
241
|
Ok(true)
|
|
@@ -333,9 +336,9 @@ fn spine_delivery_skips_queued_statuses() {
|
|
|
333
336
|
.unwrap();
|
|
334
337
|
set_message_status(&store, &qidle, "queued_until_idle");
|
|
335
338
|
set_message_status(&store, &qstart, "queued_until_start");
|
|
336
|
-
let state = serde_json::json!({"agents": {"w1": {}}});
|
|
339
|
+
let state = serde_json::json!({"agents": {"w1": {"provider": "fake"}}});
|
|
337
340
|
|
|
338
|
-
let _ = deliver_pending_messages(&ws, &state, &DeliverOkTransport, &log).unwrap();
|
|
341
|
+
let _ = deliver_pending_messages(&ws, &state, &DeliverOkTransport::default(), &log).unwrap();
|
|
339
342
|
|
|
340
343
|
assert_eq!(
|
|
341
344
|
message_status_of(&store, &qidle),
|
|
@@ -359,9 +362,9 @@ fn spine_delivery_busy_recipient_is_injected_without_idle_deferral() {
|
|
|
359
362
|
let mid = store
|
|
360
363
|
.create_message(Some("t"), "leader", "w1", "hi", None, true, None)
|
|
361
364
|
.unwrap();
|
|
362
|
-
let state = serde_json::json!({"agents": {"w1": {"status": "busy"}}});
|
|
365
|
+
let state = serde_json::json!({"agents": {"w1": {"provider": "fake", "status": "busy"}}});
|
|
363
366
|
|
|
364
|
-
let delivered = deliver_pending_messages(&ws, &state, &DeliverOkTransport, &log).unwrap();
|
|
367
|
+
let delivered = deliver_pending_messages(&ws, &state, &DeliverOkTransport::default(), &log).unwrap();
|
|
365
368
|
|
|
366
369
|
assert!(delivered.contains(&mid));
|
|
367
370
|
assert_eq!(message_status_of(&store, &mid), "delivered");
|
|
@@ -380,11 +383,39 @@ fn spine_delivery_pi_cursor_uses_v113_direct_input_without_idle_scope() {
|
|
|
380
383
|
let store = store_for(&ws);
|
|
381
384
|
let log = EventLog::new(&ws);
|
|
382
385
|
let mid = store
|
|
383
|
-
.create_message(Some("t"), "leader", "w1", "hi", None, true,
|
|
386
|
+
.create_message(Some("t"), "leader", "w1", "hi", None, true, Some("spine-team"))
|
|
384
387
|
.unwrap();
|
|
385
|
-
|
|
386
|
-
let
|
|
387
|
-
|
|
388
|
+
#[cfg(unix)]
|
|
389
|
+
let carrier = crate::mcp_server::readiness::test_carrier_pid().unwrap();
|
|
390
|
+
#[cfg(not(unix))]
|
|
391
|
+
let carrier = std::process::id();
|
|
392
|
+
let config = ws.join(".team/runtime/mcp/w1.json");
|
|
393
|
+
std::fs::create_dir_all(config.parent().unwrap()).unwrap();
|
|
394
|
+
std::fs::write(&config, serde_json::to_vec(&serde_json::json!({
|
|
395
|
+
"mcpServers": {"team_orchestrator": {
|
|
396
|
+
"command": std::env::current_exe().unwrap().canonicalize().unwrap(),
|
|
397
|
+
"env": {"TEAM_AGENT_WORKSPACE": ws, "TEAM_AGENT_ID": "w1", "TEAM_AGENT_OWNER_TEAM_ID": "spine-team"}
|
|
398
|
+
}}
|
|
399
|
+
})).unwrap()).unwrap();
|
|
400
|
+
let mut state = serde_json::json!({"team_key": "spine-team", "active_team_key": "spine-team", "session_name": "spine", "agents": {"w1": {
|
|
401
|
+
"provider": provider, "status": "running", "window": "w1", "mcp_config": config,
|
|
402
|
+
"spawned_at": (chrono::Utc::now() - chrono::Duration::seconds(10)).to_rfc3339(),
|
|
403
|
+
"pane_id": "%spine", "pane_pid": carrier
|
|
404
|
+
}}});
|
|
405
|
+
state["teams"] = serde_json::json!({"spine-team": state.clone()});
|
|
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));
|
|
388
419
|
assert_eq!(message_status_of(&store, &mid), "delivered");
|
|
389
420
|
}
|
|
390
421
|
}
|
|
@@ -405,9 +436,9 @@ fn contract_alive_worker_with_working_health_is_deliverable_not_deferred() {
|
|
|
405
436
|
.create_message(Some("t"), "leader", "w1", "hi", None, true, None)
|
|
406
437
|
.unwrap();
|
|
407
438
|
seed_agent_health(&store, "w1", "WORKING"); // turn-level state — must NOT gate delivery
|
|
408
|
-
let state = serde_json::json!({"agents": {"w1": {"status": "running"}}}); // lifecycle: alive
|
|
439
|
+
let state = serde_json::json!({"agents": {"w1": {"provider": "fake", "status": "running"}}}); // lifecycle: alive
|
|
409
440
|
|
|
410
|
-
let delivered = deliver_pending_messages(&ws, &state, &DeliverOkTransport, &log).unwrap();
|
|
441
|
+
let delivered = deliver_pending_messages(&ws, &state, &DeliverOkTransport::default(), &log).unwrap();
|
|
411
442
|
|
|
412
443
|
let events = read_event_log(&ws);
|
|
413
444
|
let deferred: Vec<_> = events
|
|
@@ -530,7 +561,7 @@ fn spine_delivery_injects_resolvable_target_not_bare_agent_pane() {
|
|
|
530
561
|
// in-team, non-busy agent -> deliver proceeds; the session-qualified resolution uses session_name + window.
|
|
531
562
|
let state = serde_json::json!({
|
|
532
563
|
"session_name": "team-x",
|
|
533
|
-
"agents": {"w1": {"status": "idle", "window": "w1"}}
|
|
564
|
+
"agents": {"w1": {"provider": "fake", "status": "idle", "window": "w1"}}
|
|
534
565
|
});
|
|
535
566
|
let transport = OfflineTransport::new();
|
|
536
567
|
|
|
@@ -585,7 +616,7 @@ fn spine_delivery_injects_rendered_protocol_block_not_raw_content() {
|
|
|
585
616
|
.unwrap();
|
|
586
617
|
let state = serde_json::json!({
|
|
587
618
|
"session_name": "team-x",
|
|
588
|
-
"agents": {"w1": {"status": "idle", "window": "w1"}}
|
|
619
|
+
"agents": {"w1": {"provider": "fake", "status": "idle", "window": "w1"}}
|
|
589
620
|
});
|
|
590
621
|
let transport = OfflineTransport::new();
|
|
591
622
|
|
|
@@ -116,7 +116,8 @@ pub(crate) fn aliases(provider: Provider) -> &'static [&'static str] {
|
|
|
116
116
|
/// Executable name we exec for the worker. `Claude` and `ClaudeCode` both
|
|
117
117
|
/// resolve to `claude` — the distinction is in state semantics
|
|
118
118
|
/// (`ClaudeCode` is the canonical CLI; `Claude` is a legacy alias kept for
|
|
119
|
-
/// older specs).
|
|
119
|
+
/// older specs). Spawn this public name. Do not replace it with a
|
|
120
|
+
/// canonicalized deep binary; that skips the user's wrapper.
|
|
120
121
|
pub(crate) fn command_name(provider: Provider) -> &'static str {
|
|
121
122
|
match provider {
|
|
122
123
|
Provider::Claude | Provider::ClaudeCode => "claude",
|
package/npm/install.mjs
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* purpose: place the Team Agent runtime and login wrappers via the npx installer
|
|
4
4
|
* contract: wrappers land only in the declared bin dir (~/.local/bin or --prefix/bin); installer-managed wrappers recorded in the manifest or recognized by marker are rewritten onto this install's runtime; a non-writable declared dir fails closed with ACTION
|
|
5
|
-
* boundary: never selects a PATH entry as the install target; never creates wrappers in third-party package dirs; does not treat host login PATH order as a landing picker
|
|
5
|
+
* boundary: never selects a PATH entry as the install target; never creates wrappers in third-party package dirs; does not treat host login PATH order as a landing picker; install does not run doctor or treat a missing MCP server as a failure
|
|
6
6
|
*/
|
|
7
7
|
import { spawnSync } from "node:child_process";
|
|
8
8
|
import fs from "node:fs";
|
|
@@ -65,56 +65,6 @@ function isCliEntrypoint() {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
export function doctorSelfCheckVerdict(doctorBody, spawnMeta = {}) {
|
|
69
|
-
if (spawnMeta.error || spawnMeta.signal) {
|
|
70
|
-
return { kind: "advisory", blockers: [] };
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
let body;
|
|
74
|
-
try {
|
|
75
|
-
body = JSON.parse(doctorBody || "");
|
|
76
|
-
} catch {
|
|
77
|
-
return { kind: "advisory", blockers: [] };
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
const blockers = [];
|
|
81
|
-
// Doctor JSON source: crates/team-agent/src/cli/mod.rs:2739-2764.
|
|
82
|
-
if (body?.tmux?.installed === false) {
|
|
83
|
-
blockers.push("tmux not installed");
|
|
84
|
-
}
|
|
85
|
-
if (!body?.mcp?.server_command) {
|
|
86
|
-
blockers.push("MCP server command missing");
|
|
87
|
-
}
|
|
88
|
-
const profileSmokeStatus = body?.profile_smoke?.status;
|
|
89
|
-
const profileSmokeNonBlocking =
|
|
90
|
-
profileSmokeStatus === "legacy_team_invalid" || profileSmokeStatus === "not_required";
|
|
91
|
-
if (
|
|
92
|
-
body?.error === "profile_smoke_failed" ||
|
|
93
|
-
(body?.profile_smoke?.ok === false && !profileSmokeNonBlocking)
|
|
94
|
-
) {
|
|
95
|
-
blockers.push("profile smoke failed");
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
if (blockers.length > 0) {
|
|
99
|
-
return { kind: "blockers", blockers };
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
const noContext =
|
|
103
|
-
body?.ok === false && body?.error === "workspace has no Team Agent spec or runtime context";
|
|
104
|
-
if (body?.ok === true || noContext) {
|
|
105
|
-
return { kind: "ok", blockers: [] };
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
return { kind: "advisory", blockers: [] };
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
export function doctorSelfCheckLine(verdict) {
|
|
112
|
-
if (verdict.kind === "blockers") {
|
|
113
|
-
return `doctor: found blockers (${verdict.blockers.join("; ")}); run team-agent doctor in your project for details`;
|
|
114
|
-
}
|
|
115
|
-
return "doctor: ok (run team-agent doctor inside a team workspace for a full report)";
|
|
116
|
-
}
|
|
117
|
-
|
|
118
68
|
function printHelp() {
|
|
119
69
|
console.log(`Team Agent installer
|
|
120
70
|
|
|
@@ -187,19 +137,6 @@ function install(argv) {
|
|
|
187
137
|
});
|
|
188
138
|
|
|
189
139
|
const teamAgent = path.join(binDir, "team-agent");
|
|
190
|
-
console.log(`installed: ${teamAgent}`);
|
|
191
|
-
if (installTarget.readyNow) {
|
|
192
|
-
console.log(`installed to ${binDir} (on PATH, ready now)`);
|
|
193
|
-
} else if (installTarget.rc?.files?.length > 0) {
|
|
194
|
-
console.log(`installed to ${binDir}; added ${binDir} to ${installTarget.rc.files.join(", ")}; restart terminal or open a new shell to use team-agent`);
|
|
195
|
-
} else if (installTarget.rc?.skipped?.length > 0) {
|
|
196
|
-
console.log(`installed to ${binDir}; PATH entry already present in ${installTarget.rc.skipped.join(", ")}; restart terminal or open a new shell to use team-agent`);
|
|
197
|
-
} else {
|
|
198
|
-
console.log(`installed to ${binDir}; add it to PATH to use team-agent by name`);
|
|
199
|
-
}
|
|
200
|
-
console.log(`runtime: ${dest}`);
|
|
201
|
-
console.log(`binary: ${platformBinary.packageName}`);
|
|
202
|
-
console.log("skill: installed for Codex, Claude and Copilot");
|
|
203
140
|
|
|
204
141
|
// 0.3.6 hotfix · C-5 cr verdict — post-install binary smoke 门(走 `--help`
|
|
205
142
|
// 子命令,因为 0.3.x CLI 现阶段没有 --version)。真跑一次 binary 才能抓住
|
|
@@ -219,25 +156,20 @@ function install(argv) {
|
|
|
219
156
|
console.error(`LOG: ${teamAgent} --help => ${log}`);
|
|
220
157
|
process.exit(1);
|
|
221
158
|
}
|
|
222
|
-
console.log("smoke: team-agent --help ok");
|
|
223
|
-
|
|
224
|
-
const doctorWorkspace = makeDoctorWorkspace();
|
|
225
|
-
try {
|
|
226
|
-
const doctor = spawnSync(teamAgent, ["doctor", "--json", "--workspace", doctorWorkspace], {
|
|
227
|
-
text: true,
|
|
228
|
-
encoding: "utf8",
|
|
229
|
-
timeout: DOCTOR_TIMEOUT_MS,
|
|
230
|
-
});
|
|
231
|
-
const verdict = doctorSelfCheckVerdict(doctor.stdout, doctor);
|
|
232
|
-
console.log(doctorSelfCheckLine(verdict));
|
|
233
|
-
} finally {
|
|
234
|
-
fs.rmSync(doctorWorkspace, { recursive: true, force: true });
|
|
235
|
-
}
|
|
236
159
|
const pathCheck = verifyInstalledTeamAgentOnPath({
|
|
237
160
|
env: process.env,
|
|
238
161
|
expectedVersion: version,
|
|
239
162
|
});
|
|
240
|
-
console.log(`
|
|
163
|
+
console.log(`Installed Team Agent ${version}`);
|
|
164
|
+
console.log(teamAgent);
|
|
165
|
+
if (shadowRepairs.length > 0) {
|
|
166
|
+
console.log(`Updated ${shadowRepairs.length} older Team Agent command${shadowRepairs.length === 1 ? "" : "s"}.`);
|
|
167
|
+
}
|
|
168
|
+
if (pathCheck.status === "ready") {
|
|
169
|
+
console.log("Ready in this terminal. Run: team-agent --help");
|
|
170
|
+
} else {
|
|
171
|
+
console.log("Open a new terminal, then run: team-agent --help");
|
|
172
|
+
}
|
|
241
173
|
}
|
|
242
174
|
|
|
243
175
|
function runDoctor(argv) {
|
|
@@ -389,36 +321,26 @@ export function repairPathShadowingTeamAgentCommands(options = {}) {
|
|
|
389
321
|
const repairs = [];
|
|
390
322
|
const recordedBinDirs = options.recordedBinDirs || recordedManagedBinDirs(options.manifest);
|
|
391
323
|
const candidates = pathShadowRepairCandidates(env.PATH || "", home, binDir, recordedBinDirs);
|
|
392
|
-
log?.(`path-shadow: scanning ${candidates.length} candidate bin dirs for managed wrappers`);
|
|
393
324
|
for (const candidateDir of candidates) {
|
|
394
325
|
const entry = candidateDir.dir;
|
|
395
326
|
if (isVersionManagedPath(entry)) {
|
|
396
|
-
log?.(`path-shadow: skip ${path.join(entry, "team-agent")} source=${candidateDir.source} reason=version-managed-path`);
|
|
397
327
|
continue;
|
|
398
328
|
}
|
|
399
329
|
for (const name of WRAPPER_NAMES) {
|
|
400
330
|
const candidate = path.join(entry, name);
|
|
401
331
|
if (!fs.existsSync(candidate)) {
|
|
402
|
-
if (name === "team-agent" && candidateDir.source === "home-local-bin") {
|
|
403
|
-
log?.(`path-shadow: checked ${candidate} source=${candidateDir.source} reason=not-found`);
|
|
404
|
-
}
|
|
405
332
|
continue;
|
|
406
333
|
}
|
|
407
|
-
log?.(`path-shadow: found ${candidate} source=${candidateDir.source}`);
|
|
408
334
|
if (!isExecutableFile(candidate)) {
|
|
409
|
-
log?.(`path-shadow: skip ${candidate} source=${candidateDir.source} reason=not-executable-file`);
|
|
410
335
|
continue;
|
|
411
336
|
}
|
|
412
337
|
if (sameFile(candidate, installedWrapper) && name === "team-agent") {
|
|
413
|
-
log?.(`path-shadow: skip ${candidate} source=${candidateDir.source} reason=installed-wrapper`);
|
|
414
338
|
continue;
|
|
415
339
|
}
|
|
416
340
|
if (sameFile(candidate, runtimeBinary)) {
|
|
417
|
-
log?.(`path-shadow: skip ${candidate} source=${candidateDir.source} reason=runtime-binary`);
|
|
418
341
|
continue;
|
|
419
342
|
}
|
|
420
343
|
if (!isInstallerManagedWrapper(candidate)) {
|
|
421
|
-
log?.(`path-shadow: skip ${candidate} source=${candidateDir.source} reason=not-installer-managed`);
|
|
422
344
|
continue;
|
|
423
345
|
}
|
|
424
346
|
const extraArgs = name === "team_orchestrator" ? ["mcp-server"] : name === "team-agent-coordinator" ? ["coordinator"] : [];
|
|
@@ -428,12 +350,11 @@ export function repairPathShadowingTeamAgentCommands(options = {}) {
|
|
|
428
350
|
const detail = error instanceof Error ? error.message : String(error);
|
|
429
351
|
throw new Error(`failed to update PATH-shadowing team-agent at ${candidate}: ${detail}`);
|
|
430
352
|
}
|
|
431
|
-
log?.(`path-shadow: updated ${candidate} source=${candidateDir.source} to runtime shim`);
|
|
432
353
|
repairs.push({ file: candidate, binDir: entry, source: candidateDir.source });
|
|
433
354
|
}
|
|
434
355
|
}
|
|
435
|
-
if (repairs.length
|
|
436
|
-
log?.(
|
|
356
|
+
if (repairs.length > 0) {
|
|
357
|
+
log?.(`updated ${repairs.length} older Team Agent command${repairs.length === 1 ? "" : "s"}`);
|
|
437
358
|
}
|
|
438
359
|
return repairs;
|
|
439
360
|
}
|
|
@@ -451,11 +372,10 @@ export function verifyInstalledTeamAgentOnPath(options = {}) {
|
|
|
451
372
|
timeout: VERSION_SMOKE_TIMEOUT_MS,
|
|
452
373
|
});
|
|
453
374
|
const entry = (which.stdout || "").split(/\r?\n/).map((line) => line.trim()).find(Boolean);
|
|
375
|
+
// A fresh ~/.local/bin install is not on the current shell PATH yet. That is
|
|
376
|
+
// guidance, not a failed install.
|
|
454
377
|
if (which.status !== 0 || !entry) {
|
|
455
|
-
|
|
456
|
-
`post-install version check failed: \`which team-agent\` did not find the installed command. ` +
|
|
457
|
-
`Expected version ${expectedVersion}. Add the install bin directory to PATH or restart your shell.`,
|
|
458
|
-
);
|
|
378
|
+
return { status: "not-on-current-path" };
|
|
459
379
|
}
|
|
460
380
|
const versionProbe = spawnSync(entry, ["--version"], {
|
|
461
381
|
text: true,
|
|
@@ -479,7 +399,7 @@ export function verifyInstalledTeamAgentOnPath(options = {}) {
|
|
|
479
399
|
`but installer installed ${expectedVersion}. Remove or update the earlier PATH entry that shadows Team Agent.`,
|
|
480
400
|
);
|
|
481
401
|
}
|
|
482
|
-
return { entry, version: actualVersion };
|
|
402
|
+
return { status: "ready", entry, version: actualVersion };
|
|
483
403
|
}
|
|
484
404
|
|
|
485
405
|
export function parseTeamAgentVersion(output) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@team-agent/installer",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.123",
|
|
4
4
|
"description": "npx installer for Team Agent",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"codex",
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"team-agent-installer": "npm/install.mjs"
|
|
21
21
|
},
|
|
22
22
|
"optionalDependencies": {
|
|
23
|
-
"@team-agent/cli-darwin-arm64": "0.5.
|
|
24
|
-
"@team-agent/cli-darwin-x64": "0.5.
|
|
25
|
-
"@team-agent/cli-linux-x64": "0.5.
|
|
23
|
+
"@team-agent/cli-darwin-arm64": "0.5.123",
|
|
24
|
+
"@team-agent/cli-darwin-x64": "0.5.123",
|
|
25
|
+
"@team-agent/cli-linux-x64": "0.5.123"
|
|
26
26
|
},
|
|
27
27
|
"scripts": {
|
|
28
28
|
"postinstall": "node npm/bincheck.mjs",
|