Skip to content
Closed
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
61 changes: 59 additions & 2 deletions src/plugin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1374,14 +1374,44 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {

const piAiModuleId = "@mariozechner/pi-ai";
const mod = (await import(piAiModuleId)) as PiAiModule;
return resolveApiKeyFromAuthProfiles({
const profileKey = await resolveApiKeyFromAuthProfiles({
provider,
authProfileId: options?.profileId,
agentDir: api.resolvePath("."),
runtimeConfig: api.config,
piAiModule: mod,
envSnapshot,
});
if (profileKey) {
return profileKey;
}

// Fallback: read apiKey from models.providers config (e.g. proxy providers
// like MiniMax that store keys under models.providers.<provider>.apiKey).
// Without this, getApiKey() fails for providers whose keys are only in
// openclaw.json config but not in process.env or keychain.
const runtimeCfg = (() => {
try {
return api.runtime?.config?.loadConfig?.() ?? api.config;
} catch {
return api.config;
}
})();
if (isRecord(runtimeCfg)) {
const providers = (runtimeCfg as { models?: { providers?: Record<string, unknown> } })
.models?.providers;
if (providers) {
const providerCfg = findProviderConfigValue(providers, provider);
if (isRecord(providerCfg) && typeof providerCfg.apiKey === "string") {
const cfgKey = providerCfg.apiKey.trim();
if (cfgKey) {
return cfgKey;
}
}
}
}

return undefined;
},
requireApiKey: async (provider, model, options) => {
const key = await (async () => {
Expand Down Expand Up @@ -1410,14 +1440,41 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {

const piAiModuleId = "@mariozechner/pi-ai";
const mod = (await import(piAiModuleId)) as PiAiModule;
return resolveApiKeyFromAuthProfiles({
const profileKey = await resolveApiKeyFromAuthProfiles({
provider,
authProfileId: options?.profileId,
agentDir: api.resolvePath("."),
runtimeConfig: api.config,
piAiModule: mod,
envSnapshot,
});
if (profileKey) {
return profileKey;
}

// Fallback: read apiKey from models.providers config (same as getApiKey)
const runtimeCfg = (() => {
try {
return api.runtime?.config?.loadConfig?.() ?? api.config;
} catch {
return api.config;
}
})();
if (isRecord(runtimeCfg)) {
const providers = (runtimeCfg as { models?: { providers?: Record<string, unknown> } })
.models?.providers;
if (providers) {
const providerCfg = findProviderConfigValue(providers, provider);
if (isRecord(providerCfg) && typeof providerCfg.apiKey === "string") {
const cfgKey = providerCfg.apiKey.trim();
if (cfgKey) {
return cfgKey;
}
}
}
}

return undefined;
})();
if (!key) {
throw new Error(`Missing API key for provider '${provider}' (model '${model}').`);
Expand Down
Loading