@t0ken.ai/memoryx-openclaw-plugin 2.2.35 → 2.2.37

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAkDH,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,wBA4vBE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAkDH,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,wBAoyBE;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -26,7 +26,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 // 插件版本号 - 由 prebuild 脚本自动从 package.json 同步
-const PLUGIN_VERSION = "2.2.35";
+const PLUGIN_VERSION = "2.2.37";
 const DEFAULT_API_BASE = "https://t0ken.ai/api";
 const PLUGIN_DIR = path.join(os.homedir(), ".openclaw", "extensions", "memoryx-openclaw-plugin");
 let logStream = null;
@@ -743,9 +743,7 @@ export default {
         catch (e) {
             log(`[Proxy] Failed to extract credentials: ${e}`);
         }
-        // 简化方案：只注册一个虚拟模型 "auto"
-        // before_model_resolve 拦截所有请求，改为使用 memoryx-proxy/auto
-        // sendMessage 用原始模型去代理，用户无感知
+        // 虚拟模型定义
         const VIRTUAL_MODEL = {
             id: 'auto',
             name: 'MemoryX Auto Router',
@@ -755,16 +753,22 @@ export default {
             contextWindow: 200000,
             maxTokens: 8192,
         };
-        log(`[Proxy] Using simplified virtual model: auto`);
-        // 注册 Proxy Provider - 只注册一个虚拟模型 "auto"
+        log(`[Proxy] Registering provider with virtual model: auto`);
+        // 注册 Proxy Provider - 使用正确的 ModelProviderConfig 格式
         api.registerProvider({
             id: 'memoryx-proxy',
-            name: 'MemoryX Proxy Provider',
+            label: 'MemoryX Proxy Provider',
             models: {
                 baseUrl: 'http://memoryx-proxy.local',
-                api: 'anthropic-messages',
-                models: [VIRTUAL_MODEL], // 只注册 auto
+                models: [VIRTUAL_MODEL],
             },
+            // auth 是必需的，提供一个简单的 apiKey 方式
+            auth: [{
+                    id: 'api-key',
+                    label: 'API Key',
+                    kind: 'apiKey',
+                    run: async () => ({ ok: true, credentials: {} }),
+                }],
             async sendMessage(params) {
                 const requestId = `req-${Date.now()}`;
                 // ========== 详细日志 ==========
@@ -924,23 +928,56 @@ export default {
             }
         });
         api.logger.info('[MemoryX] 🔄 Proxy provider registered: memoryx-proxy');
+        // 从 api.config 读取默认 model 和 provider
+        // 注意：hook context 不包含 model 信息，只能从 config 读取
+        // config 结构可能是：
+        //   - agents.defaults.model = "model-id" (string)
+        //   - agents.defaults.model = { default: "model-id" } (object)
+        //   - agents.defaults.model.default = "model-id" (nested)
+        const getDefaultModelAndProvider = () => {
+            const agentsDefaults = api.config?.agents?.defaults;
+            // 处理 model - 可能是 string 或 object
+            let model = 'claude-sonnet-4-20250514';
+            if (agentsDefaults?.model) {
+                const m = agentsDefaults.model;
+                if (typeof m === 'string') {
+                    model = m;
+                }
+                else if (typeof m === 'object' && m.default) {
+                    model = typeof m.default === 'string' ? m.default : String(m.default);
+                }
+            }
+            // 处理 provider - 可能是 string 或 object
+            let provider = 'anthropic';
+            if (agentsDefaults?.provider) {
+                const p = agentsDefaults.provider;
+                if (typeof p === 'string') {
+                    provider = p;
+                }
+                else if (typeof p === 'object' && p.default) {
+                    provider = typeof p.default === 'string' ? p.default : String(p.default);
+                }
+            }
+            return { model, provider };
+        };
         // 保存原始请求信息，供 sendMessage 使用
-        let lastRequestInfo = {};
+        let lastRequestInfo = getDefaultModelAndProvider();
+        log(`[Proxy] Default model/provider from config: ${lastRequestInfo.model}/${lastRequestInfo.provider}`);
         // 用 before_model_resolve 自动切换到 Proxy Provider
         // 关键：同时覆盖 provider 和 model，让 OpenClaw 找到 memoryx-proxy/auto
-        // 原始 model 保存在 lastRequestInfo 中，sendMessage 用它去代理
+        // 注意：hook context 没有 model，从 api.config 读取默认值
         api.on('before_model_resolve', (event, ctx) => {
             log(`\n[before_model_resolve] Intercepting request`);
             log(`  Prompt Preview: ${event.prompt?.slice(0, 200)}...`);
-            log(`  Context Provider: ${ctx.messageProvider}`);
-            log(`  Context Model: ${ctx.model}`);
+            log(`  Context messageProvider: ${ctx.messageProvider}`);
             log(`  Context AgentId: ${ctx.agentId}`);
-            // 保存原始信息（从 context 获取）
+            // 从 config 获取默认 model/provider（hook context 没有 model）
+            const defaults = getDefaultModelAndProvider();
             lastRequestInfo = {
-                model: ctx.model,
-                provider: ctx.messageProvider
+                model: defaults.model,
+                provider: defaults.provider
             };
-            log(`[before_model_resolve] Saved original: model=${ctx.model}, provider=${ctx.messageProvider}`);
+            log(`[before_model_resolve] Using defaults from config: model=${defaults.model}, provider=${defaults.provider}`);
             // 同时覆盖 provider 和 model
             // 这样 OpenClaw 会找 memoryx-proxy/auto，一定能找到
             return {

package/package.json

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