Skip to content

tui: collapse ocean_treatment into ThemeId::Underwater #5858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hmbown wants to merge 12 commits into
base: main
Choose a base branch
from
Open

tui: collapse ocean_treatment into ThemeId::Underwater #5858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac5fcae
tui: /theme underwater applies the Deepsea pair
Hmbown Sep 2, 2026
2742abf
tui: launch card runs nothing on a reflexive Enter; every launch flow…
Hmbown Sep 2, 2026
1621360
tui: locale strings for the ocean_treatment collapse
Sep 2, 2026
08d653f
tui: regenerated launch mark assets
Sep 2, 2026
41d9d39
tui: collapse ocean_treatment into ThemeId::Underwater
Sep 2, 2026
1a3e35b
tui: route commands and engine through ThemeId::Underwater
Sep 2, 2026
4888eda
tui: repaint ocean, picker, widgets, and goldens onto the theme
Sep 2, 2026
bfcb23a
tui: finish the context_percent plumbing (call sites, abyss test, dro…
Sep 2, 2026
8560081
tui: align tests and startup goldens with the collapse rules
Sep 2, 2026
fb9dbd7
tui: align tests and startup goldens with the collapse rules
Sep 2, 2026
2b54b22
tui: delete orphaned non-context color shims, checked cache division
Sep 2, 2026
6f2e4c9
tui: align PTY proof and worktree test with the collapse's honest chrome
Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions crates/config/src/settings_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,6 @@ const DEFAULT_MODE: &[SettingOption] = &[
),
];

const OCEAN_TREATMENT: &[SettingOption] = &[
SettingOption::new("deepsea", "", "ConfigChoiceDetailOceanDeepsea"),
SettingOption::new("flat", "", "ConfigChoiceDetailOceanFlat"),
];

