From fdd844b405941dcbed4f28cfc0eade51657c22c4 Mon Sep 17 00:00:00 2001
From: Sehoon Shon <sshon@google.com>
Date: Fri, 27 Feb 2026 13:04:43 -0500
Subject: [PATCH] fix(core): disable retries for code assist streaming requests
 (#20561)

---
 packages/core/src/code_assist/server.test.ts | 11 ++---------
 packages/core/src/code_assist/server.ts      | 14 +++++---------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/packages/core/src/code_assist/server.test.ts b/packages/core/src/code_assist/server.test.ts
index aa5cbae7fe..63566c4662 100644
--- a/packages/core/src/code_assist/server.test.ts
+++ b/packages/core/src/code_assist/server.test.ts
@@ -84,6 +84,7 @@ describe('CodeAssistServer', () => {
       body: expect.any(String),
       signal: undefined,
       retryConfig: {
+        retryDelay: 1000,
         retry: 3,
         noResponseRetries: 3,
         statusCodesToRetry: [
@@ -410,15 +411,7 @@ describe('CodeAssistServer', () => {
         'Content-Type': 'application/json',
       },
       signal: undefined,
-      retryConfig: {
-        retry: 3,
-        noResponseRetries: 3,
-        statusCodesToRetry: [
-          [429, 429],
-          [499, 499],
-          [500, 599],
-        ],
-      },
+      retry: false,
     });
 
     expect(results).toHaveLength(2);
diff --git a/packages/core/src/code_assist/server.ts b/packages/core/src/code_assist/server.ts
index dfcc693ca7..2c726b3c1e 100644
--- a/packages/core/src/code_assist/server.ts
+++ b/packages/core/src/code_assist/server.ts
@@ -62,6 +62,7 @@ export interface HttpOptions {
 
 export const CODE_ASSIST_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
 export const CODE_ASSIST_API_VERSION = 'v1internal';
+const GENERATE_CONTENT_RETRY_DELAY_IN_MILLISECONDS = 1000;
 
 export class CodeAssistServer implements ContentGenerator {
   constructor(
@@ -141,6 +142,7 @@ export class CodeAssistServer implements ContentGenerator {
         this.sessionId,
       ),
       req.config?.abortSignal,
+      GENERATE_CONTENT_RETRY_DELAY_IN_MILLISECONDS,
     );
     const duration = formatProtoJsonDuration(Date.now() - start);
     const streamingLatency: StreamingLatency = {
@@ -294,6 +296,7 @@ export class CodeAssistServer implements ContentGenerator {
     method: string,
     req: object,
     signal?: AbortSignal,
+    retryDelay: number = 100,
   ): Promise<T> {
     const res = await this.client.request<T>({
       url: this.getMethodUrl(method),
@@ -306,6 +309,7 @@ export class CodeAssistServer implements ContentGenerator {
       body: JSON.stringify(req),
       signal,
       retryConfig: {
+        retryDelay,
         retry: 3,
         noResponseRetries: 3,
         statusCodesToRetry: [
@@ -361,15 +365,7 @@ export class CodeAssistServer implements ContentGenerator {
       responseType: 'stream',
       body: JSON.stringify(req),
       signal,
-      retryConfig: {
-        retry: 3,
-        noResponseRetries: 3,
-        statusCodesToRetry: [
-          [429, 429],
-          [499, 499],
-          [500, 599],
-        ],
-      },
+      retry: false,
     });
 
     return (async function* (): AsyncGenerator<T> {