@team-agent/installer 0.5.126 → 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 -69
- package/crates/team-agent/src/cli/emit.rs +10 -9
- 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 +45 -0
- package/crates/team-agent/src/cli/mod.rs +13 -1
- package/crates/team-agent/src/cli/models.rs +27 -181
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +2 -2
- package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +36 -9
- package/crates/team-agent/src/compiler.rs +3 -2
- package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +6 -5
- package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
- package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -2
- 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/lifecycle/launch/fork_agent.rs +17 -185
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
- package/crates/team-agent/src/lifecycle/launch.rs +3 -11
- package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
- package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- 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 +37 -240
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
- 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 +6 -124
- 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 +136 -256
- 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/quick_start_worker_readiness_red.rs +7 -7
- 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 -1374
- 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 +5 -5
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- 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 +70 -15
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
- package/crates/team-agent/src/lifecycle/tests.rs +0 -4
- package/crates/team-agent/src/lifecycle/types.rs +2 -5
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +9 -61
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
- 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 +5 -1
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +58 -356
- package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
- package/crates/team-agent/src/provider/session/capture.rs +5 -105
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
- package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
- package/crates/team-agent/src/provider/session_scan.rs +6 -16
- package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
- package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
- package/crates/team-agent/src/provider/tests/idle.rs +0 -43
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -8
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +3 -2
- package/skills/team-agent/command-coverage.json +14 -0
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
- package/skills/team-agent/references/team-agent-operator.md +3 -1
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- 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/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
|
@@ -418,12 +418,6 @@ fn provider_env_exports(
|
|
|
418
418
|
return exports;
|
|
419
419
|
}
|
|
420
420
|
match provider {
|
|
421
|
-
Provider::Codex => {
|
|
422
|
-
let key = value_or_alternate(values, "OPENAI_API_KEY", "API_KEY");
|
|
423
|
-
append_env_pair(&mut exports, "TEAM_AGENT_PROVIDER_API_KEY", key);
|
|
424
|
-
append_env_pair(&mut exports, "OPENAI_API_KEY", key);
|
|
425
|
-
append_env_pair(&mut exports, "OPENAI_BASE_URL", values.get("BASE_URL").filter(|value| !value.is_empty()).map(String::as_str));
|
|
426
|
-
}
|
|
427
421
|
Provider::GeminiCli => {
|
|
428
422
|
append_env_pair(&mut exports, "GEMINI_API_KEY", value_or_alternate(values, "GEMINI_API_KEY", "API_KEY"));
|
|
429
423
|
}
|
|
@@ -446,9 +440,9 @@ fn provider_env_exports(
|
|
|
446
440
|
}
|
|
447
441
|
}
|
|
448
442
|
}
|
|
449
|
-
//
|
|
450
|
-
//
|
|
451
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Grok | Provider::Pi => {}
|
|
443
|
+
// Claude Code, Codex, Grok and Pi workers run only through their
|
|
444
|
+
// subscription-only contract leaves.
|
|
445
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok | Provider::Pi => {}
|
|
452
446
|
Provider::Fake => {}
|
|
453
447
|
}
|
|
454
448
|
exports
|
|
@@ -469,13 +463,10 @@ mod append_env_contract {
|
|
|
469
463
|
let map = |pairs: &[(&str, &str)]| -> BTreeMap<String, String> {
|
|
470
464
|
pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect()
|
|
471
465
|
};
|
|
472
|
-
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Pi] {
|
|
466
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok, Provider::Pi] {
|
|
473
467
|
assert!(provider_env_exports(provider, AuthMode::OfficialApi, &values).is_empty());
|
|
468
|
+
assert!(provider_env_exports(provider, AuthMode::CompatibleApi, &values).is_empty());
|
|
474
469
|
}
|
|
475
|
-
assert_eq!(provider_env_exports(Provider::Codex, AuthMode::CompatibleApi, &values), map(&[
|
|
476
|
-
("TEAM_AGENT_PROVIDER_API_KEY", "native-dummy"), ("OPENAI_API_KEY", "native-dummy"),
|
|
477
|
-
("OPENAI_BASE_URL", " raw\nbase "),
|
|
478
|
-
]));
|
|
479
470
|
assert_eq!(provider_env_exports(Provider::GeminiCli, AuthMode::OfficialApi, &values), map(&[("GEMINI_API_KEY", "dummy")]));
|
|
480
471
|
assert_eq!(provider_env_exports(Provider::Copilot, AuthMode::CompatibleApi, &values), map(&[
|
|
481
472
|
("COPILOT_PROVIDER_BASE_URL", " raw\nbase "), ("COPILOT_PROVIDER_TYPE", "custom"),
|
|
@@ -570,48 +561,7 @@ fn provider_command_overrides(
|
|
|
570
561
|
_ if agent.model.is_some() => agent.model.clone(),
|
|
571
562
|
_ => profile_model(values).map(str::to_string),
|
|
572
563
|
};
|
|
573
|
-
|
|
574
|
-
let mut codex_config = Vec::new();
|
|
575
|
-
// Python provider_env.py:62-79 (_provider_command_overrides codex branch).
|
|
576
|
-
match agent.provider {
|
|
577
|
-
Provider::Codex => {
|
|
578
|
-
codex_profile =
|
|
579
|
-
value_or_alternate(values, "CODEX_PROFILE", "NATIVE_PROFILE").map(str::to_string);
|
|
580
|
-
let model_provider = values.get("MODEL_PROVIDER").filter(|v| !v.is_empty());
|
|
581
|
-
let base_url = values.get("BASE_URL").filter(|v| !v.is_empty());
|
|
582
|
-
if agent.auth_mode == AuthMode::CompatibleApi {
|
|
583
|
-
if let (Some(model_provider), Some(base_url)) = (model_provider, base_url) {
|
|
584
|
-
if safe_codex_provider_id(model_provider) {
|
|
585
|
-
codex_config.push(format!("model_provider=\"{model_provider}\""));
|
|
586
|
-
let prefix = format!("model_providers.{model_provider}");
|
|
587
|
-
codex_config.push(format!("{prefix}.base_url=\"{base_url}\""));
|
|
588
|
-
codex_config
|
|
589
|
-
.push(format!("{prefix}.env_key=\"TEAM_AGENT_PROVIDER_API_KEY\""));
|
|
590
|
-
if let Some(wire_api) = values.get("WIRE_API").filter(|v| !v.is_empty()) {
|
|
591
|
-
codex_config.push(format!("{prefix}.wire_api=\"{wire_api}\""));
|
|
592
|
-
}
|
|
593
|
-
if let Some(name) = values.get("PROVIDER_NAME").filter(|v| !v.is_empty()) {
|
|
594
|
-
codex_config.push(format!("{prefix}.name=\"{name}\""));
|
|
595
|
-
}
|
|
596
|
-
}
|
|
597
|
-
}
|
|
598
|
-
}
|
|
599
|
-
}
|
|
600
|
-
_ => {}
|
|
601
|
-
}
|
|
602
|
-
ProviderCommandOverrides {
|
|
603
|
-
model,
|
|
604
|
-
codex_profile,
|
|
605
|
-
codex_config,
|
|
606
|
-
}
|
|
607
|
-
}
|
|
608
|
-
|
|
609
|
-
/// Python helpers.py:33-34 `_safe_codex_provider_id`: `[A-Za-z0-9_-]+`.
|
|
610
|
-
fn safe_codex_provider_id(value: &str) -> bool {
|
|
611
|
-
!value.is_empty()
|
|
612
|
-
&& value
|
|
613
|
-
.chars()
|
|
614
|
-
.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
|
|
564
|
+
ProviderCommandOverrides { model }
|
|
615
565
|
}
|
|
616
566
|
|
|
617
567
|
fn write_runtime_env_file(
|
|
@@ -704,18 +654,12 @@ fn required_profile_keys(provider: Provider, auth_mode: AuthMode) -> &'static [&
|
|
|
704
654
|
return &[];
|
|
705
655
|
}
|
|
706
656
|
match provider {
|
|
707
|
-
Provider::Codex => match auth_mode {
|
|
708
|
-
AuthMode::OfficialApi => &["API_KEY"],
|
|
709
|
-
AuthMode::CompatibleApi => &["BASE_URL", "API_KEY"],
|
|
710
|
-
AuthMode::Subscription => &[],
|
|
711
|
-
},
|
|
712
657
|
Provider::GeminiCli => &["API_KEY"],
|
|
713
658
|
// C-7-1 cr verdict: copilot 一期 subscription-only,无 BYOK required key 集合;
|
|
714
659
|
// 二期 BYOK 立项时填(向后兼容字段保留)。
|
|
715
660
|
Provider::Copilot => &[],
|
|
716
|
-
//
|
|
717
|
-
|
|
718
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Grok | Provider::Pi => &[],
|
|
661
|
+
// Claude Code/Codex/Grok/Pi worker 只走 subscription-only contract leaf。
|
|
662
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok | Provider::Pi => &[],
|
|
719
663
|
Provider::Fake => &[],
|
|
720
664
|
}
|
|
721
665
|
}
|
|
@@ -275,8 +275,8 @@ pub(super) fn spawn_agent_window(
|
|
|
275
275
|
// (agent row → active_team_key) for back-compat with non-restart callers.
|
|
276
276
|
owner_team_id_override: Option<&str>,
|
|
277
277
|
) -> Result<SpawnedAgentWindow, LifecycleError> {
|
|
278
|
-
// A pre-upgrade Claude Code or Pi worker row has no legacy
|
|
279
|
-
// refuse before any MCP file, profile or pane side effect.
|
|
278
|
+
// A pre-upgrade Claude Code, Codex, Grok or Pi worker row has no legacy
|
|
279
|
+
// runtime left; refuse before any MCP file, profile or pane side effect.
|
|
280
280
|
if let Some(retired) = agent
|
|
281
281
|
.get("provider")
|
|
282
282
|
.and_then(serde_json::Value::as_str)
|
|
@@ -424,10 +424,6 @@ pub(super) fn spawn_agent_window(
|
|
|
424
424
|
&mut env,
|
|
425
425
|
)?;
|
|
426
426
|
}
|
|
427
|
-
if provider == crate::provider::Provider::Grok {
|
|
428
|
-
crate::lifecycle::launch::ensure_grok_login_and_folder_trust(workspace)?;
|
|
429
|
-
crate::lifecycle::launch::apply_grok_mcp_overlay(workspace, &mcp_config)?;
|
|
430
|
-
}
|
|
431
427
|
// Spawn cwd is override-or-workspace (E56: ignore drifted state
|
|
432
428
|
// `.team/runtime/<team_key>/`).
|
|
433
429
|
let env_unset = crate::layout::worker_env::isolate_worker_spawn_env(
|
|
@@ -1153,7 +1149,7 @@ pub(super) fn session_live_or_default(
|
|
|
1153
1149
|
|
|
1154
1150
|
/// ---
|
|
1155
1151
|
/// purpose: 取席位行的 provider
|
|
1156
|
-
/// returns:
|
|
1152
|
+
/// returns: 解析成功用它,缺失或不认识时退到已退役的 legacy codex 键(其后一律拒绝,不会起席)
|
|
1157
1153
|
/// ---
|
|
1158
1154
|
pub(super) fn agent_provider(agent: &serde_json::Value) -> Provider {
|
|
1159
1155
|
agent
|
|
@@ -1318,41 +1314,17 @@ pub(super) fn resume_backing_probe_for_agent(
|
|
|
1318
1314
|
let _ = (workspace, agent_id, agent, session_id, rollout_path);
|
|
1319
1315
|
false
|
|
1320
1316
|
}
|
|
1321
|
-
Provider::Codex => {
|
|
1322
|
-
let rollout_ok = rollout_path_exists(rollout_path);
|
|
1323
|
-
let scan_roots = codex_session_transcript_scan_roots(agent, rollout_path);
|
|
1324
|
-
for root in &scan_roots {
|
|
1325
|
-
checked_paths.push(root.clone());
|
|
1326
|
-
}
|
|
1327
|
-
rollout_ok
|
|
1328
|
-
|| codex_session_transcript_exists_with_roots(session_id.as_str(), &scan_roots)
|
|
1329
|
-
}
|
|
1330
1317
|
Provider::Copilot => {
|
|
1331
1318
|
if let Some(home) = std::env::var_os("HOME").map(PathBuf::from) {
|
|
1332
1319
|
checked_paths.push(home.join(".copilot/session-store.db"));
|
|
1333
1320
|
}
|
|
1334
1321
|
copilot_session_store_has_session(session_id.as_str())
|
|
1335
1322
|
}
|
|
1336
|
-
|
|
1337
|
-
let spawn_cwd = agent
|
|
1338
|
-
.get("spawn_cwd")
|
|
1339
|
-
.and_then(serde_json::Value::as_str)
|
|
1340
|
-
.map(PathBuf::from)
|
|
1341
|
-
.unwrap_or_else(|| workspace.to_path_buf());
|
|
1342
|
-
match crate::provider::session_scan::grok::grok_session_dir(
|
|
1343
|
-
&spawn_cwd,
|
|
1344
|
-
session_id.as_str(),
|
|
1345
|
-
) {
|
|
1346
|
-
Some(dir) => {
|
|
1347
|
-
checked_paths.push(dir.clone());
|
|
1348
|
-
crate::provider::session_scan::grok::grok_session_archive_present(&dir)
|
|
1349
|
-
}
|
|
1350
|
-
None => false,
|
|
1351
|
-
}
|
|
1352
|
-
}
|
|
1353
|
-
// Claude Code and Pi workers run only through their contract leaves.
|
|
1323
|
+
// Claude Code, Codex, Grok and Pi workers run only through their contract leaves.
|
|
1354
1324
|
Provider::Claude
|
|
1355
1325
|
| Provider::ClaudeCode
|
|
1326
|
+
| Provider::Codex
|
|
1327
|
+
| Provider::Grok
|
|
1356
1328
|
| Provider::Pi
|
|
1357
1329
|
| Provider::GeminiCli
|
|
1358
1330
|
| Provider::Fake => false,
|
|
@@ -1389,86 +1361,6 @@ pub(super) fn provider_wire_supports_resume(provider: &str) -> bool {
|
|
|
1389
1361
|
.unwrap_or(false)
|
|
1390
1362
|
}
|
|
1391
1363
|
|
|
1392
|
-
fn rollout_path_exists(rollout_path: Option<&RolloutPath>) -> bool {
|
|
1393
|
-
rollout_path
|
|
1394
|
-
.as_ref()
|
|
1395
|
-
.is_some_and(|path| path.as_path().exists())
|
|
1396
|
-
}
|
|
1397
|
-
|
|
1398
|
-
fn codex_session_transcript_exists(
|
|
1399
|
-
agent: &serde_json::Value,
|
|
1400
|
-
session_id: &str,
|
|
1401
|
-
rollout_path: Option<&RolloutPath>,
|
|
1402
|
-
) -> bool {
|
|
1403
|
-
let roots = codex_session_transcript_scan_roots(agent, rollout_path);
|
|
1404
|
-
codex_session_transcript_exists_with_roots(session_id, &roots)
|
|
1405
|
-
}
|
|
1406
|
-
|
|
1407
|
-
fn codex_session_transcript_scan_roots(
|
|
1408
|
-
agent: &serde_json::Value,
|
|
1409
|
-
rollout_path: Option<&RolloutPath>,
|
|
1410
|
-
) -> Vec<PathBuf> {
|
|
1411
|
-
let mut roots: Vec<PathBuf> = Vec::new();
|
|
1412
|
-
if let Some(parent) = rollout_path
|
|
1413
|
-
.map(RolloutPath::as_path)
|
|
1414
|
-
.and_then(Path::parent)
|
|
1415
|
-
.filter(|path| path.is_dir())
|
|
1416
|
-
{
|
|
1417
|
-
roots.push(parent.to_path_buf());
|
|
1418
|
-
}
|
|
1419
|
-
if let Some(root) = agent
|
|
1420
|
-
.get("codex_sessions_root")
|
|
1421
|
-
.and_then(serde_json::Value::as_str)
|
|
1422
|
-
.filter(|path| !path.is_empty())
|
|
1423
|
-
.map(PathBuf::from)
|
|
1424
|
-
.filter(|path| path.is_dir())
|
|
1425
|
-
{
|
|
1426
|
-
roots.push(root);
|
|
1427
|
-
}
|
|
1428
|
-
if let Some(root) = std::env::var_os("HOME")
|
|
1429
|
-
.map(PathBuf::from)
|
|
1430
|
-
.map(|home| home.join(".codex").join("sessions"))
|
|
1431
|
-
.filter(|path| path.is_dir())
|
|
1432
|
-
{
|
|
1433
|
-
roots.push(root);
|
|
1434
|
-
}
|
|
1435
|
-
roots.sort();
|
|
1436
|
-
roots.dedup();
|
|
1437
|
-
roots
|
|
1438
|
-
}
|
|
1439
|
-
|
|
1440
|
-
fn codex_session_transcript_exists_with_roots(session_id: &str, roots: &[PathBuf]) -> bool {
|
|
1441
|
-
if session_id.is_empty() {
|
|
1442
|
-
return false;
|
|
1443
|
-
}
|
|
1444
|
-
roots
|
|
1445
|
-
.iter()
|
|
1446
|
-
.any(|root| session_transcript_exists_under(root, session_id, 4))
|
|
1447
|
-
}
|
|
1448
|
-
|
|
1449
|
-
fn session_transcript_exists_under(root: &Path, session_id: &str, max_depth: usize) -> bool {
|
|
1450
|
-
let Ok(entries) = std::fs::read_dir(root) else {
|
|
1451
|
-
return false;
|
|
1452
|
-
};
|
|
1453
|
-
for entry in entries.flatten() {
|
|
1454
|
-
let path = entry.path();
|
|
1455
|
-
if path.is_file() {
|
|
1456
|
-
let Some(name) = path.file_name().and_then(|name| name.to_str()) else {
|
|
1457
|
-
continue;
|
|
1458
|
-
};
|
|
1459
|
-
if name.ends_with(".jsonl") && name.contains(session_id) {
|
|
1460
|
-
return true;
|
|
1461
|
-
}
|
|
1462
|
-
} else if max_depth > 0
|
|
1463
|
-
&& path.is_dir()
|
|
1464
|
-
&& session_transcript_exists_under(&path, session_id, max_depth.saturating_sub(1))
|
|
1465
|
-
{
|
|
1466
|
-
return true;
|
|
1467
|
-
}
|
|
1468
|
-
}
|
|
1469
|
-
false
|
|
1470
|
-
}
|
|
1471
|
-
|
|
1472
1364
|
fn copilot_session_store_has_session(session_id: &str) -> bool {
|
|
1473
1365
|
let Some(home) = std::env::var_os("HOME").map(PathBuf::from) else {
|
|
1474
1366
|
return false;
|
|
@@ -2157,41 +2049,4 @@ mod e36_transcript_backing_tests {
|
|
|
2157
2049
|
)
|
|
2158
2050
|
.is_err());
|
|
2159
2051
|
}
|
|
2160
|
-
|
|
2161
|
-
#[test]
|
|
2162
|
-
fn codex_session_transcript_is_recognized_when_rollout_path_is_stale() {
|
|
2163
|
-
let scratch = ScratchDir::new("codex-recognized");
|
|
2164
|
-
let sessions_root = scratch.path().join("sessions");
|
|
2165
|
-
let dated = sessions_root.join("2026").join("06").join("20");
|
|
2166
|
-
std::fs::create_dir_all(&dated).expect("mkdir dated sessions");
|
|
2167
|
-
let session_id = "019ee540-37ed-7a20-a141-1d654224d209";
|
|
2168
|
-
std::fs::write(
|
|
2169
|
-
dated.join(format!("rollout-2026-06-20T21-37-31-{session_id}.jsonl")),
|
|
2170
|
-
b"{}\n",
|
|
2171
|
-
)
|
|
2172
|
-
.expect("codex transcript");
|
|
2173
|
-
|
|
2174
|
-
let stale = RolloutPath::new(scratch.path().join("old").join("missing.jsonl"));
|
|
2175
|
-
let agent = serde_json::json!({
|
|
2176
|
-
"codex_sessions_root": sessions_root.to_string_lossy(),
|
|
2177
|
-
});
|
|
2178
|
-
assert!(
|
|
2179
|
-
codex_session_transcript_exists(&agent, session_id, Some(&stale)),
|
|
2180
|
-
"matching codex transcript under codex_sessions_root must count as resume backing"
|
|
2181
|
-
);
|
|
2182
|
-
}
|
|
2183
|
-
|
|
2184
|
-
#[test]
|
|
2185
|
-
fn missing_codex_session_transcript_is_not_backing() {
|
|
2186
|
-
let scratch = ScratchDir::new("codex-missing");
|
|
2187
|
-
let sessions_root = scratch.path().join("sessions");
|
|
2188
|
-
std::fs::create_dir_all(&sessions_root).expect("mkdir sessions");
|
|
2189
|
-
let agent = serde_json::json!({
|
|
2190
|
-
"codex_sessions_root": sessions_root.to_string_lossy(),
|
|
2191
|
-
});
|
|
2192
|
-
assert!(
|
|
2193
|
-
!codex_session_transcript_exists(&agent, "019ee540-ffff-7a20-a141-1d654224d209", None,),
|
|
2194
|
-
"no matching codex transcript => no backing"
|
|
2195
|
-
);
|
|
2196
|
-
}
|
|
2197
2052
|
}
|
|
@@ -653,6 +653,135 @@ fn remove_agent_at_paths(
|
|
|
653
653
|
}
|
|
654
654
|
}
|
|
655
655
|
|
|
656
|
+
struct ContractRemovalInputs {
|
|
657
|
+
paths: LifecyclePaths,
|
|
658
|
+
team: Option<String>,
|
|
659
|
+
transport: crate::tmux_backend::TmuxBackend,
|
|
660
|
+
state: serde_json::Value,
|
|
661
|
+
spec: YamlValue,
|
|
662
|
+
team_key: String,
|
|
663
|
+
}
|
|
664
|
+
|
|
665
|
+
impl ContractRemovalInputs {
|
|
666
|
+
fn resolve(workspace: &Path, agent_id: &AgentId, team: Option<&str>) -> Result<Self, LifecycleError> {
|
|
667
|
+
let paths = lifecycle_paths(workspace, team)?;
|
|
668
|
+
let team = paths.canonical_team(team).map(str::to_string);
|
|
669
|
+
let transport = paths.tmux_backend()?;
|
|
670
|
+
let state = resolve_team_scoped_state_or_refuse(&paths.run_workspace, team.as_deref())?;
|
|
671
|
+
crate::lifecycle::launch::ensure_owner_allowed_for_state(&state, Some(agent_id))?;
|
|
672
|
+
let spec = load_team_spec(&paths.spec_workspace)?;
|
|
673
|
+
let team_key = state
|
|
674
|
+
.get("active_team_key")
|
|
675
|
+
.and_then(serde_json::Value::as_str)
|
|
676
|
+
.filter(|key| !key.is_empty())
|
|
677
|
+
.map(str::to_string)
|
|
678
|
+
.unwrap_or_else(|| crate::state::projection::team_state_key(&state));
|
|
679
|
+
Ok(Self { paths, team, transport, state, spec, team_key })
|
|
680
|
+
}
|
|
681
|
+
|
|
682
|
+
fn refs(&self) -> LifecyclePathRefs<'_> {
|
|
683
|
+
LifecyclePathRefs {
|
|
684
|
+
run_workspace: &self.paths.run_workspace,
|
|
685
|
+
spec_workspace: &self.paths.spec_workspace,
|
|
686
|
+
}
|
|
687
|
+
}
|
|
688
|
+
|
|
689
|
+
fn rollback(&self, agent_id: &AgentId) -> Result<RemoveRollback, LifecycleError> {
|
|
690
|
+
RemoveRollback::capture(
|
|
691
|
+
&self.paths.run_workspace,
|
|
692
|
+
&self.paths.spec_workspace,
|
|
693
|
+
&self.spec,
|
|
694
|
+
&self.state,
|
|
695
|
+
&self.team_key,
|
|
696
|
+
agent_id,
|
|
697
|
+
)
|
|
698
|
+
}
|
|
699
|
+
}
|
|
700
|
+
|
|
701
|
+
/// ---
|
|
702
|
+
/// purpose: 契约席位摘除前的只读预检;在原生席位停机或退役之前,确认逻辑摘除所需输入都能解析
|
|
703
|
+
/// errors: 选不到 team、owner 门不过、spec 缺失或摘除后 spec 校验不过时返回 LifecycleError
|
|
704
|
+
/// ---
|
|
705
|
+
/// Deterministic failures surface while the native seat is still intact.
|
|
706
|
+
pub(crate) fn preflight_contract_removal(
|
|
707
|
+
workspace: &Path,
|
|
708
|
+
agent_id: &AgentId,
|
|
709
|
+
team: Option<&str>,
|
|
710
|
+
) -> Result<(), LifecycleError> {
|
|
711
|
+
let inputs = ContractRemovalInputs::resolve(workspace, agent_id, team)?;
|
|
712
|
+
inputs.rollback(agent_id)?;
|
|
713
|
+
let removed = spec_without_agent(&inputs.spec, agent_id);
|
|
714
|
+
if should_validate_removed_spec(&removed, &inputs.refs()) {
|
|
715
|
+
crate::model::spec::validate_spec(&removed, &inputs.paths.run_workspace)
|
|
716
|
+
.map_err(|e| LifecycleError::Compile(e.to_string()))?;
|
|
717
|
+
}
|
|
718
|
+
Ok(())
|
|
719
|
+
}
|
|
720
|
+
|
|
721
|
+
/// ---
|
|
722
|
+
/// purpose: 契约席位的逻辑摘除;原生 store 的停机与退役已由调用方在同一把生命周期锁下完成
|
|
723
|
+
/// returns: 摘除结果
|
|
724
|
+
/// errors: 选不到 team、owner 门不过或写盘失败时返回 LifecycleError,并按快照回滚
|
|
725
|
+
/// ---
|
|
726
|
+
/// A contract seat has no workspace pane to resolve, so no legacy transport
|
|
727
|
+
/// identity is consulted. Only the shared logical records are removed.
|
|
728
|
+
pub(crate) fn remove_contract_records_locked(
|
|
729
|
+
workspace: &Path,
|
|
730
|
+
agent_id: &AgentId,
|
|
731
|
+
from_spec: bool,
|
|
732
|
+
force: bool,
|
|
733
|
+
stopped: bool,
|
|
734
|
+
team: Option<&str>,
|
|
735
|
+
) -> Result<RemoveAgentOutcome, LifecycleError> {
|
|
736
|
+
let inputs = ContractRemovalInputs::resolve(workspace, agent_id, team)?;
|
|
737
|
+
let rollback = inputs.rollback(agent_id)?;
|
|
738
|
+
let refs = inputs.refs();
|
|
739
|
+
let team = inputs.team.as_deref();
|
|
740
|
+
let result = remove_agent_inner(
|
|
741
|
+
&refs,
|
|
742
|
+
agent_id,
|
|
743
|
+
&inputs.spec,
|
|
744
|
+
inputs.state.clone(),
|
|
745
|
+
None,
|
|
746
|
+
&inputs.team_key,
|
|
747
|
+
false,
|
|
748
|
+
team,
|
|
749
|
+
&inputs.transport,
|
|
750
|
+
);
|
|
751
|
+
match result {
|
|
752
|
+
Ok(success) => {
|
|
753
|
+
write_remove_complete_event(
|
|
754
|
+
refs.run_workspace,
|
|
755
|
+
agent_id,
|
|
756
|
+
from_spec,
|
|
757
|
+
force,
|
|
758
|
+
stopped,
|
|
759
|
+
success.role_file_removed,
|
|
760
|
+
success.cleared_locations,
|
|
761
|
+
)?;
|
|
762
|
+
Ok(success.outcome)
|
|
763
|
+
}
|
|
764
|
+
Err(error) => {
|
|
765
|
+
let restore_errors =
|
|
766
|
+
rollback.restore(refs.run_workspace, refs.spec_workspace, team, &inputs.transport);
|
|
767
|
+
let rollback_ok = restore_errors.is_empty();
|
|
768
|
+
let _ = write_remove_rollback_events(RemoveRollbackEvent {
|
|
769
|
+
agent_id,
|
|
770
|
+
workspace: refs.run_workspace,
|
|
771
|
+
from_spec,
|
|
772
|
+
force,
|
|
773
|
+
stopped,
|
|
774
|
+
error: &error,
|
|
775
|
+
rollback_ok,
|
|
776
|
+
restore_errors: &restore_errors,
|
|
777
|
+
});
|
|
778
|
+
Err(LifecycleError::StatePersist(format!(
|
|
779
|
+
"remove-agent failed for {agent_id}: {error}; rollback_ok={rollback_ok}"
|
|
780
|
+
)))
|
|
781
|
+
}
|
|
782
|
+
}
|
|
783
|
+
}
|
|
784
|
+
|
|
656
785
|
fn remove_agent_inner(
|
|
657
786
|
paths: &LifecyclePathRefs<'_>,
|
|
658
787
|
agent_id: &AgentId,
|
|
@@ -52,6 +52,20 @@ pub fn add_agent_from_role(
|
|
|
52
52
|
})
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
#[cfg(test)]
|
|
56
|
+
pub(crate) fn add_agent_from_role_with_transport(
|
|
57
|
+
workspace: &Path,
|
|
58
|
+
agent_id: &AgentId,
|
|
59
|
+
source: Option<&Path>,
|
|
60
|
+
patch: &RoleConfigPatch,
|
|
61
|
+
force: bool,
|
|
62
|
+
transport: &dyn Transport,
|
|
63
|
+
) -> Result<AddAgentReport, LifecycleError> {
|
|
64
|
+
with_selected(&select(workspace, None)?, agent_id, |selected| {
|
|
65
|
+
add_at_selected(selected, agent_id, source, patch, force, transport)
|
|
66
|
+
})
|
|
67
|
+
}
|
|
68
|
+
|
|
55
69
|
pub fn start_agent_from_role(
|
|
56
70
|
workspace: &Path,
|
|
57
71
|
agent_id: &AgentId,
|
|
@@ -108,27 +122,38 @@ fn add_at_selected(
|
|
|
108
122
|
)));
|
|
109
123
|
}
|
|
110
124
|
let role_path = role_path(selected, agent_id);
|
|
111
|
-
|
|
125
|
+
// --force re-adopts the role file a removed seat left behind (#391): CLI
|
|
126
|
+
// values override its frontmatter and its body is kept.
|
|
127
|
+
let adopted = !recreate
|
|
128
|
+
&& force
|
|
129
|
+
&& source.is_none()
|
|
130
|
+
&& fs::symlink_metadata(&role_path).is_ok_and(|meta| meta.is_file());
|
|
131
|
+
if !recreate && !adopted {
|
|
112
132
|
check_destination(&role_path, source)?;
|
|
113
133
|
}
|
|
114
134
|
let text = match source {
|
|
115
135
|
Some(path) => read_text(path)?,
|
|
136
|
+
None if adopted => patched_role(&read_text(&role_path)?, agent_id, patch, false)?,
|
|
116
137
|
None => String::new(),
|
|
117
138
|
};
|
|
139
|
+
let generated = source.is_none() && !adopted;
|
|
118
140
|
#[allow(unused_mut)]
|
|
119
141
|
let mut reconciled = reconcile_creation(&text, patch)?;
|
|
120
142
|
// A generated legacy role falls back to its id as instructions at compile
|
|
121
143
|
// time; a contract role requires a body, so give it a neutral default.
|
|
122
144
|
#[cfg(unix)]
|
|
123
|
-
if
|
|
145
|
+
if generated
|
|
124
146
|
&& reconciled.prompt.is_none()
|
|
125
|
-
&& crate::contract_runtime::framework::declares_contract(
|
|
147
|
+
&& crate::contract_runtime::framework::declares_contract(
|
|
148
|
+
None,
|
|
149
|
+
reconciled.provider.as_deref(),
|
|
150
|
+
)
|
|
126
151
|
{
|
|
127
152
|
reconciled.prompt = Some(format!(
|
|
128
153
|
"You are {agent_id}. Complete the tasks assigned by the leader.\n"
|
|
129
154
|
));
|
|
130
155
|
}
|
|
131
|
-
let next = patched_role(&text, agent_id, &reconciled,
|
|
156
|
+
let next = patched_role(&text, agent_id, &reconciled, generated)?;
|
|
132
157
|
let snapshot = RoleSnapshot::capture(selected, &role_path)?;
|
|
133
158
|
let result = (|| {
|
|
134
159
|
if snapshot.role.bytes.as_deref() != Some(next.as_bytes()) {
|
|
@@ -342,12 +367,11 @@ fn reconcile_creation(
|
|
|
342
367
|
.get("provider")
|
|
343
368
|
.and_then(Value::as_str)
|
|
344
369
|
.filter(|value| !value.trim().is_empty());
|
|
345
|
-
let opted_in = matches!(meta.get("contract_runtime"), Some(Value::Bool(true)));
|
|
346
370
|
if let Some(file_provider) = file_provider {
|
|
347
|
-
let file_provider = declared_provider(file_provider
|
|
371
|
+
let file_provider = declared_provider(file_provider)
|
|
348
372
|
.ok_or_else(|| LifecycleError::Compile("unknown role provider".into()))?;
|
|
349
373
|
if let Some(provider) = &next.provider {
|
|
350
|
-
if declared_provider(provider
|
|
374
|
+
if declared_provider(provider) != Some(file_provider) {
|
|
351
375
|
return Err(conflict("provider"));
|
|
352
376
|
}
|
|
353
377
|
next.provider = None;
|
|
@@ -415,13 +439,11 @@ fn reconcile_creation(
|
|
|
415
439
|
|
|
416
440
|
/// One identity per declared provider: its contract leaf id, else its legacy
|
|
417
441
|
/// wire form, so `agent` in a role file and `--provider cursor` agree.
|
|
418
|
-
fn declared_provider(value: &str
|
|
442
|
+
fn declared_provider(value: &str) -> Option<&'static str> {
|
|
419
443
|
#[cfg(unix)]
|
|
420
|
-
if let Some(descriptor) = crate::contract_runtime::registry::declared(value
|
|
444
|
+
if let Some(descriptor) = crate::contract_runtime::registry::declared(value) {
|
|
421
445
|
return Some(descriptor.identity.id);
|
|
422
446
|
}
|
|
423
|
-
#[cfg(not(unix))]
|
|
424
|
-
let _ = contract_runtime;
|
|
425
447
|
crate::provider::wire::parse_provider(value).map(crate::provider::wire::provider_wire)
|
|
426
448
|
}
|
|
427
449
|
|
|
@@ -449,8 +471,13 @@ fn check_destination(path: &Path, source: Option<&Path>) -> Result<(), Lifecycle
|
|
|
449
471
|
.is_some_and(|(source, target)| source == target)
|
|
450
472
|
}) {
|
|
451
473
|
return Err(LifecycleError::RequirementUnmet(format!(
|
|
452
|
-
"role file already exists: {}",
|
|
453
|
-
path.display()
|
|
474
|
+
"role file already exists: {}{}",
|
|
475
|
+
path.display(),
|
|
476
|
+
if source.is_none() {
|
|
477
|
+
"; reuse it with --role-file or re-adopt it with --force"
|
|
478
|
+
} else {
|
|
479
|
+
""
|
|
480
|
+
}
|
|
454
481
|
)));
|
|
455
482
|
}
|
|
456
483
|
}
|
|
@@ -405,7 +405,7 @@ fn write_min_team(ws: &Path, name: &str) -> PathBuf {
|
|
|
405
405
|
.unwrap();
|
|
406
406
|
std::fs::write(
|
|
407
407
|
team.join("agents/worker_a.md"),
|
|
408
|
-
"---\nname: worker_a\nrole: Worker\nprovider:
|
|
408
|
+
"---\nname: worker_a\nrole: Worker\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nWorker.\n",
|
|
409
409
|
)
|
|
410
410
|
.unwrap();
|
|
411
411
|
team
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
use super::lane_ops::assert_legacy_fork_unverified;
|
|
1
2
|
use super::launch_spawn::{
|
|
2
3
|
quick_start_team_dir, restart_ws_two_resumable_workers, seed_healthy_coordinator,
|
|
3
4
|
DELEG_ROLE_ALPHA, DELEG_ROLE_BRAVO, QS_VALID_ROLE,
|
|
@@ -43,8 +44,8 @@ pub(super) fn lanea_team_ws(status: &str) -> PathBuf {
|
|
|
43
44
|
&json!({
|
|
44
45
|
"session_name": "team-laneateam",
|
|
45
46
|
"agents": {
|
|
46
|
-
"alpha": {"status": status, "provider": "
|
|
47
|
-
"bravo": {"status": status, "provider": "
|
|
47
|
+
"alpha": {"status": status, "provider": "fake", "window": "alpha"},
|
|
48
|
+
"bravo": {"status": status, "provider": "fake", "window": "bravo"}
|
|
48
49
|
}
|
|
49
50
|
}),
|
|
50
51
|
)
|
|
@@ -264,14 +265,9 @@ fn lanea_fork_agent_unknown_source_is_unknown_worker_before_session_check() {
|
|
|
264
265
|
fn lanea_fork_agent_duplicate_target_is_already_exists_before_session_check() {
|
|
265
266
|
let ws = lanea_team_ws("stopped");
|
|
266
267
|
// target 'bravo' already exists in the spec -> duplicate; source 'alpha' exists (its session_id is irrelevant).
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
);
|
|
271
|
-
assert!(
|
|
272
|
-
text.contains("unverified") || text.contains("未验证") || text.contains("refuses --as"),
|
|
273
|
-
"codex fork is unverified in-window; duplicate --as is not reached. got {text}"
|
|
274
|
-
);
|
|
268
|
+
// The legacy fork entry refuses the fake source as unverified; duplicate --as is not reached.
|
|
269
|
+
let result = fork_agent(&ws, &aid("alpha"), &aid("bravo"), None, false, None);
|
|
270
|
+
assert_legacy_fork_unverified(&result, "fake");
|
|
275
271
|
}
|
|
276
272
|
|
|
277
273
|
// SEAM-GATED real-machine boundary (note to porter): stop_agent / reset_agent / fork_agent must drive a
|
|
@@ -320,7 +316,7 @@ fn add_agent_joins_w2_into_running_roster_and_existing_session() {
|
|
|
320
316
|
workspace,
|
|
321
317
|
&json!({
|
|
322
318
|
"session_name": "team-implteam",
|
|
323
|
-
"agents": {"w1": {"status": "running", "provider": "
|
|
319
|
+
"agents": {"w1": {"status": "running", "provider": "fake", "window": "w1"}}
|
|
324
320
|
}),
|
|
325
321
|
)
|
|
326
322
|
.unwrap();
|
|
@@ -329,7 +325,7 @@ fn add_agent_joins_w2_into_running_roster_and_existing_session() {
|
|
|
329
325
|
let role_file = team_dir.join("w2-role.md");
|
|
330
326
|
std::fs::write(
|
|
331
327
|
&role_file,
|
|
332
|
-
"---\nname: w2\nrole: Worker Two\nprovider:
|
|
328
|
+
"---\nname: w2\nrole: Worker Two\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nWorker two.\n",
|
|
333
329
|
)
|
|
334
330
|
.unwrap();
|
|
335
331
|
let transport = OfflineTransport::new().with_session_present(true);
|