Merge pull request 'dev/2026-04-08' (#1) from dev/2026-04-08 into main

Reviewed-on: #1

package-lock.json

@@ -12,14 +12,10 @@
       },
       "devDependencies": {
         "@types/node": "^25.5.2",
-        "openclaw": "file:/usr/lib/node_modules/openclaw",
         "typescript": "^5.6.3",
         "vitest": "^4.1.3"
       }
     },
-    "../../../../../usr/lib/node_modules/openclaw": {
-      "dev": true
-    },
     "node_modules/@emnapi/core": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz",
@@ -918,10 +914,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/openclaw": {
-      "resolved": "../../../../../usr/lib/node_modules/openclaw",
-      "link": true
-    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",

package.json

@@ -32,7 +32,6 @@
   "devDependencies": {
     "@types/node": "^25.5.2",
     "typescript": "^5.6.3",
-    "vitest": "^4.1.3",
-    "openclaw": "file:/usr/lib/node_modules/openclaw"
+    "vitest": "^4.1.3"
   }
 }

plugin/core/config.ts

@@ -1,12 +1,8 @@
 export interface YonexusClientConfig {
   mainHost: string;
   identifier: string;
-  /**
-   * Optional. The client never sends pairing notifications (the server
-   * does); accepted for back-compat but no longer required.
-   */
-  notifyBotToken?: string;
-  adminUserId?: string;
+  notifyBotToken: string;
+  adminUserId: string;
 }
 
 export class YonexusClientConfigError extends Error {
@@ -48,9 +44,15 @@ export function validateYonexusClientConfig(raw: unknown): YonexusClientConfig {
     issues.push("identifier is required");
   }
 
-  // Optional (back-compat): the client does not send notifications.
   const rawNotifyBotToken = source.notifyBotToken;
+  if (!isNonEmptyString(rawNotifyBotToken)) {
+    issues.push("notifyBotToken is required");
+  }
+
   const rawAdminUserId = source.adminUserId;
+  if (!isNonEmptyString(rawAdminUserId)) {
+    issues.push("adminUserId is required");
+  }
 
   if (issues.length > 0) {
     throw new YonexusClientConfigError(issues);
@@ -58,15 +60,13 @@ export function validateYonexusClientConfig(raw: unknown): YonexusClientConfig {
 
   const mainHost = (rawMainHost as string).trim();
   const identifier = (rawIdentifier as string).trim();
+  const notifyBotToken = (rawNotifyBotToken as string).trim();
+  const adminUserId = (rawAdminUserId as string).trim();
 
   return {
     mainHost,
     identifier,
-    notifyBotToken: isNonEmptyString(rawNotifyBotToken)
-      ? rawNotifyBotToken.trim()
-      : undefined,
-    adminUserId: isNonEmptyString(rawAdminUserId)
-      ? rawAdminUserId.trim()
-      : undefined
+    notifyBotToken,
+    adminUserId
   };
 }

plugin/index.ts

@@ -39,11 +39,7 @@ export {
   type ClientRuleProcessor
 } from "./core/rules.js";
 
-import os from "node:os";
 import path from "node:path";
-import fs from "node:fs";
-import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
 import { validateYonexusClientConfig } from "./core/config.js";
 import { createYonexusClientStateStore } from "./core/state.js";
 import { createClientTransport } from "./core/transport.js";
@@ -56,8 +52,6 @@ const _RUNTIME_KEY   = "_yonexusClientRuntime";
 const _REGISTRY_KEY  = "_yonexusClientRegistry";
 const _CALLBACKS_KEY = "_yonexusClientOnAuthCallbacks";
 
-const PLUGIN_DATA_DIR = path.join(os.homedir(), ".openclaw", "yonexus-client");
-
 export interface YonexusClientPluginManifest {
   readonly name: "Yonexus.Client";
   readonly version: string;
@@ -70,7 +64,7 @@ const manifest: YonexusClientPluginManifest = {
   description: "Yonexus client plugin for cross-instance OpenClaw communication"
 };
 
-export function createYonexusClientPlugin(api: OpenClawPluginApi): void {
+export function createYonexusClientPlugin(api: { rootDir: string; pluginConfig: unknown }): void {
   // 1. Ensure shared state survives hot-reload — only initialise when absent
   if (!(_G[_REGISTRY_KEY] instanceof YonexusClientRuleRegistry)) {
     _G[_REGISTRY_KEY] = createClientRuleRegistry();
@@ -93,59 +87,48 @@ export function createYonexusClientPlugin(api: OpenClawPluginApi): void {
     onAuthenticated: onAuthenticatedCallbacks
   };
 
-  // 3. Runtime startup — only fire when the gateway boots, not eagerly during
-  //    register() inside one-shot CLI subprocesses (e.g. `openclaw completion`).
-  //    Without this gate, every CLI invocation that loads plugins would open
-  //    a WebSocket to the Yonexus server.
-  api.on("gateway_start", () => {
-    if (_G[_STARTED_KEY]) return;
-    _G[_STARTED_KEY] = true;
+  // 3. Start the runtime only once — the globalThis flag survives hot-reload
+  if (_G[_STARTED_KEY]) return;
+  _G[_STARTED_KEY] = true;
 
-    fs.mkdirSync(PLUGIN_DATA_DIR, { recursive: true });
+  const config = validateYonexusClientConfig(api.pluginConfig);
+  const stateStore = createYonexusClientStateStore(path.join(api.rootDir, "state.json"));
 
-    const config = validateYonexusClientConfig(api.pluginConfig);
-    const stateStore = createYonexusClientStateStore(path.join(PLUGIN_DATA_DIR, "state.json"));
-
-    const transport = createClientTransport({
-      config,
-      onMessage: (msg) => {
-        (_G[_RUNTIME_KEY] as YonexusClientRuntime | undefined)?.handleMessage(msg).catch((err: unknown) => {
-          console.error("[yonexus-client] message handler error:", err);
-        });
-      },
-      onStateChange: (state) => {
-        (_G[_RUNTIME_KEY] as YonexusClientRuntime | undefined)?.handleTransportStateChange(state);
-      }
-    });
-
-    const runtime = createYonexusClientRuntime({
-      config,
-      transport,
-      stateStore,
-      ruleRegistry,
-      onAuthenticated: () => {
-        for (const cb of onAuthenticatedCallbacks) cb();
-      }
-    });
-    _G[_RUNTIME_KEY] = runtime;
-
-    runtime.start().catch((err: unknown) => {
-      console.error("[yonexus-client] failed to start:", err);
-    });
+  const transport = createClientTransport({
+    config,
+    onMessage: (msg) => {
+      (_G[_RUNTIME_KEY] as YonexusClientRuntime | undefined)?.handleMessage(msg).catch((err: unknown) => {
+        console.error("[yonexus-client] message handler error:", err);
+      });
+    },
+    onStateChange: (state) => {
+      (_G[_RUNTIME_KEY] as YonexusClientRuntime | undefined)?.handleTransportStateChange(state);
+    }
   });
 
-  api.on("gateway_stop", () => {
-    const runtime = _G[_RUNTIME_KEY] as YonexusClientRuntime | undefined;
-    runtime?.stop().catch((err: unknown) => {
+  const runtime = createYonexusClientRuntime({
+    config,
+    transport,
+    stateStore,
+    ruleRegistry,
+    onAuthenticated: () => {
+      for (const cb of onAuthenticatedCallbacks) cb();
+    }
+  });
+  _G[_RUNTIME_KEY] = runtime;
+
+  const shutdown = (): void => {
+    runtime.stop().catch((err: unknown) => {
       console.error("[yonexus-client] shutdown error:", err);
     });
+  };
+  process.once("SIGTERM", shutdown);
+  process.once("SIGINT", shutdown);
+
+  runtime.start().catch((err: unknown) => {
+    console.error("[yonexus-client] failed to start:", err);
   });
 }
 
-export default definePluginEntry({
-  id: "yonexus-client",
-  name: "Yonexus.Client",
-  description: "Yonexus client plugin for cross-instance OpenClaw communication",
-  register: createYonexusClientPlugin,
-});
+export default createYonexusClientPlugin;
 export { manifest };

plugin/openclaw.plugin.json

@@ -1,10 +1,10 @@
 {
   "id": "yonexus-client",
   "name": "Yonexus.Client",
+  "version": "0.1.0",
   "description": "Yonexus client plugin for cross-instance OpenClaw communication",
-  "activation": {
-    "onStartup": true
-  },
+  "entry": "./dist/Yonexus.Client/plugin/index.js",
+  "permissions": [],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -14,6 +14,6 @@
       "notifyBotToken": { "type": "string" },
       "adminUserId": { "type": "string" }
     },
-    "required": ["mainHost", "identifier"]
+    "required": ["mainHost", "identifier", "notifyBotToken", "adminUserId"]
   }
 }