@kortix/sdk 0.12.8 → 0.13.1

package/dist/core/session/message-queue.d.ts

@@ -1,9 +1,20 @@
 /**
+ * @deprecated since 0.12.9 — Kortix owns prompt ordering server-side
+ * (`POST /v1/projects/:projectId/sessions/:sessionId/prompts`). This module is
+ * retained ONLY so `@kortix/sdk/message-queue`, published in 0.12.8, keeps
+ * resolving for external consumers. It is not used by any Kortix host and will
+ * be removed in the next major.
+ *
  * The rules a message queue obeys, as pure functions.
  *
  * A message typed while the agent is mid-run is held until the turn ends. That
- * much is easy. What is not easy — and what three previous implementations got
- * wrong — is *when* it is released and *how many times*.
+ * much is easy. What is not easy — and what four implementations got wrong — is
+ * *when* it is released and *how many times*. The answer this module could
+ * never reach is that a browser tab does not know: it reads one guess at the
+ * session's state, a second tab reads another, and a closed tab loses the queue
+ * outright. The durable inbox above decides admission from the same turn
+ * authority `GET .../turn` serves from, so there is one queue per session
+ * rather than one per tab.
  *
  * The failures this module exists to make impossible:
  *
@@ -19,16 +30,23 @@
  *   - **A queued message sending under the wrong model.** `agent`, `model`, and
  *     `variant` are captured at enqueue and carried verbatim.
  *
- * The claimed item stays at `pending[0]` while it is in flight rather than
- * being spliced out. That makes `inFlightId` a real lock (one field to check),
- * makes "reorder cannot cross the in-flight slot" an index clamp rather than a
- * special case, and means a crash between claim and dispatch leaves the message
- * visible in the queue instead of silently gone.
+ * Claimed items stay at the head of `pending` while they are in flight rather
+ * than being spliced out. That makes the in-flight ids a real lock (one field
+ * to check), makes "reorder cannot cross what is sending" an index clamp rather
+ * than a special case, and means a crash between claim and dispatch leaves the
+ * messages visible in the queue instead of silently gone.
  *
  * Framework-free, storage-free, and timer-free by construction. There is no
  * `Date.now()` and no `crypto` here: ids and timestamps are inputs, so every
  * transition is deterministic and testable without fakes. Persistence and the
  * decision of *when* the turn ended belong to the host.
+ *
+ * **The export list is frozen at what 0.12.8 published.** `claimBatch` and
+ * `inFlightIdsOf` were added after that release, drove the browser batch drain
+ * that no longer exists, and are absent from the published `.d.ts` — so they
+ * are gone rather than deprecated. Nothing new may be added here either: an
+ * addition would be a new promise made by a module that exists only to keep an
+ * old one.
  */
 /** What a host hands in when the user queues a message. */
 export interface QueuedMessageInput<TFile = unknown, TMention = unknown> {
@@ -49,6 +67,29 @@ export interface QueuedMessageInput<TFile = unknown, TMention = unknown> {
         modelID: string;
     } | null;
     variant?: string | null;
+    /**
+     * A `/` slash command, when this entry runs one instead of sending `text`.
+     *
+     * The queue held only prompts, so a host with a command to send had nowhere
+     * to put it and ran it immediately — straight past a busy agent, ahead of
+     * everything already waiting. Ordering is the queue's entire purpose, and a
+     * command is a turn like any other; the only difference is which call puts it
+     * on the wire, which is the host's business at dispatch time.
+     *
+     * `name`, not a resolved command object: entries are serialized to survive a
+     * reload, and the command list is re-read when the entry actually runs, so a
+     * queued command can never go stale against a list that changed underneath
+     * it. `text` still carries the arguments, so an entry stays renderable and
+     * editable with no special case.
+     */
+    command?: {
+        name: string;
+        /** Where the chip sat in `text`, for display. See the host's serializer. */
+        split?: {
+            before: string;
+            after: string;
+        };
+    };
     createdAt: number;
 }
 /** A queued message, once the queue owns it. */
