@assistant-ui/react-google-adk 0.0.30 → 0.0.32

package/dist/AdkClient.d.ts

@@ -1,29 +1,28 @@
-import { AdkStreamCallback } from "./types.js";
-//#region src/AdkClient.d.ts
-type CreateAdkStreamOptions = {
-  /**
-   * URL to POST to. Either a proxy route (e.g. "/api/adk") or
-   * an ADK server base URL (e.g. "http://localhost:8000").
-   *
-   * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`
-   * in ADK-native format. Otherwise POSTs directly to `api` in proxy format
-   * (compatible with `parseAdkRequest`).
-   */
-  api: string;
-  /**
-   * ADK application name. When provided along with `userId`,
-   * enables direct connection to an ADK server.
-   */
-  appName?: string | undefined;
-  /**
-   * ADK user ID. Required when `appName` is provided.
-   */
-  userId?: string | undefined;
-  /**
-   * Extra headers to send with every request.
-   * Can be a static object or an async function for dynamic auth tokens.
-   */
-  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>) | undefined;
+import type { AdkStreamCallback } from "./types.js";
+export type CreateAdkStreamOptions = {
+    /**
+     * URL to POST to. Either a proxy route (e.g. "/api/adk") or
+     * an ADK server base URL (e.g. "http://localhost:8000").
+     *
+     * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`
+     * in ADK-native format. Otherwise POSTs directly to `api` in proxy format
+     * (compatible with `parseAdkRequest`).
+     */
+    api: string;
+    /**
+     * ADK application name. When provided along with `userId`,
+     * enables direct connection to an ADK server.
+     */
+    appName?: string | undefined;
+    /**
+     * ADK user ID. Required when `appName` is provided.
+     */
+    userId?: string | undefined;
+    /**
+     * Extra headers to send with every request.
+     * Can be a static object or an async function for dynamic auth tokens.
+     */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>) | undefined;
 };
 /**
  * Creates an `AdkStreamCallback` that connects to an ADK endpoint.
@@ -42,7 +41,5 @@ type CreateAdkStreamOptions = {
  * });
  * ```
  */
-declare function createAdkStream(options: CreateAdkStreamOptions): AdkStreamCallback;
-//#endregion
-export { CreateAdkStreamOptions, createAdkStream };
+export declare function createAdkStream(options: CreateAdkStreamOptions): AdkStreamCallback;
 //# sourceMappingURL=AdkClient.d.ts.map

