@clwnt/clawnet 0.7.14 → 0.7.16

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawnet",
   "name": "ClawNet",
   "description": "ClawNet integration — poll inbox, route messages to hooks",
-  "version": "0.4.0",
+  "version": "0.7.16",
   "skills": ["skills"],
   "configSchema": {
     "type": "object",

package/package.json

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

package/src/service.ts

@@ -135,9 +135,6 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
 
   // --- Batch delivery ---
 
-  // Per-account auth context for mark-notified calls from deliverBatch
-  const accountAuth = new Map<string, { token: string; baseUrl: string }>();
-
   async function deliverBatch(accountId: string, agentId: string, messages: InboxMessage[]) {
     if (messages.length === 0) return;
 
@@ -179,36 +176,8 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
         `[clawnet] ${accountId}: delivered ${messages.length} message(s) to ${agentId} via ${freshCfg.deliveryMethod}`,
       );
 
-      // Post-delivery: mark items as notified + mark A2A tasks as working
-      const auth = accountAuth.get(accountId);
-      if (auth) {
-        const emailIds = messages.filter((m) => m.type === "email").map((m) => m.id);
-        const taskIds = messages.filter((m) => m.type === "task").map((m) => m.id);
-
-        // Mark notified (non-fatal)
-        if (emailIds.length > 0 || taskIds.length > 0) {
-          try {
-            const markRes = await fetch(`${auth.baseUrl}/inbox/mark-notified`, {
-              method: "POST",
-              headers: { Authorization: `Bearer ${auth.token}`, "Content-Type": "application/json" },
-              body: JSON.stringify({
-                ...(emailIds.length > 0 ? { message_ids: emailIds } : {}),
-                ...(taskIds.length > 0 ? { task_ids: taskIds } : {}),
-              }),
-            });
-            if (markRes.ok) {
-              const markData = await markRes.json().catch(() => ({})) as Record<string, unknown>;
-              api.logger.info(`[clawnet] ${accountId}: marked notified (${markData.marked_messages ?? 0} msgs, ${markData.marked_tasks ?? 0} tasks)`);
-            } else {
-              const errText = await markRes.text().catch(() => "");
-              api.logger.warn(`[clawnet] ${accountId}: mark-notified returned ${markRes.status}: ${errText}`);
-            }
-          } catch (err: any) {
-            api.logger.warn(`[clawnet] ${accountId}: mark-notified failed (non-fatal): ${err.message}`);
-          }
-        }
-
-      }
+      // Notification tracking is now server-side (agent-level last_nagged_at).
+      // No mark-notified call needed.
     } catch (err: any) {
       state.lastError = { message: err.message, at: new Date() };
       state.counters.errors++;
@@ -341,9 +310,6 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
       return { a2aDmCount: 0, sentTaskUpdates: 0, notifyCount: 0 };
     }
 
-    // Store auth context for deliverBatch to use for mark-notified calls
-    accountAuth.set(account.id, { token: resolvedToken, baseUrl: cfg.baseUrl });
-
     const headers = {
       Authorization: `Bearer ${resolvedToken}`,
       "Content-Type": "application/json",
@@ -429,8 +395,8 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
     state.lastInboxNonEmptyAt = new Date();
     api.logger.info(`[clawnet] ${account.id}: ${checkData.count} message(s) waiting (${notifyCount} to notify)`);
 
-    // Fetch full messages — request max limit so mark-notified covers everything
-    const inboxRes = await fetch(`${cfg.baseUrl}/inbox?limit=200`, { headers });
+    // Fetch messages for delivery (notification tracking is server-side via last_nagged_at)
+    const inboxRes = await fetch(`${cfg.baseUrl}/inbox`, { headers });
     if (!inboxRes.ok) {
       throw new Error(`/inbox returned ${inboxRes.status}`);
     }
@@ -450,21 +416,7 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
 
     state.counters.messagesSeen += normalized.length;
 
-    // Mark ALL fetched emails as notified up front — the delivery batch is capped
-    // at maxBatchSize, but the nag timer should reset for every message the agent
-    // is being alerted about, not just the ones in the batch.
-    const allEmailIds = normalized.map((m) => m.id);
-    if (allEmailIds.length > 0) {
-      try {
-        await fetch(`${cfg.baseUrl}/inbox/mark-notified`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({ message_ids: allEmailIds }),
-        });
-      } catch {
-        // Non-fatal — deliverBatch will still mark its batch after delivery
-      }
-    }
+    // Server-side /inbox/check auto-marks all notifiable items — no separate call needed
 
     // Add to pending (dedup by ID) and schedule debounced flush
     const existing = pendingMessages.get(account.id) ?? [];
