@t0ken.ai/memoryx-openclaw-plugin 2.2.61 → 2.2.63

package/README.md

@@ -175,14 +175,14 @@ Memories are categorized by the server:
 **SlimClaw-style (recommended, no file changes):** Like SlimClaw, you can use a **virtual provider** so all traffic goes through the Sidecar without the plugin mutating config or files. Add this to `~/.openclaw/openclaw.json` under `models.providers`:
 
 ```json
-"memoryx-proxy": {
+"memoryx-gateway": {
   "baseUrl": "http://localhost:3335/v1",
   "apiKey": "placeholder",
   "models": [{ "id": "auto" }]
 }
 ```
 
-Then add an auth profile for `memoryx-proxy` (e.g. in `~/.openclaw/agents/main/agent/auth-profiles.json` or global auth) with any placeholder key. In the UI, choose model **memoryx-proxy/auto**. Requests will go to the Sidecar, which forwards to the MemoryX server with your real provider credentials (you configure which provider/model to use via the plugin/Sidecar logic). The plugin does not modify your config or `models.json`; it only runs the Sidecar.
+Then add an auth profile for `memoryx-gateway` (e.g. in `~/.openclaw/agents/main/agent/auth-profiles.json` or global auth) with any placeholder key. In the UI, choose model **MemoryX Gateway** (id: `memoryx-gateway/auto`). Requests will go to the Sidecar, which forwards to the MemoryX server with your real provider credentials (you configure which provider/model to use via the plugin/Sidecar logic). The plugin does not modify your config or `models.json`; it only runs the Sidecar.
 
 ## License
 

package/dist/constants.d.ts

@@ -1,8 +1,10 @@
-export declare const PLUGIN_VERSION = "2.2.61";
+export declare const PLUGIN_VERSION = "2.2.63";
 export declare const DEFAULT_API_BASE = "https://t0ken.ai/api";
 export declare const PLUGIN_DIR: string;
 /** 真实上游 baseUrl 缓存文件：重启后若配置已被改成 localhost，从此文件恢复各厂商真实地址。 */
 export declare const REAL_UPSTREAM_BASEURL_CACHE_FILE: string;
 /** Sidecar HTTP port — fixed so openclaw.json can point to localhost:37169. Do not use a range. */
 export declare const SIDECAR_PORT = 37169;
+/** 单条 plugin.log 最大字节数，超过则轮转为 plugin.log.old 并重新写。 */
+export declare const MAX_LOG_FILE_BYTES: number;
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,gBAAgB,yBAAyB,CAAC;AAEvD,eAAO,MAAM,UAAU,QAAgF,CAAC;AAExG,4DAA4D;AAC5D,eAAO,MAAM,gCAAgC,QAAsD,CAAC;AAEpG,mGAAmG;AACnG,eAAO,MAAM,YAAY,QAAQ,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,gBAAgB,yBAAyB,CAAC;AAEvD,eAAO,MAAM,UAAU,QAAgF,CAAC;AAExG,4DAA4D;AAC5D,eAAO,MAAM,gCAAgC,QAAsD,CAAC;AAEpG,mGAAmG;AACnG,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,QAAkB,CAAC"}

package/dist/constants.js

@@ -4,10 +4,12 @@
 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.61";
+export const PLUGIN_VERSION = "2.2.63";
 export const DEFAULT_API_BASE = "https://t0ken.ai/api";
 export const PLUGIN_DIR = path.join(os.homedir(), ".openclaw", "extensions", "memoryx-openclaw-plugin");
 /** 真实上游 baseUrl 缓存文件：重启后若配置已被改成 localhost，从此文件恢复各厂商真实地址。 */
 export const REAL_UPSTREAM_BASEURL_CACHE_FILE = path.join(PLUGIN_DIR, "real-upstream-baseurl.json");
 /** Sidecar HTTP port — fixed so openclaw.json can point to localhost:37169. Do not use a range. */
 export const SIDECAR_PORT = 37169;
+/** 单条 plugin.log 最大字节数，超过则轮转为 plugin.log.old 并重新写。 */
+export const MAX_LOG_FILE_BYTES = 2 * 1024 * 1024; // 2MB

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): void;
+}) => void, shouldApplyProxy: () => boolean, syncRealUpstreamBaseUrlCache?: () => Promise<void>): 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,GAC3D,IAAI,CAyCN"}
+{"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"}

package/dist/hooks.js

