@ours.network/notifications 0.3.1-nightly.3 → 0.3.1-nightly.4

package/README.md

@@ -56,11 +56,11 @@ Responses are never cached. User and producer credentials have separate scopes.
 | GET `/api/v1/devices/status?id=...` | User | `{ "active": true }` |
 | GET `/api/v1/inbox?limit=50&before=...` | User | Items, shared unread count, revision, next cursor |
 | GET `/api/v1/summary` | User | Shared unread count, revision, per-chat source/identity/count, and `sections: {chats, tasks}` |
-| POST `/api/v1/read-target` | User | `{ "url": "/fleet/chats?chat=agent", "revision": OBSERVED_REVISION }`, reads only this chat up to the revision captured before its history load |
+| POST `/api/v1/read-target` | User | `{ "url": "/fleet/chats/agents/agent", "revision": OBSERVED_REVISION }`, reads only this chat up to the revision captured before its history load |
 | POST `/api/v1/read` | User | `{ "ids": ["notification-id"] }`, idempotent shared read |
 | POST `/api/v1/delete` | User | `{ "ids": ["notification-id"] }` → `{ "removed": COUNT }`; persistently removes only this user’s entries and queued deliveries after the client has confirmed target absence |
-| POST `/api/v1/delete-target` | Producer | `{ "url": "/fleet/chats?chat=agent" }` → `{ "removed": COUNT }`; only its credential’s user/source and exact canonical conversation, including filter/anchor variants |
-| POST `/api/v1/send` | Producer | `{ "eventId": "stable-event-id", "title": "Agent completed", "body": "Open the chat", "url": "/fleet/chats?chat=agent&detail=1" }` |
+| POST `/api/v1/delete-target` | Producer | `{ "url": "/fleet/chats/agents/agent" }` → `{ "removed": COUNT }`; only its credential’s user/source and exact canonical conversation, including filter/anchor variants |
+| POST `/api/v1/send` | Producer | `{ "eventId": "stable-event-id", "title": "Agent completed", "body": "Open the chat", "url": "/fleet/chats/agents/agent" }` |
 
 Inbox admission and queued delivery are one fsynced atomic snapshot. The service
 deduplicates by user/source/event ID; replay must retain identical title/body/URL
@@ -171,3 +171,5 @@ an inbox item is deleted, preventing retry resurrection. Legacy inbox entries ar
 admitted as receipts on load. The existing inbox/job caps remain; a separate cap of
 100,000 receipts per account rejects new events explicitly rather than evicting
 dedupe evidence. Upgrades must preserve the service's state file and scoped credentials.
+
+Conversation notification links use canonical contact (`/fleet/chats/contacts/:id`), agent (`/fleet/chats/agents/:id`), and task room (`/fleet/tasks/:taskId/room` or `/fleet/tasks/:taskId/rooms/:key`) paths. Deploy producers, this service, and the app together. Summary rows retain `source`/`chat` and include `kind` (`contact`, `agent`, or `room`) to distinguish colliding IDs. Filters and message anchors do not change target identity. Old query-based conversation URLs are intentionally unsupported; stored payload URLs are neither converted nor deleted by this change. Existing navigation-target security restrictions still apply.

package/dist/chat-target.d.ts

@@ -1,9 +1,8 @@
-/** Stable conversation identity, independent of list filters and mobile detail state. */
-export declare function chatTarget(path: string): {
+export interface ChatTarget {
+    kind: 'contact' | 'agent' | 'room';
     source: 'work' | 'messenger';
     chat: string;
-} | null;
-export declare function chatKey(value: {
-    source: string;
-    chat: string;
-}): string;
+}
+/** Stable conversation identity, independent of list filters and message anchors. */
+export declare function chatTarget(path: string): ChatTarget | null;
+export declare function chatKey(value: ChatTarget): string;

package/dist/chat-target.js

