@devries-cameron20 / t3code Mirror · read-only / commits / 9b313f2f09
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 09:45 UTC

fix(composer): open PR completion after opening brackets (#37827)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Alex Vallone committed Nov 16, 2026 at 17:34 UTC 9b313f2f09dced56b9d454371efae2de471216cf
5 files changed +73 -19
apps/web/src/composer-logic.ts
+7 -10
@@ -9,7 +9,11 @@ import {
9 serializeAssistantCitation,
10 withAssistantCitationComment,
11 } from "@t3tools/shared/assistantCitations";
12 -import { isCurrencyAmountQuery, isPathWord } from "@t3tools/shared/composerTrigger";
12 +import {
13 + detectComposerPullRequestTrigger,
14 + isCurrencyAmountQuery,
15 + isPathWord,
16 +} from "@t3tools/shared/composerTrigger";
17 import {
18 splitPromptIntoComposerSegments,
19 type ComposerPromptSegment,
@@ -268,15 +272,8 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
272 rangeEnd: cursor,
273 };
274 }
271 - const pullRequestMatch = /^#([\p{L}\p{N}][\p{L}\p{N}_-]*)?$/u.exec(token);
272 - if (pullRequestMatch) {
273 - return {
274 - kind: "pull-request",
275 - query: pullRequestMatch[1] ?? "",
276 - rangeStart: tokenStart,
277 - rangeEnd: cursor,
278 - };
279 - }
275 + const pullRequestTrigger = detectComposerPullRequestTrigger(token, cursor);
276 + if (pullRequestTrigger) return pullRequestTrigger;
277 const skillPrefix = /^\p{Sc}/u.exec(token);
278 if (skillPrefix) {
279 if (isCurrencyAmountQuery(token.slice(skillPrefix[0].length))) return null;
packages/shared/src/composerContextReferences.test.ts
+6
@@ -80,6 +80,12 @@ describe("labels and reference links", () => {
80 for (const occurrence of occurrences) {
81 expect(text.slice(occurrence.start, occurrence.end)).toBe(occurrence.source);
82 }
83 + const reference = "[#30296](t3-context://v1/review-comment/ctx_pr)";
84 + expect(collectComposerContextReferences(`[${reference}]`)[0]).toMatchObject({
85 + label: "#30296",
86 + source: reference,
87 + start: 1,
88 + });
89 });
90
91 it("recognizes a prompt made only of image references", () => {
packages/shared/src/composerContextReferences.ts
+1 -1
@@ -19,7 +19,7 @@ const CONTEXT_KIND_PATTERN = /^[a-z][a-z0-9-]{0,39}$/;
19 const CONTEXT_ID_PATTERN = /^[a-z0-9_-]{1,128}$/i;
20 const MAX_LINK_LABEL_LENGTH = 512;
21 const CONTEXT_LINK = new RegExp(
22 - String.raw`(!?)\[([^\]\n]{0,${MAX_LINK_LABEL_LENGTH}})\]\((${COMPOSER_CONTEXT_HREF_PREFIX}[^\s)]{1,200})\)`,
22 + String.raw`(!?)\[([^[\]\n]{0,${MAX_LINK_LABEL_LENGTH}})\]\((${COMPOSER_CONTEXT_HREF_PREFIX}[^\s)]{1,200})\)`,
23 "g",
24 );
25
packages/shared/src/composerTrigger.test.ts
+44
@@ -64,6 +64,50 @@ describe("detectComposerTrigger", () => {
64 (text) => expect(detectComposerTrigger(text, text.length)).toBeNull(),
65 );
66
67 + it.each([
68 + ["", "", ""],
69 + ["Compare ", "8737", ""],
70 + ["Compare (", "", ")"],
71 + ["Compare(", "fix-name", ")"],
72 + ["((", "fix_name", "))"],
73 + ["[", "8737", "]"],
74 + ["{", "8737", "}"],
75 + ["【", "修正", "】"],
76 + ])("keeps brackets outside the PR range after %j", (prefix, query, suffix) => {
77 + const text = `${prefix}#${query}`;
78 + expect(detectComposerTrigger(`${text}${suffix}`, text.length)).toEqual({
79 + kind: "pull-request",
80 + query,
81 + rangeStart: prefix.length,
82 + rangeEnd: text.length,
83 + });
84 + });
85 +
86 + it.each([
87 + "# Heading",
88 + "issue#123",
89 + "https://example.com/#123",
90 + "(#123)",
91 + "[issue#123",
92 + "[#_fix",
93 + "]#123",
94 + ])("does not detect a pull request in %j", (text) => {
95 + expect(detectComposerTrigger(text, text.length)).toBeNull();
96 + });
97 +
98 + it.each([
99 + ["@src/(#1", "path", "src/(#1"],
100 + ["$review(#1", "skill", "review(#1"],
101 + ])("keeps explicit completion for %j", (token, kind, query) => {
102 + const text = `Use ${token}`;
103 + expect(detectComposerTrigger(text, text.length)).toEqual({
104 + kind,
105 + query,
106 + rangeStart: 4,
107 + rangeEnd: text.length,
108 + });
109 + });
110 +
111 it.each(["$", "€", "𑿝"])("detects %s skill prefixes and their source range", (prefix) => {
112 const text = `Use ${prefix}review`;
113 expect(detectComposerTrigger(text, text.length)).toEqual({
packages/shared/src/composerTrigger.ts
+15 -8
@@ -65,6 +65,19 @@ export function isCurrencyAmountQuery(query: string): boolean {
65 return /^\.?[0-9][0-9,._]*(?:[kKmMbBtT]|[eE][0-9]+)?[.,;:!?)]*$/.test(query);
66 }
67
68 +export function detectComposerPullRequestTrigger(token: string, cursor: number) {
69 + if (/^[@\p{Sc}]/u.test(token)) return null;
70 + const match = /(?:^|\p{Ps})#([\p{L}\p{N}][\p{L}\p{N}_-]*)?$/u.exec(token);
71 + if (!match) return null;
72 + const query = match[1] ?? "";
73 + return {
74 + kind: "pull-request" as const,
75 + query,
76 + rangeStart: cursor - query.length - 1,
77 + rangeEnd: cursor,
78 + };
79 +}
80 +
81 export function detectComposerTrigger(
82 text: string,
83 cursorInput: number,
@@ -88,14 +101,8 @@ export function detectComposerTrigger(
101 rangeEnd: cursor,
102 };
103 }
91 - const pullRequestMatch = /^#([\p{L}\p{N}][\p{L}\p{N}_-]*)?$/u.exec(token);
92 - if (pullRequestMatch)
93 - return {
94 - kind: "pull-request",
95 - query: pullRequestMatch[1] ?? "",
96 - rangeStart: tokenStart,
97 - rangeEnd: cursor,
98 - };
104 + const pullRequestTrigger = detectComposerPullRequestTrigger(token, cursor);
105 + if (pullRequestTrigger) return pullRequestTrigger;
106 const skillPrefix = /^\p{Sc}/u.exec(token);
107 if (skillPrefix) {
108 if (isCurrencyAmountQuery(token.slice(skillPrefix[0].length))) return null;