@@ -60,12 +101,33 @@ export interface QueuedMessage<TFile = unknown, TMention = unknown> extends Queu
 }
 /** One session's queue. */
 export interface SessionQueue<TFile = unknown, TMention = unknown> {
-    /** Waiting to send, oldest first. `pending[0]` is in flight when claimed. */
+    /** Waiting to send, oldest first. The leading run is in flight when claimed. */
     pending: QueuedMessage<TFile, TMention>[];
     /** Gave up. Never blocks `pending`; a host offers these a retry. */
     failed: QueuedMessage<TFile, TMention>[];
-    /** The id of the item currently on the wire, or null. This is the lock. */
+    /**
+     * The head of what is on the wire, or null.
+     *
+     * Kept because it is published API and because most readers only ever want
+     * "is something sending, and which row is it". `inFlightIds[0]` and this
+     * field are the same value by construction — every transition writes both.
+     */
     inFlightId: string | null;
+    /**
+     * Every id on the wire right now, oldest first. Empty when idle.
+     *
+     * A batch claim puts more than one message on a single prompt, so the lock
+     * has to name all of them: a row the user can still edit, remove or reorder
+     * is a row that is not being sent, and `inFlightId` alone could only ever
+     * protect the first.
+     *
+     * Optional because it was added after this type shipped, and requiring it
+     * would stop a consumer's hand-built `SessionQueue` literal from compiling.
+     * Every transition in this module writes it, and `createSessionQueue()`
+     * returns it, so it is absent only on a state that predates it — which is
+     * why every read goes through `inFlight` below rather than `?? []`.
+     */
+    inFlightIds?: string[];
 }
 export declare function createSessionQueue<TFile = unknown, TMention = unknown>(): SessionQueue<TFile, TMention>;
 /**
@@ -87,7 +149,7 @@ export declare function claimNext<TFile, TMention>(state: SessionQueue<TFile, TM
     state: SessionQueue<TFile, TMention>;
     claimed?: QueuedMessage<TFile, TMention>;
 };
-/** The send landed. Drop the item and free the queue. */
+/** The send landed. Drop everything it carried and free the queue. */
 export declare function completeInFlight<TFile, TMention>(state: SessionQueue<TFile, TMention>): SessionQueue<TFile, TMention>;
 /**
  * The send failed for good. Set it aside — do not put it back at the head.
@@ -99,16 +161,18 @@ export declare function completeInFlight<TFile, TMention>(state: SessionQueue<TF
 export declare function failInFlight<TFile, TMention>(state: SessionQueue<TFile, TMention>, error: string): SessionQueue<TFile, TMention>;
 /** Put a failed item back at the tail, with its error cleared. */
 export declare function retryFailed<TFile, TMention>(state: SessionQueue<TFile, TMention>, id: string): SessionQueue<TFile, TMention>;
-/** Drop a message. Refuses the in-flight item — it is already on the wire. */
+/** Drop a message. Refuses anything in flight — it is already on the wire. */
 export declare function removeQueued<TFile, TMention>(state: SessionQueue<TFile, TMention>, id: string): SessionQueue<TFile, TMention>;
-/** Rewrite a queued message. Refuses the in-flight item. */
+/** Rewrite a queued message. Refuses anything in flight. */
 export declare function editQueued<TFile, TMention>(state: SessionQueue<TFile, TMention>, id: string, text: string): SessionQueue<TFile, TMention>;
 /**
  * Move a pending message to `toIndex`.
  *
- * `toIndex` is clamped to the movable range. While something is in flight that
- * range starts at 1, so nothing can be reordered into or past the slot that is
- * already sending — and the in-flight item itself cannot move at all.
+ * `toIndex` is clamped to the movable range. That range starts after whatever
+ * is in flight, so nothing can be reordered into or past a message already on
+ * the wire — and an in-flight message cannot move at all. That is one slot for
+ * a `claimNext` lock, and several for a state rehydrated from a host that
+ * claimed a batch.
  */
 export declare function reorderQueued<TFile, TMention>(state: SessionQueue<TFile, TMention>, id: string, toIndex: number): SessionQueue<TFile, TMention>;
 //# sourceMappingURL=message-queue.d.ts.map

package/dist/core/session/message-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../../../src/core/session/message-queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../../../src/core/session/message-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAEH,2DAA2D;AAC3D,MAAM,WAAW,kBAAkB,CAAC,KAAK,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO;IACrE,6DAA6D;IAC7D,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB,4EAA4E;IAC5E,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,4EAA4E;QAC5E,KAAK,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC3C,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa,CAAC,KAAK,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,CAChE,SAAQ,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,2BAA2B;AAC3B,MAAM,WAAW,YAAY,CAAC,KAAK,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO;IAC/D,gFAAgF;IAChF,OAAO,EAAE,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;IAC1C,oEAAoE;IACpE,MAAM,EAAE,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;IACzC;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,GAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,KAAK,YAAY,CACrF,KAAK,EACL,QAAQ,CACT,CAEA;AAkBD;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,QAAQ,EACrC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,GACzC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAE/B;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EACvC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,GACnC;IAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CAAE,CAepF;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAC9C,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,GACnC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAS/B;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,EAC1C,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,KAAK,EAAE,MAAM,GACZ,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAgB/B;AAED,kEAAkE;AAClE,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EACzC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,EAAE,EAAE,MAAM,GACT,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAU/B;AAED,8EAA8E;AAC9E,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,EAC1C,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,EAAE,EAAE,MAAM,GACT,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAS/B;AAED,4DAA4D;AAC5D,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EACxC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,GACX,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAQ/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,EAC3C,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EACpC,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,GACd,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAc/B"}

package/dist/core/session/message-queue.js

@@ -1,9 +1,20 @@
 /**
+ * @deprecated since 0.12.9 — Kortix owns prompt ordering server-side
+ * (`POST /v1/projects/:projectId/sessions/:sessionId/prompts`). This module is
+ * retained ONLY so `@kortix/sdk/message-queue`, published in 0.12.8, keeps
+ * resolving for external consumers. It is not used by any Kortix host and will
+ * be removed in the next major.
+ *
  * The rules a message queue obeys, as pure functions.
  *
  * A message typed while the agent is mid-run is held until the turn ends. That
- * much is easy. What is not easy — and what three previous implementations got
- * wrong — is *when* it is released and *how many times*.
+ * much is easy. What is not easy — and what four implementations got wrong — is
+ * *when* it is released and *how many times*. The answer this module could
+ * never reach is that a browser tab does not know: it reads one guess at the
+ * session's state, a second tab reads another, and a closed tab loses the queue
+ * outright. The durable inbox above decides admission from the same turn
+ * authority `GET .../turn` serves from, so there is one queue per session
+ * rather than one per tab.
  *
  * The failures this module exists to make impossible:
  *
@@ -19,19 +30,42 @@
  *   - **A queued message sending under the wrong model.** `agent`, `model`, and
  *     `variant` are captured at enqueue and carried verbatim.
  *
- * The claimed item stays at `pending[0]` while it is in flight rather than
- * being spliced out. That makes `inFlightId` a real lock (one field to check),
- * makes "reorder cannot cross the in-flight slot" an index clamp rather than a
- * special case, and means a crash between claim and dispatch leaves the message
- * visible in the queue instead of silently gone.
+ * Claimed items stay at the head of `pending` while they are in flight rather
+ * than being spliced out. That makes the in-flight ids a real lock (one field
+ * to check), makes "reorder cannot cross what is sending" an index clamp rather
+ * than a special case, and means a crash between claim and dispatch leaves the
+ * messages visible in the queue instead of silently gone.
  *
  * Framework-free, storage-free, and timer-free by construction. There is no
  * `Date.now()` and no `crypto` here: ids and timestamps are inputs, so every
  * transition is deterministic and testable without fakes. Persistence and the
  * decision of *when* the turn ended belong to the host.
+ *
+ * **The export list is frozen at what 0.12.8 published.** `claimBatch` and
+ * `inFlightIdsOf` were added after that release, drove the browser batch drain
+ * that no longer exists, and are absent from the published `.d.ts` — so they
+ * are gone rather than deprecated. Nothing new may be added here either: an
+ * addition would be a new promise made by a module that exists only to keep an
+ * old one.
  */
 export function createSessionQueue() {
-    return { pending: [], failed: [], inFlightId: null };
+    return { pending: [], failed: [], inFlightId: null, inFlightIds: [] };
+}
+/**
+ * Everything on the wire, oldest first. Empty when the queue is idle.
+ *
+ * Module-private since 0.12.9. It was exported as `inFlightIdsOf` only for the
+ * browser drain that read the batch lock, and that drain is gone; 0.12.8 never
+ * published the name, so nothing external can be holding it.
+ *
+ * Tolerates a state that predates `inFlightIds` — a queue rehydrated from a
+ * host that persisted the older shape has only `inFlightId`, and reading
+ * through here means no call site has to know that.
+ */
+function inFlight(state) {
+    if (state.inFlightIds?.length)
+        return state.inFlightIds;
+    return state.inFlightId ? [state.inFlightId] : [];
 }
 /**
  * Add a message to the tail.
@@ -51,7 +85,7 @@ export function enqueue(state, input) {
  * in flight — so a caller that races itself sends once, not twice.
  */
 export function claimNext(state) {
-    if (state.inFlightId !== null)
+    if (inFlight(state).length > 0)
         return { state };
     const head = state.pending[0];
     if (!head)
@@ -62,18 +96,21 @@ export function claimNext(state) {
             ...state,
             pending: [claimed, ...state.pending.slice(1)],
             inFlightId: claimed.id,
+            inFlightIds: [claimed.id],
         },
         claimed,
     };
 }
