relay-companion 0.1.44 → 0.1.46

package/overlay/inbox.html

@@ -152,6 +152,14 @@
   }
   .tab.active .tab-badge { color:var(--accent); }
   .tab-badge.gone { display:none; }
+  .mark-all-read {
+    appearance:none; margin-left:auto; border:0; background:transparent; cursor:pointer;
+    padding:0 2px; color:var(--muted-2); font-family:var(--sans); font-size:10.5px; font-weight:500;
+    transition:color .15s var(--settle), opacity .15s var(--settle);
+  }
+  .mark-all-read:hover { color:var(--accent); }
+  .mark-all-read:disabled { opacity:.45; cursor:default; color:var(--muted-3); }
+  .mark-all-read.gone { visibility:hidden; pointer-events:none; }
 
   /* scrolling content layer (host for each view) */
   .scroll {
@@ -562,6 +570,7 @@
       </button>
       <button class="tab" type="button" data-view="sent">Sent</button>
       <button class="tab" type="button" data-view="contacts">Contacts</button>
+      <button class="mark-all-read gone" id="markAllRead" type="button">Mark all as read</button>
     </nav>
 
     <div class="scroll" id="scroll">
@@ -636,6 +645,7 @@
   const relaysListEl = document.getElementById("relaysList");
   const relaysEmptyEl = document.getElementById("relaysEmpty");
   const relaysBadgeEl = document.getElementById("relaysBadge");
+  const markAllReadEl = document.getElementById("markAllRead");
   const sentViewEl = document.getElementById("sentView");
   const sentListEl = document.getElementById("sentList");
   const sentEmptyEl = document.getElementById("sentEmpty");
@@ -661,7 +671,7 @@
 
   const REDUCED = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
   const EXPANDED = { w: 344, h: 524 };
-  const PILL = { w: 244, h: 44 }; // wide enough for mark + word + "N unopened" + ✕
+  const PILL = { w: 244, h: 44 }; // wide enough for mark + word + "N unread" + ✕
   const PEEK = { w: 344, h: 118 };
 
   // ---------- zero-latency sound (Web Audio, pre-decoded) ----------
@@ -858,7 +868,7 @@
   }
   // New relays always enter the notification stack, including from a fully expanded
   // card. The main process has already pushed the new payload, so render/sizing uses