@@ -516,7 +468,7 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
     api.logger.info(`[clawnet] ${account.id}: ${tasks.length} A2A task(s) to deliver`);
 
     // Convert A2A tasks to the message format for delivery
-    // mark-notified happens post-delivery in deliverBatch
+    // Notification tracking is server-side via last_nagged_at
     const messages: InboxMessage[] = tasks.map((task) => {
       const history = task.history as Array<{ role: string; parts: Array<{ text?: string }> }> ?? [];
       const lastMsg = history[history.length - 1];
@@ -533,22 +485,7 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
 
     state.counters.messagesSeen += messages.length;
 
-    // Mark all fetched tasks as notified up front (same rationale as emails)
-    const allTaskIds = messages.map((m) => m.id);
-    if (allTaskIds.length > 0) {
-      try {
-        await fetch(`${cfg.baseUrl}/inbox/mark-notified`, {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${resolvedToken}`,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({ task_ids: allTaskIds }),
-        });
-      } catch {
-        // Non-fatal
-      }
-    }
+    // Server-side /inbox/check auto-marks all notifiable items — no separate call needed
 
     const existing = pendingMessages.get(account.id) ?? [];
     const existingIds = new Set(existing.map((m) => m.id));
@@ -606,22 +543,7 @@ export function createClawnetService(params: { api: any; cfg: ClawnetConfig }) {
 
     state.counters.messagesSeen += messages.length;
 
-    // Mark all fetched sent-task updates as notified up front (same rationale as emails)
-    const allSentTaskIds = messages.map((m) => m.id);
-    if (allSentTaskIds.length > 0) {
-      try {
-        await fetch(`${cfg.baseUrl}/inbox/mark-notified`, {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${resolvedToken}`,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({ task_ids: allSentTaskIds }),
-        });
-      } catch {
-        // Non-fatal
-      }
-    }
+    // Server-side /inbox/check auto-marks all notifiable items — no separate call needed
 
     const existing = pendingMessages.get(account.id) ?? [];
     const existingIds = new Set(existing.map((m) => m.id));

package/src/tools.ts

@@ -454,7 +454,7 @@ export function registerTools(api: any) {
       type: "object",
       properties: {
         message_id: { type: "string", description: "The message ID (e.g. msg_abc123)" },
-        status: { type: "string", enum: ["archived", "read", "snoozed", "new", "handled", "waiting"], description: "New status (use 'archived' or 'read'; 'handled'/'waiting' accepted for backward compat)" },
+        status: { type: "string", enum: ["archived", "read", "snoozed", "handled", "waiting"], description: "New status (use 'archived' or 'read'; 'handled'/'waiting' accepted for backward compat)" },
         snoozed_until: { type: "string", description: "ISO 8601 timestamp (required when status is 'snoozed')" },
       },
       required: ["message_id", "status"],
@@ -475,7 +475,7 @@ export function registerTools(api: any) {
       type: "object",
       properties: {
         message_ids: { type: "array", items: { type: "string" }, description: "Array of message IDs (e.g. ['msg_abc123', 'msg_def456'])" },
-        status: { type: "string", enum: ["archived", "read", "snoozed", "new"], description: "New status to apply to all messages" },
+        status: { type: "string", enum: ["archived", "read", "snoozed"], description: "New status to apply to all messages" },
       },
       required: ["message_ids", "status"],
     },