@@ -1,4 +1,4 @@
-export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect) {
+export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect, shouldApplyProxy, syncRealUpstreamBaseUrlCache) {
     let useVirtualProviderInLastRun = false;
     api.on("message_received", async (event) => {
         const { content } = event;
@@ -6,27 +6,26 @@ export function registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarR
             await plugin.onMessage("user", content);
     });
     api.on("llm_input", (_event) => {
-        useVirtualProviderInLastRun = _event?.provider === "memoryx-proxy";
+        useVirtualProviderInLastRun = _event?.provider === "memoryx-gateway";
     });
     api.on("llm_output", async (event) => {
-        const { assistantTexts, provider } = event;
-        if (assistantTexts && Array.isArray(assistantTexts) && plugin && provider !== "memoryx-proxy") {
+        const { assistantTexts } = event;
+        if (assistantTexts && Array.isArray(assistantTexts) && plugin) {
             const fullContent = assistantTexts.join("\n");
             if (fullContent && fullContent.length >= 2)
                 await plugin.onMessage("assistant", fullContent);
         }
     });
     api.on("before_agent_start", async (event) => {
-        wrapProvidersWithProxy();
-        applySidecarRedirect({ quiet: true });
-        const { prompt } = event;
-        if (!prompt || prompt.length < 2 || !plugin)
-            return;
+        if (shouldApplyProxy()) {
+            await syncRealUpstreamBaseUrlCache?.();
+            wrapProvidersWithProxy();
+            applySidecarRedirect({ quiet: true });
+        }
         try {
             await plugin.startTimersIfNeeded();
-            await plugin.onMessage("user", prompt);
-            // 记忆注入改由服务端 llm_proxy 在转发前注入到请求体（system/消息），不在此处用 prependContext，
-            // 避免 OpenClaw 把 prependContext 当成单独用户消息写入历史（role=user 的 MemoryX Context 条）。
+            // 用户消息只由 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.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;;;;;;kBAyBvC,GAAG,iBAAiB,YAAY,GAAG,IAAI;;AARzD,wBAkGE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"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"}

package/dist/index.js

@@ -16,7 +16,7 @@
 import { PLUGIN_VERSION, DEFAULT_API_BASE, SIDECAR_PORT } from "./constants.js";
 import { log, LOG_FILE } from "./logger.js";
 import { MemoryXPlugin, getSDK } from "./plugin-core.js";
-import { extractProviderCredentials, getDefaultModelAndProvider, buildRealUpstreamBaseUrlMap, realUpstreamCredentialsForSidecar, loadRealUpstreamBaseUrlCache, saveRealUpstreamBaseUrlCache, isLocalhostBaseUrl, } from "./proxy-credentials.js";
+import { extractProviderCredentials, getDefaultModelAndProvider, realUpstreamCredentialsForSidecar, syncRealUpstreamBaseUrlCacheFromConfig, } from "./proxy-credentials.js";
 import { createProxyRedirect } from "./proxy-redirect.js";
 import { SidecarServer } from "./sidecar.js";
 import { registerHooks } from "./hooks.js";
@@ -43,8 +43,7 @@ export default {
         log(`[Proxy] Default: ${defaultConfig.provider}/${defaultConfig.model}`);
         const realProviderHeader = "X-MemoryX-Real-Provider";
         const sidecarBaseUrl = `http://localhost:${SIDECAR_PORT}`;
-        const realUpstreamBaseUrlMap = buildRealUpstreamBaseUrlMap(providerCredentials, sidecarBaseUrl);
-        const realUpstreamCredentials = realUpstreamCredentialsForSidecar(providerCredentials, realUpstreamBaseUrlMap);
+        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,
@@ -54,7 +53,10 @@ export default {
         });
         const getSidecarBase = () => `http://localhost:${sidecar.getPort()}`;
         const { applySidecarRedirect, wrapProvidersWithProxy } = createProxyRedirect(api, getSidecarBase, realProviderHeader);
-        registerHooks(api, plugin, wrapProvidersWithProxy, applySidecarRedirect);
+        /** 仅当用户当前默认使用的是 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);
         api.registerService({
             id: "memoryx-sidecar",
             start: async () => {
@@ -71,9 +73,14 @@ export default {
                 api.logger.info("[MemoryX] Sidecar stopped");
             },
         });
-        wrapProvidersWithProxy();
-        applySidecarRedirect();
-        api.logger.info(`[MemoryX] ✅ Plugin v${PLUGIN_VERSION} ready! Requests go through MemoryX proxy with your configured model.`);
+        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.`);
+        }
         setImmediate(async () => {
             try {
                 await plugin.init();
@@ -86,19 +93,7 @@ export default {
                 // ignore
             }
             try {
-                const cached = await loadRealUpstreamBaseUrlCache();
-                const merged = new Map(realUpstreamBaseUrlMap);
-                for (const [id, url] of cached) {
-                    const current = merged.get(id);
-                    if (current && isLocalhostBaseUrl(current, sidecarBaseUrl) && url) {
-                        merged.set(id, url);
-                        log(`[Proxy] Restored ${id} baseUrl from cache (config was localhost)`);
-                    }
-                }
-                if (cached.size > 0 && merged.size > 0) {
-                    sidecar.updateRealUpstreamBaseUrlMap(merged);
-                }
-                await saveRealUpstreamBaseUrlCache(merged);
+                await syncRealUpstreamBaseUrlCacheFromConfig(api.config, sidecarBaseUrl);
             }
             catch (e) {
                 // ignore

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,QAAQ,QAAsC,CAAC;AAQ5D;;;GAGG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,IAAI,CA8B9E"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,QAAQ,QAAsC,CAAC;AA4B5D;;;GAGG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,IAAI,CAiD9E"}

package/dist/logger.js

@@ -1,17 +1,44 @@
 /**
  * Layered logging: file always, optional console for important messages.
+ * Log file size is capped: when plugin.log exceeds MAX_LOG_FILE_BYTES it is rotated to plugin.log.old and a new file is started.
  */
 import * as fs from "fs";
 import * as path from "path";
-import { PLUGIN_DIR } from "./constants.js";
+import { PLUGIN_DIR, MAX_LOG_FILE_BYTES } from "./constants.js";
 let logStream = null;
 let logStreamReady = false;
+let writeCount = 0;
+const CHECK_ROTATE_EVERY = 500;
 export const LOG_FILE = path.join(PLUGIN_DIR, "plugin.log");
+const LOG_FILE_OLD = path.join(PLUGIN_DIR, "plugin.log.old");
 function ensureDir() {
     if (!fs.existsSync(PLUGIN_DIR)) {
         fs.mkdirSync(PLUGIN_DIR, { recursive: true });
     }
 }
+function rotateIfNeeded() {
+    try {
+        if (!fs.existsSync(LOG_FILE))
+            return;
+        const stat = fs.statSync(LOG_FILE);
+        if (stat.size < MAX_LOG_FILE_BYTES)
+            return;
+        if (logStream) {
+            try {
+                logStream.end();
+            }
+            catch (_) { }
+            logStream = null;
+            logStreamReady = false;
+        }
+        if (fs.existsSync(LOG_FILE_OLD))
+            fs.unlinkSync(LOG_FILE_OLD);
+        fs.renameSync(LOG_FILE, LOG_FILE_OLD);
+    }
+    catch (_) {
+        /* ignore */
+    }
+}
 /**
  * Layered logging: all logs go to file (stream when ready, else sync append so nothing is lost).
  * When console=true, also log to console (for important/guidance messages).
@@ -26,8 +53,28 @@ export function log(message, options = {}) {
         try {
             if (!logStreamReady) {
                 ensureDir();
+                rotateIfNeeded();
                 logStream = fs.createWriteStream(LOG_FILE, { flags: "a" });
                 logStreamReady = true;
+                writeCount = 0;
+            }
+            writeCount++;
+            if (writeCount >= CHECK_ROTATE_EVERY) {
+                writeCount = 0;
+                try {
+                    if (fs.existsSync(LOG_FILE)) {
+                        const stat = fs.statSync(LOG_FILE);
+                        if (stat.size >= MAX_LOG_FILE_BYTES) {
+                            rotateIfNeeded();
+                            if (!logStreamReady) {
+                                ensureDir();
+                                logStream = fs.createWriteStream(LOG_FILE, { flags: "a" });
+                                logStreamReady = true;
+                            }
+                        }
+                    }
+                }
+                catch (_) { }
             }
             logStream?.write(line, (err) => {
                 if (err) {

package/dist/proxy-credentials.d.ts

@@ -19,7 +19,7 @@ export declare function extractProviderCredentials(config: any, providerOverride
  * 在 init 时从 OpenClaw 配置（api.config）读到的「所有厂商 -> baseUrl」做一次快照，不写死任何厂商地址。
  * - 来源唯一：插件启动时通过 api 读到的 openclaw 配置文件（openclaw.json 等）里的 models.providers[id].baseUrl。
  * - 若某条已是 localhost（例如上次 redirect 被持久化），本次仍写入 localhost；恢复依赖 setImmediate 里从缓存文件合并（首次正常时已落盘）。
- * 返回 Map<providerId, baseUrl>，memoryx-proxy 不写入。
+ * 返回 Map<providerId, baseUrl>，memoryx-gateway 不写入。
  */
 export declare function buildRealUpstreamBaseUrlMap(credentials: Map<string, ProviderCredentials>, _sidecarBaseUrl: string): Map<string, string>;
 /**
@@ -30,8 +30,18 @@ export declare function buildRealUpstreamBaseUrlMap(credentials: Map<string, Pro
 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>>;
+/**
+ * 从缓存文件加载「厂商 -> 真实 baseUrl」映射；文件不存在、IO 或解析错误时 throw。
+ * 供 Sidecar 每次请求读盘使用，不缓存。
+ */
+export declare function loadRealUpstreamBaseUrlCacheStrict(): Promise<Map<string, string>>;
+/**
+ * 根据 OpenClaw 配置更新 real-upstream-baseurl.json：非 localhost 的 baseUrl 写入/覆盖，localhost 绝不覆盖。
+ */
+export declare function syncRealUpstreamBaseUrlCacheFromConfig(config: any, sidecarBaseUrl: string): Promise<void>;
 /**
  * 将「厂商 -> 真实 baseUrl」映射写入缓存文件，重启后若配置被改成 localhost 可从此恢复。
  */

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,CA0ClC;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;;GAEG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcjF;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;;;;;;;;;;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"}

package/dist/proxy-credentials.js

@@ -35,9 +35,6 @@ function loadAuthProfilesKeys(profilesPath) {
 export function extractProviderCredentials(config, providerOverrides) {
     const credentials = new Map();
     const authKeys = loadAuthProfilesKeys(DEFAULT_AUTH_PROFILES_PATH);
-    if (authKeys.size > 0) {
-        log(`[Proxy] Loaded apiKey from auth-profiles for providers: ${[...authKeys.keys()].join(", ")}`);
-    }
     if (config?.models?.providers) {
         for (const [id, providerConfig] of Object.entries(config.models.providers)) {
             if (typeof providerConfig !== "object" ||
@@ -56,28 +53,35 @@ export function extractProviderCredentials(config, providerOverrides) {
                     process.env[`${id.toUpperCase()}_API_KEY`] ||
                     authKeys.get(id) ||
                     "";
-                const isMemoryxProxy = (id === "memoryx-proxy");
+                const isMemoryxGateway = (id === "memoryx-gateway");
                 credentials.set(id, {
-                    baseUrl: isMemoryxProxy ? "" : (override?.baseUrl || pc.baseUrl),
+                    baseUrl: isMemoryxGateway ? "" : (override?.baseUrl || pc.baseUrl),
                     apiKey,
                     models: pc.models,
                 });
-                log(`[Proxy] Extracted credentials for ${id}: models=${pc.models?.length || 0}`);
             }
         }
     }
+    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);
+    }
     return credentials;
 }
 /**
  * 在 init 时从 OpenClaw 配置（api.config）读到的「所有厂商 -> baseUrl」做一次快照，不写死任何厂商地址。
  * - 来源唯一：插件启动时通过 api 读到的 openclaw 配置文件（openclaw.json 等）里的 models.providers[id].baseUrl。
  * - 若某条已是 localhost（例如上次 redirect 被持久化），本次仍写入 localhost；恢复依赖 setImmediate 里从缓存文件合并（首次正常时已落盘）。
- * 返回 Map<providerId, baseUrl>，memoryx-proxy 不写入。
+ * 返回 Map<providerId, baseUrl>，memoryx-gateway 不写入。
  */
 export function buildRealUpstreamBaseUrlMap(credentials, _sidecarBaseUrl) {
     const map = new Map();
     for (const [id, creds] of credentials) {
-        if (id === "memoryx-proxy")
+        if (id === "memoryx-gateway")
             continue;
         const base = (creds.baseUrl ?? "").trim();
         map.set(id, base);
@@ -92,7 +96,7 @@ export function buildRealUpstreamBaseUrlMap(credentials, _sidecarBaseUrl) {
 export function realUpstreamCredentialsForSidecar(credentials, realUpstreamBaseUrlMap) {
     const out = new Map();
     for (const [id, creds] of credentials) {
-        if (id === "memoryx-proxy") {
+        if (id === "memoryx-gateway") {
             out.set(id, creds);
             continue;
         }
@@ -103,6 +107,7 @@ export function realUpstreamCredentialsForSidecar(credentials, realUpstreamBaseU
 }
 /**
  * 从缓存文件加载「厂商 -> 真实 baseUrl」映射。文件不存在或解析失败返回空 Map。
+ * 供插件 sync 时使用（先读已有缓存，没有则当空）。
  */
 export async function loadRealUpstreamBaseUrlCache() {
     try {
@@ -121,6 +126,45 @@ 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());
+        }
+    }
+    return map;
+}
+/**
+ * 根据 OpenClaw 配置更新 real-upstream-baseurl.json：非 localhost 的 baseUrl 写入/覆盖，localhost 绝不覆盖。
+ */
+export async function syncRealUpstreamBaseUrlCacheFromConfig(config, sidecarBaseUrl) {
+    let cached;
+    try {
+        cached = await loadRealUpstreamBaseUrlCache();
+    }
+    catch {
+        cached = new Map();
+    }
+    const credentials = extractProviderCredentials(config);
+    const fromConfig = buildRealUpstreamBaseUrlMap(credentials, sidecarBaseUrl);
+    const merged = new Map(cached);
+    for (const [id, url] of fromConfig) {
+        if (id === "memoryx-gateway")
+            continue;
+        if (url && !isLocalhostBaseUrl(url, sidecarBaseUrl)) {
+            merged.set(id, url);
+        }
+    }
+    await saveRealUpstreamBaseUrlCache(merged);
+}
 /**
  * 将「厂商 -> 真实 baseUrl」映射写入缓存文件，重启后若配置被改成 localhost 可从此恢复。
  */
@@ -129,7 +173,7 @@ export async function saveRealUpstreamBaseUrlCache(map) {
         await fs.promises.mkdir(PLUGIN_DIR, { recursive: true });
         const obj = {};
         for (const [id, url] of map) {
-            if (id !== "memoryx-proxy" && url)
+            if (id !== "memoryx-gateway" && url)
                 obj[id] = url;
         }
         await fs.promises.writeFile(REAL_UPSTREAM_BASEURL_CACHE_FILE, JSON.stringify(obj, null, 2), "utf8");

package/dist/proxy-redirect.js

@@ -15,7 +15,7 @@ export function createProxyRedirect(api, getSidecarBase, realProviderHeader) {
         const providers = api.config.models.providers;
         let n = 0;
         for (const providerId of creds.keys()) {
-            if (providerId === "memoryx-proxy")
+            if (providerId === "memoryx-gateway")
                 continue;
             const p = providers[providerId];
             if (!p || typeof p !== "object")
@@ -33,7 +33,7 @@ export function createProxyRedirect(api, getSidecarBase, realProviderHeader) {
         }
         if (n > 0) {
             for (const providerId of creds.keys()) {
-                if (providerId === "memoryx-proxy")
+                if (providerId === "memoryx-gateway")
                     continue;
                 const p = providers[providerId];
                 const readBack = (p && typeof p === "object" && p.baseUrl) ? p.baseUrl : "<missing>";
@@ -52,7 +52,7 @@ export function createProxyRedirect(api, getSidecarBase, realProviderHeader) {
         const handler = {
             get(target, prop) {
                 const val = target[prop];
-                if (val && typeof val === "object" && creds.has(prop) && prop !== "memoryx-proxy") {
+                if (val && typeof val === "object" && creds.has(prop) && prop !== "memoryx-gateway") {
                     return new Proxy(val, {
                         get(t, k) {
                             if (k === "baseUrl")

package/dist/sidecar.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Local HTTP Sidecar: 仅转发到服务端 proxy（记忆注入），无本地回落。
+ */
 import type { ProviderCredentials } from "./types.js";
 import type { PluginConfig } from "./types.js";
 export type GetSDK = (config?: PluginConfig) => Promise<any>;
@@ -23,18 +26,12 @@ export declare class SidecarServer {
     start(): Promise<void>;
     stop(): Promise<void>;
     getPort(): number;
-    /**
-     * 用持久化/合并后的真实上游 baseUrl 映射更新 credentials，避免重启后配置已是 localhost 时仍用旧缓存。
-     */
-    updateRealUpstreamBaseUrlMap(map: Map<string, string>): void;
     /** For logging: redact headers (Authorization, x-api-key, etc. show as ***) */
     private redactHeaders;
     /** Build forward request headers from apiKey in OpenClaw style; does not overwrite user config */
     private buildForwardHeaders;
-    /** 1) Exclude memoryx-proxy, use real provider config; 2) On proxy error fall back to direct; on direct error return error to caller. */
+    /** 仅转发到服务端 proxy（记忆注入），无本地回落。 */
     private handleRequest;
-    private directRequest;
-    private writeResponse;
     private readBody;
 }
 //# sourceMappingURL=sidecar.d.ts.map

package/dist/sidecar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/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;;OAEG;IACH,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAU5D,+EAA+E;IAC/E,OAAO,CAAC,aAAa;IAUrB,kGAAkG;IAClG,OAAO,CAAC,mBAAmB;IAa3B,yIAAyI;YAC3H,aAAa;YAoLb,aAAa;YAwBb,aAAa;IAqB3B,OAAO,CAAC,QAAQ;CAQnB"}
+{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAAA;;GAEG;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,+EAA+E;IAC/E,OAAO,CAAC,aAAa;IAUrB,kGAAkG;IAClG,OAAO,CAAC,mBAAmB;IAa3B,iCAAiC;YACnB,aAAa;IA6O3B,OAAO,CAAC,QAAQ;CAQnB"}

package/dist/sidecar.js

@@ -1,9 +1,10 @@
 /**
- * Local HTTP Sidecar: receives OpenClaw requests, forwards to MemoryX proxy or falls back to direct provider.
+ * Local HTTP Sidecar: 仅转发到服务端 proxy（记忆注入），无本地回落。
  */
 import * as http from "http";
 import { SIDECAR_PORT } from "./constants.js";
 import { log, LOG_FILE } from "./logger.js";
+import { loadRealUpstreamBaseUrlCacheStrict } from "./proxy-credentials.js";
 export class SidecarServer {
     server = null;
     credentials;
@@ -58,18 +59,6 @@ export class SidecarServer {
             ? this.server.address().port
             : SIDECAR_PORT;
     }
-    /**
-     * 用持久化/合并后的真实上游 baseUrl 映射更新 credentials，避免重启后配置已是 localhost 时仍用旧缓存。
-     */
-    updateRealUpstreamBaseUrlMap(map) {
-        for (const [id, baseUrl] of map) {
-            const creds = this.credentials.get(id);
-            if (creds && baseUrl) {
-                this.credentials.set(id, { ...creds, baseUrl });
-            }
-        }
-        log(`[Sidecar] Updated real upstream baseUrl map for ${map.size} provider(s)`);
-    }
     /** For logging: redact headers (Authorization, x-api-key, etc. show as ***) */
     redactHeaders(h) {
         const out = {};
@@ -95,7 +84,7 @@ export class SidecarServer {
         }
         return h;
     }
-    /** 1) Exclude memoryx-proxy, use real provider config; 2) On proxy error fall back to direct; on direct error return error to caller. */
+    /** 仅转发到服务端 proxy（记忆注入），无本地回落。 */
     async handleRequest(req, res) {
         const url = req.url || "/";
         const method = req.method?.toUpperCase();
@@ -106,12 +95,12 @@ export class SidecarServer {
             return;
         }
         const reqId = `req-${Date.now()}`;
-        log(`[Sidecar] ${reqId} Incoming ${method} ${url}`);
         let body;
         try {
             body = await this.readBody(req);
         }
         catch (e) {
+            log(`[Sidecar] ${reqId} err read body: ${e?.message ?? "Read body failed"}`, { console: true });
             res.writeHead(502, { "Content-Type": "application/json" });
             res.end(JSON.stringify({ error: e?.message || "Read body failed" }));
             return;
@@ -123,11 +112,13 @@ export class SidecarServer {
         catch {
             openaiRequest = {};
         }
-        const rawProvider = req.headers["x-memoryx-real-provider"]?.trim() || "";
+        const messages = openaiRequest.messages || [];
         const modelStr = openaiRequest.model || "";
+        const stream = !!openaiRequest.stream;
+        const rawProvider = req.headers["x-memoryx-real-provider"]?.trim() || "";
         let provider = rawProvider || (modelStr.includes("/") ? modelStr.split("/")[0] : "") || "";
-        if (provider === "memoryx-proxy") {
-            const real = this.availableProviders.find((p) => p.provider !== "memoryx-proxy");
+        if (provider === "memoryx-gateway") {
+            const real = this.availableProviders.find((p) => p.provider !== "memoryx-gateway");
             provider = real ? real.provider : "";
         }
         if (!provider || !this.credentials.has(provider)) {
@@ -135,34 +126,73 @@ export class SidecarServer {
         }
         if (!provider || !this.credentials.has(provider)) {
             for (const [id] of this.credentials) {
-                if (id !== "memoryx-proxy") {
+                if (id !== "memoryx-gateway") {
                     provider = id;
                     break;
                 }
             }
         }
         let creds = provider ? this.credentials.get(provider) : undefined;
-        if (!creds?.baseUrl?.trim() || !(creds.apiKey ?? "").trim()) {
+        if (!creds || !(creds.apiKey ?? "").trim()) {
             for (const [id, c] of this.credentials) {
-                if (id !== "memoryx-proxy" && (c.baseUrl || "").trim() && (c.apiKey ?? "").trim()) {
+                if (id !== "memoryx-gateway" && (c.apiKey ?? "").trim()) {
                     provider = id;
                     creds = c;
                     break;
                 }
             }
         }
-        const baseUrl = (creds?.baseUrl || "").trim();
-        const apiKey = (creds?.apiKey ?? "").trim();
-        if (!baseUrl || !apiKey) {
+        let apiKey = (creds?.apiKey ?? "").trim();
+        if (!provider || !creds || !apiKey) {
             res.writeHead(502, { "Content-Type": "application/json" });
-            res.end(JSON.stringify({ error: "No upstream" }));
+            res.end(JSON.stringify({ error: "No upstream (no apiKey for provider)" }));
+            return;
+        }
+        if (provider === "memoryx-gateway") {
+            const real = this.availableProviders.find((p) => p.provider !== "memoryx-gateway");
+            if (!real) {
+                res.writeHead(502, { "Content-Type": "application/json" });
+                res.end(JSON.stringify({
+                    error: "memoryx-gateway is virtual; no real LLM provider in config. Add a provider (e.g. zai, anthropic) in OpenClaw models.providers.",
+                }));
+                return;
+            }
+            provider = real.provider;
+            const realCreds = this.credentials.get(provider);
+            if (!realCreds || !(realCreds.apiKey ?? "").trim()) {
+                res.writeHead(502, { "Content-Type": "application/json" });
+                res.end(JSON.stringify({
+                    error: `No apiKey for real provider '${provider}'. Configure it in OpenClaw (models.providers or auth-profiles).`,
+                }));
+                return;
+            }
+            creds = realCreds;
+            apiKey = (creds.apiKey ?? "").trim();
+        }
+        let baseUrlMap;
+        try {
+            baseUrlMap = await loadRealUpstreamBaseUrlCacheStrict();
+        }
+        catch (e) {
+            res.writeHead(502, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+                error: "real-upstream-baseurl.json could not be read: " + (e?.message ?? String(e)),
+            }));
+            return;
+        }
+        const baseUrl = baseUrlMap.get(provider)?.trim();
+        if (!baseUrl) {
+            res.writeHead(502, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+                error: `Missing real upstream baseUrl for provider '${provider}'. Ensure real-upstream-baseurl.json is populated (e.g. from OpenClaw config).`,
+            }));
             return;
         }
         const base = baseUrl.replace(/\/$/, "");
         const pathFromOpenClaw = (url.split("?")[0] || "/").trim() || "/";
         const targetUrl = base + (pathFromOpenClaw.startsWith("/") ? pathFromOpenClaw : "/" + pathFromOpenClaw);
         const currentModel = openaiRequest.model || "";
-        if (!currentModel || currentModel === "auto" || currentModel.startsWith("memoryx-proxy/")) {
+        if (!currentModel || currentModel === "auto" || currentModel.startsWith("memoryx-gateway/")) {
             const firstId = creds?.models?.[0]?.id || creds?.models?.[0]?.name;
             if (firstId)
                 openaiRequest.model = firstId;
@@ -176,25 +206,21 @@ export class SidecarServer {
             agentId = accountInfo.agentId || "";
         }
         catch (_e) {
-            /* Do not block; proxy will fail and then fall back to direct */
+            /* Do not block; proxy may still accept request */
         }
         const headers = this.buildForwardHeaders(provider, apiKey);
-        const messages = openaiRequest.messages || [];
         const lastUserMsg = [...messages].reverse().find((m) => m.role === "user");
         const searchQuery = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
         const proxyRequestBody = {
             targetUrl,
+            api_base: base,
             headers,
             body: openaiRequest,
             searchQuery,
             agent_id: agentId,
             available_models: this.availableProviders.map((p) => `${p.provider}/${p.model}`),
         };
-        const proxyReqHeaders = { "Content-Type": "application/json", "X-API-Key": memoryxApiKey ? "***" : "" };
-        log(`[Sidecar] ${reqId} → Proxy POST ${proxyUrl}`);
-        log(`[Sidecar] ${reqId} Proxy request headers: ${JSON.stringify(proxyReqHeaders)}`);
-        log(`[Sidecar] ${reqId} Proxy body: targetUrl=${targetUrl} model=${openaiRequest.model} stream=${!!openaiRequest.stream} searchQuery.length=${searchQuery.length} agent_id=${agentId || "(empty)"}`);
-        log(`[Sidecar] ${reqId} Forward headers (to upstream): ${JSON.stringify(this.redactHeaders(headers))}`);
+        log(`[Sidecar] ${reqId} ${method} ${(url.split("?")[0] || "/").trim()} provider=${provider} model=${openaiRequest.model ?? "-"} stream=${stream} → proxy target=${targetUrl}`);
         let proxyResponse = null;
         try {
             proxyResponse = await fetch(proxyUrl, {
@@ -205,16 +231,28 @@ export class SidecarServer {
         }
         catch (e) {
             proxyResponse = null;
-            log(`[Sidecar] ${reqId} Proxy fetch error: ${e?.message ?? String(e)}`, { console: true });
-        }
-        if (proxyResponse) {
-            log(`[Sidecar] ${reqId} Proxy response status=${proxyResponse.status} ${proxyResponse.statusText}`);
+            log(`[Sidecar] ${reqId} err proxy fetch: ${e?.message ?? String(e)}`, { console: true });
         }
         const proxyFailed = !proxyResponse || proxyResponse.status >= 500;
         if (proxyFailed) {
-            log(`[Sidecar] ${reqId} Proxy failed, fallback to direct POST ${targetUrl}`, { console: true });
-            const directResponse = await this.directRequest(reqId, targetUrl, headers, openaiRequest);
-            this.writeResponse(res, directResponse);
+            if (proxyResponse?.body) {
+                try {
+                    if (typeof proxyResponse.body.cancel === "function") {
+                        await proxyResponse.body.cancel();
+                    }
+                    else {
+                        await proxyResponse.text();
+                    }
+                }
+                catch (_) {
+                    /* drain failed, ignore */
+                }
+            }
+            const status = proxyResponse?.status ?? 502;
+            const detail = proxyResponse?.statusText || "MemoryX proxy unavailable";
+            log(`[Sidecar] ${reqId} ← ${status} proxy failed: ${detail}`, { console: true });
+            res.writeHead(status, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: detail }));
             return;
         }
         const proxy = proxyResponse;
@@ -229,11 +267,9 @@ export class SidecarServer {
             }
             catch (firstErr) {
                 reader.releaseLock();
-                log(`[Sidecar] ${reqId} Proxy stream first chunk failed: ${firstErr?.message ?? "timeout"}, fallback to direct ${targetUrl}`, { console: true });
-                const directResponse = await this.directRequest(reqId, targetUrl, headers, openaiRequest);
-                if (directResponse)
-                    log(`[Sidecar] ${reqId} Direct response status=${directResponse.status}`);
-                this.writeResponse(res, directResponse);
+                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" }));
                 return;
             }
             res.writeHead(proxy.status, {
@@ -253,7 +289,7 @@ export class SidecarServer {
                 reader.releaseLock();
             }
             res.end();
-            log(`[Sidecar] ${reqId} Proxy stream done, status=${proxy.status}`);
+            log(`[Sidecar] ${reqId} ← ${proxy.status} stream`);
             return;
         }
         if (!proxy.body) {
@@ -261,56 +297,16 @@ export class SidecarServer {
                 "Content-Type": proxy.headers.get("content-type") || "application/json",
             });
             res.end();
+            log(`[Sidecar] ${reqId} ← ${proxy.status} (no body)`);
             return;
         }
         const text = await proxy.text();
-        log(`[Sidecar] ${reqId} Proxy done, status=${proxy.status} body.length=${text.length}`);
+        log(`[Sidecar] ${reqId} ← ${proxy.status} body=${text.length}`);
         res.writeHead(proxy.status, {
             "Content-Type": proxy.headers.get("content-type") || "application/json",
         });
         res.end(text);
     }
-    async directRequest(reqId, targetUrl, headers, openaiRequest) {
-        log(`[Sidecar] ${reqId} Direct POST ${targetUrl} headers=${JSON.stringify(this.redactHeaders(headers))} model=${openaiRequest?.model} stream=${!!openaiRequest?.stream}`);
-        try {
-            const resp = await fetch(targetUrl, {
-                method: "POST",
-                headers,
-                body: JSON.stringify(openaiRequest),
-            });
-            log(`[Sidecar] ${reqId} Direct response status=${resp.status} ${resp.statusText}`);
-            return resp;
-        }
-        catch (e) {
-            log(`[Sidecar] ${reqId} Direct fetch error: ${e?.message ?? String(e)}`, { console: true });
-            return new Response(JSON.stringify({ error: e?.message || "Direct request failed" }), {
-                status: 502,
-                headers: { "Content-Type": "application/json" },
-            });
-        }
-    }
-    async writeResponse(res, directResponse) {
-        const contentType = directResponse.headers.get("content-type") || "application/json";
-        res.writeHead(directResponse.status, { "Content-Type": contentType });
-        const body = directResponse.body;
-        if (!body) {
-            res.end();
-            return;
-        }
-        const reader = body.getReader();
-        try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                res.write(Buffer.from(value));
-            }
-        }
-        finally {
-            reader.releaseLock();
-        }
-        res.end();
-    }
     readBody(req) {
         return new Promise((resolve, reject) => {
             const chunks = [];

package/dist/vendor-normalize.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 与服务端 llm_proxy 一致的厂商请求体规范化。
+ * 部分 LLM 厂商非标准 OpenAI 格式，需在此做兼容后再转发；服务端用 LiteLLM，Sidecar 直连时用本模块保证同一套逻辑。
+ */
+/**
+ * 判断是否为 Z.AI GLM-5：按 provider 或 targetUrl 与 model 判断。
+ */
+export declare function isZaiGlm5(provider: string, targetUrl: string, model: string): boolean;
+/**
+ * 按厂商与 URL/model 规范化请求体；与服务端逻辑一致，供 Sidecar 直连时使用。
+ * 返回规范化后的 body（不修改入参）。
+ */
+export declare function normalizeBodyForVendor(provider: string, targetUrl: string, body: Record<string, unknown>): Record<string, unknown>;
+//# sourceMappingURL=vendor-normalize.d.ts.map

package/dist/vendor-normalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vendor-normalize.d.ts","sourceRoot":"","sources":["../src/vendor-normalize.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAQrF;AA4DD;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB"}

package/dist/vendor-normalize.js

@@ -0,0 +1,82 @@
+/**
+ * 与服务端 llm_proxy 一致的厂商请求体规范化。
+ * 部分 LLM 厂商非标准 OpenAI 格式，需在此做兼容后再转发；服务端用 LiteLLM，Sidecar 直连时用本模块保证同一套逻辑。
+ */
+/**
+ * 判断是否为 Z.AI GLM-5：按 provider 或 targetUrl 与 model 判断。
+ */
+export function isZaiGlm5(provider, targetUrl, model) {
+    const prov = (provider || "").toLowerCase();
+    const url = (targetUrl || "").toLowerCase();
+    const m = (model || "").toLowerCase();
+    if (prov === "zai" && (m === "glm-5" || m.endsWith("/glm-5")))
+        return true;
+    if ((url.includes("open.bigmodel.cn") || url.includes("api.z.ai")) && (m === "glm-5" || m.endsWith("/glm-5")))
+        return true;
+    return false;
+}
+/**
+ * Z.AI GLM-5 兼容：与 api/app/routers/llm_proxy.py _normalize_body_for_zai_glm5 保持一致。
+ * - messages 仅保留 role + content，role 仅允许 system/user/assistant
+ * - 顶层 system 并入 messages 首条 role=system
+ * - OpenClaw 的 developer 视为 system，其他非法 role 归为 user
+ * - 可选 thinking：未传时默认 {"type": "enabled"}
+ */
+function normalizeBodyForZaiGlm5(body) {
+    const out = { ...body };
+    delete out.system;
+    const rawMessages = Array.isArray(out.messages) ? [...out.messages] : [];
+    let systemContent = (typeof body.system === "string" ? body.system : "").trim();
+    if (systemContent) {
+        const existingSystem = rawMessages.find((m) => (String(m?.role || "").toLowerCase() === "system"));
+        if (existingSystem && typeof existingSystem.content === "string") {
+            systemContent = `${existingSystem.content}\n\n${systemContent}`.trim();
+        }
+    }
+    const withoutSystem = rawMessages.filter((m) => String(m?.role || "").toLowerCase() !== "system");
+    const ROLE_MAP = { developer: "system" };
+    const messages = [];
+    for (const m of withoutSystem) {
+        let r = String(m.role || "").trim().toLowerCase();
+        if (r === "system" || r === "user" || r === "assistant") {
+            // keep
+        }
+        else if (ROLE_MAP[r]) {
+            r = ROLE_MAP[r];
+        }
+        else {
+            r = "user";
+        }
+        let content = m.content;
+        if (content == null)
+            content = "";
+        if (Array.isArray(content)) {
+            content = content
+                .map((part) => typeof part === "object" && part != null && "text" in part
+                ? String(part.text)
+                : String(part))
+                .join("\n");
+        }
+        const contentStr = String(content).trim();
+        messages.push({ role: r, content: contentStr || " " });
+    }
+    if (systemContent) {
+        messages.unshift({ role: "system", content: systemContent });
+    }
+    out.messages = messages;
+    if (!("thinking" in out) || out.thinking == null) {
+        out.thinking = { type: "enabled" };
+    }
+    return out;
+}
+/**
+ * 按厂商与 URL/model 规范化请求体；与服务端逻辑一致，供 Sidecar 直连时使用。
+ * 返回规范化后的 body（不修改入参）。
+ */
+export function normalizeBodyForVendor(provider, targetUrl, body) {
+    const model = String(body?.model || "").trim();
+    if (isZaiGlm5(provider, targetUrl, model)) {
+        return normalizeBodyForZaiGlm5(body);
+    }
+    return body;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t0ken.ai/memoryx-openclaw-plugin",
-  "version": "2.2.61",
+  "version": "2.2.63",
   "description": "MemoryX real-time memory capture and recall plugin for OpenClaw (powered by @t0ken.ai/memoryx-sdk)",
   "type": "module",
   "author": "MemoryX Team",
@@ -15,7 +15,7 @@
     "prebuild": "node scripts/update-version.cjs",
     "build": "tsc",
     "test:recall": "node scripts/test-recall-capture.mjs",
-    "reset-proxy-usage": "node scripts/reset-memoryx-proxy-usage.mjs"
+    "reset-gateway-usage": "node scripts/reset-memoryx-gateway-usage.mjs"
   },
   "keywords": [
     "openclaw",