opencode-courier 0.2.2 → 0.3.0

package/dist/watch.d.ts

@@ -1,70 +1,98 @@
-import type { Plugin } from "@opencode/plugin";
-import { type PermissionAsked, type PermissionReplied, type Waiting } from "./relay.js";
-import { type RosterStorage } from "./roster.js";
-type Context = Plugin.Context;
+import type { Hub, WatchPorts, WatchState } from "./hub.js";
+import { type ExecutionError } from "./notices.js";
+import { type FormCreated, type FormSettled, type PermissionAsked, type PermissionReplied } from "./relay.js";
+export type { FormsTold, WatchPorts, WatchState } from "./hub.js";
 /** How long to wait before subscribing again after the event stream ended or broke. */
 export declare const RESUBSCRIBE_MS = 5000;
-export interface WatchPorts {
-    readonly storage: RosterStorage;
-    readonly session: Pick<Context["session"], "synthetic">;
-    readonly event: Pick<Context["event"], "subscribe">;
-    /** This location's pending permission requests, relayed when the watcher (re)subscribes. */
-    readonly permission: Pick<Context["permission"], "list">;
-    readonly log: (message: string) => void;
-}
-/**
- * What every plugin instance in the process shares: OpenCode sets the plugin up once per project
- * location, all in one process, and each instance may see the same event, so an event id is
- * claimed synchronously and handled once. `waiting` holds the permission requests a session was
- * told about and has not answered; `answered`, requests answered before anyone was told, so a
- * notice whose roster lookup was overtaken by the answer is not sent.
- */
-export interface WatchState {
-    readonly seen: Set<string>;
-    readonly waiting: Waiting;
-    readonly answered: Set<string>;
-}
 /** The part of OpenCode's `session.execution.failed` event the notice is made from. */
 export interface ExecutionFailed {
     readonly id: string;
+    /** When OpenCode published it, in epoch milliseconds. */
+    readonly created?: number;
     readonly data: {
         readonly sessionID: string;
-        readonly error: {
-            readonly type: string;
-            readonly message: string;
-            readonly status?: number;
-        };
+        readonly error: ExecutionError;
+    };
+}
+/** OpenCode's events that concern one session's turns and inbox: `session.execution.succeeded` and the like. */
+export interface SessionEvent {
+    readonly id: string;
+    readonly created?: number;
+    readonly data: {
+        readonly sessionID: string;
+        readonly reason?: string;
     };
 }
-export declare function failureNotice(title: string, error: ExecutionFailed["data"]["error"]): string;
-/** Adds to a bounded set, dropping the oldest entry; false when the value was there already. */
-export declare function claim(set: Set<string>, value: string): boolean;
 /**
  * Tells the parent of a child whose turn failed, since a child that cannot reach its model cannot
  * call courier_send. Returns the parents told.
  */
 export declare function reportFailure(ports: WatchPorts, seen: Set<string>, event: ExecutionFailed): Promise<string[]>;
