Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

feat(web): redesign skills in `$` menu and in `/` menu (#8009)

Exotic9da0fab08e0e
diff --git a/apps/desktop/src/settings/DesktopClientSettings.test.ts b/apps/desktop/src/settings/DesktopClientSettings.test.ts
index 1a304d582..11030fcc5 100644
--- a/apps/desktop/src/settings/DesktopClientSettings.test.ts
+++ b/apps/desktop/src/settings/DesktopClientSettings.test.ts
@@ -36,6 +36,7 @@ const clientSettings: ClientSettings = {
fontSmoothing: true,
glassOpacity: 80,
planModeEnabled: false,
+ showSkillsInSlashMenu: false,
providerModelPreferences: {},
sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index f06a96582..f29d6c2b4 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -252,7 +252,11 @@ import type { SessionPhase, Thread } from "../../types";
import type { PendingUserInputDraftAnswer } from "../../pendingUserInput";
import type { PendingApproval, PendingUserInput } from "../../session-logic";
import { deriveLatestContextWindowSnapshot } from "../../lib/contextWindow";
-import { formatProviderSkillDisplayName } from "@t3tools/client-runtime/providerSkills";
+import {
+ formatProviderSkillDisplayName,
+ getProviderSlashCommandsForSlashMenu,
+ getProviderSkillsForSlashMenu,
+} from "@t3tools/client-runtime/providerSkills";
import { searchProviderSkills } from "../../providerSkillSearch";
import { useMediaQuery } from "../../hooks/useMediaQuery";
import type { ReviewCommentContext } from "../../reviewCommentContext";
@@ -1107,30 +1111,33 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
] as const)
: []),
] satisfies ReadonlyArray<Extract<ComposerCommandItem, { type: "slash-command" }>>;
- const providerSlashCommandItems = (selectedProviderStatus?.slashCommands ?? []).map(
- (command) => ({
- id: `provider-slash-command:${selectedProvider}:${command.name}`,
- type: "provider-slash-command" as const,
- provider: selectedProvider,
- command,
- label: `/${command.name}`,
- description: command.description ?? command.input?.hint ?? "Run provider command",
- }),
+ const slashMenuSkills = getProviderSkillsForSlashMenu(
+ selectedProviderStatus?.skills ?? [],
+ settings.showSkillsInSlashMenu,
);
+ const providerSlashCommandItems = getProviderSlashCommandsForSlashMenu(
+ selectedProviderStatus?.slashCommands ?? [],
+ slashMenuSkills,
+ ).map((command) => ({
+ id: `provider-slash-command:${selectedProvider}:${command.name}`,
+ type: "provider-slash-command" as const,
+ provider: selectedProvider,
+ command,
+ label: `/${command.name}`,
+ description: command.description ?? command.input?.hint ?? "Run provider command",
+ }));
const query = composerTrigger.query.trim().toLowerCase();
- const skillItems = (selectedProviderStatus?.skills ?? [])
- .filter((skill) => skill.enabled)
- .map((skill) => ({
- id: `skill:${selectedProvider}:${skill.name}`,
- type: "skill" as const,
- provider: selectedProvider,
- skill,
- label: `skill:${skill.name}`,
- description:
- skill.shortDescription ??
- skill.description ??
- (skill.scope ? `${skill.scope} skill` : ""),
- }));
+ const skillItems = slashMenuSkills.map((skill) => ({
+ id: `skill:${selectedProvider}:${skill.name}`,
+ type: "skill" as const,
+ provider: selectedProvider,
+ skill,
+ label: `/skill:${skill.name}`,
+ description:
+ skill.shortDescription ??
+ skill.description ??
+ (skill.scope ? `${skill.scope} skill` : ""),
+ }));
const slashCommandItems = [
...builtInSlashCommandItems,
...providerSlashCommandItems,
@@ -1159,6 +1166,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
planModeUiEnabled,
selectedProvider,
selectedProviderStatus,
+ settings.showSkillsInSlashMenu,
workspaceEntries.entries,
]);
diff --git a/apps/web/src/components/chat/ComposerCommandMenu.test.tsx b/apps/web/src/components/chat/ComposerCommandMenu.test.tsx
index 350a09f9a..cf0a1747d 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.test.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.test.tsx
@@ -51,10 +51,12 @@ describe("ComposerCommandMenu", () => {
expect(markup).not.toContain("<svg");
expect(markup).toContain("font-sans text-xs font-medium");
expect(markup).not.toContain("font-mono");
- expect(markup).toContain("text-right");
+ expect(markup).not.toContain("grid-cols-");
+ expect(markup).toContain("max-w-[45%]");
+ expect(markup).toContain("text-left");
});
- it("renders a skill source icon with an accessible source label", () => {
+ it("renders the skill source icon inside its badge", () => {
const markup = renderToStaticMarkup(
<ComposerCommandMenu
items={[
@@ -82,40 +84,53 @@ describe("ComposerCommandMenu", () => {
);
expect(markup).toContain("Browser");
- expect(markup).toContain('<span class="sr-only">App skill</span>');
+ expect(markup).toContain('data-slot="badge"');
+ expect(markup).toContain(">App Skill</span>");
+ expect(markup).toContain("Open and control the in-app browser");
+ expect(markup).toContain("max-w-[48ch]");
+ expect(markup).toContain("text-secondary-label text-xs");
+ expect(markup).toContain("ms-auto");
+ expect(markup).toContain("text-current");
+ expect(markup.indexOf("Open and control the in-app browser")).toBeLessThan(
+ markup.indexOf(">App Skill</span>"),
+ );
expect(markup).toContain("<svg");
- expect(markup).toContain("text-icon-muted");
+ expect(markup.indexOf('data-slot="badge"')).toBeLessThan(markup.indexOf("<svg"));
});
- it("renders slash skill results with only the skill prefix dimmed", () => {
+ it("keeps slash skills aligned with the source icon inside the badge", () => {
const markup = renderToStaticMarkup(
<ComposerCommandMenu
items={[
{
- id: "skill:codex:browser",
+ id: "skill:codex:ask-matt",
type: "skill",
provider: ProviderDriverKind.make("codex"),
skill: {
- name: "browser",
- path: "/skills/browser/SKILL.md",
+ name: "ask-matt",
+ displayName: "Ask Matt",
+ path: "/skills/ask-matt/SKILL.md",
+ scope: "repo",
enabled: true,
},
- label: "skill:browser",
- description: "Open and control the in-app browser",
+ label: "/skill:ask-matt",
+ description: "Find the right skill or workflow",
},
]}
resolvedTheme="dark"
isLoading={false}
triggerKind="slash-command"
- activeItemId="skill:codex:browser"
+ activeItemId="skill:codex:ask-matt"
onHighlightedItemChange={() => {}}
onSelect={() => {}}
/>,
);
- expect(markup).toContain('<span class="text-secondary-label">skill:</span>browser');
- expect(markup).toContain("Open and control the in-app browser");
+ expect(markup).toContain('<span class="text-secondary-label">/skill:</span>Ask Matt');
+ expect(markup).toContain('data-slot="badge"');
+ expect(markup).toContain("lucide-folder");
+ expect(markup).toContain(">Repo</span>");
+ expect(markup).toContain("Find the right skill or workflow");
expect(markup).not.toContain("font-medium text-secondary-label");
- expect(markup).not.toContain("<svg");
});
});
diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index 0f941cc28..72267fcc9 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -1,4 +1,5 @@
import {
+ formatProviderSkillDisplayName,
resolveProviderSkillSourceKind,
type ProviderSkillSourceKind,
} from "@t3tools/client-runtime/providerSkills";
@@ -10,7 +11,6 @@ import {
} from "@t3tools/contracts";
import {
BlocksIcon,
- FolderGit2Icon,
FolderIcon,
PackageIcon,
SettingsIcon,
@@ -21,6 +21,7 @@ import { memo, useLayoutEffect, useRef } from "react";
import { type ComposerSlashCommand, type ComposerTriggerKind } from "../../composer-logic";
import { cn } from "~/lib/utils";
+import { Badge } from "../ui/badge";
import { Command, CommandGroup, CommandItem, CommandList } from "../ui/command";
import { PierreEntryIcon } from "./PierreEntryIcon";
@@ -139,7 +140,7 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
}) {
const skillSourceKind =
props.item.type === "skill" ? resolveProviderSkillSourceKind(props.item.skill) : null;
- const slashSkill =
+ const isSlashSkill =
props.triggerKind === "slash-command" && props.item.type === "skill" ? props.item.skill : null;
return (
@@ -166,23 +167,27 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
kind={props.item.pathKind}
theme={props.resolvedTheme}
/>
- ) : skillSourceKind && !slashSkill ? (
- <SkillSourceIcon kind={skillSourceKind} />
) : null}
- <span className="flex min-w-0 flex-1 items-baseline gap-3">
- <span className="shrink-0 font-sans text-xs font-medium">
- {slashSkill ? (
+ <span className="flex min-w-0 flex-1 items-center gap-2">
+ <span className="min-w-0 max-w-[45%] shrink-0 truncate font-sans text-xs font-medium">
+ {isSlashSkill ? (
<>
- <span className="text-secondary-label">skill:</span>
- {slashSkill.name}
+ <span className="text-secondary-label">/skill:</span>
+ {formatProviderSkillDisplayName(isSlashSkill)}
</>
) : (
props.item.label
)}
</span>
- <span className="min-w-0 flex-1 truncate text-right text-secondary-label text-xs">
+ <span className="min-w-0 max-w-[48ch] flex-1 truncate text-left text-secondary-label text-xs">
{props.item.description}
</span>
+ {skillSourceKind ? (
+ <SkillSourceBadge
+ kind={skillSourceKind}
+ showSkillSuffix={props.triggerKind === "skill"}
+ />
+ ) : null}
</span>
</CommandItem>
);
@@ -190,7 +195,7 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
const SKILL_SOURCE_ICON_BY_KIND: Record<ProviderSkillSourceKind, LucideIcon> = {
app: BlocksIcon,
- repo: FolderGit2Icon,
+ repo: FolderIcon,
project: FolderIcon,
personal: UserRoundIcon,
system: SettingsIcon,
@@ -203,15 +208,16 @@ const SKILL_SOURCE_LABEL_BY_KIND: Record<ProviderSkillSourceKind, string> = {
project: "Project",
personal: "Personal",
system: "System",
- other: "Other",
+ other: "Provider",
};
-function SkillSourceIcon(props: { kind: ProviderSkillSourceKind }) {
+function SkillSourceBadge(props: { kind: ProviderSkillSourceKind; showSkillSuffix: boolean }) {
const Icon = SKILL_SOURCE_ICON_BY_KIND[props.kind];
return (
- <>
- <Icon aria-hidden="true" className="size-4 shrink-0 text-icon-muted" />
- <span className="sr-only">{SKILL_SOURCE_LABEL_BY_KIND[props.kind]} skill</span>
- </>
+ <Badge className="ms-auto" variant="secondary">
+ <Icon aria-hidden="true" className="text-current" />
+ {SKILL_SOURCE_LABEL_BY_KIND[props.kind]}
+ {props.showSkillSuffix ? " Skill" : null}
+ </Badge>
);
}
diff --git a/apps/web/src/components/chat/composerSlashCommandSearch.test.ts b/apps/web/src/components/chat/composerSlashCommandSearch.test.ts
index e372acd4d..be749c0aa 100644
--- a/apps/web/src/components/chat/composerSlashCommandSearch.test.ts
+++ b/apps/web/src/components/chat/composerSlashCommandSearch.test.ts
@@ -81,7 +81,7 @@ describe("searchSlashCommandItems", () => {
enabled: true,
shortDescription: "Open and control the in-app browser",
},
- label: "skill:browser",
+ label: "/skill:browser",
description: "Open and control the in-app browser",
},
] satisfies Array<Extract<ComposerCommandItem, { type: "skill" }>>;
@@ -97,23 +97,26 @@ describe("searchSlashCommandItems", () => {
it("matches skills by display name", () => {
const items = [
{
- id: "skill:claudeAgent:browser",
+ id: "skill:claudeAgent:ask-matt",
type: "skill",
provider: claudeDriver,
skill: {
- name: "browser",
- displayName: "Web Navigator",
- path: "/skills/browser/SKILL.md",
+ name: "ask-matt",
+ displayName: "Ask Matt",
+ path: "/skills/ask-matt/SKILL.md",
enabled: true,
- shortDescription: "Open and control the in-app browser",
+ shortDescription: "Find the right skill or workflow",
},
- label: "skill:browser",
- description: "Open and control the in-app browser",
+ label: "/skill:ask-matt",
+ description: "Find the right skill or workflow",
},
] satisfies Array<Extract<ComposerCommandItem, { type: "skill" }>>;
- expect(searchSlashCommandItems(items, "navigator").map((item) => item.id)).toEqual([
- "skill:claudeAgent:browser",
+ expect(searchSlashCommandItems(items, "ask matt").map((item) => item.id)).toEqual([
+ "skill:claudeAgent:ask-matt",
+ ]);
+ expect(searchSlashCommandItems(items, "/skill:ask-matt").map((item) => item.id)).toEqual([
+ "skill:claudeAgent:ask-matt",
]);
});
@@ -128,7 +131,7 @@ describe("searchSlashCommandItems", () => {
path: "/skills/browser/SKILL.md",
enabled: true,
},
- label: "skill:browser",
+ label: "/skill:browser",
description: "Open and control the in-app browser",
},
] satisfies Array<Extract<ComposerCommandItem, { type: "skill" }>>;
@@ -136,7 +139,9 @@ describe("searchSlashCommandItems", () => {
expect(searchSlashCommandItems(items, "/skill:brow").map((item) => item.id)).toEqual([
"skill:claudeAgent:browser",
]);
- expect(searchSlashCommandItems(items, "/sk")).toEqual([]);
+ expect(searchSlashCommandItems(items, "/sk").map((item) => item.id)).toEqual([
+ "skill:claudeAgent:browser",
+ ]);
expect(searchSlashCommandItems(items, "/ill")).toEqual([]);
});
@@ -158,7 +163,7 @@ describe("searchSlashCommandItems", () => {
path: "/skills/unslop/SKILL.md",
enabled: true,
},
- label: "skill:unslop",
+ label: "/skill:unslop",
description: "Cut AI tells from writing",
},
] satisfies Array<Extract<ComposerCommandItem, { type: "slash-command" | "skill" }>>;
diff --git a/apps/web/src/components/chat/composerSlashCommandSearch.ts b/apps/web/src/components/chat/composerSlashCommandSearch.ts
index 9c1ce70f8..3e60cbf58 100644
--- a/apps/web/src/components/chat/composerSlashCommandSearch.ts
+++ b/apps/web/src/components/chat/composerSlashCommandSearch.ts
@@ -14,9 +14,15 @@ type SlashSearchItem = Extract<
function scoreSlashCommandItem(item: SlashSearchItem, query: string): number | null {
if (item.type === "skill") {
- const skillQuery =
- query === "skill" ? "" : query.startsWith("skill:") ? query.slice("skill:".length) : query;
- return skillQuery ? scoreProviderSkill(item.skill, skillQuery) : 0;
+ if (query === "skill") {
+ return 0;
+ }
+ const skillQuery = query.startsWith("skill:") ? query.slice("skill:".length) : query;
+ const skillScore = skillQuery ? scoreProviderSkill(item.skill, skillQuery) : 0;
+ if (skillScore !== null) {
+ return skillScore;
+ }
+ return "skill".startsWith(query) ? Number.MAX_SAFE_INTEGER : null;
}
const primaryValue =
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index 582dc9f6c..e77c05549 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -507,6 +507,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
? ["Diff whitespace changes"]
: []),
+ ...(settings.showSkillsInSlashMenu !== DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu
+ ? ["Show skills in slash menu"]
+ : []),
...(settings.enableLegacyTokenStreaming !==
DEFAULT_UNIFIED_SETTINGS.enableLegacyTokenStreaming
? ["Stream token by token"]
@@ -573,6 +576,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.sidebarAutoSettleOnMerge,
settings.sidebarProjectGroupingMode,
settings.sidebarThreadPreviewCount,
+ settings.showSkillsInSlashMenu,
settings.timestampFormat,
settings.wordWrap,
followSystem,
@@ -648,6 +652,7 @@ export function useSettingsRestore(onRestored?: () => void) {
timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat,
wordWrap: DEFAULT_UNIFIED_SETTINGS.wordWrap,
diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
+ showSkillsInSlashMenu: DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu,
environmentIdentificationMode: DEFAULT_UNIFIED_SETTINGS.environmentIdentificationMode,
glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
@@ -2076,6 +2081,32 @@ export function GeneralSettingsPanel() {
}
/>
+ <SettingsRow
+ {...searchableSetting("skills-in-slash-menu")}
+ description="Also include skills in the / command menu. Skills always appear when you type $."
+ resetAction={
+ settings.showSkillsInSlashMenu !== DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu ? (
+ <SettingResetButton
+ label="skills in slash menu"
+ onClick={() =>
+ updateSettings({
+ showSkillsInSlashMenu: DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu,
+ })
+ }
+ />
+ ) : null
+ }
+ control={
+ <Switch
+ checked={settings.showSkillsInSlashMenu}
+ onCheckedChange={(checked) =>
+ updateSettings({ showSkillsInSlashMenu: Boolean(checked) })
+ }
+ aria-label="Show skills in slash menu"
+ />
+ }
+ />
+
<SettingsRow
{...searchableSetting("provider-update-checks")}
description="Check installed provider CLIs for newer available versions."
diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts
index 188dbd408..5213cb55a 100644
--- a/apps/web/src/components/settings/settingsSearch.ts
+++ b/apps/web/src/components/settings/settingsSearch.ts
@@ -131,6 +131,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Hide whitespace changes",
to: "/settings/general",
},
+ {
+ id: "skills-in-slash-menu",
+ title: "Show skills in slash menu",
+ to: "/settings/general",
+ },
{
id: "provider-update-checks",
title: "Provider update checks",
diff --git a/docs/user/composer.md b/docs/user/composer.md
index f4dd49e51..50a30d7f1 100644
--- a/docs/user/composer.md
+++ b/docs/user/composer.md
@@ -4,6 +4,17 @@ Messages can contain up to 120,000 characters. If a draft is longer, T3 Code kee
composer and shows how many characters need to be removed. Shorten the draft or split it into
multiple messages, then send again in the same thread.
+## Commands and skills
+
+Type `/` to open the command menu. Type `$` to find and add a skill. Skill rows show their source,
+such as System, Personal, Project, or App.
+
+By default, the `/` menu includes skills. To keep this menu command-only, turn off **Show skills in
+slash menu** in **Settings → General**. Skill results use the `/skill:Skill Name` label and add the
+same `$name` skill token to your message. The original skill name remains searchable. If the provider
+also reports that skill as a native slash command, T3 Code hides the duplicate native entry and keeps
+the `/skill:Skill Name` label.
+
On desktop, press `Cmd+Enter` on macOS or `Ctrl+Enter` on Windows and Linux from a new thread to
start it in the background. T3 Code opens another new thread and shows an **Open** action for the
thread that started. The new thread keeps the selected workspace mode and base branch. If **New
diff --git a/packages/client-runtime/src/providerSkills.test.ts b/packages/client-runtime/src/providerSkills.test.ts
index fa6b460b9..08c79f5d8 100644
--- a/packages/client-runtime/src/providerSkills.test.ts
+++ b/packages/client-runtime/src/providerSkills.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, it } from "vite-plus/test";
import {
formatProviderSkillDisplayName,
+ getProviderSlashCommandsForSlashMenu,
+ getProviderSkillsForSlashMenu,
resolveProviderSkillSourceKind,
} from "./providerSkills.ts";
@@ -24,6 +26,47 @@ describe("formatProviderSkillDisplayName", () => {
});
});
+describe("getProviderSkillsForSlashMenu", () => {
+ it("keeps the skill alias when the provider also exposes it as a slash command", () => {
+ const askMatt = {
+ name: "ask-matt",
+ path: "/Users/matt/.agents/skills/ask-matt/SKILL.md",
+ enabled: true,
+ };
+ expect(getProviderSkillsForSlashMenu([askMatt], true).map((skill) => skill.name)).toEqual([
+ "ask-matt",
+ ]);
+ });
+});
+
+describe("getProviderSlashCommandsForSlashMenu", () => {
+ const commands = [
+ { name: "ask-matt", description: "Ask which skill fits your situation." },
+ { name: "compact", description: "Compact the conversation." },
+ ];
+ const skills = [
+ {
+ name: "ask-matt",
+ path: "/Users/matt/.agents/skills/ask-matt/SKILL.md",
+ enabled: true,
+ },
+ ];
+
+ it("lets the skill alias win when a provider command has the same name", () => {
+ expect(
+ getProviderSlashCommandsForSlashMenu(commands, skills).map((command) => command.name),
+ ).toEqual(["compact"]);
+ });
+
+ it("keeps the provider command when the matching skill alias is hidden", () => {
+ const visibleSkills = getProviderSkillsForSlashMenu(skills, false);
+
+ expect(
+ getProviderSlashCommandsForSlashMenu(commands, visibleSkills).map((command) => command.name),
+ ).toEqual(["ask-matt", "compact"]);
+ });
+});
+
describe("resolveProviderSkillSourceKind", () => {
it("marks plugin-backed skills as app installs", () => {
expect(
diff --git a/packages/client-runtime/src/providerSkills.ts b/packages/client-runtime/src/providerSkills.ts
index d24776d85..faab12799 100644
--- a/packages/client-runtime/src/providerSkills.ts
+++ b/packages/client-runtime/src/providerSkills.ts
@@ -1,4 +1,4 @@
-import type { ServerProviderSkill } from "@t3tools/contracts";
+import type { ServerProviderSkill, ServerProviderSlashCommand } from "@t3tools/contracts";
export type ProviderSkillSourceKind = "app" | "repo" | "project" | "personal" | "system" | "other";
@@ -25,6 +25,21 @@ export function formatProviderSkillDisplayName(
return titleCaseWords(skill.name);
}
+export function getProviderSkillsForSlashMenu(
+ skills: ReadonlyArray<ServerProviderSkill>,
+ showSkillsInSlashMenu: boolean,
+): ServerProviderSkill[] {
+ return showSkillsInSlashMenu ? skills.filter((skill) => skill.enabled) : [];
+}
+
+export function getProviderSlashCommandsForSlashMenu(
+ slashCommands: ReadonlyArray<ServerProviderSlashCommand>,
+ visibleSkills: ReadonlyArray<ServerProviderSkill>,
+): ServerProviderSlashCommand[] {
+ const skillNames = new Set(visibleSkills.map((skill) => skill.name.trim().toLowerCase()));
+ return slashCommands.filter((command) => !skillNames.has(command.name.trim().toLowerCase()));
+}
+
export function resolveProviderSkillSourceKind(
skill: Pick<ServerProviderSkill, "path" | "scope">,
): ProviderSkillSourceKind {
diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts
index ba4facaf5..80e03b8c8 100644
--- a/packages/contracts/src/settings.ts
+++ b/packages/contracts/src/settings.ts
@@ -225,6 +225,7 @@ export const ClientSettingsSchema = Schema.Struct({
// default UI; this beta flag restores it (plus the /plan and /default slash
// commands) for users who still rely on the old workflow.
planModeEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
+ showSkillsInSlashMenu: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
// Legacy sidebar (the original per-project tree). Deliberately a fresh key
// (was `sidebarV2Enabled` + `sidebarV2ConfiguredByUser`): decoding drops the
// old keys, so everyone, including prior beta opt-outs, resets to the new
@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
),
),
planModeEnabled: Schema.optionalKey(Schema.Boolean),
+ showSkillsInSlashMenu: Schema.optionalKey(Schema.Boolean),
legacySidebarEnabled: Schema.optionalKey(Schema.Boolean),
sidebarAutoSettleAfterDays: Schema.optionalKey(Schema.NullOr(SidebarAutoSettleAfterDays)),
sidebarAutoSettleOnMerge: Schema.optionalKey(Schema.Boolean),