Skip to content

fix(core): ensure retry sets defaults for nullish values passed into options#9540

Merged
agmsb merged 3 commits into
mainfrom
agmsb/retry
Sep 25, 2025
Merged

fix(core): ensure retry sets defaults for nullish values passed into options#9540
agmsb merged 3 commits into
mainfrom
agmsb/retry

Conversation

@agmsb

@agmsb agmsb commented Sep 25, 2025

Copy link
Copy Markdown
Contributor

TLDR

This PR filters out null or undefined option values that may get passed in to retryWithBackoff and ensures that in these cases, the defaults from DEFAULT_RETRY_OPTIONS kick in.

Dive Deeper

We add cleanOptions to filter out null/undefined values for any of the option fields that get passed in, ensuring that the spread syntax merges in default values for the null/undefined values.

Reviewer Test Plan

N/A

Testing Matrix

🍏 🪟 🐧
npm run x
npx
Docker
Podman - -
Seatbelt - -

Linked issues / bugs

Progress on #4137, #9030

@agmsb agmsb changed the title fix(core): ensure retry handles nullish options fix(core): ensure retry sets defaults for nullish values passed into options Sep 25, 2025
@github-actions

github-actions Bot commented Sep 25, 2025

Copy link
Copy Markdown

Size Change: +117 B (0%)

Total Size: 17.4 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 17.4 MB +117 B (0%)
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB 0 B
./bundle/sandbox-macos-permissive-open.sb 830 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-closed.sb 3.29 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

compressed-size-action

@abhipatel12 abhipatel12 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for adding this!

@agmsb agmsb marked this pull request as ready for review September 25, 2025 17:28
@agmsb agmsb requested a review from a team as a code owner September 25, 2025 17:28
@agmsb agmsb added this pull request to the merge queue Sep 25, 2025
@agmsb agmsb removed this pull request from the merge queue due to a manual request Sep 25, 2025
@agmsb agmsb added this pull request to the merge queue Sep 25, 2025
Merged via the queue into main with commit 4caaa2a Sep 25, 2025
17 of 19 checks passed
@agmsb agmsb deleted the agmsb/retry branch September 25, 2025 17:36
geoffdowns pushed a commit to geoffdowns/gemini-cli that referenced this pull request Sep 26, 2025
…options (google-gemini#9540)

Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>
jkcinouye pushed a commit that referenced this pull request Sep 29, 2025
…options (#9540)

Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>
thacio added a commit to thacio/auditaria that referenced this pull request Oct 4, 2025
giraffe-tree pushed a commit to giraffe-tree/gemini-cli that referenced this pull request Oct 10, 2025
…options (google-gemini#9540)

Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>
cocosheng-g pushed a commit that referenced this pull request May 6, 2026
…options (#9540)

Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>
@sripasg sripasg added the size/s A small PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/s A small PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants