From 12d5eafaed8a7f02cabe0c4e4288cad40a56db9c Mon Sep 17 00:00:00 2001
From: Amariah Kamau <110414493+AmariahAK@users.noreply.github.com>
Date: Sat, 18 Jul 2026 15:06:21 +0300
Subject: [PATCH] fix(discoveryengine): change streamAnswer return type to
 array

streamAnswer REST endpoint returns a JSON array of
AnswerQueryResponse frames at runtime, but the generated
TypeScript types declared a single object, causing
res.data.answerQueryToken and similar fields to be
undefined at runtime.

- Fix v1, v1beta, and v1alpha generated types (99 total)
- Add :stream path detection in method-partial.njk
  generator template to prevent regression

Fixes #3930

Co-authored-by: atlarix-agent <agent@atlarix.dev>
---
 src/apis/discoveryengine/v1.ts             | 66 +++++++++++-----------
 src/apis/discoveryengine/v1alpha.ts        | 66 +++++++++++-----------
 src/apis/discoveryengine/v1beta.ts         | 66 +++++++++++-----------
 src/generator/templates/method-partial.njk |  3 +
 4 files changed, 102 insertions(+), 99 deletions(-)

diff --git a/src/apis/discoveryengine/v1.ts b/src/apis/discoveryengine/v1.ts
index 32e05453bd4..17cabb1da3d 100644
--- a/src/apis/discoveryengine/v1.ts
+++ b/src/apis/discoveryengine/v1.ts
@@ -31004,7 +31004,7 @@ export namespace discoveryengine_v1 {
       params?: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
@@ -31015,33 +31015,33 @@ export namespace discoveryengine_v1 {
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -31080,12 +31080,12 @@ export namespace discoveryengine_v1 {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters
         );
       }
@@ -45833,7 +45833,7 @@ export namespace discoveryengine_v1 {
       params?: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
@@ -45844,33 +45844,33 @@ export namespace discoveryengine_v1 {
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -45909,12 +45909,12 @@ export namespace discoveryengine_v1 {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters
         );
       }
@@ -57084,7 +57084,7 @@ export namespace discoveryengine_v1 {
       params?: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
@@ -57095,33 +57095,33 @@ export namespace discoveryengine_v1 {
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -57160,12 +57160,12 @@ export namespace discoveryengine_v1 {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1AnswerQueryResponse[]>(
           parameters
         );
       }
diff --git a/src/apis/discoveryengine/v1alpha.ts b/src/apis/discoveryengine/v1alpha.ts
index 8b6a9dadffd..671ea1cb679 100644
--- a/src/apis/discoveryengine/v1alpha.ts
+++ b/src/apis/discoveryengine/v1alpha.ts
@@ -37911,7 +37911,7 @@ export namespace discoveryengine_v1alpha {
       params?: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
@@ -37922,33 +37922,33 @@ export namespace discoveryengine_v1alpha {
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -37987,12 +37987,12 @@ export namespace discoveryengine_v1alpha {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters
         );
       }
@@ -54683,7 +54683,7 @@ export namespace discoveryengine_v1alpha {
       params?: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
@@ -54694,33 +54694,33 @@ export namespace discoveryengine_v1alpha {
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -54759,12 +54759,12 @@ export namespace discoveryengine_v1alpha {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters
         );
       }
@@ -68464,7 +68464,7 @@ export namespace discoveryengine_v1alpha {
       params?: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
@@ -68475,33 +68475,33 @@ export namespace discoveryengine_v1alpha {
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -68540,12 +68540,12 @@ export namespace discoveryengine_v1alpha {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1alphaAnswerQueryResponse[]>(
           parameters
         );
       }
diff --git a/src/apis/discoveryengine/v1beta.ts b/src/apis/discoveryengine/v1beta.ts
index 5e3cc78230e..ac5962a9f82 100644
--- a/src/apis/discoveryengine/v1beta.ts
+++ b/src/apis/discoveryengine/v1beta.ts
@@ -29503,7 +29503,7 @@ export namespace discoveryengine_v1beta {
       params?: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
@@ -29514,33 +29514,33 @@ export namespace discoveryengine_v1beta {
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -29579,12 +29579,12 @@ export namespace discoveryengine_v1beta {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters
         );
       }
@@ -42697,7 +42697,7 @@ export namespace discoveryengine_v1beta {
       params?: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
@@ -42708,33 +42708,33 @@ export namespace discoveryengine_v1beta {
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Collections$Engines$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -42773,12 +42773,12 @@ export namespace discoveryengine_v1beta {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters
         );
       }
@@ -53516,7 +53516,7 @@ export namespace discoveryengine_v1beta {
       params?: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options?: MethodOptions
     ): Promise<
-      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     >;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
@@ -53527,33 +53527,33 @@ export namespace discoveryengine_v1beta {
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
       options:
         | MethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>,
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       params: Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer,
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
-      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+      callback: BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
     ): void;
     streamAnswer(
       paramsOrCallback?:
         | Params$Resource$Projects$Locations$Datastores$Servingconfigs$Streamanswer
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       optionsOrCallback?:
         | MethodOptions
         | StreamMethodOptions
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>,
       callback?:
-        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+        | BodyResponseCallback<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         | BodyResponseCallback<Readable>
     ):
       | void
       | Promise<
-          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>
+          GaxiosResponseWithHTTP2<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>
         >
       | Promise<GaxiosResponseWithHTTP2<Readable>> {
       let params = (paramsOrCallback ||
@@ -53592,12 +53592,12 @@ export namespace discoveryengine_v1beta {
         context: this.context,
       };
       if (callback) {
-        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters,
           callback as BodyResponseCallback<unknown>
         );
       } else {
-        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse>(
+        return createAPIRequest<Schema$GoogleCloudDiscoveryengineV1betaAnswerQueryResponse[]>(
           parameters
         );
       }
diff --git a/src/generator/templates/method-partial.njk b/src/generator/templates/method-partial.njk
index 706b591f6d4..cf6d3fa9dee 100644
--- a/src/generator/templates/method-partial.njk
+++ b/src/generator/templates/method-partial.njk
@@ -21,6 +21,9 @@
  */
 {% if m.response.$ref %}
   {% set responseType = "Schema$"+m.response.$ref %}
+  {% if ':stream' in m.path %}
+    {% set responseType = responseType + "[]" %}
+  {% endif %}
 {% elif m.supportsMediaDownload %}
   {% set responseType = "unknown" %}
 {% else %}