@clwnt/clawnet 0.5.1 → 0.5.3

package/index.ts

@@ -120,7 +120,8 @@ const plugin = {
         }
 
         if (args !== "link" && args !== "link reset") {
-          return { text: "Commands:\n  /clawnet status — show plugin configuration and health\n  /clawnet test — test delivery to this chat\n  /clawnet link — pin message delivery to this chat (use if messages aren't arriving)\n  /clawnet link reset — unpin and return to automatic delivery\n  /clawnet pause — temporarily stop polling\n  /clawnet resume — restart polling" };
+          const { PLUGIN_VERSION } = await import("./src/service.js");
+          return { text: `ClawNet Plugin v${PLUGIN_VERSION}\n\nCommands:\n  /clawnet status — show plugin configuration and health\n  /clawnet test — test delivery to this chat\n  /clawnet link — pin message delivery to this chat (use if messages aren't arriving)\n  /clawnet link reset — unpin and return to automatic delivery\n  /clawnet pause — temporarily stop polling\n  /clawnet resume — restart polling\n\nUpdate: openclaw plugins update clawnet` };
         }
 
         // Load config and find clawnet accounts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clwnt/clawnet",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "type": "module",
   "description": "ClawNet integration for OpenClaw — poll inbox, route messages to hooks",
   "files": [

package/src/cli.ts

@@ -5,6 +5,7 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import * as os from "node:os";
 import type { ClawnetConfig } from "./config.js";
+import { PLUGIN_VERSION } from "./service.js";
 
 const API_BASE = "https://api.clwnt.com";
 const DEVICE_POLL_INTERVAL_MS = 3000;
@@ -148,6 +149,7 @@ export function buildStatusText(api: any): string {
 
   lines.push("**ClawNet Status**\n");
 
+  lines.push(`Plugin version: ${PLUGIN_VERSION}`);
   lines.push(`Plugin enabled: ${pluginEntry?.enabled ?? false}`);
   if (pluginCfg) {
     if (pluginCfg.paused) {
@@ -424,6 +426,7 @@ export function registerClawnetCli(params: { program: Command; api: any; cfg: Cl
           // Upsert account
           const accounts: any[] = pc.accounts ?? [];
           const existingIdx = accounts.findIndex((a: any) => a.agentId === agentId || a.openclawAgentId === targetAgent);
+          const oldAccountId = existingIdx >= 0 ? accounts[existingIdx].id : null;
           const newAccount = {
             id: accountId,
             token: `\${${envVarName}}`,
@@ -454,8 +457,15 @@ export function registerClawnetCli(params: { program: Command; api: any; cfg: Cl
             "hook:",
           );
 
-          // Upsert per-account clawnet mapping
+          // Remove old mapping if account ID changed (e.g., re-registered with new handle)
           let mappings = cfg.hooks.mappings ?? [];
+          if (oldAccountId && oldAccountId !== accountId) {
+            const oldMappingId = `clawnet-${oldAccountId}`;
+            mappings = mappings.filter((m: any) => String(m?.id ?? "") !== oldMappingId);
+            console.log(`  Removed stale mapping: ${oldMappingId}`);
+          }
+
+          // Upsert per-account clawnet mapping
           mappings = upsertMapping(mappings, buildClawnetMapping(accountId, channel, targetAgent));
           cfg.hooks.mappings = mappings;
 
@@ -570,6 +580,7 @@ export function registerClawnetCli(params: { program: Command; api: any; cfg: Cl
       console.log("\n  ClawNet Status\n");
 
       // Plugin
+      console.log(`  Plugin version:   ${PLUGIN_VERSION}`);
       console.log(`  Plugin enabled:   ${pluginEntry?.enabled ?? false}`);
       if (pluginCfg) {
         console.log(`  Poll interval:    ${pluginCfg.pollEverySeconds ?? "?"}s`);

package/src/service.ts

@@ -72,7 +72,7 @@ async function reloadOnboardingMessage(): Promise<void> {
 
 const SKILL_UPDATE_INTERVAL_MS = 6 * 60 * 60 * 1000; // 6 hours
 const SKILL_FILES = ["skill.json", "api-reference.md", "inbox-handler.md", "capabilities.json", "hook-template.txt", "tool-descriptions.json", "onboarding-message.txt"];
-const PLUGIN_VERSION = "0.5.1"; // Reported to server via PATCH /me every 6h
+export const PLUGIN_VERSION = "0.5.3"; // Reported to server via PATCH /me every 6h
 
 // --- Service ---
 
@@ -88,6 +88,10 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
   // Per-account concurrency lock: only 1 LLM run at a time per account
   const accountBusy = new Set<string>();
 
+  // Per-account delivery lock: skip re-delivery while LLM is processing
+  const deliveryLock = new Map<string, Date>(); // accountId -> lock expires at
+  const DELIVERY_LOCK_TTL_MS = 10 * 60 * 1000; // 10 minutes
+
   // Per-account debounce: accumulate messages before sending
   const pendingMessages = new Map<string, InboxMessage[]>();
   const debounceTimers = new Map<string, ReturnType<typeof setTimeout>>();
@@ -222,6 +226,7 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
 
       state.counters.batchesSent++;
       state.counters.delivered += messages.length;
+      deliveryLock.set(accountId, new Date(Date.now() + DELIVERY_LOCK_TTL_MS));
       api.logger.info(
         `[clawnet] ${accountId}: delivered ${messages.length} message(s) to ${agentId}`,
       );
@@ -329,7 +334,19 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
       }
     }
 
-    if (checkData.count === 0) return;
+    if (checkData.count === 0) {
+      // Inbox clear — release any delivery lock (agent finished processing)
+      deliveryLock.delete(account.id);
+      return;
+    }
+
+    // Skip if a recent webhook delivery is still being processed by the LLM.
+    // TTL-based lock: after successful POST, lock for 10 min to let the agent work.
+    const lockUntil = deliveryLock.get(account.id);
+    if (lockUntil && new Date() < lockUntil) {
+      api.logger.debug?.(`[clawnet] ${account.id}: ${checkData.count} message(s) waiting (delivery lock active, skipping)`);
+      return;
+    }
 
     state.lastInboxNonEmptyAt = new Date();
     api.logger.info(`[clawnet] ${account.id}: ${checkData.count} message(s) waiting`);