+/** OpenCode's `session.inbox.enqueued`: the item's type, which its `session.inbox.delivered` does not carry. */
+export interface InboxEnqueued {
+    readonly data: {
+        readonly sessionID: string;
+        readonly inboxID: string;
+        readonly item: {
+            readonly type: string;
+        };
+    };
+}
+/** Remembers the type of an item enqueued for a spawned session, for `notePrompt`; other sessions cost one read. */
+export declare function noteEnqueued(ports: WatchPorts, inbox: Map<string, string>, event: InboxEnqueued): Promise<boolean>;
+/**
+ * Notes that a message reached a spawned session, which then owes its parent a report, unless `inbox` knows it for one of
+ * `UNOWED` (`spawn` notes the task itself); reads the reverse index alone, and claims nothing: the note is the same twice.
+ */
+export declare function notePrompt(ports: WatchPorts, event: SessionEvent & {
+    readonly data: {
+        readonly inboxID?: string;
+    };
+}, inbox?: Map<string, string>): Promise<boolean>;
+/**
+ * Notes that a spawned session's turn was stopped, which takes it out of its group without a report; one
+ * stopped by a shutdown resumes on the next start.
+ */
+export declare function noteInterrupted(ports: WatchPorts, event: SessionEvent): Promise<boolean>;
+/**
+ * Drops the report state, and the groups, of a session OpenCode deleted, and the report state of the sessions it
+ * started, whose reports can no longer be delivered; it leaves its own group. Returns the sessions forgotten.
+ */
+export declare function noteDeleted(ports: WatchPorts, event: SessionEvent): Promise<string[]>;
+/**
+ * Tells the parent of a spawned session whose turn ended without reporting to it since its last
+ * prompt, unless it waits; finds the session by the reverse index alone. Returns the parents told.
+ */
+export declare function reportSilent(ports: WatchPorts, seen: Set<string>, event: SessionEvent): Promise<string[]>;
 /**
  * Tells the session at the top, the parent of a child or the session a chain of children started
  * from, what a waiting child asks and which answers there are, waking it. Returns the sessions told.
  */
 export declare function reportAsked(ports: WatchPorts, state: WatchState, event: PermissionAsked): Promise<string[]>;
 /**
- * Tells the session that was told about a request that it has been answered some other way, in the
- * child's own session or along with another answer, so it does not pass on a stale question.
- * Requests answered through courier_answer are no longer waiting and are skipped.
+ * Tells the session told about a request that it was answered some other way, so it does not pass on
+ * a stale question; requests answered through courier_answer no longer wait and are skipped.
  */
 export declare function reportReplied(ports: WatchPorts, state: WatchState, event: PermissionReplied): Promise<string[]>;
 /**
- * Relays the requests that spawned sessions in this location already wait on, which the event
- * stream does not repeat: those asked while it was down, before the watcher (re)subscribed.
+ * Tells the top session about a form OpenCode shows in a spawned session, such as web search asking
+ * for its provider, which only the person can answer; question forms are left to the question relay.
+ */
+export declare function reportForm(ports: WatchPorts, state: WatchState, event: FormCreated): Promise<string[]>;
+/** Tells the session told about a form that it was answered or withdrawn, so it does not send the person to a form that is gone. */
+export declare function reportFormSettled(ports: WatchPorts, state: WatchState, event: FormSettled): Promise<string[]>;
+/**
+ * Relays the requests that spawned sessions already wait on, in every loaded location, which the
+ * event stream does not repeat: those asked while it was down, before the watcher (re)subscribed.
  */
 export declare function relayPending(ports: WatchPorts, state: WatchState): Promise<void>;
 /**
- * Follows OpenCode's events until `signal` aborts, telling parents when a spawned child's turn
- * fails, when it waits for a permission and when that request is answered without them, and
- * noting for the question relay the question forms shown, which it waits for, and the locations
- * shutting down, whose withdrawn forms must not pass for dismissals.
+ * Follows OpenCode's events until `signal` aborts: tells parents of a spawned child's failed or silent
+ * turn, its pending permission or form, notes forms and shutdowns for the relay; ends after its current event.
  */
 export declare function watchChildren(ports: WatchPorts, state: WatchState, signal: AbortSignal, retryMs?: number): Promise<void>;
-export {};
+/**
+ * Makes the hub start its subscriptions to OpenCode's events with this copy's watcher, the one loaded
+ * last; `join` starts them. The second is a standby, connected before the first's member leaves.
+ */
+export declare function watchFromHub(hub: Pick<Hub, "subscribe">, state: WatchState, retryMs?: number): void;

package/dist/watch.js

