@team-agent/installer 0.5.126 → 0.5.128

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 (187) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/README.md +11 -0
  4. package/crates/team-agent/src/cli/adapters.rs +3 -13
  5. package/crates/team-agent/src/cli/arguments.rs +4 -0
  6. package/crates/team-agent/src/cli/diagnose.rs +68 -91
  7. package/crates/team-agent/src/cli/emit.rs +61 -28
  8. package/crates/team-agent/src/cli/grok_slot.rs +88 -3
  9. package/crates/team-agent/src/cli/intent/runtime.rs +38 -9
  10. package/crates/team-agent/src/cli/intent/runtime_tests.rs +147 -11
  11. package/crates/team-agent/src/cli/intent/tests.rs +10 -12
  12. package/crates/team-agent/src/cli/intent.rs +1 -1
  13. package/crates/team-agent/src/cli/mod.rs +38 -9
  14. package/crates/team-agent/src/cli/models.rs +789 -186
  15. package/crates/team-agent/src/cli/schedule.rs +175 -0
  16. package/crates/team-agent/src/cli/send/persist.rs +0 -36
  17. package/crates/team-agent/src/cli/send/presentation.rs +1 -1
  18. package/crates/team-agent/src/cli/send.rs +108 -110
  19. package/crates/team-agent/src/cli/spec.rs +6 -0
  20. package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
  21. package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
  22. package/crates/team-agent/src/cli/tests/mod.rs +3 -3
  23. package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
  24. package/crates/team-agent/src/cli/tests/run_delegation.rs +12 -9
  25. package/crates/team-agent/src/cli/tests/status_send.rs +70 -273
  26. package/crates/team-agent/src/compiler/tests.rs +39 -27
  27. package/crates/team-agent/src/compiler.rs +206 -6
  28. package/crates/team-agent/src/contract_runtime/backend.rs +181 -11
  29. package/crates/team-agent/src/contract_runtime/commands.rs +338 -7
  30. package/crates/team-agent/src/contract_runtime/config.rs +30 -19
  31. package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
  32. package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
  33. package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
  34. package/crates/team-agent/src/contract_runtime/framework.rs +28 -14
  35. package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
  36. package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
  37. package/crates/team-agent/src/contract_runtime/registry.rs +93 -130
  38. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  39. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +8 -29
  40. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  41. package/crates/team-agent/src/coordinator/tests/health_sync.rs +44 -2
  42. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  43. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  44. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  45. package/crates/team-agent/src/coordinator/tick.rs +1 -89
  46. package/crates/team-agent/src/db/message_store.rs +7 -65
  47. package/crates/team-agent/src/direct_delivery.rs +368 -0
  48. package/crates/team-agent/src/inbox_store.rs +169 -0
  49. package/crates/team-agent/src/leader/registry.rs +5 -0
  50. package/crates/team-agent/src/leader/start.rs +2 -1
  51. package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
  52. package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
  53. package/crates/team-agent/src/lib.rs +2 -0
  54. package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
  55. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
  56. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
  57. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +36 -179
  58. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
  59. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +13 -488
  60. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
  61. package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
  62. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +26 -2
  63. package/crates/team-agent/src/lifecycle/launch/spawn.rs +41 -31
  64. package/crates/team-agent/src/lifecycle/launch.rs +27 -12
  65. package/crates/team-agent/src/lifecycle/profile_launch.rs +318 -64
  66. package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
  67. package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
  68. package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
  69. package/crates/team-agent/src/lifecycle/restart/common.rs +298 -133
  70. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  71. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  72. package/crates/team-agent/src/lifecycle/restart.rs +4 -0
  73. package/crates/team-agent/src/lifecycle/role_config.rs +79 -27
  74. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  75. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  76. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
  77. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
  78. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
  79. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +329 -70
  80. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
  81. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +25 -39
  82. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
  83. package/crates/team-agent/src/lifecycle/tests/core.rs +39 -36
  84. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  85. package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
  86. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
  87. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
  88. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  89. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  90. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  91. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +164 -282
  92. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  93. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  94. package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
  95. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  96. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  97. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
  98. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
  99. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
  100. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
  101. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
  102. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
  103. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
  104. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
  105. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
  106. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +14 -15
  107. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  108. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  109. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  110. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  111. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
  112. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  113. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
  114. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  115. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
  116. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  117. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  118. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  119. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  120. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
  121. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +38 -39
  122. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +51 -88
  123. package/crates/team-agent/src/lifecycle/tests.rs +3 -4
  124. package/crates/team-agent/src/lifecycle/types.rs +18 -5
  125. package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
  126. package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
  127. package/crates/team-agent/src/mcp_server/readiness_tests.rs +86 -109
  128. package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
  129. package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
  130. package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
  131. package/crates/team-agent/src/mcp_server/tools.rs +70 -196
  132. package/crates/team-agent/src/messaging/delivery.rs +143 -253
  133. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  134. package/crates/team-agent/src/messaging/helpers.rs +1 -19
  135. package/crates/team-agent/src/messaging/mod.rs +1 -0
  136. package/crates/team-agent/src/messaging/reminders.rs +316 -0
  137. package/crates/team-agent/src/messaging/scheduler.rs +7 -1
  138. package/crates/team-agent/src/messaging/tests/dup_inject.rs +255 -150
  139. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  140. package/crates/team-agent/src/messaging/tests/runtime.rs +9 -115
  141. package/crates/team-agent/src/messaging/tests/spine.rs +44 -24
  142. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  143. package/crates/team-agent/src/messaging/types.rs +1 -0
  144. package/crates/team-agent/src/provider/adapter.rs +208 -254
  145. package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
  146. package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
  147. package/crates/team-agent/src/provider/adapters/mod.rs +7 -7
  148. package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
  149. package/crates/team-agent/src/provider/classify.rs +1 -66
  150. package/crates/team-agent/src/provider/model_catalog.rs +201 -13
  151. package/crates/team-agent/src/provider/session/capture.rs +111 -111
  152. package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
  153. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +10 -18
  154. package/crates/team-agent/src/provider/session/context_fork.rs +87 -74
  155. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  156. package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
  157. package/crates/team-agent/src/provider/session_scan/common.rs +47 -47
  158. package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
  159. package/crates/team-agent/src/provider/session_scan.rs +13 -13
  160. package/crates/team-agent/src/provider/tests/adapter.rs +127 -121
  161. package/crates/team-agent/src/provider/tests/classify.rs +0 -53
  162. package/crates/team-agent/src/provider/tests/command_helpers.rs +11 -19
  163. package/crates/team-agent/src/provider/tests/idle.rs +13 -19
  164. package/crates/team-agent/src/provider/types.rs +0 -4
  165. package/crates/team-agent/src/provider/wire.rs +34 -20
  166. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  167. package/crates/team-agent/src/state/persist.rs +6 -6
  168. package/crates/team-agent/src/state/projection.rs +1 -1
  169. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  170. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
  171. package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
  172. package/crates/team-agent/src/tmux_backend.rs +9 -43
  173. package/package.json +4 -4
  174. package/skills/team-agent/SKILL.md +7 -8
  175. package/skills/team-agent/command-coverage.json +15 -1
  176. package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
  177. package/skills/team-agent/references/team-agent-operator.md +5 -3
  178. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  179. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  180. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  181. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  182. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  183. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  184. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  185. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  186. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  187. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
