@assistant-ui/react-google-adk 0.0.35 → 0.0.36

package/dist/server/createAdkApiRoute.d.ts

@@ -4,6 +4,19 @@ import { type AdkEventStreamOptions } from "./adkEventStream.js";
  * Avoids requiring `@google/adk` as a dependency.
  */
 type AdkRunner = {
+    readonly appName?: string;
+    readonly sessionService?: {
+        getSession(options: {
+            appName: string;
+            userId: string;
+            sessionId: string;
+        }): Promise<unknown | undefined>;
+        createSession(options: {
+            appName: string;
+            userId: string;
+            sessionId: string;
+        }): Promise<unknown>;
+    };
     runAsync(options: Record<string, unknown>): AsyncGenerator<any, void, undefined>;
 };
 export type CreateAdkApiRouteOptions = {
@@ -12,15 +25,29 @@ export type CreateAdkApiRouteOptions = {
      */
     runner: AdkRunner;
     /**
-     * User ID to use for the ADK session. Can be a static string
-     * or a function that extracts it from the request.
+     * User ID to use for the ADK session. Production routes should resolve this
+     * from the authenticated request. A static value is suitable only for a
+     * single-user development route.
      */
     userId: string | ((req: Request) => string | Promise<string>);
     /**
      * Session ID to use. Can be a static string or a function
-     * that extracts it from the request (e.g. from query params or headers).
+     * that validates or transforms the client thread ID sent by
+     * `createAdkStream`. The client value is an identifier, not authorization;
+     * scope access with an authenticated `userId`.
      */
-    sessionId: string | ((req: Request) => string | Promise<string>);
+    sessionId: string | ((req: Request, clientSessionId: string | undefined) => string | Promise<string>);
+    /**
+     * Validates or replaces the client-provided ADK run configuration.
+     * Client values are ignored unless this resolver is provided.
+     */
+    resolveRunConfig?: ((req: Request, runConfig: unknown) => unknown | Promise<unknown>) | undefined;
+    /**
+     * Validates or replaces the client-provided ADK state delta.
+     * Client values are ignored unless this resolver is provided. In particular,
+     * `app:` and `user:` keys affect state beyond the current session.
+     */
+    resolveStateDelta?: ((req: Request, stateDelta: Record<string, unknown> | undefined) => Record<string, unknown> | undefined | Promise<Record<string, unknown> | undefined>) | undefined;
     /**
      * Error handler for stream errors.
      */
@@ -34,11 +61,15 @@ export type CreateAdkApiRouteOptions = {
  * ```ts
  * import { createAdkApiRoute } from '@assistant-ui/react-google-adk/server';
  * import { runner } from './agent';
+ * import { requireUser } from './auth';
  *
  * export const POST = createAdkApiRoute({
  *   runner,
- *   userId: "default-user",
- *   sessionId: (req) => new URL(req.url).searchParams.get("sessionId") ?? "default",
+ *   userId: async (req) => (await requireUser(req)).id,
+ *   sessionId: (_req, clientSessionId) => {
+ *     if (!clientSessionId) throw new Error("Missing ADK session ID");
+ *     return clientSessionId;
+ *   },
  * });
  * ```
  */

package/dist/server/createAdkApiRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAdkApiRoute.d.ts","sourceRoot":"","sources":["../../src/server/createAdkApiRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,qBAAqB,EAAE,4BAAyB;AAE9E;;;GAGG;AACH,KAAK,SAAS,GAAG;IACf,QAAQ,CACN,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D;;;OAGG;IACH,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjE;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,wBAAwB,GAChC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CA8BrC"}
+{"version":3,"file":"createAdkApiRoute.d.ts","sourceRoot":"","sources":["../../src/server/createAdkApiRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,qBAAqB,EAAE,4BAAyB;AAE9E;;;GAGG;AACH,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,CAAC,EAAE;QACxB,UAAU,CAAC,OAAO,EAAE;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,EAAE,MAAM,CAAC;YACf,SAAS,EAAE,MAAM,CAAC;SACnB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;QACjC,aAAa,CAAC,OAAO,EAAE;YACrB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,EAAE,MAAM,CAAC;YACf,SAAS,EAAE,MAAM,CAAC;SACnB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACtB,CAAC;IACF,QAAQ,CACN,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;CACzC,CAAC;AAuDF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;;;OAIG;IACH,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D;;;;;OAKG;IACH,SAAS,EACL,MAAM,GACN,CAAC,CACC,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,GAAG,SAAS,KAChC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnC;;;OAGG;IACH,gBAAgB,CAAC,EACb,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAClE,SAAS,CAAC;IAEd;;;;OAIG;IACH,iBAAiB,CAAC,EACd,CAAC,CACC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,KAE7C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,SAAS,GACT,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,GACjD,SAAS,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,wBAAwB,GAChC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAqCrC"}

package/dist/server/createAdkApiRoute.js

@@ -1,6 +1,49 @@
 import { adkEventStream } from "./adkEventStream.js";
 import { parseAdkRequest, toAdkContent } from "./parseAdkRequest.js";
 //#region src/server/createAdkApiRoute.ts
+const pendingSessions = /* @__PURE__ */ new WeakMap();
+const ensureRunnerSession = async (runner, userId, sessionId) => {
+	const { appName, sessionService } = runner;
+	if (!appName || !sessionService) return;
+	let serviceSessions = pendingSessions.get(sessionService);
+	if (!serviceSessions) {
+		serviceSessions = /* @__PURE__ */ new Map();
+		pendingSessions.set(sessionService, serviceSessions);
+	}
+	const key = JSON.stringify([
+		appName,
+		userId,
+		sessionId
+	]);
+	let pending = serviceSessions.get(key);
+	if (!pending) {
+		pending = (async () => {
+			if (!await sessionService.getSession({
+				appName,
+				userId,
+				sessionId
+			})) try {
+				await sessionService.createSession({
+					appName,
+					userId,
+					sessionId
+				});
+			} catch (error) {
+				if (!await sessionService.getSession({
+					appName,
+					userId,
+					sessionId
+				})) throw error;
+			}
+		})();
+		serviceSessions.set(key, pending);
+	}
+	try {
+		await pending;
+	} finally {
+		if (serviceSessions.get(key) === pending) serviceSessions.delete(key);
+	}
+};
 /**
 * Creates a request handler that combines `parseAdkRequest`, `toAdkContent`,
 * and `adkEventStream` into a single function.
@@ -9,11 +52,15 @@ import { parseAdkRequest, toAdkContent } from "./parseAdkRequest.js";
 * ```ts
 * import { createAdkApiRoute } from '@assistant-ui/react-google-adk/server';
 * import { runner } from './agent';
+* import { requireUser } from './auth';
 *
 * export const POST = createAdkApiRoute({
 *   runner,
-*   userId: "default-user",
-*   sessionId: (req) => new URL(req.url).searchParams.get("sessionId") ?? "default",
+*   userId: async (req) => (await requireUser(req)).id,
+*   sessionId: (_req, clientSessionId) => {
+*     if (!clientSessionId) throw new Error("Missing ADK session ID");
+*     return clientSessionId;
+*   },
 * });
 * ```
 */
@@ -22,13 +69,16 @@ function createAdkApiRoute(options) {
 		const parsed = await parseAdkRequest(req);
 		const newMessage = toAdkContent(parsed);
 		const userId = typeof options.userId === "function" ? await options.userId(req) : options.userId;
-		const sessionId = typeof options.sessionId === "function" ? await options.sessionId(req) : options.sessionId;
+		const sessionId = typeof options.sessionId === "function" ? await options.sessionId(req, parsed.sessionId) : options.sessionId;
+		const runConfig = options.resolveRunConfig ? await options.resolveRunConfig(req, parsed.config.runConfig) : void 0;
+		const stateDelta = options.resolveStateDelta ? await options.resolveStateDelta(req, parsed.stateDelta) : void 0;
+		await ensureRunnerSession(options.runner, userId, sessionId);
 		const events = options.runner.runAsync({
 			userId,
 			sessionId,
 			newMessage,
-			...parsed.stateDelta != null && { stateDelta: parsed.stateDelta },
-			...parsed.config.runConfig != null && { runConfig: parsed.config.runConfig }
+			...stateDelta != null && { stateDelta },
+			...runConfig != null && { runConfig }
 		});
 		return adkEventStream(events, options.onError ? { onError: options.onError } : void 0);
 	};

package/dist/server/createAdkApiRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAdkApiRoute.js","names":[],"sources":["../../src/server/createAdkApiRoute.ts"],"sourcesContent":["import { parseAdkRequest, toAdkContent } from \"./parseAdkRequest\";\nimport { adkEventStream, type AdkEventStreamOptions } from \"./adkEventStream\";\n\n/**\n * Loose runner type matching the ADK SDK's Runner interface.\n * Avoids requiring `@google/adk` as a dependency.\n */\ntype AdkRunner = {\n  runAsync(\n    options: Record<string, unknown>,\n  ): AsyncGenerator<any, void, undefined>;\n};\n\nexport type CreateAdkApiRouteOptions = {\n  /**\n   * ADK Runner instance.\n   */\n  runner: AdkRunner;\n\n  /**\n   * User ID to use for the ADK session. Can be a static string\n   * or a function that extracts it from the request.\n   */\n  userId: string | ((req: Request) => string | Promise<string>);\n\n  /**\n   * Session ID to use. Can be a static string or a function\n   * that extracts it from the request (e.g. from query params or headers).\n   */\n  sessionId: string | ((req: Request) => string | Promise<string>);\n\n  /**\n   * Error handler for stream errors.\n   */\n  onError?: AdkEventStreamOptions[\"onError\"];\n};\n\n/**\n * Creates a request handler that combines `parseAdkRequest`, `toAdkContent`,\n * and `adkEventStream` into a single function.\n *\n * @example Next.js App Router\n * ```ts\n * import { createAdkApiRoute } from '@assistant-ui/react-google-adk/server';\n * import { runner } from './agent';\n *\n * export const POST = createAdkApiRoute({\n *   runner,\n *   userId: \"default-user\",\n *   sessionId: (req) => new URL(req.url).searchParams.get(\"sessionId\") ?? \"default\",\n * });\n * ```\n */\nexport function createAdkApiRoute(\n  options: CreateAdkApiRouteOptions,\n): (req: Request) => Promise<Response> {\n  return async (req: Request): Promise<Response> => {\n    const parsed = await parseAdkRequest(req);\n    const newMessage = toAdkContent(parsed);\n\n    const userId =\n      typeof options.userId === \"function\"\n        ? await options.userId(req)\n        : options.userId;\n\n    const sessionId =\n      typeof options.sessionId === \"function\"\n        ? await options.sessionId(req)\n        : options.sessionId;\n\n    const events = options.runner.runAsync({\n      userId,\n      sessionId,\n      newMessage,\n      ...(parsed.stateDelta != null && { stateDelta: parsed.stateDelta }),\n      ...(parsed.config.runConfig != null && {\n        runConfig: parsed.config.runConfig,\n      }),\n    });\n\n    return adkEventStream(\n      events,\n      options.onError ? { onError: options.onError } : undefined,\n    );\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAqDA,SAAgB,kBACd,SACqC;CACrC,OAAO,OAAO,QAAoC;EAChD,MAAM,SAAS,MAAM,gBAAgB,GAAG;EACxC,MAAM,aAAa,aAAa,MAAM;EAEtC,MAAM,SACJ,OAAO,QAAQ,WAAW,aACtB,MAAM,QAAQ,OAAO,GAAG,IACxB,QAAQ;EAEd,MAAM,YACJ,OAAO,QAAQ,cAAc,aACzB,MAAM,QAAQ,UAAU,GAAG,IAC3B,QAAQ;EAEd,MAAM,SAAS,QAAQ,OAAO,SAAS;GACrC;GACA;GACA;GACA,GAAI,OAAO,cAAc,QAAQ,EAAE,YAAY,OAAO,WAAW;GACjE,GAAI,OAAO,OAAO,aAAa,QAAQ,EACrC,WAAW,OAAO,OAAO,UAC3B;EACF,CAAC;EAED,OAAO,eACL,QACA,QAAQ,UAAU,EAAE,SAAS,QAAQ,QAAQ,IAAI,KAAA,CACnD;CACF;AACF"}
+{"version":3,"file":"createAdkApiRoute.js","names":[],"sources":["../../src/server/createAdkApiRoute.ts"],"sourcesContent":["import { parseAdkRequest, toAdkContent } from \"./parseAdkRequest\";\nimport { adkEventStream, type AdkEventStreamOptions } from \"./adkEventStream\";\n\n/**\n * Loose runner type matching the ADK SDK's Runner interface.\n * Avoids requiring `@google/adk` as a dependency.\n */\ntype AdkRunner = {\n  readonly appName?: string;\n  readonly sessionService?: {\n    getSession(options: {\n      appName: string;\n      userId: string;\n      sessionId: string;\n    }): Promise<unknown | undefined>;\n    createSession(options: {\n      appName: string;\n      userId: string;\n      sessionId: string;\n    }): Promise<unknown>;\n  };\n  runAsync(\n    options: Record<string, unknown>,\n  ): AsyncGenerator<any, void, undefined>;\n};\n\ntype AdkSessionService = NonNullable<AdkRunner[\"sessionService\"]>;\n\nconst pendingSessions = new WeakMap<\n  AdkSessionService,\n  Map<string, Promise<void>>\n>();\n\nconst ensureRunnerSession = async (\n  runner: AdkRunner,\n  userId: string,\n  sessionId: string,\n) => {\n  const { appName, sessionService } = runner;\n  if (!appName || !sessionService) return;\n\n  let serviceSessions = pendingSessions.get(sessionService);\n  if (!serviceSessions) {\n    serviceSessions = new Map();\n    pendingSessions.set(sessionService, serviceSessions);\n  }\n\n  const key = JSON.stringify([appName, userId, sessionId]);\n  let pending = serviceSessions.get(key);\n  if (!pending) {\n    pending = (async () => {\n      const session = await sessionService.getSession({\n        appName,\n        userId,\n        sessionId,\n      });\n      if (!session) {\n        try {\n          await sessionService.createSession({ appName, userId, sessionId });\n        } catch (error) {\n          const existing = await sessionService.getSession({\n            appName,\n            userId,\n            sessionId,\n          });\n          if (!existing) throw error;\n        }\n      }\n    })();\n    serviceSessions.set(key, pending);\n  }\n\n  try {\n    await pending;\n  } finally {\n    if (serviceSessions.get(key) === pending) serviceSessions.delete(key);\n  }\n};\n\nexport type CreateAdkApiRouteOptions = {\n  /**\n   * ADK Runner instance.\n   */\n  runner: AdkRunner;\n\n  /**\n   * User ID to use for the ADK session. Production routes should resolve this\n   * from the authenticated request. A static value is suitable only for a\n   * single-user development route.\n   */\n  userId: string | ((req: Request) => string | Promise<string>);\n\n  /**\n   * Session ID to use. Can be a static string or a function\n   * that validates or transforms the client thread ID sent by\n   * `createAdkStream`. The client value is an identifier, not authorization;\n   * scope access with an authenticated `userId`.\n   */\n  sessionId:\n    | string\n    | ((\n        req: Request,\n        clientSessionId: string | undefined,\n      ) => string | Promise<string>);\n\n  /**\n   * Validates or replaces the client-provided ADK run configuration.\n   * Client values are ignored unless this resolver is provided.\n   */\n  resolveRunConfig?:\n    | ((req: Request, runConfig: unknown) => unknown | Promise<unknown>)\n    | undefined;\n\n  /**\n   * Validates or replaces the client-provided ADK state delta.\n   * Client values are ignored unless this resolver is provided. In particular,\n   * `app:` and `user:` keys affect state beyond the current session.\n   */\n  resolveStateDelta?:\n    | ((\n        req: Request,\n        stateDelta: Record<string, unknown> | undefined,\n      ) =>\n        | Record<string, unknown>\n        | undefined\n        | Promise<Record<string, unknown> | undefined>)\n    | undefined;\n\n  /**\n   * Error handler for stream errors.\n   */\n  onError?: AdkEventStreamOptions[\"onError\"];\n};\n\n/**\n * Creates a request handler that combines `parseAdkRequest`, `toAdkContent`,\n * and `adkEventStream` into a single function.\n *\n * @example Next.js App Router\n * ```ts\n * import { createAdkApiRoute } from '@assistant-ui/react-google-adk/server';\n * import { runner } from './agent';\n * import { requireUser } from './auth';\n *\n * export const POST = createAdkApiRoute({\n *   runner,\n *   userId: async (req) => (await requireUser(req)).id,\n *   sessionId: (_req, clientSessionId) => {\n *     if (!clientSessionId) throw new Error(\"Missing ADK session ID\");\n *     return clientSessionId;\n *   },\n * });\n * ```\n */\nexport function createAdkApiRoute(\n  options: CreateAdkApiRouteOptions,\n): (req: Request) => Promise<Response> {\n  return async (req: Request): Promise<Response> => {\n    const parsed = await parseAdkRequest(req);\n    const newMessage = toAdkContent(parsed);\n\n    const userId =\n      typeof options.userId === \"function\"\n        ? await options.userId(req)\n        : options.userId;\n\n    const sessionId =\n      typeof options.sessionId === \"function\"\n        ? await options.sessionId(req, parsed.sessionId)\n        : options.sessionId;\n\n    const runConfig = options.resolveRunConfig\n      ? await options.resolveRunConfig(req, parsed.config.runConfig)\n      : undefined;\n    const stateDelta = options.resolveStateDelta\n      ? await options.resolveStateDelta(req, parsed.stateDelta)\n      : undefined;\n\n    await ensureRunnerSession(options.runner, userId, sessionId);\n\n    const events = options.runner.runAsync({\n      userId,\n      sessionId,\n      newMessage,\n      ...(stateDelta != null && { stateDelta }),\n      ...(runConfig != null && { runConfig }),\n    });\n\n    return adkEventStream(\n      events,\n      options.onError ? { onError: options.onError } : undefined,\n    );\n  };\n}\n"],"mappings":";;;AA4BA,MAAM,kCAAkB,IAAI,QAG1B;AAEF,MAAM,sBAAsB,OAC1B,QACA,QACA,cACG;CACH,MAAM,EAAE,SAAS,mBAAmB;CACpC,IAAI,CAAC,WAAW,CAAC,gBAAgB;CAEjC,IAAI,kBAAkB,gBAAgB,IAAI,cAAc;CACxD,IAAI,CAAC,iBAAiB;EACpB,kCAAkB,IAAI,IAAI;EAC1B,gBAAgB,IAAI,gBAAgB,eAAe;CACrD;CAEA,MAAM,MAAM,KAAK,UAAU;EAAC;EAAS;EAAQ;CAAS,CAAC;CACvD,IAAI,UAAU,gBAAgB,IAAI,GAAG;CACrC,IAAI,CAAC,SAAS;EACZ,WAAW,YAAY;GAMrB,IAAI,CAAC,MALiB,eAAe,WAAW;IAC9C;IACA;IACA;GACF,CAAC,GAEC,IAAI;IACF,MAAM,eAAe,cAAc;KAAE;KAAS;KAAQ;IAAU,CAAC;GACnE,SAAS,OAAO;IAMd,IAAI,CAAC,MALkB,eAAe,WAAW;KAC/C;KACA;KACA;IACF,CAAC,GACc,MAAM;GACvB;EAEJ,EAAA,CAAG;EACH,gBAAgB,IAAI,KAAK,OAAO;CAClC;CAEA,IAAI;EACF,MAAM;CACR,UAAU;EACR,IAAI,gBAAgB,IAAI,GAAG,MAAM,SAAS,gBAAgB,OAAO,GAAG;CACtE;AACF;;;;;;;;;;;;;;;;;;;;;AA6EA,SAAgB,kBACd,SACqC;CACrC,OAAO,OAAO,QAAoC;EAChD,MAAM,SAAS,MAAM,gBAAgB,GAAG;EACxC,MAAM,aAAa,aAAa,MAAM;EAEtC,MAAM,SACJ,OAAO,QAAQ,WAAW,aACtB,MAAM,QAAQ,OAAO,GAAG,IACxB,QAAQ;EAEd,MAAM,YACJ,OAAO,QAAQ,cAAc,aACzB,MAAM,QAAQ,UAAU,KAAK,OAAO,SAAS,IAC7C,QAAQ;EAEd,MAAM,YAAY,QAAQ,mBACtB,MAAM,QAAQ,iBAAiB,KAAK,OAAO,OAAO,SAAS,IAC3D,KAAA;EACJ,MAAM,aAAa,QAAQ,oBACvB,MAAM,QAAQ,kBAAkB,KAAK,OAAO,UAAU,IACtD,KAAA;EAEJ,MAAM,oBAAoB,QAAQ,QAAQ,QAAQ,SAAS;EAE3D,MAAM,SAAS,QAAQ,OAAO,SAAS;GACrC;GACA;GACA;GACA,GAAI,cAAc,QAAQ,EAAE,WAAW;GACvC,GAAI,aAAa,QAAQ,EAAE,UAAU;EACvC,CAAC;EAED,OAAO,eACL,QACA,QAAQ,UAAU,EAAE,SAAS,QAAQ,QAAQ,IAAI,KAAA,CACnD;CACF;AACF"}

package/dist/server/parseAdkRequest.d.ts

@@ -3,6 +3,7 @@ type ParsedAdkRequest = {
     type: "message";
     text: string;
     parts?: Array<Record<string, unknown>> | undefined;
+    sessionId?: string | undefined;
     config: AdkSendMessageConfig;
     stateDelta?: Record<string, unknown> | undefined;
 } | {
@@ -11,6 +12,7 @@ type ParsedAdkRequest = {
     toolName: string;
     result: unknown;
     isError: boolean;
+    sessionId?: string | undefined;
     config: AdkSendMessageConfig;
     stateDelta?: Record<string, unknown> | undefined;
 };
@@ -44,7 +46,8 @@ export declare const parseAdkRequest: (request: Request) => Promise<ParsedAdkReq
  * ```ts
  * const parsed = await parseAdkRequest(req);
  * const newMessage = toAdkContent(parsed);
- * const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta: parsed.stateDelta });
+ * const stateDelta = validateSessionState(parsed.stateDelta);
+ * const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta });
  * return adkEventStream(events);
  * ```
  */

package/dist/server/parseAdkRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseAdkRequest.d.ts","sourceRoot":"","sources":["../../src/server/parseAdkRequest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAiB;AAGrD,KAAK,gBAAgB,GACjB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACnD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAClD,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAClD,CAAC;AAuGN;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,OAAO,KACf,OAAO,CAAC,gBAAgB,CAwE1B,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GACvB,QAAQ,gBAAgB,KACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAsBvD,CAAC"}
+{"version":3,"file":"parseAdkRequest.d.ts","sourceRoot":"","sources":["../../src/server/parseAdkRequest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAiB;AAGrD,KAAK,gBAAgB,GACjB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAClD,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAClD,CAAC;AAuGN;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,OAAO,KACf,OAAO,CAAC,gBAAgB,CA2E1B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,YAAY,GACvB,QAAQ,gBAAgB,KACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAsBvD,CAAC"}

package/dist/server/parseAdkRequest.js

@@ -86,6 +86,7 @@ const parseAdkRequest = async (request) => {
 	if (body.runConfig !== void 0) config.runConfig = body.runConfig;
 	const checkpointId = readOptionalString(body, "checkpointId");
 	if (checkpointId !== void 0) config.checkpointId = checkpointId;
+	const sessionId = readOptionalString(body, "sessionId");
 	const stateDelta = body.stateDelta;
 	if (stateDelta !== void 0 && !isRecord(stateDelta)) throw invalidField("stateDelta", "an object");
 	if (body.type === "tool-result") {
@@ -97,6 +98,7 @@ const parseAdkRequest = async (request) => {
 			toolName: readString(body, "toolName"),
 			result: body.result,
 			isError: body.isError ?? false,
+			...sessionId !== void 0 && { sessionId },
 			config,
 			...stateDelta != null && { stateDelta }
 		};
@@ -112,6 +114,7 @@ const parseAdkRequest = async (request) => {
 		type: "message",
 		text: text ?? "",
 		...parts !== void 0 && { parts },
+		...sessionId !== void 0 && { sessionId },
 		config,
 		...stateDelta != null && { stateDelta }
 	};
@@ -124,7 +127,8 @@ const parseAdkRequest = async (request) => {
 * ```ts
 * const parsed = await parseAdkRequest(req);
 * const newMessage = toAdkContent(parsed);
-* const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta: parsed.stateDelta });
+* const stateDelta = validateSessionState(parsed.stateDelta);
+* const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta });
 * return adkEventStream(events);
 * ```
 */

package/dist/server/parseAdkRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseAdkRequest.js","names":[],"sources":["../../src/server/parseAdkRequest.ts"],"sourcesContent":["import { isRecord } from \"@assistant-ui/core/internal\";\nimport type { AdkSendMessageConfig } from \"../types\";\nimport { toAdkFunctionResponse } from \"../toAdkFunctionResponse\";\n\ntype ParsedAdkRequest =\n  | {\n      type: \"message\";\n      text: string;\n      parts?: Array<Record<string, unknown>> | undefined;\n      config: AdkSendMessageConfig;\n      stateDelta?: Record<string, unknown> | undefined;\n    }\n  | {\n      type: \"tool-result\";\n      toolCallId: string;\n      toolName: string;\n      result: unknown;\n      isError: boolean;\n      config: AdkSendMessageConfig;\n      stateDelta?: Record<string, unknown> | undefined;\n    };\n\nconst invalidField = (field: string, expectation: string): Error =>\n  new Error(\n    `Invalid Google ADK proxy request field \"${field}\": expected ${expectation}.`,\n  );\n\nconst readString = (body: Record<string, unknown>, field: string): string => {\n  const value = body[field];\n  if (typeof value !== \"string\") throw invalidField(field, \"a string\");\n  return value;\n};\n\nconst readOptionalString = (\n  body: Record<string, unknown>,\n  field: string,\n): string | undefined => {\n  const value = body[field];\n  if (value === undefined) return undefined;\n  if (typeof value !== \"string\") throw invalidField(field, \"a string\");\n  return value;\n};\n\nconst validateOptionalPartString = (\n  part: Record<string, unknown>,\n  key: string,\n  field: string,\n) => {\n  if (part[key] !== undefined && typeof part[key] !== \"string\") {\n    throw invalidField(field, \"a string\");\n  }\n};\n\n// Nested fields are validated only when present: ADK serializes with\n// exclude_none semantics and the Part vocabulary grows upstream, so absent\n// fields and unknown part kinds pass through to the runner untouched.\nconst validatePart = (part: Record<string, unknown>, index: number) => {\n  const field = (name: string) => `parts[${index}].${name}`;\n  if (Object.keys(part).length === 0) {\n    throw invalidField(`parts[${index}]`, \"a non-empty part object\");\n  }\n  if (part.thought !== undefined && typeof part.thought !== \"boolean\") {\n    throw invalidField(field(\"thought\"), \"a boolean\");\n  }\n  if (part.text !== undefined && typeof part.text !== \"string\") {\n    throw invalidField(field(\"text\"), \"a string\");\n  }\n\n  const validateRecordField = (\n    key: string,\n    validateContent: (content: Record<string, unknown>) => void,\n  ) => {\n    const value = part[key];\n    if (value === undefined) return;\n    if (!isRecord(value)) throw invalidField(field(key), \"an object\");\n    validateContent(value);\n  };\n\n  validateRecordField(\"functionCall\", (content) => {\n    validateOptionalPartString(content, \"name\", field(\"functionCall.name\"));\n    validateOptionalPartString(content, \"id\", field(\"functionCall.id\"));\n    if (content.args !== undefined && !isRecord(content.args)) {\n      throw invalidField(field(\"functionCall.args\"), \"an object\");\n    }\n  });\n  validateRecordField(\"functionResponse\", (content) => {\n    validateOptionalPartString(content, \"name\", field(\"functionResponse.name\"));\n    validateOptionalPartString(content, \"id\", field(\"functionResponse.id\"));\n  });\n  validateRecordField(\"executableCode\", (content) => {\n    validateOptionalPartString(content, \"code\", field(\"executableCode.code\"));\n    validateOptionalPartString(\n      content,\n      \"language\",\n      field(\"executableCode.language\"),\n    );\n  });\n  validateRecordField(\"codeExecutionResult\", (content) => {\n    validateOptionalPartString(\n      content,\n      \"output\",\n      field(\"codeExecutionResult.output\"),\n    );\n    validateOptionalPartString(\n      content,\n      \"outcome\",\n      field(\"codeExecutionResult.outcome\"),\n    );\n  });\n  validateRecordField(\"inlineData\", (content) => {\n    validateOptionalPartString(\n      content,\n      \"mimeType\",\n      field(\"inlineData.mimeType\"),\n    );\n    validateOptionalPartString(content, \"data\", field(\"inlineData.data\"));\n  });\n  validateRecordField(\"fileData\", (content) => {\n    validateOptionalPartString(content, \"fileUri\", field(\"fileData.fileUri\"));\n    validateOptionalPartString(content, \"mimeType\", field(\"fileData.mimeType\"));\n  });\n};\n\n/**\n * Parses an incoming HTTP request into a structured ADK request.\n *\n * Supports two request shapes:\n *\n * 1. User message:\n * ```json\n * { \"message\": \"Hello\", \"runConfig\": {}, \"stateDelta\": {} }\n * ```\n *\n * 2. Tool result:\n * ```json\n * {\n *   \"type\": \"tool-result\",\n *   \"toolCallId\": \"call_123\",\n *   \"toolName\": \"search\",\n *   \"result\": { ... },\n *   \"isError\": false\n * }\n * ```\n */\nexport const parseAdkRequest = async (\n  request: Request,\n): Promise<ParsedAdkRequest> => {\n  let body: unknown;\n  try {\n    body = await request.json();\n  } catch {\n    throw new Error(\n      'Invalid JSON in Google ADK proxy request body. Expected a JSON object like {\"message\":\"Hello\"} or {\"type\":\"tool-result\",...}.',\n    );\n  }\n\n  if (!isRecord(body)) {\n    throw new Error(\"Google ADK proxy request body must be a JSON object\");\n  }\n\n  const config: AdkSendMessageConfig = {};\n  if (body.runConfig !== undefined) config.runConfig = body.runConfig;\n  const checkpointId = readOptionalString(body, \"checkpointId\");\n  if (checkpointId !== undefined) config.checkpointId = checkpointId;\n\n  const stateDelta = body.stateDelta;\n  if (stateDelta !== undefined && !isRecord(stateDelta)) {\n    throw invalidField(\"stateDelta\", \"an object\");\n  }\n\n  if (body.type === \"tool-result\") {\n    if (!(\"result\" in body)) {\n      throw invalidField(\"result\", \"a value\");\n    }\n    if (body.isError !== undefined && typeof body.isError !== \"boolean\") {\n      throw invalidField(\"isError\", \"a boolean\");\n    }\n    return {\n      type: \"tool-result\",\n      toolCallId: readString(body, \"toolCallId\"),\n      toolName: readString(body, \"toolName\"),\n      result: body.result,\n      isError: body.isError ?? false,\n      config,\n      ...(stateDelta != null && { stateDelta }),\n    };\n  }\n\n  if (body.type !== undefined && body.type !== \"message\") {\n    throw invalidField(\"type\", '\"message\", \"tool-result\", or omitted');\n  }\n\n  const text = body.message;\n  if (text !== undefined && typeof text !== \"string\") {\n    throw invalidField(\"message\", \"a string\");\n  }\n\n  const parts = body.parts;\n  if (\n    parts !== undefined &&\n    (!Array.isArray(parts) || !parts.every(isRecord))\n  ) {\n    throw invalidField(\"parts\", \"an array of objects\");\n  }\n  parts?.forEach(validatePart);\n  if (!(\"message\" in body) && !(\"parts\" in body)) {\n    throw new Error(\n      'Invalid Google ADK proxy request: expected a \"message\" string or a \"parts\" array.',\n    );\n  }\n\n  return {\n    type: \"message\",\n    text: text ?? \"\",\n    ...(parts !== undefined && { parts }),\n    config,\n    ...(stateDelta != null && { stateDelta }),\n  };\n};\n\n/**\n * Converts a parsed ADK request into a Google GenAI Content object\n * suitable for `Runner.runAsync({ newMessage })`.\n *\n * @example\n * ```ts\n * const parsed = await parseAdkRequest(req);\n * const newMessage = toAdkContent(parsed);\n * const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta: parsed.stateDelta });\n * return adkEventStream(events);\n * ```\n */\nexport const toAdkContent = (\n  parsed: ParsedAdkRequest,\n): { role: string; parts: Array<Record<string, unknown>> } => {\n  if (parsed.type === \"tool-result\") {\n    return {\n      role: \"user\",\n      parts: [\n        {\n          functionResponse: {\n            name: parsed.toolName,\n            id: parsed.toolCallId,\n            response: toAdkFunctionResponse(parsed.result, parsed.isError),\n          },\n        },\n      ],\n    };\n  }\n\n  // If raw parts are provided (multimodal), use them directly\n  if (parsed.parts?.length) {\n    return { role: \"user\", parts: parsed.parts };\n  }\n\n  return { role: \"user\", parts: [{ text: parsed.text }] };\n};\n"],"mappings":"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"}
+{"version":3,"file":"parseAdkRequest.js","names":[],"sources":["../../src/server/parseAdkRequest.ts"],"sourcesContent":["import { isRecord } from \"@assistant-ui/core/internal\";\nimport type { AdkSendMessageConfig } from \"../types\";\nimport { toAdkFunctionResponse } from \"../toAdkFunctionResponse\";\n\ntype ParsedAdkRequest =\n  | {\n      type: \"message\";\n      text: string;\n      parts?: Array<Record<string, unknown>> | undefined;\n      sessionId?: string | undefined;\n      config: AdkSendMessageConfig;\n      stateDelta?: Record<string, unknown> | undefined;\n    }\n  | {\n      type: \"tool-result\";\n      toolCallId: string;\n      toolName: string;\n      result: unknown;\n      isError: boolean;\n      sessionId?: string | undefined;\n      config: AdkSendMessageConfig;\n      stateDelta?: Record<string, unknown> | undefined;\n    };\n\nconst invalidField = (field: string, expectation: string): Error =>\n  new Error(\n    `Invalid Google ADK proxy request field \"${field}\": expected ${expectation}.`,\n  );\n\nconst readString = (body: Record<string, unknown>, field: string): string => {\n  const value = body[field];\n  if (typeof value !== \"string\") throw invalidField(field, \"a string\");\n  return value;\n};\n\nconst readOptionalString = (\n  body: Record<string, unknown>,\n  field: string,\n): string | undefined => {\n  const value = body[field];\n  if (value === undefined) return undefined;\n  if (typeof value !== \"string\") throw invalidField(field, \"a string\");\n  return value;\n};\n\nconst validateOptionalPartString = (\n  part: Record<string, unknown>,\n  key: string,\n  field: string,\n) => {\n  if (part[key] !== undefined && typeof part[key] !== \"string\") {\n    throw invalidField(field, \"a string\");\n  }\n};\n\n// Nested fields are validated only when present: ADK serializes with\n// exclude_none semantics and the Part vocabulary grows upstream, so absent\n// fields and unknown part kinds pass through to the runner untouched.\nconst validatePart = (part: Record<string, unknown>, index: number) => {\n  const field = (name: string) => `parts[${index}].${name}`;\n  if (Object.keys(part).length === 0) {\n    throw invalidField(`parts[${index}]`, \"a non-empty part object\");\n  }\n  if (part.thought !== undefined && typeof part.thought !== \"boolean\") {\n    throw invalidField(field(\"thought\"), \"a boolean\");\n  }\n  if (part.text !== undefined && typeof part.text !== \"string\") {\n    throw invalidField(field(\"text\"), \"a string\");\n  }\n\n  const validateRecordField = (\n    key: string,\n    validateContent: (content: Record<string, unknown>) => void,\n  ) => {\n    const value = part[key];\n    if (value === undefined) return;\n    if (!isRecord(value)) throw invalidField(field(key), \"an object\");\n    validateContent(value);\n  };\n\n  validateRecordField(\"functionCall\", (content) => {\n    validateOptionalPartString(content, \"name\", field(\"functionCall.name\"));\n    validateOptionalPartString(content, \"id\", field(\"functionCall.id\"));\n    if (content.args !== undefined && !isRecord(content.args)) {\n      throw invalidField(field(\"functionCall.args\"), \"an object\");\n    }\n  });\n  validateRecordField(\"functionResponse\", (content) => {\n    validateOptionalPartString(content, \"name\", field(\"functionResponse.name\"));\n    validateOptionalPartString(content, \"id\", field(\"functionResponse.id\"));\n  });\n  validateRecordField(\"executableCode\", (content) => {\n    validateOptionalPartString(content, \"code\", field(\"executableCode.code\"));\n    validateOptionalPartString(\n      content,\n      \"language\",\n      field(\"executableCode.language\"),\n    );\n  });\n  validateRecordField(\"codeExecutionResult\", (content) => {\n    validateOptionalPartString(\n      content,\n      \"output\",\n      field(\"codeExecutionResult.output\"),\n    );\n    validateOptionalPartString(\n      content,\n      \"outcome\",\n      field(\"codeExecutionResult.outcome\"),\n    );\n  });\n  validateRecordField(\"inlineData\", (content) => {\n    validateOptionalPartString(\n      content,\n      \"mimeType\",\n      field(\"inlineData.mimeType\"),\n    );\n    validateOptionalPartString(content, \"data\", field(\"inlineData.data\"));\n  });\n  validateRecordField(\"fileData\", (content) => {\n    validateOptionalPartString(content, \"fileUri\", field(\"fileData.fileUri\"));\n    validateOptionalPartString(content, \"mimeType\", field(\"fileData.mimeType\"));\n  });\n};\n\n/**\n * Parses an incoming HTTP request into a structured ADK request.\n *\n * Supports two request shapes:\n *\n * 1. User message:\n * ```json\n * { \"message\": \"Hello\", \"runConfig\": {}, \"stateDelta\": {} }\n * ```\n *\n * 2. Tool result:\n * ```json\n * {\n *   \"type\": \"tool-result\",\n *   \"toolCallId\": \"call_123\",\n *   \"toolName\": \"search\",\n *   \"result\": { ... },\n *   \"isError\": false\n * }\n * ```\n */\nexport const parseAdkRequest = async (\n  request: Request,\n): Promise<ParsedAdkRequest> => {\n  let body: unknown;\n  try {\n    body = await request.json();\n  } catch {\n    throw new Error(\n      'Invalid JSON in Google ADK proxy request body. Expected a JSON object like {\"message\":\"Hello\"} or {\"type\":\"tool-result\",...}.',\n    );\n  }\n\n  if (!isRecord(body)) {\n    throw new Error(\"Google ADK proxy request body must be a JSON object\");\n  }\n\n  const config: AdkSendMessageConfig = {};\n  if (body.runConfig !== undefined) config.runConfig = body.runConfig;\n  const checkpointId = readOptionalString(body, \"checkpointId\");\n  if (checkpointId !== undefined) config.checkpointId = checkpointId;\n  const sessionId = readOptionalString(body, \"sessionId\");\n\n  const stateDelta = body.stateDelta;\n  if (stateDelta !== undefined && !isRecord(stateDelta)) {\n    throw invalidField(\"stateDelta\", \"an object\");\n  }\n\n  if (body.type === \"tool-result\") {\n    if (!(\"result\" in body)) {\n      throw invalidField(\"result\", \"a value\");\n    }\n    if (body.isError !== undefined && typeof body.isError !== \"boolean\") {\n      throw invalidField(\"isError\", \"a boolean\");\n    }\n    return {\n      type: \"tool-result\",\n      toolCallId: readString(body, \"toolCallId\"),\n      toolName: readString(body, \"toolName\"),\n      result: body.result,\n      isError: body.isError ?? false,\n      ...(sessionId !== undefined && { sessionId }),\n      config,\n      ...(stateDelta != null && { stateDelta }),\n    };\n  }\n\n  if (body.type !== undefined && body.type !== \"message\") {\n    throw invalidField(\"type\", '\"message\", \"tool-result\", or omitted');\n  }\n\n  const text = body.message;\n  if (text !== undefined && typeof text !== \"string\") {\n    throw invalidField(\"message\", \"a string\");\n  }\n\n  const parts = body.parts;\n  if (\n    parts !== undefined &&\n    (!Array.isArray(parts) || !parts.every(isRecord))\n  ) {\n    throw invalidField(\"parts\", \"an array of objects\");\n  }\n  parts?.forEach(validatePart);\n  if (!(\"message\" in body) && !(\"parts\" in body)) {\n    throw new Error(\n      'Invalid Google ADK proxy request: expected a \"message\" string or a \"parts\" array.',\n    );\n  }\n\n  return {\n    type: \"message\",\n    text: text ?? \"\",\n    ...(parts !== undefined && { parts }),\n    ...(sessionId !== undefined && { sessionId }),\n    config,\n    ...(stateDelta != null && { stateDelta }),\n  };\n};\n\n/**\n * Converts a parsed ADK request into a Google GenAI Content object\n * suitable for `Runner.runAsync({ newMessage })`.\n *\n * @example\n * ```ts\n * const parsed = await parseAdkRequest(req);\n * const newMessage = toAdkContent(parsed);\n * const stateDelta = validateSessionState(parsed.stateDelta);\n * const events = runner.runAsync({ userId, sessionId, newMessage, stateDelta });\n * return adkEventStream(events);\n * ```\n */\nexport const toAdkContent = (\n  parsed: ParsedAdkRequest,\n): { role: string; parts: Array<Record<string, unknown>> } => {\n  if (parsed.type === \"tool-result\") {\n    return {\n      role: \"user\",\n      parts: [\n        {\n          functionResponse: {\n            name: parsed.toolName,\n            id: parsed.toolCallId,\n            response: toAdkFunctionResponse(parsed.result, parsed.isError),\n          },\n        },\n      ],\n    };\n  }\n\n  // If raw parts are provided (multimodal), use them directly\n  if (parsed.parts?.length) {\n    return { role: \"user\", parts: parsed.parts };\n  }\n\n  return { role: \"user\", parts: [{ text: parsed.text }] };\n};\n"],"mappings":"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"}

package/dist/useAdkMessages.d.ts

@@ -1,4 +1,5 @@
-import type { AdkMessage, AdkMessageMetadata, AdkSendMessageConfig, AdkStreamCallback, AdkToolConfirmation, AdkAuthRequest, AdkThreadSnapshot, OnAdkErrorCallback, OnAdkCustomEventCallback, OnAdkAgentTransferCallback } from "./types.js";
+import { AdkThreadController } from "./AdkThreadController.js";
+import type { AdkMessage, AdkSendMessageConfig, AdkStreamCallback, AdkThreadSnapshot, OnAdkErrorCallback, OnAdkCustomEventCallback, OnAdkAgentTransferCallback } from "./types.js";
 export type UseAdkMessagesOptions = {
     stream: AdkStreamCallback;
     eventHandlers?: {
@@ -11,6 +12,7 @@ type UseAdkMessagesInternalOptions = UseAdkMessagesOptions & {
     onMessages?: (messages: AdkMessage[], runConfig: unknown) => void;
 };
 declare const useAdkMessagesInternal: ({ stream, eventHandlers, onMessages, }: UseAdkMessagesInternalOptions) => {
+    controller: AdkThreadController;
     messages: AdkMessage[];
     stateDelta: Record<string, unknown>;
     agentInfo: {
@@ -19,10 +21,10 @@ declare const useAdkMessagesInternal: ({ stream, eventHandlers, onMessages, }: U
     };
     longRunningToolIds: string[];
     artifactDelta: Record<string, number>;
-    toolConfirmations: AdkToolConfirmation[];
-    authRequests: AdkAuthRequest[];
+    toolConfirmations: import("./types.js").AdkToolConfirmation[];
+    authRequests: import("./types.js").AdkAuthRequest[];
     escalated: boolean;
-    messageMetadata: Map<string, AdkMessageMetadata>;
+    messageMetadata: Map<string, import("./types.js").AdkMessageMetadata>;
     sendMessage: (newMessages: AdkMessage[], config: AdkSendMessageConfig) => Promise<void>;
     cancel: () => void;
     setMessages: (msgs: AdkMessage[]) => void;
@@ -38,10 +40,10 @@ export declare const useAdkMessages: ({ stream, eventHandlers, }: UseAdkMessages
     };
     longRunningToolIds: string[];
     artifactDelta: Record<string, number>;
-    toolConfirmations: AdkToolConfirmation[];
-    authRequests: AdkAuthRequest[];
+    toolConfirmations: import("./types.js").AdkToolConfirmation[];
+    authRequests: import("./types.js").AdkAuthRequest[];
     escalated: boolean;
-    messageMetadata: Map<string, AdkMessageMetadata>;
+    messageMetadata: Map<string, import("./types.js").AdkMessageMetadata>;
     sendMessage: (newMessages: AdkMessage[], config: AdkSendMessageConfig) => Promise<void>;
     cancel: () => void;
     setMessages: (msgs: AdkMessage[]) => void;

package/dist/useAdkMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.d.ts","sourceRoot":"","sources":["../src/useAdkMessages.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAEV,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC3B,mBAAgB;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,aAAa,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;QAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,eAAe,CAAC,EAAE,0BAA0B,CAAC;KAC9C,CAAC;CACH,CAAC;AAEF,KAAK,6BAA6B,GAAG,qBAAqB,GAAG;IAC3D,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACnE,CAAC;AAYF,QAAA,MAAM,sBAAsB,GAAI,wCAI7B,6BAA6B;;;;eAIrB,MAAM,GAAG,SAAS;iBAChB,MAAM,GAAG,SAAS;;;;;;;;+BAqFP,UAAU,EAAE,UAAU,oBAAoB;;wBAvDhB,UAAU,EAAE;4BAmCnD,UAAU,EAAE;8BAnBR,iBAAiB;CAmP/B,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,4BAG5B,qBAAqB;;;;eAvSb,MAAM,GAAG,SAAS;iBAChB,MAAM,GAAG,SAAS;;;;;;;;+BAqFP,UAAU,EAAE,UAAU,oBAAoB;;wBAvDhB,UAAU,EAAE;4BAmCnD,UAAU,EAAE;8BAnBR,iBAAiB;CA4P5B,CAAC;AAEL,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"useAdkMessages.d.ts","sourceRoot":"","sources":["../src/useAdkMessages.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAG5D,OAAO,KAAK,EAEV,UAAU,EACV,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC3B,mBAAgB;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,aAAa,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;QAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,eAAe,CAAC,EAAE,0BAA0B,CAAC;KAC9C,CAAC;CACH,CAAC;AAEF,KAAK,6BAA6B,GAAG,qBAAqB,GAAG;IAC3D,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACnE,CAAC;AAYF,QAAA,MAAM,sBAAsB,GAAI,wCAI7B,6BAA6B;;;;;;;;;;;;;;+BAyDR,UAAU,EAAE,UAAU,oBAAoB;;wBAtCvD,UAAU,EAAE;4BAuBZ,UAAU,EAAE;8BAXR,iBAAiB;CAoO/B,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,4BAG5B,qBAAqB;;;;;;;;;;;;;+BA/MA,UAAU,EAAE,UAAU,oBAAoB;;wBAtCvD,UAAU,EAAE;4BAuBZ,UAAU,EAAE;8BAXR,iBAAiB;CA+O/B,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/useAdkMessages.js

@@ -1,47 +1,25 @@
 import { contentToParts } from "./contentToParts.js";
 import { toAdkFunctionResponse } from "./toAdkFunctionResponse.js";
 import { AdkEventAccumulator } from "./AdkEventAccumulator.js";
+import { AdkThreadController } from "./AdkThreadController.js";
 import { abortableIterable, invokeUserCallback, isRecord, openAbortableIterable } from "@assistant-ui/core/internal";
 import { generateId } from "@assistant-ui/core";
 import { useAui } from "@assistant-ui/store";
 import { useReplaySafeEffect } from "@assistant-ui/store/internal";
-import { useCallback, useInsertionEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState, useSyncExternalStore } from "react";
 //#region src/useAdkMessages.ts
 const invokeAdkRuntimeCallback = (name, callback, ...args) => {
 	invokeUserCallback("react-google-adk", name, callback, ...args);
 };
 const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
-	const [messages, _setMessages] = useState([]);
-	const [stateDelta, setStateDelta] = useState({});
-	const [agentInfo, setAgentInfo] = useState({});
-	const [longRunningToolIds, _setLongRunningToolIds] = useState([]);
-	const [artifactDelta, setArtifactDelta] = useState({});
-	const [toolConfirmations, setToolConfirmations] = useState([]);
-	const [authRequests, setAuthRequests] = useState([]);
-	const [escalated, setEscalated] = useState(false);
-	const [messageMetadata, setMessageMetadata] = useState(/* @__PURE__ */ new Map());
-	const messagesRef = useRef(messages);
-	const longRunningToolIdsRef = useRef(longRunningToolIds);
-	const stateDeltaRef = useRef(stateDelta);
-	useInsertionEffect(() => {
-		stateDeltaRef.current = stateDelta;
-	}, [stateDelta]);
-	const artifactDeltaRef = useRef(artifactDelta);
-	useInsertionEffect(() => {
-		artifactDeltaRef.current = artifactDelta;
-	}, [artifactDelta]);
-	const messageMetadataRef = useRef(messageMetadata);
-	useInsertionEffect(() => {
-		messageMetadataRef.current = messageMetadata;
-	}, [messageMetadata]);
+	const [controller] = useState(() => new AdkThreadController());
+	const { messages, stateDelta, agentInfo, longRunningToolIds, artifactDelta, toolConfirmations, authRequests, escalated, messageMetadata } = useSyncExternalStore(controller.subscribe, controller.getState, controller.getState);
 	const setMessagesImmediate = useCallback((msgs) => {
-		messagesRef.current = msgs;
-		_setMessages(msgs);
-	}, []);
-	const setLongRunningToolIds = useCallback((ids) => {
-		longRunningToolIdsRef.current = ids;
-		_setLongRunningToolIds(ids);
-	}, []);
+		controller.dispatch({
+			type: "messages.set",
+			messages: msgs
+		});
+	}, [controller]);
 	/**
 	* Swap the thread over to a loaded snapshot in one commit. Unlike
 	* {@link replaceMessages} this never passes through a cleared state, so a
@@ -49,24 +27,17 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 	* than blanking it first.
 	*/
 	const applySnapshot = useCallback((snapshot) => {
-		setMessagesImmediate(snapshot.messages);
-		setLongRunningToolIds(snapshot.longRunningToolIds ?? []);
-		setToolConfirmations(snapshot.toolConfirmations ?? []);
-		setAuthRequests(snapshot.authRequests ?? []);
-		setEscalated(snapshot.escalated ?? false);
-		setMessageMetadata(snapshot.messageMetadata ?? /* @__PURE__ */ new Map());
-		setStateDelta(snapshot.stateDelta ?? {});
-		setArtifactDelta(snapshot.artifactDelta ?? {});
-		setAgentInfo(snapshot.agentInfo ?? {});
-	}, [setLongRunningToolIds, setMessagesImmediate]);
+		controller.dispatch({
+			type: "snapshot.applied",
+			snapshot
+		});
+	}, [controller]);
 	const replaceMessages = useCallback((msgs) => {
-		setMessagesImmediate(msgs);
-		setLongRunningToolIds([]);
-		setToolConfirmations([]);
-		setAuthRequests([]);
-		setEscalated(false);
-		setMessageMetadata(/* @__PURE__ */ new Map());
-	}, [setLongRunningToolIds, setMessagesImmediate]);
+		controller.dispatch({
+			type: "messages.replaced",
+			messages: msgs
+		});
+	}, [controller]);
 	const abortControllerRef = useRef(null);
 	const { onError, onCustomEvent, onAgentTransfer } = useMemo(() => eventHandlers ?? {}, [eventHandlers]);
 	const aui = useAui();
@@ -77,15 +48,19 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 		});
 		const resentIds = new Set(newMessagesWithId.map((m) => m.id));
 		const answeredToolCallIds = new Set(newMessagesWithId.flatMap((m) => m.type === "tool" ? [m.tool_call_id] : []));
-		const accumulator = new AdkEventAccumulator(messagesRef.current.filter((m) => !resentIds.has(m.id)), longRunningToolIdsRef.current.filter((id) => !answeredToolCallIds.has(id)));
+		const currentState = controller.getState();
+		const accumulator = new AdkEventAccumulator(currentState.messages.filter((m) => !resentIds.has(m.id)), currentState.longRunningToolIds.filter((id) => !answeredToolCallIds.has(id)));
 		for (const event of messagesToEvents(newMessagesWithId)) accumulator.processEvent(event);
 		const initialMessages = accumulator.getMessages();
 		const initialMessageIds = new Set(initialMessages.map((m) => m.id));
 		const initialLongRunningToolIds = accumulator.getLongRunningToolIds();
-		setMessagesImmediate(initialMessages);
-		setLongRunningToolIds(initialLongRunningToolIds);
-		setToolConfirmations(accumulator.getToolConfirmations());
-		setAuthRequests(accumulator.getAuthRequests());
+		controller.dispatch({
+			type: "run.started",
+			messages: initialMessages,
+			longRunningToolIds: initialLongRunningToolIds,
+			toolConfirmations: accumulator.getToolConfirmations(),
+			authRequests: accumulator.getAuthRequests()
+		});
 		let lastTransferToAgent;
 		abortControllerRef.current?.abort();
 		const abortController = new AbortController();
@@ -105,24 +80,20 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 				const affectedMessageCount = Math.max(event.content?.parts?.length ?? 0, 1);
 				const affectedMessages = updatedMessages.slice(-affectedMessageCount);
 				if (affectedMessages.length > 0) onMessages?.(affectedMessages, config.runConfig);
-				setMessagesImmediate(updatedMessages);
-				setStateDelta({
-					...stateDeltaRef.current,
-					...accumulator.getStateDelta()
+				controller.dispatch({
+					type: "event.published",
+					state: {
+						messages: updatedMessages,
+						stateDelta: accumulator.getStateDelta(),
+						agentInfo: accumulator.getAgentInfo(),
+						longRunningToolIds: accumulator.getLongRunningToolIds(),
+						artifactDelta: accumulator.getArtifactDelta(),
+						toolConfirmations: accumulator.getToolConfirmations(),
+						authRequests: accumulator.getAuthRequests(),
+						escalated: accumulator.isEscalated(),
+						messageMetadata: accumulator.getMessageMetadata()
+					}
 				});
-				setAgentInfo(accumulator.getAgentInfo());
-				setLongRunningToolIds(accumulator.getLongRunningToolIds());
-				setArtifactDelta({
-					...artifactDeltaRef.current,
-					...accumulator.getArtifactDelta()
-				});
-				setToolConfirmations(accumulator.getToolConfirmations());
-				setAuthRequests(accumulator.getAuthRequests());
-				setEscalated(accumulator.isEscalated());
-				{
-					const newMeta = accumulator.getMessageMetadata();
-					if (newMeta.size > 0) setMessageMetadata(new Map([...messageMetadataRef.current, ...newMeta]));
-				}
 				const transfer = accumulator.getLastTransferToAgent();
 				if (transfer && transfer !== lastTransferToAgent) {
 					lastTransferToAgent = transfer;
@@ -136,8 +107,11 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 		} finally {
 			if (abortControllerRef.current === abortController) {
 				if (abortController.signal.aborted) {
-					setLongRunningToolIds(accumulator.getLongRunningToolIds().filter((id) => initialLongRunningToolIds.includes(id)));
-					const updatedMessages = messagesRef.current;
+					controller.dispatch({
+						type: "longRunningToolIds.set",
+						ids: accumulator.getLongRunningToolIds().filter((id) => initialLongRunningToolIds.includes(id))
+					});
+					const updatedMessages = controller.getState().messages;
 					const lastAssistantMessage = updatedMessages.findLast((m) => m.type === "ai");
 					if (lastAssistantMessage && !initialMessageIds.has(lastAssistantMessage.id) && !lastAssistantMessage.status) setMessagesImmediate(updatedMessages.map((m) => m === lastAssistantMessage ? {
 						...lastAssistantMessage,
@@ -152,8 +126,8 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 		}
 	}, [
 		aui,
+		controller,
 		setMessagesImmediate,
-		setLongRunningToolIds,
 		stream,
 		onError,
 		onCustomEvent,
@@ -165,6 +139,7 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 	}, []);
 	useReplaySafeEffect(() => cancel, []);
 	return {
+		controller,
 		messages,
 		stateDelta,
 		agentInfo,
@@ -181,10 +156,13 @@ const useAdkMessagesInternal = ({ stream, eventHandlers, onMessages }) => {
 		applySnapshot
 	};
 };
-const useAdkMessages = ({ stream, eventHandlers }) => useAdkMessagesInternal({
-	stream,
-	...eventHandlers !== void 0 && { eventHandlers }
-});
+const useAdkMessages = ({ stream, eventHandlers }) => {
+	const { controller: _controller, ...result } = useAdkMessagesInternal({
+		stream,
+		...eventHandlers !== void 0 && { eventHandlers }
+	});
+	return result;
+};
 /**
 * Transport sends every human and tool message of one `send` call as a single
 * ADK `Content`, and ADK parses that event's function responses before running