fix(clients): dedupe skills in composer menus (#8043)

Author: Adamulek123

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

@@ -1,4 +1,5 @@
 import {
+  dedupeProviderSkillsByName,
   getProviderSkillsForSlashMenu,
   getProviderSlashCommandsForSlashMenu,
 } from "@t3tools/client-runtime/providerSkills";
@@ -158,7 +159,9 @@ export function buildComposerCommandItems({
   }
 
   if (trigger.kind === "skill") {
-    const enabledSkills = (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled);
+    const enabledSkills = dedupeProviderSkillsByName(
+      (selectedProviderStatus?.skills ?? []).filter((s) => s.enabled),
+    );
     const normalizedQuery = normalizeSearchQuery(trigger.query, {
       trimLeadingPattern: /^\$+/,
     });

apps/web/src/providerSkillSearch.test.ts

@@ -69,4 +69,17 @@ describe("searchProviderSkills", () => {
       "browser",
     ]);
   });
+
+  it("returns the first enabled definition for each skill name", () => {
+    const skills = [
+      makeSkill({ name: "branch-audit", path: "/Users/matt/.codex/skills/branch-audit/SKILL.md" }),
+      makeSkill({ name: "browser" }),
+      makeSkill({ name: "branch-audit", path: "/Users/matt/.agents/skills/branch-audit/SKILL.md" }),
+    ];
+
+    expect(searchProviderSkills(skills, "").map((skill) => skill.path)).toEqual([
+      "/Users/matt/.codex/skills/branch-audit/SKILL.md",
+      "/tmp/browser/SKILL.md",
+    ]);
+  });
 });

apps/web/src/providerSkillSearch.ts

@@ -1,5 +1,8 @@
 import type { ServerProviderSkill } from "@t3tools/contracts";
-import { formatProviderSkillDisplayName } from "@t3tools/client-runtime/providerSkills";
+import {
+  dedupeProviderSkillsByName,
+  formatProviderSkillDisplayName,
+} from "@t3tools/client-runtime/providerSkills";
 import {
   insertRankedSearchResult,
   normalizeSearchQuery,
@@ -70,7 +73,7 @@ export function searchProviderSkills(
   query: string,
   limit = Number.POSITIVE_INFINITY,
 ): ServerProviderSkill[] {
-  const enabledSkills = skills.filter((skill) => skill.enabled);
+  const enabledSkills = dedupeProviderSkillsByName(skills.filter((skill) => skill.enabled));
   const normalizedQuery = normalizeSearchQuery(query, { trimLeadingPattern: /^\$+/ });
 
   if (!normalizedQuery) {

packages/client-runtime/src/providerSkills.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vite-plus/test";
 
 import {
+  dedupeProviderSkillsByName,
   formatProviderSkillDisplayName,
   getProviderSlashCommandsForSlashMenu,
   getProviderSkillsForSlashMenu,
@@ -26,6 +27,31 @@ describe("formatProviderSkillDisplayName", () => {
   });
 });
 
+describe("dedupeProviderSkillsByName", () => {
+  it("keeps the first resolved skill and preserves unrelated skill order", () => {
+    const firstSkill = {
+      name: "branch-audit",
+      path: "/Users/matt/.codex/skills/branch-audit/SKILL.md",
+      enabled: true,
+    };
+    const otherSkill = {
+      name: "browser",
+      path: "/Users/matt/.agents/skills/browser/SKILL.md",
+      enabled: true,
+    };
+    const duplicateSkill = {
+      name: "Branch-Audit",
+      path: "/Users/matt/.agents/skills/branch-audit/SKILL.md",
+      enabled: true,
+    };
+
+    expect(dedupeProviderSkillsByName([firstSkill, otherSkill, duplicateSkill])).toEqual([
+      firstSkill,
+      otherSkill,
+    ]);
+  });
+});
+
 describe("getProviderSkillsForSlashMenu", () => {
   it("keeps the skill alias when the provider also exposes it as a slash command", () => {
     const askMatt = {
@@ -52,6 +78,49 @@ describe("getProviderSkillsForSlashMenu", () => {
     const skills = [{ name: "ask-matt", path: "/skills/ask-matt/SKILL.md", enabled: true }];
     expect(getProviderSkillsForSlashMenu(skills, false)).toEqual([]);
   });
+
+  it("shows one row when enabled skills share a name", () => {
+    const skills = [
+      {
+        name: "babysit-pr",
+        path: "/Users/matt/.codex/skills/babysit-pr/SKILL.md",
+        enabled: true,
+      },
+      {
+        name: "browser",
+        path: "/Users/matt/.agents/skills/browser/SKILL.md",
+        enabled: true,
+      },
+      {
+        name: "babysit-pr",
+        path: "/Users/matt/.agents/skills/babysit-pr/SKILL.md",
+        enabled: true,
+      },
+    ];
+
+    expect(getProviderSkillsForSlashMenu(skills, true).map((skill) => skill.name)).toEqual([
+      "babysit-pr",
+      "browser",
+    ]);
+  });
+
+  it("keeps an enabled skill when a disabled duplicate appears first", () => {
+    const enabledSkill = {
+      name: "babysit-pr",
+      path: "/Users/matt/.agents/skills/babysit-pr/SKILL.md",
+      enabled: true,
+    };
+    const skills = [
+      {
+        name: "babysit-pr",
+        path: "/Users/matt/.codex/skills/babysit-pr/SKILL.md",
+        enabled: false,
+      },
+      enabledSkill,
+    ];
+
+    expect(getProviderSkillsForSlashMenu(skills, true)).toEqual([enabledSkill]);
+  });
 });
 
 describe("getProviderSlashCommandsForSlashMenu", () => {

packages/client-runtime/src/providerSkills.ts

@@ -25,11 +25,27 @@ export function formatProviderSkillDisplayName(
   return titleCaseWords(skill.name);
 }
 
+export function dedupeProviderSkillsByName(
+  skills: ReadonlyArray<ServerProviderSkill>,
+): ServerProviderSkill[] {
+  const seenNames = new Set<string>();
+  return skills.filter((skill) => {
+    const normalizedName = skill.name.trim().toLowerCase();
+    if (seenNames.has(normalizedName)) {
+      return false;
+    }
+    seenNames.add(normalizedName);
+    return true;
+  });
+}
+
 export function getProviderSkillsForSlashMenu(
   skills: ReadonlyArray<ServerProviderSkill>,
   showSkillsInSlashMenu: boolean,
 ): ServerProviderSkill[] {
-  return showSkillsInSlashMenu ? skills.filter((skill) => skill.enabled) : [];
+  return showSkillsInSlashMenu
+    ? dedupeProviderSkillsByName(skills.filter((skill) => skill.enabled))
+    : [];
 }
 
 export function getProviderSlashCommandsForSlashMenu(