@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
@@ -231,12 +231,11 @@ fn start_mode_serde_names_match_python_start_mode_strings() {
231
231
 
232
232
  // ───────────────────────────────────────────────────────────────────────
233
233
  // decide_start_mode — bug-085 四象限 + E20 #264 gap closure.
234
- // codex sess rollout-present any-fresh -> resumed
235
- // codex sess backing-MISSING !allow_fresh -> noop/refuse (绝不静默 resume 死 session)
236
- // codex sess backing-MISSING allow_fresh -> fresh_after_missing_rollout
237
- // codex no-sess any -> fresh
238
- // copilot/grok sess backing-missing -> fresh_after_missing_rollout 或 noop/refuse
239
- // copilot no-sess -> fresh
234
+ // copilot sess backing-present any-fresh -> resumed
235
+ // copilot sess backing-MISSING !allow_fresh -> noop/refuse (绝不静默 resume 死 session)
236
+ // copilot sess backing-MISSING allow_fresh -> fresh_after_missing_rollout
237
+ // copilot no-sess any -> fresh
238
+ // non-resumable (fake/gemini_cli/retired claude/pi/codex/grok rows) sess -> noop 或 fresh_after_missing_rollout
240
239
  // 这是 bug-085 把 start_mode 分类从 start_agent 的 lock+spawn 全路径剥离出来的命门。
241
240
  // ───────────────────────────────────────────────────────────────────────
242
241
 
@@ -248,16 +247,16 @@ fn rp(p: &str) -> RolloutPath {
248
247
  }
249
248
 
250
249
  #[test]
251
- fn decide_start_mode_codex_missing_rollout_with_allow_fresh_is_fresh_after_missing() {
252
- // bug-085 唯一 FreshAfterMissingRollout 臂:codex + 有 session_id + rollout 缺 + allow_fresh。
250
+ fn decide_start_mode_copilot_missing_rollout_with_allow_fresh_is_fresh_after_missing() {
251
+ // bug-085 唯一 FreshAfterMissingRollout 臂:copilot(唯一可 resume 的 legacy worker)+ 有 session_id + backing 缺 + allow_fresh。
253
252
  assert_eq!(
254
- decide_start_mode("codex", Some(&sid("s1")), None, false, true),
253
+ decide_start_mode("copilot", Some(&sid("s1")), None, false, true),
255
254
  StartMode::FreshAfterMissingRollout
256
255
  );
257
256
  // rollout 路径存在但文件已不在,同样命中。
258
257
  assert_eq!(
259
258
  decide_start_mode(
260
- "codex",
259
+ "copilot",
261
260
  Some(&sid("s1")),
262
261
  Some(&rp("/gone.jsonl")),
263
262
  false,
@@ -268,19 +267,19 @@ fn decide_start_mode_codex_missing_rollout_with_allow_fresh_is_fresh_after_missi
268
267
  }
269
268
 
270
269
  #[test]
271
- fn decide_start_mode_codex_missing_rollout_without_allow_fresh_refuses() {
270
+ fn decide_start_mode_copilot_missing_rollout_without_allow_fresh_refuses() {
272
271
  // E20 C①:backing 缺且 !allow_fresh → 诚实拒绝,绝不 resume 进死 session。
273
272
  assert_eq!(
274
- decide_start_mode("codex", Some(&sid("s1")), None, false, false),
273
+ decide_start_mode("copilot", Some(&sid("s1")), None, false, false),
275
274
  StartMode::Noop
276
275
  );
277
276
  }
278
277
 
279
278
  #[test]
280
- fn decide_start_mode_codex_rollout_present_is_resumed_regardless_of_fresh() {
279
+ fn decide_start_mode_copilot_rollout_present_is_resumed_regardless_of_fresh() {
281
280
  assert_eq!(
282
281
  decide_start_mode(
283
- "codex",
282
+ "copilot",
284
283
  Some(&sid("s1")),
285
284
  Some(&rp("/r.jsonl")),
286
285
  true,
@@ -289,7 +288,7 @@ fn decide_start_mode_codex_rollout_present_is_resumed_regardless_of_fresh() {
289
288
  StartMode::Resumed
290
289
  );
291
290
  assert_eq!(
292
- decide_start_mode("codex", Some(&sid("s1")), Some(&rp("/r.jsonl")), true, true),
291
+ decide_start_mode("copilot", Some(&sid("s1")), Some(&rp("/r.jsonl")), true, true),
293
292
  StartMode::Resumed
294
293
  );
295
294
  }
@@ -297,44 +296,19 @@ fn decide_start_mode_codex_rollout_present_is_resumed_regardless_of_fresh() {
297
296
  #[test]
298
297
  fn decide_start_mode_no_session_is_fresh() {
299
298
  assert_eq!(
300
- decide_start_mode("codex", None, None, false, true),
299
+ decide_start_mode("copilot", None, None, false, true),
301
300
  StartMode::Fresh
302
301
  );
303
302
  assert_eq!(
304
- decide_start_mode("codex", None, None, false, false),
305
- StartMode::Fresh
306
- );
307
- }
308
-
309
- #[test]
310
- fn decide_start_mode_checks_backing_for_all_resumable_providers() {
311
- for provider in ["copilot", "grok"] {
312
- assert_eq!(
313
- decide_start_mode(provider, Some(&sid("s1")), None, false, true),
314
- StartMode::FreshAfterMissingRollout,
315
- "{provider} missing backing + allow_fresh must not resume"
316
- );
317
- assert_eq!(
318
- decide_start_mode(provider, Some(&sid("s1")), None, false, false),
319
- StartMode::Noop,
320
- "{provider} missing backing + !allow_fresh must refuse"
321
- );
322
- assert_eq!(
323
- decide_start_mode(provider, Some(&sid("s1")), Some(&rp("/r")), true, false),
324
- StartMode::Resumed,
325
- "{provider} existing backing remains resumable"
326
- );
327
- }
328
- assert_eq!(
329
- decide_start_mode("copilot", None, None, false, true),
303
+ decide_start_mode("copilot", None, None, false, false),
330
304
  StartMode::Fresh
331
305
  );
332
306
  }
333
307
 
334
308
  #[test]
335
309
  fn decide_start_mode_refuses_session_id_for_nonresumable_providers() {
336
- // A persisted legacy Claude Code / Pi worker row is no longer resumable.
337
- for provider in ["fake", "gemini_cli", "claude", "claude_code", "pi"] {
310
+ // A persisted legacy Claude Code / Pi / Codex / Grok worker row is no longer resumable.
311
+ for provider in ["fake", "gemini_cli", "claude", "claude_code", "pi", "codex", "grok"] {
338
312
  assert_eq!(
339
313
  decide_start_mode(provider, Some(&sid("s1")), None, true, false),
340
314
  StartMode::Noop,
@@ -603,14 +577,14 @@ fn classify_restart_plan_never_interacted_null_session_with_allow_fresh_marks_fo
603
577
  }
604
578
 
605
579
  #[test]
606
- fn classify_restart_plan_codex_with_session_still_resumes() {
607
- // E6 层2 回归锁(不误伤): codex worker first_send_at=null 但 session_id 已捕 →
580
+ fn classify_restart_plan_copilot_with_session_still_resumes() {
581
+ // E6 层2 回归锁(不误伤): copilot worker first_send_at=null 但 session_id 已捕 →
608
582
  // 仍走 Resume(分流轴是 session_id 有无,不是 interacted)。防层2 修法把 has_session 也误判。
609
583
  let ws = temp_ws();
610
- let rollout = ws.join("codex-rollout.jsonl");
584
+ let rollout = ws.join("copilot-rollout.jsonl");
611
585
  std::fs::write(&rollout, "{}\n").unwrap();
612
586
  let state = json!({
613
- "agents": { "w1": { "provider": "codex", "session_id": "sess-codex-abc", "rollout_path": rollout.to_string_lossy() } }
587
+ "agents": { "w1": { "provider": "copilot", "session_id": "sess-copilot-abc", "rollout_path": rollout.to_string_lossy() } }
614
588
  });
615
589
  let plan = classify_restart_plan(&state, false).expect("纯验证不应 Err");
616
590
  assert_eq!(plan.decisions.len(), 1);
@@ -3,6 +3,7 @@
3
3
  //! Launch/restart may spawn a pane and then ask the provider adapter to handle startup prompts.
4
4
  //! A provider-specific prompt handler panic must not unwind out of the user command and leave a
5
5
  //! half-initialized runtime. The command should still complete once the pane has been spawned.
6
+ //! Copilot is the surviving legacy worker with a startup (folder-trust) prompt handler.
6
7
 
7
8
  #[path = "../../../tests/support/hermetic.rs"]
8
9
  mod hermetic_guard;
@@ -15,6 +16,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
15
16
  use std::sync::Mutex;
16
17
 
17
18
  use serde_json::json;
19
+ use serial_test::serial;
18
20
  use team_agent::lifecycle::{launch_with_transport, restart_with_transport, RestartReport};
19
21
  use team_agent::transport::{
20
22
  AttachOutcome, BackendKind, CaptureRange, CapturedText, InjectPayload, InjectReport,
@@ -27,10 +29,12 @@ static SEQ: AtomicU32 = AtomicU32::new(0);
27
29
 
28
30
  const TEAM_MD: &str =
29
31
  "---\nname: f032team\nobjective: F032 lifecycle prompt fault probe.\nprovider: codex\n---\n\nF032.\n";
30
- const ROLE_MD: &str = "---\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.\n";
32
+ const ROLE_MD: &str = "---\nname: implementer\nrole: Implementation Engineer\nprovider: copilot\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nImplement.\n";
31
33
 
32
34
  #[test]
35
+ #[serial(env)]
33
36
  fn f032_launch_spawn_path_treats_startup_prompt_panic_as_best_effort() {
37
+ let _hermetic = hermetic_guard::HermeticTestEnv::enter("f032-launch");
34
38
  let team = compiled_team_dir("launch");
35
39
  let spec_path = team.join("team.spec.yaml");
36
40
  let transport = PanicOnStartupPromptTransport::new();
@@ -52,8 +56,10 @@ fn f032_launch_spawn_path_treats_startup_prompt_panic_as_best_effort() {
52
56
  }
53
57
 
54
58
  #[test]
59
+ #[serial(env)]
55
60
  fn f032_restart_spawn_path_treats_startup_prompt_panic_as_best_effort() {
56
- let workspace = restart_workspace("restart");
61
+ let hermetic = hermetic_guard::HermeticTestEnv::enter("f032-restart");
62
+ let workspace = restart_workspace("restart", hermetic.home());
57
63
  let transport = PanicOnStartupPromptTransport::new();
58
64
 
59
65
  let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
@@ -101,10 +107,19 @@ fn compiled_team_dir(label: &str) -> PathBuf {
101
107
  team
102
108
  }
103
109
 
104
- fn restart_workspace(label: &str) -> PathBuf {
110
+ fn restart_workspace(label: &str, home: &Path) -> PathBuf {
105
111
  let ws = compiled_team_dir(label);
106
- let rollout = ws.join("implementer-rollout.jsonl");
107
- std::fs::write(&rollout, "{}\n").expect("seed rollout backing");
112
+ // Copilot resume backing is the session-store row under $HOME/.copilot.
113
+ let db = home.join(".copilot").join("session-store.db");
114
+ std::fs::create_dir_all(db.parent().expect("session store parent"))
115
+ .expect("create copilot home");
116
+ let conn = rusqlite::Connection::open(db).expect("open copilot session store");
117
+ conn.execute_batch(
118
+ "create table if not exists sessions (id text primary key, name text, created_at text);
119
+ insert or replace into sessions(id, name, created_at)
120
+ values ('f0320000-0000-4000-8000-000000000032', 'f032', '2026-05-27T10:00:00Z');",
121
+ )
122
+ .expect("seed copilot session store");
108
123
  team_agent::state::persist::save_runtime_state(
109
124
  &ws,
110
125
  &json!({
@@ -112,9 +127,8 @@ fn restart_workspace(label: &str) -> PathBuf {
112
127
  "agents": {
113
128
  "implementer": {
114
129
  "status": "running",
115
- "provider": "codex",
116
- "session_id": "sess-impl",
117
- "rollout_path": rollout.to_string_lossy(),
130
+ "provider": "copilot",
131
+ "session_id": "f0320000-0000-4000-8000-000000000032",
118
132
  "first_send_at": "2026-05-27T10:00:00+00:00"
119
133
  }
120
134
  }
@@ -1,10 +1,7 @@
1
- //! purpose: grok 席位角色文件必须显式写 model,缺则拒绝启动
2
- //! contract: 缺 model 的 grok 角色启动失败(错误含 model 与原因);写了 model
3
- //! 则该值进入 worker argv 的 `--model <值>`;copilot 缺 model 行为不变
4
- //! boundary: 只钉 Provider::Grok 的启动契约;不改 claude/codex/copilot 路径
5
- //!
6
- //! 修之前判红(40e91fba):grok 角色缺 model 仍会成功启动(compiler 填
7
- //! 内建默认 grok-4,argv 带 `--model grok-4`,看起来完全正常)。
1
+ //! purpose: copilot 席位角色文件缺 model 时仍能正常启动
2
+ //! contract: 缺 model 的 copilot 角色启动成功并真的 spawn worker
3
+ //! boundary: legacy Grok worker runtime 已移除(grok 角色现走 grok_build 合约叶),
4
+ //! 本文件只保留 copilot 缺 model 的回归钉子
8
5
 
9
6
  #![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
10
7
 
@@ -24,80 +21,7 @@ use serial_test::serial;
24
21
  use team_agent::lifecycle::quick_start_with_transport_in_workspace;
25
22
  use team_agent::transport::test_support::OfflineTransport;
26
23
 
27
- /// An omitted Grok role model preserves the provider-native default.
28
- #[test]
29
- #[serial(env)]
30
- fn grok_role_missing_model_uses_provider_default() {
31
- let _hermetic = enter_hermetic("grok-no-model");
32
- let ws = tmp_dir("grok-no-model");
33
- super::launch_spawn::seed_healthy_coordinator(&ws);
34
- let home = tmp_dir("grok-no-model-home");
35
- seed_grok_home(&home, Some(&ws));
36
- let _guard = HomeGuard::set(&home);
37
- let team = write_role_team(
38
- &ws,
39
- "grokteam",
40
- "grok_writer",
41
- "grok",
42
- None,
43
- "Grok Writer",
44
- );
45
- let transport = OfflineTransport::new();
46
-
47
- quick_start_with_transport_in_workspace(
48
- &ws,
49
- &team,
50
- None,
51
- true,
52
- Some("grokteam"),
53
- &transport,
54
- )
55
- .expect("Grok may use its provider-native model default");
56
- let argv = first_spawn_argv(&transport);
57
- assert!(
58
- !argv.iter().any(|arg| arg == "--model"),
59
- "an omitted model must not fabricate a --model argument: {argv:?}"
60
- );
61
- }
62
-
63
- /// 2. grok 角色写了 model ⇒ 正常启动,且该值真的进 argv(`--model <值>` 相邻)。
64
- #[test]
65
- #[serial(env)]
66
- fn grok_role_explicit_model_reaches_argv() {
67
- let _hermetic = enter_hermetic("grok-explicit-model");
68
- let ws = tmp_dir("grok-with-model");
69
- super::launch_spawn::seed_healthy_coordinator(&ws);
70
- let home = tmp_dir("grok-with-model-home");
71
- seed_grok_home(&home, Some(&ws));
72
- let _guard = HomeGuard::set(&home);
73
- let team = write_role_team(
74
- &ws,
75
- "grokteam",
76
- "grok_writer",
77
- "grok",
78
- Some("grok-4.6"),
79
- "Grok Writer",
80
- );
81
- let transport = OfflineTransport::new();
82
-
83
- quick_start_with_transport_in_workspace(
84
- &ws,
85
- &team,
86
- None,
87
- true,
88
- Some("grokteam"),
89
- &transport,
90
- )
91
- .expect("grok role with explicit model must start");
92
-
93
- let argv = first_spawn_argv(&transport);
94
- assert!(
95
- argv_contains_adjacent(&argv, &["--model", "grok-4.6"]),
96
- "declared model must appear as adjacent `--model grok-4.6` in worker argv; argv={argv:?}"
97
- );
98
- }
99
-
100
- /// 3. copilot 角色缺 model ⇒ 行为不变(仍能启动,不被 grok 的硬性 model 要求误伤)。
24
+ /// copilot 角色缺 model ⇒ 行为不变(仍能启动)。
101
25
  #[test]
102
26
  #[serial(env)]
103
27
  fn copilot_role_missing_model_still_starts() {
@@ -124,7 +48,7 @@ fn copilot_role_missing_model_still_starts() {
124
48
  );
125
49
  assert!(
126
50
  result.is_ok(),
127
- "copilot role without model must keep starting; grok-only requirement leaked; err={result:?}"
51
+ "copilot role without model must keep starting; err={result:?}"
128
52
  );
129
53
  let argv = first_spawn_argv(&transport);
130
54
  assert!(
@@ -142,14 +66,6 @@ fn first_spawn_argv(transport: &OfflineTransport) -> Vec<String> {
142
66
  records[0].1.clone()
143
67
  }
144
68
 
145
- fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
146
- if needle.is_empty() {
147
- return true;
148
- }
149
- hay.windows(needle.len())
150
- .any(|window| window.iter().map(String::as_str).eq(needle.iter().copied()))
151
- }
152
-
153
69
  fn write_role_team(
154
70
  ws: &Path,
155
71
  team_key: &str,
@@ -181,40 +97,6 @@ fn write_role_team(
181
97
  team
182
98
  }
183
99
 
184
- fn seed_grok_home(home: &Path, trusted_cwd: Option<&Path>) {
185
- let grok = home.join(".grok");
186
- std::fs::create_dir_all(&grok).unwrap();
187
- std::fs::write(grok.join("auth.json"), r#"{"test":"ok"}"#).unwrap();
188
- if let Some(cwd) = trusted_cwd {
189
- std::fs::write(
190
- grok.join("trusted_folders.toml"),
191
- format!("[folders.\"{}\"]\ntrusted = true\n", cwd.display()),
192
- )
193
- .unwrap();
194
- }
195
- }
196
-
197
- struct HomeGuard {
198
- prev: Option<String>,
199
- }
200
-
201
- impl HomeGuard {
202
- fn set(home: &Path) -> Self {
203
- let prev = std::env::var("HOME").ok();
204
- std::env::set_var("HOME", home);
205
- Self { prev }
206
- }
207
- }
208
-
209
- impl Drop for HomeGuard {
210
- fn drop(&mut self) {
211
- match &self.prev {
212
- Some(value) => std::env::set_var("HOME", value),
213
- None => std::env::remove_var("HOME"),
214
- }
215
- }
216
- }
217
-
218
100
  fn tmp_dir(tag: &str) -> PathBuf {
219
101
  static N: AtomicU64 = AtomicU64::new(0);
220
102
  let dir = std::env::temp_dir().join(format!(
@@ -12,7 +12,6 @@ fn _hermetic_boundary_marker(_: &hermetic_guard::HermeticTestEnv) {}
12
12
 
13
13
  use std::collections::{BTreeMap, BTreeSet};
14
14
  use std::fs;
15
- use std::io::Write;
16
15
  use std::os::unix::fs::PermissionsExt;
17
16
  use std::path::{Path, PathBuf};
18
17
  use std::sync::{Arc, Mutex};
@@ -30,7 +29,7 @@ use team_agent::message_store::MessageStore;
30
29
  use team_agent::model::enums::{PaneLiveness, Provider};
31
30
  use team_agent::model::ids::AgentId;
32
31
  use team_agent::model::paths::{runtime_dir, runtime_spec_path};
33
- use team_agent::provider::{get_adapter, CaptureSessionContext, ProviderAdapter};
32
+ use team_agent::provider::{get_adapter, ProviderAdapter};
34
33
  use team_agent::state::persist::{load_runtime_state, save_runtime_state};
35
34
  use team_agent::transport::{
36
35
  AttachOutcome, BackendKind, CaptureRange, CapturedText, InjectPayload, InjectReport,
@@ -458,60 +457,16 @@ fn start_agent_list_targets_failure_refuses_before_spawn() {
458
457
  }
459
458
 
460
459
  #[test]
461
- #[serial(env)]
462
- fn codex_capture_rejects_old_rollout_with_new_mtime_and_uses_typed_claim_keys() {
463
- let env = hermetic_guard::HermeticTestEnv::enter("p0-capture");
464
- let spawn_cwd = env.workspace("spawn-cwd");
465
- let rollout = write_old_codex_rollout(env.home(), &spawn_cwd);
466
- fs::OpenOptions::new()
467
- .append(true)
468
- .open(&rollout)
469
- .unwrap()
470
- .write_all(b"{\"type\":\"event\",\"payload\":{\"append\":\"after spawn\"}}\n")
471
- .unwrap();
472
-
473
- let context = CaptureSessionContext {
474
- agent_id: "developer".to_string(),
475
- spawn_cwd: spawn_cwd.clone(),
476
- pane_id: Some("%42".to_string()),
477
- pane_pid: Some(4242),
478
- spawned_at: Some("2026-01-02T00:00:00+00:00".to_string()),
479
- expected_session_id: None,
480
- provider_projects_root: None,
481
- };
482
- let candidates = get_adapter(Provider::Codex)
483
- .capture_session_candidates(&context, 0)
484
- .expect("scan codex candidates");
485
-
460
+ fn session_capture_claim_keys_are_typed_not_bare_strings() {
486
461
  let capture_src = include_str!(concat!(
487
462
  env!("CARGO_MANIFEST_DIR"),
488
463
  "/src/provider/session/capture.rs"
489
464
  ));
490
- let mut failures = Vec::new();
491
- if candidates.iter().any(|candidate| {
492
- candidate
493
- .captured
494
- .rollout_path
495
- .as_ref()
496
- .is_some_and(|path| path.as_path() == rollout)
497
- }) {
498
- failures.push(format!(
499
- "old rollout was accepted as a fresh candidate: filename/created_at predate spawn, only mutable mtime is new; candidates={candidates:?}"
500
- ));
501
- }
502
- if !capture_src.contains("SessionAttributionKey")
503
- || capture_src.contains("format!(\"session:{}\"")
504
- || capture_src.contains("format!(\"rollout:{}\"")
505
- {
506
- failures.push(
507
- "claimed/captured keys must be typed by provider+team_key+agent_id(+session/rollout), not bare session:/rollout: strings".to_string(),
508
- );
509
- }
510
-
511
465
  assert!(
512
- failures.is_empty(),
513
- "P0 capture contract failed:\n{}",
514
- failures.join("\n")
466
+ capture_src.contains("SessionAttributionKey")
467
+ && !capture_src.contains("format!(\"session:{}\"")
468
+ && !capture_src.contains("format!(\"rollout:{}\""),
469
+ "P0 capture contract: claimed/captured keys must be typed by provider+team_key+agent_id(+session/rollout), not bare session:/rollout: strings"
515
470
  );
516
471
  }
517
472
 
@@ -548,7 +503,7 @@ fn abnormal_shell_pane_with_live_delivery_is_not_dead_and_dedupe_ignores_size()
548
503
  "agents": {
549
504
  "architect": {
550
505
  "status": "running",
551
- "provider": "codex",
506
+ "provider": "copilot",
552
507
  "agent_id": "architect",
553
508
  "window": "architect",
554
509
  "pane_id": "%old-architect",
@@ -618,10 +573,10 @@ fn abnormal_shell_pane_with_live_delivery_is_not_dead_and_dedupe_ignores_size()
618
573
 
619
574
  #[test]
620
575
  #[serial(env)]
621
- fn status_model_uses_effective_codex_source_not_stale_claude_state() {
576
+ fn status_model_uses_effective_copilot_source_not_stale_claude_state() {
622
577
  let (_env, workspace) = team_case_with_model("p0-status", &[("developer", "gpt-5.6-sol")]);
623
578
  let mut state = load_runtime_state(&workspace).unwrap();
624
- state["agents"]["developer"]["provider"] = json!("codex");
579
+ state["agents"]["developer"]["provider"] = json!("copilot");
625
580
  state["agents"]["developer"]["model"] = json!("claude-opus-4-7");
626
581
  save_runtime_state(&workspace, &state).unwrap();
627
582
 
@@ -633,7 +588,7 @@ fn status_model_uses_effective_codex_source_not_stale_claude_state() {
633
588
  let model_source = agent.get("model_source").and_then(Value::as_str);
634
589
  assert!(
635
590
  model == Some("gpt-5.6-sol") || model_stale || model_source == Some("role"),
636
- "P0 provider/model projection: Codex seat must not render stale Claude model as truth; agent={agent} status={status}"
591
+ "P0 provider/model projection: Copilot seat must not render stale Claude model as truth; agent={agent} status={status}"
637
592
  );
638
593
  }
639
594
 
@@ -653,6 +608,7 @@ fn team_case_with_model(
653
608
  write_team_docs(&workspace, workers);
654
609
  write_runtime_spec(&workspace);
655
610
  seed_state(&workspace, workers);
611
+ seed_copilot_session_store(env.home(), workers);
656
612
  seed_healthy_coordinator(&workspace);
657
613
  (env, workspace)
658
614
  }
@@ -661,7 +617,7 @@ fn write_team_docs(workspace: &Path, workers: &[(&str, &str)]) {
661
617
  fs::create_dir_all(workspace.join("agents")).unwrap();
662
618
  fs::write(workspace.join("TEAM.md"), "---\nname: current\nobjective: P0 host co-tenant contract.\nprovider: codex\n---\n").unwrap();
663
619
  for (worker, model) in workers {
664
- let role = format!("---\nname: {worker}\nrole: {worker}\nprovider: codex\nmodel: {model}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\n{worker}.\n");
620
+ let role = format!("---\nname: {worker}\nrole: {worker}\nprovider: copilot\nmodel: {model}\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\n{worker}.\n");
665
621
  fs::write(workspace.join("agents").join(format!("{worker}.md")), role).unwrap();
666
622
  }
667
623
  }
@@ -679,7 +635,7 @@ fn seed_state(workspace: &Path, workers: &[(&str, &str)]) {
679
635
  let agents = workers
680
636
  .iter()
681
637
  .map(|(worker, model)| ((*worker).to_string(), json!({
682
- "status": "running", "provider": "codex", "agent_id": worker, "role": worker,
638
+ "status": "running", "provider": "copilot", "agent_id": worker, "role": worker,
683
639
  "model": model, "auth_mode": "subscription", "tools": ["mcp_team"],
684
640
  "window": worker, "pane_id": format!("%old-{worker}"), "pane_pid": 10_000,
685
641
  "owner_team_id": TEAM,
@@ -708,16 +664,23 @@ fn seed_healthy_coordinator(workspace: &Path) {
708
664
  fs::write(coordinator_pid_path(&workspace), pid.to_string()).unwrap();
709
665
  }
710
666
 
711
- fn write_old_codex_rollout(home: &Path, spawn_cwd: &Path) -> PathBuf {
712
- let dir = home.join(".codex/sessions/2026/01/01");
713
- fs::create_dir_all(&dir).unwrap();
714
- let rollout = dir.join("rollout-2026-01-01T00-00-00-old.jsonl");
715
- let meta = json!({"type": "session_meta", "payload": {
716
- "id": "old-session-before-spawn", "cwd": spawn_cwd.to_string_lossy(),
717
- "created_at": "2026-01-01T00:00:00+00:00"
718
- }});
719
- fs::write(&rollout, format!("{meta}\n{}\n", json!({"type": "event", "payload": {"message": "old rollout"}}))).unwrap();
720
- rollout
667
+ /// Copilot resume backing is the `sessions` row in the hermetic
668
+ /// `$HOME/.copilot/session-store.db`.
669
+ fn seed_copilot_session_store(home: &Path, workers: &[(&str, &str)]) {
670
+ let db = home.join(".copilot").join("session-store.db");
671
+ fs::create_dir_all(db.parent().unwrap()).unwrap();
672
+ let conn = rusqlite::Connection::open(db).unwrap();
673
+ conn.execute_batch(
674
+ "create table if not exists sessions (id text primary key, cwd text, created_at text);",
675
+ )
676
+ .unwrap();
677
+ for (worker, _) in workers {
678
+ conn.execute(
679
+ "insert or replace into sessions(id, cwd, created_at) values (?1, ?2, '2026-01-01T00:00:00Z')",
680
+ rusqlite::params![format!("sess-{worker}"), home.to_string_lossy()],
681
+ )
682
+ .unwrap();
683
+ }
721
684
  }
722
685
 
723
686
  #[derive(Clone)]
@@ -1,45 +1,17 @@
1
- //! Issue #238 lifecycle-side contracts for persisted/recovered effort and Pi
2
- //! leader argument admission. This module deliberately calls the same
1
+ //! Issue #238 lifecycle-side contracts for effort admission and Pi leader
2
+ //! argument admission. This module deliberately calls the same
3
3
  //! lifecycle helpers used by spawn/restart instead of duplicating resolution.
4
4
 
5
5
  #![allow(clippy::expect_used, clippy::panic, clippy::unwrap_used)]
6
6
 
7
- use crate::lifecycle::launch::{
8
- provider_effort_for_spawn, provider_effort_for_spawn_json, provider_effort_from_raw,
9
- };
10
7
  use crate::lifecycle::launch::pi_mcp::parse_pi_leader_args;
8
+ use crate::lifecycle::launch::provider_effort_from_raw;
11
9
  use crate::model::enums::{Provider, ProviderEffort};
12
- use crate::model::yaml::Value as Yaml;
13
- use serde_json::json;
14
10
 
15
11
  fn args(items: &[&str]) -> Vec<String> {
16
12
  items.iter().map(|item| (*item).to_string()).collect()
17
13
  }
18
14
 
19
- #[test]
20
- fn r6_spawn_and_persisted_recovery_preserve_codex_effort_literals() {
21
- for raw in ["max", "ultra"] {
22
- let yaml_agent = Yaml::Map(vec![(
23
- "effort".to_string(),
24
- Yaml::Str(raw.to_string()),
25
- )]);
26
- let json_agent = json!({"effort": raw});
27
-
28
- let direct = provider_effort_from_raw(Some(raw), Provider::Codex)
29
- .expect("direct lifecycle resolution")
30
- .expect("Codex effort");
31
- let spawned = provider_effort_for_spawn(&yaml_agent, Provider::Codex)
32
- .expect("YAML spawn resolution")
33
- .expect("spawned Codex effort");
34
- let recovered = provider_effort_for_spawn_json(&json_agent, Provider::Codex)
35
- .expect("JSON recovery resolution")
36
- .expect("recovered Codex effort");
37
- assert_eq!(direct.as_str(), raw);
38
- assert_eq!(spawned.as_str(), raw);
39
- assert_eq!(recovered.as_str(), raw);
40
- }
41
- }
42
-
43
15
  #[test]
44
16
  fn r6_unsupported_ultra_is_not_silently_dropped_on_legacy_provider() {
45
17
  let error = provider_effort_from_raw(Some("ultra"), Provider::Fake)