openclaw-linso 1.0.8 → 1.0.10

package/dist/src/monitor.js

@@ -158,11 +158,13 @@ function handleSlashCommand(raw, deviceId, cfg) {
             const name = args[0].toLowerCase();
             if (name === "off" || name === "default" || name === "reset") {
                 deviceModelOverrides.delete(deviceId);
+                patchSessionModelInStore(deviceId, null, cfg);
                 return { kind: "sync", text: "✅ 已恢复默认模型" };
             }
-            // 没有 / 时自动补全默认 provider
-            const modelInput = args[0].includes("/") ? args[0] : `${DEFAULT_MODEL_PROVIDER}/${args[0]}`;
+            // 没有 / 时，从 cfg 里查找正确的 provider，找不到才用默认
+            const modelInput = args[0].includes("/") ? args[0] : resolveModelProvider(args[0], cfg);
             deviceModelOverrides.set(deviceId, modelInput);
+            patchSessionModelInStore(deviceId, modelInput, cfg);
             return { kind: "sync", text: `✅ 模型已切换为：${modelInput}` };
         }
         // ── 状态信息 ──────────────────────────────────────────────────────────────
@@ -391,8 +393,65 @@ async function handleIncomingMessage(deviceId, text, imageUrls, cfg, log) {
 }
 // ── 工具函数 ──────────────────────────────────────────────────────────────────
 /**
- * 读取 sessions.json 并格式化状态卡片。
+ * 从 cfg.models.providers 里查找 modelId 属于哪个 provider。
+ * 找到返回 "provider/modelId"，找不到返回 "DEFAULT_MODEL_PROVIDER/modelId"。
  */
