fix: Improve coyote sandbox startup time
This commit is contained in:
+54
-7
@@ -2,6 +2,7 @@ use anyhow::{Context, Result, anyhow, bail};
|
|||||||
use rust_embed::RustEmbed;
|
use rust_embed::RustEmbed;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use sha2::{Digest, Sha256};
|
use sha2::{Digest, Sha256};
|
||||||
|
use std::collections::HashSet;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
@@ -46,8 +47,9 @@ pub fn launch(name: Option<String>) -> Result<()> {
|
|||||||
..AppConfig::default()
|
..AppConfig::default()
|
||||||
};
|
};
|
||||||
let vault = Vault::init(&bootstrap)?;
|
let vault = Vault::init(&bootstrap)?;
|
||||||
inject_llm_secret(&config_content, &vault)?;
|
let registered = sbx_registered_services()?;
|
||||||
inject_mcp_secrets(&vault)?;
|
inject_llm_secret(&config_content, &vault, ®istered)?;
|
||||||
|
inject_mcp_secrets(&vault, ®istered)?;
|
||||||
|
|
||||||
let discovered = mixins::discover()?;
|
let discovered = mixins::discover()?;
|
||||||
|
|
||||||
@@ -197,7 +199,11 @@ fn compute_kit_hash() -> Result<String> {
|
|||||||
Ok(format!("{:x}", hasher.finalize()))
|
Ok(format!("{:x}", hasher.finalize()))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn inject_llm_secret(config_content: &str, vault: &Vault) -> Result<()> {
|
fn inject_llm_secret(
|
||||||
|
config_content: &str,
|
||||||
|
vault: &Vault,
|
||||||
|
registered: &HashSet<String>,
|
||||||
|
) -> Result<()> {
|
||||||
let value: serde_yaml::Value = serde_yaml::from_str(config_content)
|
let value: serde_yaml::Value = serde_yaml::from_str(config_content)
|
||||||
.context("Failed to parse config for LLM secret injection")?;
|
.context("Failed to parse config for LLM secret injection")?;
|
||||||
|
|
||||||
@@ -219,6 +225,14 @@ fn inject_llm_secret(config_content: &str, vault: &Vault) -> Result<()> {
|
|||||||
let client_name = client.get("name").and_then(|v| v.as_str());
|
let client_name = client.get("name").and_then(|v| v.as_str());
|
||||||
let service = provider_to_sbx_service(client_type, client_name);
|
let service = provider_to_sbx_service(client_type, client_name);
|
||||||
|
|
||||||
|
if registered.contains(&service) {
|
||||||
|
eprintln!(
|
||||||
|
"Secret for '{service}' already registered with sbx. \
|
||||||
|
To update it, run: sbx secret set -g --force {service}"
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
let secret_value = vault
|
let secret_value = vault
|
||||||
.get_secret(&secret_name, false)
|
.get_secret(&secret_name, false)
|
||||||
.with_context(|| format!("Failed to decrypt LLM api_key secret '{secret_name}'"))?;
|
.with_context(|| format!("Failed to decrypt LLM api_key secret '{secret_name}'"))?;
|
||||||
@@ -242,7 +256,7 @@ fn find_secret_placeholder(value: &Value) -> Option<String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn inject_mcp_secrets(vault: &Vault) -> Result<()> {
|
fn inject_mcp_secrets(vault: &Vault, registered: &HashSet<String>) -> Result<()> {
|
||||||
let mcp_path = paths::mcp_config_file();
|
let mcp_path = paths::mcp_config_file();
|
||||||
if !mcp_path.exists() {
|
if !mcp_path.exists() {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
@@ -262,6 +276,14 @@ fn inject_mcp_secrets(vault: &Vault) -> Result<()> {
|
|||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if registered.contains(server_name.as_str()) {
|
||||||
|
eprintln!(
|
||||||
|
"Secret for '{server_name}' already registered with sbx. \
|
||||||
|
To update it, run: sbx secret set -g --force {server_name}"
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
let secret_value = vault.get_secret(&secret_name, false).with_context(|| {
|
let secret_value = vault.get_secret(&secret_name, false).with_context(|| {
|
||||||
format!(
|
format!(
|
||||||
"Secret '{secret_name}' referenced by MCP server '{server_name}' not found \
|
"Secret '{secret_name}' referenced by MCP server '{server_name}' not found \
|
||||||
@@ -285,17 +307,42 @@ fn provider_to_sbx_service(provider_type: &str, client_name: Option<&str>) -> St
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn sbx_registered_services() -> Result<HashSet<String>> {
|
||||||
|
let (success, stdout, _) = run_command_with_output(SBX_BINARY, &["secret", "ls"], None)
|
||||||
|
.context("Failed to run `sbx secret ls`")?;
|
||||||
|
|
||||||
|
if !success {
|
||||||
|
return Ok(HashSet::new());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(stdout
|
||||||
|
.lines()
|
||||||
|
.skip(1)
|
||||||
|
.filter_map(|line| {
|
||||||
|
let mut parts = line.split_whitespace();
|
||||||
|
let scope = parts.next()?;
|
||||||
|
let _kind = parts.next()?;
|
||||||
|
let name = parts.next()?;
|
||||||
|
if scope == "(global)" {
|
||||||
|
Some(name.to_string())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
fn sbx_secret_set(service: &str, secret_value: &str) -> Result<()> {
|
fn sbx_secret_set(service: &str, secret_value: &str) -> Result<()> {
|
||||||
let mut child = Command::new(SBX_BINARY)
|
let mut child = Command::new(SBX_BINARY)
|
||||||
.args(["secret", "set", "-g", "--force", service])
|
.args(["secret", "set", "-g", service])
|
||||||
.stdin(Stdio::piped())
|
.stdin(Stdio::piped())
|
||||||
.stdout(Stdio::inherit())
|
.stdout(Stdio::inherit())
|
||||||
.stderr(Stdio::inherit())
|
.stderr(Stdio::inherit())
|
||||||
.spawn()
|
.spawn()
|
||||||
.context("Failed to spawn `sbx secret set -g`")?;
|
.context("Failed to spawn `sbx secret set -g`")?;
|
||||||
|
|
||||||
if let Some(ref mut stdin) = child.stdin {
|
if let Some(mut stdin_handle) = child.stdin.take() {
|
||||||
stdin
|
stdin_handle
|
||||||
.write_all(secret_value.as_bytes())
|
.write_all(secret_value.as_bytes())
|
||||||
.context("Failed to write secret to `sbx secret set -g` stdin")?;
|
.context("Failed to write secret to `sbx secret set -g` stdin")?;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user