@volter/teams 0.1.65 → 0.1.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.65",
+  "version": "0.1.67",
   "type": "module",
   "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
   "license": "MIT",

package/session-follow.mjs

@@ -18,7 +18,7 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
   const controller = new AbortController();
   const headers = async () => ({ Authorization: `Bearer ${await token()}` });
   const failure = (stage, status, message) => Object.assign(new Error(message), { stage, status });
-  let reading = null, requested = false;
+  let reading = null, requested = false, observed = false;
   const read = () => {
     requested = true;
     return reading ??= (async () => {
@@ -30,6 +30,7 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
         const body = await response.json();
         if (controller.signal.aborted) throw new DOMException('Session follow stopped', 'AbortError');
         snapshot = body.data ?? body;
+        observed = true;
         onSnapshot(snapshot);
         // A change during the HTTP read may be newer than the capture it
         // returned. Coalesce the callers, but do not drop that invalidation.
@@ -46,7 +47,12 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
       try {
         if (!cursor) cursor = String((await read()).event_cursor ?? '') || null;
         const response = await fetchImpl(`${base}/events?${cursor ? `after=${encodeURIComponent(cursor)}` : 'tail=1'}`, { headers: await headers(), signal: AbortSignal.any([controller.signal, connection.signal]) });
-        if (!response.ok) throw failure('follow', response.status, `following the session failed (${response.status})`);
+        if (!response.ok) {
+          // The event door uses 409 when this cursor is outside its retained
+          // journal (including after a server restart). Retrying it cannot help.
+          if (response.status === 409) cursor = null;
+          throw failure('follow', response.status, `following the session failed (${response.status})`);
+        }
         onLive(true);
         reader = response.body.getReader();
         const decoder = new TextDecoder();
@@ -65,7 +71,7 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
             if (event.cursor) cursor = event.cursor;
             // The server ends a stream it can no longer resume (a slow reader, a retired cursor): start from a snapshot.
             if (event.terminal && event.type === 'resync_required') cursor = null;
-            if (event.type === 'snapshot') onSnapshot(event.data);
+            if (event.type === 'snapshot') { observed = true; onSnapshot(event.data); }
             else if (event.type === 'session_changed') {
               const refresh = read();
               // One recovery handler per coalesced read, including when a
@@ -79,16 +85,16 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
                   // Recover even if no further message arrives.
                   cursor = null;
                   following?.abort();
-                  onError({ stage: error.stage ?? 'read', status: error.status ?? null, message: error.message, snapshot: true });
+                  onError({ stage: error.stage ?? 'read', status: error.status ?? null, message: error.message, snapshot: observed });
                 });
               }
             }
-            else if (event.type === 'session_deleted') { onLive(false); onDeleted(); return; }
+            else if (event.type === 'session_deleted') { controller.abort(); onLive(false); onDeleted(); return; }
           }
         }
       } catch (error) {
         if (controller.signal.aborted) return;
-        if (!connection.signal.aborted) onError({ stage: error.stage ?? 'follow', status: error.status ?? null, message: error.message, snapshot: Boolean(cursor) });
+        if (!connection.signal.aborted) onError({ stage: error.stage ?? 'follow', status: error.status ?? null, message: error.message, snapshot: observed });
       } finally {
         if (following === connection) following = null;
         connection.abort();
@@ -164,8 +170,12 @@ export function withPeople(transcript, messages, { agentName = null, sessionId =
     if (!attributed && /^\s*\[Cross-session [a-z ]*notice\]/i.test(entry.text)) return { ...entry, role: 'notice', text: entry.text.trim().split('\n')[0] };
     const peer = attributed ? null : peerMessage(entry.text);
     if (peer) {
-      const seed = peer.address.startsWith('sc:') ? peer.address : peer.name;
-      return { ...entry, text: peer.body, mail: { id: peer.id || entry.id, from: peer.name, to: agentName || 'This session', direction: 'in', ...(peer.subject ? { subject: peer.subject } : {}), ...(peer.via === 'voice' ? { via: 'voice' } : {}), ...(peer.inReplyTo ? { inReplyTo: peer.inReplyTo } : {}) }, actor: { id: seed, name: peer.name, image: agent(seed), kind: 'agent' }, context: [{ id: `${entry.id}:envelope`, kind: 'envelope', label: 'Delivered by supercode', detail: entry.text }] };
+      // The native voice envelope deliberately omits its return address: it
+      // is this session's own front, not another agent with a generated id.
+      const ownVoice = peer.via === 'voice';
+      const seed = ownVoice ? sessionId : peer.address.startsWith('sc:') ? peer.address : peer.name;
+      const name = ownVoice && agentName ? agentName : peer.name, picture = agent(seed);
+      return { ...entry, text: peer.body, mail: { id: peer.id || entry.id, from: name, to: agentName || 'This session', direction: 'in', image: picture, ...(peer.subject ? { subject: peer.subject } : {}), ...(ownVoice ? { via: 'voice' } : {}), ...(peer.inReplyTo ? { inReplyTo: peer.inReplyTo } : {}) }, actor: { id: seed, name, image: picture, kind: 'agent' }, context: [{ id: `${entry.id}:envelope`, kind: 'envelope', label: 'Delivered by supercode', detail: entry.text }] };
     }
     const name = metadata.source_name || null;
     const seed = name ? (metadata.source_principal_id || name) : '';