@ai-sdk/google 3.0.74 → 3.0.75

package/src/interactions/google-interactions-language-model.ts

@@ -34,6 +34,7 @@ import type {
   GoogleInteractionsAgentConfig,
   GoogleInteractionsGenerationConfig,
   GoogleInteractionsRequestBody,
+  GoogleInteractionsResponseFormatEntry,
   GoogleInteractionsTool,
   GoogleInteractionsToolChoice,
 } from './google-interactions-prompt';
@@ -140,28 +141,22 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
     }
 
     /*
-     * Structured output mapping (resolves PRD Open Q1).
+     * `response_format` is a polymorphic array of entries. Three sources
+     * contribute, in order:
      *
-     * The Interactions API exposes structured output via two top-level body
-     * fields: `response_mime_type` (always `'application/json'` here) and
-     * `response_format` (typed as `unknown` in the js-genai SDK). Per the
-     * canonical sample at
-     * `googleapis/js-genai/sdk-samples/interactions_structured_output_json.ts`,
-     * `response_format` accepts a **plain JSON Schema** value directly - no
-     * wrapping object, no OpenAPI conversion. The js-genai resource type
-     * (`src/interactions/resources/interactions.ts:1399`) confirms the field is
-     * passed through verbatim. We therefore send the AI SDK
-     * `responseFormat.schema` (a `JSONSchema7`) as-is.
-     *
-     * If a future API revision rejects plain JSON Schema, fall back to
-     * `convertJSONSchemaToOpenAPISchema(...)` (already imported by
-     * `google-language-model.ts`); empirically that has not been needed.
+     *   1. AI SDK call-level `responseFormat: { type: 'json', schema }` →
+     *      `{ type: 'text', mime_type: 'application/json', schema }`.
+     *   2. `providerOptions.google.responseFormat` (primary path) — entries
+     *      are appended verbatim with camelCase → snake_case translation.
+     *   3. `providerOptions.google.imageConfig` (deprecated fallback) — only
+     *      contributes if no `{type:'image'}` entry was already provided via
+     *      sources 1 or 2; emits a deprecation warning when used.
      *
      * Agent calls cannot send `generation_config` and (per the API) cannot
-     * combine with structured output - emit a warning and drop the field.
+     * combine with structured output — emit a warning and drop the field.
      */
-    let responseMimeType: string | undefined;
-    let responseFormat: unknown | undefined;
+    const responseFormatEntries: Array<GoogleInteractionsResponseFormatEntry> =
+      [];
     if (options.responseFormat?.type === 'json') {
       if (isAgent) {
         warnings.push({
@@ -170,9 +165,43 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
             'google.interactions: structured output (responseFormat) is not supported when an agent is set; responseFormat will be ignored.',
         });
       } else {
-        responseMimeType = 'application/json';
-        if (options.responseFormat.schema != null) {
-          responseFormat = options.responseFormat.schema;
+        const entry: GoogleInteractionsResponseFormatEntry = {
+          type: 'text',
+          mime_type: 'application/json',
+          ...(options.responseFormat.schema != null
+            ? { schema: options.responseFormat.schema }
+            : {}),
+        };
+        responseFormatEntries.push(entry);
+      }
+    }
+
+    if (opts?.responseFormat != null) {
+      for (const entry of opts.responseFormat) {
+        if (entry.type === 'text') {
+          responseFormatEntries.push(
+            pruneUndefined({
+              type: 'text' as const,
+              mime_type: entry.mimeType ?? undefined,
+              schema: entry.schema ?? undefined,
+            }),
+          );
+        } else if (entry.type === 'image') {
+          responseFormatEntries.push(
+            pruneUndefined({
+              type: 'image' as const,
+              mime_type: entry.mimeType ?? undefined,
+              aspect_ratio: entry.aspectRatio ?? undefined,
+              image_size: entry.imageSize ?? undefined,
+            }),
+          );
+        } else if (entry.type === 'audio') {
+          responseFormatEntries.push(
+            pruneUndefined({
+              type: 'audio' as const,
+              mime_type: entry.mimeType ?? undefined,
+            }),
+          );
         }
       }
     }
@@ -205,14 +234,13 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
     /*
      * The Interactions API splits per-call config into `generation_config`
      * (model branch) and `agent_config` (agent branch); the two are mutually
-     * exclusive. We stay minimal here for TASK-1 - only the AI SDK call-level
-     * generation params and the thinking/imageConfig provider options flow
-     * into `generation_config`. Tool-related fields land here in later tasks.
+     * exclusive. The AI SDK call-level generation params and the thinking /
+     * imageConfig provider options flow into `generation_config`.
      *
-     * When an agent is set, none of these fields are accepted by the API. Per
-     * PRD US 31 we emit a single `LanguageModelV3CallWarning` listing the
-     * dropped field names and continue (do not throw); the agent-only
-     * `agent_config` field supersedes them.
+     * When an agent is set, none of these fields are accepted by the API.
+     * Emit a single `LanguageModelV3CallWarning` listing the dropped field
+     * names and continue (do not throw); the agent-only `agent_config`
+     * field supersedes them.
      */
     let generationConfig: GoogleInteractionsGenerationConfig | undefined;
     if (isAgent) {
@@ -249,15 +277,38 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
         max_output_tokens: options.maxOutputTokens ?? undefined,
         thinking_level: opts?.thinkingLevel ?? undefined,
         thinking_summaries: opts?.thinkingSummaries ?? undefined,
-        image_config:
-          opts?.imageConfig != null
-            ? pruneUndefined({
-                aspect_ratio: opts.imageConfig.aspectRatio ?? undefined,
-                image_size: opts.imageConfig.imageSize ?? undefined,
-              })
-            : undefined,
         tool_choice: toolChoiceForBody,
       });