@@ -1,9 +1,10 @@
1
1
  //! Provider model discovery, bounded native catalog queries, and shared fuzzy search.
2
- use std::collections::HashSet;
2
+ use std::collections::{HashMap, HashSet};
3
3
  use std::ffi::OsString;
4
4
  use std::io::{Read, Write};
5
- use std::path::Path;
5
+ use std::path::{Path, PathBuf};
6
6
  use std::process::{Child, Command, ExitStatus, Stdio};
7
+ use std::sync::atomic::{AtomicU64, Ordering};
7
8
  use std::sync::mpsc;
8
9
  use std::time::{Duration, Instant};
9
10
 
@@ -12,6 +13,8 @@ use crate::provider::wire::{parse_canonical_provider, provider_wire};
12
13
 
13
14
  const CATALOG_TIMEOUT: Duration = Duration::from_secs(10);
14
15
  const MAX_CATALOG_BYTES: u64 = 1024 * 1024;
16
+ const CLAUDE_REQUEST_ID: &str = "team-agent-model-catalog";
17
+ static TEMP_DIR_SEQUENCE: AtomicU64 = AtomicU64::new(0);
15
18
 
16
19
  #[derive(Clone, Debug, Eq, PartialEq)]
17
20
  pub struct ModelRecord {
@@ -127,23 +130,20 @@ pub fn parse_catalog_provider(name: &str) -> Option<Provider> {
127
130
 
128
131
  #[derive(Clone, Copy)]
129
132
  enum CatalogSource {
133
+ Pi,
130
134
  Codex,
131
135
  Grok,
136
+ Claude,
132
137
  }
133
138
 
134
139
  // Exhaustive by design: a new Provider variant must make an explicit catalog decision.
135
- // `team-agent models --provider claude|claude_code|pi` reads the contract
136
- // leaf's catalog (contract_runtime::discovery) before reaching this table.
137
140
  fn catalog_source(provider: Provider) -> Option<CatalogSource> {
138
141
  match provider {
142
+ Provider::Pi => Some(CatalogSource::Pi),
139
143
  Provider::Codex => Some(CatalogSource::Codex),
144
+ Provider::Claude | Provider::ClaudeCode => Some(CatalogSource::Claude),
140
145
  Provider::Grok => Some(CatalogSource::Grok),
141
- Provider::Claude
142
- | Provider::ClaudeCode
143
- | Provider::Pi
144
- | Provider::Copilot
145
- | Provider::GeminiCli
146
- | Provider::Fake => None,
146
+ Provider::Copilot | Provider::GeminiCli | Provider::Fake => None,
147
147
  }
148
148
  }
149
149
 
@@ -152,6 +152,10 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
152
152
  let source = catalog_source(provider).ok_or(CatalogError::UnsupportedProvider)?;
153
153
  let requested_provider = provider_wire(provider);
154
154
  let records = match source {
155
+ CatalogSource::Pi => {
156
+ let bytes = run_native("pi", &["--list-models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
157
+ parse_pi_catalog(&bytes)?
158
+ }
155
159
  CatalogSource::Codex => {
156
160
  let bytes = run_native("codex", &["debug", "models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
157
161
  parse_codex_catalog(&bytes, requested_provider)?
@@ -160,6 +164,7 @@ pub fn discover_model_catalog(provider_name: &str) -> Result<Vec<ModelRecord>, C
160
164
  let bytes = run_native("grok", &["models"], None, None, &[], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
161
165
  parse_grok_catalog(&bytes)?
162
166
  }
167
+ CatalogSource::Claude => discover_claude_catalog(requested_provider)?,
163
168
  };
164
169
  Ok(records)
165
170
  }
@@ -350,6 +355,90 @@ fn parse_codex_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>,
350
355
  Ok(visible)
351
356
  }
352
357
 
358
+ fn discover_claude_catalog(provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
359
+ let cwd = OwnedTempDir::create()?;
360
+ let args = [
361
+ "--print", "--input-format", "stream-json", "--output-format", "stream-json", "--verbose",
362
+ "--no-session-persistence", "--strict-mcp-config", "--mcp-config", r#"{"mcpServers":{}}"#,
363
+ "--setting-sources", "", "--settings", r#"{"disableAllHooks":true}"#, "--tools", "", "--no-chrome",
364
+ ];
365
+ let request = serde_json::json!({"type":"control_request","request_id":CLAUDE_REQUEST_ID,"request":{"subtype":"initialize","hooks":{},"agents":{},"skills":[]}});
366
+ let mut input = serde_json::to_vec(&request).map_err(|_| CatalogError::InvalidProtocol)?;
367
+ input.push(b'\n');
368
+ let bytes = run_native("claude", &args, Some(&input), Some(&cwd.0), &["CLAUDECODE"], CATALOG_TIMEOUT, MAX_CATALOG_BYTES, &mut NoopObserver)?;
369
+ parse_claude_catalog(&bytes, provider)
370
+ }
371
+
372
+ fn parse_claude_catalog(bytes: &[u8], provider: &str) -> Result<Vec<ModelRecord>, CatalogError> {
373
+ let text = std::str::from_utf8(bytes).map_err(|_| CatalogError::InvalidUtf8)?;
374
+ let mut response = None;
375
+ for line in text.lines() {
376
+ if line.is_empty() { return Err(CatalogError::InvalidProtocol); }
377
+ let frame: serde_json::Value = serde_json::from_str(line).map_err(|_| CatalogError::InvalidProtocol)?;
378
+ let frame_type = frame
379
+ .get("type")
380
+ .and_then(serde_json::Value::as_str)
381
+ .filter(|frame_type| !frame_type.is_empty())
382
+ .ok_or(CatalogError::InvalidProtocol)?;
383
+ if frame_type != "control_response" {
384
+ continue;
385
+ }
386
+ if response.is_some() {
387
+ return Err(CatalogError::InvalidProtocol);
388
+ }
389
+ let result = frame.get("response").ok_or(CatalogError::UnsupportedSchema)?;
390
+ let outer_request_id = frame.get("request_id").and_then(serde_json::Value::as_str);
391
+ let inner_request_id = result.get("request_id").and_then(serde_json::Value::as_str);
392
+ if (outer_request_id != Some(CLAUDE_REQUEST_ID) && inner_request_id != Some(CLAUDE_REQUEST_ID))
393
+ || frame.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
394
+ || result.get("request_id").is_some_and(|id| id.as_str() != Some(CLAUDE_REQUEST_ID))
395
+ {
396
+ return Err(CatalogError::InvalidProtocol);
397
+ }
398
+ if result.get("subtype").and_then(serde_json::Value::as_str) != Some("success") { return Err(CatalogError::InvalidProtocol); }
399
+ let rows = result.get("response").and_then(|v| v.get("models")).and_then(serde_json::Value::as_array).ok_or(CatalogError::UnsupportedSchema)?;
400
+ response = Some(rows.clone());
401
+ }
402
+ let rows = response.ok_or(CatalogError::InvalidProtocol)?;
403
+ if rows.is_empty() { return Err(CatalogError::Empty); }
404
+ let mut source_values = HashSet::new();
405
+ let mut by_id = HashMap::<String, usize>::new();
406
+ let mut records: Vec<ModelRecord> = Vec::new();
407
+ let mut group_defaults = Vec::<bool>::new();
408
+ let mut group_has_non_default_display = Vec::<bool>::new();
409
+ let mut any_default = false;
410
+ for row in rows {
411
+ let row = row.as_object().ok_or(CatalogError::Malformed)?;
412
+ let value = required_string(row.get("value"))?;
413
+ let resolved = required_string(row.get("resolvedModel")).map_err(|_| CatalogError::UnsupportedSchema)?;
414
+ let display = required_string(row.get("displayName")).map_err(|_| CatalogError::UnsupportedSchema)?;
415
+ validate_identity(value)?;
416
+ validate_identity(resolved)?;
417
+ validate_display(display)?;
418
+ if !source_values.insert(value.to_string()) { return Err(CatalogError::DuplicateIdentity(value.into())); }
419
+ let is_default = value == "default";
420
+ any_default |= is_default;
421
+ if let Some(index) = by_id.get(resolved).copied() {
422
+ let record = &mut records[index];
423
+ record.aliases.push(value.into());
424
+ if !is_default && !group_has_non_default_display[index] {
425
+ record.display_name = display.into();
426
+ group_has_non_default_display[index] = true;
427
+ }
428
+ group_defaults[index] |= is_default;
429
+ } else {
430
+ by_id.insert(resolved.into(), records.len());
431
+ records.push(ModelRecord { provider: provider.into(), vendor: "anthropic".into(), id: resolved.into(), display_name: display.into(), default: None, aliases: vec![value.into()] });
432
+ group_defaults.push(is_default);
433
+ group_has_non_default_display.push(!is_default);
434
+ }
435
+ }
436
+ for (record, is_default) in records.iter_mut().zip(group_defaults) {
437
+ record.default = any_default.then_some(is_default);
438
+ }
439
+ Ok(records)
440
+ }
441
+
353
442
  fn required_string(value: Option<&serde_json::Value>) -> Result<&str, CatalogError> {
354
443
  let value = value.and_then(serde_json::Value::as_str).ok_or(CatalogError::UnsupportedSchema)?;
355
444
  if value.trim().is_empty() { return Err(CatalogError::UnsupportedSchema); }
@@ -532,6 +621,54 @@ fn terminate(child: &mut Child, pid: u32) {
532
621
  let _ = child.wait();
533
622
  }
534
623
 
624
+ pub(crate) fn finish_stdout_after_exit(
625
+ stdout: std::process::ChildStdout,
626
+ status: ExitStatus,
627
+ timeout: Duration,
628
+ max_bytes: u64,
629
+ observer: &mut dyn CatalogObserver,
630
+ ) -> Result<Vec<u8>, CatalogError> {
631
+ if !status.success() { observer.exited(&status); return Err(CatalogError::CommandFailed); }
632
+ observer.exited(&status);
633
+ let (tx, rx) = mpsc::channel();
634
+ let reader = std::thread::Builder::new().name("model-catalog-reader".into()).spawn(move || {
635
+ let mut bytes = Vec::new();
636
+ let result = stdout.take(max_bytes.saturating_add(1)).read_to_end(&mut bytes);
637
+ let _ = tx.send(result.map(|_| bytes));
638
+ }).map_err(|_| CatalogError::OutputReadFailed)?;
639
+ let result = match rx.recv_timeout(timeout) {
640
+ Ok(Ok(bytes)) if bytes.len() as u64 <= max_bytes => Ok(bytes),
641
+ Ok(Ok(_)) => Err(CatalogError::OutputTooLarge),
642
+ Ok(Err(_)) | Err(mpsc::RecvTimeoutError::Disconnected) => Err(CatalogError::OutputReadFailed),
643
+ Err(mpsc::RecvTimeoutError::Timeout) => { observer.output_timeout(); Err(CatalogError::Timeout) }
644
+ };
645
+ if !matches!(&result, Err(CatalogError::Timeout)) { let _ = reader.join(); }
646
+ result
647
+ }
648
+
649
+ struct OwnedTempDir(PathBuf);
650
+ impl OwnedTempDir {
651
+ fn create() -> Result<Self, CatalogError> {
652
+ use std::os::unix::fs::DirBuilderExt;
653
+ let root = std::env::temp_dir();
654
+ for _ in 0..8 {
655
+ let id = TEMP_DIR_SEQUENCE.fetch_add(1, Ordering::Relaxed);
656
+ let path = root.join(format!("team-agent-claude-models-{}-{id}", std::process::id()));
657
+ let mut builder = std::fs::DirBuilder::new();
658
+ builder.mode(0o700);
659
+ match builder.create(&path) {
660
+ Ok(()) => return Ok(Self(path)),
661
+ Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => continue,
662
+ Err(_) => return Err(CatalogError::TemporaryDirectoryUnavailable),
663
+ }
664
+ }
665
+ Err(CatalogError::TemporaryDirectoryUnavailable)
666
+ }
667
+ }
668
+ impl Drop for OwnedTempDir {
669
+ fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.0); }
670
+ }
671
+
535
672
  #[cfg(all(test, unix))]
536
673
  mod command_wait_regressions {
537
674
  use super::*;
@@ -684,18 +821,20 @@ mod tests {
684
821
  #[test]
685
822
  fn provider_capability_is_explicit_and_exact() {
686
823
  for (name, provider) in [
824
+ ("pi", Provider::Pi),
687
825
  ("codex", Provider::Codex),
826
+ ("claude", Provider::Claude),
827
+ ("claude_code", Provider::ClaudeCode),
688
828
  ("grok", Provider::Grok),
689
829
  ] {
690
830
  assert_eq!(parse_catalog_provider(name), Some(provider));
691
831
  assert_eq!(provider_wire(provider), name);
692
832
  assert!(catalog_source(provider).is_some());
693
833
  }
694
- // Claude Code and Pi catalogs are read through their contract leaves.
695
- for name in ["", "cloud", "pi", "claude", "claude_code", "cursor", "cursor_agent", "agent", "claude-code", "copilot", "gemini_cli", "fake", "Pi", "CODEX", " pi", "pi ", "pi/model", "codex:model", "claude_code_extra"] {
834
+ for name in ["", "cloud", "cursor", "cursor_agent", "agent", "claude-code", "copilot", "gemini_cli", "fake", "Pi", "CODEX", " pi", "pi ", "pi/model", "codex:model", "claude_code_extra"] {
696
835
  assert_eq!(parse_catalog_provider(name), None);
697
836
  }
698
- for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Pi, Provider::Copilot, Provider::GeminiCli, Provider::Fake] {
837
+ for provider in [Provider::Copilot, Provider::GeminiCli, Provider::Fake] {
699
838
  assert!(catalog_source(provider).is_none());
700
839
  }
701
840
  }
@@ -711,6 +850,55 @@ mod tests {
711
850
  assert!(matches!(parse_codex_catalog(duplicate, "codex"), Err(CatalogError::DuplicateIdentity(_))));
712
851
  }
713
852
 
853
+ #[test]
854
+ fn claude_selectors_group_by_exact_resolved_id() {
855
+ let response = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
856
+ {"value":"default","resolvedModel":"claude-opus-5-5[1m]","displayName":"Default"},
857
+ {"value":"opus[1m]","resolvedModel":"claude-opus-5-5[1m]","displayName":"Opus 1M"},
858
+ {"value":"opus-alt","resolvedModel":"claude-opus-5-5[1m]","displayName":"Alternate display"},
859
+ {"value":"sonnet","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}
860
+ ]}}});
861
+ let bytes = format!("{}\n", response).into_bytes();
862
+ let rows = parse_claude_catalog(&bytes, "claude_code").unwrap();
863
+ assert_eq!(rows.len(), 2);
864
+ assert_eq!(rows[0].provider, "claude_code");
865
+ assert_eq!(rows[0].id, "claude-opus-5-5[1m]");
866
+ assert_eq!(rows[0].display_name, "Opus 1M");
867
+ assert_eq!(rows[0].aliases, vec!["default", "opus[1m]", "opus-alt"]);
868
+ assert_eq!(rows[0].default, Some(true));
869
+ assert_eq!(rows[1].default, Some(false));
870
+ assert!(model_matches(&rows[0], "OPUS 1M"));
871
+ }
872
+
873
+ #[test]
874
+ fn claude_ignores_other_stream_frames_and_matches_nested_request_id() {
875
+ let models = serde_json::json!([{"value":"default","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}]);
876
+ let frames = [
877
+ serde_json::json!({"type":"system","subtype":"hook_started"}),
878
+ serde_json::json!({"type":"system","subtype":"hook_response"}),
879
+ serde_json::json!({"type":"stream_event","event":{"type":"message_start"}}),
880
+ serde_json::json!({"type":"control_response","response":{"subtype":"success","request_id":CLAUDE_REQUEST_ID,"response":{"models":models}}}),
881
+ ];
882
+ let bytes = frames.iter().map(serde_json::Value::to_string).collect::<Vec<_>>().join("\n");
883
+ let rows = parse_claude_catalog(bytes.as_bytes(), "claude_code").unwrap();
884
+ assert_eq!(rows.len(), 1);
885
+ assert_eq!(rows[0].id, "claude-sonnet-5");
886
+
887
+ let conflicting = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","request_id":"wrong-id","response":{"models":[{"value":"default","resolvedModel":"claude-sonnet-5","displayName":"Sonnet"}]}}});
888
+ assert!(matches!(parse_claude_catalog(format!("{}\n", conflicting).as_bytes(), "claude_code"), Err(CatalogError::InvalidProtocol)));
889
+ }
890
+
891
+ #[test]
892
+ fn claude_missing_canonical_id_and_duplicate_selectors_fail_closed() {
893
+ let missing = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[{"value":"default","displayName":"Default"}]}}});
894
+ assert!(matches!(parse_claude_catalog(format!("{}\n", missing).as_bytes(), "claude"), Err(CatalogError::UnsupportedSchema)));
895
+ let duplicate = serde_json::json!({"type":"control_response","request_id":CLAUDE_REQUEST_ID,"response":{"subtype":"success","response":{"models":[
896
+ {"value":"opus","resolvedModel":"claude-opus","displayName":"Opus"},
897
+ {"value":"opus","resolvedModel":"claude-opus[1m]","displayName":"Opus 1M"}
898
+ ]}}});
899
+ assert!(matches!(parse_claude_catalog(format!("{}\n", duplicate).as_bytes(), "claude"), Err(CatalogError::DuplicateIdentity(_))));
900
+ }
901
+
714
902
  #[test]
715
903
  fn matcher_uses_and_tokens_and_all_catalog_fields() {
716
904
  let row = ModelRecord { provider: "codex".into(), vendor: "openai".into(), id: "gpt-6-luna".into(), display_name: "GPT Luna".into(), default: None, aliases: vec![] };
@@ -626,7 +626,7 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
626
626
  /// params:
627
627
  /// workspace: event log 所在工作区
628
628
  /// agent_id: 目标席位;事件的 agent_id 或 worker_id 命中即算该席位
629
- /// previous: 修复前的 agent 行
629
+ /// previous: 修复前的 agent 行;provider 字段决定要不要套 claude leader-marker 过滤
630
630
  /// adapter: 用于二次确认候选会话确实可 resume
631
631
  /// auth_mode: 传给 session_is_resumable 的鉴权模式
632
632
  /// exclude_session_ids: 调用方给出的黑名单(例如刚被判为不可用的会话)
@@ -640,7 +640,7 @@ pub fn incomplete_resumable_agent_ids(state: &Value) -> Vec<String> {
640
640
  /// - 只读 event log 与 rollout 路径存在性,不扫 provider 存档、不调分配器
641
641
  /// - 不走分配器的 claimed-key 冲突检查,只看 exclude_session_ids 与 tombstone
642
642
  /// - rollout_path 存在性用 exists()——对目录型 backing(grok)只要目录在就为真
643
- /// - 遗留 claude/pi worker 行由 adapter 判为不可 resume,修复不会落到它们身上
643
+ /// - claude 家族额外过滤 leader-marker transcript;其它 provider 无等价归属过滤
644
644
  /// - 修复成功会清掉 attribution_ambiguous 标记
645
645
  /// ---
646
646
  pub fn recover_resume_session_from_events(
@@ -651,6 +651,13 @@ pub fn recover_resume_session_from_events(
651
651
  auth_mode: crate::provider::AuthMode,
652
652
  exclude_session_ids: &BTreeSet<String>,
653
653
  ) -> Result<Option<Value>, ProviderError> {
654
+ // E57 postflight: read the agent's provider once; needed for the Claude
655
+ // leader-marker filter below. Falls back to None on non-string / missing,
656
+ // in which case the marker filter is skipped (only meaningful for Claude).
657
+ let provider = previous
658
+ .get("provider")
659
+ .and_then(Value::as_str)
660
+ .and_then(parse_provider);
654
661
  let events = crate::event_log::EventLog::new(workspace)
655
662
  .tail(0)
656
663
  .map_err(|e| ProviderError::Io(e.to_string()))?;
@@ -680,6 +687,23 @@ pub fn recover_resume_session_from_events(
680
687
  let Some(rollout_path) = event_rollout_path(event).filter(|path| path.exists()) else {
681
688
  continue;
682
689
  };
690
+ // E57 postflight (lane-046-capture-gap): the capture allocator already
691
+ // refuses Claude leader transcripts (P0 d39b5104,
692
+ // provider/session_scan/claude.rs leader marker). Event-log
693
+ // repair must apply the SAME filter — otherwise a stale `session.captured`
694
+ // event from a pre-fix run (or from a window where the allocator was
695
+ // bypassed) still pulls the 590MB leader transcript onto a worker on the
696
+ // next restart (Mac mini repro: session_id=ea059b82 reassigned to
697
+ // release-engineer via captured_via=event_log_repair). The check is
698
+ // a no-op for non-Claude providers.
699
+ if let Some(p) = provider {
700
+ if crate::provider::session_scan::rollout_path_has_claude_leader_marker(
701
+ p,
702
+ &rollout_path,
703
+ ) {
704
+ continue;
705
+ }
706
+ }
683
707
  let session = SessionId::new(session_id.to_string());
684
708
  if !adapter.session_is_resumable(Some(&session), auth_mode)? {
685
709
  continue;
@@ -876,15 +900,15 @@ mod stopped_capture_tests {
876
900
  #[test]
877
901
  fn explicit_stop_is_checked_before_adapter_or_backing_probes() {
878
902
  for row in [
879
- serde_json::json!({"status":"stopped","provider":"copilot","spawn_cwd":"/controlled"}),
880
- serde_json::json!({"status":"running","explicit_stop":true,"provider":"copilot","spawn_cwd":"/controlled"}),
881
- serde_json::json!({"status":"running","explicit_stop":"false","provider":"copilot","spawn_cwd":"/controlled"}),
903
+ serde_json::json!({"status":"stopped","provider":"pi","spawn_cwd":"/controlled"}),
904
+ serde_json::json!({"status":"running","explicit_stop":true,"provider":"pi","spawn_cwd":"/controlled"}),
905
+ serde_json::json!({"status":"running","explicit_stop":"false","provider":"pi","spawn_cwd":"/controlled"}),
882
906
  ] {
883
907
  assert!(incomplete_resumable_provider(&row, &mut |_| panic!("held seat reached adapter lookup")).is_none());
884
908
  }
885
909
  let mut calls = 0;
886
910
  let _ = incomplete_resumable_provider(
887
- &serde_json::json!({"status":"running","explicit_stop":false,"provider":"copilot","spawn_cwd":"/controlled"}),
911
+ &serde_json::json!({"status":"running","explicit_stop":false,"provider":"pi","spawn_cwd":"/controlled"}),
888
912
  &mut |provider| { calls += 1; crate::provider::get_adapter(provider) },
889
913
  );
890
914
  assert_eq!(calls, 1, "active control must still be eligible for capture");
@@ -2192,7 +2216,7 @@ mod u1_tests {
2192
2216
  #[test]
2193
2217
  fn canonical_pending_capture_preserves_legacy_missing_boundary() {
2194
2218
  let agent = serde_json::json!({
2195
- "provider": "codex",
2219
+ "provider": "copilot",
2196
2220
  "status": "running",
2197
2221
  "spawn_cwd": "/tmp/u1-cwd",
2198
2222
  "capture_state": "pending_first_turn"
@@ -2203,113 +2227,13 @@ mod u1_tests {
2203
2227
  assert_eq!(pending.context.spawned_at, None);
2204
2228
  }
2205
2229
 
2206
- #[test]
2207
- fn canonical_delayed_capture_rejects_prior_round_codex_rollout() {
2208
- let dir =
2209
- std::env::temp_dir().join(format!("ta-delayed-stale-codex-{}", std::process::id()));
2210
- let _ = std::fs::remove_dir_all(&dir);
2211
- std::fs::create_dir_all(&dir).unwrap();
2212
- let stale =
2213
- dir.join("rollout-2026-07-21T23-18-28-019f8541-c986-7f50-b9e6-6503c89df98c.jsonl");
2214
- std::fs::write(
2215
- &stale,
2216
- format!(
2217
- "{{\"session_meta\":{{\"payload\":{{\"id\":\"019f8541-c986-7f50-b9e6-6503c89df98c\",\"cwd\":\"{}\",\"created_at\":\"2026-07-21T23:18:28+00:00\"}}}}}}\n",
2218
- dir.to_string_lossy()
2219
- ),
2220
- )
2221
- .unwrap();
2222
- let mut state = serde_json::json!({
2223
- "agents": {
2224
- "clone": {
2225
- "provider": "codex",
2226
- "status": "running",
2227
- "spawn_cwd": dir.to_string_lossy(),
2228
- "spawned_at": "2026-07-22T02:12:27+00:00",
2229
- "capture_state": "pending_first_turn"
2230
- }
2231
- }
2232
- });
2233
- let mut adapter_for = crate::provider::get_adapter;
2234
-
2235
- let report = capture_missing_provider_sessions_once(&mut state, &mut adapter_for, true, 0)
2236
- .expect("delayed capture pass");
2237
-
2238
- assert!(report.assigned.is_empty());
2239
- assert!(state["agents"]["clone"]["session_id"].is_null());
2240
- assert_ne!(
2241
- state["agents"]["clone"]["capture_state"],
2242
- serde_json::json!("captured")
2243
- );
2244
- let _ = std::fs::remove_dir_all(&dir);
2245
- }
2246
-
2247
- #[test]
2248
- fn canonical_delayed_capture_ignores_active_foreign_cwd_rollouts() {
2249
- use std::io::Write;
2250
-
2251
- let root =
2252
- std::env::temp_dir().join(format!("ta-codex-dirty-domain-{}", std::process::id()));
2253
- let _ = std::fs::remove_dir_all(&root);
2254
- let current_cwd = root.join("current");
2255
- let foreign_cwd = root.join("foreign");
2256
- std::fs::create_dir_all(&current_cwd).unwrap();
2257
- std::fs::create_dir_all(&foreign_cwd).unwrap();
2258
- let stale_current = current_cwd.join(
2259
- "cache/current/rollout-2026-07-21T23-18-28-019f8541-c986-7f50-b9e6-6503c89df98c.jsonl",
2260
- );
2261
- let fresh_foreign = current_cwd.join(
2262
- "cache/foreign/rollout-2026-07-22T04-01-00-019f8644-7060-7000-8000-000000000001.jsonl",
2263
- );
2264
- let fresh_current = current_cwd.join(
2265
- "cache/current/rollout-2026-07-22T04-01-01-019f8644-7450-7000-8000-000000000002.jsonl",
2266
- );
2267
- let write_rollout = |path: &std::path::Path, cwd: &std::path::Path, id: &str| {
2268
- std::fs::create_dir_all(path.parent().unwrap()).unwrap();
2269
- std::fs::write(
2270
- path,
2271
- format!(
2272
- "{{\"type\":\"session_meta\",\"payload\":{{\"id\":\"{id}\",\"cwd\":\"{}\"}}}}\n",
2273
- cwd.to_string_lossy()
2274
- ),
2275
- )
2276
- .unwrap();
2277
- };
2278
- write_rollout(&stale_current, &current_cwd, "stale-current");
2279
- write_rollout(&fresh_foreign, &foreign_cwd, "fresh-foreign");
2280
- write_rollout(&fresh_current, &current_cwd, "fresh-current");
2281
- std::fs::OpenOptions::new()
2282
- .append(true)
2283
- .open(&stale_current)
2284
- .unwrap()
2285
- .write_all(b"{\"type\":\"event_msg\"}\n")
2286
- .unwrap();
2287
- let mut state = serde_json::json!({
2288
- "agents": {"clone": {
2289
- "provider": "codex", "status": "running",
2290
- "spawn_cwd": current_cwd.to_string_lossy(),
2291
- "spawned_at": "2026-07-21T20:00:00+00:00",
2292
- "capture_state": "pending_first_turn"
2293
- }}
2294
- });
2295
- let mut adapter_for = crate::provider::get_adapter;
2296
-
2297
- let report = capture_missing_provider_sessions_once(&mut state, &mut adapter_for, true, 0)
2298
- .expect("canonical delayed capture");
2299
-
2300
- assert_eq!(report.candidate_count_by_agent.get("clone"), Some(&1));
2301
- assert_eq!(state["agents"]["clone"]["session_id"], "fresh-current");
2302
- assert_eq!(state["agents"]["clone"]["capture_state"], "captured");
2303
- let _ = std::fs::remove_dir_all(&root);
2304
- }
2305
-
2306
2230
  #[test]
2307
2231
  fn existing_team_session_is_rejected_while_fresh_candidate_is_accepted() {
2308
2232
  let mut state = serde_json::json!({
2309
2233
  "session_name": "current",
2310
2234
  "agents": {
2311
2235
  "clone": {
2312
- "provider": "codex",
2236
+ "provider": "copilot",
2313
2237
  "status": "running",
2314
2238
  "spawn_cwd": "/tmp/u1-cwd"
2315
2239
  }
@@ -2318,7 +2242,7 @@ mod u1_tests {
2318
2242
  "archived": {
2319
2243
  "agents": {
2320
2244
  "old-seat": {
2321
- "provider": "codex",
2245
+ "provider": "copilot",
2322
2246
  "session_id": "stale-session",
2323
2247
  "rollout_path": "/tmp/stale.jsonl"
2324
2248
  }
@@ -2357,12 +2281,12 @@ mod u1_tests {
2357
2281
  let mut state = serde_json::json!({
2358
2282
  "agents": {
2359
2283
  "bad": {
2360
- "provider": "codex",
2284
+ "provider": "copilot",
2361
2285
  "status": "running",
2362
2286
  "spawn_cwd": "/tmp/u1-bad"
2363
2287
  },
2364
2288
  "good": {
2365
- "provider": "codex",
2289
+ "provider": "copilot",
2366
2290
  "status": "running",
2367
2291
  "spawn_cwd": "/tmp/u1-good"
2368
2292
  }
@@ -2650,6 +2574,82 @@ mod u1_tests {
2650
2574
  let _ = std::fs::remove_dir_all(&dir);
2651
2575
  }
2652
2576
 
2577
+ /// E57 RED postflight (lane-046-capture-gap): `recover_resume_session_from_events`
2578
+ /// must refuse to repair a worker's session from a stale `session.captured`
2579
+ /// event whose rollout file is a Claude LEADER transcript
2580
+ /// (`customTitle == "claude leader"`). Without this filter, a fresh restart
2581
+ /// after a pre-fix run still pulls the leader transcript onto a worker via
2582
+ /// captured_via=event_log_repair (Mac mini evidence:
2583
+ /// resume.session_repaired session_id=ea059b82 → release-engineer).
2584
+ #[test]
2585
+ fn e57_recover_resume_refuses_claude_leader_marker_rollout() {
2586
+ use std::io::Write;
2587
+ use std::sync::atomic::{AtomicU64, Ordering};
2588
+ static COUNTER: AtomicU64 = AtomicU64::new(0);
2589
+ let uniq = COUNTER.fetch_add(1, Ordering::Relaxed);
2590
+ let workspace =
2591
+ std::env::temp_dir().join(format!("ta-e57-recover-{}-{}", std::process::id(), uniq));
2592
+ let _ = std::fs::remove_dir_all(&workspace);
2593
+ std::fs::create_dir_all(&workspace).expect("workspace");
2594
+
2595
+ // Write a leader-marker rollout file (claude TUI leader transcript).
2596
+ let rollout = workspace.join("ea059b82-leader.jsonl");
2597
+ let mut f = std::fs::File::create(&rollout).expect("rollout");
2598
+ writeln!(
2599
+ f,
2600
+ "{{\"customTitle\":\"claude leader\",\"sessionId\":\"ea059b82-c53e-4654-9590-9f3e6d46f0ca\",\"cwd\":\"/tmp/e57\"}}"
2601
+ )
2602
+ .unwrap();
2603
+ writeln!(f, "{{\"role\":\"user\",\"content\":\"hi\"}}").unwrap();
2604
+ drop(f);
2605
+
2606
+ // Write a `session.captured` event into events.jsonl pointing
2607
+ // release-engineer at the leader rollout — simulates the stale
2608
+ // pre-fix event that triggered the bug.
2609
+ let event_log = crate::event_log::EventLog::new(&workspace);
2610
+ event_log
2611
+ .write(
2612
+ "session.captured",
2613
+ serde_json::json!({
2614
+ "agent_id": "release-engineer",
2615
+ "provider": "claude",
2616
+ "session_id": "ea059b82-c53e-4654-9590-9f3e6d46f0ca",
2617
+ "rollout_path": rollout.to_string_lossy().to_string(),
2618
+ "captured_via": "fs_watch",
2619
+ }),
2620
+ )
2621
+ .expect("event write");
2622
+
2623
+ let previous = serde_json::json!({
2624
+ "provider": "claude",
2625
+ "session_id": null,
2626
+ "rollout_path": null,
2627
+ });
2628
+ let adapter = test_support::CaptureCandidatesAdapter::new(Provider::Claude, None, "");
2629
+ let exclude = BTreeSet::new();
2630
+ let result = recover_resume_session_from_events(
2631
+ &workspace,
2632
+ "release-engineer",
2633
+ &previous,
2634
+ &adapter,
2635
+ crate::provider::AuthMode::Subscription,
2636
+ &exclude,
2637
+ )
2638
+ .expect("recover call ok");
2639
+
2640
+ assert!(
2641
+ result.is_none(),
2642
+ "E57 postflight: recover_resume_session_from_events must REFUSE \
2643
+ to repair from a Claude leader-marker rollout (event_log_repair \
2644
+ cannot resurrect a stale leader-to-worker assignment); got {result:?}"
2645
+ );
2646
+
2647
+ let _ = std::fs::remove_file(&rollout);
2648
+ let _ = std::fs::remove_file(workspace.join(".team/logs/events.jsonl"));
2649
+ let _ = std::fs::remove_dir_all(workspace.join(".team"));
2650
+ let _ = std::fs::remove_dir_all(&workspace);
2651
+ }
2652
+
2653
2653
  /// S1-CAPTURE-001 (0.4.8): pending mismatch guard. When fresh-start has
2654
2654
  /// written a new `_pending_session_id` but the old authoritative
2655
2655
  /// `session_id` is still present and differs, `agent_session_complete`