From 4e0bf2c32dfd541706142da6702ee6061f098094 Mon Sep 17 00:00:00 2001 From: SAPHID Date: Thu, 19 Nov 2026 09:32:03 +0000 Subject: [PATCH] fix(web): remove repeated model name from reasoning header --- .../components/chat/ComposerModelEffort.tsx | 7 +--- .../components/chat/ProviderModelPicker.tsx | 42 ++++++++----------- 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/apps/web/src/components/chat/ComposerModelEffort.tsx b/apps/web/src/components/chat/ComposerModelEffort.tsx index 1d0227c0f6482..8336771410e12 100644 --- a/apps/web/src/components/chat/ComposerModelEffort.tsx +++ b/apps/web/src/components/chat/ComposerModelEffort.tsx @@ -9,7 +9,7 @@ import type { EffortDisplay } from "@t3tools/contracts/settings"; import { getProviderOptionCurrentLabel } from "@t3tools/shared/model"; import { msg, T, useGT, useMessages } from "gt-react"; import { CheckIcon, ChevronRightIcon, ChevronUpIcon, WorkflowIcon } from "lucide-react"; -import { type KeyboardEvent, type ReactNode, use, useRef, useState } from "react"; +import { type KeyboardEvent, type ReactNode, useRef, useState } from "react"; import { m, type MessageResolver } from "~/i18n/messages"; import { cn } from "~/lib/utils"; @@ -27,7 +27,6 @@ import type { ComposerControlSize } from "./ComposerControl"; import { ComposerPermissionsSection, type RuntimeModeOption } from "./ComposerFooterControls"; import { composerFloatingLayerProps, focusCheckedPermission } from "./composerEventScope"; import { EffortGlyph, FastBolt, resolveEffortGlyph } from "./EffortGlyph"; -import { DockedPickerContext } from "./ProviderModelPicker"; import { getTraitsSectionVisibility, type TraitsSelectionInput, @@ -525,7 +524,6 @@ function NoEffortRow() { export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | null }) { const gt = useGT(); const messages = useMessages(); - const picker = use(DockedPickerContext); const visibility = props.traits ? getTraitsSectionVisibility({ ...props.traits, resolve: messages }) : null; @@ -544,9 +542,6 @@ export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | nul ? gt("Options", { $context: "heading for model options" }) : gt("Effort", { $context: "heading for reasoning effort levels" }))} - - {picker.modelLabel} - {/* pt-2.5 puts the first level on the same line as the first model. */} diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx index 254b1ffeac937..b71d524f54dc6 100644 --- a/apps/web/src/components/chat/ProviderModelPicker.tsx +++ b/apps/web/src/components/chat/ProviderModelPicker.tsx @@ -8,7 +8,6 @@ import { import { RegistryContext } from "@effect/atom-react"; import { T, useGT } from "gt-react"; import { - createContext, memo, type ReactNode, useContext, @@ -85,9 +84,6 @@ function lockBackgroundScroll(popup: HTMLElement | null) { }; } -/** What a docked effort column needs from its picker: the model it serves. */ -export const DockedPickerContext = createContext<{ modelLabel: string }>({ modelLabel: "" }); - export const ProviderModelPicker = memo(function ProviderModelPicker(props: { environmentId: EnvironmentId | null; workspaceCwd?: string | null; @@ -470,29 +466,27 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: { touchBackdrop > {props.effortColumn ? ( - -
- {/* One fixed height, so a model with more options never resizes the popup. Short +
+ {/* One fixed height, so a model with more options never resizes the popup. Short windows shrink it and keep the footer. */} -
- {picker} -
{ - if (event.key !== "ArrowLeft" || event.altKey || event.ctrlKey || event.metaKey) - return; - event.preventDefault(); - event.stopPropagation(); - searchInputRef.current?.focus(); - }} - > - {props.effortColumn} -
+
+ {picker} +
{ + if (event.key !== "ArrowLeft" || event.altKey || event.ctrlKey || event.metaKey) + return; + event.preventDefault(); + event.stopPropagation(); + searchInputRef.current?.focus(); + }} + > + {props.effortColumn}
- {props.footer}
- + {props.footer} +
) : ( picker )}