-/** The send landed. Drop the item and free the queue. */
+/** The send landed. Drop everything it carried and free the queue. */
 export function completeInFlight(state) {
-    if (state.inFlightId === null)
+    const sending = inFlight(state);
+    if (sending.length === 0)
         return state;
     return {
         ...state,
-        pending: state.pending.filter((m) => m.id !== state.inFlightId),
+        pending: state.pending.filter((m) => !sending.includes(m.id)),
         inFlightId: null,
+        inFlightIds: [],
     };
 }
 /**
@@ -84,15 +121,21 @@ export function completeInFlight(state) {
  * item lands in `failed` with its reason, and `pending` keeps moving.
  */
 export function failInFlight(state, error) {
-    if (state.inFlightId === null)
+    const sending = inFlight(state);
+    if (sending.length === 0)
         return state;
-    const item = state.pending.find((m) => m.id === state.inFlightId);
-    if (!item)
-        return { ...state, inFlightId: null };
+    // A list, not a single id: `claimNext` only ever locks one, but a state
+    // rehydrated from a host that claimed several still carries them, and one
+    // send failing is all of their failure. They land as separate rows so the
+    // user can retry the message that matters instead of re-sending three.
+    const items = state.pending.filter((m) => sending.includes(m.id));
+    if (items.length === 0)
+        return { ...state, inFlightId: null, inFlightIds: [] };
     return {
-        pending: state.pending.filter((m) => m.id !== state.inFlightId),
-        failed: [...state.failed, { ...item, lastError: error }],
+        pending: state.pending.filter((m) => !sending.includes(m.id)),
+        failed: [...state.failed, ...items.map((item) => ({ ...item, lastError: error }))],
         inFlightId: null,
+        inFlightIds: [],
     };
 }
 /** Put a failed item back at the tail, with its error cleared. */
@@ -107,9 +150,9 @@ export function retryFailed(state, id) {
         failed: state.failed.filter((m) => m.id !== id),
     };
 }
-/** Drop a message. Refuses the in-flight item — it is already on the wire. */
+/** Drop a message. Refuses anything in flight — it is already on the wire. */
 export function removeQueued(state, id) {
-    if (id === state.inFlightId)
+    if (inFlight(state).includes(id))
         return state;
     if (state.pending.some((m) => m.id === id)) {
         return { ...state, pending: state.pending.filter((m) => m.id !== id) };
@@ -119,9 +162,9 @@ export function removeQueued(state, id) {
     }
     return state;
 }
-/** Rewrite a queued message. Refuses the in-flight item. */
+/** Rewrite a queued message. Refuses anything in flight. */
 export function editQueued(state, id, text) {
-    if (id === state.inFlightId)
+    if (inFlight(state).includes(id))
         return state;
     if (!state.pending.some((m) => m.id === id))
         return state;
@@ -133,17 +176,20 @@ export function editQueued(state, id, text) {
 /**
  * Move a pending message to `toIndex`.
  *
- * `toIndex` is clamped to the movable range. While something is in flight that
- * range starts at 1, so nothing can be reordered into or past the slot that is
- * already sending — and the in-flight item itself cannot move at all.
+ * `toIndex` is clamped to the movable range. That range starts after whatever
+ * is in flight, so nothing can be reordered into or past a message already on
+ * the wire — and an in-flight message cannot move at all. That is one slot for
+ * a `claimNext` lock, and several for a state rehydrated from a host that
+ * claimed a batch.
  */
 export function reorderQueued(state, id, toIndex) {
-    if (id === state.inFlightId)
+    const sending = inFlight(state);
+    if (sending.includes(id))
         return state;
     const from = state.pending.findIndex((m) => m.id === id);
     if (from === -1)
         return state;
-    const first = state.inFlightId === null ? 0 : 1;
+    const first = sending.length;
     const to = Math.min(Math.max(toIndex, first), state.pending.length - 1);
     if (to === from)
         return state;

package/dist/core/session/message-queue.js.map

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

package/dist/core/session/rewind.d.ts

@@ -1,18 +1,84 @@
-export declare function messagesBeforeRewind<T extends {
-    info: {
-        id: string;
-    };
-}>(messages: T[], messageId: string | null): T[];
+/**
+ * Client-side projection of a staged/committed session rewind.
+ *
+ * `session.revert` is a STAGED pointer server-side — OpenCode never deletes
+ * anything until the next prompt COMMITS it (and `unrevert` restores it while
+ * staged). Nothing here talks to the network; this module is the pure math
+ * the sync store and `useSession` share for two questions:
+ *
+ *   1. Which locally-known messages does a staged rewind hide?
+ *   2. When is a message id inside the range a committed rewind must delete?
+ *
+ * `watermark` exists to fix a real bug: hiding used to be "everything at-or-
+ * after the boundary id", recomputed on every render off the CURRENT message
+ * list. A message minted AFTER staging — the user's replacement prompt, its
+ * answer — sorts above the boundary by id exactly like every OTHER later
+ * message, so it fell inside "everything after the boundary" too and never
+ * rendered until an unrelated remount flooded the whole transcript back,
+ * interleaved. `watermark` freezes the upper edge of the hide window at the
+ * newest message id known AT STAGE TIME, so only messages that were already
+ * part of the abandoned trajectory are ever hidden — anything newer always
+ * renders.
+ */
 export interface SessionRewindState {
+    /** The message the rewind pointer sits at — hidden along with everything
+     *  up to `watermark`. */
     messageId: string;
+    /**
+     * The newest message id known locally at the moment this rewind was staged
+     * (or first observed). The upper bound of the hide window — fixed once,
+     * never recomputed against a later, larger message list.
+     */
+    watermark: string;
+    /**
+     * False once the replacement prompt has been sent (or a
+     * `session.next.revert.committed` wire event says the server has). The
+     * hide window still applies while this is false — what stops being offered
+     * is Restore (`unrevert`), not the hiding. A committed rewind's window is
+     * deleted outright once the store observes it, not merely hidden — see
+     * `applyCommittedRevert` on the sync store.
+     */
     staged: boolean;
 }
-/** Mark the rewind as committed while its removed path remains hidden locally. */
-export declare function commitSessionRewind(rewind: SessionRewindState | null): SessionRewindState | null;
-/** Drop the local boundary after runtime synchronization confirms cleanup. */
-export declare function reconcileCommittedSessionRewind<T extends {
+/** Whether `id` falls inside the [messageId, watermark] hide range — both
+ *  bounds inclusive: the boundary message itself is part of what an edit
+ *  replaces, and the watermark is the last message known at stage time. */
+export declare function isWithinRewindWindow(id: string, rewind: SessionRewindState): boolean;
+/**
+ * The newest (highest sort-order) message id in `messages`, or `null` for an
+ * empty list. Deliberately a max-scan, not "the last element" — most callers
+ * pass an ascending-sorted list, but an optimistic entry appended out of
+ * order must never win the max by position alone.
+ */
+export declare function newestMessageId<T extends {
     info: {
         id: string;
     };
-}>(messages: T[], rewind: SessionRewindState | null): SessionRewindState | null;
+}>(messages: T[]): string | null;
+/**
+ * Build the state for a freshly staged (or freshly discovered) rewind.
+ * `watermark` is captured HERE, from the message list at this exact moment —
+ * never recomputed later. Falls back to `messageId` itself when nothing is
+ * known locally yet (a cross-tab or reload discovery with no synced messages
+ * for this session), which hides only the boundary message and nothing
+ * else — the narrowest correct answer with no other information available.
+ */
+export declare function stageSessionRewind<T extends {
+    info: {
+        id: string;
+    };
+}>(messages: T[], messageId: string): SessionRewindState;
+/** Hide the target message and every message up to the staged watermark.
+ *  Returns the SAME array reference when nothing is actually hidden — a
+ *  fresh array on every call would defeat memoization in every consumer. */
+export declare function messagesBeforeRewind<T extends {
+    info: {
+        id: string;
+    };
+}>(messages: T[], rewind: SessionRewindState | null): T[];
+/** Mark the rewind as committed while its removed path remains hidden
+ *  locally (the actual deletion is a separate, explicit store action driven
+ *  by the wire's `.committed` event — see `applyCommittedRevert`). Returns
+ *  the SAME reference when already committed or when `rewind` is `null`. */
+export declare function commitSessionRewind(rewind: SessionRewindState | null): SessionRewindState | null;
 //# sourceMappingURL=rewind.d.ts.map

package/dist/core/session/rewind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rewind.d.ts","sourceRoot":"","sources":["../../../src/core/session/rewind.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACrE,QAAQ,EAAE,CAAC,EAAE,EACb,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,CAAC,EAAE,CAIL;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,kBAAkB,GAAG,IAAI,GAChC,kBAAkB,GAAG,IAAI,CAE3B;AAED,8EAA8E;AAC9E,wBAAgB,+BAA+B,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EAChF,QAAQ,EAAE,CAAC,EAAE,EACb,MAAM,EAAE,kBAAkB,GAAG,IAAI,GAChC,kBAAkB,GAAG,IAAI,CAG3B"}
+{"version":3,"file":"rewind.d.ts","sourceRoot":"","sources":["../../../src/core/session/rewind.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,WAAW,kBAAkB;IACjC;6BACyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;;OAOG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;2EAE2E;AAC3E,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAEpF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EAChE,QAAQ,EAAE,CAAC,EAAE,GACZ,MAAM,GAAG,IAAI,CAMf;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACnE,QAAQ,EAAE,CAAC,EAAE,EACb,SAAS,EAAE,MAAM,GAChB,kBAAkB,CAMpB;AAED;;4EAE4E;AAC5E,wBAAgB,oBAAoB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACrE,QAAQ,EAAE,CAAC,EAAE,EACb,MAAM,EAAE,kBAAkB,GAAG,IAAI,GAChC,CAAC,EAAE,CAIL;AAED;;;4EAG4E;AAC5E,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,kBAAkB,GAAG,IAAI,GAChC,kBAAkB,GAAG,IAAI,CAE3B"}

package/dist/core/session/rewind.js

@@ -1,17 +1,74 @@
-export function messagesBeforeRewind(messages, messageId) {
-    if (!messageId)
+/**
+ * Client-side projection of a staged/committed session rewind.
+ *
+ * `session.revert` is a STAGED pointer server-side — OpenCode never deletes
+ * anything until the next prompt COMMITS it (and `unrevert` restores it while
+ * staged). Nothing here talks to the network; this module is the pure math
+ * the sync store and `useSession` share for two questions:
+ *
+ *   1. Which locally-known messages does a staged rewind hide?
+ *   2. When is a message id inside the range a committed rewind must delete?
+ *
+ * `watermark` exists to fix a real bug: hiding used to be "everything at-or-
+ * after the boundary id", recomputed on every render off the CURRENT message
+ * list. A message minted AFTER staging — the user's replacement prompt, its
+ * answer — sorts above the boundary by id exactly like every OTHER later
+ * message, so it fell inside "everything after the boundary" too and never
+ * rendered until an unrelated remount flooded the whole transcript back,
+ * interleaved. `watermark` freezes the upper edge of the hide window at the
+ * newest message id known AT STAGE TIME, so only messages that were already
+ * part of the abandoned trajectory are ever hidden — anything newer always
+ * renders.
+ */
+/** Whether `id` falls inside the [messageId, watermark] hide range — both
+ *  bounds inclusive: the boundary message itself is part of what an edit
+ *  replaces, and the watermark is the last message known at stage time. */
+export function isWithinRewindWindow(id, rewind) {
+    return id >= rewind.messageId && id <= rewind.watermark;
+}
+/**
+ * The newest (highest sort-order) message id in `messages`, or `null` for an
+ * empty list. Deliberately a max-scan, not "the last element" — most callers
+ * pass an ascending-sorted list, but an optimistic entry appended out of
+ * order must never win the max by position alone.
+ */
+export function newestMessageId(messages) {
+    let max = null;
+    for (const message of messages) {
+        if (max === null || message.info.id > max)
+            max = message.info.id;
+    }
+    return max;
+}
+/**
+ * Build the state for a freshly staged (or freshly discovered) rewind.
+ * `watermark` is captured HERE, from the message list at this exact moment —
+ * never recomputed later. Falls back to `messageId` itself when nothing is
+ * known locally yet (a cross-tab or reload discovery with no synced messages
+ * for this session), which hides only the boundary message and nothing
+ * else — the narrowest correct answer with no other information available.
+ */
+export function stageSessionRewind(messages, messageId) {
+    return {
+        messageId,
+        watermark: newestMessageId(messages) ?? messageId,
+        staged: true,
+    };
+}
+/** Hide the target message and every message up to the staged watermark.
+ *  Returns the SAME array reference when nothing is actually hidden — a
+ *  fresh array on every call would defeat memoization in every consumer. */
+export function messagesBeforeRewind(messages, rewind) {
+    if (!rewind)
         return messages;
-    const boundary = messages.findIndex((message) => message.info.id === messageId);
-    return boundary < 0 ? messages : messages.slice(0, boundary);
+    const kept = messages.filter((message) => !isWithinRewindWindow(message.info.id, rewind));
+    return kept.length === messages.length ? messages : kept;
 }
-/** Mark the rewind as committed while its removed path remains hidden locally. */
+/** Mark the rewind as committed while its removed path remains hidden
+ *  locally (the actual deletion is a separate, explicit store action driven
+ *  by the wire's `.committed` event — see `applyCommittedRevert`). Returns
+ *  the SAME reference when already committed or when `rewind` is `null`. */
 export function commitSessionRewind(rewind) {
     return rewind?.staged ? { ...rewind, staged: false } : rewind;
 }
-/** Drop the local boundary after runtime synchronization confirms cleanup. */
-export function reconcileCommittedSessionRewind(messages, rewind) {
-    if (!rewind || rewind.staged)
-        return rewind;
-    return messages.some((message) => message.info.id === rewind.messageId) ? rewind : null;
-}
 //# sourceMappingURL=rewind.js.map

package/dist/core/session/rewind.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewind.js","sourceRoot":"","sources":["../../../src/core/session/rewind.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAClC,QAAa,EACb,SAAwB;IAExB,IAAI,CAAC,SAAS;QAAE,OAAO,QAAQ,CAAC;IAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;IAChF,OAAO,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAOD,kFAAkF;AAClF,MAAM,UAAU,mBAAmB,CACjC,MAAiC;IAEjC,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAChE,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,+BAA+B,CAC7C,QAAa,EACb,MAAiC;IAEjC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC5C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1F,CAAC"}
+{"version":3,"file":"rewind.js","sourceRoot":"","sources":["../../../src/core/session/rewind.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAuBH;;2EAE2E;AAC3E,MAAM,UAAU,oBAAoB,CAAC,EAAU,EAAE,MAA0B;IACzE,OAAO,EAAE,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,SAAS,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,QAAa;IAEb,IAAI,GAAG,GAAkB,IAAI,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG;YAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IACnE,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAa,EACb,SAAiB;IAEjB,OAAO;QACL,SAAS;QACT,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,SAAS;QACjD,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC;AAED;;4EAE4E;AAC5E,MAAM,UAAU,oBAAoB,CAClC,QAAa,EACb,MAAiC;IAEjC,IAAI,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1F,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED;;;4EAG4E;AAC5E,MAAM,UAAU,mBAAmB,CACjC,MAAiC;IAEjC,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAChE,CAAC"}