@volter/supercode-teams 0.2.160 → 0.2.162

package/mail-history.mjs

@@ -22,10 +22,11 @@ function sessionDirectory(binary, env, signal) {
 
 /** Resolve from supercode's existing session directory and explicit voice
  * backing, never by interpreting an operator mailbox's generated name. */
-function mailActors(rows, sessions, self) {
+function mailActors(rows, sessions, self, answered = []) {
   const directory = new Map(sessions.map(session => [session.address, session]));
-  const voices = new Map(rows.filter(row => row.envelope.voice_for).map(row => [row.envelope.from, row.envelope.voice_for]));
-  const names = new Map(rows.map(row => [row.envelope.from, row.envelope.from_name]));
+  const identities = [...answered, ...rows];
+  const voices = new Map(identities.filter(row => row.envelope.voice_for).map(row => [row.envelope.from, row.envelope.voice_for]));
+  const names = new Map(identities.map(row => [row.envelope.from, row.envelope.from_name]));
   const actor = (address) => {
     const backing = voices.get(address) || address;
     const native = /^sc:([^:]+):([^:]+):(.+)$/.exec(backing);
@@ -45,6 +46,29 @@ function mailActors(rows, sessions, self) {
   }));
 }
 
+async function answeredMail(rows, binary, env, signal) {
+  const known = new Set(rows.filter(row => row.envelope.voice_for).map(row => row.envelope.from));
+  const replies = rows.filter(row => row.direction === 'out' && row.envelope.in_reply_to && !known.has(row.session) && /^sc:[^:]+:operator:/.test(row.session));
+  const ids = [...new Set(replies.map(row => row.envelope.in_reply_to))];
+  if (!ids.length) return [];
+  return new Promise((resolve, reject) => {
+    const child = spawn(binary, ['message', 'show', ...ids, '--json'], {
+      env, stdio: ['ignore', 'pipe', 'pipe'], signal: AbortSignal.any([...(signal ? [signal] : []), AbortSignal.timeout(20_000)]),
+    });
+    let output = '', detail = '';
+    child.stdout.on('data', chunk => { output += chunk; if (output.length > 8_000_000) child.kill(); });
+    child.stderr.on('data', chunk => { detail = (detail + chunk).slice(-1000); });
+    child.on('error', reject);
+    child.on('close', code => {
+      try {
+        if (code !== 0 && code !== 3) throw new Error(detail || 'Answered messages could not be read');
+        const parents = JSON.parse(output).filter(row => row.found === true).map(row => row.message);
+        resolve(parents.filter(parent => parent.envelope?.voice_for && replies.some(reply => reply.envelope.in_reply_to === parent.envelope.id && reply.session === parent.envelope.from && reply.envelope.from === parent.session)));
+      } catch (error) { reject(error); }
+    });
+  });
+}
+
 // Match the CLI's local_machine_name: the native mailbox belongs to its
 // enrolled context, which can differ from a viewer connector's --home.
 function machineName(env) {
@@ -81,7 +105,8 @@ export function readMailHistory({ binary, env, harness, session, signal }) {
       if (code !== 0) return reject(new Error(error || 'Mailbox could not be read'));
       try {
         const rows = JSON.parse(out).filter(row => ['peer', 'channel'].includes(row.envelope?.kind));
-        resolve(mailActors(rows, await sessionDirectory(binary, env, signal), address));
+        const [sessions, answered] = await Promise.all([sessionDirectory(binary, env, signal), answeredMail(rows, binary, env, signal)]);
+        resolve(mailActors(rows, sessions, address, answered));
       } catch (error) { reject(error); }
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.160",
+  "version": "0.2.162",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",

package/server/harness-routes.mjs

@@ -203,7 +203,10 @@ const ACTIVITY_FRESH_MS=60000;
 /** The connector's latest fresh native turn report; stale or unrecognized reports remain unknown. */
 async function activityOf(api,teamId,sessionId){
   const row=await api.store.one('SELECT a.turn,a.since,a.observed_at FROM session_activity a JOIN origins o ON o.team_id=a.team_id AND o.source_id=a.source_id AND o.harness=a.harness AND o.native_id=a.native_id WHERE a.team_id=? AND o.deleted_at IS NULL AND o.session_id IN (SELECT id FROM sessions WHERE team_id=? AND (id=? OR canonical_id=?)) ORDER BY a.observed_at DESC LIMIT 1',[teamId,teamId,sessionId,sessionId]);
-  return row&&['working','idle','needs_input'].includes(row.turn)&&api.clock.nowMs()-row.observed_at<ACTIVITY_FRESH_MS?{state:row.turn,since:row.since??row.observed_at,observedAt:row.observed_at}:{state:'unknown'};
+  // Unknown is a fresh server determination too: give it an ordering time so
+  // an older known report cannot restore Working while the source is stale.
+  const now=api.clock.nowMs();
+  return row&&['working','idle','needs_input'].includes(row.turn)&&now-row.observed_at<ACTIVITY_FRESH_MS?{state:row.turn,since:row.since??row.observed_at,observedAt:row.observed_at}:{state:'unknown',observedAt:now};
 }
 async function sessionDescriptor(api,res,auth,id,requestId){
   const row=await api.store.authorizedSession({teamId:auth.team_id,principalId:auth.principal_id,credentialId:auth.credential_id,ref:id,now:api.clock.nowMs(),bound:auth.bound});