From 1ae8d74389ffd4e6487c119cdf24ae7a0d67c831 Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Thu, 29 Oct 2026 14:41:45 -0700 Subject: [PATCH 1/3] feat(web): add colored PR text preference --- .../src/components/ThreadStatusIndicators.tsx | 6 ++++- .../settings/AppearanceSettingsPanel.tsx | 26 +++++++++++++++++++ .../components/settings/SettingsPanels.tsx | 4 +++ .../src/components/settings/settingsSearch.ts | 6 +++++ packages/contracts/src/settings.ts | 2 ++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/apps/web/src/components/ThreadStatusIndicators.tsx b/apps/web/src/components/ThreadStatusIndicators.tsx index 317b4f505c0dd..3a3ad91fa9fe1 100644 --- a/apps/web/src/components/ThreadStatusIndicators.tsx +++ b/apps/web/src/components/ThreadStatusIndicators.tsx @@ -32,6 +32,7 @@ import { import { useRender } from "@base-ui/react/use-render"; import { type ReactNode, type AnimationEvent, type MouseEvent, type ReactElement } from "react"; import { cn } from "../lib/utils"; +import { useClientSettings } from "../hooks/useSettings"; import { revealThreadTerminal } from "../lib/revealThreadTerminal"; import { useEnvironmentQuery } from "../state/query"; @@ -295,6 +296,7 @@ function PullRequestBadge({ onOpenList: () => void; onOpenPullRequest: (event: MouseEvent, url?: string) => void; }) { + const colorizePullRequestText = useClientSettings((settings) => settings.colorizePullRequestText); const onClick = opensList ? (event: MouseEvent) => { event.preventDefault(); @@ -323,7 +325,9 @@ function PullRequestBadge({ className={cn("contents font-normal text-xs tabular-nums", presentation.toneClassName)} > - {presentation.text} + + {presentation.text} + + + updateSettings({ + colorizePullRequestText: DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText, + }) + } + /> + ) : null + } + control={ + + updateSettings({ colorizePullRequestText: Boolean(checked) }) + } + aria-label="Color PR text" + /> + } + /> void) { ? ["Diff colors"] : []), ...(settings.chatWidth !== DEFAULT_UNIFIED_SETTINGS.chatWidth ? ["Chat width"] : []), + ...(settings.colorizePullRequestText !== DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText + ? ["Color PR text"] + : []), ...(settings.effortDisplay !== DEFAULT_UNIFIED_SETTINGS.effortDisplay ? ["Effort display"] : []), @@ -655,6 +658,7 @@ export function useSettingsRestore(onRestored?: () => void) { appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast, diffColorScheme: DEFAULT_UNIFIED_SETTINGS.diffColorScheme, chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth, + colorizePullRequestText: DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText, effortDisplay: DEFAULT_UNIFIED_SETTINGS.effortDisplay, mathRenderingEnabled: DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled, language: DEFAULT_UNIFIED_SETTINGS.language, diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index 154ad97baeabe..b0235bbba7ea9 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -355,6 +355,12 @@ export const SETTINGS_SEARCH_ITEMS = [ "customize show hide panel card environment editor scripts branch pull request git changes servers automations lineage usage limits 5 hour weekly quota tokens context window", ], }, + { + id: "colorize-pull-request-text", + title: "Color PR text", + to: "/settings/appearance", + searchTerms: ["pull request merge request sidebar indicator badge number stack status color"], + }, { id: "effort-display", title: "Effort display", diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 678f58294c66a..1f05413849d3b 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -412,6 +412,7 @@ export const ClientSettingsSchema = Schema.Struct({ ), chatWidth: ChatWidth.pipe(Schema.withDecodingDefault(Effect.succeed("comfortable" as const))), effortDisplay: EffortDisplay.pipe(Schema.withDecodingDefault(Effect.succeed("label" as const))), + colorizePullRequestText: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), loadBalancingEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))), loadBalancingWeights: LoadBalancingWeights.pipe(Schema.withDecodingDefault(Effect.succeed({}))), appearanceContrast: AppearanceContrast.pipe( @@ -2052,6 +2053,7 @@ export const ClientSettingsPatch = Schema.Struct({ diffColorScheme: Schema.optionalKey(DiffColorScheme), chatWidth: Schema.optionalKey(ChatWidth), effortDisplay: Schema.optionalKey(EffortDisplay), + colorizePullRequestText: Schema.optionalKey(Schema.Boolean), loadBalancingEnabled: Schema.optionalKey(Schema.Boolean), loadBalancingWeights: Schema.optionalKey(LoadBalancingWeights), appearanceContrast: Schema.optionalKey(AppearanceContrast), From 6e853cdb72585219b535f88b8a56a4888abeb0af Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Thu, 29 Oct 2026 14:54:03 -0700 Subject: [PATCH 2/3] fix(web): honor PR text colors in search results --- apps/web/src/components/ThreadStatusIndicators.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/components/ThreadStatusIndicators.tsx b/apps/web/src/components/ThreadStatusIndicators.tsx index 3a3ad91fa9fe1..1b79901a0b3ae 100644 --- a/apps/web/src/components/ThreadStatusIndicators.tsx +++ b/apps/web/src/components/ThreadStatusIndicators.tsx @@ -871,6 +871,7 @@ export function ThreadSearchPullRequestNumber({ enabled?: boolean; settled?: boolean; }) { + const colorizePullRequestText = useClientSettings((settings) => settings.colorizePullRequestText); const matched = pullRequestMatchesSearchQuery(thread, query); const supportsMultiplePullRequests = useSupportsMultiplePullRequests(thread.environmentId); const linked = useLinkedThreadPullRequest( @@ -922,7 +923,9 @@ export function ThreadSearchPullRequestNumber({ > {/* text-current opts out of the command palette's muted icon color. */} - {presentation.text} + + {presentation.text} + ); } From 6e3ca8d4e9051a1767a03b26fe3f1113b77e0cfb Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Mon, 16 Nov 2026 21:22:41 -0800 Subject: [PATCH 3/3] fix(web): always color PR text to match its status icon --- .../src/components/ThreadStatusIndicators.tsx | 11 ++------ .../settings/AppearanceSettingsPanel.tsx | 26 ------------------- .../components/settings/SettingsPanels.tsx | 4 --- .../src/components/settings/settingsSearch.ts | 6 ----- packages/contracts/src/settings.ts | 2 -- 5 files changed, 2 insertions(+), 47 deletions(-) diff --git a/apps/web/src/components/ThreadStatusIndicators.tsx b/apps/web/src/components/ThreadStatusIndicators.tsx index 1b79901a0b3ae..9fc85a99818fd 100644 --- a/apps/web/src/components/ThreadStatusIndicators.tsx +++ b/apps/web/src/components/ThreadStatusIndicators.tsx @@ -32,7 +32,6 @@ import { import { useRender } from "@base-ui/react/use-render"; import { type ReactNode, type AnimationEvent, type MouseEvent, type ReactElement } from "react"; import { cn } from "../lib/utils"; -import { useClientSettings } from "../hooks/useSettings"; import { revealThreadTerminal } from "../lib/revealThreadTerminal"; import { useEnvironmentQuery } from "../state/query"; @@ -296,7 +295,6 @@ function PullRequestBadge({ onOpenList: () => void; onOpenPullRequest: (event: MouseEvent, url?: string) => void; }) { - const colorizePullRequestText = useClientSettings((settings) => settings.colorizePullRequestText); const onClick = opensList ? (event: MouseEvent) => { event.preventDefault(); @@ -325,9 +323,7 @@ function PullRequestBadge({ className={cn("contents font-normal text-xs tabular-nums", presentation.toneClassName)} > - - {presentation.text} - + {presentation.text} settings.colorizePullRequestText); const matched = pullRequestMatchesSearchQuery(thread, query); const supportsMultiplePullRequests = useSupportsMultiplePullRequests(thread.environmentId); const linked = useLinkedThreadPullRequest( @@ -923,9 +918,7 @@ export function ThreadSearchPullRequestNumber({ > {/* text-current opts out of the command palette's muted icon color. */} - - {presentation.text} - + {presentation.text} ); } diff --git a/apps/web/src/components/settings/AppearanceSettingsPanel.tsx b/apps/web/src/components/settings/AppearanceSettingsPanel.tsx index 05ecc729d2e5f..00783b085d609 100644 --- a/apps/web/src/components/settings/AppearanceSettingsPanel.tsx +++ b/apps/web/src/components/settings/AppearanceSettingsPanel.tsx @@ -290,32 +290,6 @@ export function AppearanceSettingsPanel() { } /> - - updateSettings({ - colorizePullRequestText: DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText, - }) - } - /> - ) : null - } - control={ - - updateSettings({ colorizePullRequestText: Boolean(checked) }) - } - aria-label="Color PR text" - /> - } - /> void) { ? ["Diff colors"] : []), ...(settings.chatWidth !== DEFAULT_UNIFIED_SETTINGS.chatWidth ? ["Chat width"] : []), - ...(settings.colorizePullRequestText !== DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText - ? ["Color PR text"] - : []), ...(settings.effortDisplay !== DEFAULT_UNIFIED_SETTINGS.effortDisplay ? ["Effort display"] : []), @@ -658,7 +655,6 @@ export function useSettingsRestore(onRestored?: () => void) { appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast, diffColorScheme: DEFAULT_UNIFIED_SETTINGS.diffColorScheme, chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth, - colorizePullRequestText: DEFAULT_UNIFIED_SETTINGS.colorizePullRequestText, effortDisplay: DEFAULT_UNIFIED_SETTINGS.effortDisplay, mathRenderingEnabled: DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled, language: DEFAULT_UNIFIED_SETTINGS.language, diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index b0235bbba7ea9..154ad97baeabe 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -355,12 +355,6 @@ export const SETTINGS_SEARCH_ITEMS = [ "customize show hide panel card environment editor scripts branch pull request git changes servers automations lineage usage limits 5 hour weekly quota tokens context window", ], }, - { - id: "colorize-pull-request-text", - title: "Color PR text", - to: "/settings/appearance", - searchTerms: ["pull request merge request sidebar indicator badge number stack status color"], - }, { id: "effort-display", title: "Effort display", diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 1f05413849d3b..678f58294c66a 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -412,7 +412,6 @@ export const ClientSettingsSchema = Schema.Struct({ ), chatWidth: ChatWidth.pipe(Schema.withDecodingDefault(Effect.succeed("comfortable" as const))), effortDisplay: EffortDisplay.pipe(Schema.withDecodingDefault(Effect.succeed("label" as const))), - colorizePullRequestText: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), loadBalancingEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))), loadBalancingWeights: LoadBalancingWeights.pipe(Schema.withDecodingDefault(Effect.succeed({}))), appearanceContrast: AppearanceContrast.pipe( @@ -2053,7 +2052,6 @@ export const ClientSettingsPatch = Schema.Struct({ diffColorScheme: Schema.optionalKey(DiffColorScheme), chatWidth: Schema.optionalKey(ChatWidth), effortDisplay: Schema.optionalKey(EffortDisplay), - colorizePullRequestText: Schema.optionalKey(Schema.Boolean), loadBalancingEnabled: Schema.optionalKey(Schema.Boolean), loadBalancingWeights: Schema.optionalKey(LoadBalancingWeights), appearanceContrast: Schema.optionalKey(AppearanceContrast),