opencode-courier 0.4.1 → 0.6.0

package/dist/tree/panel.js

@@ -1,8 +1,8 @@
 import { busy } from "./domain.js";
-import { lastStatus, reportOf } from "./report.js";
+import { lastStatus, stoppedSincePrompt } from "./report.js";
 import { standingIn } from "./status.js";
 import { childStore } from "./store.js";
-import { subtree } from "./subtree.js";
+import { readTree } from "./subtree.js";
 /** The last tool call in a session's messages, and when it was made. */
 export function lastTool(messages) {
     for (const message of messages.toReversed()) {
@@ -18,6 +18,8 @@ export function lastTool(messages) {
 export const waitOf = (pending) => pending.type === "permission"
     ? { type: "permission", action: pending.action, resources: [...pending.resources] }
     : { type: "question", question: pending.questions[0]?.question ?? "" };
+/** A form a session shows, as the panel says what it waits on. */
+export const formWait = (form) => ({ type: "form", title: form.title });
 /** A session's report since its last prompt, as the panel shows it; none for one spawned before this was kept. */
 function reportRow(report, status) {
     if (!report)
@@ -28,7 +30,7 @@ function reportRow(report, status) {
         return { report: { state: "ended", progressed: report.progressed } };
     return { report: { state: "reported", progressed: report.progressed, ...(status ? { status } : {}) } };
 }
-/** What a session does: waiting on a request to the person, running, idle, or gone when OpenCode no longer knows it. */
+/** What a session does: waiting on a request to the person or a form it shows them, running, idle, or gone when OpenCode no longer knows it. */
 function stateOf(info, waits, running) {
     if (!info)
         return "gone";
@@ -37,16 +39,13 @@ function stateOf(info, waits, running) {
     return running ? "running" : "idle";
 }
 /** One session of the panel: what it is doing, its report and group standing, its last tool call and its cost. */
-async function row(ports, entry, depth) {
+async function row(ports, { entry, depth, info, pending, forms, report }) {
     const { sessionID } = entry;
-    const children = childStore(ports.storage);
-    const [info, messages, pending, report, status, standing] = await Promise.all([
-        ports.session.get({ sessionID }).catch(() => undefined),
+    const [messages, status, standing, stopped] = await Promise.all([
         ports.session.context({ sessionID }).catch(() => []),
-        ports.pending(sessionID).catch(() => []),
-        reportOf(children, sessionID).catch(() => undefined),
-        lastStatus(children, sessionID).catch(() => undefined),
+        lastStatus(childStore(ports.storage), sessionID).catch(() => undefined),
         entry.group ? standingIn(ports, entry, entry.group) : undefined,
+        stoppedSincePrompt(childStore(ports.storage), sessionID).catch(() => false),
     ]);
     const running = info !== undefined && busy(info.time);
     const tool = lastTool(messages);
@@ -55,8 +54,9 @@ async function row(ports, entry, depth) {
         parentID: entry.parentID,
         title: info?.title ?? entry.title,
         depth,
-        state: stateOf(info, pending.length, running),
+        state: stateOf(info, pending.length + forms.length, running),
         ...(info?.outcome ? { outcome: info.outcome } : {}),
+        ...(stopped ? { stopped } : {}),
         ...reportRow(report, status),
         ...(entry.group && standing ? { group: { name: entry.group, standing } } : {}),
         isolated: entry.isolated,
@@ -64,12 +64,15 @@ async function row(ports, entry, depth) {
         ...(info && !running && info.time.idle !== undefined ? { idle: info.time.idle } : {}),
         ...(info ? { cost: info.cost } : {}),
         ...(tool ? { tool } : {}),
-        waits: pending.map(waitOf),
+        waits: [...pending.map(waitOf), ...forms.map(formWait)],
     };
 }
-/** The tree panel's rows: the sessions courier_tree reads under a session, at most `maxTotal`, each as `row` reads it. */
+/**
+ * The tree panel's rows: the sessions under a session as courier_tree lists them, at most `maxTotal`, the live ones
+ * first, then the newest, each as `row` reads it; `truncated` counts the older ones left out.
+ */
 export async function panel(ports, rootID) {
-    const { nodes, truncated } = await subtree(ports.storage, rootID, ports.limits.maxTotal);
-    const rows = await Promise.all(nodes.map(({ entry, depth }) => row(ports, entry, depth)));
-    return { rows, ...(truncated ? { truncated: ports.limits.maxTotal } : {}) };
+    const { kept, leftOut } = await readTree(ports, rootID);
+    const rows = await Promise.all(kept.map((node) => row(ports, node)));
+    return { rows, ...(leftOut ? { truncated: leftOut } : {}) };
 }

package/dist/tree/ports.d.ts

@@ -133,6 +133,8 @@ export interface CourierPorts {
     readonly now: () => number;
     /** The permission requests and questions a session waits on, wherever they are pending. */
     readonly pending: (sessionID: string) => Promise<ReadonlyArray<Pending>>;
+    /** The forms a session shows, which only the person can answer: web search's, a plugin's; not the question tool's. */
+    readonly forms: (sessionID: string) => Promise<ReadonlyArray<ShownForm>>;
     readonly limits: Limits;
     /** The `nativeChildren` option: a child started without isolate is created with OpenCode's own `parentID`. */
     readonly nativeChildren?: boolean;
@@ -143,6 +145,11 @@ export interface CourierPorts {
     readonly nudge: () => void;
     readonly log: (message: string) => void;
 }
+/** A form a session shows, as `CourierPorts.forms` lists it; `person/` keeps them. */
+export interface ShownForm {
+    readonly id: string;
+    readonly title: string;
+}
 /** One question a session waits on, as `Pending` shows it; `person/`'s `Prompt` has these fields. */
 export interface PendingPrompt {
     readonly question: string;

package/dist/tree/roster.d.ts

@@ -18,6 +18,11 @@ export declare function lineage(storage: RosterStorage, sessionID: string): Prom
 export declare function answeringTop(storage: RosterStorage, sessionID: string, callerID: string, what: string): Promise<string>;
 /** Whether a directory still exists; tests pass a fake. */
 export type Exists = (directory: string) => boolean;
+/**
+ * Whether an entry is past retention at `now`: recorded more than `RETENTION_MS` before, unless it is an isolated
+ * child whose worktree exists, which is kept so it can still be cleaned up.
+ */
+export declare const isExpired: (entry: RosterEntry, now: number, exists?: Exists) => boolean;
 /** A parent's children, oldest first, after dropping the expired ones. */
 export declare function current(storage: RosterStorage, parentID: string, now: number, exists?: Exists): Promise<RosterEntry[]>;
 /**

package/dist/tree/roster.js

@@ -31,11 +31,13 @@ export async function answeringTop(storage, sessionID, callerID, what) {
     return top;
 }
 /**
- * Forgets the given entries that were recorded more than `RETENTION_MS` before `now`, and returns
- * the rest. An isolated child is kept while its worktree exists, so it can still be cleaned up.
+ * Whether an entry is past retention at `now`: recorded more than `RETENTION_MS` before, unless it is an isolated
+ * child whose worktree exists, which is kept so it can still be cleaned up.
  */
+export const isExpired = (entry, now, exists = existsSync) => now - entry.createdAt > RETENTION_MS && !(entry.isolated && exists(entry.directory));
+/** Forgets the given entries that are expired at `now`, and returns the rest. */
 async function dropExpired(storage, entries, now, exists) {
-    const expired = new Set(entries.filter((entry) => now - entry.createdAt > RETENTION_MS && !(entry.isolated && exists(entry.directory))));
+    const expired = new Set(entries.filter((entry) => isExpired(entry, now, exists)));
     await Promise.all([...expired].map((entry) => forgetChild(storage, entry.parentID, entry.sessionID, entry.group)));
     return entries.filter((entry) => !expired.has(entry));
 }

package/dist/tree/rpc-handlers.d.ts

@@ -14,24 +14,22 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
             }>;
             readonly output: import("effect/StandardSchema").StandardSchemaV1<{
                 readonly running: number;
+                readonly waiting: number;
                 readonly idle: number;
                 readonly groups: readonly {
                     readonly name: string;
                     readonly reported: number;
                     readonly members: number;
                 }[];
-                readonly waiting: number;
-                readonly truncated?: number | undefined;
             }, {
                 readonly running: number;
+                readonly waiting: number;
                 readonly idle: number;
                 readonly groups: readonly {
                     readonly name: string;
                     readonly reported: number;
                     readonly members: number;
                 }[];
-                readonly waiting: number;
-                readonly truncated?: number | undefined;
             }> & import("effect/Schema").Struct<{
                 readonly running: import("effect/Schema").Int;
                 readonly waiting: import("effect/Schema").Int;
@@ -41,7 +39,6 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                     readonly reported: import("effect/Schema").Int;
                     readonly members: import("effect/Schema").Int;
                 }>>;
-                readonly truncated: import("effect/Schema").optionalKey<import("effect/Schema").Int>;
             }>;
         };
         readonly tree: {
@@ -68,11 +65,15 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                     } | {
                         readonly type: "question";
                         readonly question: string;
+                    } | {
+                        readonly type: "form";
+                        readonly title: string;
                     })[];
                     readonly group?: {
                         readonly name: string;
                         readonly standing: string;
                     } | undefined;
+                    readonly stopped?: boolean | undefined;
                     readonly idle?: number | undefined;
                     readonly report?: {
                         readonly progressed: boolean;
@@ -103,11 +104,15 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                     } | {
                         readonly type: "question";
                         readonly question: string;
+                    } | {
+                        readonly type: "form";
+                        readonly title: string;
                     })[];
                     readonly group?: {
                         readonly name: string;
                         readonly standing: string;
                     } | undefined;
+                    readonly stopped?: boolean | undefined;
                     readonly idle?: number | undefined;
                     readonly report?: {
                         readonly progressed: boolean;
@@ -130,6 +135,7 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                     readonly depth: import("effect/Schema").Int;
                     readonly state: import("effect/Schema").Literals<readonly ["running", "waiting", "idle", "gone"]>;
                     readonly outcome: import("effect/Schema").optionalKey<import("effect/Schema").Literals<readonly ["succeeded", "failed", "interrupted"]>>;
+                    readonly stopped: import("effect/Schema").optionalKey<import("effect/Schema").Boolean>;
                     readonly report: import("effect/Schema").optionalKey<import("effect/Schema").Struct<{
                         readonly state: import("effect/Schema").Literals<readonly ["owed", "reported", "ended"]>;
                         readonly status: import("effect/Schema").optionalKey<import("effect/Schema").String>;
@@ -154,6 +160,9 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                     }>, import("effect/Schema").Struct<{
                         readonly type: import("effect/Schema").Literal<"question">;
                         readonly question: import("effect/Schema").String;
+                    }>, import("effect/Schema").Struct<{
+                        readonly type: import("effect/Schema").Literal<"form">;
+                        readonly title: import("effect/Schema").String;
                     }>]>>;
                 }>>;
                 readonly truncated: import("effect/Schema").optionalKey<import("effect/Schema").Int>;
@@ -196,6 +205,37 @@ export declare function registerTreeRpc(rpc: Pick<Plugin.Context["rpc"], "regist
                 readonly refused: import("effect/StandardSchema").StandardSchemaV1<{}, {}> & import("effect/Schema").Struct<{}>;
             };
         };
+        readonly cleanup: {
+            readonly input: import("effect/StandardSchema").StandardSchemaV1<{
+                readonly sessionID: string;
+                readonly by: string;
+            }, {
+                readonly sessionID: string;
+                readonly by: string;
+            }> & import("effect/Schema").Struct<{
+                readonly sessionID: import("effect/Schema").String;
+                readonly by: import("effect/Schema").String;
+            }>;
+            readonly output: import("effect/StandardSchema").StandardSchemaV1<{
+                readonly outcome: "removed" | "gone" | "forgotten";
+            } | {
+                readonly outcome: "kept";
+                readonly reason: string;
+            }, {
+                readonly outcome: "removed" | "gone" | "forgotten";
+            } | {
+                readonly outcome: "kept";
+                readonly reason: string;
+            }> & import("effect/Schema").Union<readonly [import("effect/Schema").Struct<{
+                readonly outcome: import("effect/Schema").Literals<readonly ["forgotten", "removed", "gone"]>;
+            }>, import("effect/Schema").Struct<{
+                readonly outcome: import("effect/Schema").Literal<"kept">;
+                readonly reason: import("effect/Schema").String;
+            }>]>;
+            readonly errors: {
+                readonly refused: import("effect/StandardSchema").StandardSchemaV1<{}, {}> & import("effect/Schema").Struct<{}>;
+            };
+        };
     };
     readonly events: {};
 }>>;

package/dist/tree/rpc-handlers.js

@@ -1,9 +1,14 @@
+import { describeFailure } from "../kernel/protocol.js";
+import { isNotFound } from "../platform/json.js";
+import { cleanup } from "./cleanup.js";
 import { panel } from "./panel.js";
 import { treeRpc } from "./rpc.js";
 import { stop } from "./stop.js";
+import { childStore } from "./store.js";
 import { summary } from "./summary.js";
 /** Serves the tree's RPC at the plugin's location, through the same use cases as the tools; disposed with the plugin. */
 export function registerTreeRpc(rpc, ports) {
+    const refused = (cause) => (cause instanceof Error ? cause.message : String(cause));
     return rpc.register(treeRpc, {
         summary: ({ sessionID }) => summary(ports.courier, sessionID),
         tree: ({ sessionID }) => panel(ports.courier, sessionID),
@@ -13,8 +18,32 @@ export function registerTreeRpc(rpc, ports) {
                 return { stopped: stopped.map(({ sessionID, title, outcome }) => ({ sessionID, title, outcome })), cancelled: cancelled.length };
             }
             catch (cause) {
-                return error("refused", cause instanceof Error ? cause.message : String(cause), {});
+                return error("refused", refused(cause), {});
+            }
+        },
+        cleanup: async ({ sessionID, by }, { error }) => {
+            try {
+                return await forget(ports, by, sessionID);
+            }
+            catch (cause) {
+                return error("refused", refused(cause), {});
             }
         },
     });
 }
+/**
+ * Forgets a session OpenCode no longer knows as courier_cleanup called from its own parent, once `by` is found above it,
+ * as courier_stop checks. A session OpenCode still has, or cannot say it lost, is refused: forgetting it loses its report.
+ */
+async function forget(ports, by, sessionID) {
+    const chain = await childStore(ports.courier.storage).lineage(sessionID);
+    if (!chain.length)
+        throw new Error(`${sessionID} was not started with courier_spawn, so there is nothing to forget.`);
+    if (!chain.some((entry) => entry.parentID === by))
+        throw new Error(`${by} is not above ${sessionID}: only a session above it, in the line of sessions that started it with courier_spawn, can forget it.`);
+    const known = await ports.courier.session.get({ sessionID }).then(() => `${sessionID} is still known to OpenCode: only a gone session is forgotten here.`, (error) => (isNotFound(error) ? undefined : describeFailure("session.get", error).message));
+    if (known)
+        throw new Error(known);
+    const result = await cleanup(ports.cleanup, chain[0].parentID, { sessionID });
+    return result.outcome === "kept" ? { outcome: "kept", reason: result.reason } : { outcome: result.outcome };
+}

package/dist/tree/rpc.d.ts

@@ -1,9 +1,9 @@
 import { Schema } from "effect";
 /** The sessions started under a session, as the prompt footer's status entry shows them. */
 declare const Summary: Schema.Struct<{
-    /** Running, and waiting on no request. */
+    /** Running, and waiting on no request or form. */
     readonly running: Schema.Int;
-    /** Waiting on a permission request or a question, which go to the person. */
+    /** Waiting on a permission request, a question or a form it shows, which go to the person. */
     readonly waiting: Schema.Int;
     /** Not running: done, or waiting for a message. */
     readonly idle: Schema.Int;
@@ -12,11 +12,9 @@ declare const Summary: Schema.Struct<{
         readonly reported: Schema.Int;
         readonly members: Schema.Int;
     }>>;
-    /** Set when the subtree had more sessions than `maxTotal`, which were not counted. */
-    readonly truncated: Schema.optionalKey<Schema.Int>;
 }>;
 export type Summary = typeof Summary.Type;
-/** A request a session waits on until the person answers it: a permission request, or its first question. */
+/** A request a session waits on until the person answers it: a permission request, its first question, or a form it shows. */
 declare const Wait: Schema.Union<readonly [Schema.Struct<{
     readonly type: Schema.Literal<"permission">;
     readonly action: Schema.String;
@@ -24,6 +22,9 @@ declare const Wait: Schema.Union<readonly [Schema.Struct<{
 }>, Schema.Struct<{
     readonly type: Schema.Literal<"question">;
     readonly question: Schema.String;
+}>, Schema.Struct<{
+    readonly type: Schema.Literal<"form">;
+    readonly title: Schema.String;
 }>]>;
 /** One session of the tree panel: what courier_tree shows of it, and what it is doing, in epoch milliseconds. */
 declare const Row: Schema.Struct<{
@@ -32,10 +33,12 @@ declare const Row: Schema.Struct<{
     readonly title: Schema.String;
     /** A child of the panel's session is at depth 1. */
     readonly depth: Schema.Int;
-    /** `waiting` on a request to the person; `gone` when OpenCode no longer knows it. */
+    /** `waiting` on a request to the person or a form it shows them; `gone` when OpenCode no longer knows it. */
     readonly state: Schema.Literals<readonly ["running", "waiting", "idle", "gone"]>;
     /** How its last turn ended. */
     readonly outcome: Schema.optionalKey<Schema.Literals<readonly ["succeeded", "failed", "interrupted"]>>;
+    /** Set when courier_stop stopped it since its last prompt. */
+    readonly stopped: Schema.optionalKey<Schema.Boolean>;
     /** Its report since its last prompt: still owed, arrived (held with its group or delivered), or its turn ended without one. */
     readonly report: Schema.optionalKey<Schema.Struct<{
         readonly state: Schema.Literals<readonly ["owed", "reported", "ended"]>;
@@ -65,9 +68,12 @@ declare const Row: Schema.Struct<{
     }>, Schema.Struct<{
         readonly type: Schema.Literal<"question">;
         readonly question: Schema.String;
+    }>, Schema.Struct<{
+        readonly type: Schema.Literal<"form">;
+        readonly title: Schema.String;
     }>]>>;
 }>;
-/** The sessions under a session, as courier_tree reads them, in the order a tree is drawn. */
+/** The sessions under a session, as courier_tree lists them, in the order a tree is drawn. */
 declare const Tree: Schema.Struct<{
     readonly rows: Schema.$Array<Schema.Struct<{
         readonly sessionID: Schema.String;
@@ -75,10 +81,12 @@ declare const Tree: Schema.Struct<{
         readonly title: Schema.String;
         /** A child of the panel's session is at depth 1. */
         readonly depth: Schema.Int;
-        /** `waiting` on a request to the person; `gone` when OpenCode no longer knows it. */
+        /** `waiting` on a request to the person or a form it shows them; `gone` when OpenCode no longer knows it. */
         readonly state: Schema.Literals<readonly ["running", "waiting", "idle", "gone"]>;
         /** How its last turn ended. */
         readonly outcome: Schema.optionalKey<Schema.Literals<readonly ["succeeded", "failed", "interrupted"]>>;
+        /** Set when courier_stop stopped it since its last prompt. */
+        readonly stopped: Schema.optionalKey<Schema.Boolean>;
         /** Its report since its last prompt: still owed, arrived (held with its group or delivered), or its turn ended without one. */
         readonly report: Schema.optionalKey<Schema.Struct<{
             readonly state: Schema.Literals<readonly ["owed", "reported", "ended"]>;
@@ -108,9 +116,12 @@ declare const Tree: Schema.Struct<{
         }>, Schema.Struct<{
             readonly type: Schema.Literal<"question">;
             readonly question: Schema.String;
+        }>, Schema.Struct<{
+            readonly type: Schema.Literal<"form">;
+            readonly title: Schema.String;
         }>]>>;
     }>>;
-    /** Set when the subtree had more sessions than `maxTotal`, which were left out. */
+    /** How many older sessions the listing left out, when it had more than `maxTotal`: the live ones come first, then the newest. */
     readonly truncated: Schema.optionalKey<Schema.Int>;
 }>;
 export type Row = typeof Row.Type;
@@ -127,6 +138,14 @@ declare const Stopped: Schema.Struct<{
     readonly cancelled: Schema.Int;
 }>;
 export type Stopped = typeof Stopped.Type;
+/** What courier_cleanup did: forgot it, removed its worktree, found that already gone, or kept the worktree, saying why. */
+declare const Forgotten: Schema.Union<readonly [Schema.Struct<{
+    readonly outcome: Schema.Literals<readonly ["forgotten", "removed", "gone"]>;
+}>, Schema.Struct<{
+    readonly outcome: Schema.Literal<"kept">;
+    readonly reason: Schema.String;
+}>]>;
+export type Forgotten = typeof Forgotten.Type;
 export declare const treeRpc: {
     readonly id: "courier";
     readonly methods: {
@@ -140,28 +159,26 @@ export declare const treeRpc: {
             }>;
             readonly output: import("effect/StandardSchema").StandardSchemaV1<{
                 readonly running: number;
+                readonly waiting: number;
                 readonly idle: number;
                 readonly groups: readonly {
                     readonly name: string;
                     readonly reported: number;
                     readonly members: number;
                 }[];
-                readonly waiting: number;
-                readonly truncated?: number | undefined;
             }, {
                 readonly running: number;
+                readonly waiting: number;
                 readonly idle: number;
                 readonly groups: readonly {
                     readonly name: string;
                     readonly reported: number;
                     readonly members: number;
                 }[];
-                readonly waiting: number;
-                readonly truncated?: number | undefined;
             }> & Schema.Struct<{
-                /** Running, and waiting on no request. */
+                /** Running, and waiting on no request or form. */
                 readonly running: Schema.Int;
-                /** Waiting on a permission request or a question, which go to the person. */
+                /** Waiting on a permission request, a question or a form it shows, which go to the person. */
                 readonly waiting: Schema.Int;
                 /** Not running: done, or waiting for a message. */
                 readonly idle: Schema.Int;
@@ -170,8 +187,6 @@ export declare const treeRpc: {
                     readonly reported: Schema.Int;
                     readonly members: Schema.Int;
                 }>>;
-                /** Set when the subtree had more sessions than `maxTotal`, which were not counted. */
-                readonly truncated: Schema.optionalKey<Schema.Int>;
             }>;
         };
         readonly tree: {
@@ -198,11 +213,15 @@ export declare const treeRpc: {
                     } | {
                         readonly type: "question";
                         readonly question: string;
+                    } | {
+                        readonly type: "form";
+                        readonly title: string;
                     })[];
                     readonly group?: {
                         readonly name: string;
                         readonly standing: string;
                     } | undefined;
+                    readonly stopped?: boolean | undefined;
                     readonly idle?: number | undefined;
                     readonly report?: {
                         readonly progressed: boolean;
@@ -233,11 +252,15 @@ export declare const treeRpc: {
                     } | {
                         readonly type: "question";
                         readonly question: string;
+                    } | {
+                        readonly type: "form";
+                        readonly title: string;
                     })[];
                     readonly group?: {
                         readonly name: string;
                         readonly standing: string;
                     } | undefined;
+                    readonly stopped?: boolean | undefined;
                     readonly idle?: number | undefined;
                     readonly report?: {
                         readonly progressed: boolean;
@@ -259,10 +282,12 @@ export declare const treeRpc: {
                     readonly title: Schema.String;
                     /** A child of the panel's session is at depth 1. */
                     readonly depth: Schema.Int;
-                    /** `waiting` on a request to the person; `gone` when OpenCode no longer knows it. */
+                    /** `waiting` on a request to the person or a form it shows them; `gone` when OpenCode no longer knows it. */
                     readonly state: Schema.Literals<readonly ["running", "waiting", "idle", "gone"]>;
                     /** How its last turn ended. */
                     readonly outcome: Schema.optionalKey<Schema.Literals<readonly ["succeeded", "failed", "interrupted"]>>;
+                    /** Set when courier_stop stopped it since its last prompt. */
+                    readonly stopped: Schema.optionalKey<Schema.Boolean>;
                     /** Its report since its last prompt: still owed, arrived (held with its group or delivered), or its turn ended without one. */
                     readonly report: Schema.optionalKey<Schema.Struct<{
                         readonly state: Schema.Literals<readonly ["owed", "reported", "ended"]>;
@@ -292,9 +317,12 @@ export declare const treeRpc: {
                     }>, Schema.Struct<{
                         readonly type: Schema.Literal<"question">;
                         readonly question: Schema.String;
+                    }>, Schema.Struct<{
+                        readonly type: Schema.Literal<"form">;
+                        readonly title: Schema.String;
                     }>]>>;
                 }>>;
-                /** Set when the subtree had more sessions than `maxTotal`, which were left out. */
+                /** How many older sessions the listing left out, when it had more than `maxTotal`: the live ones come first, then the newest. */
                 readonly truncated: Schema.optionalKey<Schema.Int>;
             }>;
         };
@@ -337,6 +365,38 @@ export declare const treeRpc: {
                 readonly refused: import("effect/StandardSchema").StandardSchemaV1<{}, {}> & Schema.Struct<{}>;
             };
         };
+        /** Forgets `sessionID` as courier_cleanup called from its parent, without `force`; `by` must be above it. */
+        readonly cleanup: {
+            readonly input: import("effect/StandardSchema").StandardSchemaV1<{
+                readonly sessionID: string;
+                readonly by: string;
+            }, {
+                readonly sessionID: string;
+                readonly by: string;
+            }> & Schema.Struct<{
+                readonly sessionID: Schema.String;
+                readonly by: Schema.String;
+            }>;
+            readonly output: import("effect/StandardSchema").StandardSchemaV1<{
+                readonly outcome: "removed" | "gone" | "forgotten";
+            } | {
+                readonly outcome: "kept";
+                readonly reason: string;
+            }, {
+                readonly outcome: "removed" | "gone" | "forgotten";
+            } | {
+                readonly outcome: "kept";
+                readonly reason: string;
+            }> & Schema.Union<readonly [Schema.Struct<{
+                readonly outcome: Schema.Literals<readonly ["forgotten", "removed", "gone"]>;
+            }>, Schema.Struct<{
+                readonly outcome: Schema.Literal<"kept">;
+                readonly reason: Schema.String;
+            }>]>;
+            readonly errors: {
+                readonly refused: import("effect/StandardSchema").StandardSchemaV1<{}, {}> & Schema.Struct<{}>;
+            };
+        };
     };
     readonly events: {};
 };

package/dist/tree/rpc.js

@@ -9,20 +9,19 @@ const Count = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0));
 const Group = Schema.Struct({ name: Schema.String, reported: Count, members: Count });
 /** The sessions started under a session, as the prompt footer's status entry shows them. */
 const Summary = Schema.Struct({
-    /** Running, and waiting on no request. */
+    /** Running, and waiting on no request or form. */
     running: Count,
-    /** Waiting on a permission request or a question, which go to the person. */
+    /** Waiting on a permission request, a question or a form it shows, which go to the person. */
     waiting: Count,
     /** Not running: done, or waiting for a message. */
     idle: Count,
     groups: Schema.Array(Group),
-    /** Set when the subtree had more sessions than `maxTotal`, which were not counted. */
-    truncated: Schema.optionalKey(Count),
 });
