1- import { filterComposerPullRequestMatches } from "@t3tools/shared/composerPullRequestMatches" ;
1+ import {
2+ composerPullRequestRepositories ,
3+ filterComposerPullRequestMatches ,
4+ } from "@t3tools/shared/composerPullRequestMatches" ;
25import type {
36 EnvironmentId ,
47 ProjectId ,
58 PullRequestListEntry ,
69 PullRequestListInput ,
10+ ThreadPullRequestLink ,
711} from "@t3tools/contracts" ;
812import { useMemo , useState } from "react" ;
913
1014import { pullRequestEnvironment , usePullRequestList } from "~/state/pullRequests" ;
1115import { useDebouncedValue } from "~/state/queries" ;
12- import { useEnvironmentQuery } from "~/state/query" ;
16+ import { useAtomValue } from "@effect/atom-react" ;
17+ import { createComposerPullRequestLookupAtomFamily } from "@t3tools/client-runtime/state/pull-requests" ;
1318import {
1419 matchesPullRequestQuery ,
1520 rankPullRequestMatches ,
1621} from "../pullRequest/pullRequestList.logic" ;
1722import type { ComposerReferenceItem } from "./composerReferenceMenu.logic" ;
1823
24+ const exactLookup = createComposerPullRequestLookupAtomFamily ( pullRequestEnvironment . detail ) ;
25+
1926const PULL_REQUEST_SEARCH_DEBOUNCE_MS = 180 ;
2027const PULL_REQUEST_LIST_LIMIT = 99 ;
2128const PULL_REQUEST_RESULT_LIMIT = 12 ;
@@ -39,7 +46,7 @@ type PullRequestRow = Pick<
3946
4047function toItem ( entry : PullRequestRow ) : ComposerReferenceItem {
4148 return {
42- id : `pull-request:${ entry . projectId } : ${ entry . repository } : ${ entry . number } ` ,
49+ id : `pull-request:${ entry . url } ` ,
4350 type : "pull-request" ,
4451 pullRequest : {
4552 number : entry . number ,
@@ -51,7 +58,7 @@ function toItem(entry: PullRequestRow): ComposerReferenceItem {
5158 isDraft : entry . isDraft ,
5259 } ,
5360 label : `#${ entry . number } ` ,
54- description : entry . title ,
61+ description : ` ${ entry . repository } · ${ entry . title } ` ,
5562 } ;
5663}
5764
@@ -65,6 +72,8 @@ export function useComposerPullRequestItems(input: {
6572 readonly environmentId : EnvironmentId ;
6673 readonly projectId : ProjectId | null ;
6774 readonly repository : string | null ;
75+ readonly remoteUrls : ReadonlyArray < string > ;
76+ readonly pullRequests : ReadonlyArray < ThreadPullRequestLink > ;
6877 readonly enabled : boolean ;
6978 readonly active : boolean ;
7079 readonly query : string ;
@@ -119,22 +128,35 @@ export function useComposerPullRequestItems(input: {
119128 number !== null && number === debouncedNumber && Number . isSafeInteger ( number ) && number > 0
120129 ? number
121130 : null ;
122- const baseHasNumber =
123- settledNumber !== null &&
124- base . data ?. entries . some (
125- ( entry ) =>
126- entry . projectId === projectId &&
127- entry . repository . trim ( ) . toLowerCase ( ) === repository ?. trim ( ) . toLowerCase ( ) &&
128- entry . number === settledNumber ,
129- ) === true ;
130- const exact = useEnvironmentQuery (
131- settledNumber === null || projectId === null || repository === null || baseHasNumber
132- ? null
133- : pullRequestEnvironment . detail ( {
134- environmentId,
135- input : { projectId, repository, number : settledNumber } ,
136- } ) ,
131+ const repositories = useMemo (
132+ ( ) =>
133+ projectId !== null && repository !== null
134+ ? composerPullRequestRepositories ( {
135+ projectId,
136+ repository,
137+ remoteUrls : input . remoteUrls ,
138+ pullRequests : input . pullRequests ,
139+ } )
140+ : [ ] ,
141+ [ projectId , repository , input . remoteUrls , input . pullRequests ] ,
137142 ) ;
143+ const exactTargets =
144+ settledNumber === null
145+ ? [ ]
146+ : repositories
147+ . filter (
148+ ( scope ) =>
149+ ! base . data ?. entries . some (
150+ ( entry ) =>
151+ entry . projectId === scope . projectId &&
152+ entry . repository . toLowerCase ( ) === scope . repository . toLowerCase ( ) &&
153+ ( scope . host === undefined ||
154+ entry . host . toLowerCase ( ) === scope . host . toLowerCase ( ) ) &&
155+ entry . number === settledNumber ,
156+ ) ,
157+ )
158+ . map ( ( scope ) => ( { environmentId, input : { ...scope , number : settledNumber } } ) ) ;
159+ const exact = useAtomValue ( exactLookup ( JSON . stringify ( exactTargets ) ) ) ;
138160
139161 // The last host search, kept so the next keystroke narrows it instead of dropping it.
140162 const freshSearch = settledTextQuery === null ? null : search . data ;
@@ -145,11 +167,12 @@ export function useComposerPullRequestItems(input: {
145167 if ( ! enabled || ! input . active || projectId === null || repository === null ) return [ ] ;
146168 const baseEntries = base . data ?. entries ?? [ ] ;
147169 if ( isNumberQuery ) {
148- const exactEntries = exact . data ?. number === number ? [ exact . data ] : [ ] ;
170+ const exactEntries = exact . entries . filter ( ( entry ) => entry . number === number ) ;
149171 return filterComposerPullRequestMatches ( {
150172 entries : [ ...exactEntries , ...baseEntries ] ,
151173 projectId,
152174 repository,
175+ repositories,
153176 query,
154177 limit : PULL_REQUEST_RESULT_LIMIT ,
155178 } ) . map ( toItem ) ;
@@ -178,7 +201,8 @@ export function useComposerPullRequestItems(input: {
178201 } , [
179202 base . data ,
180203 enabled ,
181- exact . data ,
204+ exact . entries ,
205+ repositories ,
182206 freshSearch ,
183207 input . active ,
184208 isNumberQuery ,
0 commit comments