fix(core): reduce default API timeout to 60s and enable retries for undici timeouts by Adib234 · Pull Request #26191 · google-gemini/gemini-cli

Adib234 · 2026-04-29T13:06:40Z

Summary

API requests could hang for up to 5 minutes (default undici timeout) when the backend or local proxy was unresponsive. This PR reduces the default timeout to 60 seconds and ensures that these timeouts are automatically retried.

Details

Reduced defaultTimeout in packages/core/src/utils/fetch.ts from 300,000ms to 60,000ms.
Updated getNetworkErrorCode in packages/core/src/utils/retry.ts to map Undici-specific timeout error codes (UND_ERR_HEADERS_TIMEOUT, UND_ERR_BODY_TIMEOUT, UND_ERR_CONNECT_TIMEOUT) to the standard ETIMEDOUT code.
This mapping allows the existing backoff resilience logic to treat Undici timeouts as retryable network errors.

Related Issues

Fixes #18030

How to Validate

Run npm test -w @google/gemini-cli-core -- src/utils/retry.test.ts to verify the new test case for Undici timeouts.
Run npm test -w @google/gemini-cli-core -- src/utils/fetch.test.ts to ensure no regressions in fetch utilities.

Pre-Merge Checklist

…ndici timeouts

gemini-code-assist · 2026-04-29T13:10:07Z

Summary of Changes

Hello, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request improves the resilience and responsiveness of API requests by shortening the default timeout period and ensuring that specific timeout-related errors are correctly handled by the existing retry mechanism. By mapping Undici-specific timeout codes to standard network error codes, the system can now automatically recover from transient connection or header timeouts.

Highlights

Timeout Reduction: Reduced the default API request timeout from 300 seconds to 60 seconds to improve responsiveness when backends or proxies are unresponsive.
Retry Logic Enhancement: Updated the network error mapping to treat specific Undici timeout error codes as retryable ETIMEDOUT errors.
Test Coverage: Added a new test case to verify that Undici timeout errors are correctly identified and retried by the backoff logic.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

github-actions · 2026-04-29T13:11:30Z

Size Change: +157 B (0%)

Total Size: 33.9 MB

Filename	Size	Change
`./bundle/chunk-2SVULO7M.js`	0 B	-2.72 MB (removed)	🏆
`./bundle/chunk-AJOEEPSA.js`	0 B	-655 kB (removed)	🏆
`./bundle/chunk-BI2TICHK.js`	0 B	-49.2 kB (removed)	🏆
`./bundle/chunk-MTACYV4P.js`	0 B	-3.8 kB (removed)	🏆
`./bundle/chunk-NXYNS3NC.js`	0 B	-12.6 kB (removed)	🏆
`./bundle/chunk-NYNNG3NC.js`	0 B	-14.7 MB (removed)	🏆
`./bundle/chunk-SVF7H5OB.js`	0 B	-3.43 kB (removed)	🏆
`./bundle/chunk-UDR4BNVP.js`	0 B	-19.5 kB (removed)	🏆
`./bundle/core-S34GRGBW.js`	0 B	-48.2 kB (removed)	🏆
`./bundle/devtoolsService-CF54MKX6.js`	0 B	-28 kB (removed)	🏆
`./bundle/gemini-ZFMVIZA2.js`	0 B	-575 kB (removed)	🏆
`./bundle/interactiveCli-KR6WYFHM.js`	0 B	-1.31 MB (removed)	🏆
`./bundle/liteRtServerManager-HSQYXMEK.js`	0 B	-2.11 kB (removed)	🏆
`./bundle/oauth2-provider-VUQWKIBS.js`	0 B	-9.16 kB (removed)	🏆
`./bundle/chunk-36AQVFOJ.js`	19.5 kB	+19.5 kB (new file)	🆕
`./bundle/chunk-52YDEPLB.js`	12.6 kB	+12.6 kB (new file)	🆕
`./bundle/chunk-6OO53Y2A.js`	655 kB	+655 kB (new file)	🆕
`./bundle/chunk-JAW7H2AW.js`	14.7 MB	+14.7 MB (new file)	🆕
`./bundle/chunk-JZNW7QWH.js`	3.43 kB	+3.43 kB (new file)	🆕
`./bundle/chunk-KQGYLEHF.js`	2.72 MB	+2.72 MB (new file)	🆕
`./bundle/chunk-ORNNQEQE.js`	3.8 kB	+3.8 kB (new file)	🆕
`./bundle/chunk-YOJBTG4D.js`	49.2 kB	+49.2 kB (new file)	🆕
`./bundle/core-V363M2UI.js`	48.2 kB	+48.2 kB (new file)	🆕
`./bundle/devtoolsService-ZI6HWLGS.js`	28 kB	+28 kB (new file)	🆕
`./bundle/gemini-5SFAIEXI.js`	575 kB	+575 kB (new file)	🆕
`./bundle/interactiveCli-VVUGBMIQ.js`	1.31 MB	+1.31 MB (new file)	🆕
`./bundle/liteRtServerManager-PJ7BB7Y7.js`	2.11 kB	+2.11 kB (new file)	🆕
`./bundle/oauth2-provider-TCFGAWEG.js`	9.16 kB	+9.16 kB (new file)	🆕

ℹ️ View Unchanged

