The best way to control Claude Code, Codex and more from any computer or phone
refactor(web): the pull request header's actions live in their own components (#22702)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Oct 21, 2026 at 01:28 UTC
8f7de1114121ca9fcdfe5c3f6e1d095124f2bef1
3 files changed
+905
-651
apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx
new
+371
@@ -0,0 +1,371 @@
1
+import { useAtomValue } from "@effect/atom-react";
2
+import type {
3
+ EnvironmentId,
4
+ PullRequestAction,
5
+ PullRequestDetail,
6
+ PullRequestMergeMethod,
7
+ PullRequestRef,
8
+ ScopedThreadRef,
9
+} from "@t3tools/contracts";
10
+import {
11
+ ArrowUpRightIcon,
12
+ BookOpenIcon,
13
+ CopyIcon,
14
+ HammerIcon,
15
+ LinkIcon,
16
+ MessageCircleQuestionIcon,
17
+ MoreHorizontalIcon,
18
+ RotateCcwIcon,
19
+ SparklesIcon,
20
+ Trash2Icon,
21
+} from "lucide-react";
22
+
23
+import { shortcutLabelForCommand } from "~/keybindings";
24
+import { readLocalApi } from "~/localApi";
25
+import { primaryServerKeybindingsAtom } from "~/state/server";
26
+import { Button } from "../ui/button";
27
+import {
28
+ Menu,
29
+ MenuItem,
30
+ MenuPopup,
31
+ MenuRadioGroup,
32
+ MenuRadioItem,
33
+ MenuSeparator,
34
+ MenuShortcut,
35
+ MenuTrigger,
36
+} from "../ui/menu";
37
+import { RefreshIcon } from "../ui/refresh-icon";
38
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
39
+import { ActOnEnvironmentPicker, type PerformPullRequestAction } from "./PullRequestDetailActions";
40
+import {
41
+ PULL_REQUEST_MERGE_METHOD_LABELS,
42
+ pullRequestActionMenuHasGroup,
43
+} from "./pullRequestDetail.logic";
44
+import { PullRequestGlyph } from "./pullRequestIcons";
45
+import type { PickableEnvironment } from "./pullRequestProjectAssignment.logic";
46
+import { PullRequestThreadLinks } from "./PullRequestThreadLinks";
47
+import { useInlineActionConfirm } from "./useInlineActionConfirm";
48
+
49
+/** Everything else the reader can do with the pull request, behind the header's overflow button. */
50
+export function PullRequestActionsMenu({
51
+ environmentId,
52
+ reference,
53
+ pullRequestKey,
54
+ detail,
55
+ linkThreadRef,
56
+ onThreadPickerOpenChange,
57
+ refreshing,
58
+ refreshFromHost,
59
+ handoff,
60
+ attachesToComposer,
61
+ askAboutPullRequest,
62
+ explainPullRequest,
63
+ canFixFindings,
64
+ startFixFindings,
65
+ handoffLabels,
66
+ canWriteGuide,
67
+ guideRunning,
68
+ guideWritten,
69
+ writeGuide,
70
+ pickableEnvironments,
71
+ actingEnvironmentId,
72
+ onActingEnvironmentChange,
73
+ can,
74
+ autoMergeArmed,
75
+ showsDraftToggle,
76
+ showsMergeNow,
77
+ showsAutoMerge,
78
+ showsMergeMethods,
79
+ allowedMergeMethods,
80
+ selectedMergeMethod,
81
+ onSelectMergeMethod,
82
+ showsDeleteBranch,
83
+ environmentConnected,
84
+ confirmDeleteBranch,
85
+ pendingAction,
86
+ perform,
87
+ openOnHostText,
88
+ copyReference,
89
+}: {
90
+ environmentId: EnvironmentId;
91
+ reference: PullRequestRef;
92
+ pullRequestKey: string;
93
+ detail: Pick<PullRequestDetail, "url" | "state" | "isDraft" | "headBranch">;
94
+ linkThreadRef: ScopedThreadRef | null;
95
+ onThreadPickerOpenChange: (open: boolean) => void;
96
+ refreshing: boolean;
97
+ refreshFromHost: () => Promise<void>;
98
+ handoff: string | null;
99
+ attachesToComposer: boolean;
100
+ askAboutPullRequest: () => void;
101
+ explainPullRequest: () => void;
102
+ canFixFindings: boolean;
103
+ startFixFindings: () => void;
104
+ handoffLabels: { readonly fixFindings: string };
105
+ canWriteGuide: boolean;
106
+ guideRunning: boolean;
107
+ guideWritten: boolean;
108
+ writeGuide: () => void;
109
+ pickableEnvironments: ReadonlyArray<PickableEnvironment>;
110
+ actingEnvironmentId: EnvironmentId;
111
+ onActingEnvironmentChange: (environmentId: EnvironmentId) => void;
112
+ can: (action: PullRequestAction) => boolean;
113
+ autoMergeArmed: boolean;
114
+ showsDraftToggle: boolean;
115
+ showsMergeNow: boolean;
116
+ showsAutoMerge: boolean;
117
+ showsMergeMethods: boolean;
118
+ allowedMergeMethods: ReadonlyArray<PullRequestMergeMethod>;
119
+ selectedMergeMethod: PullRequestMergeMethod;
120
+ onSelectMergeMethod: (method: PullRequestMergeMethod) => void;
121
+ showsDeleteBranch: boolean;
122
+ environmentConnected: boolean;
123
+ confirmDeleteBranch: () => Promise<void>;
124
+ pendingAction: PullRequestAction | null;
125
+ perform: PerformPullRequestAction;
126
+ openOnHostText: string;
127
+ copyReference: (value: string, label: string) => void;
128
+}) {
129
+ const keybindings = useAtomValue(primaryServerKeybindingsAtom);
130
+ const inlineConfirm = useInlineActionConfirm(pullRequestKey);
131
+ const actionPending = pendingAction !== null;
132
+ return (
133
+ <Menu>
134
+ <Tooltip>
135
+ <TooltipTrigger
136
+ render={
137
+ <MenuTrigger
138
+ render={
139
+ <Button
140
+ aria-label={refreshing ? "Refreshing pull request" : "More pull request actions"}
141
+ size="icon-xs"
142
+ variant="ghost-muted"
143
+ />
144
+ }
145
+ >
146
+ {refreshing ? (
147
+ <RefreshIcon refreshing size="md" />
148
+ ) : (
149
+ <MoreHorizontalIcon className="size-4" />
150
+ )}
151
+ </MenuTrigger>
152
+ }
153
+ />
154
+ <TooltipPopup>
155
+ {refreshing ? "Refreshing pull request" : "More pull request actions"}
156
+ </TooltipPopup>
157
+ </Tooltip>
158
+ <MenuPopup align="end" side="bottom">
159
+ <PullRequestThreadLinks
160
+ display="menu-item"
161
+ environmentId={environmentId}
162
+ reference={reference}
163
+ url={detail.url}
164
+ threadRef={linkThreadRef}
165
+ onPickerOpenChange={onThreadPickerOpenChange}
166
+ />
167
+ <MenuItem disabled={refreshing} onClick={() => void refreshFromHost()}>
168
+ <RefreshIcon size="sm" refreshing={refreshing} />
169
+ Refresh
170
+ </MenuItem>
171
+ <MenuItem disabled={handoff !== null} onClick={askAboutPullRequest}>
172
+ <MessageCircleQuestionIcon className="mt-1 size-3.5 shrink-0 self-start" />
173
+ <span className="flex min-w-0 flex-col">
174
+ <span>{handoff === "ask" ? "Opening..." : "Ask a question"}</span>
175
+ <span className="text-xs text-muted-foreground">
176
+ {attachesToComposer
177
+ ? "Adds the pull request to this thread's composer."
178
+ : "Opens a thread that knows which pull request you mean."}
179
+ </span>
180
+ </span>
181
+ </MenuItem>
182
+ <MenuItem disabled={handoff !== null} onClick={explainPullRequest}>
183
+ <BookOpenIcon className="mt-1 size-3.5 shrink-0 self-start" />
184
+ <span className="flex min-w-0 flex-col">
185
+ <span>{handoff === "explain" ? "Opening..." : "Explain this PR"}</span>
186
+ <span className="text-xs text-muted-foreground">
187
+ A walk through the diff and what to read closely.
188
+ </span>
189
+ </span>
190
+ </MenuItem>
191
+ <MenuItem disabled={handoff !== null || !canFixFindings} onClick={startFixFindings}>
192
+ <HammerIcon className="size-3.5" />
193
+ {handoff === "findings" ? "Preparing..." : handoffLabels.fixFindings}
194
+ </MenuItem>
195
+ {canWriteGuide ? (
196
+ <MenuItem disabled={guideRunning} onClick={writeGuide}>
197
+ <SparklesIcon className="size-3.5" />
198
+ {guideRunning ? "Writing guide..." : !guideWritten ? "Write guide" : "Rewrite guide"}
199
+ </MenuItem>
200
+ ) : null}
201
+ {pickableEnvironments.length > 0 ? (
202
+ <ActOnEnvironmentPicker
203
+ environments={pickableEnvironments}
204
+ value={actingEnvironmentId}
205
+ onChange={onActingEnvironmentChange}
206
+ disabled={handoff !== null}
207
+ />
208
+ ) : null}
209
+ <MenuSeparator />
210
+ {detail.state === "open" ? (
211
+ <>
212
+ {showsDraftToggle ? (
213
+ <MenuItem
214
+ disabled={actionPending}
215
+ onClick={() => void perform(detail.isDraft ? "ready" : "draft")}
216
+ >
217
+ {detail.isDraft ? (
218
+ <PullRequestGlyph.pullRequest className="size-3.5" />
219
+ ) : (
220
+ <PullRequestGlyph.draft className="size-3.5" />
221
+ )}
222
+ {detail.isDraft ? "Ready for review" : "Convert to draft"}
223
+ </MenuItem>
224
+ ) : null}
225
+ {showsMergeNow ? (
226
+ <MenuItem
227
+ closeOnClick={inlineConfirm.isArmed("merge")}
228
+ aria-label={inlineConfirm.isArmed("merge") ? "Confirm merge?" : "Merge now"}
229
+ disabled={actionPending}
230
+ {...inlineConfirm.props("merge", () => void perform("merge", selectedMergeMethod))}
231
+ >
232
+ <PullRequestGlyph.merged className="size-3.5" />
233
+ {inlineConfirm.isArmed("merge") ? "Confirm merge?" : "Merge now"}
234
+ </MenuItem>
235
+ ) : null}
236
+ {autoMergeArmed && can("disable-auto-merge") ? (
237
+ <MenuItem disabled={actionPending} onClick={() => void perform("disable-auto-merge")}>
238
+ <PullRequestGlyph.merged className="size-3.5" />
239
+ Disable auto-merge
240
+ </MenuItem>
241
+ ) : showsAutoMerge ? (
242
+ <MenuItem
243
+ closeOnClick={inlineConfirm.isArmed("enable-auto-merge")}
244
+ aria-label={
245
+ inlineConfirm.isArmed("enable-auto-merge")
246
+ ? "Confirm auto-merge?"
247
+ : "Enable auto-merge"
248
+ }
249
+ disabled={actionPending}
250
+ {...inlineConfirm.props(
251
+ "enable-auto-merge",
252
+ () => void perform("enable-auto-merge", selectedMergeMethod),
253
+ )}
254
+ >
255
+ <PullRequestGlyph.merged className="size-3.5" />
256
+ {inlineConfirm.isArmed("enable-auto-merge")
257
+ ? "Confirm auto-merge?"
258
+ : "Enable auto-merge"}
259
+ </MenuItem>
260
+ ) : null}
261
+ {showsMergeMethods ? (
262
+ <>
263
+ {showsDraftToggle || showsMergeNow || showsAutoMerge ? <MenuSeparator /> : null}
264
+ <MenuRadioGroup
265
+ value={selectedMergeMethod}
266
+ onValueChange={(method) => onSelectMergeMethod(method as PullRequestMergeMethod)}
267
+ >
268
+ {allowedMergeMethods.map((method) => (
269
+ <MenuRadioItem
270
+ key={method}
271
+ value={method}
272
+ disabled={actionPending}
273
+ closeOnClick
274
+ >
275
+ <span className="flex min-w-0 items-center gap-2">
276
+ <PullRequestGlyph.merged className="size-3.5" />
277
+ <span>{PULL_REQUEST_MERGE_METHOD_LABELS[method]}</span>
278
+ </span>
279
+ </MenuRadioItem>
280
+ ))}
281
+ </MenuRadioGroup>
282
+ </>
283
+ ) : null}
284
+ {pullRequestActionMenuHasGroup(
285
+ showsDraftToggle,
286
+ showsAutoMerge || showsMergeNow,
287
+ showsMergeMethods,
288
+ ) ? (
289
+ <MenuSeparator />
290
+ ) : null}
291
+ </>
292
+ ) : null}
293
+ <MenuItem onClick={() => void readLocalApi()?.shell.openExternal(detail.url)}>
294
+ <ArrowUpRightIcon className="size-3.5" />
295
+ {openOnHostText}
296
+ </MenuItem>
297
+ <MenuItem onClick={() => copyReference(detail.url, "PR link")}>
298
+ <LinkIcon className="size-3.5" />
299
+ Copy link
300
+ <MenuShortcut>
301
+ {shortcutLabelForCommand(keybindings, "thread.copyReference")}
302
+ </MenuShortcut>
303
+ </MenuItem>
304
+ <MenuItem onClick={() => copyReference(`#${reference.number}`, "PR number")}>
305
+ <CopyIcon className="size-3.5" />
306
+ Copy PR number
307
+ <MenuShortcut>
308
+ {shortcutLabelForCommand(keybindings, "pullRequest.copyNumber")}
309
+ </MenuShortcut>
310
+ </MenuItem>
311
+ {detail.state === "open" && can("close") ? (
312
+ <>
313
+ <MenuSeparator />
314
+ <MenuItem
315
+ closeOnClick={inlineConfirm.isArmed("close")}
316
+ aria-label={inlineConfirm.isArmed("close") ? "Confirm close?" : "Close pull request"}
317
+ variant="destructive"
318
+ disabled={actionPending}
319
+ {...inlineConfirm.props("close", () => void perform("close"))}
320
+ >
321
+ <PullRequestGlyph.closed className="size-3.5" />
322
+ {inlineConfirm.isArmed("close") ? "Confirm close?" : "Close pull request"}
323
+ </MenuItem>
324
+ </>
325
+ ) : detail.state === "closed" && can("reopen") ? (
326
+ <>
327
+ <MenuSeparator />
328
+ <MenuItem disabled={actionPending} onClick={() => void perform("reopen")}>
329
+ <PullRequestGlyph.reopen className="size-3.5" />
330
+ Reopen pull request
331
+ </MenuItem>
332
+ </>
333
+ ) : detail.state === "merged" && can("revert") ? (
334
+ <>
335
+ <MenuSeparator />
336
+ <MenuItem
337
+ closeOnClick={inlineConfirm.isArmed("revert")}
338
+ aria-label={inlineConfirm.isArmed("revert") ? "Confirm revert?" : "Revert changes"}
339
+ variant={inlineConfirm.isArmed("revert") ? "destructive" : "default"}
340
+ disabled={actionPending}
341
+ {...inlineConfirm.props("revert", () => void perform("revert"))}
342
+ >
343
+ <RotateCcwIcon className="size-3.5" />
344
+ {inlineConfirm.isArmed("revert") ? "Confirm revert?" : "Revert changes"}
345
+ </MenuItem>
346
+ </>
347
+ ) : null}
348
+ {showsDeleteBranch ? (
349
+ <>
350
+ <MenuSeparator />
351
+ <MenuItem
352
+ variant="destructive"
353
+ disabled={actionPending || !environmentConnected}
354
+ onClick={() => void confirmDeleteBranch()}
355
+ >
356
+ <Trash2Icon className="mt-1 size-3.5 shrink-0 self-start" />
357
+ <span className="flex min-w-0 flex-col">
358
+ <span>
359
+ {pendingAction === "delete-branch" ? "Deleting branch..." : "Delete branch"}
360
+ </span>
361
+ <span className="truncate text-xs text-muted-foreground">
362
+ {environmentConnected ? detail.headBranch : "Reconnect to delete this branch"}
363
+ </span>
364
+ </span>
365
+ </MenuItem>
366
+ </>
367
+ ) : null}
368
+ </MenuPopup>
369
+ </Menu>
370
+ );
371
+}
apps/web/src/components/pullRequest/PullRequestDetailActions.tsx
new
+443
@@ -0,0 +1,443 @@
1
+import type {
2
+ EnvironmentId,
3
+ PullRequestAction,
4
+ PullRequestMergeMethod,
5
+ PullRequestUpdateMethod,
6
+} from "@t3tools/contracts";
7
+import { CheckIcon, ChevronDownIcon, FolderGit2Icon, GitBranchIcon, PlayIcon } from "lucide-react";
8
+import type { ReactNode } from "react";
9
+
10
+import { AnimatedWidth } from "~/components/AnimatedWidth";
11
+import { cn } from "~/lib/utils";
12
+import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
13
+import { Badge } from "../ui/badge";
14
+import { Button } from "../ui/button";
15
+import {
16
+ Menu,
17
+ MenuItem,
18
+ MenuPopup,
19
+ MenuRadioGroup,
20
+ MenuRadioItem,
21
+ MenuSeparator,
22
+ MenuTrigger,
23
+} from "../ui/menu";
24
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
25
+import type { resolvePullRequestPrimaryControl } from "./pullRequestDetail.logic";
26
+import { PullRequestGlyph } from "./pullRequestIcons";
27
+import type { resolvePullRequestState } from "./pullRequestPresentation";
28
+import type { PickableEnvironment } from "./pullRequestProjectAssignment.logic";
29
+import { useInlineActionConfirm } from "./useInlineActionConfirm";
30
+
31
+export type PerformPullRequestAction = (
32
+ action: PullRequestAction,
33
+ method?: PullRequestMergeMethod,
34
+ updateMethod?: PullRequestUpdateMethod,
35
+) => Promise<boolean>;
36
+
37
+export function ActOnEnvironmentPicker({
38
+ environments,
39
+ value,
40
+ onChange,
41
+ disabled,
42
+}: {
43
+ environments: ReadonlyArray<PickableEnvironment>;
44
+ value: EnvironmentId;
45
+ onChange: (environmentId: EnvironmentId) => void;
46
+ disabled: boolean;
47
+}) {
48
+ return (
49
+ <>
50
+ <MenuSeparator />
51
+ <MenuRadioGroup
52
+ value={value}
53
+ onValueChange={(environmentId) => onChange(environmentId as EnvironmentId)}
54
+ >
55
+ {environments.map((environment) => (
56
+ <MenuRadioItem
57
+ key={environment.environmentId}
58
+ value={environment.environmentId}
59
+ disabled={disabled}
60
+ >
61
+ <span className="flex min-w-0 items-center gap-2">
62
+ <EnvironmentMachineIcon
63
+ kind={environment.machine ?? "server"}
64
+ className="size-3.5 shrink-0"
65
+ />
66
+ <span className="truncate">{environment.label}</span>
67
+ </span>
68
+ </MenuRadioItem>
69
+ ))}
70
+ </MenuRadioGroup>
71
+ </>
72
+ );
73
+}
74
+
75
+export function PullRequestCheckoutMenu({
76
+ handoff,
77
+ checkoutRoot,
78
+ canPrepareWorktree,
79
+ canCheckoutHere,
80
+ onCheckout,
81
+ pickableEnvironments,
82
+ actingEnvironmentId,
83
+ onActingEnvironmentChange,
84
+}: {
85
+ handoff: string | null;
86
+ checkoutRoot: string | null;
87
+ canPrepareWorktree: boolean;
88
+ canCheckoutHere: boolean;
89
+ onCheckout: (mode: "worktree" | "local") => void;
90
+ pickableEnvironments: ReadonlyArray<PickableEnvironment>;
91
+ actingEnvironmentId: EnvironmentId;
92
+ onActingEnvironmentChange: (environmentId: EnvironmentId) => void;
93
+}) {
94
+ return (
95
+ <Menu>
96
+ <Tooltip>
97
+ <TooltipTrigger
98
+ render={
99
+ <MenuTrigger
100
+ disabled={handoff !== null || checkoutRoot === null}
101
+ render={
102
+ <Button
103
+ size="xs"
104
+ variant="outline"
105
+ aria-label={handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
106
+ >
107
+ <GitBranchIcon aria-hidden className="size-3.5" />
108
+ <span className="@max-[35rem]/pr-header:hidden">
109
+ {handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
110
+ </span>
111
+ <ChevronDownIcon aria-hidden className="size-3.5 text-muted-foreground" />
112
+ </Button>
113
+ }
114
+ />
115
+ }
116
+ />
117
+ <TooltipPopup>Check out this pull request</TooltipPopup>
118
+ </Tooltip>
119
+ <MenuPopup align="end" side="bottom">
120
+ <MenuItem disabled={!canPrepareWorktree} onClick={() => onCheckout("worktree")}>
121
+ <GitBranchIcon className="mt-1 size-3.5 shrink-0 self-start" />
122
+ <span className="flex min-w-0 flex-col">
123
+ <span>In a separate worktree</span>
124
+ <span className="text-xs text-muted-foreground">
125
+ Its own folder and thread. Nothing you have open moves.
126
+ </span>
127
+ </span>
128
+ </MenuItem>
129
+ <MenuItem disabled={!canCheckoutHere} onClick={() => onCheckout("local")}>
130
+ <FolderGit2Icon className="mt-1 size-3.5 shrink-0 self-start" />
131
+ <span className="flex min-w-0 flex-col">
132
+ <span>In this repository</span>
133
+ <span className="text-xs text-muted-foreground">
134
+ Switches the branch you are working in, like `gh pr checkout`.
135
+ </span>
136
+ </span>
137
+ </MenuItem>
138
+ {pickableEnvironments.length > 0 ? (
139
+ <ActOnEnvironmentPicker
140
+ environments={pickableEnvironments}
141
+ value={actingEnvironmentId}
142
+ onChange={onActingEnvironmentChange}
143
+ disabled={handoff !== null}
144
+ />
145
+ ) : null}
146
+ </MenuPopup>
147
+ </Menu>
148
+ );
149
+}
150
+
151
+export function PullRequestResolveConflictsButton({
152
+ handoff,
153
+ unavailable,
154
+ onResolve,
155
+}: {
156
+ handoff: string | null;
157
+ unavailable: boolean;
158
+ onResolve: () => void;
159
+}) {
160
+ return (
161
+ <Tooltip>
162
+ <TooltipTrigger
163
+ render={
164
+ <span className="inline-flex shrink-0">
165
+ <Button
166
+ size="xs"
167
+ variant="destructive-outline"
168
+ disabled={handoff !== null || unavailable}
169
+ onClick={onResolve}
170
+ aria-label={handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
171
+ >
172
+ <PullRequestGlyph.conflicting aria-hidden className="size-3.5" />
173
+ <span className="@max-[30rem]/pr-header:hidden">
174
+ {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
175
+ </span>
176
+ </Button>
177
+ </span>
178
+ }
179
+ />
180
+ <TooltipPopup side="top">
181
+ {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
182
+ </TooltipPopup>
183
+ </Tooltip>
184
+ );
185
+}
186
+
187
+/** The header's one prominent control, which depends on where the pull request stands. */
188
+export function PullRequestPrimaryAction({
189
+ pullRequestKey,
190
+ primaryAction,
191
+ autoMergeArmed,
192
+ armedAutoMergeLabel,
193
+ pendingAutoMergeLabel,
194
+ selectedMergeMethod,
195
+ selectedMergeMethodLabel,
196
+ statePresentation,
197
+ pendingAction,
198
+ perform,
199
+ resolveConflicts,
200
+}: {
201
+ pullRequestKey: string;
202
+ primaryAction: ReturnType<typeof resolvePullRequestPrimaryControl> | null;
203
+ autoMergeArmed: boolean;
204
+ armedAutoMergeLabel: string;
205
+ pendingAutoMergeLabel: string;
206
+ selectedMergeMethod: PullRequestMergeMethod;
207
+ selectedMergeMethodLabel: string;
208
+ statePresentation: ReturnType<typeof resolvePullRequestState> | null;
209
+ pendingAction: PullRequestAction | null;
210
+ perform: PerformPullRequestAction;
211
+ resolveConflicts: ReactNode;
212
+}) {
213
+ const inlineConfirm = useInlineActionConfirm(pullRequestKey);
214
+ const actionPending = pendingAction !== null;
215
+ return (
216
+ <>
217
+ {autoMergeArmed && primaryAction !== "auto-merge-armed" ? (
218
+ <Tooltip>
219
+ <TooltipTrigger
220
+ render={
221
+ <Badge size="control" variant="info" role="img" aria-label={armedAutoMergeLabel}>
222
+ <PullRequestGlyph.merged aria-hidden className="size-3.5" />
223
+ <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
224
+ </Badge>
225
+ }
226
+ />
227
+ <TooltipPopup side="top">
228
+ {armedAutoMergeLabel}: the host will merge this on its own once its requirements are met
229
+ </TooltipPopup>
230
+ </Tooltip>
231
+ ) : null}
232
+ {primaryAction === "resolve" ? (
233
+ resolveConflicts
234
+ ) : primaryAction === "ready" ? (
235
+ <Tooltip>
236
+ <TooltipTrigger
237
+ render={
238
+ <span className="inline-flex shrink-0">
239
+ <Button
240
+ size="xs"
241
+ variant="default"
242
+ disabled={actionPending}
243
+ onClick={() => void perform("ready")}
244
+ aria-label="Ready for review"
245
+ >
246
+ <PullRequestGlyph.pullRequest aria-hidden className="size-3.5" />
247
+ <span className="@max-[30rem]/pr-header:hidden">Ready for review</span>
248
+ </Button>
249
+ </span>
250
+ }
251
+ />
252
+ <TooltipPopup side="top">Ready for review</TooltipPopup>
253
+ </Tooltip>
254
+ ) : primaryAction === "enable-auto-merge" ? (
255
+ <Tooltip>
256
+ <TooltipTrigger
257
+ render={
258
+ <span className="inline-flex shrink-0">
259
+ <Button
260
+ size="xs"
261
+ variant="default"
262
+ disabled={actionPending}
263
+ {...inlineConfirm.props(
264
+ "enable-auto-merge",
265
+ () => void perform("enable-auto-merge", selectedMergeMethod),
266
+ )}
267
+ aria-label={
268
+ pendingAction === "enable-auto-merge"
269
+ ? "Enabling..."
270
+ : inlineConfirm.isArmed("enable-auto-merge")
271
+ ? "Confirm auto-merge?"
272
+ : pendingAutoMergeLabel
273
+ }
274
+ >
275
+ {inlineConfirm.isArmed("enable-auto-merge") ? (
276
+ <CheckIcon aria-hidden className="size-3.5" />
277
+ ) : (
278
+ <PullRequestGlyph.merged aria-hidden className="size-3.5" />
279
+ )}
280
+ <AnimatedWidth className="@max-[30rem]/pr-header:hidden">
281
+ <span className="grid">
282
+ <span aria-hidden className="invisible col-start-1 row-start-1">
283
+ {pendingAutoMergeLabel}
284
+ </span>
285
+ <span className="col-start-1 row-start-1">
286
+ {pendingAction === "enable-auto-merge"
287
+ ? "Enabling..."
288
+ : inlineConfirm.isArmed("enable-auto-merge")
289
+ ? "Confirm auto-merge?"
290
+ : pendingAutoMergeLabel}
291
+ </span>
292
+ </span>
293
+ </AnimatedWidth>
294
+ </Button>
295
+ </span>
296
+ }
297
+ />
298
+ <TooltipPopup side="top">
299
+ {pendingAction === "enable-auto-merge"
300
+ ? "Enabling..."
301
+ : inlineConfirm.isArmed("enable-auto-merge")
302
+ ? "Confirm auto-merge?"
303
+ : pendingAutoMergeLabel}
304
+ </TooltipPopup>
305
+ </Tooltip>
306
+ ) : primaryAction === "auto-merge-armed" ? (
307
+ <Tooltip>
308
+ <TooltipTrigger
309
+ render={
310
+ <Badge size="control" variant="info" role="img" aria-label={armedAutoMergeLabel}>
311
+ <PullRequestGlyph.merged aria-hidden className="size-3.5" />
312
+ <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
313
+ </Badge>
314
+ }
315
+ />
316
+ <TooltipPopup side="top">
317
+ {armedAutoMergeLabel}: the host will merge this on its own once its requirements are met
318
+ </TooltipPopup>
319
+ </Tooltip>
320
+ ) : primaryAction === "merge" ? (
321
+ <Tooltip>
322
+ <TooltipTrigger
323
+ render={
324
+ <span className="inline-flex shrink-0">
325
+ <Button
326
+ size="xs"
327
+ variant="default"
328
+ disabled={actionPending}
329
+ {...inlineConfirm.props(
330
+ "merge",
331
+ () => void perform("merge", selectedMergeMethod),
332
+ )}
333
+ aria-label={
334
+ pendingAction === "merge"
335
+ ? "Merging..."
336
+ : inlineConfirm.isArmed("merge")
337
+ ? "Confirm merge?"
338
+ : selectedMergeMethodLabel
339
+ }
340
+ >
341
+ {inlineConfirm.isArmed("merge") ? (
342
+ <CheckIcon aria-hidden className="size-3.5" />
343
+ ) : (
344
+ <PullRequestGlyph.merged aria-hidden className="size-3.5" />
345
+ )}
346
+ <AnimatedWidth className="@max-[30rem]/pr-header:hidden">
347
+ <span className="grid">
348
+ <span aria-hidden className="invisible col-start-1 row-start-1">
349
+ {selectedMergeMethodLabel}
350
+ </span>
351
+ <span className="col-start-1 row-start-1">
352
+ {pendingAction === "merge"
353
+ ? "Merging..."
354
+ : inlineConfirm.isArmed("merge")
355
+ ? "Confirm merge?"
356
+ : selectedMergeMethodLabel}
357
+ </span>
358
+ </span>
359
+ </AnimatedWidth>
360
+ </Button>
361
+ </span>
362
+ }
363
+ />
364
+ <TooltipPopup side="top">
365
+ {pendingAction === "merge"
366
+ ? "Merging..."
367
+ : inlineConfirm.isArmed("merge")
368
+ ? "Confirm merge?"
369
+ : selectedMergeMethodLabel}
370
+ </TooltipPopup>
371
+ </Tooltip>
372
+ ) : (primaryAction === "merged" || primaryAction === "closed") &&
373
+ statePresentation !== null ? (
374
+ <Badge size="control" variant="outline">
375
+ <span className={cn("flex items-center gap-1", statePresentation.toneClassName)}>
376
+ <statePresentation.Icon className="size-3.5" />
377
+ {statePresentation.label}
378
+ </span>
379
+ </Badge>
380
+ ) : null}
381
+ </>
382
+ );
383
+}
384
+
385
+export function PullRequestApproveWorkflowsButton({
386
+ pullRequestKey,
387
+ pendingAction,
388
+ perform,
389
+}: {
390
+ pullRequestKey: string;
391
+ pendingAction: PullRequestAction | null;
392
+ perform: PerformPullRequestAction;
393
+}) {
394
+ const inlineConfirm = useInlineActionConfirm(pullRequestKey);
395
+ const actionPending = pendingAction !== null;
396
+ return (
397
+ <Tooltip>
398
+ <TooltipTrigger
399
+ render={
400
+ <span className="ml-auto inline-flex shrink-0">
401
+ <Button
402
+ size="xs"
403
+ variant="warning-outline"
404
+ disabled={actionPending}
405
+ {...inlineConfirm.props("approve-workflows", () => void perform("approve-workflows"))}
406
+ aria-label={
407
+ pendingAction === "approve-workflows"
408
+ ? "Approving..."
409
+ : inlineConfirm.isArmed("approve-workflows")
410
+ ? "Confirm approve?"
411
+ : "Approve workflows to run"
412
+ }
413
+ >
414
+ <PlayIcon aria-hidden className="size-3.5" />
415
+ <span className="inline-grid">
416
+ <span aria-hidden className="invisible col-start-1 row-start-1">
417
+ Approve workflows to run
418
+ </span>
419
+ <span aria-hidden className="invisible col-start-1 row-start-1">
420
+ Confirm approve?
421
+ </span>
422
+ <span className="col-start-1 row-start-1">
423
+ {pendingAction === "approve-workflows"
424
+ ? "Approving..."
425
+ : inlineConfirm.isArmed("approve-workflows")
426
+ ? "Confirm approve?"
427
+ : "Approve workflows to run"}
428
+ </span>
429
+ </span>
430
+ </Button>
431
+ </span>
432
+ }
433
+ />
434
+ <TooltipPopup side="top">
435
+ {pendingAction === "approve-workflows"
436
+ ? "Approving..."
437
+ : inlineConfirm.isArmed("approve-workflows")
438
+ ? "Confirm approve?"
439
+ : "Approve workflows to run"}
440
+ </TooltipPopup>
441
+ </Tooltip>
442
+ );
443
+}
apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+91
-651
@@ -1,8 +1,6 @@
1
import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl";
2
import { useAtomValue } from "@effect/atom-react";
3
import { usePullRequestStack } from "~/state/usePullRequestStack";
4
-import { RefreshIcon } from "~/components/ui/refresh-icon";
5
-import { AnimatedWidth } from "~/components/AnimatedWidth";
4
import {
5
scopedThreadKey,
6
scopeProjectRef,
@@ -29,26 +27,11 @@ import {
27
import {
28
ArrowDownUpIcon,
29
ArrowLeftIcon,
32
- ArrowUpRightIcon,
33
- BookOpenIcon,
34
- CheckIcon,
30
CircleDotIcon,
36
- CopyIcon,
37
- ChevronDownIcon,
31
FileDiffIcon,
39
- FolderGit2Icon,
40
- GitBranchIcon,
32
GitCommitHorizontalIcon,
42
- HammerIcon,
43
- MessageCircleQuestionIcon,
33
MessageSquareIcon,
45
- LinkIcon,
46
- MoreHorizontalIcon,
34
PanelRightIcon,
48
- PlayIcon,
49
- RotateCcwIcon,
50
- SparklesIcon,
51
- Trash2Icon,
35
} from "lucide-react";
36
import {
37
lazy,
@@ -66,11 +49,7 @@ import { useEnvironmentSettings } from "~/hooks/useSettings";
49
import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
50
import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
51
import { isCommandPaletteOpen } from "~/commandPaletteBus";
69
-import {
70
- resolveShortcutCommand,
71
- shortcutLabelForCommand,
72
- type ShortcutMatchContext,
73
-} from "~/keybindings";
52
+import { resolveShortcutCommand, type ShortcutMatchContext } from "~/keybindings";
53
import { primaryServerKeybindingsAtom } from "~/state/server";
54
import { usePullRequestDefaultMergeMethodResolver } from "./usePullRequestActions";
55
import { OFF_HEAD_PULL_REQUEST_CHECKOUT_TOAST } from "./pullRequestCheckoutToast";
@@ -100,19 +79,7 @@ import { vcsEnvironment } from "~/state/vcs";
79
import { RelativeTime } from "~/components/RelativeTime";
80
import { useUiStateStore } from "~/uiStateStore";
81
103
-import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
104
-import { Badge } from "../ui/badge";
82
import { Button } from "../ui/button";
106
-import {
107
- Menu,
108
- MenuItem,
109
- MenuPopup,
110
- MenuRadioGroup,
111
- MenuRadioItem,
112
- MenuSeparator,
113
- MenuShortcut,
114
- MenuTrigger,
115
-} from "../ui/menu";
83
import { toastManager } from "../ui/toast";
84
import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "../ui/tooltip";
85
import { MiddleTruncate } from "../ui/middle-truncate";
@@ -123,6 +90,13 @@ import {
90
} from "./PullRequestDetailLayout";
91
import { PullRequestDetailGhost, PullRequestTimelineGhost } from "./PullRequestGhosts";
92
import { PullRequestCopyableCode } from "./PullRequestCopyableCode";
93
+import { PullRequestActionsMenu } from "./PullRequestActionsMenu";
94
+import {
95
+ PullRequestApproveWorkflowsButton,
96
+ PullRequestCheckoutMenu,
97
+ PullRequestPrimaryAction,
98
+ PullRequestResolveConflictsButton,
99
+} from "./PullRequestDetailActions";
100
import { PullRequestBaseBranch } from "./PullRequestBaseBranch";
101
import { PullRequestDetailCrumbs } from "./PullRequestDetailCrumbs";
102
import { PullRequestTitleEditor } from "./PullRequestTitleEditor";
@@ -149,7 +123,6 @@ import {
123
loadingPullRequestCheckoutCommand,
124
isPullRequestNotFound,
125
isStackedPullRequestBase,
152
- pullRequestActionMenuHasGroup,
126
pullRequestActionNeedsHostRefresh,
127
pullRequestCheckoutCommand,
128
pullRequestFindingKey,
@@ -170,10 +143,7 @@ import {
143
stripPullRequestHandoffReferences,
144
writePullRequestDetailSnapshot,
145
} from "./pullRequestDetail.logic";
173
-import {
174
- resolvePickableEnvironments,
175
- type PickableEnvironment,
176
-} from "./pullRequestProjectAssignment.logic";
146
+import { resolvePickableEnvironments } from "./pullRequestProjectAssignment.logic";
147
import { PullRequestChecksPopover } from "./PullRequestChecksPopover";
148
import {
149
PullRequestActorLabel,
@@ -185,11 +155,9 @@ import {
155
resolvePullRequestState,
156
summarizePullRequestChecks,
157
} from "./pullRequestPresentation";
188
-import { PullRequestGlyph } from "./pullRequestIcons";
158
import { PullRequestGuideTab } from "./PullRequestGuideTab";
159
import { guideRunKey, useGuideRunStore } from "./guide/guideRunStore";
160
import { useReviewGuideWriter } from "./guide/useReviewGuideWriter";
192
-import { useInlineActionConfirm } from "./useInlineActionConfirm";
161
162
const ACTION_FAILURE_LABELS: Record<PullRequestAction, string> = {
163
merge: "Could not merge this pull request",
@@ -251,44 +219,6 @@ const lastHandoffPromptByDraft = new Map<string, string>();
219
const composerTargetKey = (target: ScopedThreadRef | DraftId): string =>
220
typeof target === "string" ? target : scopedThreadKey(target);
221
254
-function ActOnEnvironmentPicker({
255
- environments,
256
- value,
257
- onChange,
258
- disabled,
259
-}: {
260
- environments: ReadonlyArray<PickableEnvironment>;
261
- value: EnvironmentId;
262
- onChange: (environmentId: EnvironmentId) => void;
263
- disabled: boolean;
264
-}) {
265
- return (
266
- <>
267
- <MenuSeparator />
268
- <MenuRadioGroup
269
- value={value}
270
- onValueChange={(environmentId) => onChange(environmentId as EnvironmentId)}
271
- >
272
- {environments.map((environment) => (
273
- <MenuRadioItem
274
- key={environment.environmentId}
275
- value={environment.environmentId}
276
- disabled={disabled}
277
- >
278
- <span className="flex min-w-0 items-center gap-2">
279
- <EnvironmentMachineIcon
280
- kind={environment.machine ?? "server"}
281
- className="size-3.5 shrink-0"
282
- />
283
- <span className="truncate">{environment.label}</span>
284
- </span>
285
- </MenuRadioItem>
286
- ))}
287
- </MenuRadioGroup>
288
- </>
289
- );
290
-}
291
-
222
function reportCheckoutCommandError(error: Error) {
223
toastManager.add({
224
type: "error",
@@ -659,7 +589,6 @@ export function PullRequestDetailPanel({
589
const setMergeMethod = (method: PullRequestMergeMethod) => {
590
setMergeMethodSelection({ pullRequestKey, method });
591
};
662
- const inlineConfirm = useInlineActionConfirm(pullRequestKey);
592
const [handoff, setHandoff] = useState<string | null>(null);
593
const turnRefresh = usePullRequestTurnRefresh(environmentId);
594
const {
@@ -1299,6 +1228,12 @@ export function PullRequestDetailPanel({
1228
});
1229
};
1230
1231
+ const selectMergeMethod = (method: PullRequestMergeMethod) => {
1232
+ setMergeMethod(method);
1233
+ setLastSelectedMergeMethod(method);
1234
+ };
1235
+ const selectActingEnvironment = (next: EnvironmentId) =>
1236
+ setActingScope({ pullRequestKey, environmentId: next });
1237
const allowedMergeMethods = detail
1238
? detail.capabilities.mergeMethods.filter((method) => detail.mergeCapabilities[method])
1239
: [];
@@ -1423,85 +1358,24 @@ export function PullRequestDetailPanel({
1358
1359
const checkoutControl =
1360
context === "page" ? (
1426
- <Menu>
1427
- <Tooltip>
1428
- <TooltipTrigger
1429
- render={
1430
- <MenuTrigger
1431
- disabled={handoff !== null || checkoutRoot === null}
1432
- render={
1433
- <Button
1434
- size="xs"
1435
- variant="outline"
1436
- aria-label={handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
1437
- >
1438
- <GitBranchIcon aria-hidden className="size-3.5" />
1439
- <span className="@max-[35rem]/pr-header:hidden">
1440
- {handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
1441
- </span>
1442
- <ChevronDownIcon aria-hidden className="size-3.5 text-muted-foreground" />
1443
- </Button>
1444
- }
1445
- />
1446
- }
1447
- />
1448
- <TooltipPopup>Check out this pull request</TooltipPopup>
1449
- </Tooltip>
1450
- <MenuPopup align="end" side="bottom">
1451
- <MenuItem disabled={!canPrepareWorktree} onClick={() => startCheckout("worktree")}>
1452
- <GitBranchIcon className="mt-1 size-3.5 shrink-0 self-start" />
1453
- <span className="flex min-w-0 flex-col">
1454
- <span>In a separate worktree</span>
1455
- <span className="text-xs text-muted-foreground">
1456
- Its own folder and thread. Nothing you have open moves.
1457
- </span>
1458
- </span>
1459
- </MenuItem>
1460
- <MenuItem disabled={!prepareThread.isAllowed} onClick={() => startCheckout("local")}>
1461
- <FolderGit2Icon className="mt-1 size-3.5 shrink-0 self-start" />
1462
- <span className="flex min-w-0 flex-col">
1463
- <span>In this repository</span>
1464
- <span className="text-xs text-muted-foreground">
1465
- Switches the branch you are working in, like `gh pr checkout`.
1466
- </span>
1467
- </span>
1468
- </MenuItem>
1469
- {pickableEnvironments.length > 0 ? (
1470
- <ActOnEnvironmentPicker
1471
- environments={pickableEnvironments}
1472
- value={actingEnvironmentId}
1473
- onChange={(next) => setActingScope({ pullRequestKey, environmentId: next })}
1474
- disabled={handoff !== null}
1475
- />
1476
- ) : null}
1477
- </MenuPopup>
1478
- </Menu>
1361
+ <PullRequestCheckoutMenu
1362
+ handoff={handoff}
1363
+ checkoutRoot={checkoutRoot}
1364
+ canPrepareWorktree={canPrepareWorktree}
1365
+ canCheckoutHere={prepareThread.isAllowed}
1366
+ onCheckout={startCheckout}
1367
+ pickableEnvironments={pickableEnvironments}
1368
+ actingEnvironmentId={actingEnvironmentId}
1369
+ onActingEnvironmentChange={selectActingEnvironment}
1370
+ />
1371
) : null;
1372
1373
const resolveConflictsControl = (
1482
- <Tooltip>
1483
- <TooltipTrigger
1484
- render={
1485
- <span className="inline-flex shrink-0">
1486
- <Button
1487
- size="xs"
1488
- variant="destructive-outline"
1489
- disabled={handoff !== null || (attachTarget === null && checkoutRoot === null)}
1490
- onClick={startResolveConflicts}
1491
- aria-label={handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
1492
- >
1493
- <PullRequestGlyph.conflicting aria-hidden className="size-3.5" />
1494
- <span className="@max-[30rem]/pr-header:hidden">
1495
- {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
1496
- </span>
1497
- </Button>
1498
- </span>
1499
- }
1500
- />
1501
- <TooltipPopup side="top">
1502
- {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
1503
- </TooltipPopup>
1504
- </Tooltip>
1374
+ <PullRequestResolveConflictsButton
1375
+ handoff={handoff}
1376
+ unavailable={attachTarget === null && checkoutRoot === null}
1377
+ onResolve={startResolveConflicts}
1378
+ />
1379
);
1380
1381
if (detailQuery.isPending && !detail) {
@@ -1602,454 +1476,63 @@ export function PullRequestDetailPanel({
1476
threadRef={null}
1477
/>
1478
) : null}
1605
- {autoMergeArmed && primaryAction !== "auto-merge-armed" ? (
1606
- <Tooltip>
1607
- <TooltipTrigger
1608
- render={
1609
- <Badge
1610
- size="control"
1611
- variant="info"
1612
- role="img"
1613
- aria-label={armedAutoMergeLabel}
1614
- >
1615
- <PullRequestGlyph.merged aria-hidden className="size-3.5" />
1616
- <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
1617
- </Badge>
1618
- }
1619
- />
1620
- <TooltipPopup side="top">
1621
- {armedAutoMergeLabel}: the host will merge this on its own once its requirements
1622
- are met
1623
- </TooltipPopup>
1624
- </Tooltip>
1625
- ) : null}
1626
- {primaryAction === "resolve" ? (
1627
- resolveConflictsControl
1628
- ) : primaryAction === "ready" ? (
1629
- <Tooltip>
1630
- <TooltipTrigger
1631
- render={
1632
- <span className="inline-flex shrink-0">
1633
- <Button
1634
- size="xs"
1635
- variant="default"
1636
- disabled={actionPending}
1637
- onClick={() => void perform("ready")}
1638
- aria-label="Ready for review"
1639
- >
1640
- <PullRequestGlyph.pullRequest aria-hidden className="size-3.5" />
1641
- <span className="@max-[30rem]/pr-header:hidden">Ready for review</span>
1642
- </Button>
1643
- </span>
1644
- }
1645
- />
1646
- <TooltipPopup side="top">Ready for review</TooltipPopup>
1647
- </Tooltip>
1648
- ) : primaryAction === "enable-auto-merge" ? (
1649
- <Tooltip>
1650
- <TooltipTrigger
1651
- render={
1652
- <span className="inline-flex shrink-0">
1653
- <Button
1654
- size="xs"
1655
- variant="default"
1656
- disabled={actionPending}
1657
- {...inlineConfirm.props(
1658
- "enable-auto-merge",
1659
- () => void perform("enable-auto-merge", selectedMergeMethod),
1660
- )}
1661
- aria-label={
1662
- pendingAction === "enable-auto-merge"
1663
- ? "Enabling..."
1664
- : inlineConfirm.isArmed("enable-auto-merge")
1665
- ? "Confirm auto-merge?"
1666
- : pendingAutoMergeLabel
1667
- }
1668
- >
1669
- {inlineConfirm.isArmed("enable-auto-merge") ? (
1670
- <CheckIcon aria-hidden className="size-3.5" />
1671
- ) : (
1672
- <PullRequestGlyph.merged aria-hidden className="size-3.5" />
1673
- )}
1674
- <AnimatedWidth className="@max-[30rem]/pr-header:hidden">
1675
- <span className="grid">
1676
- <span aria-hidden className="invisible col-start-1 row-start-1">
1677
- {pendingAutoMergeLabel}
1678
- </span>
1679
- <span className="col-start-1 row-start-1">
1680
- {pendingAction === "enable-auto-merge"
1681
- ? "Enabling..."
1682
- : inlineConfirm.isArmed("enable-auto-merge")
1683
- ? "Confirm auto-merge?"
1684
- : pendingAutoMergeLabel}
1685
- </span>
1686
- </span>
1687
- </AnimatedWidth>
1688
- </Button>
1689
- </span>
1690
- }
1691
- />
1692
- <TooltipPopup side="top">
1693
- {pendingAction === "enable-auto-merge"
1694
- ? "Enabling..."
1695
- : inlineConfirm.isArmed("enable-auto-merge")
1696
- ? "Confirm auto-merge?"
1697
- : pendingAutoMergeLabel}
1698
- </TooltipPopup>
1699
- </Tooltip>
1700
- ) : primaryAction === "auto-merge-armed" ? (
1701
- <Tooltip>
1702
- <TooltipTrigger
1703
- render={
1704
- <Badge
1705
- size="control"
1706
- variant="info"
1707
- role="img"
1708
- aria-label={armedAutoMergeLabel}
1709
- >
1710
- <PullRequestGlyph.merged aria-hidden className="size-3.5" />
1711
- <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
1712
- </Badge>
1713
- }
1714
- />
1715
- <TooltipPopup side="top">
1716
- {armedAutoMergeLabel}: the host will merge this on its own once its requirements
1717
- are met
1718
- </TooltipPopup>
1719
- </Tooltip>
1720
- ) : primaryAction === "merge" ? (
1721
- <Tooltip>
1722
- <TooltipTrigger
1723
- render={
1724
- <span className="inline-flex shrink-0">
1725
- <Button
1726
- size="xs"
1727
- variant="default"
1728
- disabled={actionPending}
1729
- {...inlineConfirm.props(
1730
- "merge",
1731
- () => void perform("merge", selectedMergeMethod),
1732
- )}
1733
- aria-label={
1734
- pendingAction === "merge"
1735
- ? "Merging..."
1736
- : inlineConfirm.isArmed("merge")
1737
- ? "Confirm merge?"
1738
- : selectedMergeMethodLabel
1739
- }
1740
- >
1741
- {inlineConfirm.isArmed("merge") ? (
1742
- <CheckIcon aria-hidden className="size-3.5" />
1743
- ) : (
1744
- <PullRequestGlyph.merged aria-hidden className="size-3.5" />
1745
- )}
1746
- <AnimatedWidth className="@max-[30rem]/pr-header:hidden">
1747
- <span className="grid">
1748
- <span aria-hidden className="invisible col-start-1 row-start-1">
1749
- {selectedMergeMethodLabel}
1750
- </span>
1751
- <span className="col-start-1 row-start-1">
1752
- {pendingAction === "merge"
1753
- ? "Merging..."
1754
- : inlineConfirm.isArmed("merge")
1755
- ? "Confirm merge?"
1756
- : selectedMergeMethodLabel}
1757
- </span>
1758
- </span>
1759
- </AnimatedWidth>
1760
- </Button>
1761
- </span>
1762
- }
1763
- />
1764
- <TooltipPopup side="top">
1765
- {pendingAction === "merge"
1766
- ? "Merging..."
1767
- : inlineConfirm.isArmed("merge")
1768
- ? "Confirm merge?"
1769
- : selectedMergeMethodLabel}
1770
- </TooltipPopup>
1771
- </Tooltip>
1772
- ) : (primaryAction === "merged" || primaryAction === "closed") &&
1773
- statePresentation !== null ? (
1774
- <Badge size="control" variant="outline">
1775
- <span className={cn("flex items-center gap-1", statePresentation.toneClassName)}>
1776
- <statePresentation.Icon className="size-3.5" />
1777
- {statePresentation.label}
1778
- </span>
1779
- </Badge>
1780
- ) : null}
1479
+ <PullRequestPrimaryAction
1480
+ pullRequestKey={pullRequestKey}
1481
+ primaryAction={primaryAction}
1482
+ autoMergeArmed={autoMergeArmed}
1483
+ armedAutoMergeLabel={armedAutoMergeLabel}
1484
+ pendingAutoMergeLabel={pendingAutoMergeLabel}
1485
+ selectedMergeMethod={selectedMergeMethod}
1486
+ selectedMergeMethodLabel={selectedMergeMethodLabel}
1487
+ statePresentation={statePresentation}
1488
+ pendingAction={pendingAction}
1489
+ perform={perform}
1490
+ resolveConflicts={resolveConflictsControl}
1491
+ />
1492
{checkoutControl}
1782
- <Menu>
1783
- <Tooltip>
1784
- <TooltipTrigger
1785
- render={
1786
- <MenuTrigger
1787
- render={
1788
- <Button
1789
- aria-label={
1790
- refreshing ? "Refreshing pull request" : "More pull request actions"
1791
- }
1792
- size="icon-xs"
1793
- variant="ghost-muted"
1794
- />
1795
- }
1796
- >
1797
- {refreshing ? (
1798
- <RefreshIcon refreshing size="md" />
1799
- ) : (
1800
- <MoreHorizontalIcon className="size-4" />
1801
- )}
1802
- </MenuTrigger>
1803
- }
1804
- />
1805
- <TooltipPopup>
1806
- {refreshing ? "Refreshing pull request" : "More pull request actions"}
1807
- </TooltipPopup>
1808
- </Tooltip>
1809
- <MenuPopup align="end" side="bottom">
1810
- <PullRequestThreadLinks
1811
- display="menu-item"
1812
- environmentId={environmentId}
1813
- reference={reference}
1814
- url={detail.url}
1815
- threadRef={
1816
- threadRef ??
1817
- (typeof composerDraftTarget === "object" ? composerDraftTarget : null)
1818
- }
1819
- onPickerOpenChange={setThreadPickerOpen}
1820
- />
1821
- <MenuItem disabled={refreshing} onClick={() => void refreshFromHost()}>
1822
- <RefreshIcon size="sm" refreshing={refreshing} />
1823
- Refresh
1824
- </MenuItem>
1825
- <MenuItem disabled={handoff !== null} onClick={askAboutPullRequest}>
1826
- <MessageCircleQuestionIcon className="mt-1 size-3.5 shrink-0 self-start" />
1827
- <span className="flex min-w-0 flex-col">
1828
- <span>{handoff === "ask" ? "Opening..." : "Ask a question"}</span>
1829
- <span className="text-xs text-muted-foreground">
1830
- {attachTarget !== null
1831
- ? "Adds the pull request to this thread's composer."
1832
- : "Opens a thread that knows which pull request you mean."}
1833
- </span>
1834
- </span>
1835
- </MenuItem>
1836
- <MenuItem disabled={handoff !== null} onClick={explainPullRequest}>
1837
- <BookOpenIcon className="mt-1 size-3.5 shrink-0 self-start" />
1838
- <span className="flex min-w-0 flex-col">
1839
- <span>{handoff === "explain" ? "Opening..." : "Explain this PR"}</span>
1840
- <span className="text-xs text-muted-foreground">
1841
- A walk through the diff and what to read closely.
1842
- </span>
1843
- </span>
1844
- </MenuItem>
1845
- <MenuItem
1846
- disabled={handoff !== null || !canFixFindings}
1847
- onClick={startFixFindings}
1848
- >
1849
- <HammerIcon className="size-3.5" />
1850
- {handoff === "findings" ? "Preparing..." : handoffLabels.fixFindings}
1851
- </MenuItem>
1852
- {reviewGuidesEnabled && guideWriter.canWrite ? (
1853
- <MenuItem disabled={guideWriter.running} onClick={writeGuide}>
1854
- <SparklesIcon className="size-3.5" />
1855
- {guideWriter.running
1856
- ? "Writing guide..."
1857
- : guideWriter.data?.guide == null
1858
- ? "Write guide"
1859
- : "Rewrite guide"}
1860
- </MenuItem>
1861
- ) : null}
1862
- {pickableEnvironments.length > 0 ? (
1863
- <ActOnEnvironmentPicker
1864
- environments={pickableEnvironments}
1865
- value={actingEnvironmentId}
1866
- onChange={(next) => setActingScope({ pullRequestKey, environmentId: next })}
1867
- disabled={handoff !== null}
1868
- />
1869
- ) : null}
1870
- <MenuSeparator />
1871
- {detail.state === "open" ? (
1872
- <>
1873
- {showsDraftToggle ? (
1874
- <MenuItem
1875
- disabled={actionPending}
1876
- onClick={() => void perform(detail.isDraft ? "ready" : "draft")}
1877
- >
1878
- {detail.isDraft ? (
1879
- <PullRequestGlyph.pullRequest className="size-3.5" />
1880
- ) : (
1881
- <PullRequestGlyph.draft className="size-3.5" />
1882
- )}
1883
- {detail.isDraft ? "Ready for review" : "Convert to draft"}
1884
- </MenuItem>
1885
- ) : null}
1886
- {showsMergeNow ? (
1887
- <MenuItem
1888
- closeOnClick={inlineConfirm.isArmed("merge")}
1889
- aria-label={
1890
- inlineConfirm.isArmed("merge") ? "Confirm merge?" : "Merge now"
1891
- }
1892
- disabled={actionPending}
1893
- {...inlineConfirm.props(
1894
- "merge",
1895
- () => void perform("merge", selectedMergeMethod),
1896
- )}
1897
- >
1898
- <PullRequestGlyph.merged className="size-3.5" />
1899
- {inlineConfirm.isArmed("merge") ? "Confirm merge?" : "Merge now"}
1900
- </MenuItem>
1901
- ) : null}
1902
- {autoMergeArmed && can("disable-auto-merge") ? (
1903
- <MenuItem
1904
- disabled={actionPending}
1905
- onClick={() => void perform("disable-auto-merge")}
1906
- >
1907
- <PullRequestGlyph.merged className="size-3.5" />
1908
- Disable auto-merge
1909
- </MenuItem>
1910
- ) : showsAutoMerge ? (
1911
- <MenuItem
1912
- closeOnClick={inlineConfirm.isArmed("enable-auto-merge")}
1913
- aria-label={
1914
- inlineConfirm.isArmed("enable-auto-merge")
1915
- ? "Confirm auto-merge?"
1916
- : "Enable auto-merge"
1917
- }
1918
- disabled={actionPending}
1919
- {...inlineConfirm.props(
1920
- "enable-auto-merge",
1921
- () => void perform("enable-auto-merge", selectedMergeMethod),
1922
- )}
1923
- >
1924
- <PullRequestGlyph.merged className="size-3.5" />
1925
- {inlineConfirm.isArmed("enable-auto-merge")
1926
- ? "Confirm auto-merge?"
1927
- : "Enable auto-merge"}
1928
- </MenuItem>
1929
- ) : null}
1930
- {showsMergeMethods ? (
1931
- <>
1932
- {showsDraftToggle || showsMergeNow || showsAutoMerge ? (
1933
- <MenuSeparator />
1934
- ) : null}
1935
- <MenuRadioGroup
1936
- value={selectedMergeMethod}
1937
- onValueChange={(method) => {
1938
- const selectedMethod = method as PullRequestMergeMethod;
1939
- setMergeMethod(selectedMethod);
1940
- setLastSelectedMergeMethod(selectedMethod);
1941
- }}
1942
- >
1943
- {allowedMergeMethods.map((method) => (
1944
- <MenuRadioItem
1945
- key={method}
1946
- value={method}
1947
- disabled={actionPending}
1948
- closeOnClick
1949
- >
1950
- <span className="flex min-w-0 items-center gap-2">
1951
- <PullRequestGlyph.merged className="size-3.5" />
1952
- <span>{PULL_REQUEST_MERGE_METHOD_LABELS[method]}</span>
1953
- </span>
1954
- </MenuRadioItem>
1955
- ))}
1956
- </MenuRadioGroup>
1957
- </>
1958
- ) : null}
1959
- {pullRequestActionMenuHasGroup(
1960
- showsDraftToggle,
1961
- showsAutoMerge || showsMergeNow,
1962
- showsMergeMethods,
1963
- ) ? (
1964
- <MenuSeparator />
1965
- ) : null}
1966
- </>
1967
- ) : null}
1968
- <MenuItem onClick={() => void readLocalApi()?.shell.openExternal(detail.url)}>
1969
- <ArrowUpRightIcon className="size-3.5" />
1970
- {openOnHostText}
1971
- </MenuItem>
1972
- <MenuItem onClick={() => copyReference(detail.url, "PR link")}>
1973
- <LinkIcon className="size-3.5" />
1974
- Copy link
1975
- <MenuShortcut>
1976
- {shortcutLabelForCommand(keybindings, "thread.copyReference")}
1977
- </MenuShortcut>
1978
- </MenuItem>
1979
- <MenuItem onClick={() => copyReference(`#${reference.number}`, "PR number")}>
1980
- <CopyIcon className="size-3.5" />
1981
- Copy PR number
1982
- <MenuShortcut>
1983
- {shortcutLabelForCommand(keybindings, "pullRequest.copyNumber")}
1984
- </MenuShortcut>
1985
- </MenuItem>
1986
- {detail.state === "open" && can("close") ? (
1987
- <>
1988
- <MenuSeparator />
1989
- <MenuItem
1990
- closeOnClick={inlineConfirm.isArmed("close")}
1991
- aria-label={
1992
- inlineConfirm.isArmed("close") ? "Confirm close?" : "Close pull request"
1993
- }
1994
- variant="destructive"
1995
- disabled={actionPending}
1996
- {...inlineConfirm.props("close", () => void perform("close"))}
1997
- >
1998
- <PullRequestGlyph.closed className="size-3.5" />
1999
- {inlineConfirm.isArmed("close") ? "Confirm close?" : "Close pull request"}
2000
- </MenuItem>
2001
- </>
2002
- ) : detail.state === "closed" && can("reopen") ? (
2003
- <>
2004
- <MenuSeparator />
2005
- <MenuItem disabled={actionPending} onClick={() => void perform("reopen")}>
2006
- <PullRequestGlyph.reopen className="size-3.5" />
2007
- Reopen pull request
2008
- </MenuItem>
2009
- </>
2010
- ) : detail.state === "merged" && can("revert") ? (
2011
- <>
2012
- <MenuSeparator />
2013
- <MenuItem
2014
- closeOnClick={inlineConfirm.isArmed("revert")}
2015
- aria-label={
2016
- inlineConfirm.isArmed("revert") ? "Confirm revert?" : "Revert changes"
2017
- }
2018
- variant={inlineConfirm.isArmed("revert") ? "destructive" : "default"}
2019
- disabled={actionPending}
2020
- {...inlineConfirm.props("revert", () => void perform("revert"))}
2021
- >
2022
- <RotateCcwIcon className="size-3.5" />
2023
- {inlineConfirm.isArmed("revert") ? "Confirm revert?" : "Revert changes"}
2024
- </MenuItem>
2025
- </>
2026
- ) : null}
2027
- {showsDeleteBranch ? (
2028
- <>
2029
- <MenuSeparator />
2030
- <MenuItem
2031
- variant="destructive"
2032
- disabled={actionPending || !environmentConnected}
2033
- onClick={() => void confirmDeleteBranch()}
2034
- >
2035
- <Trash2Icon className="mt-1 size-3.5 shrink-0 self-start" />
2036
- <span className="flex min-w-0 flex-col">
2037
- <span>
2038
- {pendingAction === "delete-branch"
2039
- ? "Deleting branch..."
2040
- : "Delete branch"}
2041
- </span>
2042
- <span className="truncate text-xs text-muted-foreground">
2043
- {environmentConnected
2044
- ? detail.headBranch
2045
- : "Reconnect to delete this branch"}
2046
- </span>
2047
- </span>
2048
- </MenuItem>
2049
- </>
2050
- ) : null}
2051
- </MenuPopup>
2052
- </Menu>
1493
+ <PullRequestActionsMenu
1494
+ environmentId={environmentId}
1495
+ reference={reference}
1496
+ pullRequestKey={pullRequestKey}
1497
+ detail={detail}
1498
+ linkThreadRef={
1499
+ threadRef ??
1500
+ (typeof composerDraftTarget === "object" ? composerDraftTarget : null)
1501
+ }
1502
+ onThreadPickerOpenChange={setThreadPickerOpen}
1503
+ refreshing={refreshing}
1504
+ refreshFromHost={refreshFromHost}
1505
+ handoff={handoff}
1506
+ attachesToComposer={attachTarget !== null}
1507
+ askAboutPullRequest={askAboutPullRequest}
1508
+ explainPullRequest={explainPullRequest}
1509
+ canFixFindings={canFixFindings}
1510
+ startFixFindings={startFixFindings}
1511
+ handoffLabels={handoffLabels}
1512
+ canWriteGuide={reviewGuidesEnabled && guideWriter.canWrite}
1513
+ guideRunning={guideWriter.running}
1514
+ guideWritten={guideWriter.data?.guide != null}
1515
+ writeGuide={writeGuide}
1516
+ pickableEnvironments={pickableEnvironments}
1517
+ actingEnvironmentId={actingEnvironmentId}
1518
+ onActingEnvironmentChange={selectActingEnvironment}
1519
+ can={can}
1520
+ autoMergeArmed={autoMergeArmed}
1521
+ showsDraftToggle={showsDraftToggle}
1522
+ showsMergeNow={showsMergeNow}
1523
+ showsAutoMerge={showsAutoMerge}
1524
+ showsMergeMethods={showsMergeMethods}
1525
+ allowedMergeMethods={allowedMergeMethods}
1526
+ selectedMergeMethod={selectedMergeMethod}
1527
+ onSelectMergeMethod={selectMergeMethod}
1528
+ showsDeleteBranch={showsDeleteBranch}
1529
+ environmentConnected={environmentConnected}
1530
+ confirmDeleteBranch={confirmDeleteBranch}
1531
+ pendingAction={pendingAction}
1532
+ perform={perform}
1533
+ openOnHostText={openOnHostText}
1534
+ copyReference={copyReference}
1535
+ />
1536
</TooltipProvider>
1537
) : null}
1538
{onClose ? (
@@ -2243,54 +1726,11 @@ export function PullRequestDetailPanel({
1726
>
1727
{tab === "summary" ? (
1728
showsApproveWorkflows ? (
2246
- <Tooltip>
2247
- <TooltipTrigger
2248
- render={
2249
- <span className="ml-auto inline-flex shrink-0">
2250
- <Button
2251
- size="xs"
2252
- variant="warning-outline"
2253
- disabled={actionPending}
2254
- {...inlineConfirm.props(
2255
- "approve-workflows",
2256
- () => void perform("approve-workflows"),
2257
- )}
2258
- aria-label={
2259
- pendingAction === "approve-workflows"
2260
- ? "Approving..."
2261
- : inlineConfirm.isArmed("approve-workflows")
2262
- ? "Confirm approve?"
2263
- : "Approve workflows to run"
2264
- }
2265
- >
2266
- <PlayIcon aria-hidden className="size-3.5" />
2267
- <span className="inline-grid">
2268
- <span aria-hidden className="invisible col-start-1 row-start-1">
2269
- Approve workflows to run
2270
- </span>
2271
- <span aria-hidden className="invisible col-start-1 row-start-1">
2272
- Confirm approve?
2273
- </span>
2274
- <span className="col-start-1 row-start-1">
2275
- {pendingAction === "approve-workflows"
2276
- ? "Approving..."
2277
- : inlineConfirm.isArmed("approve-workflows")
2278
- ? "Confirm approve?"
2279
- : "Approve workflows to run"}
2280
- </span>
2281
- </span>
2282
- </Button>
2283
- </span>
2284
- }
2285
- />
2286
- <TooltipPopup side="top">
2287
- {pendingAction === "approve-workflows"
2288
- ? "Approving..."
2289
- : inlineConfirm.isArmed("approve-workflows")
2290
- ? "Confirm approve?"
2291
- : "Approve workflows to run"}
2292
- </TooltipPopup>
2293
- </Tooltip>
1729
+ <PullRequestApproveWorkflowsButton
1730
+ pullRequestKey={pullRequestKey}
1731
+ pendingAction={pendingAction}
1732
+ perform={perform}
1733
+ />
1734
) : (
1735
<PullRequestChecksStatusLine
1736
className="text-muted-foreground"