@t0ken.ai/memoryx-openclaw-plugin 2.2.50 → 2.2.53

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAmDH,UAAU,YAAY;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,UAAU,YAAY;IAClB,QAAQ,EAAE,KAAK,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,eAAe,EAAE,KAAK,CAAC;QACnB,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAqDD,cAAM,aAAa;IACf,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,YAAY,CAAC,EAAE,YAAY;IAIjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAad,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B1D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAyC/D,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc1C,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAcvE,IAAI,CAAC,KAAK,GAAE,MAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAiBxC,cAAc,IAAI,OAAO,CAAC;QACnC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAwBW,cAAc,IAAI,OAAO,CAAC;QACnC,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE;YACH,QAAQ,EAAE,MAAM,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,EAAE,MAAM,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC;YACrB,iBAAiB,EAAE,MAAM,CAAC;YAC1B,gBAAgB,EAAE,MAAM,CAAC;YACzB,mBAAmB,EAAE,MAAM,CAAC;YAC5B,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CAcL;;;;;;kBAUiB,GAAG,iBAAiB,YAAY,GAAG,IAAI;;AANzD,wBA27BE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAmDH,UAAU,YAAY;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,UAAU,YAAY;IAClB,QAAQ,EAAE,KAAK,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,eAAe,EAAE,KAAK,CAAC;QACnB,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAqDD,cAAM,aAAa;IACf,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,YAAY,CAAC,EAAE,YAAY;IAIjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAad,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B1D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAyC/D,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc1C,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAcvE,IAAI,CAAC,KAAK,GAAE,MAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAiBxC,cAAc,IAAI,OAAO,CAAC;QACnC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAwBW,cAAc,IAAI,OAAO,CAAC;QACnC,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE;YACH,QAAQ,EAAE,MAAM,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,EAAE,MAAM,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC;YACrB,iBAAiB,EAAE,MAAM,CAAC;YAC1B,gBAAgB,EAAE,MAAM,CAAC;YACzB,mBAAmB,EAAE,MAAM,CAAC;YAC5B,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CAcL;;;;;;kBAUiB,GAAG,iBAAiB,YAAY,GAAG,IAAI;;AANzD,wBAmgCE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -27,7 +27,7 @@ import * as path from "path";
 import * as os from "os";
 import * as http from "http";
 // 插件版本号 - 由 prebuild 脚本自动从 package.json 同步
-const PLUGIN_VERSION = "2.2.50";
+const PLUGIN_VERSION = "2.2.53";
 const DEFAULT_API_BASE = "https://t0ken.ai/api";
 const PLUGIN_DIR = path.join(os.homedir(), ".openclaw", "extensions", "memoryx-openclaw-plugin");
 let logStream = null;
