@volter/supercode-teams 0.3.93 → 0.3.95

package/live-sessions.mjs

@@ -433,8 +433,16 @@ export class LiveSessions extends EventEmitter {
   codexForget() {
     if (!this.codexIndexRead && !this.codexKnown) return;
     this.codexIndexRead = false; this.codexKnown = false; this.codexWaitedOut = false; this.startedAt = Date.now();
+    // what the ended serve said is not kept as what is true now: a Codex session that ended in the gap would be filed for
+    // a door it no longer has; until serve answers anew, a Codex session is not known yet (a send to it waits)
+    const had = this.codexRunning.size + this.codexPaneOf.size;
+    this.codexRunning.clear(); this.codexPaneOf = new Map();
+    if (had) this.#changed();
   }
 
+  /** A new index subscription's first answer replaces the Codex rows the last one held (its rows follow this). */
+  codexRowsReplaced() { this.codexRows.clear(); }
+
   /** The session index's first answer is read: its Codex sessions' activity is followed next (even when it has none). */
   codexIndexed() {
     if (!this.codexIndexRead) this.codexIndexedAt = Date.now();

package/machine-records.mjs

@@ -21,6 +21,8 @@ const MIN_READ_MS = 2000;
 export const BEAT_MS = 15_000;
 export const STALE_MS = 45_000;
 const backoff = (previous) => Math.min(300_000, Math.max(2000, (previous || 1000) * 2));
+/** How often a machine whose daemon is too old to serve records is asked again (its update is what answers it). */
+const TOO_OLD_RETRY_MS = 600_000;
 
 /**
  * The producer: `readers[section](detail)` reads one section (async), `detail` naming what changed when the event knows
@@ -209,6 +211,15 @@ export class RecordHolder {
     if (forgot) this.save();
     for (const [machine, held] of this.held) if (!linked.has(machine) && held.state !== 'unlinked') this.let(machine, 'offline: not linked to the team\'s server');
     for (const machine of linked) { const held = this.held.get(machine); if (!held || held.state === 'unlinked' || ((held.state === 'closed' || held.state === 'too-old') && !held.retry)) this.subscribe(machine); }
+    // a machine too old to serve records whose link changed since (it linked again: an update restarts its daemon) is
+    // asked again now, not at its ten-minute re-ask
+    const changedAt = new Map((items ?? []).filter((item) => item.linked).map((item) => [normal(item.name), item.changed_at ?? null]));
+    for (const [machine, held] of this.held) {
+      const at = changedAt.get(machine);
+      if (at == null) continue;
+      if (held.state === 'too-old' && held.linkChangedAt != null && at !== held.linkChangedAt) { held.linkChangedAt = at; this.subscribe(machine); continue; }
+      held.linkChangedAt = at;
+    }
   }
   let(machine, why) {
     const held = this.held.get(machine); if (!held) return;
@@ -231,8 +242,10 @@ export class RecordHolder {
       held.attempt = null;
       Object.assign(held, { stream: null, state, since: Date.now(), why: String(why ?? 'the stream closed').slice(0, 300) });
       try { stream?.close?.(); } catch { /* closing */ }
-      // opened again after a backoff, 2 s doubling to 5 min: an obligation of this machine, never a sweep
-      held.backoff = backoff(held.backoff);
+      // opened again after a backoff, 2 s doubling to 5 min: an obligation of this machine, never a sweep. A daemon too
+      // old to serve records is asked again every TOO_OLD_RETRY_MS: only its update answers it (asked every 8-16 s, it
+      // filled the log)
+      held.backoff = state === 'too-old' ? TOO_OLD_RETRY_MS : backoff(held.backoff);
       if (this.closed) return;
       held.retry = setTimeout(() => { held.retry = null; if ((held.state === 'closed' || held.state === 'too-old') && !this.closed) this.subscribe(machine); }, held.backoff);
       held.retry.unref?.();

package/machine.mjs

@@ -617,8 +617,33 @@ export class TeamsMachine extends MachineCore {
     this.on('internal-notification', (message) => {
       const params = message.params ?? {};
       if (params.subscription && params.subscription === this.liveActivity) this.live.codexActivity(params.activities);
+      else if (params.subscription && params.subscription === this.codexIndex) {
+        for (const change of params.changes ?? []) {
+          if (change.kind === 'removed' && change.key?.harness === 'codex') this.live.codexIndex({ removed: change.key.session_id });
+          else if (change.descriptor) this.live.codexIndex({ descriptor: change.descriptor });
+        }
+      }
+    });
+    // The Codex sessions' own index (Codex rollouts only): the live map knows them from its first answer, never waiting on
+    // the whole index of every harness, which the machine records keep (on yuerans that took 25.6 s to answer: grok's
+    // 11,305 files and claude-code's 6,334 listed, a page of 5,340 rows built; Codex's 980 files listed in 25 ms).
+    let codexIndexBackoff = 0, codexIndexRetry = null;
+    const subscribeCodex = () => this.#serveRequest('harness.v1.sessions.index.subscribe', { harnesses: ['codex'], limit: 0 }, 60_000)
+      .then((answer) => {
+        this.codexIndex = answer?.subscription ?? null; codexIndexBackoff = 0;
+        this.live.codexRowsReplaced();
+        for (const descriptor of answer?.initial ?? []) if (descriptor?.locator) this.live.codexIndex({ descriptor });
+        this.live.codexIndexed();
+      }, (error) => {
+        codexIndexBackoff = Math.min(300_000, Math.max(2000, (codexIndexBackoff || 1000) * 2));
+        this.emit('records-log', `live sessions: the Codex sessions' index could not be subscribed (${error.message}); tried again in ${Math.round(codexIndexBackoff / 1000)} s`);
+        clearTimeout(codexIndexRetry); codexIndexRetry = setTimeout(() => void subscribeCodex(), codexIndexBackoff); codexIndexRetry.unref?.();
+      });
+    void subscribeCodex();
+    this.on('serve-exit', () => {
+      this.liveActivity = null; this.codexIndex = null; followed = ''; this.live.codexForget(); this.live.emit('codex-followed');
+      clearTimeout(codexIndexRetry); codexIndexRetry = setTimeout(() => void subscribeCodex(), 2000); codexIndexRetry.unref?.();
     });
-    this.on('serve-exit', () => { this.liveActivity = null; followed = ''; this.live.codexForget(); this.live.emit('codex-followed'); });
   }
 
   // ---- this machine's mail (mail/; docs/architecture/overview.md, "The mail operations") ---------------------------
@@ -782,8 +807,6 @@ export class TeamsMachine extends MachineCore {
         for (const change of params.changes ?? []) {
           if (change.kind === 'removed' && change.key) this.sessionDescriptors?.delete(`sc:${machineName(this.env)}:${change.key.harness}:${change.key.session_id}`);
           else if (change.descriptor?.locator) this.sessionDescriptors?.set(`sc:${machineName(this.env)}:${change.descriptor.locator.harness}:${change.descriptor.locator.session_id}`, change.descriptor);
-          if (change.kind === 'removed' && change.key?.harness === 'codex') this.live?.codexIndex({ removed: change.key.session_id });
-          else if (change.descriptor) this.live?.codexIndex({ descriptor: change.descriptor });
           if (change.kind === 'removed' && change.key) locators.delete(`${change.key.harness}:${change.key.session_id}`);
           else if (change.descriptor?.locator) locators.set(`${change.descriptor.locator.harness}:${change.descriptor.locator.session_id}`, change.descriptor.locator);
         }
@@ -796,9 +819,8 @@ export class TeamsMachine extends MachineCore {
       .then((answer) => {
         this.recordsIndex = answer?.subscription ?? null; indexBackoff = 0; locators.clear();
         this.sessionDescriptors?.clear();
-        for (const descriptor of answer?.initial ?? []) if (descriptor?.locator) { locators.set(`${descriptor.locator.harness}:${descriptor.locator.session_id}`, descriptor.locator); this.live?.codexIndex({ descriptor }); this.sessionDescriptors?.set(`sc:${machineName(this.env)}:${descriptor.locator.harness}:${descriptor.locator.session_id}`, descriptor); }
+        for (const descriptor of answer?.initial ?? []) if (descriptor?.locator) { locators.set(`${descriptor.locator.harness}:${descriptor.locator.session_id}`, descriptor.locator); this.sessionDescriptors?.set(`sc:${machineName(this.env)}:${descriptor.locator.harness}:${descriptor.locator.session_id}`, descriptor); }
         producer.note('sessions_index', null); noteIndexParts(answer?.failed, null); both();
-        this.live?.codexIndexed();
       }, (error) => {
         indexBackoff = backoff(indexBackoff);
         const why = `the session index could not be subscribed: ${error.message}; sessions and panes change on pane and mail events only until it is`;

package/package.json

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