package/dist/AdkClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdkClient.d.ts","names":[],"sources":["../src/AdkClient.ts"],"mappings":";;KAYY;;;;;;;;;EASV;;;;;EAMA;;;;EAKA;;;;;EAMA,UACI,gCACO,yBAAyB,QAAQ;;;;;;;;;;;;;;;;;;;iBAqB9B,gBACd,SAAS,yBACR"}
+{"version":3,"file":"AdkClient.d.ts","sourceRoot":"","sources":["../src/AdkClient.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAIV,iBAAiB,EAClB,mBAAgB;AAEjB,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;;;;;OAOG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;;OAGG;IACH,OAAO,CAAC,EACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChE,SAAS,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,GAC9B,iBAAiB,CAsDnB"}

package/dist/AdkClient.js

@@ -1,5 +1,6 @@
 import { contentToParts } from "./contentToParts.js";
 import { parseAdkEventValue } from "./parseAdkEvent.js";
+import { raceWithAbortSignal } from "./raceWithAbortSignal.js";
 import { toAdkFunctionResponse } from "./toAdkFunctionResponse.js";
 import { trimTrailingSlashes } from "./trimTrailingSlashes.js";
 import { SSEEventDecoder } from "assistant-stream/utils";
@@ -26,7 +27,7 @@ function createAdkStream(options) {
 	const isDirect = options.appName != null;
 	if (isDirect && (options.userId == null || options.userId === "")) throw new Error("createAdkStream direct mode requires \"userId\" when \"appName\" is provided.");
 	return async function* (messages, config) {
-		const headers = await resolveHeaders(options.headers);
+		const headers = await resolveHeaders(options.headers, config.abortSignal);
 		let url;
 		let body;
 		if (isDirect) {
@@ -75,9 +76,9 @@ function parseAdkEvent(data) {
 	}
 	return parseAdkEventValue(value, "Invalid ADK stream event");
 }
-async function resolveHeaders(headers) {
+async function resolveHeaders(headers, signal) {
 	if (!headers) return {};
-	if (typeof headers === "function") return await headers();
+	if (typeof headers === "function") return await raceWithAbortSignal(signal, headers);
 	return headers;
 }
 /**
@@ -144,6 +145,7 @@ function messagesToProxyBody(messages, config) {
 	return body;
 }
 async function* parseSSEResponse(response) {
+	if (!response.body) throw new Error("Expected ADK stream response body, received no body");
 	const reader = response.body.getReader();
 	const decoder = new TextDecoder();
 	const sseDecoder = new SSEEventDecoder({ trailing: "dispatch" });

package/dist/AdkClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdkClient.js","names":[],"sources":["../src/AdkClient.ts"],"sourcesContent":["import { SSEEventDecoder } from \"assistant-stream/utils\";\nimport { contentToParts } from \"./contentToParts\";\nimport { parseAdkEventValue } from \"./parseAdkEvent\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport { trimTrailingSlashes } from \"./trimTrailingSlashes\";\nimport type {\n  AdkEvent,\n  AdkEventPart,\n  AdkMessage,\n  AdkStreamCallback,\n} from \"./types\";\n\nexport type CreateAdkStreamOptions = {\n  /**\n   * URL to POST to. Either a proxy route (e.g. \"/api/adk\") or\n   * an ADK server base URL (e.g. \"http://localhost:8000\").\n   *\n   * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`\n   * in ADK-native format. Otherwise POSTs directly to `api` in proxy format\n   * (compatible with `parseAdkRequest`).\n   */\n  api: string;\n\n  /**\n   * ADK application name. When provided along with `userId`,\n   * enables direct connection to an ADK server.\n   */\n  appName?: string | undefined;\n\n  /**\n   * ADK user ID. Required when `appName` is provided.\n   */\n  userId?: string | undefined;\n\n  /**\n   * Extra headers to send with every request.\n   * Can be a static object or an async function for dynamic auth tokens.\n   */\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined;\n};\n\n/**\n * Creates an `AdkStreamCallback` that connects to an ADK endpoint.\n *\n * @example Proxy mode (with a Next.js API route)\n * ```ts\n * const stream = createAdkStream({ api: \"/api/adk\" });\n * ```\n *\n * @example Direct mode (connecting to ADK server)\n * ```ts\n * const stream = createAdkStream({\n *   api: \"http://localhost:8000\",\n *   appName: \"my-app\",\n *   userId: \"user-1\",\n * });\n * ```\n */\nexport function createAdkStream(\n  options: CreateAdkStreamOptions,\n): AdkStreamCallback {\n  if (options.appName === \"\") {\n    throw new Error(\n      'createAdkStream direct mode requires a non-empty \"appName\".',\n    );\n  }\n\n  const isDirect = options.appName != null;\n  if (isDirect && (options.userId == null || options.userId === \"\")) {\n    throw new Error(\n      'createAdkStream direct mode requires \"userId\" when \"appName\" is provided.',\n    );\n  }\n\n  return async function* (messages, config) {\n    const headers = await resolveHeaders(options.headers);\n\n    let url: string;\n    let body: unknown;\n\n    if (isDirect) {\n      // Direct mode: POST to ADK server's /run_sse\n      url = `${trimTrailingSlashes(options.api)}/run_sse`;\n      const { externalId } = await config.initialize();\n      body = {\n        appName: options.appName,\n        userId: options.userId,\n        sessionId: externalId,\n        newMessage: messagesToContent(messages),\n        streaming: true,\n        ...(config.stateDelta != null && { stateDelta: config.stateDelta }),\n      };\n    } else {\n      // Proxy mode: POST in parseAdkRequest-compatible format\n      url = options.api;\n      body = messagesToProxyBody(messages, config);\n    }\n\n    const response = await fetch(url, {\n      method: \"POST\",\n      headers: { \"Content-Type\": \"application/json\", ...headers },\n      body: JSON.stringify(body),\n      signal: config.abortSignal,\n    });\n\n    if (!response.ok) {\n      throw new Error(\n        `ADK request failed: ${response.status} ${response.statusText}`,\n      );\n    }\n\n    validateEventStreamContentType(response);\n    yield* parseSSEResponse(response);\n  };\n}\n\n// ── Internal helpers ──\n\nfunction validateEventStreamContentType(response: Response): void {\n  const contentType = response.headers.get(\"Content-Type\");\n  const mediaType = contentType?.split(\";\", 1)[0]?.trim().toLowerCase();\n  if (mediaType !== \"text/event-stream\") {\n    const received = contentType\n      ? `\"${contentType}\"`\n      : \"no Content-Type header\";\n    void response.body?.cancel().catch(() => undefined);\n    throw new Error(\n      `Expected ADK stream response Content-Type \"text/event-stream\", received ${received}`,\n    );\n  }\n}\n\nfunction parseAdkEvent(data: string): AdkEvent {\n  let value: unknown;\n  try {\n    value = JSON.parse(data);\n  } catch {\n    throw new Error(\"Invalid ADK stream event: expected valid JSON.\");\n  }\n\n  return parseAdkEventValue(value, \"Invalid ADK stream event\");\n}\n\nasync function resolveHeaders(\n  headers:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined,\n): Promise<Record<string, string>> {\n  if (!headers) return {};\n  if (typeof headers === \"function\") return await headers();\n  return headers;\n}\n\n/**\n * Converts AdkMessage[] (new messages) into ADK Content format\n * for the direct `/run_sse` endpoint.\n */\nfunction messagesToContent(messages: AdkMessage[]): {\n  role: string;\n  parts: AdkEventPart[];\n} {\n  const parts: AdkEventPart[] = [];\n\n  for (const msg of messages) {\n    if (msg.type === \"human\") {\n      for (const part of contentToParts(msg.content)) {\n        parts.push(part);\n      }\n    } else if (msg.type === \"tool\") {\n      let response: unknown;\n      try {\n        response = JSON.parse(msg.content);\n      } catch {\n        response = msg.content;\n      }\n      parts.push({\n        functionResponse: {\n          name: msg.name,\n          id: msg.tool_call_id,\n          response: toAdkFunctionResponse(response, msg.status === \"error\"),\n        },\n      });\n    }\n  }\n\n  if (parts.length === 0) {\n    parts.push({ text: \"\" });\n  }\n\n  return { role: \"user\", parts };\n}\n\n/**\n * Converts AdkMessage[] into the proxy request body format\n * (compatible with `parseAdkRequest`).\n */\nfunction messagesToProxyBody(\n  messages: AdkMessage[],\n  config: {\n    runConfig?: unknown;\n    checkpointId?: string | undefined;\n    stateDelta?: Record<string, unknown> | undefined;\n  },\n): Record<string, unknown> {\n  const body: Record<string, unknown> = {};\n\n  if (config.runConfig != null) body.runConfig = config.runConfig;\n  if (config.checkpointId != null) body.checkpointId = config.checkpointId;\n  if (config.stateDelta != null) body.stateDelta = config.stateDelta;\n\n  // Check if there's a tool result\n  const toolMsg = messages.find((m) => m.type === \"tool\");\n  if (toolMsg && toolMsg.type === \"tool\") {\n    // If there are also other messages (e.g. cancellations), send as parts\n    if (messages.length > 1) {\n      body.parts = messagesToContent(messages).parts;\n      return body;\n    }\n\n    let result: unknown;\n    try {\n      result = JSON.parse(toolMsg.content);\n    } catch {\n      result = toolMsg.content;\n    }\n    body.type = \"tool-result\";\n    body.toolCallId = toolMsg.tool_call_id;\n    body.toolName = toolMsg.name;\n    body.result = result;\n    body.isError = toolMsg.status === \"error\";\n    return body;\n  }\n\n  // Human message(s) - possibly with cancellation tool results prepended\n  if (messages.length === 1 && messages[0]!.type === \"human\") {\n    const msg = messages[0]!;\n    if (typeof msg.content === \"string\") {\n      body.message = msg.content;\n    } else {\n      body.parts = contentToParts(msg.content);\n    }\n    return body;\n  }\n\n  // Multiple messages (e.g. cancellations + human): send as parts array\n  body.parts = messagesToContent(messages).parts;\n  return body;\n}\n\nasync function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {\n  const reader = response.body!.getReader();\n  const decoder = new TextDecoder();\n  const sseDecoder = new SSEEventDecoder({ trailing: \"dispatch\" });\n\n  let shouldCancel = true;\n  try {\n    while (true) {\n      let result: ReadableStreamReadResult<Uint8Array>;\n      try {\n        result = await reader.read();\n      } catch (error) {\n        shouldCancel = false;\n        throw error;\n      }\n\n      const { done, value } = result;\n      if (done) {\n        shouldCancel = false;\n        for (const event of sseDecoder.push(decoder.decode())) {\n          yield parseAdkEvent(event.data);\n        }\n        break;\n      }\n\n      for (const event of sseDecoder.push(\n        decoder.decode(value, { stream: true }),\n      )) {\n        yield parseAdkEvent(event.data);\n      }\n    }\n\n    const trailing = sseDecoder.flush();\n    if (trailing !== null) yield parseAdkEvent(trailing.data);\n  } finally {\n    try {\n      if (shouldCancel) await reader.cancel().catch(() => undefined);\n    } finally {\n      reader.releaseLock();\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"AdkClient.js","names":[],"sources":["../src/AdkClient.ts"],"sourcesContent":["import { SSEEventDecoder } from \"assistant-stream/utils\";\nimport { contentToParts } from \"./contentToParts\";\nimport { parseAdkEventValue } from \"./parseAdkEvent\";\nimport { raceWithAbortSignal } from \"./raceWithAbortSignal\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport { trimTrailingSlashes } from \"./trimTrailingSlashes\";\nimport type {\n  AdkEvent,\n  AdkEventPart,\n  AdkMessage,\n  AdkStreamCallback,\n} from \"./types\";\n\nexport type CreateAdkStreamOptions = {\n  /**\n   * URL to POST to. Either a proxy route (e.g. \"/api/adk\") or\n   * an ADK server base URL (e.g. \"http://localhost:8000\").\n   *\n   * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`\n   * in ADK-native format. Otherwise POSTs directly to `api` in proxy format\n   * (compatible with `parseAdkRequest`).\n   */\n  api: string;\n\n  /**\n   * ADK application name. When provided along with `userId`,\n   * enables direct connection to an ADK server.\n   */\n  appName?: string | undefined;\n\n  /**\n   * ADK user ID. Required when `appName` is provided.\n   */\n  userId?: string | undefined;\n\n  /**\n   * Extra headers to send with every request.\n   * Can be a static object or an async function for dynamic auth tokens.\n   */\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined;\n};\n\n/**\n * Creates an `AdkStreamCallback` that connects to an ADK endpoint.\n *\n * @example Proxy mode (with a Next.js API route)\n * ```ts\n * const stream = createAdkStream({ api: \"/api/adk\" });\n * ```\n *\n * @example Direct mode (connecting to ADK server)\n * ```ts\n * const stream = createAdkStream({\n *   api: \"http://localhost:8000\",\n *   appName: \"my-app\",\n *   userId: \"user-1\",\n * });\n * ```\n */\nexport function createAdkStream(\n  options: CreateAdkStreamOptions,\n): AdkStreamCallback {\n  if (options.appName === \"\") {\n    throw new Error(\n      'createAdkStream direct mode requires a non-empty \"appName\".',\n    );\n  }\n\n  const isDirect = options.appName != null;\n  if (isDirect && (options.userId == null || options.userId === \"\")) {\n    throw new Error(\n      'createAdkStream direct mode requires \"userId\" when \"appName\" is provided.',\n    );\n  }\n\n  return async function* (messages, config) {\n    const headers = await resolveHeaders(options.headers, config.abortSignal);\n\n    let url: string;\n    let body: unknown;\n\n    if (isDirect) {\n      // Direct mode: POST to ADK server's /run_sse\n      url = `${trimTrailingSlashes(options.api)}/run_sse`;\n      const { externalId } = await config.initialize();\n      body = {\n        appName: options.appName,\n        userId: options.userId,\n        sessionId: externalId,\n        newMessage: messagesToContent(messages),\n        streaming: true,\n        ...(config.stateDelta != null && { stateDelta: config.stateDelta }),\n      };\n    } else {\n      // Proxy mode: POST in parseAdkRequest-compatible format\n      url = options.api;\n      body = messagesToProxyBody(messages, config);\n    }\n\n    const response = await fetch(url, {\n      method: \"POST\",\n      headers: { \"Content-Type\": \"application/json\", ...headers },\n      body: JSON.stringify(body),\n      signal: config.abortSignal,\n    });\n\n    if (!response.ok) {\n      throw new Error(\n        `ADK request failed: ${response.status} ${response.statusText}`,\n      );\n    }\n\n    validateEventStreamContentType(response);\n    yield* parseSSEResponse(response);\n  };\n}\n\n// ── Internal helpers ──\n\nfunction validateEventStreamContentType(response: Response): void {\n  const contentType = response.headers.get(\"Content-Type\");\n  const mediaType = contentType?.split(\";\", 1)[0]?.trim().toLowerCase();\n  if (mediaType !== \"text/event-stream\") {\n    const received = contentType\n      ? `\"${contentType}\"`\n      : \"no Content-Type header\";\n    void response.body?.cancel().catch(() => undefined);\n    throw new Error(\n      `Expected ADK stream response Content-Type \"text/event-stream\", received ${received}`,\n    );\n  }\n}\n\nfunction parseAdkEvent(data: string): AdkEvent {\n  let value: unknown;\n  try {\n    value = JSON.parse(data);\n  } catch {\n    throw new Error(\"Invalid ADK stream event: expected valid JSON.\");\n  }\n\n  return parseAdkEventValue(value, \"Invalid ADK stream event\");\n}\n\nasync function resolveHeaders(\n  headers:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined,\n  signal?: AbortSignal,\n): Promise<Record<string, string>> {\n  if (!headers) return {};\n  if (typeof headers === \"function\") {\n    return await raceWithAbortSignal(signal, headers);\n  }\n  return headers;\n}\n\n/**\n * Converts AdkMessage[] (new messages) into ADK Content format\n * for the direct `/run_sse` endpoint.\n */\nfunction messagesToContent(messages: AdkMessage[]): {\n  role: string;\n  parts: AdkEventPart[];\n} {\n  const parts: AdkEventPart[] = [];\n\n  for (const msg of messages) {\n    if (msg.type === \"human\") {\n      for (const part of contentToParts(msg.content)) {\n        parts.push(part);\n      }\n    } else if (msg.type === \"tool\") {\n      let response: unknown;\n      try {\n        response = JSON.parse(msg.content);\n      } catch {\n        response = msg.content;\n      }\n      parts.push({\n        functionResponse: {\n          name: msg.name,\n          id: msg.tool_call_id,\n          response: toAdkFunctionResponse(response, msg.status === \"error\"),\n        },\n      });\n    }\n  }\n\n  if (parts.length === 0) {\n    parts.push({ text: \"\" });\n  }\n\n  return { role: \"user\", parts };\n}\n\n/**\n * Converts AdkMessage[] into the proxy request body format\n * (compatible with `parseAdkRequest`).\n */\nfunction messagesToProxyBody(\n  messages: AdkMessage[],\n  config: {\n    runConfig?: unknown;\n    checkpointId?: string | undefined;\n    stateDelta?: Record<string, unknown> | undefined;\n  },\n): Record<string, unknown> {\n  const body: Record<string, unknown> = {};\n\n  if (config.runConfig != null) body.runConfig = config.runConfig;\n  if (config.checkpointId != null) body.checkpointId = config.checkpointId;\n  if (config.stateDelta != null) body.stateDelta = config.stateDelta;\n\n  // Check if there's a tool result\n  const toolMsg = messages.find((m) => m.type === \"tool\");\n  if (toolMsg && toolMsg.type === \"tool\") {\n    // If there are also other messages (e.g. cancellations), send as parts\n    if (messages.length > 1) {\n      body.parts = messagesToContent(messages).parts;\n      return body;\n    }\n\n    let result: unknown;\n    try {\n      result = JSON.parse(toolMsg.content);\n    } catch {\n      result = toolMsg.content;\n    }\n    body.type = \"tool-result\";\n    body.toolCallId = toolMsg.tool_call_id;\n    body.toolName = toolMsg.name;\n    body.result = result;\n    body.isError = toolMsg.status === \"error\";\n    return body;\n  }\n\n  // Human message(s) - possibly with cancellation tool results prepended\n  if (messages.length === 1 && messages[0]!.type === \"human\") {\n    const msg = messages[0]!;\n    if (typeof msg.content === \"string\") {\n      body.message = msg.content;\n    } else {\n      body.parts = contentToParts(msg.content);\n    }\n    return body;\n  }\n\n  // Multiple messages (e.g. cancellations + human): send as parts array\n  body.parts = messagesToContent(messages).parts;\n  return body;\n}\n\nasync function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {\n  if (!response.body) {\n    throw new Error(\"Expected ADK stream response body, received no body\");\n  }\n  const reader = response.body.getReader();\n  const decoder = new TextDecoder();\n  const sseDecoder = new SSEEventDecoder({ trailing: \"dispatch\" });\n\n  let shouldCancel = true;\n  try {\n    while (true) {\n      let result: ReadableStreamReadResult<Uint8Array>;\n      try {\n        result = await reader.read();\n      } catch (error) {\n        shouldCancel = false;\n        throw error;\n      }\n\n      const { done, value } = result;\n      if (done) {\n        shouldCancel = false;\n        for (const event of sseDecoder.push(decoder.decode())) {\n          yield parseAdkEvent(event.data);\n        }\n        break;\n      }\n\n      for (const event of sseDecoder.push(\n        decoder.decode(value, { stream: true }),\n      )) {\n        yield parseAdkEvent(event.data);\n      }\n    }\n\n    const trailing = sseDecoder.flush();\n    if (trailing !== null) yield parseAdkEvent(trailing.data);\n  } finally {\n    try {\n      if (shouldCancel) await reader.cancel().catch(() => undefined);\n    } finally {\n      reader.releaseLock();\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/AdkEventAccumulator.d.ts

@@ -1,51 +1,47 @@
-import { AdkAuthRequest, AdkEvent, AdkMessage, AdkMessageMetadata, AdkToolConfirmation } from "./types.js";
-//#region src/AdkEventAccumulator.d.ts
+import type { AdkEvent, AdkMessage, AdkToolConfirmation, AdkAuthRequest, AdkMessageMetadata } from "./types.js";
 /**
  * Checks if an event is a final response using the same logic as ADK's
  * `isFinalResponse()`.
  */
-declare const isFinalResponse: (event: AdkEvent) => boolean;
-declare class AdkEventAccumulator {
-  private messagesMap;
-  private currentMessageId;
-  private partialTextBuffer;
-  private finalTextReplacedThisEvent;
-  private finalReasoningReplacedThisEvent;
-  private partialReasoningBuffer;
-  private accumulatedStateDelta;
-  private accumulatedArtifactDelta;
-  private lastAgentInfo;
-  private lastTransferToAgent;
-  private pendingLongRunningToolIds;
-  private toolConfirmations;
-  private authRequests;
-  private escalated;
-  private messageMetadataMap;
-  private aiMessageOrdinals;
-  constructor(initialMessages?: AdkMessage[], initialLongRunningToolIds?: readonly string[]);
-  processEvent(rawEvent: AdkEvent): AdkMessage[];
-  private processPart;
-  private trackMessageMetadata;
-  private getContentArray;
-  private getOrCreateAiMessage;
-  private appendContent;
-  private replaceLastTextContent;
-  private replaceLastReasoningContent;
-  private finalizeCurrentMessage;
-  getMessages(): AdkMessage[];
-  getStateDelta(): Record<string, unknown>;
-  getArtifactDelta(): Record<string, number>;
-  getAgentInfo(): {
-    name?: string | undefined;
-    branch?: string | undefined;
-  };
-  getLastTransferToAgent(): string | undefined;
-  getLongRunningToolIds(): string[];
-  getToolConfirmations(): AdkToolConfirmation[];
-  getAuthRequests(): AdkAuthRequest[];
-  isEscalated(): boolean;
-  getMessageMetadata(): Map<string, AdkMessageMetadata>;
+export declare const isFinalResponse: (event: AdkEvent) => boolean;
+export declare class AdkEventAccumulator {
+    private messagesMap;
+    private currentMessageId;
+    private partialTextBuffer;
+    private finalTextReplacedThisEvent;
+    private finalReasoningReplacedThisEvent;
+    private partialReasoningBuffer;
+    private accumulatedStateDelta;
+    private accumulatedArtifactDelta;
+    private lastAgentInfo;
+    private lastTransferToAgent;
+    private pendingLongRunningToolIds;
+    private escalated;
+    private messageMetadataMap;
+    private aiMessageOrdinals;
+    constructor(initialMessages?: AdkMessage[], initialLongRunningToolIds?: readonly string[]);
+    processEvent(rawEvent: AdkEvent): AdkMessage[];
+    private processPart;
+    private trackMessageMetadata;
+    private getContentArray;
+    private getOrCreateAiMessage;
+    private appendContent;
+    private replaceLastTextContent;
+    private replaceLastReasoningContent;
+    private finalizeCurrentMessage;
+    private getRequestCalls;
+    getMessages(): AdkMessage[];
+    getStateDelta(): Record<string, unknown>;
+    getArtifactDelta(): Record<string, number>;
+    getAgentInfo(): {
+        name?: string | undefined;
+        branch?: string | undefined;
+    };
+    getLastTransferToAgent(): string | undefined;
+    getLongRunningToolIds(): string[];
+    getToolConfirmations(): AdkToolConfirmation[];
+    getAuthRequests(): AdkAuthRequest[];
+    isEscalated(): boolean;
+    getMessageMetadata(): Map<string, AdkMessageMetadata>;
 }
-//#endregion
-export { AdkEventAccumulator, isFinalResponse };
 //# sourceMappingURL=AdkEventAccumulator.d.ts.map

package/dist/AdkEventAccumulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdkEventAccumulator.d.ts","names":[],"sources":["../src/AdkEventAccumulator.ts"],"mappings":";;;;;;cA0Ca,kBAAmB,OAAO;cAoK1B;UACH;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;UAIA;UACA;UACA;UACA;UACA;UACA;UAGA;EAEN,YAAA,kBAAkB,cAClB;EAYF,aAAa,UAAU,WAAW;UAwN1B;UA+JA;UAmBA;UAMA;UAyBA;UASA;UAYA;UAeA;EAMR,eAAe;EAIf,iBAAiB;EAIjB,oBAAoB;EAIpB;IAAkB;IAA2B;;EAI7C;EAIA;EAIA,wBAAwB;EAIxB,mBAAmB;EAInB;EAIA,sBAAsB,YAAY"}
+{"version":3,"file":"AdkEventAccumulator.d.ts","sourceRoot":"","sources":["../src/AdkEventAccumulator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,QAAQ,EAER,UAAU,EAGV,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EACnB,mBAAgB;AA4BjB;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,OAAO,QAAQ,KAAG,OAgBjD,CAAC;AAuHF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,0BAA0B,CAAS;IAC3C,OAAO,CAAC,+BAA+B,CAAS;IAChD,OAAO,CAAC,sBAAsB,CAAM;IACpC,OAAO,CAAC,qBAAqB,CAAgD;IAC7E,OAAO,CAAC,wBAAwB,CACV;IACtB,OAAO,CAAC,aAAa,CAGd;IACP,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,yBAAyB,CAAqB;IACtD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAyC;IAGnE,OAAO,CAAC,iBAAiB,CAA6B;gBAEpD,eAAe,CAAC,EAAE,UAAU,EAAE,EAC9B,yBAAyB,CAAC,EAAE,SAAS,MAAM,EAAE;IAY/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU,EAAE;IAyL9C,OAAO,CAAC,WAAW;IA4GnB,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,sBAAsB;IAY9B,OAAO,CAAC,2BAA2B;IAenC,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,eAAe;IAWvB,WAAW,IAAI,UAAU,EAAE;IAI3B,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIxC,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAI1C,YAAY,IAAI;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IAI1E,sBAAsB,IAAI,MAAM,GAAG,SAAS;IAI5C,qBAAqB,IAAI,MAAM,EAAE;IAIjC,oBAAoB,IAAI,mBAAmB,EAAE;IAoB7C,eAAe,IAAI,cAAc,EAAE;IAanC,WAAW,IAAI,OAAO;IAItB,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;CAGtD"}

package/dist/AdkEventAccumulator.js

@@ -1,4 +1,6 @@
 import { isAdkFunctionError } from "./toAdkFunctionResponse.js";
+import { normalizeAdkPart } from "./normalizeAdkPart.js";
+import { projectAdkToolApprovals } from "./adkToolApproval.js";
 import { isRecord } from "@assistant-ui/core/internal";
 import { generateId } from "@assistant-ui/core";
 //#region src/AdkEventAccumulator.ts
@@ -59,48 +61,31 @@ const finishReasonToStatus = (finishReason) => {
 		reason: "stop"
 	};
 };
-const inlineDataToPart = (mimeType, data) => mimeType.startsWith("image/") ? {
-	type: "image",
-	mimeType,
-	data
-} : {
-	type: "file",
-	mimeType,
-	data
-};
-const fileDataToPart = (fileUri, mimeType) => mimeType == null || mimeType.startsWith("image/") ? {
-	type: "image_url",
-	url: fileUri
-} : {
-	type: "file_url",
-	url: fileUri,
-	mimeType
-};
-const normalizeEventPart = (part) => {
-	const p = part;
-	const result = { ...p };
-	if ("function_call" in p && !("functionCall" in p)) result.functionCall = p.function_call;
-	if ("function_response" in p && !("functionResponse" in p)) result.functionResponse = p.function_response;
-	if ("inline_data" in p && !("inlineData" in p)) result.inlineData = p.inline_data;
-	if ("file_data" in p && !("fileData" in p)) result.fileData = p.file_data;
-	if (isRecord(result.inlineData)) {
-		const data = result.inlineData;
-		if ("mime_type" in data && !("mimeType" in data)) result.inlineData = {
-			...data,
-			mimeType: data.mime_type
-		};
-	}
-	if (isRecord(result.fileData)) {
-		const data = result.fileData;
-		result.fileData = {
-			...data,
-			..."mime_type" in data && !("mimeType" in data) && { mimeType: data.mime_type },
-			..."file_uri" in data && !("fileUri" in data) && { fileUri: data.file_uri }
+const mediaToContentPart = ({ inlineData, fileData }) => {
+	if (isRecord(inlineData)) {
+		const { mimeType, data } = inlineData;
+		if (typeof mimeType !== "string" || typeof data !== "string") return;
+		return mimeType.startsWith("image/") ? {
+			type: "image",
+			mimeType,
+			data
+		} : {
+			type: "file",
+			mimeType,
+			data
 		};
 	}
-	if ("executable_code" in p && !("executableCode" in p)) result.executableCode = p.executable_code;
-	if ("code_execution_result" in p && !("codeExecutionResult" in p)) result.codeExecutionResult = p.code_execution_result;
-	return result;
+	if (!isRecord(fileData)) return;
+	const { fileUri, mimeType } = fileData;
+	if (typeof fileUri !== "string") return;
+	return typeof mimeType !== "string" || mimeType.startsWith("image/") ? {
+		type: "image_url",
+		url: fileUri
+	} : {
+		type: "file_url",
+		url: fileUri,
+		mimeType
+	};
 };
 const normalizeEvent = (event) => {
 	const e = event;
@@ -131,7 +116,7 @@ const normalizeEvent = (event) => {
 		const parts = content.parts;
 		result.content = {
 			...content,
-			parts: parts.map(normalizeEventPart)
+			parts: parts.map(normalizeAdkPart)
 		};
 	}
 	return result;
@@ -148,8 +133,6 @@ var AdkEventAccumulator = class {
 	lastAgentInfo = {};
 	lastTransferToAgent;
 	pendingLongRunningToolIds = /* @__PURE__ */ new Set();
-	toolConfirmations = [];
-	authRequests = [];
 	escalated = false;
 	messageMetadataMap = /* @__PURE__ */ new Map();
 	aiMessageOrdinals = /* @__PURE__ */ new Map();
@@ -164,21 +147,6 @@ var AdkEventAccumulator = class {
 		if (event.actions?.escalate) this.escalated = true;
 		if (event.actions?.transferToAgent) this.lastTransferToAgent = event.actions.transferToAgent;
 		if (event.longRunningToolIds?.length) for (const id of event.longRunningToolIds) this.pendingLongRunningToolIds.add(id);
-		if (event.actions?.requestedToolConfirmations) for (const [tcId, conf] of Object.entries(event.actions.requestedToolConfirmations)) {
-			const c = conf;
-			this.toolConfirmations.push({
-				toolCallId: tcId,
-				toolName: "",
-				args: {},
-				hint: c.hint ?? "",
-				confirmed: false,
-				payload: c.payload
-			});
-		}
-		if (event.actions?.requestedAuthConfigs) for (const [tcId, authConf] of Object.entries(event.actions.requestedAuthConfigs)) this.authRequests.push({
-			toolCallId: tcId,
-			authConfig: authConf
-		});
 		if (event.author && event.author !== "user") this.lastAgentInfo = {
 			name: event.author ?? void 0,
 			branch: event.branch ?? void 0
@@ -234,9 +202,10 @@ var AdkEventAccumulator = class {
 				type: "text",
 				text: part.text
 			});
-			else if (part.inlineData) humanParts.push(inlineDataToPart(part.inlineData.mimeType, part.inlineData.data));
-			else if (part.fileData) humanParts.push(fileDataToPart(part.fileData.fileUri, part.fileData.mimeType));
-			else if (part.functionResponse?.id) {
+			else if (part.inlineData || part.fileData) {
+				const mediaPart = mediaToContentPart(part);
+				if (mediaPart) humanParts.push(mediaPart);
+			} else if (part.functionResponse?.id) {
 				toolMessages.push({
 					id: toolMessageId(event, index),
 					type: "tool",
@@ -285,31 +254,6 @@ var AdkEventAccumulator = class {
 		return this.getMessages();
 	}
 	processPart(part, event, partIndex) {
-		if (part.functionCall && !event.partial) {
-			const name = part.functionCall.name;
-			if (name === ADK_REQUEST_CONFIRMATION) {
-				const callArgs = part.functionCall.args;
-				const original = callArgs.originalFunctionCall ?? callArgs.original_function_call;
-				const conf = callArgs.toolConfirmation ?? callArgs.tool_confirmation;
-				this.toolConfirmations.push({
-					toolCallId: part.functionCall.id ?? "",
-					toolName: original?.name ?? "",
-					args: original?.args ?? {},
-					hint: conf?.hint ?? "",
-					confirmed: false,
-					payload: conf?.payload
-				});
-			}
-			if (name === ADK_REQUEST_CREDENTIAL) {
-				const credArgs = part.functionCall.args;
-				const originalToolCallId = credArgs.function_call_id ?? part.functionCall.id ?? "";
-				const authConfig = credArgs.auth_config ?? credArgs;
-				this.authRequests.push({
-					toolCallId: originalToolCallId,
-					authConfig
-				});
-			}
-		}
 		if (part.text != null && part.thought) {
 			const msg = this.getOrCreateAiMessage(event);
 			if (event.partial) {
@@ -346,8 +290,8 @@ var AdkEventAccumulator = class {
 			const toolCall = {
 				id: part.functionCall.id ?? generateId(),
 				name: part.functionCall.name,
-				args: part.functionCall.args,
-				argsText: JSON.stringify(part.functionCall.args)
+				args: part.functionCall.args ?? {},
+				argsText: JSON.stringify(part.functionCall.args ?? {})
 			};
 			const existing = [...msg.tool_calls ?? []];
 			const idx = existing.findIndex((tc) => tc.id === toolCall.id);
@@ -392,15 +336,10 @@ var AdkEventAccumulator = class {
 			});
 			return;
 		}
-		if (part.inlineData) {
-			const msg = this.getOrCreateAiMessage(event);
-			this.appendContent(msg, inlineDataToPart(part.inlineData.mimeType, part.inlineData.data));
-			return;
-		}
-		if (part.fileData) {
-			const msg = this.getOrCreateAiMessage(event);
-			this.appendContent(msg, fileDataToPart(part.fileData.fileUri, part.fileData.mimeType));
-		}
+		const mediaPart = mediaToContentPart(part);
+		if (!mediaPart) return;
+		const msg = this.getOrCreateAiMessage(event);
+		this.appendContent(msg, mediaPart);
 	}
 	trackMessageMetadata(event) {
 		if (!this.currentMessageId || !event.groundingMetadata && !event.citationMetadata && !event.usageMetadata) return;
@@ -481,6 +420,14 @@ var AdkEventAccumulator = class {
 		this.partialReasoningBuffer = "";
 		this.currentMessageId = null;
 	}
+	getRequestCalls(name) {
+		const calls = /* @__PURE__ */ new Map();
+		for (const msg of this.messagesMap.values()) {
+			if (msg.type !== "ai") continue;
+			for (const call of msg.tool_calls ?? []) if (call.name === name && !calls.has(call.id)) calls.set(call.id, call);
+		}
+		return [...calls.values()];
+	}
 	getMessages() {
 		return [...this.messagesMap.values()];
 	}
@@ -500,10 +447,27 @@ var AdkEventAccumulator = class {
 		return [...this.pendingLongRunningToolIds];
 	}
 	getToolConfirmations() {
-		return [...this.toolConfirmations];
+		const { approvals } = projectAdkToolApprovals(this.getMessages());
+		return this.getRequestCalls(ADK_REQUEST_CONFIRMATION).filter(({ id }) => approvals.get(id)?.approved === void 0).map(({ id, args = {} }) => {
+			const original = args.originalFunctionCall ?? args.original_function_call;
+			const confirmation = args.toolConfirmation ?? args.tool_confirmation;
+			return {
+				toolCallId: id,
+				toolName: original?.name ?? "",
+				args: original?.args ?? {},
+				hint: confirmation?.hint ?? "",
+				confirmed: false,
+				payload: confirmation?.payload
+			};
+		});
 	}
 	getAuthRequests() {
-		return [...this.authRequests];
+		const answered = /* @__PURE__ */ new Set();
+		for (const msg of this.messagesMap.values()) if (msg.type === "tool") answered.add(msg.tool_call_id);
+		return this.getRequestCalls(ADK_REQUEST_CREDENTIAL).filter(({ id }) => !answered.has(id)).map(({ id, args = {} }) => ({
+			toolCallId: id,
+			authConfig: args.auth_config ?? args.authConfig
+		}));
 	}
 	isEscalated() {
 		return this.escalated;