@@ -661,6 +661,11 @@ export default {
         // IMPORTANT: 对话流走的是 before_agent_start 事件，不是 message_received！
         // message_received 只在 auto-reply 功能中触发
         api.on("before_agent_start", async (event, ctx) => {
+            const keys = event && typeof event === 'object' ? Object.keys(event).join(', ') : 'n/a';
+            const model = event?.model ?? event?.resolvedModel ?? 'undefined';
+            const provider = event?.provider ?? event?.resolvedProvider ?? 'undefined';
+            api.logger.info(`[MemoryX] 📋 [after resolve? before_agent_start] event keys: ${keys} | model: ${model} | provider: ${provider}`);
+            log(`[before_agent_start] model=${model} provider=${provider}`);
             const { prompt } = event;
             if (!prompt || prompt.length < 2 || !plugin)
                 return;
@@ -748,27 +753,47 @@ export default {
             }
             return credentials;
         }
-        // 获取所有可用的 provider 列表（按优先级排序）
+        // 获取所有可用的 provider/model 列表（用于服务端回落与重试）
+        // 把所有配置了的 provider 及其所有 model 都传给服务端，服务端可按顺序 fallback
         function getAvailableProviders(credentials) {
             const result = [];
             for (const [providerId, creds] of credentials) {
                 if (creds.models && creds.models.length > 0) {
-                    result.push({
-                        provider: providerId,
-                        model: creds.models[0].id,
-                    });
+                    for (const m of creds.models) {
+                        const id = m.id || m.name;
+                        if (id) {
+                            result.push({ provider: providerId, model: id });
+                        }
+                    }
+                }
+                else {
+                    // 无 models 列表时仍传该 provider，用空 model 占位，服务端可忽略或按 provider 默认处理
+                    result.push({ provider: providerId, model: '' });
                 }
             }
             return result;
         }
-        // 获取默认的 model 和 provider（第一个可用的）
+        // 用于默认首选：每个 provider 只取第一个 model，保证 default 有效
+        function getDefaultProviderModelList(credentials) {
+            const result = [];
+            for (const [providerId, creds] of credentials) {
+                if (creds.models?.length) {
+                    const id = creds.models[0].id || creds.models[0].name;
+                    if (id)
+                        result.push({ provider: providerId, model: id });
+                }
+            }
+            return result;
+        }
+        // 获取默认的 model 和 provider（第一个可用的），以及完整列表供服务端 fallback
         const getDefaultModelAndProvider = (credentials) => {
-            const available = getAvailableProviders(credentials);
-            if (available.length > 0) {
+            const defaultList = getDefaultProviderModelList(credentials);
+            const availableAll = getAvailableProviders(credentials);
+            if (defaultList.length > 0) {
                 return {
-                    model: available[0].model,
-                    provider: available[0].provider,
-                    availableProviders: available
+                    model: defaultList[0].model,
+                    provider: defaultList[0].provider,
+                    availableProviders: availableAll // 全部可用的 provider/model 供服务端回落
                 };
             }
             // 回退到 agents.defaults
@@ -797,15 +822,10 @@ export default {
         log(`[Proxy] Found ${providerCredentials.size} providers in config`);
         const defaultProvider = getDefaultModelAndProvider(providerCredentials);
         log(`[Proxy] Default: ${defaultProvider.provider}/${defaultProvider.model}`);
-        // 虚拟模型定义
-        // 
-        // OpenClaw 的 resolveModel 查找逻辑：
-        // inlineModels.find(entry => entry.provider === provider && entry.id === modelId)
-        // 
-        // before_model_resolve 返回 { providerOverride: 'memoryx-proxy', modelOverride: 'auto' }
-        // 所以 modelId = 'auto'，VIRTUAL_MODEL.id 必须是 'auto'！
+        // 虚拟模型定义（与 SlimClaw 一致：主 id 用完整 "provider/model" 字符串）
+        // OpenClaw 报错 "Unknown model: memoryx-proxy/auto" 说明按完整 id 查找，故主 id 为 memoryx-proxy/auto
         const VIRTUAL_MODEL = {
-            id: 'auto', // ← 必须等于 modelOverride，不带 provider 前缀！
+            id: 'memoryx-proxy/auto',
             name: 'MemoryX Auto Router',
             api: 'openai-completions',
             reasoning: true,
@@ -814,6 +834,11 @@ export default {
             contextWindow: 200000,
             maxTokens: 16384,
         };
+        // 兼容按 provider+model 拆开查找的版本：同时注册 id=auto，便于 entry.id === modelOverride 匹配
+        const VIRTUAL_MODELS = [
+            VIRTUAL_MODEL,
+            { ...VIRTUAL_MODEL, id: 'auto' },
+        ];
         const SIDECAR_PORT = 3335;
         const PROXY_URL = (pluginConfig?.apiBaseUrl || DEFAULT_API_BASE) + '/openclaw/proxy/chat/completions';
         class SidecarServer {
@@ -834,12 +859,8 @@ export default {
                     });
                     this.server.on('error', (err) => {
                         if (err.code === 'EADDRINUSE') {
-                            log(`[Sidecar] Port ${SIDECAR_PORT} already in use, trying next...`);
-                            // Try next port
-                            this.server.listen(SIDECAR_PORT + 1, () => {
-                                log(`[Sidecar] Started on port ${SIDECAR_PORT + 1}`);
-                                resolve();
-                            });
+                            log(`[Sidecar] Port ${SIDECAR_PORT} already in use. MemoryX proxy baseUrl is fixed to this port - please free the port or disable another service.`);
+                            reject(new Error(`Port ${SIDECAR_PORT} already in use. Free the port or set OpenClaw to use a different model.`));
                         }
                         else {
                             reject(err);
@@ -1025,26 +1046,36 @@ export default {
         // =========================================================================
         // 关键：动态注入 provider 配置到 api.config
         // 
-        // resolveModel() 只从 cfg.models.providers 查找 provider，
-        // 不会查找 registerProvider() 注册的 providers！
-        // 所以必须在 config 中注入 provider 配置。
+        // 部分 OpenClaw 版本中 resolveModel() 只从 cfg.models.providers 查找，
+        // 不会使用 registerProvider() 注册的 providers，故此处注入 config。
+        // 若虚拟厂商仍不可用，请在 OpenClaw 配置中显式添加：
+        //   models.providers["memoryx-proxy"]: { baseUrl: "http://localhost:3335/v1", api: "openai-completions", models: [{ id: "memoryx-proxy/auto", name: "MemoryX Auto", ... }] }
         // =========================================================================
-        // 调试：检查 api.config 结构
-        api.logger.info(`[MemoryX] 🔍 api.config exists: ${!!api.config}`);
-        api.logger.info(`[MemoryX] 🔍 api.config.models exists: ${!!api.config?.models}`);
-        api.logger.info(`[MemoryX] 🔍 api.config.models.providers exists: ${!!api.config?.models?.providers}`);
-        api.logger.info(`[MemoryX] 🔍 api.config.models.providers keys: ${api.config?.models?.providers ? Object.keys(api.config.models.providers).join(', ') : 'N/A'}`);
+        // ---------- 日志：写 config 前 ----------
+        api.logger.info(`[MemoryX] 📋 [1] Before config write - api.config exists: ${!!api.config}`);
+        api.logger.info(`[MemoryX] 📋 [1] Before config write - api.config?.models?.providers keys: ${api.config?.models?.providers ? Object.keys(api.config.models.providers).join(', ') : 'N/A'}`);
+        if (api.config?.models?.providers) {
+            for (const [pid, p] of Object.entries(api.config.models.providers)) {
+                const models = p?.models;
+                const modelIds = models?.map((m) => m?.id ?? m?.name ?? '?').join(', ') ?? 'none';
+                api.logger.info(`[MemoryX] 📋 [1] Before config write - provider "${pid}" models: [${modelIds}]`);
+            }
+        }
         if (api.config?.models?.providers) {
             api.config.models.providers['memoryx-proxy'] = {
                 baseUrl: `http://localhost:${SIDECAR_PORT}/v1`,
                 api: 'openai-completions',
-                models: [VIRTUAL_MODEL]
+                models: VIRTUAL_MODELS
             };
             api.logger.info('[MemoryX] ✅ Injected memoryx-proxy into config.models.providers');
-            api.logger.info(`[MemoryX] 🔍 After injection keys: ${Object.keys(api.config.models.providers).join(', ')}`);
+            api.logger.info(`[MemoryX] 📋 [2] After config write - providers keys: ${Object.keys(api.config.models.providers).join(', ')}`);
+            const mx = api.config.models.providers['memoryx-proxy'];
+            if (mx?.models) {
+                const ids = mx.models.map((m) => m?.id ?? '?').join(', ');
+                api.logger.info(`[MemoryX] 📋 [2] After config write - memoryx-proxy model ids: [${ids}]`);
+            }
         }
         else if (api.config) {
-            // 确保 models.providers 存在
             if (!api.config.models) {
                 api.config.models = {};
             }
@@ -1054,23 +1085,26 @@ export default {
             api.config.models.providers['memoryx-proxy'] = {
                 baseUrl: `http://localhost:${SIDECAR_PORT}/v1`,
                 api: 'openai-completions',
-                models: [VIRTUAL_MODEL]
+                models: VIRTUAL_MODELS
             };
             api.logger.info('[MemoryX] ✅ Created and injected memoryx-proxy into config.models.providers');
+            api.logger.info(`[MemoryX] 📋 [2] After config write - memoryx-proxy model ids: [${VIRTUAL_MODELS.map(m => m.id).join(', ')}]`);
         }
         else {
             api.logger.warn('[MemoryX] ⚠️ api.config not available - resolveModel may fail to find memoryx-proxy');
         }
         // 注册 Provider - 完全对齐 SlimClaw 格式
+        const registeredModelIds = VIRTUAL_MODELS.map(m => m.id).join(', ');
+        api.logger.info(`[MemoryX] 📋 [3] Before registerProvider - will register id=memoryx-proxy, model ids: [${registeredModelIds}]`);
         api.registerProvider({
             id: 'memoryx-proxy',
             label: 'MemoryX Proxy Provider',
             aliases: ['mx'],
-            envVars: [], // No own API keys - delegates to downstream providers
+            envVars: [],
             models: {
                 baseUrl: `http://localhost:${SIDECAR_PORT}/v1`,
                 api: 'openai-completions',
-                models: [VIRTUAL_MODEL],
+                models: VIRTUAL_MODELS,
             },
             auth: [{
                     id: 'none',
@@ -1082,17 +1116,58 @@ export default {
                     }),
                 }],
         });
-        api.logger.info('[MemoryX] 🔄 Proxy provider registered: memoryx-proxy');
-        // before_model_resolve 钩子 - 自动拦截所有请求，无需用户配置
-        // 而 MemoryX 自动拦截所有请求，用户完全不需要配置
+        api.logger.info(`[MemoryX] 📋 [3] After registerProvider - registered memoryx-proxy with models: [${registeredModelIds}]`);
+        // 延迟再读一次 config，检查是否被后续逻辑覆盖
+        setImmediate(() => {
+            api.logger.info(`[MemoryX] 📋 [4] setImmediate(after register) - api.config?.models?.providers keys: ${api.config?.models?.providers ? Object.keys(api.config.models.providers).join(', ') : 'N/A'}`);
+            if (api.config?.models?.providers) {
+                const mx = api.config.models.providers['memoryx-proxy'];
+                if (mx) {
+                    const ids = mx.models?.map((m) => m?.id ?? '?').join(', ') ?? 'none';
+                    api.logger.info(`[MemoryX] 📋 [4] setImmediate - memoryx-proxy still present, model ids: [${ids}]`);
+                }
+                else {
+                    api.logger.warn('[MemoryX] 📋 [4] setImmediate - memoryx-proxy MISSING from config (may have been overwritten)');
+                }
+                for (const [pid, p] of Object.entries(api.config.models.providers)) {
+                    const models = p?.models;
+                    const modelIds = models?.map((m) => m?.id ?? '?').join(', ') ?? 'none';
+                    api.logger.info(`[MemoryX] 📋 [4] setImmediate - provider "${pid}" models: [${modelIds}]`);
+                }
+            }
+        });
+        setTimeout(() => {
+            api.logger.info(`[MemoryX] 📋 [5] setTimeout(500ms) - api.config?.models?.providers keys: ${api.config?.models?.providers ? Object.keys(api.config.models.providers).join(', ') : 'N/A'}`);
+            if (api.config?.models?.providers) {
+                const mx = api.config.models.providers['memoryx-proxy'];
+                if (mx) {
+                    const ids = mx.models?.map((m) => m?.id ?? '?').join(', ') ?? 'none';
+                    api.logger.info(`[MemoryX] 📋 [5] setTimeout(500ms) - memoryx-proxy still present, model ids: [${ids}]`);
+                }
+                else {
+                    api.logger.warn('[MemoryX] 📋 [5] setTimeout(500ms) - memoryx-proxy MISSING (overwritten after load)');
+                }
+            }
+        }, 500);
+        // before_model_resolve 钩子 - 自动拦截所有请求
         api.on('before_model_resolve', (event, ctx) => {
             const originalModel = event.model || 'unknown';
+            const eventKeys = event && typeof event === 'object' ? Object.keys(event).join(', ') : 'n/a';
+            api.logger.info(`[MemoryX] 📋 [before_model_resolve] event keys: ${eventKeys} | original model: ${originalModel} → returning providerOverride=memoryx-proxy, modelOverride=auto`);
             log(`[before_model_resolve] Intercepting: ${originalModel} → memoryx-proxy/auto`);
             return {
                 providerOverride: 'memoryx-proxy',
                 modelOverride: 'auto'
             };
         });
+        // resolve 之后：在 llm_input 打日志（此处应有已解析的 model/provider）
+        api.on('llm_input', (event, ctx) => {
+            const keys = event && typeof event === 'object' ? Object.keys(event).join(', ') : 'n/a';
+            const model = event?.model ?? event?.resolvedModel ?? 'undefined';
+            const provider = event?.provider ?? event?.resolvedProvider ?? 'undefined';
+            api.logger.info(`[MemoryX] 📋 [after resolve? llm_input] event keys: ${keys} | model: ${model} | provider: ${provider}`);
+            log(`[llm_input] model=${model} provider=${provider}`);
+        });
         api.logger.info('[MemoryX] 🔄 Auto-intercept enabled - ALL requests go through MemoryX Proxy');
         api.logger.info(`[MemoryX] ✅ Plugin v${PLUGIN_VERSION} ready! Your conversations will be remembered automatically.`);
         // Async check and show portal link after SDK initializes

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "memoryx-openclaw-plugin",
   "name": "MemoryX Real-time Plugin",
-  "version": "2.2.18",
+  "version": "2.2.53",
   "description": "Real-time memory capture and recall for OpenClaw",
   "kind": "memory",
   "main": "./dist/index.js",

package/package.json

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