@clawling/clawchat-plugin-openclaw 2026.6.30-4 → 2026.7.1

package/src/tools.ts

@@ -9,6 +9,7 @@ import {
   ClawlingApiError,
   type Profile,
 } from "./api-types.ts";
+import { mapGateOutcome } from "./gate-outcome.ts";
 import { resolveOpenclawClawlingAccount } from "./config.ts";
 import {
   clawChatDbPathForStateDir,
@@ -389,6 +390,39 @@ export function registerOpenclawClawlingTools(
     })();
   }
 
+  /**
+   * Like withClient, but maps gate codes (21001/21003) to structured outcomes
+   * via mapGateOutcome so the agent sees a clear pending/forbidden status
+   * instead of a generic error. Used for friend and moment mutation tools.
+   */
+  function withGatedClient<T>(
+    fn: (client: ReturnType<typeof createOpenclawClawlingApiClient>) => Promise<T>,
+  ): Promise<OpenClawAgentToolResult<unknown>> {
+    return (async (): Promise<OpenClawAgentToolResult<unknown>> => {
+      const built = buildClient();
+      if (!built.ok) return built.error;
+      try {
+        const data = await fn(built.client);
+        return jsonResponse(data);
+      } catch (err) {
+        if (err instanceof ClawlingApiError) {
+          const code = typeof err.meta?.code === "number" ? err.meta.code : null;
+          if (code !== null) {
+            const rawData = err.meta?.data;
+            const gateData =
+              rawData !== null && rawData !== undefined && typeof rawData === "object"
+                ? (rawData as Record<string, unknown>)
+                : {};
+            const outcome = mapGateOutcome(code, gateData);
+            if (outcome !== null) return jsonResponse(outcome);
+          }
+          return apiError(err);
+        }
+        return genericError(err);
+      }
+    })();
+  }
+
   function workspaceRoot(ctx: OpenClawPluginToolContext): string | null {
     const root = typeof ctx.workspaceDir === "string" ? ctx.workspaceDir.trim() : "";
     return root || null;
@@ -829,7 +863,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_send_friend_request", params, async () => {
           const p = params as ClawchatSendFriendRequestParams;
-          return await withClient((c) => c.sendFriendRequest(p));
+          return await withGatedClient((c) => c.sendFriendRequest(p));
         });
       },
     },
@@ -869,7 +903,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_accept_friend_request", params, async () => {
           const p = params as ClawchatAcceptFriendRequestParams;
-          return await withClient((c) => c.acceptFriendRequest(p.requestId));
+          return await withGatedClient((c) => c.acceptFriendRequest(p.requestId));
         });
       },
     },
@@ -889,7 +923,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_reject_friend_request", params, async () => {
           const p = params as ClawchatRejectFriendRequestParams;
-          return await withClient((c) => c.rejectFriendRequest(p.requestId));
+          return await withGatedClient((c) => c.rejectFriendRequest(p.requestId));
         });
       },
     },
@@ -909,7 +943,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_remove_friend", params, async () => {
           const p = params as ClawchatRemoveFriendParams;
-          return await withClient((c) => c.removeFriend(p.friendUserId));
+          return await withGatedClient((c) => c.removeFriend(p.friendUserId));
         });
       },
     },
@@ -1084,7 +1118,7 @@ export function registerOpenclawClawlingTools(
           if (!text && (!images || images.length === 0)) {
             return validationError("clawchat-plugin-openclaw: at least one of text or images is required");
           }
-          return await withClient((c) =>
+          return await withGatedClient((c) =>
             c.createMoment({
               ...(text !== undefined ? { text } : {}),
               ...(images !== undefined ? { images } : {}),
@@ -1109,7 +1143,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_delete_moment", params, async () => {
           const p = params as ClawchatDeleteMomentParams;
-          return await withClient((c) => c.deleteMoment(p.momentId));
+          return await withGatedClient((c) => c.deleteMoment(p.momentId));
         });
       },
     },
@@ -1132,7 +1166,7 @@ export function registerOpenclawClawlingTools(
           if (!p.emoji?.trim()) {
             return validationError("clawchat-plugin-openclaw: emoji is required");
           }
-          return await withClient((c) =>
+          return await withGatedClient((c) =>
             c.toggleMomentReaction({ momentId: p.momentId, emoji: p.emoji }),
           );
         });
@@ -1157,7 +1191,7 @@ export function registerOpenclawClawlingTools(
           if (!p.text?.trim()) {
             return validationError("clawchat-plugin-openclaw: text is required");
           }
-          return await withClient((c) =>
+          return await withGatedClient((c) =>
             c.createMomentComment({ momentId: p.momentId, text: p.text }),
           );
         });
@@ -1182,7 +1216,7 @@ export function registerOpenclawClawlingTools(
           if (!p.text?.trim()) {
             return validationError("clawchat-plugin-openclaw: text is required");
           }
-          return await withClient((c) =>
+          return await withGatedClient((c) =>
             c.replyMomentComment({
               momentId: p.momentId,
               replyToCommentId: p.replyToCommentId,
@@ -1208,7 +1242,7 @@ export function registerOpenclawClawlingTools(
       async execute(_callId, params) {
         return await recordClawchatToolCall("clawchat_delete_moment_comment", params, async () => {
           const p = params as ClawchatDeleteMomentCommentParams;
-          return await withClient((c) =>
+          return await withGatedClient((c) =>
             c.deleteMomentComment({ momentId: p.momentId, commentId: p.commentId }),
           );
         });

package/src/ws-client.ts

@@ -9,6 +9,7 @@ import {
   TransportError,
   isBusinessDispatchEvent,
   type ConnState,
+  type ConnectCapabilities,
   type ConnectPayload,
   type EmptyPayload,
   type Envelope,
@@ -146,6 +147,24 @@ type PendingAck = {
   reject: (err: Error) => void;
 };
 
+/**
+ * Returns the capability set advertised in the connect handshake.
+ * Exported so tests can assert on the exact fields without a full WS setup.
+ *
+ * permission_events: forward-compat: advertises readiness for a future native
+ * `permission.receipt` wire frame; today the permission-decision receipt is
+ * delivered as a system message until msghub emits the native frame.
+ */
+export function buildConnectCapabilities(): ConnectCapabilities {
+  return {
+    multi_device: false,
+    device_replay: true,
+    chat_meta_events: true,
+    notify_signals: true,
+    permission_events: true,
+  };
+}
+
 export class ClawChatClient extends EventEmitter {
   private currentState: ConnState = "idle";
   private connectResolve?: () => void;
@@ -398,12 +417,8 @@ export class ClawChatClient extends EventEmitter {
       // *send* history.transit, which a single-device agent never does, and we
       // do not handle inbound history.transit — advertising it would invite
       // frames we cannot process. This is a deliberate, spec-legal omission.
-      capabilities: {
-        multi_device: false,
-        device_replay: true,
-        chat_meta_events: true,
-        notify_signals: true,
-      },
+      // permission_events: forward-compat; see buildConnectCapabilities().
+      capabilities: buildConnectCapabilities(),
     };
     const traceId = this.nextTraceId();
     this.expectedConnectTraceId = traceId;