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, 20:45 UTC
refactor(web): typing no longer re-renders the composer model picker (#22721)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Oct 21, 2026 at 01:24 UTC
17e62e7419d9d5d5a7cfd4197389be8189996f6f
3 files changed
+205
-136
apps/web/src/components/chat/ChatComposer.tsx
+73
-133
@@ -269,8 +269,6 @@ import {
269
} from "~/state/pullRequests";
270
import { useEnvironmentQuery } from "~/state/query";
271
import { useComposerPathSearch, useDebouncedValue } from "~/state/queries";
272
-import { ProviderModelPicker } from "./ProviderModelPicker";
273
-import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
272
import {
273
type ComposerCommandItem,
274
ComposerCommandMenu,
@@ -279,6 +277,7 @@ import {
277
import { ComposerPendingApprovalActions } from "./ComposerPendingApprovalActions";
278
import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
279
import {
280
+ ComposerAttachButton,
281
ComposerAttachmentFileList,
282
ComposerAttachmentMediaRow,
283
ComposerFilePreviewDialog,
@@ -286,7 +285,11 @@ import {
285
ComposerRestingImagePreviews,
286
} from "./ComposerAttachmentStrip";
287
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
289
-import { ComposerFooterModeControls, ComposerFooterPrimaryActions } from "./ComposerFooterControls";
288
+import {
289
+ ComposerFooterModeControls,
290
+ ComposerFooterPrimaryActions,
291
+ ComposerModelPicker,
292
+} from "./ComposerFooterControls";
293
import { ComposerPendingApprovalPanel } from "./ComposerPendingApprovalPanel";
294
import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
295
import { ComposerPlanFollowUpBanner } from "./ComposerPlanFollowUpBanner";
@@ -965,10 +968,8 @@ function ComposerCommandMenuLayer(props: { anchor: HTMLElement | null; children:
968
document.body,
969
);
970
}
968
-import { Button } from "../ui/button";
969
-import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
971
import { toastManager } from "../ui/toast";
971
-import { CircleAlertIcon, PaperclipIcon, PlayIcon, ShieldIcon } from "lucide-react";
972
+import { CircleAlertIcon, PlayIcon, ShieldIcon } from "lucide-react";
973
import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
974
import { hasProviderSetup } from "./ProviderStatusBanner";
975
import {
@@ -2184,7 +2185,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2185
targetKey: "",
2186
names: new Set(),
2187
});
2187
- const attachmentInputRef = useRef<HTMLInputElement>(null);
2188
const composerFormRef = useRef<HTMLFormElement>(null);
2189
const composerSurfaceRef = useRef<HTMLDivElement>(null);
2190
const providerInputRejectedRef = useRef(false);
@@ -4785,6 +4785,64 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
4785
const hiddenRestingBlockIds = restingBlockDefs
4786
.slice(restingBlockDefs.length - restingHiddenBlockCount)
4787
.map((def) => def.id);
4788
+ // Its own element, so typing (which rebuilds the controls around it) leaves it cached.
4789
+ const composerModelPicker = (
4790
+ <ComposerModelPicker
4791
+ environmentId={environmentId}
4792
+ compact={false}
4793
+ isComposerOwned
4794
+ disabled={providerCatalogPending || isSendBusy}
4795
+ multipleModelsEnabled={routeKind === "draft" && supportsMultipleModels}
4796
+ multipleModelSelections={multipleModelSelections}
4797
+ onMultipleModelSelectionsChange={setMultipleModelSelections}
4798
+ selectedModelSelection={selectedModelSelection}
4799
+ onProviderModelSelect={onProviderModelSelect}
4800
+ activeInstanceId={
4801
+ providerCatalogPending
4802
+ ? (activeThreadModelSelection?.instanceId ?? selectedInstanceId)
4803
+ : selectedInstanceId
4804
+ }
4805
+ model={
4806
+ providerCatalogPending
4807
+ ? (activeThreadModelSelection?.model ?? selectedModelForPickerWithCustomFallback)
4808
+ : selectedModelForPickerWithCustomFallback
4809
+ }
4810
+ lockedProvider={lockedProvider}
4811
+ lockedContinuationGroupKey={lockedContinuationGroupKey}
4812
+ instanceEntries={providerInstanceEntries}
4813
+ keybindings={keybindings}
4814
+ modelOptionsByInstance={modelOptionsByInstance}
4815
+ size={composerControlsCollapsed ? "xs" : "sm"}
4816
+ triggerClassName={
4817
+ composerControlsCollapsed
4818
+ ? cn(
4819
+ "min-w-13 shrink text-xs!",
4820
+ !showInlineRestingControls &&
4821
+ "@max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:w-0 @max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:flex-none",
4822
+ )
4823
+ : "-ms-2.5 min-w-13"
4824
+ }
4825
+ terminalOpen={terminalOpen}
4826
+ open={isComposerModelPickerOpen}
4827
+ instanceIndicatorBackground={
4828
+ composerControlsCollapsed
4829
+ ? "color-mix(in srgb, var(--chat-composer-glass-surface) var(--glass-opacity), transparent)"
4830
+ : "var(--contrast-input)"
4831
+ }
4832
+ {...(composerProviderState.modelPickerIconClassName || composerControlsCollapsed
4833
+ ? {
4834
+ activeProviderIconClassName: cn(
4835
+ composerProviderState.modelPickerIconClassName,
4836
+ composerControlsCollapsed &&
4837
+ "fill-muted-foreground/70! text-muted-foreground/70! [&_path]:fill-muted-foreground/70! [&_rect]:fill-muted-foreground/70! [&_[data-icon-detail]]:fill-transparent! [&[data-provider-package-icon]]:opacity-70 [&[data-provider-package-icon]_path:not([data-icon-detail])]:fill-muted-foreground!",
4838
+ ),
4839
+ }
4840
+ : {})}
4841
+ onOpenChange={setIsComposerModelPickerOpen}
4842
+ getModelDisabledReason={getModelDisabledReason}
4843
+ onOpenProviderSetup={onOpenProviderSetup}
4844
+ />
4845
+ );
4846
const composerControls = showProviderUnavailable ? (
4847
<ComposerControl
4848
type="button"
@@ -4811,95 +4869,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
4869
data-resting-controls-separator="true"
4870
/>
4871
) : null}
4814
- <ProviderModelPicker
4815
- environmentId={environmentId}
4816
- compact={false}
4817
- isComposerOwned
4818
- disabled={providerCatalogPending || isSendBusy}
4819
- {...(routeKind === "draft" && supportsMultipleModels
4820
- ? {
4821
- ...(multipleModelSelections !== null
4822
- ? { selectedModels: multipleModelSelections }
4823
- : {}),
4824
- onToggleModel: (instanceId: ProviderInstanceId, model: string) => {
4825
- const current = multipleModelSelections ?? [selectedModelSelection];
4826
- const matchesModel = (selection: ModelSelection) => {
4827
- if (selection.instanceId !== instanceId) return false;
4828
- const entry = providerInstanceEntries.find(
4829
- (entry) => entry.instanceId === selection.instanceId,
4830
- );
4831
- const resolvedModel = resolveModelPickerSelectedModel({
4832
- driverKind: entry?.driverKind,
4833
- model: selection.model,
4834
- options: modelOptionsByInstance.get(selection.instanceId) ?? [],
4835
- });
4836
- return (resolvedModel?.slug ?? selection.model) === model;
4837
- };
4838
- const exists = current.some(matchesModel);
4839
- const next = exists
4840
- ? current.filter((selection) => !matchesModel(selection))
4841
- : [...current, createModelSelection(instanceId, model)];
4842
- if (next.length > 1) {
4843
- setMultipleModelSelections(next);
4844
- } else {
4845
- setMultipleModelSelections(null);
4846
- const remaining = next[0] ?? selectedModelSelection;
4847
- onProviderModelSelect(remaining.instanceId, remaining.model, {
4848
- focusComposer: false,
4849
- });
4850
- }
4851
- },
4852
- }
4853
- : {})}
4854
- activeInstanceId={
4855
- providerCatalogPending
4856
- ? (activeThreadModelSelection?.instanceId ?? selectedInstanceId)
4857
- : selectedInstanceId
4858
- }
4859
- model={
4860
- providerCatalogPending
4861
- ? (activeThreadModelSelection?.model ?? selectedModelForPickerWithCustomFallback)
4862
- : selectedModelForPickerWithCustomFallback
4863
- }
4864
- lockedProvider={lockedProvider}
4865
- lockedContinuationGroupKey={lockedContinuationGroupKey}
4866
- instanceEntries={providerInstanceEntries}
4867
- keybindings={keybindings}
4868
- modelOptionsByInstance={modelOptionsByInstance}
4869
- size={composerControlsCollapsed ? "xs" : "sm"}
4870
- triggerClassName={
4871
- composerControlsCollapsed
4872
- ? cn(
4873
- "min-w-13 shrink text-xs!",
4874
- !showInlineRestingControls &&
4875
- "@max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:w-0 @max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:flex-none",
4876
- )
4877
- : "-ms-2.5 min-w-13"
4878
- }
4879
- terminalOpen={terminalOpen}
4880
- open={isComposerModelPickerOpen}
4881
- instanceIndicatorBackground={
4882
- composerControlsCollapsed
4883
- ? "color-mix(in srgb, var(--chat-composer-glass-surface) var(--glass-opacity), transparent)"
4884
- : "var(--contrast-input)"
4885
- }
4886
- {...(composerProviderState.modelPickerIconClassName || composerControlsCollapsed
4887
- ? {
4888
- activeProviderIconClassName: cn(
4889
- composerProviderState.modelPickerIconClassName,
4890
- composerControlsCollapsed &&
4891
- "fill-muted-foreground/70! text-muted-foreground/70! [&_path]:fill-muted-foreground/70! [&_rect]:fill-muted-foreground/70! [&_[data-icon-detail]]:fill-transparent! [&[data-provider-package-icon]]:opacity-70 [&[data-provider-package-icon]_path:not([data-icon-detail])]:fill-muted-foreground!",
4892
- ),
4893
- }
4894
- : {})}
4895
- onOpenChange={setIsComposerModelPickerOpen}
4896
- getModelDisabledReason={getModelDisabledReason}
4897
- onInstanceModelChange={(instanceId, model) => {
4898
- setMultipleModelSelections(null);
4899
- onProviderModelSelect(instanceId, model);
4900
- }}
4901
- onOpenProviderSetup={onOpenProviderSetup}
4902
- />
4872
+ {composerModelPicker}
4873
4874
<>
4875
{restingBlockDefs.map((def, index) => {
@@ -6081,6 +6051,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
6051
onRemoveFile={removeComposerFileFromDraft}
6052
/>
6053
) : null;
6054
+ const composerAttachButton = showComposerAttachAction ? (
6055
+ <ComposerAttachButton
6056
+ addComposerAttachments={addComposerAttachments}
6057
+ focusComposer={focusComposer}
6058
+ />
6059
+ ) : null;
6060
return (
6061
<form
6062
ref={composerFormRef}
@@ -6570,43 +6546,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
6546
}
6547
className="flex shrink-0 flex-nowrap items-center justify-end gap-2"
6548
>
6573
- {showComposerAttachAction ? (
6574
- <>
6575
- <input
6576
- ref={attachmentInputRef}
6577
- type="file"
6578
- multiple
6579
- className="hidden"
6580
- onChange={(event) => {
6581
- const files = Array.from(event.currentTarget.files ?? []);
6582
- event.currentTarget.value = "";
6583
- // Inserting a chip refocuses the editor after the draft renders;
6584
- // focusing synchronously here would report the editor's stale text
6585
- // over the prompt that was just written.
6586
- void addComposerAttachments(files).then((inserted) => {
6587
- if (!inserted) focusComposer();
6588
- });
6589
- }}
6590
- />
6591
- <Tooltip>
6592
- <TooltipTrigger
6593
- render={
6594
- <Button
6595
- type="button"
6596
- variant="ghost"
6597
- size="icon-sm"
6598
- onPointerDown={(event) => event.preventDefault()}
6599
- onClick={() => attachmentInputRef.current?.click()}
6600
- aria-label="Attach files"
6601
- />
6602
- }
6603
- >
6604
- <PaperclipIcon />
6605
- </TooltipTrigger>
6606
- <TooltipPopup>Attach files</TooltipPopup>
6607
- </Tooltip>
6608
- </>
6609
- ) : null}
6549
+ {composerAttachButton}
6550
<ComposerFooterPrimaryActions
6551
compact={isComposerResting || isComposerPrimaryActionsCompact}
6552
canOperateThread={canOperateThread}
apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+48
-1
@@ -6,7 +6,7 @@ import type {
6
SnapShotSource,
7
} from "@t3tools/contracts";
8
import { formatAttachmentSize } from "@t3tools/client-runtime/state/attachments";
9
-import { CircleAlertIcon, PlayIcon, XIcon } from "lucide-react";
9
+import { CircleAlertIcon, PaperclipIcon, PlayIcon, XIcon } from "lucide-react";
10
import { type ComponentProps, useLayoutEffect, useRef } from "react";
11
12
import {
@@ -654,3 +654,50 @@ export function ComposerQueuedAttachmentRow({
654
</div>
655
);
656
}
657
+
658
+export function ComposerAttachButton({
659
+ addComposerAttachments,
660
+ focusComposer,
661
+}: {
662
+ readonly addComposerAttachments: (files: File[]) => Promise<boolean>;
663
+ readonly focusComposer: () => void;
664
+}) {
665
+ const inputRef = useRef<HTMLInputElement>(null);
666
+ return (
667
+ <>
668
+ <input
669
+ ref={inputRef}
670
+ type="file"
671
+ multiple
672
+ className="hidden"
673
+ onChange={(event) => {
674
+ const files = Array.from(event.currentTarget.files ?? []);
675
+ event.currentTarget.value = "";
676
+ // Inserting a chip refocuses the editor after the draft renders;
677
+ // focusing synchronously here would report the editor's stale text
678
+ // over the prompt that was just written.
679
+ void addComposerAttachments(files).then((inserted) => {
680
+ if (!inserted) focusComposer();
681
+ });
682
+ }}
683
+ />
684
+ <Tooltip>
685
+ <TooltipTrigger
686
+ render={
687
+ <Button
688
+ type="button"
689
+ variant="ghost"
690
+ size="icon-sm"
691
+ onPointerDown={(event) => event.preventDefault()}
692
+ onClick={() => inputRef.current?.click()}
693
+ aria-label="Attach files"
694
+ />
695
+ }
696
+ >
697
+ <PaperclipIcon />
698
+ </TooltipTrigger>
699
+ <TooltipPopup>Attach files</TooltipPopup>
700
+ </Tooltip>
701
+ </>
702
+ );
703
+}
apps/web/src/components/chat/ComposerFooterControls.tsx
+84
-2
@@ -1,6 +1,12 @@
1
-import type { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
1
+import type {
2
+ ModelSelection,
3
+ ProviderInstanceId,
4
+ ProviderInteractionMode,
5
+ RuntimeMode,
6
+} from "@t3tools/contracts";
7
+import { createModelSelection } from "@t3tools/shared/model";
8
import { BotIcon, PencilRulerIcon } from "lucide-react";
3
-import { memo } from "react";
9
+import { type ComponentProps, memo } from "react";
10
11
import type { ContextWindowSnapshot } from "../../lib/contextWindow";
12
import { Select, SelectItem, SelectPopup, SelectValue } from "../ui/select";
@@ -14,6 +20,8 @@ import {
20
import { useComposerMenuProps } from "./composerEventScope";
21
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
22
import { ContextWindowMeter, ContextWindowMeterPlaceholder } from "./ContextWindowMeter";
23
+import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
24
+import { ProviderModelPicker } from "./ProviderModelPicker";
25
import { runtimeModeConfig } from "./runtimeModeConfig";
26
import { useComposerMenuState } from "./useComposerMenuState";
27
@@ -225,3 +233,77 @@ export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryA
233
</>
234
);
235
});
236
+
237
+/**
238
+ * The composer's model picker. It owns the single- and multi-model selection
239
+ * handlers so they are cached against the selection state, not rebuilt on
240
+ * every ChatComposer render.
241
+ */
242
+export function ComposerModelPicker({
243
+ multipleModelsEnabled,
244
+ multipleModelSelections,
245
+ onMultipleModelSelectionsChange,
246
+ selectedModelSelection,
247
+ onProviderModelSelect,
248
+ ...pickerProps
249
+}: Omit<
250
+ ComponentProps<typeof ProviderModelPicker>,
251
+ "selectedModels" | "onToggleModel" | "onInstanceModelChange"
252
+> & {
253
+ readonly multipleModelsEnabled: boolean;
254
+ readonly multipleModelSelections: ReadonlyArray<ModelSelection> | null;
255
+ readonly onMultipleModelSelectionsChange: (
256
+ selections: ReadonlyArray<ModelSelection> | null,
257
+ ) => void;
258
+ readonly selectedModelSelection: ModelSelection;
259
+ readonly onProviderModelSelect: (
260
+ instanceId: ProviderInstanceId,
261
+ model: string,
262
+ options?: { focusComposer?: boolean },
263
+ ) => void;
264
+}) {
265
+ const { instanceEntries, modelOptionsByInstance } = pickerProps;
266
+ const toggleModel = (instanceId: ProviderInstanceId, model: string) => {
267
+ const current = multipleModelSelections ?? [selectedModelSelection];
268
+ const matchesModel = (selection: ModelSelection) => {
269
+ if (selection.instanceId !== instanceId) return false;
270
+ const entry = instanceEntries.find((entry) => entry.instanceId === selection.instanceId);
271
+ const resolvedModel = resolveModelPickerSelectedModel({
272
+ driverKind: entry?.driverKind,
273
+ model: selection.model,
274
+ options: modelOptionsByInstance?.get(selection.instanceId) ?? [],
275
+ });
276
+ return (resolvedModel?.slug ?? selection.model) === model;
277
+ };
278
+ const exists = current.some(matchesModel);
279
+ const next = exists
280
+ ? current.filter((selection) => !matchesModel(selection))
281
+ : [...current, createModelSelection(instanceId, model)];
282
+ if (next.length > 1) {
283
+ onMultipleModelSelectionsChange(next);
284
+ } else {
285
+ onMultipleModelSelectionsChange(null);
286
+ const remaining = next[0] ?? selectedModelSelection;
287
+ onProviderModelSelect(remaining.instanceId, remaining.model, {
288
+ focusComposer: false,
289
+ });
290
+ }
291
+ };
292
+ return (
293
+ <ProviderModelPicker
294
+ {...pickerProps}
295
+ {...(multipleModelsEnabled
296
+ ? {
297
+ ...(multipleModelSelections !== null
298
+ ? { selectedModels: multipleModelSelections }
299
+ : {}),
300
+ onToggleModel: toggleModel,
301
+ }
302
+ : {})}
303
+ onInstanceModelChange={(instanceId, model) => {
304
+ onMultipleModelSelectionsChange(null);
305
+ onProviderModelSelect(instanceId, model);
306
+ }}
307
+ />
308
+ );
309
+}