88 squashAtomCommandFailure ,
99} from "@t3tools/client-runtime/state/runtime" ;
1010import { useDebouncedValue } from "@tanstack/react-pacer" ;
11- import { useCallback , useEffect , useMemo , useRef , useState } from "react" ;
11+ import { useEffect , useRef , useState } from "react" ;
1212
1313import {
1414 readCachedPullRequestResolution ,
@@ -44,6 +44,26 @@ interface PullRequestThreadDialogProps {
4444 onPrepared : ( input : { branch : string ; worktreePath : string | null } ) => Promise < void > | void ;
4545}
4646
47+ // The prepare action keys on this scope, and the compiler would rebuild it every
48+ // render because hooks run after it.
49+ function useSourceControlScope ( environmentId : EnvironmentId , cwd : string | null ) {
50+ "use memo" ;
51+ return { environmentId, cwd } ;
52+ }
53+
54+ function pullRequestStatusTone ( state : string | undefined ) : string {
55+ switch ( state ) {
56+ case "merged" :
57+ return "text-violet-600 dark:text-violet-300/90" ;
58+ case "closed" :
59+ return "text-zinc-500 dark:text-zinc-400/80" ;
60+ case "open" :
61+ return "text-emerald-600 dark:text-emerald-300/90" ;
62+ default :
63+ return "text-muted-foreground" ;
64+ }
65+ }
66+
4767export function PullRequestThreadDialog ( {
4868 open,
4969 environmentId,
@@ -71,10 +91,7 @@ export function PullRequestThreadDialog({
7191 input : { cwd } ,
7292 } ) ,
7393 ) ;
74- const sourceControlPresentation = useMemo (
75- ( ) => getSourceControlPresentation ( gitStatus ?. sourceControlProvider ) ,
76- [ gitStatus ?. sourceControlProvider ] ,
77- ) ;
94+ const sourceControlPresentation = getSourceControlPresentation ( gitStatus ?. sourceControlProvider ) ;
7895 const terminology = sourceControlPresentation . terminology ;
7996 const SourceControlIcon = sourceControlPresentation . Icon ;
8097
@@ -91,25 +108,16 @@ export function PullRequestThreadDialog({
91108
92109 const parsedReference = parsePullRequestReference ( reference ) ;
93110 const parsedDebouncedReference = parsePullRequestReference ( debouncedReference ) ;
94- const sourceControlScope = useMemo (
95- ( ) => ( {
96- environmentId,
97- cwd,
98- } ) ,
99- [ cwd , environmentId ] ,
100- ) ;
111+ const sourceControlScope = useSourceControlScope ( environmentId , cwd ) ;
101112 const pullRequestResolution = usePullRequestResolution ( {
102113 ...sourceControlScope ,
103114 reference : open ? parsedDebouncedReference : null ,
104115 } ) ;
105- const cachedPullRequest = useMemo ( ( ) => {
106- return (
107- readCachedPullRequestResolution ( {
108- ...sourceControlScope ,
109- reference : parsedReference ,
110- } ) ?. pullRequest ?? null
111- ) ;
112- } , [ parsedReference , sourceControlScope ] ) ;
116+ const cachedPullRequest =
117+ readCachedPullRequestResolution ( {
118+ ...sourceControlScope ,
119+ reference : parsedReference ,
120+ } ) ?. pullRequest ?? null ;
113121 const preparePullRequestThreadAction = usePreparePullRequestThreadAction ( sourceControlScope ) ;
114122 const canOperateThread = useEnvironmentScope ( environmentId , AuthOrchestrationOperateScope ) ;
115123
@@ -126,74 +134,50 @@ export function PullRequestThreadDialog({
126134 parsedReference !== parsedDebouncedReference ||
127135 pullRequestResolution . isPending ||
128136 pullRequestResolution . isFetching ) ;
129- const statusTone = useMemo ( ( ) => {
130- switch ( resolvedPullRequest ?. state ) {
131- case "merged" :
132- return "text-violet-600 dark:text-violet-300/90" ;
133- case "closed" :
134- return "text-zinc-500 dark:text-zinc-400/80" ;
135- case "open" :
136- return "text-emerald-600 dark:text-emerald-300/90" ;
137- default :
138- return "text-muted-foreground" ;
139- }
140- } , [ resolvedPullRequest ?. state ] ) ;
137+ const statusTone = pullRequestStatusTone ( resolvedPullRequest ?. state ) ;
141138
142- const handleConfirm = useCallback (
143- async ( mode : "local" | "worktree" ) => {
144- if ( ! preparePullRequestThreadAction . isAllowed ) return ;
145- if (
146- mode === "worktree" &&
147- ! readEnvironmentScope ( environmentId , AuthOrchestrationOperateScope )
148- ) {
149- return ;
150- }
151- if ( ! parsedReference ) {
152- setReferenceDirty ( true ) ;
153- return ;
154- }
155- if ( ! parsedReference || ! resolvedPullRequest || ! cwd ) {
156- return ;
157- }
158- setPrepareErrorMessage ( null ) ;
159- setPreparingMode ( mode ) ;
160- const result = await preparePullRequestThreadAction . run ( {
161- reference : parsedReference ,
162- mode,
163- ...( mode === "worktree" ? { threadId } : { } ) ,
164- } ) ;
165- setPreparingMode ( null ) ;
166- if ( result . _tag === "Failure" ) {
167- if ( isAtomCommandInterrupted ( result ) ) {
168- preparePullRequestThreadAction . resetError ( ) ;
169- } else {
170- const error = squashAtomCommandFailure ( result ) ;
171- setPrepareErrorMessage (
172- error instanceof Error
173- ? error . message
174- : `Failed to prepare ${ terminology . singular } thread.` ,
175- ) ;
176- }
177- return ;
139+ const handleConfirm = async ( mode : "local" | "worktree" ) => {
140+ if ( ! preparePullRequestThreadAction . isAllowed ) return ;
141+ if (
142+ mode === "worktree" &&
143+ ! readEnvironmentScope ( environmentId , AuthOrchestrationOperateScope )
144+ ) {
145+ return ;
146+ }
147+ if ( ! parsedReference ) {
148+ setReferenceDirty ( true ) ;
149+ return ;
150+ }
151+ if ( ! parsedReference || ! resolvedPullRequest || ! cwd ) {
152+ return ;
153+ }
154+ setPrepareErrorMessage ( null ) ;
155+ setPreparingMode ( mode ) ;
156+ const result = await preparePullRequestThreadAction . run ( {
157+ reference : parsedReference ,
158+ mode,
159+ ...( mode === "worktree" ? { threadId } : { } ) ,
160+ } ) ;
161+ setPreparingMode ( null ) ;
162+ if ( result . _tag === "Failure" ) {
163+ if ( isAtomCommandInterrupted ( result ) ) {
164+ preparePullRequestThreadAction . resetError ( ) ;
165+ } else {
166+ const error = squashAtomCommandFailure ( result ) ;
167+ setPrepareErrorMessage (
168+ error instanceof Error
169+ ? error . message
170+ : `Failed to prepare ${ terminology . singular } thread.` ,
171+ ) ;
178172 }
179- await onPrepared ( {
180- branch : result . value . branch ,
181- worktreePath : result . value . worktreePath ,
182- } ) ;
183- onOpenChange ( false ) ;
184- } ,
185- [
186- cwd ,
187- environmentId ,
188- onOpenChange ,
189- onPrepared ,
190- parsedReference ,
191- preparePullRequestThreadAction ,
192- resolvedPullRequest ,
193- terminology . singular ,
194- threadId ,
195- ] ,
196- ) ;
173+ return ;
174+ }
175+ await onPrepared ( {
176+ branch : result . value . branch ,
177+ worktreePath : result . value . worktreePath ,
178+ } ) ;
179+ onOpenChange ( false ) ;
180+ } ;
197181
198182 const validationMessage = ! referenceDirty
199183 ? null
0 commit comments