Skip to content

Commit a6efeb0

Browse files
committed
feat(web): show pending approvals in timeline rows
1 parent 68495b6 commit a6efeb0

12 files changed

Lines changed: 398 additions & 168 deletions

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3271,6 +3271,10 @@ export default function ChatView(props: ChatViewProps) {
32713271
/>
32723272
<div className="relative flex min-h-0 flex-1 flex-col bg-background">
32733273
<ThreadTimeline
3274+
pendingApprovals={pendingApprovals}
3275+
respondingRequestIds={respondingRequestIds}
3276+
onRespondToApproval={onRespondToApprovalStable}
3277+
canOperateThread={canOperateThread}
32743278
threadDetailRef={routeThreadDetailRef}
32753279
entriesInput={timelineEntriesInput}
32763280
draftEntries={isServerThread ? null : draftTimelineEntries}
@@ -3581,7 +3585,6 @@ export default function ChatView(props: ChatViewProps) {
35813585
onResume={onComposerResumeStable}
35823586
onInterrupt={onInterruptStable}
35833587
onImplementPlanInNewThread={onImplementPlanInNewThreadStable}
3584-
onRespondToApproval={onRespondToApprovalStable}
35853588
onSelectActivePendingUserInputOption={
35863589
onSelectActivePendingUserInputOptionStable
35873590
}

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import type {
2020
ModelSelection,
2121
ProjectId,
2222
PreviewAnnotationPayload,
23-
ProviderApprovalDecision,
2423
ThreadContextRecord,
2524
EnvironmentContextRecord,
2625
ProviderInteractionMode,
@@ -184,7 +183,6 @@ import {
184183
ComposerCommandMenu,
185184
composerSuggestionOptionId,
186185
} from "./ComposerCommandMenu";
187-
import { ComposerPendingApprovalActions } from "./ComposerPendingApprovalActions";
188186
import {
189187
ComposerAttachButton,
190188
ComposerAttachmentFileList,
@@ -195,7 +193,6 @@ import {
195193
} from "./ComposerAttachmentStrip";
196194
import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
197195
import { ComposerFooterPrimaryActions } from "./ComposerFooterControls";
198-
import { ComposerPendingApprovalPanel } from "./ComposerPendingApprovalPanel";
199196
import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
200197
import { ComposerPlanFollowUpBanner } from "./ComposerPlanFollowUpBanner";
201198
import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";
@@ -236,7 +233,7 @@ const isEnvironmentRequestInvalidError = Schema.is(EnvironmentRequestInvalidErro
236233
const COMPOSER_SCROLL_COLLAPSE_THRESHOLD_PX = 24;
237234
const COMPOSER_SCROLL_GESTURE_RESET_MS = 120;
238235
import { toastManager } from "../ui/toast";
239-
import { PlayIcon, ShieldIcon } from "lucide-react";
236+
import { PlayIcon } from "lucide-react";
240237
import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
241238
import { hasProviderSetup } from "./ProviderStatusBanner";
242239
import { type AppModelOption, getAppModelOptionsForInstance } from "../../modelSelection";
@@ -484,10 +481,6 @@ export interface ChatComposerProps {
484481
onResume: () => void;
485482
onInterrupt: () => void;
486483
onImplementPlanInNewThread: () => void;
487-
onRespondToApproval: (
488-
requestId: RuntimeRequestId,
489-
decision: ProviderApprovalDecision,
490-
) => Promise<unknown>;
491484
onSelectActivePendingUserInputOption: (questionId: string, optionValue: string) => void;
492485
onAdvanceActivePendingUserInput: () => void;
493486
onDismissActivePendingUserInput: (requestId: RuntimeRequestId) => void;
@@ -607,7 +600,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
607600
onResume,
608601
onInterrupt,
609602
onImplementPlanInNewThread,
610-
onRespondToApproval,
611603
onSelectActivePendingUserInputOption,
612604
onAdvanceActivePendingUserInput,
613605
onDismissActivePendingUserInput,
@@ -1204,7 +1196,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
12041196
const isChoiceOnlyPendingQuestion =
12051197
activePendingProgress?.activeQuestion?.allowCustomAnswer === false;
12061198
const showComposerTopDrawer =
1207-
isComposerApprovalState ||
12081199
pendingUserInputs.length > 0 ||
12091200
(!isComposerCollapsedMobile && showPlanFollowUpPrompt && activeProposedPlan !== null);
12101201
const showCollapsedMobilePromptRow = isComposerCollapsedMobile;
@@ -3454,39 +3445,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
34543445
<ComposerBannerStack items={shelfItems} />
34553446
{showComposerTopDrawer ? (
34563447
<ComposerBanner.Attachment>
3457-
<ComposerBanner.Root
3458-
data-chat-composer-top-drawer="true"
3459-
variant={activePendingApproval ? "warning" : "info"}
3460-
density={activePendingApproval ? "spacious" : "default"}
3461-
>
3462-
{activePendingApproval ? (
3463-
<ComposerBanner.Row
3464-
layout="approval"
3465-
data-chat-composer-collapsed-controls="true"
3466-
>
3467-
<ComposerBanner.Icon>
3468-
<ShieldIcon />
3469-
</ComposerBanner.Icon>
3470-
<ComposerBanner.Content>
3471-
<ComposerPendingApprovalPanel
3472-
approval={activePendingApproval}
3473-
pendingCount={pendingApprovals.length}
3474-
/>
3475-
</ComposerBanner.Content>
3476-
<ComposerBanner.Actions>
3477-
<ComposerPendingApprovalActions
3478-
requestId={activePendingApproval.requestId}
3479-
disabled={!canOperateThread}
3480-
isResponding={respondingRequestIds.includes(
3481-
activePendingApproval.requestId,
3482-
)}
3483-
options={activePendingApproval.options}
3484-
canRespond={activePendingApproval.responseCapability === "live"}
3485-
onRespondToApproval={onRespondToApproval}
3486-
/>
3487-
</ComposerBanner.Actions>
3488-
</ComposerBanner.Row>
3489-
) : pendingUserInputs.length > 0 ? (
3448+
<ComposerBanner.Root data-chat-composer-top-drawer="true" variant="info">
3449+
{pendingUserInputs.length > 0 ? (
34903450
<ComposerPendingUserInputPanel
34913451
pendingUserInputs={pendingUserInputs}
34923452
cwd={gitCwd ?? undefined}

‎apps/web/src/components/chat/ComposerPendingApprovalActions.tsx‎

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import {
55
} from "@t3tools/contracts";
66
import { memo } from "react";
77
import { EllipsisIcon, TriangleAlertIcon } from "lucide-react";
8-
import { Button } from "../ui/button";
8+
import { Button, InlineButton } from "../ui/button";
99
import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
1010
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
1111
import { composerFloatingLayerProps } from "./composerEventScope";
1212

1313
interface ComposerPendingApprovalActionsProps {
14+
presentation?: "composer" | "inline";
1415
requestId: RuntimeRequestId;
1516
isResponding: boolean;
1617
canRespond: boolean;
@@ -30,6 +31,7 @@ const DEFAULT_APPROVAL_OPTIONS = [
3031
] satisfies ReadonlyArray<ProviderApprovalOption>;
3132

3233
export const ComposerPendingApprovalActions = memo(function ComposerPendingApprovalActions({
34+
presentation = "composer",
3335
requestId,
3436
isResponding,
3537
canRespond,
@@ -47,23 +49,42 @@ export const ComposerPendingApprovalActions = memo(function ComposerPendingAppro
4749
return (
4850
<>
4951
{primaryOptions.map((option) => {
50-
const button = (
51-
<Button
52-
key={option.decision}
53-
size="xs"
54-
variant={option.decision === "accept" ? "default" : "outline"}
55-
disabled={disabled || isResponding || !canRespond}
56-
aria-description={option.warning}
57-
onClick={() => {
58-
if (!disabled && !isResponding) {
59-
void onRespondToApproval(requestId, option.decision);
60-
}
61-
}}
62-
>
52+
const buttonProps = {
53+
disabled: disabled || isResponding || !canRespond,
54+
"aria-description": option.warning,
55+
onClick: () => {
56+
if (!disabled && !isResponding && canRespond) {
57+
void onRespondToApproval(requestId, option.decision);
58+
}
59+
},
60+
};
61+
const content = (
62+
<>
6363
{option.warning ? <TriangleAlertIcon className="size-3 shrink-0" /> : null}
64-
<span className="max-w-40 truncate">{option.label}</span>
65-
</Button>
64+
<span className={presentation === "inline" ? "whitespace-normal" : "max-w-40 truncate"}>
65+
{option.label}
66+
</span>
67+
</>
6668
);
69+
const button =
70+
presentation === "inline" ? (
71+
<InlineButton
72+
key={option.decision}
73+
{...buttonProps}
74+
tone={option.decision === "accept" ? "default" : "muted"}
75+
>
76+
{content}
77+
</InlineButton>
78+
) : (
79+
<Button
80+
key={option.decision}
81+
{...buttonProps}
82+
size="xs"
83+
variant={option.decision === "accept" ? "default" : "outline"}
84+
>
85+
{content}
86+
</Button>
87+
);
6788
return option.warning ? (
6889
<Tooltip key={option.decision}>
6990
<TooltipTrigger render={button} />
@@ -76,20 +97,26 @@ export const ComposerPendingApprovalActions = memo(function ComposerPendingAppro
7697
{moreOptions.length > 0 ? (
7798
<Menu>
7899
<MenuTrigger
79-
disabled={disabled || isResponding}
80-
render={<Button size="icon-xs" variant="outline" aria-label="More approval options" />}
100+
disabled={disabled || isResponding || !canRespond}
101+
render={
102+
presentation === "inline" ? (
103+
<InlineButton tone="muted" aria-label="More approval options" />
104+
) : (
105+
<Button size="icon-xs" variant="outline" aria-label="More approval options" />
106+
)
107+
}
81108
>
82-
<EllipsisIcon />
109+
{presentation === "inline" ? "More" : <EllipsisIcon />}
83110
</MenuTrigger>
84111
<MenuPopup {...composerFloatingLayerProps} side="top" align="end" width="content">
85112
{moreOptions.map((option) => {
86113
const item = (
87114
<MenuItem
88115
key={option.decision}
89-
disabled={disabled || isResponding}
116+
disabled={disabled || isResponding || !canRespond}
90117
aria-description={option.warning}
91118
onClick={() => {
92-
if (!disabled && !isResponding)
119+
if (!disabled && !isResponding && canRespond)
93120
void onRespondToApproval(requestId, option.decision);
94121
}}
95122
>

‎apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)