The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 13:15 UTC
feat(web): simpler composer with grouped controls, effort words and no collapsed state (#25869)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Theo Browne committed
Oct 28, 2026 at 04:49 UTC
bd84b1781a7febb7398a6838cad0416a3240da1a
40 files changed
+1162
-1196
apps/desktop/src/settings/DesktopClientSettings.test.ts
-1
@@ -34,7 +34,6 @@ const clientSettings: ClientSettings = {
34
confirmThreadDelete: false,
35
confirmThreadUnpin: false,
36
contextWindowMeterEnabled: false,
37
- composerCollapseOnScroll: true,
37
diffFilesCollapsed: true,
38
diffIgnoreWhitespace: true,
39
diffLayout: "stacked",
apps/web/src/components/BranchToolbar.logic.ts
+3
-3
@@ -66,12 +66,12 @@ export function shouldShowComposerContextStrip(input: {
66
hasActiveProject: boolean;
67
isGitRepo: boolean;
68
showEnvironmentIndicator: boolean;
69
- hostsRestingComposerControls: boolean;
69
}): boolean {
70
+ // A new thread always shows the strip, since it names the permissions the first send uses.
71
return (
72
input.hasActiveProject &&
73
- (input.isDraftHeroState || input.persistInActiveThreads) &&
74
- (input.isGitRepo || input.showEnvironmentIndicator || input.hostsRestingComposerControls)
73
+ (input.isDraftHeroState ||
74
+ (input.persistInActiveThreads && (input.isGitRepo || input.showEnvironmentIndicator)))
75
);
76
}
77
apps/web/src/components/BranchToolbar.tsx
+9
-41
@@ -5,17 +5,11 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
5
import { ComposerContextLabel } from "./ComposerContextLabel";
6
import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environment";
7
import type { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
8
-import {
9
- ChevronDownIcon,
10
- FolderGit2Icon,
11
- FolderGitIcon,
12
- FolderIcon,
13
- PlusIcon,
14
- ScaleIcon,
15
-} from "lucide-react";
8
+import { FolderGit2Icon, FolderGitIcon, FolderIcon, PlusIcon, ScaleIcon } from "lucide-react";
9
import {
10
type Ref,
11
type MouseEvent as ReactMouseEvent,
12
+ type ReactNode,
13
memo,
14
useImperativeHandle,
15
useRef,
@@ -72,8 +66,6 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
66
import { MiddleTruncate } from "./ui/middle-truncate";
67
import { ComposerSurface } from "./chat/ComposerSurface";
68
import { useComposerMenuProps } from "./chat/composerEventScope";
75
-import { measureRestingComposerControls } from "./chat/restingComposerControlsMeasurement";
76
-import { resolveRestingComposerControlsNaturalWidth } from "./composerFooterLayout";
69
import { cn } from "~/lib/utils";
70
import { observeResize } from "~/lib/observeResize";
71
@@ -105,10 +97,10 @@ interface BranchToolbarProps {
97
envLocked: boolean;
98
onCheckoutPullRequestRequest?: (reference: string) => void;
99
onComposerFocusRequest?: () => void;
100
+ /** Shown at the end of the composer strip, such as the new thread's permissions. */
101
+ trailing?: ReactNode;
102
availableEnvironments?: readonly EnvironmentOption[];
103
onEnvironmentChange?: (environmentId: EnvironmentId) => void;
110
- composerControlsHostRef?: (element: HTMLDivElement | null) => void;
111
- contextStripVisible?: boolean;
104
}
105
106
function showWorkspaceContextMenu(event: ReactMouseEvent, workspacePath: string) {
@@ -317,7 +309,6 @@ const RunContextSelector = memo(function RunContextSelector({
309
].join(" ")}
310
>
311
{triggerContent}
320
- {!isPanel ? <ChevronDownIcon className="size-3 shrink-0 mx-0!" /> : null}
312
</MenuTrigger>
313
<MenuPopup
314
align="start"
@@ -544,16 +535,7 @@ function useLabelsOverflow(): readonly [
535
let groups = 0;
536
for (const child of current.children) {
537
if (!(child instanceof HTMLElement)) continue;
547
- // Reserve overflowed controls' width to prevent repeated hiding and expansion.
548
- const hostedControls = child.matches('[data-chat-resting-composer-controls-host="true"]')
549
- ? child.querySelector<HTMLElement>('[data-chat-composer-resting-controls="true"]')
550
- : null;
551
- const hostedMeasurement = hostedControls
552
- ? measureRestingComposerControls(hostedControls)
553
- : null;
554
- const width = hostedMeasurement
555
- ? resolveRestingComposerControlsNaturalWidth(hostedMeasurement)
556
- : contentWidth(hostedControls ?? child);
538
+ const width = contentWidth(child);
539
if (width <= 1) continue;
540
groups += 1;
541
needed += width;
@@ -585,7 +567,6 @@ function useLabelsOverflow(): readonly [
567
[
568
current,
569
...Array.from(current.children),
588
- ...Array.from(current.querySelectorAll("[data-chat-composer-resting-controls='true']")),
570
...Array.from(current.querySelectorAll(COMPOSER_CONTEXT_LABEL_SELECTOR)),
571
],
572
measure,
@@ -640,8 +621,7 @@ export const BranchToolbar = memo(function BranchToolbar({
621
onComposerFocusRequest,
622
availableEnvironments,
623
onEnvironmentChange,
643
- composerControlsHostRef,
644
- contextStripVisible = true,
624
+ trailing,
625
}: BranchToolbarProps) {
626
const branchSelectorRef = useRef<BranchToolbarBranchSelectorHandle>(null);
627
const threadRef = scopeThreadRef(environmentId, threadId);
@@ -764,11 +744,7 @@ export const BranchToolbar = memo(function BranchToolbar({
744
<ComposerSurface.ContextStrip
745
ref={attachStrip}
746
data-compact={labelsOverflow ? "" : undefined}
767
- className={cn(
768
- "gap-1 text-xs font-normal text-foreground/70 dark:text-muted-foreground",
769
- // Hide empty non-Git strips while retaining host width so controls can reappear as the chat grows.
770
- !contextStripVisible && "pointer-events-none invisible absolute inset-x-0 top-full",
771
- )}
747
+ className={cn("gap-1 text-xs font-normal text-foreground/70 dark:text-muted-foreground")}
748
>
749
{showGitControls ? (
750
<div className="contents @3xl/composer-surface:hidden">
@@ -799,7 +775,7 @@ export const BranchToolbar = memo(function BranchToolbar({
775
className={cn(
776
"min-h-7 min-w-10 items-center gap-1 sm:min-h-6",
777
showGitControls ? "hidden @3xl/composer-surface:flex" : "flex",
802
- composerControlsHostRef ? "shrink" : "flex-1",
778
+ "flex-1",
779
)}
780
>
781
{showEnvironmentIndicator && availableEnvironments && (
@@ -837,15 +813,6 @@ export const BranchToolbar = memo(function BranchToolbar({
813
</div>
814
) : null}
815
840
- {composerControlsHostRef ? (
841
- <div
842
- ref={composerControlsHostRef}
843
- data-composer-context-control
844
- data-chat-resting-composer-controls-host="true"
845
- className="flex min-w-0 flex-1 items-center justify-start overflow-x-clip overflow-y-visible"
846
- />
847
- ) : null}
848
-
816
{showGitControls ? (
817
<BranchToolbarBranchSelector
818
forceNewWorktree={forceNewWorktree}
@@ -864,6 +831,7 @@ export const BranchToolbar = memo(function BranchToolbar({
831
{...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
832
/>
833
) : null}
834
+ {trailing}
835
</ComposerSurface.ContextStrip>
836
);
837
});
apps/web/src/components/BranchToolbarBranchSelector.tsx
+1
-2
@@ -16,7 +16,7 @@ import {
16
type VcsRef,
17
type ThreadId,
18
} from "@t3tools/contracts";
19
-import { ChevronDownIcon, GitBranchIcon } from "lucide-react";
19
+import { GitBranchIcon } from "lucide-react";
20
import {
21
useDeferredValue,
22
useEffect,
@@ -732,7 +732,6 @@ export function BranchToolbarBranchSelector({
732
className="w-full"
733
/>
734
</ComposerContextLabel>
735
- {displayMode !== "panel" ? <ChevronDownIcon className="size-3 shrink-0" /> : null}
735
</ComboboxTrigger>
736
</span>
737
{displayMode === "panel" && prNumber !== undefined && prUrl !== undefined ? (
apps/web/src/components/ChatView.tsx
+30
-95
@@ -175,6 +175,8 @@ import { LinkPullRequestDialogHost } from "./pullRequest/LinkPullRequestDialog";
175
import { GuestPendingMessages } from "./chat/GuestShareControls";
176
import { useDeviceState } from "~/state/device";
177
import { BranchToolbar, type BranchToolbarHandle } from "./BranchToolbar";
178
+import { ComposerContextPermissions } from "./ComposerContextPermissions";
179
+import { resolveCompatibleRuntimeMode } from "./chat/runtimeModeConfig";
180
import { makeWorkspaceFileDropHandlers } from "./chat/workspaceFileDrop";
181
import { isEditableFocused } from "../lib/editableFocus";
182
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
@@ -267,11 +269,7 @@ import type { MessagesTimelineHistoryControls } from "./chat/MessagesTimeline";
269
import { ThreadTimeline } from "./chat/ThreadTimeline";
270
import { ProviderSubagentBar } from "./chat/ProviderSubagentBar";
271
import { getTriggerDisplayModelName } from "./chat/providerIconUtils";
270
-import {
271
- overlayComposerIsResting,
272
- resolveComposerTimelineInset,
273
- resolveScrollToEndClearance,
274
-} from "./composerFooterLayout";
272
+import { resolveScrollToEndClearance } from "./composerFooterLayout";
273
import { ChatHeader } from "./chat/ChatHeader";
274
import { useRemoteOpenState } from "~/remoteOpen";
275
import { shouldShowOpenInPicker } from "./chat/OpenInPicker.logic";
@@ -611,9 +609,6 @@ export default function ChatView(props: ChatViewProps) {
609
const composerFilesRef = useRef<ComposerFileAttachment[]>([]);
610
const composerTerminalContextsRef = useRef<TerminalContextDraft[]>([]);
611
const branchToolbarRef = useRef<BranchToolbarHandle>(null);
614
- const [restingComposerControlsHost, setRestingComposerControlsHost] =
615
- useState<HTMLDivElement | null>(null);
616
- const [restingComposerControlsVisible, setRestingComposerControlsVisible] = useState(false);
612
const citeAssistantText = (
613
citation: AssistantCitation,
614
sourceAnchor: AssistantCitationSourceAnchor,
@@ -704,8 +699,6 @@ export default function ChatView(props: ChatViewProps) {
699
setPendingServerThreadStartFromOriginByThreadId,
700
] = useState<Record<string, boolean>>({});
701
const legendListRef = useRef<LegendListRef | null>(null);
707
- const getTimelineScrollableNode = () => legendListRef.current?.getScrollableNode() ?? null;
708
- const getTimelineScrollableNodeStable = useStableCallback(getTimelineScrollableNode);
702
const conversationArea = workspaceAreaProps("conversation", 1, "Conversation");
703
const composerArea = workspaceAreaProps("composer", 2, "Message input");
704
const [composerOverlayElement, setComposerOverlayElement] = useState<HTMLDivElement | null>(null);
@@ -714,9 +707,7 @@ export default function ChatView(props: ChatViewProps) {
707
const [composerReservedHeight, setComposerReservedHeight] = useState(0);
708
const composerReservedHeightRef = useRef(0);
709
const composerExpandedHeightRef = useRef(0);
717
- const composerRestingRef = useRef(false);
710
const [scrollToEndClearance, setScrollToEndClearance] = useState(0);
719
- const [timelineOverflows, setTimelineOverflows] = useState(false);
711
const fanoutSelectionsAtom = draftFanoutSelectionsAtom(routeThreadKey);
712
const { sendInFlight: sendInFlightRef } = draftSendState(routeThreadKey);
713
const multipleModelSelections = useAtomValue(fanoutSelectionsAtom);
@@ -1686,25 +1677,13 @@ export default function ChatView(props: ChatViewProps) {
1677
providerSubagentModels,
1678
reportedModelSelection,
1679
);
1689
- const mountComposerContextStrip = shouldShowComposerContextStrip({
1690
- isDraftHeroState,
1691
- persistInActiveThreads: settings.persistComposerContextStrip,
1692
- hasActiveProject: activeProject !== null && !showProviderSubagentBar,
1693
- isGitRepo,
1694
- showEnvironmentIndicator: showComposerEnvironmentIndicator,
1695
- hostsRestingComposerControls: routeKind === "server",
1696
- });
1680
const showComposerContextStrip = shouldShowComposerContextStrip({
1681
isDraftHeroState,
1682
persistInActiveThreads: settings.persistComposerContextStrip,
1683
hasActiveProject: activeProject !== null && !showProviderSubagentBar,
1684
isGitRepo,
1685
showEnvironmentIndicator: showComposerEnvironmentIndicator,
1703
- hostsRestingComposerControls: routeKind === "server" && restingComposerControlsVisible,
1686
});
1705
- const mountComposerModelStrip =
1706
- routeKind === "server" && !mountComposerContextStrip && !showProviderSubagentBar;
1707
- const showComposerModelStrip = mountComposerModelStrip && restingComposerControlsVisible;
1687
const terminalShortcutLabelOptions = {
1688
context: {
1689
terminalFocus: true,
@@ -1792,6 +1771,9 @@ export default function ChatView(props: ChatViewProps) {
1771
});
1772
};
1773
const scheduleComposerFocusStable = useStableCallback(scheduleComposerFocus);
1774
+ const openComposerPermissionsStable = useStableCallback(() =>
1775
+ composerRef.current?.openControl("composer.mode"),
1776
+ );
1777
const insertArtifactTemplate = (template: CodexArtifactTemplate) => {
1778
const composer = composerRef.current;
1779
if (!composer) return;
@@ -2047,14 +2029,12 @@ export default function ChatView(props: ChatViewProps) {
2029
const {
2030
showScrollToBottom,
2031
timelineLiveFollowEnabled,
2050
- isTimelineAtLogicalEndStable,
2032
onComposerPageScrollKeyDownStable,
2033
onComposerPageScrollKeyUpStable,
2034
onComposerPageScrollReleaseStable,
2035
scrollToEnd,
2036
onTimelineAnchorReadyStable,
2037
onTimelineAnchorSizeChangedStable,
2057
- onToolOutputCollapsedAtEndStable,
2038
onTimelineFooterGrowStable,
2039
onIsAtEndChangeStable,
2040
anchorNewTurn,
@@ -2062,7 +2042,6 @@ export default function ChatView(props: ChatViewProps) {
2042
attachComposerOverlay: attachFollowComposerOverlay,
2043
} = useTimelineFollow({
2044
legendListRef,
2065
- composerRef,
2045
composerTimelineInset,
2046
routeThreadKey,
2047
activeThreadKey,
@@ -2177,29 +2156,9 @@ export default function ChatView(props: ChatViewProps) {
2156
const publishComposerOverlayHeight = (height: number) => {
2157
const nextHeight = Math.ceil(height);
2158
if (nextHeight <= 0) return;
2180
- const isResting = overlayComposerIsResting({
2181
- composerMounted,
2182
- composerReportedResting: composerRestingRef.current,
2183
- });
2184
- const modelStrip = composerOverlayElement?.querySelector<HTMLElement>(
2185
- '[data-composer-model-strip="true"]',
2186
- );
2187
- const restingOnlyHeight =
2188
- modelStrip && isResting
2189
- ? Math.max(
2190
- 0,
2191
- modelStrip.offsetHeight + Number.parseFloat(getComputedStyle(modelStrip).marginTop),
2192
- )
2193
- : 0;
2194
- const nextInset = resolveComposerTimelineInset({
2195
- currentInset: composerTimelineInsetRef.current,
2196
- overlayHeight: height,
2197
- isResting,
2198
- restingOnlyHeight,
2199
- });
2200
- if (composerTimelineInsetRef.current !== nextInset) {
2201
- composerTimelineInsetRef.current = nextInset;
2202
- setComposerTimelineInset(nextInset);
2159
+ if (composerTimelineInsetRef.current !== nextHeight) {
2160
+ composerTimelineInsetRef.current = nextHeight;
2161
+ setComposerTimelineInset(nextHeight);
2162
}
2163
// Reserve the expanded composer height for the terminal drawer and empty placeholder.
2164
// Keep it while the mobile strip collapses, but allow growth from approvals or tasks.
@@ -2208,7 +2167,7 @@ export default function ChatView(props: ChatViewProps) {
2167
'[data-chat-composer-stack="true"]',
2168
);
2169
const expandedComposerHeight =
2211
- isDraftHeroState && stack ? Math.ceil(stack.getBoundingClientRect().height) : nextInset;
2170
+ isDraftHeroState && stack ? Math.ceil(stack.getBoundingClientRect().height) : nextHeight;
2171
const mobileCollapsed = Boolean(
2172
stack?.querySelector('[data-chat-composer-mobile-collapsed="true"]'),
2173
);
@@ -2240,11 +2199,6 @@ export default function ChatView(props: ChatViewProps) {
2199
setScrollToEndClearance(clearance);
2200
};
2201
const publishComposerOverlayHeightStable = useStableCallback(publishComposerOverlayHeight);
2243
- // The composer's layout effect publishes this flag before parent layout effects or resize observations.
2244
- const onComposerRestingChange = (resting: boolean) => {
2245
- composerRestingRef.current = resting;
2246
- };
2247
- const onComposerRestingChangeStable = useStableCallback(onComposerRestingChange);
2202
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- measures the composer overlay element before paint for a new thread or composer mount
2203
useLayoutEffect(() => {
2204
if (!composerOverlayElement) return;
@@ -3333,8 +3287,6 @@ export default function ChatView(props: ChatViewProps) {
3287
contentInsetEndAdjustment={composerTimelineInset}
3288
liveFollowEnabled={timelineLiveFollowEnabled}
3289
onIsAtEndChange={onIsAtEndChangeStable}
3336
- onContentOverflowChange={setTimelineOverflows}
3337
- onToolOutputCollapsedAtEnd={onToolOutputCollapsedAtEndStable}
3290
onViewportAttach={attachTimelineViewport}
3291
onFooterGrow={onTimelineFooterGrowStable}
3292
hideEmptyPlaceholder={isDraftHeroState || threadDetailLoading}
@@ -3349,10 +3301,7 @@ export default function ChatView(props: ChatViewProps) {
3301
<ScrollToEndButton
3302
bottom={scrollToEndClearance + 4}
3303
summary={scrollToEndSummary}
3352
- onScrollToEnd={() => {
3353
- composerRef.current?.restoreAfterTimelineReachedEnd();
3354
- scrollToEnd(true);
3355
- }}
3304
+ onScrollToEnd={() => scrollToEnd(true)}
3305
/>
3306
)}
3307
</div>
@@ -3403,9 +3352,7 @@ export default function ChatView(props: ChatViewProps) {
3352
: undefined
3353
}
3354
>
3406
- <ComposerSurface.Shell
3407
- contextStrip={showComposerContextStrip || showComposerModelStrip}
3408
- >
3355
+ <ComposerSurface.Shell contextRow={showComposerContextStrip}>
3356
<ComposerSurface.Host
3357
inert={queuedRunEdit.isSaving}
3358
aria-busy={queuedRunEdit.isSaving}
@@ -3513,6 +3460,7 @@ export default function ChatView(props: ChatViewProps) {
3460
activeEnvironmentUnavailable ? null : threadSyncPhase
3461
}
3462
runtimeMode={runtimeMode}
3463
+ defaultRuntimeMode={defaultRuntimeMode}
3464
interactionMode={interactionMode}
3465
lockedProvider={modelPickerLockedProvider}
3466
providerStatuses={providerStatuses as ServerProvider[]}
@@ -3538,17 +3486,8 @@ export default function ChatView(props: ChatViewProps) {
3486
supportsPullRequests ? activeProjectRepository : null
3487
}
3488
threadPullRequests={(activeThreadShell ?? activeThread)?.pullRequests}
3541
- restingControlsHost={restingComposerControlsHost}
3542
- restingControlsHaveLeadingContext={
3543
- mountComposerContextStrip &&
3544
- (isGitRepo || showComposerEnvironmentIndicator)
3545
- }
3546
- onRestingControlsVisibilityChange={setRestingComposerControlsVisible}
3547
- getTimelineScrollableNode={getTimelineScrollableNodeStable}
3548
- isTimelineAtLogicalEnd={isTimelineAtLogicalEndStable}
3549
- timelineOverflows={timelineOverflows}
3489
onComposerOverlayHeightChange={publishComposerOverlayHeightStable}
3551
- onRestingChange={onComposerRestingChangeStable}
3490
+ permissionsShownInStrip={showComposerContextStrip && !isServerThread}
3491
promptRef={promptRef}
3492
composerImagesRef={composerImagesRef}
3493
composerFilesRef={composerFilesRef}
@@ -3598,24 +3537,7 @@ export default function ChatView(props: ChatViewProps) {
3537
data-terminal-open={terminalUiState.terminalOpen ? "true" : undefined}
3538
className="relative z-0"
3539
>
3601
- {mountComposerModelStrip ? (
3602
- <ComposerSurface.ContextStrip
3603
- data-composer-model-strip="true"
3604
- aria-hidden={showComposerModelStrip ? undefined : true}
3605
- inert={showComposerModelStrip ? undefined : true}
3606
- className={cn(
3607
- "group-data-model-strip-transition/composer-surface:before:backdrop-blur-(--glass-blur) group-data-model-strip-transition/composer-surface:before:bg-(--chat-composer-glass-surface)/(--glass-opacity)",
3608
- !showComposerModelStrip &&
3609
- "pointer-events-none invisible absolute inset-x-0 top-full",
3610
- )}
3611
- >
3612
- <div
3613
- ref={setRestingComposerControlsHost}
3614
- className="min-w-0 flex-1"
3615
- />
3616
- </ComposerSurface.ContextStrip>
3617
- ) : null}
3618
- {mountComposerContextStrip && (
3540
+ {showComposerContextStrip && (
3541
<div className="pointer-events-auto">
3542
<BranchToolbar
3543
forceNewWorktree={multipleModelSelections !== null}
@@ -3656,8 +3578,21 @@ export default function ChatView(props: ChatViewProps) {
3578
: undefined
3579
}
3580
availableEnvironments={logicalProjectEnvironments}
3659
- composerControlsHostRef={setRestingComposerControlsHost}
3660
- contextStripVisible={showComposerContextStrip}
3581
+ {...(isServerThread
3582
+ ? {}
3583
+ : {
3584
+ trailing: (
3585
+ <ComposerContextPermissions
3586
+ runtimeMode={
3587
+ resolveCompatibleRuntimeMode(
3588
+ runtimeMode,
3589
+ activeProviderStatus?.supportedRuntimeModes,
3590
+ ).mode
3591
+ }
3592
+ onOpen={openComposerPermissionsStable}
3593
+ />
3594
+ ),
3595
+ })}
3596
/>
3597
</div>
3598
)}
apps/web/src/components/ComposerContextPermissions.tsx
new
+40
@@ -0,0 +1,40 @@
1
+import type { RuntimeMode } from "@t3tools/contracts";
2
+import { useAtomValue } from "@effect/atom-react";
3
+
4
+import { shortcutLabelForCommand } from "../keybindings";
5
+import { primaryServerKeybindingsAtom } from "../state/server";
6
+import { ComposerControl } from "./chat/ComposerControl";
7
+import { runtimeModeConfig } from "./chat/runtimeModeConfig";
8
+import { ComposerContextLabel } from "./ComposerContextLabel";
9
+import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
10
+
11
+/** The new-thread strip names the permissions the first send will use; clicking opens them. */
12
+export function ComposerContextPermissions(props: {
13
+ runtimeMode: RuntimeMode;
14
+ onOpen: () => void;
15
+}) {
16
+ const shortcutLabel = shortcutLabelForCommand(
17
+ useAtomValue(primaryServerKeybindingsAtom),
18
+ "composer.mode",
19
+ );
20
+ const { icon: Icon, label } = runtimeModeConfig[props.runtimeMode];
21
+ return (
22
+ <Tooltip>
23
+ <TooltipTrigger
24
+ render={
25
+ <ComposerControl
26
+ size="xs"
27
+ className="ms-auto min-w-0 shrink-0"
28
+ aria-label={`Permissions: ${label}`}
29
+ data-composer-context-control
30
+ onClick={props.onOpen}
31
+ />
32
+ }
33
+ >
34
+ <Icon aria-hidden="true" className="size-3" />
35
+ <ComposerContextLabel>{label}</ComposerContextLabel>
36
+ </TooltipTrigger>
37
+ <TooltipPopup>Permissions{shortcutLabel ? ` · ${shortcutLabel}` : null}</TooltipPopup>
38
+ </Tooltip>
39
+ );
40
+}
apps/web/src/components/chat/ChatComposer.tsx
+67
-398
@@ -1,7 +1,11 @@
1
import { useComposerTypingGuard } from "./useComposerTypingGuard";
2
import { insertAttachmentReferencesForDraft } from "./composerAttachmentReferences";
3
import { DESKTOP_PASTE_AS_TEXT_EVENT } from "../../lib/desktopPasteAsText";
4
-import { runtimeModeConfig, runtimeModeOptions as runtimeModes } from "./runtimeModeConfig";
4
+import {
5
+ resolveCompatibleRuntimeMode,
6
+ runtimeModeConfig,
7
+ runtimeModeOptions as runtimeModes,
8
+} from "./runtimeModeConfig";
9
import { isLocalEnvironmentDisabled } from "../../localEnvironment";
10
import { usePrimaryEnvironmentId } from "../../state/environments";
11
import { useRightPanelStore } from "~/rightPanelStore";
@@ -56,7 +60,7 @@ import {
60
useRef,
61
useState,
62
} from "react";
59
-import { createPortal, flushSync } from "react-dom";
63
+import { flushSync } from "react-dom";
64
import {
65
clampCollapsedComposerCursor,
66
type ComposerTrigger,
@@ -86,6 +90,7 @@ import {
90
import {
91
isInsideCollapsedComposerControls,
92
isInsideRestingComposerControlScope,
93
+ markOpenToPermissions,
94
} from "./composerEventScope";
95
import {
96
type ComposerFileAttachment,
@@ -102,7 +107,6 @@ import { ComposerStashBadge } from "./ComposerStashBadge";
107
import { ComposerStashMenu } from "./ComposerStashMenu";
108
import { useComposerTriggerState } from "./useComposerTriggerState";
109
import { useComposerMenuItems } from "./useComposerMenuItems";
105
-import { useComposerFocusState } from "./useComposerFocusState";
110
import { useComposerMultilinePrompt } from "./useComposerMultilinePrompt";
111
import {
112
reconcileAttachmentContextReferences,
@@ -140,7 +144,6 @@ import {
144
import {
145
shouldUseCompactComposerPrimaryActions,
146
shouldUseCompactComposerFooter,
143
- shouldUseRestingComposerLayout,
147
} from "../composerFooterLayout";
148
import {
149
type ComposerCitationCommentRequest,
@@ -221,20 +224,9 @@ import {
224
import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
225
import { pendingDraftWork } from "./pendingDraftWork";
226
import { importComposerThreadAttachment } from "./composerThreadImport";
224
-import { isTimelineScrollTarget } from "./timelineScrollTarget";
225
-import {
226
- createComposerScrollGestureState,
227
- recordComposerScrollGestureEvent,
228
- shouldCollapseComposerForScrollKey,
229
- resetComposerScrollGesture,
230
- suppressActiveComposerScrollGesture,
231
-} from "./composerScrollGesture";
227
import { observeResize } from "~/lib/observeResize";
228
229
const isEnvironmentRequestInvalidError = Schema.is(EnvironmentRequestInvalidError);
235
-
236
-const COMPOSER_SCROLL_COLLAPSE_THRESHOLD_PX = 24;
237
-const COMPOSER_SCROLL_GESTURE_RESET_MS = 120;
230
import { toastManager } from "../ui/toast";
231
import { PlayIcon } from "lucide-react";
232
import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
@@ -297,8 +289,6 @@ const runtimeModeOptions = runtimeModes.map((mode) => ({ mode, ...runtimeModeCon
289
export interface ChatComposerHandle {
290
focusAtEnd: () => void;
291
focusAt: (cursor: number) => void;
300
- restoreAfterTimelineReachedEnd: () => void;
301
- collapseForTimelineScrollKey: (key: string) => void;
292
addDroppedFiles: (files: File[]) => void;
293
addDroppedFolders: (folders: File[]) => void;
294
hasPendingAttachments: () => boolean;
@@ -424,6 +414,7 @@ export interface ChatComposerProps {
414
threadSyncPhase: ThreadSyncPhase | null;
415
416
runtimeMode: RuntimeMode;
417
+ defaultRuntimeMode?: RuntimeMode;
418
interactionMode: ProviderInteractionMode;
419
420
lockedProvider: ProviderDriverKind | null;
@@ -447,14 +438,9 @@ export interface ChatComposerProps {
438
pullRequestProjectId: ProjectId | null;
439
pullRequestRepository: string | null;
440
threadPullRequests: ReadonlyArray<ThreadPullRequestLink> | undefined;
450
- restingControlsHost: HTMLDivElement | null;
451
- restingControlsHaveLeadingContext: boolean;
452
- onRestingControlsVisibilityChange: (visible: boolean) => void;
453
- getTimelineScrollableNode: () => HTMLElement | null;
454
- isTimelineAtLogicalEnd: () => boolean;
455
- timelineOverflows: boolean;
441
onComposerOverlayHeightChange: (height: number) => void;
457
- onRestingChange: (resting: boolean) => void;
442
+ /** The new-thread strip names the permissions, so the controls row hides its chip. */
443
+ permissionsShownInStrip: boolean;
444
445
promptRef: React.RefObject<string>;
446
composerImagesRef: React.RefObject<ComposerImageAttachment[]>;
@@ -575,14 +561,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
561
pullRequestProjectId,
562
pullRequestRepository,
563
threadPullRequests,
578
- restingControlsHost,
579
- restingControlsHaveLeadingContext,
580
- onRestingControlsVisibilityChange,
581
- getTimelineScrollableNode,
582
- isTimelineAtLogicalEnd,
583
- timelineOverflows,
564
onComposerOverlayHeightChange,
585
- onRestingChange,
565
promptRef,
566
composerRef,
567
composerImagesRef,
@@ -725,7 +704,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
704
const {
705
pendingSnapShotAnimations,
706
pendingSnapShotIds,
728
- pendingSnapShotIdSet,
707
uncommittedSnapShotIds,
708
standaloneComposerImages,
709
} = useComposerImageGroups(attachmentDraftTarget, composerImages, composerPreviewAnnotations);
@@ -923,16 +901,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
901
: undefined;
902
const resolvedCompactDisabledReason =
903
compactDisabledReason ?? (noProviderAvailable ? "Compacting is unavailable right now" : null);
926
- const supportedRuntimeModes = selectedProviderEntry?.snapshot.supportedRuntimeModes;
927
- const compatibleRuntimeModeOptions =
928
- supportedRuntimeModes && supportedRuntimeModes.length > 0
929
- ? runtimeModeOptions.filter((option) => supportedRuntimeModes.includes(option.mode))
930
- : runtimeModeOptions;
931
- const compatibleRuntimeMode = compatibleRuntimeModeOptions.some(
932
- (option) => option.mode === runtimeMode,
933
- )
934
- ? runtimeMode
935
- : (compatibleRuntimeModeOptions[0]?.mode ?? runtimeMode);
904
+ const { modes: compatibleRuntimeModes, mode: compatibleRuntimeMode } =
905
+ resolveCompatibleRuntimeMode(
906
+ runtimeMode,
907
+ selectedProviderEntry?.snapshot.supportedRuntimeModes,
908
+ );
909
+ const compatibleRuntimeModeOptions = runtimeModeOptions.filter((option) =>
910
+ compatibleRuntimeModes.includes(option.mode),
911
+ );
912
913
const providerSendBlockReason = getAntigravitySendBlockReason(
914
selectedProviderEntry?.snapshot,
@@ -1029,18 +1005,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1005
null,
1006
);
1007
const [isDragOverComposer, setIsDragOverComposer] = useState(false);
1032
- const [isComposerFooterCompact, setIsComposerFooterCompact] = useState(false);
1008
const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);
1009
const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);
1010
const isMobileViewport = useMediaQuery("max-sm");
1011
const isSoftwareKeyboardOpen = useSoftwareKeyboardOpen();
1037
- const {
1038
- isComposerFocused,
1039
- setIsComposerFocused,
1040
- isComposerScrollCollapsed,
1041
- setIsComposerScrollCollapsed,
1042
- restoreAfterTimelineReachedEnd,
1043
- } = useComposerFocusState();
1012
+ const [isComposerFocused, setIsComposerFocused] = useState(false);
1013
const [composerSubmissionError, setComposerSubmissionError] = useState<string | null>(null);
1014
const [providerInputSubmissionError, setProviderInputSubmissionError] = useState<string | null>(
1015
null,
@@ -1070,10 +1039,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1039
const mobileComposerExpandFrameRef = useRef<number | null>(null);
1040
const mobileComposerExpandReleaseFrameRef = useRef<number | null>(null);
1041
const mobileComposerExpandInFlightRef = useRef(false);
1073
- const composerScrollCollapseTimeoutRef = useRef<number | null>(null);
1074
- const composerScrollCollapseEligibleRef = useRef(false);
1075
- const windowRefocusInFlightRef = useRef(false);
1076
- const composerScrollGestureRef = useRef(createComposerScrollGestureState());
1042
const pendingThreadImportsRef = useRef<Map<string, number>>(new Map());
1043
const isRevertingCheckpointRef = useRef(isRevertingCheckpoint);
1044
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes the committed checkpoint revert flag to a ref read by async handlers
@@ -1183,8 +1148,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1148
activeComposerMenuItemRef.current = activeComposerMenuItem;
1149
});
1150
1186
- const nonPersistedComposerImageIdSet = new Set(nonPersistedComposerImageIds);
1187
-
1151
const isComposerApprovalState = activePendingApproval !== null;
1152
// A send declines the approvals shown here to redirect the agent, so it steers the waiting
1153
// turn instead of queueing behind it. Approvals the typing guard holds stay unseen and pending.
@@ -1236,7 +1199,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1199
hiddenBlockCount: restingControlsHiddenBlockCount,
1200
iconOnlyBlockCount: restingControlsIconOnlyBlockCount,
1201
controlsVisible: restingControlsVisible,
1239
- } = useRestingComposerControlsLayout(restingControlsHost ?? inlineRestingControlsHost);
1202
+ } = useRestingComposerControlsLayout(inlineRestingControlsHost);
1203
const {
1204
attachControls: attachExpandedComposerControls,
1205
hiddenBlockCount: expandedControlsHiddenBlockCount,
@@ -1524,43 +1487,24 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1487
setComposerCursor(cursor);
1488
resetComposerTrigger(trigger);
1489
setIsDragOverComposer(false);
1527
- setIsComposerScrollCollapsed(false);
1490
}
1491
1492
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes composer form resizes to switch the footer and primary actions between compact layouts
1493
useLayoutEffect(() => {
1494
const composerForm = composerFormRef.current;
1495
if (!composerForm) return;
1534
- const measureComposerFormWidth = () => composerForm.clientWidth;
1535
- const measureFooterCompactness = () => {
1536
- const composerFormWidth = measureComposerFormWidth();
1537
- const footerCompact = shouldUseCompactComposerFooter(composerFormWidth, {
1538
- hasWideActions: composerFooterHasWideActions,
1539
- });
1540
- const primaryActionsCompact =
1541
- footerCompact &&
1542
- shouldUseCompactComposerPrimaryActions(composerFormWidth, {
1543
- hasWideActions: composerFooterHasWideActions,
1544
- });
1545
- return {
1546
- primaryActionsCompact,
1547
- footerCompact,
1548
- };
1496
+ const measurePrimaryActionsCompact = () => {
1497
+ const composerFormWidth = composerForm.clientWidth;
1498
+ const options = { hasWideActions: composerFooterHasWideActions };
1499
+ return (
1500
+ shouldUseCompactComposerFooter(composerFormWidth, options) &&
1501
+ shouldUseCompactComposerPrimaryActions(composerFormWidth, options)
1502
+ );
1503
};
1504
1551
- const initialCompactness = measureFooterCompactness();
1552
- setIsComposerPrimaryActionsCompact(initialCompactness.primaryActionsCompact);
1553
- setIsComposerFooterCompact(initialCompactness.footerCompact);
1505
+ setIsComposerPrimaryActionsCompact(measurePrimaryActionsCompact());
1506
return observeResize(composerForm, () => {
1555
- const nextCompactness = measureFooterCompactness();
1556
- setIsComposerPrimaryActionsCompact((previous) =>
1557
- previous === nextCompactness.primaryActionsCompact
1558
- ? previous
1559
- : nextCompactness.primaryActionsCompact,
1560
- );
1561
- setIsComposerFooterCompact((previous) =>
1562
- previous === nextCompactness.footerCompact ? previous : nextCompactness.footerCompact,
1563
- );
1507
+ setIsComposerPrimaryActionsCompact(measurePrimaryActionsCompact());
1508
});
1509
}, [composerFooterHasWideActions]);
1510
@@ -1631,16 +1575,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1575
syncComposerDraftPersistedAttachments,
1576
]);
1577
1634
- const expandComposerForEditorChange = () => {
1635
- suppressActiveComposerScrollGesture(
1636
- composerScrollGestureRef.current,
1637
- window.performance.now(),
1638
- COMPOSER_SCROLL_GESTURE_RESET_MS,
1639
- );
1640
- setIsComposerScrollCollapsed(false);
1641
- };
1642
- const expandComposerForEditorChangeStable = useStableCallback(expandComposerForEditorChange);
1643
-
1578
const retainedContextPayloads = useRetainedContextPayloads(composerDraftTargetKey);
1579
1580
const onPromptChange = (
@@ -1650,7 +1584,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1584
cursorAdjacentToMention: boolean,
1585
contextIds: string[],
1586
) => {
1653
- expandComposerForEditorChange();
1587
refreshWorkspaceSnapshotOnTyping();
1588
if (activePendingProgress?.activeQuestion && pendingUserInputs.length > 0) {
1589
if (activePendingProgress.activeQuestion.allowCustomAnswer === false) return;
@@ -2319,72 +2252,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2252
expandMobileComposer: expandMobileComposerStable,
2253
});
2254
const hasBlockingComposerTopDrawer = pendingUserInputs.length > 0;
2322
- const hasImageAttachmentAttention = standaloneComposerImages.some((image) => {
2323
- const upload = uploadsByImageId[image.id];
2324
- const failedInCurrentEnvironment =
2325
- supportsAttachmentUploads &&
2326
- upload?.status === "failed" &&
2327
- upload.environmentId === environmentId;
2328
- return nonPersistedComposerImageIdSet.has(image.id) && !failedInCurrentEnvironment;
2329
- });
2330
- const composerHasExpandedChrome =
2331
- showComposerTopDrawer ||
2332
- composerMenuOpen ||
2333
- isStashMenuOpen ||
2334
- isDragOverComposer ||
2335
- isPreparingWorktree ||
2336
- showProviderUnavailable ||
2337
- projectSelectionRequired ||
2338
- environmentUnavailable !== null ||
2339
- composerSubmissionError !== null ||
2340
- providerInputSubmissionError !== null ||
2341
- hasImageAttachmentAttention ||
2342
- preparingComposerImages.length > 0;
2343
- const isComposerResting = shouldUseRestingComposerLayout({
2344
- isExistingThread: routeKind === "server" && activeThreadId !== null,
2345
- isMobileViewport,
2346
- isScrollCollapsed: isComposerScrollCollapsed,
2347
- hasExpandedChrome: composerHasExpandedChrome,
2348
- hasMultilinePrompt,
2349
- timelineOverflows,
2350
- });
2351
- const expandedComposerImages = isComposerResting
2352
- ? standaloneComposerImages.filter((image) => pendingSnapShotIdSet.has(image.id))
2353
- : standaloneComposerImages;
2354
- const composerControlsCollapsed = isComposerResting || isComposerCollapsedMobile;
2355
- const showInlineRestingControls = composerControlsCollapsed && restingControlsHost === null;
2356
- const composerControlsVisibleInStrip =
2357
- composerControlsCollapsed && restingControlsHost !== null && restingControlsVisible;
2358
- const composerControlsHidden = composerControlsCollapsed && !restingControlsVisible;
2255
+ const composerControlsCollapsed = isComposerCollapsedMobile;
2256
+ // The collapsed mobile web composer keeps a second controls row inside the card.
2257
+ const showInlineRestingControls = isComposerCollapsedMobile;
2258
+ const composerControlsHidden = showInlineRestingControls && !restingControlsVisible;
2259
if (composerControlsHidden && isComposerModelPickerOpen) {
2260
setIsComposerModelPickerOpen(false);
2261
}
2362
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- reports whether resting controls show in the strip to ChatView before paint
2363
- useLayoutEffect(() => {
2364
- onRestingControlsVisibilityChange(composerControlsVisibleInStrip);
2365
- }, [composerControlsVisibleInStrip, onRestingControlsVisibilityChange]);
2366
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- reports the resting state to ChatView's ref before paint
2367
- useLayoutEffect(() => {
2368
- onRestingChange(isComposerResting);
2369
- }, [isComposerResting, onRestingChange]);
2370
- const [restingActionsElement, setRestingActionsElement] = useState<HTMLDivElement | null>(null);
2371
- const [restingActionsWidth, setRestingActionsWidth] = useState<number | null>(null);
2372
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes resizes of the resting actions DOM node to measure its width
2373
- useLayoutEffect(() => {
2374
- if (!isComposerResting || !restingActionsElement) return;
2375
- const measure = () => setRestingActionsWidth(restingActionsElement.offsetWidth);
2376
- measure();
2377
- return observeResize(restingActionsElement, measure);
2378
- }, [isComposerResting, restingActionsElement]);
2379
- const showMoreRestingImages = () => {
2380
- if (isComposerCollapsedMobile) {
2381
- expandMobileComposer();
2382
- return;
2383
- }
2384
- setIsComposerScrollCollapsed(false);
2385
- setIsComposerFocused(true);
2386
- scheduleComposerFocus();
2387
- };
2262
const collapsedComposerImagePreviews =
2263
standaloneComposerImages.length > 0 ? (
2264
<ComposerRestingImagePreviews
@@ -2392,136 +2266,28 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2266
allImages={composerImages}
2267
resolvedTheme={resolvedTheme}
2268
onExpandImage={onExpandImage}
2395
- onShowMore={showMoreRestingImages}
2269
+ onShowMore={expandMobileComposer}
2270
/>
2271
) : null;
2272
const { active: panelAnimationsActive, durationMs: panelAnimationDurationMs } =
2273
usePanelAnimationSettings();
2274
const composerMainSurfaceRef = useComposerRestingTransition(
2275
composerControlsCollapsed,
2402
- isComposerResting,
2276
restingComposerControlsRef,
2277
onComposerOverlayHeightChange,
2278
panelAnimationsActive,
2279
panelAnimationDurationMs,
2280
);
2408
- const canTrackComposerScrollGesture =
2409
- routeKind === "server" && activeThreadId !== null && !isMobileViewport;
2410
- const canScrollCollapseComposer =
2411
- canTrackComposerScrollGesture &&
2412
- settings.composerCollapseOnScroll &&
2413
- !hasMultilinePrompt &&
2414
- !composerHasExpandedChrome;
2415
- // Clear rather than mask: once eligibility drops, the composer stays expanded until the next
2416
- // scroll gesture even if it becomes eligible again.
2417
- if (!canScrollCollapseComposer && isComposerScrollCollapsed) {
2418
- setIsComposerScrollCollapsed(false);
2419
- }
2420
- const composerScrollCollapseEligible = canScrollCollapseComposer && !isComposerResting;
2421
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes the committed scroll-collapse eligibility to a ref read by the wheel listener
2422
- useLayoutEffect(() => {
2423
- composerScrollCollapseEligibleRef.current = composerScrollCollapseEligible;
2424
- });
2425
-
2426
- // Window activation re-fires focus; ignore that frame to keep the composer collapsed.
2427
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- window focus listener and animation frame that ignore activation focus while the composer is collapsed
2428
- useEffect(() => {
2429
- if (!isComposerScrollCollapsed) return;
2430
- let frame: number | null = null;
2431
- const onWindowFocus = () => {
2432
- windowRefocusInFlightRef.current = true;
2433
- if (frame !== null) window.cancelAnimationFrame(frame);
2434
- frame = window.requestAnimationFrame(() => {
2435
- frame = null;
2436
- windowRefocusInFlightRef.current = false;
2437
- });
2438
- };
2439
- window.addEventListener("focus", onWindowFocus);
2440
- return () => {
2441
- window.removeEventListener("focus", onWindowFocus);
2442
- if (frame !== null) window.cancelAnimationFrame(frame);
2443
- windowRefocusInFlightRef.current = false;
2444
- };
2445
- }, [isComposerScrollCollapsed]);
2446
-
2447
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes a capture-phase document wheel listener that collapses the composer on timeline scroll
2448
- useEffect(() => {
2449
- if (!canTrackComposerScrollGesture) return;
2450
-
2451
- const finishScrollGesture = () => {
2452
- if (composerScrollCollapseTimeoutRef.current !== null) {
2453
- window.clearTimeout(composerScrollCollapseTimeoutRef.current);
2454
- }
2455
- composerScrollCollapseTimeoutRef.current = null;
2456
- resetComposerScrollGesture(composerScrollGestureRef.current);
2457
- };
2458
- const handleTimelineWheel = (event: WheelEvent) => {
2459
- if (event.ctrlKey || !(event.target instanceof Element)) {
2460
- return;
2461
- }
2462
-
2463
- const scrollNode = getTimelineScrollableNode();
2464
- if (!scrollNode) return;
2465
- const targetsTimeline = isTimelineScrollTarget(event.target, scrollNode, event.deltaY);
2466
- if (
2467
- !scrollNode.contains(event.target) &&
2468
- !composerScrollGestureRef.current.collapseSuppressed
2469
- )
2470
- return;
2471
-
2472
- if (composerScrollCollapseTimeoutRef.current !== null) {
2473
- window.clearTimeout(composerScrollCollapseTimeoutRef.current);
2474
- }
2475
- composerScrollCollapseTimeoutRef.current = window.setTimeout(
2476
- finishScrollGesture,
2477
- COMPOSER_SCROLL_GESTURE_RESET_MS,
2478
- );
2479
-
2480
- const canScrollInGestureDirection =
2481
- targetsTimeline &&
2482
- (event.deltaY < 0
2483
- ? scrollNode.scrollTop > 0
2484
- : scrollNode.scrollTop < scrollNode.scrollHeight - scrollNode.clientHeight);
2485
- const deltaPx =
2486
- Math.abs(event.deltaY) *
2487
- (event.deltaMode === WheelEvent.DOM_DELTA_LINE
2488
- ? 16
2489
- : event.deltaMode === WheelEvent.DOM_DELTA_PAGE
2490
- ? scrollNode.clientHeight
2491
- : 1);
2492
- const shouldCollapse = recordComposerScrollGestureEvent(composerScrollGestureRef.current, {
2493
- now: window.performance.now(),
2494
- deltaPx,
2495
- collapseThresholdPx: COMPOSER_SCROLL_COLLAPSE_THRESHOLD_PX,
2496
- collapseEligible: targetsTimeline && composerScrollCollapseEligibleRef.current,
2497
- canScrollInGestureDirection,
2498
- scrollsTowardLogicalEnd: event.deltaY > 0 && isTimelineAtLogicalEnd(),
2499
- });
2500
- if (!shouldCollapse) {
2501
- return;
2502
- }
2503
-
2504
- setIsComposerScrollCollapsed(true);
2505
- };
2506
-
2507
- document.addEventListener("wheel", handleTimelineWheel, { capture: true, passive: true });
2508
- return () => {
2509
- document.removeEventListener("wheel", handleTimelineWheel, true);
2510
- finishScrollGesture();
2511
- };
2512
- }, [
2513
- canTrackComposerScrollGesture,
2514
- getTimelineScrollableNode,
2515
- isTimelineAtLogicalEnd,
2516
- setIsComposerScrollCollapsed,
2517
- ]);
2518
-
2519
- const restingHiddenBlockCount = composerControlsCollapsed
2281
+ const restingHiddenBlockCount = showInlineRestingControls
2282
? restingControlsHiddenBlockCount
2521
- : expandedControlsHiddenBlockCount;
2522
- const iconOnlyBlockCount = composerControlsCollapsed
2283
+ : composerControlsCollapsed
2284
+ ? 0
2285
+ : expandedControlsHiddenBlockCount;
2286
+ const iconOnlyBlockCount = showInlineRestingControls
2287
? restingControlsIconOnlyBlockCount
2524
- : expandedControlsIconOnlyBlockCount;
2288
+ : composerControlsCollapsed
2289
+ ? 0
2290
+ : expandedControlsIconOnlyBlockCount;
2291
const composerControls = (
2292
<ComposerControlsBar
2293
environmentId={environmentId}
@@ -2540,19 +2306,16 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2306
planModeUiEnabled={planModeUiEnabled}
2307
interactionMode={interactionMode}
2308
compatibleRuntimeMode={compatibleRuntimeMode}
2309
+ defaultRuntimeMode={props.defaultRuntimeMode}
2310
compatibleRuntimeModeOptions={compatibleRuntimeModeOptions}
2311
toggleInteractionMode={toggleInteractionMode}
2312
handleRuntimeModeChange={handleRuntimeModeChange}
2313
composerControlsCollapsed={composerControlsCollapsed}
2314
+ effortDisplay={settings.effortDisplay}
2315
+ permissionsShownInStrip={props.permissionsShownInStrip}
2316
composerControlsHidden={composerControlsHidden}
2317
restingHiddenBlockCount={restingHiddenBlockCount}
2318
iconOnlyBlockCount={iconOnlyBlockCount}
2550
- showInlineRestingControls={showInlineRestingControls}
2551
- showLeadingSeparator={
2552
- composerControlsCollapsed &&
2553
- restingControlsHost !== null &&
2554
- restingControlsHaveLeadingContext
2555
- }
2319
showProviderUnavailable={showProviderUnavailable}
2320
providerSetupInstanceId={providerSetupInstanceId}
2321
onOpenProviderSetup={onOpenProviderSetup}
@@ -3003,7 +2766,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2766
window.cancelAnimationFrame(composerBlurFrameRef.current);
2767
composerBlurFrameRef.current = null;
2768
}
3006
- setIsComposerScrollCollapsed(false);
2769
setIsComposerFocused(true);
2770
}
2771
setIsComposerModelPickerOpen(true);
@@ -3019,23 +2781,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2781
focusAt: (cursor: number) => {
2782
composerEditorRef.current?.focusAt(cursor);
2783
},
3022
- restoreAfterTimelineReachedEnd,
3023
- collapseForTimelineScrollKey: (key) => {
3024
- const scrollNode = getTimelineScrollableNode();
3025
- if (
3026
- composerScrollCollapseEligibleRef.current &&
3027
- scrollNode &&
3028
- shouldCollapseComposerForScrollKey({
3029
- key,
3030
- scrollTop: scrollNode.scrollTop,
3031
- scrollHeight: scrollNode.scrollHeight,
3032
- clientHeight: scrollNode.clientHeight,
3033
- isAtLogicalEnd: isTimelineAtLogicalEnd(),
3034
- })
3035
- ) {
3036
- setIsComposerScrollCollapsed(true);
3037
- }
3038
- },
2784
addDroppedFiles: (files: File[]) => {
2785
void addComposerAttachments(files).then((inserted) => {
2786
if (!inserted) focusComposer();
@@ -3112,10 +2857,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2857
window.cancelAnimationFrame(composerBlurFrameRef.current);
2858
composerBlurFrameRef.current = null;
2859
}
3115
- flushSync(() => {
3116
- setIsComposerScrollCollapsed(false);
3117
- setIsComposerFocused(true);
3118
- });
2860
+ flushSync(() => setIsComposerFocused(true));
2861
const shell = composerFormRef.current?.closest('[data-slot="composer-shell"]');
2862
const trigger = Array.from(
2863
shell?.querySelectorAll<HTMLButtonElement>(
@@ -3127,6 +2869,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2869
);
2870
if (!trigger) return;
2871
trigger.focus({ preventScroll: true });
2872
+ if (command === "composer.mode") markOpenToPermissions(trigger);
2873
trigger.click();
2874
},
2875
compactContext: compactThreadContextStable,
@@ -3290,10 +3033,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3033
interactionMode,
3034
planModeUiEnabled,
3035
compactThreadContextStable,
3293
- restoreAfterTimelineReachedEnd,
3294
- getTimelineScrollableNode,
3295
- isTimelineAtLogicalEnd,
3296
- setIsComposerScrollCollapsed,
3036
],
3037
);
3038
@@ -3302,11 +3041,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3041
!isComposerCollapsedMobile &&
3042
(uncommittedSnapShotIds.length > 0 ||
3043
composerVideos.length > 0 ||
3305
- expandedComposerImages.length > 0 ||
3044
+ standaloneComposerImages.length > 0 ||
3045
preparingComposerImages.length > 0) ? (
3046
<ComposerAttachmentMediaRow
3047
images={composerImages}
3309
- expandedImages={expandedComposerImages}
3048
+ expandedImages={standaloneComposerImages}
3049
preparingImages={preparingComposerImages}
3050
videos={composerVideos}
3051
pendingSnapShotAnimations={pendingSnapShotAnimations}
@@ -3350,23 +3089,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3089
<form
3090
ref={composerFormRef}
3091
onSubmit={submitComposerStable}
3353
- onPointerDownCapture={(event) => {
3354
- const target = event.target;
3355
- if (isInsideRestingComposerControlScope(target)) return;
3356
- if (isInsideCollapsedComposerControls(target)) return;
3357
- if (!(target instanceof Element)) return;
3358
- const isInteractive = Boolean(
3359
- target.closest('button, a, input, select, [role="button"], [role="menuitem"]'),
3360
- );
3361
- if (isInteractive) return;
3362
-
3363
- setIsComposerScrollCollapsed(false);
3364
- if (isComposerResting && !target.closest('[data-testid="composer-editor"]')) {
3365
- event.preventDefault();
3366
- setIsComposerFocused(true);
3367
- scheduleComposerFocus();
3368
- }
3369
- }}
3092
onFocusCapture={(event) => {
3093
const activeElement = event.target;
3094
if (
@@ -3381,9 +3103,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3103
if (isInsideCollapsedComposerControls(activeElement)) {
3104
return;
3105
}
3384
- if (!windowRefocusInFlightRef.current) {
3385
- setIsComposerScrollCollapsed(false);
3386
- }
3106
if (composerBlurFrameRef.current !== null) {
3107
window.cancelAnimationFrame(composerBlurFrameRef.current);
3108
composerBlurFrameRef.current = null;
@@ -3419,23 +3138,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3138
data-chat-composer-form="true"
3139
{...threadContextDropTargetProps()}
3140
>
3422
- {composerControlsCollapsed && restingControlsHost
3423
- ? createPortal(
3424
- <div
3425
- ref={attachRestingComposerControls}
3426
- data-chat-composer-resting-controls="true"
3427
- aria-hidden={restingControlsVisible ? undefined : true}
3428
- inert={restingControlsVisible ? undefined : true}
3429
- className={cn(
3430
- "relative flex w-max min-w-0 max-w-full items-center gap-1 font-normal text-muted-foreground/70 [&_button]:text-xs!",
3431
- !restingControlsVisible && "invisible",
3432
- )}
3433
- >
3434
- {composerControls}
3435
- </div>,
3436
- restingControlsHost,
3437
- )
3438
- : null}
3141
<ComposerBanner.Dock>
3142
<ComposerBanner.Column>
3143
<ComposerBannerStack items={shelfItems} />
@@ -3479,10 +3181,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3181
<div className="relative">
3182
<ComposerSurface.Main
3183
ref={composerMainSurfaceRef}
3482
- data-inline-resting-controls={restingControlsHost === null ? "true" : undefined}
3483
- data-model-only-strip={
3484
- restingControlsHost?.closest("[data-composer-model-strip]") ? "true" : undefined
3485
- }
3184
+ data-inline-resting-controls="true"
3185
className={composerProviderState.composerFrameClassName}
3186
>
3187
<div
@@ -3557,10 +3256,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3256
}}
3257
data-chat-composer-body="true"
3258
className={cn(
3560
- "relative px-3 pb-2 sm:px-4",
3259
+ "relative px-4 pb-2",
3260
"pt-3.5 sm:pt-4",
3261
isComposerCollapsedMobile && "hidden",
3563
- isComposerResting && "py-2 sm:py-2",
3262
)}
3263
>
3264
{isStashMenuOpen && !composerMenuOpen && (
@@ -3621,14 +3319,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3319
3320
{composerAttachmentFileList}
3321
3624
- <div
3625
- className={cn("relative", isComposerResting && "flex min-w-0 items-center gap-1")}
3626
- style={
3627
- isComposerResting && restingActionsWidth !== null
3628
- ? { paddingRight: `calc(${restingActionsWidth}px + 1rem)` }
3629
- : undefined
3630
- }
3631
- >
3322
+ <div className="relative">
3323
{previewFile ? (
3324
<ComposerFilePreviewDialog
3325
file={previewFile}
@@ -3660,18 +3351,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3351
buildContextClipboardFragment={buildContextClipboardFragmentStable}
3352
importContextFragment={importContextFragmentStable}
3353
skills={selectedProviderSkills}
3663
- containerClassName={cn(isComposerResting && "min-w-0 flex-1")}
3664
- className={cn(
3665
- showMobilePendingAnswerActions && "max-sm:pb-12",
3666
- isComposerResting &&
3667
- "my-0 max-h-8 min-h-8 overflow-hidden py-0 whitespace-pre! leading-8",
3668
- )}
3669
- placeholderClassName={cn(
3670
- isComposerResting &&
3671
- "flex items-center overflow-hidden whitespace-nowrap leading-8",
3672
- )}
3354
+ className={cn(showMobilePendingAnswerActions && "max-sm:pb-12")}
3355
onChange={onPromptChangeStable}
3674
- onVisibleSelectionChange={expandComposerForEditorChangeStable}
3356
onCommandKeyDown={onComposerCommandKeyStable}
3357
onPageScrollKeyDown={onPageScrollKeyDown}
3358
onPageScrollKeyUp={onPageScrollKeyUp}
@@ -3703,7 +3384,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3384
}
3385
/>
3386
</ComposerContextActionsContext>
3706
- {isComposerResting ? collapsedComposerImagePreviews : null}
3387
{showMobilePendingAnswerActions ? (
3388
<div
3389
data-chat-composer-mobile-pending-actions="true"
@@ -3743,42 +3423,31 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3423
{isComposerCollapsedMobile ? null : (
3424
<div
3425
data-chat-composer-footer="true"
3746
- data-chat-composer-footer-compact={isComposerFooterCompact ? "true" : "false"}
3426
className={cn(
3748
- "flex min-w-0 flex-nowrap items-center justify-between gap-2 overflow-visible px-3 pb-3 sm:px-4 sm:pb-4",
3427
+ "flex min-w-0 flex-nowrap items-center overflow-visible px-2 pb-2",
3428
pendingUserInputs.length > 0 && "pt-2",
3750
- isComposerFooterCompact ? "gap-1.5" : "gap-2 sm:gap-0",
3429
showMobilePendingAnswerActions && "hidden sm:flex",
3752
- isComposerResting &&
3753
- "absolute right-px z-10 h-12 w-auto gap-0 py-0 sm:gap-0 sm:py-0",
3754
- isComposerResting &&
3755
- (showInlineRestingControls ? "bottom-[calc(2rem+1px)]" : "bottom-px"),
3430
)}
3431
>
3432
+ {composerAttachButton ? <div className="me-2">{composerAttachButton}</div> : null}
3433
<div
3759
- ref={attachExpandedComposerControls}
3760
- data-chat-composer-controls="left"
3761
- data-chat-composer-footer-controls="true"
3762
- className={cn(
3763
- "relative -m-1 -ms-3.5 flex min-w-0 flex-1 items-center gap-0 overflow-x-auto p-1 ps-3.5 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
3764
- isComposerResting && "hidden",
3765
- )}
3766
- >
3767
- {composerControlsCollapsed ? null : composerControls}
3768
- </div>
3769
-
3770
- <div
3771
- ref={setRestingActionsElement}
3434
data-chat-composer-actions="right"
3435
data-chat-composer-transition-actions="true"
3436
data-chat-composer-primary-actions-compact={
3437
isComposerPrimaryActionsCompact ? "true" : "false"
3438
}
3777
- className="flex shrink-0 flex-nowrap items-center justify-end gap-2"
3439
+ className="flex min-w-0 flex-1 flex-nowrap items-center justify-end gap-2"
3440
>
3779
- {composerAttachButton}
3441
+ <div
3442
+ ref={attachExpandedComposerControls}
3443
+ data-chat-composer-controls="footer"
3444
+ data-chat-composer-footer-controls="true"
3445
+ className="relative flex min-w-0 flex-1 items-center justify-end gap-0.5"
3446
+ >
3447
+ {composerControls}
3448
+ </div>
3449
<ComposerFooterPrimaryActions
3781
- compact={isComposerResting || isComposerPrimaryActionsCompact}
3450
+ compact={isComposerPrimaryActionsCompact}
3451
canOperateThread={canOperateThread}
3452
activeContextWindow={
3453
settings.contextWindowMeterEnabled ? activeContextWindow : null
@@ -3819,7 +3488,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3488
isPreparingWorktree={isPreparingWorktree}
3489
hasSendableContent={composerSendState.hasSendableContent}
3490
canResume={showResumeAction}
3822
- preserveComposerFocusOnPointerDown={isMobileViewport || isComposerResting}
3491
+ preserveComposerFocusOnPointerDown={isMobileViewport}
3492
isEditingQueuedMessage={isEditingQueuedMessage}
3493
onSubmitMessage={handleSubmitMessageStable}
3494
onResume={onResume}
@@ -3845,7 +3514,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
3514
className="absolute bottom-2 inset-x-4 min-w-0"
3515
>
3516
<div
3848
- ref={restingComposerControlsRef}
3517
+ ref={attachRestingComposerControls}
3518
data-chat-composer-resting-controls="true"
3519
aria-hidden={restingControlsVisible ? undefined : true}
3520
inert={restingControlsVisible ? undefined : true}
apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+29
-24
@@ -1,5 +1,5 @@
1
import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
2
-import { memo, type ReactNode } from "react";
2
+import { memo, type ReactNode, useRef } from "react";
3
import { EllipsisIcon } from "lucide-react";
4
import {
5
Menu,
@@ -10,18 +10,17 @@ import {
10
MenuTrigger,
11
} from "../ui/menu";
12
import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
13
-import { useComposerMenuProps } from "./composerEventScope";
13
+import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
14
import { useComposerMenuState } from "./useComposerMenuState";
15
+import { ComposerPermissionsSection, type RuntimeModeOption } from "./ComposerFooterControls";
16
17
export const CompactComposerControlsMenu = memo(function CompactComposerControlsMenu(props: {
18
interactionMode: ProviderInteractionMode;
19
runtimeMode: RuntimeMode;
19
- runtimeModeOptions: ReadonlyArray<{
20
- readonly mode: RuntimeMode;
21
- readonly label: string;
22
- }>;
20
+ runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
21
showInteractionModeToggle: boolean;
22
traitsMenuContent?: ReactNode;
23
+ showPermissions?: boolean;
24
size?: "sm" | "xs";
25
/** Close the portaled popup when its trigger hides. */
26
hidden?: boolean;
@@ -31,17 +30,28 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
30
const composerFloatingLayerProps = useComposerMenuProps();
31
const size = props.size ?? "sm";
32
const [open, setOpen] = useComposerMenuState(props.hidden);
33
+ const triggerRef = useRef<HTMLButtonElement>(null);
34
35
return (
36
- <Menu open={open} onOpenChange={setOpen}>
36
+ <Menu
37
+ open={open}
38
+ onOpenChange={setOpen}
39
+ onOpenChangeComplete={(isOpen) => focusRequestedPermission(isOpen, triggerRef.current)}
40
+ >
41
<MenuTrigger
42
render={
43
<ComposerControl
44
+ ref={triggerRef}
45
size={size}
46
className="shrink-0"
47
aria-label="More composer controls"
48
data-composer-shortcut={
44
- props.traitsMenuContent ? "composer.mode composer.effort" : "composer.mode"
49
+ [
50
+ props.showPermissions !== false ? "composer.mode" : null,
51
+ props.traitsMenuContent ? "composer.effort" : null,
52
+ ]
53
+ .filter(Boolean)
54
+ .join(" ") || undefined
55
}
56
/>
57
}
@@ -52,7 +62,9 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
62
{props.traitsMenuContent ? (
63
<>
64
{props.traitsMenuContent}
55
- <MenuDivider />
65
+ {props.showInteractionModeToggle || props.showPermissions !== false ? (
66
+ <MenuDivider />
67
+ ) : null}
68
</>
69
) : null}
70
{props.showInteractionModeToggle ? (
@@ -68,23 +80,16 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
80
<MenuRadioItem value="default">Chat</MenuRadioItem>
81
<MenuRadioItem value="plan">Plan</MenuRadioItem>
82
</MenuRadioGroup>
71
- <MenuDivider />
83
+ {props.showPermissions !== false ? <MenuDivider /> : null}
84
</>
85
) : null}
74
- <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Access</div>
75
- <MenuRadioGroup
76
- value={props.runtimeMode}
77
- onValueChange={(value) => {
78
- if (!value || value === props.runtimeMode) return;
79
- props.onRuntimeModeChange(value as RuntimeMode);
80
- }}
81
- >
82
- {props.runtimeModeOptions.map((option) => (
83
- <MenuRadioItem key={option.mode} value={option.mode}>
84
- {option.label}
85
- </MenuRadioItem>
86
- ))}
87
- </MenuRadioGroup>
86
+ {props.showPermissions === false ? null : (
87
+ <ComposerPermissionsSection
88
+ runtimeMode={props.runtimeMode}
89
+ runtimeModeOptions={props.runtimeModeOptions}
90
+ onRuntimeModeChange={props.onRuntimeModeChange}
91
+ />
92
+ )}
93
</MenuPopup>
94
</Menu>
95
);
apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+2
-1
@@ -707,7 +707,8 @@ export function ComposerAttachButton({
707
/>
708
}
709
>
710
- <PaperclipIcon />
710
+ {/* The clip's weight sits in its upper loop; 1px down reads as centered on the row. */}
711
+ <PaperclipIcon className="translate-y-px" />
712
</TooltipTrigger>
713
<TooltipPopup>Attach files</TooltipPopup>
714
</Tooltip>
apps/web/src/components/chat/ComposerControl.tsx
+1
-43
@@ -1,11 +1,9 @@
1
import { mergeProps } from "@base-ui/react/merge-props";
2
import { Select as SelectPrimitive } from "@base-ui/react/select";
3
import { useRender } from "@base-ui/react/use-render";
4
-import type { ComponentProps, ComponentType, SVGProps } from "react";
5
-import { ChevronDownIcon } from "lucide-react";
4
+import type { ComponentType, SVGProps } from "react";
5
6
import { cn } from "~/lib/utils";
8
-import { Separator } from "../ui/separator";
7
8
export type ComposerControlSize = "sm" | "xs";
9
@@ -66,43 +64,6 @@ export function ComposerControlIcon({
64
);
65
}
66
69
-export function ComposerControlChevron({
70
- className,
71
- size = "sm",
72
-}: {
73
- className?: string;
74
- size?: ComposerControlSize;
75
-} = {}) {
76
- return (
77
- <ChevronDownIcon
78
- aria-hidden="true"
79
- className={cn(
80
- "shrink-0",
81
- size === "xs" ? "size-3 text-current" : "size-3.5 text-icon-muted",
82
- className,
83
- )}
84
- data-composer-control-chevron
85
- strokeWidth={2.25}
86
- />
87
- );
88
-}
89
-
90
-export function ComposerControlSeparator({
91
- className,
92
- size = "sm",
93
- ...props
94
-}: Omit<ComponentProps<typeof Separator>, "orientation"> & {
95
- size?: ComposerControlSize;
96
-}) {
97
- return (
98
- <Separator
99
- orientation="vertical"
100
- className={cn("mx-0.5 hidden sm:block", size === "xs" ? "h-3.5!" : "h-4", className)}
101
- {...props}
102
- />
103
- );
104
-}
105
-
67
export function ComposerSelectControl({
68
className,
69
children,
@@ -115,9 +76,6 @@ export function ComposerSelectControl({
76
return (
77
<SelectPrimitive.Trigger className={composerControlClassName(size, className)} {...props}>
78
{children}
118
- <SelectPrimitive.Icon>
119
- <ComposerControlChevron size={size} />
120
- </SelectPrimitive.Icon>
79
</SelectPrimitive.Trigger>
80
);
81
}
apps/web/src/components/chat/ComposerControlsBar.tsx
+87
-49
@@ -4,8 +4,9 @@ import type { ProviderInstanceEntry } from "../../providerInstances";
4
import { type AppModelOption } from "../../modelSelection";
5
import { CircleAlertIcon } from "lucide-react";
6
import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
7
-import { ComposerControl, ComposerControlSeparator } from "./ComposerControl";
7
+import { ComposerControl } from "./ComposerControl";
8
import {
9
+ ComposerPermissionsSection,
10
ComposerFooterModeControls,
11
ComposerModelPicker,
12
type RuntimeModeOption,
@@ -19,17 +20,24 @@ import {
20
type RuntimeMode,
21
type ServerProvider,
22
} from "@t3tools/contracts";
23
+import type { EffortDisplay } from "@t3tools/contracts/settings";
24
import { cn } from "~/lib/utils";
25
+import { shortcutLabelForCommand } from "../../keybindings";
26
import {
27
renderProviderTraitsMenuContent,
28
renderProviderTraitsPicker,
29
} from "./composerProviderState";
30
import type { useComposerProviderModel } from "./useComposerProviderModel";
31
+import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
32
33
/**
34
* The composer footer controls: model picker, traits, mode controls and the overflow menu for
35
* blocks that do not fit. Rendered in the expanded footer or the resting controls host.
36
*/
37
+// Model and effort sit a word space apart, so hover and open states brighten text, not a box.
38
+const TEXT_CONTROL_STATES =
39
+ "hover:bg-transparent data-pressed:bg-transparent data-popup-open:bg-transparent data-pressed:text-foreground data-popup-open:text-foreground";
40
+
41
export function ComposerControlsBar(props: {
42
environmentId: EnvironmentId;
43
routeKind: ChatComposerProps["routeKind"];
@@ -45,8 +53,12 @@ export function ComposerControlsBar(props: {
53
onPromptEdit: (edit: (prompt: string) => string) => void;
54
planModeEnabled: boolean;
55
planModeUiEnabled: boolean;
56
+ effortDisplay: EffortDisplay;
57
+ /** The strip under a new thread names the permissions, so the row does not repeat them. */
58
+ permissionsShownInStrip: boolean;
59
interactionMode: ProviderInteractionMode;
60
compatibleRuntimeMode: RuntimeMode;
61
+ defaultRuntimeMode: RuntimeMode | undefined;
62
compatibleRuntimeModeOptions: ReadonlyArray<RuntimeModeOption>;
63
toggleInteractionMode: () => void;
64
handleRuntimeModeChange: (mode: RuntimeMode) => void;
@@ -54,8 +66,6 @@ export function ComposerControlsBar(props: {
66
composerControlsHidden: boolean;
67
restingHiddenBlockCount: number;
68
iconOnlyBlockCount: number;
57
- showInlineRestingControls: boolean;
58
- showLeadingSeparator: boolean;
69
showProviderUnavailable: boolean;
70
providerSetupInstanceId: ProviderInstanceId | undefined;
71
onOpenProviderSetup: ChatComposerProps["onOpenProviderSetup"];
@@ -96,15 +106,14 @@ export function ComposerControlsBar(props: {
106
planModeUiEnabled,
107
interactionMode,
108
compatibleRuntimeMode,
109
+ defaultRuntimeMode,
110
compatibleRuntimeModeOptions,
111
toggleInteractionMode,
112
handleRuntimeModeChange,
113
composerControlsCollapsed,
114
composerControlsHidden,
104
- restingHiddenBlockCount,
115
+ restingHiddenBlockCount: measuredHiddenBlockCount,
116
iconOnlyBlockCount,
106
- showInlineRestingControls,
107
- showLeadingSeparator,
117
showProviderUnavailable,
118
providerSetupInstanceId,
119
onOpenProviderSetup,
@@ -141,6 +150,8 @@ export function ComposerControlsBar(props: {
150
onPromptEdit,
151
planModeEnabled,
152
});
153
+ const accessMatchesDefault = compatibleRuntimeMode === defaultRuntimeMode;
154
+ const permissionsChipHidden = accessMatchesDefault || props.permissionsShownInStrip;
155
const providerTraitsPickerInput = {
156
provider: selectedProvider,
157
instanceId: selectedInstanceId,
@@ -154,12 +165,51 @@ export function ComposerControlsBar(props: {
165
onPromptEdit,
166
planModeEnabled,
167
isComposerOwned: true,
168
+ effortDisplay: props.effortDisplay,
169
+ triggerClassName: cn("ps-1.5 pe-1", TEXT_CONTROL_STATES),
170
+ // Permissions always live in the effort menu, so the section never unmounts while open.
171
+ extraMenuContent: (
172
+ <ComposerPermissionsSection
173
+ runtimeMode={compatibleRuntimeMode}
174
+ runtimeModeOptions={compatibleRuntimeModeOptions}
175
+ onRuntimeModeChange={handleRuntimeModeChange}
176
+ />
177
+ ),
178
+ ...(permissionsChipHidden
179
+ ? {
180
+ extraMenuHint: [
181
+ `Permissions: ${
182
+ compatibleRuntimeModeOptions.find((option) => option.mode === compatibleRuntimeMode)
183
+ ?.label ?? compatibleRuntimeMode
184
+ }`,
185
+ shortcutLabelForCommand(keybindings, "composer.mode"),
186
+ ]
187
+ .filter(Boolean)
188
+ .join(" · "),
189
+ }
190
+ : {}),
191
} satisfies Parameters<typeof renderProviderTraitsPicker>[0];
192
const providerTraitsPicker = renderProviderTraitsPicker(providerTraitsPickerInput);
193
+ const {
194
+ accessDisplay,
195
+ showModeBlock,
196
+ hiddenBlockCount: restingHiddenBlockCount,
197
+ hiddenBlockIds: hiddenRestingBlockIds,
198
+ traitsHidden: traitsBlockHidden,
199
+ effortOwnsModeShortcut,
200
+ overflowShowsPermissions,
201
+ } = resolveComposerControlsOwnership({
202
+ matchesDefault: permissionsChipHidden,
203
+ hasTraits: providerTraitsPicker !== null,
204
+ planModeUiEnabled,
205
+ collapsed: composerControlsCollapsed,
206
+ measuredHiddenBlockCount,
207
+ });
208
const restingProviderTraitsPicker = renderProviderTraitsPicker({
209
...providerTraitsPickerInput,
210
size: composerControlsCollapsed ? "xs" : "sm",
162
- hidden: composerControlsHidden || restingHiddenBlockCount > 1,
211
+ hidden: composerControlsHidden || traitsBlockHidden,
212
+ extraMenuOwnsModeShortcut: effortOwnsModeShortcut,
213
});
214
const restingBlockDefs = [
215
...(providerTraitsPicker
@@ -170,25 +220,28 @@ export function ComposerControlsBar(props: {
220
},
221
]
222
: []),
173
- {
174
- id: "mode",
175
- content: (
176
- <ComposerFooterModeControls
177
- showInteractionModeToggle={planModeUiEnabled}
178
- interactionMode={interactionMode}
179
- runtimeMode={compatibleRuntimeMode}
180
- runtimeModeOptions={compatibleRuntimeModeOptions}
181
- size={composerControlsCollapsed ? "xs" : "sm"}
182
- hidden={composerControlsHidden || restingHiddenBlockCount > 0}
183
- onToggleInteractionMode={toggleInteractionMode}
184
- onRuntimeModeChange={handleRuntimeModeChange}
185
- />
186
- ),
187
- },
223
+ ...(!showModeBlock
224
+ ? []
225
+ : [
226
+ {
227
+ id: "mode",
228
+ content: (
229
+ <ComposerFooterModeControls
230
+ showInteractionModeToggle={planModeUiEnabled}
231
+ interactionMode={interactionMode}
232
+ runtimeMode={compatibleRuntimeMode}
233
+ runtimeModeOptions={compatibleRuntimeModeOptions}
234
+ size={composerControlsCollapsed ? "xs" : "sm"}
235
+ hidden={composerControlsHidden || restingHiddenBlockCount > 0}
236
+ accessDisplay={accessDisplay}
237
+ emphasized={!accessMatchesDefault}
238
+ onToggleInteractionMode={toggleInteractionMode}
239
+ onRuntimeModeChange={handleRuntimeModeChange}
240
+ />
241
+ ),
242
+ },
243
+ ]),
244
];
189
- const hiddenRestingBlockIds = restingBlockDefs
190
- .slice(restingBlockDefs.length - restingHiddenBlockCount)
191
- .map((def) => def.id);
245
// Its own element, so typing (which rebuilds the controls around it) leaves it cached.
246
const composerModelPicker = (
247
<ComposerModelPicker
@@ -217,15 +270,11 @@ export function ComposerControlsBar(props: {
270
keybindings={keybindings}
271
modelOptionsByInstance={modelOptionsByInstance}
272
size={composerControlsCollapsed ? "xs" : "sm"}
220
- triggerClassName={
221
- composerControlsCollapsed
222
- ? cn(
223
- "min-w-13 shrink text-xs!",
224
- !showInlineRestingControls &&
225
- "@max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:w-0 @max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:flex-none",
226
- )
227
- : "-ms-2 min-w-13"
228
- }
273
+ triggerClassName={cn(
274
+ "pe-1",
275
+ TEXT_CONTROL_STATES,
276
+ composerControlsCollapsed ? "min-w-13 shrink text-xs!" : "min-w-13",
277
+ )}
278
terminalOpen={terminalOpen}
279
open={modelPickerOpen}
280
instanceIndicatorBackground={
@@ -233,14 +282,8 @@ export function ComposerControlsBar(props: {
282
? "color-mix(in srgb, var(--chat-composer-glass-surface) var(--glass-opacity), transparent)"
283
: "var(--contrast-input)"
284
}
236
- {...(modelPickerIconClassName || composerControlsCollapsed
237
- ? {
238
- activeProviderIconClassName: cn(
239
- modelPickerIconClassName,
240
- composerControlsCollapsed &&
241
- "fill-muted-foreground/70! text-muted-foreground/70! [&_path]:fill-muted-foreground/70! [&_rect]:fill-muted-foreground/70! [&_[data-icon-detail]]:fill-transparent! [&[data-provider-package-icon]]:opacity-70 [&[data-provider-package-icon]_path:not([data-icon-detail])]:fill-muted-foreground!",
242
- ),
243
- }
285
+ {...(modelPickerIconClassName
286
+ ? { activeProviderIconClassName: modelPickerIconClassName }
287
: {})}
288
onOpenChange={onModelPickerOpenChange}
289
getModelDisabledReason={getModelDisabledReason}
@@ -264,13 +307,6 @@ export function ComposerControlsBar(props: {
307
</ComposerControl>
308
) : (
309
<>
267
- {showLeadingSeparator ? (
268
- <ComposerControlSeparator
269
- size="xs"
270
- className="@max-[400px]/composer-surface:hidden"
271
- data-resting-controls-separator="true"
272
- />
273
- ) : null}
310
{composerModelPicker}
311
312
<>
@@ -315,6 +351,8 @@ export function ComposerControlsBar(props: {
351
traitsMenuContent={
352
hiddenRestingBlockIds.includes("traits") ? providerTraitsMenuContent : undefined
353
}
354
+ // Permissions join the overflow only when their normal home is in it.
355
+ showPermissions={overflowShowsPermissions}
356
onToggleInteractionMode={toggleInteractionMode}
357
onRuntimeModeChange={handleRuntimeModeChange}
358
/>
apps/web/src/components/chat/ComposerFooterControls.tsx
+154
-50
@@ -6,13 +6,14 @@ import type {
6
} from "@t3tools/contracts";
7
import { createModelSelection } from "@t3tools/shared/model";
8
import { BotIcon, PencilRulerIcon } from "lucide-react";
9
-import { type ComponentProps, memo } from "react";
9
+import { type ComponentProps, memo, useId, useRef, useState } from "react";
10
11
import type { ContextWindowSnapshot } from "../../lib/contextWindow";
12
-import { Select, SelectItem, SelectPopup, SelectValue } from "../ui/select";
12
+import { Menu as MenuPrimitive } from "@base-ui/react/menu";
13
+import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
14
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
14
-import { ComposerControl, ComposerControlIcon, ComposerSelectControl } from "./ComposerControl";
15
-import { useComposerMenuProps } from "./composerEventScope";
15
+import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
16
+import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
17
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
18
import { ContextWindowMeter, ContextWindowMeterPlaceholder } from "./ContextWindowMeter";
19
import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
@@ -32,12 +33,18 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
33
runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
34
size?: "sm" | "xs";
35
hidden?: boolean;
36
+ /** How the permissions chip shows: hidden while the thread matches the user's default. */
37
+ accessDisplay?: "label" | "icon" | "hidden";
38
+ /** Draw the icon in the label color, not muted (the mode differs from the user's default). */
39
+ emphasized?: boolean;
40
onToggleInteractionMode: () => void;
41
onRuntimeModeChange: (mode: RuntimeMode) => void;
42
}) {
43
const size = props.size ?? "sm";
44
+ const accessDisplay = props.accessDisplay ?? "label";
45
const composerFloatingLayerProps = useComposerMenuProps();
46
const [open, setOpen] = useComposerMenuState(props.hidden);
47
+ const permissionsChipRef = useRef<HTMLButtonElement>(null);
48
const runtimeModeOption =
49
props.runtimeModeOptions.find((option) => option.mode === props.runtimeMode) ??
50
supervisedRuntimeModeOption;
@@ -74,7 +81,11 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
81
opticalSize={size === "xs" ? "default" : "large"}
82
/>
83
)}
77
- <span data-composer-control-label className="sr-only sm:not-sr-only">
84
+ {/* The compacted row (xs) keeps this icon-only, like the other controls there. */}
85
+ <span
86
+ data-composer-control-label
87
+ className={size === "xs" ? "sr-only" : "sr-only sm:not-sr-only"}
88
+ >
89
{props.interactionMode === "plan" ? "Plan" : "Build"}
90
</span>
91
</TooltipTrigger>
@@ -82,61 +93,154 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
93
</Tooltip>
94
) : null;
95
85
- return (
86
- <>
96
+ // The chip opens the same Permissions toggle used in the effort menu.
97
+ const permissionsTooltip = `Permissions: ${runtimeModeOption.label}. ${runtimeModeOption.description}`;
98
+ const permissionsChip = (
99
+ <Menu
100
+ open={open}
101
+ onOpenChange={setOpen}
102
+ onOpenChangeComplete={(isOpen) =>
103
+ focusRequestedPermission(isOpen, permissionsChipRef.current)
104
+ }
105
+ >
106
<Tooltip>
88
- <Select
89
- open={open}
90
- onOpenChange={setOpen}
91
- value={props.runtimeMode}
92
- onValueChange={(value) => props.onRuntimeModeChange(value!)}
107
+ <TooltipTrigger
108
+ render={
109
+ <MenuTrigger
110
+ render={
111
+ <ComposerControl
112
+ ref={permissionsChipRef}
113
+ data-composer-shortcut="composer.mode"
114
+ size={size}
115
+ // Mirrors the effort chip's trailing pe-1 so both gaps around the bars match.
116
+ className="ps-1.5"
117
+ aria-label={`Permissions: ${runtimeModeOption.label}`}
118
+ />
119
+ }
120
+ />
121
+ }
122
>
94
- <TooltipTrigger
95
- render={
96
- <ComposerSelectControl
97
- data-composer-shortcut="composer.mode"
98
- size={size}
99
- aria-label="Runtime mode"
100
- />
101
- }
123
+ <ComposerControlIcon
124
+ icon={RuntimeModeIcon}
125
+ size={size}
126
+ // Match the label, not full foreground: the chip's presence already marks the mode.
127
+ {...(props.emphasized ? { className: "text-current" } : {})}
128
+ />
129
+ <span
130
+ data-composer-control-label
131
+ className={accessDisplay === "icon" ? "sr-only" : undefined}
132
>
103
- <ComposerControlIcon icon={RuntimeModeIcon} size={size} />
104
- <SelectValue data-composer-control-label>{runtimeModeOption.label}</SelectValue>
105
- </TooltipTrigger>
106
- <SelectPopup alignItemWithTrigger={false} {...composerFloatingLayerProps}>
107
- {props.runtimeModeOptions.map((option) => {
108
- const OptionIcon = option.icon;
109
- return (
110
- <SelectItem
111
- key={option.mode}
112
- value={option.mode}
113
- hideIndicator
114
- className="min-w-64"
115
- >
116
- <div className="flex min-w-0 items-center gap-3">
117
- <div className="grid min-w-0 flex-1 gap-0.5">
118
- <span className="inline-flex items-center gap-1.5 font-medium text-foreground">
119
- <OptionIcon className="size-3.5 shrink-0 text-muted-foreground" />
120
- {option.label}
121
- </span>
122
- <span className="text-muted-foreground text-xs leading-4">
123
- {option.description}
124
- </span>
125
- </div>
126
- </div>
127
- </SelectItem>
128
- );
129
- })}
130
- </SelectPopup>
131
- </Select>
132
- <TooltipPopup side="top">{runtimeModeOption.description}</TooltipPopup>
133
+ {runtimeModeOption.label}
134
+ </span>
135
+ </TooltipTrigger>
136
+ <TooltipPopup side="top">{permissionsTooltip}</TooltipPopup>
137
</Tooltip>
138
+ <MenuPopup align="start" {...composerFloatingLayerProps}>
139
+ <ComposerPermissionsSection
140
+ runtimeMode={props.runtimeMode}
141
+ runtimeModeOptions={props.runtimeModeOptions}
142
+ onRuntimeModeChange={props.onRuntimeModeChange}
143
+ />
144
+ </MenuPopup>
145
+ </Menu>
146
+ );
147
148
+ return (
149
+ <>
150
+ {accessDisplay === "hidden" ? null : permissionsChip}
151
{interactionModeToggle}
152
</>
153
);
154
});
155
156
+/**
157
+ * Permission modes as one horizontal toggle, with the shown mode named below.
158
+ * Each segment is a real menu radio item, so arrow keys reach it from the rest of the menu
159
+ * and a pick closes the menu. Lives inside a Menu: the permissions chip, the effort menu,
160
+ * or the overflow menu.
161
+ */
162
+export function ComposerPermissionsSection(props: {
163
+ runtimeMode: RuntimeMode;
164
+ runtimeModeOptions: ReadonlyArray<
165
+ { mode: RuntimeMode } & (typeof runtimeModeConfig)[RuntimeMode]
166
+ >;
167
+ onRuntimeModeChange: (mode: RuntimeMode) => void;
168
+}) {
169
+ // Hover or keyboard focus previews a mode's name and description before a pick.
170
+ const [previewMode, setPreviewMode] = useState<RuntimeMode | null>(null);
171
+ const shownMode = previewMode ?? props.runtimeMode;
172
+ const shown =
173
+ props.runtimeModeOptions.find((option) => option.mode === shownMode) ??
174
+ supervisedRuntimeModeOption;
175
+ const descriptionId = useId();
176
+ return (
177
+ <div data-composer-permissions className="grid w-72 gap-1.5 px-2 py-1.5">
178
+ <div className="font-medium text-muted-foreground text-xs">Permissions</div>
179
+ <MenuPrimitive.RadioGroup
180
+ aria-label="Permissions"
181
+ value={props.runtimeMode}
182
+ onValueChange={(value: RuntimeMode) => {
183
+ if (value !== props.runtimeMode) props.onRuntimeModeChange(value);
184
+ }}
185
+ className="flex gap-0.5 rounded-lg bg-input/40 p-0.5"
186
+ // Menus navigate with Up/Down only; the row reads horizontally, so Left/Right move too.
187
+ onKeyDown={(event) => {
188
+ if (event.key !== "ArrowLeft" && event.key !== "ArrowRight") return;
189
+ const items = Array.from(
190
+ event.currentTarget.querySelectorAll<HTMLElement>('[role="menuitemradio"]'),
191
+ );
192
+ const index = items.findIndex((item) => item === document.activeElement);
193
+ const next = items[index + (event.key === "ArrowRight" ? 1 : -1)];
194
+ if (index < 0 || !next) return;
195
+ event.preventDefault();
196
+ event.stopPropagation();
197
+ next.focus();
198
+ }}
199
+ >
200
+ {props.runtimeModeOptions.map((option) => {
201
+ const OptionIcon = option.icon;
202
+ return (
203
+ <MenuPrimitive.RadioItem
204
+ key={option.mode}
205
+ value={option.mode}
206
+ label={option.label}
207
+ aria-label={option.label}
208
+ aria-describedby={`${descriptionId}-${option.mode}`}
209
+ closeOnClick
210
+ onPointerEnter={() => setPreviewMode(option.mode)}
211
+ onPointerLeave={() => setPreviewMode(null)}
212
+ onFocus={() => setPreviewMode(option.mode)}
213
+ onBlur={() => setPreviewMode(null)}
214
+ className="flex h-6 flex-1 cursor-pointer items-center justify-center rounded-md text-muted-foreground outline-none data-checked:bg-input/72 data-checked:text-foreground data-highlighted:text-foreground not-data-checked:data-highlighted:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset"
215
+ >
216
+ <OptionIcon aria-hidden="true" className="size-3.5" />
217
+ </MenuPrimitive.RadioItem>
218
+ );
219
+ })}
220
+ </MenuPrimitive.RadioGroup>
221
+ {/* Static per-mode descriptions for screen readers; the preview below is visual only. */}
222
+ {props.runtimeModeOptions.map((option) => (
223
+ <span key={option.mode} id={`${descriptionId}-${option.mode}`} className="sr-only">
224
+ {option.description}
225
+ </span>
226
+ ))}
227
+ <div className="grid gap-0.5" aria-hidden="true">
228
+ <span
229
+ className={
230
+ shownMode === props.runtimeMode
231
+ ? "text-foreground text-sm"
232
+ : "text-muted-foreground text-sm"
233
+ }
234
+ >
235
+ {shown.label}
236
+ </span>
237
+ {/* Two lines reserved so the menu does not shift while you preview modes. */}
238
+ <span className="min-h-8 text-muted-foreground text-xs leading-4">{shown.description}</span>
239
+ </div>
240
+ </div>
241
+ );
242
+}
243
+
244
export const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(props: {
245
compact: boolean;
246
canOperateThread: boolean;
apps/web/src/components/chat/ComposerPermissionsSection.browser.test.tsx
new
+151
@@ -0,0 +1,151 @@
1
+import type { RuntimeMode } from "@t3tools/contracts";
2
+import { type ReactNode, useRef, useState } from "react";
3
+import { expect, it, vi } from "vite-plus/test";
4
+import { page, userEvent } from "vite-plus/test/browser";
5
+
6
+import { render } from "../../../test/render";
7
+import { ComposerHandleContext, type ComposerHandleRef } from "../../composerHandleContext";
8
+import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";
9
+import {
10
+ focusRequestedPermission,
11
+ markOpenToPermissions,
12
+ useComposerMenuProps,
13
+} from "./composerEventScope";
14
+import { ComposerFooterModeControls, ComposerPermissionsSection } from "./ComposerFooterControls";
15
+import { runtimeModeConfig, runtimeModeOptions } from "./runtimeModeConfig";
16
+
17
+const options = runtimeModeOptions.map((mode) => ({ mode, ...runtimeModeConfig[mode] }));
18
+
19
+// Mirrors the effort menu: effort radio items first, then the Permissions section.
20
+function EffortMenu() {
21
+ const [effort, setEffort] = useState("high");
22
+ const [mode, setMode] = useState<RuntimeMode>("full-access");
23
+ const composerMenuProps = useComposerMenuProps();
24
+ const triggerRef = useRef<HTMLButtonElement>(null);
25
+ return (
26
+ <>
27
+ <Menu onOpenChangeComplete={(open) => focusRequestedPermission(open, triggerRef.current)}>
28
+ <MenuTrigger ref={triggerRef}>Effort</MenuTrigger>
29
+ <MenuPopup {...composerMenuProps}>
30
+ <MenuRadioGroup value={effort} onValueChange={setEffort}>
31
+ <MenuRadioItem value="low">Low</MenuRadioItem>
32
+ <MenuRadioItem value="high">High</MenuRadioItem>
33
+ </MenuRadioGroup>
34
+ <ComposerPermissionsSection
35
+ runtimeMode={mode}
36
+ runtimeModeOptions={options}
37
+ onRuntimeModeChange={setMode}
38
+ />
39
+ </MenuPopup>
40
+ </Menu>
41
+ <p role="status">{mode}</p>
42
+ </>
43
+ );
44
+}
45
+
46
+it("reaches Permissions from the effort items with arrow keys, previews, and picks with Enter", async () => {
47
+ await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
48
+ const trigger = screen.getByRole("button", { name: "Effort" });
49
+ await userEvent.tab();
50
+ await expect.element(trigger).toHaveFocus();
51
+ await userEvent.keyboard("{ArrowDown}");
52
+ await expect.element(page.getByRole("menuitemradio", { name: "Low" })).toHaveFocus();
53
+
54
+ await userEvent.keyboard("{ArrowDown}{ArrowDown}");
55
+ const supervised = page.getByRole("menuitemradio", { name: "Supervised" });
56
+ await expect.element(supervised).toHaveFocus();
57
+ await expect
58
+ .element(supervised)
59
+ .toHaveAccessibleDescription("Ask before commands and file changes.");
60
+
61
+ await userEvent.keyboard("{ArrowRight}");
62
+ await expect
63
+ .element(page.getByRole("menuitemradio", { name: "Auto-accept edits" }))
64
+ .toHaveFocus();
65
+ await userEvent.keyboard("{ArrowLeft}{ArrowLeft}");
66
+ await expect.element(page.getByRole("menuitemradio", { name: "Supervised" })).toHaveFocus();
67
+
68
+ await userEvent.keyboard("{ArrowUp}");
69
+ await expect.element(page.getByRole("menuitemradio", { name: "High" })).toHaveFocus();
70
+
71
+ await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
72
+ await expect.element(screen.getByRole("status")).toHaveTextContent("auto-accept-edits");
73
+ await expect
74
+ .element(page.getByRole("menuitemradio", { name: "Supervised" }))
75
+ .not.toBeInTheDocument();
76
+ await expect.element(trigger).toHaveFocus();
77
+});
78
+
79
+it("marks the current mode as checked and closes on Escape", async () => {
80
+ await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
81
+ await userEvent.tab();
82
+ await userEvent.keyboard("{ArrowDown}");
83
+ const fullAccess = page.getByRole("menuitemradio", { name: "Full access" });
84
+ await expect.element(fullAccess).toHaveAttribute("aria-checked", "true");
85
+ await userEvent.keyboard("{Escape}");
86
+ await expect.element(fullAccess).not.toBeInTheDocument();
87
+ await expect.element(screen.getByRole("button", { name: "Effort" })).toHaveFocus();
88
+});
89
+
90
+// The real composer menu focus rule (useComposerMenuProps), with a stub composer handle.
91
+function withComposer(children: ReactNode) {
92
+ const handle = { focusAtEnd: vi.fn() };
93
+ const ref = { current: handle } as unknown as ComposerHandleRef;
94
+ return { handle, ui: <ComposerHandleContext value={ref}>{children}</ComposerHandleContext> };
95
+}
96
+
97
+it("returns focus to the editor after a pick", async () => {
98
+ const { handle, ui } = withComposer(<EffortMenu />);
99
+ await using screen = await render(ui, { router: false }); // no routes involved
100
+ await userEvent.tab();
101
+ await userEvent.keyboard("{ArrowDown}");
102
+ await expect.element(page.getByRole("menuitemradio", { name: "Low" })).toHaveFocus();
103
+ await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
104
+ await expect.element(screen.getByRole("status")).toHaveTextContent("approval-required");
105
+ await vi.waitFor(() => expect(handle.focusAtEnd).toHaveBeenCalled());
106
+});
107
+
108
+it("opens on the checked permission when composer.mode marked the trigger", async () => {
109
+ await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
110
+ const trigger = screen.getByRole("button", { name: "Effort" });
111
+ markOpenToPermissions(trigger.element() as HTMLElement);
112
+ await userEvent.click(trigger);
113
+ await expect.element(page.getByRole("menuitemradio", { name: "Full access" })).toHaveFocus();
114
+
115
+ // The mark is used once: a plain reopen lands on the menu's usual first focus.
116
+ await userEvent.keyboard("{Escape}");
117
+ await userEvent.click(trigger);
118
+ await expect.element(page.getByRole("menuitemradio", { name: "Full access" })).not.toHaveFocus();
119
+});
120
+
121
+// Mirrors ComposerControlsBar: the chip shows only while the mode differs from the default.
122
+function PermissionsChip() {
123
+ const [mode, setMode] = useState<RuntimeMode>("approval-required");
124
+ return (
125
+ <div data-slot="composer-shell">
126
+ <button type="button" data-composer-shortcut="composer.effort composer.mode">
127
+ Effort
128
+ </button>
129
+ {mode === "full-access" ? null : (
130
+ <ComposerFooterModeControls
131
+ showInteractionModeToggle={false}
132
+ interactionMode="default"
133
+ runtimeMode={mode}
134
+ runtimeModeOptions={options}
135
+ accessDisplay="label"
136
+ onToggleInteractionMode={() => {}}
137
+ onRuntimeModeChange={setMode}
138
+ />
139
+ )}
140
+ </div>
141
+ );
142
+}
143
+
144
+it("returns focus to the editor when picking the default hides the chip", async () => {
145
+ const { handle, ui } = withComposer(<PermissionsChip />);
146
+ await using screen = await render(ui, { router: false }); // no routes involved
147
+ await userEvent.click(screen.getByRole("button", { name: "Permissions: Supervised" }));
148
+ await userEvent.click(page.getByRole("menuitemradio", { name: "Full access" }));
149
+ await vi.waitFor(() => expect(handle.focusAtEnd).toHaveBeenCalled());
150
+ await expect.element(screen.getByRole("button", { name: "Effort" })).not.toHaveFocus();
151
+});
apps/web/src/components/chat/ComposerSurface.tsx
+10
-25
@@ -3,14 +3,14 @@ import type { ComponentProps } from "react";
3
import { cn } from "~/lib/utils";
4
5
function Shell({
6
- contextStrip = false,
6
+ contextRow = false,
7
className,
8
...props
9
-}: ComponentProps<"div"> & { contextStrip?: boolean }) {
9
+}: ComponentProps<"div"> & { contextRow?: boolean }) {
10
return (
11
<div
12
data-slot="composer-shell"
13
- data-with-context={contextStrip || undefined}
13
+ data-context-row={contextRow || undefined}
14
className={cn(
15
"@container/composer-surface group/composer-surface relative isolate mx-auto w-full max-w-(--chat-content-max-width)",
16
"[--chat-composer-drawer-inset:1.375rem] [--chat-composer-glass-surface:var(--card)] [--chat-composer-outline:rgb(0_0_0/8%)]",
@@ -20,13 +20,9 @@ function Shell({
20
"dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-highlight:color-mix(in_srgb,#432d48_12%,transparent)] dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-outline:#241e28]",
21
"before:pointer-events-none before:absolute before:inset-0 before:z-0 before:rounded-2xl before:bg-(--chat-composer-glass-surface)/(--glass-opacity) before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
22
"not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:before:bg-(--chat-composer-glass-surface)",
23
- "has-data-[composer-banner-surface=attached]:before:hidden data-model-strip-transition:before:hidden",
24
- contextStrip && [
25
- "[--chat-composer-context-extension:2.25rem] sm:[--chat-composer-context-extension:2rem]",
26
- "supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:rounded-none",
27
- "before:[clip-path:shape(from_0_16px,curve_to_16px_0_with_0_7.16px/7.16px_0,line_to_calc(100%-16px)_0,curve_to_100%_16px_with_calc(100%-7.16px)_0/100%_7.16px,line_to_100%_calc(100%-var(--chat-composer-context-extension)-16px),curve_to_calc(100%-16px)_calc(100%-var(--chat-composer-context-extension))_with_100%_calc(100%-var(--chat-composer-context-extension)-7.16px)/calc(100%-7.16px)_calc(100%-var(--chat-composer-context-extension)),line_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-var(--chat-composer-context-extension)),line_to_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-16px),curve_to_calc(100%-var(--chat-composer-drawer-inset)-16px)_100%_with_calc(100%-var(--chat-composer-drawer-inset))_calc(100%-7.16px)/calc(100%-var(--chat-composer-drawer-inset)-7.16px)_100%,line_to_calc(var(--chat-composer-drawer-inset)+16px)_100%,curve_to_var(--chat-composer-drawer-inset)_calc(100%-16px)_with_calc(var(--chat-composer-drawer-inset)+7.16px)_100%/var(--chat-composer-drawer-inset)_calc(100%-7.16px),line_to_var(--chat-composer-drawer-inset)_calc(100%-var(--chat-composer-context-extension)),line_to_16px_calc(100%-var(--chat-composer-context-extension)),curve_to_0_calc(100%-var(--chat-composer-context-extension)-16px)_with_7.16px_calc(100%-var(--chat-composer-context-extension))/0_calc(100%-var(--chat-composer-context-extension)-7.16px),line_to_0_16px,close)]",
28
- "not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bottom-(--chat-composer-context-extension)",
29
- ],
23
+ "has-data-[composer-banner-surface=attached]:before:hidden",
24
+ // With a context row below, the card paints its own glass (see Host) so the row stays bare.
25
+ "data-context-row:before:hidden",
26
className,
27
)}
28
{...props}
@@ -37,17 +33,14 @@ function Shell({
33
const outlineClasses =
34
"after:pointer-events-none after:absolute after:inset-0 after:rounded-[inherit] after:border after:border-(--chat-composer-outline) dark:after:inset-shadow-2xs dark:after:inset-shadow-(color:--chat-composer-highlight)";
35
40
-const contextSeamClasses =
41
- "group-data-with-context/composer-surface:after:[clip-path:polygon(0_0,100%_0,100%_100%,calc(100%-22px)_100%,calc(100%-22px)_calc(100%-2px),22px_calc(100%-2px),22px_100%,0_100%)]";
42
-
36
function Host({ className, ...props }: ComponentProps<"div">) {
37
return (
38
<div
39
data-slot="composer-host"
40
className={cn(
41
"relative z-10 w-full rounded-2xl shadow-composer after:z-1 dark:shadow-none",
42
+ "group-data-context-row/composer-surface:before:pointer-events-none group-data-context-row/composer-surface:before:absolute group-data-context-row/composer-surface:before:inset-0 group-data-context-row/composer-surface:before:-z-1 group-data-context-row/composer-surface:before:rounded-2xl group-data-context-row/composer-surface:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-data-context-row/composer-surface:before:backdrop-blur-(--glass-blur) group-data-context-row/composer-surface:before:backdrop-saturate-(--glass-saturation)",
43
outlineClasses,
50
- contextSeamClasses,
44
"group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none group-has-data-[composer-banner-surface=attached]/composer-surface:after:hidden",
45
className,
46
)}
@@ -62,10 +55,8 @@ function Main({ className, ...props }: ComponentProps<"div">) {
55
data-chat-composer-main-surface="true"
56
className={cn(
57
"group relative z-10 rounded-2xl p-px",
65
- "group-data-model-strip-transition/composer-surface:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-data-model-strip-transition/composer-surface:backdrop-blur-(--glass-blur) group-data-model-strip-transition/composer-surface:backdrop-saturate-(--glass-saturation)",
58
outlineClasses,
67
- contextSeamClasses,
68
- "after:z-20 after:hidden group-has-data-[composer-banner-surface=attached]/composer-surface:after:block group-data-model-strip-transition/composer-surface:after:block",
59
+ "after:z-20 after:hidden group-has-data-[composer-banner-surface=attached]/composer-surface:after:block",
60
"group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-saturate-(--glass-saturation)",
61
"group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-composer dark:group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none",
62
"not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)",
@@ -77,19 +68,13 @@ function Main({ className, ...props }: ComponentProps<"div">) {
68
);
69
}
70
80
-// Position hints keep class merging from dropping mask color stops.
81
-// Dark goes transparent only where the Shell backdrop paints the strip; scoping it keeps dark: from beating the fills below.
71
+/** A plain row under the card (environment, worktree, branch) with no surface of its own. */
72
function ContextStrip({ className, ...props }: ComponentProps<"div">) {
73
return (
74
<div
75
data-slot="composer-context-strip"
76
className={cn(
87
- "group/composer-context relative isolate mx-auto -mt-4 flex w-[calc(100%-2*var(--chat-composer-drawer-inset))] items-center gap-2 overflow-x-clip overflow-y-visible px-2 pt-5 pb-1",
88
- "before:absolute before:inset-0 before:-z-1 before:rounded-b-2xl before:border before:border-(--chat-composer-outline) before:mask-b-from-transparent before:mask-b-from-(position:--spacing-composer-seam) before:mask-b-to-black before:mask-b-to-(position:--spacing-composer-seam)",
89
- "before:bg-(--chat-composer-glass-surface) dark:before:bg-composer-seam-below dark:before:bg-origin-border",
90
- "dark:supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:group-not-has-data-[composer-banner-surface=attached]/composer-surface:before:bg-transparent",
91
- "group-has-data-[composer-banner-surface=attached]/composer-surface:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-saturate-(--glass-saturation)",
92
- "not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-blur-(--glass-blur) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-saturate-(--glass-saturation)",
77
+ "group/composer-context relative flex w-full items-center gap-2 overflow-x-clip px-2 pt-2 text-muted-foreground",
78
className,
79
)}
80
{...props}
apps/web/src/components/chat/EffortGlyph.test.ts
new
+67
@@ -0,0 +1,67 @@
1
+import { describe, expect, it } from "vite-plus/test";
2
+
3
+import { effortBarHeights, resolveEffortGlyph } from "./EffortGlyph";
4
+
5
+const descriptor = (ids: ReadonlyArray<string>, promptInjectedValues?: ReadonlyArray<string>) => ({
6
+ id: "effort",
7
+ label: "Reasoning",
8
+ type: "select" as const,
9
+ options: ids.map((id) => ({ id, label: id[0]!.toUpperCase() + id.slice(1) })),
10
+ ...(promptInjectedValues ? { promptInjectedValues } : {}),
11
+});
12
+
13
+describe("resolveEffortGlyph", () => {
14
+ const claude = descriptor(
15
+ ["low", "medium", "high", "xhigh", "max", "ultracode", "ultrathink"],
16
+ ["ultrathink"],
17
+ );
18
+
19
+ it("fills bars up to the current level and leaves max and workflow levels off the scale", () => {
20
+ expect(resolveEffortGlyph(claude, "xhigh")).toEqual({
21
+ count: 4,
22
+ filled: 4,
23
+ special: null,
24
+ label: "Xhigh",
25
+ });
26
+ });
27
+
28
+ it("names max instead of drawing it", () => {
29
+ expect(resolveEffortGlyph(claude, "max")?.special).toBe("Max");
30
+ });
31
+
32
+ it("names Ultracode and Ultrathink instead of drawing a level", () => {
33
+ expect(resolveEffortGlyph(claude, "ultracode")?.special).toBe("Ultracode");
34
+ expect(resolveEffortGlyph(claude, "ultrathink")?.special).toBe("Ultrathink");
35
+ });
36
+
37
+ it("draws the lowest level as one bar, and an off level as none", () => {
38
+ expect(resolveEffortGlyph(claude, "low")).toMatchObject({ count: 4, filled: 1 });
39
+ expect(resolveEffortGlyph(claude, "medium")).toMatchObject({ count: 4, filled: 2 });
40
+ expect(resolveEffortGlyph(descriptor(["off", "low", "high"]), "off")).toEqual({
41
+ count: 2,
42
+ filled: 0,
43
+ special: null,
44
+ label: "Off",
45
+ });
46
+ });
47
+
48
+ it("falls back to the word when the value is unknown or the scale has one level", () => {
49
+ expect(resolveEffortGlyph(claude, "unknown")).toBeNull();
50
+ expect(resolveEffortGlyph(descriptor(["high"]), "high")).toBeNull();
51
+ });
52
+});
53
+
54
+describe("effortBarHeights", () => {
55
+ it.each([3, 4, 5, 6, 7])(
56
+ "rises by one whole-pixel step and ends at full height: %i bars",
57
+ (count) => {
58
+ const heights = effortBarHeights(count, 12);
59
+ expect(heights).toHaveLength(count);
60
+ expect(heights.at(-1)).toBe(12);
61
+ const steps = new Set(heights.slice(1).map((height, index) => height - heights[index]!));
62
+ expect(steps.size).toBe(1);
63
+ const [step] = steps;
64
+ expect(Number.isInteger(step) && step! > 0).toBe(true);
65
+ },
66
+ );
67
+});
apps/web/src/components/chat/EffortGlyph.tsx
new
+86
@@ -0,0 +1,86 @@
1
+import type { ProviderOptionDescriptor } from "@t3tools/contracts";
2
+
3
+import type { ComposerControlSize } from "./ComposerControl";
4
+
5
+const GLYPH_HEIGHT_SM = 14;
6
+const GLYPH_HEIGHT_XS = 12;
7
+// Bars stop this far above the box's bottom, which puts their flat base on the text baseline.
8
+const BASELINE_INSET = 2;
9
+
10
+type SelectDescriptor = Extract<ProviderOptionDescriptor, { type: "select" }>;
11
+
12
+// Ultracode changes the workflow, not only intensity, so it keeps its name like Ultrathink.
13
+// Max is named too, so the full scale stops short of it.
14
+const NAMED_LEVELS = new Set(["ultracode", "max"]);
15
+const OFF_LEVELS = new Set(["off", "none"]);
16
+
17
+/**
18
+ * Maps a reasoning select to bars: one per ordinary level, filled up to the current one, with an
19
+ * off level as none filled. Max, prompt-injected and workflow levels are named instead of drawn.
20
+ */
21
+export function resolveEffortGlyph(descriptor: SelectDescriptor, current: string | null) {
22
+ const special = new Set([...(descriptor.promptInjectedValues ?? []), ...NAMED_LEVELS]);
23
+ const levels = descriptor.options.filter((option) => !special.has(option.id));
24
+ if (levels.length < 2 || current === null) return null;
25
+ const startsAtOff = OFF_LEVELS.has(levels[0]!.id);
26
+ const count = startsAtOff ? levels.length - 1 : levels.length;
27
+ if (special.has(current)) {
28
+ const label = descriptor.options.find((option) => option.id === current)?.label ?? current;
29
+ return { count, filled: count, special: label, label };
30
+ }
31
+ const index = levels.findIndex((option) => option.id === current);
32
+ if (index < 0) return null;
33
+ return {
34
+ count,
35
+ filled: startsAtOff ? index : index + 1,
36
+ special: null,
37
+ label: levels[index]!.label,
38
+ };
39
+}
40
+
41
+/** Bar heights that rise by one whole-pixel step, from about half height up to `maxBar`. */
42
+export function effortBarHeights(count: number, maxBar: number): number[] {
43
+ // Rounding each bar separately mixes 1px and 2px steps, so round the step once.
44
+ const step = Math.max(1, Math.round(maxBar / 2 / Math.max(count - 1, 1)));
45
+ return Array.from({ length: count }, (_, index) => maxBar - (count - 1 - index) * step);
46
+}
47
+
48
+/**
49
+ * Rising bars on whole pixels so they stay sharp on 1x displays. Color follows the text.
50
+ * The box is centered like the icons beside it; the bars sit on the text baseline inside it.
51
+ */
52
+export function EffortGlyph(props: { count: number; filled: number; size?: ComposerControlSize }) {
53
+ const height = props.size === "xs" ? GLYPH_HEIGHT_XS : GLYPH_HEIGHT_SM;
54
+ const step = 4;
55
+ const width = step * props.count - 2;
56
+ const maxBar = height - BASELINE_INSET;
57
+ return (
58
+ <svg
59
+ aria-hidden="true"
60
+ width={width}
61
+ height={height}
62
+ viewBox={`0 0 ${width} ${height}`}
63
+ // Inline size: the composer control CSS forces unsized SVGs to 16px.
64
+ style={{ width, height }}
65
+ className="shrink-0 text-current"
66
+ data-composer-effort-glyph
67
+ // Opts out of the control's negative icon margins, so the row's gaps stay true.
68
+ data-composer-control-icon
69
+ >
70
+ {effortBarHeights(props.count, maxBar).map((barHeight, index) => {
71
+ const x = index * step;
72
+ return (
73
+ <rect
74
+ key={x}
75
+ x={x}
76
+ y={maxBar - barHeight}
77
+ width={2}
78
+ height={barHeight}
79
+ fill="currentColor"
80
+ opacity={index < props.filled ? 1 : 0.4}
81
+ />
82
+ );
83
+ })}
84
+ </svg>
85
+ );
86
+}
apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
-23
@@ -205,29 +205,6 @@ describe("MessagesTimeline messages", () => {
205
expect(maxNestedCommits).toBeLessThan(20);
206
});
207
208
- it("keeps reporting overflow while the composer inset changes", async () => {
209
- setup();
210
- const props = baseProps();
211
- const overflowReports: boolean[] = [];
212
- const replies = Array.from({ length: 40 }, (_, index) =>
213
- message(`Reply ${index}\n\n${"line\n\n".repeat(8)}`, { role: "assistant" }, `r-${index}`),
214
- );
215
- const timeline = (inset: number) => (
216
- <MessagesTimeline
217
- {...props}
218
- timelineEntries={replies}
219
- contentInsetEndAdjustment={inset}
220
- onContentOverflowChange={(overflows) => overflowReports.push(overflows)}
221
- />
222
- );
223
- await using screen = await renderElement(timeline(110));
224
- await vi.waitFor(() => expect(overflowReports.at(-1)).toBe(true));
225
- overflowReports.length = 0;
226
- // The resting composer resizes with overflow; a false report here flips it back.
227
- await screen.rerender(timeline(148));
228
- expect(overflowReports).not.toContain(false);
229
- });
230
-
208
it("keeps the first and last message headings reachable from either end", async () => {
209
setup();
210
const props = baseProps();
apps/web/src/components/chat/MessagesTimeline.tsx
+3
-43
@@ -63,7 +63,6 @@ import {
63
readTimelinePosition,
64
type RememberedTimelinePosition,
65
rememberTimelinePosition,
66
- timelineContentOverflowsViewport,
66
} from "./timelineScrollAnchoring";
67
import { AssistantSelectionToolbar } from "./AssistantSelectionToolbar";
68
import type { AssistantCitationSourceAnchor } from "~/lib/assistantTextSelection";
@@ -289,8 +288,6 @@ interface MessagesTimelineProps {
288
onIsAtEndChange: (isAtEnd: boolean) => void;
289
/** Disable while reading history to prevent LegendList re-pinning near the bottom. */
290
liveFollowEnabled: boolean;
292
- onContentOverflowChange?: (overflows: boolean) => void;
293
- onToolOutputCollapsedAtEnd?: () => void;
291
/** Receives the list's viewport when it mounts; the returned cleanup runs when it goes away. */
292
onViewportAttach?: (viewport: TimelineViewport) => () => void;
293
/** The footer's content grew, such as a new queued turn or status line. */
@@ -388,9 +385,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
385
onAnchorSizeChanged,
386
contentInsetEndAdjustment,
387
onIsAtEndChange,
391
- onContentOverflowChange,
388
liveFollowEnabled,
393
- onToolOutputCollapsedAtEnd,
389
onViewportAttach,
390
onFooterGrow,
391
hideEmptyPlaceholder = false,
@@ -465,7 +460,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
460
const findActive = findExpanded;
461
462
const disclosurePinsEndRef = useRef(false);
468
- const disclosureCollapsedRef = useRef(false);
463
const pinDisclosureToEnd = () => {
464
if (!disclosurePinsEndRef.current) return;
465
const element = listRef.current?.getScrollableNode();
@@ -488,19 +482,12 @@ const ConversationTimeline = memo(function ConversationTimeline({
482
setDisclosureToggleSettling(false);
483
disclosureSettleFrameRef.current = null;
484
disclosureSettleSecondFrameRef.current = null;
491
- if (
492
- disclosureCollapsedRef.current &&
493
- resolveTimelineIsAtEnd(listRef.current?.getState()) === true
494
- ) {
495
- onToolOutputCollapsedAtEnd?.();
496
- }
485
});
486
});
487
};
488
501
- const suspendEndScrollMaintenanceForDisclosure = (anchorKey: string, collapsed = false) => {
489
+ const suspendEndScrollMaintenanceForDisclosure = (anchorKey: string) => {
490
disclosureAnchorKeyRef.current = anchorKey;
503
- disclosureCollapsedRef.current = collapsed;
491
disclosurePinsEndRef.current = resolveTimelineIsAtEnd(listRef.current?.getState()) === true;
492
setDisclosureToggleSettling(true);
493
scheduleDisclosureSettle();
@@ -525,7 +512,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
512
});
513
};
514
const onToggleWorkGroup = (groupId: string, anchorKey: string) => {
528
- suspendEndScrollMaintenanceForDisclosure(anchorKey, expandedWorkGroupIds.has(groupId));
515
+ suspendEndScrollMaintenanceForDisclosure(anchorKey);
516
setExpandedWorkGroupIds((existing) => {
517
const next = new Set(existing);
518
if (next.has(groupId)) {
@@ -847,26 +834,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
834
size: true,
835
shouldRestorePosition: shouldRestoreVisibleContentPosition,
836
};
850
- const measureContentOverflow = () =>
851
- timelineContentOverflowsViewport(listRef.current?.getState?.(), {
852
- composerInset: contentInsetEndAdjustment,
853
- anchorOffset: CHAT_TIMELINE_ANCHOR_OFFSET,
854
- });
855
- // Read next frame, after LegendList's layout effects settle row positions.
856
- const contentOverflowFrameRef = useRef<number | null>(null);
857
- const cancelContentOverflowFrame = () => {
858
- if (contentOverflowFrameRef.current !== null) {
859
- cancelAnimationFrame(contentOverflowFrameRef.current);
860
- contentOverflowFrameRef.current = null;
861
- }
862
- };
863
- const reportContentOverflow = () => {
864
- if (!onContentOverflowChange || contentOverflowFrameRef.current !== null) return;
865
- contentOverflowFrameRef.current = requestAnimationFrame(() => {
866
- contentOverflowFrameRef.current = null;
867
- onContentOverflowChange(measureContentOverflow());
868
- });
869
- };
837
838
const refreshMinimap = useStableCallback(() => {
839
const state = listRef.current?.getState?.();
@@ -972,7 +939,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
939
if (isAtEnd !== undefined && !citationPositioning) {
940
onIsAtEndChange(isAtEnd);
941
}
975
- reportContentOverflow();
942
scheduleMinimapRefresh();
943
};
944
@@ -981,7 +947,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
947
queueMicrotask(pinDisclosureToEnd);
948
scheduleDisclosureSettle();
949
}
984
- reportContentOverflow();
950
scheduleMinimapRefresh();
951
};
952
@@ -1149,8 +1114,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
1114
1115
const canvas = useChatCanvas();
1116
const registerTimeline = canvas?.registerTimeline;
1152
- // Stable so the list attaches once per mount. A re-attach reports no overflow for a frame,
1153
- // which flips the resting composer, resizes it, and re-renders this list again.
1117
+ // Stable so the list attaches once per mount, not on every render.
1118
const setTimelineList = useStableCallback((list: LegendListRef | null) => {
1119
listRef.current = list;
1120
const scrollNode: HTMLElement | null = list?.getScrollableNode() ?? null;
@@ -1182,14 +1146,12 @@ const ConversationTimeline = memo(function ConversationTimeline({
1146
return () => {
1147
stopListeningToContentSize?.();
1148
stopRememberingRelease?.();
1185
- onContentOverflowChange?.(false);
1149
if (contentSizeFrame !== null) cancelAnimationFrame(contentSizeFrame);
1150
detachViewport?.();
1151
viewport?.dispose();
1152
if (viewportRef.current === viewport) viewportRef.current = null;
1153
// Refresh frames only read the list; disclosure frames still run so the
1154
// settle flag clears.
1192
- cancelContentOverflowFrame();
1155
if (minimapRefreshFrameRef.current !== null) {
1156
cancelAnimationFrame(minimapRefreshFrameRef.current);
1157
minimapRefreshFrameRef.current = null;
@@ -1378,8 +1340,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
1340
maintainScrollAtEndThreshold={1}
1341
onScroll={handleScroll}
1342
onItemSizeChanged={handleItemSizeChanged}
1381
- // A viewport resize changes how much of the content fits.
1382
- onLayout={reportContentOverflow}
1343
className={cn(
1344
"messages-timeline-scroll scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain [overflow-anchor:none]",
1345
topFadeEnabled && "topbar-scroll-fade",
apps/web/src/components/chat/ProviderModelPicker.tsx
+24
-24
@@ -15,11 +15,7 @@ import { ChatGptSharingControl } from "./ChatGptSharingControl";
15
import { ProviderInstanceIcon } from "./ProviderInstanceIcon";
16
import { ModelEsque, getDisplayModelName, getTriggerDisplayModelName } from "./providerIconUtils";
17
import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances";
18
-import {
19
- ComposerControl,
20
- ComposerControlChevron,
21
- type ComposerControlSize,
22
-} from "./ComposerControl";
18
+import { ComposerControl, type ComposerControlSize } from "./ComposerControl";
19
import { useComposerMenuProps } from "./composerEventScope";
20
import { shortcutLabelForCommand } from "../../keybindings";
21
@@ -211,7 +207,11 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
207
className={cn("flex min-w-0 flex-1 items-center", size === "xs" ? "gap-1" : "gap-1.5")}
208
>
209
{selectedEntries && props.triggerLabel === undefined ? (
214
- <span className="flex shrink-0 items-center -space-x-1" aria-hidden="true">
210
+ <span
211
+ data-chat-provider-model-picker-icon
212
+ className="flex shrink-0 items-center -space-x-1"
213
+ aria-hidden="true"
214
+ >
215
{selectedEntries
216
.slice(0, 3)
217
.map((selection) =>
@@ -233,21 +233,24 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
233
) : null}
234
</span>
235
) : activeEntry && props.triggerLabel === undefined ? (
236
- <ProviderInstanceIcon
237
- driverKind={activeEntry.driverKind}
238
- displayName={activeEntry.displayName}
239
- accentColor={activeEntry.accentColor}
240
- acpRegistryAgentId={activeEntry.acpRegistryAgentId}
241
- acpRegistryIconUrl={activeEntry.acpRegistryIconUrl}
242
- showBadge={showInstanceBadge}
243
- className="size-4"
244
- iconClassName={cn("size-4", props.activeProviderIconClassName)}
245
- indicatorBackground={props.instanceIndicatorBackground ?? "var(--contrast-input)"}
246
- badgeClassName={cn(
247
- "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs",
248
- size === "xs" && "shadow-none",
249
- )}
250
- />
236
+ // Narrow compacted composers hide the provider icon before truncating the name.
237
+ <span data-chat-provider-model-picker-icon className="contents">
238
+ <ProviderInstanceIcon
239
+ driverKind={activeEntry.driverKind}
240
+ displayName={activeEntry.displayName}
241
+ accentColor={activeEntry.accentColor}
242
+ acpRegistryAgentId={activeEntry.acpRegistryAgentId}
243
+ acpRegistryIconUrl={activeEntry.acpRegistryIconUrl}
244
+ showBadge={showInstanceBadge}
245
+ className="size-4"
246
+ iconClassName={cn("size-4", props.activeProviderIconClassName)}
247
+ indicatorBackground={props.instanceIndicatorBackground ?? "var(--contrast-input)"}
248
+ badgeClassName={cn(
249
+ "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs",
250
+ size === "xs" && "shadow-none",
251
+ )}
252
+ />
253
+ </span>
254
) : null}
255
<Tooltip>
256
<TooltipTrigger
@@ -268,9 +271,6 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
271
</Badge>
272
) : null}
273
</span>
271
- <span aria-hidden="true" className="flex items-center">
272
- <ComposerControlChevron size={size} />
273
- </span>
274
</PopoverTrigger>
275
<PopoverPopup
276
{...(props.isComposerOwned ? composerFloatingLayerProps : {})}
apps/web/src/components/chat/TraitsPicker.tsx
+124
-16
@@ -16,6 +16,7 @@ import {
16
type ScopedThreadRef,
17
type ServerProviderModel,
18
} from "@t3tools/contracts";
19
+import type { EffortDisplay } from "@t3tools/contracts/settings";
20
import {
21
buildProviderOptionSelectionsFromDescriptors,
22
getProviderOptionCurrentLabel,
@@ -23,8 +24,8 @@ import {
24
isClaudeUltrathinkPrompt,
25
normalizeModelSlug,
26
} from "@t3tools/shared/model";
26
-import { memo } from "react";
27
-import { GaugeIcon } from "lucide-react";
27
+import { memo, type ReactNode, useRef } from "react";
28
+import { GaugeIcon, ZapIcon } from "lucide-react";
29
import {
30
Menu,
31
MenuGroup,
@@ -39,14 +40,10 @@ import { getProviderModelCapabilities } from "../../providerModels";
40
import { cn } from "~/lib/utils";
41
import { Badge } from "../ui/badge";
42
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
42
-import {
43
- ComposerControl,
44
- ComposerControlChevron,
45
- ComposerControlIcon,
46
- type ComposerControlSize,
47
-} from "./ComposerControl";
48
-import { useComposerMenuProps } from "./composerEventScope";
43
+import { ComposerControl, ComposerControlIcon, type ComposerControlSize } from "./ComposerControl";
44
+import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
45
import { useComposerMenuState } from "./useComposerMenuState";
46
+import { EffortGlyph, resolveEffortGlyph } from "./EffortGlyph";
47
48
type ProviderOptions = ReadonlyArray<ProviderOptionSelection>;
49
@@ -322,6 +319,14 @@ interface TraitsMenuContentProps {
319
planModeEnabled: boolean;
320
triggerClassName?: string;
321
isComposerOwned?: boolean;
322
+ /** Composer chips name the effort level unless the user picked bars. */
323
+ effortDisplay?: EffortDisplay;
324
+ /** Extra section shown below the traits in the picker popup (Permissions). */
325
+ extraMenuContent?: ReactNode;
326
+ /** This trigger also answers composer.mode (while the permissions chip is hidden). */
327
+ extraMenuOwnsModeShortcut?: boolean;
328
+ /** Extra tooltip text naming what else the menu holds. */
329
+ extraMenuHint?: string;
330
}
331
332
export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
@@ -506,6 +511,24 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
511
);
512
});
513
514
+/** One bolt for Fast. Ultrafast adds an outlined echo behind it, cut away by the surface color. */
515
+function FastBolt(props: { ultra: boolean }) {
516
+ if (!props.ultra) {
517
+ return (
518
+ <ZapIcon aria-hidden="true" data-composer-control-icon className="size-3 fill-current" />
519
+ );
520
+ }
521
+ return (
522
+ <span aria-hidden="true" className="relative h-3 w-3.75 shrink-0">
523
+ <ZapIcon className="absolute top-0 left-0.75 size-3" />
524
+ <ZapIcon
525
+ strokeWidth={4}
526
+ className="absolute top-0 left-0 size-3 fill-current stroke-(--chat-composer-glass-surface) [paint-order:stroke]"
527
+ />
528
+ </span>
529
+ );
530
+}
531
+
532
export const TraitsPicker = memo(function TraitsPicker({
533
provider,
534
instanceId,
@@ -519,6 +542,10 @@ export const TraitsPicker = memo(function TraitsPicker({
542
planModeEnabled,
543
triggerClassName,
544
isComposerOwned,
545
+ effortDisplay = "label",
546
+ extraMenuContent,
547
+ extraMenuOwnsModeShortcut,
548
+ extraMenuHint,
549
size = "sm",
550
hidden = false,
551
disabled = false,
@@ -531,6 +558,7 @@ export const TraitsPicker = memo(function TraitsPicker({
558
}) {
559
const composerFloatingLayerProps = useComposerMenuProps();
560
const [isMenuOpen, setIsMenuOpen] = useComposerMenuState(hidden || disabled);
561
+ const triggerRef = useRef<HTMLButtonElement>(null);
562
const { descriptors, primarySelectDescriptor, ultrathinkPromptControlled } =
563
getTraitsSectionVisibility({
564
provider,
@@ -555,7 +583,11 @@ export const TraitsPicker = memo(function TraitsPicker({
583
return null;
584
}
585
558
- const { label: triggerLabel } = buildTraitsTriggerDisplay({
586
+ const {
587
+ label: triggerLabel,
588
+ speedLabel,
589
+ otherLabels,
590
+ } = buildTraitsTriggerDisplay({
591
provider,
592
descriptors,
593
primarySelectDescriptorId: primarySelectDescriptor?.id ?? null,
@@ -564,6 +596,29 @@ export const TraitsPicker = memo(function TraitsPicker({
596
reportedModelSelection,
597
});
598
const isCodexStyle = provider === "codex";
599
+ // In the composer the glyph has no word, so the tooltip and label name the control.
600
+ const triggerDescription = isComposerOwned
601
+ ? [`Effort: ${triggerLabel}`, speedLabel, extraMenuHint].filter(Boolean).join(" · ")
602
+ : triggerLabel;
603
+ const effortGlyph =
604
+ isComposerOwned &&
605
+ primarySelectDescriptor &&
606
+ REASONING_SELECT_DESCRIPTOR_IDS.has(primarySelectDescriptor.id)
607
+ ? resolveEffortGlyph(
608
+ primarySelectDescriptor,
609
+ ultrathinkPromptControlled
610
+ ? "ultrathink"
611
+ : getDescriptorStringValue(
612
+ primarySelectDescriptor,
613
+ instanceId && model ? { instanceId, model, options: modelOptions ?? [] } : null,
614
+ reportedModelSelection,
615
+ ),
616
+ )
617
+ : null;
618
+ // Workflow levels such as Ultracode always show their name; the setting names every level.
619
+ const effortWord = effortGlyph
620
+ ? (effortGlyph.special ?? (effortDisplay === "label" ? effortGlyph.label : null))
621
+ : null;
622
623
return (
624
<Menu
@@ -571,6 +626,7 @@ export const TraitsPicker = memo(function TraitsPicker({
626
onOpenChange={(open) => {
627
setIsMenuOpen(open && !disabled);
628
}}
629
+ onOpenChangeComplete={(open) => focusRequestedPermission(open, triggerRef.current)}
630
>
631
<Tooltip>
632
<TooltipTrigger
@@ -578,22 +634,70 @@ export const TraitsPicker = memo(function TraitsPicker({
634
<MenuTrigger
635
render={
636
<ComposerControl
637
+ ref={triggerRef}
638
disabled={disabled}
582
- aria-label={triggerLabel}
583
- data-composer-shortcut={isComposerOwned ? "composer.effort" : undefined}
639
+ aria-label={triggerDescription}
640
+ data-composer-shortcut={
641
+ isComposerOwned
642
+ ? extraMenuOwnsModeShortcut
643
+ ? "composer.effort composer.mode"
644
+ : "composer.effort"
645
+ : undefined
646
+ }
647
size={size}
648
className={cn(
649
isCodexStyle
650
? "min-w-0 max-w-40 shrink justify-start overflow-hidden whitespace-nowrap sm:max-w-48"
651
: "shrink-0 whitespace-nowrap",
652
triggerClassName,
653
+ // Effort reads on from the model name, "Opus 5.5 High", at about the space
654
+ // inside the name: this cancels the model chip's end padding and the row gap.
655
+ isComposerOwned && (effortWord !== null ? "-ms-1 ps-0" : "-ms-1 ps-0.5"),
656
+ // The word is muted next to the model name and brightens like it on hover.
657
+ effortWord !== null &&
658
+ "text-muted-foreground hover:text-foreground data-pressed:text-foreground data-popup-open:text-foreground",
659
)}
660
/>
661
}
662
/>
663
}
664
>
596
- {isCodexStyle ? (
665
+ {effortGlyph ? (
666
+ <span className="flex items-center gap-1.5">
667
+ {effortWord === null ? (
668
+ <EffortGlyph count={effortGlyph.count} filled={effortGlyph.filled} size={size} />
669
+ ) : null}
670
+ {effortWord !== null ? (
671
+ <>
672
+ <span data-composer-control-label>{effortWord}</span>
673
+ {/* Icon-only footers hide labels and reveal this instead. */}
674
+ <GaugeIcon
675
+ aria-hidden="true"
676
+ data-composer-control-compact-icon
677
+ className="invisible absolute size-3.5"
678
+ />
679
+ </>
680
+ ) : (
681
+ <span data-composer-control-label className="sr-only">
682
+ {triggerLabel}
683
+ </span>
684
+ )}
685
+ {speedLabel === "Fast" || speedLabel === "Ultrafast" ? (
686
+ <FastBolt ultra={speedLabel === "Ultrafast"} />
687
+ ) : null}
688
+ {otherLabels.length > 0 ? (
689
+ <span
690
+ aria-hidden="true"
691
+ // A label, so icon-only footers drop it; compacted rows drop it before the model.
692
+ data-composer-control-label
693
+ data-composer-secondary-trait
694
+ className="max-w-24 truncate text-xs"
695
+ >
696
+ {otherLabels.join(" · ")}
697
+ </span>
698
+ ) : null}
699
+ </span>
700
+ ) : isCodexStyle ? (
701
<span
702
className={cn(
703
"flex min-w-0 w-full items-center",
@@ -604,17 +708,15 @@ export const TraitsPicker = memo(function TraitsPicker({
708
<span data-composer-control-label className="min-w-0 truncate">
709
{triggerLabel}
710
</span>
607
- <ComposerControlChevron size={size} />
711
</span>
712
) : (
713
<>
714
<ComposerControlIcon icon={GaugeIcon} size={size} />
715
<span data-composer-control-label>{triggerLabel}</span>
613
- <ComposerControlChevron size={size} />
716
</>
717
)}
718
</TooltipTrigger>
617
- <TooltipPopup side="top">{triggerLabel}</TooltipPopup>
719
+ <TooltipPopup side="top">{triggerDescription}</TooltipPopup>
720
</Tooltip>
721
<MenuPopup align="start" {...(isComposerOwned ? composerFloatingLayerProps : {})}>
722
<TraitsMenuContent
@@ -630,6 +732,12 @@ export const TraitsPicker = memo(function TraitsPicker({
732
planModeEnabled={planModeEnabled}
733
{...persistence}
734
/>
735
+ {extraMenuContent ? (
736
+ <>
737
+ <MenuDivider />
738
+ {extraMenuContent}
739
+ </>
740
+ ) : null}
741
</MenuPopup>
742
</Menu>
743
);
apps/web/src/components/chat/composerControlsOwnership.test.ts
new
+90
@@ -0,0 +1,90 @@
1
+import { describe, expect, it } from "vite-plus/test";
2
+
3
+import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
4
+
5
+const base = {
6
+ matchesDefault: true,
7
+ hasTraits: true,
8
+ planModeUiEnabled: false,
9
+ collapsed: false,
10
+ measuredHiddenBlockCount: 0,
11
+};
12
+
13
+describe("resolveComposerControlsOwnership", () => {
14
+ it("hides the chip at the default and lets the effort menu answer composer.mode", () => {
15
+ const result = resolveComposerControlsOwnership(base);
16
+ expect(result).toMatchObject({
17
+ accessDisplay: "hidden",
18
+ showModeBlock: false,
19
+ hiddenBlockIds: [],
20
+ effortOwnsModeShortcut: true,
21
+ });
22
+ });
23
+
24
+ it("shows a labelled chip that owns composer.mode when the mode differs", () => {
25
+ const result = resolveComposerControlsOwnership({ ...base, matchesDefault: false });
26
+ expect(result).toMatchObject({
27
+ accessDisplay: "label",
28
+ showModeBlock: true,
29
+ effortOwnsModeShortcut: false,
30
+ });
31
+ });
32
+
33
+ it("never leaves an empty overflow menu: the effort chip overflows with the chip", () => {
34
+ const result = resolveComposerControlsOwnership({
35
+ ...base,
36
+ matchesDefault: false,
37
+ measuredHiddenBlockCount: 1,
38
+ });
39
+ expect(result.hiddenBlockIds).toEqual(["traits", "mode"]);
40
+ expect(result.overflowShowsPermissions).toBe(true);
41
+ // One composer.mode target: the overflow menu, not the overflowed effort chip.
42
+ expect(result.effortOwnsModeShortcut).toBe(false);
43
+ });
44
+
45
+ it("keeps the Plan toggle block at the default and overflows it before the effort chip", () => {
46
+ const result = resolveComposerControlsOwnership({
47
+ ...base,
48
+ planModeUiEnabled: true,
49
+ measuredHiddenBlockCount: 1,
50
+ });
51
+ expect(result.showModeBlock).toBe(true);
52
+ expect(result.hiddenBlockIds).toEqual(["mode"]);
53
+ expect(result.overflowShowsPermissions).toBe(false);
54
+ expect(result.effortOwnsModeShortcut).toBe(true);
55
+ });
56
+
57
+ it("overflows only the chip when the Plan toggle gives the overflow menu content", () => {
58
+ const result = resolveComposerControlsOwnership({
59
+ ...base,
60
+ matchesDefault: false,
61
+ planModeUiEnabled: true,
62
+ measuredHiddenBlockCount: 1,
63
+ });
64
+ expect(result.hiddenBlockIds).toEqual(["mode"]);
65
+ // Permissions stay in the visible effort menu, which now answers composer.mode.
66
+ expect(result.overflowShowsPermissions).toBe(false);
67
+ expect(result.effortOwnsModeShortcut).toBe(true);
68
+ });
69
+
70
+ it("keeps a permissions icon for models without traits, even at the default", () => {
71
+ const result = resolveComposerControlsOwnership({ ...base, hasTraits: false });
72
+ expect(result.accessDisplay).toBe("icon");
73
+ const overflowed = resolveComposerControlsOwnership({
74
+ ...base,
75
+ hasTraits: false,
76
+ measuredHiddenBlockCount: 1,
77
+ });
78
+ expect(overflowed.hiddenBlockIds).toEqual(["mode"]);
79
+ expect(overflowed.overflowShowsPermissions).toBe(true);
80
+ });
81
+
82
+ it("shows the non-default chip as an icon in the compacted row", () => {
83
+ const result = resolveComposerControlsOwnership({
84
+ ...base,
85
+ matchesDefault: false,
86
+ collapsed: true,
87
+ });
88
+ expect(result.accessDisplay).toBe("icon");
89
+ });
90
+});
apps/web/src/components/chat/composerControlsOwnership.ts
new
+63
@@ -0,0 +1,63 @@
1
+/**
2
+ * Where the permissions control lives, which blocks overflow, and which menu answers the
3
+ * composer.mode shortcut. Blocks are ordered [traits, mode]; the last block overflows first.
4
+ * The rule: Permissions have exactly one visible home and composer.mode exactly one target.
5
+ */
6
+export function resolveComposerControlsOwnership(input: {
7
+ /** Permissions hide while the mode is the default, or while the new-thread strip names it. */
8
+ readonly matchesDefault: boolean;
9
+ /** The model has an effort (traits) menu, which then always holds Permissions. */
10
+ readonly hasTraits: boolean;
11
+ readonly planModeUiEnabled: boolean;
12
+ readonly collapsed: boolean;
13
+ /** How many trailing blocks the width measurement moved into the overflow menu. */
14
+ readonly measuredHiddenBlockCount: number;
15
+}) {
16
+ const accessDisplay = !input.matchesDefault
17
+ ? input.collapsed
18
+ ? ("icon" as const)
19
+ : ("label" as const)
20
+ : // Without traits there is no effort menu to hold Permissions, so keep an icon.
21
+ input.hasTraits
22
+ ? ("hidden" as const)
23
+ : ("icon" as const);
24
+ const showModeBlock = !(accessDisplay === "hidden" && !input.planModeUiEnabled);
25
+ const blockIds = [
26
+ ...(input.hasTraits ? ["traits" as const] : []),
27
+ ...(showModeBlock ? ["mode" as const] : []),
28
+ ];
29
+ const hiddenFor = (count: number) => blockIds.slice(blockIds.length - count);
30
+ const overflowShowsPermissionsFor = (hidden: ReadonlyArray<string>) =>
31
+ hidden.includes(input.hasTraits ? "traits" : "mode");
32
+ const overflowHasContent = (hidden: ReadonlyArray<string>) =>
33
+ hidden.includes("traits") ||
34
+ (input.planModeUiEnabled && hidden.includes("mode")) ||
35
+ overflowShowsPermissionsFor(hidden);
36
+
37
+ let hiddenBlockCount = Math.min(input.measuredHiddenBlockCount, blockIds.length);
38
+ // An overflow menu with nothing in it must not exist: overflow one more block instead.
39
+ while (
40
+ hiddenBlockCount > 0 &&
41
+ hiddenBlockCount < blockIds.length &&
42
+ !overflowHasContent(hiddenFor(hiddenBlockCount))
43
+ ) {
44
+ hiddenBlockCount += 1;
45
+ }
46
+ const hiddenBlockIds = hiddenFor(hiddenBlockCount);
47
+ const modeHidden = hiddenBlockIds.includes("mode");
48
+ const traitsHidden = hiddenBlockIds.includes("traits");
49
+ return {
50
+ accessDisplay,
51
+ showModeBlock,
52
+ hiddenBlockCount,
53
+ hiddenBlockIds,
54
+ traitsHidden,
55
+ modeHidden,
56
+ /**
57
+ * The effort chip answers composer.mode while the chip is hidden or overflowed, until the
58
+ * effort chip overflows too; then the overflow menu (which holds Permissions) answers it.
59
+ */
60
+ effortOwnsModeShortcut: (input.matchesDefault || modeHidden) && !traitsHidden,
61
+ overflowShowsPermissions: overflowShowsPermissionsFor(hiddenBlockIds),
62
+ };
63
+}
apps/web/src/components/chat/composerEventScope.ts
+19
@@ -47,3 +47,22 @@ export function isInsideRestingComposerControlScope(target: EventTarget | null):
47
isInsideComposerFloatingLayer(target))
48
);
49
}
50
+
51
+/**
52
+ * composer.mode marks the trigger it opens; the menu's onOpenChangeComplete then moves focus
53
+ * to the checked permission in that menu's own popup, after the menu placed its own focus.
54
+ */
55
+export function markOpenToPermissions(trigger: HTMLElement): void {
56
+ trigger.dataset.openToPermissions = "true";
57
+}
58
+
59
+export function focusRequestedPermission(open: boolean, trigger: HTMLElement | null): void {
60
+ if (!trigger?.dataset.openToPermissions) return;
61
+ delete trigger.dataset.openToPermissions;
62
+ if (!open) return;
63
+ const popupId = trigger.getAttribute("aria-controls");
64
+ const popup = popupId ? document.getElementById(popupId) : null;
65
+ popup
66
+ ?.querySelector<HTMLElement>("[data-composer-permissions] [aria-checked='true']")
67
+ ?.focus({ preventScroll: true });
68
+}
apps/web/src/components/chat/composerProviderState.tsx
+13
@@ -7,6 +7,7 @@ import {
7
type ScopedThreadRef,
8
type ServerProviderModel,
9
} from "@t3tools/contracts";
10
+import type { EffortDisplay } from "@t3tools/contracts/settings";
11
import {
12
buildExplicitProviderOptionSelectionsFromDescriptors,
13
getProviderOptionCurrentValue,
@@ -63,6 +64,10 @@ type TraitsRenderInput = {
64
hidden?: boolean;
65
triggerClassName?: string;
66
isComposerOwned?: boolean;
67
+ effortDisplay?: EffortDisplay;
68
+ extraMenuContent?: ReactNode;
69
+ extraMenuOwnsModeShortcut?: boolean;
70
+ extraMenuHint?: string;
71
};
72
73
export function getComposerPromptInjectionState(prompt: string): ComposerPromptInjectionState {
@@ -232,6 +237,10 @@ function renderTraitsControl(
237
hidden,
238
triggerClassName,
239
isComposerOwned,
240
+ effortDisplay,
241
+ extraMenuContent,
242
+ extraMenuOwnsModeShortcut,
243
+ extraMenuHint,
244
} = input;
245
const hasTarget = threadRef !== undefined || draftId !== undefined;
246
const { selections: resolvedModelOptions } = resolveComposerOptionSelections(
@@ -271,6 +280,10 @@ function renderTraitsControl(
280
{...(hidden !== undefined ? { hidden } : {})}
281
{...(triggerClassName !== undefined ? { triggerClassName } : {})}
282
{...(isComposerOwned ? { isComposerOwned } : {})}
283
+ {...(effortDisplay ? { effortDisplay } : {})}
284
+ {...(extraMenuContent ? { extraMenuContent } : {})}
285
+ {...(extraMenuOwnsModeShortcut ? { extraMenuOwnsModeShortcut } : {})}
286
+ {...(extraMenuHint ? { extraMenuHint } : {})}
287
/>
288
);
289
}
apps/web/src/components/chat/composerScrollGesture.ts
deleted
-79
@@ -1,79 +0,0 @@
1
-type ComposerScrollGestureState = {
2
- accumulatedDeltaPx: number;
3
- collapseSuppressed: boolean;
4
- lastEventAt: number;
5
-};
6
-
7
-export function shouldCollapseComposerForScrollKey(input: {
8
- key: string;
9
- scrollTop: number;
10
- scrollHeight: number;
11
- clientHeight: number;
12
- isAtLogicalEnd: boolean;
13
-}): boolean {
14
- switch (input.key) {
15
- case "PageUp":
16
- case "Home":
17
- return input.scrollTop > 1;
18
- case "PageDown":
19
- case "End":
20
- return !input.isAtLogicalEnd && input.scrollTop < input.scrollHeight - input.clientHeight - 1;
21
- default:
22
- return false;
23
- }
24
-}
25
-
26
-export function createComposerScrollGestureState(): ComposerScrollGestureState {
27
- return {
28
- accumulatedDeltaPx: 0,
29
- collapseSuppressed: false,
30
- lastEventAt: Number.NEGATIVE_INFINITY,
31
- };
32
-}
33
-
34
-export function resetComposerScrollGesture(state: ComposerScrollGestureState): void {
35
- state.accumulatedDeltaPx = 0;
36
- state.collapseSuppressed = false;
37
- state.lastEventAt = Number.NEGATIVE_INFINITY;
38
-}
39
-
40
-export function suppressActiveComposerScrollGesture(
41
- state: ComposerScrollGestureState,
42
- now: number,
43
- gestureResetMs: number,
44
-): void {
45
- if (now - state.lastEventAt <= gestureResetMs) {
46
- state.collapseSuppressed = true;
47
- }
48
-}
49
-
50
-export function recordComposerScrollGestureEvent(
51
- state: ComposerScrollGestureState,
52
- input: {
53
- now: number;
54
- deltaPx: number;
55
- collapseThresholdPx: number;
56
- collapseEligible: boolean;
57
- canScrollInGestureDirection: boolean;
58
- scrollsTowardLogicalEnd: boolean;
59
- },
60
-): boolean {
61
- state.lastEventAt = input.now;
62
- if (
63
- state.collapseSuppressed ||
64
- !input.collapseEligible ||
65
- !input.canScrollInGestureDirection ||
66
- input.scrollsTowardLogicalEnd
67
- ) {
68
- state.accumulatedDeltaPx = 0;
69
- return false;
70
- }
71
-
72
- state.accumulatedDeltaPx += input.deltaPx;
73
- if (state.accumulatedDeltaPx < input.collapseThresholdPx) {
74
- return false;
75
- }
76
-
77
- state.accumulatedDeltaPx = 0;
78
- return true;
79
-}
apps/web/src/components/chat/runtimeModeConfig.ts
+15
-2
@@ -1,5 +1,5 @@
1
import type { RuntimeMode } from "@t3tools/contracts";
2
-import { type LucideIcon, LockIcon, LockOpenIcon, PenLineIcon, SparklesIcon } from "lucide-react";
2
+import { type LucideIcon, LockIcon, PenLineIcon, ShieldOffIcon, SparklesIcon } from "lucide-react";
3
4
export const runtimeModeConfig: Record<
5
RuntimeMode,
@@ -23,8 +23,21 @@ export const runtimeModeConfig: Record<
23
"full-access": {
24
label: "Full access",
25
description: "Allow commands and edits without prompts.",
26
- icon: LockOpenIcon,
26
+ // An open lock reads like a closed one at small sizes; a crossed shield does not.
27
+ icon: ShieldOffIcon,
28
},
29
};
30
31
export const runtimeModeOptions = Object.keys(runtimeModeConfig) as RuntimeMode[];
32
+
33
+/** The modes a provider supports (all when it reports none) and the mode a thread really runs in. */
34
+export function resolveCompatibleRuntimeMode(
35
+ runtimeMode: RuntimeMode,
36
+ supportedRuntimeModes: ReadonlyArray<RuntimeMode> | undefined,
37
+) {
38
+ const modes =
39
+ supportedRuntimeModes && supportedRuntimeModes.length > 0
40
+ ? runtimeModeOptions.filter((mode) => supportedRuntimeModes.includes(mode))
41
+ : runtimeModeOptions;
42
+ return { modes, mode: modes.includes(runtimeMode) ? runtimeMode : (modes[0] ?? runtimeMode) };
43
+}
apps/web/src/components/chat/timelineScrollTarget.test.ts
-24
@@ -1,9 +1,5 @@
1
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
2
3
-import {
4
- createComposerScrollGestureState,
5
- recordComposerScrollGestureEvent,
6
-} from "./composerScrollGesture";
3
import { createUpwardScrollDetector, isTimelineScrollTarget } from "./timelineScrollTarget";
4
5
class ScrollElement extends EventTarget {
@@ -65,26 +61,6 @@ describe("timeline scroll targets", () => {
61
expect(targetsTimeline(content, timeline, deltaY)).toBe(true);
62
expect(targetsTimeline(content, timeline, -deltaY)).toBe(false);
63
});
68
-
69
- it("does not accumulate nested scrolling toward composer collapse", () => {
70
- const { timeline, group, content } = setup();
71
- const state = createComposerScrollGestureState();
72
- const record = (target: ScrollElement, now: number, deltaPx: number) =>
73
- recordComposerScrollGestureEvent(state, {
74
- now,
75
- deltaPx,
76
- collapseThresholdPx: 24,
77
- collapseEligible: targetsTimeline(target, timeline, -deltaPx),
78
- canScrollInGestureDirection: timeline.scrollTop > 0,
79
- scrollsTowardLogicalEnd: false,
80
- });
81
-
82
- expect(record(timeline, 0, 20)).toBe(false);
83
- expect(record(content, 20, 30)).toBe(false);
84
- group.scrollTop = 0;
85
- expect(record(content, 40, 10)).toBe(false);
86
- expect(record(content, 60, 14)).toBe(true);
87
- });
64
});
65
66
describe("timeline scroll follow opt-out", () => {
apps/web/src/components/chat/useComposerFocusState.ts
deleted
-18
@@ -1,18 +0,0 @@
1
-import { useState } from "react";
2
-
3
-export function useComposerFocusState() {
4
- const [isComposerFocused, setIsComposerFocused] = useState(false);
5
- const [isComposerScrollCollapsed, setIsComposerScrollCollapsed] = useState(false);
6
-
7
- const restoreAfterTimelineReachedEnd = () => {
8
- setIsComposerScrollCollapsed(false);
9
- };
10
-
11
- return {
12
- isComposerFocused,
13
- setIsComposerFocused,
14
- isComposerScrollCollapsed,
15
- setIsComposerScrollCollapsed,
16
- restoreAfterTimelineReachedEnd,
17
- };
18
-}
apps/web/src/components/chat/useComposerRestingTransition.ts
+5
-76
@@ -8,7 +8,6 @@ const COMPOSER_RESTING_CONTROLS_ARRIVAL_DRIFT_PX = 4;
8
9
export function useComposerRestingTransition(
10
isCollapsed: boolean,
11
- isResting: boolean,
11
restingControlsRef: React.RefObject<HTMLDivElement | null>,
12
onOverlayHeightChange: (height: number) => void,
13
animationsActive: boolean,
@@ -17,9 +16,7 @@ export function useComposerRestingTransition(
16
const elementRef = useRef<HTMLDivElement>(null);
17
const isCollapsedRef = useRef(isCollapsed);
18
const previousCollapsedRef = useRef(isCollapsed);
20
- const previousRestingRef = useRef(isResting);
19
const previousHeightRef = useRef<number | null>(null);
22
- const previousModelStripHeightRef = useRef<number | null>(null);
20
const previousContentOffsetsRef = useRef<{
21
promptFromTop: number | null;
22
promptHeight: number | null;
@@ -60,8 +57,6 @@ export function useComposerRestingTransition(
57
const element = elementRef.current;
58
const footer = element?.querySelector<HTMLElement>('[data-chat-composer-footer="true"]');
59
element?.style.removeProperty("overflow");
63
- element?.style.removeProperty("clip-path");
64
- element?.style.removeProperty("overflow-clip-margin");
60
element
61
?.querySelector<HTMLElement>('[data-chat-composer-surface="true"]')
62
?.style.removeProperty("height");
@@ -71,22 +66,6 @@ export function useComposerRestingTransition(
66
footer?.style.removeProperty("left");
67
footer?.style.removeProperty("right");
68
footer?.style.removeProperty("height");
74
- const shell = element?.closest<HTMLElement>('[data-slot="composer-shell"]');
75
- shell?.removeAttribute("data-model-strip-transition");
76
- const modelStrip = shell?.querySelector<HTMLElement>('[data-composer-model-strip="true"]');
77
- for (const property of [
78
- "position",
79
- "top",
80
- "visibility",
81
- "height",
82
- "min-height",
83
- "padding-top",
84
- "align-items",
85
- "z-index",
86
- "pointer-events",
87
- ]) {
88
- modelStrip?.style.removeProperty(property);
89
- }
69
clearOverlayPin();
70
};
71
@@ -111,16 +90,11 @@ export function useComposerRestingTransition(
90
);
91
const action = visibleTransitionElement('[data-chat-composer-transition-actions="true"]');
92
const footer = element.querySelector<HTMLElement>('[data-chat-composer-footer="true"]');
114
- const continuousControls =
115
- element.dataset.inlineRestingControls === "true" || element.dataset.modelOnlyStrip === "true";
93
+ const continuousControls = element.dataset.inlineRestingControls === "true";
94
const controls = nextIsCollapsed
95
? restingControlsRef.current
118
- : element.querySelector<HTMLElement>('[data-chat-composer-controls="left"]');
96
+ : element.querySelector<HTMLElement>('[data-chat-composer-controls="footer"]');
97
120
- const shell = element.closest<HTMLElement>('[data-slot="composer-shell"]');
121
- const modelStrip = shell?.querySelector<HTMLElement>('[data-composer-model-strip="true"]');
122
- const interruptedStripHeight =
123
- animationRef.current && modelStrip ? modelStrip.getBoundingClientRect().height : null;
98
const interruptedAnimation = animationRef.current;
99
const interruptedPromptTop = interruptedAnimation
100
? (prompt?.getBoundingClientRect().top ?? null)
@@ -157,7 +131,6 @@ export function useComposerRestingTransition(
131
132
const nextRect = element.getBoundingClientRect();
133
const nextHeight = nextRect.height;
160
- const nextModelStripHeight = modelStrip?.getBoundingClientRect().height ?? null;
134
// The chat view resize-observes the overlay to place the timeline
135
// inset, the scroll-to-end pill, and the mini player. Publishing the
136
// destination height here turns that feedback into one update instead
@@ -196,14 +169,6 @@ export function useComposerRestingTransition(
169
const duration =
170
interruptedHeight !== null && !targetChanged ? remainingDuration : animationDurationMs;
171
element.style.overflow = "clip";
199
- if (modelStrip) {
200
- const controlsClearance = Math.max(
201
- nextModelStripHeight ?? 0,
202
- previousModelStripHeightRef.current ?? 0,
203
- );
204
- element.style.overflowClipMargin = `${controlsClearance}px`;
205
- element.style.clipPath = `inset(0 0 -${controlsClearance}px 0)`;
206
- }
172
surface.style.height = "100%";
173
174
if (overlay && overlayHeight !== null) {
@@ -228,31 +193,6 @@ export function useComposerRestingTransition(
193
}
194
}
195
231
- let stripAnimation: Animation | null = null;
232
- if (modelStrip) {
233
- const stripHeight = modelStrip.getBoundingClientRect().height;
234
- const stripOverlap = -Number.parseFloat(getComputedStyle(modelStrip).marginTop);
235
- const fromHeight =
236
- interruptedStripHeight ??
237
- (previousCollapsedRef.current
238
- ? (previousModelStripHeightRef.current ?? stripHeight)
239
- : stripOverlap);
240
- const toHeight = nextIsCollapsed ? stripHeight : stripOverlap;
241
- modelStrip.style.position = "relative";
242
- modelStrip.style.top = "auto";
243
- modelStrip.style.visibility = "visible";
244
- modelStrip.style.minHeight = "0";
245
- modelStrip.style.paddingTop = "0";
246
- modelStrip.style.alignItems = "flex-end";
247
- modelStrip.style.pointerEvents = "none";
248
- modelStrip.style.zIndex = "20";
249
- shell?.setAttribute("data-model-strip-transition", "true");
250
- stripAnimation = modelStrip.animate(
251
- [{ height: `${fromHeight}px` }, { height: `${toHeight}px` }],
252
- { duration, easing: COMPOSER_RESTING_TRANSITION_EASING, fill: "both" },
253
- );
254
- }
255
-
196
const animation = element.animate(
197
[{ height: `${previousHeight}px` }, { height: `${nextHeight}px` }],
198
{
@@ -280,7 +220,7 @@ export function useComposerRestingTransition(
220
(previousContentOffsetsRef.current.actionFromBottom === null
221
? null
222
: previousBottom - previousContentOffsetsRef.current.actionFromBottom);
283
- const contentAnimations: Animation[] = stripAnimation ? [stripAnimation] : [];
223
+ const contentAnimations: Animation[] = [];
224
const animateContentPosition = (
225
content: HTMLElement | null,
226
previousTop: number | null,
@@ -346,7 +286,7 @@ export function useComposerRestingTransition(
286
287
const arrivingControls = nextIsCollapsed
288
? restingControlsRef.current
349
- : element.querySelector<HTMLElement>('[data-chat-composer-controls="left"]');
289
+ : element.querySelector<HTMLElement>('[data-chat-composer-controls="footer"]');
290
if (arrivingControls && !continuousControls) {
291
const drift = nextIsCollapsed
292
? -COMPOSER_RESTING_CONTROLS_ARRIVAL_DRIFT_PX
@@ -407,7 +347,6 @@ export function useComposerRestingTransition(
347
contentAnimationsRef.current = [];
348
stateChangeAnimationsRef.current = [];
349
animation.cancel();
410
- stripAnimation?.cancel();
350
clearTransitionStyles();
351
};
352
void animation.finished.catch(() => undefined).then(() => finishTransition(false));
@@ -424,7 +363,6 @@ export function useComposerRestingTransition(
363
364
previousCollapsedRef.current = nextIsCollapsed;
365
previousHeightRef.current = nextHeight;
427
- previousModelStripHeightRef.current = nextModelStripHeight;
366
previousContentOffsetsRef.current = {
367
promptFromTop: nextPromptTop === null ? null : nextPromptTop - nextRect.top,
368
promptHeight: nextPromptRect?.height ?? null,
@@ -454,15 +392,6 @@ export function useComposerRestingTransition(
392
};
393
}, [isCollapsed, transitionToCurrentGeometry]);
394
457
- // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- measures the committed overlay element and reports its height when the resting state changes
458
- useLayoutEffect(() => {
459
- if (previousRestingRef.current === isResting) return;
460
- previousRestingRef.current = isResting;
461
- if (animationRef.current) return;
462
- const overlay = elementRef.current?.closest<HTMLElement>('[data-chat-composer-overlay="true"]');
463
- if (overlay) onOverlayHeightChange(overlay.getBoundingClientRect().height);
464
- }, [isResting, onOverlayHeightChange]);
465
-
395
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes composer and body resize to record geometry and retarget a running animation
396
useLayoutEffect(() => {
397
const element = elementRef.current;
@@ -490,7 +419,7 @@ export function useComposerRestingTransition(
419
const controlsRect = (
420
isCollapsedRef.current
421
? restingControlsRef.current
493
- : visibleTransitionElement('[data-chat-composer-controls="left"]')
422
+ : visibleTransitionElement('[data-chat-composer-controls="footer"]')
423
)?.getBoundingClientRect();
424
previousHeightRef.current = elementRect.height;
425
previousContentOffsetsRef.current = {
apps/web/src/components/chat/useTimelineFollow.ts
-35
@@ -17,7 +17,6 @@ import {
17
observeTimelineRun,
18
type TimelineRunObservation,
19
} from "./timelineScrollAnchoring";
20
-import { type ChatComposerHandle } from "./ChatComposer";
20
import { createPageScrollController, type PageScrollKey } from "./pageScrollController";
21
import {
22
FOLLOWING,
@@ -65,7 +64,6 @@ function createVisitScrollState(
64
) {
65
return {
66
visit,
68
- intent: null as "toward-end" | "away-from-end" | null,
67
// Debounce *showing* the scroll-to-bottom pill so it doesn't flash during
68
// thread switches. LegendList fires scroll events with isAtEnd=false while
69
// initialScrollAtEnd is settling; hiding is always immediate.
@@ -148,7 +146,6 @@ function sameRunObservation(
146
147
interface TimelineFollowInput {
148
readonly legendListRef: RefObject<LegendListRef | null>;
151
- readonly composerRef: RefObject<ChatComposerHandle | null>;
149
readonly composerTimelineInset: number;
150
readonly routeThreadKey: string;
151
readonly activeThreadKey: string | null;
@@ -171,7 +168,6 @@ interface TimelineFollowInput {
168
export function useTimelineFollow(input: TimelineFollowInput) {
169
const {
170
legendListRef,
174
- composerRef,
171
composerTimelineInset,
172
routeThreadKey,
173
activeThreadKey,
@@ -223,7 +219,6 @@ export function useTimelineFollow(input: TimelineFollowInput) {
219
(current.mode === "following" || current.atEnd)
220
);
221
};
226
- const isTimelineAtLogicalEndStable = useStableCallback(isTimelineAtLogicalEnd);
222
const visitScrollRef = useRef<VisitScrollState | null>(null);
223
/** Only from handlers: the bookkeeping of the visit they run in. */
224
const visitScroll = () => {
@@ -310,8 +305,6 @@ export function useTimelineFollow(input: TimelineFollowInput) {
305
null,
306
);
307
const handlePageScrollStart = useStableCallback((key: PageScrollKey) => {
313
- visitScroll().intent = key === "PageUp" ? "away-from-end" : "toward-end";
314
- composerRef.current?.collapseForTimelineScrollKey(key);
308
if ((key === "PageUp" && timelineRealContentOverflowsViewport()) || !isTimelineAtLogicalEnd()) {
309
// Through the viewport, so a running position restore stops too.
310
viewportRef.current?.navigate({ releasesFollow: true });
@@ -366,31 +359,12 @@ export function useTimelineFollow(input: TimelineFollowInput) {
359
}, [composerTimelineInset, readCurrentFollow, scrollToEndStable]);
360
361
const handleNavigation = (navigation: TimelineNavigation) => {
369
- const composer = composerRef.current;
362
const awayFromEnd = () => resolveTimelineIsAtEnd(legendListRef.current?.getState()) === false;
363
const releases = navigationReleasesFollow(navigation, {
364
contentScrollsUp: timelineRealContentOverflowsViewport,
365
awayFromEnd,
366
});
375
- if (navigation.source === "wheel") {
376
- visitScroll().intent = navigation.direction === "down" ? "toward-end" : "away-from-end";
377
- const current = readFollow();
378
- if (navigation.direction === "down" && (current.mode === "following" || current.atEnd)) {
379
- composer?.restoreAfterTimelineReachedEnd();
380
- }
381
- }
382
- if (navigation.source === "key") {
383
- visitScroll().intent = navigation.direction === "down" ? "toward-end" : "away-from-end";
384
- }
367
if (releases) releaseFollowForNavigation();
386
- if (navigation.source === "key" && navigation.key !== " ") {
387
- if (navigation.direction === "up") {
388
- if (releases) composer?.collapseForTimelineScrollKey(navigation.key);
389
- } else {
390
- composer?.collapseForTimelineScrollKey(navigation.key);
391
- if (isTimelineAtLogicalEnd()) composer?.restoreAfterTimelineReachedEnd();
392
- }
393
- }
368
};
369
const handleNavigationStable = useStableCallback(handleNavigation);
370
/**
@@ -506,10 +480,6 @@ export function useTimelineFollow(input: TimelineFollowInput) {
480
};
481
const onTimelineAnchorSizeChangedStable = useStableCallback(onTimelineAnchorSizeChanged);
482
509
- const onToolOutputCollapsedAtEnd = () => {
510
- composerRef.current?.restoreAfterTimelineReachedEnd();
511
- };
512
- const onToolOutputCollapsedAtEndStable = useStableCallback(onToolOutputCollapsedAtEnd);
483
// The list ignores footer layout, so a new queued turn or status line there would land
484
// under the composer. Follow it when the reader was following the end.
485
const onTimelineFooterGrow = () => {
@@ -529,9 +499,6 @@ export function useTimelineFollow(input: TimelineFollowInput) {
499
});
500
if (after === before) return;
501
if (after.mode === "following") {
532
- if (scroll.intent === "toward-end") {
533
- composerRef.current?.restoreAfterTimelineReachedEnd();
534
- }
502
setTimelineAnchor(releaseChatTimelineAnchor);
503
scroll.showScrollDebouncer.cancel();
504
setShowScrollToBottom(false);
@@ -586,14 +553,12 @@ export function useTimelineFollow(input: TimelineFollowInput) {
553
return {
554
showScrollToBottom,
555
timelineLiveFollowEnabled,
589
- isTimelineAtLogicalEndStable,
556
onComposerPageScrollKeyDownStable,
557
onComposerPageScrollKeyUpStable,
558
onComposerPageScrollReleaseStable,
559
scrollToEnd,
560
onTimelineAnchorReadyStable,
561
onTimelineAnchorSizeChangedStable,
596
- onToolOutputCollapsedAtEndStable,
562
onTimelineFooterGrowStable,
563
onIsAtEndChangeStable,
564
anchorNewTurn,
apps/web/src/components/composerFooterLayout.test.ts
-25
@@ -2,35 +2,10 @@ import { describe, expect, it } from "vite-plus/test";
2
3
import { resolveContextStripLabelsCompact } from "./BranchToolbar.logic";
4
import {
5
- resolveComposerTimelineInset,
5
resolveRestingComposerControlsLayout,
6
resolveRestingComposerControlsNaturalWidth,
7
} from "./composerFooterLayout";
8
10
-describe("resolveComposerTimelineInset", () => {
11
- it("keeps timeline padding stable when the model-only strip appears on collapse", () => {
12
- const expanded = resolveComposerTimelineInset({
13
- currentInset: 0,
14
- overlayHeight: 172,
15
- isResting: false,
16
- });
17
- const collapsed = resolveComposerTimelineInset({
18
- currentInset: expanded,
19
- overlayHeight: 110,
20
- isResting: true,
21
- restingOnlyHeight: 32,
22
- });
23
- expect(collapsed).toBe(expanded);
24
- expect(
25
- resolveComposerTimelineInset({
26
- currentInset: collapsed,
27
- overlayHeight: 172,
28
- isResting: false,
29
- }),
30
- ).toBe(expanded);
31
- });
32
-});
33
-
9
describe("context strip labels and resting composer controls", () => {
10
const stripWidth = 724;
11
const labelWidth = 327;
apps/web/src/components/composerFooterLayout.ts
-52
@@ -23,58 +23,6 @@ export function shouldUseCompactComposerFooter(
23
return width !== null && width < breakpoint;
24
}
25
26
-export function shouldUseRestingComposerLayout(input: {
27
- isExistingThread: boolean;
28
- isMobileViewport: boolean;
29
- isScrollCollapsed: boolean;
30
- hasExpandedChrome: boolean;
31
- hasMultilinePrompt: boolean;
32
- timelineOverflows: boolean;
33
-}): boolean {
34
- return (
35
- input.isExistingThread &&
36
- !input.isMobileViewport &&
37
- input.timelineOverflows &&
38
- input.isScrollCollapsed &&
39
- !input.hasMultilinePrompt &&
40
- !input.hasExpandedChrome
41
- );
42
-}
43
-
44
-/**
45
- * How much taller the empty expanded composer is than its resting row on
46
- * desktop widths, from the layout classes in ChatComposer: the body loses
47
- * 8px of top padding, the prompt clamps from min-h-17.5 (70px) to 32px, and
48
- * the 48px footer leaves flow.
49
- */
50
-const COMPOSER_RESTING_EXPANSION_MIN_PX = 94;
51
-
52
-/** Reserve expansion height because the timeline does not move when footer growth covers its last rows. */
53
-export function resolveComposerTimelineInset(input: {
54
- currentInset: number;
55
- overlayHeight: number;
56
- isResting: boolean;
57
- restingOnlyHeight?: number;
58
-}): number {
59
- const overlayHeight = Math.ceil(input.overlayHeight);
60
- return input.isResting
61
- ? Math.max(
62
- input.currentInset,
63
- overlayHeight +
64
- (input.currentInset === 0
65
- ? COMPOSER_RESTING_EXPANSION_MIN_PX - (input.restingOnlyHeight ?? 0)
66
- : 0),
67
- )
68
- : overlayHeight;
69
-}
70
-
71
-export function overlayComposerIsResting(input: {
72
- composerMounted: boolean;
73
- composerReportedResting: boolean;
74
-}): boolean {
75
- return input.composerMounted && input.composerReportedResting;
76
-}
77
-
26
export function shouldAnimateComposerRestingTransition(input: {
27
hasCompletedInitialLayout: boolean;
28
stateChanged: boolean;
apps/web/src/components/guest/GuestPage.tsx
-4
@@ -24,7 +24,6 @@ import {
24
import { createQuestionHistoryProjector } from "@t3tools/client-runtime/state/thread-requests";
25
import { ArrowUpIcon, PaperclipIcon, XIcon } from "lucide-react";
26
import {
27
- createRef,
27
useEffect,
28
useReducer,
29
useRef,
@@ -41,7 +40,6 @@ import { useTheme } from "~/hooks/useTheme";
40
import { observeResize } from "~/lib/observeResize";
41
import { cn } from "~/lib/utils";
42
import { deriveActiveWorkStartedAt, derivePhase } from "~/session-logic";
44
-import type { ChatComposerHandle } from "../chat/ChatComposer";
43
import { ComposerControl, ComposerControlIcon } from "../chat/ComposerControl";
44
import type { ExpandedImagePreview } from "../chat/ExpandedImagePreview";
45
import { GuestMessageAttachments } from "../chat/GuestMessageAttachments";
@@ -348,7 +346,6 @@ function NameForm({
346
// The timeline needs an environment id to key its rows. Nothing behind it loads on this page;
347
// see isGuestPage.
348
const GUEST_ENVIRONMENT_ID = EnvironmentId.make("guest");
351
-const NO_COMPOSER = createRef<ChatComposerHandle>();
349
const NO_TURN_DIFFS: ReadonlyArray<never> = [];
350
const NO_OPTIMISTIC_MESSAGES: ReadonlyArray<never> = [];
351
const ignore = () => {};
@@ -399,7 +396,6 @@ function GuestThread({
396
const runningRunId = runtime?.activeRunId ?? null;
397
const follow = useTimelineFollow({
398
legendListRef: listRef,
402
- composerRef: NO_COMPOSER,
399
composerTimelineInset: 0,
400
routeThreadKey: threadKey,
401
activeThreadKey: threadKey,
apps/web/src/components/settings/AppearanceSettingsPanel.tsx
+39
@@ -4,6 +4,7 @@ import {
4
DEFAULT_ENVIRONMENT_IDENTIFICATION_MODE,
5
DEFAULT_UNIFIED_SETTINGS,
6
type ChatWidth,
7
+ type EffortDisplay,
8
type EnvironmentIdentificationMode,
9
MAX_APPEARANCE_CONTRAST,
10
MAX_GLASS_OPACITY,
@@ -76,6 +77,11 @@ const CHAT_WIDTH_LABELS: Record<ChatWidth, string> = {
77
full: "Full",
78
};
79
80
+const EFFORT_DISPLAY_LABELS: Record<EffortDisplay, string> = {
81
+ label: "Word",
82
+ bars: "Bars",
83
+};
84
+
85
export function AppearanceSettingsPanel() {
86
const {
87
appearanceMode,
@@ -267,6 +273,39 @@ export function AppearanceSettingsPanel() {
273
</div>
274
}
275
/>
276
+ <SettingsRow
277
+ {...searchableSetting("effort-display")}
278
+ description="Show reasoning effort in the composer as its name, such as High, or as bars."
279
+ resetAction={
280
+ settings.effortDisplay !== DEFAULT_UNIFIED_SETTINGS.effortDisplay ? (
281
+ <SettingResetButton
282
+ label="effort display"
283
+ onClick={() =>
284
+ updateSettings({ effortDisplay: DEFAULT_UNIFIED_SETTINGS.effortDisplay })
285
+ }
286
+ />
287
+ ) : null
288
+ }
289
+ control={
290
+ <div className="w-full sm:w-40">
291
+ <Select
292
+ value={settings.effortDisplay}
293
+ onValueChange={(value) => {
294
+ if (value === "bars" || value === "label")
295
+ updateSettings({ effortDisplay: value });
296
+ }}
297
+ >
298
+ <SelectTrigger size="sm" className="w-full min-w-0" aria-label="Effort display">
299
+ <SelectValue>{EFFORT_DISPLAY_LABELS[settings.effortDisplay]}</SelectValue>
300
+ </SelectTrigger>
301
+ <SelectPopup align="end" alignItemWithTrigger={false}>
302
+ <SelectItem value="label">Word (default)</SelectItem>
303
+ <SelectItem value="bars">Bars</SelectItem>
304
+ </SelectPopup>
305
+ </Select>
306
+ </div>
307
+ }
308
+ />
309
<SettingsRow
310
{...searchableSetting("math-rendering")}
311
description="Typeset LaTeX math, such as $x^2$ or \[x^2\], in messages and Markdown previews. The composer keeps TeX source editable."
apps/web/src/components/settings/SettingsPanels.tsx
+4
-30
@@ -402,6 +402,9 @@ export function useSettingsRestore(onRestored?: () => void) {
402
? ["Diff colors"]
403
: []),
404
...(settings.chatWidth !== DEFAULT_UNIFIED_SETTINGS.chatWidth ? ["Chat width"] : []),
405
+ ...(settings.effortDisplay !== DEFAULT_UNIFIED_SETTINGS.effortDisplay
406
+ ? ["Effort display"]
407
+ : []),
408
...(settings.mathRenderingEnabled !== DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled
409
? ["Render math"]
410
: []),
@@ -468,9 +471,6 @@ export function useSettingsRestore(onRestored?: () => void) {
471
...(settings.showSkillsInSlashMenu !== DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu
472
? ["Show skills in slash menu"]
473
: []),
471
- ...(settings.composerCollapseOnScroll !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll
472
- ? ["Collapse composer on scroll"]
473
- : []),
474
...(settings.composerRichTextEnabled !== DEFAULT_UNIFIED_SETTINGS.composerRichTextEnabled
475
? ["Rich text composer"]
476
: []),
@@ -577,6 +577,7 @@ export function useSettingsRestore(onRestored?: () => void) {
577
appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast,
578
diffColorScheme: DEFAULT_UNIFIED_SETTINGS.diffColorScheme,
579
chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth,
580
+ effortDisplay: DEFAULT_UNIFIED_SETTINGS.effortDisplay,
581
mathRenderingEnabled: DEFAULT_UNIFIED_SETTINGS.mathRenderingEnabled,
582
timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat,
583
notificationMode: DEFAULT_UNIFIED_SETTINGS.notificationMode,
@@ -588,7 +589,6 @@ export function useSettingsRestore(onRestored?: () => void) {
589
diffLayout: DEFAULT_UNIFIED_SETTINGS.diffLayout,
590
proactivePanelsEnabled: DEFAULT_UNIFIED_SETTINGS.proactivePanelsEnabled,
591
showSkillsInSlashMenu: DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu,
591
- composerCollapseOnScroll: DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll,
592
composerRichTextEnabled: DEFAULT_UNIFIED_SETTINGS.composerRichTextEnabled,
593
sendShortcut: DEFAULT_UNIFIED_SETTINGS.sendShortcut,
594
followUpBehavior: DEFAULT_UNIFIED_SETTINGS.followUpBehavior,
@@ -1107,32 +1107,6 @@ export function ChatSettingsPanel() {
1107
</Select>
1108
}
1109
/>
1110
- <SettingsRow
1111
- {...searchableSetting("composer-collapse")}
1112
- description="Rest the composer of an existing thread into a single line when you scroll the conversation. Focus the composer or start typing to expand it again."
1113
- resetAction={
1114
- settings.composerCollapseOnScroll !==
1115
- DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll ? (
1116
- <SettingResetButton
1117
- label="collapse composer on scroll"
1118
- onClick={() =>
1119
- updateSettings({
1120
- composerCollapseOnScroll: DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll,
1121
- })
1122
- }
1123
- />
1124
- ) : null
1125
- }
1126
- control={
1127
- <Switch
1128
- checked={settings.composerCollapseOnScroll}
1129
- onCheckedChange={(checked) =>
1130
- updateSettings({ composerCollapseOnScroll: Boolean(checked) })
1131
- }
1132
- aria-label="Collapse composer on scroll"
1133
- />
1134
- }
1135
- />
1110
<AdvancedSettings targetIds={[searchableSetting("skills-in-slash-menu").id]}>
1111
<SettingsRow
1112
{...searchableSetting("skills-in-slash-menu")}
apps/web/src/components/settings/settingsSearch.ts
+6
-6
@@ -315,6 +315,12 @@ export const SETTINGS_SEARCH_ITEMS = [
315
to: "/settings/appearance",
316
searchTerms: ["wide full width column layout messages composer monitor"],
317
},
318
+ {
319
+ id: "effort-display",
320
+ title: "Effort display",
321
+ to: "/settings/appearance",
322
+ searchTerms: ["reasoning effort thinking bars graph word label level composer"],
323
+ },
324
{
325
id: "math-rendering",
326
title: "Render math",
@@ -541,12 +547,6 @@ export const SETTINGS_SEARCH_ITEMS = [
547
to: "/settings/chat",
548
searchTerms: ["composer rich text tiptap bold italic markdown styled wysiwyg"],
549
},
544
- {
545
- id: "composer-collapse",
546
- title: "Collapse composer on scroll",
547
- to: "/settings/chat",
548
- searchTerms: ["composer rest resting scroll wheel conversation timeline shrink minimize"],
549
- },
550
{
551
id: "send-shortcut",
552
title: "Send shortcut",
docs/user/keybindings.md
+1
-1
@@ -24,7 +24,7 @@ steer. Change it under **Queue: Send First Queued Message** in Keybindings.
24
Use `mod+shift+m` to choose a model and `mod+shift+h` to choose a host.
25
To step a new thread to the next machine instead of opening the menu, bind
26
**Composer: Cycle Host** in Keybindings. It has no default shortcut.
27
-Use `mod+shift+e` for effort, `mod+shift+a` for access mode, `mod+shift+x` for the
27
+Use `mod+shift+e` for effort, `mod+shift+a` for permissions, `mod+shift+x` for the
28
workspace, and `mod+shift+g` for the Git branch. The workspace menu includes the
29
current checkout, a new worktree, and the previous worktree when available.
30
Use `mod+shift+l` to reuse the previous worktree directly.
docs/user/permission-modes.md
+3
-1
@@ -1,7 +1,9 @@
1
# Permission modes
2
3
Permission modes control when an agent needs your approval to act. Choose a mode in the message
4
-composer; it applies to that thread.
4
+composer; it applies to that thread. A new thread names its mode under the composer. In a thread
5
+on your default mode, open **Permissions** from the effort menu or press `mod+shift+a`. A thread on
6
+another mode, or a model without an effort menu, shows the mode next to the model.
7
8
Set the default for new threads in **Settings → Threads → New threads → Permissions**.
9
Projects can override the environment default. New threads use this setting rather than the
packages/client-runtime/src/modelTraits.ts
+10
-3
@@ -110,7 +110,13 @@ export function buildTraitsTriggerDisplay(input: {
110
ultrathinkPromptControlled: boolean;
111
modelSelection?: ModelSelection | null;
112
reportedModelSelection?: ModelSelection | null | undefined;
113
-}): { label: string } {
113
+}): {
114
+ label: string;
115
+ /** "Fast" or "Ultrafast" when a speed option is on. */
116
+ speedLabel: string | null;
117
+ /** Labels other than reasoning and speed, such as context window or thinking. */
118
+ otherLabels: ReadonlyArray<string>;
119
+} {
120
let fastModeFallbackLabel: string | null = null;
121
let speedLabel: string | null = null;
122
let reasoningLabelIndex = -1;
@@ -167,8 +173,9 @@ export function buildTraitsTriggerDisplay(input: {
173
}
174
}
175
176
+ const otherLabels = labels.filter((_, index) => index !== reasoningLabelIndex);
177
if (labels.length === 0 && fastModeFallbackLabel !== null) {
171
- return { label: fastModeFallbackLabel };
178
+ return { label: fastModeFallbackLabel, speedLabel, otherLabels };
179
}
180
if (speedLabel) {
181
if (reasoningLabelIndex >= 0) {
@@ -177,5 +184,5 @@ export function buildTraitsTriggerDisplay(input: {
184
labels.push(speedLabel);
185
}
186
}
180
- return { label: labels.join(" · ") };
187
+ return { label: labels.join(" · "), speedLabel, otherLabels };
188
}
packages/contracts/src/settings.ts
+6
-2
@@ -326,6 +326,10 @@ export const DiffColorScheme = Schema.Literals(["red-green", "blue-orange"]);
326
export const ChatWidth = Schema.Literals(["comfortable", "wide", "full"]);
327
export type ChatWidth = typeof ChatWidth.Type;
328
329
+/** How the composer shows reasoning effort: the level's name, or rising bars. */
330
+export const EffortDisplay = Schema.Literals(["label", "bars"]);
331
+export type EffortDisplay = typeof EffortDisplay.Type;
332
+
333
export const ModelFavorite = Schema.Struct({
334
provider: ProviderInstanceId,
335
model: TrimmedNonEmptyString,
@@ -352,6 +356,7 @@ export const ClientSettingsSchema = Schema.Struct({
356
Schema.withDecodingDefault(Effect.succeed("red-green" as const)),
357
),
358
chatWidth: ChatWidth.pipe(Schema.withDecodingDefault(Effect.succeed("comfortable" as const))),
359
+ effortDisplay: EffortDisplay.pipe(Schema.withDecodingDefault(Effect.succeed("label" as const))),
360
loadBalancingEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
361
loadBalancingWeights: LoadBalancingWeights.pipe(Schema.withDecodingDefault(Effect.succeed({}))),
362
appearanceContrast: AppearanceContrast.pipe(
@@ -459,7 +464,6 @@ export const ClientSettingsSchema = Schema.Struct({
464
465
planModeEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
466
contextWindowMeterEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
462
- composerCollapseOnScroll: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
467
composerRichTextEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
468
sendShortcut: Schema.Literals(["enter", "mod-enter-multiline", "mod-enter"]).pipe(
469
Schema.withDecodingDefault(Effect.succeed("enter")),
@@ -1652,6 +1656,7 @@ export const ClientSettingsPatch = Schema.Struct({
1656
inAppNotificationsEnabled: Schema.optionalKey(Schema.Boolean),
1657
diffColorScheme: Schema.optionalKey(DiffColorScheme),
1658
chatWidth: Schema.optionalKey(ChatWidth),
1659
+ effortDisplay: Schema.optionalKey(EffortDisplay),
1660
loadBalancingEnabled: Schema.optionalKey(Schema.Boolean),
1661
loadBalancingWeights: Schema.optionalKey(LoadBalancingWeights),
1662
appearanceContrast: Schema.optionalKey(AppearanceContrast),
@@ -1696,7 +1701,6 @@ export const ClientSettingsPatch = Schema.Struct({
1701
pullRequestLinksOpenInApp: Schema.optionalKey(Schema.Boolean),
1702
planModeEnabled: Schema.optionalKey(Schema.Boolean),
1703
contextWindowMeterEnabled: Schema.optionalKey(Schema.Boolean),
1699
- composerCollapseOnScroll: Schema.optionalKey(Schema.Boolean),
1704
composerRichTextEnabled: Schema.optionalKey(Schema.Boolean),
1705
sendShortcut: Schema.optionalKey(Schema.Literals(["enter", "mod-enter-multiline", "mod-enter"])),
1706
followUpBehavior: Schema.optionalKey(Schema.Literals(["queue", "steer"])),