@@ -1,28 +1,19 @@
-import { envelope } from "./courier.js";
-import { eventsFollowed, eventsLeft, formShown, formsMayHaveBeenMissed, locationClosing } from "./question.js";
-import { permissionNotice, settledNotice } from "./relay.js";
-import { allEntries, entriesOf, lineage } from "./roster.js";
+import { addBounded, setBounded } from "./bounded.js";
+import { lastReply } from "./courier.js";
+import { dropGroups, hasCompleteGroup, markLeft, membershipOf } from "./group.js";
+import { envelope, failureNotice, formNotice, formSettledNotice, kindOf, permissionNotice, permissionSettledNotice, silentNotice, } from "./notices.js";
+import { eventsFollowed, eventsLeft, formShown, formsMayHaveBeenMissed, locationClosing, pendingQuestions } from "./question/index.js";
+import { listEverywhere, QUESTION_FORM, } from "./relay.js";
+import { scheduledFor } from "./later.js";
+import { awaited, forgetReport, prompted, reportOf, settled, stoppedSincePrompt, told, untold } from "./report.js";
+import { allEntries, children, entriesOf, entryUnder, indexedEntry, indexedParent, lineage } from "./roster.js";
+import { subscriptions } from "./webhook.js";
 /** How long to wait before subscribing again after the event stream ended or broke. */
 export const RESUBSCRIBE_MS = 5_000;
 /** How many handled event ids, and waiting or answered requests, are remembered. */
 const SEEN_MAX = 1_000;