+
+      /*
+       * Deprecated fallback path: `imageConfig` contributes an image entry
+       * only when none was supplied via `responseFormat`. A warning is
+       * always emitted when `imageConfig` is set so callers migrate to the
+       * `responseFormat` shape.
+       */
+      if (opts?.imageConfig != null) {
+        const alreadyHasImageEntry = responseFormatEntries.some(
+          entry => entry.type === 'image',
+        );
+        warnings.push({
+          type: 'other',
+          message: alreadyHasImageEntry
+            ? 'google.interactions: providerOptions.google.imageConfig is deprecated and was ignored because providerOptions.google.responseFormat already supplies an image entry. Use responseFormat exclusively.'
+            : 'google.interactions: providerOptions.google.imageConfig is deprecated. Use providerOptions.google.responseFormat with a { type: "image", ... } entry instead.',
+        });
+        if (!alreadyHasImageEntry) {
+          responseFormatEntries.push({
+            type: 'image',
+            mime_type: 'image/png',
+            ...(opts.imageConfig.aspectRatio != null
+              ? { aspect_ratio: opts.imageConfig.aspectRatio }
+              : {}),
+            ...(opts.imageConfig.imageSize != null
+              ? { image_size: opts.imageConfig.imageSize }
+              : {}),
+          });
+        }
+      }
     }
 
     let agentConfig: GoogleInteractionsAgentConfig | undefined;
@@ -293,8 +344,8 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
       input,
       system_instruction: systemInstruction,
       tools: toolsForBody,
-      response_format: responseFormat,
-      response_mime_type: responseMimeType,
+      response_format:
+        responseFormatEntries.length > 0 ? responseFormatEntries : undefined,
       response_modalities:
         opts?.responseModalities != null
           ? (opts.responseModalities as Array<
@@ -329,6 +380,7 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
     const url = `${this.config.baseURL}/interactions`;
 
     const mergedHeaders = combineHeaders(
+      INTERACTIONS_API_REVISION_HEADER,
       this.config.headers ? await resolve(this.config.headers) : undefined,
       options.headers,
     );
@@ -383,7 +435,7 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
         : undefined;
 
     const { content, hasFunctionCall } = parseGoogleInteractionsOutputs({
-      outputs: response.outputs ?? null,
+      steps: response.steps ?? null,
       generateId: this.config.generateId ?? defaultGenerateId,
       interactionId,
     });
@@ -457,6 +509,7 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
     const url = `${this.config.baseURL}/interactions`;
 
     const mergedHeaders = combineHeaders(
+      INTERACTIONS_API_REVISION_HEADER,
       this.config.headers ? await resolve(this.config.headers) : undefined,
       options.headers,
     );
@@ -625,6 +678,15 @@ export class GoogleInteractionsLanguageModel implements LanguageModelV3 {
   }
 }
 
