@knpkv/relay 0.1.0 → 0.2.0

package/README.md

@@ -50,7 +50,10 @@ const RelayLive = Layer.unwrap(
   the run that answers it. `backend` switches the session from its next turn on (`RelayBackendNotConfigured`
   otherwise). `context` is what the person attached, as the product renders it (`{ label, body }`): it is
   placed just before the message for the model, and never appears in the transcript or the Snapshot.
-- `events(ref)`: a `Snapshot` first, with each message's `id` and the `runIds` of a run in flight. Then:
+- `events(ref)`: a `Snapshot` first, with each message's `id`, the `runIds` of a run in flight and the
+  requestIds still `queued`. Then:
+  - `MessageQueued { requestId }`, then `MessagePlaced { id, requestId, text }` when a run takes it, or
+    `MessageWithdrawn { requestId }` when it is cancelled first.
   - `RunStarted { runIds }` and `TextDelta`.
   - `ToolStarted` and `ToolFinished`, each with a server-built, display-safe `summary`. A finished call carries
     its citations, and a write whose product projects one carries a `receipt { summary, providerId, link? }`
@@ -67,14 +70,31 @@ const RelayLive = Layer.unwrap(
   `NotInstalled`, `SignedOut`, `Misconfigured` or `NoCapability` and a one-line fix. Observed, never persisted.
   `SignedOut` comes from an `AuthenticationError` turn failure.
 
+## In the browser: `@knpkv/relay/wire`
+
+The contract a product's `/…/relay` routes speak, as a separate browser bundle that imports only
+`effect` and `@knpkv/capability`. It holds the harness's event and session schemas, plus:
+
+- `RelayStreamFrame`: one `data:` frame of `GET events`, a `RelayEvent`, `Unauthorized` or `StreamFailed`;
+- `RelayMessageRequest`, `RelayCancelRequest` and `RelayDecisionRequest`, the write bodies, and `RelayMessageAccepted`;
+- the typed refusals: `RelayUnavailableError` (503, with the fix), `RelayConflictError` (409, with the
+  `RelayConflictState` found) and `RelayBadRequestError` (400).
+
+A product narrows `ref` to its own objects and may add a typed `context` to a message. The build fails if
+the bundle reaches anything else, and `pnpm test:pack` checks the packed `dist/wire.js` again.
+`@knpkv/relay-product/client` reads a conversation through it.
+
 ## Security boundaries
 
 - The session store holds conversation content. Its directory is created `0700` and the database `0600`;
   a store directory, database or SQLite sidecar (`-wal`, `-shm`) that is a symbolic link, even a dangling one, fails with `RelayStoreLinked` before anything is
   re-permissioned or written;
   it is never logged, never sent to telemetry, and never served on unauthenticated routes.
-- One process owns a store: the connection runs in SQLite's exclusive locking mode, so a second owner fails
-  with `RelayStoreLocked`, and the lock is released by the OS if the owner dies.
+- One process owns a store: it holds an exclusive SQLite lock on `<store>.lock` (owner-only), so a second
+  owner fails with `RelayStoreLocked`. Closing the harness frees the store at once, so the same process can
+  open it again; the OS releases the lock if the owner dies. The lock is the runtime's own SQLite
+  (`node:sqlite` on Node, `bun:sqlite` on Bun), loaded when a store opens and used only through `exec`,
+  because libsql keeps a closed connection, and its locks, until its statements are garbage-collected.
 - Provider credentials stay with the user's CLI. Relay only spawns `claude`/`codex` with all of their tools
   withheld.
 

package/dist/harness.d.ts

@@ -1,4 +1,4 @@
-import { Context, Crypto, Effect, FileSystem, Layer, Path, Schema, Stream } from "effect";
+import { Context, Crypto, Effect, FileSystem, Layer, Path, Schema, Scope, Stream } from "effect";
 import type { LanguageModel } from "effect/ai";
 import { RelayBackendId } from "./model.js";
 import type { BackendStatus, ObjectRef, RelayEvent, SessionInfo, SessionTool } from "./model.js";
@@ -120,9 +120,13 @@ export interface RelayHarnessService {
 declare const RelayHarness_base: Context.ServiceClass<RelayHarness, "@knpkv/relay/RelayHarness", RelayHarnessService>;
 export declare class RelayHarness extends RelayHarness_base {
 }
-/** Build the harness for one product. */
-export declare const make: <Requirements>(options: RelayHarnessOptions<Requirements>) => Effect.Effect<RelayHarnessService, RelayStoreFailed | RelayStoreLinked | RelayStoreLocked, Requirements | Crypto.Crypto | FileSystem.FileSystem | Path.Path | import("effect/Scope").Scope>;
+/**
+ * Build the harness for one product. One attempt's resources (the store lock, the store, the harness) live in
+ * their own scope: an attempt that fails releases them at once, so a retry in the same scope can take the
+ * store; one that succeeds keeps them until the caller's scope closes.
+ */
+export declare const make: <Requirements>(options: RelayHarnessOptions<Requirements>) => Effect.Effect<RelayHarnessService, RelayStoreFailed | RelayStoreLinked | RelayStoreLocked, Crypto.Crypto | FileSystem.FileSystem | Path.Path | Scope.Scope | Exclude<Requirements, Scope.Scope>>;
 /** Build the harness as a scoped layer: the store closes, and the lock is released, with the scope. */
-export declare const layer: <Requirements>(options: RelayHarnessOptions<Requirements>) => Layer.Layer<RelayHarness, RelayStoreFailed | RelayStoreLinked | RelayStoreLocked, Crypto.Crypto | FileSystem.FileSystem | Path.Path | Exclude<Requirements, import("effect/Scope").Scope>>;
+export declare const layer: <Requirements>(options: RelayHarnessOptions<Requirements>) => Layer.Layer<RelayHarness, RelayStoreFailed | RelayStoreLinked | RelayStoreLocked, Crypto.Crypto | FileSystem.FileSystem | Path.Path | Exclude<Exclude<Requirements, Scope.Scope>, Scope.Scope>>;
 export {};
 //# sourceMappingURL=harness.d.ts.map

package/dist/harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../src/harness.ts"],"names":[],"mappings":"AAmCA,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,UAAU,EACV,KAAK,EACL,IAAI,EAKJ,MAAM,EAEN,MAAM,EACP,MAAM,QAAQ,CAAA;AAEf,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAG9C,OAAO,EAAwD,cAAc,EAAgB,MAAM,YAAY,CAAA;AAC/G,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAKhG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;;;;;AAGzD,qDAAqD;AACrD,qBAAa,gBAAiB,SAAQ,qBAGpC;CAAG;;;;;AAEL;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAGpC;CAAG;;;;;AAEL,8FAA8F;AAC9F,qBAAa,gBAAiB,SAAQ,qBAGpC;CAAG;;;;;;;;;;;AAEL,iHAAiH;AACjH,qBAAa,uBAAwB,SAAQ,4BAG5C;CAAG;;;;AAEJ,6EAA6E;AAC7E,qBAAa,iBAAkB,SAAQ,sBAErC;CAAG;;;;AAEL,sEAAsE;AACtE,qBAAa,yBAA0B,SAAQ,8BAG9C;CAAG;;;;;AAEJ,mFAAmF;AACnF,qBAAa,uBAAwB,SAAQ,4BAG5C;CAAG;AAEJ,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAA;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;IACxD,0FAA0F;IAC1F,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IAC9D,2FAA2F;IAC3F,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED,MAAM,WAAW,mBAAmB,CAAC,YAAY;IAC/C,wFAAwF;IACxF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,qDAAqD;IACrD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAA;IACxE,yDAAyD;IACzD,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,YAAY,EAAE,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,CAAA;CAC3E;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,gEAAgE;IAChE,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAA;IAC7C,wDAAwD;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,GAAG,SAAS,CAAA;CAC7D;AAED,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,WAAW,KAClB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,GAAG,yBAAyB,CAAC,CAAA;IACtE,+FAA+F;IAC/F,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;IAChF;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,CACf,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,KACX,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,gBAAgB,CAAC,CAAA;IACpE;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,CAAA;IAC7G,qFAAqF;IACrF,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;IAClF,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAA;IAC9D,8CAA8C;IAC9C,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;CAC3C;;AAED,qBAAa,YAAa,SAAQ,iBAAiF;CAAG;AAgGtH,yCAAyC;AACzC,eAAO,MAAM,IAAI,GAA4C,YAAY,4OAoQvE,CAAA;AAEF,uGAAuG;AACvG,eAAO,MAAM,KAAK,GAAI,YAAY,WAAW,mBAAmB,CAAC,YAAY,CAAC,+LACnC,CAAA"}
+{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../src/harness.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -4757,10 +4757,10 @@ async function finalResult(runtime, call, result, reported, context) {
     harness.push(truncated(bounded, reported.limits.retain));
   return { ...final, content: bounded.content, diagnostics: [...final.diagnostics ?? [], ...harness] };
 }
-async function settle(runtime, call, ending, build, context) {
+async function settle(runtime, call, ending, build2, context) {
   await runtime.commit(async (tx) => {
     const slot = toolSlot(await tx.doc(LiveDoc, runtime.conversationId), runtime.taskId);
-    const result = build(slot);
+    const result = build2(slot);
     const entry = await appendToolResult(tx, runtime.conversationId, call, result, runtime.now());
     if (slot !== void 0)
       finishSlot(slot, entry.id);
@@ -9257,11 +9257,11 @@ var HarnessImpl = class extends SessionImpl {
   }
   /** Build a conversation's environment from its current `cwd`; `undefined` without an `env` option. */
   async buildEnv(id, context) {
-    const build = this.#options.env;
-    if (build === void 0)
+    const build2 = this.#options.env;
+    if (build2 === void 0)
       return void 0;
     const cwd = (await this.snapshot(AgentDoc, id, context))?.cwd;
-    return build({ conversationId: id, ...cwd === void 0 ? {} : { cwd }, read: this }, context);
+    return build2({ conversationId: id, ...cwd === void 0 ? {} : { cwd }, read: this }, context);
   }
   /** Reconcile surviving `running` tasks to `pending`; part of open. */
   openTasks(context) {
@@ -10117,8 +10117,9 @@ var SqliteStorage = class _SqliteStorage {
 // dist/harness.js
 import * as Capability2 from "@knpkv/capability";
 import { createClient } from "@libsql/client";
-import { Clock, Context, Crypto, Deferred, Effect as Effect3, Exit, FileSystem, Layer, Path, Predicate as Predicate3, PubSub, Queue, Ref, Schema as Schema5, Semaphore, Stream } from "effect";
+import { Clock, Context, Crypto, Deferred, Effect as Effect3, Exit, FileSystem, Layer, Path, Predicate as Predicate4, PubSub, Queue, Ref, Schema as Schema5, Scope, Semaphore, Stream } from "effect";
 import { AiError } from "effect/ai";
+import { createRequire } from "node:module";
 
 // dist/libsqlDatabase.js
 import { Predicate } from "effect";
@@ -10174,6 +10175,48 @@ var libsqlDatabase = (client) => {
   };
 };
 
+// dist/messages.js
+import { Predicate as Predicate2 } from "effect";
+var entryText = (messages) => (messages ?? []).flatMap((message) => message.role === "user" || message.role === "assistant" ? Predicate2.isString(message.content) ? [message.content] : message.content.flatMap((block) => block.type === "text" && block.text !== void 0 ? [block.text] : []) : []).join("\n");
+var makeMessageTracker = () => {
+  const texts = /* @__PURE__ */ new Map();
+  const requests = /* @__PURE__ */ new Map();
+  const announced = /* @__PURE__ */ new Set();
+  const placed = (entry) => {
+    const text = texts.get(entry);
+    const requestId = requests.get(entry);
+    if (text === void 0 || requestId === void 0 || announced.has(entry))
+      return [];
+    announced.add(entry);
+    texts.delete(entry);
+    requests.delete(entry);
+    return [{ _tag: "MessagePlaced", id: entry, requestId, text }];
+  };
+  return {
+    /** A committed entry; only a person's message can place one. */
+    entry: (entry) => {
+      if (entry.kind !== "pi.user" || announced.has(String(entry.id)))
+        return [];
+      texts.set(String(entry.id), entryText(entry.model));
+      return placed(String(entry.id));
+    },
+    /** A submission record; Relay submits every input with the dock's requestId, its id is the fallback. */
+    record: (record) => {
+      if (record.type !== "input")
+        return [];
+      const requestId = record.requestId ?? String(record.id);
+      if (record.entry === void 0) {
+        return [{ _tag: record.status === "queued" ? "MessageQueued" : "MessageWithdrawn", requestId }];
+      }
+      const entry = String(record.entry);
+      if (announced.has(entry))
+        return [];
+      requests.set(entry, requestId);
+      return placed(entry);
+    }
+  };
+};
+
 // dist/model.js
 import * as Capability from "@knpkv/capability";
 import { Schema } from "effect";
@@ -10228,8 +10271,19 @@ var RelayEvent = Schema.TaggedUnion({
     ...eventFields,
     messages: Schema.Array(Schema.Struct({ id: Name, role: Schema.Literals(["user", "relay"]), text: Schema.String })),
     /** The run in flight, empty when idle. */
-    runIds: RunIds
+    runIds: RunIds,
+    /** Messages accepted but not yet in the transcript, oldest first: they wait for the run in flight. */
+    queued: RunIds
   },
+  /**
+   * A message the server accepted that waits for the run in flight. It joins the transcript with its own
+   * `MessagePlaced`, or leaves with `MessageWithdrawn`.
+   */
+  MessageQueued: { ...eventFields, requestId: Name },
+  /** A message the server placed in the transcript; `id` is its transcript id, as a later Snapshot names it. */
+  MessagePlaced: { ...eventFields, id: Name, requestId: Name, text: Schema.String },
+  /** A queued message the person withdrew before any run took it. */
+  MessageWithdrawn: { ...eventFields, requestId: Name },
   RunStarted: { ...eventFields, runIds: RunIds },
   TextDelta: { ...eventFields, text: Schema.String },
   /** `summary` is a server-built, display-safe line; `input` is the call's typed arguments. */
@@ -11309,11 +11363,11 @@ function createProvider(input) {
 }
 
 // dist/piProvider.js
-import { Predicate as Predicate2, Schema as Schema2 } from "effect";
+import { Predicate as Predicate3, Schema as Schema2 } from "effect";
 var API = "relay-cli-turn";
 var decodeJson = Schema2.decodeUnknownOption(Schema2.Json);
 var MODEL_ID = "default";
-var textOf = (content) => Predicate2.isString(content) ? content : content.flatMap((block) => block.type === "text" && block.text !== void 0 ? [block.text] : []).join("\n");
+var textOf = (content) => Predicate3.isString(content) ? content : content.flatMap((block) => block.type === "text" && block.text !== void 0 ? [block.text] : []).join("\n");
 var turnRequestOf = (messages) => {
   const instructions = [];
   const tools = /* @__PURE__ */ new Map();
@@ -11636,7 +11690,48 @@ var promise = (operation, run2) => Effect3.tryPromise({
   try: run2,
   catch: (cause) => new RelayStoreFailed({ operation, message: `${operation} failed: ${String(cause)}` })
 });
-var notALink = (error) => error.reason._tag === "NotFound" || error.reason._tag !== "BadArgument" && Predicate3.hasProperty(error.reason.cause, "code") && error.reason.cause.code === "EINVAL";
+var notALink = (error) => error.reason._tag === "NotFound" || error.reason._tag !== "BadArgument" && Predicate4.hasProperty(error.reason.cause, "code") && error.reason.cause.code === "EINVAL";
+var lockDriver = Effect3.tryPromise({
+  try: async () => {
+    try {
+      const { DatabaseSync } = await import("node:sqlite");
+      return (path) => new DatabaseSync(path);
+    } catch (nodeFailure) {
+      try {
+        const bun = createRequire(import.meta.url)("bun:sqlite");
+        return (path) => new bun.Database(path);
+      } catch (bunFailure) {
+        throw new AggregateError([nodeFailure, bunFailure], `neither node:sqlite (${String(nodeFailure)}) nor bun:sqlite (${String(bunFailure)}) could load`, { cause: bunFailure });
+      }
+    }
+  },
+  catch: (cause) => new RelayStoreFailed({
+    operation: "load SQLite for the Relay store lock",
+    message: `load SQLite for the Relay store lock failed: ${String(cause)}`
+  })
+});
+var isBusy = (cause) => Predicate4.hasProperty(cause, "errcode") && cause.errcode === 5 || Predicate4.hasProperty(cause, "errno") && cause.errno === 5 || Predicate4.hasProperty(cause, "code") && cause.code === "SQLITE_BUSY";
+var acquireStoreLock = (path) => Effect3.acquireRelease(Effect3.flatMap(lockDriver, (open) => Effect3.try({
+  try: () => {
+    const lock = open(path);
+    try {
+      lock.exec("PRAGMA locking_mode = EXCLUSIVE");
+      lock.exec("BEGIN IMMEDIATE");
+      lock.exec("COMMIT");
+      return lock;
+    } catch (failure) {
+      lock.close();
+      throw failure;
+    }
+  },
+  catch: (cause) => isBusy(cause) ? new RelayStoreLocked({
+    path,
+    message: `Another process owns the Relay store at ${path.replace(/\.lock$/u, "")}. Stop it, then retry.`
+  }) : new RelayStoreFailed({
+    operation: "lock the Relay store",
+    message: `lock the Relay store failed: ${String(cause)}`
+  })
+})), (lock) => Effect3.sync(() => lock.close()));
 var openStore = (path) => Effect3.acquireRelease(Effect3.gen(function* () {
   const fs = yield* FileSystem.FileSystem;
   const paths = yield* Path.Path;
@@ -11654,17 +11749,17 @@ var openStore = (path) => Effect3.acquireRelease(Effect3.gen(function* () {
   }));
   yield* refuseLink(directory, "store directory");
   yield* fs.makeDirectory(directory, { recursive: true, mode: 448 }).pipe(ownerOnly("create the Relay store directory"));
-  yield* Effect3.forEach([path, `${path}-wal`, `${path}-shm`], (file) => refuseLink(file, "store"), {
+  yield* Effect3.forEach([path, `${path}-wal`, `${path}-shm`, `${path}.lock`], (file) => refuseLink(file, "store"), {
     discard: true
   });
   yield* fs.chmod(directory, 448).pipe(ownerOnly("restrict the Relay store directory"));
+  yield* acquireStoreLock(`${path}.lock`);
+  yield* fs.chmod(`${path}.lock`, 384).pipe(ownerOnly("restrict the Relay store lock"));
   const client = createClient({ url: `file:${path}` });
   const database = libsqlDatabase(client);
   yield* promise("open the Relay store", async () => {
-    await database.exec("PRAGMA locking_mode = EXCLUSIVE");
     await database.exec("PRAGMA journal_mode = WAL");
     await database.exec("PRAGMA synchronous = NORMAL");
-    await database.exec("BEGIN IMMEDIATE; COMMIT");
   }).pipe(Effect3.andThen(fs.chmod(path, 384).pipe(ownerOnly("restrict the Relay store"))), Effect3.catchTag("RelayStoreFailed", (failure) => /SQLITE_BUSY|database is locked/u.test(failure.message) ? Effect3.fail(new RelayStoreLocked({
     path,
     message: `Another process owns the Relay store at ${path}. Stop it, then retry.`
@@ -11672,6 +11767,11 @@ var openStore = (path) => Effect3.acquireRelease(Effect3.gen(function* () {
   return database;
 }), (database) => Effect3.promise(() => database.close()));
 var make = Effect3.fn("RelayHarness.make")(function* (options) {
+  const owner = yield* Scope.Scope;
+  const attempt = yield* Scope.fork(owner, "sequential");
+  return yield* build(options).pipe(Scope.provide(attempt), Effect3.onExit((exit) => Exit.isFailure(exit) ? Scope.close(attempt, exit) : Effect3.void));
+});
+var build = Effect3.fn("RelayHarness.build")(function* (options) {
   const services = yield* Effect3.context();
   const runEffect = (effect, signal) => Effect3.runPromiseExitWith(services)(effect, signal === void 0 ? void 0 : { signal });
   const runPromise = Effect3.runPromiseWith(services);
@@ -11861,7 +11961,6 @@ ${item.body}`,
   });
 });
 var layer = (options) => Layer.effect(RelayHarness, make(options));
-var entryText = (messages) => (messages ?? []).flatMap((message) => message.role === "user" || message.role === "assistant" ? Predicate3.isString(message.content) ? [message.content] : message.content.flatMap((block) => block.type === "text" ? [block.text] : []) : []).join("\n");
 var decodeDetails = Schema5.decodeUnknownOption(Schema5.Struct({ cites: Schema5.Array(Capability2.ObjectRef), receipt: Schema5.optionalKey(WriteReceipt) }));
 var sessionEvents = (harness, conversation, confirmations, pendingFor, display) => {
   const summarize = (capability, args) => display(capability)?.summarize(args) ?? capability;
@@ -11905,7 +12004,9 @@ var sessionEvents = (harness, conversation, confirmations, pendingFor, display)
     }]);
     return [...partial, ...running];
   };
-  const toRelay = (event, runIds) => {
+  const messages = makeMessageTracker();
+  const fromMessages = (events) => events.map((event) => ({ ...event, session }));
+  const toRelay = (event, runIds, queued2 = []) => {
     switch (event.type) {
       case "snapshot":
         return [
@@ -11913,6 +12014,7 @@ var sessionEvents = (harness, conversation, confirmations, pendingFor, display)
             _tag: "Snapshot",
             session,
             runIds,
+            queued: queued2,
             messages: event.entries.flatMap((entry) => entry.kind === "pi.user" ? [{ id: String(entry.id), role: "user", text: entryText(entry.model) }] : entry.kind === "pi.assistant" ? [{ id: String(entry.id), role: "relay", text: entryText(entry.model) }] : [])
           },
           ...inFlight(event),
@@ -11921,6 +12023,11 @@ var sessionEvents = (harness, conversation, confirmations, pendingFor, display)
       case "message_start":
         sent.clear();
         return event.message.role === "assistant" ? event.message.content.flatMap((block, index) => block.type === "text" ? textFrom(index, block.text) : []) : [];
+      case "message_end":
+      case "entry_appended":
+        return fromMessages(messages.entry(event.entry));
+      case "submission":
+        return fromMessages(messages.record(event.record));
       case "message_update":
         return event.changes.flatMap((change) => {
           if (change.type === "text_delta") {
@@ -11979,6 +12086,10 @@ var sessionEvents = (harness, conversation, confirmations, pendingFor, display)
   const runIdsOf = (inputs, read2) => inputs.map((id, index) => read2[index]?.requestId ?? String(id));
   let active = [];
   const track2 = (inputs) => (inputs.length === 0 ? Effect3.succeed([]) : promise("read the run in flight", async () => runIdsOf(inputs, await records(inputs)))).pipe(Effect3.tap((runIds) => Effect3.sync(() => active = runIds)));
+  const queuedOf = (inbox) => {
+    const inputs = inbox.map(({ id }) => id);
+    return inputs.length === 0 ? Effect3.succeed([]) : promise("read the queued messages", async () => runIdsOf(inputs, await records(inputs)));
+  };
   const runEnded = (inputs) => promise("read how the run ended", async () => {
     const read2 = await records(inputs);
     const runIds = runIdsOf(inputs, read2);
@@ -11991,13 +12102,13 @@ var sessionEvents = (harness, conversation, confirmations, pendingFor, display)
       session,
       runIds,
       // `reason` is Pi's code (`model_error`); `detail` carries the backend's own message when there is one.
-      cause: Predicate3.isString(unanswered.detail) ? unanswered.detail : unanswered.reason,
+      cause: Predicate4.isString(unanswered.detail) ? unanswered.detail : unanswered.reason,
       fix: "Check the backend in Relay setup (installed and signed in), then send the message again."
     };
   });
   const gate = Stream.fromPubSub(confirmations).pipe(Stream.filter(({ conversationId }) => conversationId === session), Stream.map(({ event }) => event));
   let seq = 0;
-  const relayed = Stream.flatMap(fromPi, (event) => event.type === "run_end" ? Stream.fromEffect(runEnded(event.inputs).pipe(Effect3.tap(() => Effect3.sync(() => active = [])))) : event.type === "run_start" ? Stream.fromEffect(track2(event.inputs)).pipe(Stream.map((runIds) => ({ _tag: "RunStarted", session, runIds }))) : event.type === "snapshot" ? Stream.fromEffect(track2(event.run?.inputs ?? [])).pipe(Stream.flatMap((runIds) => Stream.fromIterable(toRelay(event, runIds)))) : Stream.fromIterable(toRelay(event, active)));
+  const relayed = Stream.flatMap(fromPi, (event) => event.type === "run_end" ? Stream.fromEffect(runEnded(event.inputs).pipe(Effect3.tap(() => Effect3.sync(() => active = [])))) : event.type === "run_start" ? Stream.fromEffect(track2(event.inputs)).pipe(Stream.map((runIds) => ({ _tag: "RunStarted", session, runIds }))) : event.type === "snapshot" ? Stream.fromEffect(Effect3.all([track2(event.run?.inputs ?? []), queuedOf(event.inbox)])).pipe(Stream.flatMap(([runIds, queued2]) => Stream.fromIterable(toRelay(event, runIds, queued2)))) : Stream.fromIterable(toRelay(event, active)));
   return Stream.merge(relayed, gate).pipe(Stream.map((event) => ({ ...event, seq: seq++ })));
 };