-/** A request a session waits on until the person answers it: a permission request, or its first question. */
+/** A request a session waits on until the person answers it: a permission request, its first question, or a form it shows. */
 const Wait = Schema.Union([
     Schema.Struct({ type: Schema.Literal("permission"), action: Schema.String, resources: Schema.Array(Schema.String) }),
     Schema.Struct({ type: Schema.Literal("question"), question: Schema.String }),
+    Schema.Struct({ type: Schema.Literal("form"), title: Schema.String }),
 ]);
 /** One session of the tree panel: what courier_tree shows of it, and what it is doing, in epoch milliseconds. */
 const Row = Schema.Struct({
@@ -31,10 +30,12 @@ const Row = Schema.Struct({
     title: Schema.String,
     /** A child of the panel's session is at depth 1. */
     depth: Count,
-    /** `waiting` on a request to the person; `gone` when OpenCode no longer knows it. */
+    /** `waiting` on a request to the person or a form it shows them; `gone` when OpenCode no longer knows it. */
     state: Schema.Literals(["running", "waiting", "idle", "gone"]),
     /** How its last turn ended. */
     outcome: Schema.optionalKey(Schema.Literals(["succeeded", "failed", "interrupted"])),
+    /** Set when courier_stop stopped it since its last prompt. */
+    stopped: Schema.optionalKey(Schema.Boolean),
     /** Its report since its last prompt: still owed, arrived (held with its group or delivered), or its turn ended without one. */
     report: Schema.optionalKey(Schema.Struct({ state: Schema.Literals(["owed", "reported", "ended"]), status: Schema.optionalKey(Schema.String), progressed: Schema.Boolean })),
     /** Its join group, and its standing there: `held`, `out`, how it left, or `released`. */
@@ -49,10 +50,10 @@ const Row = Schema.Struct({
     tool: Schema.optionalKey(Schema.Struct({ name: Schema.String, at: Schema.Number })),
     waits: Schema.Array(Wait),
 });
-/** The sessions under a session, as courier_tree reads them, in the order a tree is drawn. */
+/** The sessions under a session, as courier_tree lists them, in the order a tree is drawn. */
 const Tree = Schema.Struct({
     rows: Schema.Array(Row),
-    /** Set when the subtree had more sessions than `maxTotal`, which were left out. */
+    /** How many older sessions the listing left out, when it had more than `maxTotal`: the live ones come first, then the newest. */
     truncated: Schema.optionalKey(Count),
 });
 /** What a stop did to each session, deepest first, as courier_stop reports it. */
@@ -61,6 +62,11 @@ const Stopped = Schema.Struct({
     /** How many scheduled messages were cancelled. */
     cancelled: Count,
 });
+/** What courier_cleanup did: forgot it, removed its worktree, found that already gone, or kept the worktree, saying why. */
+const Forgotten = Schema.Union([
+    Schema.Struct({ outcome: Schema.Literals(["forgotten", "removed", "gone"]) }),
+    Schema.Struct({ outcome: Schema.Literal("kept"), reason: Schema.String }),
+]);
 export const treeRpc = Rpc.define({
     id: "courier",
     methods: {
@@ -78,6 +84,12 @@ export const treeRpc = Rpc.define({
             output: Schema.toStandardSchemaV1(Stopped),
             errors: { refused: Schema.toStandardSchemaV1(Schema.Struct({})) },
         },
+        /** Forgets `sessionID` as courier_cleanup called from its parent, without `force`; `by` must be above it. */
+        cleanup: {
+            input: Schema.toStandardSchemaV1(Schema.Struct({ sessionID: Schema.String, by: Schema.String })),
+            output: Schema.toStandardSchemaV1(Forgotten),
+            errors: { refused: Schema.toStandardSchemaV1(Schema.Struct({})) },
+        },
     },
     events: {},
 });