chore: sync fork with upstream master (14 commits) - #22
Conversation
refs herdrdev#3054 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
refs herdrdev#3100 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
* fix(windows): preserve non-us shifted text refs herdrdev#3045 * fix(windows): retain shifted key repeat lifecycle refs herdrdev#3045
* feat: add per-mode theme overrides allow [theme.custom.light] and [theme.custom.dark] blocks so custom overrides can differ per resolved appearance when auto_switch flips. precedence: theme defaults, then [theme.custom], then the block for the active mode. configs without the new blocks resolve unchanged. refs herdrdev#837 * docs: complete per-mode theme documentation --------- Co-authored-by: Ogulcan Celik <ogulcancelik@gmail.com>
* fix(windows): add local cmd installer bootstrap refs herdrdev#2751 * fix(windows): bound installer downloads refs herdrdev#2751
# Conflicts: # README.md # docs/next/CHANGELOG.md # src/api/subscriptions.rs
|
Warning Review limit reachedYou’ve reached a temporary PR review limit under our Fair Usage Limits Policy. Next review available in: 38 minutes Limit details: You’ve used the included review currently available. Your 66 included PR review attempts over the past 7 days set your current allowance at 1 review per hour. Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?Wait for the limit to reset, then comment An organization admin can change what happens after included review limits in Billing. How do review limits work?CodeRabbit enforces per-developer PR review limits within each organization. For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: ⛔ Files ignored due to path filters (3)
📒 Files selected for processing (63)
Comment |
6 participants
Periodic rebuild of this fork on top of
herdrdev/herdrmaster, viascripts/sync-upstream.sh. Supersedes #20, which hadherdrdev:masteras its head branch — conflict resolutions can't be pushed to upstream's branch, so that PR could never be finished in place.14 upstream commits in, against 68 fork-only commits.
Conflicts resolved (3)
README.md— auto-resolved by the script, keeping the fork's own notice.src/api/subscriptions.rs— upstream refactored every match arm through a newevent_subscriptionclosure that threadsevent_start_sequence(fix(api): start lifecycle subscriptions from live events, fix(api): start lifecycle subscriptions from live events herdrdev/herdr#3134); the fork had added aTabMovedAcrossWorkspacesarm. Took upstream's refactor and re-expressed the fork's arm in the new style. It now usesevent_start_sequencerather than the oldlast_sequence: 0, matching what upstream did to all 24 sibling arms — that is the point of fix(api): start lifecycle subscriptions from live events herdrdev/herdr#3134, so the fork's arm should not be the one exception.docs/next/CHANGELOG.md— both sides appended to an empty base in the same two sections, so this is the union case, not the release-cut case that has silently dropped fork entries before. Verified after resolution that all 18 fork-only lines and all 15 upstream lines survive.Verification
bash scripts/docker-check.shfrom this worktree: PASS. The 14 failures are exactly the script'sKNOWN_ENV_FAILURESset, with no unexpected entries; maintenance suite 95/95.cargo fmt --checkandcargo clippy --all-targets --locked -- -D warningsare green — the clippy gate is what catches this fork's characteristic failure mode, where upstream adds call sites to a signature the fork has widened and the textual merge succeeds anyway.