@team-agent/installer 0.5.125 → 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 (144) hide show
  1. package/Cargo.lock +1 -1
  2. package/Cargo.toml +1 -1
  3. package/crates/team-agent/src/cli/diagnose.rs +0 -137
  4. package/crates/team-agent/src/cli/emit.rs +13 -8
  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 +55 -10
  8. package/crates/team-agent/src/cli/mod.rs +35 -29
  9. package/crates/team-agent/src/cli/models.rs +33 -944
  10. package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
  11. package/crates/team-agent/src/cli/tests/mod.rs +3 -3
  12. package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
  13. package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
  14. package/crates/team-agent/src/compiler/tests.rs +54 -12
  15. package/crates/team-agent/src/compiler.rs +7 -205
  16. package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
  17. package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
  18. package/crates/team-agent/src/contract_runtime/config.rs +12 -8
  19. package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
  20. package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
  21. package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
  22. package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
  23. package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
  24. package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
  25. package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
  26. package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
  27. package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
  28. package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
  29. package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
  30. package/crates/team-agent/src/leader/start.rs +1 -1
  31. package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
  32. package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
  33. package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +22 -200
  34. package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
  35. package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
  36. package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
  37. package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
  38. package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
  39. package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
  40. package/crates/team-agent/src/lifecycle/launch.rs +3 -34
  41. package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
  42. package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
  43. package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
  44. package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
  45. package/crates/team-agent/src/lifecycle/restart.rs +0 -2
  46. package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
  47. package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
  48. package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
  49. package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
  50. package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
  51. package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +106 -186
  52. package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
  53. package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +19 -15
  54. package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
  55. package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
  56. package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
  57. package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
  58. package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
  59. package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
  60. package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
  61. package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
  62. package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
  63. package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
  64. package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
  65. package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
  66. package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
  67. package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
  68. package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
  69. package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
  70. package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
  71. package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
  72. package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
  73. package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
  74. package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +15 -14
  75. package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
  76. package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
  77. package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
  78. package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
  79. package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
  80. package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
  81. package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
  82. package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
  83. package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
  84. package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
  85. package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
  86. package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
  87. package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
  88. package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
  89. package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
  90. package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
  91. package/crates/team-agent/src/lifecycle/tests.rs +0 -7
  92. package/crates/team-agent/src/lifecycle/types.rs +2 -21
  93. package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
  94. package/crates/team-agent/src/messaging/delivery.rs +14 -195
  95. package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
  96. package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
  97. package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
  98. package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
  99. package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
  100. package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
  101. package/crates/team-agent/src/provider/adapter.rs +71 -572
  102. package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
  103. package/crates/team-agent/src/provider/model_catalog.rs +13 -201
  104. package/crates/team-agent/src/provider/session/capture.rs +11 -211
  105. package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
  106. package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
  107. package/crates/team-agent/src/provider/session/mod.rs +2 -3
  108. package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
  109. package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
  110. package/crates/team-agent/src/provider/session_scan.rs +7 -23
  111. package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
  112. package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
  113. package/crates/team-agent/src/provider/tests/idle.rs +0 -68
  114. package/crates/team-agent/src/provider/types.rs +0 -4
  115. package/crates/team-agent/src/provider/wire.rs +77 -23
  116. package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
  117. package/crates/team-agent/src/state/persist.rs +6 -6
  118. package/crates/team-agent/src/state/repository/tests.rs +2 -2
  119. package/crates/team-agent/src/tmux_backend.rs +4 -3
  120. package/package.json +4 -4
  121. package/skills/team-agent/SKILL.md +8 -5
  122. package/skills/team-agent/command-coverage.json +29 -1
  123. package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
  124. package/skills/team-agent/references/team-agent-operator.md +7 -3
  125. package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
  126. package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
  127. package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
  128. package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
  129. package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
  130. package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
  131. package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
  132. package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
  133. package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
  134. package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
  135. package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
  136. package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
  137. package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
  138. package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
  139. package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
  140. package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
  141. package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
  142. package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
  143. package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
  144. package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
@@ -97,8 +97,8 @@ pub(crate) fn prepare_provider_profile_launch_with_profile_dir(
97
97
  profile_dir: Option<&Path>,
98
98
  mcp_config: Option<&McpConfig>,
99
99
  ) -> Result<ProviderProfileLaunch, LifecycleError> {
100
- if agent.get("provider").and_then(YamlValue::as_str).is_some_and(crate::provider::wire::is_retired_provider) {
101
- return Err(LifecycleError::Provider(crate::provider::wire::RETIRED_PROVIDER_ERROR.into()));
100
+ if let Some(retired) = agent.get("provider").and_then(YamlValue::as_str).filter(|provider| crate::provider::wire::is_retired_provider(provider)) {
101
+ return Err(LifecycleError::Provider(crate::provider::wire::retired_provider_error(retired).into()));
102
102
  }
103
103
  let input = AgentProfileInput {
104
104
  id: agent
@@ -153,8 +153,8 @@ pub(crate) fn prepare_provider_profile_launch_from_json(
153
153
  agent: &serde_json::Value,
154
154
  mcp_config: Option<&McpConfig>,
155
155
  ) -> Result<ProviderProfileLaunch, LifecycleError> {
156
- if agent.get("provider").and_then(serde_json::Value::as_str).is_some_and(crate::provider::wire::is_retired_provider) {
157
- return Err(LifecycleError::Provider(crate::provider::wire::RETIRED_PROVIDER_ERROR.into()));
156
+ if let Some(retired) = agent.get("provider").and_then(serde_json::Value::as_str).filter(|provider| crate::provider::wire::is_retired_provider(provider)) {
157
+ return Err(LifecycleError::Provider(crate::provider::wire::retired_provider_error(retired).into()));
158
158
  }
159
159
  let input = AgentProfileInput {
160
160
  id: agent
@@ -205,9 +205,6 @@ fn prepare_profile_launch(
205
205
  return Ok(ProviderProfileLaunch::default());
206
206
  };
207
207
  let Some(path) = find_profile_file(workspace, profile, agent.profile_dir.as_deref()) else {
208
- if agent.provider == Provider::Pi && agent.auth_mode == AuthMode::Subscription {
209
- return Ok(ProviderProfileLaunch::default());
210
- }
211
208
  return Err(profile_not_found(profile));
212
209
  };
213
210
  let loaded = read_profile_file(path)?;
@@ -215,26 +212,8 @@ fn prepare_profile_launch(
215
212
 
216
213
  let mut env_overlay = provider_env_exports(agent.provider, agent.auth_mode, &loaded.values);
217
214
  let mut env_unset = provider_env_unsets(agent.provider, agent.auth_mode);
218
- let mut claude_config_dir = None;
219
- let mut claude_projects_root = None;
220
- let mut managed_mcp_config = false;
221
-
222
- if matches!(agent.provider, Provider::Claude | Provider::ClaudeCode)
223
- && agent.auth_mode == AuthMode::CompatibleApi
224
- {
225
- let dir = compatible_claude_config_dir(workspace, &agent.id)?;
226
- if let Some(config) = mcp_config {
227
- ensure_compatible_claude_mcp_config(&dir, workspace, config)?;
228
- managed_mcp_config = true;
229
- }
230
- let projects_root = dir.join("projects");
231
- env_overlay.insert(
232
- "CLAUDE_CONFIG_DIR".to_string(),
233
- dir.to_string_lossy().to_string(),
234
- );
235
- claude_projects_root = Some(projects_root);
236
- claude_config_dir = Some(dir);
237
- }
215
+ // Claude Code's compatible-API config dir went with its legacy worker runtime.
216
+ let _ = mcp_config;
238
217
 
239
218
  env_overlay.extend(compatible_api_network_exports(
240
219
  agent.auth_mode,
@@ -254,9 +233,9 @@ fn prepare_profile_launch(
254
233
  env_overlay,
255
234
  env_unset,
256
235
  command_overrides,
257
- claude_config_dir,
258
- claude_projects_root,
259
- managed_mcp_config,
236
+ claude_config_dir: None,
237
+ claude_projects_root: None,
238
+ managed_mcp_config: false,
260
239
  })
261
240
  }
262
241
 
@@ -439,25 +418,6 @@ fn provider_env_exports(
439
418
  return exports;
440
419
  }
441
420
  match provider {
442
- Provider::Claude | Provider::ClaudeCode => {
443
- append_env_pair(&mut exports, "ANTHROPIC_BASE_URL", value_or_alternate(values, "ANTHROPIC_BASE_URL", "BASE_URL"));
444
- if auth_mode == AuthMode::OfficialApi {
445
- append_env_pair(&mut exports, "ANTHROPIC_API_KEY", value_or_alternate(values, "ANTHROPIC_API_KEY", "API_KEY"));
446
- }
447
- append_env_pair(&mut exports, "ANTHROPIC_AUTH_TOKEN", value_or_alternate(values, "ANTHROPIC_AUTH_TOKEN", "AUTH_TOKEN")
448
- .or_else(|| {
449
- (auth_mode == AuthMode::CompatibleApi)
450
- .then(|| value_or_alternate(values, "ANTHROPIC_API_KEY", "API_KEY"))
451
- .flatten()
452
- }));
453
- append_env_pair(&mut exports, "ANTHROPIC_MODEL", profile_model(values));
454
- }
455
- Provider::Codex => {
456
- let key = value_or_alternate(values, "OPENAI_API_KEY", "API_KEY");
457
- append_env_pair(&mut exports, "TEAM_AGENT_PROVIDER_API_KEY", key);
458
- append_env_pair(&mut exports, "OPENAI_API_KEY", key);
459
- append_env_pair(&mut exports, "OPENAI_BASE_URL", values.get("BASE_URL").filter(|value| !value.is_empty()).map(String::as_str));
460
- }
461
421
  Provider::GeminiCli => {
462
422
  append_env_pair(&mut exports, "GEMINI_API_KEY", value_or_alternate(values, "GEMINI_API_KEY", "API_KEY"));
463
423
  }
@@ -480,8 +440,9 @@ fn provider_env_exports(
480
440
  }
481
441
  }
482
442
  }
483
- // Grok and Pi retain their native subscription credentials.
484
- Provider::Grok | Provider::Pi => {}
443
+ // Claude Code, Codex, Grok and Pi workers run only through their
444
+ // subscription-only contract leaves.
445
+ Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok | Provider::Pi => {}
485
446
  Provider::Fake => {}
486
447
  }
487
448
  exports
@@ -502,16 +463,10 @@ mod append_env_contract {
502
463
  let map = |pairs: &[(&str, &str)]| -> BTreeMap<String, String> {
503
464
  pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect()
504
465
  };
505
- for provider in [Provider::Claude, Provider::ClaudeCode] {
506
- assert_eq!(provider_env_exports(provider, AuthMode::OfficialApi, &values), map(&[
507
- ("ANTHROPIC_BASE_URL", " raw\nbase "), ("ANTHROPIC_API_KEY", "dummy"),
508
- ("ANTHROPIC_AUTH_TOKEN", "dummy-token"), ("ANTHROPIC_MODEL", " raw model "),
509
- ]));
466
+ for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok, Provider::Pi] {
467
+ assert!(provider_env_exports(provider, AuthMode::OfficialApi, &values).is_empty());
468
+ assert!(provider_env_exports(provider, AuthMode::CompatibleApi, &values).is_empty());
510
469
  }
511
- assert_eq!(provider_env_exports(Provider::Codex, AuthMode::CompatibleApi, &values), map(&[
512
- ("TEAM_AGENT_PROVIDER_API_KEY", "native-dummy"), ("OPENAI_API_KEY", "native-dummy"),
513
- ("OPENAI_BASE_URL", " raw\nbase "),
514
- ]));
515
470
  assert_eq!(provider_env_exports(Provider::GeminiCli, AuthMode::OfficialApi, &values), map(&[("GEMINI_API_KEY", "dummy")]));
516
471
  assert_eq!(provider_env_exports(Provider::Copilot, AuthMode::CompatibleApi, &values), map(&[
517
472
  ("COPILOT_PROVIDER_BASE_URL", " raw\nbase "), ("COPILOT_PROVIDER_TYPE", "custom"),
@@ -606,48 +561,7 @@ fn provider_command_overrides(
606
561
  _ if agent.model.is_some() => agent.model.clone(),
607
562
  _ => profile_model(values).map(str::to_string),
608
563
  };
609
- let mut codex_profile = None;
610
- let mut codex_config = Vec::new();
611
- // Python provider_env.py:62-79 (_provider_command_overrides codex branch).
612
- match agent.provider {
613
- Provider::Codex => {
614
- codex_profile =
615
- value_or_alternate(values, "CODEX_PROFILE", "NATIVE_PROFILE").map(str::to_string);
616
- let model_provider = values.get("MODEL_PROVIDER").filter(|v| !v.is_empty());
617
- let base_url = values.get("BASE_URL").filter(|v| !v.is_empty());
618
- if agent.auth_mode == AuthMode::CompatibleApi {
619
- if let (Some(model_provider), Some(base_url)) = (model_provider, base_url) {
620
- if safe_codex_provider_id(model_provider) {
621
- codex_config.push(format!("model_provider=\"{model_provider}\""));
622
- let prefix = format!("model_providers.{model_provider}");
623
- codex_config.push(format!("{prefix}.base_url=\"{base_url}\""));
624
- codex_config
625
- .push(format!("{prefix}.env_key=\"TEAM_AGENT_PROVIDER_API_KEY\""));
626
- if let Some(wire_api) = values.get("WIRE_API").filter(|v| !v.is_empty()) {
627
- codex_config.push(format!("{prefix}.wire_api=\"{wire_api}\""));
628
- }
629
- if let Some(name) = values.get("PROVIDER_NAME").filter(|v| !v.is_empty()) {
630
- codex_config.push(format!("{prefix}.name=\"{name}\""));
631
- }
632
- }
633
- }
634
- }
635
- }
636
- _ => {}
637
- }
638
- ProviderCommandOverrides {
639
- model,
640
- codex_profile,
641
- codex_config,
642
- }
643
- }
644
-
645
- /// Python helpers.py:33-34 `_safe_codex_provider_id`: `[A-Za-z0-9_-]+`.
646
- fn safe_codex_provider_id(value: &str) -> bool {
647
- !value.is_empty()
648
- && value
649
- .chars()
650
- .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
564
+ ProviderCommandOverrides { model }
651
565
  }
652
566
 
653
567
  fn write_runtime_env_file(
@@ -703,270 +617,6 @@ fn shell_quote(value: &str) -> String {
703
617
  format!("'{}'", value.replace('\'', "'\"'\"'"))
704
618
  }
705
619
 
706
- fn compatible_claude_config_dir(
707
- workspace: &Path,
708
- agent_id: &str,
709
- ) -> Result<PathBuf, LifecycleError> {
710
- let dir = workspace
711
- .join(".team/runtime/provider-config")
712
- .join(agent_id)
713
- .join("claude");
714
- std::fs::create_dir_all(&dir)
715
- .map_err(|e| LifecycleError::StatePersist(format!("{}: {e}", dir.display())))?;
716
- ensure_compatible_claude_config(&dir, workspace)?;
717
- Ok(dir)
718
- }
719
-
720
- fn ensure_compatible_claude_config(dir: &Path, workspace: &Path) -> Result<(), LifecycleError> {
721
- let settings_path = dir.join("settings.json");
722
- let mut settings = read_json_object(&settings_path)?;
723
- insert_if_missing(&mut settings, "theme", serde_json::json!("auto"));
724
- insert_if_missing(
725
- &mut settings,
726
- "skipDangerousModePermissionPrompt",
727
- serde_json::json!(true),
728
- );
729
- settings.insert(
730
- "hasCompletedOnboarding".to_string(),
731
- serde_json::json!(true),
732
- );
733
- settings.insert(
734
- "hasTrustDialogAccepted".to_string(),
735
- serde_json::json!(true),
736
- );
737
- insert_if_missing(
738
- &mut settings,
739
- "lastOnboardingVersion",
740
- serde_json::json!("2.1.0"),
741
- );
742
- insert_if_missing(
743
- &mut settings,
744
- "firstStartTime",
745
- serde_json::json!("1970-01-01T00:00:00.000Z"),
746
- );
747
- insert_if_missing(&mut settings, "numStartups", serde_json::json!(0));
748
- insert_if_missing(
749
- &mut settings,
750
- "projectOnboardingSeenCount",
751
- serde_json::json!(1),
752
- );
753
- write_json_object(&settings_path, &settings)?;
754
-
755
- let state_path = dir.join(".claude.json");
756
- let mut state = read_json_object(&state_path)?;
757
- state.insert(
758
- "hasCompletedOnboarding".to_string(),
759
- serde_json::json!(true),
760
- );
761
- insert_if_missing(
762
- &mut state,
763
- "lastOnboardingVersion",
764
- serde_json::json!("2.1.0"),
765
- );
766
- insert_if_missing(
767
- &mut state,
768
- "firstStartTime",
769
- serde_json::json!("1970-01-01T00:00:00.000Z"),
770
- );
771
- insert_if_missing(&mut state, "numStartups", serde_json::json!(0));
772
- ensure_claude_projects(&mut state, workspace, None);
773
- write_json_object(&state_path, &state)
774
- }
775
-
776
- fn ensure_compatible_claude_mcp_config(
777
- dir: &Path,
778
- workspace: &Path,
779
- mcp_config: &McpConfig,
780
- ) -> Result<(), LifecycleError> {
781
- let state_path = dir.join(".claude.json");
782
- let mut state = read_json_object(&state_path)?;
783
- state.insert(
784
- "hasCompletedOnboarding".to_string(),
785
- serde_json::json!(true),
786
- );
787
- state.insert(
788
- "hasTrustDialogAccepted".to_string(),
789
- serde_json::json!(true),
790
- );
791
- insert_if_missing(
792
- &mut state,
793
- "projectOnboardingSeenCount",
794
- serde_json::json!(1),
795
- );
796
- state.insert("mcpServers".to_string(), mcp_config.raw.clone());
797
- state.insert(
798
- "enabledMcpjsonServers".to_string(),
799
- serde_json::json!(mcp_server_names(&mcp_config.raw)),
800
- );
801
- ensure_claude_projects(&mut state, workspace, Some(&mcp_config.raw));
802
- write_json_object(&state_path, &state)
803
- }
804
-
805
- fn ensure_claude_projects(
806
- state: &mut serde_json::Map<String, serde_json::Value>,
807
- workspace: &Path,
808
- mcp_servers: Option<&serde_json::Value>,
809
- ) {
810
- if !state
811
- .get("projects")
812
- .is_some_and(serde_json::Value::is_object)
813
- {
814
- state.insert("projects".to_string(), serde_json::json!({}));
815
- }
816
- let Some(projects) = state
817
- .get_mut("projects")
818
- .and_then(serde_json::Value::as_object_mut)
819
- else {
820
- return;
821
- };
822
- for key in claude_project_keys(workspace) {
823
- let entry = projects.entry(key).or_insert_with(|| serde_json::json!({}));
824
- if !entry.is_object() {
825
- *entry = serde_json::json!({});
826
- }
827
- let Some(project) = entry.as_object_mut() else {
828
- continue;
829
- };
830
- project.insert(
831
- "hasTrustDialogAccepted".to_string(),
832
- serde_json::json!(true),
833
- );
834
- insert_if_missing(project, "projectOnboardingSeenCount", serde_json::json!(1));
835
- if let Some(mcp_servers) = mcp_servers {
836
- insert_if_missing(project, "allowedTools", serde_json::json!([]));
837
- insert_if_missing(project, "mcpContextUris", serde_json::json!([]));
838
- project.insert(
839
- "enabledMcpjsonServers".to_string(),
840
- serde_json::json!(mcp_server_names(mcp_servers)),
841
- );
842
- insert_if_missing(project, "disabledMcpjsonServers", serde_json::json!([]));
843
- insert_if_missing(
844
- project,
845
- "hasClaudeMdExternalIncludesApproved",
846
- serde_json::json!(false),
847
- );
848
- insert_if_missing(
849
- project,
850
- "hasClaudeMdExternalIncludesWarningShown",
851
- serde_json::json!(false),
852
- );
853
- if !project
854
- .get("mcpServers")
855
- .is_some_and(serde_json::Value::is_object)
856
- {
857
- project.insert("mcpServers".to_string(), serde_json::json!({}));
858
- }
859
- if let Some(existing) = project
860
- .get_mut("mcpServers")
861
- .and_then(serde_json::Value::as_object_mut)
862
- {
863
- if let Some(servers) = mcp_servers.as_object() {
864
- existing.extend(servers.clone());
865
- }
866
- }
867
- }
868
- }
869
- }
870
-
871
- fn mcp_server_names(mcp_servers: &serde_json::Value) -> Vec<String> {
872
- mcp_servers
873
- .as_object()
874
- .map(|servers| servers.keys().cloned().collect())
875
- .unwrap_or_default()
876
- }
877
-
878
- /// swallow batch 4 C1-C4 (MUST-NOT-9/13): a CORRUPT provider-config JSON fails
879
- /// EXPLICITLY — the old `unwrap_or_default` turned a parse failure into an empty map
880
- /// that the subsequent write flattened back over the user's file (silent destructive
881
- /// rewrite). A missing file stays Ok(empty) — only an existing-but-unparseable file
882
- /// errors, naming the path + parse detail + next action; the file is never touched.
883
- fn read_json_object(
884
- path: &Path,
885
- ) -> Result<serde_json::Map<String, serde_json::Value>, LifecycleError> {
886
- let text = match std::fs::read_to_string(path) {
887
- Ok(text) => text,
888
- Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
889
- return Ok(serde_json::Map::new());
890
- }
891
- Err(error) => {
892
- return Err(LifecycleError::RequirementUnmet(format!(
893
- "profile_invalid_json: {} could not be read: {error}; fix or remove the file (or restore a backup) and relaunch",
894
- path.display()
895
- )));
896
- }
897
- };
898
- match serde_json::from_str::<serde_json::Value>(&text) {
899
- Ok(serde_json::Value::Object(map)) => Ok(map),
900
- Ok(other) => Err(LifecycleError::RequirementUnmet(format!(
901
- "profile_invalid_json: {} is not a JSON object (found {}); fix or remove the file (or restore a backup) and relaunch",
902
- path.display(),
903
- json_kind(&other)
904
- ))),
905
- Err(error) => Err(LifecycleError::RequirementUnmet(format!(
906
- "profile_invalid_json: {} could not be parsed: {error}; fix or remove the file (or restore a backup) and relaunch",
907
- path.display()
908
- ))),
909
- }
910
- }
911
-
912
- fn json_kind(value: &serde_json::Value) -> &'static str {
913
- match value {
914
- serde_json::Value::Null => "null",
915
- serde_json::Value::Bool(_) => "a boolean",
916
- serde_json::Value::Number(_) => "a number",
917
- serde_json::Value::String(_) => "a string",
918
- serde_json::Value::Array(_) => "an array",
919
- serde_json::Value::Object(_) => "an object",
920
- }
921
- }
922
-
923
- fn write_json_object(
924
- path: &Path,
925
- value: &serde_json::Map<String, serde_json::Value>,
926
- ) -> Result<(), LifecycleError> {
927
- if let Some(parent) = path.parent() {
928
- std::fs::create_dir_all(parent)
929
- .map_err(|e| LifecycleError::StatePersist(format!("{}: {e}", parent.display())))?;
930
- }
931
- let body = serde_json::to_string_pretty(value)
932
- .map_err(|e| LifecycleError::StatePersist(format!("serialize {}: {e}", path.display())))?;
933
- std::fs::write(path, format!("{body}\n"))
934
- .map_err(|e| LifecycleError::StatePersist(format!("{}: {e}", path.display())))?;
935
- set_owner_only_permissions(path)
936
- }
937
-
938
- fn insert_if_missing(
939
- map: &mut serde_json::Map<String, serde_json::Value>,
940
- key: &str,
941
- value: serde_json::Value,
942
- ) {
943
- map.entry(key.to_string()).or_insert(value);
944
- }
945
-
946
- fn claude_project_keys(workspace: &Path) -> Vec<String> {
947
- let mut keys = vec![workspace.to_string_lossy().to_string()];
948
- if let Ok(resolved) = workspace.canonicalize() {
949
- let resolved = resolved.to_string_lossy().to_string();
950
- if !keys.iter().any(|key| key == &resolved) {
951
- keys.push(resolved);
952
- }
953
- }
954
- for key in keys.clone() {
955
- if let Some(stripped) = key.strip_prefix("/private/var/") {
956
- push_unique_string(&mut keys, format!("/var/{stripped}"));
957
- } else if let Some(stripped) = key.strip_prefix("/var/") {
958
- push_unique_string(&mut keys, format!("/private/var/{stripped}"));
959
- }
960
- }
961
- keys
962
- }
963
-
964
- fn push_unique_string(values: &mut Vec<String>, value: String) {
965
- if !values.iter().any(|existing| existing == &value) {
966
- values.push(value);
967
- }
968
- }
969
-
970
620
  fn compatible_api_network_exports(
971
621
  auth_mode: AuthMode,
972
622
  values: &BTreeMap<String, String>,
@@ -1004,17 +654,12 @@ fn required_profile_keys(provider: Provider, auth_mode: AuthMode) -> &'static [&
1004
654
  return &[];
1005
655
  }
1006
656
  match provider {
1007
- Provider::Claude | Provider::ClaudeCode | Provider::Codex => match auth_mode {
1008
- AuthMode::OfficialApi => &["API_KEY"],
1009
- AuthMode::CompatibleApi => &["BASE_URL", "API_KEY"],
1010
- AuthMode::Subscription => &[],
1011
- },
1012
657
  Provider::GeminiCli => &["API_KEY"],
1013
658
  // C-7-1 cr verdict: copilot 一期 subscription-only,无 BYOK required key 集合;
1014
659
  // 二期 BYOK 立项时填(向后兼容字段保留)。
1015
660
  Provider::Copilot => &[],
1016
- // 0.5.67: Grok/Pi 一期无 BYOK required key 集合 (同 copilot 精神)。
1017
- Provider::Grok | Provider::Pi => &[],
661
+ // Claude Code/Codex/Grok/Pi worker 只走 subscription-only contract leaf。
662
+ Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok | Provider::Pi => &[],
1018
663
  Provider::Fake => &[],
1019
664
  }
1020
665
  }