@team-agent/installer 0.5.127 → 0.5.128
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/README.md +11 -0
- package/crates/team-agent/src/cli/adapters.rs +3 -13
- package/crates/team-agent/src/cli/arguments.rs +4 -0
- package/crates/team-agent/src/cli/diagnose.rs +68 -22
- package/crates/team-agent/src/cli/emit.rs +58 -26
- package/crates/team-agent/src/cli/intent/runtime.rs +32 -5
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +102 -11
- package/crates/team-agent/src/cli/intent/tests.rs +10 -12
- package/crates/team-agent/src/cli/intent.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +25 -8
- package/crates/team-agent/src/cli/models.rs +764 -7
- package/crates/team-agent/src/cli/schedule.rs +175 -0
- package/crates/team-agent/src/cli/send/persist.rs +0 -36
- package/crates/team-agent/src/cli/send/presentation.rs +1 -1
- package/crates/team-agent/src/cli/send.rs +108 -110
- package/crates/team-agent/src/cli/spec.rs +6 -0
- package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
- package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +9 -6
- package/crates/team-agent/src/cli/tests/status_send.rs +68 -271
- package/crates/team-agent/src/compiler/tests.rs +3 -18
- package/crates/team-agent/src/compiler.rs +205 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +145 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +7 -7
- package/crates/team-agent/src/contract_runtime/config.rs +26 -16
- package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
- package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
- package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
- package/crates/team-agent/src/contract_runtime/framework.rs +28 -11
- package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
- package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
- package/crates/team-agent/src/contract_runtime/registry.rs +56 -92
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +11 -11
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +16 -54
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +42 -0
- package/crates/team-agent/src/coordinator/tick.rs +1 -89
- package/crates/team-agent/src/db/message_store.rs +7 -65
- package/crates/team-agent/src/direct_delivery.rs +368 -0
- package/crates/team-agent/src/inbox_store.rs +169 -0
- package/crates/team-agent/src/leader/registry.rs +5 -0
- package/crates/team-agent/src/leader/start.rs +2 -1
- package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
- package/crates/team-agent/src/lib.rs +2 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +38 -13
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +9 -1
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +24 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +36 -13
- package/crates/team-agent/src/lifecycle/launch.rs +24 -1
- package/crates/team-agent/src/lifecycle/profile_launch.rs +321 -11
- package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +345 -35
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +4 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +39 -14
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +236 -13
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +5 -4
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +47 -18
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +14 -14
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +28 -26
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +10 -11
- 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 +254 -2
- 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 +5 -6
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +16 -7
- package/crates/team-agent/src/lifecycle/tests.rs +3 -0
- package/crates/team-agent/src/lifecycle/types.rs +18 -2
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
- package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +98 -119
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
- package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
- package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
- package/crates/team-agent/src/mcp_server/tools.rs +70 -196
- package/crates/team-agent/src/messaging/delivery.rs +160 -218
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/helpers.rs +1 -19
- package/crates/team-agent/src/messaging/mod.rs +1 -0
- package/crates/team-agent/src/messaging/reminders.rs +316 -0
- package/crates/team-agent/src/messaging/scheduler.rs +7 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +191 -85
- package/crates/team-agent/src/messaging/tests/runtime.rs +4 -110
- package/crates/team-agent/src/messaging/tests/spine.rs +40 -24
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +303 -51
- package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +7 -5
- package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
- package/crates/team-agent/src/provider/classify.rs +1 -66
- package/crates/team-agent/src/provider/model_catalog.rs +201 -13
- package/crates/team-agent/src/provider/session/capture.rs +106 -6
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +4 -0
- package/crates/team-agent/src/provider/session/context_fork.rs +150 -18
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +44 -8
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +16 -6
- package/crates/team-agent/src/provider/tests/adapter.rs +104 -17
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +12 -3
- package/crates/team-agent/src/provider/tests/idle.rs +37 -0
- package/crates/team-agent/src/provider/wire.rs +22 -34
- 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/projection.rs +1 -1
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
- package/crates/team-agent/src/tmux_backend.rs +5 -40
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +5 -7
- package/skills/team-agent/command-coverage.json +1 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -3
- package/skills/team-agent/references/team-agent-operator.md +3 -3
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
use std::path::Path;
|
|
2
|
+
use std::sync::atomic::{AtomicU32, Ordering};
|
|
3
|
+
|
|
4
|
+
use crate::compiler::{compile_role_agent, CompiledRole};
|
|
5
|
+
use crate::lifecycle::launch::pi_mcp::{parse_pi_list_models_table, select_exact_pi_model};
|
|
6
|
+
use crate::model::enums::ProviderEffort;
|
|
7
|
+
use crate::model::yaml::Value;
|
|
8
|
+
use crate::model::ModelError;
|
|
9
|
+
use crate::provider::adapters::pi::{build_pi_command_argv, PiCommandRequest, PiSessionSelector};
|
|
10
|
+
|
|
11
|
+
const CATALOG: &[u8] = include_bytes!("fixtures/pi_list_models_g0.stdout.txt");
|
|
12
|
+
static NEXT_ROLE: AtomicU32 = AtomicU32::new(0);
|
|
13
|
+
|
|
14
|
+
fn compile_pi_role(front_matter: &str) -> Result<CompiledRole, ModelError> {
|
|
15
|
+
compile_pi_role_with_team(front_matter, &Value::Map(Vec::new()))
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
fn compile_pi_role_with_team(
|
|
19
|
+
front_matter: &str,
|
|
20
|
+
team_meta: &Value,
|
|
21
|
+
) -> Result<CompiledRole, ModelError> {
|
|
22
|
+
let seq = NEXT_ROLE.fetch_add(1, Ordering::Relaxed);
|
|
23
|
+
let root = std::env::temp_dir().join(format!(
|
|
24
|
+
"team-agent-pi-compiler-{}-{seq}",
|
|
25
|
+
std::process::id()
|
|
26
|
+
));
|
|
27
|
+
std::fs::create_dir_all(&root).expect("create role fixture root");
|
|
28
|
+
let role = root.join("pi-worker.md");
|
|
29
|
+
std::fs::write(
|
|
30
|
+
&role,
|
|
31
|
+
format!("---\n{front_matter}\n---\nPi worker contract.\n"),
|
|
32
|
+
)
|
|
33
|
+
.expect("write role fixture");
|
|
34
|
+
let result = compile_role_agent(&role, team_meta, "/workspace");
|
|
35
|
+
std::fs::remove_dir_all(root).expect("remove role fixture root");
|
|
36
|
+
result
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
fn valid_role_with(extra: &str) -> String {
|
|
40
|
+
format!(
|
|
41
|
+
"name: pi-worker\nrole: developer\nprovider: pi\nmodel: team-agent/qwen3.8-27b\nauth_mode: subscription\neffort: medium\ntools:\n - mcp_team\n - fs_read\n - fs_list\n - fs_write\n - execute_bash\ndangerously_skip_permissions: true\n{extra}"
|
|
42
|
+
)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
fn compile_error(result: Result<CompiledRole, ModelError>) -> ModelError {
|
|
46
|
+
match result {
|
|
47
|
+
Err(error) => error,
|
|
48
|
+
Ok(_) => panic!("incomplete Pi role must refuse"),
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
fn command(_tools: &[&str], effort: ProviderEffort, model: &str) -> Result<Vec<String>, String> {
|
|
53
|
+
build_pi_command_argv(PiCommandRequest {
|
|
54
|
+
extension: Path::new("/workspace/.team/runtime/pi/t1/pi-worker/team-mcp.ts"),
|
|
55
|
+
model: Some(model),
|
|
56
|
+
effort: Some(effort),
|
|
57
|
+
system_prompt: "Pi worker contract.",
|
|
58
|
+
session_dir: Some(Path::new(
|
|
59
|
+
"/workspace/.team/runtime/pi/t1/pi-worker/sessions",
|
|
60
|
+
)),
|
|
61
|
+
session: PiSessionSelector::Fresh,
|
|
62
|
+
agent_id: "pi-worker",
|
|
63
|
+
})
|
|
64
|
+
.map_err(|error| error.to_string())
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
#[test]
|
|
68
|
+
fn pi_role_ignores_tools_and_preserves_provider_defaults() {
|
|
69
|
+
let positive = compile_pi_role(&valid_role_with(""));
|
|
70
|
+
assert!(positive.is_ok(), "fully explicit Pi role must compile");
|
|
71
|
+
|
|
72
|
+
let missing_tools = valid_role_with("").replace(
|
|
73
|
+
"tools:\n - mcp_team\n - fs_read\n - fs_list\n - fs_write\n - execute_bash\n",
|
|
74
|
+
"",
|
|
75
|
+
);
|
|
76
|
+
compile_pi_role(&missing_tools).expect("omitted tools metadata must compile");
|
|
77
|
+
let unqualified =
|
|
78
|
+
valid_role_with("").replace("model: team-agent/qwen3.8-27b", "model: qwen3.8-27b");
|
|
79
|
+
let error = compile_error(compile_pi_role(&unqualified));
|
|
80
|
+
assert!(
|
|
81
|
+
error.to_string().to_ascii_lowercase().contains("qualified exact model"),
|
|
82
|
+
"error must name qualified model; got {error}"
|
|
83
|
+
);
|
|
84
|
+
|
|
85
|
+
let defaults = valid_role_with("")
|
|
86
|
+
.replace("model: team-agent/qwen3.8-27b\n", "")
|
|
87
|
+
.replace("effort: medium\n", "")
|
|
88
|
+
.replace("dangerously_skip_permissions: true\n", "");
|
|
89
|
+
let team_meta = Value::Map(vec![
|
|
90
|
+
(
|
|
91
|
+
"provider_models".to_string(),
|
|
92
|
+
Value::Map(vec![(
|
|
93
|
+
"pi".to_string(),
|
|
94
|
+
Value::Str("team-default/forced-model".to_string()),
|
|
95
|
+
)]),
|
|
96
|
+
),
|
|
97
|
+
(
|
|
98
|
+
"default_model".to_string(),
|
|
99
|
+
Value::Str("global-default/forced-model".to_string()),
|
|
100
|
+
),
|
|
101
|
+
(
|
|
102
|
+
"provider_effort".to_string(),
|
|
103
|
+
Value::Str("high".to_string()),
|
|
104
|
+
),
|
|
105
|
+
]);
|
|
106
|
+
let compiled = compile_pi_role_with_team(&defaults, &team_meta)
|
|
107
|
+
.expect("omitted model and effort preserve provider-native defaults");
|
|
108
|
+
assert_eq!(
|
|
109
|
+
compiled.agent.get("model"),
|
|
110
|
+
Some(&Value::Null),
|
|
111
|
+
"omitted Pi model stays unset rather than using team metadata"
|
|
112
|
+
);
|
|
113
|
+
assert_eq!(
|
|
114
|
+
compiled.agent.get("effort"),
|
|
115
|
+
None,
|
|
116
|
+
"omitted Pi effort stays unset rather than using team metadata"
|
|
117
|
+
);
|
|
118
|
+
assert_eq!(
|
|
119
|
+
compiled.agent.get("dangerously_skip_permissions"),
|
|
120
|
+
Some(&Value::Bool(false)),
|
|
121
|
+
"omitted Pi bypass defaults to safe false"
|
|
122
|
+
);
|
|
123
|
+
|
|
124
|
+
let models = parse_pi_list_models_table(CATALOG).expect("catalog fixture");
|
|
125
|
+
assert!(select_exact_pi_model(&models, "team-agent/qwen3.8-27b").is_ok());
|
|
126
|
+
assert!(select_exact_pi_model(&models, "foo/bar").is_err());
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
#[test]
|
|
130
|
+
fn pi_role_uses_standard_bypass_field_without_fabricating_argv() {
|
|
131
|
+
let compiled = compile_pi_role(&valid_role_with("")).expect("true acknowledgement");
|
|
132
|
+
assert_eq!(
|
|
133
|
+
compiled.agent.get("dangerously_skip_permissions"),
|
|
134
|
+
Some(&Value::Bool(true))
|
|
135
|
+
);
|
|
136
|
+
|
|
137
|
+
let argv = command(
|
|
138
|
+
&["mcp_team"],
|
|
139
|
+
ProviderEffort::Medium,
|
|
140
|
+
"team-agent/qwen3.8-27b",
|
|
141
|
+
)
|
|
142
|
+
.expect("true acknowledgement maps to intrinsic unrestricted mode");
|
|
143
|
+
for forbidden in [
|
|
144
|
+
"--approve",
|
|
145
|
+
"--always-approve",
|
|
146
|
+
"--force",
|
|
147
|
+
"--trust",
|
|
148
|
+
"--sandbox",
|
|
149
|
+
"dangerous_auto_approve",
|
|
150
|
+
] {
|
|
151
|
+
assert!(
|
|
152
|
+
!argv.iter().any(|arg| arg == forbidden),
|
|
153
|
+
"Pi acknowledgement must not fabricate a bypass flag {forbidden}: {argv:?}"
|
|
154
|
+
);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
let false_ack = valid_role_with("").replace(
|
|
158
|
+
"dangerously_skip_permissions: true",
|
|
159
|
+
"dangerously_skip_permissions: false",
|
|
160
|
+
);
|
|
161
|
+
let compiled = compile_pi_role(&false_ack).expect("standard false bypass value");
|
|
162
|
+
assert_eq!(
|
|
163
|
+
compiled.agent.get("dangerously_skip_permissions"),
|
|
164
|
+
Some(&Value::Bool(false))
|
|
165
|
+
);
|
|
166
|
+
|
|
167
|
+
let missing_ack = valid_role_with("").replace("dangerously_skip_permissions: true\n", "");
|
|
168
|
+
let compiled = compile_pi_role(&missing_ack)
|
|
169
|
+
.expect("omitted bypass metadata defaults to false");
|
|
170
|
+
assert_eq!(
|
|
171
|
+
compiled.agent.get("dangerously_skip_permissions"),
|
|
172
|
+
Some(&Value::Bool(false))
|
|
173
|
+
);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
#[test]
|
|
177
|
+
fn pi_max_effort_is_supported_without_model_suffix() {
|
|
178
|
+
let max_role = valid_role_with("").replace("effort: medium", "effort: max");
|
|
179
|
+
compile_pi_role(&max_role).expect("Pi supports explicit max effort");
|
|
180
|
+
|
|
181
|
+
let argv =
|
|
182
|
+
command(&["mcp_team"], ProviderEffort::Max, "team-agent/qwen3.8-27b").expect("max Pi argv");
|
|
183
|
+
assert!(
|
|
184
|
+
argv.windows(2).any(|pair| pair == ["--thinking", "max"]),
|
|
185
|
+
"max must map to --thinking max: {argv:?}"
|
|
186
|
+
);
|
|
187
|
+
assert!(
|
|
188
|
+
argv.windows(2)
|
|
189
|
+
.any(|pair| pair == ["--model", "team-agent/qwen3.8-27b"]),
|
|
190
|
+
"model must remain exact and unsuffixed: {argv:?}"
|
|
191
|
+
);
|
|
192
|
+
assert!(!argv.iter().any(|arg| arg.ends_with(":max")));
|
|
193
|
+
|
|
194
|
+
let models = parse_pi_list_models_table(CATALOG).expect("catalog fixture");
|
|
195
|
+
assert!(select_exact_pi_model(&models, "team-agent/qwen3.8-27b:max").is_err());
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
#[test]
|
|
199
|
+
fn pi_role_command_ignores_legacy_tool_metadata() {
|
|
200
|
+
let argv = command(
|
|
201
|
+
&["mcp_team", "fs_write", "fs_read", "fs_list", "execute_bash"],
|
|
202
|
+
ProviderEffort::Medium,
|
|
203
|
+
"team-agent/qwen3.8-27b",
|
|
204
|
+
)
|
|
205
|
+
.expect("known standard role tools");
|
|
206
|
+
assert!(
|
|
207
|
+
!argv.iter().any(|arg| arg == "--tools"),
|
|
208
|
+
"role tools validate Team Agent capabilities but must not replace direct Pi tools: {argv:?}"
|
|
209
|
+
);
|
|
210
|
+
}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
use crate::cli::spec::{CommandKind, COMMAND_SPECS};
|
|
2
|
+
use crate::compiler::compile_role_agent;
|
|
2
3
|
use crate::lifecycle::launch::pi_mcp::parse_pi_leader_args;
|
|
3
|
-
use crate::model::enums::{Provider, ProviderEffort};
|
|
4
|
+
use crate::model::enums::{AuthMode, Provider, ProviderEffort};
|
|
4
5
|
use crate::model::ids::AgentId;
|
|
6
|
+
use crate::model::yaml::Value;
|
|
7
|
+
use crate::provider::{get_adapter, ProviderCommandContext};
|
|
5
8
|
use crate::transport::test_support::OfflineTransport;
|
|
6
9
|
use crate::transport::{Transport, WindowName};
|
|
7
10
|
use serde_json::json;
|
|
@@ -80,6 +83,36 @@ fn dynamic_add_fixture(root: &Path, label: &str, role_doc: &str) -> (PathBuf, Pa
|
|
|
80
83
|
(team, role)
|
|
81
84
|
}
|
|
82
85
|
|
|
86
|
+
#[cfg(unix)]
|
|
87
|
+
struct EnvVarGuard {
|
|
88
|
+
key: &'static str,
|
|
89
|
+
previous: Option<std::ffi::OsString>,
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
#[cfg(unix)]
|
|
93
|
+
impl EnvVarGuard {
|
|
94
|
+
fn set(key: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
|
|
95
|
+
let previous = std::env::var_os(key);
|
|
96
|
+
unsafe {
|
|
97
|
+
std::env::set_var(key, value);
|
|
98
|
+
}
|
|
99
|
+
Self { key, previous }
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
#[cfg(unix)]
|
|
104
|
+
impl Drop for EnvVarGuard {
|
|
105
|
+
fn drop(&mut self) {
|
|
106
|
+
unsafe {
|
|
107
|
+
if let Some(previous) = self.previous.take() {
|
|
108
|
+
std::env::set_var(self.key, previous);
|
|
109
|
+
} else {
|
|
110
|
+
std::env::remove_var(self.key);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
83
116
|
#[test]
|
|
84
117
|
fn pi_leader_and_teammate_share_provider_plan_but_are_separately_launchable() {
|
|
85
118
|
run_process_isolated(PI_DUAL_ENTRY_CHILD, PI_DUAL_ENTRY_TEST, || {
|
|
@@ -168,6 +201,51 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
168
201
|
);
|
|
169
202
|
}
|
|
170
203
|
|
|
204
|
+
let root = hermetic.workspace("core-dual");
|
|
205
|
+
let role = root.join("worker.md");
|
|
206
|
+
std::fs::write(
|
|
207
|
+
&role,
|
|
208
|
+
"---\nname: worker-a\nrole: developer\nprovider: pi\nmodel: team-agent/qwen3.8-27b\nauth_mode: subscription\neffort: max\ntools:\n - mcp_team\ndangerously_skip_permissions: true\n---\nworker contract\n",
|
|
209
|
+
)
|
|
210
|
+
.expect("write teammate role");
|
|
211
|
+
let teammate = compile_role_agent(&role, &Value::Map(Vec::new()), "/workspace")
|
|
212
|
+
.expect("provider: pi teammate must compile separately");
|
|
213
|
+
assert_eq!(
|
|
214
|
+
teammate.agent.get("provider").and_then(Value::as_str),
|
|
215
|
+
Some("pi")
|
|
216
|
+
);
|
|
217
|
+
|
|
218
|
+
std::fs::write(
|
|
219
|
+
&role,
|
|
220
|
+
"---\nname: worker-a\nrole: developer\nprovider: pi\nauth_mode: subscription\ntools:\n - mcp_team\n---\nworker contract\n",
|
|
221
|
+
)
|
|
222
|
+
.expect("write provider-default teammate role");
|
|
223
|
+
let defaults = compile_role_agent(&role, &Value::Map(Vec::new()), "/workspace")
|
|
224
|
+
.expect("provider: pi teammate may preserve provider-native defaults");
|
|
225
|
+
assert_eq!(defaults.agent.get("model"), Some(&Value::Null));
|
|
226
|
+
assert_eq!(defaults.agent.get("effort"), None);
|
|
227
|
+
assert_eq!(
|
|
228
|
+
defaults.agent.get("dangerously_skip_permissions"),
|
|
229
|
+
Some(&Value::Bool(false))
|
|
230
|
+
);
|
|
231
|
+
std::fs::remove_dir_all(root).expect("remove role fixture");
|
|
232
|
+
|
|
233
|
+
let adapter = get_adapter(Provider::Pi);
|
|
234
|
+
let raw_build = adapter.build_command_plan(ProviderCommandContext {
|
|
235
|
+
auth_mode: AuthMode::Subscription,
|
|
236
|
+
mcp_config: None,
|
|
237
|
+
system_prompt: None,
|
|
238
|
+
model: None,
|
|
239
|
+
dangerously_skip_permissions: false,
|
|
240
|
+
profile_launch: None,
|
|
241
|
+
agent_id_hint: None,
|
|
242
|
+
effort: None,
|
|
243
|
+
});
|
|
244
|
+
assert!(raw_build
|
|
245
|
+
.expect_err("Pi adapter must refuse callers that skip the shared materializer")
|
|
246
|
+
.to_string()
|
|
247
|
+
.contains("shared lifecycle materializer"));
|
|
248
|
+
|
|
171
249
|
let dynamic_root = hermetic.workspace("teammate-dual");
|
|
172
250
|
let fake_role = "---\nname: mate\nrole: Dynamic Worker\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\ndynamic\n";
|
|
173
251
|
|
|
@@ -286,6 +364,69 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
286
364
|
"dynamic add must not create a second tmux session"
|
|
287
365
|
);
|
|
288
366
|
|
|
367
|
+
let pi_provider_root = hermetic.workspace("pi-add-provider");
|
|
368
|
+
let pi_bin = pi_provider_root.join("bin");
|
|
369
|
+
std::fs::create_dir_all(&pi_bin).expect("create Pi test bin");
|
|
370
|
+
let pi_real = pi_provider_root.join("pi-cli");
|
|
371
|
+
std::fs::write(
|
|
372
|
+
&pi_real,
|
|
373
|
+
"#!/bin/sh\ncase \"$1\" in\n --version) printf '0.84.4\\n' ;;\n --list-models) printf 'provider model\\nteam-agent qwen3.8-27b\\n' ;;\n list) exit 64 ;;\n *) exit 64 ;;\nesac\n",
|
|
374
|
+
)
|
|
375
|
+
.expect("write protocol-capable Pi test executable");
|
|
376
|
+
std::fs::set_permissions(
|
|
377
|
+
&pi_real,
|
|
378
|
+
std::os::unix::fs::PermissionsExt::from_mode(0o755),
|
|
379
|
+
)
|
|
380
|
+
.expect("make Pi test executable");
|
|
381
|
+
std::os::unix::fs::symlink(&pi_real, pi_bin.join("pi")).expect("link Pi test executable");
|
|
382
|
+
let _pi_path = EnvVarGuard::set("PATH", pi_bin.as_os_str());
|
|
383
|
+
let pi_success_role = "---\nname: mate\nrole: Pi Dynamic Worker\nprovider: pi\nmodel: team-agent/qwen3.8-27b\nauth_mode: subscription\neffort: max\ntools:\n - mcp_team\ndangerously_skip_permissions: true\n---\n\ndynamic pi\n";
|
|
384
|
+
let (pi_success_team, pi_success_role_path) =
|
|
385
|
+
dynamic_add_fixture(&dynamic_root, "dynamic-pi-success", pi_success_role);
|
|
386
|
+
let pi_success_transport = OfflineTransport::new().with_session_present(true);
|
|
387
|
+
crate::lifecycle::add_agent_with_transport(
|
|
388
|
+
&pi_success_team,
|
|
389
|
+
&AgentId::new("mate"),
|
|
390
|
+
&pi_success_role_path,
|
|
391
|
+
false,
|
|
392
|
+
None,
|
|
393
|
+
&pi_success_transport,
|
|
394
|
+
)
|
|
395
|
+
.expect("Pi dynamic add must commit after spawning its materialized plan");
|
|
396
|
+
let pi_spawn = pi_success_transport.spawn_records();
|
|
397
|
+
assert_eq!(pi_spawn.len(), 1, "Pi dynamic add must spawn exactly once");
|
|
398
|
+
let pi_state = crate::state::persist::load_runtime_state(&pi_success_team)
|
|
399
|
+
.expect("load successful Pi add state");
|
|
400
|
+
assert_eq!(
|
|
401
|
+
pi_state
|
|
402
|
+
.pointer("/agents/mate/status")
|
|
403
|
+
.and_then(serde_json::Value::as_str),
|
|
404
|
+
Some("running"),
|
|
405
|
+
"successful Pi add must commit the running seat"
|
|
406
|
+
);
|
|
407
|
+
let pi_events = crate::event_log::EventLog::new(&pi_success_team)
|
|
408
|
+
.tail(50)
|
|
409
|
+
.expect("read successful Pi add events");
|
|
410
|
+
let pi_start_event = pi_events
|
|
411
|
+
.iter()
|
|
412
|
+
.find(|event| {
|
|
413
|
+
event.get("event").and_then(serde_json::Value::as_str)
|
|
414
|
+
== Some("start_agent.agent_start")
|
|
415
|
+
})
|
|
416
|
+
.expect("successful Pi add must emit start event");
|
|
417
|
+
let pi_event_command = pi_start_event
|
|
418
|
+
.get("command")
|
|
419
|
+
.and_then(serde_json::Value::as_array)
|
|
420
|
+
.expect("successful Pi start event command")
|
|
421
|
+
.iter()
|
|
422
|
+
.map(|value| value.as_str().expect("Pi argv string").to_string())
|
|
423
|
+
.collect::<Vec<_>>();
|
|
424
|
+
assert_eq!(
|
|
425
|
+
pi_event_command, pi_spawn[0].1,
|
|
426
|
+
"Pi start event must record the exact materialized plan that was spawned"
|
|
427
|
+
);
|
|
428
|
+
drop(_pi_path);
|
|
429
|
+
|
|
289
430
|
let (rollback_team, rollback_role) =
|
|
290
431
|
dynamic_add_fixture(&dynamic_root, "dynamic-rollback", fake_role);
|
|
291
432
|
let events_path = rollback_team.join(".team/logs/events.jsonl");
|
|
@@ -311,7 +452,8 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
311
452
|
"failed dynamic add must not retain the inserted seat"
|
|
312
453
|
);
|
|
313
454
|
|
|
314
|
-
let
|
|
455
|
+
let pi_role = "---\nname: mate\nrole: Pi Dynamic Worker\nprovider: pi\nmodel: team-agent/qwen3.8-27b\nauth_mode: subscription\neffort: max\ntools:\n - mcp_team\ndangerously_skip_permissions: true\n---\n\ndynamic pi\n";
|
|
456
|
+
let (noop_team, noop_role) = dynamic_add_fixture(&dynamic_root, "dynamic-noop", pi_role);
|
|
315
457
|
let noop_transport = OfflineTransport::new()
|
|
316
458
|
.with_session_present(true)
|
|
317
459
|
.with_windows(vec![WindowName::new("mate")]);
|
|
@@ -323,7 +465,7 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
323
465
|
None,
|
|
324
466
|
&noop_transport,
|
|
325
467
|
)
|
|
326
|
-
.expect_err("a newly added seat cannot succeed through start_agent.noop");
|
|
468
|
+
.expect_err("a newly added Pi seat cannot succeed through start_agent.noop");
|
|
327
469
|
assert!(noop.to_string().contains("start_agent.noop"));
|
|
328
470
|
assert!(noop_transport.spawn_records().is_empty());
|
|
329
471
|
let noop_state =
|
|
@@ -353,6 +495,8 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
353
495
|
|
|
354
496
|
let shared_source = include_str!("../launch/pi_mcp.rs");
|
|
355
497
|
let leader_source = include_str!("../../leader/start.rs");
|
|
498
|
+
let teammate_source = include_str!("../launch/spawn.rs");
|
|
499
|
+
let restart_source = include_str!("../restart/common.rs");
|
|
356
500
|
let restart_agent_source = include_str!("../restart/agent.rs");
|
|
357
501
|
let add_source = include_str!("../launch/add_agent.rs");
|
|
358
502
|
assert!(
|
|
@@ -366,8 +510,17 @@ fn pi_leader_and_teammate_body(hermetic: &HermeticTestEnv) {
|
|
|
366
510
|
assert_eq!(
|
|
367
511
|
shared_source.matches("fn materialize_pi_plan(").count(),
|
|
368
512
|
1,
|
|
369
|
-
"
|
|
513
|
+
"leader and teammate call sites must depend on one shared materializer definition"
|
|
514
|
+
);
|
|
515
|
+
assert_eq!(
|
|
516
|
+
shared_source
|
|
517
|
+
.matches("fn materialize_pi_resume_plan(")
|
|
518
|
+
.count(),
|
|
519
|
+
1,
|
|
520
|
+
"resume must share the same Core materializer module"
|
|
370
521
|
);
|
|
522
|
+
assert!(teammate_source.contains("materialize_pi_plan("));
|
|
523
|
+
assert!(restart_source.contains("materialize_pi_plan("));
|
|
371
524
|
assert!(add_source.contains("start_agent_at_paths("));
|
|
372
525
|
assert!(restart_agent_source.contains("&spawn.plan,"));
|
|
373
526
|
std::fs::remove_dir_all(dynamic_root).expect("remove dynamic fixtures");
|