@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.
- package/Cargo.lock +1 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +22 -138
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -23
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- 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).
|
|
101
|
-
return Err(LifecycleError::Provider(crate::provider::wire::
|
|
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).
|
|
157
|
-
return Err(LifecycleError::Provider(crate::provider::wire::
|
|
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
|
-
|
|
219
|
-
let
|
|
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,19 +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
421
|
Provider::Codex => {
|
|
456
422
|
let key = value_or_alternate(values, "OPENAI_API_KEY", "API_KEY");
|
|
457
423
|
append_env_pair(&mut exports, "TEAM_AGENT_PROVIDER_API_KEY", key);
|
|
@@ -480,8 +446,9 @@ fn provider_env_exports(
|
|
|
480
446
|
}
|
|
481
447
|
}
|
|
482
448
|
}
|
|
483
|
-
// Grok
|
|
484
|
-
|
|
449
|
+
// Grok retains its native subscription credentials. Claude Code and Pi
|
|
450
|
+
// workers run only through their subscription-only contract leaves.
|
|
451
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Grok | Provider::Pi => {}
|
|
485
452
|
Provider::Fake => {}
|
|
486
453
|
}
|
|
487
454
|
exports
|
|
@@ -502,11 +469,8 @@ mod append_env_contract {
|
|
|
502
469
|
let map = |pairs: &[(&str, &str)]| -> BTreeMap<String, String> {
|
|
503
470
|
pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect()
|
|
504
471
|
};
|
|
505
|
-
for provider in [Provider::Claude, Provider::ClaudeCode] {
|
|
506
|
-
|
|
507
|
-
("ANTHROPIC_BASE_URL", " raw\nbase "), ("ANTHROPIC_API_KEY", "dummy"),
|
|
508
|
-
("ANTHROPIC_AUTH_TOKEN", "dummy-token"), ("ANTHROPIC_MODEL", " raw model "),
|
|
509
|
-
]));
|
|
472
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Pi] {
|
|
473
|
+
assert!(provider_env_exports(provider, AuthMode::OfficialApi, &values).is_empty());
|
|
510
474
|
}
|
|
511
475
|
assert_eq!(provider_env_exports(Provider::Codex, AuthMode::CompatibleApi, &values), map(&[
|
|
512
476
|
("TEAM_AGENT_PROVIDER_API_KEY", "native-dummy"), ("OPENAI_API_KEY", "native-dummy"),
|
|
@@ -703,270 +667,6 @@ fn shell_quote(value: &str) -> String {
|
|
|
703
667
|
format!("'{}'", value.replace('\'', "'\"'\"'"))
|
|
704
668
|
}
|
|
705
669
|
|
|
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
670
|
fn compatible_api_network_exports(
|
|
971
671
|
auth_mode: AuthMode,
|
|
972
672
|
values: &BTreeMap<String, String>,
|
|
@@ -1004,7 +704,7 @@ fn required_profile_keys(provider: Provider, auth_mode: AuthMode) -> &'static [&
|
|
|
1004
704
|
return &[];
|
|
1005
705
|
}
|
|
1006
706
|
match provider {
|
|
1007
|
-
Provider::
|
|
707
|
+
Provider::Codex => match auth_mode {
|
|
1008
708
|
AuthMode::OfficialApi => &["API_KEY"],
|
|
1009
709
|
AuthMode::CompatibleApi => &["BASE_URL", "API_KEY"],
|
|
1010
710
|
AuthMode::Subscription => &[],
|
|
@@ -1013,8 +713,9 @@ fn required_profile_keys(provider: Provider, auth_mode: AuthMode) -> &'static [&
|
|
|
1013
713
|
// C-7-1 cr verdict: copilot 一期 subscription-only,无 BYOK required key 集合;
|
|
1014
714
|
// 二期 BYOK 立项时填(向后兼容字段保留)。
|
|
1015
715
|
Provider::Copilot => &[],
|
|
1016
|
-
// 0.5.67: Grok
|
|
1017
|
-
|
|
716
|
+
// 0.5.67: Grok 一期无 BYOK required key 集合 (同 copilot 精神)。Claude Code/Pi
|
|
717
|
+
// worker 只走 subscription-only contract leaf。
|
|
718
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Grok | Provider::Pi => &[],
|
|
1018
719
|
Provider::Fake => &[],
|
|
1019
720
|
}
|
|
1020
721
|
}
|