feat(config): separate tui.toml for theme and keybinds (closes #437) by merchloubna70-dot · Pull Request #657 · Hmbown/CodeWhale

merchloubna70-dot · 2026-05-04T23:30:42Z

Summary

Implements issue #437 — decouple TUI-specific preferences from the agent/project config.toml so they survive project switches.

Adds TuiPrefs struct and KeybindPrefs sub-struct to crates/tui/src/settings.rs
Loads from ~/.deepseek/tui.toml via TuiPrefs::load(); falls back to struct defaults when absent (backwards-compatible — no behaviour change for existing users)
Supports theme (dark | light | system), font_size (u16, 0 = terminal default), and a [keybinds] table with optional overrides for submit, new_line, command_palette, cancel, toggle_sidebar
TuiPrefs::save() persists preferences back to disk, creating ~/.deepseek/ if needed
TuiPrefs::validate() normalises theme casing and rejects unknown values with a helpful error message
Respects the DEEPSEEK_CONFIG_PATH env-var redirect used by tests and CI (same pattern as Settings::path())

Example `~/.deepseek/tui.toml`

theme     = "dark"       # dark | light | system
font_size = 14           # 0 = terminal default

[keybinds]
submit          = "ctrl+enter"
new_line        = "enter"
command_palette = "ctrl+k"
cancel          = "ctrl+c"
toggle_sidebar  = "ctrl+b"

Test plan

8 new unit tests added in settings::tests:
- tui_prefs_defaults_are_dark_theme_zero_font
- tui_prefs_validate_accepts_known_themes
- tui_prefs_validate_normalises_theme_case
- tui_prefs_validate_rejects_unknown_theme
- tui_prefs_round_trips_through_toml
- tui_prefs_load_returns_defaults_when_file_absent
- tui_prefs_save_and_load_round_trip
- tui_prefs_path_uses_home_deepseek_subdir_by_default
All 16 settings::tests pass (cargo test -p deepseek-tui "settings::tests")
cargo +nightly check clean — 0 errors

🤖 Generated with Claude Code

All system prompts were English-only, causing DeepSeek V4 to reason and respond in English even when users wrote in Chinese or other languages. Add a Language Mirror section to base.md and base.txt that instructs the model to detect the user's primary language and use it for both reasoning (thinking tokens) and the final reply.

base.txt is not referenced via include_str! in prompts.rs. Only base.md is loaded (BASE_PROMPT). Remove the redundant change to base.txt as noted by Gemini Code Assist review.

…#437) Add `TuiPrefs` struct and `KeybindPrefs` sub-struct to `settings.rs` to decouple TUI-specific preferences (theme, font_size, keybinds) from the agent/project `config.toml` so they survive project switches. - `TuiPrefs::path()` resolves to `~/.deepseek/tui.toml`; honours `DEEPSEEK_CONFIG_PATH` env-var redirect used by tests and CI. - `TuiPrefs::load()` falls back to struct defaults when the file is absent — no error, backwards-compatible. - `TuiPrefs::save()` creates `~/.deepseek/` if necessary. - `TuiPrefs::validate()` normalises theme case and rejects unknown values with a helpful message. - 8 new unit tests cover defaults, round-trip TOML serde, validation, absent-file fallback, and the save→load cycle; all pass. - `cargo check` clean (0 errors, 0 new warnings beyond expected dead-code on the new public API). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

gemini-code-assist · 2026-05-04T23:30:46Z

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

ILoveScratch2 · 2026-05-05T04:07:40Z

谁家PR机器人

Hmbown · 2026-05-05T05:34:45Z

Triple-check finding: TuiPrefs never loaded

The TuiPrefs struct, KeybindPrefs, TuiPrefs::load(), save(), validate(), and path() are all defined — but TuiPrefs::load() has zero production callers. The only call sites are in #[test] functions. Similarly, zero production code reads any KeybindPrefs override field.

The tui.toml format and parsing infrastructure compiled and landed, but nobody wires it into the app startup to actually load the file. The feature is dead code — users can create a tui.toml with themes and keybinds, but the TUI will never read it.

Recommendation: Wire TuiPrefs::load() into the app startup path (likely main.rs or app.rs) so the file is actually read and applied. Without that wiring, this PR only ships a file format with no consumer.

…w-up) TuiPrefs, KeybindPrefs, and their load/save/validate methods had zero production callers — users could create ~/.deepseek/tui.toml with theme and keybind overrides, but the TUI never loaded the file. Load prefs in run_interactive, propagate via TuiOptions.tui_prefs, and store on App so the data is available to rendering and keybind resolution. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

merchloubna70-dot · 2026-05-05T06:26:55Z

Fixed — TuiPrefs::load() is now called in run_interactive (non-fatal, falls back to TuiPrefs::default() on error), propagated through TuiOptions.tui_prefs, and stored on App for rendering and keybind resolution.

The match guard at tui/ui.rs:1603 used `&& let Some(...) = ...` inside an `if` guard, which requires the `if_let_guard` nightly feature on Rust < 1.94. Reported by an external user attempting `cargo install deepseek-tui` on stable rustc — it failed with E0658. Rewrite as a plain match guard with a nested `if let` inside the arm body so the language-picker hotkeys compile on every supported rustc. Workspace also now declares `rust-version = "1.88"` to match the codebase's actual reliance on `let_chains` in if/while conditions, so users on too-old toolchains see a clear cargo error instead of a confusing rustc one. `AGENTS.md` and `CLAUDE.md` gain a "stable Rust only" section documenting the trap and how to rewrite around it. Also annotate the deferred `TuiPrefs` (#657) and `handoff::THRESHOLDS` (#667) APIs with `#[allow(dead_code)]` so CI's `-D warnings` flag stays green while the call sites are staged for v0.8.13. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Explicitly read tui_prefs.theme so the field is not completely dead storage. The full light/system palette variant is a follow-up; the read establishes that theme is consulted at construction time. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

