@volter/teams 0.1.72 → 0.1.74

package/browser-channel.d.ts

@@ -46,11 +46,17 @@ export type BrowserTurnAnswer =
   | { code: 0; turn_id?: string; door?: 'runtime' | 'pane' | 'waiting'; text?: string }
   | { code: number; text?: string };
 
+/** The accepted stream ended without a valid receipt; delivery may have occurred. */
+export declare class TurnDeliveryUnconfirmedError extends Error {
+  constructor(message: string);
+}
+
 /**
  * One line typed into the channel's session as its user's own turn; rejects when the machine refuses the stream.
  * `turnKey`: one per typed line, reused on retry, so the machine types the line once.
  * Receipt waits time out after thirty seconds. Cancellation stops waiting; it
- * does not undo delivery. Reuse the same key when retrying an uncertain receipt.
+ * does not undo delivery. After acceptance, a lost, invalid or cancelled receipt
+ * rejects with TurnDeliveryUnconfirmedError. Reuse the same key when retrying it.
  */
 export function sendBrowserTurn(channel: BrowserChannel, text: string, options?: { turnKey?: string; signal?: AbortSignal }): Promise<BrowserTurnAnswer>;
 

package/browser-channel.mjs

@@ -167,6 +167,11 @@ export function openBrowserSession({ origin, teamId, sessionId, token }, { WebSo
   return connectBrowserChannel(socket, channel, `could not reach session ${sessionId} through ${origin}`, 'the server closed the session channel');
 }
 
+/** A turn was accepted by its stream, but its delivery receipt was not obtained. */
+export class TurnDeliveryUnconfirmedError extends Error {
+  constructor(message) { super(message); this.name = 'TurnDeliveryUnconfirmedError'; }
+}
+
 /**
  * One line typed into the channel's session as its user's own turn. Resolves with the machine's answer:
  * `{ code: 0, turn_id, door: 'runtime' | 'pane' | 'waiting' }` (waiting: filed, typed when the session's composer
@@ -189,13 +194,19 @@ export async function sendBrowserTurn(channel, text, { turnKey, signal } = {}) {
       // receipt as success, or imply that a typed turn was rolled back.
       stream.close(error.message);
     };
-    const cancelled = () => fail(Object.assign(new Error('Turn delivery wait cancelled'), { name: 'AbortError' }));
-    const timer = setTimeout(() => fail(new Error('Turn delivery acknowledgement timed out')), 30_000);
-    const data = chunk => { answer += chunk; if (answer.length > 256_000) fail(new Error('Turn delivery receipt too large')); };
-    const closed = () => {
+    const cancelled = () => fail(new TurnDeliveryUnconfirmedError('Turn delivery wait cancelled'));
+    const timer = setTimeout(() => fail(new TurnDeliveryUnconfirmedError('Turn delivery acknowledgement timed out')), 30_000);
+    const data = chunk => { answer += chunk; if (answer.length > 256_000) fail(new TurnDeliveryUnconfirmedError('Turn delivery receipt too large')); };
+    const closed = reason => {
       if (settled) return;
       settled = true; cleanup();
-      try { resolve(JSON.parse(answer)); } catch { resolve({ code: 1, text: answer || 'no answer from the machine' }); }
+      // Only an actual machine answer establishes delivery or refusal. A socket
+      // closing, an incomplete JSON frame or an empty receipt cannot prove either.
+      try {
+        const receipt = JSON.parse(answer);
+        if (!receipt || !Number.isInteger(receipt.code)) throw new Error('Invalid receipt');
+        resolve(receipt);
+      } catch { reject(new TurnDeliveryUnconfirmedError(reason || 'No complete delivery receipt from the machine')); }
     };
     stream.on('data', data);
     if (!settled) stream.on('close', closed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "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

@@ -210,19 +210,36 @@ export function withPeople(transcript, messages, { agentName = null, sessionId =
 export function withMail(transcript, rows, { agentName = 'This session', agentId = '', agentImage: picture = agentImage } = {}) {
   // An older mailbox must not jump ahead of the page of history being viewed.
   // Its envelopes become visible when the person loads that earlier history.
-  const times = transcript.map(entry => entry.ts).filter(Number.isFinite);
-  if (times.length) rows = rows.filter(row => row.at >= Math.min(...times));
+  let earliest = Infinity;
+  for (const entry of transcript) if (Number.isFinite(entry.ts)) earliest = Math.min(earliest, entry.ts);
+  if (earliest !== Infinity) rows = rows.filter(row => row.at >= earliest);
   const nameOf = actor => actor?.self ? agentName : actor?.name || 'Unknown sender';
   const mail = rows.map(row => ({ id: `mail:${row.id}`, role: 'notice', text: row.text, ts: row.at, truncated: false,
     mail: { id: row.id, from: nameOf(row.fromActor), to: row.toActor ? nameOf(row.toActor) : row.direction === 'in' ? agentName : 'Another session',
       image: row.fromActor?.kind === 'agent' ? picture(row.fromActor.self ? agentId : row.fromActor.id) : `https://brand.volter.ai/bot/svg?seed=${encodeURIComponent(row.fromActor?.id || row.from)}&size=24&radius=4`,
       subject: row.subject || undefined, via: row.fromActor?.via, direction: row.direction, inReplyTo: row.inReplyTo } }));
-  const result = transcript.filter(entry => !entry.mail || !rows.some(row => row.id === entry.mail.id || row.id.startsWith(entry.mail.id)));
-  // Keep native tool/result ordering intact (some native entries have no time).
-  for (const entry of mail.sort((a, b) => a.ts - b.ts)) {
-    const index = result.findIndex(item => Number.isFinite(item.ts) && item.ts > entry.ts);
-    result.splice(index < 0 ? result.length : index, 0, entry);
+  // Some native envelopes use a shortened ID. It identifies a copy only if
+  // there is exactly one matching full ID; ambiguity must not erase native mail.
+  const fullIds = new Set(rows.map(row => row.id));
+  const sortedIds = [...fullIds].sort();
+  const inMailbox = id => {
+    if (!id) return false;
+    if (fullIds.has(id)) return true;
+    let low = 0, high = sortedIds.length;
+    while (low < high) { const middle = (low + high) >>> 1; if (sortedIds[middle] < id) low = middle + 1; else high = middle; }
+    return sortedIds[low]?.startsWith(id) === true && sortedIds[low + 1]?.startsWith(id) !== true;
+  };
+  mail.sort((a, b) => a.ts - b.ts);
+  const result = []; let next = 0;
+  // Keep native order, including untimed tools/results. Ascending envelopes
+  // can be merged before the first later timed entry without repeated splices
+  // or sorting the native transcript itself.
+  for (const entry of transcript) {
+    if (entry.mail && inMailbox(entry.mail.id)) continue;
+    while (next < mail.length && Number.isFinite(entry.ts) && entry.ts > mail[next].ts) result.push(mail[next++]);
+    result.push(entry);
   }
+  while (next < mail.length) result.push(mail[next++]);
   return result;
 }