@volter/teams 0.1.61 → 0.1.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "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.d.ts

@@ -33,7 +33,7 @@ export interface FollowTeamSessionOptions {
 export function followTeamSession(options: FollowTeamSessionOptions): { stop(): void; read(): Promise<TeamSessionSnapshot> };
 
 /** A message another session sent this one, from its envelope: its sender and body, or null for an ordinary turn. */
-export function peerMessage(text: string): { name: string; address: string; body: string } | null;
+export function peerMessage(text: string): { id: string | null; name: string; address: string; body: string; subject: string | null; via: string | null; inReplyTo: string | null } | null;
 
 /** Overlay actual envelopes, deduplicating copies already delivered into the native transcript. */
 export function withMail<Entry extends { id: string; ts: number | null; mail?: { id: string } }>(transcript: Entry[], rows: import('./browser-channel.js').MailHistoryEntry[], options?: { agentName?: string; agentId?: string; agentImage?(seed: string): string }): Array<Entry | { id: string; role: 'notice'; text: string; ts: number; truncated: boolean; mail: { id: string; from: string; to: string; direction: 'in' | 'out'; inReplyTo?: string | null; image?: string; via?: 'voice' } }>;
@@ -45,7 +45,7 @@ export function agentImage(seed: string): string;
  * Who wrote each entry of a projected transcript (supercode-ui's `TranscriptEntryModel`s), from the messages' own
  * annotations. Each actor carries `id` (a principal id, a session address or seed) for a host that draws its own faces.
  */
-export function withPeople<Entry extends { role: string; text: string; ts: number | null; id: string }>(
+export function withPeople<Entry extends { role: string; text: string; ts: number | null; id: string; messageIndex?: number }>(
   transcript: Entry[],
   messages: Array<{ role?: string; metadata?: Record<string, unknown> }>,
   options?: { agentName?: string | null; sessionId?: string; personImage?(seed: string): string; agentImage?(seed: string): string; locale?: string | string[] },

package/session-follow.mjs

@@ -72,7 +72,7 @@ export function followTeamSession({ origin, teamId, sessionId, token, tail = 300
 /**
  * A message another session sent this one, as its harness delivers it: an envelope naming the sender (a
  * `cross-session-message` tag, the innermost one when the harness wraps it in its own) around the body. Returns
- * { name, address, body }, or null for an ordinary turn.
+ * { id, name, address, body, subject, via, inReplyTo }, or null for an ordinary turn.
  */
 export function peerMessage(text) {
   const close = text.search(/<\\?\/cross-session-message>/);
@@ -80,10 +80,15 @@ export function peerMessage(text) {
   const opens = [...text.slice(0, close).matchAll(/<\\?cross-session-message\b([^>]*)>/g)];
   if (!opens.length) return null;
   const inner = opens[opens.length - 1];
-  const attributes = (tag) => Object.fromEntries([...tag.matchAll(/([\w-]+)="([^"]*)"/g)].map((m) => [m[1], m[2]]));
+  // Match the producer's escaping, exactly once. An original literal &lt;
+  // arrives as &amp;lt; and must remain &lt;, rather than becoming a tag.
+  const entities = { amp: '&', lt: '<', gt: '>', quot: '"' };
+  const decodeAttribute = value => value.replace(/&(amp|lt|gt|quot);/g, (_, name) => entities[name]);
+  const attributes = (tag) => Object.fromEntries([...tag.matchAll(/([\w-]+)="([^"]*)"/g)].map((m) => [m[1], decodeAttribute(m[2])]));
   const own = attributes(inner[1]), outer = attributes(opens[0][1]);
-  const body = text.slice(inner.index + inner[0].length, close).trim();
-  return { id: own.id || outer.id || null, name: own['from-name'] || outer['from-name'] || own.from || outer.from || 'Another session', address: own.from || outer.from || '', body };
+  const body = text.slice(inner.index + inner[0].length, close).trim().replace(/&(amp|lt);/g, (_, name) => entities[name]);
+  return { id: own.id || outer.id || null, name: own['from-name'] || outer['from-name'] || own.from || outer.from || 'Another session', address: own.from || outer.from || '', body,
+    subject: own.subject || outer.subject || null, via: own.via || outer.via || null, inReplyTo: own['in-reply-to'] || outer['in-reply-to'] || null };
 }
 
 /** A known person's picture; an unnamed sender gets the neutral brand user icon. */
@@ -104,24 +109,32 @@ export function withPeople(transcript, messages, { agentName = null, sessionId =
   for (const message of messages) {
     if (message?.role !== 'user') continue;
     const at = Date.parse(message.metadata?.timestamp ?? '');
-    if (Number.isFinite(at)) byTime.set(at, message.metadata);
+    // A timestamp alone is not an identity: a native batch may record several
+    // turns at the same instant. Keep this fallback only when it is unambiguous.
+    if (Number.isFinite(at)) byTime.set(at, byTime.has(at) ? null : message.metadata);
   }
   const people = transcript.map((entry) => {
     if (entry.role === 'assistant') return { ...entry, actor: { id: sessionId, ...(agentName ? { name: agentName } : {}), image: agent(sessionId), kind: 'agent' } };
     if (entry.role !== 'user') return entry;
+    // The projection carries its one-based position in this exact capture.
+    // Resolve it before looking at the words: a person's pasted envelope or
+    // wake notice remains that person's message when the native source says so.
+    const indexed = Number.isSafeInteger(entry.messageIndex) && entry.messageIndex > 0;
+    const native = indexed ? messages[entry.messageIndex - 1] : null;
+    const metadata = indexed ? native?.role === 'user' ? native.metadata ?? {} : {} : byTime.get(entry.ts) ?? {};
+    const attributed = Boolean(metadata.source_principal_id || metadata.source_name || metadata.source_via);
     const automated = /^\s*<(hook_prompt|supercode-notice)\b[^>]*>([\s\S]*)<\/\1>\s*$/.exec(entry.text);
     // This exact legacy wake string is emitted by mail_route::CODEX_WAKE. Do
     // not infer automation from general wording in a person's own message.
     const legacyWake = entry.text.trim() === 'You have unread supercode messages. Read them with: supercode message inbox';
-    if (automated || legacyWake) return { ...entry, role: 'notice', code: 'automation', text: `${automated?.[1] === 'hook_prompt' ? 'Hook' : 'Mailbox'} notification: ${automated ? automated[2].trim() : entry.text.trim()}` };
+    if (!attributed && (automated || legacyWake)) return { ...entry, role: 'notice', code: 'automation', text: `${automated?.[1] === 'hook_prompt' ? 'Hook' : 'Mailbox'} notification: ${automated ? automated[2].trim() : entry.text.trim()}` };
     // A harness's delivery notice about a message is a compact system line, not a person's turn.
-    if (/^\s*\[Cross-session [a-z ]*notice\]/i.test(entry.text)) return { ...entry, role: 'notice', text: entry.text.trim().split('\n')[0] };
-    const peer = peerMessage(entry.text);
+    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' }, 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 }] };
+      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 }] };
     }
-    const metadata = byTime.get(entry.ts) ?? {};
     const name = metadata.source_name || null;
     const seed = name ? (metadata.source_principal_id || name) : '';
     const via = typeof metadata.source_via === 'string' ? metadata.source_via.trim() : '';