feat: add per-mode theme overrides - #2324
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
Included review availability: Your plan provides up to 10 included reviews per hour; 5 remain after this review. 📝 WalkthroughWalkthroughThe theme configuration now supports light- and dark-appearance custom color overrides. Automatic theme switching applies active mode overrides after shared custom and legacy accent colors. Tests and documentation cover the new behavior. ChangesTheme appearance overrides
Estimated code review effort: 3 (Moderate) | ~20 minutes Merge Risk: ⚪ Minimal · up to This adds optional light- and dark-mode theme overrides while preserving existing behavior for configurations that do not use them; no actionable merge-blocking risk remains beyond normal checks and review. Sequence Diagram(s)sequenceDiagram
participant HostAppearance
participant resolve_effective_theme
participant resolve_palette_for_theme_name
participant Palette
HostAppearance->>resolve_effective_theme: select light or dark appearance
resolve_effective_theme->>resolve_palette_for_theme_name: pass active mode overrides
resolve_palette_for_theme_name->>Palette: apply shared custom colors
Palette->>Palette: apply active mode-specific colors
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
|
Hi @aneym, thanks for your interest in contributing! Herdr automatically admits focused bug fixes from contributors who are not maintainers when the title uses Contributors who are not maintainers may submit only focused bug fixes. If this pull request fixes a bug, rename it to use a conventional Feature requests, behavior changes, and other proposals belong in GitHub Discussions and require maintainer approval before a pull request. If this gate classified the pull request incorrectly, reply and tag a maintainer listed in Patch size: 7 changed files, 391 changed lines. See https://github.com/herdrdev/herdr/blob/master/CONTRIBUTING.md for the contribution policy. |
Greptile SummaryAdds light- and dark-specific custom theme overrides that are layered over shared overrides when automatic theme switching is active.
Confidence Score: 5/5The PR appears safe to merge. No blocking failure remains.
|
| Filename | Overview |
|---|---|
| src/app/mod.rs | Resolves and applies the active appearance-specific override after shared theme colors while preserving manual-mode behavior. |
| src/app/state.rs | Adds palette support for applying every mode-specific color token. |
| src/config/theme.rs | Adds deserializable light and dark override blocks and parsing coverage. |
| src/config.rs | Re-exports the new mode-specific theme color model. |
| src/main.rs | Documents the new override blocks in the generated default configuration. |
| docs/next/website/src/data/config-reference.json | Adds reference entries for all supported light- and dark-specific color tokens. |
Reviews (13): Last reviewed commit: "docs: complete per-mode theme documentat..." | Re-trigger Greptile
66ee3b8 to
d1a4e65
Compare
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
src/config/theme.rs (1)
126-146: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winAdd
sidebar_bgto mode-specific overrides.
ModeThemeColorsomitssidebar_bg, althoughCustomThemeColorsandPalettesupport it. A user cannot set a light-only or dark-only sidebar background.Add
sidebar_bgtoModeThemeColors. Apply it inPalette::with_mode_overrides. Add parsing and palette-resolution coverage.Proposed fix
--- a/src/config/theme.rs +++ b/src/config/theme.rs pub struct ModeThemeColors { pub accent: Option<String>, pub panel_bg: Option<String>, + pub sidebar_bg: Option<String>, pub surface0: Option<String>,--- a/src/app/state.rs +++ b/src/app/state.rs if let Some(c) = &custom.panel_bg { self.panel_bg = parse_color(c); } + if let Some(c) = &custom.sidebar_bg { + self.sidebar_bg = parse_color(c); + }Based on supplied downstream context,
src/app/state.rs:641-692has the same omission.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 1cefb19c-6dd0-416f-9a93-164b72966a75
📒 Files selected for processing (7)
docs/next/website/src/content/docs/configuration.mdxdocs/next/website/src/data/config-reference.jsonsrc/app/mod.rssrc/app/state.rssrc/config.rssrc/config/theme.rssrc/main.rs
🚧 Files skipped from review as they are similar to previous changes (6)
- docs/next/website/src/content/docs/configuration.mdx
- docs/next/website/src/data/config-reference.json
- src/main.rs
- src/app/state.rs
- src/app/mod.rs
- src/config.rs
d1a4e65 to
baff68f
Compare
|
Added |
bd6babf to
1c53cf1
Compare
1c53cf1 to
47b056c
Compare
|
@coderabbitai review |
✅ Action performedReview finished.
|
|
Note GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer. |
e35f2a1 to
7d23934
Compare
|
Want your agent to iterate on Greptile's feedback? Try greploops. |
|
@coderabbitai review |
|
@coderabbitai resume |
|
@coderabbitai review |
✅ Action performedReviews resumed. |
|
@coderabbitai review |
|
|
|
7d23934 to
f608ecd
Compare
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
f608ecd to
b7b3d5e
Compare
ogulcancelik
left a comment
There was a problem hiding this comment.
Reviewed the implementation, precedence, manual-mode behavior, config coverage, and documentation. Rebased onto current master; local and CI checks pass, and both review bots are clear.
|
@aneym sorry for taking so long, ty! |
* fix: match Windows Ctrl+digit keybindings (herdrdev#2913) refs herdrdev#2910 * fix: sync powershell process working directory (herdrdev#2879) * fix: reap ctrl-click url openers (herdrdev#2906) * fix: reap ctrl-click url openers refs herdrdev#2903 * fix: scope linux opener test import refs herdrdev#2903 * test: isolate url opener regression refs herdrdev#2903 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix(docs): link agents to config reference data * feat(website): plugin marketplace discovery shelves — trending and new arrivals * fix(website): raise timeout on docs release integration test for slow builders * fix: retry Windows installer activation after transient locks (herdrdev#2921) refs herdrdev#2916 * fix: isolate hidden pane render cadence (herdrdev#2892) refs herdrdev#2890 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: preserve macOS IME commits in report-all mode (herdrdev#2947) * feat: make Windows generally available * docs: publish preview documentation * docs: finalize 0.8.1 release notes * release: v0.8.1 * fix(ci): publish v0.8.1 documentation * fix: restore v0.8.0 as stable release * fix(perf): eliminate redundant terminal wake work (herdrdev#2962) * fix(perf): eliminate redundant terminal wake work * fix(perf): harden release benchmark gate * test(perf): strengthen performance guardrails * fix(theme): keep active terminal row visible under cursor (herdrdev#2989) refs herdrdev#2987 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix(cli): exit quietly when output pipes close (herdrdev#2996) refs herdrdev#2994 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * docs: finalize 0.8.2 release notes * release: v0.8.2 * docs: update website manifest for v0.8.2 * docs: publish preview documentation * fix: strip ansi sequences from tab bar status (herdrdev#3003) * fix: strip ansi sequences from tab bar status refs herdrdev#3001 * docs: clarify tab bar escape sequence scope refs herdrdev#3001 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix(input): preserve mouse forwarding through handoff (herdrdev#3002) refs herdrdev#3000 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: honor mouse capture config in terminal attach (herdrdev#2995) refs herdrdev#2992 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: synchronize plugin pane pwd (herdrdev#2985) * fix: synchronize plugin pane pwd refs herdrdev#2984 * refactor: isolate plugin pwd platform policy refs herdrdev#2984 * docs: fix changelog conflict resolution --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: Can Celik <ogulcancelik@gmail.com> * fix: add claude screen activity fallbacks refs herdrdev#1630 refs herdrdev#2241 * fix(windows): detect cursor bundled node process (herdrdev#3034) * fix(windows): detect cursor bundled node process refs herdrdev#3032 * docs: clarify cursor detection scope * fix(windows): constrain cursor runtime detection refs herdrdev#3032 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * ci: support immutable preview releases * chore: remove akbash maintainer authority * test: use native path in docs parity assertion (herdrdev#3043) * chore: pin kennel maintainer identities * chore: keep kennel authority private * fix(graphics): isolate oversized kitty images (herdrdev#3035) * fix(graphics): isolate oversized kitty images refs herdrdev#3033 * fix(graphics): budget pane image cleanup refs herdrdev#3033 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: preserve multiline paste in terminal attach (herdrdev#3056) refs herdrdev#3054 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: keep background Claude MCP tasks working (herdrdev#3094) * fix: match generated characters in prefix bindings (herdrdev#3085) refs herdrdev#3079 * fix: publish Claude MCP detection manifest * docs: document macos keychain launch context refs herdrdev#966 * fix: preserve focus after background worktree removal (herdrdev#3099) * fix: copy selections before delayed mouse release (herdrdev#3102) refs herdrdev#3100 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> * fix: clear Windows Terminal identity in panes (herdrdev#3127) * fix(windows): preserve non-us shifted text (herdrdev#3055) * 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 (herdrdev#2324) * 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 (herdrdev#3133) * fix(windows): add local cmd installer bootstrap refs herdrdev#2751 * fix(windows): bound installer downloads refs herdrdev#2751 * fix(api): start lifecycle subscriptions from live events (herdrdev#3134) refs herdrdev#1270 * fix: keep omp panes working through scheduled continuations (herdrdev#3122) refs herdrdev#2851 * fix: serve a google-eligible favicon * fix(graphics): batch kitty image row lifecycle (herdrdev#3166) * fix(graphics): coalesce terminal kitty placements A Unicode-placeholder image arrives as one placement per viewport row it covers, and after 624dfd4 the budgeted encoder emitted one placement per frame, so every redraw painted images one row per frame. * fix(graphics): coalesce only pure kitty re-displays Keep pixel uploads and superseded-image deletes in a transaction of their own: a placement joins the coalesced transaction only when its image is uploaded and its source already maps to that image, and nothing joins after an upload or a delete. * fix(graphics): batch kitty image row lifecycle --------- Co-authored-by: kataokatsuki <kataokatsuki@users.noreply.github.com> --------- Co-authored-by: Can Celik <ogulcancelik@gmail.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com> Co-authored-by: akbash <akbash@herdr.dev> Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: kangal-bot <285672167+kangal-bot@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Alex <a.neyman17@gmail.com> Co-authored-by: caner-akca <94343893+caner-akca@users.noreply.github.com> Co-authored-by: kataokatsuki <kataokatsuki@users.noreply.github.com>
* 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>
Summary
[theme.custom]applies one set of overrides in both modes, so withauto_switcha value tuned for the dark theme washes out when the light theme activates. #837 proposed per-mode blocks and @ogulcancelik approved a PR there.This adds
[theme.custom.light]and[theme.custom.dark]. Resolution order: theme defaults, then[theme.custom], then the block matching the resolved appearance. Configs that do not use the new blocks resolve exactly as they do today.Both panes are the same seeded layout rendered with
catppuccin-latteactive; the only difference is the[theme.custom.light]block.Refs #837. #2032 asks for the same capability from a full-theme-pair angle; this shape covers it through
[theme.custom.light]/[theme.custom.dark]alone.Test plan
master(ffc4e263).sidebar_bg/new sidebar row color tokens.live_handoffx2 andapi_pingpane-info); rerunning the CI suite with exactly those three excluded passed all 3,329 remaining Rust tests plus fmt, clippy, UI architecture, integration assets, and plugin marketplace checks.just windows-lint: passed.