@clawling/clawchat-plugin-openclaw 2026.8.5-1 → 2026.8.5-2

package/dist/src/runtime.js

@@ -2803,6 +2803,37 @@ export async function startOpenclawClawlingGateway(params) {
                 conversationId: claimedBootstrap.conversationId,
             }));
         };
+        const markBootstrapSent = (reason) => {
+            if (!bootstrap)
+                return;
+            const claimedBootstrap = bootstrap;
+            const marked = recordConnection("activation bootstrap sent", () => store.markActivationBootstrapSent?.({
+                platform: "openclaw",
+                accountId,
+                conversationId: claimedBootstrap.conversationId,
+            }));
+            if (marked !== true) {
+                // The UPDATE is guarded on bootstrap_sent = 0 AND bootstrap_claimed_at
+                // IS NOT NULL, so a stale re-claim makes this a no-op — and the row
+                // then stays re-greetable on every later reconnect. Never swallow it.
+                log?.error?.(`[${accountId}] clawchat-plugin-openclaw activation bootstrap not marked sent (${reason}); the greeting may repeat on reconnect`);
+            }
+            // Delivered — stop any pending retry.
+            clearBootstrapRetry();
+        };
+        // Single decision point for every exit after the claim. The greeting is
+        // emitted *inside* the dispatched turn, so once it has reached the user the
+        // claim must never be rolled back: releasing it lets the next connection
+        // claim again and greet a second time. Only a turn that delivered nothing
+        // is safe to retry.
+        const settleBootstrap = (reason) => {
+            if (bootstrapGreetingDelivered) {
+                markBootstrapSent(reason);
+                return;
+            }
+            releaseBootstrap();
+            armBootstrapRetry();
+        };
         try {
             bootstrap = recordConnection("activation bootstrap claim", () => store.claimPendingActivationBootstrap?.({ platform: "openclaw", accountId }));
             if (!bootstrap) {
@@ -2819,8 +2850,7 @@ export async function startOpenclawClawlingGateway(params) {
             bootstrapGreetingDelivered = false;
             const result = await handleInboundEnvelope(buildActivationBootstrapEnvelope({ account, conversationId: claimedBootstrap.conversationId }));
             if (result !== "submitted") {
-                releaseBootstrap();
-                armBootstrapRetry();
+                settleBootstrap("turn was not submitted");
                 return;
             }
             // Only mark the bootstrap done once the greeting was actually delivered
@@ -2831,21 +2861,11 @@ export async function startOpenclawClawlingGateway(params) {
             // rather than silently consuming it forever or waiting for the next reconnect.
             if (!bootstrapGreetingDelivered) {
                 log?.info?.(`[${accountId}] clawchat-plugin-openclaw activation bootstrap dispatched but greeting was not delivered; leaving pending for retry`);
-                releaseBootstrap();
-                armBootstrapRetry();
-                return;
             }
-            recordConnection("activation bootstrap sent", () => store.markActivationBootstrapSent?.({
-                platform: "openclaw",
-                accountId,
-                conversationId: claimedBootstrap.conversationId,
-            }));
-            // Delivered — stop any pending retry.
-            clearBootstrapRetry();
+            settleBootstrap("turn submitted");
         }
         catch (err) {
-            releaseBootstrap();
-            armBootstrapRetry();
+            settleBootstrap("dispatch threw");
             log?.error?.(`[${accountId}] clawchat-plugin-openclaw activation bootstrap failed: ${err instanceof Error ? err.message : String(err)}`);
         }
         finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawling/clawchat-plugin-openclaw",
-  "version": "2026.8.5-1",
+  "version": "2026.8.5-2",
   "description": "OpenClaw ClawChat channel plugin",
   "license": "MIT",
   "author": "CLAWLING PTE. LTD.",

package/src/runtime.ts

@@ -3333,6 +3333,40 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
         }),
       );
     };
+    const markBootstrapSent = (reason: string) => {
+      if (!bootstrap) return;
+      const claimedBootstrap = bootstrap;
+      const marked = recordConnection("activation bootstrap sent", () =>
+        store.markActivationBootstrapSent?.({
+          platform: "openclaw",
+          accountId,
+          conversationId: claimedBootstrap.conversationId,
+        }),
+      );
+      if (marked !== true) {
+        // The UPDATE is guarded on bootstrap_sent = 0 AND bootstrap_claimed_at
+        // IS NOT NULL, so a stale re-claim makes this a no-op — and the row
+        // then stays re-greetable on every later reconnect. Never swallow it.
+        log?.error?.(
+          `[${accountId}] clawchat-plugin-openclaw activation bootstrap not marked sent (${reason}); the greeting may repeat on reconnect`,
+        );
+      }
+      // Delivered — stop any pending retry.
+      clearBootstrapRetry();
+    };
+    // Single decision point for every exit after the claim. The greeting is
+    // emitted *inside* the dispatched turn, so once it has reached the user the
+    // claim must never be rolled back: releasing it lets the next connection
+    // claim again and greet a second time. Only a turn that delivered nothing
+    // is safe to retry.
+    const settleBootstrap = (reason: string) => {
+      if (bootstrapGreetingDelivered) {
+        markBootstrapSent(reason);
+        return;
+      }
+      releaseBootstrap();
+      armBootstrapRetry();
+    };
     try {
       bootstrap = recordConnection("activation bootstrap claim", () =>
         store.claimPendingActivationBootstrap?.({ platform: "openclaw", accountId }),
@@ -3352,8 +3386,7 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
         buildActivationBootstrapEnvelope({ account, conversationId: claimedBootstrap.conversationId }),
       );
       if (result !== "submitted") {
-        releaseBootstrap();
-        armBootstrapRetry();
+        settleBootstrap("turn was not submitted");
         return;
       }
       // Only mark the bootstrap done once the greeting was actually delivered
@@ -3366,22 +3399,10 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
         log?.info?.(
           `[${accountId}] clawchat-plugin-openclaw activation bootstrap dispatched but greeting was not delivered; leaving pending for retry`,
         );
-        releaseBootstrap();
-        armBootstrapRetry();
-        return;
       }
-      recordConnection("activation bootstrap sent", () =>
-        store.markActivationBootstrapSent?.({
-          platform: "openclaw",
-          accountId,
-          conversationId: claimedBootstrap.conversationId,
-        }),
-      );
-      // Delivered — stop any pending retry.
-      clearBootstrapRetry();
+      settleBootstrap("turn submitted");
     } catch (err) {
-      releaseBootstrap();
-      armBootstrapRetry();
+      settleBootstrap("dispatch threw");
       log?.error?.(
         `[${accountId}] clawchat-plugin-openclaw activation bootstrap failed: ${err instanceof Error ? err.message : String(err)}`,
       );