@unicitylabs/openclaw-unicity 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unicitylabs/openclaw-unicity",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Unicity wallet identity and encrypted DMs for OpenClaw agents — powered by Sphere SDK",
   "type": "module",
   "main": "src/index.ts",

package/src/channel.ts

@@ -13,6 +13,7 @@ const DEFAULT_ACCOUNT_ID = "default";
 /** How long (ms) to wait after the last group message before declaring backfill complete. */
 export const GROUP_BACKFILL_DEBOUNCE_MS = 3_000;
 
+
 interface GroupBackfillState {
   phase: "buffering" | "live";
   latestMsg: {
@@ -452,6 +453,25 @@ export const unicityChannelPlugin = {
         replyToId?: string;
       };
 
+      // Nostr pubkey for self-message detection and reply-to-self detection.
+      // Group messages use the 32-byte x-only Nostr pubkey (event.pubkey),
+      // NOT the 33-byte compressed chainPubkey.
+      const myNostrPubkey = sphere.groupChat?.getMyPublicKey?.() ?? null;
+
+      // Detect if a group message is a reply to one of the agent's own messages.
+      // Used to set WasMentioned so the mention gate treats replies-to-self as
+      // implicit mentions (same pattern Discord uses for thread replies).
+      function isReplyToSelf(msg: GroupMsg): boolean {
+        if (!msg.replyToId || !myNostrPubkey) return false;
+        try {
+          const messages = sphere.groupChat?.getMessages?.(msg.groupId) ?? [];
+          const repliedTo = messages.find((m: { id: string }) => m.id === msg.replyToId);
+          return repliedTo?.senderPubkey === myNostrPubkey;
+        } catch {
+          return false;
+        }
+      }
+
       function dispatchGroupMessage(msg: GroupMsg): void {
         const senderName = msg.senderNametag ?? msg.senderPubkey.slice(0, 12);
         const groupData = sphere.groupChat?.getGroup?.(msg.groupId);
@@ -460,6 +480,10 @@ export const unicityChannelPlugin = {
         const metadataHeader = `[SenderName: ${senderName} | SenderId: ${msg.senderPubkey} | GroupId: ${msg.groupId} | GroupName: ${groupName} | IsOwner: ${isOwner} | CommandAuthorized: ${isOwner}]`;
         const sanitizedContent = msg.content.replace(/\[(?:SenderName|SenderId|IsOwner|CommandAuthorized|GroupId|GroupName)\s*:/gi, "[BLOCKED:");
 
+        // Treat replies to the agent's own messages as implicit mentions,
+        // so the mention gate doesn't skip them (mirrors Discord's behavior).
+        const wasMentioned = isReplyToSelf(msg) || undefined;
+
         ctx.log?.info(`[${ctx.account.accountId}] Group message from ${senderName} in ${groupName}: ${msg.content.slice(0, 80)}`);
 
         const inboundCtx = runtime.channel.reply.finalizeInboundContext({
@@ -478,6 +502,7 @@ export const unicityChannelPlugin = {
           SenderId: msg.senderPubkey,
           IsOwner: isOwner,
           CommandAuthorized: isOwner,
+          WasMentioned: wasMentioned,
         });
 
         runtime.channel.reply
@@ -489,7 +514,7 @@ export const unicityChannelPlugin = {
                 const text = payload.text;
                 if (!text) return;
                 try {
-                  await sphere.groupChat.sendMessage(msg.groupId, text);
+                  await sphere.groupChat.sendMessage(msg.groupId, text, msg.id);
                   ctx.log?.info(`[${ctx.account.accountId}] Group message sent to ${groupName}: ${text.slice(0, 80)}`);
                 } catch (err) {
                   ctx.log?.error(`[${ctx.account.accountId}] Failed to send group message to ${groupName}: ${err}`);
@@ -514,8 +539,9 @@ export const unicityChannelPlugin = {
 
       // Subscribe to incoming group messages
       const unsubGroupMessage = sphere.groupChat?.onMessage?.((msg: GroupMsg) => {
-        // Skip messages from self
-        if (msg.senderPubkey === sphere.identity?.chainPubkey) return;
+        // Skip messages from self (echoed back by the relay).
+        // Compare against the Nostr x-only pubkey, not chainPubkey.
+        if (myNostrPubkey && msg.senderPubkey === myNostrPubkey) return;
 
         // Lookup or create per-group backfill state
         let state = groupBackfillStates.get(msg.groupId);