openclaw/Kova
openclaw/Kova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: configure external cli live auth correctly

Browse Source
This commit is contained in:
Shakker 2026-05-01 17:09:35 +01:00
parent 689ef0e43f
commit 0e76a28549
No known key found for this signature in database
2 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/selfcheck.mjs
View File

@ -4506,11 +4506,15 @@ async function externalCliOpenClawConfigCheck(tmp) {
throw new Error(result.stderr.trim() || result.stdout.trim() || `exit ${result.status}`);
}
const config = JSON.parse(await readFile(join(home, ".openclaw", "openclaw.json"), "utf8"));
assertEqual(config.agents?.defaults?.model?.primary, "openai/gpt-5.5", "external cli model ref");
assertEqual(config.agents?.defaults?.model?.primary, "codex/gpt-5.5", "external cli model ref");
assertEqual(config.agents?.defaults?.agentRuntime?.id, "codex", "external cli runtime id");
assertEqual(config.agents?.defaults?.agentRuntime?.fallback, "none", "external cli runtime fallback");
if (config.models?.providers?.openai?.apiKey !== undefined) {
throw new Error("external CLI config must not write env apiKey config");
assertEqual(config.plugins?.entries?.codex?.enabled, true, "external cli codex plugin enabled");
if (config.models?.providers?.openai !== undefined) {
throw new Error("Codex external CLI config must not write an OpenAI provider override");
}
if (config.models?.providers?.codex !== undefined) {
throw new Error("Codex external CLI config must use the bundled codex provider instead of writing a provider override");
}
return {
id: "external-cli-openclaw-config",
@ -4575,8 +4579,9 @@ async function claudeCliOpenClawConfigCheck(tmp) {
assertEqual(config.agents?.defaults?.model?.primary, "anthropic/claude-sonnet-4-5", "claude cli model ref");
assertEqual(config.agents?.defaults?.agentRuntime?.id, "claude-cli", "claude cli runtime id");
assertEqual(config.agents?.defaults?.agentRuntime?.fallback, "none", "claude cli runtime fallback");
if (config.models?.providers?.anthropic?.apiKey !== undefined) {
throw new Error("Claude CLI config must not write env apiKey config");
assertEqual(config.plugins?.entries?.anthropic?.enabled, true, "claude cli anthropic plugin enabled");
if (config.models?.providers?.anthropic !== undefined) {
throw new Error("Claude CLI config must use the bundled Anthropic provider instead of writing a provider override");
}
return {
id: "claude-cli-openclaw-config",

103
support/configure-openclaw-live-auth.mjs
View File

@ -7,8 +7,11 @@ const provider = options.provider || "openai";
const envVar = options.envVar || "OPENAI_API_KEY";
const authMethod = options.authMethod || "env";
const externalCli = options.externalCli || null;
const model = options.model || defaultModel(provider);
const providerKey = providerConfigKey(provider);
const externalRuntime = authMethod === "external-cli"
? externalCliRuntimeConfig(provider, externalCli, options.model)
: null;
const model = externalRuntime?.model || options.model || defaultModel(provider);
const providerKey = externalRuntime?.providerKey || providerConfigKey(provider);
const stateDir = process.env.OPENCLAW_STATE_DIR || path.join(requiredEnv("OPENCLAW_HOME"), ".openclaw");
const configPath = process.env.OPENCLAW_CONFIG_PATH || path.join(stateDir, "openclaw.json");
@ -21,30 +24,38 @@ try {
config = {};
}
const existingProvider = config.models?.providers?.[providerKey] || {};
const providerConfig = authMethod === "external-cli"
? {
...withoutApiKey(existingProvider),
models: mergeModels(existingProvider.models, model)
if (authMethod !== "external-cli") {
const existingProvider = config.models?.providers?.[providerKey] || {};
config.models = {
...(config.models || {}),
mode: "merge",
providers: {
...(config.models?.providers || {}),
[providerKey]: {
...existingProvider,
apiKey: {
source: "env",
provider: "default",
id: envVar
},
models: mergeModels(existingProvider.models, model)
}
}
: {
...existingProvider,
apiKey: {
source: "env",
provider: "default",
id: envVar
},
models: mergeModels(existingProvider.models, model)
};
};
}
config.models = {
...(config.models || {}),
mode: "merge",
providers: {
...(config.models?.providers || {}),
[providerKey]: providerConfig
}
};
if (externalRuntime?.pluginEntry) {
config.plugins = {
...(config.plugins || {}),
entries: {
...(config.plugins?.entries || {}),
[externalRuntime.pluginEntry]: {
...(config.plugins?.entries?.[externalRuntime.pluginEntry] || {}),
enabled: true
}
}
};
}
config.agents = {
...(config.agents || {}),
@ -57,7 +68,7 @@ config.agents = {
...(authMethod === "external-cli" ? {
agentRuntime: {
...(config.agents?.defaults?.agentRuntime || {}),
id: agentRuntimeForExternalCli(externalCli),
id: externalRuntime.agentRuntime,
fallback: "none"
}
} : {})
@ -98,19 +109,36 @@ function providerConfigKey(provider) {
return provider;
}
function agentRuntimeForExternalCli(cli) {
if (cli === "codex") {
return "codex";
function externalCliRuntimeConfig(provider, cli, modelId) {
if (provider === "openai" && cli === "codex") {
return {
providerKey: "codex",
agentRuntime: "codex",
pluginEntry: "codex",
model: {
...defaultModel("openai"),
id: modelId || "gpt-5.5",
name: modelId || "gpt-5.5",
api: "openai-codex-responses",
contextWindow: 272000,
contextTokens: 272000,
maxTokens: 128000
}
};
}
if (cli === "claude") {
return "claude-cli";
if (provider === "anthropic" && cli === "claude") {
return {
providerKey: "anthropic",
agentRuntime: "claude-cli",
pluginEntry: "anthropic",
model: {
...defaultModel("anthropic"),
id: modelId || "claude-sonnet-4-5",
name: modelId || "claude-sonnet-4-5"
}
};
}
throw new Error(`unsupported external CLI runtime: ${cli || "<missing>"}`);
}
function withoutApiKey(provider) {
const { apiKey: _apiKey, ...rest } = provider || {};
return rest;
throw new Error(`unsupported external CLI runtime for provider ${provider}: ${cli || "<missing>"}`);
}
function parseArgs(args) {
@ -132,7 +160,8 @@ function parseArgs(args) {
provider: parsed.provider,
envVar: parsed.envvar,
authMethod: parsed.authmethod,
externalCli: parsed.externalcli
externalCli: parsed.externalcli,
model: parsed.model
};
}