@eclaw/openclaw-channel 1.0.15 → 1.0.17

package/dist/client.d.ts

@@ -16,8 +16,12 @@ export declare class EClawClient {
      *  If entityId is omitted, the backend auto-selects the first free slot.
      */
     bindEntity(entityId?: number, name?: string): Promise<BindResponse>;
-    /** Send bot message to user */
+    /** Send bot message to user (updates own entity state on wallpaper) */
     sendMessage(message: string, state?: string, mediaType?: string, mediaUrl?: string): Promise<MessageResponse>;
+    /** Send bot-to-bot message to another entity (speak-to) */
+    speakTo(toEntityId: number, text: string, expectsReply?: boolean): Promise<void>;
+    /** Broadcast message to all other bound entities */
+    broadcastToAll(text: string, expectsReply?: boolean): Promise<void>;
     /** Unregister callback on shutdown */
     unregisterCallback(): Promise<void>;
     get currentDeviceId(): string | null;

package/dist/client.js

@@ -64,7 +64,7 @@ export class EClawClient {
         this.entityId = data.entityId; // Use server-assigned slot
         return data;
     }
-    /** Send bot message to user */
+    /** Send bot message to user (updates own entity state on wallpaper) */
     async sendMessage(message, state = 'IDLE', mediaType, mediaUrl) {
         if (!this.deviceId || !this.botSecret) {
             throw new Error('Not bound — call bindEntity() first');
@@ -85,6 +85,41 @@ export class EClawClient {
         });
         return await res.json();
     }
+    /** Send bot-to-bot message to another entity (speak-to) */
+    async speakTo(toEntityId, text, expectsReply = false) {
+        if (!this.deviceId || !this.botSecret) {
+            throw new Error('Not bound — call bindEntity() first');
+        }
+        await fetch(`${this.apiBase}/api/entity/speak-to`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                deviceId: this.deviceId,
+                fromEntityId: this.entityId,
+                toEntityId,
+                botSecret: this.botSecret,
+                text,
+                expects_reply: expectsReply,
+            }),
+        });
+    }
+    /** Broadcast message to all other bound entities */
+    async broadcastToAll(text, expectsReply = false) {
+        if (!this.deviceId || !this.botSecret) {
+            throw new Error('Not bound — call bindEntity() first');
+        }
+        await fetch(`${this.apiBase}/api/entity/broadcast`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                deviceId: this.deviceId,
+                fromEntityId: this.entityId,
+                botSecret: this.botSecret,
+                text,
+                expects_reply: expectsReply,
+            }),
+        });
+    }
     /** Unregister callback on shutdown */
     async unregisterCallback() {
         await fetch(`${this.apiBase}/api/channel/register`, {

package/dist/gateway.js

@@ -22,7 +22,7 @@ function resolveAccountFromCtx(ctx) {
             apiKey: ctx.account.apiKey,
             apiSecret: ctx.account.apiSecret,
             apiBase: (ctx.account.apiBase ?? 'https://eclawbot.com').replace(/\/$/, ''),
-            entityId: ctx.account.entityId ?? 0,
+            entityId: ctx.account.entityId, // undefined = auto-select
             botName: ctx.account.botName,
             webhookUrl: ctx.account.webhookUrl,
         };
@@ -83,14 +83,16 @@ export async function startAccount(ctx) {
         // Bind entity via channel API.
         // /api/channel/bind is idempotent for the same channel account:
         //   - Not bound → binds fresh, returns new botSecret
-        //   - Already bound via this channel account → returns existing botSecret
+        //   - Already bound via this channel account → returns existing botSecret (reconnect)
         //   - Bound via different method → throws error (user must unbind first)
-        const entityInfo = regData.entities.find(e => e.entityId === account.entityId);
-        const alreadyBound = entityInfo?.isBound ?? false;
+        // entityId is omitted here so the server auto-selects the best slot
         const bindData = await client.bindEntity(account.entityId, account.botName);
-        console.log(alreadyBound
-            ? `[E-Claw] Entity ${account.entityId} reconnected (existing channel binding), publicCode: ${bindData.publicCode}`
-            : `[E-Claw] Entity ${account.entityId} bound, publicCode: ${bindData.publicCode}`);
+        const assignedEntityId = bindData.entityId;
+        const entityInfo = regData.entities.find(e => e.entityId === assignedEntityId);
+        const wasAlreadyBound = entityInfo?.isBound ?? false;
+        console.log(wasAlreadyBound
+            ? `[E-Claw] Entity ${assignedEntityId} reconnected (existing channel binding), publicCode: ${bindData.publicCode}`
+            : `[E-Claw] Entity ${assignedEntityId} bound, publicCode: ${bindData.publicCode}`);
         console.log(`[E-Claw] Account ${accountId} ready!`);
     }
     catch (err) {

package/dist/outbound.d.ts

@@ -1,4 +1,6 @@
 import { EClawClient } from './client.js';
+export declare function setActiveEvent(accountId: string, event: string): void;
+export declare function clearActiveEvent(accountId: string): void;
 export declare function setClient(accountId: string, client: EClawClient): void;
 export declare function getClient(accountId: string): EClawClient | undefined;
 /** OpenClaw outbound: send text message to E-Claw user */

package/dist/outbound.js

@@ -1,5 +1,13 @@
 /** Client instances keyed by accountId */
 const clients = new Map();
+/** Track current inbound event type per account to suppress duplicate sendMessage calls */
+const activeEvent = new Map();
+export function setActiveEvent(accountId, event) {
+    activeEvent.set(accountId, event);
+}
+export function clearActiveEvent(accountId) {
+    activeEvent.delete(accountId);
+}
 export function setClient(accountId, client) {
     clients.set(accountId, client);
 }
@@ -10,6 +18,11 @@ export function getClient(accountId) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function sendText(ctx) {
     const accountId = ctx.accountId ?? 'default';
+    // Suppress duplicate delivery for bot-to-bot events — webhook-handler's deliver handles these
+    const event = activeEvent.get(accountId) ?? 'message';
+    if (event === 'entity_message' || event === 'broadcast') {
+        return { channel: 'eclaw', messageId: '', chatId: '' };
+    }
     const client = clients.get(accountId);
     if (!client) {
         return { channel: 'eclaw', messageId: '', chatId: '' };
@@ -32,6 +45,11 @@ export async function sendText(ctx) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function sendMedia(ctx) {
     const accountId = ctx.accountId ?? 'default';
+    // Suppress duplicate delivery for bot-to-bot events — webhook-handler's deliver handles these
+    const event = activeEvent.get(accountId) ?? 'message';
+    if (event === 'entity_message' || event === 'broadcast') {
+        return { channel: 'eclaw', messageId: '', chatId: '' };
+    }
     const client = clients.get(accountId);
     if (!client) {
         return { channel: 'eclaw', messageId: '', chatId: '' };

package/dist/types.d.ts

@@ -8,6 +8,14 @@ export interface EClawAccountConfig {
     botName?: string;
     webhookUrl?: string;
 }
+/** Context block injected by E-Claw server for Channel Bot parity with Traditional Bot */
+export interface EClawContext {
+    b2bRemaining?: number;
+    b2bMax?: number;
+    expectsReply?: boolean;
+    missionHints?: string;
+    silentToken?: string;
+}
 /** Inbound message from E-Claw callback webhook */
 export interface EClawInboundMessage {
     event: 'message' | 'entity_message' | 'broadcast' | 'cross_device_message';
@@ -25,6 +33,7 @@ export interface EClawInboundMessage {
     fromEntityId?: number;
     fromCharacter?: string;
     fromPublicCode?: string;
+    eclaw_context?: EClawContext;
 }
 /** Entity info returned by channel register */
 export interface EClawEntityInfo {

package/dist/webhook-handler.d.ts

@@ -1,10 +1,18 @@
 /**
  * Create an HTTP request handler for inbound messages from E-Claw.
  *
- * When a user sends a message on E-Claw, the backend POSTs structured JSON
- * to this webhook. We normalize it into OpenClaw's native PascalCase context
- * format and dispatch to the agent via dispatchReplyWithBufferedBlockDispatcher.
+ * Handles three event types:
+ *   - 'message'        → Normal human message; reply via sendMessage()
+ *   - 'entity_message' → Bot-to-bot speak-to; reply via sendMessage() + speakTo(fromEntityId)
+ *   - 'broadcast'      → Broadcast from another entity; reply via sendMessage() + speakTo(fromEntityId)
  *
- * The `deliver` callback sends the AI reply back to E-Claw via the API client.
+ * The `deliver` callback routes AI response to the correct E-Claw endpoint
+ * based on the inbound event type.
+ *
+ * Channel Bot Context Parity v1.0.17:
+ *   - Bot-to-bot / broadcast now calls sendMessage() to update own wallpaper AND speakTo() to reply
+ *   - Quota awareness via eclaw_context.b2bRemaining / b2bMax
+ *   - Mission context via eclaw_context.missionHints
+ *   - Silent suppression via silentToken (default "[SILENT]")
  */
 export declare function createWebhookHandler(expectedToken: string, accountId: string, cfg: any): (req: any, res: any) => Promise<void>;

package/dist/webhook-handler.js

@@ -1,13 +1,21 @@
 import { getPluginRuntime } from './runtime.js';
-import { getClient } from './outbound.js';
+import { getClient, setActiveEvent, clearActiveEvent } from './outbound.js';
 /**
  * Create an HTTP request handler for inbound messages from E-Claw.
  *
- * When a user sends a message on E-Claw, the backend POSTs structured JSON
- * to this webhook. We normalize it into OpenClaw's native PascalCase context
- * format and dispatch to the agent via dispatchReplyWithBufferedBlockDispatcher.
+ * Handles three event types:
+ *   - 'message'        → Normal human message; reply via sendMessage()
+ *   - 'entity_message' → Bot-to-bot speak-to; reply via sendMessage() + speakTo(fromEntityId)
+ *   - 'broadcast'      → Broadcast from another entity; reply via sendMessage() + speakTo(fromEntityId)
  *
- * The `deliver` callback sends the AI reply back to E-Claw via the API client.
+ * The `deliver` callback routes AI response to the correct E-Claw endpoint
+ * based on the inbound event type.
+ *
+ * Channel Bot Context Parity v1.0.17:
+ *   - Bot-to-bot / broadcast now calls sendMessage() to update own wallpaper AND speakTo() to reply
+ *   - Quota awareness via eclaw_context.b2bRemaining / b2bMax
+ *   - Mission context via eclaw_context.missionHints
+ *   - Silent suppression via silentToken (default "[SILENT]")
  */
 export function createWebhookHandler(expectedToken, accountId, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -31,14 +39,37 @@ cfg // full openclaw config (ctx.cfg from startAccount)
             const rt = getPluginRuntime();
             const client = getClient(accountId);
             const conversationId = msg.conversationId || `${msg.deviceId}:${msg.entityId}`;
+            // Capture event context for deliver routing
+            const event = msg.event || 'message';
+            const fromEntityId = msg.fromEntityId;
+            const fromCharacter = msg.fromCharacter;
+            // Read server-injected context block (Channel Bot parity)
+            const eclawCtx = msg.eclaw_context;
+            const silentToken = eclawCtx?.silentToken ?? '[SILENT]';
             // Map E-Claw media type to OpenClaw media type
             const ocMediaType = msg.mediaType === 'photo' ? 'image'
                 : msg.mediaType === 'voice' ? 'audio'
                     : msg.mediaType === 'video' ? 'video'
                         : msg.mediaType ? 'file'
                             : undefined;
+            // Build body — enrich with event context for bot-to-bot and broadcast
+            let body = msg.text || '';
+            if ((event === 'entity_message' || event === 'broadcast') && fromEntityId !== undefined) {
+                const senderLabel = fromCharacter
+                    ? `Entity ${fromEntityId} (${fromCharacter})`
+                    : `Entity ${fromEntityId}`;
+                const eventPrefix = event === 'broadcast'
+                    ? `[Broadcast from ${senderLabel}]`
+                    : `[Bot-to-Bot message from ${senderLabel}]`;
+                const quotaLine = eclawCtx?.b2bRemaining !== undefined
+                    ? `[Quota: ${eclawCtx.b2bRemaining}/${eclawCtx.b2bMax ?? 8} remaining — output "${silentToken}" if no new info worth replying to]`
+                    : '';
+                const missionBlock = eclawCtx?.missionHints ?? '';
+                body = [eventPrefix, quotaLine, missionBlock, msg.text || '']
+                    .filter(Boolean)
+                    .join('\n');
+            }
             // Build context in OpenClaw's native PascalCase format
-            // (same convention as Telegram/LINE/WhatsApp channels)
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const inboundCtx = {
                 Surface: 'eclaw',
@@ -49,9 +80,9 @@ cfg // full openclaw config (ctx.cfg from startAccount)
                 To: conversationId,
                 OriginatingTo: msg.from,
                 SessionKey: conversationId,
-                Body: msg.text || '',
-                RawBody: msg.text || '',
-                CommandBody: msg.text || '',
+                Body: body,
+                RawBody: body,
+                CommandBody: body,
                 ChatType: 'direct',
                 ...(ocMediaType && msg.mediaUrl ? {
                     MediaType: ocMediaType,
@@ -59,32 +90,50 @@ cfg // full openclaw config (ctx.cfg from startAccount)
                 } : {}),
             };
             const ctxPayload = rt.channel.reply.finalizeInboundContext(inboundCtx);
-            await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-                ctx: ctxPayload,
-                cfg,
-                dispatcherOptions: {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    deliver: async (payload) => {
-                        if (!client)
-                            return;
-                        const text = typeof payload.text === 'string' ? payload.text.trim() : '';
-                        if (text) {
-                            await client.sendMessage(text, 'IDLE');
-                        }
-                        else if (payload.mediaUrl) {
-                            const rawType = typeof payload.mediaType === 'string' ? payload.mediaType : '';
-                            const mediaType = rawType === 'image' ? 'photo'
-                                : rawType === 'audio' ? 'voice'
-                                    : rawType === 'video' ? 'video'
-                                        : 'file';
-                            await client.sendMessage('', 'IDLE', mediaType, payload.mediaUrl);
-                        }
-                    },
-                    onError: (err) => {
-                        console.error('[E-Claw] Reply delivery error:', err);
+            // Track event type so outbound.sendText() can suppress duplicate delivery
+            setActiveEvent(accountId, event);
+            try {
+                await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+                    ctx: ctxPayload,
+                    cfg,
+                    dispatcherOptions: {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        deliver: async (payload) => {
+                            if (!client)
+                                return;
+                            const text = typeof payload.text === 'string' ? payload.text.trim() : '';
+                            // [SILENT] token or empty → skip all API calls
+                            if (!text || text === silentToken)
+                                return;
+                            if ((event === 'entity_message' || event === 'broadcast') && fromEntityId !== undefined) {
+                                // Bot-to-bot / broadcast: update own wallpaper AND reply to sender
+                                await client.sendMessage(text, 'IDLE');
+                                await client.speakTo(fromEntityId, text, false);
+                            }
+                            else {
+                                // Normal human message: reply via channel message
+                                if (text) {
+                                    await client.sendMessage(text, 'IDLE');
+                                }
+                                else if (payload.mediaUrl) {
+                                    const rawType = typeof payload.mediaType === 'string' ? payload.mediaType : '';
+                                    const mediaType = rawType === 'image' ? 'photo'
+                                        : rawType === 'audio' ? 'voice'
+                                            : rawType === 'video' ? 'video'
+                                                : 'file';
+                                    await client.sendMessage('', 'IDLE', mediaType, payload.mediaUrl);
+                                }
+                            }
+                        },
+                        onError: (err) => {
+                            console.error('[E-Claw] Reply delivery error:', err);
+                        },
                     },
-                },
-            });
+                });
+            }
+            finally {
+                clearActiveEvent(accountId);
+            }
         }
         catch (err) {
             console.error('[E-Claw] Webhook dispatch error:', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclaw/openclaw-channel",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "E-Claw channel plugin for OpenClaw — AI chat platform for live wallpaper entities",
   "type": "module",
   "main": "./dist/index.js",