@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.
Files changed (107) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/crates/team-agent/src/cli/diagnose.rs +0 -69
  4. package/crates/team-agent/src/cli/emit.rs +10 -9
  5. package/crates/team-agent/src/cli/grok_slot.rs +88 -3
  6. package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
  7. package/crates/team-agent/src/cli/intent/runtime_tests.rs +45 -0
  8. package/crates/team-agent/src/cli/mod.rs +13 -1
  9. package/crates/team-agent/src/cli/models.rs +27 -181
  10. package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
  11. package/crates/team-agent/src/cli/tests/mod.rs +2 -2
  12. package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
  13. package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
  14. package/crates/team-agent/src/compiler/tests.rs +36 -9
  15. package/crates/team-agent/src/compiler.rs +3 -2
  16. package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
  17. package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
  18. package/crates/team-agent/src/contract_runtime/config.rs +6 -5
  19. package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
  20. package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
  21. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  22. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
  23. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  24. package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -2
  25. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  26. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  27. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  28. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +17 -185
  29. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
  30. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
  31. package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
  32. package/crates/team-agent/src/lifecycle/launch.rs +3 -11
  33. package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
  34. package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
  35. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  36. package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
  37. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  38. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  39. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
  40. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
  41. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
  42. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  43. package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
  44. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  45. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +6 -124
  46. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  47. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  48. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  49. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +136 -256
  50. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  51. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  52. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  53. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  54. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +7 -7
  55. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  56. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  57. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  58. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  59. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
  60. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  61. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +5 -5
  62. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  63. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  64. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  65. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  66. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  67. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +70 -15
  68. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
  69. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
  70. package/crates/team-agent/src/lifecycle/tests.rs +0 -4
  71. package/crates/team-agent/src/lifecycle/types.rs +2 -5
  72. package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
  73. package/crates/team-agent/src/messaging/delivery.rs +9 -61
  74. package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
  75. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  76. package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
  77. package/crates/team-agent/src/messaging/tests/spine.rs +5 -1
  78. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  79. package/crates/team-agent/src/provider/adapter.rs +58 -356
  80. package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
  81. package/crates/team-agent/src/provider/session/capture.rs +5 -105
  82. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
  83. package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
  84. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  85. package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
  86. package/crates/team-agent/src/provider/session_scan.rs +6 -16
  87. package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
  88. package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
  89. package/crates/team-agent/src/provider/tests/idle.rs +0 -43
  90. package/crates/team-agent/src/provider/types.rs +0 -4
  91. package/crates/team-agent/src/provider/wire.rs +34 -8
  92. package/crates/team-agent/src/tmux_backend.rs +4 -3
  93. package/package.json +4 -4
  94. package/skills/team-agent/SKILL.md +3 -2
  95. package/skills/team-agent/command-coverage.json +14 -0
  96. package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
  97. package/skills/team-agent/references/team-agent-operator.md +3 -1
  98. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  99. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  100. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  101. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  102. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  103. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  104. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  105. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  106. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  107. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
