From b612af1c38352e9688744492120be1fdcca4fbaf Mon Sep 17 00:00:00 2001 From: openclaw Date: Mon, 19 Oct 2026 07:40:26 +0000 Subject: [PATCH] fix(config): ensure fallback to cfg when apiPluginConfig has no image/video property --- dist/image/index.js | 5 +++-- dist/video/index.js | 5 +++-- src/image/index.ts | 7 +++---- src/video/index.ts | 7 +++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/image/index.js b/dist/image/index.js index 2ffec97..46a77b6 100644 --- a/dist/image/index.js +++ b/dist/image/index.js @@ -40,8 +40,9 @@ export function resolvePluginApiKey(rawKey) { return undefined; } export function resolveImageConfig(cfg, apiPluginConfig) { - const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config); - return config?.image; + const direct = apiPluginConfig?.image; + const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.image; + return direct ?? fromCfg; } export function resolveConfiguredImageBaseUrl(cfg, pluginCfg) { return (normalizeOptionalString(pluginCfg?.baseUrl) ?? diff --git a/dist/video/index.js b/dist/video/index.js index 158ec77..cc9db4e 100644 --- a/dist/video/index.js +++ b/dist/video/index.js @@ -23,8 +23,9 @@ export function resolvePluginApiKey(rawKey) { return undefined; } export function resolveVideoConfig(cfg, apiPluginConfig) { - const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config); - return config?.video; + const direct = apiPluginConfig?.video; + const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.video; + return direct ?? fromCfg; } export function resolveConfiguredOpenAIBaseUrl(cfg, pluginCfg) { return (normalizeOptionalString(pluginCfg?.baseUrl) ?? diff --git a/src/image/index.ts b/src/image/index.ts index 900d75e..a8d744a 100644 --- a/src/image/index.ts +++ b/src/image/index.ts @@ -69,10 +69,9 @@ export function resolveImageConfig( cfg: ImageGenerationRequest["cfg"] | undefined, apiPluginConfig?: Record, ): ImagePluginConfig | undefined { - const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config) as - | { image?: ImagePluginConfig } - | undefined; - return config?.image; + const direct = apiPluginConfig?.image as ImagePluginConfig | undefined; + const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.image as ImagePluginConfig | undefined; + return direct ?? fromCfg; } export function resolveConfiguredImageBaseUrl( diff --git a/src/video/index.ts b/src/video/index.ts index cde2f43..0694d03 100644 --- a/src/video/index.ts +++ b/src/video/index.ts @@ -80,10 +80,9 @@ export function resolveVideoConfig( cfg: VideoGenerationRequest["cfg"] | undefined, apiPluginConfig?: Record, ): VideoPluginConfig | undefined { - const config = (apiPluginConfig ?? cfg?.plugins?.entries?.["1h-tools"]?.config) as - | { video?: VideoPluginConfig } - | undefined; - return config?.video; + const direct = apiPluginConfig?.video as VideoPluginConfig | undefined; + const fromCfg = cfg?.plugins?.entries?.["1h-tools"]?.config?.video as VideoPluginConfig | undefined; + return direct ?? fromCfg; } export function resolveConfiguredOpenAIBaseUrl(