Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 23 additions & 15 deletions apps/web/src/components/DiffPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ import { ToggleGroup, Toggle } from "./ui/toggle-group";
type DiffRenderMode = "stacked" | "split";
type DiffThemeType = "light" | "dark";

const DIFF_PANEL_UNSAFE_CSS = `
function buildDiffPanelCss(colorblind: boolean): string {
const addition = colorblind ? "var(--cb-addition)" : "var(--success)";
const deletion = colorblind ? "var(--cb-deletion)" : "var(--destructive)";

return `
[data-diffs-header],
[data-diff],
[data-file],
Expand All @@ -55,23 +59,23 @@ const DIFF_PANEL_UNSAFE_CSS = `
--diffs-bg-separator-override: color-mix(in srgb, var(--background) 95%, var(--foreground));
--diffs-bg-buffer-override: color-mix(in srgb, var(--background) 90%, var(--foreground));

--diffs-bg-addition-override: color-mix(in srgb, var(--background) 92%, var(--success));
--diffs-bg-addition-number-override: color-mix(in srgb, var(--background) 88%, var(--success));
--diffs-bg-addition-hover-override: color-mix(in srgb, var(--background) 85%, var(--success));
--diffs-bg-addition-emphasis-override: color-mix(in srgb, var(--background) 80%, var(--success));

--diffs-bg-deletion-override: color-mix(in srgb, var(--background) 92%, var(--destructive));
--diffs-bg-deletion-number-override: color-mix(in srgb, var(--background) 88%, var(--destructive));
--diffs-bg-deletion-hover-override: color-mix(in srgb, var(--background) 85%, var(--destructive));
--diffs-bg-deletion-emphasis-override: color-mix(
in srgb,
var(--background) 80%,
var(--destructive)
);
--diffs-addition-color-override: ${addition};
--diffs-bg-addition-override: color-mix(in srgb, var(--background) 92%, ${addition});
--diffs-bg-addition-number-override: color-mix(in srgb, var(--background) 88%, ${addition});
--diffs-bg-addition-hover-override: color-mix(in srgb, var(--background) 85%, ${addition});
--diffs-bg-addition-emphasis-override: color-mix(in srgb, var(--background) 80%, ${addition});

--diffs-deletion-color-override: ${deletion};
--diffs-bg-deletion-override: color-mix(in srgb, var(--background) 92%, ${deletion});
--diffs-bg-deletion-number-override: color-mix(in srgb, var(--background) 88%, ${deletion});
--diffs-bg-deletion-hover-override: color-mix(in srgb, var(--background) 85%, ${deletion});
--diffs-bg-deletion-emphasis-override: color-mix(in srgb, var(--background) 80%, ${deletion});

background-color: var(--diffs-bg) !important;
}`;
}

