rol-websocket-channel 1.6.2 → 1.6.4

package/dist/index.js

@@ -490,7 +490,8 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
         log?.error(`[rol-websocket-channel] Failed to process message: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-async function handleCustomMessageType(msgType, innerData, traceId, accountId, mqttTopic) {
+const immediateAckMessageTypes = new Set(["openclawUpdate", "pluginSelfUpdate"]);
+export async function handleCustomMessageType(msgType, innerData, traceId, accountId, mqttTopic) {
     const isSkillInstallFlow = msgType === "skillsInstallFromClawHub" || msgType === "skillsUpdateFromClawHub";
     const response = {
         type: "receiver",
@@ -503,6 +504,19 @@ async function handleCustomMessageType(msgType, innerData, traceId, accountId, m
     }
     const handlerMethod = messageHandler[msgType];
     if (typeof handlerMethod === "function") {
+        if (immediateAckMessageTypes.has(msgType)) {
+            response.success = true;
+            response.data = {
+                ok: true,
+                action: msgType,
+                status: "running",
+                accepted: true,
+                message: `${msgType} started`,
+            };
+            publishCustomMessageResponse(response, innerData, mqttTopic);
+            void runCustomMessageHandler(msgType, handlerMethod, innerData, response, mqttTopic);
+            return;
+        }
         try {
             const methodResult = await handlerMethod.call(messageHandler, innerData);
             // 兼容两种返回格式：
@@ -516,6 +530,12 @@ async function handleCustomMessageType(msgType, innerData, traceId, accountId, m
                 response.data = methodResult.result;
                 if (!methodResult.ok) {
                     response.error = methodResult.error?.message || "Unknown error";
+                    if (methodResult.error?.code !== undefined) {
+                        response.error_code = methodResult.error.code;
+                    }
+                    if (methodResult.error?.data !== undefined) {
+                        response.error_data = methodResult.error.data;
+                    }
                     if (isSkillInstallFlow) {
                         console.error(`[rol-websocket-channel] custom message failed: type=${msgType}, traceId=${traceId}, slug=${innerData?.slug ?? ""}, error=${response.error}, detail=${JSON.stringify(methodResult.error?.data ?? {})}`);
                     }
@@ -545,6 +565,41 @@ async function handleCustomMessageType(msgType, innerData, traceId, accountId, m
         response.success = false;
         response.error = `Unknown message type: ${msgType}`;
     }
+    publishCustomMessageResponse(response, innerData, mqttTopic);
+}
+async function runCustomMessageHandler(msgType, handlerMethod, innerData, baseResponse, mqttTopic) {
+    const response = {
+        ...baseResponse,
+        timestamp: Date.now(),
+    };
+    try {
+        const methodResult = await handlerMethod.call(messageHandler, innerData);
+        if (typeof methodResult === "object" &&
+            methodResult !== null &&
+            "ok" in methodResult) {
+            response.success = methodResult.ok;
+            response.data = methodResult.result;
+            if (!methodResult.ok) {
+                response.error = methodResult.error?.message || "Unknown error";
+            }
+            else {
+                delete response.error;
+            }
+        }
+        else {
+            response.success = true;
+            response.data = methodResult;
+            delete response.error;
+        }
+    }
+    catch (handlerErr) {
+        response.success = false;
+        response.data = undefined;
+        response.error = handlerErr.message;
+    }
+    publishCustomMessageResponse(response, innerData, mqttTopic);
+}
+function publishCustomMessageResponse(response, innerData, mqttTopic) {
     const conn = ConnectionManager.getGlobalConnection();
     if (conn && conn.ws && conn.ws.connected) {
         // 根据 source_type 修改 topic 末尾的 #

package/dist/message-handler.js

@@ -6,7 +6,7 @@ import { getContext } from './src/shared/context.js';
 import { wrapAdminCall } from './src/shared/wrapper.js';
 import { getAgents, getConfig, setApiCoreBotConfig } from './src/admin/methods/admin.js';
 import { createAgent, deleteAgent, listAgents, updateAgent } from './src/admin/methods/agents-extended.js';
-import { createArtifactRecord, ensureArtifactUploaded, getArtifactContent, getArtifactPresignedPost, listArtifacts, markArtifactUploaded, refreshArtifacts } from './src/admin/methods/artifacts.js';
+import { createArtifactRecord, ensureArtifactUploaded, findLatestArtifacts, getArtifactContent, getArtifactPresignedPost, listArtifacts, markArtifactUploaded, publishArtifact, refreshArtifacts } from './src/admin/methods/artifacts.js';
 import { addCron, disableCron, enableCron, getCronStatus, listCron, listCronRuns, renameCron, removeCron, rescheduleCron, runCron, setCronContent, updateCronMessage, updateCronSystemEvent } from './src/admin/methods/cron.js';
 import { listSessions } from './src/admin/methods/sessions.js';
 import { getSession, prepareMessage, attachSkill } from './src/admin/methods/sessions-extended.js';
@@ -400,6 +400,12 @@ export class MessageHandler {
             return await refreshArtifacts(data, context);
         });
     }
+    async artifactsFindLatest(data) {
+        return wrapAdminCall(async () => {
+            const context = getContext();
+            return await findLatestArtifacts(data, context);
+        });
+    }
     async artifactsGetContent(data) {
         return wrapAdminCall(async () => {
             const context = getContext();
@@ -412,6 +418,12 @@ export class MessageHandler {
             return await ensureArtifactUploaded(data, context);
         });
     }
+    async artifactsPublish(data) {
+        return wrapAdminCall(async () => {
+            const context = getContext();
+            return await publishArtifact(data, context);
+        });
+    }
     async artifactsGetPresignedPost(data) {
         return wrapAdminCall(async () => {
             const context = getContext();

package/dist/src/admin/methods/admin.js

@@ -2,8 +2,6 @@ import path from 'node:path';
 import { readJsonFile, writeJsonFile } from '../lib/fs.js';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 const DEFAULT_PLUGIN_ID = 'rol-websocket-channel';
-const DEFAULT_API_CORE_BOT_BASE_URL = 'http://192.168.1.23:9092';
-const DEFAULT_API_CORE_BOT_AUTH_TOKEN = '123';
 export const getAgents = async (_params, context) => {
     const configPath = path.join(context.openclawRoot, 'openclaw.json');
     const config = await readJsonFile(configPath);
@@ -36,10 +34,10 @@ export const setApiCoreBotConfig = async (params, context) => {
     const objectParams = isObject(params) ? params : {};
     const baseUrl = typeof objectParams.baseUrl === 'string'
         ? objectParams.baseUrl.trim().replace(/\/+$/, '')
-        : DEFAULT_API_CORE_BOT_BASE_URL;
+        : '';
     const authToken = typeof objectParams.authToken === 'string' && objectParams.authToken.trim()
         ? objectParams.authToken.trim()
-        : DEFAULT_API_CORE_BOT_AUTH_TOKEN;
+        : null;
     if (!baseUrl) {
         throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, 'apiCoreBot.baseUrl is required');
     }

package/dist/src/admin/methods/admin.test.js

@@ -43,15 +43,12 @@ test('setApiCoreBotConfig writes apiCoreBot endpoint without changing pairing or
     assert.equal(savedConfig.plugins.entries['rol-websocket-channel'].config.pairing.pairingKeyLast4, '7a46');
     assert.equal(savedConfig.channels['rol-websocket-channel'].config.mqttUrl, 'ws://mqtt.example.test:8083/mqtt');
 });
-test('setApiCoreBotConfig uses default apiCoreBot values when omitted', async () => {
+test('setApiCoreBotConfig rejects missing baseUrl instead of writing defaults', async () => {
     const context = await createMethodContext();
-    await fs.writeFile(path.join(context.openclawRoot, 'openclaw.json'), '{}');
-    const result = await setApiCoreBotConfig({}, context);
-    const savedConfig = JSON.parse(await fs.readFile(path.join(context.openclawRoot, 'openclaw.json'), 'utf8'));
-    assert.equal(result.apiCoreBot.baseUrl, 'http://192.168.1.23:9092');
-    assert.equal(result.apiCoreBot.authToken, '********');
-    assert.equal(savedConfig.plugins.entries['rol-websocket-channel'].config.apiCoreBot.baseUrl, 'http://192.168.1.23:9092');
-    assert.equal(savedConfig.plugins.entries['rol-websocket-channel'].config.apiCoreBot.authToken, '123');
+    const configPath = path.join(context.openclawRoot, 'openclaw.json');
+    await fs.writeFile(configPath, '{}');
+    await assert.rejects(() => setApiCoreBotConfig({}, context), /apiCoreBot\.baseUrl is required/);
+    assert.equal(await fs.readFile(configPath, 'utf8'), '{}');
 });
 async function createMethodContext() {
     const projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'api-core-bot-config-test-'));

package/dist/src/admin/methods/mem9.js

@@ -34,7 +34,7 @@ function resolveOpenClawBin() {
 export async function installMem9(context) {
     const config = await ensureOpenClawConfigExists(context.openclawRoot);
     const currentState = readMem9State(config);
-    const currentEntrypoint = await findMem9RuntimeEntrypoint(context.openclawRoot);
+    const currentEntrypoint = await findMem9RuntimeEntrypoint(context.openclawRoot, config);
     // Phase A: Plugin not installed → install only, then restart
     if (!currentState.installed && !currentEntrypoint) {
         await ensureOpenClawCli();
@@ -52,7 +52,7 @@ export async function installMem9(context) {
     }
     // Phase B: Installed but no key → create key, write config, restart
     if (!currentState.configured || !currentState.apiKey) {
-        const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+        const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
         const apiKey = await createMem9Key();
         const updated = await writeMem9Config(context.openclawRoot, apiKey);
         const restart = await restartGateway(context.projectRoot);
@@ -73,7 +73,7 @@ export async function installMem9(context) {
         };
     }
     // Phase C: Already configured → ensure slot/hooks/allow are correct
-    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
     const updated = await ensureMem9SlotConfig(context.openclawRoot, currentState.apiKey);
     const restart = await restartGateway(context.projectRoot);
     return {
@@ -102,7 +102,7 @@ export async function reconnectMem9(key, context) {
     }
     const config = await ensureOpenClawConfigExists(context.openclawRoot);
     const previousState = readMem9State(config);
-    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
     const updated = await writeMem9Config(context.openclawRoot, apiKey);
     const restart = await restartGateway(context.projectRoot);
     return {
@@ -178,8 +178,8 @@ async function installMem9Plugin(cwd) {
         });
     }
 }
-export async function findMem9RuntimeEntrypoint(openclawRoot) {
-    for (const packageRoot of MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))) {
+export async function findMem9RuntimeEntrypoint(openclawRoot, config) {
+    for (const packageRoot of resolveMem9RuntimePackageRoots(openclawRoot, config)) {
         for (const entrypoint of RUNTIME_ENTRYPOINTS.map((item) => path.join(packageRoot, item))) {
             if (await pathExists(entrypoint)) {
                 return entrypoint;
@@ -188,17 +188,34 @@ export async function findMem9RuntimeEntrypoint(openclawRoot) {
     }
     return null;
 }
-async function ensureMem9RuntimeEntrypoint(openclawRoot) {
-    const entrypoint = await findMem9RuntimeEntrypoint(openclawRoot);
+async function ensureMem9RuntimeEntrypoint(openclawRoot, config) {
+    const entrypoint = await findMem9RuntimeEntrypoint(openclawRoot, config);
     if (entrypoint) {
         return entrypoint;
     }
+    const installRecord = readMem9InstallRecord(config);
+    const checkedPackageRoots = resolveMem9RuntimePackageRoots(openclawRoot, config);
     throw new JsonRpcException(JSON_RPC_ERRORS.internalError, 'mem9 plugin is installed but missing compiled runtime output', {
         code: 'MEM9_RUNTIME_OUTPUT_MISSING',
         expected: RUNTIME_ENTRYPOINTS.map((item) => `./${item.replace(/\\/g, '/')}`),
-        packageRoots: MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))
+        checkedPackageRoots,
+        checkedEntrypoints: checkedPackageRoots.flatMap((packageRoot) => RUNTIME_ENTRYPOINTS.map((item) => path.join(packageRoot, item))),
+        installRecord
     });
 }
+function resolveMem9RuntimePackageRoots(openclawRoot, config) {
+    const roots = [];
+    const installPath = pickString(readMem9InstallRecord(config)?.installPath);
+    if (installPath) {
+        roots.push(path.isAbsolute(installPath) ? installPath : path.resolve(openclawRoot, installPath));
+    }
+    for (const fallbackRoot of MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))) {
+        if (!roots.includes(fallbackRoot)) {
+            roots.push(fallbackRoot);
+        }
+    }
+    return roots;
+}
 async function createMem9Key() {
     let response;
     try {
@@ -368,6 +385,10 @@ function pickString(value) {
 function isRecord(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
+function readMem9InstallRecord(config) {
+    const record = config?.plugins?.installs?.[MEM9_PLUGIN_ID];
+    return isRecord(record) ? record : null;
+}
 function readMem9State(config) {
     const installed = Boolean((config.plugins?.installs && typeof config.plugins.installs === 'object' && MEM9_PLUGIN_ID in config.plugins.installs)
         || (config.plugins?.entries && typeof config.plugins.entries === 'object' && MEM9_PLUGIN_ID in config.plugins.entries));

package/dist/src/admin/methods/models-extended.js

@@ -32,6 +32,16 @@ export const updateModels = async (params, context) => {
     const changes = [];
     // 更新 primary model
     if (primaryModel) {
+        const inferredProvider = inferProviderFromPrimaryModel(primaryModel);
+        if (!inferredProvider) {
+            throwModelError('MODEL_PRIMARY_INVALID', 'primaryModel must be in provider/model format');
+        }
+        if (modelProvider && modelProvider !== inferredProvider) {
+            throwModelError('MODEL_PROVIDER_MISMATCH', 'modelProvider does not match primaryModel');
+        }
+        if (!isAllowedModel(config, primaryModel)) {
+            throwModelError('MODEL_NOT_ALLOWED', 'model is not in allowed model options');
+        }
         if (!config.agents)
             config.agents = {};
         if (!config.agents.defaults)
@@ -39,10 +49,6 @@ export const updateModels = async (params, context) => {
         if (!config.agents.defaults.model)
             config.agents.defaults.model = {};
         config.agents.defaults.model.primary = primaryModel;
-        const inferredProvider = inferProviderFromPrimaryModel(primaryModel);
-        if (modelProvider && modelProvider !== inferredProvider) {
-            throwModelError('MODEL_PROVIDER_MISMATCH', 'modelProvider does not match primaryModel');
-        }
         updated = true;
         changes.push(`Updated primary model to: ${primaryModel}`);
     }

package/index.ts

@@ -625,7 +625,9 @@ async function handleIncomingMessage(
   }
 }
 
-async function handleCustomMessageType(
+const immediateAckMessageTypes = new Set(["openclawUpdate", "pluginSelfUpdate"]);
+
+export async function handleCustomMessageType(
   msgType: string,
   innerData: any,
   traceId: string,
@@ -648,6 +650,21 @@ async function handleCustomMessageType(
 
   const handlerMethod = (messageHandler as any)[msgType];
   if (typeof handlerMethod === "function") {
+    if (immediateAckMessageTypes.has(msgType)) {
+      response.success = true;
+      response.data = {
+        ok: true,
+        action: msgType,
+        status: "running",
+        accepted: true,
+        message: `${msgType} started`,
+      };
+      publishCustomMessageResponse(response, innerData, mqttTopic);
+
+      void runCustomMessageHandler(msgType, handlerMethod, innerData, response, mqttTopic);
+      return;
+    }
+
     try {
       const methodResult = await handlerMethod.call(messageHandler, innerData);
 
@@ -664,6 +681,12 @@ async function handleCustomMessageType(
         response.data = methodResult.result;
         if (!methodResult.ok) {
           response.error = methodResult.error?.message || "Unknown error";
+          if (methodResult.error?.code !== undefined) {
+            response.error_code = methodResult.error.code;
+          }
+          if (methodResult.error?.data !== undefined) {
+            response.error_data = methodResult.error.data;
+          }
           if (isSkillInstallFlow) {
             console.error(
               `[rol-websocket-channel] custom message failed: type=${msgType}, traceId=${traceId}, slug=${innerData?.slug ?? ""}, error=${response.error}, detail=${JSON.stringify(methodResult.error?.data ?? {})}`,
@@ -698,6 +721,51 @@ async function handleCustomMessageType(
     response.error = `Unknown message type: ${msgType}`;
   }
 
+  publishCustomMessageResponse(response, innerData, mqttTopic);
+}
+
+async function runCustomMessageHandler(
+  msgType: string,
+  handlerMethod: Function,
+  innerData: any,
+  baseResponse: any,
+  mqttTopic: string,
+): Promise<void> {
+  const response = {
+    ...baseResponse,
+    timestamp: Date.now(),
+  };
+
+  try {
+    const methodResult = await handlerMethod.call(messageHandler, innerData);
+
+    if (
+      typeof methodResult === "object" &&
+      methodResult !== null &&
+      "ok" in methodResult
+    ) {
+      response.success = methodResult.ok;
+      response.data = methodResult.result;
+      if (!methodResult.ok) {
+        response.error = methodResult.error?.message || "Unknown error";
+      } else {
+        delete response.error;
+      }
+    } else {
+      response.success = true;
+      response.data = methodResult;
+      delete response.error;
+    }
+  } catch (handlerErr: any) {
+    response.success = false;
+    response.data = undefined;
+    response.error = handlerErr.message;
+  }
+
+  publishCustomMessageResponse(response, innerData, mqttTopic);
+}
+
+function publishCustomMessageResponse(response: any, innerData: any, mqttTopic: string): void {
   const conn = ConnectionManager.getGlobalConnection();
   if (conn && conn.ws && conn.ws.connected) {
     // 根据 source_type 修改 topic 末尾的 #

package/message-handler.ts

@@ -10,10 +10,12 @@ import { createAgent, deleteAgent, listAgents, updateAgent } from './src/admin/m
 import {
   createArtifactRecord,
   ensureArtifactUploaded,
+  findLatestArtifacts,
   getArtifactContent,
   getArtifactPresignedPost,
   listArtifacts,
   markArtifactUploaded,
+  publishArtifact,
   refreshArtifacts
 } from './src/admin/methods/artifacts.js';
 import {
@@ -493,6 +495,13 @@ export class MessageHandler {
     });
   }
 
+  async artifactsFindLatest(data: any): Promise<any> {
+    return wrapAdminCall(async () => {
+      const context = getContext();
+      return await findLatestArtifacts(data, context);
+    });
+  }
+
   async artifactsGetContent(data: any): Promise<any> {
     return wrapAdminCall(async () => {
       const context = getContext();
@@ -507,6 +516,13 @@ export class MessageHandler {
     });
   }
 
+  async artifactsPublish(data: any): Promise<any> {
+    return wrapAdminCall(async () => {
+      const context = getContext();
+      return await publishArtifact(data, context);
+    });
+  }
+
   async artifactsGetPresignedPost(data: any): Promise<any> {
     return wrapAdminCall(async () => {
       const context = getContext();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rol-websocket-channel",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Unified OpenClaw plugin: MQTT Channel + Admin Bridge for remote management",
   "license": "MIT",
   "author": "nixgnehc",

package/src/admin/methods/admin.test.ts

@@ -67,28 +67,16 @@ test('setApiCoreBotConfig writes apiCoreBot endpoint without changing pairing or
   );
 });
 
-test('setApiCoreBotConfig uses default apiCoreBot values when omitted', async () => {
+test('setApiCoreBotConfig rejects missing baseUrl instead of writing defaults', async () => {
   const context = await createMethodContext();
-  await fs.writeFile(path.join(context.openclawRoot, 'openclaw.json'), '{}');
-
-  const result = await setApiCoreBotConfig({}, context) as {
-    apiCoreBot: {
-      baseUrl: string;
-      authToken: string;
-    };
-  };
-  const savedConfig = JSON.parse(await fs.readFile(path.join(context.openclawRoot, 'openclaw.json'), 'utf8'));
+  const configPath = path.join(context.openclawRoot, 'openclaw.json');
+  await fs.writeFile(configPath, '{}');
 
-  assert.equal(result.apiCoreBot.baseUrl, 'http://192.168.1.23:9092');
-  assert.equal(result.apiCoreBot.authToken, '********');
-  assert.equal(
-    savedConfig.plugins.entries['rol-websocket-channel'].config.apiCoreBot.baseUrl,
-    'http://192.168.1.23:9092'
-  );
-  assert.equal(
-    savedConfig.plugins.entries['rol-websocket-channel'].config.apiCoreBot.authToken,
-    '123'
+  await assert.rejects(
+    () => setApiCoreBotConfig({}, context),
+    /apiCoreBot\.baseUrl is required/
   );
+  assert.equal(await fs.readFile(configPath, 'utf8'), '{}');
 });
 
 async function createMethodContext(): Promise<MethodContext> {

package/src/admin/methods/admin.ts

@@ -5,8 +5,6 @@ import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 import type { JsonValue, MethodHandler } from '../types.js';
 
 const DEFAULT_PLUGIN_ID = 'rol-websocket-channel';
-const DEFAULT_API_CORE_BOT_BASE_URL = 'http://192.168.1.23:9092';
-const DEFAULT_API_CORE_BOT_AUTH_TOKEN = '123';
 
 interface OpenClawConfig {
   agents?: {
@@ -63,10 +61,10 @@ export const setApiCoreBotConfig: MethodHandler = async (params, context): Promi
   const objectParams = isObject(params) ? params : {};
   const baseUrl = typeof objectParams.baseUrl === 'string'
     ? objectParams.baseUrl.trim().replace(/\/+$/, '')
-    : DEFAULT_API_CORE_BOT_BASE_URL;
+    : '';
   const authToken = typeof objectParams.authToken === 'string' && objectParams.authToken.trim()
     ? objectParams.authToken.trim()
-    : DEFAULT_API_CORE_BOT_AUTH_TOKEN;
+    : null;
 
   if (!baseUrl) {
     throw new JsonRpcException(

package/src/admin/methods/mem9.ts

@@ -53,7 +53,7 @@ function resolveOpenClawBin(): string {
 export async function installMem9(context: MethodContext): Promise<JsonValue> {
   const config = await ensureOpenClawConfigExists(context.openclawRoot);
   const currentState = readMem9State(config);
-  const currentEntrypoint = await findMem9RuntimeEntrypoint(context.openclawRoot);
+  const currentEntrypoint = await findMem9RuntimeEntrypoint(context.openclawRoot, config);
 
   // Phase A: Plugin not installed → install only, then restart
   if (!currentState.installed && !currentEntrypoint) {
@@ -74,7 +74,7 @@ export async function installMem9(context: MethodContext): Promise<JsonValue> {
 
   // Phase B: Installed but no key → create key, write config, restart
   if (!currentState.configured || !currentState.apiKey) {
-    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+    const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
     const apiKey = await createMem9Key();
     const updated = await writeMem9Config(context.openclawRoot, apiKey);
     const restart = await restartGateway(context.projectRoot);
@@ -97,7 +97,7 @@ export async function installMem9(context: MethodContext): Promise<JsonValue> {
   }
 
   // Phase C: Already configured → ensure slot/hooks/allow are correct
-  const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+  const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
   const updated = await ensureMem9SlotConfig(context.openclawRoot, currentState.apiKey!);
   const restart = await restartGateway(context.projectRoot);
 
@@ -130,7 +130,7 @@ export async function reconnectMem9(key: string, context: MethodContext): Promis
 
   const config = await ensureOpenClawConfigExists(context.openclawRoot);
   const previousState = readMem9State(config);
-  const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot);
+  const runtimeEntrypoint = await ensureMem9RuntimeEntrypoint(context.openclawRoot, config);
   const updated = await writeMem9Config(context.openclawRoot, apiKey);
   const restart = await restartGateway(context.projectRoot);
 
@@ -225,8 +225,8 @@ async function installMem9Plugin(cwd: string): Promise<void> {
   }
 }
 
-export async function findMem9RuntimeEntrypoint(openclawRoot: string): Promise<string | null> {
-  for (const packageRoot of MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))) {
+export async function findMem9RuntimeEntrypoint(openclawRoot: string, config?: OpenClawConfig): Promise<string | null> {
+  for (const packageRoot of resolveMem9RuntimePackageRoots(openclawRoot, config)) {
     for (const entrypoint of RUNTIME_ENTRYPOINTS.map((item) => path.join(packageRoot, item))) {
       if (await pathExists(entrypoint)) {
         return entrypoint;
@@ -236,22 +236,40 @@ export async function findMem9RuntimeEntrypoint(openclawRoot: string): Promise<s
   return null;
 }
 
-async function ensureMem9RuntimeEntrypoint(openclawRoot: string): Promise<string> {
-  const entrypoint = await findMem9RuntimeEntrypoint(openclawRoot);
+async function ensureMem9RuntimeEntrypoint(openclawRoot: string, config?: OpenClawConfig): Promise<string> {
+  const entrypoint = await findMem9RuntimeEntrypoint(openclawRoot, config);
   if (entrypoint) {
     return entrypoint;
   }
+  const installRecord = readMem9InstallRecord(config);
+  const checkedPackageRoots = resolveMem9RuntimePackageRoots(openclawRoot, config);
   throw new JsonRpcException(
     JSON_RPC_ERRORS.internalError,
     'mem9 plugin is installed but missing compiled runtime output',
     {
       code: 'MEM9_RUNTIME_OUTPUT_MISSING',
       expected: RUNTIME_ENTRYPOINTS.map((item) => `./${item.replace(/\\/g, '/')}`),
-      packageRoots: MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))
+      checkedPackageRoots,
+      checkedEntrypoints: checkedPackageRoots.flatMap((packageRoot) => RUNTIME_ENTRYPOINTS.map((item) => path.join(packageRoot, item))),
+      installRecord
     }
   );
 }
 
+function resolveMem9RuntimePackageRoots(openclawRoot: string, config?: OpenClawConfig): string[] {
+  const roots: string[] = [];
+  const installPath = pickString(readMem9InstallRecord(config)?.installPath);
+  if (installPath) {
+    roots.push(path.isAbsolute(installPath) ? installPath : path.resolve(openclawRoot, installPath));
+  }
+  for (const fallbackRoot of MEM9_PACKAGE_ROOTS.map((item) => path.join(openclawRoot, item))) {
+    if (!roots.includes(fallbackRoot)) {
+      roots.push(fallbackRoot);
+    }
+  }
+  return roots;
+}
+
 async function createMem9Key(): Promise<string> {
   let response: Response;
   try {
@@ -447,6 +465,11 @@ function isRecord(value: unknown): value is Record<string, any> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
 
+function readMem9InstallRecord(config?: OpenClawConfig): Record<string, any> | null {
+  const record = config?.plugins?.installs?.[MEM9_PLUGIN_ID];
+  return isRecord(record) ? record : null;
+}
+
 function readMem9State(config: OpenClawConfig): {
   installed: boolean;
   configured: boolean;

package/src/admin/methods/models-extended.ts

@@ -62,18 +62,33 @@ export const updateModels: MethodHandler = async (
 
   // 更新 primary model
   if (primaryModel) {
-    if (!config.agents) config.agents = {};
-    if (!config.agents.defaults) config.agents.defaults = {};
-    if (!config.agents.defaults.model) config.agents.defaults.model = {};
-    
-    config.agents.defaults.model.primary = primaryModel;
     const inferredProvider = inferProviderFromPrimaryModel(primaryModel);
+    if (!inferredProvider) {
+      throwModelError(
+        'MODEL_PRIMARY_INVALID',
+        'primaryModel must be in provider/model format'
+      );
+    }
+
     if (modelProvider && modelProvider !== inferredProvider) {
       throwModelError(
         'MODEL_PROVIDER_MISMATCH',
         'modelProvider does not match primaryModel'
       );
     }
+
+    if (!isAllowedModel(config, primaryModel)) {
+      throwModelError(
+        'MODEL_NOT_ALLOWED',
+        'model is not in allowed model options'
+      );
+    }
+
+    if (!config.agents) config.agents = {};
+    if (!config.agents.defaults) config.agents.defaults = {};
+    if (!config.agents.defaults.model) config.agents.defaults.model = {};
+    
+    config.agents.defaults.model.primary = primaryModel;
     updated = true;
     changes.push(`Updated primary model to: ${primaryModel}`);
   }