@truefoundry/assistant-ui-runtime 0.1.15 → 0.1.17

package/src/convertTurnMessages.ts

@@ -1379,93 +1379,38 @@ export async function buildSnapshotFromSession(
     });
 }
 
-/** Rebuilds session state from turns strictly before `beforeTurnId` (excludes that turn). */
-export async function buildSnapshotBeforeTurn(
-    server: AgentChatServer,
-    sessionId: string,
-    beforeTurnId: string,
-    concurrency: number = DEFAULT_LIST_EVENTS_CONCURRENCY,
-): Promise<SessionSnapshot> {
-    const turns = await listSessionTurnsOrdered(server, sessionId);
-
-    const beforeIndex = turns.findIndex((turn) => turn.id === beforeTurnId);
-    if (beforeIndex === -1) {
-        throw new Error(`Turn ${beforeTurnId} not found in session`);
-    }
-
-    return buildSnapshotBeforeTurnIndex(
-        server,
-        sessionId,
-        beforeIndex,
-        concurrency,
-        turns,
-    );
-}
-
-/** Rebuilds session state from the first `turnIndex` turns (excludes that turn). */
-export async function buildSnapshotBeforeTurnIndex(
+/**
+ * Rebuilds the conversation through `anchorTurnId`, including that turn.
+ * The server follows parent links from the anchor, so turns from abandoned
+ * branches are excluded. A null anchor represents an empty conversation.
+ */
+export async function buildSnapshotThroughTurn(
     server: AgentChatServer,
     sessionId: string,
-    turnIndex: number,
-    _concurrency: number = DEFAULT_LIST_EVENTS_CONCURRENCY,
-    orderedTurns?: Turn[],
+    anchorTurnId: string | null,
 ): Promise<SessionSnapshot> {
-    if (turnIndex <= 0) {
+    if (anchorTurnId == null) {
         return createEmptySessionSnapshot();
     }
-
-    const turns = orderedTurns ?? (await listSessionTurnsOrdered(server, sessionId));
-    const turnsToInclude = turns.slice(0, turnIndex);
-    const lastTurnId = turnsToInclude.at(-1)?.id;
-    if (lastTurnId == null) {
-        return createEmptySessionSnapshot();
-    }
-
-    // Anchor the session events window at the newest included turn so the
-    // ancestor chain matches `[turns[0], …, turns[turnIndex - 1]]`.
-    const items = await fetchAllSessionEvents(server, sessionId, { lastTurnId });
+    const items = await fetchAllSessionEvents(server, sessionId, {
+        lastTurnId: anchorTurnId,
+    });
     const snapshot = createEmptySessionSnapshot();
     ingestSessionEventsIntoSnapshot(snapshot, items);
     return snapshot;
 }
 
-/** Turn id to branch from when resubmitting at `turnIndex` (`"none"` for first turn). */
-export async function resolveGatewayBranchPreviousTurnId(
-    server: AgentChatServer,
-    sessionId: string,
-    turnIndex: number,
-    orderedTurns?: Turn[],
-): Promise<string> {
-    if (turnIndex <= 0) {
-        return "none";
-    }
-    const turns = orderedTurns ?? (await listSessionTurnsOrdered(server, sessionId));
-    return turns[turnIndex - 1]?.id ?? "none";
-}
-
-/** Resolves `previousTurnId` by turn id so partial history windows stay correct. */
+/**
+ * Resolves `previousTurnId` for edit/retry of `turnId` from the turn's own
+ * parent pointer (`"none"` for roots). Independent of listTurns order.
+ */
 export async function resolveGatewayBranchPreviousTurnIdForTurn(
     server: AgentChatServer,
     sessionId: string,
     turnId: string,
 ): Promise<string> {
-    const turns = await listSessionTurnsOrdered(server, sessionId);
-    const turnIndex = turns.findIndex((turn) => turn.id === turnId);
-    return resolveGatewayBranchPreviousTurnId(server, sessionId, turnIndex, turns);
-}
-
-async function listSessionTurnsOrdered(
-    server: AgentChatServer,
-    sessionId: string,
-): Promise<Turn[]> {
-    const turns = await drainListPages((pageToken) =>
-        server.listTurns({
-            sessionId,
-            ...(pageToken != null ? { pageToken } : {}),
-        }),
-    );
-    turns.reverse();
-    return turns;
+    const turn = await server.getTurn({ sessionId, turnId });
+    return turn.previousTurnId ?? "none";
 }
 
 export async function buildTurnAssistantContent(

package/src/index.ts

@@ -143,6 +143,8 @@ export type {
     SandboxConfig,
     SandboxCatalogEntry,
     SandboxBase,
+    SandboxSnapshotSyncStatus,
+    SandboxProviderListEntry,
     CreateSandboxRequest,
     UpdateSandboxRequest,
     SandboxProviderConfig,

package/src/server/index.ts

@@ -83,6 +83,8 @@ export type {
     SandboxConfig,
     SandboxCatalogEntry,
     SandboxBase,
+    SandboxSnapshotSyncStatus,
+    SandboxProviderListEntry,
     CreateSandboxRequest,
     UpdateSandboxRequest,
     SandboxProviderConfig,

package/src/server/types.ts

@@ -10,7 +10,7 @@ import type {
   ActionRequiredEvent,
   SessionEventItem,
   TurnEvent,
-  TurnStreamData
+  TurnStreamData,
 } from "./events.js";
 
 // ---------------------------------------------------------------------------
@@ -74,19 +74,19 @@ export type SearchAgentSelectorParams = {
 // ---------------------------------------------------------------------------
 
 /**
-* Mounts written to AgentSpec.skills[] / AgentSpec.mcpServers[].
-*
-* These are opaque to the runtime — it stores and forwards them but never reads
-* a field, and the backend owns the shape (the gateway identifies a skill by
-* `fqn`, with no `id` or `name` anywhere). So the base constrains only that a
-* mount is an object; hosts intersect their concrete mount type over it, as
-* `TfySkillMount` / `TfyMcpServerMount` do in the gateway adapter.
-*
-* Naming a field here would not just be unread, it would be wrong: a base with
-* required fields rejects the backend's own payloads, and one with only optional
-* fields is a weak type, which TypeScript rejects for a source that shares no
-* property with it — the gateway's registry skill shares none.
-*/
+ * Mounts written to AgentSpec.skills[] / AgentSpec.mcpServers[].
+ *
+ * These are opaque to the runtime — it stores and forwards them but never reads
+ * a field, and the backend owns the shape (the gateway identifies a skill by
+ * `fqn`, with no `id` or `name` anywhere). So the base constrains only that a
+ * mount is an object; hosts intersect their concrete mount type over it, as
+ * `TfySkillMount` / `TfyMcpServerMount` do in the gateway adapter.
+ *
+ * Naming a field here would not just be unread, it would be wrong: a base with
+ * required fields rejects the backend's own payloads, and one with only optional
+ * fields is a weak type, which TypeScript rejects for a source that shares no
+ * property with it — the gateway's registry skill shares none.
+ */
 export type SkillMount = object;
 
 export type McpServerMount = object;
@@ -116,10 +116,10 @@ export interface AgentRuntimeConfig {
 }
 
 /**
-* SDK-owned agent definition — fields the FE reads/writes.
-* Host widens `model` / `skills` / `mcpServers` / `config` via type params,
-* and adds extra fields via `TSpec extends AgentSpec<...>`.
-*/
+ * SDK-owned agent definition — fields the FE reads/writes.
+ * Host widens `model` / `skills` / `mcpServers` / `config` via type params,
+ * and adds extra fields via `TSpec extends AgentSpec<...>`.
+ */
 export interface AgentSpec<
   TModel extends Model = Model,
   TSkill extends SkillMount = SkillMount,
@@ -193,7 +193,10 @@ export type PreviousTurnIdInput = "auto" | "none" | string;
 
 export type UserMessageContent =
   | string
-  | Array<{ type: "text"; text: string } | { type: "file"; name: string; data: string }>;
+  | Array<
+      | { type: "text"; text: string }
+      | { type: "file"; name: string; data: string }
+    >;
 
 export interface UserMessage {
   type: "user.message";
@@ -265,11 +268,11 @@ export interface Turn {
 // ---------------------------------------------------------------------------
 
 /**
-* Chat / session port — the runtime calls these.
-*
-* All session ops are flat (sessionId param). No gateway client dependency.
-* `createTrueFoundryServer` is one possible implementation (TFY adapter).
-*/
+ * Chat / session port — the runtime calls these.
+ *
+ * All session ops are flat (sessionId param). No gateway client dependency.
+ * `createTrueFoundryServer` is one possible implementation (TFY adapter).
+ */
 export interface AgentChatServer<
   TSpec extends AgentSpec = AgentSpec,
   TSession extends Session<TSpec> = Session<TSpec>,
@@ -284,44 +287,44 @@ export interface AgentChatServer<
   updateSession(req: TUpdate): Promise<TSession>;
 
   createTurn(req: {
-      sessionId: string;
-      input?: TurnInputItem[];
-      previousTurnId?: PreviousTurnIdInput;
-      abortSignal?: AbortSignal;
-      headers?: Record<string, string>;
+    sessionId: string;
+    input?: TurnInputItem[];
+    previousTurnId?: PreviousTurnIdInput;
+    abortSignal?: AbortSignal;
+    headers?: Record<string, string>;
   }): AsyncIterable<TurnStreamData>;
 
   cancelSession(req: { sessionId: string }): Promise<void>;
   deleteSession?(req: { sessionId: string }): Promise<void>;
 
   listTurns(req: {
-      sessionId: string;
-      limit?: number;
-      pageToken?: string;
-      order?: ListSessionsOrder;
+    sessionId: string;
+    limit?: number;
+    pageToken?: string;
+    order?: ListSessionsOrder;
   }): Promise<ListResult<TTurn>>;
   getTurn(req: { sessionId: string; turnId: string }): Promise<TTurn>;
   listEvents(req: {
-      sessionId: string;
-      pageToken?: string;
-      lastTurnId?: string;
-      limit?: number;
+    sessionId: string;
+    pageToken?: string;
+    lastTurnId?: string;
+    limit?: number;
   }): Promise<ListResult<SessionEventItem>>;
 
   /** Optional per-turn event listing (hydrate in-flight turn content). */
   listTurnEvents?(req: {
-      sessionId: string;
-      turnId: string;
-      limit?: number;
-      pageToken?: string;
-      order?: ListSessionsOrder;
+    sessionId: string;
+    turnId: string;
+    limit?: number;
+    pageToken?: string;
+    order?: ListSessionsOrder;
   }): Promise<ListResult<TurnEvent>>;
 
   subscribeToTurn?(req: {
-      sessionId: string;
-      turnId: string;
-      afterSequenceNumber?: number;
-      abortSignal?: AbortSignal;
+    sessionId: string;
+    turnId: string;
+    afterSequenceNumber?: number;
+    abortSignal?: AbortSignal;
   }): AsyncIterable<TurnStreamData>;
 
   /**
@@ -330,10 +333,10 @@ export interface AgentChatServer<
    * directly use `sandboxId`.
    */
   downloadSandboxFile?(req: {
-      sessionId: string;
-      turnId: string;
-      sandboxId: string;
-      path: string;
+    sessionId: string;
+    turnId: string;
+    sandboxId: string;
+    path: string;
   }): Promise<Blob>;
 }
 
@@ -365,9 +368,9 @@ export interface AgentBuilderCapabilitiesResponse {
 }
 
 /**
-* Builder catalog + persist port — atoms call these.
-* Passed separately from the runtime's chat server.
-*/
+ * Builder catalog + persist port — atoms call these.
+ * Passed separately from the runtime's chat server.
+ */
 export interface AgentBuilderServer<
   TSpec extends AgentSpec = AgentSpec,
   TModel extends ModelSelectorEntry = ModelSelectorEntry,
@@ -375,7 +378,8 @@ export interface AgentBuilderServer<
   TMcp extends ConnectorSelectorEntry = ConnectorSelectorEntry,
   TAgent extends AgentSelectorEntry = AgentSelectorEntry,
   TSave = SaveAgentResult,
-  TCapabilities extends AgentBuilderCapabilitiesResponse = AgentBuilderCapabilitiesResponse,
+  TCapabilities extends AgentBuilderCapabilitiesResponse =
+    AgentBuilderCapabilitiesResponse,
 > {
   getCapabilities(): Promise<TCapabilities>;
   getModels(): Promise<TModel[]>;
@@ -391,28 +395,30 @@ export interface AgentBuilderServer<
 // ---------------------------------------------------------------------------
 
 /**
-* Provider type id. Reserved literal: `"custom"` for user-defined providers;
-* any other string is a builtin (e.g. `"openai"`, `"anthropic"`).
-*
-* Note: `string | "custom"` is useless in TypeScript (`"custom"` ⊆ `string`),
-* so this stays `string` and `"custom"` is a documented convention.
-*/
+ * Provider type id. Reserved literal: `"custom"` for user-defined providers;
+ * any other string is a builtin (e.g. `"openai"`, `"anthropic"`).
+ *
+ * Note: `string | "custom"` is useless in TypeScript (`"custom"` ⊆ `string`),
+ * so this stays `string` and `"custom"` is a documented convention.
+ */
 export type ProviderType = string;
 
 /**
-* Model row — form "Model ID" + "Display name".
-* Host extends for properties, etc.
-*/
+ * Model row — form "Model ID" + "Display name".
+ * Host extends for properties, etc.
+ */
 export interface ModelEntry {
   id: string;
   name: string;
 }
 
 /**
-* Write config for create/update (custom form + catalog "Save key").
-* Host extends. `baseUrl` present iff `type === "custom"`.
-*/
-export interface ModelProviderConfigBase<TModel extends ModelEntry = ModelEntry> {
+ * Write config for create/update (custom form + catalog "Save key").
+ * Host extends. `baseUrl` present iff `type === "custom"`.
+ */
+export interface ModelProviderConfigBase<
+  TModel extends ModelEntry = ModelEntry,
+> {
   type: ProviderType;
   name: string;
   /** Present iff `type === "custom"`. */
@@ -422,9 +428,9 @@ export interface ModelProviderConfigBase<TModel extends ModelEntry = ModelEntry>
 }
 
 /**
-* Configured provider card (list/read). No raw `apiKey`.
-* Host extends for apiKeySet, timestamps, etc.
-*/
+ * Configured provider card (list/read). No raw `apiKey`.
+ * Host extends for apiKeySet, timestamps, etc.
+ */
 export interface ModelProviderBase<TModel extends ModelEntry = ModelEntry> {
   id: string;
   type: ProviderType;
@@ -435,11 +441,13 @@ export interface ModelProviderBase<TModel extends ModelEntry = ModelEntry> {
 }
 
 /**
-* Discovery-only catalog provider (AVAILABLE list).
-* `type` must not be `"custom"` — custom providers use the custom form.
-* Host extends for richer model rows.
-*/
-export interface ModelProviderCatalogEntry<TModel extends ModelEntry = ModelEntry> {
+ * Discovery-only catalog provider (AVAILABLE list).
+ * `type` must not be `"custom"` — custom providers use the custom form.
+ * Host extends for richer model rows.
+ */
+export interface ModelProviderCatalogEntry<
+  TModel extends ModelEntry = ModelEntry,
+> {
   type: ProviderType;
   name: string;
   models: TModel[];
@@ -458,9 +466,12 @@ export type UpdateModelProviderRequest<TModel extends ModelEntry = ModelEntry> =
 export interface ModelCatalogServer<
   TModel extends ModelEntry = ModelEntry,
   TProvider extends ModelProviderBase<TModel> = ModelProviderBase<TModel>,
-  TCatalogProvider extends ModelProviderCatalogEntry<TModel> = ModelProviderCatalogEntry<TModel>,
-  TCreate extends CreateModelProviderRequest<TModel> = CreateModelProviderRequest<TModel>,
-  TUpdate extends UpdateModelProviderRequest<TModel> = UpdateModelProviderRequest<TModel>,
+  TCatalogProvider extends ModelProviderCatalogEntry<TModel> =
+    ModelProviderCatalogEntry<TModel>,
+  TCreate extends CreateModelProviderRequest<TModel> =
+    CreateModelProviderRequest<TModel>,
+  TUpdate extends UpdateModelProviderRequest<TModel> =
+    UpdateModelProviderRequest<TModel>,
 > {
   getModelProviderCatalog(): Promise<TCatalogProvider[]>;
   listModelProviders(): Promise<TProvider[]>;
@@ -506,8 +517,8 @@ export type ConnectorAuthPublic =
   | ConnectorAuthPublicNone;
 
 /**
-* MCP / connector create-edit config. Host extends for extra fields, etc.
-*/
+ * MCP / connector create-edit config. Host extends for extra fields, etc.
+ */
 export interface ConnectorConfigBase<
   TAuth extends ConnectorAuth = ConnectorAuth,
 > {
@@ -547,12 +558,14 @@ export interface ConnectorCatalogEntry<
 }
 
 /** Create connector — no `id`; server assigns it. Host extends. */
-export type CreateConnectorRequest<TAuth extends ConnectorAuth = ConnectorAuth> =
-  ConnectorConfigBase<TAuth>;
+export type CreateConnectorRequest<
+  TAuth extends ConnectorAuth = ConnectorAuth,
+> = ConnectorConfigBase<TAuth>;
 
 /** Update connector — `id` required. Host extends. */
-export type UpdateConnectorRequest<TAuth extends ConnectorAuth = ConnectorAuth> =
-  ConnectorConfigBase<TAuth> & { id: string };
+export type UpdateConnectorRequest<
+  TAuth extends ConnectorAuth = ConnectorAuth,
+> = ConnectorConfigBase<TAuth> & { id: string };
 
 export interface AuthenticateConnectorRequest {
   id: string;
@@ -664,7 +677,6 @@ export interface SkillCatalogServer<
 
 /** Mutable sandbox provider settings shared by catalog rows, create, and update. */
 export interface SandboxConfig {
-  snapshotName: string;
   execTimeoutMs: number;
   autoStopIntervalInMinutes: number;
   autoArchiveIntervalInMinutes: number;
@@ -688,6 +700,18 @@ export interface SandboxBase extends SandboxConfig {
   isConnected: boolean;
 }
 
+export type SandboxSnapshotSyncStatus = {
+  status: "pending" | "ready" | "failed";
+  statusReason?: string | null;
+};
+
+export interface SandboxProviderListEntry<
+  TSandbox extends SandboxBase = SandboxBase,
+> {
+  data: TSandbox;
+  snapshotSyncStatus: SandboxSnapshotSyncStatus;
+}
+
 export interface CreateSandboxRequest extends SandboxConfig {
   /** `SandboxCatalogEntry.id` used to create this sandbox provider. */
   catalogId: string;
@@ -714,9 +738,11 @@ export interface SandboxCatalogServer<
   TCatalogEntry extends SandboxCatalogEntry = SandboxCatalogEntry,
   TCreate extends CreateSandboxRequest = CreateSandboxRequest,
   TUpdate extends UpdateSandboxRequest = UpdateSandboxRequest,
+  TListEntry extends SandboxProviderListEntry<TProvider> =
+    SandboxProviderListEntry<TProvider>,
 > {
   getSandboxProviderCatalog(): Promise<TCatalogEntry[]>;
-  listSandboxProviders(req?: { query?: string }): Promise<TProvider[]>;
+  listSandboxProviders(req?: { query?: string }): Promise<TListEntry[]>;
   createSandboxProvider(req: TCreate): Promise<TProvider>;
   updateSandboxProvider(req: TUpdate): Promise<TProvider>;
   deleteSandboxProvider?(req: { id: string }): Promise<void>;
@@ -730,10 +756,10 @@ export type AgentLibraryEntry = AgentSelectorEntry;
 export type SearchAgentsParams = SearchAgentSelectorParams;
 
 /**
-* Settings management aggregate — modelCatalog + connectorCatalog + optional
-* skill and sandbox catalogs.
-* Hosts may pass the whole object to an app shell, or a focused sub-port to a page.
-*/
+ * Settings management aggregate — modelCatalog + connectorCatalog + optional
+ * skill and sandbox catalogs.
+ * Hosts may pass the whole object to an app shell, or a focused sub-port to a page.
+ */
 export interface CatalogServer<
   TModelCatalog extends ModelCatalogServer = ModelCatalogServer,
   TConnectorCatalog extends ConnectorCatalogServer = ConnectorCatalogServer,

package/src/types.ts

@@ -28,7 +28,6 @@ type TrueFoundryAgentRuntimeBaseOptions = ExternalStoreSharedOptions & {
     threadId?: string | undefined;
     onThreadIdChange?: ((threadId: string | undefined) => void) | undefined;
     onError?: ((error: unknown) => void) | undefined;
-    listEventsConcurrency?: number | undefined;
     /**
      * Optional filter forwarded to `listSessions({ agentId })`.
      * Omit for all chats; hosts that key agents by name pass that name as the id.

package/src/useTrueFoundryAgentMessages.test.tsx

@@ -47,6 +47,7 @@ vi.mock("./convertTurnMessages.js", async (importOriginal) => {
 const mockServer = {
     cancelSession: vi.fn().mockResolvedValue(undefined),
     listTurns: vi.fn(),
+    getTurn: vi.fn(),
     // Present so resume-capable paths are exercised; resumeTurnStream is mocked.
     subscribeToTurn: vi.fn(),
 } as unknown as AgentChatServer;
@@ -429,6 +430,7 @@ describe("useTrueFoundryAgentMessages", () => {
             expect.any(PeerThreadFoldState),
             {
                 userMessage: "first",
+                previousTurnId: "none",
                 headers: {
                     "x-tfy-session-last-updated-at": "2026-06-30T12:00:00.000Z",
                 },
@@ -689,21 +691,22 @@ describe("useTrueFoundryAgentMessages", () => {
 
     it("editFromTurn drops prior turns before showing the edited user message", async () => {
         const createdAt = new Date().toISOString();
+        const rootTurn = {
+            id: "turn-1",
+            sessionId: "session-1",
+            createdAt,
+            previousTurnId: null,
+            state: {
+                status: "done" as const,
+                requiredActions: [],
+                completedAt: createdAt,
+            },
+            input: [{ type: "user.message" as const, content: "Hello" }],
+        } as Turn;
         vi.mocked(mockServer.listTurns).mockResolvedValue({
-            data: [
-                {
-                    id: "turn-1",
-                    sessionId: "session-1",
-                    createdAt,
-                    state: {
-                        status: "done",
-                        requiredActions: [],
-                        completedAt: createdAt,
-                    },
-                    input: [{ type: "user.message", content: "Hello" }],
-                } as Turn,
-            ],
+            data: [rootTurn],
         });
+        vi.mocked(mockServer.getTurn).mockResolvedValue(rootTurn);
         const fold = new PeerThreadFoldState();
         ingestTurnEvent(fold, {
             type: "model.message",
@@ -805,21 +808,22 @@ describe("useTrueFoundryAgentMessages", () => {
         const onError = vi.fn();
         const original = snapshotWithUserTurn("Hello");
         vi.mocked(loadSessionSnapshot).mockResolvedValue(original);
+        const rootTurn = {
+            id: "turn-1",
+            sessionId: "session-1",
+            createdAt,
+            previousTurnId: null,
+            state: {
+                status: "done" as const,
+                requiredActions: [],
+                completedAt: createdAt,
+            },
+            input: [{ type: "user.message" as const, content: "Hello" }],
+        } as Turn;
         vi.mocked(mockServer.listTurns).mockResolvedValue({
-            data: [
-                {
-                    id: "turn-1",
-                    sessionId: "session-1",
-                    createdAt,
-                    state: {
-                        status: "done",
-                        requiredActions: [],
-                        completedAt: createdAt,
-                    },
-                    input: [{ type: "user.message", content: "Hello" }],
-                } as Turn,
-            ],
+            data: [rootTurn],
         });
+        vi.mocked(mockServer.getTurn).mockResolvedValue(rootTurn);
         vi.mocked(streamTurnContent).mockImplementation(async function* () {
             throw new Error("Turn preparation failed");
         });

package/src/useTrueFoundryAgentMessages.ts

@@ -15,7 +15,7 @@ import type { AgentChatServer } from "./server/types.js";
 import { ROOT_THREAD_ID } from "./constants.js";
 import {
     buildEditedUserMessageContent,
-    buildSnapshotBeforeTurn,
+    buildSnapshotThroughTurn,
     computeGroupRootBaseline,
     extractTurnUserMessageContent,
     prependOlderSessionHistory,
@@ -60,7 +60,6 @@ export type UseTrueFoundryAgentMessagesOptions = {
     isMain?: boolean | undefined;
     /** URL-selected session may load before the thread list marks it as main. */
     isInitialSession?: boolean | undefined;
-    listEventsConcurrency?: number | undefined;
     onError?: ((error: unknown) => void) | undefined;
     initializeSession?: () => Promise<{
         remoteId: string;
@@ -293,7 +292,6 @@ export function useTrueFoundryAgentMessages({
     sessionId,
     isMain,
     isInitialSession,
-    listEventsConcurrency,
     onError,
     initializeSession,
     resolveConversationSessionId,
@@ -975,11 +973,12 @@ export function useTrueFoundryAgentMessages({
                     conversationSessionId,
                     turnId,
                 );
-                rewound = await buildSnapshotBeforeTurn(
+                // Rewind to the exact parent used for the new branch. Using the
+                // previous item from listTurns could select an abandoned branch.
+                rewound = await buildSnapshotThroughTurn(
                     server,
                     conversationSessionId,
-                    turnId,
-                    listEventsConcurrency,
+                    previousTurnId === "none" ? null : previousTurnId,
                 );
                 createdAtByMessageIdRef.current = new Map();
                 // Keep the ref aligned before awaiting sendTurn so any intermediate
@@ -1000,13 +999,7 @@ export function useTrueFoundryAgentMessages({
                 branchRollbackSnapshot: committed,
             });
         },
-        [
-            cancel,
-            server,
-            listEventsConcurrency,
-            sendTurn,
-            sessionId,
-        ],
+        [cancel, server, sendTurn, sessionId],
     );
 
     const resetFromTurn = useCallback(

package/src/useTrueFoundryAgentRuntime.ts

@@ -49,7 +49,6 @@ function useTrueFoundryAgentRuntimeImpl(
         agent,
         adapters,
         onError,
-        listEventsConcurrency,
         ...sharedOptions
     } = options;
 
@@ -126,7 +125,6 @@ function useTrueFoundryAgentRuntimeImpl(
         sessionId,
         isMain,
         isInitialSession,
-        listEventsConcurrency,
         onError,
         initializeSession,
         getTurnHeaders: agent.mode === "draft" ? getTurnHeaders : undefined,