-  // the latest unopened rows rather than the previous inbox.
+  // the latest unread rows rather than the previous inbox.
   function notifyArrival(rows) {
     if (peekTimer) clearTimeout(peekTimer);
     cancelBye();
@@ -1199,7 +1209,7 @@
 
   let unreadCount = 0;
   function refreshCountLabel() {
-    const label = collapsed ? `${unreadCount} unopened` : String(unreadCount);
+    const label = collapsed ? `${unreadCount} unread` : String(unreadCount);
     if (countEl.textContent !== label) {
       countEl.textContent = label;
       if (!REDUCED) { countEl.style.animation = "none"; void countEl.offsetWidth; countEl.style.animation = "countRoll .2s var(--settle)"; }
@@ -2155,11 +2165,27 @@
     const unread = (payload.relays || []).filter((r) => r.unread && isRelayListKind(r)).length;
     setCount(unread);
     setBadge(relaysBadgeEl, unread);
+    markAllReadEl.classList.toggle("gone", activeView !== "relays" || unread === 0);
+    markAllReadEl.disabled = unread === 0;
     if (activeView === "relays") renderRelays();
     else if (activeView === "sent") renderSent();
     // contacts renders from its own load path
   }
 
+  markAllReadEl.addEventListener("click", async () => {
+    if (markAllReadEl.disabled || unreadCount === 0) return;
+    markAllReadEl.disabled = true;
+    markAllReadEl.textContent = "Marking…";
+    const result = await window.relay.markAllRead();
+    markAllReadEl.textContent = "Mark all as read";
+    if (!result || !result.ok) {
+      markAllReadEl.disabled = false;
+      markAllReadEl.title = (result && result.error) || "Could not mark relays as read.";
+      return;
+    }
+    markAllReadEl.title = "";
+  });
+
   function syncDismissControl() {
     const ui = (payload && payload.ui) || {};
     const canDismiss = ui.canDismiss !== false;

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,
@@ -373,6 +374,38 @@ function visibleRelayRows(rows) {
   return rows.filter((row) => !RELAY_HIDDEN_KINDS.has(row && row.relayNotificationKind));
 }
 
+async function markAllVisibleRelaysRead() {
+  try {
+    // Server first so the website and other devices share the same read cutoff.
+    const client = await relayClient();
+    const result = await client.markAllRead({ idempotencyKey: idempotencyKey("inbox_read_all") });
+    const cutoffMs = new Date(result.readAllAt || "").getTime();
+    let marked = 0;
+    withJsonLock(STATE_PATH, () => {
+      const store = readStore();
+      for (const [id, row] of Object.entries(store.packets || {})) {
+        if (!row || row.direction !== "inbound" || row.state === "read") continue;
+        if (RELAY_HIDDEN_KINDS.has(row.relayNotificationKind)) continue;
+        const reference = row.deliveryReferenceAt ||
+          (row.relayNotificationKind === "plain_relay" ? row.updatedAt : row.createdAt);
+        const referenceMs = new Date(reference || "").getTime();
+        if (Number.isFinite(cutoffMs) && Number.isFinite(referenceMs) && referenceMs > cutoffMs) continue;
+        row.state = "read";
+        activeAttentionIds.delete(id);
+        marked += 1;
+      }
+      writeStateAtomic(store);
+    });
+    writeOverlayPrefs();
+    await pushInbox(true);
+    return { ok: true, marked, readAllAt: result.readAllAt };
+  } catch (error) {
+    const message = error && error.message ? error.message : String(error);
+    console.error("[overlay] mark all read failed:", message);
+    return { ok: false, error: message };
+  }
+}
+
 // ---- sent relays (live) --------------------------------------------------
 
 let sentCache = [];
@@ -660,18 +693,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 };
@@ -1625,6 +1663,7 @@ ipcMain.on("relay:openTask", (_e, taskId) => openTaskDetail(taskId));
 ipcMain.on("relay:openUrl", (_e, url) => openUrlTarget(url));
 ipcMain.on("relay:ack", (_e, id) => ackPacket(id));
 ipcMain.handle("relay:delete", (_e, id) => deletePacket(id));
+ipcMain.handle("relay:markAllRead", () => markAllVisibleRelaysRead());
 ipcMain.handle("relay:refreshSent", async () => {
   await refreshSent();
   await pushInbox(true);

package/overlay/preload.cjs

@@ -16,6 +16,7 @@ contextBridge.exposeInMainWorld("relay", {
   openSent: (id) => ipcRenderer.send("relay:openSent", id),
   ack: (id) => ipcRenderer.send("relay:ack", id),
   deleteRelay: (id) => ipcRenderer.invoke("relay:delete", id),
+  markAllRead: () => ipcRenderer.invoke("relay:markAllRead"),
   openUrl: (url) => ipcRenderer.send("relay:openUrl", url),
   refreshSent: () => ipcRenderer.invoke("relay:refreshSent"),
 

package/package.json

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

package/src/client.js

@@ -57,6 +57,10 @@ export class RelayClient {
     return this.#req("GET", "/v1/inbox");
   }
 
+  markAllRead(payload = {}) {
+    return this.#req("POST", "/v1/inbox/read-all", payload);
+  }
+
   sent() {
     return this.#req("GET", "/v1/sent");
   }

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,
@@ -195,12 +198,20 @@ export function buildHumanNotifications({ user, tasks = [], relays = [], connect
   }
   const suppressed = new Set(inboxState.suppressedItemIds || []);
   const restoredAtByItemId = inboxState.restoredAtByItemId || {};
+  const readAllAtMs = inboxState.readAllAt ? new Date(inboxState.readAllAt).getTime() : Number.NaN;
   return notifications
     .filter((notification) => !suppressed.has(notification.id))
-    .map((notification) => ({
-      ...notification,
-      deliveryVersion: restoredAtByItemId[notification.id] || "",
-    }));
+    .map((notification) => {
+      const deliveryVersion = restoredAtByItemId[notification.id] || "";
+      const deliveryReferenceAt = deliveryVersion || notification.createdAt || "";
+      const deliveryMs = new Date(deliveryReferenceAt).getTime();
+      return {
+        ...notification,
+        deliveryVersion,
+        deliveryReferenceAt,
+        read: Number.isFinite(readAllAtMs) && Number.isFinite(deliveryMs) && deliveryMs <= readAllAtMs,
+      };
+    });
 }
 
 export function freshNotifications(ledger, notifications) {
@@ -257,8 +268,8 @@ export function removeSuppressedCompanionItems(itemIds, { statePath = companionS
     const state = readCompanionState(statePath);
     state.packets ||= {};
     let removed = 0;
-    for (const id of suppressed) {
-      if (!state.packets[id]) continue;
+    for (const [id, row] of Object.entries(state.packets)) {
+      if (!suppressed.has(canonicalInboxItemId(id, row))) continue;
       delete state.packets[id];
       removed += 1;
     }
@@ -267,6 +278,28 @@ export function removeSuppressedCompanionItems(itemIds, { statePath = companionS
   });
 }
 
+/** Reconcile an account-wide mark-all-read watermark onto already-staged rows. */
+export function markCompanionItemsReadThrough(readAllAt, { statePath = companionStatePath() } = {}) {
+  const cutoffMs = new Date(readAllAt || "").getTime();
+  if (!Number.isFinite(cutoffMs)) return 0;
+  return withJsonLock(statePath, () => {
+    const state = readCompanionState(statePath);
+    state.packets ||= {};
+    let changed = 0;
+    for (const row of Object.values(state.packets)) {
+      if (!row || row.direction !== "inbound" || row.state === "read") continue;
+      const reference = row.deliveryReferenceAt ||
+        (row.relayNotificationKind === "plain_relay" ? row.updatedAt : row.createdAt);
+      const referenceMs = new Date(reference || "").getTime();
+      if (!Number.isFinite(referenceMs) || referenceMs > cutoffMs) continue;
+      row.state = "read";
+      changed += 1;
+    }
+    if (changed) writeCompanionState(statePath, state);
+    return changed;
+  });
+}
+
 function accountMarker({ user = currentUser(), deviceId = readConfig().deviceId || "" } = {}) {
   return {
     userId: user?.id || "",
@@ -410,7 +443,7 @@ function relayPacketFromNotification(notification, { now = new Date().toISOStrin
     id: notification.id,
     createdAt: notification.createdAt || now,
     updatedAt: now,
-    state: "unread",
+    state: notification.read ? "read" : "unread",
     sender,
     recipient: notificationRecipient(),
     source: {
@@ -445,7 +478,7 @@ export function relayCompanionRowFromNotification(
   return {
     id: notification.id,
     direction: "inbound",
-    state: "unread",
+    state: notification.read ? "read" : "unread",
     kind: "message",
     // Default unknown notification kinds to a neutral "message", never "task_completed"
     // (which would falsely mark an unknown row as a finished task). main.cjs readRelays
@@ -458,6 +491,7 @@ export function relayCompanionRowFromNotification(
     briefingMarkdown: packetMarkdownForNotification(notification),
     bodyMarkdown: notification.body || notification.title || "",
     createdAt: notification.createdAt || now,
+    deliveryReferenceAt: notification.deliveryReferenceAt || notification.createdAt || now,
     updatedAt: now,
     stagedAt: now,
     actionUrl,
@@ -487,7 +521,7 @@ export function stageRelayCompanionItem(notification, { statePath = companionSta
     const item = {
       ...existing,
       ...relayCompanionRowFromNotification(notification, { contentPath }),
-      state: existing.state === "read" ? "read" : "unread",
+      state: existing.state === "read" || packet.state === "read" ? "read" : "unread",
     };
     state.packets[item.id] = item;
     writeCompanionState(statePath, state);
@@ -599,6 +633,7 @@ export function stagePlainRelayItem(
     bodyMarkdown: packet?.bodyMarkdown || item.preview || "",
     createdAt: item.createdAt || packet?.createdAt || now,
     updatedAt: item.updatedAt || now,
+    deliveryReferenceAt: item.updatedAt || item.createdAt || now,
     stagedAt: now,
     actionUrl: "/app/relays",
     action: { type: "open", url: "/app/relays" },

package/src/task-daemon.js

@@ -14,6 +14,7 @@ import {
   defaultStageRelayCompanionItem,
   freshNotifications,
   markNotificationsProcessed,
+  markCompanionItemsReadThrough,
   removeSuppressedCompanionItems,
   reconcileAnsweredQuestions,
   stagePlainRelayItem as defaultStagePlainRelayItem,
@@ -174,6 +175,8 @@ async function pollHumanNotifications({ client, ledger, stageCompanionItem, stag
     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 markedRead = markCompanionItemsReadThrough(relays.inboxState?.readAllAt);
+    if (markedRead) log(`marked ${markedRead} Relay item(s) read from another surface`);
     const notifications = buildHumanNotifications({
       user: me.user,
       tasks: tasks.tasks || [],