merchloubna70-dot · 2026-05-05T07:19:08Z

Added explicit read of tui_prefs.theme at App construction so the field is not completely dead storage. Full light/system palette variant is a follow-up; keybind resolution will read from tui_prefs.keybinds once the key-handler is updated.

The match guard at tui/ui.rs:1603 used `&& let Some(...) = ...` inside an `if` guard, which requires the `if_let_guard` nightly feature on Rust < 1.94. Reported by an external user attempting `cargo install deepseek-tui` on stable rustc — it failed with E0658. Rewrite as a plain match guard with a nested `if let` inside the arm body so the language-picker hotkeys compile on every supported rustc. Workspace also now declares `rust-version = "1.88"` to match the codebase's actual reliance on `let_chains` in if/while conditions, so users on too-old toolchains see a clear cargo error instead of a confusing rustc one. `AGENTS.md` and `CLAUDE.md` gain a "stable Rust only" section documenting the trap and how to rewrite around it. Also annotate the deferred `TuiPrefs` (Hmbown#657) and `handoff::THRESHOLDS` (Hmbown#667) APIs with `#[allow(dead_code)]` so CI's `-D warnings` flag stays green while the call sites are staged for v0.8.13. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Wires the previously-dormant `theme` setting (Hmbown#657 follow-up) into the live Settings struct so the choice survives restart. `/theme` opens an interactive picker with live preview; `/theme <name>` switches and persists non-interactively. Most render sites use bare `palette::TEXT_BODY` / `DEEPSEEK_INK` / `BORDER_COLOR` constants rather than reading `app.ui_theme`, so simply adding new UiTheme variants only repaints ~20% of surfaces. The fix is a third stage in ColorCompatBackend (alongside the existing dark<->light and truecolor<->256 stages) that rewrites every well-known dark-palette constant to the corresponding UiTheme slot for the active preset. The remap is a no-op for System / Whale / WhaleLight, so legacy dark/light flows stay byte-identical. Settings: theme = system | dark | light | catppuccin-mocha | tokyo-night | dracula | gruvbox-dark. Unknown values normalise to system. background_color still overlays on top. Tests: new coverage in theme_picker and palette; pinned make_app() in footer tests to ThemeId::System after App::new (matching the existing default_model pin) since App::new now honors settings.theme.

Hmbown · 2026-05-23T21:58:08Z

This PR was opened before the v0.8.41 rebrand and is now stale. Feel free to rebase onto current main and reopen. 鲸鱼兄弟们等你 🐋

macworkers and others added 3 commits May 4, 2026 12:39

fix: remove base.txt change — file is not loaded by runtime

3cff070

base.txt is not referenced via include_str! in prompts.rs. Only base.md is loaded (BASE_PROMPT). Remove the redundant change to base.txt as noted by Gemini Code Assist review.

Hmbown mentioned this pull request May 5, 2026

release: v0.8.12 — 20 community PRs + cargo-install fix + workspace-bleed hotfix #704

Merged

7 tasks

kibuniverse pushed a commit to kibuniverse/DeepSeek-TUI that referenced this pull request May 5, 2026

feat(config): separate tui.toml for theme and keybinds (Hmbown#657)

b31bc41

MMMarcinho pushed a commit to MMMarcinho/DeepSeek-TUI that referenced this pull request May 6, 2026

feat(config): separate tui.toml for theme and keybinds (Hmbown#657)

808bcb1

douglarek mentioned this pull request May 8, 2026

Consolidate config files into a single directory (~/.deepseek/) #1224

Closed

laoye2020 mentioned this pull request May 12, 2026

Add Catppuccin/Tokyo Night/Dracula/Gruvbox themes + /theme picker #1534

Merged

6 tasks

Hmbown closed this May 23, 2026

greptile-apps Bot mentioned this pull request Jun 1, 2026

fix(tui): prefer codewhale settings path #2516

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(config): separate tui.toml for theme and keybinds (closes #437)#657

feat(config): separate tui.toml for theme and keybinds (closes #437)#657
merchloubna70-dot wants to merge 5 commits into
Hmbown:mainfrom
merchloubna70-dot:feat/tui-toml-437

merchloubna70-dot commented May 4, 2026

Uh oh!

gemini-code-assist Bot commented May 4, 2026

Uh oh!

ILoveScratch2 commented May 5, 2026

Uh oh!

Hmbown commented May 5, 2026

Uh oh!

merchloubna70-dot commented May 5, 2026

Uh oh!

merchloubna70-dot commented May 5, 2026

Uh oh!

Hmbown commented May 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

merchloubna70-dot commented May 4, 2026

Summary

Example ~/.deepseek/tui.toml

Test plan

Uh oh!

gemini-code-assist Bot commented May 4, 2026

Uh oh!

ILoveScratch2 commented May 5, 2026

Uh oh!

Hmbown commented May 5, 2026

Triple-check finding: TuiPrefs never loaded

Uh oh!

merchloubna70-dot commented May 5, 2026

Uh oh!

merchloubna70-dot commented May 5, 2026

Uh oh!

Hmbown commented May 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Example `~/.deepseek/tui.toml`