@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
|
@@ -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
|
|
|
@@ -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
|
}
|
|
@@ -315,7 +315,13 @@ const ALIAS_JSON: &str = r#"{"version":1,"team":{"name":"debate-team","mode":"su
|
|
|
315
315
|
fn compile_provider_models_do_not_fill_claude_code_role_model() {
|
|
316
316
|
let team = build_team(ALIAS_TEAM, &[("implementer.md", ALIAS_ROLE)], &[]);
|
|
317
317
|
let spec = compile_team(&team).unwrap();
|
|
318
|
-
|
|
318
|
+
// On unix a `claude_code` role compiles to the Claude Code contract leaf's id.
|
|
319
|
+
let expected = if cfg!(unix) {
|
|
320
|
+
ALIAS_JSON.replace(r#""provider":"claude_code""#, r#""provider":"claude_tui""#)
|
|
321
|
+
} else {
|
|
322
|
+
ALIAS_JSON.to_string()
|
|
323
|
+
};
|
|
324
|
+
assert_eq!(templated_compact_json(&spec), expected);
|
|
319
325
|
}
|
|
320
326
|
|
|
321
327
|
// Omitted role model remains null; the provider supplies its native default.
|
|
@@ -419,7 +425,9 @@ fn compile_missing_provider_defaults_to_pi() {
|
|
|
419
425
|
let team = build_team(TEAM_BASE, &[("implementer.md", ROLE_MISSING_PROVIDER)], &[]);
|
|
420
426
|
let spec = compile_team(&team).expect("an omitted provider defaults to Pi");
|
|
421
427
|
let agent = agent0(&spec);
|
|
422
|
-
|
|
428
|
+
// On unix the default `pi` compiles to the Pi contract leaf's id.
|
|
429
|
+
let expected = if cfg!(unix) { "pi_tui" } else { "pi" };
|
|
430
|
+
assert_eq!(agent.get("provider"), Some(&Value::Str(expected.to_string())));
|
|
423
431
|
assert_eq!(
|
|
424
432
|
agent.get("model"),
|
|
425
433
|
Some(&Value::Str("team-agent/qwen3.8-27b".to_string()))
|
|
@@ -536,7 +544,8 @@ fn team_provider_model_aliases_do_not_fill_role_model() {
|
|
|
536
544
|
|
|
537
545
|
#[test]
|
|
538
546
|
fn claude_role_without_model_keeps_provider_native_default() {
|
|
539
|
-
// A missing explicit model stays null for both Claude provider names
|
|
547
|
+
// A missing explicit model stays null for both Claude provider names, each
|
|
548
|
+
// of which compiles to the Claude Code contract leaf on unix.
|
|
540
549
|
for prov in ["claude", "claude_code"] {
|
|
541
550
|
let team = build_team(TM_CODEX, &[("w.md", &role_nomodel(prov))], &[]);
|
|
542
551
|
let spec = compile_team(&team).unwrap();
|
|
@@ -545,6 +554,12 @@ fn claude_role_without_model_keeps_provider_native_default() {
|
|
|
545
554
|
Some(&Value::Null),
|
|
546
555
|
"provider {prov}"
|
|
547
556
|
);
|
|
557
|
+
let expected = if cfg!(unix) { "claude_tui" } else { prov };
|
|
558
|
+
assert_eq!(
|
|
559
|
+
agent0(&spec).get("provider").and_then(Value::as_str),
|
|
560
|
+
Some(expected),
|
|
561
|
+
"provider {prov}"
|
|
562
|
+
);
|
|
548
563
|
}
|
|
549
564
|
}
|
|
550
565
|
|
|
@@ -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,7 +386,6 @@ 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
|
-
let is_pi = parse_canonical_provider(&provider) == Some(Provider::Pi);
|
|
498
389
|
// An exact boolean opt-in; a bare shared key (codex) keeps its legacy meaning.
|
|
499
390
|
let contract_runtime = match meta.get("contract_runtime") {
|
|
500
391
|
None => false,
|
|
@@ -529,7 +420,6 @@ fn compile_role_agent_with_mode(
|
|
|
529
420
|
contract.is_some_and(|descriptor| !descriptor.effort.inherit_team_default);
|
|
530
421
|
#[cfg(not(unix))]
|
|
531
422
|
let skip_team_effort = false;
|
|
532
|
-
validate_pi_role_fields(&meta, role_path, &provider)?;
|
|
533
423
|
let model = string_field(&meta, "model")
|
|
534
424
|
.filter(|value| !value.trim().is_empty())
|
|
535
425
|
.map(Value::Str)
|
|
@@ -537,12 +427,6 @@ fn compile_role_agent_with_mode(
|
|
|
537
427
|
let auth_mode = string_field(&meta, "auth_mode")
|
|
538
428
|
.or_else(|| string_field(team_meta, "default_auth_mode"))
|
|
539
429
|
.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
430
|
if auth_mode != "subscription" && meta.get("profile").is_none() {
|
|
547
431
|
return Err(ModelError::Validation(format!(
|
|
548
432
|
"{}: profile is required when auth_mode is '{auth_mode}'",
|
|
@@ -588,8 +472,9 @@ fn compile_role_agent_with_mode(
|
|
|
588
472
|
if let Some(profile) = string_field(&meta, "profile") {
|
|
589
473
|
agent_items.push(("profile", Value::Str(profile)));
|
|
590
474
|
}
|
|
591
|
-
// Role effort wins;
|
|
592
|
-
//
|
|
475
|
+
// Role effort wins; a contract leaf that does not inherit the team default
|
|
476
|
+
// uses only an explicit role value. Legacy providers may inherit TEAM
|
|
477
|
+
// provider_effort for Issue #238 compatibility.
|
|
593
478
|
let role_effort = match string_field(&meta, "effort") {
|
|
594
479
|
Some(raw) if !raw.trim().is_empty() => {
|
|
595
480
|
let value = raw.trim();
|
|
@@ -607,7 +492,7 @@ fn compile_role_agent_with_mode(
|
|
|
607
492
|
Some(raw) if !raw.trim().is_empty() => ProviderEffort::parse(raw.trim()),
|
|
608
493
|
_ => None,
|
|
609
494
|
};
|
|
610
|
-
let resolved_effort = if
|
|
495
|
+
let resolved_effort = if skip_team_effort {
|
|
611
496
|
role_effort
|
|
612
497
|
} else {
|
|
613
498
|
role_effort.or(team_effort)
|
|
@@ -705,27 +590,6 @@ fn string_field(meta: &Value, key: &str) -> Option<String> {
|
|
|
705
590
|
.map(ToString::to_string)
|
|
706
591
|
}
|
|
707
592
|
|
|
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
593
|
fn optional_dangerously_skip_permissions(meta: &Value) -> bool {
|
|
730
594
|
match meta.get("dangerously_skip_permissions") {
|
|
731
595
|
Some(Value::Bool(value)) => *value,
|
|
@@ -754,69 +618,6 @@ fn int_field(meta: &Value, key: &str, default: i64) -> Value {
|
|
|
754
618
|
}
|
|
755
619
|
}
|
|
756
620
|
|
|
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
621
|
fn py_int_value(value: &Value) -> Option<i64> {
|
|
821
622
|
match value {
|
|
822
623
|
Value::Bool(b) => Some(if *b { 1 } else { 0 }),
|
|
@@ -225,7 +225,7 @@ fn workspace_socket(path: &Path) -> Result<Option<(u64, u64)>, BackendError> {
|
|
|
225
225
|
|
|
226
226
|
/// The selected root transport is authority; ambient TMUX is never a selector.
|
|
227
227
|
/// This runs only in the owning lifecycle action, after native F0 admission.
|
|
228
|
-
fn workspace_tmux(
|
|
228
|
+
pub(super) fn workspace_tmux(
|
|
229
229
|
binding: &Binding,
|
|
230
230
|
seat: &SeatId,
|
|
231
231
|
claim: Option<&team_agent_contract::host::transport::TargetReceipt>,
|
|
@@ -396,7 +396,7 @@ pub(super) fn adapter(
|
|
|
396
396
|
BTreeMap::new(),
|
|
397
397
|
)?.with_launch_context(binding.workspace.path.clone(), None)?)
|
|
398
398
|
}
|
|
399
|
-
fn launch_adapter(
|
|
399
|
+
pub(super) fn launch_adapter(
|
|
400
400
|
binding: &Binding,
|
|
401
401
|
identity: &InstanceIdentity,
|
|
402
402
|
provider: &ProviderId,
|
|
@@ -406,7 +406,7 @@ fn launch_adapter(
|
|
|
406
406
|
binding.workspace.path.clone(), discovered.runtime.clone(),
|
|
407
407
|
)?)
|
|
408
408
|
}
|
|
409
|
-
fn request(
|
|
409
|
+
pub(super) fn request(
|
|
410
410
|
binding: &Binding,
|
|
411
411
|
role: &RoleConfig,
|
|
412
412
|
identity: InstanceIdentity,
|
|
@@ -482,7 +482,7 @@ fn preflight_request(
|
|
|
482
482
|
|
|
483
483
|
/// Providers whose native config search would otherwise inherit a Git or
|
|
484
484
|
/// project configuration ancestor. Metadata only; no body is read.
|
|
485
|
-
fn require_private_primary(
|
|
485
|
+
pub(super) fn require_private_primary(
|
|
486
486
|
selected: registry::NativeProvider,
|
|
487
487
|
cwd: &team_agent_contract::contract::session::CwdIdentity,
|
|
488
488
|
) -> Result<(), BackendError> {
|
|
@@ -589,7 +589,7 @@ fn existing_start(backend: &Backend, seat: &SeatId) -> Result<Option<ExistingSta
|
|
|
589
589
|
else { ExistingStart::Committed(record) }))
|
|
590
590
|
}
|
|
591
591
|
|
|
592
|
-
fn require_candidate(binding: &Binding) -> Result<(), BackendError> {
|
|
592
|
+
pub(super) fn require_candidate(binding: &Binding) -> Result<(), BackendError> {
|
|
593
593
|
let candidate = std::env::current_exe()?.canonicalize()?;
|
|
594
594
|
if candidate != binding.candidate || fingerprint_file(&candidate, 1024 * 1024 * 1024,
|
|
595
595
|
Duration::from_secs(10))? != binding.candidate_sha256 { return Err(Error::Fence.into()); }
|
|
@@ -694,6 +694,59 @@ fn finish_receipt(backend: &mut Backend, record: OperationRecord) -> Result<Oper
|
|
|
694
694
|
Ok(Lifecycle { store: &mut backend.store, host: &mut host, io: &mut NoNewIo }.recover(&record.id)?)
|
|
695
695
|
}
|
|
696
696
|
|
|
697
|
+
/// No creation receipt, unfinished lease or seat exists for this ID.
|
|
698
|
+
pub(super) fn seat_unclaimed(backend: &Backend, seat: &SeatId) -> Result<bool, BackendError> {
|
|
699
|
+
Ok(existing_start(backend, seat)?.is_none())
|
|
700
|
+
}
|
|
701
|
+
|
|
702
|
+
/// Team-level forwarding peers (legacy members and the leader) that every new
|
|
703
|
+
/// native seat's framework route depends on. Shared by fresh start and fork.
|
|
704
|
+
pub(super) fn publish_framework_routes(backend: &mut Backend, members: &[MemberRoute]) -> Result<(), BackendError> {
|
|
705
|
+
let route = backend.binding.framework().route()?;
|
|
706
|
+
let mut peers: Vec<_> = members
|
|
707
|
+
.iter()
|
|
708
|
+
.filter(|member| member.runtime == RuntimeFamily::Legacy)
|
|
709
|
+
.map(
|
|
710
|
+
|member| team_agent_contract::orchestration::forward::FrameworkPeer {
|
|
711
|
+
recipient: member.id.clone(),
|
|
712
|
+
route: route.clone(),
|
|
713
|
+
provider: member.provider.clone(),
|
|
714
|
+
},
|
|
715
|
+
)
|
|
716
|
+
.collect();
|
|
717
|
+
peers.push(team_agent_contract::orchestration::forward::FrameworkPeer {
|
|
718
|
+
recipient: "leader".into(),
|
|
719
|
+
route: route.clone(),
|
|
720
|
+
provider: "framework".into(),
|
|
721
|
+
});
|
|
722
|
+
backend.store.set_framework_routes(&peers, Some(&route))?;
|
|
723
|
+
Ok(())
|
|
724
|
+
}
|
|
725
|
+
|
|
726
|
+
/// The native session ID a launch names before spawn, for the leaves whose
|
|
727
|
+
/// fresh session is `Preassigned`. Shared by fresh start and a native fork's child.
|
|
728
|
+
pub(super) fn preassign_session(
|
|
729
|
+
selected: registry::NativeProvider,
|
|
730
|
+
request: &mut LaunchRequest,
|
|
731
|
+
discovered: &Discovery,
|
|
732
|
+
) -> Result<(), BackendError> {
|
|
733
|
+
if selected == registry::NativeProvider::Claude {
|
|
734
|
+
// `--session-id` names the new session; derived from this proposed instance.
|
|
735
|
+
request.preassigned_session = Some(team_agent_contract::providers::claude::session_id(&request.identity));
|
|
736
|
+
}
|
|
737
|
+
if let Some(registry::NativeRuntime::Cursor(runtime)) = &discovered.runtime {
|
|
738
|
+
request.preassigned_session = Some(
|
|
739
|
+
team_agent_contract::providers::cursor::native::allocate_chat(
|
|
740
|
+
runtime, &request.paths.cwd, &mut RealCommandRunner::default(),
|
|
741
|
+
team_agent_contract::contract::hooks::ReadBounds {
|
|
742
|
+
deadline: Duration::from_secs(90), max_output_bytes: 1024 * 1024,
|
|
743
|
+
},
|
|
744
|
+
).map_err(|error| BackendError::Discovery(DiscoveryError::Catalog(error)))?,
|
|
745
|
+
);
|
|
746
|
+
}
|
|
747
|
+
Ok(())
|
|
748
|
+
}
|
|
749
|
+
|
|
697
750
|
/// Fresh startup is distinct from resume. An existing generation is never
|
|
698
751
|
/// silently replaced with a new native session.
|
|
699
752
|
pub fn start(
|
|
@@ -782,24 +835,7 @@ pub fn start(
|
|
|
782
835
|
if existing_start(&backend, &role.id)?.is_some() {
|
|
783
836
|
return Err(Error::Conflict.into());
|
|
784
837
|
}
|
|
785
|
-
|
|
786
|
-
let mut peers: Vec<_> = members
|
|
787
|
-
.iter()
|
|
788
|
-
.filter(|member| member.runtime == RuntimeFamily::Legacy)
|
|
789
|
-
.map(
|
|
790
|
-
|member| team_agent_contract::orchestration::forward::FrameworkPeer {
|
|
791
|
-
recipient: member.id.clone(),
|
|
792
|
-
route: route.clone(),
|
|
793
|
-
provider: member.provider.clone(),
|
|
794
|
-
},
|
|
795
|
-
)
|
|
796
|
-
.collect();
|
|
797
|
-
peers.push(team_agent_contract::orchestration::forward::FrameworkPeer {
|
|
798
|
-
recipient: "leader".into(),
|
|
799
|
-
route: route.clone(),
|
|
800
|
-
provider: "framework".into(),
|
|
801
|
-
});
|
|
802
|
-
backend.store.set_framework_routes(&peers, Some(&route))?;
|
|
838
|
+
publish_framework_routes(&mut backend, members)?;
|
|
803
839
|
let identity = backend.store.propose_identity(&role.id)?;
|
|
804
840
|
let server_key = selected.server_key_for(&identity)?;
|
|
805
841
|
write_role(&backend.binding, &identity, role)?;
|
|
@@ -810,20 +846,7 @@ pub fn start(
|
|
|
810
846
|
request.paths.cwd = super::workspace::prepare(&backend.binding, &role.id)?;
|
|
811
847
|
}
|
|
812
848
|
require_private_primary(selected, &request.paths.cwd)?;
|
|
813
|
-
|
|
814
|
-
// `--session-id` names the fresh session; derived from this proposed instance.
|
|
815
|
-
request.preassigned_session = Some(team_agent_contract::providers::claude::session_id(&request.identity));
|
|
816
|
-
}
|
|
817
|
-
if let Some(registry::NativeRuntime::Cursor(runtime)) = &discovered.runtime {
|
|
818
|
-
request.preassigned_session = Some(
|
|
819
|
-
team_agent_contract::providers::cursor::native::allocate_chat(
|
|
820
|
-
runtime, &request.paths.cwd, &mut RealCommandRunner::default(),
|
|
821
|
-
team_agent_contract::contract::hooks::ReadBounds {
|
|
822
|
-
deadline: Duration::from_secs(90), max_output_bytes: 1024 * 1024,
|
|
823
|
-
},
|
|
824
|
-
).map_err(|error| BackendError::Discovery(DiscoveryError::Catalog(error)))?,
|
|
825
|
-
);
|
|
826
|
-
}
|
|
849
|
+
preassign_session(selected, &mut request, &discovered)?;
|
|
827
850
|
let resolved = resolve_launch(
|
|
828
851
|
descriptor,
|
|
829
852
|
&hooks,
|
|
@@ -1035,7 +1058,7 @@ fn role_path(binding: &Binding, identity: &InstanceIdentity) -> PathBuf {
|
|
|
1035
1058
|
"role-{}-{}.json", identity.seat.as_str(), identity.instance.as_str(),
|
|
1036
1059
|
))
|
|
1037
1060
|
}
|
|
1038
|
-
fn write_role(binding: &Binding, identity: &InstanceIdentity, role: &RoleConfig) -> Result<(), BackendError> {
|
|
1061
|
+
pub(super) fn write_role(binding: &Binding, identity: &InstanceIdentity, role: &RoleConfig) -> Result<(), BackendError> {
|
|
1039
1062
|
use std::os::unix::fs::OpenOptionsExt;
|
|
1040
1063
|
if identity.scope != binding.scope || identity.seat != role.id {
|
|
1041
1064
|
return Err(BackendError::Metadata);
|
|
@@ -186,11 +186,14 @@ fn read_team_inner(
|
|
|
186
186
|
return Err(invalid(&path, "front matter"));
|
|
187
187
|
}
|
|
188
188
|
let opted = opted_in(&meta, &path)?;
|
|
189
|
+
// An omitted provider is the default `pi`, which declares the Pi leaf.
|
|
189
190
|
if opted
|
|
190
|
-
|| meta
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
191
|
+
|| match meta.get("provider") {
|
|
192
|
+
None | Some(Value::Null) => true,
|
|
193
|
+
Some(provider) => provider
|
|
194
|
+
.as_str()
|
|
195
|
+
.is_some_and(|provider| super::registry::recognizes(provider, false)),
|
|
196
|
+
}
|
|
194
197
|
{
|
|
195
198
|
selected = true;
|
|
196
199
|
}
|