@staix/agent-hub 0.6.4 → 0.7.0

package/src/hub/manager.ts

@@ -3,7 +3,7 @@ import { randomBytes, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { spawn } from "node:child_process";
-import { ControlClient, PROTOCOL } from "./control-client.ts";
+import { ControlClient, PROTOCOL, RECOVERY_SOURCE_PROTOCOLS } from "./control-client.ts";
 import { Registry, type Project } from "./registry.ts";
 import { hubHome } from "./project.ts";
 import { startDashboard } from "./ui.ts";
@@ -21,7 +21,9 @@ type ManagerHandle = { stop(): Promise<void>; stopped: Promise<void> };
 type Manifest = { port: number; protocol: number; instanceId: string; pid: number };
 const active = new Map<string, { handle: ManagerHandle; issue(): string }>();
 const CONTROL_TIMEOUT = 3000;
-const SUPPORTED_MANAGER_PROTOCOLS = new Set([8, PROTOCOL]);
+// A current CLI may authenticate the previous protocol-9 manager while
+// refreshing it, then launch the protocol-10 manager implementation.
+const SUPPORTED_MANAGER_PROTOCOLS = new Set<number>(RECOVERY_SOURCE_PROTOCOLS);
 const safeError = (error: unknown) => error instanceof Error ? error.message.slice(0, 300) : "operation failed";
 
 function files(home: string) {
@@ -216,11 +218,11 @@ export async function openManager(options: ManagerOptions = {}): Promise<string>
   throw new Error(`manager readiness not confirmed: ${safeError(error)}; see ${join(f.dir, "manager.log")}`);
 }
 
-/** Refresh an explicitly supported protocol-8 manager onto the current CLI after upgrade. */
+/** Refresh an explicitly supported protocol-9 manager onto the current CLI after upgrade. */
 export async function refreshManager(options: ManagerOptions = {}): Promise<string> {
   const home = options.home ?? hubHome();
   const manifest = readManifest(home);
-  if (manifest && manifest.protocol === 8) {
+  if (manifest && manifest.protocol === RECOVERY_SOURCE_PROTOCOLS[0]) {
     await managerRequest(home, "/stop");
     const deadline = Date.now() + CONTROL_TIMEOUT;
     while (Date.now() < deadline && readManifest(home)) await Bun.sleep(25);

package/src/hub/peers.ts

@@ -1,14 +1,20 @@
 import type { Envelope, EnvelopeOpts, PeerId, PeerState } from "./envelope.ts";
 
+export interface DeliveryReceipt {
+  id: string;
+  state: "accepted" | "completed" | "failed_safe" | "needs_review";
+  reason?: string;
+}
+
 export interface PeerAdapter {
   readonly id: PeerId;
   readonly state: PeerState;
   /** A peer the hub drives itself (Pi, the local worker). It cannot be trusted to rate its own urgency: the bus caps it. */
   readonly hubNative?: boolean;
   /** Inject now, as one prompt. Only called while `state === "idle"`. Rejecting puts the envelopes back at the queue head. */
-  deliver(envs: Envelope[]): Promise<void>;
+  deliver(envs: Envelope[], deliveryId?: string): Promise<void>;
   /** Optional: feed envelopes into the turn that is running now. Only called while `state === "busy"`. */
-  steer?(envs: Envelope[]): Promise<void>;
+  steer?(envs: Envelope[], deliveryId?: string): Promise<void>;
   start(): Promise<void>;
   stop(): Promise<void>;
   /** Set by the bus. The peer said something worth sharing. */
@@ -17,6 +23,8 @@ export interface PeerAdapter {
   onState?: (state: PeerState) => void;
   /** Set by the bus. A delivery that had resolved turned out not to reach the agent: put it back. */
   onFailed?: (envs: Envelope[]) => void;
+  /** Correlated durable-delivery lifecycle, emitted only when the bus supplied an id. */
+  onDelivery?: (receipt: DeliveryReceipt) => void;
   /** Safe restart metadata only: ids and launch parameters, never prompt/message text. */
   recoveryMetadata?(): Record<string, unknown>;
 }
@@ -28,6 +36,7 @@ export abstract class BasePeer implements PeerAdapter {
   onMessage?: (body: string, opts?: EnvelopeOpts) => void;
   onState?: (state: PeerState) => void;
   onFailed?: (envs: Envelope[]) => void;
+  onDelivery?: (receipt: DeliveryReceipt) => void;
   private _state: PeerState = "offline";
   private timer: ReturnType<typeof setTimeout> | undefined;
 
@@ -61,12 +70,16 @@ export abstract class BasePeer implements PeerAdapter {
     this.setState("idle");
   }
 
+  protected delivery(receipt: DeliveryReceipt): void {
+    this.onDelivery?.(receipt);
+  }
+
   private clearWatchdog(): void {
     if (this.timer) clearTimeout(this.timer);
     this.timer = undefined;
   }
 
-  abstract deliver(envs: Envelope[]): Promise<void>;
+  abstract deliver(envs: Envelope[], deliveryId?: string): Promise<void>;
   abstract start(): Promise<void>;
   abstract stop(): Promise<void>;
 }

package/src/hub/restart.ts

@@ -4,6 +4,7 @@ import { join } from "node:path";
 import type { BusSnapshot } from "./bus.ts";
 import type { PeerId, PeerState } from "./envelope.ts";
 import { MAX_HOP } from "./envelope.ts";
+import { validateJournalSnapshot } from "./delivery-journal.ts";
 
 export const RESTART_SCHEMA_VERSION = 1;
 
@@ -71,6 +72,7 @@ export function readRestartSnapshot(stateDir: string, expected: RestartReadExpec
   if (!Object.keys(bus.queues).every(peerId) || !Object.keys(bus.prefaces).every(peerId) || !Object.values(bus.queues).every((queue) => Array.isArray(queue) && queue.every((e) => isEnvelope(e))) || !Object.values(bus.prefaces).every((e) => isEnvelope(e)) || !bus.seen.every((e) => isEnvelope(e, true)) || !bus.withdrawn.every((id) => typeof id === "string" && id.length > 0) || !Object.values(bus.attempts).every((n) => Number.isSafeInteger(n) && n > 0)) return undefined;
   if (!Array.isArray(s.manualPaused) || !s.manualPaused.every((id) => typeof id === "string") || !Array.isArray(s.peers) || !s.peers.every((peer) => peer && typeof peer === "object" && typeof peer.id === "string" && ["idle", "busy", "paused", "offline"].includes(peer.state as string) && Array.isArray(peer.queueIds) && peer.queueIds.every((id) => typeof id === "string"))) return undefined;
   if (s.integrity !== undefined && (!s.integrity || typeof s.integrity !== "object" || typeof s.integrity.boardDigest !== "string" || typeof s.integrity.budgetDigest !== "string" || !Array.isArray(s.integrity.manualPaused) || !s.integrity.manualPaused.every((id) => typeof id === "string") || !s.integrity.queues || typeof s.integrity.queues !== "object" || !Object.values(s.integrity.queues).every((ids) => Array.isArray(ids) && ids.every((id) => typeof id === "string")))) return undefined;
+  if (bus.journal !== undefined) { try { validateJournalSnapshot(bus.journal); } catch { return undefined; } }
   return s as RestartSnapshot;
 }
 

package/src/ui/index.html

@@ -155,7 +155,10 @@ function render(snapshot) {
       const row = el('div', undefined, 'row'), head = el('div', undefined, 'row-head'), name = el('div', undefined, 'peername');
       name.append(dot(peerDot[peer.state] || ''), el('span', id, 'label'));
       head.append(name, badge(peer.state, peerDot[peer.state] || ''));
-      row.append(head, el('p', peer.queued + ' queued', 'meta'));
+      row.append(head, el('p', peer.queued + ' queued' + (peer.queuedImportant ? ' (' + peer.queuedImportant + ' important)' : ''), 'meta'));
+      if (peer.needsReview) row.append(el('p', peer.needsReview + ' need review: use ahub queue list', 'meta'));
+      if (peer.oldestQueuedAt !== undefined) row.append(el('p', 'Oldest pending: ' + Math.max(0, Math.floor((Date.now() - peer.oldestQueuedAt) / 1000)) + 's', 'meta'));
+      if (peer.attached === false) row.append(el('p', 'Disconnected recipient; work is retained.', 'meta'));
       if (peer.paused) row.append(el('p', peer.paused, 'meta'));
       if (peer.requestedModel) row.append(el('p', 'Requested: ' + peer.requestedModel, 'meta'));
       for (const backend of peer.backends || []) {
@@ -165,8 +168,9 @@ function render(snapshot) {
       row.append(button(paused ? 'Resume' : 'Pause', {action:paused ? 'resume' : 'pause', peer:id})); target.append(row);
     }
   });
-  const peerSignature = JSON.stringify(ids);
-  if (signatures.get('peer-options') !== peerSignature) { signatures.set('peer-options', peerSignature); peerOptions($('owner'), ids, 'Automatic'); peerOptions($('recipient'), ids, 'All peers'); if (draftChoicesPending) { restoreDraft(true); draftChoicesPending = false; } }
+  const assignable = ids.filter((id) => peers[id].state !== 'offline' && peers[id].attached !== false);
+  const peerSignature = JSON.stringify([ids, assignable]);
+  if (signatures.get('peer-options') !== peerSignature) { signatures.set('peer-options', peerSignature); peerOptions($('owner'), assignable, 'Automatic'); peerOptions($('recipient'), ids, 'All peers'); if (draftChoicesPending) { restoreDraft(true); draftChoicesPending = false; } }
   $('task-count').textContent = snapshot.tasks.length + ' tasks';
   const taskFilter = $('task-filter').value;
   const visibleTasks = taskFilter ? snapshot.tasks.filter((task) => task.state === taskFilter) : snapshot.tasks;