@team-agent/installer 0.5.125 → 0.5.126

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/crates/team-agent/src/cli/diagnose.rs +0 -68
  4. package/crates/team-agent/src/cli/emit.rs +6 -2
  5. package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
  6. package/crates/team-agent/src/cli/mod.rs +22 -28
  7. package/crates/team-agent/src/cli/models.rs +7 -764
  8. package/crates/team-agent/src/cli/tests/mod.rs +1 -1
  9. package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
  10. package/crates/team-agent/src/compiler/tests.rs +18 -3
  11. package/crates/team-agent/src/compiler.rs +4 -203
  12. package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
  13. package/crates/team-agent/src/contract_runtime/config.rs +7 -4
  14. package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
  15. package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
  16. package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
  17. package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
  18. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
  19. package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
  20. package/crates/team-agent/src/leader/start.rs +1 -1
  21. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
  22. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
  23. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
  24. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
  25. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
  26. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
  27. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
  28. package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
  29. package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -33
  30. package/crates/team-agent/src/lifecycle/launch.rs +0 -23
  31. package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
  32. package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
  33. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  34. package/crates/team-agent/src/lifecycle/restart.rs +0 -2
  35. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
  36. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
  37. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +22 -138
  38. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
  39. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
  40. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  41. package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
  42. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
  43. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
  44. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
  45. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
  46. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
  47. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
  48. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
  49. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
  50. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
  51. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
  52. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
  53. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
  54. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
  55. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
  56. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
  57. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
  58. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -16
  59. package/crates/team-agent/src/lifecycle/tests.rs +0 -3
  60. package/crates/team-agent/src/lifecycle/types.rs +2 -18
  61. package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
  62. package/crates/team-agent/src/messaging/delivery.rs +12 -141
  63. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  64. package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
  65. package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
  66. package/crates/team-agent/src/provider/adapter.rs +35 -238
  67. package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
  68. package/crates/team-agent/src/provider/model_catalog.rs +13 -201
  69. package/crates/team-agent/src/provider/session/capture.rs +6 -106
  70. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
  71. package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
  72. package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
  73. package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
  74. package/crates/team-agent/src/provider/session_scan.rs +4 -10
  75. package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
  76. package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
  77. package/crates/team-agent/src/provider/tests/idle.rs +0 -25
  78. package/crates/team-agent/src/provider/wire.rs +51 -23
  79. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  80. package/crates/team-agent/src/state/persist.rs +6 -6
  81. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  82. package/package.json +4 -4
  83. package/skills/team-agent/SKILL.md +6 -4
  84. package/skills/team-agent/command-coverage.json +15 -1
  85. package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
  86. package/skills/team-agent/references/team-agent-operator.md +5 -3
  87. package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
  88. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
  89. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
  90. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
  91. package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
  92. package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
  93. package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
  94. package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
  95. package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
  96. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
@@ -8,7 +8,7 @@ use crate::transport::test_support::OfflineTransport;
8
8
 
9
9
  #[test]
