@unicitylabs/openclaw-unicity 0.5.7 → 0.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unicitylabs/openclaw-unicity",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "Unicity wallet identity and encrypted DMs for OpenClaw agents — powered by Sphere SDK",
   "type": "module",
   "main": "src/index.ts",
@@ -44,13 +44,13 @@
   "dependencies": {
     "@clack/prompts": "^0.10.0",
     "@sinclair/typebox": "^0.34.48",
-    "@unicitylabs/sphere-sdk": "0.6.8-dev.2"
+    "@unicitylabs/sphere-sdk": "0.6.8-dev.3"
   },
   "peerDependencies": {
     "openclaw": "*"
   },
   "devDependencies": {
-    "openclaw": "^2026.3.2",
+    "openclaw": "^2026.3.13",
     "oxlint": "^1.43.0",
     "vitest": "^4.0.18"
   },

package/src/channel.ts

@@ -103,6 +103,8 @@ let activeSphere: Sphere | null = null;
 let pluginRuntime: PluginRuntime | null = null;
 let ownerIdentity: string | null = null;
 let pluginConfig: UnicityConfig = {};
+/** Cleanup function from the previous gateway start — called before re-subscribing. */
+let previousGatewayCleanup: (() => void) | null = null;
 
 export function setUnicityRuntime(rt: PluginRuntime): void {
   pluginRuntime = rt;
@@ -223,6 +225,14 @@ export const unicityChannelPlugin = {
       log?: { info: (m: string) => void; warn: (m: string) => void; error: (m: string) => void; debug: (m: string) => void };
       setStatus: (s: Record<string, unknown>) => void;
     }) => {
+      // Clean up handlers from any previous gateway start (auto-restart scenario).
+      // Without this, each restart stacks duplicate onDirectMessage handlers on the
+      // shared Sphere singleton, causing messages to be processed N times.
+      if (previousGatewayCleanup) {
+        previousGatewayCleanup();
+        previousGatewayCleanup = null;
+      }
+
       const sphere = activeSphere ?? await waitForSphere();
       if (!sphere) throw new Error("Unicity Sphere not initialized — run `openclaw unicity init`");
 
@@ -233,6 +243,7 @@ export const unicityChannelPlugin = {
         publicKey: sphere.identity?.chainPubkey,
         nametag: sphere.identity?.nametag,
         running: true,
+        connected: true,
         lastStartAt: Date.now(),
       });
 
@@ -277,6 +288,7 @@ export const unicityChannelPlugin = {
 
       function dispatchDm(msg: DmMsg): void {
         sendersInFlight.add(msg.senderPubkey);
+        ctx.setStatus({ lastEventAt: Date.now() });
 
         // Immediately signal that we're composing a reply
         sphere.communications.sendComposingIndicator(msg.senderPubkey)
@@ -402,6 +414,7 @@ export const unicityChannelPlugin = {
 
       // Subscribe to incoming token transfers
       const unsubTransfer = sphere.on("transfer:incoming", (transfer) => {
+        ctx.setStatus({ lastEventAt: Date.now() });
         // Full address for DM replies; short form for display/logging only
         const replyTo = transfer.senderNametag ? `@${transfer.senderNametag}` : transfer.senderPubkey;
         const displayName = transfer.senderNametag ? `@${transfer.senderNametag}` : transfer.senderPubkey.slice(0, 12) + "…";
@@ -464,6 +477,7 @@ export const unicityChannelPlugin = {
 
       // Subscribe to incoming payment requests
       const unsubPaymentRequest = sphere.on("payment_request:incoming", (request) => {
+        ctx.setStatus({ lastEventAt: Date.now() });
         const replyTo = request.senderNametag ? `@${request.senderNametag}` : request.senderPubkey;
         const displayName = request.senderNametag ? `@${request.senderNametag}` : request.senderPubkey.slice(0, 12) + "…";
         const decimals = getCoinDecimals(request.coinId) ?? 0;
@@ -618,6 +632,7 @@ export const unicityChannelPlugin = {
 
       // Subscribe to incoming group messages
       const unsubGroupMessage = sphere.groupChat?.onMessage?.((msg: GroupMsg) => {
+        ctx.setStatus({ lastEventAt: Date.now() });
         // Skip messages from self (echoed back by the relay).
         // Compare against the Nostr x-only pubkey, not chainPubkey.
         if (myNostrPubkey && msg.senderPubkey === myNostrPubkey) return;
@@ -692,7 +707,7 @@ export const unicityChannelPlugin = {
         groupBackfillStates.clear();
       }
 
-      ctx.abortSignal.addEventListener("abort", () => {
+      function cleanupSubscriptions(): void {
         clearBackfillTimers();
         unsub();
         unsubTransfer();
@@ -701,18 +716,21 @@ export const unicityChannelPlugin = {
         unsubGroupJoined();
         unsubGroupLeft();
         unsubGroupKicked();
+      }
+
+      // Store cleanup so auto-restart can tear down stale handlers
+      previousGatewayCleanup = cleanupSubscriptions;
+
+      ctx.abortSignal.addEventListener("abort", () => {
+        cleanupSubscriptions();
+        previousGatewayCleanup = null;
       }, { once: true });
 
       return {
         stop: () => {
-          clearBackfillTimers();
-          unsub();
-          unsubTransfer();
-          unsubPaymentRequest();
-          unsubGroupMessage();
-          unsubGroupJoined();
-          unsubGroupLeft();
-          unsubGroupKicked();
+          cleanupSubscriptions();
+          previousGatewayCleanup = null;
+          ctx.setStatus({ connected: false, running: false });
           ctx.log?.info(`[${ctx.account.accountId}] Unicity channel stopped`);
         },
       };