@t0ken.ai/memoryx-openclaw-plugin 2.2.64 → 2.2.66

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const PLUGIN_VERSION = "2.2.64";
+export declare const PLUGIN_VERSION = "2.2.66";
 export declare const DEFAULT_API_BASE = "https://t0ken.ai/api";
 export declare const PLUGIN_DIR: string;
 /** 真实上游 baseUrl 缓存文件：重启后若配置已被改成 localhost，从此文件恢复各厂商真实地址。 */

package/dist/constants.js

@@ -4,7 +4,7 @@
 import * as path from "path";
 import * as os from "os";
 // Plugin version - synced from package.json by prebuild script
-export const PLUGIN_VERSION = "2.2.64";
+export const PLUGIN_VERSION = "2.2.66";
 export const DEFAULT_API_BASE = "https://t0ken.ai/api";
 export const PLUGIN_DIR = path.join(os.homedir(), ".openclaw", "extensions", "memoryx-openclaw-plugin");
 /** 真实上游 baseUrl 缓存文件：重启后若配置已被改成 localhost，从此文件恢复各厂商真实地址。 */

package/dist/hooks.d.ts

@@ -4,5 +4,5 @@
 import type { MemoryXPlugin } from "./plugin-core.js";
 export declare function registerHooks(api: any, plugin: MemoryXPlugin, wrapProvidersWithProxy: () => void, applySidecarRedirect: (opts?: {
     quiet?: boolean;
-}) => void, shouldApplyProxy: () => boolean, syncRealUpstreamBaseUrlCache?: () => Promise<void>): void;
+}) => void, shouldApplyProxy: () => boolean): void;
 //# sourceMappingURL=hooks.d.ts.map

package/dist/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,wBAAgB,aAAa,CACzB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,aAAa,EACrB,sBAAsB,EAAE,MAAM,IAAI,EAClC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,EAC1D,gBAAgB,EAAE,MAAM,OAAO,EAC/B,4BAA4B,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACnD,IAAI,CAuCN"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,wBAAgB,aAAa,CACzB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,aAAa,EACrB,sBAAsB,EAAE,MAAM,IAAI,EAClC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,EAC1D,gBAAgB,EAAE,MAAM,OAAO,GAChC,IAAI,CAoCN"}

package/dist/hooks.js

@@ -1,4 +1,4 @@
-export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect, shouldApplyProxy, syncRealUpstreamBaseUrlCache) {
+export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect, shouldApplyProxy) {
     let useVirtualProviderInLastRun = false;
     api.on("message_received", async (event) => {
         const { content } = event;
@@ -16,16 +16,13 @@ export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarR
                 await plugin.onMessage("assistant", fullContent);
         }
     });
