Merge branch 'main' into fix/retry-logic-for-all-users

packages/core/src/code_assist/server.ts

@@ -5,6 +5,7 @@
  */
 
 import type { AuthClient } from 'google-auth-library';
+import { Agent } from 'node:https';
 import type {
   CodeAssistGlobalUserSettingResponse,
   LoadCodeAssistRequest,
@@ -54,6 +55,7 @@ import {
 } from './telemetry.js';
 import { getClientMetadata } from './experiments/client_metadata.js';
 import type { LlmRole } from '../telemetry/types.js';
+
 /** HTTP options to be used in each of the requests. */
 export interface HttpOptions {
   /** Additional HTTP headers to be sent with the request. */
@@ -71,6 +73,9 @@ export class CodeAssistServer implements ContentGenerator {
     readonly sessionId?: string,
     readonly userTier?: UserTierId,
     readonly userTierName?: string,
+    private readonly httpsAgent = new Agent({
+      timeout: 300000,
+    }),
   ) {}
 
   async generateContentStream(
@@ -305,6 +310,7 @@ export class CodeAssistServer implements ContentGenerator {
       responseType: 'json',
       body: JSON.stringify(req),
       signal,
+      agent: this.httpsAgent,
     });
     return res.data;
   }
@@ -322,6 +328,7 @@ export class CodeAssistServer implements ContentGenerator {
       },
       responseType: 'json',
       signal,
+      agent: this.httpsAgent,
     });
     return res.data;
   }
@@ -352,6 +359,7 @@ export class CodeAssistServer implements ContentGenerator {
       responseType: 'stream',
       body: JSON.stringify(req),
       signal,
+      agent: this.httpsAgent,
     });
 
     return (async function* (): AsyncGenerator<T> {