Filename	Size	Change
`./bundle/bundled/third_party/index.js`	8 MB	0 B
`./bundle/chunk-34MYV7JD.js`	2.45 kB	0 B
`./bundle/chunk-5AUYMPVF.js`	858 B	0 B
`./bundle/chunk-5PS3AYFU.js`	1.18 kB	0 B
`./bundle/chunk-664ZODQF.js`	124 kB	0 B
`./bundle/chunk-DAHVX5MI.js`	206 kB	0 B
`./bundle/chunk-IUUIT4SU.js`	56.5 kB	0 B
`./bundle/chunk-RJTRUG2J.js`	39.8 kB	0 B
`./bundle/chunk-XRLFHCHC.js`	1.97 MB	0 B
`./bundle/cleanup-LEFBMJQ6.js`	0 B	-932 B (removed)	🏆
`./bundle/devtools-36NN55EP.js`	696 kB	0 B
`./bundle/dist-T73EYRDX.js`	356 B	0 B
`./bundle/events-XB7DADIJ.js`	418 B	0 B
`./bundle/examples/hooks/scripts/on-start.js`	188 B	0 B
`./bundle/examples/mcp-server/example.js`	1.43 kB	0 B
`./bundle/gemini.js`	5.1 kB	0 B
`./bundle/getMachineId-bsd-TXG52NKR.js`	1.55 kB	0 B
`./bundle/getMachineId-darwin-7OE4DDZ6.js`	1.55 kB	0 B
`./bundle/getMachineId-linux-SHIFKOOX.js`	1.34 kB	0 B
`./bundle/getMachineId-unsupported-5U5DOEYY.js`	1.06 kB	0 B
`./bundle/getMachineId-win-6KLLGOI4.js`	1.72 kB	0 B
`./bundle/memoryDiscovery-FN3IAPBT.js`	980 B	0 B
`./bundle/multipart-parser-KPBZEGQU.js`	11.7 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js`	222 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js`	229 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js`	13.4 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js`	132 B	0 B
`./bundle/sandbox-macos-permissive-open.sb`	890 B	0 B
`./bundle/sandbox-macos-permissive-proxied.sb`	1.31 kB	0 B
`./bundle/sandbox-macos-restrictive-open.sb`	3.36 kB	0 B
`./bundle/sandbox-macos-restrictive-proxied.sb`	3.56 kB	0 B
`./bundle/sandbox-macos-strict-open.sb`	4.82 kB	0 B
`./bundle/sandbox-macos-strict-proxied.sb`	5.02 kB	0 B
`./bundle/src-QVCVGIUX.js`	47 kB	0 B
`./bundle/start-XUJGADG2.js`	0 B	-652 B (removed)	🏆
`./bundle/tree-sitter-7U6MW5PS.js`	274 kB	0 B
`./bundle/tree-sitter-bash-34ZGLXVX.js`	1.84 MB	0 B
`./bundle/cleanup-2YPRBKIP.js`	932 B	+932 B (new file)	🆕
`./bundle/start-VDNKP4F7.js`	652 B	+652 B (new file)	🆕

_{compressed-size-action}

gemini-code-assist

Code Review

This pull request reduces the default fetch timeout from five minutes to 60 seconds and updates the retry logic to map specific Undici timeout error codes to a generic 'ETIMEDOUT' status, supported by a new test case. Feedback suggests that a 60-second timeout may be too aggressive for long-running LLM generations and recommends retaining the original Undici error codes to preserve telemetry detail while still enabling retries.

…dici timeouts

cocosheng-g · 2026-04-29T15:16:47Z

is there any data backing up with timeout number chosen?

Adib234 · 2026-04-29T19:24:11Z

From the issue, there's no reasonable data by the author. This was selected a reasonable client-side timeout value #18030

…ndici timeouts (google-gemini#26191)

fix(core): reduce default API timeout to 60s and enable retries for u…

7d860c7

…ndici timeouts

Adib234 requested a review from a team as a code owner April 29, 2026 13:06

gemini-code-assist Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread packages/core/src/utils/fetch.ts Outdated

Comment thread packages/core/src/utils/retry.ts Outdated

gemini-cli Bot added priority/p1 Important and should be addressed in the near term. area/core Issues related to User Interface, OS Support, Core Functionality 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. labels Apr 29, 2026

fix(core): separate header/body timeouts and improve telemetry for un…

9a722ed

…dici timeouts

cocosheng-g approved these changes Apr 29, 2026

View reviewed changes

Adib234 added this pull request to the merge queue Apr 29, 2026

Merged via the queue into main with commit 99235fc Apr 29, 2026
27 checks passed

Adib234 deleted the fix/timeout-hang-18030 branch April 29, 2026 20:20

TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026

fix(core): reduce default API timeout to 60s and enable retries for u…

cf2d0b4

…ndici timeouts (google-gemini#26191)

kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026

fix(core): reduce default API timeout to 60s and enable retries for u…

034c3e0

…ndici timeouts (google-gemini#26191)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(core): reduce default API timeout to 60s and enable retries for undici timeouts#26191

fix(core): reduce default API timeout to 60s and enable retries for undici timeouts#26191
Adib234 merged 2 commits intomainfrom
fix/timeout-hang-18030

Adib234 commented Apr 29, 2026

Uh oh!

gemini-code-assist Bot commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

cocosheng-g commented Apr 29, 2026

Uh oh!

Adib234 commented Apr 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Adib234 commented Apr 29, 2026

Summary

Details

Related Issues

How to Validate

Pre-Merge Checklist

Uh oh!

gemini-code-assist Bot commented Apr 29, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

github-actions Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

cocosheng-g commented Apr 29, 2026

Uh oh!

Adib234 commented Apr 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions Bot commented Apr 29, 2026 •

edited

Loading