-    api.on("before_agent_start", async (event) => {
+    api.on("before_agent_start", async (_event) => {
         if (shouldApplyProxy()) {
-            await syncRealUpstreamBaseUrlCache?.();
             wrapProvidersWithProxy();
             applySidecarRedirect({ quiet: true });
         }
         try {
             await plugin.startTimersIfNeeded();
-            // 用户消息只由 message_received 写入一次，此处不再 onMessage("user", prompt)，
-            // 避免与 message_received 重复，且 before_agent_start 可能被多次触发（如 tool 多轮）导致同条 prompt 重复入队。
         }
         catch (error) {
             api.logger.warn(`[MemoryX] before_agent_start failed: ${error}`);

package/dist/index.d.ts

@@ -9,6 +9,8 @@
  * - All initialization (DB, config loading, etc.) must be lazy-loaded
  * - Use setImmediate() for deferred operations
  *
+ * All file I/O (baseUrl cache) happens in service start (async).
+ *
  * This version uses @t0ken.ai/memoryx-sdk with conversation preset:
  * - maxTokens: 30000 (flush when reaching token limit)
  * - intervalMs: 300000 (flush after 5 minutes idle)

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAU,MAAM,kBAAkB,CAAC;;;;;;kBAsBvC,GAAG,iBAAiB,YAAY,GAAG,IAAI;;AARzD,wBA6FE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAU,MAAM,kBAAkB,CAAC;;;;;;kBAsBvC,GAAG,iBAAiB,YAAY,GAAG,IAAI;;AARzD,wBAmGE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -9,6 +9,8 @@
  * - All initialization (DB, config loading, etc.) must be lazy-loaded
  * - Use setImmediate() for deferred operations
  *
+ * All file I/O (baseUrl cache) happens in service start (async).
+ *
  * This version uses @t0ken.ai/memoryx-sdk with conversation preset:
  * - maxTokens: 30000 (flush when reaching token limit)
  * - intervalMs: 300000 (flush after 5 minutes idle)
@@ -37,50 +39,56 @@ export default {
         }
         plugin = new MemoryXPlugin(pluginConfig);
         registerTools(api, plugin);
-        const providerCredentials = extractProviderCredentials(api.config);
-        log(`[Proxy] Found ${providerCredentials.size} providers in config`);
-        const defaultConfig = getDefaultModelAndProvider(providerCredentials, api.config);
+        // Pure memory: read provider list from api.config (no file I/O, same as slimclaw)
+        const configCredentials = extractProviderCredentials(api.config);
+        log(`[Proxy] Found ${configCredentials.size} providers in config`);
+        const defaultConfig = getDefaultModelAndProvider(configCredentials, api.config);
         log(`[Proxy] Default: ${defaultConfig.provider}/${defaultConfig.model}`);
         const realProviderHeader = "X-MemoryX-Real-Provider";
         const sidecarBaseUrl = `http://localhost:${SIDECAR_PORT}`;
-        const realUpstreamCredentials = realUpstreamCredentialsForSidecar(providerCredentials, new Map());
         const proxyUrl = (pluginConfig?.apiBaseUrl || DEFAULT_API_BASE) + "/llm/proxy/chat/completions";
-        const sidecar = new SidecarServer(realUpstreamCredentials, { model: defaultConfig.model, provider: defaultConfig.provider }, defaultConfig.availableProviders, {
-            proxyUrl,
-            getSDK,
-            pluginConfig,
-            onStarted: (logFile) => api.logger.info(`[MemoryX] Plugin log file: ${logFile}`),
-        });
-        const getSidecarBase = () => `http://localhost:${sidecar.getPort()}`;
+        let sidecar = null;
+        const getSidecarBase = () => sidecar ? `http://localhost:${sidecar.getPort()}` : sidecarBaseUrl;
         const { applySidecarRedirect, wrapProvidersWithProxy } = createProxyRedirect(api, getSidecarBase, realProviderHeader);
-        /** 仅当用户当前默认使用的是 memoryx-gateway 时才做拦截/注入，否则不碰配置，避免装完插件就用不了 OpenClaw。 */
-        const shouldApplyProxy = () => getDefaultModelAndProvider(extractProviderCredentials(api.config), api.config).provider === "memoryx-gateway";
-        const syncRealUpstreamBaseUrlCache = () => syncRealUpstreamBaseUrlCacheFromConfig(api.config, getSidecarBase());
-        registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect, shouldApplyProxy, syncRealUpstreamBaseUrlCache);
+        const shouldApplyProxy = () => {
+            const creds = extractProviderCredentials(api.config);
+            return getDefaultModelAndProvider(creds, api.config).provider === "memoryx-gateway";
+        };
+        registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect, shouldApplyProxy);
         api.registerService({
             id: "memoryx-sidecar",
             start: async () => {
                 try {
+                    // Re-read credentials from api.config (pure memory, may have updated since register)
+                    const credentials = extractProviderCredentials(api.config);
+                    const defaults = getDefaultModelAndProvider(credentials, api.config);
+                    // Sync baseUrl cache: config → compare with cache → update non-localhost
+                    await syncRealUpstreamBaseUrlCacheFromConfig(api.config, getSidecarBase());
+                    const realUpstreamCredentials = realUpstreamCredentialsForSidecar(credentials, new Map());
+                    sidecar = new SidecarServer(realUpstreamCredentials, { model: defaults.model, provider: defaults.provider }, defaults.availableProviders, {
+                        proxyUrl,
+                        getSDK,
+                        pluginConfig,
+                        onStarted: (logFile) => api.logger.info(`[MemoryX] Plugin log file: ${logFile}`),
+                    });
                     await sidecar.start();
                     api.logger.info(`[MemoryX] Sidecar started on port ${sidecar.getPort()}`);
+                    if (defaults.provider === "memoryx-gateway") {
+                        wrapProvidersWithProxy();
+                        applySidecarRedirect();
+                    }
                 }
                 catch (e) {
                     api.logger.error(`[MemoryX] Sidecar failed to start: ${e.message}`);
                 }
             },
             stop: async () => {
-                await sidecar.stop();
+                if (sidecar)
+                    await sidecar.stop();
                 api.logger.info("[MemoryX] Sidecar stopped");
             },
         });
-        if (defaultConfig.provider === "memoryx-gateway") {
-            wrapProvidersWithProxy();
-            applySidecarRedirect();
-            api.logger.info(`[MemoryX] ✅ Plugin v${PLUGIN_VERSION} ready! Default is MemoryX Gateway, redirect applied.`);
-        }
-        else {
-            api.logger.info(`[MemoryX] ✅ Plugin v${PLUGIN_VERSION} ready! Default is ${defaultConfig.provider}/${defaultConfig.model}; switch to MemoryX Gateway to use MemoryX.`);
-        }
+        api.logger.info(`[MemoryX] ✅ Plugin v${PLUGIN_VERSION} registered (I/O deferred to service start).`);
         setImmediate(async () => {
             try {
                 await plugin.init();
@@ -89,13 +97,7 @@ export default {
                     api.logger.info(`[MemoryX] 💡 Manage your memories: https://t0ken.ai/portal?api_key=${info.apiKey}`);
                 }
             }
-            catch (e) {
-                // ignore
-            }
-            try {
-                await syncRealUpstreamBaseUrlCacheFromConfig(api.config, sidecarBaseUrl);
-            }
-            catch (e) {
+            catch (_) {
                 // ignore
             }
         });

package/dist/proxy-credentials.d.ts

@@ -1,67 +1,42 @@
 /**
- * Extract and resolve provider credentials from OpenClaw config; default model/provider and available list for fallback.
+ * Extract and resolve provider credentials from OpenClaw config (api.config).
  *
- * API key sources:
- * - OpenClaw may store keys in auth-profiles.json (e.g. openclaw models auth paste-token);
- *   the gateway does auth lookup at runtime and does not merge back into api.config.
- * - The plugin only receives api.config (from openclaw.json), so it can read:
- *   config.models.providers[id].apiKey, env vars, and auth-profiles.json (this module).
- * - If the user configured key only via auth-profiles and not in config/env, we try to
- *   fill apiKey from ~/.openclaw/agents/main/agent/auth-profiles.json by provider.
+ * API key resolution order (same as slimclaw):
+ * 1. providerOverrides[id].apiKey (explicit)
+ * 2. api.config.models.providers[id].apiKey (openclaw.json)
+ * 3. providerOverrides[id].apiKeyEnv → process.env[name]
+ * 4. process.env[${PROVIDER_ID}_API_KEY]
+ *
+ * NO file I/O in this module's credential extraction.
+ * Only real-upstream-baseurl.json cache uses async file I/O.
  */
 import type { ProviderCredentials } from "./types.js";
+/**
+ * Extract provider credentials from api.config only.
+ * Follows slimclaw pattern: config.models.providers + env vars, no system file access.
+ */
 export declare function extractProviderCredentials(config: any, providerOverrides?: Record<string, {
     baseUrl?: string;
     apiKeyEnv?: string;
     apiKey?: string;
 }>): Map<string, ProviderCredentials>;
-/**
- * 在 init 时从 OpenClaw 配置（api.config）读到的「所有厂商 -> baseUrl」做一次快照，不写死任何厂商地址。
- * - 来源唯一：插件启动时通过 api 读到的 openclaw 配置文件（openclaw.json 等）里的 models.providers[id].baseUrl。
- * - 若某条已是 localhost（例如上次 redirect 被持久化），本次仍写入 localhost；恢复依赖 setImmediate 里从缓存文件合并（首次正常时已落盘）。
- * 返回 Map<providerId, baseUrl>，memoryx-gateway 不写入。
- */
 export declare function buildRealUpstreamBaseUrlMap(credentials: Map<string, ProviderCredentials>, _sidecarBaseUrl: string): Map<string, string>;
-/**
- * 用 init 时缓存的「真实上游 baseUrl 映射表」生成供 Sidecar 使用的 credentials。
- * 发给 llm_proxy 的 base_url_map（各厂商 api_base）均来自此映射表（真实 baseUrl），不会被 redirect 后的 localhost 覆盖。
- * 用户改配置后重启即可生效。
- */
 export declare function realUpstreamCredentialsForSidecar(credentials: Map<string, ProviderCredentials>, realUpstreamBaseUrlMap: Map<string, string>): Map<string, ProviderCredentials>;
-/**
- * 从缓存文件加载「厂商 -> 真实 baseUrl」映射。文件不存在或解析失败返回空 Map。
- * 供插件 sync 时使用（先读已有缓存，没有则当空）。
- */
 export declare function loadRealUpstreamBaseUrlCache(): Promise<Map<string, string>>;
+export declare function saveRealUpstreamBaseUrlCache(map: Map<string, string>): Promise<void>;
+export declare function isLocalhostBaseUrl(url: string, sidecarBaseUrl: string): boolean;
 /**
- * 从缓存文件加载「厂商 -> 真实 baseUrl」映射；文件不存在、IO 或解析错误时 throw。
- * 供 Sidecar 每次请求读盘使用，不缓存。
- */
-export declare function loadRealUpstreamBaseUrlCacheStrict(): Promise<Map<string, string>>;
-/**
- * 根据 OpenClaw 配置更新 real-upstream-baseurl.json：非 localhost 的 baseUrl 写入/覆盖，localhost 绝不覆盖。
+ * Sync real-upstream-baseurl.json: config baseUrl vs cache, update non-localhost entries.
  */
 export declare function syncRealUpstreamBaseUrlCacheFromConfig(config: any, sidecarBaseUrl: string): Promise<void>;
-/**
- * 将「厂商 -> 真实 baseUrl」映射写入缓存文件，重启后若配置被改成 localhost 可从此恢复。
- */
-export declare function saveRealUpstreamBaseUrlCache(map: Map<string, string>): Promise<void>;
-/** 判断是否为 localhost（或等于 sidecarBaseUrl），用于合并缓存时决定是否用缓存值覆盖。 */
-export declare function isLocalhostBaseUrl(url: string, sidecarBaseUrl: string): boolean;
-/** Get all available provider/model list (for server fallback/retry); only providers with apiKey set */
 export declare function getAvailableProviders(credentials: Map<string, ProviderCredentials>): Array<{
     provider: string;
     model: string;
 }>;
-/**
- * Default primary: one model per provider (first listed); only providers with apiKey set.
- * Order follows config.models.providers key order (Map insertion order).
- */
 export declare function getDefaultProviderModelList(credentials: Map<string, ProviderCredentials>): Array<{
     provider: string;
     model: string;
 }>;
-/** Get default model/provider and full availableProviders; prefer config.agents.defaults.model.primary, else first in list. */
 export declare function getDefaultModelAndProvider(credentials: Map<string, ProviderCredentials>, config?: any): {
     model: string;
     provider: string;

package/dist/proxy-credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-credentials.d.ts","sourceRoot":"","sources":["../src/proxy-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAuCtD,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,GAAG,EACX,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAC9F,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAiDlC;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACvC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE,MAAM,GACxB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQrB;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC7C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5C,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAWlC;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcjF;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAUvF;AAED;;GAEG;AACH,wBAAsB,sCAAsC,CACxD,MAAM,EAAE,GAAG,EACX,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB1F;AAED,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAI/E;AAOD,wGAAwG;AACxG,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAC9C,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAc5C;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACvC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAC9C,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAU5C;AAoBD,+HAA+H;AAC/H,wBAAgB,0BAA0B,CACtC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,MAAM,CAAC,EAAE,GAAG,GACb;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CA8BrG"}
+{"version":3,"file":"proxy-credentials.d.ts","sourceRoot":"","sources":["../src/proxy-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAStD;;;GAGG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,GAAG,EACX,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAC9F,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAuClC;AAMD,wBAAgB,2BAA2B,CACvC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE,MAAM,GACxB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQrB;AAED,wBAAgB,iCAAiC,CAC7C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5C,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAWlC;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcjF;AAED,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB1F;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAI/E;AAED;;GAEG;AACH,wBAAsB,sCAAsC,CACxD,MAAM,EAAE,GAAG,EACX,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAMD,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAC9C,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAa5C;AAED,wBAAgB,2BAA2B,CACvC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAC9C,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAS5C;AAmBD,wBAAgB,0BAA0B,CACtC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,MAAM,CAAC,EAAE,GAAG,GACb;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CA8BrG"}

package/dist/proxy-credentials.js

@@ -1,40 +1,15 @@
 import { log } from "./logger.js";
 import { PLUGIN_DIR, REAL_UPSTREAM_BASEURL_CACHE_FILE } from "./constants.js";
 import * as fs from "fs";
-import * as path from "path";
-import * as os from "os";
-const DEFAULT_AUTH_PROFILES_PATH = path.join(os.homedir(), ".openclaw", "agents", "main", "agent", "auth-profiles.json");
-/** Parse apiKey by provider from auth-profiles.json. Profile keys are often "providerId" or "providerId:name", matching models.providers id. */
-function loadAuthProfilesKeys(profilesPath) {
-    const out = new Map();
-    try {
-        if (!fs.existsSync(profilesPath))
-            return out;
-        const raw = fs.readFileSync(profilesPath, "utf8");
-        const data = JSON.parse(raw);
-        const profiles = data?.profiles ?? {};
-        for (const [profileId, p] of Object.entries(profiles)) {
-            if (!p || typeof p !== "object")
-                continue;
-            const isApiKey = (p.type === "api_key" || p.mode === "api_key");
-            const value = (p.key ?? p.token ?? "")?.trim();
-            if (!isApiKey || !value)
-                continue;
-            const providerId = profileId.includes(":") ? profileId.split(":")[0] : profileId;
-            if (!out.has(providerId))
-                out.set(providerId, value);
-            if (p.provider && p.provider !== providerId && !out.has(p.provider))
-                out.set(p.provider, value);
-        }
-    }
-    catch (_) {
-        // ignore
-    }
-    return out;
-}
+// ---------------------------------------------------------------------------
+// Provider credentials from api.config (pure memory, no file I/O)
+// ---------------------------------------------------------------------------
+/**
+ * Extract provider credentials from api.config only.
+ * Follows slimclaw pattern: config.models.providers + env vars, no system file access.
+ */
 export function extractProviderCredentials(config, providerOverrides) {
     const credentials = new Map();
-    const authKeys = loadAuthProfilesKeys(DEFAULT_AUTH_PROFILES_PATH);
     if (config?.models?.providers) {
         for (const [id, providerConfig] of Object.entries(config.models.providers)) {
             if (typeof providerConfig !== "object" ||
@@ -51,7 +26,6 @@ export function extractProviderCredentials(config, providerOverrides) {
                     (typeof pc.apiKey === "string" ? pc.apiKey.trim() : "") ||
                     (customEnvName ? process.env[customEnvName] : undefined) ||
                     process.env[`${id.toUpperCase()}_API_KEY`] ||
-                    authKeys.get(id) ||
                     "";
                 const isMemoryxGateway = (id === "memoryx-gateway");
                 credentials.set(id, {
@@ -63,21 +37,13 @@ export function extractProviderCredentials(config, providerOverrides) {
         }
     }
     if (credentials.size > 0) {
-        const parts = [...credentials.entries()].map(([id, c]) => `${id}(${c.models?.length ?? 0})`);
-        const authFromProfiles = [...credentials.keys()].filter((id) => authKeys.has(id));
-        const summary = authFromProfiles.length > 0
-            ? `[Proxy] Credentials: ${parts.join(", ")}; apiKey from auth-profiles: ${authFromProfiles.join(", ")}`
-            : `[Proxy] Credentials: ${parts.join(", ")}`;
-        log(summary);
+        log(`[Proxy] Providers: ${[...credentials.keys()].join(", ")}`);
     }
     return credentials;
 }
-/**
- * 在 init 时从 OpenClaw 配置（api.config）读到的「所有厂商 -> baseUrl」做一次快照，不写死任何厂商地址。
- * - 来源唯一：插件启动时通过 api 读到的 openclaw 配置文件（openclaw.json 等）里的 models.providers[id].baseUrl。
- * - 若某条已是 localhost（例如上次 redirect 被持久化），本次仍写入 localhost；恢复依赖 setImmediate 里从缓存文件合并（首次正常时已落盘）。
- * 返回 Map<providerId, baseUrl>，memoryx-gateway 不写入。
- */
+// ---------------------------------------------------------------------------
+// baseUrl cache (real-upstream-baseurl.json) — async file I/O only
+// ---------------------------------------------------------------------------
 export function buildRealUpstreamBaseUrlMap(credentials, _sidecarBaseUrl) {
     const map = new Map();
     for (const [id, creds] of credentials) {
@@ -88,11 +54,6 @@ export function buildRealUpstreamBaseUrlMap(credentials, _sidecarBaseUrl) {
     }
     return map;
 }
-/**
- * 用 init 时缓存的「真实上游 baseUrl 映射表」生成供 Sidecar 使用的 credentials。
- * 发给 llm_proxy 的 base_url_map（各厂商 api_base）均来自此映射表（真实 baseUrl），不会被 redirect 后的 localhost 覆盖。
- * 用户改配置后重启即可生效。
- */
 export function realUpstreamCredentialsForSidecar(credentials, realUpstreamBaseUrlMap) {
     const out = new Map();
     for (const [id, creds] of credentials) {
@@ -105,10 +66,6 @@ export function realUpstreamCredentialsForSidecar(credentials, realUpstreamBaseU
     }
     return out;
 }
-/**
- * 从缓存文件加载「厂商 -> 真实 baseUrl」映射。文件不存在或解析失败返回空 Map。
- * 供插件 sync 时使用（先读已有缓存，没有则当空）。
- */
 export async function loadRealUpstreamBaseUrlCache() {
     try {
         const raw = await fs.promises.readFile(REAL_UPSTREAM_BASEURL_CACHE_FILE, "utf8");
@@ -126,24 +83,28 @@ export async function loadRealUpstreamBaseUrlCache() {
         return new Map();
     }
 }
-/**
- * 从缓存文件加载「厂商 -> 真实 baseUrl」映射；文件不存在、IO 或解析错误时 throw。
- * 供 Sidecar 每次请求读盘使用，不缓存。
- */
-export async function loadRealUpstreamBaseUrlCacheStrict() {
-    const raw = await fs.promises.readFile(REAL_UPSTREAM_BASEURL_CACHE_FILE, "utf8");
-    const obj = JSON.parse(raw);
-    const map = new Map();
-    if (obj && typeof obj === "object") {
-        for (const [id, url] of Object.entries(obj)) {
-            if (id && typeof url === "string" && url.trim())
-                map.set(id, url.trim());
+export async function saveRealUpstreamBaseUrlCache(map) {
+    try {
+        await fs.promises.mkdir(PLUGIN_DIR, { recursive: true });
+        const obj = {};
+        for (const [id, url] of map) {
+            if (id !== "memoryx-gateway" && url)
+                obj[id] = url;
         }
+        await fs.promises.writeFile(REAL_UPSTREAM_BASEURL_CACHE_FILE, JSON.stringify(obj, null, 2), "utf8");
+        log(`[Proxy] baseUrl cache saved`);
+    }
+    catch (e) {
+        log(`[Proxy] Failed to save real upstream cache: ${e?.message ?? e}`);
     }
-    return map;
+}
+export function isLocalhostBaseUrl(url, sidecarBaseUrl) {
+    const u = (url || "").trim().toLowerCase().replace(/\/$/, "");
+    const sidecarNorm = (sidecarBaseUrl || "").toLowerCase().replace(/\/$/, "");
+    return !u || u.includes("localhost") || (!!sidecarNorm && u === sidecarNorm);
 }
 /**
- * 根据 OpenClaw 配置更新 real-upstream-baseurl.json：非 localhost 的 baseUrl 写入/覆盖，localhost 绝不覆盖。
+ * Sync real-upstream-baseurl.json: config baseUrl vs cache, update non-localhost entries.
  */
 export async function syncRealUpstreamBaseUrlCacheFromConfig(config, sidecarBaseUrl) {
     let cached;
@@ -165,40 +126,12 @@ export async function syncRealUpstreamBaseUrlCacheFromConfig(config, sidecarBase
     }
     await saveRealUpstreamBaseUrlCache(merged);
 }
-/**
- * 将「厂商 -> 真实 baseUrl」映射写入缓存文件，重启后若配置被改成 localhost 可从此恢复。
- */
-export async function saveRealUpstreamBaseUrlCache(map) {
-    try {
-        await fs.promises.mkdir(PLUGIN_DIR, { recursive: true });
-        const obj = {};
-        for (const [id, url] of map) {
-            if (id !== "memoryx-gateway" && url)
-                obj[id] = url;
-        }
-        await fs.promises.writeFile(REAL_UPSTREAM_BASEURL_CACHE_FILE, JSON.stringify(obj, null, 2), "utf8");
-        log(`[Proxy] Saved real upstream baseUrl cache to ${REAL_UPSTREAM_BASEURL_CACHE_FILE}`);
-    }
-    catch (e) {
-        log(`[Proxy] Failed to save real upstream cache: ${e?.message ?? e}`);
-    }
-}
-/** 判断是否为 localhost（或等于 sidecarBaseUrl），用于合并缓存时决定是否用缓存值覆盖。 */
-export function isLocalhostBaseUrl(url, sidecarBaseUrl) {
-    const u = (url || "").trim().toLowerCase().replace(/\/$/, "");
-    const sidecarNorm = (sidecarBaseUrl || "").toLowerCase().replace(/\/$/, "");
-    return !u || u.includes("localhost") || (!!sidecarNorm && u === sidecarNorm);
-}
-/** Only include providers with non-empty apiKey to avoid invalid Bearer header */
-function hasApiKey(creds) {
-    return ((creds.apiKey ?? "").trim().length > 0);
-}
-/** Get all available provider/model list (for server fallback/retry); only providers with apiKey set */
+// ---------------------------------------------------------------------------
+// Provider list helpers (pure memory)
+// ---------------------------------------------------------------------------
 export function getAvailableProviders(credentials) {
     const result = [];
     for (const [providerId, creds] of credentials) {
-        if (!hasApiKey(creds))
-            continue;
         if (creds.models && creds.models.length > 0) {
             for (const m of creds.models) {
                 const id = m.id || m.name;
@@ -206,21 +139,15 @@ export function getAvailableProviders(credentials) {
                     result.push({ provider: providerId, model: id });
             }
         }
-        else {
+        else if (creds.baseUrl) {
             result.push({ provider: providerId, model: "" });
         }
     }
     return result;
 }
-/**
- * Default primary: one model per provider (first listed); only providers with apiKey set.
- * Order follows config.models.providers key order (Map insertion order).
- */
 export function getDefaultProviderModelList(credentials) {
     const result = [];
     for (const [providerId, creds] of credentials) {
-        if (!hasApiKey(creds))
-            continue;
         if (creds.models?.length) {
             const id = creds.models[0].id || creds.models[0].name;
             if (id)
@@ -229,7 +156,6 @@ export function getDefaultProviderModelList(credentials) {
     }
     return result;
 }
-/** Find provider/model in available list matching primary (primary format: "provider/modelId") */
 function resolvePrimaryInAvailable(primary, available) {
     if (!primary || typeof primary !== "string")
         return null;
@@ -247,7 +173,6 @@ function resolvePrimaryInAvailable(primary, available) {
         return { provider: wantProvider, model: wantModel };
     return null;
 }
-/** Get default model/provider and full availableProviders; prefer config.agents.defaults.model.primary, else first in list. */
 export function getDefaultModelAndProvider(credentials, config) {
     const defaultList = getDefaultProviderModelList(credentials);
     const availableAll = getAvailableProviders(credentials);

package/dist/proxy-redirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-redirect.d.ts","sourceRoot":"","sources":["../src/proxy-redirect.ts"],"names":[],"mappings":"AAMA,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,MAAM,EAC5B,kBAAkB,EAAE,MAAM,GAC3B;IACC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,sBAAsB,EAAE,MAAM,IAAI,CAAC;CACtC,CAoEA"}
+{"version":3,"file":"proxy-redirect.d.ts","sourceRoot":"","sources":["../src/proxy-redirect.ts"],"names":[],"mappings":"AAyBA,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,MAAM,EAC5B,kBAAkB,EAAE,MAAM,GAC3B;IACC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,sBAAsB,EAAE,MAAM,IAAI,CAAC;CACtC,CAyDA"}

package/dist/proxy-redirect.js

@@ -1,22 +1,40 @@
 /**
  * Redirect provider baseUrl to Sidecar and wrap config so reads always resolve to Sidecar.
+ *
+ * Neither function performs file I/O. They only mutate api.config in memory.
  */
-import { extractProviderCredentials } from "./proxy-credentials.js";
 import { log } from "./logger.js";
+/**
+ * Get all non-memoryx-gateway provider IDs from api.config.models.providers.
+ * Pure memory read, no file I/O.
+ */
+function getProviderIds(config) {
+    const providers = config?.models?.providers;
+    if (!providers || typeof providers !== "object")
+        return [];
+    const ids = [];
+    for (const id of Object.keys(providers)) {
+        if (id === "memoryx-gateway")
+            continue;
+        const p = providers[id];
+        if (p && typeof p === "object" && "baseUrl" in p) {
+            ids.push(id);
+        }
+    }
+    return ids;
+}
 export function createProxyRedirect(api, getSidecarBase, realProviderHeader) {
     const applySidecarRedirect = (opts) => {
         const sidecarBase = getSidecarBase();
-        const creds = extractProviderCredentials(api.config);
-        if (!api.config?.models?.providers || creds.size === 0) {
+        const providerIds = getProviderIds(api.config);
+        if (providerIds.length === 0) {
             if (!opts?.quiet)
-                log(`[Proxy] No providers to redirect (providers exists: ${!!api.config?.models?.providers}, creds: ${creds.size})`, { console: true });
+                log(`[Proxy] No providers to redirect`, { console: true });
             return;
         }
         const providers = api.config.models.providers;
         let n = 0;
-        for (const providerId of creds.keys()) {
-            if (providerId === "memoryx-gateway")
-                continue;
+        for (const providerId of providerIds) {
             const p = providers[providerId];
             if (!p || typeof p !== "object")
                 continue;
@@ -28,31 +46,20 @@ export function createProxyRedirect(api, getSidecarBase, realProviderHeader) {
             log(`[Proxy] Redirected provider "${providerId}" baseUrl → Sidecar, header ${realProviderHeader}=${providerId}`);
         }
         if (n > 0 && !opts?.quiet) {
-            api.logger.info(`[MemoryX] ✅ Sidecar redirect applied for ${n} provider(s). Use your configured model (e.g. zai/glm-5).`);
-            log(`[Proxy] Sidecar redirect applied for ${n} provider(s)`, { console: true });
-        }
-        if (n > 0) {
-            for (const providerId of creds.keys()) {
-                if (providerId === "memoryx-gateway")
-                    continue;
-                const p = providers[providerId];
-                const readBack = (p && typeof p === "object" && p.baseUrl) ? p.baseUrl : "<missing>";
-                const isSidecar = readBack === sidecarBase;
-                log(`[Proxy] Readback ${providerId}.baseUrl = ${readBack} ${isSidecar ? "(Sidecar ✓)" : "(NOT Sidecar!)"}`);
-            }
+            api.logger.info(`[MemoryX] ✅ Sidecar redirect applied for ${n} provider(s).`);
         }
     };
     const wrapProvidersWithProxy = () => {
         if (!api.config?.models?.providers || typeof api.config.models.providers !== "object")
             return;
-        const creds = extractProviderCredentials(api.config);
-        if (creds.size === 0)
+        const providerIds = new Set(getProviderIds(api.config));
+        if (providerIds.size === 0)
             return;
         const raw = api.config.models.providers;
         const handler = {
             get(target, prop) {
                 const val = target[prop];
-                if (val && typeof val === "object" && creds.has(prop) && prop !== "memoryx-gateway") {
+                if (val && typeof val === "object" && providerIds.has(prop)) {
                     return new Proxy(val, {
                         get(t, k) {
                             if (k === "baseUrl")

package/dist/sidecar.d.ts

@@ -1,6 +1,7 @@
 /**
- * Local HTTP Sidecar: 轻量化转发。只读 base_url_map + credentials，打包发给服务端；
- * 服务端解析 provider、用 api_base 调 LiteLLM（不拼 URL），做记忆注入。无本地解析、无 target。
+ * Local HTTP Sidecar: lightweight forwarder.
+ * Reads base_url_map from local cache file, credentials from constructor (api.config).
+ * Packages payload and POSTs to MemoryX API server.
  */
 import type { ProviderCredentials } from "./types.js";
 import type { PluginConfig } from "./types.js";
@@ -27,7 +28,6 @@ export declare class SidecarServer {
     start(): Promise<void>;
     stop(): Promise<void>;
     getPort(): number;
-    /** 轻量化：只读 base_url_map + credentials，打包发给服务端；不做 provider 解析、无 target。 */
     private handleRequest;
     private readBody;
 }

package/dist/sidecar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,eAAe,CAAsC;IAC7D,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAiB;gBAG5B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EACpD,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC9D,OAAO,EAAE,cAAc;IAQrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,OAAO,IAAI,MAAM;IAMjB,yEAAyE;YAC3D,aAAa;IAqK3B,OAAO,CAAC,QAAQ;CAQnB"}
+{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,eAAe,CAAsC;IAC7D,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAiB;gBAG5B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EACpD,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC9D,OAAO,EAAE,cAAc;IAQrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,OAAO,IAAI,MAAM;YAMH,aAAa;IAgM3B,OAAO,CAAC,QAAQ;CAQnB"}

package/dist/sidecar.js

@@ -1,6 +1,7 @@
 /**
- * Local HTTP Sidecar: 轻量化转发。只读 base_url_map + credentials，打包发给服务端；
- * 服务端解析 provider、用 api_base 调 LiteLLM（不拼 URL），做记忆注入。无本地解析、无 target。
+ * Local HTTP Sidecar: lightweight forwarder.
+ * Reads base_url_map from local cache file, credentials from constructor (api.config).
+ * Packages payload and POSTs to MemoryX API server.
  */
 import * as http from "http";
 import { SIDECAR_PORT } from "./constants.js";
@@ -60,7 +61,6 @@ export class SidecarServer {
             ? this.server.address().port
             : SIDECAR_PORT;
     }
-    /** 轻量化：只读 base_url_map + credentials，打包发给服务端；不做 provider 解析、无 target。 */
     async handleRequest(req, res) {
         const url = req.url || "/";
         const method = req.method?.toUpperCase();
@@ -71,6 +71,7 @@ export class SidecarServer {
             return;
         }
         const reqId = `req-${Date.now()}`;
+        log(`[Sidecar] ${reqId} in ${method} ${url}`, { console: true });
         let body;
         try {
             body = await this.readBody(req);
@@ -89,6 +90,7 @@ export class SidecarServer {
             openaiRequest = {};
         }
         const stream = !!openaiRequest.stream;
+        // Read base_url_map from cache file (async)
         let baseUrlMap;
         try {
             baseUrlMap = await loadRealUpstreamBaseUrlCache();
@@ -101,16 +103,20 @@ export class SidecarServer {
             if (id && u?.trim())
                 baseUrlMapObj[id] = u.trim();
         }
+        const rawProvider = req.headers["x-memoryx-real-provider"]?.trim() || "";
+        const authHeader = req.headers["authorization"]?.trim() || "";
+        const incomingApiKey = authHeader.startsWith("Bearer ")
+            ? authHeader.slice(7).trim()
+            : authHeader;
+        // Build credentials: use incoming Authorization header as apiKey for the target provider
         const credentialsObj = {};
-        for (const [id, c] of this.credentials) {
-            if (!c)
-                continue;
-            credentialsObj[id] = {
-                apiKey: (c.apiKey ?? "").trim(),
-                models: c.models,
-            };
+        for (const [id, creds] of this.credentials) {
+            const realBaseUrl = baseUrlMapObj[id] || creds.baseUrl || "";
+            const apiKey = (id === rawProvider && incomingApiKey)
+                ? incomingApiKey
+                : (creds.apiKey || "");
+            credentialsObj[id] = { baseUrl: realBaseUrl, apiKey };
         }
-        const rawProvider = req.headers["x-memoryx-real-provider"]?.trim() || "";
         const messages = openaiRequest.messages || [];
         const lastUserMsg = [...messages].reverse().find((m) => m.role === "user");
         const searchQuery = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
@@ -128,6 +134,7 @@ export class SidecarServer {
         const proxyRequestBody = {
             base_url_map: baseUrlMapObj,
             credentials: credentialsObj,
+            incoming_api_key: incomingApiKey || undefined,
             body: openaiRequest,
             request_headers: { "x-memoryx-real-provider": rawProvider },
             search_query: searchQuery,
@@ -135,18 +142,25 @@ export class SidecarServer {
             available_models: this.availableProviders.map((p) => `${p.provider}/${p.model}`),
         };
         const pathLog = (req.url || "/").split("?")[0] || "/";
-        log(`[Sidecar] ${reqId} ${method} ${pathLog} model=${openaiRequest.model ?? "-"} stream=${stream} → proxy`);
+        log(`[Sidecar] ${reqId} ${method} ${pathLog} model=${openaiRequest.model ?? "-"} stream=${stream} → proxy ${proxyUrl}`, { console: true });
+        const fetchAbort = new AbortController();
+        const fetchTimer = setTimeout(() => fetchAbort.abort(), 120_000);
         let proxyResponse = null;
         try {
             proxyResponse = await fetch(proxyUrl, {
                 method: "POST",
                 headers: { "Content-Type": "application/json", "X-API-Key": memoryxApiKey },
                 body: JSON.stringify(proxyRequestBody),
+                signal: fetchAbort.signal,
             });
         }
         catch (e) {
             proxyResponse = null;
-            log(`[Sidecar] ${reqId} err proxy fetch: ${e?.message ?? String(e)}`, { console: true });
+            const msg = fetchAbort.signal.aborted ? "fetch timeout (120s)" : (e?.message ?? String(e));
+            log(`[Sidecar] ${reqId} err proxy fetch: ${msg}`, { console: true });
+        }
+        finally {
+            clearTimeout(fetchTimer);
         }
         const proxyFailed = !proxyResponse || proxyResponse.status >= 500;
         if (proxyFailed) {
@@ -173,15 +187,20 @@ export class SidecarServer {
         const proxy = proxyResponse;
         if (openaiRequest.stream && proxy.body) {
             const reader = proxy.body.getReader();
+            const CHUNK_TIMEOUT = 90_000;
+            const readWithTimeout = () => Promise.race([
+                reader.read(),
+                new Promise((_, rej) => setTimeout(() => rej(new Error("chunk timeout")), CHUNK_TIMEOUT)),
+            ]);
             let firstChunk;
             try {
-                firstChunk = await Promise.race([
-                    reader.read(),
-                    new Promise((_, rej) => setTimeout(() => rej(new Error("First chunk timeout")), 15000)),
-                ]);
+                firstChunk = await readWithTimeout();
             }
             catch (firstErr) {
-                reader.releaseLock();
+                try {
+                    reader.releaseLock();
+                }
+                catch (_) { }
                 log(`[Sidecar] ${reqId} err stream first chunk: ${firstErr?.message ?? "timeout"}`, { console: true });
                 res.writeHead(502, { "Content-Type": "application/json" });
                 res.end(JSON.stringify({ error: "MemoryX proxy stream failed" }));
@@ -194,17 +213,27 @@ export class SidecarServer {
                 if (!firstChunk.done && firstChunk.value)
                     res.write(Buffer.from(firstChunk.value));
                 while (true) {
-                    const { done, value } = await reader.read();
-                    if (done)
+                    if (res.destroyed) {
+                        log(`[Sidecar] ${reqId} client disconnected, aborting stream`, { console: true });
+                        break;
+                    }
+                    const { done, value } = await readWithTimeout();
+                    if (done || !value)
                         break;
                     res.write(Buffer.from(value));
                 }
             }
+            catch (streamErr) {
+                log(`[Sidecar] ${reqId} stream error: ${streamErr?.message ?? "unknown"}`, { console: true });
+            }
             finally {
-                reader.releaseLock();
+                try {
+                    reader.releaseLock();
+                }
+                catch (_) { }
             }
             res.end();
-            log(`[Sidecar] ${reqId} ← ${proxy.status} stream`);
+            log(`[Sidecar] ${reqId} ← ${proxy.status} stream`, { console: true });
             return;
         }
         if (!proxy.body) {
@@ -212,11 +241,11 @@ export class SidecarServer {
                 "Content-Type": proxy.headers.get("content-type") || "application/json",
             });
             res.end();
-            log(`[Sidecar] ${reqId} ← ${proxy.status} (no body)`);
+            log(`[Sidecar] ${reqId} ← ${proxy.status} (no body)`, { console: true });
             return;
         }
         const text = await proxy.text();
-        log(`[Sidecar] ${reqId} ← ${proxy.status} body=${text.length}`);
+        log(`[Sidecar] ${reqId} ← ${proxy.status} body=${text.length}`, { console: true });
         res.writeHead(proxy.status, {
             "Content-Type": proxy.headers.get("content-type") || "application/json",
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t0ken.ai/memoryx-openclaw-plugin",
-  "version": "2.2.64",
+  "version": "2.2.66",
   "description": "MemoryX real-time memory capture and recall plugin for OpenClaw (powered by @t0ken.ai/memoryx-sdk)",
   "type": "module",
   "author": "MemoryX Team",