Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src-tauri/src/deeplink/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ pub struct DeepLinkImportRequest {
#[serde(skip_serializing_if = "Option::is_none")]
pub opus_model: Option<String>,

/// 自定义环境变量(从 inline config 的 env 对象中保留的非标准 key)
#[serde(skip_serializing_if = "Option::is_none")]
pub custom_env: Option<serde_json::Map<String, serde_json::Value>>,

#[serde(skip_serializing_if = "Option::is_none")]
pub content: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/deeplink/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,6 @@ fn parse_provider_deeplink(
.get("usageAutoInterval")
.and_then(|v| v.parse::<u64>().ok()),
openclaw_config: None,
custom_env: None,
})
}
25 changes: 25 additions & 0 deletions src-tauri/src/deeplink/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,13 @@ fn build_claude_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
);
}

// 合并自定义环境变量
if let Some(custom) = &request.custom_env {
for (key, value) in custom {
env.entry(key.clone()).or_insert(value.clone());
}
}

json!({ "env": env })
}

Expand Down Expand Up @@ -527,6 +534,24 @@ fn merge_claude_config(
.map(|s| s.to_string());
}

// 保留非标准 env key(如 ANTHROPIC_CUSTOM_HEADERS 等自定义变量)
let known_keys: &[&str] = &[
"ANTHROPIC_AUTH_TOKEN",
"ANTHROPIC_BASE_URL",
"ANTHROPIC_MODEL",
"ANTHROPIC_DEFAULT_HAIKU_MODEL",
"ANTHROPIC_DEFAULT_SONNET_MODEL",
"ANTHROPIC_DEFAULT_OPUS_MODEL",
];
let custom: serde_json::Map<String, serde_json::Value> = env
.iter()
.filter(|(k, _)| !known_keys.contains(&k.as_str()))
.map(|(k, v)| (k.clone(), v.clone()))
.collect();
if !custom.is_empty() {
request.custom_env = Some(custom);
}

Ok(())
}

Expand Down
Loading