@nauticana/sail 1.1.20 → 1.1.21

package/README.md

@@ -646,7 +646,7 @@ import { AgentStudioService, PromptLanguageEditorComponent, TurnStream } from '@
 | `sail-prompt-section-editor` | One section's layers in server order. Read-only layers render as text; editable ones edit `instruction`, `output`, `merge_mode`, `sealed`. A sealed layer locks every layer below it. Effective text is shown as received, never merged client-side; after a save, replace the whole draft with the response. |
 | `sail-release-sections` | Frozen sections of a release with the layer (`source`) that decided each. |
 | `sail-turn-event-list` | Renders typed turn events in frame order; proposal, result, effect, and approval of one call meet by `call_id`. Effect status `unknown` is its own state. Unknown kinds are ignored; `extension` events render only through `[extensionTemplate]`. |
-| `TurnStream` | Per-turn stream state: `accept(frame)` drops frames already rendered, `cursor()` is the resume point, `markReplayExpired()` + `acceptStoredResult(frame)` handle an expired replay window, `markCancelRequested()` holds `cancelling` until the final frame. |
+| `TurnStream` | Per-turn stream state: `accept(frame)` accepts Scout's zero-based frames and drops frames already rendered, `cursor()` is the next sequence wanted for inclusive replay, a suspension frame (`approval_pending`, even when marked final) sets `awaiting_approval` without advancing the cursor so the resumed frame at the same sequence is accepted, `markReplayExpired()` + `acceptStoredResult(frame)` handle an expired replay window, `markCancelRequested()` holds `cancelling` until the final frame. |
 | `sail-turn-stream-view` | `TurnStream` + event list + status + cancel button (`cancelRequested`). |
 | `sail-decision-timeline` | Read-only decision chain of one request, grouped by category. |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nauticana/sail",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "Metadata-driven Angular component library for CRUD admin frontends backed by the keel Go backend. Tables, forms, navigation, OTP/2FA/social auth, billing, payout onboarding.",
   "main": "src/index.ts",
   "exports": {

package/src/agent/service/turn_stream.ts

@@ -12,22 +12,29 @@ const terminalStatuses: ReadonlySet<TurnStreamStatus> = new Set(['completed', 'c
 export class TurnStream {
   private readonly frames = signal<TurnReplyFrame[]>([]);
   private readonly state = signal<TurnStreamStatus>('idle');
-  private readonly lastSequence = signal(0);
+  private readonly lastSequence = signal(-1);
+  private suspendedAt: number | null = null;
 
   readonly status = this.state.asReadonly();
-  /** Last sequence rendered; a reconnect resumes after it. */
-  readonly cursor = this.lastSequence.asReadonly();
+  /** Next zero-based sequence wanted by Scout's inclusive replay cursor. */
+  readonly cursor = computed(() => this.lastSequence() + 1);
   readonly events = computed<TurnEvent[]>(() => this.frames().flatMap((frame) => frame.events));
-  readonly finalFrame = computed(() => this.frames().find((frame) => frame.final));
+  readonly finalFrame = computed(() => this.frames().find((frame) => frame.final && !isSuspension(frame)));
   readonly isTerminal = computed(() => terminalStatuses.has(this.state()));
 
   constructor(readonly requestId: string) {}
 
-  /** Returns false for a frame of another turn, one already rendered, or one after the final. */
+  /**
+   * Returns false for a frame of another turn, one already rendered, or one after the final.
+   * A suspension frame does not advance the cursor: the resumed turn reuses its sequence.
+   */
   accept(frame: TurnReplyFrame): boolean {
     if (frame.request_id !== this.requestId || this.isTerminal()) return false;
     if (frame.sequence <= this.lastSequence()) return false;
-    this.lastSequence.set(frame.sequence);
+    const suspension = isSuspension(frame);
+    if (suspension && this.suspendedAt === frame.sequence) return false;
+    this.suspendedAt = suspension ? frame.sequence : null;
+    if (!suspension) this.lastSequence.set(frame.sequence);
     this.append(frame);
     return true;
   }
@@ -58,13 +65,16 @@ export class TurnStream {
   }
 
   private statusAfter(frame: TurnReplyFrame): TurnStreamStatus {
-    if (frame.final) {
+    if (frame.final && !isSuspension(frame)) {
       if (frame.error_code === TURN_ERROR_CANCELED) return 'canceled';
       return frame.error_code ? 'failed' : 'completed';
     }
     if (this.state() === 'cancelling') return 'cancelling';
-    // approval_pending ends the delivery, not the turn: resumed frames follow on the same stream.
-    const last = frame.events[frame.events.length - 1];
-    return last?.kind === 'approval_pending' ? 'awaiting_approval' : 'streaming';
+    return isSuspension(frame) ? 'awaiting_approval' : 'streaming';
   }
 }
+
+/** approval_pending ends the delivery, not the turn, even on a frame marked final with an error code. */
+function isSuspension(frame: TurnReplyFrame): boolean {
+  return frame.events[frame.events.length - 1]?.kind === 'approval_pending';
+}