pi-forge 1.3.5 → 1.3.7

package/dist/server/orchestration/event-bridge.js

@@ -1,4 +1,5 @@
 import { bridgeWorkerEvent } from "./inbox.js";
+import { getWorkerRecord, updateWorkerLifecycle } from "./store.js";
 function findLastAssistant(messages) {
     for (let i = messages.length - 1; i >= 0; i--) {
         const m = messages[i];
@@ -28,54 +29,81 @@ function extractAssistantText(content) {
     }
     if (parts.length === 0)
         return undefined;
-    // Cap to 600 chars in the inbox payload — the supervisor LLM
-    // sees this as a quick summary; if it wants more it calls
-    // `orchestrate_read_worker`. Bigger payloads bloat the inbox
-    // file and the supervisor's tool-result context.
-    const joined = parts.join("\n");
-    return joined.length > 600 ? `${joined.slice(0, 600)}…` : joined;
+    // Worker completion notifications are the supervisor's actionable
+    // context now, so include the full final assistant text rather than a
+    // preview that requires a follow-up inbox/transcript read.
+    return parts.join("\n");
 }
 /**
  * Called from `session-registry.makeSubscribeHandler` for every
- * AgentSessionEvent on every live session. Filters for the two SDK
- * events that map to inbox items; everything else is ignored.
+ * AgentSessionEvent on every live session. Only authoritative
+ * lifecycle signals wake the supervisor: agent_end (final turn
+ * outcome) and explicit blocked state from ask_user_question (below).
+ * Retry events are deliberately ignored here; if retries ultimately
+ * fail, the SDK reports the terminal outcome on agent_end or the
+ * explicit stop/delete path reports no agent_end was observed.
  */
 export async function bridgeWorkerAgentEvent(meta, event) {
     const e = event;
-    if (e.type === "agent_end") {
-        const messages = meta.session.messages;
-        const lastAssistant = findLastAssistant(messages);
-        const errorMessage = meta.session.errorMessage ??
-            lastAssistant?.errorMessage;
-        await bridgeWorkerEvent(meta.sessionId, "worker.ended", {
-            stopReason: lastAssistant?.stopReason ?? null,
-            errorMessage: errorMessage ?? null,
-            assistantTextPreview: lastAssistant?.text ?? null,
+    const now = new Date().toISOString();
+    if (e.type === "agent_start") {
+        await updateWorkerLifecycle(meta.sessionId, {
+            state: "running",
+            turnOpen: true,
+            lastStateAt: now,
+            lastAgentStartAt: now,
+            stopReason: null,
+            errorMessage: null,
         });
         return;
     }
-    if (e.type === "auto_retry_end" && e.success === false) {
-        await bridgeWorkerEvent(meta.sessionId, "worker.auto_retry_failed", {
-            attempt: e.attempt ?? null,
-            maxAttempts: e.maxAttempts ?? null,
-            finalError: e.finalError ?? null,
-        });
+    if (e.type !== "agent_end")
         return;
-    }
+    const messages = meta.session.messages;
+    const lastAssistant = findLastAssistant(messages);
+    const errorMessage = meta.session.errorMessage ??
+        lastAssistant?.errorMessage;
+    const hasError = typeof errorMessage === "string" && errorMessage.length > 0;
+    await updateWorkerLifecycle(meta.sessionId, {
+        state: hasError ? "errored" : "ended",
+        turnOpen: false,
+        lastStateAt: now,
+        lastAgentEndAt: now,
+        stopReason: lastAssistant?.stopReason ?? null,
+        errorMessage: errorMessage ?? null,
+    });
+    await bridgeWorkerEvent(meta.sessionId, "worker.ended", {
+        stopReason: lastAssistant?.stopReason ?? null,
+        errorMessage: errorMessage ?? null,
+        assistantText: lastAssistant?.text ?? null,
+    });
 }
 export async function bridgeWorkerAskUserQuestion(sessionId, questions, requestId) {
+    await updateWorkerLifecycle(sessionId, {
+        state: "awaiting_question",
+        lastStateAt: new Date().toISOString(),
+    });
     await bridgeWorkerEvent(sessionId, "worker.ask_user", {
         requestId,
         questionCount: questions.length,
-        // Keep the inbox payload tight — preview is the first question's
-        // header so the supervisor sees enough to decide whether to read
-        // the worker's transcript. Full question detail is in the
-        // worker's session, fetched via orchestrate_read_worker.
+        // Include the question detail directly so the supervisor can react
+        // from the pushed notification without first draining an inbox.
         firstQuestionHeader: questions[0]?.header ?? null,
         firstQuestionText: questions[0]?.question ?? null,
     });
 }
+export function shouldBridgeWorkerProcessAlert(_reason) {
+    // Worker process alerts are intentionally not escalated to the
+    // supervisor inbox. The worker session itself still receives the
+    // in-chat process alert because it explicitly requested an
+    // alertOn* notification, and the running worker agent can react
+    // locally. Waking the orchestrator for process success/failure/kill
+    // outcomes has proven too noisy and duplicative.
+    return false;
+}
 export async function bridgeWorkerProcessAlert(sessionId, info, reason) {
+    if (!shouldBridgeWorkerProcessAlert(reason))
+        return;
     await bridgeWorkerEvent(sessionId, "worker.process_alert", {
         reason,
         processId: info.id,
@@ -85,7 +113,31 @@ export async function bridgeWorkerProcessAlert(sessionId, info, reason) {
         success: info.success,
     });
 }
+export async function bridgeWorkerExecutionStopped(sessionId, meta) {
+    const rec = await getWorkerRecord(sessionId);
+    if (rec?.turnOpen !== true)
+        return;
+    await updateWorkerLifecycle(sessionId, {
+        state: "stopped",
+        turnOpen: false,
+        lastStateAt: new Date().toISOString(),
+        stopReason: meta.reason,
+    });
+    await bridgeWorkerEvent(sessionId, "worker.execution_stopped_without_agent_end", {
+        reason: meta.reason,
+        wasLive: meta.wasLive,
+        lastAgentStartAt: rec.lastAgentStartAt ?? null,
+    });
+}
 export async function bridgeWorkerDeleted(sessionId, meta) {
+    const reason = meta.reason ?? "deleted";
+    await bridgeWorkerExecutionStopped(sessionId, { wasLive: meta.wasLive, reason });
+    await updateWorkerLifecycle(sessionId, {
+        state: "deleted",
+        turnOpen: false,
+        lastStateAt: new Date().toISOString(),
+        stopReason: reason,
+    });
     await bridgeWorkerEvent(sessionId, "worker.deleted", {
         wasLive: meta.wasLive,
     });

package/dist/server/orchestration/event-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-bridge.js","sourceRoot":"","sources":["../../src/orchestration/event-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event-bridge.js","sourceRoot":"","sources":["../../src/orchestration/event-bridge.ts"],"names":[],"mappings":"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"}

package/dist/server/orchestration/inbox.js

@@ -1,47 +1,19 @@
 /**
- * Inbox surface — the bridge between worker events and supervisor
- * wake-up. Wraps the raw inbox queue (in `store.ts`) with the
- * "fire a prompt at an idle supervisor" mechanism that makes
- * "session A watches session B" actually work without polling.
+ * Worker notification surface — the bridge between worker events and
+ * supervisor custom messages. The persisted inbox store remains as UI
+ * history/audit data, but the supervisor LLM no longer needs a separate
+ * read-inbox tool: each `orchestration-notify` message carries the
+ * actionable event payload directly.
  *
- * Design:
- *   1. PULL primary: supervisor's LLM calls `orchestrate_read_inbox`
- *      to drain pending items. Items stay in the file (cap-evicted)
- *      so the REST UI can show recent activity even after the LLM
- *      consumed them.
- *   2. PUSH secondary: when an event enqueues AND the supervisor
- *      session is live AND idle (not currently streaming), we fire
- *      a tiny `[orchestration]` prompt at the supervisor so it
- *      starts a new turn that surfaces the items. If the supervisor
- *      is busy, the push skips — the items wait on the queue, and
- *      the supervisor's next prompt will see them via
- *      `orchestrate_read_inbox`.
- *   3. Recovery: when the supervisor's own `agent_end` fires (i.e.
- *      it just became idle), we check for pending items and PUSH
- *      again if any. Closes the "supervisor finished a turn but
- *      didn't call read_inbox" gap.
- *
- * All PUSH paths are best-effort: the queue is the source of truth.
- * A missed wake-up means the supervisor sees the items on its next
- * turn, not that the items vanish.
+ * Delivery policy:
+ *   - If the supervisor is active, every worker update is delivered as
+ *     `steer` so it can enter the current run at the next model step.
+ *   - If the supervisor is idle, every update except delete/unregister
+ *     starts a new turn; delete/unregister only appends a visible card.
  */
+import { sendCustomLifecycleMessage } from "../lifecycle-notifications.js";
 import { getSession } from "../session-registry.js";
-import { enqueueInboxItem, getSupervisorIdForWorker, pendingInboxCount, readPendingInbox, } from "./store.js";
-/**
- * Per-supervisor "already pushed once for this idle window" flag.
- * Without this, every inbox enqueue while the supervisor is briefly
- * idle would fire a fresh `prompt()` — the supervisor's first push
- * starts a turn, but the SDK may not flip isStreaming to true
- * immediately (it's set after the first message_start event), so a
- * second enqueue 1ms later would still see "idle" and fire a
- * duplicate prompt. The flag is cleared in two places:
- *   - On the supervisor's own `agent_end` (handled in
- *     `notifySupervisorIdle` below) — the supervisor's turn finished
- *     and the next idle window is a new wake-up opportunity.
- *   - On supervisor dispose (handled in session-registry) — clear
- *     so a re-resumed session can wake again.
- */
-const pendingWakePush = new Set();
+import { enqueueInboxItem, getSupervisorIdForWorker, readPendingInbox } from "./store.js";
 /**
  * Per-supervisor sequence number for wake-up prompts. Surfaces in
  * stderr logs to make it possible to grep "how many times have we
@@ -57,84 +29,156 @@ function logInbox(level, payload) {
     process.stderr.write(`${JSON.stringify({ level, time: new Date().toISOString(), ...payload })}\n`);
 }
 /**
- * Decide whether the live supervisor session is "idle" — i.e.,
- * not currently mid-turn. The SDK exposes `isStreaming`; that's a
- * stable proxy for "the agent loop is producing output right now."
- * A session that has never prompted is also idle.
- */
-function isSupervisorIdle(supervisorId) {
-    const live = getSession(supervisorId);
-    if (live === undefined)
-        return false; // not live → no idle to push to
-    // SDK exposes isStreaming as a getter on AgentSession.
-    return live.session.isStreaming === false;
-}
-/**
- * Build the wake-up prompt text. Kept short — the prompt's only job
- * is to nudge the supervisor LLM to call `orchestrate_read_inbox`.
- * The bracket marker is also what the client UI uses to style the
- * message distinctly from a user message (recognised by the
- * `OrchestrationWakePrefix` constant exported below).
+ * Build the supervisor notification text. The content is intentionally
+ * actionable on its own so the supervisor does not need a separate
+ * read-inbox call before deciding what to do.
  */
 export const ORCHESTRATION_WAKE_PREFIX = "[orchestration]";
-function buildWakeText(pendingCount) {
-    return (`${ORCHESTRATION_WAKE_PREFIX} ${pendingCount} pending worker event(s). ` +
-        `Call \`orchestrate_read_inbox\` to inspect, then decide whether to ` +
-        `\`orchestrate_read_worker\`, \`orchestrate_send_to_worker\`, or take no action.`);
+export const ORCHESTRATION_NOTIFY_TYPE = "orchestration-notify";
+export function shouldTriggerWorkerTurn(type) {
+    return type !== "worker.deleted";
+}
+function workerStateForInboxType(type) {
+    if (type === "worker.ended")
+        return "ended";
+    if (type === "worker.execution_stopped_without_agent_end")
+        return "failed";
+    if (type === "worker.deleted")
+        return "deleted";
+    if (type === "worker.ask_user")
+        return "awaiting_question";
+    if (type === "worker.process_alert")
+        return "process_alert";
+    return type.replace(/^worker\./, "");
+}
+function buildNotificationText(type, workerId, data) {
+    const state = workerStateForInboxType(type);
+    const lines = [`Worker ${workerId} reported ${state}.`];
+    const detail = summarizeWorkerEventData(type, data);
+    if (detail !== "")
+        lines.push(detail);
+    return lines.join("\n\n");
+}
+function summarizeWorkerEventData(type, data) {
+    if (type === "worker.ended") {
+        const stop = typeof data.stopReason === "string" ? data.stopReason : "unknown";
+        const err = typeof data.errorMessage === "string" && data.errorMessage.length > 0
+            ? data.errorMessage
+            : "";
+        const text = typeof data.assistantText === "string" && data.assistantText.length > 0
+            ? data.assistantText
+            : "";
+        const parts = [`stopReason: ${stop}`];
+        if (err !== "")
+            parts.push(`errorMessage:\n${err}`);
+        if (text !== "")
+            parts.push(`finalMessage:\n${text}`);
+        return parts.join("\n\n");
+    }
+    if (type === "worker.ask_user") {
+        const count = typeof data.questionCount === "number" ? data.questionCount : 1;
+        const header = typeof data.firstQuestionHeader === "string" ? data.firstQuestionHeader : "";
+        const text = typeof data.firstQuestionText === "string" ? data.firstQuestionText : "";
+        return [
+            `questionCount: ${count}`,
+            header !== "" ? `firstQuestionHeader: ${header}` : "",
+            text !== "" ? `firstQuestionText:\n${text}` : "",
+        ]
+            .filter((part) => part !== "")
+            .join("\n\n");
+    }
+    if (type === "worker.execution_stopped_without_agent_end") {
+        const reason = typeof data.reason === "string" ? data.reason : "stopped";
+        const lastStart = typeof data.lastAgentStartAt === "string" ? data.lastAgentStartAt : "";
+        return `reason: ${reason}${lastStart !== "" ? `\nlastAgentStartAt: ${lastStart}` : ""}`;
+    }
+    if (type === "worker.deleted") {
+        return `wasLive: ${data.wasLive === true ? "true" : "false"}`;
+    }
+    try {
+        return JSON.stringify(data, null, 2);
+    }
+    catch {
+        return "";
+    }
 }
 /**
- * Attempt to wake the supervisor with a tiny system-style prompt.
- * No-op if the supervisor is offline, busy, or already has an
- * in-flight push for this idle window.
- *
- * Returns true if a prompt was actually fired (used by tests).
+ * Deliver a worker notification to the supervisor. No-op if the
+ * supervisor is offline, or if this exact inbox item was already
+ * surfaced as a durable custom message.
  */
-async function tryWakeSupervisor(supervisorId) {
+async function tryWakeSupervisor(supervisorId, event) {
     const live = getSession(supervisorId);
     if (live === undefined)
         return false;
-    if (!isSupervisorIdle(supervisorId))
+    const pendingItems = await readPendingInbox(supervisorId);
+    const pending = pendingItems.length;
+    const fallbackItem = pendingItems.find((it) => shouldTriggerWorkerTurn(it.type)) ?? pendingItems[0];
+    const effectiveEvent = event ??
+        (fallbackItem === undefined
+            ? undefined
+            : {
+                type: fallbackItem.type,
+                workerId: fallbackItem.workerId,
+                itemId: fallbackItem.id,
+                data: fallbackItem.data,
+            });
+    if (effectiveEvent === undefined)
         return false;
-    if (pendingWakePush.has(supervisorId))
-        return false;
-    const pending = await pendingInboxCount(supervisorId);
-    if (pending === 0)
-        return false;
-    pendingWakePush.add(supervisorId);
+    const triggerTurn = shouldTriggerWorkerTurn(effectiveEvent.type);
     const seq = nextWakeCounter(supervisorId);
-    const text = buildWakeText(pending);
-    // Fire-and-forget. The SDK's session.prompt is async; we let it
+    const type = effectiveEvent.type;
+    const workerId = effectiveEvent.workerId;
+    const text = buildNotificationText(type, workerId, effectiveEvent.data);
+    // Fire-and-forget. The SDK's sendCustomMessage is async; we let it
     // run in the background so the event-bridge caller (often the
-    // hot path of an AgentSessionEvent subscriber) returns
-    // immediately. Errors are surfaced via stderr — most likely
-    // cause is "no model configured on the supervisor session," in
-    // which case the supervisor is unusable for orchestration
-    // regardless and the operator needs to see why.
-    live.session
-        .prompt(text)
-        .then(() => {
-        logInbox("info", {
-            msg: "orchestration-wake-delivered",
-            supervisorId,
-            pending,
-            seq,
-        });
-    })
-        .catch((err) => {
-        logInbox("warn", {
-            msg: "orchestration-wake-failed",
-            supervisorId,
-            pending,
-            seq,
-            err: err instanceof Error ? err.message : String(err),
-        });
+    // hot path of an AgentSessionEvent subscriber) returns immediately.
+    // Errors are surfaced via stderr — most likely cause is "session was
+    // disposed between enqueue and wake" or no model configured when a
+    // triggering notification starts a turn.
+    sendCustomLifecycleMessage(live.session, {
+        customType: ORCHESTRATION_NOTIFY_TYPE,
+        content: text,
+        display: true,
+        details: {
+            source: "orchestration",
+            state: workerStateForInboxType(type),
+            eventType: type,
+            workerId,
+            inboxItemId: effectiveEvent.itemId,
+            pendingCount: pending,
+            data: effectiveEvent.data,
+        },
+    }, {
+        triggerTurn,
+        dedupe: { detailKey: "inboxItemId", detailValue: effectiveEvent.itemId },
+        onError: (err) => {
+            logInbox("warn", {
+                msg: "orchestration-wake-failed",
+                supervisorId,
+                workerId,
+                type,
+                pending,
+                seq,
+                triggerTurn,
+                err: err instanceof Error ? err.message : String(err),
+            });
+        },
+    });
+    logInbox("info", {
+        msg: "orchestration-wake-delivered",
+        supervisorId,
+        workerId,
+        type,
+        pending,
+        seq,
+        triggerTurn,
     });
     return true;
 }
 /**
  * Public entry point: a worker session emitted an interesting
- * event, route it to the right supervisor's inbox and try to
- * wake the supervisor.
+ * event, store it for UI history and notify the supervisor.
  *
  * Silently skips when the worker isn't linked to a supervisor —
  * happens transiently when a worker is being detached/disposed,
@@ -151,6 +195,7 @@ export async function bridgeWorkerEvent(workerId, type, data) {
         workerId,
         occurredAt: new Date().toISOString(),
         data,
+        delivered: true,
     });
     logInbox("info", {
         msg: "orchestration-inbox-enqueued",
@@ -159,39 +204,27 @@ export async function bridgeWorkerEvent(workerId, type, data) {
         type,
         itemId: item.id,
     });
-    // Best-effort wake-up. tryWake handles its own debounce + offline
-    // checks. We DON'T await — the worker event handler that called
-    // us shouldn't block on the supervisor's LLM round-trip.
-    void tryWakeSupervisor(supervisorId);
+    // Best-effort wake-up/status append. We DON'T await — the worker event
+    // handler that called us shouldn't block on the supervisor's LLM round-trip.
+    void tryWakeSupervisor(supervisorId, { type, workerId, itemId: item.id, data });
     return item;
 }
 /**
- * Called from session-registry when a supervisor's own session
- * emits `agent_end` — i.e., the supervisor just became idle.
- * Clears the per-idle-window dedupe flag and re-pushes if pending
- * items accumulated during the just-finished turn.
- *
- * This closes the "supervisor finished a turn without reading the
- * inbox" gap: if the supervisor's LLM ignored a prior wake-up (or
- * the wake-up arrived after the supervisor was already mid-turn),
- * this gives it one more nudge before going truly idle.
+ * Called from session-registry when a supervisor's own session emits
+ * `agent_end` — i.e., the supervisor just became idle. Compatibility
+ * recovery for any older undelivered history items.
  */
 export async function notifySupervisorIdle(supervisorId) {
-    pendingWakePush.delete(supervisorId);
     void tryWakeSupervisor(supervisorId);
 }
-/**
- * Called from session-registry when a supervisor session is
- * disposed. Drops the dedupe flag so a future re-resume of the
- * same id can wake again from scratch.
- */
+/** Called from session-registry when a supervisor session is disposed. */
 export function notifySupervisorDisposed(supervisorId) {
-    pendingWakePush.delete(supervisorId);
     wakeCounters.delete(supervisorId);
 }
 /**
- * Drain a supervisor's pending inbox items and mark them delivered.
- * The tool-side wrapper for `orchestrate_read_inbox`.
+ * Drain a supervisor's pending history items and mark them delivered.
+ * Retained for REST/UI history compatibility; no agent-facing inbox tool
+ * is registered.
  */
 export async function drainInbox(supervisorId) {
     return readPendingInbox(supervisorId, { markDelivered: true });

package/dist/server/orchestration/inbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/orchestration/inbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/orchestration/inbox.ts"],"names":[],"mappings":"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"}

package/dist/server/orchestration/init.js

@@ -2,7 +2,7 @@
  * Boot-time wiring of the orchestration event bridge to the
  * forge-native singleton event channels (ask-user-question, processes).
  *
- * Per-AgentSession events (agent_end, auto_retry_end) are dispatched
+ * Per-AgentSession events (agent_start, agent_end) are dispatched
  * from inside `session-registry.makeSubscribeHandler` — those need
  * the LiveSession context at construction time. session-registry
  * also calls `notifySupervisorIdle` on supervisor agent_end and

package/dist/server/orchestration/store.js

@@ -54,6 +54,18 @@ function isSupervisorRecord(v) {
         Array.isArray(r.workerIds) &&
         r.workerIds.every((id) => typeof id === "string"));
 }
+const WORKER_LIFECYCLE_STATES = new Set([
+    "idle",
+    "running",
+    "ended",
+    "errored",
+    "stopped",
+    "deleted",
+    "awaiting_question",
+]);
+function isWorkerLifecycleState(v) {
+    return typeof v === "string" && WORKER_LIFECYCLE_STATES.has(v);
+}
 function isWorkerRecord(v) {
     if (typeof v !== "object" || v === null)
         return false;
@@ -67,6 +79,18 @@ function isWorkerRecord(v) {
         if (sf.mode !== "fresh" && sf.mode !== "summary")
             return false;
     }
+    if (r.state !== undefined && !isWorkerLifecycleState(r.state))
+        return false;
+    if (r.turnOpen !== undefined && typeof r.turnOpen !== "boolean")
+        return false;
+    for (const key of ["lastStateAt", "lastAgentStartAt", "lastAgentEndAt"]) {
+        if (r[key] !== undefined && typeof r[key] !== "string")
+            return false;
+    }
+    for (const key of ["stopReason", "errorMessage"]) {
+        if (r[key] !== undefined && r[key] !== null && typeof r[key] !== "string")
+            return false;
+    }
     return true;
 }
 async function readStoreFile() {
@@ -175,9 +199,13 @@ export async function registerWorker(opts) {
             throw new OrchestrationError("depth_limit_exceeded", `Session ${opts.workerId} is already a supervisor; cannot also be a worker.`);
         }
         sup.workerIds.push(opts.workerId);
+        const now = new Date().toISOString();
         const wrec = {
             supervisorId: opts.supervisorId,
-            spawnedAt: new Date().toISOString(),
+            spawnedAt: now,
+            state: "idle",
+            turnOpen: false,
+            lastStateAt: now,
         };
         if (opts.spawnedFrom !== undefined)
             wrec.spawnedFrom = opts.spawnedFrom;
@@ -231,6 +259,17 @@ export async function getWorkerRecord(workerId) {
     const s = await readStoreFile();
     return s.workers[workerId];
 }
+export async function updateWorkerLifecycle(workerId, patch) {
+    return withStoreLock(async () => {
+        const s = await readStoreFile();
+        const rec = s.workers[workerId];
+        if (rec === undefined)
+            return undefined;
+        Object.assign(rec, patch);
+        await writeStoreFile(s);
+        return { ...rec };
+    });
+}
 // ---- orchestrator-inbox.json (queue) ----
 let inboxLock = Promise.resolve();
 function withInboxLock(fn) {
@@ -287,7 +326,8 @@ export async function enqueueInboxItem(supervisorId, item) {
     return withInboxLock(async () => {
         const s = await readInboxFile();
         const existing = s.inboxes[supervisorId] ?? [];
-        const full = { id: randomUUID(), delivered: false, ...item };
+        const { delivered = false, ...rest } = item;
+        const full = { id: randomUUID(), delivered, ...rest };
         existing.push(full);
         // FIFO trim from the front so the most recent N stay.
         const trimmed = existing.length > MAX_INBOX_ITEMS
@@ -337,8 +377,8 @@ export async function pendingInboxCount(supervisorId) {
     return items.filter((it) => !it.delivered).length;
 }
 /**
- * Drop a supervisor's inbox entirely. Called when supervisor mode
- * is disabled or the supervisor session is deleted.
+ * Drop a supervisor's worker-event history entirely. Called when
+ * supervisor mode is disabled or the supervisor session is deleted.
  */
 export async function clearInbox(supervisorId) {
     await withInboxLock(async () => {