feat(shared): Add cancellation and per-error delay options to retry - #9182

Open
wobsoriano wants to merge 12 commits into
mainfrom
rob/shared-retry-cancellation
Open

feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom
rob/shared-retry-cancellation

Conversation

@wobsoriano

@wobsorianowobsoriano commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Description

Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:

  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.

Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.

A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot

changeset-botBot commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: dd5e622

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm

Request Review

@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai

coderabbitaiBot commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842

📥 Commits

Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.

📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough

Walkthrough

The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.

Changes

Retry cancellation and dynamic backoff

Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Suggested reviewers:nikosdouvlis

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

Comment @coderabbitai help to get the list of available commands.

@pkg-pr-new

pkg-pr-newBot commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin

npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express

npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react

npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622

coderabbitai[bot]
coderabbitaiBot reviewed Jul 16, 2026
View reviewed changes

@coderabbitaicoderabbitaiBot 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.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a

📥 Commits

Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.

📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts

Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions

github-actionsBot commented Jul 16, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-07-21T16:43:43.067Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.

Report generated by Break Check

Last ran on dd5e622.

@wobsoriano
wobsoriano requested review from a team and mikepitre and removed request for a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot reviewed Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts Outdated
wobsorianoand others added 2 commits July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp

macroscopeappBot commented Jul 17, 2026•
edited
Loading

Copy link
Copy Markdown

Approvability

Verdict: Approved

Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.

You can customize Macroscope's approvability policy. Learn more.

coderabbitai[bot]
coderabbitaiBot reviewed Jul 17, 2026
View reviewed changes

@coderabbitaicoderabbitaiBot 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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce

📥 Commits

Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.

📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts

Comment threadpackages/shared/src/retry.ts Outdated
wobsorianoand others added 2 commits July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano requested a review from a teamJuly 18, 2026 22:03
mikepitre
mikepitre reviewed Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
}

@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?

@wobsorianowobsorianoJul 21, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path

I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(shared): Add cancellation and per-error delay options to retry - #9182
Open
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Open
feat(shared): Add cancellation and per-error delay options to retry#9182
wobsoriano wants to merge 12 commits into
mainfrom 
rob/shared-retry-cancellation
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Description
Follow-up to #9173, which added a hand-rolled exponential backoff to Expo's initialization resource recovery because the shared retry helper couldn't express two things it needed. This adds them:
  • signal?: AbortSignal: cancels retrying. Aborting rejects the returned promise with the signal's abort reason and immediately interrupts a pending backoff delay. It does not abort a callback that is already executing.
  • initialDelay now also accepts a function (error, iteration) => number, deriving the backoff base delay from the error that triggered the retry (e.g. 2s for network errors, 10s for 5xx). The exponential factor, cap, and jitter still apply.
Both changes are optional and additive. Defaults and existing behavior are unchanged, and no current retry consumer is affected.
A follow-up PR will migrate the Expo recovery logic from #9173 onto this helper, gaining jitter on its retry delays.
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
@wobsoriano
feat(shared): add cancellation and per-error delay options to retry
e4a53b1
Adds an optional signal (AbortSignal) option so callers can cancel
retrying promptly, and allows initialDelay to be a function deriving
the backoff base delay from the error that triggered the retry.
@changeset-bot
changeset-botBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: dd5e622
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 23 packages
NameType
@clerk/sharedPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/chrome-extensionPatch
@clerk/clerk-jsPatch
@clerk/electronPatch
@clerk/expo-passkeysPatch
@clerk/expoPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/headlessPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch
@clerk/swingsetPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJul 21, 2026 4:40pm
swingsetReadyReadyPreview, CommentJul 21, 2026 4:40pm
Request Review
@wobsoriano
Update retry helper for cancellation and backoff support
401b36c
The `retry` helper now supports cancellation and error-dependent backoff. Added `signal` option for cancellation and modified `initialDelay` to accept a function for backoff base delay.
@coderabbitai
coderabbitaiBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
Note
Reviews paused
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
Use the following commands to manage reviews:
  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.
Use the checkboxes below for quick actions:
  • ▶️ Resume reviews
  •  🔍 Trigger review
No actionable comments were generated in the recent review. 🎉
ℹ️ Recent review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 232b4dd6-48cc-4035-90ec-c0c67bf17842
📥 Commits
Reviewing files that changed from the base of the PR and between be31b94 and dd5e622.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
🔗 Linked repositories identified
CodeRabbit considers these linked repositories for cross-repo context during reviews:
  • clerk/clerk_go(manual)
  • clerk/dashboard(manual)
  • clerk/accounts(manual)
  • clerk/backoffice(manual)
  • clerk/clerk(manual)
  • clerk/clerk-docs(manual)
  • clerk/cloudflare-workers(manual)
🚧 Files skipped from review as they are similar to previous changes (2)
  • packages/shared/src/retry.ts
  • packages/shared/src/tests/retry.spec.ts
