orizu 0.5.32 → 0.5.33

package/dist/hosted-loop.d.ts.map

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

package/dist/hosted-loop.js

@@ -691,7 +691,10 @@ export async function runHostedLoop(opts) {
                 await sleep(delayMs);
                 try {
                     await sink.finish(error.intendedStatus, error.finishOptions);
-                    return { status: error.intendedStatus, agentSessionId, installOk, error: null };
+                    // A timer flush may have met the server's 404/410 during the sleep,
+                    // making finish() a no-op: honour the server, as the drain does.
+                    const status = sink.terminatedServerSide ? 'cancelled' : error.intendedStatus;
+                    return { status, agentSessionId, installOk, error: null };
                 }
                 catch (retryError) {
                     // The run went terminal server-side while we were retrying: accept
@@ -705,8 +708,10 @@ export async function runHostedLoop(opts) {
             }
             if (sink.sealed) {
                 // A concurrent/preceding delivery landed after all — the record is
-                // terminal server-side with our intended status semantics preserved.
-                return { status: error.intendedStatus, agentSessionId, installOk, error: null };
+                // terminal server-side with our intended status semantics preserved —
+                // unless a timer flush met the server's 404/410 instead.
+                const status = sink.terminatedServerSide ? 'cancelled' : error.intendedStatus;
+                return { status, agentSessionId, installOk, error: null };
             }
             return {
                 status: error.intendedStatus,

package/dist/hosted-run-event-sink.d.ts

@@ -66,12 +66,15 @@ export interface RunEventSink {
      *  Terminal kinds are rejected (they must go through `finish`). */
     append(event: HarnessEvent): Promise<void>;
     /** Force-flush any coalesced token snapshots (also runs on every structural
-     *  event and on `finish`). Exposed so callers can flush on a timer if desired. */
+     *  event, on `finish`, and every `tokenFlushMs` while new tokens arrive). */
     flushTokens(): Promise<void>;
     /** Terminal transition via PATCH; records the transcript tail first, then CAS. */
     finish(status: TerminalStatus, opts?: FinishOptions): Promise<void>;
     /** True once a terminal transition has landed and the sink is sealed. */
     readonly sealed: boolean;
+    /** True when an append met 404/410, i.e. the server ended the run, not this
+     *  writer's PATCH. A timer flush can learn this with no caller awaiting it. */
+    readonly terminatedServerSide: boolean;
     /** The next sequence the sink will attempt to allocate (test/resume aid). */
     readonly nextSequence: number;
     /** Events the sink has confirmed appended, in order (redacted payloads). */
@@ -163,7 +166,13 @@ export interface CreateRunEventSinkOptions {
     sleepImpl?: (ms: number) => Promise<void>;
     /** Local diagnostic sink for disagreement-rule logs (never throws). */
     onDiagnostic?: (message: string) => void;
+    /** How often buffered token snapshots are flushed while a reply is being
+     *  written (ORI-2340). Default TOKEN_FLUSH_MS. */
+    tokenFlushMs?: number;
 }
+/** A text-only reply reaches the browser as growing snapshots at this cadence
+ *  instead of whole at the end of the turn (ORI-2340). */
+export declare const TOKEN_FLUSH_MS = 250;
 export declare function createRunEventSink(options: CreateRunEventSinkOptions): RunEventSink;
 export interface ResumeRunEventSinkOptions extends Omit<CreateRunEventSinkOptions, 'startSequence'> {
     /** Page size for the cursor tail while discovering the latest sequence. */

package/dist/hosted-run-event-sink.d.ts.map

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

package/dist/hosted-run-event-sink.js

@@ -156,6 +156,9 @@ const TERMINAL_STATUSES = new Set(['succeeded', 'failed', 'cancelled']);
 function isTerminalStatus(status) {
     return status !== null && TERMINAL_STATUSES.has(status);
 }
+/** A text-only reply reaches the browser as growing snapshots at this cadence
+ *  instead of whole at the end of the turn (ORI-2340). */
+export const TOKEN_FLUSH_MS = 250; // held equal to SESSION_TIMERS.agentTokenFlushMs by test
 const DEFAULT_MAX_CRITICAL_ATTEMPTS = 4;
 // Non-critical appends get a SMALL bounded retry so a single transient blip
 // (network reset / 5xx) does not drop the event — but on exhaustion they are
@@ -209,6 +212,53 @@ export function createRunEventSink(options) {
     const tokenBuffer = new Map();
     let nextSequence = options.startSequence ?? 1;
     let sealed = false;
+    let terminatedServerSide = false;
+    // One promise chain for every buffer-touching operation: append, flushTokens,
+    // finish and the timer flush below. This is how the timer honours the
+    // reentrancy contract on flushTokens — it queues behind an in-flight append
+    // or flush instead of running beside it. A rejected step reaches its own
+    // caller and never breaks the chain.
+    let queue = Promise.resolve();
+    function serialize(fn) {
+        const run = queue.then(fn);
+        queue = run.catch(() => { });
+        return run;
+    }
+    // ORI-2340 timer flush: started by the first token, unref'd so it never keeps
+    // the process alive, stopped for good once the sink seals or the bearer is
+    // refused. `tokensDirty` keeps a quiet tick (or a dropped snapshot with no
+    // newer text) from posting again.
+    let flushTimer = null;
+    let flushTimerStopped = false;
+    let tokensDirty = false;
+    let timerFlushQueued = false;
+    function stopFlushTimer() {
+        flushTimerStopped = true;
+        if (flushTimer)
+            clearInterval(flushTimer);
+        flushTimer = null;
+    }
+    function onFlushTick() {
+        if (sealed)
+            return stopFlushTimer();
+        if (!tokensDirty || timerFlushQueued)
+            return;
+        timerFlushQueued = true;
+        serialize(async () => {
+            timerFlushQueued = false;
+            // Queued behind finish(), the sink may have sealed since the tick fired.
+            if (sealed)
+                return;
+            tokensDirty = false;
+            await flushTokens();
+        }).catch(error => {
+            // A refused bearer would be refused again every tick; the loop learns of
+            // it at its next structural event or finish.
+            if (error instanceof RunAuthError)
+                stopFlushTimer();
+            diag(`timer token flush failed: ${error instanceof Error ? error.message : String(error)}`);
+        });
+    }
     function assertWritable() {
         if (sealed) {
             throw new RunTerminalError('run is terminal server-side — refusing to append (Orizu records win)');
@@ -280,6 +330,7 @@ export function createRunEventSink(options) {
             // Run gone/terminal server-side: seal and stop (Orizu records win).
             if (response.status === 404 || response.status === 410) {
                 sealed = true;
+                terminatedServerSide = true;
                 diag(`append rejected (${response.status}) for ${eventType} — sealing sink (run terminal)`);
                 throw new RunTerminalError(`append rejected (${response.status}) — run is terminal server-side`);
             }
@@ -321,10 +372,10 @@ export function createRunEventSink(options) {
     // REENTRANCY CONTRACT: flushTokens MUST run to completion before the next
     // append()/flushTokens() begins — it is NOT safe to run concurrently with a
     // token append. Coalescing correctness (and the `===` re-check below) relies on
-    // the caller awaiting each append/flush strictly sequentially, so no newer
-    // delta can mutate `tokenBuffer` mid-flush. If a timer-based flush is ever added
-    // (see the interface note above), it MUST serialize against append — e.g. share
-    // a mutex/queue — or the drop-preserving guarantee breaks.
+    // every append/flush running strictly sequentially, so no newer delta can
+    // mutate `tokenBuffer` mid-flush. The public methods and the ORI-2340 timer
+    // flush all go through `serialize` to keep that true; any new caller of this
+    // inner function MUST too, or the drop-preserving guarantee breaks.
     async function flushTokens() {
         if (tokenBuffer.size === 0)
             return;
@@ -354,6 +405,11 @@ export function createRunEventSink(options) {
             const messageId = event.messageId ?? '_';
             const text = typeof event.payload.text === 'string' ? event.payload.text : '';
             tokenBuffer.set(messageId, text);
+            tokensDirty = true;
+            if (!flushTimer && !flushTimerStopped) {
+                flushTimer = setInterval(onFlushTick, options.tokenFlushMs ?? TOKEN_FLUSH_MS);
+                flushTimer.unref?.();
+            }
             return;
         }
         const eventType = eventTypeForKind(event.kind);
@@ -470,12 +526,15 @@ export function createRunEventSink(options) {
         }
     }
     return {
-        append,
-        flushTokens,
-        finish,
+        append: event => serialize(() => append(event)),
+        flushTokens: () => serialize(flushTokens),
+        finish: (status, opts) => serialize(() => finish(status, opts)),
         get sealed() {
             return sealed;
         },
+        get terminatedServerSide() {
+            return terminatedServerSide;
+        },
         get nextSequence() {
             return nextSequence;
         },
@@ -583,7 +642,9 @@ export async function drainHarnessToSink(events, sink, opts = {}) {
             : finishOpts;
         try {
             await sink.finish(status, mergedFinishOpts);
-            return status;
+            // A timer flush queued ahead of finish() can meet the server's 404/410
+            // after the check above; finish() then no-ops, so honour the server.
+            return sink.terminatedServerSide ? 'cancelled' : status;
         }
         catch (error) {
             if (error instanceof RunTerminalError)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orizu",
-  "version": "0.5.32",
+  "version": "0.5.33",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",

package/src/hosted-loop.ts

@@ -860,7 +860,10 @@ export async function runHostedLoop(opts: RunHostedLoopOptions): Promise<HostedL
         await sleep(delayMs)
         try {
           await sink.finish(error.intendedStatus, error.finishOptions)
-          return { status: error.intendedStatus, agentSessionId, installOk, error: null }
+          // A timer flush may have met the server's 404/410 during the sleep,
+          // making finish() a no-op: honour the server, as the drain does.
+          const status = sink.terminatedServerSide ? 'cancelled' : error.intendedStatus
+          return { status, agentSessionId, installOk, error: null }
         } catch (retryError) {
           // The run went terminal server-side while we were retrying: accept
           // the server record (Orizu records win) instead of retrying further.
@@ -873,8 +876,10 @@ export async function runHostedLoop(opts: RunHostedLoopOptions): Promise<HostedL
       }
       if (sink.sealed) {
         // A concurrent/preceding delivery landed after all — the record is
-        // terminal server-side with our intended status semantics preserved.
-        return { status: error.intendedStatus, agentSessionId, installOk, error: null }
+        // terminal server-side with our intended status semantics preserved —
+        // unless a timer flush met the server's 404/410 instead.
+        const status = sink.terminatedServerSide ? 'cancelled' : error.intendedStatus
+        return { status, agentSessionId, installOk, error: null }
       }
       return {
         status: error.intendedStatus,

package/src/hosted-run-event-sink.ts

@@ -128,12 +128,15 @@ export interface RunEventSink {
    *  Terminal kinds are rejected (they must go through `finish`). */
   append(event: HarnessEvent): Promise<void>
   /** Force-flush any coalesced token snapshots (also runs on every structural
-   *  event and on `finish`). Exposed so callers can flush on a timer if desired. */
+   *  event, on `finish`, and every `tokenFlushMs` while new tokens arrive). */
   flushTokens(): Promise<void>
   /** Terminal transition via PATCH; records the transcript tail first, then CAS. */
   finish(status: TerminalStatus, opts?: FinishOptions): Promise<void>
   /** True once a terminal transition has landed and the sink is sealed. */
   readonly sealed: boolean
+  /** True when an append met 404/410, i.e. the server ended the run, not this
+   *  writer's PATCH. A timer flush can learn this with no caller awaiting it. */
+  readonly terminatedServerSide: boolean
   /** The next sequence the sink will attempt to allocate (test/resume aid). */
   readonly nextSequence: number
   /** Events the sink has confirmed appended, in order (redacted payloads). */
@@ -251,8 +254,15 @@ export interface CreateRunEventSinkOptions {
   sleepImpl?: (ms: number) => Promise<void>
   /** Local diagnostic sink for disagreement-rule logs (never throws). */
   onDiagnostic?: (message: string) => void
+  /** How often buffered token snapshots are flushed while a reply is being
+   *  written (ORI-2340). Default TOKEN_FLUSH_MS. */
+  tokenFlushMs?: number
 }
 
+/** A text-only reply reaches the browser as growing snapshots at this cadence
+ *  instead of whole at the end of the turn (ORI-2340). */
+export const TOKEN_FLUSH_MS = 250 // held equal to SESSION_TIMERS.agentTokenFlushMs by test
+
 const DEFAULT_MAX_CRITICAL_ATTEMPTS = 4
 // Non-critical appends get a SMALL bounded retry so a single transient blip
 // (network reset / 5xx) does not drop the event — but on exhaustion they are
@@ -312,6 +322,50 @@ export function createRunEventSink(options: CreateRunEventSinkOptions): RunEvent
 
   let nextSequence = options.startSequence ?? 1
   let sealed = false
+  let terminatedServerSide = false
+
+  // One promise chain for every buffer-touching operation: append, flushTokens,
+  // finish and the timer flush below. This is how the timer honours the
+  // reentrancy contract on flushTokens — it queues behind an in-flight append
+  // or flush instead of running beside it. A rejected step reaches its own
+  // caller and never breaks the chain.
+  let queue: Promise<unknown> = Promise.resolve()
+  function serialize<T>(fn: () => Promise<T>): Promise<T> {
+    const run = queue.then(fn)
+    queue = run.catch(() => {})
+    return run
+  }
+
+  // ORI-2340 timer flush: started by the first token, unref'd so it never keeps
+  // the process alive, stopped for good once the sink seals or the bearer is
+  // refused. `tokensDirty` keeps a quiet tick (or a dropped snapshot with no
+  // newer text) from posting again.
+  let flushTimer: ReturnType<typeof setInterval> | null = null
+  let flushTimerStopped = false
+  let tokensDirty = false
+  let timerFlushQueued = false
+  function stopFlushTimer(): void {
+    flushTimerStopped = true
+    if (flushTimer) clearInterval(flushTimer)
+    flushTimer = null
+  }
+  function onFlushTick(): void {
+    if (sealed) return stopFlushTimer()
+    if (!tokensDirty || timerFlushQueued) return
+    timerFlushQueued = true
+    serialize(async () => {
+      timerFlushQueued = false
+      // Queued behind finish(), the sink may have sealed since the tick fired.
+      if (sealed) return
+      tokensDirty = false
+      await flushTokens()
+    }).catch(error => {
+      // A refused bearer would be refused again every tick; the loop learns of
+      // it at its next structural event or finish.
+      if (error instanceof RunAuthError) stopFlushTimer()
+      diag(`timer token flush failed: ${error instanceof Error ? error.message : String(error)}`)
+    })
+  }
 
   function assertWritable(): void {
     if (sealed) {
@@ -389,6 +443,7 @@ export function createRunEventSink(options: CreateRunEventSinkOptions): RunEvent
       // Run gone/terminal server-side: seal and stop (Orizu records win).
       if (response.status === 404 || response.status === 410) {
         sealed = true
+        terminatedServerSide = true
         diag(`append rejected (${response.status}) for ${eventType} — sealing sink (run terminal)`)
         throw new RunTerminalError(`append rejected (${response.status}) — run is terminal server-side`)
       }
@@ -434,10 +489,10 @@ export function createRunEventSink(options: CreateRunEventSinkOptions): RunEvent
   // REENTRANCY CONTRACT: flushTokens MUST run to completion before the next
   // append()/flushTokens() begins — it is NOT safe to run concurrently with a
   // token append. Coalescing correctness (and the `===` re-check below) relies on
-  // the caller awaiting each append/flush strictly sequentially, so no newer
-  // delta can mutate `tokenBuffer` mid-flush. If a timer-based flush is ever added
-  // (see the interface note above), it MUST serialize against append — e.g. share
-  // a mutex/queue — or the drop-preserving guarantee breaks.
+  // every append/flush running strictly sequentially, so no newer delta can
+  // mutate `tokenBuffer` mid-flush. The public methods and the ORI-2340 timer
+  // flush all go through `serialize` to keep that true; any new caller of this
+  // inner function MUST too, or the drop-preserving guarantee breaks.
   async function flushTokens(): Promise<void> {
     if (tokenBuffer.size === 0) return
     // Snapshot the pending entries but DO NOT clear the buffer up front: only drop
@@ -467,6 +522,11 @@ export function createRunEventSink(options: CreateRunEventSinkOptions): RunEvent
       const messageId = event.messageId ?? '_'
       const text = typeof event.payload.text === 'string' ? event.payload.text : ''
       tokenBuffer.set(messageId, text)
+      tokensDirty = true
+      if (!flushTimer && !flushTimerStopped) {
+        flushTimer = setInterval(onFlushTick, options.tokenFlushMs ?? TOKEN_FLUSH_MS)
+        flushTimer.unref?.()
+      }
       return
     }
     const eventType = eventTypeForKind(event.kind)
@@ -586,12 +646,15 @@ export function createRunEventSink(options: CreateRunEventSinkOptions): RunEvent
   }
 
   return {
-    append,
-    flushTokens,
-    finish,
+    append: event => serialize(() => append(event)),
+    flushTokens: () => serialize(flushTokens),
+    finish: (status, opts) => serialize(() => finish(status, opts)),
     get sealed() {
       return sealed
     },
+    get terminatedServerSide() {
+      return terminatedServerSide
+    },
     get nextSequence() {
       return nextSequence
     },
@@ -737,7 +800,9 @@ export async function drainHarnessToSink(
       : finishOpts
     try {
       await sink.finish(status, mergedFinishOpts)
-      return status
+      // A timer flush queued ahead of finish() can meet the server's 404/410
+      // after the check above; finish() then no-ops, so honour the server.
+      return sink.terminatedServerSide ? 'cancelled' : status
     } catch (error) {
       if (error instanceof RunTerminalError) return 'cancelled'
       throw error