@team-agent/installer 0.5.125 → 0.5.127
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 -137
- package/crates/team-agent/src/cli/emit.rs +13 -8
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +55 -10
- package/crates/team-agent/src/cli/mod.rs +35 -29
- package/crates/team-agent/src/cli/models.rs +33 -944
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +54 -12
- package/crates/team-agent/src/compiler.rs +7 -205
- package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +12 -8
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- 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 +22 -200
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
- package/crates/team-agent/src/lifecycle/launch.rs +3 -34
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
- package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
- 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 +106 -186
- 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 +19 -15
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- 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 +15 -14
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
- package/crates/team-agent/src/lifecycle/tests.rs +0 -7
- package/crates/team-agent/src/lifecycle/types.rs +2 -21
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +14 -195
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
- package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +71 -572
- package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +11 -211
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
- package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +7 -23
- package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
- package/crates/team-agent/src/provider/tests/idle.rs +0 -68
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +77 -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/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +8 -5
- package/skills/team-agent/command-coverage.json +29 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
- package/skills/team-agent/references/team-agent-operator.md +7 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- 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/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- 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/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- 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/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -30,7 +30,7 @@ fn cli_send_persists_real_message_row() {
|
|
|
30
30
|
&ws,
|
|
31
31
|
&serde_json::json!({
|
|
32
32
|
"active_team_key": "current",
|
|
33
|
-
"teams": {"current": {"agents": {"w1": {"provider": "
|
|
33
|
+
"teams": {"current": {"agents": {"w1": {"provider": "copilot"}}}}
|
|
34
34
|
}),
|
|
35
35
|
)
|
|
36
36
|
.unwrap();
|
|
@@ -58,8 +58,8 @@ fn seed_send_workspace() -> std::path::PathBuf {
|
|
|
58
58
|
"teams": {
|
|
59
59
|
"teamA": {
|
|
60
60
|
"agents": {
|
|
61
|
-
"alice": {"provider": "
|
|
62
|
-
"drifted": {"provider": "
|
|
61
|
+
"alice": {"provider": "copilot"},
|
|
62
|
+
"drifted": {"provider": "copilot", "status": "session_drift"}
|
|
63
63
|
},
|
|
64
64
|
"tasks": [{"id": "t-1"}]
|
|
65
65
|
}
|
|
@@ -74,7 +74,7 @@ fn seed_send_workspace() -> std::path::PathBuf {
|
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
const DELEG_VALID_ROLE: &str = "---\nname: implementer\nrole: Implementation Engineer\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nImplement bounded tasks.\n";
|
|
77
|
-
const DELEG_INVALID_ROLE: &str = "---\nname: broken\nrole: Broken Worker\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\
|
|
77
|
+
const DELEG_INVALID_ROLE: &str = "---\nname: broken\nrole: Broken Worker\nprovider: not-a-provider\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nUnknown provider.\n";
|
|
78
78
|
const DELEG_TEAM_MD: &str =
|
|
79
79
|
"---\nname: clidelegteam\nobjective: Delegation probe.\nprovider: fake\n---\n\nteam.\n";
|
|
80
80
|
|
|
@@ -107,7 +107,7 @@ fn run_dispatches_send_to_handler_returns_ok() {
|
|
|
107
107
|
&ws,
|
|
108
108
|
&serde_json::json!({
|
|
109
109
|
"active_team_key": "current",
|
|
110
|
-
"teams": {"current": {"agents": {"w1": {"provider": "
|
|
110
|
+
"teams": {"current": {"agents": {"w1": {"provider": "fake"}}}}
|
|
111
111
|
}),
|
|
112
112
|
)
|
|
113
113
|
.unwrap();
|
|
@@ -185,7 +185,7 @@ fn run_dispatches_quick_start_compiles_spec() {
|
|
|
185
185
|
.unwrap();
|
|
186
186
|
std::fs::write(
|
|
187
187
|
dir.join("agents").join("implementer.md"),
|
|
188
|
-
"---\nname: implementer\nrole: Impl\nprovider:
|
|
188
|
+
"---\nname: implementer\nrole: Impl\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nImpl.\n",
|
|
189
189
|
)
|
|
190
190
|
.unwrap();
|
|
191
191
|
let argv = vec![
|
|
@@ -252,9 +252,10 @@ fn cli_quick_start_invokes_real_lifecycle_admission_before_runtime_effects() {
|
|
|
252
252
|
);
|
|
253
253
|
}
|
|
254
254
|
|
|
255
|
-
// 2 [P0] — cmd_quick_start over an INVALID role doc surfaces the REAL compiler error (
|
|
256
|
-
// `provider
|
|
257
|
-
// placeholder returns a canned {ok:true} with no error
|
|
255
|
+
// 2 [P0] — cmd_quick_start over an INVALID role doc surfaces the REAL compiler error (unknown
|
|
256
|
+
// `provider`; an omitted one is the default Pi leaf), proving delegation to crate::lifecycle
|
|
257
|
+
// (compile fails before any spawn). The placeholder returns a canned {ok:true} with no error
|
|
258
|
+
// -> RED. OS-safe (compile fails early).
|
|
258
259
|
#[test]
|
|
259
260
|
fn cli_quick_start_invalid_spec_surfaces_real_compile_error() {
|
|
260
261
|
let team = deleg_uniq_dir("qsbad");
|
|
@@ -274,7 +275,7 @@ fn cli_quick_start_invalid_spec_surfaces_real_compile_error() {
|
|
|
274
275
|
let text = outcome_text(cmd_quick_start(&args));
|
|
275
276
|
assert!(
|
|
276
277
|
text.contains("provider"),
|
|
277
|
-
"cmd_quick_start must surface the REAL compiler error for a role doc
|
|
278
|
+
"cmd_quick_start must surface the REAL compiler error for a role doc with an unknown `provider` \
|
|
278
279
|
(proving delegation to crate::lifecycle, not the placeholder's canned ok:true); got {text}"
|
|
279
280
|
);
|
|
280
281
|
}
|
|
@@ -319,7 +320,7 @@ fn cli_add_agent_duplicate_id_surfaces_real_error() {
|
|
|
319
320
|
&json!({
|
|
320
321
|
"session_name": "team-deleg-addagent",
|
|
321
322
|
"agents": {
|
|
322
|
-
"implementer": {"status": "running", "provider": "
|
|
323
|
+
"implementer": {"status": "running", "provider": "fake", "window": "implementer"}
|
|
323
324
|
}
|
|
324
325
|
}),
|
|
325
326
|
)
|
|
@@ -554,7 +554,7 @@ fn queued_send_args_fixture(json: bool) -> SendArgs {
|
|
|
554
554
|
&ws,
|
|
555
555
|
&json!({
|
|
556
556
|
"active_team_key": "current",
|
|
557
|
-
"teams": {"current": {"agents": {"w1": {"provider": "
|
|
557
|
+
"teams": {"current": {"agents": {"w1": {"provider": "copilot"}}}}
|
|
558
558
|
}),
|
|
559
559
|
)
|
|
560
560
|
.unwrap();
|
|
@@ -828,7 +828,7 @@ fn cmd_send_canonicalizes_legacy_session_alias_before_membership_projection() {
|
|
|
828
828
|
"teamdir": {
|
|
829
829
|
"status": "alive",
|
|
830
830
|
"session_name": "team-displayname",
|
|
831
|
-
"agents": {"w1": {"provider": "
|
|
831
|
+
"agents": {"w1": {"provider": "copilot", "status": "running"}}
|
|
832
832
|
}
|
|
833
833
|
}
|
|
834
834
|
}),
|
|
@@ -35,6 +35,33 @@ fn every_cursor_provider_name_compiles_to_the_contract_leaf() {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
#[cfg(unix)]
|
|
39
|
+
#[test]
|
|
40
|
+
fn every_codex_and_grok_provider_name_compiles_to_the_contract_leaf() {
|
|
41
|
+
// No opt-in: each public name declares its leaf, and neither leaf inherits
|
|
42
|
+
// the TEAM provider_effort default.
|
|
43
|
+
let team_meta = Value::Map(vec![(
|
|
44
|
+
"provider_effort".to_string(),
|
|
45
|
+
Value::Str("high".to_string()),
|
|
46
|
+
)]);
|
|
47
|
+
for (provider, leaf) in [
|
|
48
|
+
("codex", "codex_tui"),
|
|
49
|
+
("codex_cli", "codex_tui"),
|
|
50
|
+
("codex-cli", "codex_tui"),
|
|
51
|
+
("grok", "grok_build"),
|
|
52
|
+
] {
|
|
53
|
+
let role = write_tmp("leaf.md", &format!("---\nprovider: {provider}\n---\nRole\n"));
|
|
54
|
+
let compiled = compile_role_agent(&role, &team_meta, "/workspace").unwrap();
|
|
55
|
+
assert_eq!(
|
|
56
|
+
compiled.agent.get("provider").and_then(Value::as_str),
|
|
57
|
+
Some(leaf),
|
|
58
|
+
"{provider}"
|
|
59
|
+
);
|
|
60
|
+
assert!(compiled.agent.get("effort").is_none(), "{provider}");
|
|
61
|
+
fs::remove_dir_all(role.parent().unwrap()).unwrap();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
38
65
|
fn unique_base() -> PathBuf {
|
|
39
66
|
let n = COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
40
67
|
std::env::temp_dir().join(format!("ta_rs_compile_{}_{}", std::process::id(), n))
|
|
@@ -130,7 +157,7 @@ const ROLE_NOPROFILE: &str = "\
|
|
|
130
157
|
---
|
|
131
158
|
name: implementer
|
|
132
159
|
role: Implementation Engineer
|
|
133
|
-
provider:
|
|
160
|
+
provider: copilot
|
|
134
161
|
model: gpt-5.5
|
|
135
162
|
auth_mode: subscription
|
|
136
163
|
dangerously_skip_permissions: false
|
|
@@ -201,7 +228,7 @@ fn front_matter_cases() {
|
|
|
201
228
|
// separators=(",",":"))` with the workspace path templated to __WS__.
|
|
202
229
|
// (team-agent-public v0.2.11, /tmp/probe_compiler.py.)
|
|
203
230
|
|
|
204
|
-
const BASE_NOPROFILE_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":"gpt-5.5","context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"
|
|
231
|
+
const BASE_NOPROFILE_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":"gpt-5.5","context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"copilot","model":"gpt-5.5","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks and report result_envelope_v1.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-doc-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
|
|
205
232
|
|
|
206
233
|
#[test]
|
|
207
234
|
fn compile_base_noprofile_matches_python_dict_order_and_values() {
|
|
@@ -260,7 +287,7 @@ const RUNTIME_DEFAULTS_ROLE: &str = "\
|
|
|
260
287
|
---
|
|
261
288
|
name: implementer
|
|
262
289
|
role: Implementation Engineer
|
|
263
|
-
provider:
|
|
290
|
+
provider: copilot
|
|
264
291
|
tools:
|
|
265
292
|
- fs_read
|
|
266
293
|
- mcp_team
|
|
@@ -270,7 +297,7 @@ dangerously_skip_permissions: false
|
|
|
270
297
|
Implement bounded tasks.
|
|
271
298
|
";
|
|
272
299
|
|
|
273
|
-
const RUNTIME_DEFAULTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"
|
|
300
|
+
const RUNTIME_DEFAULTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"copilot","model":null,"auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-doc-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":true,"tick_interval_sec":1,"push_min_interval_sec":3,"stuck_timeout_sec":5},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
|
|
274
301
|
|
|
275
302
|
#[test]
|
|
276
303
|
fn compile_runtime_front_matter_defaults_match_python() {
|
|
@@ -315,7 +342,13 @@ const ALIAS_JSON: &str = r#"{"version":1,"team":{"name":"debate-team","mode":"su
|
|
|
315
342
|
fn compile_provider_models_do_not_fill_claude_code_role_model() {
|
|
316
343
|
let team = build_team(ALIAS_TEAM, &[("implementer.md", ALIAS_ROLE)], &[]);
|
|
317
344
|
let spec = compile_team(&team).unwrap();
|
|
318
|
-
|
|
345
|
+
// On unix a `claude_code` role compiles to the Claude Code contract leaf's id.
|
|
346
|
+
let expected = if cfg!(unix) {
|
|
347
|
+
ALIAS_JSON.replace(r#""provider":"claude_code""#, r#""provider":"claude_tui""#)
|
|
348
|
+
} else {
|
|
349
|
+
ALIAS_JSON.to_string()
|
|
350
|
+
};
|
|
351
|
+
assert_eq!(templated_compact_json(&spec), expected);
|
|
319
352
|
}
|
|
320
353
|
|
|
321
354
|
// Omitted role model remains null; the provider supplies its native default.
|
|
@@ -332,7 +365,7 @@ const BUILTIN_ROLE: &str = "\
|
|
|
332
365
|
---
|
|
333
366
|
name: implementer
|
|
334
367
|
role: Implementation Engineer
|
|
335
|
-
provider:
|
|
368
|
+
provider: copilot
|
|
336
369
|
auth_mode: subscription
|
|
337
370
|
dangerously_skip_permissions: false
|
|
338
371
|
tools:
|
|
@@ -342,7 +375,7 @@ tools:
|
|
|
342
375
|
Implement bounded tasks.
|
|
343
376
|
";
|
|
344
377
|
|
|
345
|
-
const BUILTIN_JSON: &str = r#"{"version":1,"team":{"name":"default-model-team","mode":"supervisor_worker","objective":"Compile role docs without model fields.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"
|
|
378
|
+
const BUILTIN_JSON: &str = r#"{"version":1,"team":{"name":"default-model-team","mode":"supervisor_worker","objective":"Compile role docs without model fields.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"copilot","model":null,"auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-default-model-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
|
|
346
379
|
|
|
347
380
|
#[test]
|
|
348
381
|
fn compile_subscription_without_model_keeps_provider_native_default() {
|
|
@@ -358,7 +391,7 @@ const TWO_ROLE_A: &str = "\
|
|
|
358
391
|
---
|
|
359
392
|
name: alpha
|
|
360
393
|
role: Alpha Worker
|
|
361
|
-
provider:
|
|
394
|
+
provider: copilot
|
|
362
395
|
model: gpt-5.5
|
|
363
396
|
auth_mode: subscription
|
|
364
397
|
dangerously_skip_permissions: false
|
|
@@ -373,7 +406,7 @@ const TWO_ROLE_B: &str = "\
|
|
|
373
406
|
---
|
|
374
407
|
name: bravo
|
|
375
408
|
role: Bravo Worker
|
|
376
|
-
provider:
|
|
409
|
+
provider: copilot
|
|
377
410
|
model: gpt-5.5
|
|
378
411
|
auth_mode: subscription
|
|
379
412
|
dangerously_skip_permissions: false
|
|
@@ -384,7 +417,7 @@ tools:
|
|
|
384
417
|
Bravo body.
|
|
385
418
|
";
|
|
386
419
|
|
|
387
|
-
const TWO_AGENTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":"gpt-5.5","context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"alpha","role":"Alpha Worker","provider":"
|
|
420
|
+
const TWO_AGENTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":"gpt-5.5","context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"alpha","role":"Alpha Worker","provider":"copilot","model":"gpt-5.5","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Alpha body.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["alpha","Alpha Worker"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}},{"id":"bravo","role":"Bravo Worker","provider":"copilot","model":"gpt-5.5","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Bravo body.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["bravo","Bravo Worker"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"alpha","rules":[{"id":"route-alpha","match":{"assignee":["alpha"]},"assign_to":"alpha","priority":10},{"id":"route-bravo","match":{"assignee":["bravo"]},"assign_to":"bravo","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-doc-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":2,"startup_order":["alpha","bravo"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"alpha","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
|
|
388
421
|
|
|
389
422
|
#[test]
|
|
390
423
|
fn compile_two_agents_sorted_by_filename_with_routing_and_startup_order() {
|
|
@@ -419,7 +452,9 @@ fn compile_missing_provider_defaults_to_pi() {
|
|
|
419
452
|
let team = build_team(TEAM_BASE, &[("implementer.md", ROLE_MISSING_PROVIDER)], &[]);
|
|
420
453
|
let spec = compile_team(&team).expect("an omitted provider defaults to Pi");
|
|
421
454
|
let agent = agent0(&spec);
|
|
422
|
-
|
|
455
|
+
// On unix the default `pi` compiles to the Pi contract leaf's id.
|
|
456
|
+
let expected = if cfg!(unix) { "pi_tui" } else { "pi" };
|
|
457
|
+
assert_eq!(agent.get("provider"), Some(&Value::Str(expected.to_string())));
|
|
423
458
|
assert_eq!(
|
|
424
459
|
agent.get("model"),
|
|
425
460
|
Some(&Value::Str("team-agent/qwen3.8-27b".to_string()))
|
|
@@ -536,7 +571,8 @@ fn team_provider_model_aliases_do_not_fill_role_model() {
|
|
|
536
571
|
|
|
537
572
|
#[test]
|
|
538
573
|
fn claude_role_without_model_keeps_provider_native_default() {
|
|
539
|
-
// A missing explicit model stays null for both Claude provider names
|
|
574
|
+
// A missing explicit model stays null for both Claude provider names, each
|
|
575
|
+
// of which compiles to the Claude Code contract leaf on unix.
|
|
540
576
|
for prov in ["claude", "claude_code"] {
|
|
541
577
|
let team = build_team(TM_CODEX, &[("w.md", &role_nomodel(prov))], &[]);
|
|
542
578
|
let spec = compile_team(&team).unwrap();
|
|
@@ -545,6 +581,12 @@ fn claude_role_without_model_keeps_provider_native_default() {
|
|
|
545
581
|
Some(&Value::Null),
|
|
546
582
|
"provider {prov}"
|
|
547
583
|
);
|
|
584
|
+
let expected = if cfg!(unix) { "claude_tui" } else { prov };
|
|
585
|
+
assert_eq!(
|
|
586
|
+
agent0(&spec).get("provider").and_then(Value::as_str),
|
|
587
|
+
Some(expected),
|
|
588
|
+
"provider {prov}"
|
|
589
|
+
);
|
|
548
590
|
}
|
|
549
591
|
}
|
|
550
592
|
|
|
@@ -348,114 +348,6 @@ pub struct CompiledRole {
|
|
|
348
348
|
pub agent: Value,
|
|
349
349
|
}
|
|
350
350
|
|
|
351
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
352
|
-
pub struct PiModelPreflightError {
|
|
353
|
-
pub requested: String,
|
|
354
|
-
pub candidates: Vec<String>,
|
|
355
|
-
pub action: String,
|
|
356
|
-
pub not_ready: bool,
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
impl std::fmt::Display for PiModelPreflightError {
|
|
360
|
-
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
361
|
-
write!(
|
|
362
|
-
formatter,
|
|
363
|
-
"Pi role model {:?} is not a qualified exact model",
|
|
364
|
-
self.requested
|
|
365
|
-
)
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
|
|
369
|
-
/// Shared admission gate: omitted and qualified models pass; only an
|
|
370
|
-
/// unqualified present model causes one bounded catalog observation.
|
|
371
|
-
pub fn preflight_pi_role_model(meta: &Value) -> Result<(), PiModelPreflightError> {
|
|
372
|
-
preflight_pi_role_model_with(meta, |requested| {
|
|
373
|
-
crate::lifecycle::launch::pi_mcp::pi_model_candidates(requested).map_err(|_| ())
|
|
374
|
-
})
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
pub fn preflight_pi_role_model_with<F>(
|
|
378
|
-
meta: &Value,
|
|
379
|
-
mut discover: F,
|
|
380
|
-
) -> Result<(), PiModelPreflightError>
|
|
381
|
-
where
|
|
382
|
-
F: FnMut(&str) -> Result<Vec<String>, ()>,
|
|
383
|
-
{
|
|
384
|
-
if parse_canonical_provider(meta.get("provider").and_then(Value::as_str).unwrap_or(""))
|
|
385
|
-
!= Some(Provider::Pi)
|
|
386
|
-
{
|
|
387
|
-
return Ok(());
|
|
388
|
-
}
|
|
389
|
-
let Some(model) = string_field(meta, "model").filter(|value| !value.trim().is_empty()) else {
|
|
390
|
-
return Ok(());
|
|
391
|
-
};
|
|
392
|
-
let requested = model.trim().to_string();
|
|
393
|
-
if requested.split_once('/').is_some_and(|(provider, name)| {
|
|
394
|
-
!provider.is_empty() && !name.is_empty() && !requested.contains('*')
|
|
395
|
-
}) {
|
|
396
|
-
return Ok(());
|
|
397
|
-
}
|
|
398
|
-
let (candidates, not_ready) = match discover(&requested) {
|
|
399
|
-
Ok(candidates) => (candidates, false),
|
|
400
|
-
Err(()) => (Vec::new(), true),
|
|
401
|
-
};
|
|
402
|
-
let action = if candidates.is_empty() {
|
|
403
|
-
format!("run `team-agent models --provider pi --search {requested}`")
|
|
404
|
-
} else {
|
|
405
|
-
format!("copy a candidate into the role, or run `team-agent models --provider pi --search {requested}`")
|
|
406
|
-
};
|
|
407
|
-
Err(PiModelPreflightError {
|
|
408
|
-
requested,
|
|
409
|
-
candidates,
|
|
410
|
-
action,
|
|
411
|
-
not_ready,
|
|
412
|
-
})
|
|
413
|
-
}
|
|
414
|
-
|
|
415
|
-
pub fn preflight_pi_models_in_team(team_dir: &Path) -> Result<(), PiModelPreflightError> {
|
|
416
|
-
preflight_pi_models_in_team_with(team_dir, |requested| {
|
|
417
|
-
crate::lifecycle::launch::pi_mcp::pi_model_candidates(requested).map_err(|_| ())
|
|
418
|
-
})
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
pub fn preflight_pi_models_in_team_with<F>(
|
|
422
|
-
team_dir: &Path,
|
|
423
|
-
mut discover: F,
|
|
424
|
-
) -> Result<(), PiModelPreflightError>
|
|
425
|
-
where
|
|
426
|
-
F: FnMut(&str) -> Result<Vec<String>, ()>,
|
|
427
|
-
{
|
|
428
|
-
let agents_dir = team_dir.join("agents");
|
|
429
|
-
let entries = match std::fs::read_dir(&agents_dir) {
|
|
430
|
-
Ok(entries) => entries,
|
|
431
|
-
Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(()),
|
|
432
|
-
Err(_) => {
|
|
433
|
-
return Err(PiModelPreflightError {
|
|
434
|
-
requested: "<role directory>".into(),
|
|
435
|
-
candidates: Vec::new(),
|
|
436
|
-
action: "repair the role directory and retry".into(),
|
|
437
|
-
not_ready: true,
|
|
438
|
-
})
|
|
439
|
-
}
|
|
440
|
-
};
|
|
441
|
-
let mut paths = entries
|
|
442
|
-
.filter_map(Result::ok)
|
|
443
|
-
.map(|entry| entry.path())
|
|
444
|
-
.filter(|path| path.extension().and_then(|ext| ext.to_str()) == Some("md"))
|
|
445
|
-
.collect::<Vec<_>>();
|
|
446
|
-
paths.sort();
|
|
447
|
-
for path in paths {
|
|
448
|
-
let (meta, _) = read_front_matter(&path).map_err(|_| PiModelPreflightError {
|
|
449
|
-
requested: path.display().to_string(),
|
|
450
|
-
candidates: Vec::new(),
|
|
451
|
-
action: "repair the role document and retry".into(),
|
|
452
|
-
not_ready: true,
|
|
453
|
-
})?;
|
|
454
|
-
preflight_pi_role_model_with(&meta, &mut discover)?;
|
|
455
|
-
}
|
|
456
|
-
Ok(())
|
|
457
|
-
}
|
|
458
|
-
|
|
459
351
|
/// 把一份 role 文档编译成 agent spec 条目。`team_meta` 供 model/auth_mode 继承;
|
|
460
352
|
/// `workspace_s` 是 working_directory。**纯读 `role_path`,无任何文件落地。**
|
|
461
353
|
pub fn compile_role_agent(
|
|
@@ -494,8 +386,8 @@ fn compile_role_agent_with_mode(
|
|
|
494
386
|
let provider = string_field(&meta, "provider")
|
|
495
387
|
.filter(|provider| !provider.trim().is_empty())
|
|
496
388
|
.unwrap_or_else(|| "pi".to_string());
|
|
497
|
-
|
|
498
|
-
//
|
|
389
|
+
// An exact boolean; every contract name (codex, grok, claude, pi, ...)
|
|
390
|
+
// selects its leaf without it, `true` only insists on a contract leaf.
|
|
499
391
|
let contract_runtime = match meta.get("contract_runtime") {
|
|
500
392
|
None => false,
|
|
501
393
|
Some(Value::Bool(value)) => *value,
|
|
@@ -507,7 +399,7 @@ fn compile_role_agent_with_mode(
|
|
|
507
399
|
}
|
|
508
400
|
};
|
|
509
401
|
#[cfg(unix)]
|
|
510
|
-
let contract = crate::contract_runtime::registry::declared(&provider
|
|
402
|
+
let contract = crate::contract_runtime::registry::declared(&provider);
|
|
511
403
|
#[cfg(not(unix))]
|
|
512
404
|
let contract: Option<()> = None;
|
|
513
405
|
if contract_runtime && contract.is_none() {
|
|
@@ -529,7 +421,6 @@ fn compile_role_agent_with_mode(
|
|
|
529
421
|
contract.is_some_and(|descriptor| !descriptor.effort.inherit_team_default);
|
|
530
422
|
#[cfg(not(unix))]
|
|
531
423
|
let skip_team_effort = false;
|
|
532
|
-
validate_pi_role_fields(&meta, role_path, &provider)?;
|
|
533
424
|
let model = string_field(&meta, "model")
|
|
534
425
|
.filter(|value| !value.trim().is_empty())
|
|
535
426
|
.map(Value::Str)
|
|
@@ -537,12 +428,6 @@ fn compile_role_agent_with_mode(
|
|
|
537
428
|
let auth_mode = string_field(&meta, "auth_mode")
|
|
538
429
|
.or_else(|| string_field(team_meta, "default_auth_mode"))
|
|
539
430
|
.unwrap_or_else(|| "subscription".to_string());
|
|
540
|
-
if is_pi && auth_mode != "subscription" {
|
|
541
|
-
return Err(ModelError::Validation(format!(
|
|
542
|
-
"{}: Pi roles support subscription auth_mode only",
|
|
543
|
-
role_path.display()
|
|
544
|
-
)));
|
|
545
|
-
}
|
|
546
431
|
if auth_mode != "subscription" && meta.get("profile").is_none() {
|
|
547
432
|
return Err(ModelError::Validation(format!(
|
|
548
433
|
"{}: profile is required when auth_mode is '{auth_mode}'",
|
|
@@ -588,8 +473,9 @@ fn compile_role_agent_with_mode(
|
|
|
588
473
|
if let Some(profile) = string_field(&meta, "profile") {
|
|
589
474
|
agent_items.push(("profile", Value::Str(profile)));
|
|
590
475
|
}
|
|
591
|
-
// Role effort wins;
|
|
592
|
-
//
|
|
476
|
+
// Role effort wins; a contract leaf that does not inherit the team default
|
|
477
|
+
// uses only an explicit role value. Legacy providers may inherit TEAM
|
|
478
|
+
// provider_effort for Issue #238 compatibility.
|
|
593
479
|
let role_effort = match string_field(&meta, "effort") {
|
|
594
480
|
Some(raw) if !raw.trim().is_empty() => {
|
|
595
481
|
let value = raw.trim();
|
|
@@ -607,7 +493,7 @@ fn compile_role_agent_with_mode(
|
|
|
607
493
|
Some(raw) if !raw.trim().is_empty() => ProviderEffort::parse(raw.trim()),
|
|
608
494
|
_ => None,
|
|
609
495
|
};
|
|
610
|
-
let resolved_effort = if
|
|
496
|
+
let resolved_effort = if skip_team_effort {
|
|
611
497
|
role_effort
|
|
612
498
|
} else {
|
|
613
499
|
role_effort.or(team_effort)
|
|
@@ -705,27 +591,6 @@ fn string_field(meta: &Value, key: &str) -> Option<String> {
|
|
|
705
591
|
.map(ToString::to_string)
|
|
706
592
|
}
|
|
707
593
|
|
|
708
|
-
fn validate_pi_role_fields(meta: &Value, path: &Path, provider: &str) -> Result<(), ModelError> {
|
|
709
|
-
if parse_canonical_provider(provider) != Some(Provider::Pi) {
|
|
710
|
-
return Ok(());
|
|
711
|
-
}
|
|
712
|
-
if let Some(model) = string_field(meta, "model").filter(|value| !value.trim().is_empty()) {
|
|
713
|
-
let (catalog, name) = model.trim().split_once('/').ok_or_else(|| {
|
|
714
|
-
ModelError::Validation(format!(
|
|
715
|
-
"{}: Pi roles require a qualified exact model such as provider/model",
|
|
716
|
-
path.display()
|
|
717
|
-
))
|
|
718
|
-
})?;
|
|
719
|
-
if catalog.is_empty() || name.is_empty() || model.contains('*') {
|
|
720
|
-
return Err(ModelError::Validation(format!(
|
|
721
|
-
"{}: Pi roles require a qualified exact model",
|
|
722
|
-
path.display()
|
|
723
|
-
)));
|
|
724
|
-
}
|
|
725
|
-
}
|
|
726
|
-
Ok(())
|
|
727
|
-
}
|
|
728
|
-
|
|
729
594
|
fn optional_dangerously_skip_permissions(meta: &Value) -> bool {
|
|
730
595
|
match meta.get("dangerously_skip_permissions") {
|
|
731
596
|
Some(Value::Bool(value)) => *value,
|
|
@@ -754,69 +619,6 @@ fn int_field(meta: &Value, key: &str, default: i64) -> Value {
|
|
|
754
619
|
}
|
|
755
620
|
}
|
|
756
621
|
|
|
757
|
-
#[cfg(test)]
|
|
758
|
-
mod pi_preflight_tests {
|
|
759
|
-
use super::*;
|
|
760
|
-
use std::cell::Cell;
|
|
761
|
-
|
|
762
|
-
fn role(provider: &str, model: Option<&str>) -> Value {
|
|
763
|
-
let mut fields = vec![("provider".to_string(), Value::Str(provider.into()))];
|
|
764
|
-
if let Some(model) = model {
|
|
765
|
-
fields.push(("model".to_string(), Value::Str(model.into())));
|
|
766
|
-
}
|
|
767
|
-
Value::Map(fields)
|
|
768
|
-
}
|
|
769
|
-
|
|
770
|
-
#[test]
|
|
771
|
-
fn omitted_qualified_and_non_pi_do_not_discover() {
|
|
772
|
-
for meta in [
|
|
773
|
-
role("pi", None),
|
|
774
|
-
role("pi", Some("openai/gpt-5")),
|
|
775
|
-
role("codex", Some("gpt-5")),
|
|
776
|
-
] {
|
|
777
|
-
let calls = Cell::new(0);
|
|
778
|
-
assert!(preflight_pi_role_model_with(&meta, |_| {
|
|
779
|
-
calls.set(calls.get() + 1);
|
|
780
|
-
Ok(vec![])
|
|
781
|
-
})
|
|
782
|
-
.is_ok());
|
|
783
|
-
assert_eq!(calls.get(), 0);
|
|
784
|
-
}
|
|
785
|
-
}
|
|
786
|
-
|
|
787
|
-
#[test]
|
|
788
|
-
fn unqualified_discovers_once_and_projects_candidates() {
|
|
789
|
-
let calls = Cell::new(0);
|
|
790
|
-
let error = preflight_pi_role_model_with(&role("pi", Some("gpt-5.6-sol")), |requested| {
|
|
791
|
-
calls.set(calls.get() + 1);
|
|
792
|
-
assert_eq!(requested, "gpt-5.6-sol");
|
|
793
|
-
Ok(vec![
|
|
794
|
-
"openai-codex/gpt-5.6-sol".into(),
|
|
795
|
-
"azure/gpt-5.6-sol".into(),
|
|
796
|
-
])
|
|
797
|
-
})
|
|
798
|
-
.expect_err("unqualified model must fail closed");
|
|
799
|
-
assert_eq!(calls.get(), 1);
|
|
800
|
-
assert_eq!(
|
|
801
|
-
error.candidates,
|
|
802
|
-
vec!["openai-codex/gpt-5.6-sol", "azure/gpt-5.6-sol"]
|
|
803
|
-
);
|
|
804
|
-
assert!(!error.not_ready);
|
|
805
|
-
assert!(error
|
|
806
|
-
.action
|
|
807
|
-
.contains("team-agent models --provider pi --search gpt-5.6-sol"));
|
|
808
|
-
}
|
|
809
|
-
|
|
810
|
-
#[test]
|
|
811
|
-
fn catalog_failure_is_not_ready_without_partial_candidates() {
|
|
812
|
-
let error = preflight_pi_role_model_with(&role("pi", Some("gpt-5.6-sol")), |_| Err(()))
|
|
813
|
-
.expect_err("catalog failure must reject");
|
|
814
|
-
assert!(error.not_ready);
|
|
815
|
-
assert!(error.candidates.is_empty());
|
|
816
|
-
assert!(!error.to_string().contains("stderr"));
|
|
817
|
-
}
|
|
818
|
-
}
|
|
819
|
-
|
|
820
622
|
fn py_int_value(value: &Value) -> Option<i64> {
|
|
821
623
|
match value {
|
|
822
624
|
Value::Bool(b) => Some(if *b { 1 } else { 0 }),
|