@@ -1,15 +1,34 @@
-/** Stable conversation identity, independent of list filters and mobile detail state. */
+import { target as navigationTarget } from './validation.js';
+/** Stable conversation identity, independent of list filters and message anchors. */
 export function chatTarget(path) {
-    const url = new URL(path, 'https://ours.invalid');
-    if (url.pathname === '/fleet/chats') {
-        const chat = url.searchParams.get('chat');
-        if (!chat || chat.length > 512)
+    try {
+        navigationTarget(path);
+        const url = new URL(path, 'https://ours.invalid');
+        if (['source', 'chat', 'task', 'detail'].some(key => url.searchParams.has(key)))
             return null;
-        return { source: url.searchParams.get('source') === 'messenger' ? 'messenger' : 'work', chat };
+        // Match the original path: URL normalization must not turn malformed arity into a target.
+        const parts = path.split(/[?#]/, 1)[0].split('/').slice(1).map(decodeURIComponent);
+        if (parts.some(part => !part || /[\x00-\x1f\x7f]/.test(part) || part === '.' || part === '..'))
+            return null;
+        if (parts.length === 4 && parts[0] === 'fleet' && parts[1] === 'chats') {
+            if (parts[2] === 'contacts')
+                return { kind: 'contact', source: 'messenger', chat: parts[3] };
+            if (parts[2] === 'agents')
+                return { kind: 'agent', source: 'work', chat: parts[3] };
+        }
+        if (parts[0] === 'fleet' && parts[1] === 'tasks' && /^[A-Za-z0-9_-]{1,120}$/.test(parts[2] ?? '')) {
+            if (parts.length === 4 && parts[3] === 'room')
+                return { kind: 'room', source: 'work', chat: `room-${parts[2]}` };
+            if (parts.length === 5 && parts[3] === 'rooms' && /^[A-Za-z][A-Za-z0-9_-]*$/.test(parts[4])
+                && !['constructor', 'prototype', '__proto__'].includes(parts[4])) {
+                return { kind: 'room', source: 'work', chat: `room-${parts[2]}:${parts[4]}` };
+            }
+        }
     }
+    catch { /* Unsupported persisted input is unknown, never a missing target. */ }
     return null;
 }
 export function chatKey(value) {
-    const chat = value.source === 'messenger' && /^[a-f0-9]{64}$/i.test(value.chat) ? value.chat.toUpperCase() : value.chat;
-    return JSON.stringify([value.source, chat]);
+    const chat = value.kind === 'contact' && /^[a-f0-9]{64}$/i.test(value.chat) ? value.chat.toUpperCase() : value.chat;
+    return JSON.stringify([value.kind, value.source, chat]);
 }

package/dist/store.d.ts

@@ -1,3 +1,4 @@
+import { type ChatTarget } from './chat-target.js';
 import type { PushSubscription } from 'web-push';
 export interface Notification {
     id: string;
@@ -51,11 +52,9 @@ export declare class Store {
     summary(userId: string): {
         unread: number;
         revision: number;
-        chats: {
-            source: "work" | "messenger";
-            chat: string;
+        chats: (ChatTarget & {
             count: number;
-        }[];
+        })[];
         sections: {
             chats: number;
             tasks: number;

package/dist/store.js

@@ -114,7 +114,7 @@ export class Store {
             if (/^\/fleet\/tasks(?:\/[^/]+)?\/?$/.test(url.pathname))
                 sections.tasks++;
             else if (targetForSection) {
-                if (typeof n.taskId === 'string' || targetForSection.source === 'work' && /^room-[^:]+(?::[^:]+)?$/.test(targetForSection.chat))
+                if (typeof n.taskId === 'string' || targetForSection.kind === 'room')
                     sections.tasks++;
                 else if (targetForSection.source === 'messenger')
                     sections.chats++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/notifications",
-  "version": "0.3.1-nightly.3",
+  "version": "0.3.1-nightly.4",
   "description": "Authenticated web push delivery and shared notification inbox",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",