Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Refactor composer refs and context providers (#2664)
Julius Marmingeb83e9c95e4f3
diff --git a/apps/web/package.json b/apps/web/package.jsonindex ba386f7d9..419721fde 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -35,8 +35,8 @@"effect": "catalog:","lexical": "^0.41.0","lucide-react": "^0.564.0",- "react": "^19.0.0",- "react-dom": "^19.0.0",+ "react": "19.2.6",+ "react-dom": "19.2.6","react-markdown": "^10.1.0","remark-gfm": "^4.0.1","tailwind-merge": "^3.4.0",@@ -48,12 +48,12 @@"@tailwindcss/vite": "^4.0.0","@tanstack/router-plugin": "^1.161.0","@types/babel__core": "^7.20.5",- "@types/react": "^19.0.0",- "@types/react-dom": "^19.0.0",+ "@types/react": "~19.2.14",+ "@types/react-dom": "~19.2.3","@vercel/config": "^0.3.0","@vitejs/plugin-react": "^6.0.0","@vitest/browser-playwright": "^4.0.18",- "babel-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",+ "babel-plugin-react-compiler": "1.0.0","msw": "2.12.11","playwright": "^1.58.2","tailwindcss": "^4.0.0",diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex a7567d6b4..d66d2487c 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -3607,7 +3607,7 @@ export default function ChatView(props: ChatViewProps) {<ComposerBannerStack className="relative z-0" items={composerBannerItems} /><div className="relative z-10"><ChatComposer- ref={composerRef}+ composerRef={composerRef}composerDraftTarget={composerDraftTarget}environmentId={environmentId}routeKind={routeKind}diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsxindex 1b3936ec7..7862191d4 100644--- a/apps/web/src/components/CommandPalette.tsx+++ b/apps/web/src/components/CommandPalette.tsx@@ -364,12 +364,12 @@ export function CommandPalette({ children }: { children: ReactNode }) {}, [keybindings, terminalOpen, toggleOpen]);return (- <ComposerHandleContext.Provider value={composerHandleRef}>+ <ComposerHandleContext value={composerHandleRef}><CommandDialog open={open} onOpenChange={setOpen}>{children}<CommandPaletteDialog /></CommandDialog>- </ComposerHandleContext.Provider>+ </ComposerHandleContext>);}diff --git a/apps/web/src/components/ComposerPromptEditor.tsx b/apps/web/src/components/ComposerPromptEditor.tsxindex 453be25a9..6f17c8663 100644--- a/apps/web/src/components/ComposerPromptEditor.tsx+++ b/apps/web/src/components/ComposerPromptEditor.tsx@@ -38,17 +38,14 @@ import {} from "lexical";import {createContext,- forwardRef,+ use,useCallback,- useContext,useEffect,+ useEffectEvent,useImperativeHandle,useLayoutEffect,useMemo,useRef,- type ClipboardEventHandler,- type ReactElement,- type Ref,} from "react";import {@@ -160,7 +157,7 @@ function ComposerMentionDecorator(props: { path: string }) {);}-class ComposerMentionNode extends DecoratorNode<ReactElement> {+class ComposerMentionNode extends DecoratorNode<React.ReactElement> {__path: string;static override getType(): string {@@ -208,7 +205,7 @@ class ComposerMentionNode extends DecoratorNode<ReactElement> {return true;}- override decorate(): ReactElement {+ override decorate(): React.ReactElement {return <ComposerMentionDecorator path={this.__path} />;}}@@ -278,7 +275,7 @@ function ComposerSkillDecorator(props: { skillLabel: string; skillDescription: s);}-class ComposerSkillNode extends DecoratorNode<ReactElement> {+class ComposerSkillNode extends DecoratorNode<React.ReactElement> {__skillName: string;__skillLabel: string;__skillDescription: string | null;@@ -346,7 +343,7 @@ class ComposerSkillNode extends DecoratorNode<ReactElement> {return true;}- override decorate(): ReactElement {+ override decorate(): React.ReactElement {return (<ComposerSkillDecoratorskillLabel={this.__skillLabel}@@ -368,7 +365,7 @@ function ComposerTerminalContextDecorator(props: { context: TerminalContextDraftreturn <ComposerPendingTerminalContextChip context={props.context} />;}-class ComposerTerminalContextNode extends DecoratorNode<ReactElement> {+class ComposerTerminalContextNode extends DecoratorNode<React.ReactElement> {__context: TerminalContextDraft;static override getType(): string {@@ -417,7 +414,7 @@ class ComposerTerminalContextNode extends DecoratorNode<ReactElement> {return true;}- override decorate(): ReactElement {+ override decorate(): React.ReactElement {return <ComposerTerminalContextDecorator context={this.__context} />;}}@@ -900,11 +897,8 @@ interface ComposerPromptEditorProps {key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab",event: KeyboardEvent,) => boolean;- onPaste: ClipboardEventHandler<HTMLElement>;-}--interface ComposerPromptEditorInnerProps extends ComposerPromptEditorProps {- editorRef: Ref<ComposerPromptEditorHandle>;+ onPaste: React.ClipboardEventHandler<HTMLElement>;+ editorRef: React.RefObject<ComposerPromptEditorHandle | null>;}function ComposerCommandKeyPlugin(props: {@@ -1059,7 +1053,7 @@ function ComposerInlineTokenSelectionNormalizePlugin() {function ComposerInlineTokenBackspacePlugin() {const [editor] = useLexicalComposerContext();- const { onRemoveTerminalContext } = useContext(ComposerTerminalContextActionsContext);+ const { onRemoveTerminalContext } = use(ComposerTerminalContextActionsContext);useEffect(() => {return editor.registerCommand(@@ -1150,68 +1144,65 @@ function ComposerSurroundSelectionPlugin(props: {skillMetadataRef.current = skillMetadataByName(props.skills);}, [props.skills]);- const applySurroundInsertion = useCallback(- (inputData: string): boolean => {- const surroundCloseSymbol = SURROUND_SYMBOLS_MAP.get(inputData);- const pendingSurroundSelection = pendingSurroundSelectionRef.current;- if (!surroundCloseSymbol) {- pendingSurroundSelectionRef.current = null;- return false;- }+ const applySurroundInsertion = useEffectEvent((inputData: string): boolean => {+ const surroundCloseSymbol = SURROUND_SYMBOLS_MAP.get(inputData);+ const pendingSurroundSelection = pendingSurroundSelectionRef.current;+ if (!surroundCloseSymbol) {+ pendingSurroundSelectionRef.current = null;+ return false;+ }- let handled = false;- editor.update(() => {- const selectionSnapshot =- pendingSurroundSelection ??- (() => {- const selection = $getSelection();- if (!$isRangeSelection(selection) || selection.isCollapsed()) {- return null;- }- if ($selectionTouchesInlineToken(selection)) {- return null;- }- const range = getSelectionRangeForExpandedComposerOffsets(selection);- if (!range || range.start === range.end) {- return null;- }- const value = $getRoot().getTextContent();- if (selectionTouchesMentionBoundary(value, range.start, range.end)) {- return null;- }- return {- value,- expandedStart: range.start,- expandedEnd: range.end,- };- })();-- if (!selectionSnapshot || !surroundCloseSymbol) {- return;- }+ let handled = false;+ editor.update(() => {+ const selectionSnapshot =+ pendingSurroundSelection ??+ (() => {+ const selection = $getSelection();+ if (!$isRangeSelection(selection) || selection.isCollapsed()) {+ return null;+ }+ if ($selectionTouchesInlineToken(selection)) {+ return null;+ }+ const range = getSelectionRangeForExpandedComposerOffsets(selection);+ if (!range || range.start === range.end) {+ return null;+ }+ const value = $getRoot().getTextContent();+ if (selectionTouchesMentionBoundary(value, range.start, range.end)) {+ return null;+ }+ return {+ value,+ expandedStart: range.start,+ expandedEnd: range.end,+ };+ })();++ if (!selectionSnapshot || !surroundCloseSymbol) {+ return;+ }- const selectedText = selectionSnapshot.value.slice(- selectionSnapshot.expandedStart,- selectionSnapshot.expandedEnd,- );- const nextValue = `${selectionSnapshot.value.slice(0, selectionSnapshot.expandedStart)}${inputData}${selectedText}${surroundCloseSymbol}${selectionSnapshot.value.slice(selectionSnapshot.expandedEnd)}`;- $setComposerEditorPrompt(nextValue, terminalContextsRef.current, skillMetadataRef.current);- const selectionStart = collapseExpandedComposerCursor(- nextValue,- selectionSnapshot.expandedStart,- );- $setSelectionRangeAtComposerOffsets(- selectionStart + inputData.length,- selectionStart + inputData.length + selectedText.length,- );- handled = true;- pendingSurroundSelectionRef.current = null;- });+ const selectedText = selectionSnapshot.value.slice(+ selectionSnapshot.expandedStart,+ selectionSnapshot.expandedEnd,+ );+ const nextValue = `${selectionSnapshot.value.slice(0, selectionSnapshot.expandedStart)}${inputData}${selectedText}${surroundCloseSymbol}${selectionSnapshot.value.slice(selectionSnapshot.expandedEnd)}`;+ $setComposerEditorPrompt(nextValue, terminalContextsRef.current, skillMetadataRef.current);+ const selectionStart = collapseExpandedComposerCursor(+ nextValue,+ selectionSnapshot.expandedStart,+ );+ $setSelectionRangeAtComposerOffsets(+ selectionStart + inputData.length,+ selectionStart + inputData.length + selectedText.length,+ );+ handled = true;+ pendingSurroundSelectionRef.current = null;+ });- return handled;- },- [editor],- );+ return handled;+ });useEffect(() => {const onKeyDown = (event: KeyboardEvent) => {@@ -1388,7 +1379,7 @@ function ComposerSurroundSelectionPlugin(props: {}unregisterRootListener();};- }, [applySurroundInsertion, editor]);+ }, [editor]);return null;}@@ -1406,7 +1397,7 @@ function ComposerPromptEditorInner({onCommandKeyDown,onPaste,editorRef,-}: ComposerPromptEditorInnerProps) {+}: ComposerPromptEditorProps) {const [editor] = useLexicalComposerContext();const onChangeRef = useRef(onChange);const initialCursor = clampCollapsedComposerCursor(value, cursor);@@ -1614,13 +1605,13 @@ function ComposerPromptEditorInner({}, []);return (- <ComposerTerminalContextActionsContext.Provider value={terminalContextActions}>+ <ComposerTerminalContextActionsContext value={terminalContextActions}><div className="relative"><PlainTextPlugincontentEditable={<ContentEditableclassName={cn(- "block max-h-[200px] min-h-17.5 w-full overflow-y-auto whitespace-pre-wrap wrap-break-word bg-transparent text-[16px] leading-relaxed text-foreground focus:outline-none sm:text-[14px]",+ "block max-h-50 min-h-17.5 w-full overflow-y-auto whitespace-pre-wrap wrap-break-word bg-transparent text-[16px] leading-relaxed text-foreground focus:outline-none sm:text-[14px]",className,)}data-testid="composer-editor"@@ -1646,29 +1637,24 @@ function ComposerPromptEditorInner({<ComposerInlineTokenBackspacePlugin /><HistoryPlugin /></div>- </ComposerTerminalContextActionsContext.Provider>+ </ComposerTerminalContextActionsContext>);}-export const ComposerPromptEditor = forwardRef<- ComposerPromptEditorHandle,- ComposerPromptEditorProps->(function ComposerPromptEditor(- {- value,- cursor,- terminalContexts,- skills,- disabled,- placeholder,- className,- onRemoveTerminalContext,- onChange,- onCommandKeyDown,- onPaste,- },- ref,-) {+export function ComposerPromptEditor({+ value,+ cursor,+ terminalContexts,+ skills,+ disabled,+ placeholder,+ className,+ onRemoveTerminalContext,+ onChange,+ onCommandKeyDown,+ onPaste,+ editorRef,+}: ComposerPromptEditorProps) {const initialValueRef = useRef(value);const initialTerminalContextsRef = useRef(terminalContexts);const initialSkillMetadataRef = useRef(skillMetadataByName(skills));@@ -1703,10 +1689,10 @@ export const ComposerPromptEditor = forwardRef<onRemoveTerminalContext={onRemoveTerminalContext}onChange={onChange}onPaste={onPaste}- editorRef={ref}+ editorRef={editorRef}{...(onCommandKeyDown ? { onCommandKeyDown } : {})}{...(className ? { className } : {})}/></LexicalComposer>);-});+}diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsxindex 2c4743de3..96fc34c10 100644--- a/apps/web/src/components/chat/ChatComposer.tsx+++ b/apps/web/src/components/chat/ChatComposer.tsx@@ -20,7 +20,6 @@ import {} from "@t3tools/contracts";import { createModelSelection, normalizeModelSlug } from "@t3tools/shared/model";import {- forwardRef,memo,useCallback,useEffect,@@ -446,12 +445,13 @@ export interface ChatComposerProps {gitCwd: string | null;// Refs the parent needs kept in sync- promptRef: React.MutableRefObject<string>;- composerImagesRef: React.MutableRefObject<ComposerImageAttachment[]>;- composerTerminalContextsRef: React.MutableRefObject<TerminalContextDraft[]>;+ promptRef: React.RefObject<string>;+ composerImagesRef: React.RefObject<ComposerImageAttachment[]>;+ composerTerminalContextsRef: React.RefObject<TerminalContextDraft[]>;+ composerRef: React.RefObject<ChatComposerHandle | null>;// Scroll- shouldAutoScrollRef: React.MutableRefObject<boolean>;+ shouldAutoScrollRef: React.RefObject<boolean>;scheduleStickToBottom: () => void;// Callbacks@@ -489,427 +489,423 @@ export interface ChatComposerProps {// Component// ---------------------------------------------------------------------------export const ChatComposer = memo(- forwardRef<ChatComposerHandle, ChatComposerProps>(function ChatComposer(props, ref) {- const {- composerDraftTarget,- environmentId,- routeKind,- routeThreadRef,- draftId,- activeThreadId,- activeThreadEnvironmentId: _activeThreadEnvironmentId,- activeThread,- isServerThread: _isServerThread,- isLocalDraftThread: _isLocalDraftThread,- phase,- isConnecting,- isSendBusy,- isPreparingWorktree,- environmentUnavailable,- activePendingApproval,- pendingApprovals,- pendingUserInputs,- activePendingProgress,- activePendingResolvedAnswers,- activePendingIsResponding,- activePendingDraftAnswers,- activePendingQuestionIndex,- respondingRequestIds,- showPlanFollowUpPrompt,- activeProposedPlan,- activePlan,- sidebarProposedPlan,- planSidebarLabel,- planSidebarOpen,- runtimeMode,- interactionMode,- lockedProvider,+export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) {+ const {+ composerDraftTarget,+ environmentId,+ routeKind,+ routeThreadRef,+ draftId,+ activeThreadId,+ activeThreadEnvironmentId: _activeThreadEnvironmentId,+ activeThread,+ isServerThread: _isServerThread,+ isLocalDraftThread: _isLocalDraftThread,+ phase,+ isConnecting,+ isSendBusy,+ isPreparingWorktree,+ environmentUnavailable,+ activePendingApproval,+ pendingApprovals,+ pendingUserInputs,+ activePendingProgress,+ activePendingResolvedAnswers,+ activePendingIsResponding,+ activePendingDraftAnswers,+ activePendingQuestionIndex,+ respondingRequestIds,+ showPlanFollowUpPrompt,+ activeProposedPlan,+ activePlan,+ sidebarProposedPlan,+ planSidebarLabel,+ planSidebarOpen,+ runtimeMode,+ interactionMode,+ lockedProvider,+ providerStatuses,+ activeProjectDefaultModelSelection,+ activeThreadModelSelection,+ activeThreadActivities,+ resolvedTheme,+ settings,+ keybindings,+ terminalOpen,+ gitCwd,+ promptRef,+ composerRef,+ composerImagesRef,+ composerTerminalContextsRef,+ shouldAutoScrollRef,+ scheduleStickToBottom,+ onSend,+ onInterrupt,+ onImplementPlanInNewThread,+ onRespondToApproval,+ onSelectActivePendingUserInputOption,+ onAdvanceActivePendingUserInput,+ onPreviousActivePendingUserInputQuestion,+ onChangeActivePendingUserInputCustomAnswer,+ onProviderModelSelect,+ toggleInteractionMode,+ handleRuntimeModeChange,+ handleInteractionModeChange,+ togglePlanSidebar,+ focusComposer,+ scheduleComposerFocus,+ setThreadError,+ onExpandImage,+ } = props;++ // ------------------------------------------------------------------+ // Store subscriptions (prompt / images / terminal contexts)+ // ------------------------------------------------------------------+ const composerDraft = useComposerThreadDraft(composerDraftTarget);+ const prompt = composerDraft.prompt;+ const composerImages = composerDraft.images;+ const composerTerminalContexts = composerDraft.terminalContexts;+ const nonPersistedComposerImageIds = composerDraft.nonPersistedImageIds;++ const setComposerDraftPrompt = useComposerDraftStore((store) => store.setPrompt);+ const addComposerDraftImage = useComposerDraftStore((store) => store.addImage);+ const addComposerDraftImages = useComposerDraftStore((store) => store.addImages);+ const removeComposerDraftImage = useComposerDraftStore((store) => store.removeImage);+ const insertComposerDraftTerminalContext = useComposerDraftStore(+ (store) => store.insertTerminalContext,+ );+ const removeComposerDraftTerminalContext = useComposerDraftStore(+ (store) => store.removeTerminalContext,+ );+ const setComposerDraftTerminalContexts = useComposerDraftStore(+ (store) => store.setTerminalContexts,+ );+ const clearComposerDraftPersistedAttachments = useComposerDraftStore(+ (store) => store.clearPersistedAttachments,+ );+ const syncComposerDraftPersistedAttachments = useComposerDraftStore(+ (store) => store.syncPersistedAttachments,+ );+ const getComposerDraft = useComposerDraftStore((store) => store.getComposerDraft);++ // ------------------------------------------------------------------+ // Model state+ // ------------------------------------------------------------------+ // Instance-aware projection of the wire provider list. One entry per+ // configured instance (default built-in + any custom `providerInstances.*`),+ // sorted default-first per driver kind for a stable picker order.+ const providerInstanceEntries = useMemo<ReadonlyArray<ProviderInstanceEntry>>(+ () => sortProviderInstanceEntries(deriveProviderInstanceEntries(providerStatuses)),+ [providerStatuses],+ );+ const selectedProviderByThreadId = composerDraft.activeProvider ?? null;+ const threadProvider =+ activeThread?.session?.providerInstanceId ??+ activeThreadModelSelection?.instanceId ??+ activeProjectDefaultModelSelection?.instanceId ??+ null;+ const explicitSelectedInstanceId = selectedProviderByThreadId ?? threadProvider;++ const unlockedSelectedProvider =+ resolveProviderDriverKindForInstanceSelection(+ providerInstanceEntries,providerStatuses,- activeProjectDefaultModelSelection,- activeThreadModelSelection,- activeThreadActivities,- resolvedTheme,- settings,- keybindings,- terminalOpen,- gitCwd,- promptRef,- composerImagesRef,- composerTerminalContextsRef,- shouldAutoScrollRef,- scheduleStickToBottom,- onSend,- onInterrupt,- onImplementPlanInNewThread,- onRespondToApproval,- onSelectActivePendingUserInputOption,- onAdvanceActivePendingUserInput,- onPreviousActivePendingUserInputQuestion,- onChangeActivePendingUserInputCustomAnswer,- onProviderModelSelect,- toggleInteractionMode,- handleRuntimeModeChange,- handleInteractionModeChange,- togglePlanSidebar,- focusComposer,- scheduleComposerFocus,- setThreadError,- onExpandImage,- } = props;-- // ------------------------------------------------------------------- // Store subscriptions (prompt / images / terminal contexts)- // ------------------------------------------------------------------- const composerDraft = useComposerThreadDraft(composerDraftTarget);- const prompt = composerDraft.prompt;- const composerImages = composerDraft.images;- const composerTerminalContexts = composerDraft.terminalContexts;- const nonPersistedComposerImageIds = composerDraft.nonPersistedImageIds;-- const setComposerDraftPrompt = useComposerDraftStore((store) => store.setPrompt);- const addComposerDraftImage = useComposerDraftStore((store) => store.addImage);- const addComposerDraftImages = useComposerDraftStore((store) => store.addImages);- const removeComposerDraftImage = useComposerDraftStore((store) => store.removeImage);- const insertComposerDraftTerminalContext = useComposerDraftStore(- (store) => store.insertTerminalContext,- );- const removeComposerDraftTerminalContext = useComposerDraftStore(- (store) => store.removeTerminalContext,- );- const setComposerDraftTerminalContexts = useComposerDraftStore(- (store) => store.setTerminalContexts,- );- const clearComposerDraftPersistedAttachments = useComposerDraftStore(- (store) => store.clearPersistedAttachments,- );- const syncComposerDraftPersistedAttachments = useComposerDraftStore(- (store) => store.syncPersistedAttachments,- );- const getComposerDraft = useComposerDraftStore((store) => store.getComposerDraft);-- // ------------------------------------------------------------------- // Model state- // ------------------------------------------------------------------- // Instance-aware projection of the wire provider list. One entry per- // configured instance (default built-in + any custom `providerInstances.*`),- // sorted default-first per driver kind for a stable picker order.- const providerInstanceEntries = useMemo<ReadonlyArray<ProviderInstanceEntry>>(- () => sortProviderInstanceEntries(deriveProviderInstanceEntries(providerStatuses)),- [providerStatuses],+ explicitSelectedInstanceId,+ ) ?? ProviderDriverKind.make("codex");+ const selectedProvider: ProviderDriverKind = lockedProvider ?? unlockedSelectedProvider;+ const lockedContinuationGroupKey = useMemo((): string | null => {+ if (!lockedProvider || !activeThread) return null;+ const lockedInstanceId =+ activeThread.session?.providerInstanceId ?? activeThreadModelSelection?.instanceId;+ if (!lockedInstanceId) return null;+ return (+ providerInstanceEntries.find((entry) => entry.instanceId === lockedInstanceId)+ ?.continuationGroupKey ?? null);- const selectedProviderByThreadId = composerDraft.activeProvider ?? null;- const threadProvider =- activeThread?.session?.providerInstanceId ??- activeThreadModelSelection?.instanceId ??- activeProjectDefaultModelSelection?.instanceId ??- null;- const explicitSelectedInstanceId = selectedProviderByThreadId ?? threadProvider;-- const unlockedSelectedProvider =- resolveProviderDriverKindForInstanceSelection(- providerInstanceEntries,- providerStatuses,- explicitSelectedInstanceId,- ) ?? ProviderDriverKind.make("codex");- const selectedProvider: ProviderDriverKind = lockedProvider ?? unlockedSelectedProvider;- const lockedContinuationGroupKey = useMemo((): string | null => {- if (!lockedProvider || !activeThread) return null;- const lockedInstanceId =- activeThread.session?.providerInstanceId ?? activeThreadModelSelection?.instanceId;- if (!lockedInstanceId) return null;- return (- providerInstanceEntries.find((entry) => entry.instanceId === lockedInstanceId)- ?.continuationGroupKey ?? null- );- }, [- activeThread,+ }, [+ activeThread,+ activeThreadModelSelection?.instanceId,+ lockedProvider,+ providerInstanceEntries,+ ]);++ // Resolve which configured instance the composer is currently targeting.+ // Priority:+ // 1. The composer draft's `activeProvider` — the user's unsaved pick+ // from the model picker (must win, otherwise the UI appears to+ // ignore picker selections).+ // 2. Thread's persisted instance id (server-side saved selection).+ // 3. Project default's instance id.+ // 4. First enabled entry matching the current driver kind.+ // 5. First enabled entry overall / default instance for the kind.+ //+ const selectedInstanceId = useMemo<ProviderInstanceId>(() => {+ const candidates: Array<string | null | undefined> = [+ composerDraft.activeProvider,+ activeThread?.session?.providerInstanceId,activeThreadModelSelection?.instanceId,- lockedProvider,- providerInstanceEntries,- ]);-- // Resolve which configured instance the composer is currently targeting.- // Priority:- // 1. The composer draft's `activeProvider` — the user's unsaved pick- // from the model picker (must win, otherwise the UI appears to- // ignore picker selections).- // 2. Thread's persisted instance id (server-side saved selection).- // 3. Project default's instance id.- // 4. First enabled entry matching the current driver kind.- // 5. First enabled entry overall / default instance for the kind.- //- const selectedInstanceId = useMemo<ProviderInstanceId>(() => {- const candidates: Array<string | null | undefined> = [- composerDraft.activeProvider,- activeThread?.session?.providerInstanceId,- activeThreadModelSelection?.instanceId,- activeProjectDefaultModelSelection?.instanceId,- ];- for (const candidate of candidates) {- if (!candidate) continue;- const match = providerInstanceEntries.find(- (entry) => entry.instanceId === candidate && entry.enabled,- );- if (match) {- // When locked to a specific driver kind, ignore persisted instance- // ids from a different kind or continuation group.- if (lockedProvider && match.driverKind !== lockedProvider) continue;- if (- lockedContinuationGroupKey &&- match.continuationGroupKey !== lockedContinuationGroupKey- ) {- continue;- }- return match.instanceId;+ activeProjectDefaultModelSelection?.instanceId,+ ];+ for (const candidate of candidates) {+ if (!candidate) continue;+ const match = providerInstanceEntries.find(+ (entry) => entry.instanceId === candidate && entry.enabled,+ );+ if (match) {+ // When locked to a specific driver kind, ignore persisted instance+ // ids from a different kind or continuation group.+ if (lockedProvider && match.driverKind !== lockedProvider) continue;+ if (+ lockedContinuationGroupKey &&+ match.continuationGroupKey !== lockedContinuationGroupKey+ ) {+ continue;}+ return match.instanceId;}- if (explicitSelectedInstanceId) {- return ProviderInstanceId.make(explicitSelectedInstanceId);- }- const byKind = providerInstanceEntries.find(- (entry) =>- entry.enabled &&- entry.driverKind === selectedProvider &&- (!lockedContinuationGroupKey ||- entry.continuationGroupKey === lockedContinuationGroupKey),- );- if (byKind) return byKind.instanceId;- const anyEnabled = providerInstanceEntries.find((entry) => entry.enabled);- return (- anyEnabled?.instanceId ??- providerInstanceEntries[0]?.instanceId ??- activeThreadModelSelection?.instanceId ??- activeProjectDefaultModelSelection?.instanceId ??- ProviderInstanceId.make("codex")- );- }, [- activeProjectDefaultModelSelection?.instanceId,- activeThread?.session?.providerInstanceId,- activeThreadModelSelection?.instanceId,- composerDraft.activeProvider,- explicitSelectedInstanceId,- lockedContinuationGroupKey,- lockedProvider,- providerInstanceEntries,- selectedProvider,- ]);-- const { modelOptions: composerModelOptions, selectedModel } = useEffectiveComposerModelState({- threadRef: composerDraftTarget,- providers: providerStatuses,- selectedProvider,- selectedInstanceId,- threadModelSelection: activeThreadModelSelection,- projectModelSelection: activeProjectDefaultModelSelection,- settings,- });-- // Resolve the active instance's snapshot by `instanceId` so a custom- // instance gets its own slash commands, skills, and model list — not- // the first snapshot for the same driver kind.- const selectedProviderEntry = useMemo(- () => providerInstanceEntries.find((entry) => entry.instanceId === selectedInstanceId),- [providerInstanceEntries, selectedInstanceId],+ }+ if (explicitSelectedInstanceId) {+ return ProviderInstanceId.make(explicitSelectedInstanceId);+ }+ const byKind = providerInstanceEntries.find(+ (entry) =>+ entry.enabled &&+ entry.driverKind === selectedProvider &&+ (!lockedContinuationGroupKey || entry.continuationGroupKey === lockedContinuationGroupKey),);- const selectedProviderStatus = useMemo(- () => selectedProviderEntry?.snapshot ?? null,- [selectedProviderEntry],- );- const selectedProviderModels = useMemo<ReadonlyArray<ServerProvider["models"][number]>>(- () => selectedProviderEntry?.models ?? [],- [selectedProviderEntry],+ if (byKind) return byKind.instanceId;+ const anyEnabled = providerInstanceEntries.find((entry) => entry.enabled);+ return (+ anyEnabled?.instanceId ??+ providerInstanceEntries[0]?.instanceId ??+ activeThreadModelSelection?.instanceId ??+ activeProjectDefaultModelSelection?.instanceId ??+ ProviderInstanceId.make("codex"));+ }, [+ activeProjectDefaultModelSelection?.instanceId,+ activeThread?.session?.providerInstanceId,+ activeThreadModelSelection?.instanceId,+ composerDraft.activeProvider,+ explicitSelectedInstanceId,+ lockedContinuationGroupKey,+ lockedProvider,+ providerInstanceEntries,+ selectedProvider,+ ]);++ const { modelOptions: composerModelOptions, selectedModel } = useEffectiveComposerModelState({+ threadRef: composerDraftTarget,+ providers: providerStatuses,+ selectedProvider,+ selectedInstanceId,+ threadModelSelection: activeThreadModelSelection,+ projectModelSelection: activeProjectDefaultModelSelection,+ settings,+ });- const composerProviderState = useMemo(- () =>- getComposerProviderState({- provider: selectedProvider,- model: selectedModel,- models: selectedProviderModels,- prompt,- modelOptions: composerModelOptions?.[selectedProvider],- }),- [composerModelOptions, prompt, selectedModel, selectedProvider, selectedProviderModels],- );+ // Resolve the active instance's snapshot by `instanceId` so a custom+ // instance gets its own slash commands, skills, and model list — not+ // the first snapshot for the same driver kind.+ const selectedProviderEntry = useMemo(+ () => providerInstanceEntries.find((entry) => entry.instanceId === selectedInstanceId),+ [providerInstanceEntries, selectedInstanceId],+ );+ const selectedProviderStatus = useMemo(+ () => selectedProviderEntry?.snapshot ?? null,+ [selectedProviderEntry],+ );+ const selectedProviderModels = useMemo<ReadonlyArray<ServerProvider["models"][number]>>(+ () => selectedProviderEntry?.models ?? [],+ [selectedProviderEntry],+ );- const selectedPromptEffort = composerProviderState.promptEffort;- const selectedModelOptionsForDispatch = composerProviderState.modelOptionsForDispatch;- const composerProviderControls = useMemo(- () => ({- showInteractionModeToggle: getProviderInteractionModeToggle(- providerStatuses,- selectedProvider,- ),+ const composerProviderState = useMemo(+ () =>+ getComposerProviderState({+ provider: selectedProvider,+ model: selectedModel,+ models: selectedProviderModels,+ prompt,+ modelOptions: composerModelOptions?.[selectedProvider],}),- [providerStatuses, selectedProvider],- );- const selectedModelSelection = useMemo<ModelSelection>(- () =>- createModelSelection(selectedInstanceId, selectedModel, selectedModelOptionsForDispatch),- [selectedInstanceId, selectedModel, selectedModelOptionsForDispatch],- );- const selectedModelForPicker = selectedModel;- // Instance-keyed option list so the picker can show each configured- // instance (built-in + custom) as a first-class sidebar entry. The- // options are server-reported models plus that exact instance's- // configured custom models; selected slugs are not injected into lists.- const modelOptionsByInstance = useMemo<- ReadonlyMap<ProviderInstanceId, ReadonlyArray<AppModelOption>>- >(() => {- const out = new Map<ProviderInstanceId, ReadonlyArray<AppModelOption>>();- for (const entry of providerInstanceEntries) {- out.set(entry.instanceId, getAppModelOptionsForInstance(settings, entry));- }- return out;- }, [providerInstanceEntries, settings]);- const selectedModelForPickerWithCustomFallback = useMemo(() => {- const currentOptions = modelOptionsByInstance.get(selectedInstanceId) ?? [];- return currentOptions.some((option) => option.slug === selectedModelForPicker)- ? selectedModelForPicker- : (normalizeModelSlug(selectedModelForPicker, selectedProvider) ?? selectedModelForPicker);- }, [modelOptionsByInstance, selectedInstanceId, selectedModelForPicker, selectedProvider]);-- // ------------------------------------------------------------------- // Context window- // ------------------------------------------------------------------- const activeContextWindow = useMemo(- () => deriveLatestContextWindowSnapshot(activeThreadActivities ?? []),- [activeThreadActivities],- );+ [composerModelOptions, prompt, selectedModel, selectedProvider, selectedProviderModels],+ );- // ------------------------------------------------------------------- // Composer-local state- // ------------------------------------------------------------------- const [composerCursor, setComposerCursor] = useState(() =>- collapseExpandedComposerCursor(prompt, prompt.length),- );- const [composerTrigger, setComposerTrigger] = useState<ComposerTrigger | null>(() =>- detectComposerTrigger(prompt, prompt.length),- );- const [composerHighlightedItemId, setComposerHighlightedItemId] = useState<string | null>(null);- const [composerHighlightedSearchKey, setComposerHighlightedSearchKey] = useState<string | null>(- null,- );- const [isDragOverComposer, setIsDragOverComposer] = useState(false);- const [isComposerFooterCompact, setIsComposerFooterCompact] = useState(false);- const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);- const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);- const [isComposerFocused, setIsComposerFocused] = useState(false);- const isMobileViewport = useMediaQuery("max-sm");- const isComposerCollapsedMobile = isMobileViewport && !isComposerFocused;-- // ------------------------------------------------------------------- // Refs- // ------------------------------------------------------------------- const composerEditorRef = useRef<ComposerPromptEditorHandle>(null);- const composerFormRef = useRef<HTMLFormElement>(null);- const composerSurfaceRef = useRef<HTMLDivElement>(null);- const composerFormHeightRef = useRef(0);- const composerSelectLockRef = useRef(false);- const composerMenuOpenRef = useRef(false);- const composerMenuItemsRef = useRef<ComposerCommandItem[]>([]);- const activeComposerMenuItemRef = useRef<ComposerCommandItem | null>(null);- const composerBlurFrameRef = useRef<number | null>(null);- const mobileComposerExpandFrameRef = useRef<number | null>(null);- const mobileComposerExpandReleaseFrameRef = useRef<number | null>(null);- const mobileComposerExpandInFlightRef = useRef(false);- const dragDepthRef = useRef(0);-- // ------------------------------------------------------------------- // Derived: composer send state- // ------------------------------------------------------------------- const composerSendState = useMemo(- () =>- deriveComposerSendState({- prompt,- imageCount: composerImages.length,- terminalContexts: composerTerminalContexts,- }),- [composerImages.length, composerTerminalContexts, prompt],- );+ const selectedPromptEffort = composerProviderState.promptEffort;+ const selectedModelOptionsForDispatch = composerProviderState.modelOptionsForDispatch;+ const composerProviderControls = useMemo(+ () => ({+ showInteractionModeToggle: getProviderInteractionModeToggle(+ providerStatuses,+ selectedProvider,+ ),+ }),+ [providerStatuses, selectedProvider],+ );+ const selectedModelSelection = useMemo<ModelSelection>(+ () => createModelSelection(selectedInstanceId, selectedModel, selectedModelOptionsForDispatch),+ [selectedInstanceId, selectedModel, selectedModelOptionsForDispatch],+ );+ const selectedModelForPicker = selectedModel;+ // Instance-keyed option list so the picker can show each configured+ // instance (built-in + custom) as a first-class sidebar entry. The+ // options are server-reported models plus that exact instance's+ // configured custom models; selected slugs are not injected into lists.+ const modelOptionsByInstance = useMemo<+ ReadonlyMap<ProviderInstanceId, ReadonlyArray<AppModelOption>>+ >(() => {+ const out = new Map<ProviderInstanceId, ReadonlyArray<AppModelOption>>();+ for (const entry of providerInstanceEntries) {+ out.set(entry.instanceId, getAppModelOptionsForInstance(settings, entry));+ }+ return out;+ }, [providerInstanceEntries, settings]);+ const selectedModelForPickerWithCustomFallback = useMemo(() => {+ const currentOptions = modelOptionsByInstance.get(selectedInstanceId) ?? [];+ return currentOptions.some((option) => option.slug === selectedModelForPicker)+ ? selectedModelForPicker+ : (normalizeModelSlug(selectedModelForPicker, selectedProvider) ?? selectedModelForPicker);+ }, [modelOptionsByInstance, selectedInstanceId, selectedModelForPicker, selectedProvider]);++ // ------------------------------------------------------------------+ // Context window+ // ------------------------------------------------------------------+ const activeContextWindow = useMemo(+ () => deriveLatestContextWindowSnapshot(activeThreadActivities ?? []),+ [activeThreadActivities],+ );- // ------------------------------------------------------------------- // Derived: composer trigger / menu- // ------------------------------------------------------------------- const composerTriggerKind = composerTrigger?.kind ?? null;- const pathTriggerQuery = composerTrigger?.kind === "path" ? composerTrigger.query : "";- const isPathTrigger = composerTriggerKind === "path";- const [debouncedPathQuery, composerPathQueryDebouncer] = useDebouncedValue(- pathTriggerQuery,- { wait: COMPOSER_PATH_QUERY_DEBOUNCE_MS },- (debouncerState) => ({ isPending: debouncerState.isPending }),- );- const effectivePathQuery = pathTriggerQuery.length > 0 ? debouncedPathQuery : "";- const workspaceEntriesQuery = useQuery(- projectSearchEntriesQueryOptions({- environmentId,- cwd: gitCwd,- query: effectivePathQuery,- enabled: isPathTrigger,- limit: 80,+ // ------------------------------------------------------------------+ // Composer-local state+ // ------------------------------------------------------------------+ const [composerCursor, setComposerCursor] = useState(() =>+ collapseExpandedComposerCursor(prompt, prompt.length),+ );+ const [composerTrigger, setComposerTrigger] = useState<ComposerTrigger | null>(() =>+ detectComposerTrigger(prompt, prompt.length),+ );+ const [composerHighlightedItemId, setComposerHighlightedItemId] = useState<string | null>(null);+ const [composerHighlightedSearchKey, setComposerHighlightedSearchKey] = useState<string | null>(+ null,+ );+ const [isDragOverComposer, setIsDragOverComposer] = useState(false);+ const [isComposerFooterCompact, setIsComposerFooterCompact] = useState(false);+ const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);+ const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);+ const [isComposerFocused, setIsComposerFocused] = useState(false);+ const isMobileViewport = useMediaQuery("max-sm");+ const isComposerCollapsedMobile = isMobileViewport && !isComposerFocused;++ // ------------------------------------------------------------------+ // Refs+ // ------------------------------------------------------------------+ const composerEditorRef = useRef<ComposerPromptEditorHandle>(null);+ const composerFormRef = useRef<HTMLFormElement>(null);+ const composerSurfaceRef = useRef<HTMLDivElement>(null);+ const composerFormHeightRef = useRef(0);+ const composerSelectLockRef = useRef(false);+ const composerMenuOpenRef = useRef(false);+ const composerMenuItemsRef = useRef<ComposerCommandItem[]>([]);+ const activeComposerMenuItemRef = useRef<ComposerCommandItem | null>(null);+ const composerBlurFrameRef = useRef<number | null>(null);+ const mobileComposerExpandFrameRef = useRef<number | null>(null);+ const mobileComposerExpandReleaseFrameRef = useRef<number | null>(null);+ const mobileComposerExpandInFlightRef = useRef(false);+ const dragDepthRef = useRef(0);++ // ------------------------------------------------------------------+ // Derived: composer send state+ // ------------------------------------------------------------------+ const composerSendState = useMemo(+ () =>+ deriveComposerSendState({+ prompt,+ imageCount: composerImages.length,+ terminalContexts: composerTerminalContexts,}),- );- const workspaceEntries = workspaceEntriesQuery.data?.entries ?? EMPTY_PROJECT_ENTRIES;-- const composerMenuItems = useMemo<ComposerCommandItem[]>(() => {- if (!composerTrigger) return [];- if (composerTrigger.kind === "path") {- return workspaceEntries.map((entry) => ({- id: `path:${entry.kind}:${entry.path}`,- type: "path",- path: entry.path,- pathKind: entry.kind,- label: basenameOfPath(entry.path),- description: entry.parentPath ?? "",- }));- }- if (composerTrigger.kind === "slash-command") {- const builtInSlashCommandItems = [- {- id: "slash:model",- type: "slash-command",- command: "model",- label: "/model",- description: "Switch response model for this thread",- },- {- id: "slash:plan",- type: "slash-command",- command: "plan",- label: "/plan",- description: "Switch this thread into plan mode",- },- {- id: "slash:default",- type: "slash-command",- command: "default",- label: "/default",- description: "Switch this thread back to normal build mode",- },- ] satisfies ReadonlyArray<Extract<ComposerCommandItem, { type: "slash-command" }>>;- const providerSlashCommandItems = (selectedProviderStatus?.slashCommands ?? []).map(- (command) => ({- id: `provider-slash-command:${selectedProvider}:${command.name}`,- type: "provider-slash-command" as const,- provider: selectedProvider,- command,- label: `/${command.name}`,- description: command.description ?? command.input?.hint ?? "Run provider command",- }),- );- const query = composerTrigger.query.trim().toLowerCase();- const slashCommandItems = [...builtInSlashCommandItems, ...providerSlashCommandItems];- if (!query) {- return slashCommandItems;- }- return searchSlashCommandItems(slashCommandItems, query);+ [composerImages.length, composerTerminalContexts, prompt],+ );++ // ------------------------------------------------------------------+ // Derived: composer trigger / menu+ // ------------------------------------------------------------------+ const composerTriggerKind = composerTrigger?.kind ?? null;+ const pathTriggerQuery = composerTrigger?.kind === "path" ? composerTrigger.query : "";+ const isPathTrigger = composerTriggerKind === "path";+ const [debouncedPathQuery, composerPathQueryDebouncer] = useDebouncedValue(+ pathTriggerQuery,+ { wait: COMPOSER_PATH_QUERY_DEBOUNCE_MS },+ (debouncerState) => ({ isPending: debouncerState.isPending }),+ );+ const effectivePathQuery = pathTriggerQuery.length > 0 ? debouncedPathQuery : "";+ const workspaceEntriesQuery = useQuery(+ projectSearchEntriesQueryOptions({+ environmentId,+ cwd: gitCwd,+ query: effectivePathQuery,+ enabled: isPathTrigger,+ limit: 80,+ }),+ );+ const workspaceEntries = workspaceEntriesQuery.data?.entries ?? EMPTY_PROJECT_ENTRIES;++ const composerMenuItems = useMemo<ComposerCommandItem[]>(() => {+ if (!composerTrigger) return [];+ if (composerTrigger.kind === "path") {+ return workspaceEntries.map((entry) => ({+ id: `path:${entry.kind}:${entry.path}`,+ type: "path",+ path: entry.path,+ pathKind: entry.kind,+ label: basenameOfPath(entry.path),+ description: entry.parentPath ?? "",+ }));+ }+ if (composerTrigger.kind === "slash-command") {+ const builtInSlashCommandItems = [+ {+ id: "slash:model",+ type: "slash-command",+ command: "model",+ label: "/model",+ description: "Switch response model for this thread",+ },+ {+ id: "slash:plan",+ type: "slash-command",+ command: "plan",+ label: "/plan",+ description: "Switch this thread into plan mode",+ },+ {+ id: "slash:default",+ type: "slash-command",+ command: "default",+ label: "/default",+ description: "Switch this thread back to normal build mode",+ },+ ] satisfies ReadonlyArray<Extract<ComposerCommandItem, { type: "slash-command" }>>;+ const providerSlashCommandItems = (selectedProviderStatus?.slashCommands ?? []).map(+ (command) => ({+ id: `provider-slash-command:${selectedProvider}:${command.name}`,+ type: "provider-slash-command" as const,+ provider: selectedProvider,+ command,+ label: `/${command.name}`,+ description: command.description ?? command.input?.hint ?? "Run provider command",+ }),+ );+ const query = composerTrigger.query.trim().toLowerCase();+ const slashCommandItems = [...builtInSlashCommandItems, ...providerSlashCommandItems];+ if (!query) {+ return slashCommandItems;}- if (composerTrigger.kind === "skill") {- return searchProviderSkills(- selectedProviderStatus?.skills ?? [],- composerTrigger.query,- ).map((skill) => ({+ return searchSlashCommandItems(slashCommandItems, query);+ }+ if (composerTrigger.kind === "skill") {+ return searchProviderSkills(selectedProviderStatus?.skills ?? [], composerTrigger.query).map(+ (skill) => ({id: `skill:${selectedProvider}:${skill.name}`,type: "skill" as const,provider: selectedProvider,@@ -919,1125 +915,1084 @@ export const ChatComposer = memo(skill.shortDescription ??skill.description ??(skill.scope ? `${skill.scope} skill` : "Run provider skill"),- }));- }- return [];- }, [composerTrigger, selectedProvider, selectedProviderStatus, workspaceEntries]);-- const composerMenuOpen = Boolean(composerTrigger);- const composerMenuSearchKey = composerTrigger- ? `${composerTrigger.kind}:${composerTrigger.query.trim().toLowerCase()}`- : null;- const activeComposerMenuItem = useMemo(() => {- const activeItemId = resolveComposerMenuActiveItemId({- items: composerMenuItems,- highlightedItemId: composerHighlightedItemId,- currentSearchKey: composerMenuSearchKey,- highlightedSearchKey: composerHighlightedSearchKey,- });- return composerMenuItems.find((item) => item.id === activeItemId) ?? null;- }, [- composerHighlightedItemId,- composerHighlightedSearchKey,- composerMenuItems,- composerMenuSearchKey,- ]);-- composerMenuOpenRef.current = composerMenuOpen;- composerMenuItemsRef.current = composerMenuItems;- activeComposerMenuItemRef.current = activeComposerMenuItem;-- const nonPersistedComposerImageIdSet = useMemo(- () => new Set(nonPersistedComposerImageIds),- [nonPersistedComposerImageIds],- );-- const isComposerApprovalState = activePendingApproval !== null;- const activePendingUserInput = pendingUserInputs[0] ?? null;- const hasComposerHeader =- isComposerApprovalState ||- pendingUserInputs.length > 0 ||- (showPlanFollowUpPrompt && activeProposedPlan !== null);- const showCollapsedMobilePromptRow =- isComposerCollapsedMobile && !isComposerApprovalState && pendingUserInputs.length === 0;-- const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;- const showPlanSidebarToggle = Boolean(activePlan || sidebarProposedPlan || planSidebarOpen);- const composerFooterActionLayoutKey = useMemo(() => {- if (activePendingProgress) {- return `pending:${activePendingProgress.questionIndex}:${activePendingProgress.isLastQuestion}:${activePendingIsResponding}`;- }- if (phase === "running") {- return "running";- }- if (showPlanFollowUpPrompt) {- return prompt.trim().length > 0 ? "plan:refine" : "plan:implement";- }- return `idle:${composerSendState.hasSendableContent}:${isSendBusy}:${isConnecting}:${isPreparingWorktree}`;- }, [- activePendingIsResponding,- activePendingProgress,- composerSendState.hasSendableContent,- isConnecting,- isPreparingWorktree,- isSendBusy,- phase,- prompt,- showPlanFollowUpPrompt,- ]);-- const isComposerMenuLoading =- composerTriggerKind === "path" &&- ((pathTriggerQuery.length > 0 && composerPathQueryDebouncer.state.isPending) ||- workspaceEntriesQuery.isLoading ||- workspaceEntriesQuery.isFetching);- const composerMenuEmptyState = useMemo(() => {- if (composerTriggerKind === "skill") {- return "No skills found. Try / to browse provider commands.";- }- return composerTriggerKind === "path"- ? "No matching files or folders."- : "No matching command.";- }, [composerTriggerKind]);-- // ------------------------------------------------------------------- // Provider traits UI- // ------------------------------------------------------------------- const setPromptFromTraits = useCallback(- (nextPrompt: string) => {- if (nextPrompt === promptRef.current) {- scheduleComposerFocus();- return;- }- promptRef.current = nextPrompt;- setComposerDraftPrompt(composerDraftTarget, nextPrompt);- const nextCursor = collapseExpandedComposerCursor(nextPrompt, nextPrompt.length);- setComposerCursor(nextCursor);- setComposerTrigger(detectComposerTrigger(nextPrompt, nextPrompt.length));- scheduleComposerFocus();- },- [composerDraftTarget, promptRef, scheduleComposerFocus, setComposerDraftPrompt],- );-- const providerTraitsMenuContent = renderProviderTraitsMenuContent({- provider: selectedProvider,- ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),- ...(routeKind === "draft" && draftId ? { draftId } : {}),- model: selectedModel,- models: selectedProviderModels,- modelOptions: composerModelOptions?.[selectedProvider],- prompt,- onPromptChange: setPromptFromTraits,- });- const providerTraitsPicker = renderProviderTraitsPicker({- provider: selectedProvider,- ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),- ...(routeKind === "draft" && draftId ? { draftId } : {}),- model: selectedModel,- models: selectedProviderModels,- modelOptions: composerModelOptions?.[selectedProvider],- prompt,- onPromptChange: setPromptFromTraits,+ }),+ );+ }+ return [];+ }, [composerTrigger, selectedProvider, selectedProviderStatus, workspaceEntries]);++ const composerMenuOpen = Boolean(composerTrigger);+ const composerMenuSearchKey = composerTrigger+ ? `${composerTrigger.kind}:${composerTrigger.query.trim().toLowerCase()}`+ : null;+ const activeComposerMenuItem = useMemo(() => {+ const activeItemId = resolveComposerMenuActiveItemId({+ items: composerMenuItems,+ highlightedItemId: composerHighlightedItemId,+ currentSearchKey: composerMenuSearchKey,+ highlightedSearchKey: composerHighlightedSearchKey,});- const pendingPrimaryAction = useMemo(- () =>- activePendingProgress- ? {- questionIndex: activePendingProgress.questionIndex,- isLastQuestion: activePendingProgress.isLastQuestion,- canAdvance: activePendingProgress.canAdvance,- isResponding: activePendingIsResponding,- isComplete: Boolean(activePendingResolvedAnswers),- }- : null,- [activePendingIsResponding, activePendingProgress, activePendingResolvedAnswers],- );- const collapsedComposerPrimaryActionDisabled =- phase === "running" || isSendBusy || isConnecting || !composerSendState.hasSendableContent;- const collapsedComposerPrimaryActionLabel = "Send message";- const showMobilePendingAnswerActions =- isMobileViewport && !isComposerCollapsedMobile && pendingPrimaryAction !== null;-- // ------------------------------------------------------------------- // Prompt helpers- // ------------------------------------------------------------------- const setPrompt = useCallback(- (nextPrompt: string) => {- setComposerDraftPrompt(composerDraftTarget, nextPrompt);- },- [composerDraftTarget, setComposerDraftPrompt],- );-- const addComposerImage = useCallback(- (image: ComposerImageAttachment) => {- addComposerDraftImage(composerDraftTarget, image);- },- [composerDraftTarget, addComposerDraftImage],- );-- const addComposerImagesToDraft = useCallback(- (images: ComposerImageAttachment[]) => {- addComposerDraftImages(composerDraftTarget, images);- },- [composerDraftTarget, addComposerDraftImages],- );-- const removeComposerImageFromDraft = useCallback(- (imageId: string) => {- removeComposerDraftImage(composerDraftTarget, imageId);- },- [composerDraftTarget, removeComposerDraftImage],- );-- const removeComposerTerminalContextFromDraft = useCallback(- (contextId: string) => {- const contextIndex = composerTerminalContexts.findIndex(- (context) => context.id === contextId,- );- if (contextIndex < 0) return;- const removal = removeInlineTerminalContextPlaceholder(promptRef.current, contextIndex);- promptRef.current = removal.prompt;- setPrompt(removal.prompt);- removeComposerDraftTerminalContext(composerDraftTarget, contextId);- const nextCursor = collapseExpandedComposerCursor(removal.prompt, removal.cursor);- setComposerCursor(nextCursor);- setComposerTrigger(detectComposerTrigger(removal.prompt, removal.cursor));- },- [- composerDraftTarget,- composerTerminalContexts,- promptRef,- removeComposerDraftTerminalContext,- setPrompt,- ],- );+ return composerMenuItems.find((item) => item.id === activeItemId) ?? null;+ }, [+ composerHighlightedItemId,+ composerHighlightedSearchKey,+ composerMenuItems,+ composerMenuSearchKey,+ ]);++ composerMenuOpenRef.current = composerMenuOpen;+ composerMenuItemsRef.current = composerMenuItems;+ activeComposerMenuItemRef.current = activeComposerMenuItem;++ const nonPersistedComposerImageIdSet = useMemo(+ () => new Set(nonPersistedComposerImageIds),+ [nonPersistedComposerImageIds],+ );- // ------------------------------------------------------------------- // Sync refs back to parent- // ------------------------------------------------------------------- useEffect(() => {- promptRef.current = prompt;- setComposerCursor((existing) => clampCollapsedComposerCursor(prompt, existing));- }, [prompt, promptRef]);-- useEffect(() => {- composerImagesRef.current = composerImages;- }, [composerImages, composerImagesRef]);-- useEffect(() => {- composerTerminalContextsRef.current = composerTerminalContexts;- }, [composerTerminalContexts, composerTerminalContextsRef]);-- // ------------------------------------------------------------------- // Composer menu highlight sync- // ------------------------------------------------------------------- useEffect(() => {- if (!composerMenuOpen) {- setComposerHighlightedItemId(null);- setComposerHighlightedSearchKey(null);- return;- }- const nextActiveItemId = resolveComposerMenuActiveItemId({- items: composerMenuItems,- highlightedItemId: composerHighlightedItemId,- currentSearchKey: composerMenuSearchKey,- highlightedSearchKey: composerHighlightedSearchKey,- });- setComposerHighlightedItemId((existing) =>- existing === nextActiveItemId ? existing : nextActiveItemId,- );- setComposerHighlightedSearchKey((existing) =>- existing === composerMenuSearchKey ? existing : composerMenuSearchKey,- );- }, [- composerHighlightedItemId,- composerHighlightedSearchKey,- composerMenuItems,- composerMenuOpen,- composerMenuSearchKey,- ]);-- const lastSyncedPendingInputRef = useRef<{- requestId: string | null;- questionId: string | null;- } | null>(null);-- useEffect(() => {- const nextCustomAnswer = activePendingProgress?.customAnswer;- if (typeof nextCustomAnswer !== "string") {- lastSyncedPendingInputRef.current = null;+ const isComposerApprovalState = activePendingApproval !== null;+ const activePendingUserInput = pendingUserInputs[0] ?? null;+ const hasComposerHeader =+ isComposerApprovalState ||+ pendingUserInputs.length > 0 ||+ (showPlanFollowUpPrompt && activeProposedPlan !== null);+ const showCollapsedMobilePromptRow =+ isComposerCollapsedMobile && !isComposerApprovalState && pendingUserInputs.length === 0;++ const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;+ const showPlanSidebarToggle = Boolean(activePlan || sidebarProposedPlan || planSidebarOpen);+ const composerFooterActionLayoutKey = useMemo(() => {+ if (activePendingProgress) {+ return `pending:${activePendingProgress.questionIndex}:${activePendingProgress.isLastQuestion}:${activePendingIsResponding}`;+ }+ if (phase === "running") {+ return "running";+ }+ if (showPlanFollowUpPrompt) {+ return prompt.trim().length > 0 ? "plan:refine" : "plan:implement";+ }+ return `idle:${composerSendState.hasSendableContent}:${isSendBusy}:${isConnecting}:${isPreparingWorktree}`;+ }, [+ activePendingIsResponding,+ activePendingProgress,+ composerSendState.hasSendableContent,+ isConnecting,+ isPreparingWorktree,+ isSendBusy,+ phase,+ prompt,+ showPlanFollowUpPrompt,+ ]);++ const isComposerMenuLoading =+ composerTriggerKind === "path" &&+ ((pathTriggerQuery.length > 0 && composerPathQueryDebouncer.state.isPending) ||+ workspaceEntriesQuery.isLoading ||+ workspaceEntriesQuery.isFetching);+ const composerMenuEmptyState = useMemo(() => {+ if (composerTriggerKind === "skill") {+ return "No skills found. Try / to browse provider commands.";+ }+ return composerTriggerKind === "path"+ ? "No matching files or folders."+ : "No matching command.";+ }, [composerTriggerKind]);++ // ------------------------------------------------------------------+ // Provider traits UI+ // ------------------------------------------------------------------+ const setPromptFromTraits = useCallback(+ (nextPrompt: string) => {+ if (nextPrompt === promptRef.current) {+ scheduleComposerFocus();return;}+ promptRef.current = nextPrompt;+ setComposerDraftPrompt(composerDraftTarget, nextPrompt);+ const nextCursor = collapseExpandedComposerCursor(nextPrompt, nextPrompt.length);+ setComposerCursor(nextCursor);+ setComposerTrigger(detectComposerTrigger(nextPrompt, nextPrompt.length));+ scheduleComposerFocus();+ },+ [composerDraftTarget, promptRef, scheduleComposerFocus, setComposerDraftPrompt],+ );- const nextRequestId = activePendingUserInput?.requestId ?? null;- const nextQuestionId = activePendingProgress?.activeQuestion?.id ?? null;- const questionChanged =- lastSyncedPendingInputRef.current?.requestId !== nextRequestId ||- lastSyncedPendingInputRef.current?.questionId !== nextQuestionId;- const textChangedExternally = promptRef.current !== nextCustomAnswer;+ const providerTraitsMenuContent = renderProviderTraitsMenuContent({+ provider: selectedProvider,+ ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),+ ...(routeKind === "draft" && draftId ? { draftId } : {}),+ model: selectedModel,+ models: selectedProviderModels,+ modelOptions: composerModelOptions?.[selectedProvider],+ prompt,+ onPromptChange: setPromptFromTraits,+ });+ const providerTraitsPicker = renderProviderTraitsPicker({+ provider: selectedProvider,+ ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),+ ...(routeKind === "draft" && draftId ? { draftId } : {}),+ model: selectedModel,+ models: selectedProviderModels,+ modelOptions: composerModelOptions?.[selectedProvider],+ prompt,+ onPromptChange: setPromptFromTraits,+ });+ const pendingPrimaryAction = useMemo(+ () =>+ activePendingProgress+ ? {+ questionIndex: activePendingProgress.questionIndex,+ isLastQuestion: activePendingProgress.isLastQuestion,+ canAdvance: activePendingProgress.canAdvance,+ isResponding: activePendingIsResponding,+ isComplete: Boolean(activePendingResolvedAnswers),+ }+ : null,+ [activePendingIsResponding, activePendingProgress, activePendingResolvedAnswers],+ );+ const collapsedComposerPrimaryActionDisabled =+ phase === "running" || isSendBusy || isConnecting || !composerSendState.hasSendableContent;+ const collapsedComposerPrimaryActionLabel = "Send message";+ const showMobilePendingAnswerActions =+ isMobileViewport && !isComposerCollapsedMobile && pendingPrimaryAction !== null;++ // ------------------------------------------------------------------+ // Prompt helpers+ // ------------------------------------------------------------------+ const setPrompt = useCallback(+ (nextPrompt: string) => {+ setComposerDraftPrompt(composerDraftTarget, nextPrompt);+ },+ [composerDraftTarget, setComposerDraftPrompt],+ );- lastSyncedPendingInputRef.current = {- requestId: nextRequestId,- questionId: nextQuestionId,- };+ const addComposerImage = useCallback(+ (image: ComposerImageAttachment) => {+ addComposerDraftImage(composerDraftTarget, image);+ },+ [composerDraftTarget, addComposerDraftImage],+ );- if (!questionChanged && !textChangedExternally) {- return;- }+ const addComposerImagesToDraft = useCallback(+ (images: ComposerImageAttachment[]) => {+ addComposerDraftImages(composerDraftTarget, images);+ },+ [composerDraftTarget, addComposerDraftImages],+ );- promptRef.current = nextCustomAnswer;- const nextCursor = collapseExpandedComposerCursor(nextCustomAnswer, nextCustomAnswer.length);- setComposerCursor(nextCursor);- setComposerTrigger(- detectComposerTrigger(- nextCustomAnswer,- expandCollapsedComposerCursor(nextCustomAnswer, nextCursor),- ),+ const removeComposerImageFromDraft = useCallback(+ (imageId: string) => {+ removeComposerDraftImage(composerDraftTarget, imageId);+ },+ [composerDraftTarget, removeComposerDraftImage],+ );++ const removeComposerTerminalContextFromDraft = useCallback(+ (contextId: string) => {+ const contextIndex = composerTerminalContexts.findIndex(+ (context) => context.id === contextId,);- setComposerHighlightedItemId(null);- }, [- activePendingProgress?.customAnswer,- activePendingProgress?.activeQuestion?.id,- activePendingUserInput?.requestId,+ if (contextIndex < 0) return;+ const removal = removeInlineTerminalContextPlaceholder(promptRef.current, contextIndex);+ promptRef.current = removal.prompt;+ setPrompt(removal.prompt);+ removeComposerDraftTerminalContext(composerDraftTarget, contextId);+ const nextCursor = collapseExpandedComposerCursor(removal.prompt, removal.cursor);+ setComposerCursor(nextCursor);+ setComposerTrigger(detectComposerTrigger(removal.prompt, removal.cursor));+ },+ [+ composerDraftTarget,+ composerTerminalContexts,promptRef,- ]);+ removeComposerDraftTerminalContext,+ setPrompt,+ ],+ );- // ------------------------------------------------------------------- // Reset compositor state on thread/draft change- // ------------------------------------------------------------------- useEffect(() => {+ // ------------------------------------------------------------------+ // Sync refs back to parent+ // ------------------------------------------------------------------+ useEffect(() => {+ promptRef.current = prompt;+ setComposerCursor((existing) => clampCollapsedComposerCursor(prompt, existing));+ }, [prompt, promptRef]);++ useEffect(() => {+ composerImagesRef.current = composerImages;+ }, [composerImages, composerImagesRef]);++ useEffect(() => {+ composerTerminalContextsRef.current = composerTerminalContexts;+ }, [composerTerminalContexts, composerTerminalContextsRef]);++ // ------------------------------------------------------------------+ // Composer menu highlight sync+ // ------------------------------------------------------------------+ useEffect(() => {+ if (!composerMenuOpen) {setComposerHighlightedItemId(null);- setComposerCursor(- collapseExpandedComposerCursor(promptRef.current, promptRef.current.length),- );- setComposerTrigger(detectComposerTrigger(promptRef.current, promptRef.current.length));- dragDepthRef.current = 0;- setIsDragOverComposer(false);- }, [draftId, activeThreadId, promptRef]);-- // ------------------------------------------------------------------- // Footer compact layout observation- // ------------------------------------------------------------------- useLayoutEffect(() => {- const composerForm = composerFormRef.current;- if (!composerForm) return;- const measureComposerFormWidth = () => composerForm.clientWidth;- const measureFooterCompactness = () => {- const composerFormWidth = measureComposerFormWidth();- const footerCompact = shouldUseCompactComposerFooter(composerFormWidth, {+ setComposerHighlightedSearchKey(null);+ return;+ }+ const nextActiveItemId = resolveComposerMenuActiveItemId({+ items: composerMenuItems,+ highlightedItemId: composerHighlightedItemId,+ currentSearchKey: composerMenuSearchKey,+ highlightedSearchKey: composerHighlightedSearchKey,+ });+ setComposerHighlightedItemId((existing) =>+ existing === nextActiveItemId ? existing : nextActiveItemId,+ );+ setComposerHighlightedSearchKey((existing) =>+ existing === composerMenuSearchKey ? existing : composerMenuSearchKey,+ );+ }, [+ composerHighlightedItemId,+ composerHighlightedSearchKey,+ composerMenuItems,+ composerMenuOpen,+ composerMenuSearchKey,+ ]);++ const lastSyncedPendingInputRef = useRef<{+ requestId: string | null;+ questionId: string | null;+ } | null>(null);++ useEffect(() => {+ const nextCustomAnswer = activePendingProgress?.customAnswer;+ if (typeof nextCustomAnswer !== "string") {+ lastSyncedPendingInputRef.current = null;+ return;+ }++ const nextRequestId = activePendingUserInput?.requestId ?? null;+ const nextQuestionId = activePendingProgress?.activeQuestion?.id ?? null;+ const questionChanged =+ lastSyncedPendingInputRef.current?.requestId !== nextRequestId ||+ lastSyncedPendingInputRef.current?.questionId !== nextQuestionId;+ const textChangedExternally = promptRef.current !== nextCustomAnswer;++ lastSyncedPendingInputRef.current = {+ requestId: nextRequestId,+ questionId: nextQuestionId,+ };++ if (!questionChanged && !textChangedExternally) {+ return;+ }++ promptRef.current = nextCustomAnswer;+ const nextCursor = collapseExpandedComposerCursor(nextCustomAnswer, nextCustomAnswer.length);+ setComposerCursor(nextCursor);+ setComposerTrigger(+ detectComposerTrigger(+ nextCustomAnswer,+ expandCollapsedComposerCursor(nextCustomAnswer, nextCursor),+ ),+ );+ setComposerHighlightedItemId(null);+ }, [+ activePendingProgress?.customAnswer,+ activePendingProgress?.activeQuestion?.id,+ activePendingUserInput?.requestId,+ promptRef,+ ]);++ // ------------------------------------------------------------------+ // Reset compositor state on thread/draft change+ // ------------------------------------------------------------------+ useEffect(() => {+ setComposerHighlightedItemId(null);+ setComposerCursor(collapseExpandedComposerCursor(promptRef.current, promptRef.current.length));+ setComposerTrigger(detectComposerTrigger(promptRef.current, promptRef.current.length));+ dragDepthRef.current = 0;+ setIsDragOverComposer(false);+ }, [draftId, activeThreadId, promptRef]);++ // ------------------------------------------------------------------+ // Footer compact layout observation+ // ------------------------------------------------------------------+ useLayoutEffect(() => {+ const composerForm = composerFormRef.current;+ if (!composerForm) return;+ const measureComposerFormWidth = () => composerForm.clientWidth;+ const measureFooterCompactness = () => {+ const composerFormWidth = measureComposerFormWidth();+ const footerCompact = shouldUseCompactComposerFooter(composerFormWidth, {+ hasWideActions: composerFooterHasWideActions,+ });+ const primaryActionsCompact =+ footerCompact &&+ shouldUseCompactComposerPrimaryActions(composerFormWidth, {hasWideActions: composerFooterHasWideActions,});- const primaryActionsCompact =- footerCompact &&- shouldUseCompactComposerPrimaryActions(composerFormWidth, {- hasWideActions: composerFooterHasWideActions,- });- return {- primaryActionsCompact,- footerCompact,- };+ return {+ primaryActionsCompact,+ footerCompact,};+ };- composerFormHeightRef.current = composerForm.getBoundingClientRect().height;- const initialCompactness = measureFooterCompactness();- setIsComposerPrimaryActionsCompact(initialCompactness.primaryActionsCompact);- setIsComposerFooterCompact(initialCompactness.footerCompact);- if (typeof ResizeObserver === "undefined") return;-- const observer = new ResizeObserver((entries) => {- const [entry] = entries;- if (!entry) return;- const nextCompactness = measureFooterCompactness();- setIsComposerPrimaryActionsCompact((previous) =>- previous === nextCompactness.primaryActionsCompact- ? previous- : nextCompactness.primaryActionsCompact,- );- setIsComposerFooterCompact((previous) =>- previous === nextCompactness.footerCompact ? previous : nextCompactness.footerCompact,- );- const nextHeight = entry.contentRect.height;- const previousHeight = composerFormHeightRef.current;- composerFormHeightRef.current = nextHeight;- if (previousHeight > 0 && Math.abs(nextHeight - previousHeight) < 0.5) return;- if (!shouldAutoScrollRef.current) return;- scheduleStickToBottom();- });+ composerFormHeightRef.current = composerForm.getBoundingClientRect().height;+ const initialCompactness = measureFooterCompactness();+ setIsComposerPrimaryActionsCompact(initialCompactness.primaryActionsCompact);+ setIsComposerFooterCompact(initialCompactness.footerCompact);+ if (typeof ResizeObserver === "undefined") return;++ const observer = new ResizeObserver((entries) => {+ const [entry] = entries;+ if (!entry) return;+ const nextCompactness = measureFooterCompactness();+ setIsComposerPrimaryActionsCompact((previous) =>+ previous === nextCompactness.primaryActionsCompact+ ? previous+ : nextCompactness.primaryActionsCompact,+ );+ setIsComposerFooterCompact((previous) =>+ previous === nextCompactness.footerCompact ? previous : nextCompactness.footerCompact,+ );+ const nextHeight = entry.contentRect.height;+ const previousHeight = composerFormHeightRef.current;+ composerFormHeightRef.current = nextHeight;+ if (previousHeight > 0 && Math.abs(nextHeight - previousHeight) < 0.5) return;+ if (!shouldAutoScrollRef.current) return;+ scheduleStickToBottom();+ });- observer.observe(composerForm);- return () => {- observer.disconnect();- };- }, [- activeThreadId,- composerFooterActionLayoutKey,- composerFooterHasWideActions,- scheduleStickToBottom,- shouldAutoScrollRef,- ]);-- // ------------------------------------------------------------------- // Image persist effect- // ------------------------------------------------------------------- useEffect(() => {- let cancelled = false;- void (async () => {- if (composerImages.length === 0) {- clearComposerDraftPersistedAttachments(composerDraftTarget);- return;- }- const getPersistedAttachmentsForThread = () =>- getComposerDraft(composerDraftTarget)?.persistedAttachments ?? [];- try {- const currentPersistedAttachments = getPersistedAttachmentsForThread();- const existingPersistedById = new Map(- currentPersistedAttachments.map((attachment) => [attachment.id, attachment]),- );- const stagedAttachmentById = new Map<string, PersistedComposerImageAttachment>();- await Promise.all(- composerImages.map(async (image) => {- try {- const dataUrl = await readFileAsDataUrl(image.file);- stagedAttachmentById.set(image.id, {- id: image.id,- name: image.name,- mimeType: image.mimeType,- sizeBytes: image.sizeBytes,- dataUrl,- });- } catch {- const existingPersisted = existingPersistedById.get(image.id);- if (existingPersisted) {- stagedAttachmentById.set(image.id, existingPersisted);- }+ observer.observe(composerForm);+ return () => {+ observer.disconnect();+ };+ }, [+ activeThreadId,+ composerFooterActionLayoutKey,+ composerFooterHasWideActions,+ scheduleStickToBottom,+ shouldAutoScrollRef,+ ]);++ // ------------------------------------------------------------------+ // Image persist effect+ // ------------------------------------------------------------------+ useEffect(() => {+ let cancelled = false;+ void (async () => {+ if (composerImages.length === 0) {+ clearComposerDraftPersistedAttachments(composerDraftTarget);+ return;+ }+ const getPersistedAttachmentsForThread = () =>+ getComposerDraft(composerDraftTarget)?.persistedAttachments ?? [];+ try {+ const currentPersistedAttachments = getPersistedAttachmentsForThread();+ const existingPersistedById = new Map(+ currentPersistedAttachments.map((attachment) => [attachment.id, attachment]),+ );+ const stagedAttachmentById = new Map<string, PersistedComposerImageAttachment>();+ await Promise.all(+ composerImages.map(async (image) => {+ try {+ const dataUrl = await readFileAsDataUrl(image.file);+ stagedAttachmentById.set(image.id, {+ id: image.id,+ name: image.name,+ mimeType: image.mimeType,+ sizeBytes: image.sizeBytes,+ dataUrl,+ });+ } catch {+ const existingPersisted = existingPersistedById.get(image.id);+ if (existingPersisted) {+ stagedAttachmentById.set(image.id, existingPersisted);}- }),- );- const serialized = Array.from(stagedAttachmentById.values());- if (cancelled) return;- syncComposerDraftPersistedAttachments(composerDraftTarget, serialized);- } catch {- const currentImageIds = new Set(composerImages.map((image) => image.id));- const fallbackPersistedAttachments = getPersistedAttachmentsForThread();- const fallbackPersistedIds = fallbackPersistedAttachments- .map((attachment) => attachment.id)- .filter((id) => currentImageIds.has(id));- const fallbackPersistedIdSet = new Set(fallbackPersistedIds);- const fallbackAttachments = fallbackPersistedAttachments.filter((attachment) =>- fallbackPersistedIdSet.has(attachment.id),- );- if (cancelled) return;- syncComposerDraftPersistedAttachments(composerDraftTarget, fallbackAttachments);- }- })();- return () => {- cancelled = true;- };- }, [- composerDraftTarget,- clearComposerDraftPersistedAttachments,- composerImages,- getComposerDraft,- syncComposerDraftPersistedAttachments,- ]);-- // ------------------------------------------------------------------- // Callbacks: prompt change- // ------------------------------------------------------------------- const onPromptChange = useCallback(- (- nextPrompt: string,- nextCursor: number,- expandedCursor: number,- cursorAdjacentToMention: boolean,- terminalContextIds: string[],- ) => {- if (activePendingProgress?.activeQuestion && pendingUserInputs.length > 0) {- setComposerCursor(nextCursor);- setComposerTrigger(- cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),- );- onChangeActivePendingUserInputCustomAnswer(- activePendingProgress.activeQuestion.id,- nextPrompt,- nextCursor,- expandedCursor,- cursorAdjacentToMention,- );- return;- }- promptRef.current = nextPrompt;- setPrompt(nextPrompt);- if (!terminalContextIdListsEqual(composerTerminalContexts, terminalContextIds)) {- setComposerDraftTerminalContexts(- composerDraftTarget,- syncTerminalContextsByIds(composerTerminalContexts, terminalContextIds),- );- }+ }+ }),+ );+ const serialized = Array.from(stagedAttachmentById.values());+ if (cancelled) return;+ syncComposerDraftPersistedAttachments(composerDraftTarget, serialized);+ } catch {+ const currentImageIds = new Set(composerImages.map((image) => image.id));+ const fallbackPersistedAttachments = getPersistedAttachmentsForThread();+ const fallbackPersistedIds = fallbackPersistedAttachments+ .map((attachment) => attachment.id)+ .filter((id) => currentImageIds.has(id));+ const fallbackPersistedIdSet = new Set(fallbackPersistedIds);+ const fallbackAttachments = fallbackPersistedAttachments.filter((attachment) =>+ fallbackPersistedIdSet.has(attachment.id),+ );+ if (cancelled) return;+ syncComposerDraftPersistedAttachments(composerDraftTarget, fallbackAttachments);+ }+ })();+ return () => {+ cancelled = true;+ };+ }, [+ composerDraftTarget,+ clearComposerDraftPersistedAttachments,+ composerImages,+ getComposerDraft,+ syncComposerDraftPersistedAttachments,+ ]);++ // ------------------------------------------------------------------+ // Callbacks: prompt change+ // ------------------------------------------------------------------+ const onPromptChange = useCallback(+ (+ nextPrompt: string,+ nextCursor: number,+ expandedCursor: number,+ cursorAdjacentToMention: boolean,+ terminalContextIds: string[],+ ) => {+ if (activePendingProgress?.activeQuestion && pendingUserInputs.length > 0) {setComposerCursor(nextCursor);setComposerTrigger(cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),);- },- [- activePendingProgress?.activeQuestion,- pendingUserInputs.length,- onChangeActivePendingUserInputCustomAnswer,- promptRef,- setPrompt,- composerDraftTarget,- composerTerminalContexts,- setComposerDraftTerminalContexts,- ],- );-- // ------------------------------------------------------------------- // Callbacks: prompt replacement / menu- // ------------------------------------------------------------------- const applyPromptReplacement = useCallback(- (- rangeStart: number,- rangeEnd: number,- replacement: string,- options?: { expectedText?: string; focusEditorAfterReplace?: boolean },- ): boolean => {- const currentText = promptRef.current;- const safeStart = Math.max(0, Math.min(currentText.length, rangeStart));- const safeEnd = Math.max(safeStart, Math.min(currentText.length, rangeEnd));- if (- options?.expectedText !== undefined &&- currentText.slice(safeStart, safeEnd) !== options.expectedText- ) {- return false;- }- const next = replaceTextRange(promptRef.current, rangeStart, rangeEnd, replacement);- const nextCursor = collapseExpandedComposerCursor(next.text, next.cursor);- const nextExpandedCursor = expandCollapsedComposerCursor(next.text, nextCursor);- promptRef.current = next.text;- const activePendingQuestion = activePendingProgress?.activeQuestion;- if (activePendingQuestion && activePendingUserInput) {- onChangeActivePendingUserInputCustomAnswer(- activePendingQuestion.id,- next.text,- nextCursor,- nextExpandedCursor,- false,- );- } else {- setPrompt(next.text);- }- setComposerCursor(nextCursor);- setComposerTrigger(detectComposerTrigger(next.text, nextExpandedCursor));- if (options?.focusEditorAfterReplace !== false) {- window.requestAnimationFrame(() => {- composerEditorRef.current?.focusAt(nextCursor);- });- }- return true;- },- [- activePendingProgress?.activeQuestion,- activePendingUserInput,- onChangeActivePendingUserInputCustomAnswer,- promptRef,- setPrompt,- ],- );-- const readComposerSnapshot = useCallback((): {- value: string;- cursor: number;- expandedCursor: number;- terminalContextIds: string[];- } => {- const editorSnapshot = composerEditorRef.current?.readSnapshot();- if (editorSnapshot) {- return editorSnapshot;+ onChangeActivePendingUserInputCustomAnswer(+ activePendingProgress.activeQuestion.id,+ nextPrompt,+ nextCursor,+ expandedCursor,+ cursorAdjacentToMention,+ );+ return;}- return {- value: promptRef.current,- cursor: composerCursor,- expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),- terminalContextIds: composerTerminalContexts.map((context) => context.id),- };- }, [composerCursor, composerTerminalContexts, promptRef]);-- const resolveActiveComposerTrigger = useCallback((): {- snapshot: { value: string; cursor: number; expandedCursor: number };- trigger: ComposerTrigger | null;- } => {- const snapshot = readComposerSnapshot();- return {- snapshot,- trigger: detectComposerTrigger(snapshot.value, snapshot.expandedCursor),- };- }, [readComposerSnapshot]);+ promptRef.current = nextPrompt;+ setPrompt(nextPrompt);+ if (!terminalContextIdListsEqual(composerTerminalContexts, terminalContextIds)) {+ setComposerDraftTerminalContexts(+ composerDraftTarget,+ syncTerminalContextsByIds(composerTerminalContexts, terminalContextIds),+ );+ }+ setComposerCursor(nextCursor);+ setComposerTrigger(+ cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),+ );+ },+ [+ activePendingProgress?.activeQuestion,+ pendingUserInputs.length,+ onChangeActivePendingUserInputCustomAnswer,+ promptRef,+ setPrompt,+ composerDraftTarget,+ composerTerminalContexts,+ setComposerDraftTerminalContexts,+ ],+ );- const onSelectComposerItem = useCallback(- (item: ComposerCommandItem) => {- if (composerSelectLockRef.current) return;- composerSelectLockRef.current = true;+ // ------------------------------------------------------------------+ // Callbacks: prompt replacement / menu+ // ------------------------------------------------------------------+ const applyPromptReplacement = useCallback(+ (+ rangeStart: number,+ rangeEnd: number,+ replacement: string,+ options?: { expectedText?: string; focusEditorAfterReplace?: boolean },+ ): boolean => {+ const currentText = promptRef.current;+ const safeStart = Math.max(0, Math.min(currentText.length, rangeStart));+ const safeEnd = Math.max(safeStart, Math.min(currentText.length, rangeEnd));+ if (+ options?.expectedText !== undefined &&+ currentText.slice(safeStart, safeEnd) !== options.expectedText+ ) {+ return false;+ }+ const next = replaceTextRange(promptRef.current, rangeStart, rangeEnd, replacement);+ const nextCursor = collapseExpandedComposerCursor(next.text, next.cursor);+ const nextExpandedCursor = expandCollapsedComposerCursor(next.text, nextCursor);+ promptRef.current = next.text;+ const activePendingQuestion = activePendingProgress?.activeQuestion;+ if (activePendingQuestion && activePendingUserInput) {+ onChangeActivePendingUserInputCustomAnswer(+ activePendingQuestion.id,+ next.text,+ nextCursor,+ nextExpandedCursor,+ false,+ );+ } else {+ setPrompt(next.text);+ }+ setComposerCursor(nextCursor);+ setComposerTrigger(detectComposerTrigger(next.text, nextExpandedCursor));+ if (options?.focusEditorAfterReplace !== false) {window.requestAnimationFrame(() => {- composerSelectLockRef.current = false;+ composerEditorRef.current?.focusAt(nextCursor);});- const { snapshot, trigger } = resolveActiveComposerTrigger();- if (!trigger) return;- if (item.type === "path") {- const replacement = `@${item.path} `;- const replacementRangeEnd = extendReplacementRangeForTrailingSpace(- snapshot.value,- trigger.rangeEnd,- replacement,- );- const applied = applyPromptReplacement(- trigger.rangeStart,- replacementRangeEnd,- replacement,- { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },- );- if (applied) {- setComposerHighlightedItemId(null);- }- return;+ }+ return true;+ },+ [+ activePendingProgress?.activeQuestion,+ activePendingUserInput,+ onChangeActivePendingUserInputCustomAnswer,+ promptRef,+ setPrompt,+ ],+ );++ const readComposerSnapshot = useCallback((): {+ value: string;+ cursor: number;+ expandedCursor: number;+ terminalContextIds: string[];+ } => {+ const editorSnapshot = composerEditorRef.current?.readSnapshot();+ if (editorSnapshot) {+ return editorSnapshot;+ }+ return {+ value: promptRef.current,+ cursor: composerCursor,+ expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),+ terminalContextIds: composerTerminalContexts.map((context) => context.id),+ };+ }, [composerCursor, composerTerminalContexts, promptRef]);++ const resolveActiveComposerTrigger = useCallback((): {+ snapshot: { value: string; cursor: number; expandedCursor: number };+ trigger: ComposerTrigger | null;+ } => {+ const snapshot = readComposerSnapshot();+ return {+ snapshot,+ trigger: detectComposerTrigger(snapshot.value, snapshot.expandedCursor),+ };+ }, [readComposerSnapshot]);++ const onSelectComposerItem = useCallback(+ (item: ComposerCommandItem) => {+ if (composerSelectLockRef.current) return;+ composerSelectLockRef.current = true;+ window.requestAnimationFrame(() => {+ composerSelectLockRef.current = false;+ });+ const { snapshot, trigger } = resolveActiveComposerTrigger();+ if (!trigger) return;+ if (item.type === "path") {+ const replacement = `@${item.path} `;+ const replacementRangeEnd = extendReplacementRangeForTrailingSpace(+ snapshot.value,+ trigger.rangeEnd,+ replacement,+ );+ const applied = applyPromptReplacement(+ trigger.rangeStart,+ replacementRangeEnd,+ replacement,+ { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },+ );+ if (applied) {+ setComposerHighlightedItemId(null);}- if (item.type === "slash-command") {- if (item.command === "model") {- const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {- expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),- focusEditorAfterReplace: false,- });- if (applied) {- setComposerHighlightedItemId(null);- setIsComposerModelPickerOpen(true);- }- return;- }- void handleInteractionModeChange(item.command === "plan" ? "plan" : "default");+ return;+ }+ if (item.type === "slash-command") {+ if (item.command === "model") {const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),+ focusEditorAfterReplace: false,});if (applied) {setComposerHighlightedItemId(null);+ setIsComposerModelPickerOpen(true);}return;}- if (item.type === "provider-slash-command") {- const replacement = `/${item.command.name} `;- const replacementRangeEnd = extendReplacementRangeForTrailingSpace(- snapshot.value,- trigger.rangeEnd,- replacement,- );- const applied = applyPromptReplacement(- trigger.rangeStart,- replacementRangeEnd,- replacement,- { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },- );- if (applied) {- setComposerHighlightedItemId(null);- }- return;- }- if (item.type === "skill") {- const replacement = `$${item.skill.name} `;- const replacementRangeEnd = extendReplacementRangeForTrailingSpace(- snapshot.value,- trigger.rangeEnd,- replacement,- );- const applied = applyPromptReplacement(- trigger.rangeStart,- replacementRangeEnd,- replacement,- { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },- );- if (applied) {- setComposerHighlightedItemId(null);- }- return;+ void handleInteractionModeChange(item.command === "plan" ? "plan" : "default");+ const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {+ expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),+ });+ if (applied) {+ setComposerHighlightedItemId(null);}- },- [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],- );-- const onComposerMenuItemHighlighted = useCallback(- (itemId: string | null) => {- setComposerHighlightedItemId(itemId);- setComposerHighlightedSearchKey(composerMenuSearchKey);- },- [composerMenuSearchKey],- );-- const nudgeComposerMenuHighlight = useCallback(- (key: "ArrowDown" | "ArrowUp") => {- if (composerMenuItems.length === 0) return;- const highlightedIndex = composerMenuItems.findIndex(- (item) => item.id === composerHighlightedItemId,- );- const normalizedIndex =- highlightedIndex >= 0 ? highlightedIndex : key === "ArrowDown" ? -1 : 0;- const offset = key === "ArrowDown" ? 1 : -1;- const nextIndex =- (normalizedIndex + offset + composerMenuItems.length) % composerMenuItems.length;- const nextItem = composerMenuItems[nextIndex];- setComposerHighlightedItemId(nextItem?.id ?? null);- },- [composerHighlightedItemId, composerMenuItems],- );-- const blurMobileComposerAfterSend = useCallback(() => {- if (!isMobileViewport) return;- if (composerBlurFrameRef.current !== null) {- window.cancelAnimationFrame(composerBlurFrameRef.current);- composerBlurFrameRef.current = null;- }- const activeElement = document.activeElement;- if (activeElement instanceof HTMLElement) {- activeElement.blur();- }- setIsComposerFocused(false);- }, [isMobileViewport]);-- const shouldBlurMobileComposerOnSubmit = useCallback(() => {- if (!isMobileViewport) return false;- if (isSendBusy || isConnecting || phase === "running") return false;- if (activePendingProgress) {- return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers);+ return;}- return showPlanFollowUpPrompt || composerSendState.hasSendableContent;- }, [- activePendingProgress,- activePendingResolvedAnswers,- composerSendState.hasSendableContent,- isConnecting,- isMobileViewport,- isSendBusy,- phase,- showPlanFollowUpPrompt,- ]);-- const submitComposer = useCallback(- (event?: { preventDefault: () => void }) => {- onSend(event);- if (shouldBlurMobileComposerOnSubmit()) {- blurMobileComposerAfterSend();+ if (item.type === "provider-slash-command") {+ const replacement = `/${item.command.name} `;+ const replacementRangeEnd = extendReplacementRangeForTrailingSpace(+ snapshot.value,+ trigger.rangeEnd,+ replacement,+ );+ const applied = applyPromptReplacement(+ trigger.rangeStart,+ replacementRangeEnd,+ replacement,+ { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },+ );+ if (applied) {+ setComposerHighlightedItemId(null);}- },- [blurMobileComposerAfterSend, onSend, shouldBlurMobileComposerOnSubmit],- );- const expandMobileComposer = useCallback(() => {- if (composerBlurFrameRef.current !== null) {- window.cancelAnimationFrame(composerBlurFrameRef.current);- composerBlurFrameRef.current = null;- }- if (mobileComposerExpandFrameRef.current !== null) {- window.cancelAnimationFrame(mobileComposerExpandFrameRef.current);+ return;}- if (mobileComposerExpandReleaseFrameRef.current !== null) {- window.cancelAnimationFrame(mobileComposerExpandReleaseFrameRef.current);+ if (item.type === "skill") {+ const replacement = `$${item.skill.name} `;+ const replacementRangeEnd = extendReplacementRangeForTrailingSpace(+ snapshot.value,+ trigger.rangeEnd,+ replacement,+ );+ const applied = applyPromptReplacement(+ trigger.rangeStart,+ replacementRangeEnd,+ replacement,+ { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },+ );+ if (applied) {+ setComposerHighlightedItemId(null);+ }+ return;}- mobileComposerExpandInFlightRef.current = true;- setIsComposerFocused(true);- mobileComposerExpandFrameRef.current = window.requestAnimationFrame(() => {- mobileComposerExpandFrameRef.current = null;- composerEditorRef.current?.focusAtEnd();- mobileComposerExpandReleaseFrameRef.current = window.requestAnimationFrame(() => {- mobileComposerExpandReleaseFrameRef.current = null;- mobileComposerExpandInFlightRef.current = false;- });+ },+ [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],+ );++ const onComposerMenuItemHighlighted = useCallback(+ (itemId: string | null) => {+ setComposerHighlightedItemId(itemId);+ setComposerHighlightedSearchKey(composerMenuSearchKey);+ },+ [composerMenuSearchKey],+ );++ const nudgeComposerMenuHighlight = useCallback(+ (key: "ArrowDown" | "ArrowUp") => {+ if (composerMenuItems.length === 0) return;+ const highlightedIndex = composerMenuItems.findIndex(+ (item) => item.id === composerHighlightedItemId,+ );+ const normalizedIndex =+ highlightedIndex >= 0 ? highlightedIndex : key === "ArrowDown" ? -1 : 0;+ const offset = key === "ArrowDown" ? 1 : -1;+ const nextIndex =+ (normalizedIndex + offset + composerMenuItems.length) % composerMenuItems.length;+ const nextItem = composerMenuItems[nextIndex];+ setComposerHighlightedItemId(nextItem?.id ?? null);+ },+ [composerHighlightedItemId, composerMenuItems],+ );++ const blurMobileComposerAfterSend = useCallback(() => {+ if (!isMobileViewport) return;+ if (composerBlurFrameRef.current !== null) {+ window.cancelAnimationFrame(composerBlurFrameRef.current);+ composerBlurFrameRef.current = null;+ }+ const activeElement = document.activeElement;+ if (activeElement instanceof HTMLElement) {+ activeElement.blur();+ }+ setIsComposerFocused(false);+ }, [isMobileViewport]);++ const shouldBlurMobileComposerOnSubmit = useCallback(() => {+ if (!isMobileViewport) return false;+ if (isSendBusy || isConnecting || phase === "running") return false;+ if (activePendingProgress) {+ return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers);+ }+ return showPlanFollowUpPrompt || composerSendState.hasSendableContent;+ }, [+ activePendingProgress,+ activePendingResolvedAnswers,+ composerSendState.hasSendableContent,+ isConnecting,+ isMobileViewport,+ isSendBusy,+ phase,+ showPlanFollowUpPrompt,+ ]);++ const submitComposer = useCallback(+ (event?: { preventDefault: () => void }) => {+ onSend(event);+ if (shouldBlurMobileComposerOnSubmit()) {+ blurMobileComposerAfterSend();+ }+ },+ [blurMobileComposerAfterSend, onSend, shouldBlurMobileComposerOnSubmit],+ );+ const expandMobileComposer = useCallback(() => {+ if (composerBlurFrameRef.current !== null) {+ window.cancelAnimationFrame(composerBlurFrameRef.current);+ composerBlurFrameRef.current = null;+ }+ if (mobileComposerExpandFrameRef.current !== null) {+ window.cancelAnimationFrame(mobileComposerExpandFrameRef.current);+ }+ if (mobileComposerExpandReleaseFrameRef.current !== null) {+ window.cancelAnimationFrame(mobileComposerExpandReleaseFrameRef.current);+ }+ mobileComposerExpandInFlightRef.current = true;+ setIsComposerFocused(true);+ mobileComposerExpandFrameRef.current = window.requestAnimationFrame(() => {+ mobileComposerExpandFrameRef.current = null;+ composerEditorRef.current?.focusAtEnd();+ mobileComposerExpandReleaseFrameRef.current = window.requestAnimationFrame(() => {+ mobileComposerExpandReleaseFrameRef.current = null;+ mobileComposerExpandInFlightRef.current = false;});- }, []);-- // ------------------------------------------------------------------- // Callbacks: command key- // ------------------------------------------------------------------- const onComposerCommandKey = (- key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab",- event: KeyboardEvent,- ) => {- if (key === "Tab" && event.shiftKey) {- toggleInteractionMode();+ });+ }, []);++ // ------------------------------------------------------------------+ // Callbacks: command key+ // ------------------------------------------------------------------+ const onComposerCommandKey = (+ key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab",+ event: KeyboardEvent,+ ) => {+ if (key === "Tab" && event.shiftKey) {+ toggleInteractionMode();+ return true;+ }+ const { trigger } = resolveActiveComposerTrigger();+ const menuIsActive = composerMenuOpenRef.current || trigger !== null;+ if (menuIsActive) {+ const currentItems = composerMenuItemsRef.current;+ const selectedItem = activeComposerMenuItemRef.current ?? currentItems[0];+ if (key === "ArrowDown" && currentItems.length > 0) {+ nudgeComposerMenuHighlight("ArrowDown");return true;}- const { trigger } = resolveActiveComposerTrigger();- const menuIsActive = composerMenuOpenRef.current || trigger !== null;- if (menuIsActive) {- const currentItems = composerMenuItemsRef.current;- const selectedItem = activeComposerMenuItemRef.current ?? currentItems[0];- if (key === "ArrowDown" && currentItems.length > 0) {- nudgeComposerMenuHighlight("ArrowDown");- return true;- }- if (key === "ArrowUp" && currentItems.length > 0) {- nudgeComposerMenuHighlight("ArrowUp");- return true;- }- if ((key === "Enter" || key === "Tab") && selectedItem) {- onSelectComposerItem(selectedItem);- return true;- }+ if (key === "ArrowUp" && currentItems.length > 0) {+ nudgeComposerMenuHighlight("ArrowUp");+ return true;}- if (key === "Enter" && !event.shiftKey) {- submitComposer();+ if ((key === "Enter" || key === "Tab") && selectedItem) {+ onSelectComposerItem(selectedItem);return true;}- return false;- };+ }+ if (key === "Enter" && !event.shiftKey) {+ submitComposer();+ return true;+ }+ return false;+ };- // ------------------------------------------------------------------- // Callbacks: images- // ------------------------------------------------------------------- const addComposerImages = (files: File[]) => {- if (!activeThreadId || files.length === 0) return;- if (pendingUserInputs.length > 0) {- toastManager.add({- type: "error",- title: "Attach images after answering plan questions.",- });- return;+ // ------------------------------------------------------------------+ // Callbacks: images+ // ------------------------------------------------------------------+ const addComposerImages = (files: File[]) => {+ if (!activeThreadId || files.length === 0) return;+ if (pendingUserInputs.length > 0) {+ toastManager.add({+ type: "error",+ title: "Attach images after answering plan questions.",+ });+ return;+ }+ const nextImages: ComposerImageAttachment[] = [];+ let nextImageCount = composerImagesRef.current.length;+ let error: string | null = null;+ for (const file of files) {+ if (!file.type.startsWith("image/")) {+ error = `Unsupported file type for '${file.name}'. Please attach image files only.`;+ continue;}- const nextImages: ComposerImageAttachment[] = [];- let nextImageCount = composerImagesRef.current.length;- let error: string | null = null;- for (const file of files) {- if (!file.type.startsWith("image/")) {- error = `Unsupported file type for '${file.name}'. Please attach image files only.`;- continue;- }- if (file.size > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES) {- error = `'${file.name}' exceeds the ${IMAGE_SIZE_LIMIT_LABEL} attachment limit.`;- continue;- }- if (nextImageCount >= PROVIDER_SEND_TURN_MAX_ATTACHMENTS) {- error = `You can attach up to ${PROVIDER_SEND_TURN_MAX_ATTACHMENTS} images per message.`;- break;- }- const previewUrl = URL.createObjectURL(file);- nextImages.push({- type: "image",- id: randomUUID(),- name: file.name || "image",- mimeType: file.type,- sizeBytes: file.size,- previewUrl,- file,- });- nextImageCount += 1;+ if (file.size > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES) {+ error = `'${file.name}' exceeds the ${IMAGE_SIZE_LIMIT_LABEL} attachment limit.`;+ continue;}- if (nextImages.length === 1 && nextImages[0]) {- addComposerImage(nextImages[0]);- } else if (nextImages.length > 1) {- addComposerImagesToDraft(nextImages);+ if (nextImageCount >= PROVIDER_SEND_TURN_MAX_ATTACHMENTS) {+ error = `You can attach up to ${PROVIDER_SEND_TURN_MAX_ATTACHMENTS} images per message.`;+ break;}- setThreadError(activeThreadId, error);- };-- const removeComposerImage = (imageId: string) => {- removeComposerImageFromDraft(imageId);- };+ const previewUrl = URL.createObjectURL(file);+ nextImages.push({+ type: "image",+ id: randomUUID(),+ name: file.name || "image",+ mimeType: file.type,+ sizeBytes: file.size,+ previewUrl,+ file,+ });+ nextImageCount += 1;+ }+ if (nextImages.length === 1 && nextImages[0]) {+ addComposerImage(nextImages[0]);+ } else if (nextImages.length > 1) {+ addComposerImagesToDraft(nextImages);+ }+ setThreadError(activeThreadId, error);+ };- // ------------------------------------------------------------------- // Callbacks: paste / drag- // ------------------------------------------------------------------- const onComposerPaste = (event: React.ClipboardEvent<HTMLElement>) => {- const files = Array.from(event.clipboardData.files);- if (files.length === 0) return;- const imageFiles = files.filter((file) => file.type.startsWith("image/"));- if (imageFiles.length === 0) return;- event.preventDefault();- addComposerImages(imageFiles);- };+ const removeComposerImage = (imageId: string) => {+ removeComposerImageFromDraft(imageId);+ };- const onComposerDragEnter = (event: React.DragEvent<HTMLDivElement>) => {- if (!event.dataTransfer.types.includes("Files")) return;- event.preventDefault();- dragDepthRef.current += 1;- setIsDragOverComposer(true);- };+ // ------------------------------------------------------------------+ // Callbacks: paste / drag+ // ------------------------------------------------------------------+ const onComposerPaste = (event: React.ClipboardEvent<HTMLElement>) => {+ const files = Array.from(event.clipboardData.files);+ if (files.length === 0) return;+ const imageFiles = files.filter((file) => file.type.startsWith("image/"));+ if (imageFiles.length === 0) return;+ event.preventDefault();+ addComposerImages(imageFiles);+ };- const onComposerDragOver = (event: React.DragEvent<HTMLDivElement>) => {- if (!event.dataTransfer.types.includes("Files")) return;- event.preventDefault();- event.dataTransfer.dropEffect = "copy";- setIsDragOverComposer(true);- };+ const onComposerDragEnter = (event: React.DragEvent<HTMLDivElement>) => {+ if (!event.dataTransfer.types.includes("Files")) return;+ event.preventDefault();+ dragDepthRef.current += 1;+ setIsDragOverComposer(true);+ };- const onComposerDragLeave = (event: React.DragEvent<HTMLDivElement>) => {- if (!event.dataTransfer.types.includes("Files")) return;- event.preventDefault();- const nextTarget = event.relatedTarget;- if (nextTarget instanceof Node && event.currentTarget.contains(nextTarget)) return;- dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);- if (dragDepthRef.current === 0) {- setIsDragOverComposer(false);- }- };+ const onComposerDragOver = (event: React.DragEvent<HTMLDivElement>) => {+ if (!event.dataTransfer.types.includes("Files")) return;+ event.preventDefault();+ event.dataTransfer.dropEffect = "copy";+ setIsDragOverComposer(true);+ };- const onComposerDrop = (event: React.DragEvent<HTMLDivElement>) => {- if (!event.dataTransfer.types.includes("Files")) return;- event.preventDefault();- dragDepthRef.current = 0;+ const onComposerDragLeave = (event: React.DragEvent<HTMLDivElement>) => {+ if (!event.dataTransfer.types.includes("Files")) return;+ event.preventDefault();+ const nextTarget = event.relatedTarget;+ if (nextTarget instanceof Node && event.currentTarget.contains(nextTarget)) return;+ dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);+ if (dragDepthRef.current === 0) {setIsDragOverComposer(false);- const files = Array.from(event.dataTransfer.files);- addComposerImages(files);- focusComposer();- };- const handleInterruptPrimaryAction = useCallback(() => {- void onInterrupt();- }, [onInterrupt]);- const handleImplementPlanInNewThreadPrimaryAction = useCallback(() => {- void onImplementPlanInNewThread();- }, [onImplementPlanInNewThread]);- const scheduleComposerCollapseCheck = useCallback(() => {- if (!isMobileViewport) {+ }+ };++ const onComposerDrop = (event: React.DragEvent<HTMLDivElement>) => {+ if (!event.dataTransfer.types.includes("Files")) return;+ event.preventDefault();+ dragDepthRef.current = 0;+ setIsDragOverComposer(false);+ const files = Array.from(event.dataTransfer.files);+ addComposerImages(files);+ focusComposer();+ };+ const handleInterruptPrimaryAction = useCallback(() => {+ void onInterrupt();+ }, [onInterrupt]);+ const handleImplementPlanInNewThreadPrimaryAction = useCallback(() => {+ void onImplementPlanInNewThread();+ }, [onImplementPlanInNewThread]);+ const scheduleComposerCollapseCheck = useCallback(() => {+ if (!isMobileViewport) {+ return;+ }+ if (mobileComposerExpandInFlightRef.current) {+ return;+ }+ if (composerBlurFrameRef.current !== null) {+ window.cancelAnimationFrame(composerBlurFrameRef.current);+ }+ composerBlurFrameRef.current = window.requestAnimationFrame(() => {+ composerBlurFrameRef.current = null;+ if (mobileComposerExpandInFlightRef.current) {return;}- if (mobileComposerExpandInFlightRef.current) {+ const composerSurface = composerSurfaceRef.current;+ const activeElement = document.activeElement;+ if (activeElement instanceof Element && isInsideComposerFloatingLayer(activeElement)) {return;}+ if (+ composerSurface &&+ activeElement instanceof Node &&+ composerSurface.contains(activeElement)+ ) {+ return;+ }+ setIsComposerFocused(false);+ });+ }, [isMobileViewport]);++ useEffect(() => {+ return () => {if (composerBlurFrameRef.current !== null) {window.cancelAnimationFrame(composerBlurFrameRef.current);}- composerBlurFrameRef.current = window.requestAnimationFrame(() => {- composerBlurFrameRef.current = null;- if (mobileComposerExpandInFlightRef.current) {- return;- }- const composerSurface = composerSurfaceRef.current;- const activeElement = document.activeElement;- if (activeElement instanceof Element && isInsideComposerFloatingLayer(activeElement)) {- return;- }- if (- composerSurface &&- activeElement instanceof Node &&- composerSurface.contains(activeElement)- ) {- return;- }- setIsComposerFocused(false);- });- }, [isMobileViewport]);-- useEffect(() => {- return () => {- if (composerBlurFrameRef.current !== null) {- window.cancelAnimationFrame(composerBlurFrameRef.current);- }- if (mobileComposerExpandFrameRef.current !== null) {- window.cancelAnimationFrame(mobileComposerExpandFrameRef.current);- }- if (mobileComposerExpandReleaseFrameRef.current !== null) {- window.cancelAnimationFrame(mobileComposerExpandReleaseFrameRef.current);- }- };- }, []);-- // ------------------------------------------------------------------- // Imperative handle- // ------------------------------------------------------------------- useImperativeHandle(- ref,- () => ({- focusAtEnd: () => {- composerEditorRef.current?.focusAtEnd();- },- focusAt: (cursor: number) => {- composerEditorRef.current?.focusAt(cursor);- },- openModelPicker: () => {- setIsComposerModelPickerOpen(true);- },- toggleModelPicker: () => {- setIsComposerModelPickerOpen((open) => !open);- },- isModelPickerOpen: () => isComposerModelPickerOpen,- readSnapshot: () => {- return readComposerSnapshot();- },- resetCursorState: (options?: {- cursor?: number;- prompt?: string;- detectTrigger?: boolean;- }) => {- const promptForState = options?.prompt ?? promptRef.current;- const cursor = clampCollapsedComposerCursor(promptForState, options?.cursor ?? 0);- setComposerHighlightedItemId(null);- setComposerCursor(cursor);- setComposerTrigger(- options?.detectTrigger- ? detectComposerTrigger(- promptForState,- expandCollapsedComposerCursor(promptForState, cursor),- )- : null,- );- },- addTerminalContext: (selection: TerminalContextSelection) => {- if (!activeThread) return;- const snapshot = composerEditorRef.current?.readSnapshot() ?? {- value: promptRef.current,- cursor: composerCursor,- expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),- terminalContextIds: composerTerminalContexts.map((context) => context.id),- };- const insertion = insertInlineTerminalContextPlaceholder(- snapshot.value,- snapshot.expandedCursor,- );- const nextCollapsedCursor = collapseExpandedComposerCursor(- insertion.prompt,- insertion.cursor,- );- const inserted = insertComposerDraftTerminalContext(- composerDraftTarget,- insertion.prompt,- {- id: randomUUID(),- threadId: activeThread.id,- createdAt: new Date().toISOString(),- ...selection,- },- insertion.contextIndex,- );- if (!inserted) return;- promptRef.current = insertion.prompt;- setComposerCursor(nextCollapsedCursor);- setComposerTrigger(detectComposerTrigger(insertion.prompt, insertion.cursor));- window.requestAnimationFrame(() => {- composerEditorRef.current?.focusAt(nextCollapsedCursor);- });- },- getSendContext: () => ({- prompt: promptRef.current,- images: composerImagesRef.current,- terminalContexts: composerTerminalContextsRef.current,- selectedPromptEffort,- selectedModelOptionsForDispatch,- selectedModelSelection,- selectedProvider,- selectedModel,- selectedProviderModels,- }),- }),- [- activeThread,- composerDraftTarget,- composerCursor,- composerTerminalContexts,- insertComposerDraftTerminalContext,- promptRef,- composerImagesRef,- composerTerminalContextsRef,- isComposerModelPickerOpen,- readComposerSnapshot,- selectedModel,+ if (mobileComposerExpandFrameRef.current !== null) {+ window.cancelAnimationFrame(mobileComposerExpandFrameRef.current);+ }+ if (mobileComposerExpandReleaseFrameRef.current !== null) {+ window.cancelAnimationFrame(mobileComposerExpandReleaseFrameRef.current);+ }+ };+ }, []);++ // ------------------------------------------------------------------+ // Imperative handle+ // ------------------------------------------------------------------+ useImperativeHandle(+ composerRef,+ () => ({+ focusAtEnd: () => {+ composerEditorRef.current?.focusAtEnd();+ },+ focusAt: (cursor: number) => {+ composerEditorRef.current?.focusAt(cursor);+ },+ openModelPicker: () => {+ setIsComposerModelPickerOpen(true);+ },+ toggleModelPicker: () => {+ setIsComposerModelPickerOpen((open) => !open);+ },+ isModelPickerOpen: () => isComposerModelPickerOpen,+ readSnapshot: () => {+ return readComposerSnapshot();+ },+ resetCursorState: (options?: {+ cursor?: number;+ prompt?: string;+ detectTrigger?: boolean;+ }) => {+ const promptForState = options?.prompt ?? promptRef.current;+ const cursor = clampCollapsedComposerCursor(promptForState, options?.cursor ?? 0);+ setComposerHighlightedItemId(null);+ setComposerCursor(cursor);+ setComposerTrigger(+ options?.detectTrigger+ ? detectComposerTrigger(+ promptForState,+ expandCollapsedComposerCursor(promptForState, cursor),+ )+ : null,+ );+ },+ addTerminalContext: (selection: TerminalContextSelection) => {+ if (!activeThread) return;+ const snapshot = composerEditorRef.current?.readSnapshot() ?? {+ value: promptRef.current,+ cursor: composerCursor,+ expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),+ terminalContextIds: composerTerminalContexts.map((context) => context.id),+ };+ const insertion = insertInlineTerminalContextPlaceholder(+ snapshot.value,+ snapshot.expandedCursor,+ );+ const nextCollapsedCursor = collapseExpandedComposerCursor(+ insertion.prompt,+ insertion.cursor,+ );+ const inserted = insertComposerDraftTerminalContext(+ composerDraftTarget,+ insertion.prompt,+ {+ id: randomUUID(),+ threadId: activeThread.id,+ createdAt: new Date().toISOString(),+ ...selection,+ },+ insertion.contextIndex,+ );+ if (!inserted) return;+ promptRef.current = insertion.prompt;+ setComposerCursor(nextCollapsedCursor);+ setComposerTrigger(detectComposerTrigger(insertion.prompt, insertion.cursor));+ window.requestAnimationFrame(() => {+ composerEditorRef.current?.focusAt(nextCollapsedCursor);+ });+ },+ getSendContext: () => ({+ prompt: promptRef.current,+ images: composerImagesRef.current,+ terminalContexts: composerTerminalContextsRef.current,+ selectedPromptEffort,selectedModelOptionsForDispatch,selectedModelSelection,- selectedPromptEffort,selectedProvider,+ selectedModel,selectedProviderModels,- ],- );+ }),+ }),+ [+ activeThread,+ composerDraftTarget,+ composerCursor,+ composerTerminalContexts,+ insertComposerDraftTerminalContext,+ promptRef,+ composerImagesRef,+ composerTerminalContextsRef,+ isComposerModelPickerOpen,+ readComposerSnapshot,+ selectedModel,+ selectedModelOptionsForDispatch,+ selectedModelSelection,+ selectedPromptEffort,+ selectedProvider,+ selectedProviderModels,+ ],+ );- // Render- // ------------------------------------------------------------------- return (- <form- ref={composerFormRef}- onSubmit={submitComposer}- className="mx-auto w-full min-w-0 max-w-208"- data-chat-composer-form="true"+ // Render+ // ------------------------------------------------------------------+ return (+ <form+ ref={composerFormRef}+ onSubmit={submitComposer}+ className="mx-auto w-full min-w-0 max-w-208"+ data-chat-composer-form="true"+ >+ <div+ className={cn(+ "group rounded-[22px] p-px transition-colors duration-200",+ composerProviderState.composerFrameClassName,+ )}+ onDragEnter={onComposerDragEnter}+ onDragOver={onComposerDragOver}+ onDragLeave={onComposerDragLeave}+ onDrop={onComposerDrop}><div+ ref={composerSurfaceRef}+ data-chat-composer-mobile-collapsed={isComposerCollapsedMobile ? "true" : "false"}className={cn(- "group rounded-[22px] p-px transition-colors duration-200",- composerProviderState.composerFrameClassName,+ "rounded-[20px] border bg-card transition-colors duration-200 has-focus-visible:border-ring/45",+ isDragOverComposer ? "border-primary/70 bg-accent/30" : "border-border",+ environmentUnavailable ? "opacity-75" : null,+ composerProviderState.composerSurfaceClassName,)}- onDragEnter={onComposerDragEnter}- onDragOver={onComposerDragOver}- onDragLeave={onComposerDragLeave}- onDrop={onComposerDrop}+ onFocusCapture={(event) => {+ const activeElement = event.target;+ if (+ isComposerCollapsedMobile &&+ activeElement instanceof HTMLElement &&+ activeElement.closest('[data-chat-composer-collapsed-controls="true"]')+ ) {+ return;+ }+ if (composerBlurFrameRef.current !== null) {+ window.cancelAnimationFrame(composerBlurFrameRef.current);+ composerBlurFrameRef.current = null;+ }+ setIsComposerFocused(true);+ }}+ onBlurCapture={() => {+ scheduleComposerCollapseCheck();+ }}>- <div- ref={composerSurfaceRef}- data-chat-composer-mobile-collapsed={isComposerCollapsedMobile ? "true" : "false"}- className={cn(- "rounded-[20px] border bg-card transition-colors duration-200 has-focus-visible:border-ring/45",- isDragOverComposer ? "border-primary/70 bg-accent/30" : "border-border",- environmentUnavailable ? "opacity-75" : null,- composerProviderState.composerSurfaceClassName,- )}- onFocusCapture={(event) => {- const activeElement = event.target;- if (- isComposerCollapsedMobile &&- activeElement instanceof HTMLElement &&- activeElement.closest('[data-chat-composer-collapsed-controls="true"]')- ) {- return;- }- if (composerBlurFrameRef.current !== null) {- window.cancelAnimationFrame(composerBlurFrameRef.current);- composerBlurFrameRef.current = null;- }- setIsComposerFocused(true);- }}- onBlurCapture={() => {- scheduleComposerCollapseCheck();- }}- >- {!isComposerCollapsedMobile &&- (activePendingApproval ? (- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">- <ComposerPendingApprovalPanel- approval={activePendingApproval}- pendingCount={pendingApprovals.length}- />- </div>- ) : pendingUserInputs.length > 0 ? (- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">- <ComposerPendingUserInputPanel- pendingUserInputs={pendingUserInputs}- respondingRequestIds={respondingRequestIds}- answers={activePendingDraftAnswers}- questionIndex={activePendingQuestionIndex}- onToggleOption={onSelectActivePendingUserInputOption}- onAdvance={onAdvanceActivePendingUserInput}- />- </div>- ) : showPlanFollowUpPrompt && activeProposedPlan ? (- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">- <ComposerPlanFollowUpBanner- key={activeProposedPlan.id}- planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}- />- </div>- ) : null)}-- {isComposerCollapsedMobile && activePendingApproval ? (- <div- className="rounded-t-[19px] border-b border-border/65 bg-muted/20"- data-chat-composer-collapsed-controls="true"- >+ {!isComposerCollapsedMobile &&+ (activePendingApproval ? (+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20"><ComposerPendingApprovalPanelapproval={activePendingApproval}pendingCount={pendingApprovals.length}/>- <div className="flex flex-wrap items-center justify-end gap-2 px-3 pb-3 sm:px-4">- <ComposerPendingApprovalActions- requestId={activePendingApproval.requestId}- isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}- onRespondToApproval={onRespondToApproval}- />- </div></div>- ) : isComposerCollapsedMobile && pendingUserInputs.length > 0 ? (- <div- className="rounded-t-[19px] border-b border-border/65 bg-muted/20"- data-chat-composer-collapsed-controls="true"- >+ ) : pendingUserInputs.length > 0 ? (+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20"><ComposerPendingUserInputPanelpendingUserInputs={pendingUserInputs}respondingRequestIds={respondingRequestIds}@@ -2046,240 +2001,70 @@ export const ChatComposer = memo(onToggleOption={onSelectActivePendingUserInputOption}onAdvance={onAdvanceActivePendingUserInput}/>- <div className="px-3 pb-3 sm:px-4">- <div- data-chat-composer-mobile-pending-compact="true"- className={cn(- "flex min-w-0 items-center gap-2 rounded-lg border border-border/55 bg-background/55 p-1.5 pl-3 transition-colors hover:bg-background/80",- !activePendingProgress?.activeQuestion?.multiSelect && "p-0",- )}- >- <button- type="button"- className={cn(- "min-w-0 flex-1 truncate bg-transparent py-1.5 text-left text-sm",- activePendingProgress?.customAnswer- ? "text-foreground"- : "text-muted-foreground/60",- !activePendingProgress?.activeQuestion?.multiSelect && "px-3 py-2",- )}- onPointerDown={(event) => event.preventDefault()}- onClick={expandMobileComposer}- aria-label="Write custom answer"- >- {activePendingProgress?.customAnswer || "Write custom answer"}- </button>- {activePendingProgress?.activeQuestion?.multiSelect ? (- <ComposerPrimaryActions- compact- pendingAction={pendingPrimaryAction}- isRunning={false}- showPlanFollowUpPrompt={false}- promptHasText={false}- isSendBusy={isSendBusy}- isConnecting={isConnecting}- isEnvironmentUnavailable={environmentUnavailable !== null}- isPreparingWorktree={false}- hasSendableContent={false}- preserveComposerFocusOnPointerDown- onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}- onInterrupt={handleInterruptPrimaryAction}- onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}- />- ) : null}- </div>- </div></div>- ) : null}-- {showCollapsedMobilePromptRow ? (- <div className="flex items-center justify-between gap-2 px-3 py-2">- <button- type="button"- className={cn(- "min-w-0 flex-1 truncate bg-transparent p-0 text-left text-[14px] focus:outline-none",- (activePendingProgress ? activePendingProgress.customAnswer : prompt.trim())- ? "text-foreground"- : "text-muted-foreground/35",- )}- onPointerDown={(event) => event.preventDefault()}- onClick={expandMobileComposer}- aria-label="Expand composer"- >- {activePendingProgress- ? activePendingProgress.customAnswer ||- "Type your own answer, or leave this blank to use the selected option"- : prompt.trim() || "Ask anything..."}- </button>- <button- type="button"- className="flex size-8 shrink-0 items-center justify-center rounded-full bg-primary/90 text-primary-foreground disabled:opacity-30"- disabled={collapsedComposerPrimaryActionDisabled}- aria-label={collapsedComposerPrimaryActionLabel}- onPointerDown={(event) => event.preventDefault()}- onClick={(event) => {- event.stopPropagation();- submitComposer();- }}- >- <svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">- <path- d="M8 3L8 13M8 3L4 7M8 3L12 7"- stroke="currentColor"- strokeWidth="2"- strokeLinecap="round"- strokeLinejoin="round"- />- </svg>- </button>+ ) : showPlanFollowUpPrompt && activeProposedPlan ? (+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">+ <ComposerPlanFollowUpBanner+ key={activeProposedPlan.id}+ planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}+ /></div>- ) : null}+ ) : null)}+ {isComposerCollapsedMobile && activePendingApproval ? (<div- className={cn(- "relative px-3 pb-2 sm:px-4",- hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",- isComposerCollapsedMobile && "hidden",- )}+ className="rounded-t-[19px] border-b border-border/65 bg-muted/20"+ data-chat-composer-collapsed-controls="true">- {composerMenuOpen && !isComposerApprovalState && (- <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">- <ComposerCommandMenu- items={composerMenuItems}- resolvedTheme={resolvedTheme}- isLoading={isComposerMenuLoading}- triggerKind={composerTriggerKind}- groupSlashCommandSections={- composerTrigger?.kind === "slash-command" &&- composerTrigger.query.trim().length === 0- }- emptyStateText={composerMenuEmptyState}- activeItemId={activeComposerMenuItem?.id ?? null}- onHighlightedItemChange={onComposerMenuItemHighlighted}- onSelect={onSelectComposerItem}- />- </div>- )}-- {!isComposerCollapsedMobile &&- !isComposerApprovalState &&- pendingUserInputs.length === 0 &&- composerImages.length > 0 && (- <div className="mb-3 flex flex-wrap gap-2">- {composerImages.map((image) => (- <div- key={image.id}- className="relative h-16 w-16 overflow-hidden rounded-lg border border-border/80 bg-background"- >- {image.previewUrl ? (- <button- type="button"- className="h-full w-full cursor-zoom-in"- aria-label={`Preview ${image.name}`}- onClick={() => {- const preview = buildExpandedImagePreview(composerImages, image.id);- if (!preview) return;- onExpandImage(preview);- }}- >- <img- src={image.previewUrl}- alt={image.name}- className="h-full w-full object-cover"- />- </button>- ) : (- <div className="flex h-full w-full items-center justify-center px-1 text-center text-[10px] text-muted-foreground/70">- {image.name}- </div>- )}- {nonPersistedComposerImageIdSet.has(image.id) && (- <Tooltip>- <TooltipTrigger- render={- <span- role="img"- aria-label="Draft attachment may not persist"- className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-amber-600"- >- <CircleAlertIcon className="size-3" />- </span>- }- />- <TooltipPopup- side="top"- className="max-w-64 whitespace-normal leading-tight"- >- Draft attachment could not be saved locally and may be lost on- navigation.- </TooltipPopup>- </Tooltip>- )}- <Button- variant="ghost"- size="icon-xs"- className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"- onClick={() => removeComposerImage(image.id)}- aria-label={`Remove ${image.name}`}- >- <XIcon />- </Button>- </div>- ))}- </div>- )}-- <div className="relative">- <ComposerPromptEditor- ref={composerEditorRef}- value={- isComposerApprovalState- ? ""- : activePendingProgress- ? activePendingProgress.customAnswer- : prompt- }- cursor={composerCursor}- terminalContexts={- !isComposerApprovalState && pendingUserInputs.length === 0- ? composerTerminalContexts- : []- }- skills={selectedProviderStatus?.skills ?? []}- {...(showMobilePendingAnswerActions ? { className: "max-sm:pb-11" } : {})}- onRemoveTerminalContext={removeComposerTerminalContextFromDraft}- onChange={onPromptChange}- onCommandKeyDown={onComposerCommandKey}- onPaste={onComposerPaste}- placeholder={- isComposerApprovalState- ? (activePendingApproval?.detail ??- "Resolve this approval request to continue")- : activePendingProgress- ? "Type your own answer, or leave this blank to use the selected option"- : showPlanFollowUpPrompt && activeProposedPlan- ? "Add feedback to refine the plan, or leave this blank to implement it"- : environmentUnavailable- ? `${environmentUnavailable.label} is ${- environmentUnavailable.connectionState === "connecting"- ? "connecting"- : "disconnected"- }`- : phase === "disconnected"- ? "Ask for follow-up changes or attach images"- : "Ask anything, @tag files/folders, $use skills, or / for commands"- }- disabled={- isConnecting ||- isComposerApprovalState ||- (environmentUnavailable !== null && activePendingProgress === null)- }+ <ComposerPendingApprovalPanel+ approval={activePendingApproval}+ pendingCount={pendingApprovals.length}+ />+ <div className="flex flex-wrap items-center justify-end gap-2 px-3 pb-3 sm:px-4">+ <ComposerPendingApprovalActions+ requestId={activePendingApproval.requestId}+ isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}+ onRespondToApproval={onRespondToApproval}/>- {showMobilePendingAnswerActions ? (- <div- data-chat-composer-mobile-pending-actions="true"- className="absolute bottom-0 right-0 flex justify-end"+ </div>+ </div>+ ) : isComposerCollapsedMobile && pendingUserInputs.length > 0 ? (+ <div+ className="rounded-t-[19px] border-b border-border/65 bg-muted/20"+ data-chat-composer-collapsed-controls="true"+ >+ <ComposerPendingUserInputPanel+ pendingUserInputs={pendingUserInputs}+ respondingRequestIds={respondingRequestIds}+ answers={activePendingDraftAnswers}+ questionIndex={activePendingQuestionIndex}+ onToggleOption={onSelectActivePendingUserInputOption}+ onAdvance={onAdvanceActivePendingUserInput}+ />+ <div className="px-3 pb-3 sm:px-4">+ <div+ data-chat-composer-mobile-pending-compact="true"+ className={cn(+ "flex min-w-0 items-center gap-2 rounded-lg border border-border/55 bg-background/55 p-1.5 pl-3 transition-colors hover:bg-background/80",+ !activePendingProgress?.activeQuestion?.multiSelect && "p-0",+ )}+ >+ <button+ type="button"+ className={cn(+ "min-w-0 flex-1 truncate bg-transparent py-1.5 text-left text-sm",+ activePendingProgress?.customAnswer+ ? "text-foreground"+ : "text-muted-foreground/60",+ !activePendingProgress?.activeQuestion?.multiSelect && "px-3 py-2",+ )}+ onPointerDown={(event) => event.preventDefault()}+ onClick={expandMobileComposer}+ aria-label="Write custom answer">+ {activePendingProgress?.customAnswer || "Write custom answer"}+ </button>+ {activePendingProgress?.activeQuestion?.multiSelect ? (<ComposerPrimaryActionscompactpendingAction={pendingPrimaryAction}@@ -2296,128 +2081,328 @@ export const ChatComposer = memo(onInterrupt={handleInterruptPrimaryAction}onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}/>- </div>- ) : null}+ ) : null}+ </div></div></div>+ ) : null}- {/* Bottom toolbar */}- {isComposerCollapsedMobile ? null : activePendingApproval ? (- <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">- <ComposerPendingApprovalActions- requestId={activePendingApproval.requestId}- isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}- onRespondToApproval={onRespondToApproval}- />- </div>- ) : (- <div- data-chat-composer-footer="true"- data-chat-composer-footer-compact={isComposerFooterCompact ? "true" : "false"}+ {showCollapsedMobilePromptRow ? (+ <div className="flex items-center justify-between gap-2 px-3 py-2">+ <button+ type="button"className={cn(- "flex min-w-0 flex-nowrap items-center justify-between gap-2 overflow-visible px-2.5 pb-2.5 sm:px-3 sm:pb-3",- isComposerFooterCompact ? "gap-1.5" : "gap-2 sm:gap-0",- showMobilePendingAnswerActions && "hidden sm:flex",+ "min-w-0 flex-1 truncate bg-transparent p-0 text-left text-[14px] focus:outline-none",+ (activePendingProgress ? activePendingProgress.customAnswer : prompt.trim())+ ? "text-foreground"+ : "text-muted-foreground/35",)}+ onPointerDown={(event) => event.preventDefault()}+ onClick={expandMobileComposer}+ aria-label="Expand composer"+ >+ {activePendingProgress+ ? activePendingProgress.customAnswer ||+ "Type your own answer, or leave this blank to use the selected option"+ : prompt.trim() || "Ask anything..."}+ </button>+ <button+ type="button"+ className="flex size-8 shrink-0 items-center justify-center rounded-full bg-primary/90 text-primary-foreground disabled:opacity-30"+ disabled={collapsedComposerPrimaryActionDisabled}+ aria-label={collapsedComposerPrimaryActionLabel}+ onPointerDown={(event) => event.preventDefault()}+ onClick={(event) => {+ event.stopPropagation();+ submitComposer();+ }}>- <div className="-m-1 flex min-w-0 flex-1 items-center gap-1 overflow-x-auto p-1 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">- <ProviderModelPicker- compact={isComposerFooterCompact}- activeInstanceId={selectedInstanceId}- model={selectedModelForPickerWithCustomFallback}- lockedProvider={lockedProvider}- lockedContinuationGroupKey={lockedContinuationGroupKey}- instanceEntries={providerInstanceEntries}- keybindings={keybindings}- modelOptionsByInstance={modelOptionsByInstance}- terminalOpen={terminalOpen}- open={isComposerModelPickerOpen}- {...(composerProviderState.modelPickerIconClassName- ? {- activeProviderIconClassName:- composerProviderState.modelPickerIconClassName,- }- : {})}- onOpenChange={(open) => {- setIsComposerModelPickerOpen(open);- }}- onInstanceModelChange={onProviderModelSelect}+ <svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">+ <path+ d="M8 3L8 13M8 3L4 7M8 3L12 7"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"/>+ </svg>+ </button>+ </div>+ ) : null}- {isComposerFooterCompact ? (- <CompactComposerControlsMenu- activePlan={showPlanSidebarToggle}- interactionMode={interactionMode}- planSidebarLabel={planSidebarLabel}- planSidebarOpen={planSidebarOpen}- runtimeMode={runtimeMode}- showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}- traitsMenuContent={providerTraitsMenuContent}- onToggleInteractionMode={toggleInteractionMode}- onTogglePlanSidebar={togglePlanSidebar}- onRuntimeModeChange={handleRuntimeModeChange}- />- ) : (- <>- {providerTraitsPicker ? (- <>- <Separator- orientation="vertical"- className="mx-0.5 hidden h-4 sm:block"+ <div+ className={cn(+ "relative px-3 pb-2 sm:px-4",+ hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",+ isComposerCollapsedMobile && "hidden",+ )}+ >+ {composerMenuOpen && !isComposerApprovalState && (+ <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">+ <ComposerCommandMenu+ items={composerMenuItems}+ resolvedTheme={resolvedTheme}+ isLoading={isComposerMenuLoading}+ triggerKind={composerTriggerKind}+ groupSlashCommandSections={+ composerTrigger?.kind === "slash-command" &&+ composerTrigger.query.trim().length === 0+ }+ emptyStateText={composerMenuEmptyState}+ activeItemId={activeComposerMenuItem?.id ?? null}+ onHighlightedItemChange={onComposerMenuItemHighlighted}+ onSelect={onSelectComposerItem}+ />+ </div>+ )}++ {!isComposerCollapsedMobile &&+ !isComposerApprovalState &&+ pendingUserInputs.length === 0 &&+ composerImages.length > 0 && (+ <div className="mb-3 flex flex-wrap gap-2">+ {composerImages.map((image) => (+ <div+ key={image.id}+ className="relative h-16 w-16 overflow-hidden rounded-lg border border-border/80 bg-background"+ >+ {image.previewUrl ? (+ <button+ type="button"+ className="h-full w-full cursor-zoom-in"+ aria-label={`Preview ${image.name}`}+ onClick={() => {+ const preview = buildExpandedImagePreview(composerImages, image.id);+ if (!preview) return;+ onExpandImage(preview);+ }}+ >+ <img+ src={image.previewUrl}+ alt={image.name}+ className="h-full w-full object-cover"/>- {providerTraitsPicker}- </>- ) : null}- <ComposerFooterModeControls- showInteractionModeToggle={- composerProviderControls.showInteractionModeToggle- }- interactionMode={interactionMode}- runtimeMode={runtimeMode}- showPlanToggle={showPlanSidebarToggle}- planSidebarLabel={planSidebarLabel}- planSidebarOpen={planSidebarOpen}- onToggleInteractionMode={toggleInteractionMode}- onRuntimeModeChange={handleRuntimeModeChange}- onTogglePlanSidebar={togglePlanSidebar}- />- </>- )}+ </button>+ ) : (+ <div className="flex h-full w-full items-center justify-center px-1 text-center text-[10px] text-muted-foreground/70">+ {image.name}+ </div>+ )}+ {nonPersistedComposerImageIdSet.has(image.id) && (+ <Tooltip>+ <TooltipTrigger+ render={+ <span+ role="img"+ aria-label="Draft attachment may not persist"+ className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-amber-600"+ >+ <CircleAlertIcon className="size-3" />+ </span>+ }+ />+ <TooltipPopup+ side="top"+ className="max-w-64 whitespace-normal leading-tight"+ >+ Draft attachment could not be saved locally and may be lost on+ navigation.+ </TooltipPopup>+ </Tooltip>+ )}+ <Button+ variant="ghost"+ size="icon-xs"+ className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"+ onClick={() => removeComposerImage(image.id)}+ aria-label={`Remove ${image.name}`}+ >+ <XIcon />+ </Button>+ </div>+ ))}</div>+ )}- {/* Right side: send / stop button */}+ <div className="relative">+ <ComposerPromptEditor+ editorRef={composerEditorRef}+ value={+ isComposerApprovalState+ ? ""+ : activePendingProgress+ ? activePendingProgress.customAnswer+ : prompt+ }+ cursor={composerCursor}+ terminalContexts={+ !isComposerApprovalState && pendingUserInputs.length === 0+ ? composerTerminalContexts+ : []+ }+ skills={selectedProviderStatus?.skills ?? []}+ {...(showMobilePendingAnswerActions ? { className: "max-sm:pb-11" } : {})}+ onRemoveTerminalContext={removeComposerTerminalContextFromDraft}+ onChange={onPromptChange}+ onCommandKeyDown={onComposerCommandKey}+ onPaste={onComposerPaste}+ placeholder={+ isComposerApprovalState+ ? (activePendingApproval?.detail ?? "Resolve this approval request to continue")+ : activePendingProgress+ ? "Type your own answer, or leave this blank to use the selected option"+ : showPlanFollowUpPrompt && activeProposedPlan+ ? "Add feedback to refine the plan, or leave this blank to implement it"+ : environmentUnavailable+ ? `${environmentUnavailable.label} is ${+ environmentUnavailable.connectionState === "connecting"+ ? "connecting"+ : "disconnected"+ }`+ : phase === "disconnected"+ ? "Ask for follow-up changes or attach images"+ : "Ask anything, @tag files/folders, $use skills, or / for commands"+ }+ disabled={+ isConnecting ||+ isComposerApprovalState ||+ (environmentUnavailable !== null && activePendingProgress === null)+ }+ />+ {showMobilePendingAnswerActions ? (<div- data-chat-composer-actions="right"- data-chat-composer-primary-actions-compact={- isComposerPrimaryActionsCompact ? "true" : "false"- }- className="flex shrink-0 flex-nowrap items-center justify-end gap-2"+ data-chat-composer-mobile-pending-actions="true"+ className="absolute bottom-0 right-0 flex justify-end">- <ComposerFooterPrimaryActions- compact={isComposerPrimaryActionsCompact}- activeContextWindow={activeContextWindow}+ <ComposerPrimaryActions+ compactpendingAction={pendingPrimaryAction}- isRunning={phase === "running"}- showPlanFollowUpPrompt={- pendingUserInputs.length === 0 && showPlanFollowUpPrompt- }- promptHasText={prompt.trim().length > 0}+ isRunning={false}+ showPlanFollowUpPrompt={false}+ promptHasText={false}isSendBusy={isSendBusy}isConnecting={isConnecting}isEnvironmentUnavailable={environmentUnavailable !== null}- isPreparingWorktree={isPreparingWorktree}- hasSendableContent={composerSendState.hasSendableContent}- preserveComposerFocusOnPointerDown={isMobileViewport}+ isPreparingWorktree={false}+ hasSendableContent={false}+ preserveComposerFocusOnPointerDownonPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}onInterrupt={handleInterruptPrimaryAction}onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}/></div>- </div>- )}+ ) : null}+ </div></div>++ {/* Bottom toolbar */}+ {isComposerCollapsedMobile ? null : activePendingApproval ? (+ <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">+ <ComposerPendingApprovalActions+ requestId={activePendingApproval.requestId}+ isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}+ onRespondToApproval={onRespondToApproval}+ />+ </div>+ ) : (+ <div+ data-chat-composer-footer="true"+ data-chat-composer-footer-compact={isComposerFooterCompact ? "true" : "false"}+ className={cn(+ "flex min-w-0 flex-nowrap items-center justify-between gap-2 overflow-visible px-2.5 pb-2.5 sm:px-3 sm:pb-3",+ isComposerFooterCompact ? "gap-1.5" : "gap-2 sm:gap-0",+ showMobilePendingAnswerActions && "hidden sm:flex",+ )}+ >+ <div className="-m-1 flex min-w-0 flex-1 items-center gap-1 overflow-x-auto p-1 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">+ <ProviderModelPicker+ compact={isComposerFooterCompact}+ activeInstanceId={selectedInstanceId}+ model={selectedModelForPickerWithCustomFallback}+ lockedProvider={lockedProvider}+ lockedContinuationGroupKey={lockedContinuationGroupKey}+ instanceEntries={providerInstanceEntries}+ keybindings={keybindings}+ modelOptionsByInstance={modelOptionsByInstance}+ terminalOpen={terminalOpen}+ open={isComposerModelPickerOpen}+ {...(composerProviderState.modelPickerIconClassName+ ? {+ activeProviderIconClassName: composerProviderState.modelPickerIconClassName,+ }+ : {})}+ onOpenChange={(open) => {+ setIsComposerModelPickerOpen(open);+ }}+ onInstanceModelChange={onProviderModelSelect}+ />++ {isComposerFooterCompact ? (+ <CompactComposerControlsMenu+ activePlan={showPlanSidebarToggle}+ interactionMode={interactionMode}+ planSidebarLabel={planSidebarLabel}+ planSidebarOpen={planSidebarOpen}+ runtimeMode={runtimeMode}+ showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}+ traitsMenuContent={providerTraitsMenuContent}+ onToggleInteractionMode={toggleInteractionMode}+ onTogglePlanSidebar={togglePlanSidebar}+ onRuntimeModeChange={handleRuntimeModeChange}+ />+ ) : (+ <>+ {providerTraitsPicker ? (+ <>+ <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />+ {providerTraitsPicker}+ </>+ ) : null}+ <ComposerFooterModeControls+ showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}+ interactionMode={interactionMode}+ runtimeMode={runtimeMode}+ showPlanToggle={showPlanSidebarToggle}+ planSidebarLabel={planSidebarLabel}+ planSidebarOpen={planSidebarOpen}+ onToggleInteractionMode={toggleInteractionMode}+ onRuntimeModeChange={handleRuntimeModeChange}+ onTogglePlanSidebar={togglePlanSidebar}+ />+ </>+ )}+ </div>++ {/* Right side: send / stop button */}+ <div+ data-chat-composer-actions="right"+ data-chat-composer-primary-actions-compact={+ isComposerPrimaryActionsCompact ? "true" : "false"+ }+ className="flex shrink-0 flex-nowrap items-center justify-end gap-2"+ >+ <ComposerFooterPrimaryActions+ compact={isComposerPrimaryActionsCompact}+ activeContextWindow={activeContextWindow}+ pendingAction={pendingPrimaryAction}+ isRunning={phase === "running"}+ showPlanFollowUpPrompt={pendingUserInputs.length === 0 && showPlanFollowUpPrompt}+ promptHasText={prompt.trim().length > 0}+ isSendBusy={isSendBusy}+ isConnecting={isConnecting}+ isEnvironmentUnavailable={environmentUnavailable !== null}+ isPreparingWorktree={isPreparingWorktree}+ hasSendableContent={composerSendState.hasSendableContent}+ preserveComposerFocusOnPointerDown={isMobileViewport}+ onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}+ onInterrupt={handleInterruptPrimaryAction}+ onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}+ />+ </div>+ </div>+ )}</div>- </form>- );- }),-);+ </div>+ </form>+ );+});diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.tsxindex cd5334cc0..e59938b49 100644--- a/apps/web/src/components/chat/MessagesTimeline.browser.tsx+++ b/apps/web/src/components/chat/MessagesTimeline.browser.tsx@@ -13,18 +13,16 @@ const getStateSpy = vi.fn(() => ({ isAtEnd: true }));vi.mock("@legendapp/list/react", async () => {const React = await import("react");- const LegendList = React.forwardRef(function MockLegendList(- props: {- data: Array<{ id: string }>;- keyExtractor: (item: { id: string }) => string;- renderItem: (args: { item: { id: string } }) => React.ReactNode;- ListHeaderComponent?: React.ReactNode;- ListFooterComponent?: React.ReactNode;- },- ref: React.ForwardedRef<LegendListRef>,- ) {+ function LegendList(props: {+ data: Array<{ id: string }>;+ keyExtractor: (item: { id: string }) => string;+ renderItem: (args: { item: { id: string } }) => React.ReactNode;+ ListHeaderComponent?: React.ReactNode;+ ListFooterComponent?: React.ReactNode;+ ref?: React.Ref<LegendListRef>;+ }) {React.useImperativeHandle(- ref,+ props.ref,() =>({scrollToEnd: scrollToEndSpy,@@ -41,7 +39,7 @@ vi.mock("@legendapp/list/react", async () => {{props.ListFooterComponent}</div>);- });+ }return { LegendList };});diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsxindex 33f09b7a7..121031948 100644--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx@@ -1,32 +1,28 @@import { EnvironmentId, MessageId } from "@t3tools/contracts";-import { createRef } from "react";+import { createRef, type ReactNode, type Ref } from "react";import { renderToStaticMarkup } from "react-dom/server";import { beforeAll, describe, expect, it, vi } from "vitest";import type { LegendListRef } from "@legendapp/list/react";vi.mock("@legendapp/list/react", async () => {- const React = await import("react");-- const LegendList = React.forwardRef(function MockLegendList(- props: {- data: Array<{ id: string }>;- keyExtractor: (item: { id: string }) => string;- renderItem: (args: { item: { id: string } }) => React.ReactNode;- ListHeaderComponent?: React.ReactNode;- ListFooterComponent?: React.ReactNode;- },- _ref: React.ForwardedRef<LegendListRef>,- ) {- return (- <div data-testid="legend-list">- {props.ListHeaderComponent}- {props.data.map((item) => (- <div key={props.keyExtractor(item)}>{props.renderItem({ item })}</div>- ))}- {props.ListFooterComponent}- </div>- );- });+ const legendListTestId = "legend-list";++ const LegendList = (props: {+ data: Array<{ id: string }>;+ keyExtractor: (item: { id: string }) => string;+ renderItem: (args: { item: { id: string } }) => ReactNode;+ ListHeaderComponent?: ReactNode;+ ListFooterComponent?: ReactNode;+ ref?: Ref<LegendListRef>;+ }) => (+ <div data-testid={legendListTestId}>+ {props.ListHeaderComponent}+ {props.data.map((item) => (+ <div key={props.keyExtractor(item)}>{props.renderItem({ item })}</div>+ ))}+ {props.ListFooterComponent}+ </div>+ );return { LegendList };});diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsxindex ff2f8ce13..1540d5f34 100644--- a/apps/web/src/components/chat/MessagesTimeline.tsx+++ b/apps/web/src/components/chat/MessagesTimeline.tsx@@ -69,7 +69,7 @@ import { SkillInlineText } from "./SkillInlineText";import { formatWorkspaceRelativePath } from "../../filePathDisplay";// ----------------------------------------------------------------------------// Context — shared state consumed by every row component via useContext.+// Context — shared state consumed by every row component via Context.// Propagates through LegendList's memo boundaries for shared callbacks and// non-row-scoped state. `nowIso` is intentionally excluded — self-ticking// components (WorkingTimer, LiveElapsed) handle it.@@ -264,8 +264,8 @@ export const MessagesTimeline = memo(function MessagesTimeline({}return (- <TimelineRowCtx.Provider value={sharedState}>- <TimelineRowActivityCtx.Provider value={activityState}>+ <TimelineRowCtx value={sharedState}>+ <TimelineRowActivityCtx value={activityState}><LegendList<MessagesTimelineRow>ref={listRef}data={rows}@@ -281,8 +281,8 @@ export const MessagesTimeline = memo(function MessagesTimeline({ListHeaderComponent={TIMELINE_LIST_HEADER}ListFooterComponent={TIMELINE_LIST_FOOTER}/>- </TimelineRowActivityCtx.Provider>- </TimelineRowCtx.Provider>+ </TimelineRowActivityCtx>+ </TimelineRowCtx>);});diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsxindex ff6056e9c..b83eead95 100644--- a/apps/web/src/components/ui/combobox.tsx+++ b/apps/web/src/components/ui/combobox.tsx@@ -22,9 +22,9 @@ function Combobox<Value, Multiple extends boolean | undefined = false>(const chipsRef = React.useRef<Element | null>(null);const value = React.useMemo(() => ({ chipsRef, multiple: !!props.multiple }), [props.multiple]);return (- <ComboboxContext.Provider value={value}>+ <ComboboxContext value={value}><ComboboxPrimitive.Root {...props} />- </ComboboxContext.Provider>+ </ComboboxContext>);}@@ -151,7 +151,7 @@ function ComboboxPopup({side?: ComboboxPrimitive.Positioner.Props["side"];anchor?: ComboboxPrimitive.Positioner.Props["anchor"];}) {- const { chipsRef } = React.useContext(ComboboxContext);+ const { chipsRef } = React.use(ComboboxContext);const anchor = anchorProp ?? chipsRef;return (@@ -324,7 +324,7 @@ function ComboboxChips({}: ComboboxPrimitive.Chips.Props & {startAddon?: React.ReactNode;}) {- const { chipsRef } = React.useContext(ComboboxContext);+ const { chipsRef } = React.use(ComboboxContext);return (<ComboboxPrimitive.Chipsdiff --git a/apps/web/src/components/ui/number-field.tsx b/apps/web/src/components/ui/number-field.tsxindex 2d627757d..4b348f2ff 100644--- a/apps/web/src/components/ui/number-field.tsx+++ b/apps/web/src/components/ui/number-field.tsx@@ -25,7 +25,7 @@ export function NumberField({const contextValue = React.useMemo(() => ({ fieldId }), [fieldId]);return (- <NumberFieldContext.Provider value={contextValue}>+ <NumberFieldContext value={contextValue}><NumberFieldPrimitive.RootclassName={cn("flex w-full flex-col items-start gap-2", className)}data-size={size}@@ -33,7 +33,7 @@ export function NumberField({id={fieldId}{...props}/>- </NumberFieldContext.Provider>+ </NumberFieldContext>);}@@ -112,7 +112,7 @@ export function NumberFieldScrubArea({}: NumberFieldPrimitive.ScrubArea.Props & {label: string;}): React.ReactElement {- const context = React.useContext(NumberFieldContext);+ const context = React.use(NumberFieldContext);if (!context) {throw new Error(diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsxindex 278df12fc..d27412c95 100644--- a/apps/web/src/components/ui/sidebar.tsx+++ b/apps/web/src/components/ui/sidebar.tsx@@ -77,7 +77,7 @@ const SidebarContext = React.createContext<SidebarContextProps | null>(null);const SidebarInstanceContext = React.createContext<SidebarInstanceContextProps | null>(null);function useSidebar() {- const context = React.useContext(SidebarContext);+ const context = React.use(SidebarContext);if (!context) {throw new Error("useSidebar must be used within a SidebarProvider.");}@@ -148,7 +148,7 @@ function SidebarProvider({);return (- <SidebarContext.Provider value={contextValue}>+ <SidebarContext value={contextValue}><divclassName={cn("group/sidebar-wrapper flex min-h-svh w-full has-data-[variant=inset]:bg-sidebar",@@ -166,7 +166,7 @@ function SidebarProvider({>{children}</div>- </SidebarContext.Provider>+ </SidebarContext>);}@@ -206,7 +206,7 @@ function Sidebar({if (collapsible === "none") {return (- <SidebarInstanceContext.Provider value={instanceContextValue}>+ <SidebarInstanceContext value={instanceContextValue}><divclassName={cn("flex h-full w-(--sidebar-width) flex-col bg-sidebar text-sidebar-foreground",@@ -217,13 +217,13 @@ function Sidebar({>{children}</div>- </SidebarInstanceContext.Provider>+ </SidebarInstanceContext>);}if (isMobile) {return (- <SidebarInstanceContext.Provider value={instanceContextValue}>+ <SidebarInstanceContext value={instanceContextValue}><Sheet onOpenChange={setOpenMobile} open={openMobile} {...props}><SheetPopupclassName={cn(@@ -255,12 +255,12 @@ function Sidebar({</div></SheetPopup></Sheet>- </SidebarInstanceContext.Provider>+ </SidebarInstanceContext>);}return (- <SidebarInstanceContext.Provider value={instanceContextValue}>+ <SidebarInstanceContext value={instanceContextValue}><divclassName="group peer hidden text-sidebar-foreground md:block"data-collapsible={state === "collapsed" ? collapsible : ""}@@ -305,7 +305,7 @@ function Sidebar({</div></div></div>- </SidebarInstanceContext.Provider>+ </SidebarInstanceContext>);}@@ -345,7 +345,7 @@ function SidebarRail({...props}: React.ComponentProps<"button">) {const { open, toggleSidebar } = useSidebar();- const sidebarInstance = React.useContext(SidebarInstanceContext);+ const sidebarInstance = React.use(SidebarInstanceContext);const railRef = React.useRef<HTMLButtonElement | null>(null);const suppressClickRef = React.useRef(false);const resizeStateRef = React.useRef<{@@ -889,7 +889,7 @@ function SidebarMenuSkeleton({}: React.ComponentProps<"div"> & {showIcon?: boolean;}) {- // Random width between 50 to 90%.+ // Random width between 50 to 90%. Intentionally wrapped in useMemo to avoid changing width on every render.const width = React.useMemo(() => {return `${Math.floor(Math.random() * 40) + 50}%`;}, []);diff --git a/apps/web/src/components/ui/toggle-group.tsx b/apps/web/src/components/ui/toggle-group.tsxindex 437c5ef98..68cf007d7 100644--- a/apps/web/src/components/ui/toggle-group.tsx+++ b/apps/web/src/components/ui/toggle-group.tsx@@ -43,7 +43,7 @@ function ToggleGroup({orientation={orientation}{...props}>- <ToggleGroupContext.Provider value={value}>{children}</ToggleGroupContext.Provider>+ <ToggleGroupContext value={value}>{children}</ToggleGroupContext></ToggleGroupPrimitive>);}@@ -55,7 +55,7 @@ function Toggle({size,...props}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {- const context = React.useContext(ToggleGroupContext);+ const context = React.use(ToggleGroupContext);const resolvedVariant = variant ?? context.variant;const resolvedSize = size ?? context.size;diff --git a/apps/web/src/composerHandleContext.ts b/apps/web/src/composerHandleContext.tsindex 820720ba7..4b825d3dd 100644--- a/apps/web/src/composerHandleContext.ts+++ b/apps/web/src/composerHandleContext.ts@@ -1,10 +1,10 @@-import { createContext, useContext, type MutableRefObject } from "react";+import { createContext, use } from "react";import type { ChatComposerHandle } from "./components/chat/ChatComposer";-export type ComposerHandleRef = MutableRefObject<ChatComposerHandle | null>;+export type ComposerHandleRef = React.RefObject<ChatComposerHandle | null>;export const ComposerHandleContext = createContext<ComposerHandleRef | null>(null);export function useComposerHandleContext(): ComposerHandleRef | null {- return useContext(ComposerHandleContext);+ return use(ComposerHandleContext);}diff --git a/apps/web/src/rpc/atomRegistry.tsx b/apps/web/src/rpc/atomRegistry.tssimilarity index 55%rename from apps/web/src/rpc/atomRegistry.tsxrename to apps/web/src/rpc/atomRegistry.tsindex 89385c9a7..3fb12914a 100644--- a/apps/web/src/rpc/atomRegistry.tsx+++ b/apps/web/src/rpc/atomRegistry.ts@@ -1,11 +1,11 @@import { RegistryContext } from "@effect/atom-react";import { AtomRegistry } from "effect/unstable/reactivity";-import type { ReactNode } from "react";+import { createElement } from "react";export let appAtomRegistry = AtomRegistry.make();-export function AppAtomRegistryProvider({ children }: { readonly children: ReactNode }) {- return <RegistryContext.Provider value={appAtomRegistry}>{children}</RegistryContext.Provider>;+export function AppAtomRegistryProvider({ children }: React.PropsWithChildren) {+ return createElement(RegistryContext.Provider, { value: appAtomRegistry }, children);}export function resetAppAtomRegistryForTests() {diff --git a/bun.lock b/bun.lockindex 9f0c7bf49..f3ca61fda 100644--- a/bun.lock+++ b/bun.lock@@ -108,8 +108,8 @@"effect": "catalog:","lexical": "^0.41.0","lucide-react": "^0.564.0",- "react": "^19.0.0",- "react-dom": "^19.0.0",+ "react": "19.2.6",+ "react-dom": "19.2.6","react-markdown": "^10.1.0","remark-gfm": "^4.0.1","tailwind-merge": "^3.4.0",@@ -121,12 +121,12 @@"@tailwindcss/vite": "^4.0.0","@tanstack/router-plugin": "^1.161.0","@types/babel__core": "^7.20.5",- "@types/react": "^19.0.0",- "@types/react-dom": "^19.0.0",+ "@types/react": "~19.2.14",+ "@types/react-dom": "~19.2.3","@vercel/config": "^0.3.0","@vitejs/plugin-react": "^6.0.0","@vitest/browser-playwright": "^4.0.18",- "babel-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",+ "babel-plugin-react-compiler": "1.0.0","msw": "2.12.11","playwright": "^1.58.2","tailwindcss": "^4.0.0",@@ -1011,7 +1011,7 @@"babel-dead-code-elimination": ["[email protected]", "", { "dependencies": { "@babel/core": "^7.23.7", "@babel/parser": "^7.23.6", "@babel/traverse": "^7.23.7", "@babel/types": "^7.23.6" } }, "sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig=="],- "babel-plugin-react-compiler": ["[email protected]", "", { "dependencies": { "@babel/types": "^7.26.0" } }, "sha512-q84bNR9JG1crykAlJUt5Ud0/5BUyMFuQww/mrwIQDFBaxsikqBDj3f/FNDsVd2iR26A1HvXKWPEIfgJDv8/V2g=="],+ "babel-plugin-react-compiler": ["[email protected]", "", { "dependencies": { "@babel/types": "^7.26.0" } }, "sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw=="],"bail": ["[email protected]", "", {}, "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="],@@ -1737,9 +1737,9 @@"raw-body": ["[email protected]", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="],- "react": ["[email protected]", "", {}, "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ=="],+ "react": ["[email protected]", "", {}, "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q=="],- "react-dom": ["[email protected]", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.4" } }, "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ=="],+ "react-dom": ["[email protected]", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.6" } }, "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g=="],"react-error-boundary": ["[email protected]", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0" } }, "sha512-BrYwPOdXi5mqkk5lw+Uvt0ThHx32rCt3BkukS4X23A2AIWDPSGX6iaWTc0y9TU/mHDA/6qOSGel+B2ERkOvD1w=="],