-export function failureNotice(title, error) {
-    const status = error.status === undefined ? "" : `, status ${error.status}`;
-    return [
-        `This session, "${title}", which you started with courier_spawn, failed: ${error.message} (${error.type}${status}).`,
-        "Its turn ended without finishing, so it will not report back on its own.",
-        "Message it with courier_send to have it try again, start a replacement, or carry on without it.",
-    ].join("\n");
-}
-/** Adds to a bounded set, dropping the oldest entry; false when the value was there already. */
-export function claim(set, value) {
-    if (set.has(value))
-        return false;
-    set.add(value);
-    if (set.size > SEEN_MAX)
-        set.delete(set.values().next().value);
-    return true;
-}
+/** Claims a value in one of the shared sets; false when it was claimed already. */
+const claim = (set, value) => addBounded(set, value, SEEN_MAX);
 /**
  * Tells the parent of a child whose turn failed, since a child that cannot reach its model cannot
  * call courier_send. Returns the parents told.
@@ -32,15 +23,174 @@ export async function reportFailure(ports, seen, event) {
         return [];
     const { sessionID, error } = event.data;
     const entries = await entriesOf(ports.storage, sessionID);
-    await Promise.all(entries.map((entry) => ports.session.synthetic({
-        sessionID: entry.parentID,
-        text: envelope(sessionID, failureNotice(entry.title, error), { failed: error.type }),
-        description: `Session ${sessionID} failed`,
-        metadata: { source: "courier", from: sessionID, failed: true },
-        delivery: "steer",
-    })));
+    const at = event.created ?? ports.now();
+    // Not in the way of the notice: kept only so the limits stop counting the child.
+    if (entries.length)
+        await settled(ports.storage, sessionID, "failed", at).catch((error) => ports.log(`courier watch: could not note the failed turn of ${sessionID}: ${String(error)}`));
+    const out = await Promise.all(entries.map((entry) => outIn(ports, entry)));
+    // Left before the notice, so the parent waits on the group meanwhile; nudged after it, so the group's
+    // message does not overtake the notice, short of an interval tick falling in between.
+    const completed = await Promise.all(out.map((member) => (member ? leave(ports, member, "failed", at) : Promise.resolve(false))));
+    // A session courier_stop stopped is not a failure to tell: its parent was told of the stop, or ordered it.
+    const quiet = entries.length > 0 && (await stoppedSincePrompt(ports.storage, sessionID).catch(() => false));
+    try {
+        if (quiet)
+            return [];
+        await Promise.all(entries.map((entry, index) => ports.session.synthetic({
+            sessionID: entry.parentID,
+            text: envelope(sessionID, failureNotice(entry.title, error, out[index]?.group), { failed: error.type }),
+            description: `Session ${sessionID} failed`,
+            metadata: { source: "courier", from: sessionID, failed: true },
+            delivery: "steer",
+        })));
+    }
+    finally {
+        if (completed.includes(true))
+            ports.nudge();
+    }
     return entries.map((entry) => entry.parentID);
 }
+/** A child's membership of an open group it is still out in: the group waits for it, and its end takes it out without a report. */
+async function outIn(ports, entry) {
+    if (!entry.group)
+        return undefined;
+    try {
+        const member = await membershipOf(ports.storage, entry.parentID, entry.group, entry.sessionID);
+        return member?.out ? member : undefined;
+    }
+    catch (error) {
+        ports.log(`courier watch: could not read ${entry.sessionID}'s place in group ${entry.group}: ${String(error)}`);
+        return undefined;
+    }
+}
+/** Takes a member out of its group without a report; true when that completes the group, for the caller to nudge the scheduler. */
+async function leave(ports, member, by, at) {
+    try {
+        return await markLeft(ports.storage, member, by, at);
+    }
+    catch (error) {
+        ports.log(`courier watch: could not take ${member.sessionID} out of group ${member.group}: ${String(error)}`);
+        return false;
+    }
+}
+/** Inbox items that are not courier's or the parent's business: the person's own prompts, compactions and moves. */
+const UNOWED = new Set(["user", "compaction", "move"]);
+/** Remembers the type of an item enqueued for a spawned session, for `notePrompt`; other sessions cost one read. */
+export async function noteEnqueued(ports, inbox, event) {
+    const { sessionID, inboxID, item } = event.data;
+    if ((await indexedParent(ports.storage, sessionID)) === undefined)
+        return false;
+    setBounded(inbox, inboxID, item.type, SEEN_MAX);
+    return true;
+}
+/**
+ * Notes that a message reached a spawned session, which then owes its parent a report, unless `inbox` knows it for one of
+ * `UNOWED` (`spawn` notes the task itself); reads the reverse index alone, and claims nothing: the note is the same twice.
+ */
+export async function notePrompt(ports, event, inbox) {
+    const { sessionID, inboxID } = event.data;
+    // Kept, not deleted: the hub's other subscription looks it up for the same delivery.
+    if (inboxID !== undefined && UNOWED.has(inbox?.get(inboxID) ?? ""))
+        return false;
+    if ((await indexedParent(ports.storage, sessionID)) === undefined)
+        return false;
+    await prompted(ports.storage, sessionID, event.created ?? ports.now());
+    return true;
+}
+/**
+ * Notes that a spawned session's turn was stopped, which takes it out of its group without a report; one
+ * stopped by a shutdown resumes on the next start.
+ */
+export async function noteInterrupted(ports, event) {
+    if (event.data.reason === "shutdown")
+        return false;
+    const { sessionID } = event.data;
+    const entry = await indexedEntry(ports.storage, sessionID);
+    if (entry === undefined)
+        return false;
+    const at = event.created ?? ports.now();
+    await settled(ports.storage, sessionID, "interrupted", at);
+    const member = await outIn(ports, entry);
+    if (member && (await leave(ports, member, "interrupted", at)))
+        ports.nudge();
+    return true;
+}
+/**
+ * Drops the report state, and the groups, of a session OpenCode deleted, and the report state of the sessions it
+ * started, whose reports can no longer be delivered; it leaves its own group. Returns the sessions forgotten.
+ */
+export async function noteDeleted(ports, event) {
+    const { sessionID } = event.data;
+    const [parentID, started] = await Promise.all([indexedParent(ports.storage, sessionID), children(ports.storage, sessionID)]);
+    const forgotten = [...(parentID === undefined ? [] : [sessionID]), ...started.map((child) => child.sessionID)];
+    const entry = parentID === undefined ? undefined : await entryUnder(ports.storage, parentID, sessionID);
+    const member = entry && (await outIn(ports, entry));
+    // Its groups go whether or not it has children on the roster: a held report outlives the member's entry.
+    const [completed] = await Promise.all([
+        member ? leave(ports, member, "deleted", event.created ?? ports.now()) : Promise.resolve(false),
+        ...forgotten.map((id) => forgetReport(ports.storage, id)),
+        dropGroups(ports.storage, sessionID),
+    ]);
+    if (completed)
+        ports.nudge();
+    return forgotten;
+}
+/**
+ * Whether a session prompted at `prompt` waits: on an untold report of a session it started, a complete group of
+ * its about to be delivered, a request of its own, a scheduled message, or a webhook it subscribed to since. Cheapest first.
+ */
+async function waits(ports, sessionID, prompt) {
+    const started = await children(ports.storage, sessionID);
+    if ((await Promise.all(started.map((entry) => awaited(ports.storage, entry.sessionID)))).includes(true))
+        return true;
+    if ((await listEverywhere([...ports.permissions()], sessionID)).some((found) => found.requests.length))
+        return true;
+    // A group with a member still out is waited on through that member, above; one whose every out member was told of is not.
+    if (started.some((entry) => entry.group) && (await hasCompleteGroup(ports.storage, sessionID)))
+        return true;
+    if ((await pendingQuestions(ports.storage, sessionID)).length)
+        return true;
+    const [scheduled, subscribed] = await Promise.all([scheduledFor(ports.storage, sessionID), subscriptions(ports)]);
+    // An older subscription is no wait: a prompt, most likely its delivery, has come since.
+    return scheduled.length > 0 || subscribed.some((subscription) => subscription.sessionID === sessionID && subscription.createdAt >= prompt);
+}
+/**
+ * Tells the parent of a spawned session whose turn ended without reporting to it since its last
+ * prompt, unless it waits; finds the session by the reverse index alone. Returns the parents told.
+ */
+export async function reportSilent(ports, seen, event) {
+    const { sessionID } = event.data;
+    const entry = await indexedEntry(ports.storage, sessionID);
+    // Claimed after the lookup, so other sessions' turns do not crowd `seen`, and before anything is told.
+    if (!entry || !claim(seen, event.id))
+        return [];
+    const report = await reportOf(ports.storage, sessionID);
+    if (!report?.owes || (await waits(ports, sessionID, report.prompt)))
+        return [];
+    if (await stoppedSincePrompt(ports.storage, sessionID).catch(() => false))
+        return [];
+    // The notice goes out without the reply rather than not at all.
+    const lastText = await ports.session.context({ sessionID }).then(lastReply, () => undefined);
+    const group = (await outIn(ports, entry))?.group;
+    // Before the notice, which may end the parent's turn at once: once told, it no longer waits for this one.
+    const toldAt = event.created ?? ports.now();
+    await told(ports.storage, sessionID, toldAt).catch((error) => ports.log(`courier watch: could not note that the parent of ${sessionID} was told: ${String(error)}`));
+    try {
+        await ports.session.synthetic({
+            sessionID: entry.parentID,
+            text: envelope(sessionID, silentNotice(entry.title, lastText, report.progressed, group), { ended: "without-report" }),
+            description: `Session ${sessionID} ended without a report`,
+            metadata: { source: "courier", from: sessionID, ended: "without-report" },
+            delivery: "steer",
+        });
+    }
+    catch (error) {
+        // Not told after all: the parent still waits for it.
+        await untold(ports.storage, sessionID, toldAt).catch(() => undefined);
+        throw error;
+    }
+    return [entry.parentID];
+}
 /** The session at the top of a lineage: where its permission requests go, since that is where the person is. */
 const topOf = (chain) => chain.at(-1).parentID;
 /**
@@ -70,9 +220,8 @@ export async function reportAsked(ports, state, event) {
     return [topOf(chain)];
 }
 /**
- * Tells the session that was told about a request that it has been answered some other way, in the
- * child's own session or along with another answer, so it does not pass on a stale question.
- * Requests answered through courier_answer are no longer waiting and are skipped.
+ * Tells the session told about a request that it was answered some other way, so it does not pass on
+ * a stale question; requests answered through courier_answer no longer wait and are skipped.
  */
 export async function reportReplied(ports, state, event) {
     if (!claim(state.seen, event.id))
@@ -87,7 +236,7 @@ export async function reportReplied(ports, state, event) {
         return [];
     await ports.session.synthetic({
         sessionID: topOf(chain),
-        text: envelope(sessionID, settledNotice(chain[0].title, requestID, reply), { answered: reply, request: requestID }),
+        text: envelope(sessionID, permissionSettledNotice(chain[0].title, requestID, reply), { answered: reply, request: requestID }),
         description: `Session ${sessionID} no longer asks for permission`,
         metadata: { source: "courier", from: sessionID, answered: reply, requestID },
         delivery: "steer",
@@ -95,15 +244,74 @@ export async function reportReplied(ports, state, event) {
     return [topOf(chain)];
 }
 /**
- * Relays the requests that spawned sessions in this location already wait on, which the event
- * stream does not repeat: those asked while it was down, before the watcher (re)subscribed.
+ * Tells the top session about a form OpenCode shows in a spawned session, such as web search asking
+ * for its provider, which only the person can answer; question forms are left to the question relay.
+ */
+export async function reportForm(ports, state, event) {
+    if (!claim(state.seen, event.id))
+        return [];
+    const form = event.data.form;
+    if (kindOf(form) === QUESTION_FORM)
+        return [];
+    const chain = await lineage(ports.storage, form.sessionID);
+    // As with a permission request, claimed after the lookup, so a form settled meanwhile is not told.
+    if (!chain.length || state.forms.settled.has(form.id) || state.forms.told.has(form.id))
+        return [];
+    const startedBy = chain.length > 1 ? chain[0].parentID : undefined;
+    const kind = kindOf(form);
+    const telling = ports.session.synthetic({
+        sessionID: topOf(chain),
+        text: envelope(form.sessionID, formNotice(chain[0].title, form, startedBy), {
+            asks: "form",
+            form: form.id,
+            ...(kind ? { kind } : {}),
+        }),
+        description: `Session ${form.sessionID} shows a form`,
+        metadata: { source: "courier", from: form.sessionID, asks: "form", formID: form.id, ...(kind ? { kind } : {}) },
+        delivery: "steer",
+    });
+    setBounded(state.forms.told, form.id, telling, SEEN_MAX);
+    await telling;
+    return [topOf(chain)];
+}
+/** Tells the session told about a form that it was answered or withdrawn, so it does not send the person to a form that is gone. */
+export async function reportFormSettled(ports, state, event) {
+    if (!claim(state.seen, event.id))
+        return [];
+    const { id, sessionID } = event.data;
+    const telling = state.forms.told.get(id);
+    if (!telling) {
+        claim(state.forms.settled, id);
+        return [];
+    }
+    state.forms.told.delete(id);
+    const settled = event.type === "form.replied" ? "answered" : "cancelled";
+    // After the notice that the form is shown, which another instance may still be sending, so the
+    // settling never arrives first; and not at all when that notice did not go out.
+    const [chain, told] = await Promise.all([lineage(ports.storage, sessionID), telling.then(() => true, () => false)]);
+    if (!chain.length || !told)
+        return [];
+    await ports.session.synthetic({
+        sessionID: topOf(chain),
+        text: envelope(sessionID, formSettledNotice(chain[0].title, id, settled), { settled, form: id }),
+        description: `Session ${sessionID} no longer shows a form`,
+        metadata: { source: "courier", from: sessionID, settled, formID: id },
+        delivery: "steer",
+    });
+    return [topOf(chain)];
+}
+/**
+ * Relays the requests that spawned sessions already wait on, in every loaded location, which the
+ * event stream does not repeat: those asked while it was down, before the watcher (re)subscribed.
  */
 export async function relayPending(ports, state) {
     const sessions = new Set((await allEntries(ports.storage)).map((entry) => entry.sessionID));
-    // Each request is claimed before its notice goes out, so relaying them all at once tells each once.
+    const domains = [...ports.permissions()];
+    // Each request is claimed before its notice goes out, so relaying them all at once tells each
+    // once, however many locations list it; a location that cannot be read lists none.
     const relay = async (sessionID) => {
-        const requests = await ports.permission.list({ sessionID }).catch(() => []);
-        await Promise.all(requests.map((request) => reportAsked(ports, state, { id: `pending:${request.id}`, data: request })));
+        const listed = (await listEverywhere(domains, sessionID)).flatMap((found) => found.requests);
+        await Promise.all(listed.map((request) => reportAsked(ports, state, { id: `pending:${request.id}`, data: request })));
     };
     await Promise.all([...sessions].map(relay));
 }
@@ -116,53 +324,126 @@ const pause = (ms, signal) => new Promise((resolve) => {
     }
     signal.addEventListener("abort", done);
 });
+const TURN_ENDS = new Set(["session.execution.succeeded", "session.execution.failed", "session.execution.interrupted"]);
+/** A session's turn ended, sealing its groups: one that is complete has the scheduler deliver it now. */
+async function sealGroups(ports, event) {
+    if (event.data.reason === "shutdown")
+        return;
+    try {
+        if (await hasCompleteGroup(ports.storage, event.data.sessionID))
+            ports.nudge();
+    }
+    catch (error) {
+        ports.log(`courier watch: could not read the groups of ${event.data.sessionID}: ${String(error)}`);
+    }
+}
 /**
  * Handles one event of OpenCode's stream; those that cannot concern a spawned child, or a question
  * relayed for one, are ignored.
  */
 async function handle(ports, state, event) {
+    try {
+        return await route(ports, state, event);
+    }
+    finally {
+        // After: a silent end is judged while the group the nudge may deliver is still there to wait on.
+        if (TURN_ENDS.has(event.type))
+            await sealGroups(ports, event);
+    }
+}
+async function route(ports, state, event) {
     if (event.type === "session.execution.failed")
         return reportFailure(ports, state.seen, event);
+    if (event.type === "session.execution.succeeded")
+        return reportSilent(ports, state.seen, event);
+    if (event.type === "session.execution.interrupted")
+        return noteInterrupted(ports, event);
+    if (event.type === "session.inbox.enqueued")
+        return noteEnqueued(ports, state.inbox, event);
+    if (event.type === "session.inbox.delivered")
+        return notePrompt(ports, event, state.inbox);
+    if (event.type === "session.deleted")
+        return noteDeleted(ports, event);
     if (event.type === "permission.asked")
         return reportAsked(ports, state, event);
     if (event.type === "permission.replied")
         return reportReplied(ports, state, event);
-    // Not claimed: every instance may resolve the same waiting call, which is harmless.
-    if (event.type === "form.created")
+    if (event.type === "form.created") {
+        // Not claimed: the hub's other subscription, or another copy's watcher, may resolve the same
+        // waiting call, which is harmless.
         formShown(event);
+        return reportForm(ports, state, event);
+    }
+    if (event.type === "form.replied" || event.type === "form.cancelled")
+        return reportFormSettled(ports, state, event);
     // Not claimed either: a location closing withdraws its forms, which must not pass for dismissals.
     // The event's location is optional; without one, the shutdown counts for every location.
     if (event.type === "location.shutdown") {
         const directory = event.location?.directory;
-        locationClosing(typeof directory === "string" ? directory : undefined);
+        locationClosing(ports.now(), typeof directory === "string" ? directory : undefined);
     }
     return [];
 }
+const ENDED = { done: true, value: undefined };
 /**
- * Follows OpenCode's events until `signal` aborts, telling parents when a spawned child's turn
- * fails, when it waits for a permission and when that request is answered without them, and
- * noting for the question relay the question forms shown, which it waits for, and the locations
- * shutting down, whose withdrawn forms must not pass for dismissals.
+ * `events` until it ends or `signal` aborts, the stream left open; each wait hears the abort only while
+ * it waits, so a watcher that follows events for the life of the process holds nothing per event.
+ */
+const until = (events, signal) => ({
+    [Symbol.asyncIterator]: () => ({
+        next: () => new Promise((resolve, reject) => {
+            if (signal.aborted)
+                return resolve(ENDED);
+            const stop = () => resolve(ENDED);
+            signal.addEventListener("abort", stop, { once: true });
+            // Once the signal has aborted, whatever the stream ends this wait with is not wanted.
+            events.next().then((next) => {
+                signal.removeEventListener("abort", stop);
+                resolve(next);
+            }, (error) => {
+                signal.removeEventListener("abort", stop);
+                reject(error);
+            });
+        }),
+    }),
+});
+/** Relays the requests already pending, kept in `relaying` until done, for the watcher's end to wait for. */
+function relayAlongside(ports, state, relaying) {
+    const relayed = relayPending(ports, state)
+        .catch((error) => ports.log(`courier watch: could not relay pending requests: ${String(error)}`))
+        .finally(() => relaying.delete(relayed));
+    relaying.add(relayed);
+}
+/** Handles one event, logging a failure rather than ending the watch. */
+function handleLogged(ports, state, event) {
+    return handle(ports, state, event).catch((error) => {
+        const data = event.data;
+        const sessionID = data?.sessionID ?? data?.form?.sessionID;
+        ports.log(`courier watch: could not handle ${event.type} of ${sessionID}: ${String(error)}`);
+    });
+}
+/**
+ * Follows OpenCode's events until `signal` aborts: tells parents of a spawned child's failed or silent
+ * turn, its pending permission or form, notes forms and shutdowns for the relay; ends after its current event.
  */
 export async function watchChildren(ports, state, signal, retryMs = RESUBSCRIBE_MS) {
+    const relaying = new Set();
     while (!signal.aborted) {
         let following = false;
+        let events;
         try {
-            const events = ports.event.subscribe({ signal });
+            events = ports.event.subscribe({ signal })[Symbol.asyncIterator]();
             // Question forms shown while no instance followed the events were not seen: released now,
             // and again on the first event, by when the stream is surely connected.
             let missed = eventsFollowed();
             following = true;
             // Alongside the new subscription; a request both relays see is relayed once.
-            void relayPending(ports, state).catch((error) => ports.log(`courier watch: could not relay pending requests: ${String(error)}`));
-            for await (const event of events) {
+            relayAlongside(ports, state, relaying);
+            for await (const event of until(events, signal)) {
                 if (missed)
                     formsMayHaveBeenMissed();
                 missed = false;
-                await handle(ports, state, event).catch((error) => {
-                    const sessionID = event.data?.sessionID;
-                    ports.log(`courier watch: could not handle ${event.type} of ${sessionID}: ${String(error)}`);
-                });
+                await handleLogged(ports, state, event);
             }
         }
         catch (error) {
@@ -172,8 +453,22 @@ export async function watchChildren(ports, state, signal, retryMs = RESUBSCRIBE_
         finally {
             if (following)
                 eventsLeft();
+            // Closed without waiting: closing the adapter's stream waits on OpenCode, which may not answer
+            // while a location closes, and the leave waiting for this watcher must not wait for that too.
+            void events?.return?.().catch(() => { });
         }
         if (!signal.aborted)
             await pause(retryMs, signal);
     }
+    await Promise.allSettled(relaying);
+}
+/**
+ * Makes the hub start its subscriptions to OpenCode's events with this copy's watcher, the one loaded
+ * last; `join` starts them. The second is a standby, connected before the first's member leaves.
+ */
+export function watchFromHub(hub, state, retryMs = RESUBSCRIBE_MS) {
+    hub.subscribe = (member) => {
+        const stop = new AbortController();
+        return { member, stop, done: watchChildren(member.watch, state, stop.signal, retryMs) };
+    };
 }