@team-agent/installer 0.5.125 → 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 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- 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/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- 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/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- 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 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- 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/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 +22 -138
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +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_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 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -23
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- 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/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/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/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/test_support/models_timeout_fixture.rs +0 -144
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
//!
|
|
1
|
+
//! Profile launch contracts for Batch A Lane 2.
|
|
2
2
|
//!
|
|
3
|
-
//! The
|
|
4
|
-
//!
|
|
5
|
-
//! S0 it behavior-reds on lifecycle/profile wiring.
|
|
3
|
+
//! The Claude compatible-api worker launch these contracts were written for is gone with the
|
|
4
|
+
//! legacy Claude worker runtime; the provider-neutral resolver wiring and doctor contracts remain.
|
|
6
5
|
|
|
7
6
|
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
|
|
8
7
|
|
|
@@ -13,117 +12,10 @@ fn _hermetic_boundary_marker(_: &hermetic_guard::HermeticTestEnv) {}
|
|
|
13
12
|
|
|
14
13
|
#[path = "../../../tests/support/composite_source.rs"]
|
|
15
14
|
mod composite_source;
|
|
16
|
-
use std::collections::{BTreeMap, BTreeSet};
|
|
17
15
|
use std::path::{Path, PathBuf};
|
|
18
16
|
use std::process::Command;
|
|
19
|
-
use std::sync::atomic::{AtomicU64, Ordering};
|
|
20
|
-
use std::sync::Mutex;
|
|
21
17
|
|
|
22
18
|
use serde_json::{json, Value};
|
|
23
|
-
use serial_test::serial;
|
|
24
|
-
use team_agent::lifecycle::quick_start_with_transport_in_workspace;
|
|
25
|
-
use team_agent::provider::{ProviderCommandOverrides, ProviderProfileLaunch};
|
|
26
|
-
use team_agent::state::persist::load_runtime_state;
|
|
27
|
-
use team_agent::transport::{
|
|
28
|
-
AttachOutcome, BackendKind, CaptureRange, CapturedText, InjectPayload, InjectReport,
|
|
29
|
-
InjectStage, InjectVerification, Key, PaneField, PaneId, PaneInfo, SessionName, SetEnvOutcome,
|
|
30
|
-
SpawnResult, SubmitVerification, Target, Transport, TransportError, TurnVerification,
|
|
31
|
-
WindowName,
|
|
32
|
-
};
|
|
33
|
-
|
|
34
|
-
#[test]
|
|
35
|
-
#[serial(env)]
|
|
36
|
-
fn compatible_api_profile_quick_start_spawns_claude_with_profile_env_and_state_metadata() {
|
|
37
|
-
let _hermetic = hermetic_guard::HermeticTestEnv::enter_with_leader("claude-profile-quick-start");
|
|
38
|
-
assert_s0_profile_launch_shape();
|
|
39
|
-
|
|
40
|
-
let ws = tmp_dir("profile-launch");
|
|
41
|
-
super::launch_spawn::seed_healthy_coordinator(&ws);
|
|
42
|
-
let team = write_claude_profile_team(&ws, "claudeprof", "clauder");
|
|
43
|
-
let transport = RecordingTransport::default();
|
|
44
|
-
|
|
45
|
-
quick_start_with_transport_in_workspace(&ws, &team, None, true, Some("claudeprof"), &transport)
|
|
46
|
-
.expect(
|
|
47
|
-
"quick-start through recording transport should reach the real lifecycle spawn path",
|
|
48
|
-
);
|
|
49
|
-
|
|
50
|
-
let spawn = transport.single_spawn();
|
|
51
|
-
for (key, expected) in [
|
|
52
|
-
("CLAUDE_CONFIG_DIR", None),
|
|
53
|
-
("ANTHROPIC_BASE_URL", Some("https://llm.local/v1")),
|
|
54
|
-
("ANTHROPIC_AUTH_TOKEN", Some("local-secret")),
|
|
55
|
-
("ANTHROPIC_MODEL", Some("profile-effective-haiku")),
|
|
56
|
-
] {
|
|
57
|
-
let got = spawn.env.get(key).map(String::as_str);
|
|
58
|
-
match expected {
|
|
59
|
-
Some(expected) => assert_eq!(
|
|
60
|
-
got,
|
|
61
|
-
Some(expected),
|
|
62
|
-
"Claude compatible_api profile launch must inject {key} from .team/current/profiles/local.env; env={:?}",
|
|
63
|
-
spawn.env
|
|
64
|
-
),
|
|
65
|
-
None => assert!(
|
|
66
|
-
got.is_some_and(|value| !value.is_empty()),
|
|
67
|
-
"Claude compatible_api profile launch must inject non-empty {key}; env={:?}",
|
|
68
|
-
spawn.env
|
|
69
|
-
),
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
assert!(
|
|
73
|
-
!spawn.env.contains_key("ANTHROPIC_API_KEY"),
|
|
74
|
-
"compatible_api must unset ANTHROPIC_API_KEY and use ANTHROPIC_AUTH_TOKEN instead; env={:?}",
|
|
75
|
-
spawn.env
|
|
76
|
-
);
|
|
77
|
-
assert!(
|
|
78
|
-
argv_contains_adjacent(&spawn.argv, &["--model", "profile-effective-haiku"]),
|
|
79
|
-
"profile model must become the effective Claude model when role model is null; argv={:?}",
|
|
80
|
-
spawn.argv
|
|
81
|
-
);
|
|
82
|
-
|
|
83
|
-
let state = load_runtime_state(&ws).unwrap();
|
|
84
|
-
let agent = &state["teams"]["claudeprof"]["agents"]["clauder"];
|
|
85
|
-
assert!(
|
|
86
|
-
agent["_pending_session_id"].as_str().is_some_and(|value| !value.is_empty()),
|
|
87
|
-
"lifecycle must persist CommandPlan.expected_session_id as agents[*]._pending_session_id; state={state}"
|
|
88
|
-
);
|
|
89
|
-
assert!(
|
|
90
|
-
agent["claude_projects_root"].as_str().is_some_and(|value| !value.is_empty()),
|
|
91
|
-
"lifecycle must persist CommandPlan.provider_projects_root/profile claude_projects_root for capture; state={state}"
|
|
92
|
-
);
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
#[ignore = "flaky under parallel suite, tracked"]
|
|
96
|
-
#[test]
|
|
97
|
-
#[serial(env)]
|
|
98
|
-
fn subscription_profile_keeps_default_claude_config_dir_for_logged_in_quota() {
|
|
99
|
-
let ws = tmp_dir("subscription-config");
|
|
100
|
-
let team = write_claude_subscription_profile_team(&ws, "subteam", "clauder");
|
|
101
|
-
let transport = RecordingTransport::default();
|
|
102
|
-
|
|
103
|
-
quick_start_with_transport_in_workspace(&ws, &team, None, true, Some("subteam"), &transport)
|
|
104
|
-
.expect("subscription profile should launch without managed config isolation");
|
|
105
|
-
|
|
106
|
-
let spawn = transport.single_spawn();
|
|
107
|
-
assert!(
|
|
108
|
-
!spawn.env.contains_key("CLAUDE_CONFIG_DIR"),
|
|
109
|
-
"subscription Claude workers must inherit the user's default ~/.claude login state; env={:?}",
|
|
110
|
-
spawn.env
|
|
111
|
-
);
|
|
112
|
-
assert!(
|
|
113
|
-
!spawn.env.contains_key("ANTHROPIC_API_KEY")
|
|
114
|
-
&& !spawn.env.contains_key("ANTHROPIC_AUTH_TOKEN"),
|
|
115
|
-
"subscription launch must not switch into API-token auth via profile env; env={:?}",
|
|
116
|
-
spawn.env
|
|
117
|
-
);
|
|
118
|
-
|
|
119
|
-
let state = load_runtime_state(&ws).unwrap();
|
|
120
|
-
let agent = &state["teams"]["subteam"]["agents"]["clauder"];
|
|
121
|
-
assert_eq!(
|
|
122
|
-
agent.get("claude_projects_root"),
|
|
123
|
-
None,
|
|
124
|
-
"without a supported fine-grained Claude projects-root env, subscription workers must not fake an isolated transcript root; state={state}"
|
|
125
|
-
);
|
|
126
|
-
}
|
|
127
19
|
|
|
128
20
|
#[test]
|
|
129
21
|
fn launch_restart_start_add_and_fork_all_delegate_to_the_profile_launch_resolver() {
|
|
@@ -171,7 +63,7 @@ fn launch_restart_start_add_and_fork_all_delegate_to_the_profile_launch_resolver
|
|
|
171
63
|
fn diagnose_missing_profile_is_rc1_ok_false_and_zero_token() {
|
|
172
64
|
let env = hermetic_guard::HermeticTestEnv::enter("diagnose-missing-profile");
|
|
173
65
|
let ws = env.workspace("missing-profile");
|
|
174
|
-
let team =
|
|
66
|
+
let team = write_compatible_profile_team(&ws, "diagteam", "copiloter");
|
|
175
67
|
std::fs::remove_file(
|
|
176
68
|
ws.join(".team")
|
|
177
69
|
.join("current")
|
|
@@ -212,73 +104,26 @@ fn diagnose_missing_profile_is_rc1_ok_false_and_zero_token() {
|
|
|
212
104
|
);
|
|
213
105
|
}
|
|
214
106
|
|
|
215
|
-
fn
|
|
216
|
-
let profile = ProviderProfileLaunch {
|
|
217
|
-
env_overlay: BTreeMap::from([(
|
|
218
|
-
"ANTHROPIC_MODEL".to_string(),
|
|
219
|
-
"profile-effective-haiku".to_string(),
|
|
220
|
-
)]),
|
|
221
|
-
env_unset: BTreeSet::from(["ANTHROPIC_API_KEY".to_string()]),
|
|
222
|
-
command_overrides: ProviderCommandOverrides {
|
|
223
|
-
model: Some("profile-effective-haiku".to_string()),
|
|
224
|
-
..ProviderCommandOverrides::default()
|
|
225
|
-
},
|
|
226
|
-
claude_config_dir: Some(PathBuf::from("/tmp/claude-config")),
|
|
227
|
-
claude_projects_root: Some(PathBuf::from("/tmp/claude-config/projects")),
|
|
228
|
-
managed_mcp_config: true,
|
|
229
|
-
};
|
|
230
|
-
assert!(profile.managed_mcp_config);
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
fn write_claude_profile_team(ws: &Path, team_key: &str, agent_id: &str) -> PathBuf {
|
|
107
|
+
fn write_compatible_profile_team(ws: &Path, team_key: &str, agent_id: &str) -> PathBuf {
|
|
234
108
|
let team = ws.join(team_key);
|
|
235
109
|
std::fs::create_dir_all(team.join("agents")).unwrap();
|
|
236
110
|
std::fs::create_dir_all(ws.join(".team").join("current").join("profiles")).unwrap();
|
|
237
111
|
std::fs::write(
|
|
238
112
|
ws.join(".team").join("current").join("profiles").join("local.env"),
|
|
239
|
-
"
|
|
113
|
+
"BASE_URL=https://llm.local/v1\nAPI_KEY=local-secret\nMODEL=profile-effective-model\n",
|
|
240
114
|
)
|
|
241
115
|
.unwrap();
|
|
242
116
|
std::fs::write(
|
|
243
117
|
team.join("TEAM.md"),
|
|
244
118
|
format!(
|
|
245
|
-
"---\nname: {team_key}\nobjective:
|
|
119
|
+
"---\nname: {team_key}\nobjective: Compatible profile doctor contract.\nprovider: copilot\nauth_mode: compatible_api\ndangerously_skip_permissions: false\n---\n\nTeam.\n"
|
|
246
120
|
),
|
|
247
121
|
)
|
|
248
122
|
.unwrap();
|
|
249
123
|
std::fs::write(
|
|
250
124
|
team.join("agents").join(format!("{agent_id}.md")),
|
|
251
125
|
format!(
|
|
252
|
-
"---\nname: {agent_id}\nrole:
|
|
253
|
-
),
|
|
254
|
-
)
|
|
255
|
-
.unwrap();
|
|
256
|
-
team
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
fn write_claude_subscription_profile_team(ws: &Path, team_key: &str, agent_id: &str) -> PathBuf {
|
|
260
|
-
let team = ws.join(team_key);
|
|
261
|
-
std::fs::create_dir_all(team.join("agents")).unwrap();
|
|
262
|
-
std::fs::create_dir_all(ws.join(".team").join("current").join("profiles")).unwrap();
|
|
263
|
-
std::fs::write(
|
|
264
|
-
ws.join(".team")
|
|
265
|
-
.join("current")
|
|
266
|
-
.join("profiles")
|
|
267
|
-
.join("local.env"),
|
|
268
|
-
"AUTH_MODE=subscription\nMODEL=claude-sonnet-4-6\n",
|
|
269
|
-
)
|
|
270
|
-
.unwrap();
|
|
271
|
-
std::fs::write(
|
|
272
|
-
team.join("TEAM.md"),
|
|
273
|
-
format!(
|
|
274
|
-
"---\nname: {team_key}\nobjective: Claude subscription profile launch contract.\nprovider: claude\nauth_mode: subscription\ndangerously_skip_permissions: false\n---\n\nTeam.\n"
|
|
275
|
-
),
|
|
276
|
-
)
|
|
277
|
-
.unwrap();
|
|
278
|
-
std::fs::write(
|
|
279
|
-
team.join("agents").join(format!("{agent_id}.md")),
|
|
280
|
-
format!(
|
|
281
|
-
"---\nname: {agent_id}\nrole: Claude Worker\nprovider: claude\nauth_mode: subscription\ndangerously_skip_permissions: false\nprofile: local\nmodel: null\ntools:\n - mcp_team\n---\n\nWorker.\n"
|
|
126
|
+
"---\nname: {agent_id}\nrole: Copilot Worker\nprovider: copilot\nauth_mode: compatible_api\ndangerously_skip_permissions: false\nprofile: local\nmodel: profile-effective-model\ntools:\n - mcp_team\n---\n\nWorker.\n"
|
|
282
127
|
),
|
|
283
128
|
)
|
|
284
129
|
.unwrap();
|
|
@@ -288,160 +133,3 @@ fn write_claude_subscription_profile_team(ws: &Path, team_key: &str, agent_id: &
|
|
|
288
133
|
fn source(path: &str) -> String {
|
|
289
134
|
composite_source::composite_source(path)
|
|
290
135
|
}
|
|
291
|
-
|
|
292
|
-
fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
293
|
-
hay.windows(needle.len())
|
|
294
|
-
.any(|window| window.iter().map(String::as_str).eq(needle.iter().copied()))
|
|
295
|
-
}
|
|
296
|
-
|
|
297
|
-
fn tmp_dir(tag: &str) -> PathBuf {
|
|
298
|
-
static N: AtomicU64 = AtomicU64::new(0);
|
|
299
|
-
let dir = std::env::temp_dir().join(format!(
|
|
300
|
-
"ta-rs-claude-profile-launch-{tag}-{}-{}",
|
|
301
|
-
std::process::id(),
|
|
302
|
-
N.fetch_add(1, Ordering::Relaxed)
|
|
303
|
-
));
|
|
304
|
-
let _ = std::fs::remove_dir_all(&dir);
|
|
305
|
-
std::fs::create_dir_all(&dir).unwrap();
|
|
306
|
-
std::fs::canonicalize(dir).unwrap()
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
#[derive(Debug, Clone)]
|
|
310
|
-
struct RecordedSpawn {
|
|
311
|
-
argv: Vec<String>,
|
|
312
|
-
env: BTreeMap<String, String>,
|
|
313
|
-
}
|
|
314
|
-
|
|
315
|
-
#[derive(Debug, Default)]
|
|
316
|
-
struct RecordingTransport {
|
|
317
|
-
spawns: Mutex<Vec<RecordedSpawn>>,
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
impl RecordingTransport {
|
|
321
|
-
fn single_spawn(&self) -> RecordedSpawn {
|
|
322
|
-
let spawns = self.spawns.lock().unwrap();
|
|
323
|
-
assert_eq!(
|
|
324
|
-
spawns.len(),
|
|
325
|
-
1,
|
|
326
|
-
"fixture should record one Claude worker spawn; spawns={spawns:?}"
|
|
327
|
-
);
|
|
328
|
-
spawns[0].clone()
|
|
329
|
-
}
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
impl Transport for RecordingTransport {
|
|
333
|
-
fn kind(&self) -> BackendKind {
|
|
334
|
-
BackendKind::Tmux
|
|
335
|
-
}
|
|
336
|
-
|
|
337
|
-
fn spawn_first(
|
|
338
|
-
&self,
|
|
339
|
-
session: &SessionName,
|
|
340
|
-
window: &WindowName,
|
|
341
|
-
argv: &[String],
|
|
342
|
-
_cwd: &Path,
|
|
343
|
-
env: &BTreeMap<String, String>,
|
|
344
|
-
) -> Result<SpawnResult, TransportError> {
|
|
345
|
-
self.spawn_into(session, window, argv, _cwd, env)
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
fn spawn_into(
|
|
349
|
-
&self,
|
|
350
|
-
session: &SessionName,
|
|
351
|
-
window: &WindowName,
|
|
352
|
-
argv: &[String],
|
|
353
|
-
_cwd: &Path,
|
|
354
|
-
env: &BTreeMap<String, String>,
|
|
355
|
-
) -> Result<SpawnResult, TransportError> {
|
|
356
|
-
let mut spawns = self.spawns.lock().unwrap();
|
|
357
|
-
spawns.push(RecordedSpawn {
|
|
358
|
-
argv: argv.to_vec(),
|
|
359
|
-
env: env.clone(),
|
|
360
|
-
});
|
|
361
|
-
Ok(SpawnResult {
|
|
362
|
-
pane_id: PaneId::new(format!("%{}", spawns.len())),
|
|
363
|
-
session: session.clone(),
|
|
364
|
-
window: window.clone(),
|
|
365
|
-
child_pid: Some(10_000 + spawns.len() as u32),
|
|
366
|
-
})
|
|
367
|
-
}
|
|
368
|
-
|
|
369
|
-
fn inject(
|
|
370
|
-
&self,
|
|
371
|
-
_target: &Target,
|
|
372
|
-
_payload: &InjectPayload,
|
|
373
|
-
_submit: Key,
|
|
374
|
-
_bracketed: bool,
|
|
375
|
-
) -> Result<InjectReport, TransportError> {
|
|
376
|
-
Ok(InjectReport {
|
|
377
|
-
stage_reached: InjectStage::Submit,
|
|
378
|
-
inject_verification: InjectVerification::CaptureContainsToken,
|
|
379
|
-
submit_verification: SubmitVerification::EnterSentWithoutPlaceholderCheck,
|
|
380
|
-
turn_verification: TurnVerification::NotYetObserved,
|
|
381
|
-
attempts: 1,
|
|
382
|
-
submit_diagnostics: None,
|
|
383
|
-
})
|
|
384
|
-
}
|
|
385
|
-
|
|
386
|
-
fn send_keys(&self, _target: &Target, _keys: &[Key]) -> Result<(), TransportError> {
|
|
387
|
-
Ok(())
|
|
388
|
-
}
|
|
389
|
-
|
|
390
|
-
fn capture(
|
|
391
|
-
&self,
|
|
392
|
-
_target: &Target,
|
|
393
|
-
range: CaptureRange,
|
|
394
|
-
) -> Result<CapturedText, TransportError> {
|
|
395
|
-
Ok(CapturedText {
|
|
396
|
-
text: String::new(),
|
|
397
|
-
range,
|
|
398
|
-
})
|
|
399
|
-
}
|
|
400
|
-
|
|
401
|
-
fn query(&self, _target: &Target, field: PaneField) -> Result<Option<String>, TransportError> {
|
|
402
|
-
match field {
|
|
403
|
-
PaneField::PaneWidth => Ok(Some("120".to_string())),
|
|
404
|
-
_ => Ok(None),
|
|
405
|
-
}
|
|
406
|
-
}
|
|
407
|
-
|
|
408
|
-
fn liveness(
|
|
409
|
-
&self,
|
|
410
|
-
_pane: &PaneId,
|
|
411
|
-
) -> Result<team_agent::transport::PaneLiveness, TransportError> {
|
|
412
|
-
Ok(team_agent::transport::PaneLiveness::Live)
|
|
413
|
-
}
|
|
414
|
-
|
|
415
|
-
fn list_targets(&self) -> Result<Vec<PaneInfo>, TransportError> {
|
|
416
|
-
Ok(Vec::new())
|
|
417
|
-
}
|
|
418
|
-
|
|
419
|
-
fn has_session(&self, _session: &SessionName) -> Result<bool, TransportError> {
|
|
420
|
-
Ok(false)
|
|
421
|
-
}
|
|
422
|
-
|
|
423
|
-
fn list_windows(&self, _session: &SessionName) -> Result<Vec<WindowName>, TransportError> {
|
|
424
|
-
Ok(Vec::new())
|
|
425
|
-
}
|
|
426
|
-
|
|
427
|
-
fn set_session_env(
|
|
428
|
-
&self,
|
|
429
|
-
_session: &SessionName,
|
|
430
|
-
_key: &str,
|
|
431
|
-
_value: &str,
|
|
432
|
-
) -> Result<SetEnvOutcome, TransportError> {
|
|
433
|
-
Ok(SetEnvOutcome::Applied)
|
|
434
|
-
}
|
|
435
|
-
|
|
436
|
-
fn kill_session(&self, _session: &SessionName) -> Result<(), TransportError> {
|
|
437
|
-
Ok(())
|
|
438
|
-
}
|
|
439
|
-
|
|
440
|
-
fn kill_window(&self, _target: &Target) -> Result<(), TransportError> {
|
|
441
|
-
Ok(())
|
|
442
|
-
}
|
|
443
|
-
|
|
444
|
-
fn attach_session(&self, _session: &SessionName) -> Result<AttachOutcome, TransportError> {
|
|
445
|
-
Ok(AttachOutcome::Attached)
|
|
446
|
-
}
|
|
447
|
-
}
|
|
@@ -218,12 +218,7 @@ fn executable(path: &Path, script: &str) {
|
|
|
218
218
|
fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
|
|
219
219
|
}
|
|
220
220
|
fn role(provider: &str, id: &str) -> String {
|
|
221
|
-
|
|
222
|
-
"team-agent/qwen3.8-27b"
|
|
223
|
-
} else {
|
|
224
|
-
"gpt-5.5"
|
|
225
|
-
};
|
|
226
|
-
format!("---\nname: {id}\nrole: {id} Worker\nprovider: {provider}\nmodel: {model}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nLiteral route worker.\n")
|
|
221
|
+
format!("---\nname: {id}\nrole: {id} Worker\nprovider: {provider}\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nLiteral route worker.\n")
|
|
227
222
|
}
|
|
228
223
|
fn seed_coordinator(ws: &Path) {
|
|
229
224
|
let workspace = crate::coordinator::WorkspacePath::new(ws.to_path_buf());
|
|
@@ -476,7 +471,7 @@ fn a03_persisted_enabled_and_env_override_apply_at_native_cold_boundary() {
|
|
|
476
471
|
#[serial(env)]
|
|
477
472
|
fn a05_generated_literal_tokens_roundtrip_cli_json_native_and_posix_wrappers() {
|
|
478
473
|
let f = Fixture::new("argv-literal");
|
|
479
|
-
let base = f.cold("
|
|
474
|
+
let base = f.cold("codex");
|
|
480
475
|
let sentinel = f.env.root().join("INJECTION-MUST-NOT-RUN");
|
|
481
476
|
for seed in 0..16 {
|
|
482
477
|
let route = vec![
|
|
@@ -497,7 +492,7 @@ fn a05_generated_literal_tokens_roundtrip_cli_json_native_and_posix_wrappers() {
|
|
|
497
492
|
];
|
|
498
493
|
let mut cmd = Command::new(super::test_binary_path());
|
|
499
494
|
cmd.current_dir(&f.ws)
|
|
500
|
-
.args(["route", "set", "
|
|
495
|
+
.args(["route", "set", "codex", "--json", "--"])
|
|
501
496
|
.args(&route)
|
|
502
497
|
.env(SWITCH, "off");
|
|
503
498
|
let out = cmd.output().unwrap();
|
|
@@ -507,12 +502,12 @@ fn a05_generated_literal_tokens_roundtrip_cli_json_native_and_posix_wrappers() {
|
|
|
507
502
|
String::from_utf8_lossy(&out.stderr)
|
|
508
503
|
);
|
|
509
504
|
let persisted: Value = serde_json::from_slice(&fs::read(f.config()).unwrap()).unwrap();
|
|
510
|
-
assert_eq!(persisted["providers"]["
|
|
505
|
+
assert_eq!(persisted["providers"]["codex"], json!(route));
|
|
511
506
|
f.switch(Some("on"));
|
|
512
|
-
let actual = f.cold("
|
|
507
|
+
let actual = f.cold("codex");
|
|
513
508
|
injected(&base, &route, &actual);
|
|
514
509
|
let mut recorded = actual.clone();
|
|
515
|
-
recorded[0] = f.bin.join("
|
|
510
|
+
recorded[0] = f.bin.join("codex").to_string_lossy().into_owned();
|
|
516
511
|
for leader in [false, true] {
|
|
517
512
|
let line = if leader {
|
|
518
513
|
crate::tmux_backend::leader_shell_wrapper_command(
|
|
@@ -520,7 +515,7 @@ fn a05_generated_literal_tokens_roundtrip_cli_json_native_and_posix_wrappers() {
|
|
|
520
515
|
&f.ws,
|
|
521
516
|
&BTreeMap::new(),
|
|
522
517
|
&[],
|
|
523
|
-
"
|
|
518
|
+
"codex",
|
|
524
519
|
)
|
|
525
520
|
} else {
|
|
526
521
|
crate::tmux_backend::worker_shell_wrapper_command(
|
|
@@ -528,7 +523,7 @@ fn a05_generated_literal_tokens_roundtrip_cli_json_native_and_posix_wrappers() {
|
|
|
528
523
|
&f.ws,
|
|
529
524
|
&BTreeMap::new(),
|
|
530
525
|
&[],
|
|
531
|
-
"
|
|
526
|
+
"codex",
|
|
532
527
|
)
|
|
533
528
|
};
|
|
534
529
|
// Recorder terminates its exact parent shell after capturing argv; no inert-tail orphan.
|
|
@@ -566,9 +561,7 @@ fn provider_property(key: &str, provider: Provider) {
|
|
|
566
561
|
f.switch(None);
|
|
567
562
|
let actual = f.cold(wire);
|
|
568
563
|
f.seed(true, json!({"pi":["pi-must-not-leak"]}));
|
|
569
|
-
|
|
570
|
-
assert_eq!(normalized(&f.cold(wire)), normalized(&base));
|
|
571
|
-
}
|
|
564
|
+
assert_eq!(normalized(&f.cold(wire)), normalized(&base));
|
|
572
565
|
injected(&base, &[format!("route-only-{key}")], &actual);
|
|
573
566
|
assert_eq!(
|
|
574
567
|
actual
|
|
@@ -580,13 +573,10 @@ fn provider_property(key: &str, provider: Provider) {
|
|
|
580
573
|
}
|
|
581
574
|
macro_rules! provider_tests { ($($name:ident => $key:literal, $provider:ident;)*) => { $(#[test] #[serial(env)] fn $name() { provider_property($key, Provider::$provider); })* }; }
|
|
582
575
|
provider_tests! {
|
|
583
|
-
a06_claude => "claude", Claude;
|
|
584
|
-
a06_claude_code => "claude", ClaudeCode;
|
|
585
576
|
a06_codex => "codex", Codex;
|
|
586
577
|
a06_copilot => "copilot", Copilot;
|
|
587
578
|
a06_gemini_cli => "gemini_cli", GeminiCli;
|
|
588
579
|
a06_grok => "grok", Grok;
|
|
589
|
-
a06_pi => "pi", Pi;
|
|
590
580
|
}
|
|
591
581
|
|
|
592
582
|
#[test]
|
|
@@ -832,78 +822,6 @@ fn a09_start_fresh_missing_backing_reset_and_add_use_new_route_once() {
|
|
|
832
822
|
}
|
|
833
823
|
}
|
|
834
824
|
|
|
835
|
-
#[test]
|
|
836
|
-
#[serial(env)]
|
|
837
|
-
fn a09_resume_retains_session_metadata_while_routes_change() {
|
|
838
|
-
let f = Fixture::new("argv-resume");
|
|
839
|
-
f.start_team("pi", &["worker"]);
|
|
840
|
-
let selected = crate::state::projection::select_runtime_state(&f.ws, Some("argvteam")).unwrap();
|
|
841
|
-
// Fresh Pi assigns its own session id; capture records it afterwards.
|
|
842
|
-
assert!(selected["agents"]["worker"]["_pending_session_id"].is_null());
|
|
843
|
-
let session_id = "8d6c1f2e-4a5b-4c7d-9e0f-a09000000001";
|
|
844
|
-
let session = crate::lifecycle::launch::pi_mcp::pi_seat_paths(&f.ws, "argvteam", "worker")
|
|
845
|
-
.sessions
|
|
846
|
-
.join("valid.jsonl");
|
|
847
|
-
fs::create_dir_all(session.parent().unwrap()).unwrap();
|
|
848
|
-
fs::write(&session, format!("{}\n{}\n", json!({"type":"session","version":3,"id":session_id,"cwd":f.ws,"timestamp":"2026-01-01T00:00:00Z"}), json!({"type":"message","id":"a","parentId":null,"timestamp":"2026-01-01T00:00:01Z","message":{"role":"user","content":[{"type":"text","text":"seed"}]}}))).unwrap();
|
|
849
|
-
f.mutate_agent("worker", |a| {
|
|
850
|
-
a["status"] = json!("stopped");
|
|
851
|
-
a["session_id"] = json!(session_id);
|
|
852
|
-
a["rollout_path"] = json!(session);
|
|
853
|
-
a["captured_at"] = json!("2026-01-01T00:00:01Z");
|
|
854
|
-
a["captured_via"] = json!("session_scan");
|
|
855
|
-
a["capture_state"] = json!("captured");
|
|
856
|
-
a["first_send_at"] = json!("2026-01-01T00:00:01Z");
|
|
857
|
-
});
|
|
858
|
-
f.seed(true, json!({"pi":["resume-route"]}));
|
|
859
|
-
f.switch(None);
|
|
860
|
-
let t = offline();
|
|
861
|
-
start_agent_with_transport(
|
|
862
|
-
&f.ws,
|
|
863
|
-
&AgentId::new("worker"),
|
|
864
|
-
false,
|
|
865
|
-
false,
|
|
866
|
-
false,
|
|
867
|
-
Some("argvteam"),
|
|
868
|
-
&t,
|
|
869
|
-
)
|
|
870
|
-
.unwrap();
|
|
871
|
-
assert_eq!(t.spawn_records().len(), 1);
|
|
872
|
-
let argv = t.spawn_records()[0].1.clone();
|
|
873
|
-
assert!(argv
|
|
874
|
-
.windows(2)
|
|
875
|
-
.any(|p| p[0] == "--session" && Path::new(&p[1]) == session));
|
|
876
|
-
assert!(!argv.iter().any(|v| v == "--session-id"));
|
|
877
|
-
let retained = offline().with_session_present(true);
|
|
878
|
-
let reset = reset_agent_with_transport(
|
|
879
|
-
&f.ws,
|
|
880
|
-
&AgentId::new("worker"),
|
|
881
|
-
false,
|
|
882
|
-
false,
|
|
883
|
-
Some("argvteam"),
|
|
884
|
-
&retained,
|
|
885
|
-
);
|
|
886
|
-
// Existing reset policy requires discard-session even with a valid tuple.
|
|
887
|
-
// Protect refusal; routing must not invent a retain-session reset branch.
|
|
888
|
-
assert!(matches!(
|
|
889
|
-
reset,
|
|
890
|
-
Ok(crate::lifecycle::ResetAgentOutcome::Refused { .. })
|
|
891
|
-
));
|
|
892
|
-
assert!(retained.spawn_records().is_empty());
|
|
893
|
-
let restarted = offline()
|
|
894
|
-
.with_session_present(true)
|
|
895
|
-
.with_default_liveness(crate::transport::PaneLiveness::Dead);
|
|
896
|
-
let report = restart_with_transport(&f.ws, false, Some("argvteam"), &restarted);
|
|
897
|
-
assert!(report.is_ok(), "in-session resume fixture: {report:?}");
|
|
898
|
-
assert_eq!(restarted.spawn_records().len(), 1);
|
|
899
|
-
let restart_argv = restarted.spawn_records()[0].1.clone();
|
|
900
|
-
assert!(restart_argv
|
|
901
|
-
.windows(2)
|
|
902
|
-
.any(|p| p[0] == "--session" && Path::new(&p[1]) == session));
|
|
903
|
-
assert_route(&argv, &["resume-route"]);
|
|
904
|
-
assert_route(&restart_argv, &["resume-route"]);
|
|
905
|
-
}
|
|
906
|
-
|
|
907
825
|
#[test]
|
|
908
826
|
#[serial(env)]
|
|
909
827
|
fn a09_remove_rollback_respawns_original_seat_with_route_once() {
|
|
@@ -944,51 +862,11 @@ fn a09_remove_rollback_respawns_original_seat_with_route_once() {
|
|
|
944
862
|
);
|
|
945
863
|
}
|
|
946
864
|
|
|
947
|
-
#[test]
|
|
948
|
-
#[serial(env)]
|
|
949
|
-
fn a09_pi_fork_inherits_session_and_routes_only_new_native_spawn() {
|
|
950
|
-
let f = Fixture::new("argv-fork");
|
|
951
|
-
f.start_team("pi", &["worker"]);
|
|
952
|
-
let session = crate::lifecycle::launch::pi_mcp::pi_seat_paths(&f.ws, "argvteam", "worker")
|
|
953
|
-
.sessions
|
|
954
|
-
.join("source.jsonl");
|
|
955
|
-
fs::create_dir_all(session.parent().unwrap()).unwrap();
|
|
956
|
-
let id = "fc317e54-bdbb-4ce5-8c1a-2b1bf33a9700";
|
|
957
|
-
fs::write(&session, format!("{}\n{}\n", json!({"type":"session","version":3,"id":id,"cwd":f.ws,"timestamp":"2026-01-01T00:00:00Z"}), json!({"type":"message","id":"seed01","parentId":null,"timestamp":"2026-01-01T00:00:01Z","message":{"role":"user","content":[{"type":"text","text":"fork seed"}]}}))).unwrap();
|
|
958
|
-
f.mutate_agent("worker", |a| {
|
|
959
|
-
a["session_id"] = json!(id);
|
|
960
|
-
a["rollout_path"] = json!(session);
|
|
961
|
-
a["captured_at"] = json!("2026-01-01T00:00:01Z");
|
|
962
|
-
a["captured_via"] = json!("session_scan");
|
|
963
|
-
a["capture_state"] = json!("captured");
|
|
964
|
-
});
|
|
965
|
-
let original = fs::read(&session).unwrap();
|
|
966
|
-
f.seed(true, json!({"pi":["fork-route"]}));
|
|
967
|
-
f.switch(None);
|
|
968
|
-
let t = offline().with_session_present(true);
|
|
969
|
-
let report = fork_agent_with_transport(
|
|
970
|
-
&f.ws,
|
|
971
|
-
&AgentId::new("worker"),
|
|
972
|
-
&AgentId::new("forked"),
|
|
973
|
-
None,
|
|
974
|
-
false,
|
|
975
|
-
Some("argvteam"),
|
|
976
|
-
&t,
|
|
977
|
-
);
|
|
978
|
-
assert!(
|
|
979
|
-
report.is_ok(),
|
|
980
|
-
"valid v3 Pi fork must reach native spawn: {report:?}"
|
|
981
|
-
);
|
|
982
|
-
assert_eq!(t.spawn_records().len(), 1);
|
|
983
|
-
assert_route(&t.spawn_records()[0].1, &["fork-route"]);
|
|
984
|
-
assert_eq!(fs::read(session).unwrap(), original);
|
|
985
|
-
}
|
|
986
|
-
|
|
987
865
|
#[test]
|
|
988
866
|
#[serial(env)]
|
|
989
867
|
fn a09_public_clone_reaches_native_argv_without_inheriting_old_route() {
|
|
990
868
|
let f = Fixture::new("argv-clone");
|
|
991
|
-
f.start_team("
|
|
869
|
+
f.start_team("codex", &["worker"]);
|
|
992
870
|
// Public clone has no Transport seam: this fixture tmux executes the actual
|
|
993
871
|
// generated provider shell line against the argv recorder, never real tmux.
|
|
994
872
|
let calls = f.env.root().join("clone-spawn-calls");
|
|
@@ -1009,12 +887,12 @@ new-window|new-session|split-window)
|
|
|
1009
887
|
previous=$last
|
|
1010
888
|
done
|
|
1011
889
|
printf '%s\n' "$op" >> '{}'
|
|
1012
|
-
printf '%%99__TA_FIELD__%s__TA_FIELD__1__TA_FIELD__%s__TA_FIELD__0__TA_FIELD__/dev/pts/
|
|
890
|
+
printf '%%99__TA_FIELD__%s__TA_FIELD__1__TA_FIELD__%s__TA_FIELD__0__TA_FIELD__/dev/pts/99__TA_FIELD__codex__TA_FIELD__1__TA_FIELD__{}__TA_FIELD__0__TA_FIELD__0__TA_FIELD__1__TA_FIELD__\n' "$session" "$window" > '{}'
|
|
1013
891
|
/bin/sh -c "$last" >/dev/null 2>&1
|
|
1014
892
|
echo %99; exit 0;;
|
|
1015
893
|
list-panes) while IFS= read -r line; do printf '%s\n' "$line"; done < '{}';;
|
|
1016
894
|
display-message) for last do :; done; case "$last" in *pane_id*) echo %99;; *pane_dead*) echo 0;; *pane_width*) echo 120;; esac;;
|
|
1017
|
-
capture-pane) echo '>
|
|
895
|
+
capture-pane) echo 'codex>'; ;;
|
|
1018
896
|
*) exit 0;;
|
|
1019
897
|
esac
|
|
1020
898
|
"#,
|
|
@@ -1024,7 +902,7 @@ esac
|
|
|
1024
902
|
identity.display()
|
|
1025
903
|
),
|
|
1026
904
|
);
|
|
1027
|
-
f.seed(true, json!({"
|
|
905
|
+
f.seed(true, json!({"codex":["clone-route"]}));
|
|
1028
906
|
f.switch(None);
|
|
1029
907
|
let cloned = crate::lifecycle::clone_agent(
|
|
1030
908
|
&f.ws,
|
|
@@ -1202,8 +1080,14 @@ fn a13_materializer_version_catalog_and_nonagent_command_builders_are_not_routed
|
|
|
1202
1080
|
json!({"pi":["--mode","rpc"],"copilot":["must-not-pollute-probe"]}),
|
|
1203
1081
|
);
|
|
1204
1082
|
f.switch(None);
|
|
1205
|
-
|
|
1206
|
-
|
|
1083
|
+
unsafe {
|
|
1084
|
+
std::env::set_var("TMUX", "fixture,1,0");
|
|
1085
|
+
}
|
|
1086
|
+
// The Pi leader plan is the remaining Pi materializer (version + catalog probes).
|
|
1087
|
+
let plan = f.leader(Provider::Pi, true, false).unwrap();
|
|
1088
|
+
unsafe {
|
|
1089
|
+
std::env::remove_var("TMUX");
|
|
1090
|
+
}
|
|
1207
1091
|
let probes = fs::read_to_string(&f.probes).unwrap();
|
|
1208
1092
|
assert!(probes.contains("--version"));
|
|
1209
1093
|
assert!(probes.contains("--list-models"));
|
|
@@ -1214,7 +1098,7 @@ fn a13_materializer_version_catalog_and_nonagent_command_builders_are_not_routed
|
|
|
1214
1098
|
!f.native_file().exists(),
|
|
1215
1099
|
"plan/materializer must not execute native provider session"
|
|
1216
1100
|
);
|
|
1217
|
-
assert_route(&
|
|
1101
|
+
assert_route(&plan.provider_argv, &["--mode", "rpc"]);
|
|
1218
1102
|
}
|
|
1219
1103
|
|
|
1220
1104
|
#[test]
|