From d37df0e83f24bdce8426e3d524c37b30395b8582 Mon Sep 17 00:00:00 2001 From: luke2x <97411838+luke2x@users.noreply.github.com> Date: Mon, 2 Nov 2026 02:10:57 +0000 Subject: [PATCH 1/3] perf(web): reuse repeated inline skill lookups --- packages/shared/src/inlineSkills.test.ts | 36 +++++++++++++++++++++++- packages/shared/src/inlineSkills.ts | 9 +++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/inlineSkills.test.ts b/packages/shared/src/inlineSkills.test.ts index 9413148cee9e7..076cc1ae43516 100644 --- a/packages/shared/src/inlineSkills.test.ts +++ b/packages/shared/src/inlineSkills.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "vite-plus/test"; -import { formatProviderSkillDisplayName } from "./inlineSkills.ts"; +import { formatProviderSkillDisplayName, matchInlineSkills } from "./inlineSkills.ts"; describe("formatProviderSkillDisplayName", () => { it.each([ @@ -17,3 +17,37 @@ describe("formatProviderSkillDisplayName", () => { ); }); }); + +describe("matchInlineSkills", () => { + it("preserves offsets, skill identity, first-name precedence, and unknown tokens", () => { + const first = { name: "design", displayName: "Design" }; + const duplicate = { name: "design", displayName: "Other design" }; + const namespaced = { name: "pdf:pdf" }; + expect([ + ...matchInlineSkills("Use $design then $missing and $pdf:pdf, $pdf:pdf $design", [ + first, + duplicate, + namespaced, + ]), + ]).toEqual([ + { start: 4, end: 11, skill: first, rawText: "$design" }, + { start: 40, end: 48, skill: namespaced, rawText: "$pdf:pdf" }, + { start: 49, end: 56, skill: first, rawText: "$design" }, + ]); + }); + + it("bounds name reads for repeated known and unknown tokens", () => { + let nameReads = 0; + const skills = Array.from({ length: 128 }, (_, index) => ({ + get name() { + nameReads += 1; + return `skill-${index}`; + }, + })); + const text = Array.from({ length: 100 }, () => "$skill-127 $missing").join(" "); + const matches = [...matchInlineSkills(text, skills)]; + expect(matches).toHaveLength(100); + expect(matches.every((match) => match.skill === skills[127])).toBe(true); + expect(nameReads).toBeLessThanOrEqual(2 * skills.length); + }); +}); diff --git a/packages/shared/src/inlineSkills.ts b/packages/shared/src/inlineSkills.ts index 7a8c05f4e2b5b..aacbc38cf65d2 100644 --- a/packages/shared/src/inlineSkills.ts +++ b/packages/shared/src/inlineSkills.ts @@ -15,9 +15,16 @@ export function* matchInlineSkills( text: string, skills: readonly Skill[], ) { + const byName = new Map(); for (const match of text.matchAll(SKILL_TOKEN_REGEX)) { const name = match[2] ?? ""; - const skill = skills.find((candidate) => candidate.name === name); + if (!byName.has(name)) { + byName.set( + name, + skills.find((candidate) => candidate.name === name), + ); + } + const skill = byName.get(name); if (!skill) continue; const start = match.index + (match[1]?.length ?? 0); yield { start, end: match.index + match[0].length, skill, rawText: `$${name}` }; From c993abe9401897c582d57dee4e903762c395c9fd Mon Sep 17 00:00:00 2001 From: maria-rcks Date: Mon, 2 Nov 2026 22:12:59 +0000 Subject: [PATCH 2/3] test(shared): drop getter-count inline skill assertion --- packages/shared/src/inlineSkills.test.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/shared/src/inlineSkills.test.ts b/packages/shared/src/inlineSkills.test.ts index 076cc1ae43516..5b0aed536a10c 100644 --- a/packages/shared/src/inlineSkills.test.ts +++ b/packages/shared/src/inlineSkills.test.ts @@ -35,19 +35,4 @@ describe("matchInlineSkills", () => { { start: 49, end: 56, skill: first, rawText: "$design" }, ]); }); - - it("bounds name reads for repeated known and unknown tokens", () => { - let nameReads = 0; - const skills = Array.from({ length: 128 }, (_, index) => ({ - get name() { - nameReads += 1; - return `skill-${index}`; - }, - })); - const text = Array.from({ length: 100 }, () => "$skill-127 $missing").join(" "); - const matches = [...matchInlineSkills(text, skills)]; - expect(matches).toHaveLength(100); - expect(matches.every((match) => match.skill === skills[127])).toBe(true); - expect(nameReads).toBeLessThanOrEqual(2 * skills.length); - }); }); From ca27c136898bcc2180f3630a55e45ea82d28162e Mon Sep 17 00:00:00 2001 From: luke2x <97411838+luke2x@users.noreply.github.com> Date: Tue, 3 Nov 2026 10:53:37 +0000 Subject: [PATCH 3/3] test(shared): assert inline skill identity --- packages/shared/src/inlineSkills.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/inlineSkills.test.ts b/packages/shared/src/inlineSkills.test.ts index 5b0aed536a10c..dde40480cab01 100644 --- a/packages/shared/src/inlineSkills.test.ts +++ b/packages/shared/src/inlineSkills.test.ts @@ -23,16 +23,20 @@ describe("matchInlineSkills", () => { const first = { name: "design", displayName: "Design" }; const duplicate = { name: "design", displayName: "Other design" }; const namespaced = { name: "pdf:pdf" }; - expect([ + const matches = [ ...matchInlineSkills("Use $design then $missing and $pdf:pdf, $pdf:pdf $design", [ first, duplicate, namespaced, ]), - ]).toEqual([ + ]; + expect(matches).toEqual([ { start: 4, end: 11, skill: first, rawText: "$design" }, { start: 40, end: 48, skill: namespaced, rawText: "$pdf:pdf" }, { start: 49, end: 56, skill: first, rawText: "$design" }, ]); + expect(matches[0]?.skill).toBe(first); + expect(matches[1]?.skill).toBe(namespaced); + expect(matches[2]?.skill).toBe(first); }); });