const FOCUS_TEXTURE: &[SettingOption] = &[
SettingOption::new("off", "ConfigValueOff", ""),
SettingOption::new("scrim", "", ""),
Expand Down Expand Up @@ -396,17 +391,6 @@ pub const SETTINGS_SCHEMA: &[SettingDef] = &[
"ConfigHintBackgroundColor",
),
),
def(
"ocean_treatment",
SettingKind::Enum(OCEAN_TREATMENT),
"flat",
ui(
TAB_APPEARANCE,
"display",
"ConfigLabelOceanTreatment",
"ConfigHintOceanTreatment",
),
),
// No sentence anywhere justifies this prototype toggle, so it keeps its
// declaration and loses its row.
def(
Expand Down
4 changes: 3 additions & 1 deletion crates/lane/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ pub use runtime::{
InlineRuntime, LaneLogProxySpec, LaneStartSpec, RuntimeBackend, RuntimeBackendKind,
TmuxRuntime, backend_for, resolve_backend, run_lane_log_proxy,
};
pub use worktree::{WorktreeProvision, provision_worktree, remove_worktree_if_expired};
pub use worktree::{
ProvisionedWorktree, WorktreeProvision, provision_worktree, remove_worktree_if_expired,
};
Binary file modified crates/tui/assets/mark-48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/tui/assets/mark-96.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions crates/tui/locales/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@
"ConfigLabelTheme": "Tema",
"ConfigLabelLocale": "Idioma",
"ConfigLabelBackground": "Fons",
"ConfigLabelOceanTreatment": "Tractament Ocean",
"ConfigLabelWorkSurfacePlacement": "Posició de la barra lateral",
"ConfigLabelTopHeight": "Alçada de la barra superior",
"ConfigLabelSideWidth": "Amplada de la barra lateral",
Expand Down Expand Up @@ -712,7 +711,7 @@
"SubagentsRoleConsultant": "consultor",
"SubagentsRoleCustom": "personalitzat",
"HelpUnknownCommand": "Comanda desconeguda: {topic}",
"HomeDashboardTitle": "Codewhale",
"HomeDashboardTitle": "codewhale",
"HomeModel": "Model:",
"HomeMode": "Mode:",
"HomeWorkspace": "Espai de treball:",
Expand Down Expand Up @@ -1228,7 +1227,7 @@
"LaunchProviderConfiguredShort": "proveïdor configurat",
"LaunchProviderSetupShort": "configura proveïdor",
"LaunchMenuChangelog": "Registre de canvis",
"LaunchWorktreePrompt": "Anomena la branca/worktree, o prem Enter per a un nom automàtic.",
"LaunchWorktreePrompt": "Anomena la branca/worktree, o prem Enter per a un nom automàtic. Esc per tornar.",
"LaunchWorktreeNeedsGit": "Un worktree nou requereix un repositori Git.",
"LaunchWorktreeNameLabel": "nom del worktree",
"LaunchHintMove": "mou",
Expand All @@ -1238,6 +1237,7 @@
"LaunchSavedSessionsPlural": "{count} sessions desades",
"LaunchCreatingWorktree": "Creant el worktree…",
"LaunchWorktreeFailed": "El worktree ha fallat: {error}",
"LaunchWorktreeCreated": "Nou worktree {path} a la branca {branch}",
"LaunchNoSavedSessions": "No hi ha sessions desades per a aquest espai de treball.",
"LaunchComposerHint": "Enter envia · Shift+Enter línia nova · Esc torna",
"LaunchNoModelConnected": "cap model connectat",
Expand Down Expand Up @@ -1438,9 +1438,6 @@
"ProviderExternalRevokedToast": "Accés a credencials externes revocat per a {provider}",
"ProviderExternalRevokeFailedToast": "No s'ha pogut revocar l'accés a credencials externes: {error}",
"ThemeSurfaceTitle": "tema · previsualització en directe",
"ThemeTreatmentDeepseaUnavailable": "Tractament Deepsea no disponible — el terminal controla el fons",
"ThemeTreatmentFlatActive": "Tractament Flat — actiu",
"ThemeTreatmentDeepseaActive": "Tractament Deepsea — actiu",
"FleetRosterHeaderLabel": "pod",
"FleetRosterTabRoster": "membres",
"FleetRosterTabSetup": "configuració",
Expand Down Expand Up @@ -1964,8 +1961,6 @@
"ConfigChoiceDetailShowThinkingOff": "Manté ocult el raonament del model; respostes i eines continuen visibles.",
"ConfigChoiceDetailThinkingHighlightOn": "Omple el fons del raonament del model.",
"ConfigChoiceDetailThinkingHighlightOff": "Manté el rail discontinu i el text en cursiva sense fons ple.",
"ConfigChoiceDetailOceanDeepsea": "Usa un únic camp de color continu de l'oceà.",
"ConfigChoiceDetailOceanFlat": "Usa un únic color de fons pla.",
"ConfigHintModel": "model de la ruta en viu d'aquesta sessió; Enter obre /model",
"ConfigHintFastModel": "l'usen l'encaminament Auto i model_strength=faster dels agents quan aquest proveïdor té un germà conegut",
"ConfigHintProvider": "proveïdor de la ruta en viu d'aquesta sessió; Enter obre /provider (credencial, model i endpoint canvien junts)",
Expand All @@ -1992,7 +1987,6 @@
"ConfigHintCalmMode": "silencia el crom de la transcripció i el detall de les eines; independent del moviment en viu",
"ConfigHintLowMotion": "activat sobreescriu el moviment de l'estat en viu; la sortida del model no canvia",
"ConfigHintFancyAnimations": "activat anima amb fidelitat l'estat en viu d'eines, estat i oceà",
"ConfigHintOceanTreatment": "deepsea | flat (aparença; independent del moviment)",
"ConfigHintShowThinking": "mostra o amaga el raonament del model al xat; les llistes de tasques continuen concises",
"ConfigHintThinkingDefaultExpanded": "expandeix el raonament del model per defecte; Espai continua commutant cada bloc",
"ConfigHintThinkingPreviewLines": "files de previsualització del pensament completat plegat (predeterminat 2; 0=només capçalera; 10=bolcat antic)",
Expand Down
12 changes: 3 additions & 9 deletions crates/tui/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@
"ConfigLabelTheme": "Theme",
"ConfigLabelLocale": "Sprache",
"ConfigLabelBackground": "Hintergrund",
"ConfigLabelOceanTreatment": "Ocean-Darstellung",
"ConfigLabelWorkSurfacePlacement": "Seitenleisten-Position",
"ConfigLabelTopHeight": "Höhe der oberen Leiste",
"ConfigLabelSideWidth": "Breite der Seitenleiste",
Expand Down Expand Up @@ -712,7 +711,7 @@
"SubagentsRoleConsultant": "Berater",
"SubagentsRoleCustom": "benutzerdefiniert",
"HelpUnknownCommand": "Unbekannter Befehl: {topic}",
"HomeDashboardTitle": "Codewhale",
"HomeDashboardTitle": "codewhale",
"HomeModel": "Modell:",
"HomeMode": "Modus:",
"HomeWorkspace": "Workspace:",
Expand Down Expand Up @@ -1228,7 +1227,7 @@
"LaunchProviderConfiguredShort": "Anbieter eingerichtet",
"LaunchProviderSetupShort": "Anbieter einrichten",
"LaunchMenuChangelog": "Changelog",
"LaunchWorktreePrompt": "Branch/Worktree benennen oder Enter für einen automatischen Namen.",
"LaunchWorktreePrompt": "Branch/Worktree benennen oder Enter für einen automatischen Namen. Esc zurück.",
"LaunchWorktreeNeedsGit": "Neuer Worktree erfordert ein Git-Repository.",
"LaunchWorktreeNameLabel": "Worktree-Name",
"LaunchHintMove": "bewegen",
Expand All @@ -1238,6 +1237,7 @@
"LaunchSavedSessionsPlural": "{count} gespeicherte Sitzungen",
"LaunchCreatingWorktree": "Worktree wird erstellt…",
"LaunchWorktreeFailed": "Worktree fehlgeschlagen: {error}",
"LaunchWorktreeCreated": "Neuer Worktree {path} auf Branch {branch}",
"LaunchNoSavedSessions": "Keine gespeicherten Sitzungen für diesen Workspace.",
"LaunchComposerHint": "Enter senden · Shift+Enter neue Zeile · Esc zurück",
"LaunchNoModelConnected": "kein Modell verbunden",
Expand Down Expand Up @@ -1438,9 +1438,6 @@
"ProviderExternalRevokedToast": "Externer Zugangsdaten-Zugriff für {provider} widerrufen",
"ProviderExternalRevokeFailedToast": "Externer Zugangsdaten-Zugriff wurde nicht widerrufen: {error}",
"ThemeSurfaceTitle": "Theme · Live-Vorschau",
"ThemeTreatmentDeepseaUnavailable": "Treatment Deepsea nicht verfügbar — Terminal besitzt den Hintergrund",
"ThemeTreatmentFlatActive": "Treatment Flat — aktiv",
"ThemeTreatmentDeepseaActive": "Treatment Deepsea — aktiv",
"FleetRosterHeaderLabel": "Pod",
"FleetRosterTabRoster": "Mitglieder",
"FleetRosterTabSetup": "Setup",
Expand Down Expand Up @@ -1964,8 +1961,6 @@
"ConfigChoiceDetailShowThinkingOff": "Hält das Reasoning des Modells verborgen; Antworten und Werkzeuge bleiben sichtbar.",
"ConfigChoiceDetailThinkingHighlightOn": "Füllt den Hintergrund des Modell-Reasonings.",
"ConfigChoiceDetailThinkingHighlightOff": "Behält die gestrichelte Leiste und den kursiven Text ohne gefüllten Hintergrund.",
"ConfigChoiceDetailOceanDeepsea": "Nutzt ein durchgehendes Ozean-Farbfeld.",
"ConfigChoiceDetailOceanFlat": "Nutzt eine einzelne flache Hintergrundfarbe.",
"ConfigHintModel": "Modell der Live-Route dieser Sitzung; Enter öffnet /model",
"ConfigHintFastModel": "wird von Auto-Routing und agentischem model_strength=faster genutzt, wenn dieser Anbieter ein bekanntes Schwestermodell hat",
"ConfigHintProvider": "Anbieter der Live-Route dieser Sitzung; Enter öffnet /provider (Zugangsdaten, Modell und Endpunkt wechseln gemeinsam)",
Expand All @@ -1992,7 +1987,6 @@
"ConfigHintCalmMode": "beruhigt Transkript-Chrome und Werkzeugdetails; unabhängig von Live-Bewegung",
"ConfigHintLowMotion": "an überschreibt Live-Bewegung; die Modellausgabe bleibt unverändert",
"ConfigHintFancyAnimations": "an animiert wahrheitsgetreu den Live-Zustand von Werkzeugen, Status und Ozean",
"ConfigHintOceanTreatment": "deepsea | flat (Darstellung; unabhängig von Bewegung)",
"ConfigHintShowThinking": "Modell-Reasoning im Chat zeigen oder verbergen; Aufgabenlisten bleiben knapp",
"ConfigHintThinkingDefaultExpanded": "Modell-Reasoning standardmäßig ausklappen; Leertaste schaltet weiterhin jeden Block um",
"ConfigHintThinkingPreviewLines": "Vorschauzeilen eingeklappter abgeschlossener Gedanken (Standard 2; 0=nur Kopfzeile; 10=älterer Dump)",
Expand Down
12 changes: 3 additions & 9 deletions crates/tui/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@
"ConfigLabelTheme": "Theme",
"ConfigLabelLocale": "Language",
"ConfigLabelBackground": "Background",
"ConfigLabelOceanTreatment": "Ocean treatment",
"ConfigLabelWorkSurfacePlacement": "Sidebar position",
"ConfigLabelTopHeight": "Top bar height",
"ConfigLabelSideWidth": "Side bar width",
Expand Down Expand Up @@ -729,7 +728,7 @@
"SubagentsRoleConsultant": "advisor",
"SubagentsRoleCustom": "custom",
"HelpUnknownCommand": "Unknown command: {topic}",
"HomeDashboardTitle": "Codewhale",
"HomeDashboardTitle": "codewhale",
"HomeModel": "Model:",
"HomeMode": "Mode:",
"HomeWorkspace": "Workspace:",
Expand Down Expand Up @@ -1251,7 +1250,7 @@
"LaunchProviderConfiguredShort": "provider set",
"LaunchProviderSetupShort": "provider setup",
"LaunchMenuChangelog": "Changelog",
"LaunchWorktreePrompt": "Name the branch/worktree, or press Enter for an automatic name.",
"LaunchWorktreePrompt": "Name the branch/worktree, or press Enter for an automatic name. Esc back.",
"LaunchWorktreeNeedsGit": "New worktree requires a Git repository.",
"LaunchWorktreeNameLabel": "worktree name",
"LaunchHintMove": "move",
Expand All @@ -1261,6 +1260,7 @@
"LaunchSavedSessionsPlural": "{count} saved sessions",
"LaunchCreatingWorktree": "Creating worktree…",
"LaunchWorktreeFailed": "Worktree failed: {error}",
"LaunchWorktreeCreated": "New worktree {path} on branch {branch}",
"LaunchNoSavedSessions": "No saved sessions for this workspace.",
"LaunchComposerHint": "Enter send · Shift+Enter new line · Esc back",
"LaunchNoModelConnected": "no model connected",
Expand Down Expand Up @@ -1461,9 +1461,6 @@
"ProviderExternalRevokedToast": "External credential access revoked for {provider}",
"ProviderExternalRevokeFailedToast": "External credential access was not revoked: {error}",
"ThemeSurfaceTitle": "theme · live preview",
"ThemeTreatmentDeepseaUnavailable": "Treatment Deepsea unavailable — Terminal owns the background",
"ThemeTreatmentFlatActive": "Treatment Flat — active",
"ThemeTreatmentDeepseaActive": "Treatment Deepsea — active",
"FleetRosterHeaderLabel": "fleet",
"FleetRosterTabRoster": "members",
"FleetRosterTabSetup": "setup",
Expand Down Expand Up @@ -1964,8 +1961,6 @@
"ConfigChoiceDetailShowThinkingOff": "Keep model reasoning hidden; answers and tools remain visible.",
"ConfigChoiceDetailThinkingHighlightOn": "Fill the model reasoning background.",
"ConfigChoiceDetailThinkingHighlightOff": "Keep the dashed reasoning rail and italic text without a filled background.",
"ConfigChoiceDetailOceanDeepsea": "Use one continuous ocean color field.",
"ConfigChoiceDetailOceanFlat": "Use a single flat background color.",
"ConfigHintModel": "live route model for this session; Enter opens /model",
"ConfigHintFastModel": "used by Auto routing and agent model_strength=faster when this provider has a known sibling",
"ConfigHintProvider": "live route provider for this session; Enter opens /provider (credential, model, and endpoint switch together)",
Expand All @@ -1992,7 +1987,6 @@
"ConfigHintCalmMode": "quietens transcript chrome and tool detail; independent of live motion",
"ConfigHintLowMotion": "on overrides live-state motion; model output is unchanged",
"ConfigHintFancyAnimations": "on animates truthful tool, status, and ocean live state",
"ConfigHintOceanTreatment": "deepsea | flat (appearance; independent of motion)",
"ConfigHintShowThinking": "show or hide model reasoning in chat; task lists stay concise",
"ConfigHintThinkingDefaultExpanded": "expand model reasoning by default; Space still toggles each block",
"ConfigHintThinkingPreviewLines": "collapsed completed-thought preview rows (default 2; 0=header-only; 10=older dump)",
Expand Down
12 changes: 3 additions & 9 deletions crates/tui/locales/es-419.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@
"ConfigLabelTheme": "Tema",
"ConfigLabelLocale": "Idioma",
"ConfigLabelBackground": "Fondo",
"ConfigLabelOceanTreatment": "Tratamiento oceánico",
"ConfigLabelWorkSurfacePlacement": "Posición de la barra lateral",
"ConfigLabelTopHeight": "Altura de la barra superior",
"ConfigLabelSideWidth": "Ancho de la barra lateral",
Expand Down Expand Up @@ -729,7 +728,7 @@
"SubagentsRoleConsultant": "consultor",
"SubagentsRoleCustom": "personalizado",
"HelpUnknownCommand": "Comando desconocido: {topic}",
"HomeDashboardTitle": "Codewhale",
"HomeDashboardTitle": "codewhale",
"HomeModel": "Modelo:",
"HomeMode": "Modo:",
"HomeWorkspace": "Espacio de trabajo:",
Expand Down Expand Up @@ -1251,7 +1250,7 @@
"LaunchProviderConfiguredShort": "proveedor configurado",
"LaunchProviderSetupShort": "configurar proveedor",
"LaunchMenuChangelog": "Changelog",
"LaunchWorktreePrompt": "Nombra la rama/worktree, o presiona Enter para un nombre automático.",
"LaunchWorktreePrompt": "Nombra la rama/worktree, o presiona Enter para un nombre automático. Esc para volver.",
"LaunchWorktreeNeedsGit": "Un worktree nuevo requiere un repositorio Git.",
"LaunchWorktreeNameLabel": "nombre del worktree",
"LaunchHintMove": "mover",
Expand All @@ -1261,6 +1260,7 @@
"LaunchSavedSessionsPlural": "{count} sesiones guardadas",
"LaunchCreatingWorktree": "Creando worktree…",
"LaunchWorktreeFailed": "El worktree falló: {error}",
"LaunchWorktreeCreated": "Nuevo worktree {path} en la rama {branch}",
"LaunchNoSavedSessions": "No hay sesiones guardadas para este workspace.",
"LaunchComposerHint": "Enter envía · Shift+Enter nueva línea · Esc vuelve",
"LaunchNoModelConnected": "ningún modelo conectado",
Expand Down Expand Up @@ -1461,9 +1461,6 @@
"ProviderExternalRevokedToast": "Se revocó el acceso a credenciales externas para {provider}",
"ProviderExternalRevokeFailedToast": "No se revocó el acceso a credenciales externas: {error}",
"ThemeSurfaceTitle": "tema · vista previa en vivo",
"ThemeTreatmentDeepseaUnavailable": "Tratamiento Deepsea no disponible — la terminal controla el fondo",
"ThemeTreatmentFlatActive": "Tratamiento Flat — activo",
"ThemeTreatmentDeepseaActive": "Tratamiento Deepsea — activo",
"FleetRosterHeaderLabel": "pod",
"FleetRosterTabRoster": "miembros",
"FleetRosterTabSetup": "setup",
Expand Down Expand Up @@ -1964,8 +1961,6 @@
"ConfigChoiceDetailShowThinkingOff": "Mantiene oculto el razonamiento del modelo; respuestas y herramientas siguen visibles.",
"ConfigChoiceDetailThinkingHighlightOn": "Rellena el fondo del razonamiento del modelo.",
"ConfigChoiceDetailThinkingHighlightOff": "Mantiene el riel punteado y el texto en cursiva sin fondo relleno.",
"ConfigChoiceDetailOceanDeepsea": "Usa un único campo de color continuo del océano.",
"ConfigChoiceDetailOceanFlat": "Usa un único color de fondo plano.",
"ConfigHintModel": "modelo de la ruta en vivo de esta sesión; Enter abre /model",
"ConfigHintFastModel": "lo usan el enrutamiento Auto y model_strength=faster de los agentes cuando este proveedor tiene un hermano conocido",
"ConfigHintProvider": "proveedor de la ruta en vivo de esta sesión; Enter abre /provider (credencial, modelo y endpoint cambian juntos)",
Expand All @@ -1992,7 +1987,6 @@
"ConfigHintCalmMode": "silencia el cromo de la transcripción y el detalle de herramientas; independiente del movimiento en vivo",
"ConfigHintLowMotion": "activado anula el movimiento del estado en vivo; la salida del modelo no cambia",
"ConfigHintFancyAnimations": "activado anima con fidelidad el estado en vivo de herramientas, estado y océano",
"ConfigHintOceanTreatment": "deepsea | flat (apariencia; independiente del movimiento)",
"ConfigHintShowThinking": "muestra u oculta el razonamiento del modelo en el chat; las listas de tareas siguen concisas",
"ConfigHintThinkingDefaultExpanded": "expande el razonamiento del modelo de forma predeterminada; Espacio sigue alternando cada bloque",
"ConfigHintThinkingPreviewLines": "filas de vista previa del pensamiento completado plegado (predeterminado 2; 0=solo encabezado; 10=volcado antiguo)",
Expand Down
Loading
Loading