📝 Walkthrough
Walkthrough
The shared retry helper now supports AbortSignal cancellation, abort-aware delays, and error-dependent initial backoff calculation. Tests cover cancellation timing and dynamic delay bases, with a changeset documenting the patch.
Changes
Retry cancellation and dynamic backoff
Layer / File(s)Summary
Retry options and abort-aware backoff
packages/shared/src/retry.ts		retry accepts an AbortSignal, interrupts pending delays, stops subsequent attempts after cancellation, and supports function-based initialDelay values derived from errors and iterations.
Retry behavior validation and release guidance
packages/shared/src/__tests__/retry.spec.ts, .changeset/shared-retry-cancellation.md		Tests cover pre-aborted, in-flight, and delayed cancellation plus error-derived backoff delays; the changeset records the updated retry behavior.
Estimated code review effort: 3 (Moderate) | ~20 minutes
Suggested reviewers:nikosdouvlis
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly summarizes the main change: adding cancellation and per-error delay support to retry.
Description check✅ PassedThe description accurately matches the changeset and explains the new retry cancellation and functional initialDelay options.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@9182

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@9182

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@9182

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@9182

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@9182

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@9182

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@9182

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@9182

@clerk/expo-google-signin
npm i https://pkg.pr.new/@clerk/expo-google-signin@9182

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@9182

@clerk/express
npm i https://pkg.pr.new/@clerk/express@9182

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@9182

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@9182

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@9182

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@9182

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@9182

@clerk/react
npm i https://pkg.pr.new/@clerk/react@9182

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@9182

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@9182

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@9182

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@9182

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@9182

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@9182

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@9182

commit: dd5e622
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 16, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 5-11: Update the JSDoc for the public initialDelay callback
parameter in retry configuration to explicitly state that iteration starts at 1,
clarifying its indexing semantics without changing the callback type or
behavior.
- Around line 138-142: Update the retry loop around the callback’s catch
handling to recheck signal cancellation immediately after the callback rejects,
before returning the original error or invoking retry hooks; when aborted, throw
abortReason(signal) to preserve the cancellation contract. Add a regression test
covering a callback that aborts the signal while running and then rejects.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: fa8bdc4b-3b48-4f3e-8b60-0c1aca0aa78a
📥 Commits
Reviewing files that changed from the base of the PR and between b0ed361 and 401b36c.
📒 Files selected for processing (3)
  • .changeset/shared-retry-cancellation.md
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
@github-actions
github-actionsBot
commented
Jul 16, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-07-21T16:43:43.067Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on dd5e622.
@wobsoriano
wobsoriano
requested review from
a team and mikepitre
and removed request for
a teamJuly 16, 2026 19:40
macroscopeapp[bot]
macroscopeappBot
reviewed
Jul 16, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 16, 2026 21:37
@wobsoriano@macroscopeapp
Update packages/shared/src/retry.ts
73ea8b7
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@wobsoriano
Merge branch 'main' into rob/shared-retry-cancellation
e841a9d
@macroscopeapp
macroscopeappBot
commented
Jul 17, 2026•

edited

Loading

Copy link


Copy Markdown

Approvability
Verdict: Approved
Additive feature adding optional signal and functional initialDelay parameters to the retry utility. Changes are backward compatible, well-tested, and both review comments are already addressed in the current code.
You can customize Macroscope's approvability policy. Learn more.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jul 17, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
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.

Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/shared/src/retry.ts`:
- Around line 150-151: Remove the duplicated catch clause in the retry logic so
the surrounding try statement has only one `catch (e)` block. Preserve the
existing catch body and error-handling behavior.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 103d6fe9-86f8-4115-80a0-a299e85963ce
📥 Commits
Reviewing files that changed from the base of the PR and between 401b36c and e841a9d.
📒 Files selected for processing (2)
  • packages/shared/src/__tests__/retry.spec.ts
  • packages/shared/src/retry.ts
Comment threadpackages/shared/src/retry.ts
Outdated

wobsorianoand others
added 2 commits
July 18, 2026 15:03
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
05e7a0c
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano@coderabbitai
Update packages/shared/src/retry.ts
1e1868f
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@wobsoriano
wobsoriano
requested a review
from a teamJuly 18, 2026 22:03
mikepitre
mikepitre
reviewed
Jul 20, 2026
View reviewed changes
Comment threadpackages/shared/src/retry.ts
@@ -120,9 +162,9 @@ export const retry = async <T>(callback: () => T | Promise<T>, options: RetryOpt
 }
@mikepitremikepitreJul 20, 2026

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.

Should we handle aborts while onBeforeRetry is running too? Right now, if the signal aborts while an async hook is pending, retry() waits for the hook to finish. If the hook rejects, its error also wins over the abort reason. Could we make this path follow the same cancellation behavior as the retry delay?
@wobsorianowobsorianoJul 21, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for checking this out! Pushed a fix (ref) for the error precedence. If the hook rejects after an abort, the abort reason now wins, same as the callback path
I left the pending-hook behavior as is. We don't interrupt user code, same as the callback, and the abort still wins as soon as the hook settles. I also updated the JSDoc to document this.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mikepitremikepitremikepitre left review comments
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes
@nikosdouvlisnikosdouvlisAwaiting requested review from nikosdouvlis

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre