@truefoundry/assistant-ui-runtime 0.1.7 → 0.1.8

package/src/server/types.ts

@@ -249,7 +249,7 @@ export interface AgentChatServer<
     getSession(req: { sessionId: string }): Promise<TSession>;
     updateSession(req: TUpdate): Promise<TSession>;
 
-    prepareAndExecuteTurn(req: {
+    createTurn(req: {
         sessionId: string;
         input?: TurnInputItem[];
         previousTurnId?: PreviousTurnIdInput;
@@ -407,31 +407,33 @@ export interface ToolBase {
     name: string;
 }
 
-/**
- * Auth type id. Reserved literals: `"None"`, `"OAuth"`, `"API Key"`.
- * Stays `string` so hosts can widen (same pattern as `ProviderType`).
- */
-export type ConnectorAuthType = string;
+/** Strict auth type id. Hosts widen branches via intersection + re-union. */
+export type ConnectorAuthType = "oauth" | "apiKey" | "none";
 
-/**
- * Write-time connector auth. Host extends / narrows via `TType`.
- * For `"API Key"`, pass `apiKey` (and optional `headerName`).
- */
-export interface ConnectorAuth<TType extends ConnectorAuthType = ConnectorAuthType> {
-    type: TType;
+// Write (create/update) — export branches so hosts can intersect extras
+export type ConnectorAuthOAuth = { type: "oauth"; authUrl?: string };
+export type ConnectorAuthApiKey = {
+    type: "apiKey";
     apiKey?: string;
     headerName?: string;
-}
-
-/**
- * Catalog / list auth — no secrets. Host extends / narrows via `TType`.
- */
-export interface ConnectorAuthPublic<
-    TType extends ConnectorAuthType = ConnectorAuthType,
-> {
-    type: TType;
+};
+export type ConnectorAuthNone = { type: "none" };
+export type ConnectorAuth =
+    | ConnectorAuthOAuth
+    | ConnectorAuthApiKey
+    | ConnectorAuthNone;
+
+// Public (list/detail) — no secrets; oauth requires authUrl
+export type ConnectorAuthPublicOAuth = { type: "oauth"; authUrl: string };
+export type ConnectorAuthPublicApiKey = {
+    type: "apiKey";
     headerName?: string;
-}
+};
+export type ConnectorAuthPublicNone = { type: "none" };
+export type ConnectorAuthPublic =
+    | ConnectorAuthPublicOAuth
+    | ConnectorAuthPublicApiKey
+    | ConnectorAuthPublicNone;
 
 /**
  * MCP / connector create-edit config. Host extends for extra fields, etc.
@@ -457,6 +459,8 @@ export interface ConnectorBase<
     description: string;
     url: string;
     auth: TAuth;
+    /** When true, UI should not show Disconnect. */
+    requiresAuth: boolean;
     authenticated: boolean;
     tools: TTool[];
 }
@@ -500,7 +504,10 @@ export interface ConnectorCatalogServer<
     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>;
     /** Clear connector auth. */
     disconnectConnector(req: { id: string }): Promise<TConnector>;

package/src/streamTurn.test.ts

@@ -33,7 +33,7 @@ describe("streamTurn", () => {
     describe("streamTurnContent", () => {
         it("prepares a user turn and yields folded stream updates", async () => {
             const foldState = new PeerThreadFoldState();
-            const prepareAndExecuteTurn = vi.fn(async function* () {
+            const createTurn = vi.fn(async function* () {
                 yield streamData(1, {
                     type: "model.message",
                     createdAt,
@@ -43,7 +43,7 @@ describe("streamTurn", () => {
                 });
             });
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
 
@@ -57,7 +57,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: [{ type: "user.message", content: "hello" }],
                 previousTurnId: "auto",
@@ -68,7 +68,7 @@ describe("streamTurn", () => {
             ]);
         });
 
-        it("passes required-action inputs through prepareAndExecuteTurn", async () => {
+        it("passes required-action inputs through createTurn", async () => {
             const inputs = [
                 {
                     type: "user.tool_approval" as const,
@@ -83,9 +83,9 @@ describe("streamTurn", () => {
                     content: "A",
                 },
             ];
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+            const createTurn = vi.fn(async function* () {});
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
 
@@ -99,7 +99,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: inputs,
                 previousTurnId: "auto",
@@ -108,9 +108,9 @@ describe("streamTurn", () => {
         });
 
         it("uses empty input when resuming after MCP auth", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+            const createTurn = vi.fn(async function* () {});
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
 
@@ -124,7 +124,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: [],
                 previousTurnId: "auto",
@@ -133,9 +133,9 @@ describe("streamTurn", () => {
         });
 
         it("forwards an explicit previousTurnId when branching", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+            const createTurn = vi.fn(async function* () {});
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
 
@@ -149,7 +149,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: [{ type: "user.message", content: "edited" }],
                 previousTurnId: "turn-a",
@@ -158,9 +158,9 @@ describe("streamTurn", () => {
         });
 
         it("forwards previousTurnId \"none\" when branching from root", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+            const createTurn = vi.fn(async function* () {});
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
 
@@ -174,7 +174,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: [{ type: "user.message", content: "first" }],
                 previousTurnId: "none",
@@ -183,9 +183,9 @@ describe("streamTurn", () => {
         });
 
         it("returns early and cancels the session when already aborted", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+            const createTurn = vi.fn(async function* () {});
             const cancelSession = vi.fn().mockResolvedValue(undefined);
-            const server = mockServer({ prepareAndExecuteTurn, cancelSession });
+            const server = mockServer({ createTurn, cancelSession });
             const abortController = new AbortController();
             abortController.abort();
 
@@ -200,14 +200,14 @@ describe("streamTurn", () => {
             );
 
             expect(cancelSession).toHaveBeenCalledWith({ sessionId: SESSION_ID });
-            expect(prepareAndExecuteTurn).not.toHaveBeenCalled();
+            expect(createTurn).not.toHaveBeenCalled();
             expect(updates).toEqual([]);
         });
 
-        it("forwards headers to prepareAndExecuteTurn", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {});
+        it("forwards headers to createTurn", async () => {
+            const createTurn = vi.fn(async function* () {});
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
             const abortSignal = new AbortController().signal;
@@ -227,7 +227,7 @@ describe("streamTurn", () => {
                 ),
             );
 
-            expect(prepareAndExecuteTurn).toHaveBeenCalledWith({
+            expect(createTurn).toHaveBeenCalledWith({
                 sessionId: SESSION_ID,
                 input: [{ type: "user.message", content: "hello" }],
                 previousTurnId: "auto",
@@ -240,7 +240,7 @@ describe("streamTurn", () => {
 
         it("notifies gateway turn id when turn.done errors with no content yields", async () => {
             const gatewayTurnId = "01ky6mqzmczwt6ssyd5r02gjjc";
-            const prepareAndExecuteTurn = vi.fn(async function* () {
+            const createTurn = vi.fn(async function* () {
                 yield streamData(1, {
                     type: "turn.created",
                     createdAt,
@@ -261,7 +261,7 @@ describe("streamTurn", () => {
                 });
             });
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
             const onTurnIdAvailable = vi.fn();
@@ -285,7 +285,7 @@ describe("streamTurn", () => {
         });
 
         it("does not notify when an error stream never emits turn.created", async () => {
-            const prepareAndExecuteTurn = vi.fn(async function* () {
+            const createTurn = vi.fn(async function* () {
                 yield streamData(1, {
                     type: "turn.done",
                     createdAt,
@@ -298,7 +298,7 @@ describe("streamTurn", () => {
                 });
             });
             const server = mockServer({
-                prepareAndExecuteTurn,
+                createTurn,
                 cancelSession: vi.fn().mockResolvedValue(undefined),
             });
             const onTurnIdAvailable = vi.fn();

package/src/streamTurn.ts

@@ -18,7 +18,7 @@ export type StreamTurnOptions = {
     resumeMcpAuth?: boolean;
     inputs?: RequiredActionInput[];
     /**
-     * Branch anchor for prepareAndExecuteTurn. Omit for `"auto"`. Pass `"none"` for a fresh
+     * Branch anchor for createTurn. Omit for `"auto"`. Pass `"none"` for a fresh
      * root turn.
      */
     previousTurnId?: PreviousTurnIdInput;
@@ -79,7 +79,7 @@ export async function* streamTurnContent(
         }
     };
 
-    const stream: AsyncIterable<TurnStreamData> = server.prepareAndExecuteTurn({
+    const stream: AsyncIterable<TurnStreamData> = server.createTurn({
         sessionId,
         input: buildTurnInput(options),
         previousTurnId: options.previousTurnId ?? "auto",

package/src/truefoundryOwnedSessionsThreadListAdapter.ts

@@ -63,7 +63,10 @@ export function createTrueFoundryOwnedSessionsThreadListAdapter(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/truefoundryThreadListAdapter.test.ts

@@ -98,4 +98,26 @@ describe("createTrueFoundryThreadListAdapter", () => {
 
         expect(result.nextCursor).toBeUndefined();
     });
+
+    it("delete calls server.deleteSession when implemented", async () => {
+        const deleteSession = vi.fn().mockResolvedValue(undefined);
+        const server = mockServer({ deleteSession });
+        const adapter = createTrueFoundryThreadListAdapter({
+            server,
+            agentName: "my-agent",
+        });
+
+        await adapter.delete("s1");
+
+        expect(deleteSession).toHaveBeenCalledWith({ sessionId: "s1" });
+    });
+
+    it("delete is a no-op when server.deleteSession is missing", async () => {
+        const adapter = createTrueFoundryThreadListAdapter({
+            server: mockServer({}),
+            agentName: "my-agent",
+        });
+
+        await expect(adapter.delete("s1")).resolves.toBeUndefined();
+    });
 });

package/src/truefoundryThreadListAdapter.ts

@@ -50,7 +50,10 @@ export function createTrueFoundryThreadListAdapter(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/useTrueFoundryAgentMessages.test.tsx

@@ -994,7 +994,7 @@ describe("useTrueFoundryAgentMessages", () => {
     });
 
     describe("batched resume invariant", () => {
-        it("issues exactly one prepareAndExecuteTurn input batch across root and sub-agent threads", async () => {
+        it("issues exactly one createTurn input batch across root and sub-agent threads", async () => {
             vi.mocked(loadSessionSnapshot).mockResolvedValue(
                 snapshotWithAssistantMessage(assistantMessageWithMultiThreadPendingActions()),
             );

package/dist/chunk-SQDOTGP2.js

@@ -1,292 +0,0 @@
-// src/plugins/truefoundry-agent-server-adapter/index.ts
-import { AgentSessionClient } from "truefoundry-gateway-sdk/agents";
-import { PrivateAgentSessionClient } from "truefoundry-gateway-sdk/agents/private";
-
-// src/plugins/truefoundry-agent-server-adapter/guards.ts
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-function hasNumbers(value, keys) {
-  return isRecord(value) && keys.every((key) => typeof value[key] === "number");
-}
-function isTfySystemToolInfo(toolInfo) {
-  return isRecord(toolInfo) && toolInfo.type === "truefoundry-system" && typeof toolInfo.name === "string";
-}
-function isTfyMcpToolInfo(toolInfo) {
-  return isRecord(toolInfo) && toolInfo.type === "mcp" && typeof toolInfo.name === "string" && typeof toolInfo.serverId === "string" && typeof toolInfo.serverName === "string";
-}
-function isTfyToolInfo(toolInfo) {
-  return isTfySystemToolInfo(toolInfo) || isTfyMcpToolInfo(toolInfo);
-}
-var USAGE_BREAKDOWN_KEYS = [
-  "harness",
-  "skills",
-  "instructions",
-  "toolDefinitions",
-  "messages"
-];
-function getTfyUsage(source) {
-  const usage = source?.usage;
-  if (!hasNumbers(usage, ["inputTokens", "outputTokens"])) {
-    return void 0;
-  }
-  if (!hasNumbers(usage.inputTokensBreakdown, USAGE_BREAKDOWN_KEYS)) {
-    return void 0;
-  }
-  return usage;
-}
-function getTfyThreadState(event) {
-  const state = event?.state;
-  if (!isRecord(state)) {
-    return void 0;
-  }
-  if (state.status === "done" && isRecord(state.output)) {
-    return state;
-  }
-  if (state.status === "error" && typeof state.error === "string") {
-    return state;
-  }
-  return void 0;
-}
-function getTfyMcpInitServers(event) {
-  const servers = event?.mcpServers;
-  if (!Array.isArray(servers)) {
-    return void 0;
-  }
-  const valid = servers.every(
-    (server) => isRecord(server) && typeof server.id === "string" && typeof server.name === "string"
-  );
-  return valid ? servers : void 0;
-}
-
-// src/plugins/truefoundry-agent-server-adapter/index.ts
-function isNotFound(error) {
-  return typeof error === "object" && error !== null && error.statusCode === 404;
-}
-function isDraft(session) {
-  return session.type === "session/draft";
-}
-function toSession(raw) {
-  const mutable = isDraft(raw);
-  return {
-    id: raw.id,
-    title: raw.title,
-    agentName: raw.agentName,
-    ...mutable ? { agentSpec: raw.agentSpec } : {},
-    isMutable: mutable,
-    createdBySubject: raw.createdBySubject,
-    createdAt: raw.createdAt,
-    updatedAt: raw.updatedAt
-  };
-}
-function toTurn(raw) {
-  return {
-    id: raw.id,
-    sessionId: raw.sessionId,
-    previousTurnId: raw.previousTurnId,
-    input: raw.input,
-    state: raw.state,
-    createdBySubject: raw.createdBySubject,
-    createdAt: raw.createdAt
-  };
-}
-async function toListResult(page, map) {
-  const nextPageToken = page.response?.pagination?.nextPageToken;
-  return {
-    data: page.data.map(map),
-    ...nextPageToken != null && nextPageToken !== "" ? { nextPageToken } : {}
-  };
-}
-function createTrueFoundryChatServer(opts) {
-  const gatewayOpts = { apiKey: opts.apiKey, baseUrl: opts.baseUrl };
-  const client = opts.client ?? new AgentSessionClient(gatewayOpts);
-  const privateClient = opts.privateClient ?? new PrivateAgentSessionClient(gatewayOpts);
-  const sessionTypeCache = /* @__PURE__ */ new Map();
-  const sessionTypeProbes = /* @__PURE__ */ new Map();
-  function cacheSessionType(session) {
-    sessionTypeCache.set(session.id, session.isMutable);
-  }
-  async function probeSessionType(sessionId) {
-    const inflight = sessionTypeProbes.get(sessionId);
-    if (inflight != null) {
-      return inflight;
-    }
-    const probe = (async () => {
-      try {
-        await privateClient.getDraftSession({ draftSessionId: sessionId });
-        return true;
-      } catch (error) {
-        if (!isNotFound(error)) {
-          throw error;
-        }
-        await client.getSession({ sessionId });
-        return false;
-      }
-    })();
-    sessionTypeProbes.set(sessionId, probe);
-    try {
-      const isMutable = await probe;
-      sessionTypeCache.set(sessionId, isMutable);
-      return isMutable;
-    } finally {
-      sessionTypeProbes.delete(sessionId);
-    }
-  }
-  async function getSessionObj(sessionId) {
-    const isMutable = sessionTypeCache.get(sessionId) ?? await probeSessionType(sessionId);
-    return isMutable ? privateClient.getDraftSession({ draftSessionId: sessionId }) : client.getSession({ sessionId });
-  }
-  const server = {
-    async createSession(req) {
-      if (req.agentSpec != null) {
-        const draft = await privateClient.createDraftSession({
-          agentSpec: req.agentSpec,
-          ...req.agentName != null ? { agentName: req.agentName } : {},
-          ...req.tfyMetadata != null ? { tfyMetadata: req.tfyMetadata } : {}
-        });
-        const session = toSession(draft);
-        cacheSessionType(session);
-        return session;
-      }
-      if (req.agentName != null) {
-        const named = await client.createSession({
-          agentName: req.agentName,
-          ...req.tfyMetadata != null ? { tfyMetadata: req.tfyMetadata } : {}
-        });
-        const session = toSession(named);
-        cacheSessionType(session);
-        return session;
-      }
-      throw new Error("createSession requires agentName and/or agentSpec");
-    },
-    async listSessions(req) {
-      const page = await privateClient.listOwnedSessions({
-        limit: req?.limit,
-        order: req?.order,
-        pageToken: req?.pageToken,
-        startTimestamp: req?.startTimestamp,
-        endTimestamp: req?.endTimestamp,
-        ...req?.agentName != null ? { agentName: req.agentName } : {}
-      });
-      const result = await toListResult(page, (s) => toSession(s));
-      for (const session of result.data) {
-        cacheSessionType(session);
-      }
-      return result;
-    },
-    async getSession({ sessionId }) {
-      const raw = await getSessionObj(sessionId);
-      const session = toSession(raw);
-      cacheSessionType(session);
-      return session;
-    },
-    async updateSession(req) {
-      const raw = await getSessionObj(req.sessionId);
-      if (!isDraft(raw)) {
-        throw new Error(
-          "updateSession: session is not mutable (isMutable=false)"
-        );
-      }
-      if (req.agentSpec != null) {
-        await raw.update({ agentSpec: req.agentSpec });
-      }
-      return toSession(raw);
-    },
-    prepareAndExecuteTurn(req) {
-      return (async function* () {
-        const session = await getSessionObj(req.sessionId);
-        const prepared = session.prepareTurn({
-          input: req.input,
-          previousTurnId: req.previousTurnId ?? "auto"
-        });
-        yield* prepared.execute(
-          { stream: true },
-          {
-            ...req.abortSignal != null ? { abortSignal: req.abortSignal } : {},
-            ...req.headers != null ? { headers: req.headers } : {}
-          }
-        );
-      })();
-    },
-    async cancelSession({ sessionId }) {
-      await (await getSessionObj(sessionId)).cancel();
-    },
-    async deleteSession({ sessionId }) {
-      if (opts.deleteSession == null) {
-        throw new Error(
-          "deleteSession is not on the gateway SDK. Pass deleteSession to createTrueFoundryChatServer."
-        );
-      }
-      await opts.deleteSession({ sessionId });
-    },
-    // The runtime's signature offers `order`, but the gateway's listTurns
-    // takes no such param — forwarding it silently did nothing.
-    async listTurns({ sessionId, limit, pageToken }) {
-      const raw = await getSessionObj(sessionId);
-      const page = await raw.listTurns({
-        ...limit != null ? { limit } : {},
-        ...pageToken != null ? { pageToken } : {}
-      });
-      return toListResult(page, (turn) => toTurn(turn));
-    },
-    async getTurn({ sessionId, turnId }) {
-      const raw = await getSessionObj(sessionId);
-      return toTurn(await raw.getTurn({ turnId }));
-    },
-    async listEvents({ sessionId, pageToken, lastTurnId, limit }) {
-      const raw = await getSessionObj(sessionId);
-      const page = await raw.listEvents({
-        ...limit != null ? { limit } : {},
-        ...pageToken != null ? { pageToken } : {},
-        ...lastTurnId != null ? { lastTurnId } : {}
-      });
-      return toListResult(
-        page,
-        (item) => item
-      );
-    },
-    async listTurnEvents({ sessionId, turnId, limit, pageToken, order }) {
-      const raw = await getSessionObj(sessionId);
-      const turn = await raw.getTurn({ turnId });
-      const page = await turn.listEvents({
-        ...limit != null ? { limit } : {},
-        ...pageToken != null ? { pageToken } : {},
-        ...order != null ? { order } : {}
-      });
-      return toListResult(page, (event) => event);
-    },
-    async *subscribeToTurn({
-      sessionId,
-      turnId,
-      afterSequenceNumber,
-      abortSignal
-    }) {
-      const raw = await getSessionObj(sessionId);
-      const turn = await raw.getTurn({ turnId });
-      yield* turn.stream(
-        afterSequenceNumber != null ? { afterSequenceNumber } : {},
-        abortSignal != null ? { abortSignal } : {}
-      );
-    },
-    async downloadSandboxFile(sandboxId, req) {
-      const response = await privateClient.downloadSandboxFile(
-        sandboxId,
-        req
-      );
-      return await response.blob();
-    },
-    getGatewayClients: () => ({ client, privateClient })
-  };
-  return server;
-}
-
-export {
-  isTfySystemToolInfo,
-  isTfyMcpToolInfo,
-  isTfyToolInfo,
-  getTfyUsage,
-  getTfyThreadState,
-  getTfyMcpInitServers,
-  createTrueFoundryChatServer
-};
-//# sourceMappingURL=chunk-SQDOTGP2.js.map