rol-websocket-channel 1.6.3 → 1.6.7

package/dist/index.js

@@ -530,6 +530,12 @@ export async function handleCustomMessageType(msgType, innerData, traceId, accou
                 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 ?? {})}`);
                     }

package/dist/src/admin/lib/openclaw-bin.js

@@ -0,0 +1,3 @@
+export function resolveOpenClawBin() {
+    return process.env.OPENCLAW_BIN || 'openclaw';
+}

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

@@ -2,6 +2,7 @@ import { exec, execFile } from 'node:child_process';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { pathExists, readJsonFile, writeJsonFile } from '../lib/fs.js';
+import { resolveOpenClawBin } from '../lib/openclaw-bin.js';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 const execAsync = promisify(exec);
 const execFileAsync = promisify(execFile);
@@ -23,18 +24,12 @@ const RUNTIME_ENTRYPOINTS = [
     'index.cjs'
 ];
 // ---------------------------------------------------------------------------
-// Resolve openclaw binary path (supports OPENCLAW_BIN env override)
-// ---------------------------------------------------------------------------
-function resolveOpenClawBin() {
-    return process.env.OPENCLAW_BIN || 'openclaw';
-}
-// ---------------------------------------------------------------------------
 // Public API: installMem9 (idempotent, phase-based)
 // ---------------------------------------------------------------------------
 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 +47,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 +68,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 +97,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 {
@@ -153,7 +148,7 @@ async function ensureOpenClawCli() {
         await execFileAsync(bin, ['--version']);
     }
     catch (error) {
-        throw new JsonRpcException(JSON_RPC_ERRORS.internalError, `openclaw command is not available (tried: ${bin}). Set OPENCLAW_BIN env to override.`, { code: 'MEM9_OPENCLAW_NOT_FOUND', bin, detail: error instanceof Error ? error.message : String(error) });
+        throw new JsonRpcException(JSON_RPC_ERRORS.internalError, `openclaw command is not available (tried: ${bin}). Configure the OpenClaw binary path for the Gateway service.`, { code: 'MEM9_OPENCLAW_NOT_FOUND', bin, detail: error instanceof Error ? error.message : String(error) });
     }
 }
 async function ensureNodeRuntime() {
@@ -178,8 +173,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 +183,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 +380,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/index.ts

@@ -681,6 +681,12 @@ export 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 ?? {})}`,

package/package.json

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

package/src/admin/lib/openclaw-bin.ts

@@ -0,0 +1,3 @@
+export function resolveOpenClawBin(): string {
+  return process.env.OPENCLAW_BIN || 'openclaw';
+}

package/src/admin/methods/mem9.ts

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { promisify } from 'node:util';
 
 import { pathExists, readJsonFile, writeJsonFile } from '../lib/fs.js';
+import { resolveOpenClawBin } from '../lib/openclaw-bin.js';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 import type { JsonValue, MethodContext } from '../types.js';
 
@@ -38,14 +39,6 @@ interface OpenClawConfig {
   [key: string]: any;
 }
 
-// ---------------------------------------------------------------------------
-// Resolve openclaw binary path (supports OPENCLAW_BIN env override)
-// ---------------------------------------------------------------------------
-
-function resolveOpenClawBin(): string {
-  return process.env.OPENCLAW_BIN || 'openclaw';
-}
-
 // ---------------------------------------------------------------------------
 // Public API: installMem9 (idempotent, phase-based)
 // ---------------------------------------------------------------------------
@@ -53,7 +46,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 +67,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 +90,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 +123,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);
 
@@ -189,7 +182,7 @@ async function ensureOpenClawCli(): Promise<void> {
   } catch (error) {
     throw new JsonRpcException(
       JSON_RPC_ERRORS.internalError,
-      `openclaw command is not available (tried: ${bin}). Set OPENCLAW_BIN env to override.`,
+      `openclaw command is not available (tried: ${bin}). Configure the OpenClaw binary path for the Gateway service.`,
       { code: 'MEM9_OPENCLAW_NOT_FOUND', bin, detail: error instanceof Error ? error.message : String(error) }
     );
   }
@@ -225,8 +218,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 +229,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 +458,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;