@clawroom/openclaw 0.4.0 → 0.5.0

package/README.md

@@ -29,11 +29,11 @@ openclaw gateway restart
 
 ## Release
 
-The repository includes a GitHub Actions workflow that publishes `@clawroom/protocol`, `@clawroom/sdk`, and `@clawroom/openclaw` to npm when a release tag is pushed.
+The repository includes a GitHub Actions workflow that publishes `@clawroom/protocol`, `@clawroom/sdk`, `@clawroom/bridge`, and `@clawroom/openclaw` to npm when a release tag is pushed.
 
 To publish a new version:
 
-1. Update the package versions in `protocol/package.json`, `sdk/package.json`, and `plugin/package.json`.
+1. Update the package versions in `protocol/package.json`, `sdk/package.json`, `bridge/package.json`, and `plugin/package.json`.
 2. Commit and push the release commit to GitHub.
 3. Push a release tag, for example `git tag plugin-0.2.3 && git push origin plugin-0.2.3`.
-4. Watch `.github/workflows/release-plugin.yml` until all three publish jobs succeed.
+4. Watch `.github/workflows/release-plugin.yml` until all publish jobs succeed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawroom/openclaw",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "OpenClaw channel plugin for ClawRoom",
   "type": "module",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "@clawroom/sdk"
   ],
   "dependencies": {
-    "@clawroom/sdk": "^0.4.0"
+    "@clawroom/sdk": "^0.5.0"
   },
   "peerDependencies": {
     "openclaw": "*"

package/src/channel.ts

@@ -1,18 +1,19 @@
 import type { ChannelPlugin } from "openclaw/plugin-sdk/core";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
-import { collectSkills } from "./skill-reporter.js";
+// import { collectSkills } from "./skill-reporter.js";
 import { getClawroomRuntime } from "./runtime.js";
-import { ClawroomClient } from "./client.js";
+import { ClawroomPluginClient } from "./client.js";
 import { setupTaskExecutor } from "./task-executor.js";
 import { setupChatExecutor } from "./chat-executor.js";
 
 // ── Config resolution ────────────────────────────────────────────────
 
-const DEFAULT_ENDPOINT = "https://clawroom.site9.ai/api/agents";
+const DEFAULT_ENDPOINT = "https://clawroom.site9.ai/api/machines";
 const DEFAULT_ACCOUNT_ID = "default";
 
 interface ClawroomAccountConfig {
-  token?: string;
+  api_key?: string;
+  token?: string; // deprecated, fallback
   endpoint?: string;
   skills?: string[];
   enabled?: boolean;
@@ -23,7 +24,7 @@ interface ResolvedClawroomAccount {
   name: string;
   enabled: boolean;
   configured: boolean;
-  token: string;
+  apiKey: string;
   endpoint: string;
   skills: string[];
 }
@@ -39,7 +40,7 @@ function resolveClawroomAccount(opts: {
   accountId?: string | null;
 }): ResolvedClawroomAccount {
   const section = readClawroomSection(opts.cfg);
-  const token = section.token ?? "";
+  const apiKey = section.api_key ?? section.token ?? "";
   const endpoint = section.endpoint || DEFAULT_ENDPOINT;
   const skills = Array.isArray(section.skills) ? section.skills : [];
   const enabled = section.enabled !== false;
@@ -48,8 +49,8 @@ function resolveClawroomAccount(opts: {
     accountId: opts.accountId ?? DEFAULT_ACCOUNT_ID,
     name: "ClawRoom",
     enabled,
-    configured: token.length > 0,
-    token,
+    configured: apiKey.length > 0,
+    apiKey,
     endpoint,
     skills,
   };
@@ -57,7 +58,7 @@ function resolveClawroomAccount(opts: {
 
 // ── Persistent client per gateway lifecycle ───────────────────────
 
-let activeClient: ClawroomClient | null = null;
+let activeClient: ClawroomPluginClient | null = null;
 
 // ── Channel plugin definition ────────────────────────────────────────
 
@@ -104,17 +105,9 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
     deliveryMode: "direct",
 
     sendText: async ({ to, text }) => {
-      // Outbound messages are task results sent via HTTP.
-      // The task-executor sends results directly through client.send();
-      // this adapter exists for completeness if openclaw routing tries
-      // to deliver a reply through the channel outbound path.
-      if (activeClient) {
-        activeClient.send({
-          type: "agent.complete",
-          taskId: to,
-          output: text,
-        });
-      }
+      // Outbound path — task results are sent directly by executors,
+      // this is a fallback if openclaw routing triggers outbound delivery.
+      // No-op for machine client (executors handle it).
       return { channel: "clawroom", messageId: to, to };
     },
   },
@@ -125,24 +118,16 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
 
       if (!account.configured) {
         throw new Error(
-          "ClawRoom is not configured: set channels.clawroom.token in your OpenClaw config.",
+          "ClawRoom is not configured: set channels.clawroom.api_key in your OpenClaw config.",
         );
       }
 
       const runtime = getClawroomRuntime();
-      const skills = collectSkills({
-        runtime,
-        configuredSkills: account.skills,
-      });
-
-      const deviceId = resolveDeviceId(ctx);
       const log = ctx.log ?? undefined;
 
-      const client = new ClawroomClient({
+      const client = new ClawroomPluginClient({
         endpoint: account.endpoint,
-        token: account.token,
-        deviceId,
-        skills,
+        apiKey: account.apiKey,
         log,
       });
 
@@ -170,23 +155,11 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
         });
       };
 
-      // Wire up HTTP polling events to OpenClaw health status
+      // Wire up polling events to OpenClaw health status
       client.onWelcome(() => publishConnected());
-      client.onTask(() => {
-        // Any server task = update lastEventAt so gateway knows we're alive
-        ctx.setStatus({
-          accountId: account.accountId,
-          running: true,
-          connected: true,
-          lastEventAt: Date.now(),
-          lastStartAt: Date.now(),
-          lastStopAt: null,
-          lastError: null,
-        });
-      });
       client.onDisconnect(() => publishDisconnected());
-      client.onFatal((reason, code) => {
-        log?.error?.(`[clawroom] fatal error (code ${code}): ${reason}`);
+      client.onFatal((reason) => {
+        log?.error?.(`[clawroom] fatal error: ${reason}`);
         ctx.setStatus({
           accountId: account.accountId,
           running: false,