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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truefoundry/assistant-ui-runtime",
-  "version": "0.1.3-rc.3",
+  "version": "0.1.5",
   "description": "TrueFoundry Gateway agent runtime adapter for assistant-ui",
   "license": "Apache-2.0",
   "repository": {
@@ -50,7 +50,7 @@
   "peerDependencies": {
     "@types/react": "*",
     "react": "^18 || ^19",
-    "truefoundry-gateway-sdk": "^0.3.2-rc.1"
+    "truefoundry-gateway-sdk": "^0.4.0-rc.5"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -63,7 +63,7 @@
     "@types/react": "^19.2.17",
     "jsdom": "^29.1.1",
     "react": "^19.2.4",
-    "truefoundry-gateway-sdk": "0.3.2-rc.1",
+    "truefoundry-gateway-sdk": "0.4.0-rc.5",
     "tsup": "^8.5.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.9"

package/src/buildEditedUserMessageContent.test.ts

@@ -12,11 +12,11 @@ describe("user message branch helpers", () => {
         expect(parseTurnIdFromMessageId("turn-abc-user")).toBe("turn-abc");
     });
 
-    it("resolveBranchPreviousTurnId returns null for the first turn", () => {
+    it("resolveBranchPreviousTurnId returns \"none\" for the first turn", () => {
         const turns: SessionTurnRecord[] = [
             { id: "a", createdAt: "", state: { status: "done", requiredActions: [], completedAt: "" } },
         ];
-        expect(resolveBranchPreviousTurnId(turns, "a")).toBeNull();
+        expect(resolveBranchPreviousTurnId(turns, "a")).toBe("none");
     });
 
     it("resolveBranchPreviousTurnId returns the prior turn id", () => {

package/src/convertTurnMessages.test.ts

@@ -178,7 +178,7 @@ async function sessionEventItemsFromTurns(
                 turnId: turn.id,
                 input: turn.input,
                 state: { status: "running" },
-                createdBy: { subjectId: "u1", subjectType: "user" },
+                createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                 createdAt: turn.createdAt,
             },
         });
@@ -636,7 +636,7 @@ describe("convertTurnMessages", () => {
                 input: [{ type: "user.message", content: "run tool" }],
                 state: {
                     status: "done",
-                    output: null,
+                    output: undefined,
                     requiredActions: [
                         approvalRequired({
                             id: "approval-event",
@@ -703,7 +703,7 @@ describe("convertTurnMessages", () => {
                 input: [{ type: "user.message", content: "run tool" }],
                 state: {
                     status: "done",
-                    output: null,
+                    output: undefined,
                     requiredActions: [
                         approvalRequired({
                             id: "approval-event",
@@ -787,7 +787,7 @@ describe("convertTurnMessages", () => {
                 input: [{ type: "user.message", content: "ask me" }],
                 state: {
                     status: "done",
-                    output: null,
+                    output: undefined,
                     requiredActions: [
                         responseRequired({
                             id: "resp-req-1",
@@ -859,7 +859,7 @@ describe("convertTurnMessages", () => {
                 input: [{ type: "user.message", content: "ask me" }],
                 state: {
                     status: "done",
-                    output: null,
+                    output: undefined,
                     requiredActions: [
                         responseRequired({
                             id: "resp-req-1",
@@ -2186,7 +2186,7 @@ describe("buildSnapshotFromSessionEvents", () => {
                     turnId: "t1",
                     input: [{ type: "user.message", content: "hello" }],
                     state: { status: "running" },
-                    createdBy: { subjectId: "u1", subjectType: "user" },
+                    createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                     createdAt,
                 },
             },
@@ -2241,7 +2241,7 @@ describe("buildSnapshotFromSessionEvents", () => {
                     turnId: "t1",
                     input: [{ type: "user.message", content: "first" }],
                     state: { status: "running" },
-                    createdBy: { subjectId: "u1", subjectType: "user" },
+                    createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                     createdAt,
                 },
             },
@@ -2286,7 +2286,7 @@ describe("buildSnapshotFromSessionEvents", () => {
                     turnId: "t1",
                     input: [{ type: "user.message", content: "first" }],
                     state: { status: "running" },
-                    createdBy: { subjectId: "u1", subjectType: "user" },
+                    createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                     createdAt,
                 },
             },
@@ -2311,7 +2311,7 @@ describe("buildSnapshotFromSessionEvents", () => {
                     turnId: "t2",
                     input: [{ type: "user.message", content: "second" }],
                     state: { status: "running" },
-                    createdBy: { subjectId: "u1", subjectType: "user" },
+                    createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                     createdAt,
                 },
             },
@@ -2380,7 +2380,7 @@ describe("buildSnapshotFromSessionEvents", () => {
                     turnId: id,
                     input: [{ type: "user.message", content: text }],
                     state: { status: "running" },
-                    createdBy: { subjectId: "u1", subjectType: "user" },
+                    createdBy: { subjectId: "u1", subjectType: "user", subjectSlug: "u1" },
                     createdAt,
                 },
             },

package/src/convertTurnMessages.ts

@@ -1276,24 +1276,24 @@ export async function buildSnapshotBeforeTurnIndex(
     return snapshot;
 }
 
-/** Gateway turn id to branch from when resubmitting at `turnIndex` (null for first turn). */
+/** Gateway turn id to branch from when resubmitting at `turnIndex` (`"none"` for first turn). */
 export async function resolveGatewayBranchPreviousTurnId(
     session: AgentSession,
     turnIndex: number,
     orderedTurns?: Turn[],
-): Promise<string | null> {
+): Promise<string> {
     if (turnIndex <= 0) {
-        return null;
+        return "none";
     }
     const turns = orderedTurns ?? (await listSessionTurnsOrdered(session));
-    return turns[turnIndex - 1]?.id ?? null;
+    return turns[turnIndex - 1]?.id ?? "none";
 }
 
 /** Resolves `previousTurnId` by turn id so partial history windows stay correct. */
 export async function resolveGatewayBranchPreviousTurnIdForTurn(
     session: AgentSession,
     turnId: string,
-): Promise<string | null> {
+): Promise<string> {
     const turns = await listSessionTurnsOrdered(session);
     const turnIndex = turns.findIndex((turn) => turn.id === turnId);
     return resolveGatewayBranchPreviousTurnId(session, turnIndex, turns);
@@ -1456,14 +1456,14 @@ export function parseTurnIdFromMessageId(messageId: string): string {
     return messageId.replace(/-user$/, "");
 }
 
-/** Parent turn id for branching before `turnId`; `null` when editing the first turn. */
+/** Parent turn id for branching before `turnId`; `"none"` when editing the first turn. */
 export function resolveBranchPreviousTurnId(
     turns: readonly SessionTurnRecord[],
     turnId: string,
-): string | null {
+): string {
     const turnIndex = turns.findIndex((turn) => turn.id === turnId);
     if (turnIndex <= 0) {
-        return null;
+        return "none";
     }
     return turns[turnIndex - 1]!.id;
 }

package/src/draftAgentConfig.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { mergeAgentSpec } from "./private/agentSpec.js";
+import { mergeAgentSpec, type AgentSpec } from "./private/agentSpec.js";
 import {
     resolveTrueFoundryAgentConfig,
     resolveTrueFoundryAgentRuntimeOptions,
@@ -80,14 +80,14 @@ describe("mergeAgentSpec", () => {
     });
 
     it("replaces mcpServers array wholesale", () => {
-        const base = {
+        const base: AgentSpec = {
             model: { name: "openai/gpt-4o" },
-            mcpServers: [{ name: "github", enableTools: ["@all"] }],
+            mcpServers: [{ type: "truefoundry-mcp-registry", name: "github", enableTools: ["@all"] }],
         };
         const next = mergeAgentSpec(base, {
-            mcpServers: [{ name: "slack", enableTools: ["@all"] }],
+            mcpServers: [{ type: "truefoundry-mcp-registry", name: "slack", enableTools: ["@all"] }],
         });
-        expect(next.mcpServers).toEqual([{ name: "slack", enableTools: ["@all"] }]);
+        expect(next.mcpServers).toEqual([{ type: "truefoundry-mcp-registry", name: "slack", enableTools: ["@all"] }]);
     });
 
     it("replaces skills array wholesale", () => {
@@ -102,9 +102,9 @@ describe("mergeAgentSpec", () => {
     });
 
     it("model partial update does not clear mcpServers or skills", () => {
-        const base = {
+        const base: AgentSpec = {
             model: { name: "openai/gpt-4o", params: { maxTokens: 1024 } },
-            mcpServers: [{ name: "github", enableTools: ["@all"] }],
+            mcpServers: [{ type: "truefoundry-mcp-registry", name: "github", enableTools: ["@all"] }],
             skills: [{ fqn: "acme/skill-a:1", preload: false }],
         };
         const next = mergeAgentSpec(base, {

package/src/foldPeerThreads.test.ts

@@ -142,7 +142,7 @@ describe("foldPeerThreads", () => {
                         id: "spawn-1",
                         type: "function",
                         function: { name: "create_sub_agent", arguments: "{}" },
-                    },
+                    toolInfo: { type: "truefoundry-system", name: "create_sub_agent" }, },
                 ],
             }),
         );

package/src/modelMessageImageContent.ts

@@ -74,7 +74,9 @@ function ensureModelMessageContentArray(message: ModelMessageEvent): void {
     if (Array.isArray(message.content)) {
         return;
     }
-    message.content = normalizeModelMessageContent(message);
+    // Gateway may stream `image_url` content blocks that aren't in the SDK content union yet.
+    (message as { content?: ModelMessageContentPart[] }).content =
+        normalizeModelMessageContent(message);
 }
 
 function mergeContentBlockDeltas(

package/src/private/truefoundryDraftThreadListAdapter.test.ts

@@ -104,7 +104,7 @@ describe("createTrueFoundryDraftThreadListAdapter", () => {
         const liveAgentSpec: AgentSpec = {
             model: { name: "anthropic/claude-opus-4-8" },
             instructions: "You are helpful.",
-            mcpServers: [{ name: "github", enableTools: ["@all"] }],
+            mcpServers: [{ type: "truefoundry-mcp-registry", name: "github", enableTools: ["@all"] }],
             skills: [{ fqn: "acme/skill-a:1", preload: false }],
         };
         const createDraftSession = vi.fn().mockResolvedValue(

package/src/streamTurn.test.ts

@@ -13,9 +13,9 @@ const createdAt = new Date().toISOString();
 
 function streamData(
     sequenceNumber: number,
-    event: TurnStreamData["event"],
+    event: TurnStreamData["event"] | Record<string, unknown>,
 ): TurnStreamData {
-    return { sequenceNumber, event };
+    return { sequenceNumber, event: event as TurnStreamData["event"] };
 }
 
 async function collectUpdates(
@@ -150,7 +150,7 @@ describe("streamTurn", () => {
             });
         });
 
-        it("omits previousTurnId when branching from root", async () => {
+        it("forwards previousTurnId \"none\" when branching from root", async () => {
             const execute = vi.fn(() => (async function* () {})());
             const prepareTurn = vi.fn(() => ({ execute }));
             const session = {
@@ -162,13 +162,14 @@ describe("streamTurn", () => {
                 streamTurnContent(
                     session,
                     new PeerThreadFoldState(),
-                    { userMessage: "first", previousTurnId: null },
+                    { userMessage: "first", previousTurnId: "none" },
                     new AbortController().signal,
                 ),
             );
 
             expect(prepareTurn).toHaveBeenCalledWith({
                 input: [{ type: "user.message", content: "first" }],
+                previousTurnId: "none",
             });
         });
 
@@ -248,6 +249,7 @@ describe("streamTurn", () => {
                                 status: "error",
                                 message:
                                     "Publisher Model is not servable in region us-central1.",
+                                completedAt: createdAt,
                             },
                         });
                     })(),
@@ -285,6 +287,7 @@ describe("streamTurn", () => {
                         createdAt,
                         state: {
                             status: "error",
+                            completedAt: createdAt,
                             message: "boom",
                         },
                     });

package/src/streamTurn.ts

@@ -1,9 +1,9 @@
-import {
-    type AgentSession,
-    type Turn,
-    type TurnInputItem,
-    TrueFoundryGatewayApi,
+import type {
+    AgentSession,
+    Turn,
+    TurnInputItem,
 } from "truefoundry-gateway-sdk/agents";
+import type { TruefoundryGatewayApi } from "truefoundry-gateway-sdk";
 
 import {
     streamTurnEvents,
@@ -18,10 +18,10 @@ export type StreamTurnOptions = {
     resumeMcpAuth?: boolean;
     inputs?: RequiredActionInput[];
     /**
-     * Branch anchor for `prepareTurn`. Omit for `"auto"`. Pass `null` for a fresh
-     * root turn — sent as `previous_turn_id: null` on the wire.
+     * Branch anchor for `prepareTurn`. Omit for `"auto"`. Pass `"none"` for a fresh
+     * root turn — sent as `previous_turn_id: "none"` on the wire.
      */
-    previousTurnId?: string | null;
+    previousTurnId?: TruefoundryGatewayApi.PreviousTurnIdInput;
     /** Extra headers for the createTurn request (`execute` request options). */
     headers?: Record<string, string>;
 };
@@ -62,18 +62,9 @@ export async function* streamTurnContent(
      */
     onTurnIdAvailable?: (turnId: string) => void,
 ): AsyncGenerator<TurnStreamUpdate> {
-    // 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
-            ? null
-            : (options.previousTurnId ?? "auto");
     const turn = session.prepareTurn({
         input: buildTurnInput(options),
-        ...(previousTurnId !== undefined
-            ? { previousTurnId: previousTurnId as TrueFoundryGatewayApi.PreviousTurnIdInput }
-            : {}),
+        previousTurnId: options.previousTurnId ?? "auto",
     });
 
     const onAbort = bindAbort(session, abortSignal);

package/src/truefoundryThreadListAdapter.ts

@@ -23,7 +23,7 @@ export function createTrueFoundryThreadListAdapter(options: {
             const threads = page.data.map((session) => ({
                 status: "regular" as const,
                 remoteId: session.id,
-                title: session.title,
+                title: session.title ?? undefined,
                 lastMessageAt: new Date(session.updatedAt),
             }));
             return {
@@ -42,7 +42,7 @@ export function createTrueFoundryThreadListAdapter(options: {
             return {
                 status: "regular" as const,
                 remoteId: session.id,
-                title: session.title,
+                title: session.title ?? undefined,
                 lastMessageAt: new Date(session.updatedAt),
             };
         },

package/src/useTrueFoundryAgentMessages.ts

@@ -80,7 +80,7 @@ export type UseTrueFoundryAgentMessagesOptions = {
 export type SendTurnOptions =
     | {
           userMessage: UserMessageContent;
-          previousTurnId?: string | null;
+          previousTurnId?: string;
           /**
            * When branching (edit/reset), the already-rewound history to send from.
            * Applied atomically with `pendingUser` so a stale React snapshot cannot
@@ -596,7 +596,7 @@ export function useTrueFoundryAgentMessages({
                 isContinuation && continuationTurnId != null
                     ? continuationTurnId
                     : generateId();
-            // First turns must send previousTurnId: null.
+            // First turns must send previousTurnId: "none".
             const isFirstTurnInSession =
                 "userMessage" in options &&
                 options.previousTurnId === undefined &&
@@ -697,7 +697,7 @@ export function useTrueFoundryAgentMessages({
                             ...(options.previousTurnId !== undefined
                                 ? { previousTurnId: options.previousTurnId }
                                 : isFirstTurnInSession
-                                  ? { previousTurnId: null }
+                                  ? { previousTurnId: "none" }
                                   : {}),
                             ...streamHeaders,
                         },

package/src/useTrueFoundryAgentRuntime.ts

@@ -30,7 +30,6 @@ import {
     createDraftSessionBridge,
     DRAFT_SESSION_LAST_UPDATED_AT_HEADER,
 } from "./private/draftSessionBridge.js";
-import { getGatewayFromPrivateClient } from "./private/getGatewayFromPrivateClient.js";
 import { MCP_AUTH_RESUME_RUN_CUSTOM_KEY } from "./mcpAuth.js";
 import { createTrueFoundryDraftThreadListAdapter } from "./private/truefoundryDraftThreadListAdapter.js";
 import { trueFoundryExtras } from "./truefoundryExtras.js";
@@ -164,9 +163,7 @@ function useTrueFoundryAgentRuntimeImpl(
                 onError?.(error);
                 throw error;
             }
-            // Same gateway.agents.downloadSandboxFile path as before, via the wrapped client.
-            const gateway = getGatewayFromPrivateClient(privateClient);
-            const response = await gateway.agents.downloadSandboxFile(sandboxId, { path });
+            const response = await privateClient.downloadSandboxFile(sandboxId, { path });
             return await response.blob();
         },
         [privateClient, sandboxId, onError],