@truefoundry/assistant-ui-runtime 0.1.3-rc.2 → 0.1.3-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truefoundry/assistant-ui-runtime",
-  "version": "0.1.3-rc.2",
+  "version": "0.1.3-rc.3",
   "description": "TrueFoundry Gateway agent runtime adapter for assistant-ui",
   "license": "Apache-2.0",
   "repository": {

package/src/streamTurn.test.ts

@@ -227,6 +227,91 @@ describe("streamTurn", () => {
                 },
             );
         });
+
+        it("notifies gateway turn id when turn.done errors with no content yields", async () => {
+            const gatewayTurnId = "01ky6mqzmczwt6ssyd5r02gjjc";
+            const turn = {
+                id: undefined as string | undefined,
+                execute: vi.fn(() =>
+                    (async function* () {
+                        // SDK sets turn.id when turn.created is observed.
+                        turn.id = gatewayTurnId;
+                        yield streamData(1, {
+                            type: "turn.created",
+                            createdAt,
+                            input: [{ type: "user.message", content: "hello" }],
+                        });
+                        yield streamData(2, {
+                            type: "turn.done",
+                            createdAt,
+                            state: {
+                                status: "error",
+                                message:
+                                    "Publisher Model is not servable in region us-central1.",
+                            },
+                        });
+                    })(),
+                ),
+            };
+            const prepareTurn = vi.fn(() => turn);
+            const session = {
+                prepareTurn,
+                cancel: vi.fn().mockResolvedValue(undefined),
+            } as unknown as AgentSession;
+            const onTurnIdAvailable = vi.fn();
+
+            await expect(
+                collectUpdates(
+                    streamTurnContent(
+                        session,
+                        new PeerThreadFoldState(),
+                        { userMessage: "hello" },
+                        new AbortController().signal,
+                        undefined,
+                        onTurnIdAvailable,
+                    ),
+                ),
+            ).rejects.toThrow("Publisher Model is not servable in region us-central1.");
+
+            expect(onTurnIdAvailable).toHaveBeenCalledTimes(1);
+            expect(onTurnIdAvailable).toHaveBeenCalledWith(gatewayTurnId);
+        });
+
+        it("does not notify when an error stream never assigns turn.id", async () => {
+            const execute = vi.fn(() =>
+                (async function* () {
+                    yield streamData(1, {
+                        type: "turn.done",
+                        createdAt,
+                        state: {
+                            status: "error",
+                            message: "boom",
+                        },
+                    });
+                })(),
+            );
+            const prepareTurn = vi.fn(() => ({ id: undefined, execute }));
+            const session = {
+                prepareTurn,
+                cancel: vi.fn().mockResolvedValue(undefined),
+            } as unknown as AgentSession;
+            const onTurnIdAvailable = vi.fn();
+
+            await expect(
+                collectUpdates(
+                    streamTurnContent(
+                        session,
+                        new PeerThreadFoldState(),
+                        { userMessage: "hello" },
+                        new AbortController().signal,
+                        undefined,
+                        onTurnIdAvailable,
+                    ),
+                ),
+            ).rejects.toThrow("boom");
+
+            expect(onTurnIdAvailable).not.toHaveBeenCalled();
+        });
     });
 
     describe("resumeTurnStream", () => {

package/src/streamTurn.ts

@@ -2,6 +2,7 @@ import {
     type AgentSession,
     type Turn,
     type TurnInputItem,
+    TrueFoundryGatewayApi,
 } from "truefoundry-gateway-sdk/agents";
 
 import {
@@ -18,7 +19,7 @@ export type StreamTurnOptions = {
     inputs?: RequiredActionInput[];
     /**
      * Branch anchor for `prepareTurn`. Omit for `"auto"`. Pass `null` for a fresh
-     * root turn (no `previousTurnId` field).
+     * root turn — sent as `previous_turn_id: null` on the wire.
      */
     previousTurnId?: string | null;
     /** Extra headers for the createTurn request (`execute` request options). */
@@ -61,13 +62,18 @@ export async function* streamTurnContent(
      */
     onTurnIdAvailable?: (turnId: string) => void,
 ): AsyncGenerator<TurnStreamUpdate> {
-    const previousTurnId =
+    // When previousTurnId is explicitly null, pass it through to prepareTurn so the
+    // SDK serializer emits `previous_turn_id: null` on the wire (first turn in session).
+    // The SDK type doesn't admit null, but the Fern serializer handles it correctly.
+    const previousTurnId: TrueFoundryGatewayApi.PreviousTurnIdInput | null | undefined =
         options.previousTurnId === null
-            ? undefined
+            ? null
             : (options.previousTurnId ?? "auto");
     const turn = session.prepareTurn({
         input: buildTurnInput(options),
-        ...(previousTurnId != null ? { previousTurnId } : {}),
+        ...(previousTurnId !== undefined
+            ? { previousTurnId: previousTurnId as TrueFoundryGatewayApi.PreviousTurnIdInput }
+            : {}),
     });
 
     const onAbort = bindAbort(session, abortSignal);
@@ -75,8 +81,15 @@ export async function* streamTurnContent(
         return;
     }
 
+    let turnIdNotified = false;
+    const notifyTurnIdIfAvailable = () => {
+        if (!turnIdNotified && turn.id != null) {
+            onTurnIdAvailable?.(turn.id);
+            turnIdNotified = true;
+        }
+    };
+
     try {
-        let turnIdNotified = false;
         for await (const update of streamTurnEvents(
             turn.execute(
                 { stream: true },
@@ -91,17 +104,17 @@ export async function* streamTurnContent(
             // After the first `turn.created` event, `turn.id` is set.
             // Notify BEFORE yielding so the caller can update its tracking
             // before the snapshot is written with the stream update.
-            if (!turnIdNotified && turn.id != null) {
-                onTurnIdAvailable?.(turn.id);
-                turnIdNotified = true;
-            }
+            notifyTurnIdIfAvailable();
             yield update;
         }
         // Handle streams that complete without yielding any content.
-        if (!turnIdNotified && turn.id != null) {
-            onTurnIdAvailable?.(turn.id);
-        }
+        notifyTurnIdIfAvailable();
     } catch (error) {
+        // Error streams often throw on `turn.done` (status=error) without ever
+        // yielding content (e.g. model not servable). `turn.id` is still set
+        // after `turn.created` — notify so edit/retry can resolve the turn.
+        // Same for AbortError after create: keep local ids aligned with gateway.
+        notifyTurnIdIfAvailable();
         if (error instanceof Error && error.name === "AbortError") {
             return;
         }

package/src/useTrueFoundryAgentMessages.ts

@@ -596,6 +596,13 @@ export function useTrueFoundryAgentMessages({
                 isContinuation && continuationTurnId != null
                     ? continuationTurnId
                     : generateId();
+            // First turns must send previousTurnId: null.
+            const isFirstTurnInSession =
+                "userMessage" in options &&
+                options.previousTurnId === undefined &&
+                snapshotRef.current.turns.length === 0 &&
+                snapshotRef.current.pendingUser == null &&
+                snapshotRef.current.activeStream == null;
 
             // Mutable ref so runStream always reads the latest ID. For new
             // user-message turns the local `generateId()` value is replaced
@@ -689,7 +696,9 @@ export function useTrueFoundryAgentMessages({
                             userMessage: options.userMessage,
                             ...(options.previousTurnId !== undefined
                                 ? { previousTurnId: options.previousTurnId }
-                                : {}),
+                                : isFirstTurnInSession
+                                  ? { previousTurnId: null }
+                                  : {}),
                             ...streamHeaders,
                         },
                         signal,