+/*
+ * Pins the Interactions API revision the SDK targets. Sent on every request
+ * the model issues so model-id calls, agent calls, polling, SSE reconnects,
+ * and cancellation all hit the same schema.
+ */
+const INTERACTIONS_API_REVISION_HEADER: Record<string, string> = {
+  'Api-Revision': '2026-05-20',
+};
+
 function pruneUndefined<T extends Record<string, unknown>>(obj: T): T {
   const result: Record<string, unknown> = {};
   for (const [key, value] of Object.entries(obj)) {

package/src/interactions/google-interactions-prompt.ts

@@ -2,15 +2,13 @@
  * Internal TypeScript types for the Gemini Interactions API wire format.
  *
  * Mirrors the public types in `googleapis/js-genai`:
- * `src/interactions/resources/interactions.ts`. Kept minimal for TASK-1 (text +
- * thought happy path); further content/tool block variants are scaffolded as
- * `unknown` here and populated in subsequent tasks.
+ * `src/interactions/resources/interactions.ts`.
  */
 
 export type GoogleInteractionsTextContent = {
   type: 'text';
   text: string;
-  annotations?: Array<unknown>;
+  annotations?: Array<GoogleInteractionsAnnotation | { type: string }>;
 };
 
 export type GoogleInteractionsImageContent = {
@@ -49,20 +47,6 @@ export type GoogleInteractionsThoughtSummaryItem =
   | GoogleInteractionsTextContent
   | GoogleInteractionsImageContent;
 
-export type GoogleInteractionsThoughtContent = {
-  type: 'thought';
-  signature?: string;
-  summary?: Array<GoogleInteractionsThoughtSummaryItem>;
-};
-
-export type GoogleInteractionsFunctionCallContent = {
-  type: 'function_call';
-  id: string;
-  name: string;
-  arguments: Record<string, unknown>;
-  signature?: string;
-};
-
 export type GoogleInteractionsFunctionResultContent = {
   type: 'function_result';
   call_id: string;
@@ -76,9 +60,11 @@ export type GoogleInteractionsFunctionResultContent = {
 };
 
 /**
- * URL citation annotation for `text` content blocks.
- * Mirrors `Annotation.URLCitation` in `googleapis/js-genai`
- * `src/interactions/resources/interactions.ts`.
+ * Annotation types attached to a `text` content block:
+ * - `url_citation` (web) — `url` + optional `title`
+ * - `file_citation` — `url` for the citation target; optional `document_uri`
+ *   / `file_name` for doc references
+ * - `place_citation` — Maps grounding, carries `url`
  */
 export type GoogleInteractionsURLCitation = {
   type: 'url_citation';
@@ -88,14 +74,11 @@ export type GoogleInteractionsURLCitation = {
   end_index?: number;
 };
 
-/**
- * File citation annotation for `text` content blocks.
- */
 export type GoogleInteractionsFileCitation = {
   type: 'file_citation';
   file_name?: string;
   document_uri?: string;
-  source?: string;
+  url?: string;
   page_number?: number;
   media_id?: string;
   start_index?: number;
@@ -103,9 +86,6 @@ export type GoogleInteractionsFileCitation = {
   custom_metadata?: Record<string, unknown>;
 };
 
-/**
- * Place citation annotation for Google Maps grounding.
- */
 export type GoogleInteractionsPlaceCitation = {
   type: 'place_citation';
   name?: string;
@@ -125,28 +105,42 @@ export type GoogleInteractionsAnnotation =
   | GoogleInteractionsFileCitation
   | GoogleInteractionsPlaceCitation;
 
-/**
- * Built-in tool call content blocks. The Interactions API exposes server-side
- * tool invocations via paired `*_call`/`*_result` blocks (as opposed to
- * `function_call`/`function_result` for client-executed tools).
+/*
+ * --- Step payload shapes ---
+ *
+ * `function_call`, `thought`, and the built-in `*_call`/`*_result` are
+ * top-level **step** types — their fields live directly on the step object
+ * (no `content` indirection). The types below model those payloads; the step
+ * wrapper (`type` discriminator + payload) is `GoogleInteractionsStep`
+ * further down.
  */
-export type GoogleInteractionsCodeExecutionCallContent = {
-  type: 'code_execution_call';
+
+export type GoogleInteractionsFunctionCallStepPayload = {
+  id: string;
+  name: string;
+  arguments: Record<string, unknown>;
+  signature?: string;
+};
+
+export type GoogleInteractionsThoughtStepPayload = {
+  signature?: string;
+  summary?: Array<GoogleInteractionsThoughtSummaryItem>;
+};
+
+export type GoogleInteractionsCodeExecutionCallStepPayload = {
   id: string;
   arguments?: { code?: string; language?: string };
   signature?: string;
 };
 
-export type GoogleInteractionsCodeExecutionResultContent = {
-  type: 'code_execution_result';
+export type GoogleInteractionsCodeExecutionResultStepPayload = {
   call_id: string;
   result?: string;
   is_error?: boolean;
   signature?: string;
 };
 
-export type GoogleInteractionsURLContextCallContent = {
-  type: 'url_context_call';
+export type GoogleInteractionsURLContextCallStepPayload = {
   id: string;
   arguments?: { urls?: Array<string> };
   signature?: string;
@@ -157,16 +151,14 @@ export type GoogleInteractionsURLContextResultEntry = {
   status?: 'success' | 'error' | 'paywall' | 'unsafe' | string;
 };
 
-export type GoogleInteractionsURLContextResultContent = {
-  type: 'url_context_result';
+export type GoogleInteractionsURLContextResultStepPayload = {
   call_id: string;
   result?: Array<GoogleInteractionsURLContextResultEntry>;
   is_error?: boolean;
   signature?: string;
 };
 
-export type GoogleInteractionsGoogleSearchCallContent = {
-  type: 'google_search_call';
+export type GoogleInteractionsGoogleSearchCallStepPayload = {
   id: string;
   arguments?: { queries?: Array<string> };
   search_type?: 'web_search' | 'image_search' | 'enterprise_web_search';
@@ -179,36 +171,25 @@ export type GoogleInteractionsGoogleSearchResultEntry = {
   title?: string;
 };
 
-export type GoogleInteractionsGoogleSearchResultContent = {
-  type: 'google_search_result';
+export type GoogleInteractionsGoogleSearchResultStepPayload = {
   call_id: string;
   result?: Array<GoogleInteractionsGoogleSearchResultEntry>;
   is_error?: boolean;
   signature?: string;
 };
 
-export type GoogleInteractionsFileSearchCallContent = {
-  type: 'file_search_call';
+export type GoogleInteractionsFileSearchCallStepPayload = {
   id: string;
   signature?: string;
 };
 
-export type GoogleInteractionsFileSearchResultEntry = {
-  file_name?: string;
-  document_uri?: string;
-  title?: string;
-  source?: string;
-};
-
-export type GoogleInteractionsFileSearchResultContent = {
-  type: 'file_search_result';
+export type GoogleInteractionsFileSearchResultStepPayload = {
   call_id: string;
   result?: Array<unknown>;
   signature?: string;
 };
 
-export type GoogleInteractionsGoogleMapsCallContent = {
-  type: 'google_maps_call';
+export type GoogleInteractionsGoogleMapsCallStepPayload = {
   id: string;
   arguments?: { queries?: Array<string> };
   signature?: string;
@@ -230,15 +211,13 @@ export type GoogleInteractionsGoogleMapsResultEntry = {
   widget_context_token?: string;
 };
 
-export type GoogleInteractionsGoogleMapsResultContent = {
-  type: 'google_maps_result';
+export type GoogleInteractionsGoogleMapsResultStepPayload = {
   call_id: string;
   result?: Array<GoogleInteractionsGoogleMapsResultEntry>;
   signature?: string;
 };
 
-export type GoogleInteractionsMCPServerToolCallContent = {
-  type: 'mcp_server_tool_call';
+export type GoogleInteractionsMCPServerToolCallStepPayload = {
   id: string;
   name: string;
   server_name: string;
@@ -246,8 +225,7 @@ export type GoogleInteractionsMCPServerToolCallContent = {
   signature?: string;
 };
 
-export type GoogleInteractionsMCPServerToolResultContent = {
-  type: 'mcp_server_tool_result';
+export type GoogleInteractionsMCPServerToolResultStepPayload = {
   call_id: string;
   result?: unknown;
   name?: string;
@@ -255,49 +233,96 @@ export type GoogleInteractionsMCPServerToolResultContent = {
   signature?: string;
 };
 
-export type GoogleInteractionsBuiltinToolCallContent =
-  | GoogleInteractionsCodeExecutionCallContent
-  | GoogleInteractionsURLContextCallContent
-  | GoogleInteractionsGoogleSearchCallContent
-  | GoogleInteractionsFileSearchCallContent
-  | GoogleInteractionsGoogleMapsCallContent
-  | GoogleInteractionsMCPServerToolCallContent;
+/*
+ * Discriminated step union — the elements of `response.steps[]` and the
+ * `step` field on `step.start` SSE events.
+ */
+export type GoogleInteractionsModelOutputStep = {
+  type: 'model_output';
+  content?: Array<GoogleInteractionsContentBlock>;
+};
 
-export type GoogleInteractionsBuiltinToolResultContent =
-  | GoogleInteractionsCodeExecutionResultContent
-  | GoogleInteractionsURLContextResultContent
-  | GoogleInteractionsGoogleSearchResultContent
-  | GoogleInteractionsFileSearchResultContent
-  | GoogleInteractionsGoogleMapsResultContent
-  | GoogleInteractionsMCPServerToolResultContent;
+export type GoogleInteractionsUserInputStep = {
+  type: 'user_input';
+  content?: Array<GoogleInteractionsContentBlock>;
+};
 
-/**
- * Discriminated union of every content block kind the API supports. For
- * TASK-1, only `text` and `thought` are exercised end-to-end; the remaining
- * variants are listed for type completeness so subsequent tasks can extend the
- * parser/converter without widening the type.
+export type GoogleInteractionsFunctionCallStep = {
+  type: 'function_call';
+} & GoogleInteractionsFunctionCallStepPayload;
+
+export type GoogleInteractionsThoughtStep = {
+  type: 'thought';
+} & GoogleInteractionsThoughtStepPayload;
+
+export type GoogleInteractionsBuiltinToolCallStep =
+  | ({
+      type: 'google_search_call';
+    } & GoogleInteractionsGoogleSearchCallStepPayload)
+  | ({
+      type: 'code_execution_call';
+    } & GoogleInteractionsCodeExecutionCallStepPayload)
+  | ({ type: 'url_context_call' } & GoogleInteractionsURLContextCallStepPayload)
+  | ({ type: 'file_search_call' } & GoogleInteractionsFileSearchCallStepPayload)
+  | ({ type: 'google_maps_call' } & GoogleInteractionsGoogleMapsCallStepPayload)
+  | ({
+      type: 'mcp_server_tool_call';
+    } & GoogleInteractionsMCPServerToolCallStepPayload);
+
+export type GoogleInteractionsBuiltinToolResultStep =
+  | ({
+      type: 'google_search_result';
+    } & GoogleInteractionsGoogleSearchResultStepPayload)
+  | ({
+      type: 'code_execution_result';
+    } & GoogleInteractionsCodeExecutionResultStepPayload)
+  | ({
+      type: 'url_context_result';
+    } & GoogleInteractionsURLContextResultStepPayload)
+  | ({
+      type: 'file_search_result';
+    } & GoogleInteractionsFileSearchResultStepPayload)
+  | ({
+      type: 'google_maps_result';
+    } & GoogleInteractionsGoogleMapsResultStepPayload)
+  | ({
+      type: 'mcp_server_tool_result';
+    } & GoogleInteractionsMCPServerToolResultStepPayload);
+
+export type GoogleInteractionsStep =
+  | GoogleInteractionsUserInputStep
+  | GoogleInteractionsModelOutputStep
+  | GoogleInteractionsFunctionCallStep
+  | GoogleInteractionsThoughtStep
+  | GoogleInteractionsBuiltinToolCallStep
+  | GoogleInteractionsBuiltinToolResultStep
+  | { type: string; [k: string]: unknown };
+
+/*
+ * Inner content-block types (what lives inside `model_output.content[]` and
+ * `user_input.content[]`). Function calls, thoughts, and built-in tool
+ * call/result blocks are steps, not content blocks.
  */
-export type GoogleInteractionsContent =
+export type GoogleInteractionsContentBlock =
   | GoogleInteractionsTextContent
   | GoogleInteractionsImageContent
   | GoogleInteractionsAudioContent
   | GoogleInteractionsDocumentContent
   | GoogleInteractionsVideoContent
-  | GoogleInteractionsThoughtContent
-  | GoogleInteractionsFunctionCallContent
   | GoogleInteractionsFunctionResultContent
   | { type: string; [k: string]: unknown };
 
-export type GoogleInteractionsTurn = {
-  role: 'user' | 'model' | string;
-  content?: string | Array<GoogleInteractionsContent>;
-};
+/**
+ * Alias kept for the file-part converter surface; identical to
+ * `GoogleInteractionsContentBlock`.
+ */
+export type GoogleInteractionsContent = GoogleInteractionsContentBlock;
 
-export type GoogleInteractionsInput =
-  | string
-  | GoogleInteractionsContent
-  | Array<GoogleInteractionsContent>
-  | Array<GoogleInteractionsTurn>;
+/*
+ * `input` is an array of steps. A single-turn user prompt is sent as
+ * `[{ type: 'user_input', content: [...] }]`.
+ */
+export type GoogleInteractionsInput = Array<GoogleInteractionsStep>;
 
 export type GoogleInteractionsTool =
   | {
@@ -381,25 +406,58 @@ export type GoogleInteractionsResponseModality =
 
 export type GoogleInteractionsServiceTier = 'flex' | 'standard' | 'priority';
 
-export type GoogleInteractionsImageConfig = {
-  aspect_ratio?:
-    | '1:1'
-    | '2:3'
-    | '3:2'
-    | '3:4'
-    | '4:3'
-    | '4:5'
-    | '5:4'
-    | '9:16'
-    | '16:9'
-    | '21:9'
-    | '1:8'
-    | '8:1'
-    | '1:4'
-    | '4:1';
-  image_size?: '1K' | '2K' | '4K' | '512';
+export type GoogleInteractionsAspectRatio =
+  | '1:1'
+  | '2:3'
+  | '3:2'
+  | '3:4'
+  | '4:3'
+  | '4:5'
+  | '5:4'
+  | '9:16'
+  | '16:9'
+  | '21:9'
+  | '1:8'
+  | '8:1'
+  | '1:4'
+  | '4:1';
+
+export type GoogleInteractionsImageSize = '1K' | '2K' | '4K' | '512';
+
+/*
+ * `response_format` is a polymorphic entry. Multiple modalities are requested
+ * by sending an array of entries. Entries the SDK constructs:
+ *
+ *   { type: 'text', mime_type: 'application/json', schema: <JSONSchema> }
+ *     -- structured output (JSON mode). `mime_type` is required; `schema` is
+ *     optional but recommended.
+ *
+ *   { type: 'image', mime_type, aspect_ratio?, image_size? }
+ *     -- image generation. `mime_type` defaults to `image/png`.
+ */
+export type GoogleInteractionsResponseFormatTextEntry = {
+  type: 'text';
+  mime_type?: string;
+  schema?: unknown;
+};
+
+export type GoogleInteractionsResponseFormatImageEntry = {
+  type: 'image';
+  mime_type?: string;
+  aspect_ratio?: GoogleInteractionsAspectRatio;
+  image_size?: GoogleInteractionsImageSize;
 };
 
+export type GoogleInteractionsResponseFormatAudioEntry = {
+  type: 'audio';
+  mime_type?: string;
+};
+
+export type GoogleInteractionsResponseFormatEntry =
+  | GoogleInteractionsResponseFormatTextEntry
+  | GoogleInteractionsResponseFormatImageEntry
+  | GoogleInteractionsResponseFormatAudioEntry;
+
 export type GoogleInteractionsGenerationConfig = {
   temperature?: number;
   top_p?: number;
@@ -408,7 +466,6 @@ export type GoogleInteractionsGenerationConfig = {
   max_output_tokens?: number;
   thinking_level?: GoogleInteractionsThinkingLevel;
   thinking_summaries?: GoogleInteractionsThinkingSummaries;
-  image_config?: GoogleInteractionsImageConfig;
   tool_choice?: GoogleInteractionsToolChoice;
 };
 
@@ -427,8 +484,7 @@ export type GoogleInteractionsRequestBody = {
   input: GoogleInteractionsInput;
   system_instruction?: string;
   tools?: Array<GoogleInteractionsTool>;
-  response_format?: unknown;
-  response_mime_type?: string;
+  response_format?: Array<GoogleInteractionsResponseFormatEntry>;
   response_modalities?: Array<GoogleInteractionsResponseModality>;
   generation_config?: GoogleInteractionsGenerationConfig;
   agent_config?: GoogleInteractionsAgentConfig;
@@ -455,3 +511,22 @@ export type GoogleInteractionsStatus =
   | 'failed'
   | 'cancelled'
   | 'incomplete';
+
+/*
+ * Aliases used by the source extractor; structurally equivalent to their
+ * step-payload counterparts.
+ */
+export type GoogleInteractionsBuiltinToolResultContent =
+  GoogleInteractionsBuiltinToolResultStep;
+export type GoogleInteractionsGoogleSearchResultContent = Extract<
+  GoogleInteractionsBuiltinToolResultStep,
+  { type: 'google_search_result' }
+>;
+export type GoogleInteractionsGoogleMapsResultContent = Extract<
+  GoogleInteractionsBuiltinToolResultStep,
+  { type: 'google_maps_result' }
+>;
+export type GoogleInteractionsURLContextResultContent = Extract<
+  GoogleInteractionsBuiltinToolResultStep,
+  { type: 'url_context_result' }
+>;