@devries-cameron20 / t3code-1 / commits / c19d9977d4
Fork 0

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

perf(web): typing no longer re-renders the traits picker or attach button (#23040)

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

Julius Marminge committed Oct 21, 2026 at 13:23 UTC c19d9977d483f8c661c9ad6bede0f1d8da517d31
7 files changed +144 -119
apps/web/src/components/chat/ChatComposer.tsx
+87 -80
@@ -290,6 +290,7 @@ import {
290 renderProviderTraitsMenuContent,
291 renderProviderTraitsPicker,
292 } from "./composerProviderState";
293 +import { readPromptUltrathink } from "./TraitsPicker";
294 import {
295 providerSupportsManualCompaction,
296 resolveContextWindowModelDisplayName,
@@ -2307,7 +2308,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2308 activePendingProgress.activeQuestion?.allowCustomAnswer !== false));
2309 const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;
2310
2310 - const setPromptFromTraits = (nextPrompt: string) => {
2311 + const editPromptFromTraits = (edit: (prompt: string) => string) => {
2312 + const currentPrompt = getComposerDraft(composerDraftTarget)?.prompt ?? "";
2313 + const nextPrompt = edit(currentPrompt);
2314 + if (nextPrompt === currentPrompt) return;
2315 if (nextPrompt === promptRef.current) {
2316 scheduleComposerFocus();
2317 return;
@@ -2319,7 +2323,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2323 setComposerTrigger(detectComposerTrigger(nextPrompt, nextPrompt.length));
2324 scheduleComposerFocus();
2325 };
2322 - const setPromptFromTraitsStable = useStableCallback(setPromptFromTraits);
2326 + const editPromptFromTraitsStable = useStableCallback(editPromptFromTraits);
2327 + const promptUltrathink = readPromptUltrathink(prompt);
2328
2329 const providerTraitsMenuContent = renderProviderTraitsMenuContent({
2330 provider: selectedProvider,
@@ -2330,8 +2335,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2335 models: selectedProviderModels,
2336 modelOptions: composerModelOptions?.[selectedInstanceId],
2337 reportedModelSelection,
2333 - prompt,
2334 - onPromptChange: setPromptFromTraitsStable,
2338 + promptUltrathink,
2339 + onPromptEdit: editPromptFromTraitsStable,
2340 planModeEnabled: settings.planModeEnabled,
2341 });
2342 const providerTraitsPickerInput = {
@@ -2343,8 +2348,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2348 models: selectedProviderModels,
2349 modelOptions: composerModelOptions?.[selectedInstanceId],
2350 reportedModelSelection,
2346 - prompt,
2347 - onPromptChange: setPromptFromTraitsStable,
2351 + promptUltrathink,
2352 + onPromptEdit: editPromptFromTraitsStable,
2353 planModeEnabled: settings.planModeEnabled,
2354 isComposerOwned: true,
2355 } satisfies Parameters<typeof renderProviderTraitsPicker>[0];
@@ -4736,6 +4741,82 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
4741 terminalOpen,
4742 ]);
4743
4744 + const insertComposerText = (
4745 + text: string,
4746 + position: "cursor" | "end",
4747 + options?: {
4748 + ensureLeadingBoundary?: boolean;
4749 + citationCommentAnchor?: AssistantCitationSourceAnchor;
4750 + clipboardData?: DataTransfer;
4751 + },
4752 + ): boolean => {
4753 + if (
4754 + text.length === 0 ||
4755 + isConnecting ||
4756 + activePendingIsResponding ||
4757 + (pendingUserInputs.length > 0 && !activePendingProgress?.activeQuestion) ||
4758 + projectSelectionRequired ||
4759 + (options?.citationCommentAnchor && !composerEditorRef.current)
4760 + ) {
4761 + return false;
4762 + }
4763 + if (options?.clipboardData) {
4764 + text = importPastedComposerText(options.clipboardData, importContextFragment);
4765 + }
4766 + const prompt = promptRef.current;
4767 + const cursor = position === "cursor" ? readComposerSnapshot().expandedCursor : prompt.length;
4768 + const needsLeadingSpace =
4769 + (options?.ensureLeadingBoundary ?? false) &&
4770 + cursor > 0 &&
4771 + !/\s/.test(prompt[cursor - 1] ?? "");
4772 + const rangeEnd = extendReplacementRangeForTrailingSpace(prompt, cursor, text);
4773 + return applyPromptReplacement(
4774 + cursor,
4775 + rangeEnd,
4776 + needsLeadingSpace ? ` ${text}` : text,
4777 + options?.citationCommentAnchor
4778 + ? {
4779 + citationComment: {
4780 + start: cursor + (needsLeadingSpace ? 1 : 0),
4781 + sourceAnchor: options.citationCommentAnchor,
4782 + insertedSpaces: { before: needsLeadingSpace, after: rangeEnd === cursor },
4783 + },
4784 + focusEditorAfterReplace: false,
4785 + }
4786 + : undefined,
4787 + );
4788 + };
4789 + const insertComposerTextStable = useStableCallback(insertComposerText);
4790 +
4791 + const insertAttachmentReferences = (
4792 + references: ReadonlyArray<ComposerContextReference>,
4793 + selection?: { start: number; end: number },
4794 + ): boolean => {
4795 + if (references.length === 0) return false;
4796 + // Question answers carry attachments beside the answer, never as chips. Falling back to
4797 + // the thread prompt here would hide the file behind a reference the question never shows.
4798 + if (questionAttachmentTarget) return false;
4799 + return insertAttachmentReferencesForDraft({
4800 + target: composerDraftTarget,
4801 + liveAttachmentTargetKey: attachmentTargetKeyRef.current,
4802 + references,
4803 + insertReferences: () => {
4804 + if (selection) {
4805 + const edit = inlineContextReferenceReplacement(promptRef.current, selection, references);
4806 + return applyPromptReplacementStable(edit.start, edit.end, edit.text);
4807 + }
4808 + const text = references.map(formatInlineContextReference).join(" ");
4809 + const inserted = insertComposerTextStable(`${text} `, "cursor", {
4810 + ensureLeadingBoundary: true,
4811 + });
4812 + if (!inserted) {
4813 + setPrompt(ensureInlineContextReferences(promptRef.current, references));
4814 + }
4815 + return true;
4816 + },
4817 + });
4818 + };
4819 +
4820 const addComposerAttachments = async (
4821 files: File[],
4822 options?: {
@@ -4944,33 +5025,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
5025 });
5026 };
5027
4947 - const insertAttachmentReferences = (
4948 - references: ReadonlyArray<ComposerContextReference>,
4949 - selection?: { start: number; end: number },
4950 - ): boolean => {
4951 - if (references.length === 0) return false;
4952 - // Question answers carry attachments beside the answer, never as chips. Falling back to
4953 - // the thread prompt here would hide the file behind a reference the question never shows.
4954 - if (questionAttachmentTarget) return false;
4955 - return insertAttachmentReferencesForDraft({
4956 - target: composerDraftTarget,
4957 - liveAttachmentTargetKey: attachmentTargetKeyRef.current,
4958 - references,
4959 - insertReferences: () => {
4960 - if (selection) {
4961 - const edit = inlineContextReferenceReplacement(promptRef.current, selection, references);
4962 - return applyPromptReplacement(edit.start, edit.end, edit.text);
4963 - }
4964 - const text = references.map(formatInlineContextReference).join(" ");
4965 - const inserted = insertComposerText(`${text} `, "cursor", { ensureLeadingBoundary: true });
4966 - if (!inserted) {
4967 - setPrompt(ensureInlineContextReferences(promptRef.current, references));
4968 - }
4969 - return true;
4970 - },
4971 - });
4972 - };
4973 -
5028 const removeComposerImage = (imageId: string) => {
5029 const image = composerImagesRef.current.find((candidate) => candidate.id === imageId);
5030 const referenced = collectInlineContextIds(promptRef.current).includes(
@@ -5075,53 +5129,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
5129 () => resolveActiveComposerTrigger().trigger?.kind === "path",
5130 );
5131
5078 - const insertComposerText = (
5079 - text: string,
5080 - position: "cursor" | "end",
5081 - options?: {
5082 - ensureLeadingBoundary?: boolean;
5083 - citationCommentAnchor?: AssistantCitationSourceAnchor;
5084 - clipboardData?: DataTransfer;
5085 - },
5086 - ): boolean => {
5087 - if (
5088 - text.length === 0 ||
5089 - isConnecting ||
5090 - activePendingIsResponding ||
5091 - (pendingUserInputs.length > 0 && !activePendingProgress?.activeQuestion) ||
5092 - projectSelectionRequired ||
5093 - (options?.citationCommentAnchor && !composerEditorRef.current)
5094 - ) {
5095 - return false;
5096 - }
5097 - if (options?.clipboardData) {
5098 - text = importPastedComposerText(options.clipboardData, importContextFragment);
5099 - }
5100 - const prompt = promptRef.current;
5101 - const cursor = position === "cursor" ? readComposerSnapshot().expandedCursor : prompt.length;
5102 - const needsLeadingSpace =
5103 - (options?.ensureLeadingBoundary ?? false) &&
5104 - cursor > 0 &&
5105 - !/\s/.test(prompt[cursor - 1] ?? "");
5106 - const rangeEnd = extendReplacementRangeForTrailingSpace(prompt, cursor, text);
5107 - return applyPromptReplacement(
5108 - cursor,
5109 - rangeEnd,
5110 - needsLeadingSpace ? ` ${text}` : text,
5111 - options?.citationCommentAnchor
5112 - ? {
5113 - citationComment: {
5114 - start: cursor + (needsLeadingSpace ? 1 : 0),
5115 - sourceAnchor: options.citationCommentAnchor,
5116 - insertedSpaces: { before: needsLeadingSpace, after: rangeEnd === cursor },
5117 - },
5118 - focusEditorAfterReplace: false,
5119 - }
5120 - : undefined,
5121 - );
5122 - };
5123 - const insertComposerTextStable = useStableCallback(insertComposerText);
5124 -
5132 const insertComposerTextAtEnd: ChatComposerHandle["insertTextAtEnd"] = (text, options) => {
5133 const inserted = insertComposerText(text, "end", options);
5134 if (inserted && isComposerCollapsedMobile) {
apps/web/src/components/chat/TraitsPicker.tsx
+39 -24
@@ -1,7 +1,6 @@
1 import {
2 buildTraitsTriggerDisplay,
3 getDescriptorStringValue,
4 - getPromptControlledTraits,
4 getTraitSelectChange,
5 replaceDescriptorCurrentValue,
6 selectableProviderOptionChoices,
@@ -21,6 +20,7 @@ import {
20 buildProviderOptionSelectionsFromDescriptors,
21 getProviderOptionCurrentLabel,
22 getProviderOptionDescriptors,
23 + isClaudeUltrathinkPrompt,
24 normalizeModelSlug,
25 } from "@t3tools/shared/model";
26 import { memo } from "react";
@@ -50,6 +50,17 @@ import { useComposerMenuState } from "./useComposerMenuState";
50
51 type ProviderOptions = ReadonlyArray<ProviderOptionSelection>;
52
53 +/**
54 + * All the picker reads from the prompt while rendering. Passing this instead of
55 + * the prompt keeps the picker from re-rendering on every keystroke.
56 + */
57 +export type PromptUltrathink = "none" | "prefix" | "body";
58 +
59 +export function readPromptUltrathink(prompt: string): PromptUltrathink {
60 + if (!isClaudeUltrathinkPrompt(prompt)) return "none";
61 + return isClaudeUltrathinkPrompt(prompt.replace(/^Ultrathink:\s*/i, "")) ? "body" : "prefix";
62 +}
63 +
64 const SAVED_OPTION_LABELS: Readonly<Record<string, string>> = {
65 agent: "Agent",
66 effort: "Effort",
@@ -108,7 +119,7 @@ function getSelectedTraits(
119 provider: ProviderDriverKind,
120 models: ReadonlyArray<ServerProviderModel>,
121 model: string | null | undefined,
111 - prompt: string,
122 + promptUltrathink: PromptUltrathink,
123 modelOptions: ProviderOptions | null | undefined,
124 allowPromptInjectedEffort: boolean,
125 planModeEnabled: boolean,
@@ -144,11 +155,11 @@ function getSelectedTraits(
155 const thinkingDescriptor =
156 booleanDescriptors.find((descriptor) => descriptor.id === "thinking") ?? null;
157
147 - const { ultrathinkPromptControlled, ultrathinkInBodyText } = getPromptControlledTraits(
148 - descriptors,
149 - prompt,
150 - allowPromptInjectedEffort,
151 - );
158 + const ultrathinkPromptControlled =
159 + allowPromptInjectedEffort &&
160 + (primarySelectDescriptor?.promptInjectedValues?.length ?? 0) > 0 &&
161 + promptUltrathink !== "none";
162 + const ultrathinkInBodyText = ultrathinkPromptControlled && promptUltrathink === "body";
163 const effort =
164 (ultrathinkPromptControlled
165 ? "ultrathink"
@@ -186,7 +197,7 @@ function getTraitsSectionVisibility(input: {
197 provider: ProviderDriverKind;
198 models: ReadonlyArray<ServerProviderModel>;
199 model: string | null | undefined;
189 - prompt: string;
200 + promptUltrathink?: PromptUltrathink | undefined;
201 modelOptions: ProviderOptions | null | undefined;
202 allowPromptInjectedEffort?: boolean;
203 planModeEnabled: boolean;
@@ -195,7 +206,7 @@ function getTraitsSectionVisibility(input: {
206 input.provider,
207 input.models,
208 input.model,
198 - input.prompt,
209 + input.promptUltrathink ?? "none",
210 input.modelOptions,
211 input.allowPromptInjectedEffort ?? true,
212 input.planModeEnabled,
@@ -244,7 +255,7 @@ export function getReasoningTraitStep(input: {
255 input.provider,
256 input.models,
257 input.model,
247 - input.prompt,
258 + readPromptUltrathink(input.prompt),
259 input.modelOptions,
260 true,
261 input.planModeEnabled,
@@ -291,7 +302,7 @@ export function shouldRenderTraitsControls(input: {
302 provider: ProviderDriverKind;
303 models: ReadonlyArray<ServerProviderModel>;
304 model: string | null | undefined;
294 - prompt: string;
305 + promptUltrathink?: PromptUltrathink | undefined;
306 modelOptions: ProviderOptions | null | undefined;
307 allowPromptInjectedEffort?: boolean;
308 planModeEnabled: boolean;
@@ -304,8 +315,9 @@ export interface TraitsMenuContentProps {
315 instanceId?: ProviderInstanceId;
316 models: ReadonlyArray<ServerProviderModel>;
317 model: string | null | undefined;
307 - prompt: string;
308 - onPromptChange: (prompt: string) => void;
318 + promptUltrathink?: PromptUltrathink | undefined;
319 + /** Receives an edit of the live prompt; the picker never holds the prompt text itself. */
320 + onPromptEdit?: (edit: (prompt: string) => string) => void;
321 modelOptions?: ProviderOptions | null | undefined;
322 reportedModelSelection?: ModelSelection | null | undefined;
323 allowPromptInjectedEffort?: boolean;
@@ -319,8 +331,8 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
331 instanceId,
332 models,
333 model,
322 - prompt,
323 - onPromptChange,
334 + promptUltrathink,
335 + onPromptEdit,
336 modelOptions,
337 reportedModelSelection,
338 allowPromptInjectedEffort = true,
@@ -349,7 +361,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
361 provider,
362 models,
363 model,
352 - prompt,
364 + promptUltrathink,
365 modelOptions,
366 allowPromptInjectedEffort,
367 planModeEnabled,
@@ -372,9 +384,12 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
384 descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
385 value: string,
386 ) => {
375 - const change = getTraitSelectChange(selected, descriptor, prompt, value);
387 + // Whether a pick applies, and the options it writes, do not depend on the prompt text.
388 + const change = getTraitSelectChange(selected, descriptor, "", value);
389 if (!change) return;
377 - if (change.prompt !== prompt) onPromptChange(change.prompt);
390 + onPromptEdit?.(
391 + (prompt) => getTraitSelectChange(selected, descriptor, prompt, value)?.prompt ?? prompt,
392 + );
393 if ("modelOptions" in change) updateModelOptions(change.modelOptions);
394 };
395
@@ -500,8 +515,8 @@ export const TraitsPicker = memo(function TraitsPicker({
515 instanceId,
516 models,
517 model,
503 - prompt,
504 - onPromptChange,
518 + promptUltrathink,
519 + onPromptEdit,
520 modelOptions,
521 reportedModelSelection,
522 allowPromptInjectedEffort = true,
@@ -525,7 +540,7 @@ export const TraitsPicker = memo(function TraitsPicker({
540 provider,
541 models,
542 model,
528 - prompt,
543 + promptUltrathink,
544 modelOptions,
545 allowPromptInjectedEffort,
546 planModeEnabled,
@@ -535,7 +550,7 @@ export const TraitsPicker = memo(function TraitsPicker({
550 provider,
551 models,
552 model,
538 - prompt,
553 + promptUltrathink,
554 modelOptions,
555 allowPromptInjectedEffort,
556 planModeEnabled,
@@ -611,8 +626,8 @@ export const TraitsPicker = memo(function TraitsPicker({
626 {...(instanceId ? { instanceId } : {})}
627 models={models}
628 model={model}
614 - prompt={prompt}
615 - onPromptChange={onPromptChange}
629 + promptUltrathink={promptUltrathink}
630 + {...(onPromptEdit ? { onPromptEdit } : {})}
631 modelOptions={modelOptions}
632 reportedModelSelection={reportedModelSelection}
633 allowPromptInjectedEffort={allowPromptInjectedEffort}
apps/web/src/components/chat/composerProviderState.test.tsx
+10
@@ -11,6 +11,7 @@ import {
11 getComposerReasoningStep,
12 withImplicitFastModeDefault,
13 } from "./composerProviderState";
14 +import { readPromptUltrathink } from "./TraitsPicker";
15
16 const PROVIDER: ProviderDriverKind = ProviderDriverKind.make("codex");
17 const MODEL = "test-model";
@@ -238,6 +239,15 @@ describe("withImplicitFastModeDefault", () => {
239 });
240 });
241
242 +describe("readPromptUltrathink", () => {
243 + it("tells the Ultrathink prefix apart from the word in the body", () => {
244 + expect(readPromptUltrathink("Fix the bug")).toBe("none");
245 + expect(readPromptUltrathink("Ultrathink: Fix the bug")).toBe("prefix");
246 + expect(readPromptUltrathink("ultrathink about the bug")).toBe("body");
247 + expect(readPromptUltrathink("Ultrathink: ultrathink harder")).toBe("body");
248 + });
249 +});
250 +
251 describe("getComposerReasoningStep", () => {
252 const LEVELS = [
253 { id: "low", label: "Low" },
apps/web/src/components/chat/composerProviderState.tsx
+8 -7
@@ -24,6 +24,7 @@ import {
24 shouldRenderTraitsControls,
25 TraitsMenuContent,
26 TraitsPicker,
27 + type PromptUltrathink,
28 } from "./TraitsPicker";
29
30 export type ComposerProviderStateInput = {
@@ -55,8 +56,8 @@ type TraitsRenderInput = {
56 models: ReadonlyArray<ServerProviderModel>;
57 modelOptions: ReadonlyArray<ProviderOptionSelection> | undefined;
58 reportedModelSelection?: ModelSelection | null | undefined;
58 - prompt: string;
59 - onPromptChange: (prompt: string) => void;
59 + promptUltrathink: PromptUltrathink;
60 + onPromptEdit: (edit: (prompt: string) => string) => void;
61 planModeEnabled: boolean;
62 size?: ComposerControlSize;
63 hidden?: boolean;
@@ -230,8 +231,8 @@ function renderTraitsControl(
231 models,
232 modelOptions,
233 reportedModelSelection,
233 - prompt,
234 - onPromptChange,
234 + promptUltrathink,
235 + onPromptEdit,
236 planModeEnabled,
237 size,
238 hidden,
@@ -253,7 +254,7 @@ function renderTraitsControl(
254 models,
255 model,
256 modelOptions: resolvedModelOptions,
256 - prompt,
257 + promptUltrathink,
258 planModeEnabled,
259 })
260 ) {
@@ -269,8 +270,8 @@ function renderTraitsControl(
270 model={model}
271 modelOptions={resolvedModelOptions}
272 reportedModelSelection={reportedModelSelection}
272 - prompt={prompt}
273 - onPromptChange={onPromptChange}
273 + promptUltrathink={promptUltrathink}
274 + onPromptEdit={onPromptEdit}
275 planModeEnabled={planModeEnabled}
276 {...(size !== undefined ? { size } : {})}
277 {...(hidden !== undefined ? { hidden } : {})}
apps/web/src/components/settings/ProjectDefaultsSettings.tsx
-2
@@ -191,8 +191,6 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
191 provider={activeEntry.driverKind}
192 models={activeEntry.models}
193 model={selection.model}
194 - prompt=""
195 - onPromptChange={() => {}}
194 modelOptions={selection.options ?? []}
195 allowPromptInjectedEffort={false}
196 planModeEnabled={settings.planModeEnabled}
apps/web/src/components/settings/SettingsPanels.tsx
-2
@@ -1869,8 +1869,6 @@ export function GeneralSettingsPanel() {
1869 provider={textGenProvider}
1870 models={textGenInstanceEntry?.models ?? []}
1871 model={textGenModel}
1872 - prompt=""
1873 - onPromptChange={() => {}}
1872 modelOptions={textGenModelOptions}
1873 allowPromptInjectedEffort={false}
1874 planModeEnabled={
apps/web/src/components/settings/SourceControlWritingSettings.tsx
-4
@@ -397,8 +397,6 @@ export function SourceControlWritingSettingsSection() {
397 provider={writerInstanceEntry.driverKind}
398 models={writerInstanceEntry.models}
399 model={activeSelection.model}
400 - prompt=""
401 - onPromptChange={() => {}}
400 modelOptions={activeSelection.options ?? []}
401 allowPromptInjectedEffort={false}
402 planModeEnabled={
@@ -503,8 +501,6 @@ export function SourceControlWritingSettingsSection() {
501 provider={reviewGuideInstanceEntry.driverKind}
502 models={reviewGuideInstanceEntry.models}
503 model={reviewGuideSelection.model}
506 - prompt=""
507 - onPromptChange={() => {}}
504 modelOptions={reviewGuideSelection.options ?? []}
505 allowPromptInjectedEffort={false}
506 planModeEnabled={