Skip to content

Commit 59754ba

Browse files
fix(composer): resolve numeric PR references in linked repositories (#295)
1 parent 465efe3 commit 59754ba

12 files changed

Lines changed: 361 additions & 46 deletions

File tree

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
541541
const composerMenu = useComposerCommandMenu({
542542
draftMessage: props.draftMessage,
543543
ownerKey: composerOwnerKey,
544+
draftKey: composerDraftKey,
544545
environmentId: props.environmentId,
545546
threadShells: useThreadShells(),
546547
projects: useProjects(),

‎apps/mobile/src/features/threads/use-composer-command-menu.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ vi.mock("../../state/queries", () => ({
2121
}));
2222
vi.mock("../../state/use-composer-drafts", () => ({
2323
getComposerDraftSnapshot: vi.fn(),
24+
useComposerDraft: () => ({ text: "", attachments: [] }),
2425
readComposerDraftSelection: vi.fn(),
2526
setComposerDraftContext: vi.fn(),
2627
}));
28+
vi.mock("../../state/threads", () => ({
29+
useEnvironmentThread: () => ({ data: { _tag: "None" } }),
30+
}));
2731
vi.mock("../../lib/uuid", () => ({ uuidv4: () => "context-id" }));
2832
vi.mock("../../state/server", () => ({
2933
serverEnvironment: { refreshProviders: Symbol("refreshProviders") },

‎apps/mobile/src/features/threads/use-composer-command-menu.ts‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as Option from "effect/Option";
2+
import { useEnvironmentThread } from "../../state/threads";
13
import type {
24
ComposerContextRecord,
35
EnvironmentId,
@@ -32,6 +34,7 @@ import { pullRequestComposerContext, threadComposerContext } from "../../lib/com
3234
import { uuidv4 } from "../../lib/uuid";
3335
import {
3436
getComposerDraftSnapshot,
37+
useComposerDraft,
3538
readComposerDraftSelection,
3639
setComposerDraftContext,
3740
} from "../../state/use-composer-drafts";
@@ -186,6 +189,7 @@ export function resolveComposerCommandSelection(input: {
186189
export function useComposerCommandMenu({
187190
draftMessage,
188191
ownerKey,
192+
draftKey,
189193
environmentId,
190194
threadShells = EMPTY_THREAD_SHELLS,
191195
projects = EMPTY_PROJECTS,
@@ -206,6 +210,7 @@ export function useComposerCommandMenu({
206210
}: {
207211
readonly draftMessage: string;
208212
readonly ownerKey: string | null;
213+
readonly draftKey?: string;
209214
readonly environmentId: EnvironmentId | null;
210215
/** Candidates for `@` thread suggestions; the caller reads them from the entity store. */
211216
readonly threadShells?: ReadonlyArray<EnvironmentThreadShell>;
@@ -436,10 +441,30 @@ export function useComposerCommandMenu({
436441
onChange: (tab: ComposerPathTab) => setPathTabChoice({ rangeStart, tab }),
437442
};
438443
}, [agentFleet, chatItems, pathSearch.entries, pathSearch.isPending, pathTabChoice, trigger]);
444+
const referenceDraft = useComposerDraft(draftKey ?? ownerKey);
445+
const referenceThread = useEnvironmentThread(
446+
trigger?.kind === "pull-request" ? environmentId : null,
447+
currentThreadId,
448+
);
449+
const referenceMessages = Option.getOrNull(referenceThread.data)?.messages ?? [];
450+
const pullRequestRemoteUrls = useMemo(
451+
() =>
452+
[
453+
...(referenceDraft.context?.records ?? []),
454+
...referenceMessages.flatMap((message) => message.context?.records ?? []),
455+
].flatMap((record) =>
456+
record.kind === "repository" && "remoteUrl" in record ? [record.remoteUrl] : [],
457+
),
458+
[referenceDraft.context, referenceMessages],
459+
);
439460
const pullRequestSearch = useComposerPullRequestSearch({
440461
environmentId,
441462
projectId: pullRequestProjectId,
442463
repository: pullRequestRepository,
464+
remoteUrls: pullRequestRemoteUrls,
465+
pullRequests: threadShells.find(
466+
(thread) => thread.environmentId === environmentId && thread.id === currentThreadId,
467+
)?.pullRequests,
443468
query: trigger?.kind === "pull-request" ? trigger.query : null,
444469
});
445470

@@ -448,7 +473,7 @@ export function useComposerCommandMenu({
448473

449474
if (trigger.kind === "pull-request") {
450475
return pullRequestSearch.entries.map((entry) => ({
451-
id: `pr:${entry.projectId}:${entry.repository}:${entry.number}`,
476+
id: `pr:${entry.url}`,
452477
type: "pull-request",
453478
pullRequest: {
454479
number: entry.number,
@@ -460,7 +485,7 @@ export function useComposerCommandMenu({
460485
isDraft: entry.isDraft,
461486
},
462487
label: `#${entry.number}`,
463-
description: `${entry.isDraft ? "Draft" : entry.state} · ${entry.title}`,
488+
description: `${entry.repository} · ${entry.isDraft ? "Draft" : entry.state} · ${entry.title}`,
464489
}));
465490
}
466491

‎apps/mobile/src/state/queries.ts‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { filterComposerPullRequestMatches } from "@t3tools/shared/composerPullRequestMatches";
1+
import { createComposerPullRequestLookupAtomFamily } from "@t3tools/client-runtime/state/pull-requests";
2+
import type { ThreadPullRequestLink } from "@t3tools/contracts";
3+
import {
4+
composerPullRequestRepositories,
5+
filterComposerPullRequestMatches,
6+
} from "@t3tools/shared/composerPullRequestMatches";
27
import { resolveFilesystemReadAccess } from "@t3tools/client-runtime/state/filesystem";
38
import { environmentSession } from "./session";
49
import { useEnvironmentPresentation } from "./presentation";
@@ -82,11 +87,15 @@ export function useDebouncedValue<A>(value: A, delayMs: number): A {
8287
* `#` opens and each keystroke filters them locally; a word also searches the host once typing
8388
* settles, and the last search stays visible while the next one loads.
8489
*/
90+
const exactLookup = createComposerPullRequestLookupAtomFamily(composerPullRequests.detail);
91+
8592
export function useComposerPullRequestSearch(input: {
8693
environmentId: EnvironmentId | null;
8794
projectId: ProjectId | null;
8895
repository: string | null;
8996
query: string | null;
97+
pullRequests?: ReadonlyArray<ThreadPullRequestLink>;
98+
remoteUrls?: ReadonlyArray<string>;
9099
}) {
91100
const open =
92101
input.query !== null &&
@@ -115,26 +124,43 @@ export function useComposerPullRequestSearch(input: {
115124

116125
const rawNumber = open && numeric && input.query ? Number(input.query) : null;
117126
const number = useDebouncedValue(rawNumber, 180) === rawNumber ? rawNumber : null;
118-
const hasExact = base.data?.entries.some(
119-
(entry) =>
120-
entry.number === number && entry.repository.toLowerCase() === input.repository?.toLowerCase(),
121-
);
122-
const exact = useEnvironmentQuery(
123-
open && number !== null && Number.isSafeInteger(number) && number > 0 && !hasExact
124-
? composerPullRequests.detail({
125-
environmentId: input.environmentId!,
126-
input: { projectId: input.projectId!, repository: input.repository!, number },
127-
})
128-
: null,
127+
const repositories = useMemo(
128+
() =>
129+
input.projectId !== null && input.repository !== null
130+
? composerPullRequestRepositories({
131+
projectId: input.projectId,
132+
repository: input.repository,
133+
remoteUrls: input.remoteUrls ?? [],
134+
pullRequests: input.pullRequests ?? [],
135+
})
136+
: [],
137+
[input.projectId, input.repository, input.pullRequests, input.remoteUrls],
129138
);
139+
const targets =
140+
open && number !== null && Number.isSafeInteger(number) && number > 0
141+
? repositories
142+
.filter(
143+
(scope) =>
144+
!base.data?.entries.some(
145+
(entry) =>
146+
entry.number === number &&
147+
entry.repository.toLowerCase() === scope.repository.toLowerCase() &&
148+
(scope.host === undefined ||
149+
entry.host.toLowerCase() === scope.host.toLowerCase()),
150+
),
151+
)
152+
.map((scope) => ({ environmentId: input.environmentId!, input: { ...scope, number } }))
153+
: [];
154+
const exact = useAtomValue(exactLookup(JSON.stringify(targets)));
130155
const entries = useMemo(() => {
131156
if (!open) return [];
132-
const exactEntries = exact.data && exact.data.number === rawNumber ? [exact.data] : [];
157+
const exactEntries = exact.entries.filter((entry) => entry.number === rawNumber);
133158
if (numeric) {
134159
return filterComposerPullRequestMatches({
135160
entries: [...exactEntries, ...(base.data?.entries ?? [])],
136161
projectId: input.projectId!,
137162
repository: input.repository!,
163+
repositories,
138164
query: input.query ?? "",
139165
limit: 20,
140166
});
@@ -158,7 +184,8 @@ export function useComposerPullRequestSearch(input: {
158184
.slice(0, 20);
159185
}, [
160186
base.data,
161-
exact.data,
187+
exact.entries,
188+
repositories,
162189
freshSearch,
163190
input.projectId,
164191
input.query,
@@ -176,7 +203,7 @@ export function useComposerPullRequestSearch(input: {
176203
(textQuery !== null && (settledTextQuery === null || search.isPending)) ||
177204
rawNumber !== number ||
178205
exact.isPending),
179-
error: base.error ?? base.data?.errors[0]?.message ?? search.error ?? exact.error,
206+
error: base.error ?? base.data?.errors[0]?.message ?? search.error,
180207
};
181208
}
182209

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,10 @@ import {
195195
type TerminalContextSelection,
196196
} from "../../lib/terminalContext";
197197
import { useComposerPathSearch } from "../../lib/composerPathSearchState";
198-
import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
198+
import {
199+
collectComposerContextReferences,
200+
replaceComposerContextReferences,
201+
} from "@t3tools/shared/composerContextReferences";
199202
import {
200203
type ComposerObjectLink,
201204
findComposerObjectLinks,
@@ -2862,10 +2865,34 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
28622865
const referenceTab: ComposerReferenceTab = referenceMenuOpen
28632866
? (referenceTabPickedByHand ?? predictedReferenceTab)
28642867
: "pull-requests";
2868+
const threadRepositoryRemoteUrls = useMemo(
2869+
() =>
2870+
promptHistoryMessages.flatMap((message) =>
2871+
(message.context?.records ?? []).flatMap((record) =>
2872+
record.kind === "repository" && "remoteUrl" in record ? [record.remoteUrl] : [],
2873+
),
2874+
),
2875+
[promptHistoryMessages],
2876+
);
2877+
const pullRequestRemoteUrls = useMemo(() => {
2878+
const referencedIds = new Set(
2879+
collectComposerContextReferences(prompt)
2880+
.filter((reference) => reference.kind === "repository")
2881+
.map((reference) => reference.contextId),
2882+
);
2883+
return [
2884+
...threadRepositoryRemoteUrls,
2885+
...composerRepositoryContexts
2886+
.filter((record) => referencedIds.has(record.contextId))
2887+
.map((record) => record.remoteUrl),
2888+
];
2889+
}, [composerRepositoryContexts, prompt, threadRepositoryRemoteUrls]);
28652890
const pullRequestMenu = useComposerPullRequestItems({
28662891
environmentId,
28672892
projectId: pullRequestProjectId,
28682893
repository: pullRequestRepository,
2894+
remoteUrls: pullRequestRemoteUrls,
2895+
pullRequests: (activeThread ?? props.activeThreadShell)?.pullRequests ?? [],
28692896
enabled: referenceMenuOpen,
28702897
active: referenceTab === "pull-requests",
28712898
query: referenceQuery,

‎apps/web/src/components/chat/useComposerPullRequestItems.ts‎

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
import { filterComposerPullRequestMatches } from "@t3tools/shared/composerPullRequestMatches";
1+
import {
2+
composerPullRequestRepositories,
3+
filterComposerPullRequestMatches,
4+
} from "@t3tools/shared/composerPullRequestMatches";
25
import type {
36
EnvironmentId,
47
ProjectId,
58
PullRequestListEntry,
69
PullRequestListInput,
10+
ThreadPullRequestLink,
711
} from "@t3tools/contracts";
812
import { useMemo, useState } from "react";
913

1014
import { pullRequestEnvironment, usePullRequestList } from "~/state/pullRequests";
1115
import { 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";
1318
import {
1419
matchesPullRequestQuery,
1520
rankPullRequestMatches,
1621
} from "../pullRequest/pullRequestList.logic";
1722
import type { ComposerReferenceItem } from "./composerReferenceMenu.logic";
1823

24+
const exactLookup = createComposerPullRequestLookupAtomFamily(pullRequestEnvironment.detail);
25+
1926
const PULL_REQUEST_SEARCH_DEBOUNCE_MS = 180;
2027
const PULL_REQUEST_LIST_LIMIT = 99;
2128
const PULL_REQUEST_RESULT_LIMIT = 12;
@@ -39,7 +46,7 @@ type PullRequestRow = Pick<
3946

4047
function 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

Comments
 (0)