package/Cargo.lock CHANGED
@@ -721,7 +721,7 @@ dependencies = [
721
721
 
722
722
  [[package]]
723
723
  name = "team-agent"
724
- version = "0.5.126"
724
+ version = "0.5.127"
725
725
  dependencies = [
726
726
  "anyhow",
727
727
  "chrono",
package/Cargo.toml CHANGED
@@ -11,7 +11,7 @@ exclude = ["crates/team-agent-contract"]
11
11
 
12
12
  [workspace.package]
13
13
  edition = "2021"
14
- version = "0.5.126"
14
+ version = "0.5.127"
15
15
  license = "AGPL-3.0"
16
16
  rust-version = "1.95"
17
17
 
@@ -1180,22 +1180,6 @@ mod tests {
1180
1180
  );
1181
1181
  }
1182
1182
 
1183
- fn write_codex_identity_rollout(
1184
- workspace: &std::path::Path,
1185
- session_id: &str,
1186
- embedded_agent_id: &str,
1187
- ) -> std::path::PathBuf {
1188
- let path = workspace.join("rollout-poison.jsonl");
1189
- let text = format!(
1190
- "{{\"session_meta\":{{\"payload\":{{\"id\":\"{session_id}\",\"cwd\":\"{}\"}}}}}}\n\
1191
- {{\"type\":\"turn_context\",\"payload\":{{}}}}\n\
1192
- {{\"type\":\"response_item\",\"payload\":{{\"content\":[{{\"type\":\"input_text\",\"text\":\"You are Team Agent worker `{embedded_agent_id}` with role `fixture`.\"}}]}}}}\n",
1193
- workspace.to_string_lossy()
1194
- );
1195
- std::fs::write(&path, text).expect("write rollout");
1196
- path
1197
- }
1198
-
1199
1183
  fn coordinator_health_fixture(
1200
1184
  status: crate::coordinator::CoordinatorHealthStatus,
1201
1185
  metadata_mismatch_reason: Option<&str>,
@@ -1271,59 +1255,6 @@ mod tests {
1271
1255
  );
1272
1256
  }
1273
1257
 
1274
- #[test]
1275
- fn diagnose_surfaces_codex_session_identity_mismatch() {
1276
- let workspace =
1277
- std::env::temp_dir().join(format!("ta-diagnose-crossbind-{}", std::process::id()));
1278
- let _ = std::fs::remove_dir_all(&workspace);
1279
- std::fs::create_dir_all(&workspace).unwrap();
1280
- let rollout = write_codex_identity_rollout(
1281
- &workspace,
1282
- "019f3327-c35a-7023-b3cd-1bea93a7a157",
1283
- "ios-dev",
1284
- );
1285
- let state = json!({
1286
- "session_name": "team-fixture",
1287
- "leader_receiver": {
1288
- "mode": "direct_tmux",
1289
- "status": "attached",
1290
- "pane_id": "%leader",
1291
- "provider": "codex"
1292
- },
1293
- "agents": {
1294
- "frontend": {
1295
- "provider": "codex",
1296
- "status": "running",
1297
- "session_id": "019f3327-c35a-7023-b3cd-1bea93a7a157",
1298
- "rollout_path": rollout.to_string_lossy(),
1299
- "captured_at": "2026-07-05T17:04:04Z",
1300
- "captured_via": "fs_watch",
1301
- "spawn_cwd": workspace.to_string_lossy(),
1302
- "window": "frontend"
1303
- }
1304
- }
1305
- });
1306
- let backend = crate::transport::test_support::OfflineTransport::new()
1307
- .with_session_present(true)
1308
- .with_windows(vec![crate::transport::WindowName::new("frontend")]);
1309
- let (issues, repairs) = diagnose_runtime(&state, &backend);
1310
- assert!(
1311
- issues
1312
- .as_array()
1313
- .is_some_and(|items| items.iter().any(|item| item.as_str()
1314
- == Some("session_identity_mismatch:frontend"))),
1315
- "diagnose must surface session_identity_mismatch for poisoned Codex tuples; issues={issues}"
1316
- );
1317
- assert!(
1318
- repairs.as_array().is_some_and(|items| items.iter().any(|item| {
1319
- item.get("issue").and_then(Value::as_str)
1320
- == Some("session_identity_mismatch:frontend")
1321
- })),
1322
- "diagnose should include an explicit repair hint for the mismatched tuple; repairs={repairs}"
1323
- );
1324
- let _ = std::fs::remove_dir_all(&workspace);
1325
- }
1326
-
1327
1258
  fn pane(session: &str, pane_id: &str, window: &str) -> crate::transport::PaneInfo {
1328
1259
  crate::transport::PaneInfo {
1329
1260
  pane_id: crate::transport::PaneId::new(pane_id),
@@ -463,7 +463,7 @@ pub(super) fn command_help(command: Option<&str>) -> String {
463
463
  "team-agent restart worker --dry-run --json\nteam-agent restart worker --session preserve --workspace . --dry-run --json", "Use team-agent team restart for deliberate team recovery; choose --session preserve when context must be retained. Team restart leaves explicitly stopped/paused seats alone; team-agent start intentionally activates the non-paused roster. Inspect partial/unknown outcomes with status/doctor, never blind reset or retry."),
464
464
  "shutdown" => ("Compatibility bridge: stop only the selected workspace/team. Logs are retained by default; --keep-logs remains compatible.\n--json reports scope, degradation and owned residuals. Success does not mean other teams were shut down.",
465
465
  "team-agent shutdown --workspace .\nteam-agent shutdown --workspace . --team help-demo --json", "Prefer team-agent stop --workspace . --team KEY --json. Verify this team's owned residuals are empty; use team-agent start for authorized later activation. Do not clean up other teams or shared servers."),
466
- "add-agent" => ("Compatibility add-only entry. <agent> names the new seat; --provider/--model/--effort select intentional launch settings.\n--bypass requires true|false; --prompt sets responsibilities; --profile selects a local profile.\nProvider and bypass must be explicit in arguments or --role-file. Conflicting settings are refused before writes. --force requires explicit authorization, a positively dead old pane and no live cohort.",
466
+ "add-agent" => ("Compatibility add-only entry. <agent> names the new seat; --provider/--model/--effort select intentional launch settings.\n--bypass requires true|false; --prompt sets responsibilities; --profile selects a local profile.\nProvider and bypass must be explicit in arguments or --role-file. Conflicting settings are refused before writes. --force requires explicit authorization, a positively dead old pane and no live cohort;\nfor a removed seat, --force re-adopts the role file it left behind and CLI values override it.",
467
467
  "team-agent add-agent reviewer --provider pi --model openai-codex/gpt-6-luna --bypass false --prompt 'Review tasks'\nteam-agent add-agent reviewer --role-file ./agents/reviewer.md", "Prefer team-agent start reviewer --role-file FILE for add-or-wake, or team-agent agent add reviewer for strict new-seat behavior. Keep provider/bypass explicit; check status and send a task after actual startup."),
468
468
  "start-agent" => ("Compatibility entry starts an existing stopped seat only; a running seat is refused.\n--provider/--model/--effort/--bypass select intentional settings; --prompt replaces permanent instructions and --profile selects local authentication.\nA different provider is refused. Use --allow-fresh only after explicit authorization to lose saved context.",
469
469
  "team-agent start-agent worker\nteam-agent start-agent worker --model openai-codex/gpt-6-luna", "Prefer team-agent start worker for daily add-or-wake or verified live no-op. Use team-agent stop worker before applying changed settings; inspect status and send a task afterward. A no-op is not role synchronization or business readiness."),
@@ -1644,9 +1644,10 @@ fn role_agent_args(
1644
1644
  match flag {
1645
1645
  "--provider" => {
1646
1646
  // A contract name is written as the leaf's public name (`agent` →
1647
- // `cursor`, `claude_code` → `claude`); it declares the same leaf.
1647
+ // `cursor`, `claude_code` → `claude`, `codex_cli` → `codex`); it
1648
+ // declares the same leaf.
1648
1649
  #[cfg(unix)]
1649
- let contract = crate::contract_runtime::registry::declared(&value, false)
1650
+ let contract = crate::contract_runtime::registry::declared(&value)
1650
1651
  .map(crate::contract_runtime::registry::public_name);
1651
1652
  #[cfg(not(unix))]
1652
1653
  let contract: Option<&str> = None;
@@ -1749,19 +1750,19 @@ mod role_cli_tests {
1749
1750
  fn provider_accepts_contract_names_as_their_leaf_id() {
1750
1751
  for (name, leaf) in [
1751
1752
  ("cursor", "cursor"), ("cursor-agent", "cursor"), ("agent", "cursor"),
1752
- ("cursor_agent", "cursor"), ("kiro", "kiro"), ("codex_tui", "codex_tui"),
1753
- // Claude Code and Pi keep their public command names, which declare the leaf.
1753
+ ("cursor_agent", "cursor"), ("kiro", "kiro"),
1754
+ // Claude Code, Codex, Grok Build and Pi keep their public command
1755
+ // names, which declare the leaf.
1754
1756
  ("claude", "claude"), ("claude_code", "claude"), ("claude-code", "claude"),
1755
- ("claude_tui", "claude"), ("pi", "pi"), ("pi_tui", "pi"),
1757
+ ("claude_tui", "claude"), ("codex", "codex"), ("codex_cli", "codex"),
1758
+ ("codex-cli", "codex"), ("codex_tui", "codex"), ("grok", "grok"),
1759
+ ("grok_build", "grok"), ("pi", "pi"), ("pi_tui", "pi"),
1756
1760
  ] {
1757
1761
  let (_, patch) = role_agent_args(
1758
1762
  &strings(&["w", "--provider", name, "--bypass", "true"]), true,
1759
1763
  ).unwrap_or_else(|error| panic!("{name}: {error}"));
1760
1764
  assert_eq!(patch.provider.as_deref(), Some(leaf), "{name}");
1761
1765
  }
1762
- let (_, patch) =
1763
- role_agent_args(&strings(&["w", "--provider", "codex", "--bypass", "true"]), true).unwrap();
1764
- assert_eq!(patch.provider.as_deref(), Some("codex"), "a bare shared key stays legacy");
1765
1766
  assert!(role_agent_args(&strings(&["w", "--provider", "Cursor", "--bypass", "true"]), true).is_err());
1766
1767
  }
1767
1768
 
@@ -1,12 +1,13 @@
1
1
  //! ---
2
- //! purpose: 对账 .grok/config.toml 残余共享槽与在役 grok 席,含未首 turn 危险窗
2
+ //! purpose: 对账 .grok/config.toml 残余共享槽与升级前遗留的在役 grok 席,含未首 turn 危险窗
3
3
  //! contract:
4
4
  //! provides:
5
5
  //! - name: grok_slot_report
6
6
  //! what: 盘上 ID/OWNER/AUTH、在役 grok、pre_first_turn;读不出为 unjudgeable
7
7
  //! boundary:
8
8
  //! - 读不出不报一致
9
- //! - 不写盘、不改 overlay
9
+ //! - 不写盘、不改 overlay;legacy grok worker 已退役,本文件只做观测,
10
+ //! 帮助清理升级前留下的席位与共享槽(grok_build 叶子不写这份 toml)
10
11
  //! maturity: wired
11
12
  //! ---
12
13
 
@@ -91,8 +92,50 @@ struct DiskSlot {
91
92
  extras: Vec<(String, String)>,
92
93
  }
93
94
 
95
+ /// Shared identity keys belong on pane env. The only TEAM_AGENT_* key
96
+ /// allowed in the directory-scoped grok toml is WORKSPACE (same cwd).
97
+ fn is_per_seat_env_key(key: &str) -> bool {
98
+ let key = key.trim();
99
+ key.starts_with("TEAM_AGENT_") && key != "TEAM_AGENT_WORKSPACE"
100
+ }
101
+
102
+ /// Per-seat keys of every `*.env` table, first-seen order, values unquoted.
103
+ fn per_seat_keys_in_toml(text: &str) -> Vec<(String, String)> {
104
+ let mut in_env_table = false;
105
+ let mut out = Vec::new();
106
+ for line in text.lines() {
107
+ let trimmed = line.trim();
108
+ if trimmed.starts_with('[') && trimmed.ends_with(']') {
109
+ let name = &trimmed[1..trimmed.len() - 1];
110
+ in_env_table = name.ends_with(".env");
111
+ continue;
112
+ }
113
+ if !in_env_table {
114
+ continue;
115
+ }
116
+ let Some((key, rest)) = trimmed.split_once('=') else {
117
+ continue;
118
+ };
119
+ let key = key.trim();
120
+ if !is_per_seat_env_key(key) {
121
+ continue;
122
+ }
123
+ let rest = rest.trim();
124
+ let value = rest
125
+ .strip_prefix('"')
126
+ .and_then(|s| s.strip_suffix('"'))
127
+ .or_else(|| rest.strip_prefix('\'').and_then(|s| s.strip_suffix('\'')))
128
+ .unwrap_or(rest);
129
+ if out.iter().any(|(existing, _)| existing == key) {
130
+ continue;
131
+ }
132
+ out.push((key.to_string(), value.to_string()));
133
+ }
134
+ out
135
+ }
136
+
94
137
  fn parse_disk_slot(text: &str) -> DiskSlot {
95
- let keys = crate::lifecycle::launch::per_seat_keys_in_toml(text);
138
+ let keys = per_seat_keys_in_toml(text);
96
139
  DiskSlot {
97
140
  team_agent_id: find_key(&keys, "TEAM_AGENT_ID"),
98
141
  owner_team_id: find_key(&keys, "TEAM_AGENT_OWNER_TEAM_ID"),
@@ -296,4 +339,46 @@ fn expected_auth_mode(live: &[LiveGrok]) -> Option<String> {
296
339
  found
297
340
  }
298
341
 
342
+ #[cfg(test)]
343
+ mod tests {
344
+ use super::*;
299
345
 
346
+ #[test]
347
+ fn workspace_is_shared_other_team_agent_keys_are_per_seat() {
348
+ assert!(!is_per_seat_env_key("TEAM_AGENT_WORKSPACE"));
349
+ assert!(is_per_seat_env_key("TEAM_AGENT_ID"));
350
+ assert!(is_per_seat_env_key("TEAM_AGENT_OWNER_TEAM_ID"));
351
+ assert!(is_per_seat_env_key("TEAM_AGENT_AUTH_MODE"));
352
+ assert!(is_per_seat_env_key("TEAM_AGENT_FUTURE_SEAT_KEY"));
353
+ assert!(!is_per_seat_env_key("GROK_FOLDER_TRUST"));
354
+ }
355
+
356
+ #[test]
357
+ fn scan_finds_per_seat_keys_in_env_table_only() {
358
+ let text = r#"
359
+ [mcp_servers.other.env]
360
+ TEAM_AGENT_ID = "ignore-other-server-still-counts"
361
+
362
+ [mcp_servers.team_orchestrator]
363
+ command = "/bin/x"
364
+
365
+ [mcp_servers.team_orchestrator.env]
366
+ TEAM_AGENT_WORKSPACE = "/ws"
367
+ TEAM_AGENT_AUTH_MODE = "impostor"
368
+ "#;
369
+ let keys = per_seat_keys_in_toml(text);
370
+ assert!(
371
+ keys.iter()
372
+ .any(|(k, v)| k == "TEAM_AGENT_AUTH_MODE" && v == "impostor"),
373
+ "must see AUTH; keys={keys:?}"
374
+ );
375
+ assert!(
376
+ keys.iter().any(|(k, _)| k == "TEAM_AGENT_ID"),
377
+ "any env table per-seat key counts; keys={keys:?}"
378
+ );
379
+ assert!(
380
+ !keys.iter().any(|(k, _)| k == "TEAM_AGENT_WORKSPACE"),
381
+ "WORKSPACE is shared; keys={keys:?}"
382
+ );
383
+ }
384
+ }
@@ -609,15 +609,17 @@ fn add(
609
609
  id: &str,
610
610
  source: Option<PathBuf>,
611
611
  ) -> Result<(), CliError> {
612
+ // An explicit start re-admits a removed seat: the add consumes its retired
613
+ // tombstone. Only lifecycle history this planner cannot classify is refused.
612
614
  if selected
613
615
  .state
614
616
  .get("agent_lifecycle")
615
617
  .and_then(|lifecycle| lifecycle.get(id))
616
- .is_some()
618
+ .is_some_and(|entry| entry.get("state").and_then(Value::as_str) != Some("retired"))
617
619
  {
618
- return Err(refusal(
619
- "agent lifecycle history is not an absent role; use explicit recovery/add",
620
- ));
620
+ return Err(refusal(format!(
621
+ "agent {id} has unrecognized lifecycle history; refusing to re-admit it"
622
+ )));
621
623
  }
622
624
  let patch = plan.intent.patch.clone();
623
625
  let role_file = match source {
@@ -336,6 +336,51 @@ fn role_only_add_and_absent_creation_need_explicit_decisions() {
336
336
  }
337
337
  #[test]
338
338
  #[serial_test::serial(env)]
339
+ fn issue391_start_readmits_a_removed_seat_from_its_left_behind_role_file() {
340
+ let (root, mut intent) = fixture(&["one"]);
341
+ install(root.path(), &[("one", "stopped", false)]);
342
+ // remove-agent keeps the user's role file and leaves a retired tombstone.
343
+ write_role(root.path(), "two");
344
+ let state = crate::state::persist::runtime_state_path(root.path());
345
+ let mut raw: Value = serde_json::from_slice(&std::fs::read(&state).unwrap()).unwrap();
346
+ let tombstone = json!({"two": {"state": "retired", "changed_at": "2026-10-27T15:25:48Z", "reason": "remove-agent"}});
347
+ raw["agent_lifecycle"] = tombstone.clone();
348
+ raw["teams"]["fixture"]["agent_lifecycle"] = tombstone;
349
+ std::fs::write(&state, serde_json::to_vec(&raw).unwrap()).unwrap();
350
+ intent.subject = Subject::Agent(AgentId::new("two"));
351
+ let plan = plan_with_observer(intent.clone(), |_, _, _| panic!("unregistered probe")).unwrap();
352
+ assert_eq!(actions(&plan), [("add_agent", Some("two"))]);
353
+ let Step::AddAgent(args) = &plan.steps[0] else {
354
+ panic!()
355
+ };
356
+ assert_eq!(
357
+ Path::new(&args.role_file),
358
+ root.path().join("agents/two.md"),
359
+ "the left-behind role file is the seat's definition"
360
+ );
361
+ // Team start still leaves a removed seat retired.
362
+ let mut team = intent.clone();
363
+ team.subject = Subject::Team { source: None };
364
+ let plan = plan_with_observer(team, |_, _, _| Ok(Observation::StoppedVerified)).unwrap();
365
+ assert_eq!(actions(&plan), [("start_agent", Some("one"))]);
366
+ assert!(plan
367
+ .skipped
368
+ .iter()
369
+ .any(|entry| entry["agent"] == "two" && entry["reason"] == "retired"));
370
+ // History the planner cannot classify is refused without naming a phantom command.
371
+ raw["agent_lifecycle"]["two"]["state"] = json!("quarantined");
372
+ raw["teams"]["fixture"]["agent_lifecycle"]["two"]["state"] = json!("quarantined");
373
+ std::fs::write(&state, serde_json::to_vec(&raw).unwrap()).unwrap();
374
+ let error = plan_with_observer(intent, |_, _, _| panic!())
375
+ .unwrap_err()
376
+ .to_string();
377
+ assert!(
378
+ error.contains("unrecognized lifecycle history") && !error.contains("recovery"),
379
+ "{error}"
380
+ );
381
+ }
382
+ #[test]
383
+ #[serial_test::serial(env)]
339
384
  fn spec_only_state_only_and_missing_spec_do_not_fallback_to_creation() {
340
385
  let (root, mut intent) = fixture(&["one", "two"]);
341
386
  install(root.path(), &[("one", "stopped", false)]);
@@ -3414,6 +3414,12 @@ pub mod lifecycle_port {
3414
3414
  discard_session: bool,
3415
3415
  team: Option<&str>,
3416
3416
  ) -> Result<Value, CliError> {
3417
+ #[cfg(unix)]
3418
+ if let Some(receipt) =
3419
+ crate::contract_runtime::commands::reset_agent(workspace, team, agent, discard_session)?
3420
+ {
3421
+ return Ok(receipt);
3422
+ }
3417
3423
  let agent_id = crate::model::ids::AgentId::new(agent);
3418
3424
  #[cfg(unix)]
3419
3425
  crate::contract_runtime::framework::require_legacy_lifecycle(
@@ -3602,6 +3608,12 @@ pub mod lifecycle_port {
3602
3608
  force: bool,
3603
3609
  team: Option<&str>,
3604
3610
  ) -> Result<Value, CliError> {
3611
+ #[cfg(unix)]
3612
+ if let Some(receipt) = crate::contract_runtime::commands::remove_agent(
3613
+ workspace, team, agent, from_spec, confirm, force,
3614
+ )? {
3615
+ return Ok(receipt);
3616
+ }
3605
3617
  let agent_id = crate::model::ids::AgentId::new(agent);
3606
3618
  #[cfg(unix)]
3607
3619
  crate::contract_runtime::framework::require_legacy_lifecycle(
@@ -4486,7 +4498,7 @@ pub mod lifecycle_port {
4486
4498
  .unwrap();
4487
4499
  std::fs::write(
4488
4500
  team_dir.join("agents").join("implementer.md"),
4489
- "---\nname: implementer\nrole: Implementation Engineer\nprovider: codex\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nImplement bounded tasks.\n",
4501
+ "---\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",
4490
4502
  )
4491
4503
  .unwrap();
4492
4504
  super::super::hermetic_test_support::seed_in_process_coordinator(&root);
@@ -7,9 +7,10 @@ type ModelRecord = crate::provider::model_catalog::ModelRecord;
7
7
 
8
8
  pub fn cmd_models(args: &ModelsArgs) -> Result<CmdResult, CliError> {
9
9
  #[cfg(unix)]
10
- if let Some(descriptor) = crate::contract_runtime::registry::declared(&args.provider, false) {
10
+ if let Some(descriptor) = crate::contract_runtime::registry::declared(&args.provider) {
11
11
  // A role's provider names its catalog: `agent` or `cursor-agent` is the
12
- // Cursor leaf; `claude`/`claude_code` and `pi` are the Claude Code and Pi leaves.
12
+ // Cursor leaf; `claude`/`claude_code`, `codex`, `grok` and `pi` are the
13
+ // Claude Code, Codex, Grok Build and Pi leaves.
13
14
  let args = ModelsArgs { provider: descriptor.identity.id.into(), ..args.clone() };
14
15
  return crate::contract_runtime::discovery::models(&args);
15
16
  }
@@ -157,28 +158,32 @@ esac"#);
157
158
  #[cfg(unix)]
158
159
  #[test]
159
160
  fn grok_build_contract_catalog_runs_the_public_grok_found_on_path() {
160
- let program = fixture_program("grok", r#"
161
+ // The public `grok` provider name declares the Grok Build leaf; both
162
+ // names read the same contract catalog.
163
+ for name in ["grok_build", "grok"] {
164
+ let program = fixture_program("grok", r#"
161
165
  test "$#" = 1 || exit 9
162
166
  case "$1" in
163
167
  --version) printf '%s\n' 'grok 1.0.52 (0920c8169e27)' ;;
164
168
  models) exec /bin/cat "$TEAM_AGENT_MODELS_FIXTURE" ;;
165
169
  *) exit 9 ;;
166
170
  esac"#);
167
- let mut grok = CliFixture::new(program);
168
- let response = grok.program.with_extension("stdout");
169
- std::fs::write(&response, include_bytes!("../provider/testdata/grok-models-authenticated.stdout")).unwrap();
170
- grok.response = Some(response);
171
- let output = run_public_models_cli(&grok.program, grok.response.as_deref(),
172
- &["models", "--provider", "grok_build", "--json"]);
173
- let text = public_cli_text(&output);
174
- let calls = std::fs::read_to_string(grok.program.with_extension("count")).unwrap_or_default();
175
- assert!(output.status.success(), "{text}");
176
- // Whatever `grok` PATH selects answers every probe; no install path is assumed.
177
- assert_eq!(calls, "1:--version\n1:models\n");
178
- let value: Value = serde_json::from_str(text.trim()).unwrap();
179
- assert_eq!(value["provider"], "grok_build");
180
- assert_eq!(value["source"]["executable"], grok.program.to_str().unwrap());
181
- assert!(value["models"].as_array().unwrap().iter().any(|row| row["model_id"] == "grok-4.7-build-fast"));
171
+ let mut grok = CliFixture::new(program);
172
+ let response = grok.program.with_extension("stdout");
173
+ std::fs::write(&response, include_bytes!("../provider/testdata/grok-models-authenticated.stdout")).unwrap();
174
+ grok.response = Some(response);
175
+ let output = run_public_models_cli(&grok.program, grok.response.as_deref(),
176
+ &["models", "--provider", name, "--json"]);
177
+ let text = public_cli_text(&output);
178
+ let calls = std::fs::read_to_string(grok.program.with_extension("count")).unwrap_or_default();
179
+ assert!(output.status.success(), "{name}: {text}");
180
+ // Whatever `grok` PATH selects answers every probe; no install path is assumed.
181
+ assert_eq!(calls, "1:--version\n1:models\n", "{name}");
182
+ let value: Value = serde_json::from_str(text.trim()).unwrap();
183
+ assert_eq!(value["provider"], "grok_build", "{name}");
184
+ assert_eq!(value["source"]["executable"], grok.program.to_str().unwrap(), "{name}");
185
+ assert!(value["models"].as_array().unwrap().iter().any(|row| row["model_id"] == "grok-4.7-build-fast"), "{name}");
186
+ }
182
187
  }
183
188
 
184
189
  #[cfg(unix)]
@@ -234,158 +239,6 @@ esac"#));
234
239
  assert!(value["error"].as_str().unwrap().contains("Cursor release unknown"));
235
240
  }
236
241
 
237
- #[cfg(unix)]
238
- #[test]
239
- fn grok_public_cli_uses_native_catalog_and_keeps_shared_projection() {
240
- let grok = native_cli_fixture(
241
- "grok",
242
- include_bytes!("../provider/testdata/grok-models-authenticated.stdout"),
243
- );
244
- let json = run_public_models_cli(
245
- &grok.program,
246
- grok.response.as_deref(),
247
- &["models", "--provider", "grok", "--json"],
248
- );
249
- let human = run_public_models_cli(
250
- &grok.program,
251
- grok.response.as_deref(),
252
- &["models", "--provider", "grok", "--search", "BUILD FAST"],
253
- );
254
- let no_match = run_public_models_cli(
255
- &grok.program,
256
- grok.response.as_deref(),
257
- &[
258
- "models",
259
- "--provider",
260
- "grok",
261
- "--search",
262
- "definitely-absent",
263
- ],
264
- );
265
- let json_text = public_cli_text(&json);
266
- let human_text = public_cli_text(&human);
267
- let no_match_text = public_cli_text(&no_match);
268
- let calls =
269
- std::fs::read_to_string(grok.program.with_extension("count")).unwrap_or_default();
270
- drop(grok);
271
- assert!(json.status.success(), "{json_text}");
272
- assert!(human.status.success(), "{human_text}");
273
- assert!(no_match.status.success(), "{no_match_text}");
274
- assert_eq!(calls, "1:models\n".repeat(3));
275
- let value: Value = serde_json::from_str(json_text.trim()).unwrap();
276
- assert_eq!(value["schema_version"], "models.v1");
277
- assert_eq!(value["provider"], "grok");
278
- assert_eq!(value["auth_basis"], "catalog_visibility");
279
- let models = value["models"].as_array().unwrap();
280
- assert_eq!(
281
- models
282
- .iter()
283
- .map(|model| model["model_id"].as_str().unwrap())
284
- .collect::<Vec<_>>(),
285
- vec!["grok-4.7", "grok-4.7-build-fast", "grok-4.5", "grok-4.6"]
286
- );
287
- assert!(models.iter().all(|model| model["provider"] == "grok"
288
- && model["vendor"] == "xai"
289
- && model["aliases"] == json!([])));
290
- assert_eq!(models[0]["default"], false);
291
- assert_eq!(models[3]["default"], true);
292
- assert!(human_text.contains("grok-4.7-build-fast"));
293
- assert!(no_match_text.contains("No models matched --search"));
294
- assert!(no_match_text.contains("auth: ok (catalog_visibility)"));
295
-
296
- let grok = native_cli_fixture(
297
- "grok",
298
- include_bytes!("../provider/testdata/grok-models-unauthenticated.stdout"),
299
- );
300
- let changed_default = run_public_models_cli(
301
- &grok.program,
302
- grok.response.as_deref(),
303
- &["models", "--provider", "grok", "--json"],
304
- );
305
- let changed_text = public_cli_text(&changed_default);
306
- drop(grok);
307
- assert!(changed_default.status.success(), "{changed_text}");
308
- let changed: Value = serde_json::from_str(changed_text.trim()).unwrap();
309
- assert_eq!(changed["models"][0]["model_id"], "grok-4.7");
310
- assert_eq!(changed["models"][0]["default"], true);
311
- assert_eq!(changed["models"][1]["default"], false);
312
- }
313
-
314
- #[cfg(unix)]
315
- #[test]
316
- fn grok_invalid_native_catalogs_fail_closed_without_fallback() {
317
- let cases: [(&str, Vec<u8>); 7] = [
318
- ("unknown row", b"You are logged in with grok.com.\n\nDefault model: grok-4.6\n\nAvailable models:\n - grok-4.6\n ? grok-4.5\n".to_vec()),
319
- ("duplicate", b"You are logged in with grok.com.\n\nDefault model: grok-4.6\n\nAvailable models:\n - grok-4.6\n - grok-4.6\n".to_vec()),
320
- ("invalid id", b"You are logged in with grok.com.\n\nDefault model: grok-4.6\n\nAvailable models:\n * grok bad (default)\n".to_vec()),
321
- ("control id", b"You are logged in with grok.com.\n\nDefault model: grok-4.6\n\nAvailable models:\n * grok-\x01evil (default)\n".to_vec()),
322
- ("empty", b"You are not authenticated.\n\nDefault model: grok-4.6\n\nAvailable models:\n".to_vec()),
323
- ("contradictory default", b"You are not authenticated.\n\nDefault model: grok-4.6\n\nAvailable models:\n * grok-4.7 (default)\n - grok-4.6\n".to_vec()),
324
- ("invalid utf8", vec![b'Y', b'o', b'u', 0xff]),
325
- ];
326
- let mut outcomes = Vec::new();
327
- for (name, bytes) in cases {
328
- let grok = native_cli_fixture("grok", &bytes);
329
- let output = run_public_models_cli(
330
- &grok.program,
331
- grok.response.as_deref(),
332
- &["models", "--provider", "grok", "--json"],
333
- );
334
- let text = public_cli_text(&output);
335
- let calls =
336
- std::fs::read_to_string(grok.program.with_extension("count")).unwrap_or_default();
337
- outcomes.push((name, output.status.success(), text, calls));
338
- }
339
- for (name, success, text, calls) in outcomes {
340
- assert!(!success, "{name} catalog unexpectedly accepted: {text}");
341
- assert_eq!(calls, "1:models\n", "{name}");
342
- let value: Value = serde_json::from_str(text.trim()).unwrap();
343
- assert_eq!(value["schema_version"], "models.v1", "{name}");
344
- assert_eq!(value["ok"], false, "{name}");
345
- assert_eq!(value["models"], json!([]), "{name}");
346
- assert!(
347
- !value["error"]
348
- .as_str()
349
- .unwrap()
350
- .to_ascii_lowercase()
351
- .contains("unsupported model provider"),
352
- "{name}: {text}"
353
- );
354
- }
355
- }
356
-
357
- #[cfg(unix)]
358
- #[test]
359
- fn grok_nonzero_native_command_is_not_a_successful_empty_catalog() {
360
- let grok = CliFixture::new(fixture_program(
361
- "grok",
362
- "printf 'private diagnostic' >&2\nexit 7",
363
- ));
364
- let output = run_public_models_cli(
365
- &grok.program,
366
- None,
367
- &["models", "--provider", "grok", "--json"],
368
- );
369
- let text = public_cli_text(&output);
370
- let calls =
371
- std::fs::read_to_string(grok.program.with_extension("count")).unwrap_or_default();
372
- drop(grok);
373
- assert!(!output.status.success(), "{text}");
374
- assert_eq!(calls, "1:models\n");
375
- assert!(!text.contains("private diagnostic"));
376
- let value: Value = serde_json::from_str(text.trim()).unwrap();
377
- assert_eq!(value["ok"], false);
378
- assert_eq!(value["models"], json!([]));
379
- assert!(
380
- value["error"]
381
- .as_str()
382
- .unwrap()
383
- .to_ascii_lowercase()
384
- .contains("grok"),
385
- "{text}"
386
- );
387
- }
388
-
389
242
  #[cfg(unix)]
390
243
  #[test]
391
244
  fn grok_failure_help_and_unsupported_action_are_publicly_diagnostic() {
@@ -397,7 +250,11 @@ esac"#));
397
250
  );
398
251
  let text = public_cli_text(&output);
399
252
  let value: Value = serde_json::from_str(text.trim()).unwrap();
253
+ // `grok` reads the Grok Build leaf catalog; a missing PATH `grok` fails
254
+ // closed there with no legacy catalog fallback.
400
255
  assert_eq!(value["ok"], false);
256
+ assert_eq!(value["provider"], "grok_build", "{text}");
257
+ assert_eq!(value["models"], json!([]), "{text}");
401
258
  assert!(
402
259
  value["error"]
403
260
  .as_str()
@@ -406,7 +263,6 @@ esac"#));
406
263
  .contains("grok"),
407
264
  "{text}"
408
265
  );
409
- assert!(value["action"].as_str().unwrap().contains("grok"), "{text}");
410
266
  assert!(crate::cli::emit::default_help().contains("grok"));
411
267
  assert!(crate::cli::spec::command_spec("models")
412
268
  .unwrap()
@@ -501,16 +357,6 @@ esac"#));
501
357
  }
502
358
  }
503
359
 
504
- #[cfg(unix)]
505
- fn native_cli_fixture(program: &str, bytes: &[u8]) -> CliFixture {
506
- let program = fixture_program(program, "exec /bin/cat \"$TEAM_AGENT_MODELS_FIXTURE\"");
507
- let mut fixture = CliFixture::new(program);
508
- let response = fixture.program.with_extension("stdout");
509
- std::fs::write(&response, bytes).unwrap();
510
- fixture.response = Some(response);
511
- fixture
512
- }
513
-
514
360
  #[cfg(unix)]
515
361
  fn run_public_models_cli(
516
362
  path: &Path,
@@ -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": "codex"}}}}
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": "codex"},
62
- "drifted": {"provider": "codex", "status": "session_drift"}
61
+ "alice": {"provider": "copilot"},
62
+ "drifted": {"provider": "copilot", "status": "session_drift"}
63
63
  },
64
64
  "tasks": [{"id": "t-1"}]
65
65
  }