10
10
  fn abnormal_exit_is_reported_without_auto_recovery_intent_or_action() {
11
- let case = RecoveryCase::new("reported-no-auto");
11
+ let case = RecoveryCase::new("reported-no-auto", "claude_code");
12
12
  case.seed_agent("baseline-429");
13
13
  let transport = OfflineTransport::new().with_session_present(true);
14
14
  let coord = case.coord(transport.clone());
@@ -61,7 +61,9 @@ fn abnormal_exit_is_reported_without_auto_recovery_intent_or_action() {
61
61
 
62
62
  #[test]
63
63
  fn first_turn_death_cannot_enter_auto_respawn_loop_and_manual_start_still_recovers() {
64
- let case = RecoveryCase::new("first-turn-death-no-loop");
64
+ // A pre-upgrade claude_code row cannot be started any more; Codex keeps
65
+ // both an explicit failed-turn fact and a resumable manual start.
66
+ let case = RecoveryCase::new("first-turn-death-no-loop", "codex");
65
67
  case.seed_agent("baseline-429");
66
68
  let transport = OfflineTransport::new().with_session_present(true);
67
69
  let coord = case.coord(transport.clone());
@@ -131,10 +133,11 @@ fn first_turn_death_cannot_enter_auto_respawn_loop_and_manual_start_still_recove
131
133
 
132
134
  struct RecoveryCase {
133
135
  root: std::path::PathBuf,
136
+ provider: &'static str,
134
137
  }
135
138
 
136
139
  impl RecoveryCase {
137
- fn new(tag: &str) -> Self {
140
+ fn new(tag: &str, provider: &'static str) -> Self {
138
141
  let base = std::env::var_os("TEAM_AGENT_TEST_TMP")
139
142
  .map(std::path::PathBuf::from)
140
143
  .unwrap_or_else(std::env::temp_dir);
@@ -148,7 +151,7 @@ impl RecoveryCase {
148
151
  .as_nanos()
149
152
  ));
150
153
  std::fs::create_dir_all(&root).unwrap();
151
- Self { root }
154
+ Self { root, provider }
152
155
  }
153
156
 
154
157
  fn coord(&self, transport: OfflineTransport) -> Coordinator {
@@ -163,7 +166,8 @@ impl RecoveryCase {
163
166
 
164
167
  fn seed_agent(&self, uuid: &str) {
165
168
  let rollout = self.rollout();
166
- std::fs::write(&rollout, claude_api_error_line(uuid)).unwrap();
169
+ std::fs::write(&rollout, self.error_line(uuid)).unwrap();
170
+ let model = if self.provider == "codex" { "gpt-5.5" } else { "sonnet" };
167
171
  let state = serde_json::json!({
168
172
  "active_team_key": "research",
169
173
  "team_key": "research",
@@ -179,8 +183,8 @@ impl RecoveryCase {
179
183
  "fe-admin": {
180
184
  "agent_id": "fe-admin",
181
185
  "id": "fe-admin",
182
- "provider": "claude_code",
183
- "model": "sonnet",
186
+ "provider": self.provider,
187
+ "model": model,
184
188
  "status": "running",
185
189
  "window": "fe-admin",
186
190
  "rollout_path": rollout,
@@ -236,10 +240,17 @@ impl RecoveryCase {
236
240
  .append(true)
237
241
  .open(self.rollout())
238
242
  .unwrap();
239
- file.write_all(claude_api_error_line(uuid).as_bytes())
243
+ file.write_all(self.error_line(uuid).as_bytes())
240
244
  .unwrap();
241
245
  }
242
246
 
247
+ fn error_line(&self, uuid: &str) -> String {
248
+ match self.provider {
249
+ "codex" => codex_failed_turn_line(uuid),
250
+ _ => claude_api_error_line(uuid),
251
+ }
252
+ }
253
+
243
254
  fn rollout(&self) -> std::path::PathBuf {
244
255
  self.root.join("rollout-fe-admin.jsonl")
245
256
  }
@@ -292,6 +303,16 @@ fn claude_api_error_line(uuid: &str) -> String {
292
303
  )
293
304
  }
294
305
 
306
+ fn codex_failed_turn_line(turn_id: &str) -> String {
307
+ format!(
308
+ "{}\n",
309
+ serde_json::json!({
310
+ "method": "turn/completed",
311
+ "params": {"turn": {"id": turn_id, "status": "failed"}}
312
+ })
313
+ )
314
+ }
315
+
295
316
  fn find_event<'a>(events: &'a [serde_json::Value], name: &str) -> Option<&'a serde_json::Value> {
296
317
  events
297
318
  .iter()
@@ -230,48 +230,6 @@ fn spine2_sync_health_records_last_output_at() {
230
230
  );
231
231
  }
232
232
 
233
- // P1 — capture_missing: an agent with NO session_id but a discoverable transcript under spawn_cwd gets
234
- // its session_id captured + persisted (real capture_session_id); an agent that already has one is
235
- // untouched. Golden sessions/capture.py:capture_missing_sessions.
236
- #[test]
237
- fn spine2_capture_missing_captures_session_id_for_missing_agent() {
238
- use std::sync::atomic::{AtomicU64, Ordering};
239
- static N: AtomicU64 = AtomicU64::new(0);
240
- let tdir = std::env::temp_dir().join(format!(
241
- "ta-rs-health-tx-{}-{}",
242
- std::process::id(),
243
- N.fetch_add(1, Ordering::Relaxed)
244
- ));
245
- std::fs::create_dir_all(&tdir).unwrap();
246
- // lane-046-capture-gap: Claude no-expected_session_id capture now requires
247
- // positive_agent_id_match (TEAM_AGENT_ID=<id>) OR agent_path_match. Without
248
- // a worker-identity signal, weak candidates can be leader transcripts and
249
- // must not be attributed to a worker. The seeded transcript includes the
250
- // TEAM_AGENT_ID marker for w1.
251
- std::fs::write(
252
- tdir.join("session.jsonl"),
253
- r#"{"type":"user","sessionId":"sess-found","cwd":"x","message":{"content":"TEAM_AGENT_ID=w1 hi"}}"#,
254
- )
255
- .unwrap();
256
- let agents = serde_json::json!({
257
- "w1": { "provider": "claude_code", "window": "w1", "spawn_cwd": tdir.to_string_lossy() },
258
- "w2": { "provider": "claude_code", "window": "w2", "session_id": "existing-sess" },
259
- });
260
- let (coord, dir) = seeded_health_coord(agents, "");
261
- coord.tick().expect("tick");
262
- assert!(
263
- agent_field(&dir, "w1", "session_id").and_then(|v| v.as_str().map(str::to_string)).is_some(),
264
- "capture_missing must capture+persist a session_id for an agent with a discoverable transcript; today it's a probe"
265
- );
266
- assert_eq!(
267
- agent_field(&dir, "w2", "session_id")
268
- .and_then(|v| v.as_str().map(str::to_string))
269
- .as_deref(),
270
- Some("existing-sess"),
271
- "an agent that already has a session_id must be untouched"
272
- );
273
- }
274
-
275
233
  // CONTRACT — sync_health runs BEFORE deliver_pending, but turn-level WORKING state must not make an
276
234
  // alive worker undeliverable. Busy delivery deferral is lifecycle-only (`state.agents[id].status=="busy"`);
277
235
  // activity/agent_health WORKING remains diagnostic turn state.
@@ -3538,7 +3538,7 @@ mod tests {
3538
3538
  std::fs::write(&path, serde_json::json!({
3539
3539
  "active_team_key":"current", "session_name":"team-existing-workers",
3540
3540
  "spec_path":"/fixture/spec.yml", "team_dir":"/fixture/roles",
3541
- "agents":{"worker":{"agent_id":"worker","provider":"pi","status":status}},
3541
+ "agents":{"worker":{"agent_id":"worker","provider":"copilot","status":status}},
3542
3542
  "tasks":[{"task_id":"existing-task"}],
3543
3543
  }).to_string()).unwrap();
3544
3544
  persist_exec_provider_leader_binding(&plan, &workspace, &authority, false).unwrap();
@@ -50,7 +50,7 @@ use super::*;
50
50
  /// pre-write JSON (so the half-written `status:starting` row is gone). The
51
51
  /// caller propagates the ORIGINAL operation error after rollback; rollback
52
52
  /// errors are swallowed (best-effort, no panic).
53
- pub(super) fn rollback_add_agent_atomic(
53
+ pub(crate) fn rollback_add_agent_atomic(
54
54
  run_workspace: &Path,
55
55
  spec_path: &Path,
56
56
  pre_spec_text: Option<&str>,
@@ -165,7 +165,7 @@ pub(super) fn upsert_agent_state_from_role(
165
165
  /// purpose: 把一席的 starting 行写进团队 state 并落盘
166
166
  /// errors: 读或写 runtime state 失败时返回 StatePersist
167
167
  /// ---
168
- pub(super) fn upsert_agent_entry(
168
+ pub(crate) fn upsert_agent_entry(
169
169
  workspace: &Path,
170
170
  canonical_team_key: &str,
171
171
  agent_id: &AgentId,
@@ -203,199 +203,6 @@ pub(super) fn upsert_agent_entry(
203
203
  )
204
204
  }
205
205
 
206
- /// ---
207
- /// purpose: 首次登记 Pi fork 席位,原子带入目标角色与完整 fork capture seed
208
- /// returns: 成功后 TARGET 已按 ForkAgent typed intent 登记为 starting
209
- /// errors: 重复席位、无效 capture seed 或 state 写入失败时拒绝
210
- /// ---
211
- pub(crate) fn fork_upsert_agent_state_from_role(
212
- workspace: &Path,
213
- canonical_team_key: &str,
214
- agent_id: &AgentId,
215
- meta: &Value,
216
- compiled_agent: &Value,
217
- dynamic_role_file: &Path,
218
- seed: &ForkCaptureSeed,
219
- ) -> Result<(), LifecycleError> {
220
- if agent_id == &seed.source_agent_id {
221
- return Err(LifecycleError::RequirementUnmet(
222
- "fork target must differ from source".to_string(),
223
- ));
224
- }
225
- if seed.captured.captured_via != crate::provider::CaptureVia::ForkSnapshot
226
- || seed.captured.attribution_confidence != crate::provider::Confidence::High
227
- || seed.captured.session_id.is_none()
228
- || seed.captured.rollout_path.is_none()
229
- || seed.captured_at.is_empty()
230
- {
231
- return Err(LifecycleError::RequirementUnmet(
232
- "fork capture seed is incomplete or not a verified Pi snapshot".to_string(),
233
- ));
234
- }
235
- if compiled_agent.get("id").and_then(Value::as_str) != Some(agent_id.as_str()) {
236
- return Err(LifecycleError::Compile(
237
- "compiled fork role id does not match target".to_string(),
238
- ));
239
- }
240
- let sessions_root = std::fs::canonicalize(&seed.pi_sessions_root)
241
- .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
242
- let backing = seed.captured.rollout_path.as_ref().ok_or_else(|| {
243
- LifecycleError::RequirementUnmet("fork backing path is missing".to_string())
244
- })?;
245
- let backing_path = std::fs::canonicalize(&backing.0)
246
- .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
247
- if !backing_path.starts_with(&sessions_root) {
248
- return Err(LifecycleError::RequirementUnmet(
249
- "fork backing is outside the target Pi session root".to_string(),
250
- ));
251
- }
252
-
253
- let mut state =
254
- crate::state::projection::select_runtime_state(workspace, Some(canonical_team_key))
255
- .map_err(|e| LifecycleError::TeamSelect(e.to_string()))?;
256
- if !state.is_object() {
257
- state = serde_json::json!({});
258
- }
259
- let root = state.as_object_mut().ok_or_else(|| {
260
- LifecycleError::StatePersist("runtime state root is not an object".to_string())
261
- })?;
262
- let agents = root
263
- .entry("agents".to_string())
264
- .or_insert_with(|| serde_json::json!({}));
265
- if !agents.is_object() {
266
- *agents = serde_json::json!({});
267
- }
268
- let agent_map = agents.as_object_mut().ok_or_else(|| {
269
- LifecycleError::StatePersist("runtime state agents is not an object".to_string())
270
- })?;
271
- if agent_map.contains_key(agent_id.as_str()) {
272
- return Err(LifecycleError::RequirementUnmet(format!(
273
- "agent id already exists in selected team: {}",
274
- agent_id
275
- )));
276
- }
277
-
278
- let source_profile_dir = agent_map
279
- .get(seed.source_agent_id.as_str())
280
- .and_then(serde_json::Value::as_object)
281
- .and_then(|source| source.get("_profile_dir"))
282
- .and_then(serde_json::Value::as_str)
283
- .filter(|path| !path.is_empty())
284
- .map(|path| serde_json::json!(path));
285
- let mut entry = starting_agent_entry(workspace, agent_id, meta, dynamic_role_file);
286
- let entry_object = entry.as_object_mut().ok_or_else(|| {
287
- LifecycleError::StatePersist("fork target entry is not an object".to_string())
288
- })?;
289
- for field in [
290
- "provider",
291
- "auth_mode",
292
- "role",
293
- "model",
294
- "effort",
295
- "profile",
296
- "tools",
297
- "system_prompt",
298
- "output_contract",
299
- "communication_mode",
300
- "working_directory",
301
- "cwd",
302
- "config",
303
- "name",
304
- "dangerously_skip_permissions",
305
- ] {
306
- if let Some(value) = compiled_agent.get(field) {
307
- entry_object.insert(field.to_string(), yaml_value_to_json(value));
308
- }
309
- }
310
- if compiled_agent.get("model").is_some() && !entry_object.contains_key("model_source") {
311
- entry_object.insert("model_source".to_string(), serde_json::json!("team"));
312
- }
313
- entry_object.insert("agent_id".to_string(), serde_json::json!(agent_id.as_str()));
314
- entry_object.insert("label".to_string(), serde_json::json!(agent_id.as_str()));
315
- entry_object.insert(
316
- "owner_team_id".to_string(),
317
- serde_json::json!(canonical_team_key),
318
- );
319
- entry_object.insert(
320
- "claude_projects_root".to_string(),
321
- serde_json::json!(sessions_root.to_string_lossy().to_string()),
322
- );
323
- entry_object.insert(
324
- "forked_from".to_string(),
325
- serde_json::json!(seed.source_agent_id.as_str()),
326
- );
327
- entry_object.insert(
328
- "spawn_cwd".to_string(),
329
- serde_json::json!(seed.captured.spawn_cwd.to_string_lossy().to_string()),
330
- );
331
- entry_object.insert(
332
- "session_id".to_string(),
333
- serde_json::json!(seed.captured.session_id.as_ref().map(|id| id.as_str())),
334
- );
335
- let backing = seed.captured.rollout_path.as_ref().ok_or_else(|| {
336
- LifecycleError::RequirementUnmet("fork backing path is missing".to_string())
337
- })?;
338
- entry_object.insert(
339
- "rollout_path".to_string(),
340
- serde_json::json!(backing.0.to_string_lossy().to_string()),
341
- );
342
- entry_object.insert(
343
- "captured_at".to_string(),
344
- serde_json::json!(seed.captured_at.as_str()),
345
- );
346
- entry_object.insert(
347
- "captured_via".to_string(),
348
- serde_json::to_value(seed.captured.captured_via)
349
- .map_err(|e| LifecycleError::StatePersist(e.to_string()))?,
350
- );
351
- entry_object.insert(
352
- "attribution_confidence".to_string(),
353
- serde_json::to_value(seed.captured.attribution_confidence)
354
- .map_err(|e| LifecycleError::StatePersist(e.to_string()))?,
355
- );
356
- entry_object.insert("capture_state".to_string(), serde_json::json!("captured"));
357
- if let Some(profile_dir) = source_profile_dir {
358
- entry_object.insert("_profile_dir".to_string(), profile_dir);
359
- } else {
360
- entry_object.insert(
361
- "_profile_dir".to_string(),
362
- serde_json::json!(seed.profile_dir.to_string_lossy().to_string()),
363
- );
364
- }
365
- agent_map.insert(agent_id.as_str().to_string(), entry);
366
- crate::lifecycle::restart::remove::clear_agent_retirement_in_state(&mut state, agent_id);
367
- crate::state::repository::StateRepository::new(workspace)
368
- .save(
369
- crate::state::repository::StateWriteIntent::ForkAgent {
370
- team_key: canonical_team_key,
371
- agent_id: agent_id.as_str(),
372
- },
373
- &state,
374
- )
375
- .map_err(|e| LifecycleError::StatePersist(e.to_string()))
376
- }
377
-
378
- fn yaml_value_to_json(value: &Value) -> serde_json::Value {
379
- match value {
380
- Value::Null => serde_json::Value::Null,
381
- Value::Bool(value) => serde_json::json!(value),
382
- Value::Int(value) => serde_json::json!(value),
383
- Value::Float(value) => serde_json::Number::from_f64(*value)
384
- .map(serde_json::Value::Number)
385
- .unwrap_or(serde_json::Value::Null),
386
- Value::Str(value) => serde_json::json!(value),
387
- Value::List(values) => {
388
- serde_json::Value::Array(values.iter().map(yaml_value_to_json).collect())
389
- }
390
- Value::Map(values) => serde_json::Value::Object(
391
- values
392
- .iter()
393
- .map(|(key, value)| (key.clone(), yaml_value_to_json(value)))
394
- .collect(),
395
- ),
396
- }
397
- }
398
-
399
206
  fn starting_agent_entry(
400
207
  workspace: &Path,
401
208
  agent_id: &AgentId,
@@ -47,6 +47,16 @@ pub fn clone_agent(
47
47
  .ok_or_else(|| {
48
48
  LifecycleError::RequirementUnmet(format!("unknown worker agent id: {source_agent_id}"))
49
49
  })?;
50
+ // A pre-upgrade Claude Code or Pi row has no legacy runtime to clone onto.
51
+ if let Some(retired) = source_agent
52
+ .get("provider")
53
+ .and_then(serde_json::Value::as_str)
54
+ .filter(|provider| crate::provider::wire::is_retired_provider(provider))
55
+ {
56
+ return Err(LifecycleError::Provider(
57
+ crate::provider::wire::retired_provider_error(retired).into(),
58
+ ));
59
+ }
50
60
  let source_session_id = source_agent
51
61
  .get("session_id")
52
62
  .and_then(serde_json::Value::as_str)
@@ -122,37 +132,11 @@ fn read_agent_session(
122
132
  .get("rollout_path")
123
133
  .and_then(serde_json::Value::as_str)
124
134
  .filter(|value| !value.is_empty())
125
- .map(std::path::PathBuf::from)
126
- .or_else(|| find_claude_backing(agent, session))?;
135
+ .map(std::path::PathBuf::from)?;
127
136
  let distinct = source_session_id.is_none_or(|source| source.as_str() != session);
128
137
  (distinct && backing.is_file()).then(|| (SessionId::new(session), backing))
129
138
  }
130
139
 
131
- fn find_claude_backing(agent: &serde_json::Value, session: &str) -> Option<std::path::PathBuf> {
132
- let root = agent
133
- .get("claude_projects_root")
134
- .and_then(serde_json::Value::as_str)
135
- .map(std::path::PathBuf::from)
136
- .or_else(|| {
137
- std::env::var_os("HOME")
138
- .map(|home| std::path::PathBuf::from(home).join(".claude/projects"))
139
- })?;
140
- let target = format!("{session}.jsonl");
141
- let mut pending = vec![root];
142
- while let Some(dir) = pending.pop() {
143
- let entries = std::fs::read_dir(&dir).ok()?;
144
- for entry in entries.flatten() {
145
- let path = entry.path();
146
- if path.is_dir() {
147
- pending.push(path);
148
- } else if path.file_name().and_then(|name| name.to_str()) == Some(target.as_str()) {
149
- return Some(path);
150
- }
151
- }
152
- }
153
- None
154
- }
155
-
156
140
  fn persist_clone_session(
157
141
  workspace: &Path,
158
142
  team_key: &str,
@@ -1,9 +1,9 @@
1
1
  //! ---
2
- //! purpose: Pi 以完整会话快照创建独立席位;已验证的其他 provider 保持窗口内分身
2
+ //! purpose: legacy 席位的窗口内分身(Grok);Claude Code / Pi 席位只走 contract 管道的原生新席位 fork
3
3
  //! contract:
4
4
  //! provides:
5
5
  //! - name: fork_agent_with_transport
6
- //! what: Pi 走锁内快照新席位;已验证的其他 provider 保持窗口内斜杠 fork
6
+ //! what: Grok 走窗口内斜杠 fork;升级前遗留的 claude/pi worker 行明确拒绝
7
7
  //! - name: in_window_fork
8
8
  //! what: 已验证的 provider+subscription 给出 command+screen_mark;未验证返回 None
9
9
  //! depends:
@@ -12,8 +12,8 @@
12
12
  //! - crate::lifecycle::profile_launch
13
13
  //! - crate::transport::Transport
14
14
  //! boundary:
15
- //! - 仅 Pi 的锁内专用管道读取 exact backing、注册并启动新席位
16
- //! - 非 Pi 不 spawn 新 pane,不改 TEAM_AGENT_ID / MCP / 席位名
15
+ //! - 新席位 fork 只由 contract_runtime::fork 管道完成,这里不注册新席位
16
+ //! - 窗口内分身不 spawn 新 pane,不改 TEAM_AGENT_ID / MCP / 席位名
17
17
  //! - 重试只重按回车,不重粘 /fork
18
18
  //! - 不把 pane 锁超时从 200ms 调大
19
19
  //! - 未验证的 provider 不猜斜杠命令
@@ -43,18 +43,16 @@ pub struct InWindowFork {
43
43
  /// ---
44
44
  /// Official in-window fork. None = unverified or unsupported-auth.
45
45
  /// grok `/fork` mark `forked from` (2026-08-17).
46
- /// claude `/branch` mark `Branched conversation` (Claude Code v2.1.181, 2026-08-17).
47
- /// claude `/fork` is a background-agent command (`Usage: /fork <directive>`), not the session split.
46
+ /// Claude's `/branch` is retired here: it moves the SOURCE process onto the
47
+ /// branch (renamed "<title> (Branch)") while the seat's captured tuple still
48
+ /// names the old session, and creates no seat. Claude Code and Pi fork only
49
+ /// into a new seat through the contract pipeline (`contract_runtime::fork`).
48
50
  pub fn in_window_fork(provider: Provider, auth: AuthMode) -> Option<InWindowFork> {
49
51
  match (provider, auth) {
50
52
  (Provider::Grok, AuthMode::Subscription) => Some(InWindowFork {
51
53
  command: "/fork",
52
54
  screen_mark: "forked from",
53
55
  }),
54
- (Provider::Claude | Provider::ClaudeCode, AuthMode::Subscription) => Some(InWindowFork {
55
- command: "/branch",
56
- screen_mark: "Branched conversation",
57
- }),
58
56
  _ => None,
59
57
  }
60
58
  }
@@ -68,13 +66,7 @@ pub fn in_window_fork_command(provider: Provider, auth: AuthMode) -> Option<&'st
68
66
  }
69
67
 
70
68
  fn refuse_missing_in_window_fork(provider: Provider, provider_raw: &str) -> LifecycleError {
71
- if matches!(
72
- provider,
73
- Provider::Grok
74
- | Provider::Claude
75
- | Provider::ClaudeCode
76
- | Provider::Pi
77
- ) {
69
+ if matches!(provider, Provider::Grok | Provider::Pi) {
78
70
  LifecycleError::Provider(format!(
79
71
  "{provider_raw} does not support native session fork"
80
72
  ))
@@ -99,7 +91,7 @@ pub fn fork_agent_with_transport(
99
91
  source_agent_id: &AgentId,
100
92
  as_agent_id: &AgentId,
101
93
  label: Option<&str>,
102
- _open_display: bool,
94
+ open_display: bool,
103
95
  team: Option<&str>,
104
96
  transport: &dyn Transport,
105
97
  ) -> Result<ForkAgentReport, LifecycleError> {
@@ -139,17 +131,16 @@ pub fn fork_agent_with_transport(
139
131
  .get("auth_mode")
140
132
  .and_then(serde_json::Value::as_str)
141
133
  .unwrap_or("subscription");
134
+ // A pre-upgrade Claude Code or Pi row has no legacy runtime to fork from;
135
+ // contract seats fork through the contract pipeline before this point.
136
+ if crate::provider::wire::is_retired_provider(provider_raw) {
137
+ return Err(LifecycleError::Provider(
138
+ crate::provider::wire::retired_provider_error(provider_raw).into(),
139
+ ));
140
+ }
141
+ let _ = (label, open_display);
142
142
  let provider = parse_provider(provider_raw).unwrap_or(Provider::Grok);
143
143
  let auth = parse_auth_mode(auth_raw).unwrap_or(AuthMode::Subscription);
144
- if provider == Provider::Pi {
145
- return crate::lifecycle::restart::fork_pi_new_seat_locked(
146
- &selected,
147
- source_agent_id,
148
- as_agent_id,
149
- label,
150
- transport,
151
- );
152
- }
153
144
  let Some(spec) = in_window_fork(provider, auth) else {
154
145
  return Err(refuse_missing_in_window_fork(provider, provider_raw));
155
146
  };
@@ -209,7 +200,6 @@ pub fn fork_agent_with_transport(
209
200
  },
210
201
  session_id: None,
211
202
  backing_state: ForkBackingState::Verified,
212
- pi_fork: None,
213
203
  })
214
204
  }
215
205
 
@@ -44,39 +44,13 @@ pub fn fork_agent(
44
44
  .map_err(|e| LifecycleError::TeamSelect(e.to_string()))?;
45
45
  // Fork-agent routes to the selected live team's persisted endpoint, not
46
46
  // the workspace-hash fallback socket.
47
- let is_pi = selected
48
- .state
49
- .get("agents")
50
- .and_then(|agents| agents.get(source_agent_id.as_str()))
51
- .and_then(|agent| agent.get("provider"))
52
- .and_then(serde_json::Value::as_str)
53
- == Some("pi");
54
- let transport: Box<dyn crate::transport::Transport> = if is_pi {
55
- #[cfg(test)]
56
- {
57
- test_fork_transport(&selected, source_agent_id)
58
- }
59
- #[cfg(not(test))]
60
- {
61
- Box::new(
62
- crate::lifecycle::restart::lifecycle_worker_tmux_backend_selection_for_state(
63
- &selected.run_workspace,
64
- &selected.state,
65
- )?
66
- .backend,
67
- )
68
- }
69
- } else {
70
- Box::new(
71
- crate::lifecycle::restart::lifecycle_worker_tmux_backend_for_selected_state(
72
- &selected.run_workspace,
73
- Some(selected.team_key.as_str()),
74
- )
75
- .unwrap_or_else(|_| {
76
- crate::tmux_backend::TmuxBackend::for_workspace(&selected.run_workspace)
77
- }),
47
+ let transport: Box<dyn crate::transport::Transport> = Box::new(
48
+ crate::lifecycle::restart::lifecycle_worker_tmux_backend_for_selected_state(
49
+ &selected.run_workspace,
50
+ Some(selected.team_key.as_str()),
78
51
  )
79
- };
52
+ .unwrap_or_else(|_| crate::tmux_backend::TmuxBackend::for_workspace(&selected.run_workspace)),
53
+ );
80
54
  fork_agent_with_transport(
81
55
  workspace,
82
56
  source_agent_id,
@@ -87,58 +61,3 @@ pub fn fork_agent(
87
61
  transport.as_ref(),
88
62
  )
89
63
  }
90
-
91
- #[cfg(test)]
92
- fn test_fork_transport(
93
- selected: &crate::state::selector::SelectedTeam,
94
- source_agent_id: &AgentId,
95
- ) -> Box<dyn crate::transport::Transport> {
96
- let state = &selected.state;
97
- let session = state
98
- .get("session_name")
99
- .and_then(serde_json::Value::as_str)
100
- .filter(|value| !value.is_empty())
101
- .map(crate::transport::SessionName::new)
102
- .unwrap_or_else(|| crate::transport::SessionName::new("offline"));
103
- let source = state
104
- .get("agents")
105
- .and_then(|agents| agents.get(source_agent_id.as_str()));
106
- let targets = source
107
- .and_then(|agent| agent.get("pane_id"))
108
- .and_then(serde_json::Value::as_str)
109
- .filter(|pane| !pane.is_empty())
110
- .map(|pane| {
111
- let window = source
112
- .and_then(|agent| agent.get("window"))
113
- .and_then(serde_json::Value::as_str)
114
- .filter(|value| !value.is_empty())
115
- .unwrap_or(source_agent_id.as_str());
116
- vec![crate::transport::PaneInfo {
117
- pane_id: crate::transport::PaneId::new(pane),
118
- session: session.clone(),
119
- window_index: None,
120
- window_name: Some(crate::transport::WindowName::new(window)),
121
- pane_index: None,
122
- tty: None,
123
- current_command: None,
124
- current_path: None,
125
- active: false,
126
- pane_pid: None,
127
- leader_env: std::collections::BTreeMap::new(),
128
- }]
129
- })
130
- .unwrap_or_default();
131
- let endpoint = state
132
- .get("tmux_endpoint")
133
- .or_else(|| state.get("tmux_socket"))
134
- .and_then(serde_json::Value::as_str)
135
- .filter(|value| !value.is_empty())
136
- .map(str::to_string)
137
- .unwrap_or_else(|| "offline".to_string());
138
- Box::new(
139
- crate::transport::test_support::OfflineTransport::new()
140
- .with_session_present(true)
141
- .with_targets(targets)
142
- .with_tmux_endpoint(endpoint),
143
- )
144
- }
@@ -610,7 +610,7 @@ fn upsert_toml_table_prefixes(existing: &str, tables: &[&str], stanza: &str) ->
610
610
  /// ---
611
611
  /// purpose: 把 argv 里 provider 原生的 MCP 配置参数改指到已落盘的文件
612
612
  /// params:
613
- /// argv: 就地改写;claude 系改 --mcp-config 的值,copilot 改 --additional-mcp-config 并加 @ 前缀
613
+ /// argv: 就地改写;copilot 改 --additional-mcp-config 并加 @ 前缀
614
614
  /// returns: argv 里没有对应参数时什么都不做
615
615
  /// ---
616
616
  pub(crate) fn point_native_mcp_config_at_file(
@@ -619,14 +619,6 @@ pub(crate) fn point_native_mcp_config_at_file(
619
619
  path: &Path,
620
620
  ) {
621
621
  match provider {
622
- Provider::Claude | Provider::ClaudeCode => {
623
- let Some(index) = argv.iter().position(|arg| arg == "--mcp-config") else {
624
- return;
625
- };
626
- if let Some(value) = argv.get_mut(index.saturating_add(1)) {
627
- *value = path.to_string_lossy().to_string();
628
- }
629
- }
630
622
  // §C1 note: copilot `--additional-mcp-config` 接受 `@file`,直接指向既有
631
623
  // `.team/runtime/mcp/<agent>.json`(launch 路径 write_worker_mcp_config 已写)。
632
624
  // 既避免 inline JSON 包 mcpServers wrapper 的语义错位,也更利于 ps 验法。