@devries-cameron20 / t3code Mirror · read-only / commits / 96fc7b9551
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 14:30 UTC

refactor(web): the new design is the only design, with no toggle (#25778)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Theo Browne committed Oct 27, 2026 at 00:00 UTC 96fc7b955196637605cbf3b415152ce4dd0e2294
51 files changed +248 -455
apps/desktop/src/window/DesktopWindow.ts
+1 -1
@@ -131,7 +131,7 @@ function getIconOption(
131 }
132
133 function getInitialWindowBackgroundColor(shouldUseDarkColors: boolean): string {
134 - return shouldUseDarkColors ? "#0a0a0a" : "#ffffff";
134 + return shouldUseDarkColors ? "#000000" : "#ffffff";
135 }
136
137 type DisplayBounds = Pick<Electron.Rectangle, "x" | "y" | "width" | "height">;
apps/web/index.html
+5 -5
@@ -6,14 +6,14 @@
6 name="viewport"
7 content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content"
8 />
9 - <meta name="theme-color" content="#0a0a0a" />
9 + <meta name="theme-color" content="#000000" />
10 <link rel="icon" href="/favicon.ico" sizes="48x48" />
11 <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
12 <link rel="manifest" href="/manifest.webmanifest" />
13 <script>
14 (() => {
15 const LIGHT_BACKGROUND = "#ffffff";
16 - const DARK_BACKGROUND = "#0a0a0a";
16 + const DARK_BACKGROUND = "#000000";
17 const CUSTOM_THEMES_STORAGE_KEY = "t3code:themes:v1";
18 const THEME_FOLLOW_SYSTEM_STORAGE_KEY = "t3code:theme-follow-system";
19 const THEME_APPEARANCE_MODE_STORAGE_KEY = "t3code:theme-appearance-mode";
@@ -25,7 +25,7 @@
25 accent: "#4f46e5",
26 },
27 dark: {
28 - background: "#0a0a0a",
28 + background: "#000000",
29 foreground: "#f5f5f5",
30 accent: "#818cf8",
31 },
@@ -403,7 +403,7 @@
403 }
404
405 html.dark body {
406 - background: #0a0a0a;
406 + background: #000000;
407 color: #f5f5f5;
408 }
409
@@ -462,7 +462,7 @@
462
463 html.dark #boot-error {
464 --boot-error-fg: #f5f5f5;
465 - --boot-error-bg: #0a0a0a;
465 + --boot-error-bg: #000000;
466 }
467
468 html[data-theme-selected="true"] #boot-error {
apps/web/src/appInit.tsx
-3
@@ -62,9 +62,6 @@ function startClientAppearance(): void {
62 if (previous?.chatWidth !== settings.chatWidth) {
63 root.dataset.chatWidth = settings.chatWidth;
64 }
65 - if (previous?.redesignEnabled !== settings.redesignEnabled) {
66 - root.toggleAttribute("data-redesign", settings.redesignEnabled);
67 - }
65 if (previous?.appearanceContrast !== settings.appearanceContrast) {
66 applyAppearanceContrast(root, settings.appearanceContrast);
67 }
apps/web/src/components/ChatView.tsx
-2
@@ -1835,7 +1835,6 @@ export default function ChatView(props: ChatViewProps) {
1835 const threadPanelInlineOpen = useRightPanelStore((state) =>
1836 selectThreadPanelOpen(state.threadPanelVisibilityByThreadKey, activeThreadRef, "inline"),
1837 );
1838 - const centerChatBesideDetails = useClientSettings((s) => s.redesignEnabled);
1838 // Selects only the mode, so canvas resizes rerender the chat view only when the
1839 // card switches presentation.
1840 const threadPanelPresentation = useStore(
@@ -1847,7 +1846,6 @@ export default function ChatView(props: ChatViewProps) {
1846 threadRef: activeThreadRef,
1847 preview: canvasPreview,
1848 detailsCardInlineOpen: threadPanelInlineOpen,
1850 - centerBesideDetails: centerChatBesideDetails,
1849 }).detailsCardMode,
1850 );
1851 const threadPanelOpen = useRightPanelStore((state) =>
apps/web/src/components/ComposerPromptEditorTiptap.tsx
+1 -1
@@ -1077,7 +1077,7 @@ function ComposerPromptEditorTiptapInner(
1077
1078 const editorAttributes = {
1079 class: cn(
1080 - "composer-tiptap -m-1 block max-h-52 min-h-19.5 redesign:min-h-12 overflow-y-auto p-1 whitespace-pre-wrap wrap-break-word bg-transparent leading-relaxed text-foreground focus:outline-none",
1080 + "composer-tiptap -m-1 block max-h-52 min-h-12 overflow-y-auto p-1 whitespace-pre-wrap wrap-break-word bg-transparent leading-relaxed text-foreground focus:outline-none",
1081 className,
1082 ),
1083 "data-testid": "composer-editor",
apps/web/src/components/DiffPanel.tsx
+6 -12
@@ -40,7 +40,6 @@ import { useStableCallback } from "../hooks/useStableCallback";
40 import {
41 buildFileDiffContentVersion,
42 buildFileDiffIdentityKey,
43 - getDiffCollapseIconClassName,
43 getDiffLineStat,
44 getRenderablePatch,
45 resolveDiffThemeName,
@@ -122,14 +121,12 @@ function DiffFileCollapseToggle({
121 fileKey,
122 collapsed,
123 unavailable,
125 - iconClassName,
124 onToggle,
125 }: {
126 filePath: string;
127 fileKey: string;
128 collapsed: boolean;
129 unavailable: boolean;
132 - iconClassName: string;
130 onToggle: (fileKey: string) => void;
131 }) {
132 return (
@@ -151,7 +148,7 @@ function DiffFileCollapseToggle({
148 }
149 >
150 <MorphIcon
154 - className={cn("size-4", iconClassName)}
151 + className="size-4 text-muted-foreground/80"
152 icon={collapsed ? ChevronRight : ChevronDown}
153 />
154 </TooltipTrigger>
@@ -706,9 +703,9 @@ export default function DiffPanel({
703 <Tooltip>
704 <TooltipTrigger
705 render={
709 - // Too narrow for both refs, the New design keeps the target readable and drops
710 - // the head, which is the thread's own branch.
711 - <span className="flex min-w-[min(3rem,calc(100%-2.75rem))] items-center gap-2 overflow-hidden redesign:@max-[20rem]/diff-refs:hidden" />
706 + // Too narrow for both refs, keep the target readable and drop the head, which
707 + // is the thread's own branch.
708 + <span className="flex min-w-[min(3rem,calc(100%-2.75rem))] items-center gap-2 overflow-hidden @max-[20rem]/diff-refs:hidden" />
709 }
710 >
711 <span className="min-w-0 max-w-48 truncate">
@@ -722,9 +719,7 @@ export default function DiffPanel({
719 </Tooltip>
720 <Tooltip>
721 <TooltipTrigger
725 - render={
726 - <span aria-hidden className="hidden redesign:@max-[20rem]/diff-refs:inline" />
727 - }
722 + render={<span aria-hidden className="hidden @max-[20rem]/diff-refs:inline" />}
723 >
724 vs
725 </TooltipTrigger>
@@ -746,7 +741,7 @@ export default function DiffPanel({
741 >
742 <ComboboxTrigger
743 render={<Button variant="ghost-muted" size="xs" />}
749 - className="min-w-9 max-w-48 shrink redesign:shrink-0"
744 + className="min-w-9 max-w-48 shrink-0"
745 aria-label={`Change comparison target. Currently ${selectedGitSource.baseRef}`}
746 >
747 <span className="min-w-0 truncate">{selectedGitSource.baseRef}</span>
@@ -1126,7 +1121,6 @@ export default function DiffPanel({
1121 fileKey={fileKey}
1122 collapsed={unavailable || collapsedDiffFileKeys.has(fileKey)}
1123 unavailable={unavailable}
1129 - iconClassName={getDiffCollapseIconClassName(fileDiff)}
1124 onToggle={toggleDiffFileCollapsed}
1125 />
1126 );
apps/web/src/components/DiffWorkerPoolProvider.tsx
+2 -8
@@ -3,14 +3,13 @@ import { WorkerPoolManager } from "@pierre/diffs/worker";
3 import DiffsWorker from "@pierre/diffs/worker/worker.js?worker";
4 import * as Schema from "effect/Schema";
5 import { useEffect, useState, useSyncExternalStore, type ReactNode } from "react";
6 -import { subscribeClientSettings } from "../hooks/useSettings";
6 import { getRenderedAppearance, subscribeRenderedAppearance } from "../hooks/useTheme";
7 import { resolveDiffThemeName } from "../lib/diffRendering";
8 import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting";
9
10 export class DiffWorkerError extends Schema.TaggedError<DiffWorkerError>()("DiffWorkerError", {
11 operation: Schema.Literals(["create-worker", "get-render-options", "set-render-options"]),
13 - themeName: Schema.Literals(["pierre-light", "pierre-dark", "t3-light"]),
12 + themeName: Schema.Literals(["pierre-dark", "t3-light"]),
13 cause: Schema.Defect(),
14 }) {
15 override get message(): string {
@@ -73,12 +72,7 @@ function createDiffWorkerPool(poolSize: number) {
72 );
73 return {
74 pool,
76 - unsubscribeTheme: (() => {
77 - const apply = () => applyDiffWorkerTheme(pool);
78 - // The New design picks the light syntax palette, so a settings change can switch it too.
79 - const unsubscribes = [subscribeRenderedAppearance(apply), subscribeClientSettings(apply)];
80 - return () => unsubscribes.forEach((unsubscribe) => unsubscribe());
81 - })(),
75 + unsubscribeTheme: subscribeRenderedAppearance(() => applyDiffWorkerTheme(pool)),
76 consumers: 0,
77 idleTimer: undefined,
78 };
apps/web/src/components/GitActionsControl.tsx
-3
@@ -122,7 +122,6 @@ import { getSourceControlPresentation, sourceControlIcon } from "~/sourceControl
122 import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
123 import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
124 import { useOpenLink } from "~/browser/useOpenLink";
125 -import { useClientSettings } from "~/hooks/useSettings";
125
126 interface GitActionsControlProps {
127 presentation?: "toolbar" | "menu";
@@ -1149,10 +1148,8 @@ export default function GitActionsControl({
1148 ? (quickAction.hint ?? "This action is currently unavailable.")
1149 : null;
1150 const gitActionProgress = resolveGitActionProgressPresentation(vcsActionState);
1152 - const redesign = useClientSettings((s) => s.redesignEnabled);
1151 // A fresh draft or a thread with no turns hides commit, push, and diff rows until there is work.
1152 const quietEmptyDraft =
1155 - redesign &&
1153 isPanel &&
1154 (draftId !== undefined || activeServerThreadShell?.latestRun === null) &&
1155 gitActionProgress === null &&
apps/web/src/components/Sidebar.tsx
+3 -7
@@ -3201,14 +3201,10 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
3201 olderSettledShelf.retry();
3202 showMoreSettled();
3203 }}
3204 - className="flex h-9 w-full cursor-pointer items-center gap-2.5 rounded-md px-2.5 text-left text-sm text-sidebar-muted-foreground/55 hover:bg-sidebar-row-hover hover:text-sidebar-foreground disabled:cursor-default redesign:text-sidebar-muted-foreground"
3204 + className="flex h-9 w-full cursor-pointer items-center gap-2.5 rounded-md px-2.5 text-left text-sm text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground disabled:cursor-default"
3205 >
3206 - {/* The New design keeps plus for "add" and uses a chevron to reveal more. */}
3207 - <PlusIcon aria-hidden className="size-4 shrink-0 redesign:hidden" />
3208 - <ChevronDownIcon
3209 - aria-hidden
3210 - className="hidden size-4 shrink-0 redesign:block"
3211 - />
3206 + {/* Plus means "add", so revealing more uses a chevron. */}
3207 + <ChevronDownIcon aria-hidden className="size-4 shrink-0" />
3208 {olderSettledShelf.loading
3209 ? "Loading"
3210 : olderSettledShelf.failed
apps/web/src/components/ThreadStatusIndicators.tsx
+1 -1
@@ -287,7 +287,7 @@ function PullRequestBadge({
287 className={cn("contents font-normal text-xs tabular-nums", presentation.toneClassName)}
288 >
289 <presentation.Icon aria-hidden className="size-3 shrink-0" />
290 - <span className="redesign:text-secondary-label">{presentation.text}</span>
290 + <span className="text-secondary-label">{presentation.text}</span>
291 </span>
292 </TooltipTrigger>
293 <TooltipPopup
apps/web/src/components/chat/ChatCanvas.tsx
-3
@@ -6,7 +6,6 @@ import { resolveChatCanvasModel, type ChatCanvasStore } from "./canvasStore";
6 import { selectThreadPanelOpen, useRightPanelStore } from "../../rightPanelStore";
7 import { observeResize } from "../../lib/observeResize";
8 import type { ScopedThreadRef } from "@t3tools/contracts";
9 -import { useClientSettings } from "~/hooks/useSettings";
9
10 export function ChatCanvas({
11 store,
@@ -72,14 +71,12 @@ export function ChatCanvas({
71 ? false
72 : selectThreadPanelOpen(state.threadPanelVisibilityByThreadKey, threadRef, "inline"),
73 );
75 - const centerBesideDetails = useClientSettings((s) => s.redesignEnabled);
74 const model = resolveChatCanvasModel({
75 measurements,
76 detailsCardMeasurement,
77 threadRef,
78 preview,
79 detailsCardInlineOpen,
82 - centerBesideDetails,
80 });
81 const context = {
82 container: model.container,
apps/web/src/components/chat/ChatComposer.tsx
+1 -1
@@ -3658,7 +3658,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3658 className={cn(
3659 showMobilePendingAnswerActions && "max-sm:pb-12",
3660 isComposerResting &&
3661 - "my-0 max-h-8 min-h-8 redesign:min-h-8 overflow-hidden py-0 whitespace-pre! leading-8",
3661 + "my-0 max-h-8 min-h-8 overflow-hidden py-0 whitespace-pre! leading-8",
3662 )}
3663 placeholderClassName={cn(
3664 isComposerResting &&
apps/web/src/components/chat/ComposerPrimaryActions.tsx
+4 -25
@@ -2,7 +2,7 @@ import { memo, type MouseEventHandler, type PointerEventHandler } from "react";
2 import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, Minimize2Icon, PlayIcon } from "lucide-react";
3 import { CornerUpRight, ListPlus } from "lucide";
4 import { MorphIcon } from "~/components/MorphIcon";
5 -import { useClientSettings, useEnvironmentIdentificationMode } from "~/hooks/useSettings";
5 +import { useEnvironmentIdentificationMode } from "~/hooks/useSettings";
6 import { formatContextWindowTokens } from "~/lib/contextWindow";
7 import { cn } from "~/lib/utils";
8 import { useShortcutModifierState } from "../../shortcutModifierState";
@@ -113,7 +113,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
113 ? { onPointerDown: preventPointerFocus }
114 : undefined;
115 const environmentIdentificationMode = useEnvironmentIdentificationMode();
116 - const redesign = useClientSettings((s) => s.redesignEnabled);
116 const shortcutModifiers = useShortcutModifierState();
117 const isQueuing =
118 !isEditingQueuedMessage &&
@@ -369,16 +368,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
368 render={
369 <button
370 type="button"
372 - className={
373 - redesign
374 - ? "flex h-7 shrink-0 cursor-pointer items-center gap-1.5 rounded-(--control-radius) px-2 font-medium text-base text-foreground/80 tabular-nums outline-none hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-64 sm:text-sm aria-pressed:bg-accent/60 aria-pressed:text-foreground [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:text-muted-foreground"
375 - : cn(
376 - "flex h-9 shrink-0 cursor-pointer items-center gap-1.5 rounded-full border px-2.5 text-xs tabular-nums outline-none transition-colors focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-64 sm:h-8 [&_svg]:pointer-events-none [&_svg]:size-3.5",
377 - keepFullHistory
378 - ? "border-border text-muted-foreground hover:text-foreground"
379 - : "border-warning/40 text-warning hover:bg-warning/8",
380 - )
381 - }
371 + className="flex h-7 shrink-0 cursor-pointer items-center gap-1.5 rounded-(--control-radius) px-2 font-medium text-base text-foreground/80 tabular-nums outline-none hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-64 sm:text-sm aria-pressed:bg-accent/60 aria-pressed:text-foreground [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:text-muted-foreground"
372 {...pointerFocusProps}
373 aria-pressed={!keepFullHistory}
374 aria-label={`Compact ${compactTokens} tokens of history before sending`}
@@ -388,19 +378,8 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
378 }
379 >
380 <Minimize2Icon aria-hidden="true" />
391 - {/* The new design keeps the token count in the tooltip so the permission label keeps its room. */}
392 - {redesign ? (
393 - keepFullHistory ? (
394 - "Keep full"
395 - ) : (
396 - "Compact next"
397 - )
398 - ) : (
399 - <>
400 - {keepFullHistory ? "Full" : "Compact"}
401 - <span>{compactTokens}</span>
402 - </>
403 - )}
381 + {/* The token count lives in the tooltip so the permission label keeps its room. */}
382 + {keepFullHistory ? "Keep full" : "Compact next"}
383 </TooltipTrigger>
384 <TooltipPopup>
385 <div>
apps/web/src/components/chat/ModelListRow.tsx
+6 -9
@@ -29,7 +29,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
29 acpRegistryIconUrl?: string | undefined;
30 isFavorite: boolean;
31 isSelected: boolean;
32 - showSelection?: boolean;
32 showProvider: boolean;
33 preferShortName?: boolean;
34 useTriggerLabel?: boolean;
@@ -61,7 +60,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
60 >
61 <div className="min-w-0 flex-1 text-left">
62 <div className="flex min-w-0 items-center gap-2">
64 - <div className="min-w-0 truncate text-xs font-medium leading-snug redesign:text-sm redesign:font-normal">
63 + <div className="min-w-0 truncate text-sm font-normal leading-snug">
64 {props.useTriggerLabel
65 ? getTriggerDisplayModelLabel(model)
66 : getDisplayModelName(
@@ -124,7 +123,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
123 "size-3.5 sm:size-3",
124 props.isFavorite
125 ? "fill-current text-warning"
127 - : "redesign:opacity-0 redesign:group-hover:opacity-100 redesign:group-data-highlighted:opacity-100 redesign:in-focus-visible:opacity-100 redesign:pointer-coarse:opacity-100",
126 + : "opacity-0 group-hover:opacity-100 group-data-highlighted:opacity-100 in-focus-visible:opacity-100 pointer-coarse:opacity-100",
127 )}
128 />
129 </Button>
@@ -135,12 +134,10 @@ export const ModelListRow = memo(function ModelListRow(props: {
134 </TooltipPopup>
135 </Tooltip>
136 {/* Last, and always reserved, so stars and the check keep fixed columns. */}
138 - {props.showSelection ? (
139 - <CheckIcon
140 - className={cn("size-3.5", !props.isSelected && "invisible")}
141 - aria-hidden="true"
142 - />
143 - ) : null}
137 + <CheckIcon
138 + className={cn("size-3.5", !props.isSelected && "invisible")}
139 + aria-hidden="true"
140 + />
141 </div>
142 </ComboboxItem>
143 );
apps/web/src/components/chat/ModelPickerContent.tsx
+6 -13
@@ -49,7 +49,6 @@ import {
49 shortcutLabelForCommand,
50 } from "../../keybindings";
51 import {
52 - useClientSettings,
52 useEnvironmentModelPreferences,
53 useToggleEnvironmentModelFavorite,
54 } from "~/hooks/useSettings";
@@ -165,7 +164,7 @@ const EMPTY_MODEL_JUMP_LABELS = new Map<string, string>();
164 const MODEL_LIST_ESTIMATED_ITEM_SIZE = 52;
165 // Rendered heights in `--spacing` units. Chrome is the search box and list padding, plus a 1px border.
166 const ONE_LINE_ROW_UNITS = 8;
168 -const TWO_LINE_ROW_UNITS = { classic: 11.25, redesign: 12 };
167 +const TWO_LINE_ROW_UNITS = 12;
168 const ROW_SEPARATOR_UNITS = 0.5;
169 const LIST_CHROME_UNITS = 15.5;
170
@@ -577,15 +576,12 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
576 const isLocked = lockedProvider !== null;
577 const isSearching = searchQuery.trim().length > 0;
578 // Inside one provider's tab the provider line repeats the selected rail icon on every row.
580 - const redesign = useClientSettings((s) => s.redesignEnabled);
581 - const rowsMixProviders = !redesign || isSearching || selectedInstanceId === "favorites";
579 + const rowsMixProviders = isSearching || selectedInstanceId === "favorites";
580 // Fit the tallest tab so switching tabs never resizes the popup and moves the rail under the cursor.
581 const tallestTabUnits = (() => {
582 const unitsByTab = new Map<ProviderInstanceId | "favorites", number>();
583 const addRow = (tab: ProviderInstanceId | "favorites", twoLine: boolean) => {
586 - const rowUnits = twoLine
587 - ? TWO_LINE_ROW_UNITS[redesign ? "redesign" : "classic"]
588 - : ONE_LINE_ROW_UNITS;
584 + const rowUnits = twoLine ? TWO_LINE_ROW_UNITS : ONE_LINE_ROW_UNITS;
585 const previous = unitsByTab.get(tab);
586 unitsByTab.set(
587 tab,
@@ -600,7 +596,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
596 if (model.isLegacy && !isFavorite) {
597 tabsWithLegacyRow.add(model.instanceId);
598 } else {
603 - addRow(model.instanceId, !redesign || Boolean(model.subProvider));
599 + addRow(model.instanceId, Boolean(model.subProvider));
600 }
601 }
602 for (const instanceId of tabsWithLegacyRow) addRow(instanceId, true);
@@ -977,10 +973,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
973 className="group w-full cursor-pointer"
974 >
975 <div className="min-w-0 flex-1 text-left">
980 - <div className="text-xs font-medium leading-snug redesign:text-sm redesign:font-normal">
981 - Legacy models
982 - </div>
983 - <div className="mt-1 text-xs font-normal leading-snug text-muted-foreground/70 redesign:text-muted-foreground">
976 + <div className="text-sm font-normal leading-snug">Legacy models</div>
977 + <div className="mt-1 text-xs font-normal leading-snug text-muted-foreground">
978 {legacySection.legacyModels.length} models
979 </div>
980 </div>
@@ -1019,7 +1013,6 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
1013 ? selectedModelKeySet.has(modelKey)
1014 : modelKey === activeModelKey
1015 }
1022 - showSelection={selectedModelKeys !== undefined || redesign}
1016 showProvider={rowsMixProviders || Boolean(model.subProvider)}
1017 preferShortName={!isLocked}
1018 useTriggerLabel={false}
apps/web/src/components/chat/ModelPickerSidebar.tsx
+1 -6
@@ -25,8 +25,6 @@ function describeUnavailableInstance(entry: ProviderInstanceEntry): string {
25 return msg ? `${label}: ${kind}. ${msg}` : `${label}: ${kind}.`;
26 }
27
28 -const SELECTED_INDICATOR_CLASS =
29 - "pointer-events-none absolute -right-1 top-1/2 z-10 h-5 w-0.75 -translate-y-1/2 rounded-l-full bg-primary redesign:right-1 redesign:rounded-full";
28 const BADGE_BASE_CLASS =
29 "pointer-events-none absolute -right-0.5 top-0.5 z-10 flex size-3.5 items-center justify-center rounded-full bg-transparent shadow-sm ";
30 const NEW_BADGE_CLASS = `${BADGE_BASE_CLASS} text-update-foreground `;
@@ -92,10 +90,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
90 {selectedIndicatorTop !== null ? (
91 <div
92 data-model-picker-selected-indicator="true"
95 - className={cn(
96 - SELECTED_INDICATOR_CLASS,
97 - "right-0 translate-y-0 transition-[top] duration-200 ease-out",
98 - )}
93 + className="pointer-events-none absolute right-1 z-10 h-5 w-0.75 rounded-full bg-primary transition-[top] duration-200 ease-out"
94 style={{ top: selectedIndicatorTop }}
95 />
96 ) : null}
apps/web/src/components/chat/ThreadDetailsControl.tsx
+5 -6
@@ -53,22 +53,21 @@ export function ThreadDetailsControl({
53 "relative inline-flex shrink-0 cursor-pointer items-center whitespace-nowrap border outline-none transition-[box-shadow,scale] [&:not([aria-haspopup]):not(:disabled):not([aria-disabled=true])]:will-change-[scale] [&:active:not([aria-haspopup])]:scale-[0.97] focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 disabled:pointer-events-none disabled:opacity-64 aria-disabled:cursor-not-allowed aria-disabled:opacity-64 [&_svg]:shrink-0",
54 parts[part],
55 multiline && "h-auto min-h-8 py-0.75 disabled:opacity-100 sm:h-auto",
56 - tone === "muted" &&
57 - "text-muted-foreground/70 hover:text-foreground/80 redesign:text-muted-foreground",
56 + tone === "muted" && "text-muted-foreground hover:text-foreground/80",
57 tone === "primary" &&
58 // The row surface forces a faint hover fill with !important; the solid pill keeps its own.
60 - "text-primary hover:text-primary redesign:bg-primary redesign:text-primary-foreground redesign:hover:text-primary-foreground redesign:hover:!bg-primary/85 redesign:data-pressed:!bg-primary/85 redesign:dark:hover:!bg-primary/85 redesign:dark:data-pressed:!bg-primary/85",
59 + "bg-primary text-primary-foreground hover:text-primary-foreground hover:!bg-primary/85 data-pressed:!bg-primary/85 dark:hover:!bg-primary/85 dark:data-pressed:!bg-primary/85",
60 tone === "destructive" &&
61 "text-destructive hover:text-destructive data-pressed:text-destructive",
62 // PR row actions share one 20px pill with a 1px inset focus ring that stays clear of the
63 // label. The solid pill draws it in the canvas color so it shows against the fill.
64 part === "meta" &&
65 (tone === "primary" || tone === "destructive") &&
67 - "redesign:h-5 redesign:focus-visible:ring-offset-0 redesign:focus-visible:ring-1",
68 - part === "meta" && tone === "primary" && "redesign:focus-visible:ring-background",
66 + "h-5 focus-visible:ring-1 focus-visible:ring-offset-0",
67 + part === "meta" && tone === "primary" && "focus-visible:ring-background",
68 part === "meta" &&
69 tone === "destructive" &&
71 - "redesign:bg-destructive/10 redesign:hover:!bg-destructive/16 redesign:data-pressed:!bg-destructive/16 redesign:dark:hover:!bg-destructive/16 redesign:dark:data-pressed:!bg-destructive/16",
70 + "bg-destructive/10 hover:!bg-destructive/16 data-pressed:!bg-destructive/16 dark:hover:!bg-destructive/16 dark:data-pressed:!bg-destructive/16",
71 className,
72 ),
73 },
apps/web/src/components/chat/ThreadDetailsPrRow.tsx
+1 -1
@@ -439,7 +439,7 @@ export function ThreadDetailsPrRow({
439 {detail !== null && (showChecks || trailingAction !== null || watching) ? (
440 <div className="pb-1.5">
441 {openRow(detail.title, "row", true)}
442 - <div className="flex h-5 min-w-0 items-center gap-0.5 ps-9 pe-1 text-xs text-muted-foreground redesign:pe-2.5">
442 + <div className="flex h-5 min-w-0 items-center gap-0.5 ps-9 pe-2.5 text-xs text-muted-foreground">
443 <span className="me-1 shrink-0 tabular-nums">#{number}</span>
444 {showChecks && checksRollup !== null ? (
445 <PullRequestChecksPopover
apps/web/src/components/chat/ThreadDetailsPrRows.tsx
+3 -5
@@ -6,7 +6,7 @@ import {
6 threadPullRequestKeyOf,
7 visibleThreadPullRequests,
8 } from "@t3tools/client-runtime/thread-pull-requests";
9 -import { ChevronDown, ChevronUp, Minus, Plus } from "lucide";
9 +import { ChevronDown, ChevronUp } from "lucide";
10 import { useState, type ComponentProps, type MouseEvent as ReactMouseEvent } from "react";
11
12 import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
@@ -17,7 +17,6 @@ import { threadEnvironment } from "~/state/threads";
17 import { useAtomCommand } from "~/state/use-atom-command";
18
19 import { MorphIcon } from "~/components/MorphIcon";
20 -import { useClientSettings } from "~/hooks/useSettings";
20 import { linkedPullRequestSnapshotStatus, prStatusIndicator } from "../ThreadStatusIndicators";
21
22 import { ThreadDetailsPrRow } from "./ThreadDetailsPrRow";
@@ -76,8 +75,6 @@ export function ThreadDetailsPrRows({
75 onOpenLink: (event: ReactMouseEvent<HTMLElement>, url: string) => void;
76 }) {
77 const [expanded, setExpanded] = useState(false);
79 - // The plus already means "add" in this card (Add project script).
80 - const redesign = useClientSettings((s) => s.redesignEnabled);
78 const watch = useAtomCommand(threadEnvironment.watchPullRequest, { reportFailure: true });
79 const stopWatching = (link: ThreadPullRequestLink | null) =>
80 link?.watch === undefined
@@ -130,7 +127,8 @@ export function ThreadDetailsPrRows({
127 <MorphIcon
128 aria-hidden
129 className="size-4 shrink-0"
133 - icon={expanded ? (redesign ? ChevronUp : Minus) : redesign ? ChevronDown : Plus}
130 + // Chevrons, not plus and minus: the plus already means "add" in this card.
131 + icon={expanded ? ChevronUp : ChevronDown}
132 />
133 {expanded ? "Show less" : `Show ${rest.length} more`}
134 </ThreadDetailsControl>
apps/web/src/components/chat/ThreadRelationshipsControl.tsx
+1 -1
@@ -153,7 +153,7 @@ function ThreadLineageGroup(props: {
153 className={cn(
154 THREAD_DETAILS_PANEL_CHEVRON_CLASS,
155 "transition-transform",
156 - !expanded && "rotate-180 redesign:-rotate-90",
156 + !expanded && "-rotate-90",
157 )}
158 />
159 </ThreadDetailsControl>
apps/web/src/components/chat/ThreadStatusLine.tsx
+1 -8
@@ -1,6 +1,5 @@
1 import type { ReactNode } from "react";
2
3 -import { useClientSettings } from "~/hooks/useSettings";
3 import { InlineButton } from "../ui/button";
4
5 export function ThreadStatusLine(props: {
@@ -12,8 +11,6 @@ export function ThreadStatusLine(props: {
11 // Set for clock-dependent labels to trigger updates.
12 readonly clockMinute?: string;
13 }) {
15 - // Muted, the action blends into the status text; the New design gives it full color.
16 - const redesign = useClientSettings((s) => s.redesignEnabled);
14 return (
15 <div
16 data-chat-thread-status-line="true"
@@ -22,11 +19,7 @@ export function ThreadStatusLine(props: {
19 {props.icon}
20 <span className="min-w-0 truncate">{props.label}</span>
21 <span aria-hidden="true">·</span>
25 - <InlineButton
26 - tone={redesign ? "default" : "muted"}
27 - disabled={props.actionDisabled}
28 - onClick={props.onAction}
29 - >
22 + <InlineButton disabled={props.actionDisabled} onClick={props.onAction}>
23 {props.actionLabel}
24 </InlineButton>
25 </div>
apps/web/src/components/chat/TraitsPicker.tsx
+3 -5
@@ -24,7 +24,7 @@ import {
24 normalizeModelSlug,
25 } from "@t3tools/shared/model";
26 import { memo } from "react";
27 -import { BrainIcon, GaugeIcon } from "lucide-react";
27 +import { GaugeIcon } from "lucide-react";
28 import {
29 Menu,
30 MenuGroup,
@@ -600,8 +600,7 @@ export const TraitsPicker = memo(function TraitsPicker({
600 size === "xs" ? "gap-1" : "gap-1.5",
601 )}
602 >
603 - <ComposerControlIcon icon={BrainIcon} size={size} className="redesign:hidden" />
604 - <ComposerControlIcon icon={GaugeIcon} size={size} className="hidden redesign:block" />
603 + <ComposerControlIcon icon={GaugeIcon} size={size} />
604 <span data-composer-control-label className="min-w-0 truncate">
605 {triggerLabel}
606 </span>
@@ -609,8 +608,7 @@ export const TraitsPicker = memo(function TraitsPicker({
608 </span>
609 ) : (
610 <>
612 - <ComposerControlIcon icon={BrainIcon} size={size} className="redesign:hidden" />
613 - <ComposerControlIcon icon={GaugeIcon} size={size} className="hidden redesign:block" />
611 + <ComposerControlIcon icon={GaugeIcon} size={size} />
612 <span data-composer-control-label>{triggerLabel}</span>
613 <ComposerControlChevron size={size} />
614 </>
apps/web/src/components/chat/canvasStore.test.ts
-3
@@ -38,7 +38,6 @@ describe("chat canvas model", () => {
38 threadRef,
39 preview: null,
40 detailsCardInlineOpen: true,
41 - centerBesideDetails: false,
41 }).detailsCardMode;
42 expect(resolve(1400)).toBe("inline");
43 expect(resolve(900)).toBe("popover");
@@ -52,7 +51,6 @@ describe("chat canvas model", () => {
51 threadRef,
52 preview: { ...preview, position: { x: 760, y: 150 }, lastInteraction: "drag" },
53 detailsCardInlineOpen: true,
55 - centerBesideDetails: false,
54 });
55 const model = resolve(400);
56 expect(model.layout.overlapsDetailsCard).toBe(true);
@@ -66,7 +64,6 @@ describe("chat canvas model", () => {
64 threadRef,
65 preview: { ...preview, position: { x: 760, y: 150 }, lastInteraction: "drag" },
66 detailsCardInlineOpen: true,
69 - centerBesideDetails: false,
67 });
68 expect(model.layout.overlapsDetailsCard).toBe(false);
69 expect(model.detailsCardMode).toBe("inline");
apps/web/src/components/chat/canvasStore.ts
-3
@@ -85,7 +85,6 @@ export function resolveChatCanvasModel({
85 threadRef,
86 preview,
87 detailsCardInlineOpen,
88 - centerBesideDetails,
88 }: {
89 measurements: ChatCanvasMeasurements;
90 detailsCardMeasurement: DetailsCardMeasurement | null;
@@ -93,7 +92,6 @@ export function resolveChatCanvasModel({
92 threadRef: ScopedThreadRef | null;
93 preview: ChatCanvasPreview | null;
94 detailsCardInlineOpen: boolean;
96 - centerBesideDetails: boolean;
95 }) {
96 const container = { width: measurements.width, height: measurements.height };
97 const { findBar } = measurements;
@@ -138,7 +136,6 @@ export function resolveChatCanvasModel({
136 composerHeight: measurements.composerHeight,
137 detailsCard,
138 findBar,
141 - centerBesideDetails,
139 });
140 const detailsCardPlacement = resolveThreadDetailsCardLayout({
141 container,
apps/web/src/components/chat/chatCanvasLayout.test.ts
+10 -16
@@ -102,21 +102,17 @@ describe("chat canvas layout", () => {
102 });
103 expect(result.frame).toEqual({ x: 1260, y: 351, width: 240, height: 365 });
104 expect(result.overlapsDetailsCard).toBe(false);
105 - expect(result.chat).toEqual({ left: 424, width: 736, insetStart: 0, insetEnd: 0 });
105 + expect(result.chat).toEqual({ left: 330, width: 736, insetStart: 0, insetEnd: 188 });
106 });
107 - it("centers the chat beside a details card it would crowd, when asked", () => {
108 - const layout = (centerBesideDetails: boolean) =>
109 - resolveChatCanvasLayout({
110 - container: { width: 1344, height: 988 },
111 - maxChatWidth: 736,
112 - detailsCard: { left: 1052, right: 1332, bottom: 339 },
113 - preview: null,
114 - centerBesideDetails,
115 - }).chat;
116 - // Pushed left just enough to clear the card.
117 - expect(layout(false).left).toBe(1052 - 32 - 736);
107 + it("centers the chat beside a details card it would crowd", () => {
108 + const { chat } = resolveChatCanvasLayout({
109 + container: { width: 1344, height: 988 },
110 + maxChatWidth: 736,
111 + detailsCard: { left: 1052, right: 1332, bottom: 339 },
112 + preview: null,
113 + });
114 // Equal space on both sides of the chat.
119 - expect(layout(true)).toMatchObject({ left: (1052 - 736) / 2, width: 736 });
115 + expect(chat).toMatchObject({ left: (1052 - 736) / 2, width: 736 });
116 });
117 it("keeps the chat canvas-centered when it clears the details card", () => {
118 const result = resolveChatCanvasLayout({
@@ -124,7 +120,6 @@ describe("chat canvas layout", () => {
120 maxChatWidth: 736,
121 detailsCard: { left: 1876, right: 2188, bottom: 339 },
122 preview: null,
127 - centerBesideDetails: true,
123 });
124 expect(result.chat.left).toBe((2200 - 736) / 2);
125 });
@@ -135,7 +130,6 @@ describe("chat canvas layout", () => {
130 maxChatWidth: 736,
131 detailsCard: { left: width - 292, right: width - 12, bottom: 339 },
132 preview: null,
138 - centerBesideDetails: true,
133 }).chat.left;
134 for (let width = 1300; width < 1800; width += 1) {
135 expect(Math.abs(leftAt(width + 1) - leftAt(width))).toBeLessThanOrEqual(1);
@@ -261,7 +255,7 @@ describe("chat canvas layout", () => {
255 const compact = layout(460);
256 expect(compact.frame!.x + compact.frame!.width).toBe(1572);
257 expect(compact.frame!.width).toBe(460);
264 - expect(compact.chat.left).toBe(364);
258 + expect(compact.chat.left).toBe(330);
259 expect(compact.overlapsDetailsCard).toBe(true);
260 expect(density(compact)).toBe("compact");
261 expectClear(compact);
apps/web/src/components/chat/chatCanvasLayout.ts
+9 -13
@@ -30,7 +30,6 @@ export function resolveChatCanvasLayout({
30 composerHeight = 0,
31 detailsCard = null,
32 findBar = null,
33 - centerBesideDetails = false,
33 }: {
34 container: PreviewMiniPlayerSize;
35 preview: ChatCanvasPreview | null;
@@ -40,8 +39,6 @@ export function resolveChatCanvasLayout({
39 composerHeight?: number;
40 detailsCard?: PreviewMiniPlayerObstacles["detailsCard"];
41 findBar?: PreviewMiniPlayerObstacles["detailsCard"];
43 - /** Center the chat in the space left of the details card when it would otherwise crowd it. */
44 - centerBesideDetails?: boolean;
42 }) {
43 const centeredWidth = Math.max(0, Math.min(maxChatWidth, container.width - padding * 2));
44 const laneRight = detailsCard
@@ -52,16 +49,15 @@ export function resolveChatCanvasLayout({
49 // Beside a card it would crowd, the chat centers between the card and the canvas edge. The shift
50 // eases to zero as clearance grows, so very wide windows keep the chat still and a resize
51 // never jumps it.
55 - const besideShift =
56 - detailsCard && centerBesideDetails
57 - ? Math.min(
58 - (container.width - detailsCard.left) / 2,
59 - Math.max(
60 - 0,
61 - (container.width - detailsCard.left) / 2 - (laneRight - canvasCenterLeft - normalWidth),
62 - ),
63 - )
64 - : 0;
52 + const besideShift = detailsCard
53 + ? Math.min(
54 + (container.width - detailsCard.left) / 2,
55 + Math.max(
56 + 0,
57 + (container.width - detailsCard.left) / 2 - (laneRight - canvasCenterLeft - normalWidth),
58 + ),
59 + )
60 + : 0;
61 const normalLeft = Math.max(
62 padding,
63 Math.min(canvasCenterLeft - besideShift, laneRight - normalWidth),
apps/web/src/components/pullRequest/PullRequestGhosts.tsx
+1 -3
@@ -54,9 +54,7 @@ export function PullRequestListGhost({ rows = 7, caption }: { rows?: number; cap
54 <div role="status" aria-label={caption ?? "Loading pull requests"} className="space-y-0.5">
55 {/* Outside the pulse so the explanation stays readable. */}
56 {caption ? (
57 - <p className="px-3 pb-1 text-xs font-medium text-muted-foreground/70 redesign:text-muted-foreground">
58 - {caption}
59 - </p>
57 + <p className="px-3 pb-1 text-xs font-medium text-muted-foreground">{caption}</p>
58 ) : null}
59 <div className="motion-safe:animate-skeleton space-y-0.5">
60 {Array.from({ length: rows }, (_, index) => (
apps/web/src/components/settings/AppearanceSettingsPanel.tsx
-21
@@ -105,27 +105,6 @@ export function AppearanceSettingsPanel() {
105 </SettingsSection>
106
107 <SettingsSection id="appearance-interface" title="Interface">
108 - <SettingsRow
109 - {...searchableSetting("new-design")}
110 - description="A true black dark mode, dimmer read threads, and simpler composer controls. Turn it off for the classic look."
111 - resetAction={
112 - settings.redesignEnabled !== DEFAULT_UNIFIED_SETTINGS.redesignEnabled ? (
113 - <SettingResetButton
114 - label="new design"
115 - onClick={() =>
116 - updateSettings({ redesignEnabled: DEFAULT_UNIFIED_SETTINGS.redesignEnabled })
117 - }
118 - />
119 - ) : null
120 - }
121 - control={
122 - <Switch
123 - checked={settings.redesignEnabled}
124 - onCheckedChange={(checked) => updateSettings({ redesignEnabled: Boolean(checked) })}
125 - aria-label="New design"
126 - />
127 - }
128 - />
108 <SettingsRow
109 {...searchableSetting("setting-appearance-contrast")}
110 description="Adjust the contrast of colors and borders across the interface."
apps/web/src/components/settings/ProviderInstanceCard.tsx
+3 -6
@@ -37,7 +37,6 @@ import {
37 } from "@t3tools/shared/model";
38 import { cn } from "../../lib/utils";
39 import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
40 -import { useClientSettings } from "../../hooks/useSettings";
40 import { useStableCallback } from "../../hooks/useStableCallback";
41 import { normalizeProviderAccentColor } from "../../providerInstances";
42 import { Badge } from "../ui/badge";
@@ -675,7 +674,6 @@ export function ProviderInstanceCard({
674 const displayName =
675 instance.displayName?.trim() || driverOption?.label || String(instance.driver);
676 const accentColor = normalizeProviderAccentColor(instance.accentColor);
678 - const redesign = useClientSettings((settings) => settings.redesignEnabled);
677 const { copyToClipboard } = useCopyToClipboard<{ providerName: string }>({
678 onCopy: ({ providerName }) => {
679 toastManager.add({
@@ -968,7 +966,7 @@ export function ProviderInstanceCard({
966 data-slot="settings-row"
967 className={cn(
968 "group flex min-h-18 items-center gap-3 px-3 py-3 transition-colors sm:px-4",
971 - selected ? "bg-muted/45 redesign:bg-foreground/[0.06]" : "hover:bg-muted/25",
969 + selected ? "bg-foreground/[0.06]" : "hover:bg-muted/25",
970 )}
971 >
972 <div
@@ -1076,7 +1074,7 @@ export function ProviderInstanceCard({
1074 </div>
1075 );
1076
1079 - // The New design gives provider status its own row instead of hanging it under the name field.
1077 + // Provider status gets its own row instead of hanging under the name field.
1078 const statusContent = (
1079 <>
1080 <ProviderStatusDiagnostic detail={statusDiagnostic}>
@@ -1136,10 +1134,9 @@ export function ProviderInstanceCard({
1134 return (
1135 <>
1136 <SettingsSection title={displayName} icon={titleIconNode} headerAction={editorHeaderAction}>
1139 - {redesign ? <SettingsRow title="Status" status={statusContent} /> : null}
1137 + <SettingsRow title="Status" status={statusContent} />
1138 <SettingsRow
1139 title="Display name"
1142 - {...(redesign ? {} : { status: statusContent })}
1140 control={
1141 <div
1142 inert={readOnly}
apps/web/src/components/settings/ProviderModelsSection.tsx
+1 -1
@@ -334,7 +334,7 @@ export function ProviderModelsSection({
334 size="xs"
335 variant="ghost-muted"
336 // The ghost padding would inset the label from the column edge the toggles align to.
337 - className="ml-auto redesign:-me-2"
337 + className="-me-2 ml-auto"
338 onClick={() => setIsAdding(true)}
339 >
340 <PlusIcon className="size-3" />
apps/web/src/components/settings/ProviderSettingsPanel.tsx
+3 -3
@@ -1001,8 +1001,8 @@ export function EnvironmentProviderSettings({
1001 ) : null
1002 }
1003 headerAction={
1004 - // The ghost button's padding would inset its label; the New design aligns the text to the card edge.
1005 - <div className="flex min-w-0 items-center gap-2 redesign:-me-2">
1004 + // The ghost button's padding would inset its label, so pull the text to the card edge.
1005 + <div className="-me-2 flex min-w-0 items-center gap-2">
1006 <ProviderUpdatesAction />
1007 <Tooltip>
1008 <TooltipTrigger
@@ -1075,7 +1075,7 @@ export function EnvironmentProviderSettings({
1075 {selectedRow ? (
1076 <ScrollArea scrollFade chainVerticalScroll className="@min-[48rem]/providers:h-full">
1077 {/* Flat sections run dividers edge to edge and inset text like the list beside them. */}
1078 - <div className="space-y-6 p-4 redesign:px-0">
1078 + <div className="space-y-6 py-4">
1079 {renderProviderInstance(selectedRow, "editor")}
1080 </div>
1081 </ScrollArea>
apps/web/src/components/settings/SettingsFontPreviews.tsx
+1 -1
@@ -43,7 +43,7 @@ export function PromptFontPreview() {
43 skills={PREVIEW_SKILLS}
44 disabled={false}
45 placeholder={DEFAULT_COMPOSER_PLACEHOLDER}
46 - className="max-h-42 min-h-14"
46 + className="max-h-42"
47 onChange={onChange}
48 onPaste={noop}
49 />
apps/web/src/components/settings/SettingsPanels.tsx
-4
@@ -408,9 +408,6 @@ export function useSettingsRestore(onRestored?: () => void) {
408 ...(settings.mathRenderingEnabled !== DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled
409 ? ["Render math"]
410 : []),
411 - ...(settings.redesignEnabled !== DEFAULT_UNIFIED_SETTINGS.redesignEnabled
412 - ? ["New design"]
413 - : []),
411 ...(settings.panelAnimationDurationMs !== DEFAULT_UNIFIED_SETTINGS.panelAnimationDurationMs
412 ? ["Panel animations"]
413 : []),
@@ -584,7 +581,6 @@ export function useSettingsRestore(onRestored?: () => void) {
581 diffColorScheme: DEFAULT_UNIFIED_SETTINGS.diffColorScheme,
582 chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth,
583 mathRenderingEnabled: DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled,
587 - redesignEnabled: DEFAULT_UNIFIED_SETTINGS.redesignEnabled,
584 timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat,
585 notificationMode: DEFAULT_UNIFIED_SETTINGS.notificationMode,
586 inAppNotificationsEnabled: DEFAULT_UNIFIED_SETTINGS.inAppNotificationsEnabled,
apps/web/src/components/settings/ThemePreviewCircles.tsx
+1 -1
@@ -172,7 +172,7 @@ export function ThemePreviewCircles({
172 aria-label={`Use ${label} ${mode} mode`}
173 aria-pressed={isPicked}
174 className={cn(
175 - "relative flex size-[68px] shrink-0 transform-gpu cursor-pointer items-center justify-center rounded-full p-1 outline-none redesign:p-1.5 transition-transform hover:scale-105 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-card redesign:focus-visible:ring-0 redesign:focus-visible:ring-offset-0 redesign:focus-visible:outline-2 redesign:focus-visible:outline-solid redesign:focus-visible:-outline-offset-5 redesign:focus-visible:outline-foreground/60",
175 + "relative flex size-[68px] shrink-0 transform-gpu cursor-pointer items-center justify-center rounded-full p-1.5 outline-none transition-transform hover:scale-105 focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-5 focus-visible:outline-foreground/60",
176 isPicked && "hover:scale-100",
177 )}
178 onClick={(event) => {
apps/web/src/components/settings/ThemeSettings.tsx
+6 -6
@@ -191,7 +191,7 @@ function ThemeLibraryCard({
191 : `Use ${mode} variant, currently ${selected.option.label}`
192 }
193 aria-pressed={isActive}
194 - className="absolute left-1/2 top-2 z-20 flex size-14 items-center justify-center rounded-full outline-none focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-2 focus-visible:outline-ring redesign:focus-visible:-outline-offset-5 redesign:focus-visible:outline-foreground/60"
194 + className="absolute left-1/2 top-2 z-20 flex size-14 items-center justify-center rounded-full outline-none focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-5 focus-visible:outline-foreground/60"
195 style={{
196 transform: `translateX(calc(-50% + ${rootOffsetX}px))`,
197 }}
@@ -678,9 +678,9 @@ export function ThemeLibrary({
678 aria-pressed={isActive}
679 className={cn(
680 // The accent ring marks the picked tile; focus is a neutral ring set inside it with a gap.
681 - "flex cursor-pointer flex-col items-stretch gap-1.5 rounded-xl border p-2 outline-none transition-colors focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-2 focus-visible:outline-ring redesign:focus-visible:-outline-offset-7 redesign:focus-visible:outline-foreground/60",
681 + "flex cursor-pointer flex-col items-stretch gap-1.5 rounded-xl border p-2 outline-none transition-colors focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-7 focus-visible:outline-foreground/60",
682 isActive
683 - ? "border-transparent bg-accent/30 ring-1 ring-inset ring-ring redesign:ring-2"
683 + ? "border-transparent bg-accent/30 ring-2 ring-inset ring-ring"
684 : "border-border/70 bg-card/60 hover:bg-accent/10",
685 )}
686 key={mode}
@@ -827,12 +827,12 @@ export function ThemeLibrary({
827
828 return (
829 <div className="space-y-3">
830 - <h3 className="flex min-h-7 items-center px-3 text-sm font-normal text-foreground/70 sm:px-4 redesign:text-base redesign:font-semibold redesign:text-foreground">
830 + <h3 className="flex min-h-7 items-center px-3 text-base font-semibold text-foreground sm:px-4">
831 {searchableSetting("color-scheme").title}
832 </h3>
833 {renderModeTiles()}
834 - <div className="flex min-h-8 flex-wrap items-center justify-between gap-3 px-3 pt-2 sm:px-4 redesign:pt-5">
835 - <h3 className="text-sm font-normal text-foreground/70 redesign:text-base redesign:font-semibold redesign:text-foreground">
834 + <div className="flex min-h-8 flex-wrap items-center justify-between gap-3 px-3 pt-5 sm:px-4">
835 + <h3 className="text-base font-semibold text-foreground">
836 {searchableSetting("theme").title}
837 </h3>
838 <div className="flex flex-wrap items-center justify-end gap-2">
apps/web/src/components/settings/settingsSearch.ts
-6
@@ -403,12 +403,6 @@ export const SETTINGS_SEARCH_ITEMS = [
403 to: "/settings/threads",
404 searchTerms: ["usage quota rate limit reset recover continue"],
405 },
406 - {
407 - id: "new-design",
408 - title: "New design",
409 - to: "/settings/appearance",
410 - searchTerms: ["redesign look style sidebar composer black quieter classic"],
411 - },
406 {
407 id: "working-shelf",
408 title: "Working section",
apps/web/src/components/sidebar/SidebarListMarkers.tsx
+2 -11
@@ -3,7 +3,6 @@ import { useSortable } from "@dnd-kit/sortable";
3 import { CSS } from "@dnd-kit/utilities";
4 import { type ReactNode } from "react";
5 import { cn } from "~/lib/utils";
6 -import { useClientSettings } from "../../hooks/useSettings";
6 import {
7 animateSidebarLayoutChanges,
8 sidebarMarkerId,
@@ -104,7 +103,7 @@ export function SidebarDragBoundary(props: {
103 export function SidebarSectionHeader(props: {
104 marker: "working-header" | "snoozed-header" | "settled-header";
105 label: string;
107 - /** A muted trailing count; classic shows it only while the shelf is collapsed. */
106 + /** A muted trailing count. */
107 count: number;
108 className?: string;
109 dragging?: boolean;
@@ -119,9 +118,6 @@ export function SidebarSectionHeader(props: {
118 : props.marker === "snoozed-header"
119 ? "snoozed"
120 : "settled";
122 - const redesign = useClientSettings((s) => s.redesignEnabled);
123 - const collapsedCount = props.toggle.expanded ? null : props.count;
124 - const count = redesign ? props.count : collapsedCount;
121 return (
122 <SortableSidebarMarker
123 marker={props.marker}
@@ -136,14 +132,9 @@ export function SidebarSectionHeader(props: {
132 expanded={props.toggle.expanded}
133 tone={props.isDropTarget ? "accent" : props.dragging ? "emphasized" : "muted"}
134 data-testid={`sidebar-${shelf}-shelf-toggle`}
139 - accessory={
140 - redesign && count !== null ? (
141 - <span className="font-normal tabular-nums">{count}</span>
142 - ) : null
143 - }
135 + accessory={<span className="font-normal tabular-nums">{props.count}</span>}
136 >
137 {props.label}
146 - {!redesign && collapsedCount !== null ? ` (${collapsedCount})` : null}
138 </CollapsibleSectionHeader>
139 </SortableSidebarMarker>
140 );
apps/web/src/components/sidebar/SidebarThreadHeader.tsx
+1 -1
@@ -62,7 +62,7 @@ export function SidebarThreadHeader({
62 <div className="flex items-center gap-1">
63 <div
64 ref={searchFieldRef}
65 - className="flex h-8 min-w-0 flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground redesign:focus-within:bg-sidebar-row-hover redesign:focus-within:text-sidebar-foreground redesign:focus-within:ring-1 redesign:focus-within:ring-inset redesign:focus-within:ring-ring/70"
65 + className="flex h-8 min-w-0 flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-within:bg-sidebar-row-hover focus-within:text-sidebar-foreground focus-within:ring-1 focus-within:ring-inset focus-within:ring-ring/70"
66 >
67 <SearchIcon className="size-4 shrink-0 text-(--sidebar-icon-color)" />
68 <SidebarInput
apps/web/src/components/sidebar/SidebarThreadRow.tsx
+60 -72
@@ -912,9 +912,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
912 "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left outline-none select-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
913 variantAction === "unsettle" &&
914 !props.isActive &&
915 - "[&:not(:hover):not(:focus-within)_*]:text-secondary-label/70 redesign:[&:not(:hover):not(:focus-within)_*]:text-secondary-label",
915 + "[&:not(:hover):not(:focus-within)_*]:text-secondary-label",
916 props.isActive
917 - ? "bg-sidebar-row-active text-sidebar-foreground light:shadow-xs light:ring-1 light:ring-inset light:ring-sidebar-border/70 redesign:light:shadow-none"
917 + ? "bg-sidebar-row-active text-sidebar-foreground light:ring-1 light:ring-inset light:ring-sidebar-border/70"
918 : isSelected || props.sweepAction !== null
919 ? "bg-sidebar-row-selected text-sidebar-foreground light:ring-1 light:ring-inset light:ring-sidebar-border/70"
920 : hasUnsentDraft
@@ -986,17 +986,15 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
986 ? cn(
987 "truncate",
988 shouldRecede
989 - ? "text-secondary-label redesign:text-foreground/75 redesign:group-hover/sidebar-row:text-foreground redesign:group-focus-visible/sidebar-row:text-foreground"
990 - : isUnread || isWoke || status === "input" || status === "request"
991 - ? "text-foreground"
992 - : status === "failed"
993 - ? "text-foreground/95"
994 - : "text-foreground/90 redesign:text-foreground",
989 + ? "text-foreground/75 group-hover/sidebar-row:text-foreground group-focus-visible/sidebar-row:text-foreground"
990 + : status === "failed" && !isUnread && !isWoke
991 + ? "text-foreground/95"
992 + : "text-foreground",
993 )
994 : cn(
995 "truncate group-focus-within/sidebar-row:text-foreground group-hover/sidebar-row:text-foreground",
996 shouldRecede
999 - ? "text-secondary-label/70 redesign:text-secondary-label"
997 + ? "text-secondary-label"
998 : props.isActive || isWoke || status === "input" || status === "request"
999 ? "text-foreground"
1000 : isUnread
@@ -1140,8 +1138,6 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1138 Regenerating title
1139 </span>
1140 ) : null}
1143 - {/* Shelf rows are one line; the New design gives the title the room a PR number takes. */}
1144 - {prBadge ? <span className="contents redesign:hidden">{prBadge}</span> : null}
1141 {sortable?.isDragging ? (
1142 dragDestination
1143 ) : (
@@ -1160,7 +1156,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1156 {variantAction === "unsnooze" && props.snoozeWakeLabelText !== null ? (
1157 <span className="inline-flex items-center gap-1 text-xs text-info-foreground tabular-nums">
1158 {/* The clock tells a wake time from an age at a glance. */}
1163 - <AlarmClockIcon aria-hidden className="hidden size-3 redesign:block" />
1159 + <AlarmClockIcon aria-hidden className="size-3" />
1160 {props.snoozeWakeLabelText}
1161 </span>
1162 ) : isWoke ? (
@@ -1253,7 +1249,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1249 }
1250
1251 const diff = latestRunDiff(thread);
1256 - // Only the provider icon would remain; the New design drops the line instead of leaving it blank.
1252 + // Only the provider icon would remain, so the row drops the line instead of leaving it blank.
1253 const metaLineEmpty =
1254 !thread.branch &&
1255 !showsScratchMachine &&
@@ -1269,7 +1265,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1265 {...(fileDropHandlers ?? {})}
1266 className={cn(
1267 "list-none py-0.5 [content-visibility:auto] [contain-intrinsic-size:auto_78px]",
1272 - metaLineEmpty && "redesign:[contain-intrinsic-size:auto_58px]",
1268 + metaLineEmpty && "[contain-intrinsic-size:auto_58px]",
1269 sortable?.isDragging && "relative z-20",
1270 )}
1271 >
@@ -1296,7 +1292,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1292 <div
1293 className={cn(
1294 "relative z-10 h-[4.875rem] px-(--sidebar-row-content-inset) py-(--sidebar-content-inset)",
1299 - metaLineEmpty && "redesign:h-auto",
1295 + metaLineEmpty && "h-auto",
1296 )}
1297 >
1298 <div className="flex h-5 min-w-0 items-center gap-1.5">
@@ -1309,10 +1305,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1305 {pinIndicator}
1306 {props.projectDisplayName ? (
1307 <span
1312 - className={cn(
1313 - "min-w-0 flex-1 truncate text-secondary-label text-xs",
1314 - shouldRecede ? "font-normal" : "font-medium redesign:font-normal",
1315 - )}
1308 + className={cn("min-w-0 flex-1 truncate font-normal text-secondary-label text-xs")}
1309 >
1310 {props.projectDisplayName}
1311 </span>
@@ -1466,7 +1459,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1459 </span>
1460 ) : null}
1461 {metaLineEmpty ? (
1469 - <span aria-hidden className="hidden shrink-0 redesign:inline-flex">
1462 + <span aria-hidden className="inline-flex shrink-0">
1463 <SidebarProviderStack
1464 thread={thread}
1465 providerEntryByInstanceId={props.providerEntryByInstanceId}
@@ -1474,64 +1467,59 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1467 </span>
1468 ) : null}
1469 </div>
1477 - <div
1478 - className={cn(
1479 - "mt-0.5 flex min-w-0 items-center gap-1.5 text-secondary-label text-xs",
1480 - metaLineEmpty && "redesign:hidden",
1481 - )}
1482 - >
1483 - {thread.branch ? (
1484 - <>
1485 - <ThreadWorktreeIndicator thread={thread} />
1486 - <span className="flex min-w-0 flex-1 text-muted-foreground/40 redesign:text-inherit">
1487 - <MiddleTruncate value={thread.branch} showTitle={false} />
1488 - </span>
1489 - </>
1490 - ) : showsScratchMachine ? (
1491 - <>
1492 - <EnvironmentMachineIcon
1493 - aria-hidden
1494 - kind={props.environmentMachine}
1495 - className="size-3 shrink-0 text-muted-foreground/40 redesign:text-inherit"
1496 - />
1497 - <span className="min-w-0 flex-1 truncate text-muted-foreground/40 redesign:text-inherit">
1498 - {props.scratchMachineLabel}
1499 - </span>
1500 - </>
1501 - ) : (
1502 - <span className="flex-1" />
1503 - )}
1504 - {terminalStatusIcon}
1505 - {prBadge}
1506 - {diff ? (
1507 - <span className="shrink-0 font-mono">
1508 - <span className="text-diff-addition-foreground">
1509 - +{formatDiffCount(diff.insertions)}
1510 - </span>{" "}
1511 - <span className="text-diff-deletion-foreground">
1512 - −{formatDiffCount(diff.deletions)}
1513 - </span>
1514 - </span>
1515 - ) : null}
1516 - <span
1517 - aria-hidden
1518 - className="pointer-events-none ml-auto inline-flex shrink-0 items-center gap-1"
1519 - >
1520 - {isRemote && !showsScratchMachine ? (
1521 - <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1470 + {metaLineEmpty ? null : (
1471 + <div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-secondary-label text-xs">
1472 + {thread.branch ? (
1473 + <>
1474 + <ThreadWorktreeIndicator thread={thread} />
1475 + <span className="flex min-w-0 flex-1">
1476 + <MiddleTruncate value={thread.branch} showTitle={false} />
1477 + </span>
1478 + </>
1479 + ) : showsScratchMachine ? (
1480 + <>
1481 <EnvironmentMachineIcon
1482 aria-hidden
1483 kind={props.environmentMachine}
1525 - className="size-3.5"
1484 + className="size-3 shrink-0"
1485 />
1486 + <span className="min-w-0 flex-1 truncate">{props.scratchMachineLabel}</span>
1487 + </>
1488 + ) : (
1489 + <span className="flex-1" />
1490 + )}
1491 + {terminalStatusIcon}
1492 + {prBadge}
1493 + {diff ? (
1494 + <span className="shrink-0 font-mono">
1495 + <span className="text-diff-addition-foreground">
1496 + +{formatDiffCount(diff.insertions)}
1497 + </span>{" "}
1498 + <span className="text-diff-deletion-foreground">
1499 + −{formatDiffCount(diff.deletions)}
1500 + </span>
1501 </span>
1502 ) : null}
1529 - <SidebarProviderStack
1530 - thread={thread}
1531 - providerEntryByInstanceId={props.providerEntryByInstanceId}
1532 - />
1533 - </span>
1534 - </div>
1503 + <span
1504 + aria-hidden
1505 + className="pointer-events-none ml-auto inline-flex shrink-0 items-center gap-1"
1506 + >
1507 + {isRemote && !showsScratchMachine ? (
1508 + <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1509 + <EnvironmentMachineIcon
1510 + aria-hidden
1511 + kind={props.environmentMachine}
1512 + className="size-3.5"
1513 + />
1514 + </span>
1515 + ) : null}
1516 + <SidebarProviderStack
1517 + thread={thread}
1518 + providerEntryByInstanceId={props.providerEntryByInstanceId}
1519 + />
1520 + </span>
1521 + </div>
1522 + )}
1523 </div>
1524 {props.jumpLabel ? <JumpHintBadge label={props.jumpLabel} /> : null}
1525 </TooltipTrigger>
apps/web/src/components/ui/button.tsx
+1 -1
@@ -106,7 +106,7 @@ const inlineButtonVariants = cva(
106 muted: "text-muted-foreground hover:text-foreground",
107 destructive: "text-destructive/80 hover:text-destructive",
108 picker:
109 - "gap-1 text-foreground underline decoration-foreground/30 decoration-dotted decoration-from-font underline-offset-4 hover:decoration-foreground hover:decoration-solid data-popup-open:decoration-foreground data-popup-open:decoration-solid redesign:no-underline redesign:hover:underline redesign:data-popup-open:underline",
109 + "gap-1 text-foreground decoration-from-font underline-offset-4 data-popup-open:underline",
110 },
111 },
112 },
apps/web/src/components/ui/collapsible-section-header.tsx
+3 -11
@@ -35,21 +35,13 @@ export function CollapsibleSectionHeader({
35 <span className="shrink-0">{children}</span>
36 <span
37 aria-hidden
38 - // A header with a trailing count drops its rule so it doesn't read as a leader. The New
39 - // design drops it in both states so a shelf header looks the same open or closed.
40 - className={cn(
41 - "h-px min-w-2 flex-1",
42 - tones[tone].line,
43 - accessory && (expanded ? "redesign:invisible" : "invisible"),
44 - )}
38 + // A header with a trailing count drops its rule so it doesn't read as a leader.
39 + className={cn("h-px min-w-2 flex-1", tones[tone].line, accessory && "invisible")}
40 />
41 {accessory}
42 <ChevronDownIcon
43 aria-hidden
49 - className={cn(
50 - "size-3 shrink-0 transition-transform",
51 - !expanded && "rotate-180 redesign:-rotate-90",
52 - )}
44 + className={cn("size-3 shrink-0 transition-transform", !expanded && "-rotate-90")}
45 />
46 </button>
47 );
apps/web/src/components/ui/combobox.tsx
+1 -1
@@ -192,7 +192,7 @@ function ComboboxItem({
192 return (
193 <ComboboxPrimitive.Item
194 className={cn(
195 - "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none not-data-disabled:hover:bg-accent data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:bg-foreground/[0.08] data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground redesign:data-selected:bg-foreground/[0.06] redesign:data-highlighted:bg-foreground/[0.09] redesign:[&[data-highlighted][data-selected]]:bg-foreground/[0.09] redesign:not-data-disabled:hover:bg-foreground/[0.09] data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
195 + "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none not-data-disabled:hover:bg-foreground/[0.09] data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:bg-foreground/[0.06] data-selected:text-foreground data-highlighted:bg-foreground/[0.09] data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-foreground/[0.09] [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
196 className,
197 )}
198 data-slot="combobox-item"
apps/web/src/components/ui/command.tsx
+1 -1
@@ -218,7 +218,7 @@ function CommandFooter({ className, ...props }: React.ComponentProps<"div">) {
218 return (
219 <div
220 className={cn(
221 - "relative flex items-center justify-between gap-2 rounded-b-[calc(var(--radius-2xl)-1px)] bg-foreground/[0.025] redesign:border-t redesign:border-foreground/[0.07] px-[var(--command-content-inset)] py-2.5 font-medium text-sm text-muted-foreground [&_[data-slot=kbd-group]]:font-sans [&_[data-slot=kbd]]:bg-foreground/[0.08] [&_[data-slot=kbd]]:text-foreground [&_[data-slot=kbd]]:ring-0",
221 + "relative flex items-center justify-between gap-2 rounded-b-[calc(var(--radius-2xl)-1px)] border-t border-foreground/[0.07] bg-foreground/[0.025] px-[var(--command-content-inset)] py-2.5 font-medium text-sm text-muted-foreground [&_[data-slot=kbd-group]]:font-sans [&_[data-slot=kbd]]:bg-foreground/[0.08] [&_[data-slot=kbd]]:text-foreground [&_[data-slot=kbd]]:ring-0",
222 className,
223 )}
224 data-slot="command-footer"
apps/web/src/components/ui/kbd.tsx
+1 -1
@@ -6,7 +6,7 @@ function Kbd({ className, ...props }: React.ComponentProps<"kbd">) {
6 return (
7 <kbd
8 className={cn(
9 - "pointer-events-none inline-flex h-5 min-w-5 select-none items-center justify-center gap-1 rounded bg-muted px-1 redesign:bg-foreground/[0.07] font-medium font-sans text-muted-foreground text-xs [&_svg:not([class*='size-'])]:size-3",
9 + "pointer-events-none inline-flex h-5 min-w-5 select-none items-center justify-center gap-1 rounded bg-foreground/[0.07] px-1 font-medium font-sans text-muted-foreground text-xs [&_svg:not([class*='size-'])]:size-3",
10 className,
11 )}
12 data-slot="kbd"
apps/web/src/components/usage/UsageLimitsPooled.tsx
+6 -9
@@ -402,15 +402,12 @@ function SegmentTriggers({
402 className="min-w-0 truncate font-medium text-foreground"
403 />
404 ) : null}
405 - <span
406 - className={cn(
407 - "shrink-0 font-semibold text-foreground tabular-nums",
408 - // A single-account bar repeats the headline percentage.
409 - !showAccountName && "redesign:hidden",
410 - )}
411 - >
412 - {remaining}%
413 - </span>
405 + {/* A single-account bar repeats the headline percentage. */}
406 + {showAccountName ? (
407 + <span className="shrink-0 font-semibold text-foreground tabular-nums">
408 + {remaining}%
409 + </span>
410 + ) : null}
411 {resetsIn || credits ? (
412 <span className="ms-auto flex min-w-0 items-center gap-1.5 overflow-hidden rounded-sm bg-background/85 px-1.5 py-0.5 text-2xs whitespace-nowrap text-foreground tabular-nums">
413 {resetsIn?.replace("resets in ", "↻ ") ?? ""}
apps/web/src/components/usage/UsagePage.tsx
+46 -48
@@ -391,25 +391,25 @@ export function UsagePage() {
391 </span>
392 ) : null}
393 <div className="ms-auto hidden shrink-0 items-center justify-end gap-2 @4xl/usage-header:flex">
394 - <ToggleGroup
395 - aria-label="Usage period"
396 - variant="segmented"
397 - value={[String(windowDays)]}
398 - disabled={showingLimits}
399 - // Limits are always current; the New design hides the period instead of greying it.
400 - // It sits before the metric tabs so hiding it never moves them.
401 - className={showingLimits ? "redesign:hidden" : undefined}
402 - onValueChange={(next) => {
403 - const value = next[0];
404 - if (value) selectWindow(Number(value));
405 - }}
406 - >
407 - {WINDOW_OPTIONS.map((option) => (
408 - <Toggle key={option.days} value={String(option.days)} title={shortcutTitle(option)}>
409 - {option.label}
410 - </Toggle>
411 - ))}
412 - </ToggleGroup>
394 + {/* Limits are always current, so they have no period. The period sits before the metric
395 + tabs so dropping it never moves them. */}
396 + {showingLimits ? null : (
397 + <ToggleGroup
398 + aria-label="Usage period"
399 + variant="segmented"
400 + value={[String(windowDays)]}
401 + onValueChange={(next) => {
402 + const value = next[0];
403 + if (value) selectWindow(Number(value));
404 + }}
405 + >
406 + {WINDOW_OPTIONS.map((option) => (
407 + <Toggle key={option.days} value={String(option.days)} title={shortcutTitle(option)}>
408 + {option.label}
409 + </Toggle>
410 + ))}
411 + </ToggleGroup>
412 + )}
413 <ToggleGroup
414 aria-label="Usage metric"
415 variant="segmented"
@@ -437,33 +437,31 @@ export function UsagePage() {
437 </Button>
438 </div>
439 <div className="ms-auto flex shrink-0 items-center justify-end gap-1 @4xl/usage-header:hidden">
440 - <Select
441 - value={String(windowDays)}
442 - disabled={showingLimits}
443 - onValueChange={(value) => selectWindow(Number(value))}
444 - >
445 - <SelectTrigger
446 - aria-label="Usage period"
447 - size="compact"
448 - variant="ghost"
449 - className={cn("w-auto min-w-0", showingLimits && "redesign:hidden")}
450 - >
451 - <SelectValue>
452 - {WINDOW_OPTIONS.find((option) => option.days === windowDays)?.label}
453 - </SelectValue>
454 - </SelectTrigger>
455 - <SelectPopup align="end" alignItemWithTrigger={false}>
456 - {WINDOW_OPTIONS.map((option) => (
457 - <SelectItem
458 - key={option.days}
459 - value={String(option.days)}
460 - title={shortcutTitle(option)}
461 - >
462 - {option.label}
463 - </SelectItem>
464 - ))}
465 - </SelectPopup>
466 - </Select>
440 + {showingLimits ? null : (
441 + <Select value={String(windowDays)} onValueChange={(value) => selectWindow(Number(value))}>
442 + <SelectTrigger
443 + aria-label="Usage period"
444 + size="compact"
445 + variant="ghost"
446 + className="w-auto min-w-0"
447 + >
448 + <SelectValue>
449 + {WINDOW_OPTIONS.find((option) => option.days === windowDays)?.label}
450 + </SelectValue>
451 + </SelectTrigger>
452 + <SelectPopup align="end" alignItemWithTrigger={false}>
453 + {WINDOW_OPTIONS.map((option) => (
454 + <SelectItem
455 + key={option.days}
456 + value={String(option.days)}
457 + title={shortcutTitle(option)}
458 + >
459 + {option.label}
460 + </SelectItem>
461 + ))}
462 + </SelectPopup>
463 + </Select>
464 + )}
465 <Select
466 value={metric}
467 onValueChange={(value) => {
@@ -1338,7 +1336,7 @@ function UsageEnvironmentFilter({
1336 />
1337 ) : (
1338 <ChevronDownIcon
1341 - className="size-3.5 opacity-0 transition-opacity group-hover/usage-environment:opacity-100 group-focus-visible/usage-environment:opacity-100 group-data-popup-open/usage-environment:opacity-100 redesign:opacity-60 redesign:group-hover/usage-environment:opacity-100 redesign:group-focus-visible/usage-environment:opacity-100 redesign:group-data-popup-open/usage-environment:opacity-100"
1339 + className="size-3.5 opacity-60 transition-opacity group-hover/usage-environment:opacity-100 group-focus-visible/usage-environment:opacity-100 group-data-popup-open/usage-environment:opacity-100"
1340 aria-hidden
1341 />
1342 )}
@@ -1451,7 +1449,7 @@ function UsageProviderFilter({
1449 <MenuTrigger render={<InlineButton />} className="group/usage-provider min-w-0 max-w-full">
1450 <span className="min-w-0 truncate">{label}</span>
1451 <ChevronDownIcon
1454 - className="size-3.5 shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover/usage-provider:opacity-100 group-focus-visible/usage-provider:opacity-100 group-data-popup-open/usage-provider:opacity-100 redesign:opacity-60 redesign:group-hover/usage-provider:opacity-100 redesign:group-focus-visible/usage-provider:opacity-100 redesign:group-data-popup-open/usage-provider:opacity-100"
1452 + className="size-3.5 shrink-0 text-muted-foreground opacity-60 transition-opacity group-hover/usage-provider:opacity-100 group-focus-visible/usage-provider:opacity-100 group-data-popup-open/usage-provider:opacity-100"
1453 aria-hidden
1454 />
1455 </MenuTrigger>
apps/web/src/index.css
+32 -55
@@ -4,9 +4,6 @@
4 @custom-variant light (&:not(.dark, .dark *));
5 /* Window Controls Overlay: active when Electron exposes native titlebar control geometry. */
6 @custom-variant wco (&:is(.wco, .wco *));
7 -/* Beta "New design" (Settings -> Beta) sets data-redesign on <html>. The variant adds no
8 - specificity, so it loses to dark:, hover: and other variants on the same property. */
9 -@custom-variant redesign (&:where([data-redesign] *));
7
8 /* Secondary hovering pointers reveal sidebar actions on touch-primary devices. */
9 @custom-variant any-hover {
@@ -1195,14 +1192,15 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
1192
1193 @variant dark {
1194 color-scheme: dark;
1198 - /* Keep controls and floating surfaces close to the neutral-black canvas.
1199 - Borders and hover states provide separation without milky gray fills. */
1200 - --background: var(--color-neutral-950);
1201 - --surface-raised: color-mix(in srgb, var(--background) 97%, var(--color-white));
1195 + /* The canvas is true black, matching the sidebar. Raised surfaces keep the tone they had
1196 + over neutral-950, so cards, popovers, and the composer still lift. Borders and hover
1197 + states provide separation without milky gray fills. */
1198 + --background: #000;
1199 + --surface-raised: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1200 --foreground: var(--color-neutral-100);
1203 - --card: color-mix(in srgb, var(--background) 97%, var(--color-white));
1201 + --card: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1202 --card-foreground: var(--color-neutral-100);
1205 - --popover: color-mix(in srgb, var(--background) 97%, var(--color-white));
1203 + --popover: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1204 --popover-foreground: var(--color-neutral-100);
1205 --primary: oklch(0.571 0.21 264);
1206 --secondary: --alpha(var(--color-white) / 3%);
@@ -1211,7 +1209,8 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
1209 --muted-foreground: var(--color-neutral-400);
1210 --accent: --alpha(var(--color-white) / 4%);
1211 --accent-foreground: var(--color-neutral-100);
1214 - --message-surface: var(--accent);
1212 + /* A user turn sits above the composer tone, level with the selected sidebar row. */
1213 + --message-surface: color-mix(in srgb, var(--color-neutral-950) 92%, var(--color-white));
1214 --error: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
1215 --error-foreground: var(--color-red-400);
1216 --tool-error-icon: #fca5a5;
@@ -1280,57 +1279,49 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
1279 --sidebar-row-selected: color-mix(in srgb, var(--contrast-foreground) 7%, transparent);
1280 --sidebar-border: var(--border);
1281 --sidebar-stage-fade: var(--card);
1282 + /* Row metadata sits a step below read titles (75% white). */
1283 + --secondary-label: #8f8f8f;
1284 }
1285 }
1286
1286 -/* New design: modified files get a muted blue so added and deleted files lead. Built from the
1287 - info token, which themes do not override, so it stays blue in every theme. */
1288 -html[data-redesign] {
1287 +/* Modified files get a muted blue so added and deleted files lead. Built from the info token,
1288 + which themes do not override, so it stays blue in every theme. */
1289 +:root {
1290 --diff-modified-icon: color-mix(in srgb, var(--info-foreground) 50%, var(--muted-foreground));
1290 -}
1291
1292 -html.dark[data-redesign] {
1293 - /* On black a gray mix stays as bright as the blue, so dim with transparency instead. */
1294 - --diff-modified-icon: color-mix(in srgb, var(--info-foreground) 65%, transparent);
1295 - --diff-added-icon: var(--success-foreground);
1292 + @variant dark {
1293 + /* On black a gray mix stays as bright as the blue, so dim with transparency instead. */
1294 + --diff-modified-icon: color-mix(in srgb, var(--info-foreground) 65%, transparent);
1295 + --diff-added-icon: var(--success-foreground);
1296 + }
1297 }
1298
1298 -/* Blue-orange already spends blue on additions. */
1299 -html[data-redesign][data-diff-color-scheme="blue-orange"] {
1299 +/* Blue-orange already spends blue on additions. Same specificity as the dark block above and
1300 + later, so it wins there too. */
1301 +:root[data-diff-color-scheme="blue-orange"] {
1302 --diff-modified-icon: var(--muted-foreground);
1303 --diff-added-icon: initial;
1302 -}
1304
1304 -html.dark[data-redesign][data-diff-color-scheme="blue-orange"] {
1305 - --diff-modified-icon: color-mix(in srgb, var(--muted-foreground) 65%, transparent);
1305 + @variant dark {
1306 + --diff-modified-icon: color-mix(in srgb, var(--muted-foreground) 65%, transparent);
1307 + }
1308 }
1309
1308 -/* New design: sections in the provider detail pane sit flat in its card instead of nesting
1309 - cards inside it. Headings and row dividers still separate them. */
1310 -[data-redesign] [data-provider-detail] [data-slot="settings-group"] {
1310 +/* Sections in the provider detail pane sit flat in its card instead of nesting cards inside
1311 + it. Headings and row dividers still separate them. */
1312 +[data-provider-detail] [data-slot="settings-group"] {
1313 border-color: transparent;
1314 background: transparent;
1315 box-shadow: none;
1316 }
1317
1316 -/* New design: a diff header's copy button shows on file hover or focus. */
1318 +/* A diff header's copy button shows on file hover or focus. */
1319 @media (hover: hover) {
1318 - [data-redesign] diffs-container:not(:hover) [data-diff-copy-path]:not(:focus-within) {
1320 + diffs-container:not(:hover) [data-diff-copy-path]:not(:focus-within) {
1321 opacity: 0;
1322 }
1323 }
1324
1323 -/* New design: the default dark canvas is true black, matching the sidebar. Raised surfaces
1324 - keep the tone they had over neutral-950 so cards, popovers, and the composer still lift. */
1325 -html.dark[data-redesign]:not([data-theme-id]) {
1326 - --background: #000;
1327 - --surface-raised: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1328 - --card: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1329 - --popover: color-mix(in srgb, var(--color-neutral-950) 97%, var(--color-white));
1330 - /* A user turn sits above the composer tone, level with the selected sidebar row. */
1331 - --message-surface: color-mix(in srgb, var(--color-neutral-950) 92%, var(--color-white));
1332 -}
1333 -
1325 /* Theme files are expressed in app color roles and mapped to the existing
1326 semantic surface tokens here. Keep this block after the sidebar-version
1327 compatibility overrides so both navigation implementations receive the
@@ -1735,13 +1726,6 @@ body {
1726 padding: 0;
1727 }
1728
1738 -/* New design: sidebar row metadata sits a step below read titles (75% white). */
1739 -[data-redesign] [data-app-sidebar] {
1740 - @variant dark {
1741 - --secondary-label: #8f8f8f;
1742 - }
1743 -}
1744 -
1729 /* Lighter default icon stroke. In the base layer so stroke-* utilities still win; any
1730 CSS beats lucide's stroke-width="2" attribute. */
1731 @layer base {
@@ -2228,23 +2212,16 @@ code {
2212 border-collapse: collapse;
2213 overflow-wrap: normal;
2214 word-break: normal;
2231 - font-size: 0.75rem;
2232 -}
2233 -
2234 -/* New design: tables sit one step under 15px prose instead of three. */
2235 -[data-redesign] .chat-markdown table {
2215 + /* One step under 15px prose. */
2216 font-size: 0.875rem;
2217 }
2218
2239 -[data-redesign] .chat-markdown :is(td, th) {
2240 - text-wrap: pretty;
2241 -}
2242 -
2219 /* Top-aligned so wrapped rows share a first line, and the outer columns sit
2220 flush with the surrounding prose. */
2221 .chat-markdown th,
2222 .chat-markdown td {
2223 padding: 0.45rem 0.75rem;
2224 + text-wrap: pretty;
2225 text-align: start;
2226 vertical-align: top;
2227 }
apps/web/src/lib/diffRendering.ts
+4 -23
@@ -3,20 +3,16 @@ import { parseDiffFromFile } from "@pierre/diffs";
3 import type { FileDiffMetadata } from "@pierre/diffs/types";
4 import { READABLE_LIGHT_THEME_NAME } from "./readableSyntaxTheme";
5
6 +// Light mode uses a darker pierre-light so syntax stays readable on every code surface.
7 export const DIFF_THEME_NAMES = {
7 - light: "pierre-light",
8 + light: READABLE_LIGHT_THEME_NAME,
9 dark: "pierre-dark",
9 - readableLight: READABLE_LIGHT_THEME_NAME,
10 } as const;
11
12 export type DiffThemeName = (typeof DIFF_THEME_NAMES)[keyof typeof DIFF_THEME_NAMES];
13
14 export function resolveDiffThemeName(theme: "light" | "dark"): DiffThemeName {
15 - if (theme === "dark") return DIFF_THEME_NAMES.dark;
16 - // The New design (data-redesign on <html>) keeps light syntax readable on every code surface.
17 - return typeof document !== "undefined" && document.documentElement.hasAttribute("data-redesign")
18 - ? DIFF_THEME_NAMES.readableLight
19 - : DIFF_THEME_NAMES.light;
15 + return DIFF_THEME_NAMES[theme];
16 }
17
18 const FNV_OFFSET_BASIS_32 = 0x811c9dc5;
@@ -278,21 +274,6 @@ export function buildFileDiffContentVersion(fileDiff: FileDiffMetadata): number
274 return hash;
275 }
276
281 -export function getDiffCollapseIconClassName(fileDiff: FileDiffMetadata): string {
282 - switch (fileDiff.type) {
283 - case "new":
284 - return "text-[var(--diffs-addition-base)] redesign:text-muted-foreground/80";
285 - case "deleted":
286 - return "text-[var(--diffs-deletion-base)] redesign:text-muted-foreground/80";
287 - case "change":
288 - case "rename-pure":
289 - case "rename-changed":
290 - return "text-[var(--diffs-modified-base)] redesign:text-muted-foreground/80";
291 - default:
292 - return "text-muted-foreground/80";
293 - }
294 -}
295 -
277 export const DIFF_SURFACE_THEME_UNSAFE_CSS = `
278 [data-diffs-header],
279 [data-diff],
@@ -367,7 +348,7 @@ export const DIFF_SURFACE_THEME_UNSAFE_CSS = `
348 [data-change-icon="deleted"] {
349 color: light-dark(var(--diff-deletion-foreground), var(--diffs-deletion-base)) !important;
350 }
370 -/* The page sets --diff-modified-icon under the New design: a muted T3 blue, so the common case stays quiet. */
351 +/* The page sets --diff-modified-icon to a muted T3 blue, so the common case stays quiet. */
352 [data-change-icon="change"],
353 [data-change-icon="rename-pure"],
354 [data-change-icon="rename-changed"] {
apps/web/src/lib/incrementalHighlighting.ts
+3 -4
@@ -1,12 +1,11 @@
1 import {
2 renderTokenLines,
3 type DiffsHighlighter,
4 + type DiffsThemeNames,
5 type ThemedToken,
6 type TokensResult,
7 } from "@pierre/diffs";
8
8 -import type { DiffThemeName } from "./diffRendering";
9 -
9 function highlightedDocument(
10 result: TokensResult,
11 lines = renderTokenLines(result.tokens, {}),
@@ -50,7 +49,7 @@ export function highlightCodeToHast(
49 highlighter: DiffsHighlighter,
50 code: string,
51 language: string,
53 - theme: DiffThemeName,
52 + theme: DiffsThemeNames,
53 ) {
54 return highlightedDocument(highlighter.codeToTokens(code, { lang: language, theme }));
55 }
@@ -58,7 +57,7 @@ export function highlightCodeToHast(
57 export function createIncrementalHighlightedDocument(
58 highlighter: DiffsHighlighter,
59 language: string,
61 - theme: DiffThemeName,
60 + theme: DiffsThemeNames,
61 ) {
62 const options = { lang: language, theme };
63 let shell: TokensResult | undefined;
apps/web/src/lib/syntaxHighlighting.ts
+1 -1
@@ -21,7 +21,7 @@ export function getSyntaxHighlighterPromise(language: string): Promise<DiffsHigh
21 if (cached) return cached;
22
23 const promise = getSharedHighlighter({
24 - // Every palette, so toggling the New design never needs a new highlighter.
24 + // Both palettes, so switching appearance never needs a new highlighter.
25 themes: Object.values(DIFF_THEME_NAMES),
26 langs: [language as SupportedLanguages],
27 preferredHighlighter: PREFERRED_HIGHLIGHTER,
packages/contracts/src/settings.ts
-3
@@ -473,8 +473,6 @@ export const ClientSettingsSchema = Schema.Struct({
473 // Opt-in TeX typesetting in rendered Markdown. Off keeps math parsing and
474 // KaTeX out of the render path entirely.
475 mathRenderingEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
476 - // The quieter sidebar, composer and panel design. Off keeps the classic look.
477 - redesignEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
476 });
477 export type ClientSettings = typeof ClientSettingsSchema.Type;
478
@@ -1680,6 +1678,5 @@ export const ClientSettingsPatch = Schema.Struct({
1678 snapShotAnimations: Schema.optionalKey(Schema.Boolean),
1679 wordWrap: Schema.optionalKey(Schema.Boolean),
1680 mathRenderingEnabled: Schema.optionalKey(Schema.Boolean),
1683 - redesignEnabled: Schema.optionalKey(Schema.Boolean),
1681 });
1682 export type ClientSettingsPatch = typeof ClientSettingsPatch.Type;