commanderclaw 1.1.5 → 1.1.7

package/dist/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsVH,QAAA,MAAM,MAAM;;;;;kBAKI,GAAG;CAQlB,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgWH,QAAA,MAAM,MAAM;;;;;kBAKI,GAAG;CAQlB,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/plugin/index.mjs

@@ -215,14 +215,25 @@ class CommanderClawClient {
             console.error(`[CommanderClawClient] send: WebSocket not connected, cannot send ${type}`);
             return;
         }
+        let to;
+        let actualPayload = payload;
+        if (payload && typeof payload === "object" && "to" in payload) {
+            const { to: toField, ...rest } = payload;
+            to = toField;
+            actualPayload = rest;
+        }
         const msg = {
             type,
             id: crypto.randomUUID(),
             from: this.nodeId || "unknown",
-            payload,
+            to,
+            payload: actualPayload,
             timestamp: Date.now(),
         };
-        console.log(`[CommanderClawClient] send: type=${type}, from=${msg.from}`, payload);
+        if (to) {
+            msg.msgType = "private";
+        }
+        console.log(`[CommanderClawClient] send: type=${type}, from=${msg.from}, to=${to || "broadcast"}`, actualPayload);
         this.ws.send(JSON.stringify(msg));
     }
     on(event, handler) {
@@ -4288,15 +4299,20 @@ async function handleChatMessage(msg) {
         to: msg.to,
         msgType: msg.msgType,
     });
+    if (!client) {
+        log.error("handleChatMessage: client not initialized");
+        return;
+    }
+    const nodeId = client.getNodeId();
+    if (msg.from === nodeId) {
+        log.debug("handleChatMessage: ignoring own message", { from: msg.from });
+        return;
+    }
     const rt = getRuntime();
     if (!rt || !rt.channel) {
         log.error("handleChatMessage: runtime or channel not initialized");
         return;
     }
-    if (!client) {
-        log.error("handleChatMessage: client not initialized");
-        return;
-    }
     if (!pluginConfig) {
         log.error("handleChatMessage: pluginConfig not initialized");
         return;
@@ -4310,6 +4326,7 @@ async function handleChatMessage(msg) {
         from: msg.from,
         contentLength: content.length,
     });
+    const senderId = msg.from;
     try {
         const nodeId = client.getNodeId() || "unknown";
         const route = rt.channel.routing.resolveAgentRoute({
@@ -4318,7 +4335,7 @@ async function handleChatMessage(msg) {
             accountId: "default",
             peer: {
                 kind: "direct",
-                id: msg.from,
+                id: senderId,
             },
         });
         const ctxPayload = rt.channel.reply.finalizeInboundContext({
@@ -4326,13 +4343,13 @@ async function handleChatMessage(msg) {
             RawBody: content,
             CommandBody: content,
             MessageSid: `cc-${Date.now()}`,
-            From: `${CHANNEL_ID}:${msg.from}`,
+            From: `${CHANNEL_ID}:${senderId}`,
             To: `${CHANNEL_ID}:${nodeId}`,
-            SenderId: msg.from,
+            SenderId: senderId,
             SessionKey: route.sessionKey,
             AccountId: "default",
             ChatType: "direct",
-            ConversationLabel: `user:${msg.from}`,
+            ConversationLabel: `user:${senderId}`,
             Timestamp: Date.now(),
             Provider: CHANNEL_ID,
             Surface: CHANNEL_ID,
@@ -4350,10 +4367,12 @@ async function handleChatMessage(msg) {
                     accumulatedText = payload.text;
                     if (info.kind === "final") {
                         log.info("handleChatMessage: sending response", {
+                            to: senderId,
                             textLength: accumulatedText.length,
                         });
                         client?.send("CHAT", {
                             content: accumulatedText,
+                            to: senderId,
                         });
                     }
                 },