relay-companion 0.1.43 → 0.1.45

package/overlay/main.cjs

@@ -44,6 +44,7 @@ const {
   recoverInterruptedAttentionPrefs,
 } = require("./visibility.cjs");
 const { withJsonLock } = require("../src/state-lock.cjs");
+const { canonicalInboxItemId, packetIdsForCanonicalItem } = require("../src/inbox-item-id.cjs");
 const {
   reinforceSpacePresence,
   resetWindowZoom,
@@ -660,18 +661,23 @@ async function deletePacket(packetId) {
   if (!packetId) return { ok: false, error: "Missing relay id." };
   const row = rowById(packetId);
   if (!row) return { ok: true };
+  const itemId = canonicalInboxItemId(packetId, row);
   try {
     // Server first: a transient network/API error must never make a recoverable
     // item disappear locally without actually entering Recently Deleted.
     const client = await relayClient();
-    await client.deleteInboxItem(packetId, { idempotencyKey: idempotencyKey("inbox_delete") });
+    await client.deleteInboxItem(itemId, { idempotencyKey: idempotencyKey("inbox_delete") });
+    let removedPacketIds = [];
     withJsonLock(STATE_PATH, () => {
       const store = readStore();
-      if (store.packets) delete store.packets[packetId];
+      removedPacketIds = packetIdsForCanonicalItem(store.packets, itemId);
+      for (const id of removedPacketIds) delete store.packets[id];
       writeStateAtomic(store);
     });
-    presentedRelayIds.delete(packetId);
-    activeAttentionIds.delete(packetId);
+    for (const id of removedPacketIds) {
+      presentedRelayIds.delete(id);
+      activeAttentionIds.delete(id);
+    }
     writeOverlayPrefs();
     await pushInbox(true);
     return { ok: true };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-companion",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "description": "Relay companion: connects local coding agents to Relay tasks, approvals, and connector tools.",
   "type": "module",
   "bin": {

package/src/inbox-item-id.cjs

@@ -0,0 +1,25 @@
+"use strict";
+
+/**
+ * Old companion releases staged task notifications with a timestamp suffix.
+ * The API intentionally uses the stable condition id, so normalize both old
+ * and current rows before deleting, suppressing, or comparing them.
+ */
+function canonicalInboxItemId(packetId, row = {}) {
+  const kind = String(row.relayNotificationKind || "");
+  if (kind === "human_question" && row.messageId) {
+    return `human_question:${row.messageId}`;
+  }
+  if (["task_completed", "task_cancelled", "task_failed"].includes(kind) && row.taskId) {
+    return `${kind}:${row.taskId}`;
+  }
+  return String(packetId || "");
+}
+
+function packetIdsForCanonicalItem(packets, canonicalItemId) {
+  return Object.entries(packets || {})
+    .filter(([packetId, row]) => canonicalInboxItemId(packetId, row) === canonicalItemId)
+    .map(([packetId]) => packetId);
+}
+
+module.exports = { canonicalInboxItemId, packetIdsForCanonicalItem };

package/src/notifications.js

@@ -4,6 +4,9 @@ import path from "node:path";
 import { currentUser, readConfig, webUrl } from "./config.js";
 import { relayBinPath } from "./install.js";
 import { withJsonLock } from "./state-lock.cjs";
+import inboxItemIds from "./inbox-item-id.cjs";
+
+const { canonicalInboxItemId } = inboxItemIds;
 
 const DEFAULT_COMPANION_STATE = {
   version: 1,
@@ -249,6 +252,24 @@ function writeCompanionState(statePath, state) {
   fs.renameSync(tmp, statePath);
 }
 
+/** Apply server tombstones to rows already staged by this companion. */
+export function removeSuppressedCompanionItems(itemIds, { statePath = companionStatePath() } = {}) {
+  const suppressed = new Set((itemIds || []).filter(Boolean).map(String));
+  if (!suppressed.size) return 0;
+  return withJsonLock(statePath, () => {
+    const state = readCompanionState(statePath);
+    state.packets ||= {};
+    let removed = 0;
+    for (const [id, row] of Object.entries(state.packets)) {
+      if (!suppressed.has(canonicalInboxItemId(id, row))) continue;
+      delete state.packets[id];
+      removed += 1;
+    }
+    if (removed) writeCompanionState(statePath, state);
+    return removed;
+  });
+}
+
 function accountMarker({ user = currentUser(), deviceId = readConfig().deviceId || "" } = {}) {
   return {
     userId: user?.id || "",

package/src/task-daemon.js

@@ -14,6 +14,7 @@ import {
   defaultStageRelayCompanionItem,
   freshNotifications,
   markNotificationsProcessed,
+  removeSuppressedCompanionItems,
   reconcileAnsweredQuestions,
   stagePlainRelayItem as defaultStagePlainRelayItem,
 } from "./notifications.js";
@@ -171,6 +172,8 @@ async function pollHumanNotifications({ client, ledger, stageCompanionItem, stag
       client.listConnectors(),
     ]);
     const events = await pollVisibleTaskEvents({ client, ledger, tasks, log });
+    const removed = removeSuppressedCompanionItems(relays.inboxState?.suppressedItemIds || []);
+    if (removed) log(`removed ${removed} Relay item(s) moved to Recently Deleted elsewhere`);
     const notifications = buildHumanNotifications({
       user: me.user,
       tasks: tasks.tasks || [],