+function resolveModelProvider(modelId, cfg) {
+    const providers = cfg?.models;
+    const providerMap = providers?.providers;
+    if (providerMap) {
+        for (const [providerName, providerCfg] of Object.entries(providerMap)) {
+            const models = providerCfg?.models ?? [];
+            if (models.some((m) => m.id === modelId)) {
+                return `${providerName}/${modelId}`;
+            }
+        }
+    }
+    return `${DEFAULT_MODEL_PROVIDER}/${modelId}`;
+}
+/**
+ * 直接把 modelOverride / providerOverride 写进 sessions.json，
+ * 这样下次 dispatchReplyFromConfig 读 session entry 时就能生效。
+ * （session entry 里的 modelOverride 优先级高于 cfg.agents.defaults.model）
+ */
+function patchSessionModelInStore(deviceId, modelOverride, cfg) {
+    try {
+        const core = getLinsoRuntime();
+        const peerId = getDevicePeerId(deviceId);
+        const route = core.channel.routing.resolveAgentRoute({
+            cfg,
+            channel: "linso",
+            accountId: "default",
+            peer: { kind: "direct", id: peerId },
+        });
+        const agentId = route.agentId ?? "main";
+        const sessionKey = route.sessionKey;
+        const store = loadSessionsStore(agentId);
+        const entry = store[sessionKey] ?? {};
+        if (!modelOverride) {
+            // 恢复默认：清除 override
+            delete entry.modelOverride;
+            delete entry.providerOverride;
+        }
+        else {
+            const slashIdx = modelOverride.indexOf("/");
+            if (slashIdx !== -1) {
+                entry.providerOverride = modelOverride.slice(0, slashIdx);
+                entry.modelOverride = modelOverride.slice(slashIdx + 1);
+            }
+            else {
+                entry.modelOverride = modelOverride;
+                delete entry.providerOverride;
+            }
+        }
+        store[sessionKey] = entry;
+        saveSessionsStore(agentId, store);
+    }
+    catch (e) {
+        // 非致命，不影响正常消息流
+        console.error("[Linso] patchSessionModelInStore failed:", e);
+    }
+}
 async function buildStatusCard(deviceId, cfg) {
     const core = getLinsoRuntime();
     const peerId = getDevicePeerId(deviceId);
@@ -495,13 +554,16 @@ void saveSessionsStore;
  * agents.list 为空时，defaults 是唯一生效的模型配置。
  */
 function patchAgentModel(cfg, _agentId, modelOverride) {
+    const defaults = (cfg.agents?.defaults ?? {});
+    const existingModels = (defaults.models ?? {});
     return {
         ...cfg,
         agents: {
             ...(cfg.agents ?? {}),
             defaults: {
-                ...(cfg.agents?.defaults ?? {}),
-                model: modelOverride,
+                ...defaults,
+                model: { primary: modelOverride },
+                models: { ...existingModels, [modelOverride]: {} },
             },
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-linso",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Linso iOS App channel plugin for OpenClaw — connects via cloud Relay Server",
   "type": "module",
   "main": "./dist/index.js",

package/src/monitor.ts

@@ -204,11 +204,13 @@ function handleSlashCommand(raw: string, deviceId: string, cfg: OpenClawConfig):
       const name = args[0].toLowerCase();
       if (name === "off" || name === "default" || name === "reset") {
         deviceModelOverrides.delete(deviceId);
+        patchSessionModelInStore(deviceId, null, cfg);
         return { kind: "sync", text: "✅ 已恢复默认模型" };
       }
-      // 没有 / 时自动补全默认 provider
-      const modelInput = args[0].includes("/") ? args[0] : `${DEFAULT_MODEL_PROVIDER}/${args[0]}`;
+      // 没有 / 时，从 cfg 里查找正确的 provider，找不到才用默认
+      const modelInput = args[0].includes("/") ? args[0] : resolveModelProvider(args[0], cfg);
       deviceModelOverrides.set(deviceId, modelInput);
+      patchSessionModelInStore(deviceId, modelInput, cfg);
       return { kind: "sync", text: `✅ 模型已切换为：${modelInput}` };
     }
 
@@ -466,8 +468,67 @@ async function handleIncomingMessage(
 // ── 工具函数 ──────────────────────────────────────────────────────────────────
 
 /**
- * 读取 sessions.json 并格式化状态卡片。
+ * 从 cfg.models.providers 里查找 modelId 属于哪个 provider。
+ * 找到返回 "provider/modelId"，找不到返回 "DEFAULT_MODEL_PROVIDER/modelId"。
  */
+function resolveModelProvider(modelId: string, cfg: OpenClawConfig): string {
+  const providers = (cfg as unknown as Record<string, unknown>)?.models as Record<string, unknown>;
+  const providerMap = providers?.providers as Record<string, { models?: Array<{ id: string }> }> | undefined;
+  if (providerMap) {
+    for (const [providerName, providerCfg] of Object.entries(providerMap)) {
+      const models = providerCfg?.models ?? [];
+      if (models.some((m) => m.id === modelId)) {
+        return `${providerName}/${modelId}`;
+      }
+    }
+  }
+  return `${DEFAULT_MODEL_PROVIDER}/${modelId}`;
+}
+
+/**
+ * 直接把 modelOverride / providerOverride 写进 sessions.json，
+ * 这样下次 dispatchReplyFromConfig 读 session entry 时就能生效。
+ * （session entry 里的 modelOverride 优先级高于 cfg.agents.defaults.model）
+ */
+function patchSessionModelInStore(deviceId: string, modelOverride: string | null, cfg: OpenClawConfig): void {
+  try {
+    const core = getLinsoRuntime();
+    const peerId = getDevicePeerId(deviceId);
+    const route = core.channel.routing.resolveAgentRoute({
+      cfg,
+      channel: "linso",
+      accountId: "default",
+      peer: { kind: "direct", id: peerId },
+    });
+    const agentId = route.agentId ?? "main";
+    const sessionKey = route.sessionKey;
+    const store = loadSessionsStore(agentId);
+    const entry: Record<string, unknown> = (store[sessionKey] as Record<string, unknown>) ?? {};
+
+    if (!modelOverride) {
+      // 恢复默认：清除 override
+      delete entry.modelOverride;
+      delete entry.providerOverride;
+    } else {
+      const slashIdx = modelOverride.indexOf("/");
+      if (slashIdx !== -1) {
+        entry.providerOverride = modelOverride.slice(0, slashIdx);
+        entry.modelOverride = modelOverride.slice(slashIdx + 1);
+      } else {
+        entry.modelOverride = modelOverride;
+        delete entry.providerOverride;
+      }
+    }
+
+    store[sessionKey] = entry;
+    saveSessionsStore(agentId, store);
+  } catch (e) {
+    // 非致命，不影响正常消息流
+    console.error("[Linso] patchSessionModelInStore failed:", e);
+  }
+}
+
+
 async function buildStatusCard(deviceId: string, cfg: OpenClawConfig): Promise<string> {
   const core = getLinsoRuntime();
   const peerId = getDevicePeerId(deviceId);
@@ -582,13 +643,16 @@ void saveSessionsStore;
  * agents.list 为空时，defaults 是唯一生效的模型配置。
  */
 function patchAgentModel(cfg: OpenClawConfig, _agentId: string, modelOverride: string): OpenClawConfig {
+  const defaults = (cfg.agents?.defaults ?? {}) as Record<string, unknown>;
+  const existingModels = (defaults.models ?? {}) as Record<string, unknown>;
   return {
     ...cfg,
     agents: {
       ...(cfg.agents ?? {}),
       defaults: {
-        ...(cfg.agents?.defaults ?? {}),
-        model: modelOverride,
+        ...defaults,
+        model: { primary: modelOverride },
+        models: { ...existingModels, [modelOverride]: {} },
       },
     },
   } as unknown as OpenClawConfig;