Skip to content

Merge upstream: Return replay retry state from orchestration recovery (#1728)#47

Merged
aaditagrawal merged 1 commit intomainfrom
merge/upstream-1728-recovery-retry-state
Apr 5, 2026
Merged

Merge upstream: Return replay retry state from orchestration recovery (#1728)#47
aaditagrawal merged 1 commit intomainfrom
merge/upstream-1728-recovery-retry-state

Conversation

@aaditagrawal
Copy link
Copy Markdown
Owner

What

Cherry-picks upstream commit 6de4b47e (PR #1728) onto the fork.

Upstream changes

Enhances orchestration recovery to return replay retry state, allowing the UI to surface retry information when event replay fails. Adds comprehensive tests for the retry state machine.

  • orchestrationRecovery.ts: New ReplayRetryState type, retry tracking with exponential backoff, shouldRetryReplay helper.
  • orchestrationRecovery.test.ts: 10 new test cases covering retry state transitions.
  • __root.tsx: Integrates retry state into the recovery effect, surfaces retry UI.

Conflict resolution

None -- clean cherry-pick with no conflicts. Auto-merged orchestrationRecovery.ts and __root.tsx (fork changes are in different sections).

Verification

  • bun typecheck passes (all 7 packages)
  • orchestrationRecovery.test.ts passes (12 tests)
  • Fork's !thread guard in __root.tsx preserved

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 5, 2026

Warning

Rate limit exceeded

@aaditagrawal has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 21 minutes and 32 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 21 minutes and 32 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 0874a868-2471-45a3-9ec8-a750ffa845fc

📥 Commits

Reviewing files that changed from the base of the PR and between 24b27a0 and d342960.

📒 Files selected for processing (3)
  • apps/web/src/orchestrationRecovery.test.ts
  • apps/web/src/orchestrationRecovery.ts
  • apps/web/src/routes/__root.tsx
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch merge/upstream-1728-recovery-retry-state

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@github-actions github-actions bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 effective changed lines (test files excluded in mixed PRs). labels Apr 5, 2026
@aaditagrawal aaditagrawal merged commit 1afeec4 into main Apr 5, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants