@truefoundry/assistant-ui-runtime 0.1.7 → 0.1.8

package/dist/plugins/truefoundry-agent-server-adapter/index.d.ts

@@ -1,6 +1,6 @@
 import { AgentSessionClient } from 'truefoundry-gateway-sdk/agents';
 import { PrivateAgentSessionClient } from 'truefoundry-gateway-sdk/agents/private';
-import { A as AgentSpec, C as CreateSessionRequest, L as ListSessionsParams, S as Session, T as Turn, a as TurnState, b as AgentChatServer, U as UpdateSessionRequest } from '../../types-DbNsU075.js';
+import { A as AgentSpec, w as CreateSessionRequest, y as ListSessionsParams, S as Session, d as Turn, W as TurnState, a as AgentChatServer, a0 as UpdateSessionRequest, a2 as AgentSelectorEntry, a3 as ConnectorSelectorEntry, a4 as ModelSelectorEntry, a5 as SkillSelectorEntry, f as AgentBuilderServer } from '../../types-B_z-FsDS.js';
 import { TruefoundryGatewayApi } from 'truefoundry-gateway-sdk';
 
 /**
@@ -77,11 +77,89 @@ type TfyFinishReason = TruefoundryGatewayApi.FinishReason;
 type TfyThreadState = TruefoundryGatewayApi.ThreadState;
 type TfyMcpServerInitInfo = TruefoundryGatewayApi.McpServerInitInfo;
 
+type CreateTrueFoundryChatServerOptions = {
+    apiKey: string;
+    baseUrl: string;
+    /** Optional override — otherwise constructed from apiKey/baseUrl. */
+    client?: AgentSessionClient;
+    privateClient?: PrivateAgentSessionClient;
+    deleteSession?: (req: {
+        sessionId: string;
+    }) => Promise<void>;
+};
+/**
+ * Only the spec is generic. Session/Turn/list-params are the concrete Tfy*
+ * types because the adapter builds them as fixed object literals — a generic
+ * there would type fields that nothing ever populates. The spec is safe: the
+ * gateway SDK serializes with `unrecognizedObjectKeys: "passthrough"`, so
+ * host-added spec fields survive the round trip.
+ */
+type TrueFoundryChatServer<TSpec extends TfyAgentSpec = TfyAgentSpec> = AgentChatServer<TSpec, TfySession<TSpec>, TfyCreateSessionRequest<TSpec>, TfyListSessionsParams, UpdateSessionRequest<TSpec>, TfyTurn> & {
+    /** Escape hatch for hosts that still need raw gateway clients. */
+    getGatewayClients(): {
+        client: AgentSessionClient;
+        privateClient: PrivateAgentSessionClient;
+    };
+};
+/**
+ * Wraps TrueFoundry gateway clients into a flat `AgentChatServer`.
+ * Named vs draft routing is fully internal — an in-memory session-type cache
+ * (populated by createSession/listSessions) determines which gateway client
+ * to call, falling back to a one-time probe for ids seen only in a URL.
+ */
+declare function createTrueFoundryChatServer<TSpec extends TfyAgentSpec = TfyAgentSpec>(opts: CreateTrueFoundryChatServerOptions): TrueFoundryChatServer<TSpec>;
+
+/**
+ * Control Plane HTTP for builder catalog lists + gateway URL resolution.
+ *
+ * Wire shapes are host/CP contracts (not Fern / gateway SDK). Paths match
+ * ai.tf cpApi usage — expect drift; keep normalizers defensive.
+ */
+
+interface TfyModelSelectorEntry extends ModelSelectorEntry {
+    /** Write into AgentSpec.model.name (model_fqn). */
+    apiModel: string;
+    modelId: string;
+    providerAccount?: string;
+    id?: string;
+}
+interface TfySkillSelectorEntry extends SkillSelectorEntry {
+    /** Version FQN — mount as RegisteredSkillMount.fqn. */
+    fqn: string;
+}
+interface TfyConnectorSelectorEntry extends ConnectorSelectorEntry {
+    /** Mount as RegisteredMcpServer.name. */
+    mcpName: string;
+    serverId?: string | null;
+    authenticated?: boolean;
+}
+type TfyAgentSelectorEntry = AgentSelectorEntry;
+
+type CreateTrueFoundryAgentUIServerOptions = {
+    apiKey: string;
+    /** Control Plane base URL (builder lists + optional /session for gateway resolve). */
+    cpURL: string;
+    /**
+     * Gateway base URL. When omitted, resolved via
+     * `GET {cpURL}/api/svc/v1/session` → `{cpURL}{env.LLM_GATEWAY_URL ?? "/api/llm"}/{tenantName}`.
+     * Session failure throws (no silent public-gateway fallback).
+     */
+    gatewayURL?: string;
+};
+type TrueFoundryAgentUIServer<TSpec extends TfyAgentSpec = TfyAgentSpec> = TrueFoundryChatServer<TSpec> & AgentBuilderServer<TSpec, TfyModelSelectorEntry, TfySkillSelectorEntry, TfyConnectorSelectorEntry, TfyAgentSelectorEntry, unknown>;
+/**
+ * Full pack: gateway chat + Control Plane builder lists.
+ *
+ * Same `apiKey` bearer is used for CP and gateway. Concurrent calls with the
+ * same credentials share one in-flight promise (React Strict Mode safe).
+ */
+declare function createTrueFoundryAgentUIServer<TSpec extends TfyAgentSpec = TfyAgentSpec>(opts: CreateTrueFoundryAgentUIServerOptions): Promise<TrueFoundryAgentUIServer<TSpec>>;
+
 /**
  * Point-of-use narrowing for the event half of the gateway protocol.
  *
  * `AgentChatServer` hardcodes the runtime's event types on listEvents,
- * listTurnEvents, subscribeToTurn and prepareAndExecuteTurn — there is no
+ * listTurnEvents, subscribeToTurn and createTurn — there is no
  * generic to override them from here. So instead of typing those channels,
  * hosts call these guards on the values they receive.
  *
@@ -124,36 +202,4 @@ declare function getTfyMcpInitServers(event: {
     mcpServers?: unknown;
 } | null | undefined): TfyMcpServerInitInfo[] | undefined;
 
-type CreateTrueFoundryChatServerOptions = {
-    apiKey: string;
-    baseUrl: string;
-    /** Optional override — otherwise constructed from apiKey/baseUrl. */
-    client?: AgentSessionClient;
-    privateClient?: PrivateAgentSessionClient;
-    deleteSession?: (req: {
-        sessionId: string;
-    }) => Promise<void>;
-};
-/**
- * Only the spec is generic. Session/Turn/list-params are the concrete Tfy*
- * types because the adapter builds them as fixed object literals — a generic
- * there would type fields that nothing ever populates. The spec is safe: the
- * gateway SDK serializes with `unrecognizedObjectKeys: "passthrough"`, so
- * host-added spec fields survive the round trip.
- */
-type TrueFoundryChatServer<TSpec extends TfyAgentSpec = TfyAgentSpec> = AgentChatServer<TSpec, TfySession<TSpec>, TfyCreateSessionRequest<TSpec>, TfyListSessionsParams, UpdateSessionRequest<TSpec>, TfyTurn> & {
-    /** Escape hatch for hosts that still need raw gateway clients. */
-    getGatewayClients(): {
-        client: AgentSessionClient;
-        privateClient: PrivateAgentSessionClient;
-    };
-};
-/**
- * Wraps TrueFoundry gateway clients into a flat `AgentChatServer`.
- * Named vs draft routing is fully internal — an in-memory session-type cache
- * (populated by createSession/listSessions) determines which gateway client
- * to call, falling back to a one-time probe for ids seen only in a URL.
- */
-declare function createTrueFoundryChatServer<TSpec extends TfyAgentSpec = TfyAgentSpec>(opts: CreateTrueFoundryChatServerOptions): TrueFoundryChatServer<TSpec>;
-
-export { type CreateTrueFoundryChatServerOptions, type RequireApprovalToolSelectorItem, type RequireApprovalToolsSelectorTag, type TfyAgentSpec, type TfyCreateSessionRequest, type TfyFinishReason, type TfyListSessionsParams, type TfyMcpServerInitInfo, type TfyMcpServerMount, type TfyMcpToolInfo, type TfyModelMessageUsage, type TfyModelParams, type TfyResponseFormat, type TfyRuntimeConfig, type TfySession, type TfySkillMount, type TfySubject, type TfySystemToolInfo, type TfyThreadState, type TfyToolInfo, type TfyTurn, type TfyTurnCancelledReason, type TfyTurnState, type TfyTurnStateDoneOutput, type ToolsSelectorItem, type ToolsSelectorTag, type TrueFoundryChatServer, createTrueFoundryChatServer, getTfyMcpInitServers, getTfyThreadState, getTfyUsage, isTfyMcpToolInfo, isTfySystemToolInfo, isTfyToolInfo };
+export { type CreateTrueFoundryAgentUIServerOptions, type CreateTrueFoundryChatServerOptions, type RequireApprovalToolSelectorItem, type RequireApprovalToolsSelectorTag, type TfyAgentSelectorEntry, type TfyAgentSpec, type TfyConnectorSelectorEntry, type TfyCreateSessionRequest, type TfyFinishReason, type TfyListSessionsParams, type TfyMcpServerInitInfo, type TfyMcpServerMount, type TfyMcpToolInfo, type TfyModelMessageUsage, type TfyModelParams, type TfyModelSelectorEntry, type TfyResponseFormat, type TfyRuntimeConfig, type TfySession, type TfySkillMount, type TfySkillSelectorEntry, type TfySubject, type TfySystemToolInfo, type TfyThreadState, type TfyToolInfo, type TfyTurn, type TfyTurnCancelledReason, type TfyTurnState, type TfyTurnStateDoneOutput, type ToolsSelectorItem, type ToolsSelectorTag, type TrueFoundryAgentUIServer, type TrueFoundryChatServer, createTrueFoundryAgentUIServer, createTrueFoundryChatServer, getTfyMcpInitServers, getTfyThreadState, getTfyUsage, isTfyMcpToolInfo, isTfySystemToolInfo, isTfyToolInfo };

package/dist/plugins/truefoundry-agent-server-adapter/index.js

@@ -1,4 +1,5 @@
 import {
+  createTrueFoundryAgentUIServer,
   createTrueFoundryChatServer,
   getTfyMcpInitServers,
   getTfyThreadState,
@@ -6,8 +7,9 @@ import {
   isTfyMcpToolInfo,
   isTfySystemToolInfo,
   isTfyToolInfo
-} from "../../chunk-SQDOTGP2.js";
+} from "../../chunk-CXBZ6WLZ.js";
 export {
+  createTrueFoundryAgentUIServer,
   createTrueFoundryChatServer,
   getTfyMcpInitServers,
   getTfyThreadState,

package/dist/server/index.d.ts

@@ -1,5 +1,5 @@
-import { R as TurnStreamingEvent, Y as DeltaEvents, c as TurnEvent } from '../types-DbNsU075.js';
-export { Z as ActionRequiredEvent, h as AgentBuilderServer, b as AgentChatServer, _ as AgentInfo, $ as AgentParent, a0 as AgentSelectorEntry, A as AgentSpec, i as AgentUIServerPort, a1 as ApprovalDecision, j as CatalogServer, a2 as ChunkDeltaToolCall, k as ConnectorAuth, l as ConnectorAuthPublic, m as ConnectorAuthType, n as ConnectorBase, o as ConnectorCatalogEntry, p as ConnectorCatalogServer, q as ConnectorConfigBase, a3 as ConnectorSelectorEntry, r as CreateConnectorRequest, s as CreateModelProviderRequest, C as CreateSessionRequest, t as CreateSkillRequest, u as ListResult, a4 as ListSessionsOrder, L as ListSessionsParams, M as McpAuthRequiredEvent, a5 as McpInitializeEvent, a6 as McpServerAuthInfo, a7 as McpServerMount, a8 as Model, v as ModelCatalogServer, w as ModelEntry, a9 as ModelMessageContentPart, aa as ModelMessageDeltaEvent, x as ModelMessageEvent, ab as ModelParams, y as ModelProviderBase, z as ModelProviderCatalogEntry, B as ModelProviderConfigBase, ac as ModelSelectorEntry, ad as PageParams, P as PreviousTurnIdInput, D as ProviderType, E as SandboxCreatedEvent, ae as SearchAgentSelectorParams, S as Session, F as SessionEventItem, G as SkillBase, H as SkillCatalogServer, af as SkillMount, ag as SkillSelectorEntry, d as ThreadCreatedEvent, ah as ThreadDoneEvent, I as ToolApprovalRequiredEvent, J as ToolBase, K as ToolCall, ai as ToolCallFunction, aj as ToolCallRef, ak as ToolInfo, al as ToolResponseEvent, N as ToolResponseRequiredEvent, T as Turn, am as TurnCreatedEvent, an as TurnDoneEvent, g as TurnInputItem, a as TurnState, ao as TurnStateCancelled, O as TurnStateDone, ap as TurnStateError, aq as TurnStateRunning, Q as TurnStreamData, V as UpdateConnectorRequest, W as UpdateModelProviderRequest, U as UpdateSessionRequest, X as UserMessage, ar as UserMessageContent, f as UserToolApprovalEvent, e as UserToolResponseEvent } from '../types-DbNsU075.js';
+import { Z as TurnStreamingEvent, a6 as DeltaEvents, T as TurnEvent } from '../types-B_z-FsDS.js';
+export { a7 as ActionRequiredEvent, f as AgentBuilderServer, a as AgentChatServer, a8 as AgentInfo, a9 as AgentParent, a2 as AgentSelectorEntry, A as AgentSpec, g as AgentUIServerPort, aa as ApprovalDecision, C as CatalogServer, ab as ChunkDeltaToolCall, h as ConnectorAuth, i as ConnectorAuthApiKey, j as ConnectorAuthNone, k as ConnectorAuthOAuth, l as ConnectorAuthPublic, m as ConnectorAuthPublicApiKey, n as ConnectorAuthPublicNone, o as ConnectorAuthPublicOAuth, p as ConnectorAuthType, q as ConnectorBase, r as ConnectorCatalogEntry, s as ConnectorCatalogServer, t as ConnectorConfigBase, a3 as ConnectorSelectorEntry, u as CreateConnectorRequest, v as CreateModelProviderRequest, w as CreateSessionRequest, x as CreateSkillRequest, L as ListResult, ac as ListSessionsOrder, y as ListSessionsParams, M as McpAuthRequiredEvent, ad as McpInitializeEvent, ae as McpServerAuthInfo, af as McpServerMount, ag as Model, z as ModelCatalogServer, B as ModelEntry, ah as ModelMessageContentPart, ai as ModelMessageDeltaEvent, D as ModelMessageEvent, aj as ModelParams, E as ModelProviderBase, F as ModelProviderCatalogEntry, G as ModelProviderConfigBase, a4 as ModelSelectorEntry, ak as PageParams, P as PreviousTurnIdInput, H as ProviderType, I as SandboxCreatedEvent, al as SearchAgentSelectorParams, S as Session, J as SessionEventItem, K as SkillBase, N as SkillCatalogServer, am as SkillMount, a5 as SkillSelectorEntry, b as ThreadCreatedEvent, an as ThreadDoneEvent, O as ToolApprovalRequiredEvent, Q as ToolBase, R as ToolCall, ao as ToolCallFunction, ap as ToolCallRef, aq as ToolInfo, ar as ToolResponseEvent, V as ToolResponseRequiredEvent, d as Turn, as as TurnCreatedEvent, at as TurnDoneEvent, e as TurnInputItem, W as TurnState, au as TurnStateCancelled, X as TurnStateDone, av as TurnStateError, aw as TurnStateRunning, Y as TurnStreamData, _ as UpdateConnectorRequest, $ as UpdateModelProviderRequest, a0 as UpdateSessionRequest, a1 as UserMessage, ax as UserMessageContent, c as UserToolApprovalEvent, U as UserToolResponseEvent } from '../types-B_z-FsDS.js';
 
 /**
  * Local implementations of streaming delta helpers.

package/dist/{types-DbNsU075.d.ts → types-B_z-FsDS.d.ts}

@@ -398,7 +398,7 @@ interface AgentChatServer<TSpec extends AgentSpec = AgentSpec, TSession extends
         sessionId: string;
     }): Promise<TSession>;
     updateSession(req: TUpdate): Promise<TSession>;
-    prepareAndExecuteTurn(req: {
+    createTurn(req: {
         sessionId: string;
         input?: TurnInputItem[];
         previousTurnId?: PreviousTurnIdInput;
@@ -533,27 +533,33 @@ interface ToolBase {
     id: string;
     name: string;
 }
-/**
- * Auth type id. Reserved literals: `"None"`, `"OAuth"`, `"API Key"`.
- * Stays `string` so hosts can widen (same pattern as `ProviderType`).
- */
-type ConnectorAuthType = string;
-/**
- * Write-time connector auth. Host extends / narrows via `TType`.
- * For `"API Key"`, pass `apiKey` (and optional `headerName`).
- */
-interface ConnectorAuth<TType extends ConnectorAuthType = ConnectorAuthType> {
-    type: TType;
+/** Strict auth type id. Hosts widen branches via intersection + re-union. */
+type ConnectorAuthType = "oauth" | "apiKey" | "none";
+type ConnectorAuthOAuth = {
+    type: "oauth";
+    authUrl?: string;
+};
+type ConnectorAuthApiKey = {
+    type: "apiKey";
     apiKey?: string;
     headerName?: string;
-}
-/**
- * Catalog / list auth — no secrets. Host extends / narrows via `TType`.
- */
-interface ConnectorAuthPublic<TType extends ConnectorAuthType = ConnectorAuthType> {
-    type: TType;
+};
+type ConnectorAuthNone = {
+    type: "none";
+};
+type ConnectorAuth = ConnectorAuthOAuth | ConnectorAuthApiKey | ConnectorAuthNone;
+type ConnectorAuthPublicOAuth = {
+    type: "oauth";
+    authUrl: string;
+};
+type ConnectorAuthPublicApiKey = {
+    type: "apiKey";
     headerName?: string;
-}
+};
+type ConnectorAuthPublicNone = {
+    type: "none";
+};
+type ConnectorAuthPublic = ConnectorAuthPublicOAuth | ConnectorAuthPublicApiKey | ConnectorAuthPublicNone;
 /**
  * MCP / connector create-edit config. Host extends for extra fields, etc.
  */
@@ -572,6 +578,8 @@ interface ConnectorBase<TTool extends ToolBase = ToolBase, TAuth extends Connect
     description: string;
     url: string;
     auth: TAuth;
+    /** When true, UI should not show Disconnect. */
+    requiresAuth: boolean;
     authenticated: boolean;
     tools: TTool[];
 }
@@ -597,7 +605,10 @@ interface ConnectorCatalogServer<TTool extends ToolBase = ToolBase, TAuthWrite e
     createConnector(req: TCreate): Promise<TConnector>;
     /** Full replace update keyed by connector `id`. */
     updateConnector(req: TUpdate): Promise<TConnector>;
-    /** Start connector auth (e.g. OAuth). Host may widen return with `authUrl`. */
+    /**
+     * Start connector auth (e.g. OAuth).
+     * For oauth, the returned connector's `auth.authUrl` is the authorize URL.
+     */
     authenticateConnector(req: {
         id: string;
     }): Promise<TConnector>;
@@ -652,4 +663,4 @@ type AgentUIServerPort<TChat extends AgentChatServer = AgentChatServer, TBuilder
     catalog?: TCatalog;
 };
 
-export type { AgentParent as $, AgentSpec as A, ModelProviderConfigBase as B, CreateSessionRequest as C, ProviderType as D, SandboxCreatedEvent as E, SessionEventItem as F, SkillBase as G, SkillCatalogServer as H, ToolApprovalRequiredEvent as I, ToolBase as J, ToolCall as K, ListSessionsParams as L, McpAuthRequiredEvent as M, ToolResponseRequiredEvent as N, TurnStateDone as O, PreviousTurnIdInput as P, TurnStreamData as Q, TurnStreamingEvent as R, Session as S, Turn as T, UpdateSessionRequest as U, UpdateConnectorRequest as V, UpdateModelProviderRequest as W, UserMessage as X, DeltaEvents as Y, ActionRequiredEvent as Z, AgentInfo as _, TurnState as a, AgentSelectorEntry as a0, ApprovalDecision as a1, ChunkDeltaToolCall as a2, ConnectorSelectorEntry as a3, ListSessionsOrder as a4, McpInitializeEvent as a5, McpServerAuthInfo as a6, McpServerMount as a7, Model as a8, ModelMessageContentPart as a9, ModelMessageDeltaEvent as aa, ModelParams as ab, ModelSelectorEntry as ac, PageParams as ad, SearchAgentSelectorParams as ae, SkillMount as af, SkillSelectorEntry as ag, ThreadDoneEvent as ah, ToolCallFunction as ai, ToolCallRef as aj, ToolInfo as ak, ToolResponseEvent as al, TurnCreatedEvent as am, TurnDoneEvent as an, TurnStateCancelled as ao, TurnStateError as ap, TurnStateRunning as aq, UserMessageContent as ar, AgentChatServer as b, TurnEvent as c, ThreadCreatedEvent as d, UserToolResponseEvent as e, UserToolApprovalEvent as f, TurnInputItem as g, AgentBuilderServer as h, AgentUIServerPort as i, CatalogServer as j, ConnectorAuth as k, ConnectorAuthPublic as l, ConnectorAuthType as m, ConnectorBase as n, ConnectorCatalogEntry as o, ConnectorCatalogServer as p, ConnectorConfigBase as q, CreateConnectorRequest as r, CreateModelProviderRequest as s, CreateSkillRequest as t, ListResult as u, ModelCatalogServer as v, ModelEntry as w, ModelMessageEvent as x, ModelProviderBase as y, ModelProviderCatalogEntry as z };
+export type { UpdateModelProviderRequest as $, AgentSpec as A, ModelEntry as B, CatalogServer as C, ModelMessageEvent as D, ModelProviderBase as E, ModelProviderCatalogEntry as F, ModelProviderConfigBase as G, ProviderType as H, SandboxCreatedEvent as I, SessionEventItem as J, SkillBase as K, ListResult as L, McpAuthRequiredEvent as M, SkillCatalogServer as N, ToolApprovalRequiredEvent as O, PreviousTurnIdInput as P, ToolBase as Q, ToolCall as R, Session as S, TurnEvent as T, UserToolResponseEvent as U, ToolResponseRequiredEvent as V, TurnState as W, TurnStateDone as X, TurnStreamData as Y, TurnStreamingEvent as Z, UpdateConnectorRequest as _, AgentChatServer as a, UpdateSessionRequest as a0, UserMessage as a1, AgentSelectorEntry as a2, ConnectorSelectorEntry as a3, ModelSelectorEntry as a4, SkillSelectorEntry as a5, DeltaEvents as a6, ActionRequiredEvent as a7, AgentInfo as a8, AgentParent as a9, ApprovalDecision as aa, ChunkDeltaToolCall as ab, ListSessionsOrder as ac, McpInitializeEvent as ad, McpServerAuthInfo as ae, McpServerMount as af, Model as ag, ModelMessageContentPart as ah, ModelMessageDeltaEvent as ai, ModelParams as aj, PageParams as ak, SearchAgentSelectorParams as al, SkillMount as am, ThreadDoneEvent as an, ToolCallFunction as ao, ToolCallRef as ap, ToolInfo as aq, ToolResponseEvent as ar, TurnCreatedEvent as as, TurnDoneEvent as at, TurnStateCancelled as au, TurnStateError as av, TurnStateRunning as aw, UserMessageContent as ax, ThreadCreatedEvent as b, UserToolApprovalEvent as c, Turn as d, TurnInputItem as e, AgentBuilderServer as f, AgentUIServerPort as g, ConnectorAuth as h, ConnectorAuthApiKey as i, ConnectorAuthNone as j, ConnectorAuthOAuth as k, ConnectorAuthPublic as l, ConnectorAuthPublicApiKey as m, ConnectorAuthPublicNone as n, ConnectorAuthPublicOAuth as o, ConnectorAuthType as p, ConnectorBase as q, ConnectorCatalogEntry as r, ConnectorCatalogServer as s, ConnectorConfigBase as t, CreateConnectorRequest as u, CreateModelProviderRequest as v, CreateSessionRequest as w, CreateSkillRequest as x, ListSessionsParams as y, ModelCatalogServer as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truefoundry/assistant-ui-runtime",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "TrueFoundry Gateway agent runtime adapter for assistant-ui",
   "license": "Apache-2.0",
   "repository": {

package/src/convertTurnMessages.ts

@@ -516,6 +516,10 @@ function attachRunningTurn(
     if (runningTurn == null) {
         return snapshot;
     }
+    // Session-level history excludes the running turn. Apply continuation inputs
+    // from the turn listing so answered approvals / ask-user prompts are not
+    // restored as pending while reconnecting to that turn after a refresh.
+    applyUserToolResponsesToFold(snapshot.fold, runningTurn.input ?? []);
     const pendingUserText = extractTurnUserText(runningTurn.input);
     return replaceSessionSnapshot(snapshot, {
         runningTurn,

package/src/draft/truefoundryDraftThreadListAdapter.ts

@@ -61,7 +61,10 @@ export function createTrueFoundryDraftThreadListAdapter(options: {
         async rename() {},
         async archive() {},
         async unarchive() {},
-        async delete() {},
+        async delete(remoteId) {
+            if (typeof server.deleteSession !== "function") return;
+            await server.deleteSession({ sessionId: remoteId });
+        },
 
         async generateTitle() {
             return new ReadableStream();

package/src/harness.temp.ts

@@ -0,0 +1,85 @@
+/**
+ * TEMP — Harness / backend wire shapes for model-provider and MCP catalogs.
+ *
+ * Not part of the published FE contract. The gateway adapter (and these types)
+ * will live outside this repo; keep this file only as a scratch reference for
+ * hosts mapping wire → FE `CatalogServer` bases in `server/types.ts`.
+ *
+ * Do not import from package public exports.
+ */
+
+import type { ProviderType } from "./server/types.js";
+
+// ---------------------------------------------------------------------------
+// Models — harness wire
+// ---------------------------------------------------------------------------
+
+export interface HarnessModelProperties {
+    contextLength: number;
+    maxOutputTokens: number;
+    reasoningEfforts?: string[];
+}
+
+/** Model row as returned/accepted by the harness model-provider APIs. */
+export interface HarnessModelEntry {
+    modelId: string;
+    name: string;
+    properties: HarnessModelProperties;
+}
+
+export type HarnessModelProviderAuthWrite = { apiKey: string };
+export type HarnessModelProviderAuthRead = { apiKeySet: true };
+
+export interface HarnessModelProviderCatalogEntry {
+    /** Builtin catalog type — never `"custom"`. */
+    type: ProviderType;
+    name: string;
+    models: HarnessModelEntry[];
+}
+
+export interface HarnessModelProviderBase {
+    type: ProviderType;
+    name: string;
+    /** Present iff `type === "custom"`. */
+    baseUrl?: string;
+    models: HarnessModelEntry[];
+}
+
+export type HarnessUpdateModelProviderRequest = HarnessModelProviderBase & {
+    auth: HarnessModelProviderAuthWrite;
+};
+
+export type HarnessModelProvider = HarnessModelProviderBase & {
+    auth: HarnessModelProviderAuthRead;
+};
+
+/** Flat FQN read view for GET /models. */
+export interface HarnessCatalogModel {
+    /** `${providerName}/${model.name}` */
+    name: string;
+    modelId: string;
+    properties: HarnessModelProperties;
+}
+
+// ---------------------------------------------------------------------------
+// MCP — harness wire
+// ---------------------------------------------------------------------------
+
+export type HarnessMcpServerAuth = { type: "dcr" };
+
+export interface HarnessMcpServerCatalogEntry {
+    provider: string;
+    name: string;
+    url: string;
+    auth?: HarnessMcpServerAuth;
+}
+
+export type HarnessMcpServerAuthStatus =
+    | { status: "authenticated" }
+    | { status: "authRequired"; authorizationUrl: string };
+
+export interface HarnessConfiguredMcpServer extends HarnessMcpServerCatalogEntry {
+    authStatus: HarnessMcpServerAuthStatus;
+}
+
+export type HarnessUpdateMcpServerRequest = HarnessMcpServerCatalogEntry;

package/src/index.ts

@@ -101,7 +101,13 @@ export type {
     ModelCatalogServer,
     ToolBase,
     ConnectorAuthType,
+    ConnectorAuthOAuth,
+    ConnectorAuthApiKey,
+    ConnectorAuthNone,
     ConnectorAuth,
+    ConnectorAuthPublicOAuth,
+    ConnectorAuthPublicApiKey,
+    ConnectorAuthPublicNone,
     ConnectorAuthPublic,
     ConnectorConfigBase,
     ConnectorBase,
@@ -136,8 +142,15 @@ export { isEventDelta, mergeEventDelta } from "./server/index.js";
 
 export {
     createTrueFoundryChatServer,
+    createTrueFoundryAgentUIServer,
     type CreateTrueFoundryChatServerOptions,
     type TrueFoundryChatServer,
+    type CreateTrueFoundryAgentUIServerOptions,
+    type TrueFoundryAgentUIServer,
+    type TfyModelSelectorEntry,
+    type TfySkillSelectorEntry,
+    type TfyConnectorSelectorEntry,
+    type TfyAgentSelectorEntry,
     type TfyAgentSpec,
     type TfySkillMount,
     type TfyMcpServerMount,

package/src/plugins/truefoundry-agent-server-adapter/README.md

@@ -1,8 +1,11 @@
 # truefoundry-agent-server-adapter
 
-A gateway plugin that wraps [`truefoundry-gateway-sdk`](https://www.npmjs.com/package/truefoundry-gateway-sdk) into an [`AgentChatServer`](../../README.md#server-port-agentchatserver) for `@truefoundry/assistant-ui-runtime`.
+TrueFoundry **agent UI server** for `@truefoundry/assistant-ui-runtime`: gateway chat + Control Plane builder lists.
 
-Named vs draft session routing is internal — you pass `apiKey` / `baseUrl` (or pre-built clients) and get a flat server the runtime can call.
+- **Preferred:** `createTrueFoundryAgentUIServer` — chat + builder from `{ apiKey, cpURL, gatewayURL? }`
+- **Chat-only escape hatch:** `createTrueFoundryChatServer` — gateway sessions only (CLI / tests)
+
+The same API key bearer is used for Control Plane and gateway.
 
 ### Used by the [runtime Quick start](../../README.md#quick-start)
 
@@ -11,8 +14,11 @@ Named vs draft session routing is internal — you pass `apiKey` / `baseUrl` (or
 ## Table of contents
 
 - [Installation](#installation)
-- [Quick start](#quick-start)
-- [`createTrueFoundryChatServer` options](#createtruefoundrychatserver-options)
+- [Quick start (full pack)](#quick-start-full-pack)
+- [`createTrueFoundryAgentUIServer` options](#createtruefoundryagentuiserver-options)
+- [Gateway URL resolution](#gateway-url-resolution)
+- [Builder methods](#builder-methods)
+- [Chat-only: `createTrueFoundryChatServer`](#chat-only-createtruefoundrychatserver)
 - [Named vs draft sessions](#named-vs-draft-sessions)
 - [Types & guards](#types--guards)
 - [Extending `TfyAgentSpec`](#extending-tfyagentspec)
@@ -37,44 +43,82 @@ yarn add @truefoundry/assistant-ui-runtime truefoundry-gateway-sdk
 
 ---
 
-## Quick start
+## Quick start (full pack)
 
 ```tsx
-import { createTrueFoundryChatServer } from "@truefoundry/assistant-ui-runtime";
+import { createTrueFoundryAgentUIServer } from "@truefoundry/assistant-ui-runtime";
 // Isolated import (no React):
-// import { createTrueFoundryChatServer } from "@truefoundry/assistant-ui-runtime/plugins/truefoundry-agent-server-adapter";
+// import { createTrueFoundryAgentUIServer } from "@truefoundry/assistant-ui-runtime/plugins/truefoundry-agent-server-adapter";
 
-const server = createTrueFoundryChatServer({
+const server = await createTrueFoundryAgentUIServer({
   apiKey: process.env.TFY_API_KEY!,
-  baseUrl: process.env.TFY_GATEWAY_URL!,
+  cpURL: process.env.TFY_CP_URL!,
+  // gatewayURL: process.env.TFY_GATEWAY_URL, // optional
 });
 
-// Pass `server` to useTrueFoundryAgentRuntime({ server, agentName })
+// Pass `server` to TrueFoundryAssistantUI / useTrueFoundryAgentRuntime
 ```
 
-That returns a `TrueFoundryChatServer` implementing `AgentChatServer` with concrete `TfySession` / `TfyTurn` types.
+Returns `TrueFoundryAgentUIServer` = `AgentChatServer` & `AgentBuilderServer` (no settings `catalog`). Concurrent calls with the same credentials share one in-flight promise.
 
 ---
 
-## `createTrueFoundryChatServer` options
+## `createTrueFoundryAgentUIServer` options
 
 | Option | Type | Required | Description |
 | ------ | ---- | -------- | ----------- |
-| `apiKey` | `string` | ✅ | TrueFoundry API key |
-| `baseUrl` | `string` | ✅ | Gateway base URL |
-| `client` | `AgentSessionClient` | — | Override the named-session client (otherwise built from `apiKey` / `baseUrl`) |
-| `privateClient` | `PrivateAgentSessionClient` | — | Override the draft/private client |
-| `deleteSession` | `(req: { sessionId: string }) => Promise<void>` | — | Optional delete hook — not on the gateway SDK today; pass your own if needed |
+| `apiKey` | `string` | ✅ | Bearer for CP and gateway (same PAT) |
+| `cpURL` | `string` | ✅ | Control Plane base URL (builder lists + optional `/session`) |
+| `gatewayURL` | `string` | — | Gateway base URL; when omitted, resolved via CP session (see below) |
+
+---
+
+## Gateway URL resolution
+
+1. If `gatewayURL` is set → use it (no `/session` call)
+2. Else `GET {cpURL}/api/svc/v1/session` → `{cpURL}{env.LLM_GATEWAY_URL ?? "/api/llm"}/{tenantName}`
+3. If session fails or `tenantName` is missing → **throws** (no silent public-gateway fallback)
+
+Pass a public gateway explicitly when needed, e.g. `https://gateway.truefoundry.ai/<tenant>`.
+
+---
+
+## Builder methods
+
+Implemented against Control Plane HTTP (not the gateway SDK):
+
+| Method | CP path |
+| ------ | ------- |
+| `getModels` | `GET /api/svc/v1/llm-gateway/model/enabled` |
+| `getSkills` | `GET /api/ml/v1/agent-skills?include_empty_agent_skills=false` |
+| `getMcp` | `GET /api/svc/v1/mcp-servers` |
+| `searchAgents` | `GET /api/svc/v1/agents?type=truefoundry-agent&…` |
+| `saveAgent` | `PUT /api/svc/v1/agents` (`{ manifest }`, upsert by name) |
+
+Selector rows include TFY mount fields (`apiModel`, skill `fqn`, `mcpName`).
+
+---
+
+## Chat-only: `createTrueFoundryChatServer`
+
+For CLI / tests that only need sessions:
 
 ```tsx
+import { createTrueFoundryChatServer } from "@truefoundry/assistant-ui-runtime";
+
 const server = createTrueFoundryChatServer({
-  apiKey,
-  baseUrl,
-  // client, privateClient, deleteSession — optional overrides
+  apiKey: process.env.TFY_API_KEY!,
+  baseUrl: process.env.TFY_GATEWAY_URL!,
 });
 ```
 
-Escape hatch for hosts that still need raw gateway clients:
+| Option | Type | Required | Description |
+| ------ | ---- | -------- | ----------- |
+| `apiKey` | `string` | ✅ | TrueFoundry API key |
+| `baseUrl` | `string` | ✅ | Gateway base URL |
+| `client` | `AgentSessionClient` | — | Override the named-session client |
+| `privateClient` | `PrivateAgentSessionClient` | — | Override the draft/private client |
+| `deleteSession` | `(req: { sessionId: string }) => Promise<void>` | — | Optional delete hook |
 
 ```tsx
 const { client, privateClient } = server.getGatewayClients();
@@ -93,14 +137,10 @@ Routing is fully internal via an in-memory session-type cache populated by `crea
 
 `updateSession` is only allowed when `session.isMutable === true` (draft). Calling it on a named session throws.
 
-> Ensure `createSession` or `listSessions` ran before `getSession` / turn methods for a given id — the adapter must have cached the session type.
-
 ---
 
 ## Types & guards
 
-The plugin surfaces concrete gateway types for hosts that need them:
-
 ```tsx
 import type {
   TfyAgentSpec,
@@ -108,8 +148,9 @@ import type {
   TfyMcpServerMount,
   TfySession,
   TfyTurn,
-  TfyTurnState,
-  TfyToolInfo,
+  TfyModelSelectorEntry,
+  TfySkillSelectorEntry,
+  TfyConnectorSelectorEntry,
 } from "@truefoundry/assistant-ui-runtime";
 
 import {
@@ -122,8 +163,6 @@ import {
 } from "@truefoundry/assistant-ui-runtime";
 ```
 
-Use the type guards to narrow event fields typed as `unknown` by the runtime.
-
 ---
 
 ## Extending `TfyAgentSpec`
@@ -132,23 +171,20 @@ Only the **spec** is generic. Session / turn / list-params stay as concrete `Tfy
 
 ```tsx
 import {
-  createTrueFoundryChatServer,
+  createTrueFoundryAgentUIServer,
   type TfyAgentSpec,
-  type TrueFoundryChatServer,
+  type TrueFoundryAgentUIServer,
 } from "@truefoundry/assistant-ui-runtime";
 
 interface MySpec extends TfyAgentSpec {
   workspaceId: string;
-  deploymentId: string;
 }
 
-const server: TrueFoundryChatServer<MySpec> = createTrueFoundryChatServer<MySpec>({
-  apiKey,
-  baseUrl,
-});
-
-const session = await server.getSession({ sessionId: "ses_abc" });
-console.log(session.agentSpec?.workspaceId); // string | undefined
+const server: TrueFoundryAgentUIServer<MySpec> =
+  await createTrueFoundryAgentUIServer<MySpec>({
+    apiKey,
+    cpURL,
+  });
 ```
 
 ---
@@ -157,11 +193,14 @@ console.log(session.agentSpec?.workspaceId); // string | undefined
 
 | Export | Kind | Purpose |
 | ------ | ---- | ------- |
-| `createTrueFoundryChatServer` | Function | Build a `TrueFoundryChatServer` from gateway credentials / clients |
-| `CreateTrueFoundryChatServerOptions` | Type | Options bag above |
-| `TrueFoundryChatServer<TSpec>` | Type | `AgentChatServer` + `getGatewayClients()` |
+| `createTrueFoundryAgentUIServer` | Function | Full pack: chat + builder |
+| `CreateTrueFoundryAgentUIServerOptions` | Type | Options bag |
+| `TrueFoundryAgentUIServer<TSpec>` | Type | Chat + builder result |
+| `createTrueFoundryChatServer` | Function | Chat-only escape hatch |
+| `TrueFoundryChatServer<TSpec>` | Type | Chat-only result |
+| `TfyModelSelectorEntry`, … | Types | Builder selector rows |
 | `TfyAgentSpec`, `TfySession`, `TfyTurn`, … | Types | Concrete gateway DTOs |
-| `isTfyToolInfo`, `getTfyUsage`, … | Guards / helpers | Narrow / extract gateway event fields |
+| `isTfyToolInfo`, `getTfyUsage`, … | Guards | Narrow gateway event fields |
 
 Import path:
 
@@ -169,7 +208,7 @@ Import path:
 "@truefoundry/assistant-ui-runtime/plugins/truefoundry-agent-server-adapter"
 ```
 
-(or the main `@truefoundry/assistant-ui-runtime` entry, which re-exports these symbols).
+(or the main `@truefoundry/assistant-ui-runtime` entry).
 
 ---