const DIFF_PANEL_STATIC_CSS = `
[data-file-info] {
background-color: color-mix(in srgb, var(--card) 94%, var(--foreground)) !important;
border-block-color: var(--border) !important;
Expand Down Expand Up @@ -169,6 +173,10 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
const settings = useSettings();
const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");
const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);
const diffUnsafeCss = useMemo(
() => buildDiffPanelCss(settings.colorblindMode) + DIFF_PANEL_STATIC_CSS,
[settings.colorblindMode],
);
const patchViewportRef = useRef<HTMLDivElement>(null);
const turnStripRef = useRef<HTMLDivElement>(null);
const previousDiffOpenRef = useRef(false);
Expand Down Expand Up @@ -615,7 +623,7 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
overflow: diffWordWrap ? "wrap" : "scroll",
theme: resolveDiffThemeName(resolvedTheme),
themeType: resolvedTheme as DiffThemeType,
unsafeCSS: DIFF_PANEL_UNSAFE_CSS,
unsafeCSS: diffUnsafeCss,
}}
/>
</div>
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/components/GitActionsControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,9 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
<span className="text-muted-foreground">Excluded</span>
) : (
<>
<span className="text-success">+{file.insertions}</span>
<span className="diff-stat-addition">+{file.insertions}</span>
<span className="text-muted-foreground"> / </span>
<span className="text-destructive">-{file.deletions}</span>
<span className="diff-stat-deletion">-{file.deletions}</span>
</>
)}
</span>
Expand All @@ -983,11 +983,11 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
</div>
</ScrollArea>
<div className="flex justify-end font-mono">
<span className="text-success">
<span className="diff-stat-addition">
+{selectedFiles.reduce((sum, f) => sum + f.insertions, 0)}
</span>
<span className="text-muted-foreground"> / </span>
<span className="text-destructive">
<span className="diff-stat-deletion">
-{selectedFiles.reduce((sum, f) => sum + f.deletions, 0)}
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/chat/DiffStatLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ export const DiffStatLabel = memo(function DiffStatLabel(props: {
return (
<>
{showParentheses && <span className="text-muted-foreground/70">(</span>}
<span className="text-success">+{additions}</span>
<span className="diff-stat-addition">+{additions}</span>
<span className="mx-0.5 text-muted-foreground/70">/</span>
<span className="text-destructive">-{deletions}</span>
<span className="diff-stat-deletion">-{deletions}</span>
{showParentheses && <span className="text-muted-foreground/70">)</span>}
</>
);
Expand Down
28 changes: 28 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@ export function useSettingsRestore(onRestored?: () => void) {
const changedSettingLabels = useMemo(
() => [
...(theme !== "system" ? ["Theme"] : []),
...(settings.colorblindMode !== DEFAULT_UNIFIED_SETTINGS.colorblindMode
? ["Colorblind mode"]
: []),
...(settings.timestampFormat !== DEFAULT_UNIFIED_SETTINGS.timestampFormat
? ["Time format"]
: []),
Expand All @@ -481,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
[
areProviderSettingsDirty,
isGitWritingModelDirty,
settings.colorblindMode,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.defaultThreadEnvMode,
Expand Down Expand Up @@ -814,6 +818,30 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
title="Colorblind mode"
description="Replace red/green with blue/orange across diffs and stats."
resetAction={
settings.colorblindMode !== DEFAULT_UNIFIED_SETTINGS.colorblindMode ? (
<SettingResetButton
label="colorblind mode"
onClick={() =>
updateSettings({
colorblindMode: DEFAULT_UNIFIED_SETTINGS.colorblindMode,
})
}
/>
) : null
}
control={
<Switch
checked={settings.colorblindMode}
onCheckedChange={(checked) => updateSettings({ colorblindMode: Boolean(checked) })}
aria-label="Enable colorblind mode"
/>
}
/>

<SettingsRow
title="Diff line wrapping"
description="Set the default wrap state when the diff panel opens."
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/hooks/useSettings.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ describe("buildLegacyClientSettingsMigrationPatch", () => {
confirmThreadDelete: false,
});
});

it("does not migrate colorblindMode since it never existed in legacy settings", () => {
expect(buildLegacyClientSettingsMigrationPatch({ colorblindMode: true })).toEqual({});
});
});
18 changes: 17 additions & 1 deletion apps/web/src/hooks/useSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
} from "@t3tools/contracts/settings";
import { serverConfigQueryOptions, serverQueryKeys } from "~/lib/serverReactQuery";
import { ensureNativeApi } from "~/nativeApi";
import { useLocalStorage } from "./useLocalStorage";
import { getLocalStorageItem, useLocalStorage } from "./useLocalStorage";
import { normalizeCustomModelSlugs } from "~/modelSelection";
import { Predicate, Schema, Struct } from "effect";
import { DeepMutable } from "effect/Types";
Expand Down Expand Up @@ -268,3 +268,19 @@ export function migrateLocalSettingsToServer(): void {
localStorage.removeItem(OLD_SETTINGS_KEY);
}
}

// ── Colorblind mode root class ──────────────────────────────────

export function applyColorblindMode(enabled: boolean): void {
if (typeof document === "undefined") return;
document.documentElement.classList.toggle("colorblind-mode", enabled);
}

export function getStoredColorblindMode(): boolean {
try {
const stored = getLocalStorageItem(CLIENT_SETTINGS_STORAGE_KEY, ClientSettingsSchema);
return stored?.colorblindMode ?? false;
} catch {
return false;
}
}
28 changes: 28 additions & 0 deletions apps/web/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,34 @@
}
}

/* Colorblind mode: blue/orange for addition/deletion comparative contexts.
Colors from GitHub Primer @primer/primitives diffBlob tokens. */
:root.colorblind-mode {
--cb-addition: #0969da;
--cb-deletion: #bc4c00;
}

:root.colorblind-mode.dark {
--cb-addition: #388bfd;
--cb-deletion: #db6d28;
}

.diff-stat-addition {
color: var(--color-success);
}

.diff-stat-deletion {
color: var(--color-destructive);
}

:root.colorblind-mode .diff-stat-addition {
color: var(--cb-addition);
}

:root.colorblind-mode .diff-stat-deletion {
color: var(--cb-deletion);
}

body {
font-family:
"DM Sans",
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import "./index.css";
import { isElectron } from "./env";
import { getRouter } from "./router";
import { APP_DISPLAY_NAME } from "./branding";
import { applyColorblindMode, getStoredColorblindMode } from "./hooks/useSettings";

// Electron loads the app from a file-backed shell, so hash history avoids path resolution issues.
const history = isElectron ? createHashHistory() : createBrowserHistory();

const router = getRouter(history);

document.title = APP_DISPLAY_NAME;
applyColorblindMode(getStoredColorblindMode());

ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
<React.StrictMode>
Expand Down
15 changes: 14 additions & 1 deletion apps/web/src/routes/__root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ import { useStore } from "../store";
import { useTerminalStateStore } from "../terminalStateStore";
import { terminalRunningSubprocessFromEvent } from "../terminalActivity";
import { onServerConfigUpdated, onServerProvidersUpdated, onServerWelcome } from "../wsNativeApi";
import { migrateLocalSettingsToServer } from "../hooks/useSettings";
import {
applyColorblindMode,
migrateLocalSettingsToServer,
useSettings,
} from "../hooks/useSettings";
import { providerQueryKeys } from "../lib/providerReactQuery";
import { projectQueryKeys } from "../lib/projectReactQuery";
import { collectActiveTerminalThreadIds } from "../lib/terminalStateCleanup";
Expand Down Expand Up @@ -53,6 +57,7 @@ function RootRouteView() {
return (
<ToastProvider>
<AnchoredToastProvider>
<ColorblindModeSync />
<EventRouter />
<DesktopProjectBootstrap />
<AppSidebarLayout>
Expand All @@ -63,6 +68,14 @@ function RootRouteView() {
);
}

function ColorblindModeSync() {
const settings = useSettings();
useEffect(() => {
applyColorblindMode(settings.colorblindMode);
}, [settings.colorblindMode]);
return null;
}

function RootRouteErrorView({ error, reset }: ErrorComponentProps) {
const message = errorMessage(error);
const details = errorDetails(error);
Expand Down
1 change: 1 addition & 0 deletions packages/contracts/src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export type SidebarThreadSortOrder = typeof SidebarThreadSortOrder.Type;
export const DEFAULT_SIDEBAR_THREAD_SORT_ORDER: SidebarThreadSortOrder = "updated_at";

export const ClientSettingsSchema = Schema.Struct({
colorblindMode: Schema.Boolean.pipe(Schema.withDecodingDefault(() => false)),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(() => false)),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(() => true)),
diffWordWrap: Schema.Boolean.pipe(Schema.withDecodingDefault(() => false)),
Expand Down
Loading