Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions apps/web/src/components/ChatView.browser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5952,6 +5952,48 @@ describe("ChatView timeline estimator parity (full app)", () => {
}
});

it("shows provider skills in the slash-command menu", async () => {
const mounted = await mountChatView({
viewport: DEFAULT_VIEWPORT,
snapshot: createSnapshotForTargetUser({
targetMessageId: "msg-user-slash-skill-target" as MessageId,
targetText: "slash skill menu thread",
}),
configureFixture: (nextFixture) => {
const provider = nextFixture.serverConfig.providers[0];
if (!provider) {
throw new Error("Expected default provider in test fixture.");
}
(
provider as {
skills: ServerConfig["providers"][number]["skills"];
}
).skills = [
{
name: "agent-browser",
displayName: "Agent Browser",
shortDescription: "Open pages, click around, and inspect web apps.",
path: "/Users/test/.agents/skills/agent-browser/SKILL.md",
enabled: true,
},
];
},
});

try {
await waitForComposerEditor();
await page.getByTestId("composer-editor").fill("/");

const skillItem = await waitForComposerMenuItem("skill:codex:agent-browser");
expect(skillItem.textContent).toContain("Agent Browser");

await skillItem.click();
await waitForComposerText("$agent-browser ");
} finally {
await mounted.cleanup();
}
});

it("opens the model picker when selecting /model", async () => {
const mounted = await mountChatView({
viewport: DEFAULT_VIEWPORT,
Expand Down
36 changes: 23 additions & 13 deletions apps/web/src/components/chat/ChatComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,23 @@ import { useMediaQuery } from "../../hooks/useMediaQuery";

const IMAGE_SIZE_LIMIT_LABEL = `${Math.round(PROVIDER_SEND_TURN_MAX_IMAGE_BYTES / (1024 * 1024))}MB`;

function toSkillComposerCommandItem(
provider: ProviderDriverKind,
skill: ServerProvider["skills"][number],
): Extract<ComposerCommandItem, { type: "skill" }> {
return {
id: `skill:${provider}:${skill.name}`,
type: "skill",
provider,
skill,
label: formatProviderSkillDisplayName(skill),
description:
skill.shortDescription ??
skill.description ??
(skill.scope ? `${skill.scope} skill` : "Run provider skill"),
};
}

const runtimeModeConfig: Record<
RuntimeMode,
{ label: string; description: string; icon: LucideIcon }
Expand Down Expand Up @@ -899,27 +916,20 @@ export const ChatComposer = memo(
}),
);
const query = composerTrigger.query.trim().toLowerCase();
const skillItems = searchProviderSkills(selectedProviderStatus?.skills ?? [], query).map(
(skill) => toSkillComposerCommandItem(selectedProvider, skill),
);
Comment thread
cursor[bot] marked this conversation as resolved.
const slashCommandItems = [...builtInSlashCommandItems, ...providerSlashCommandItems];
if (!query) {
return slashCommandItems;
return [...slashCommandItems, ...skillItems];
}
return searchSlashCommandItems(slashCommandItems, query);
return [...searchSlashCommandItems(slashCommandItems, query), ...skillItems];
}
if (composerTrigger.kind === "skill") {
return searchProviderSkills(
selectedProviderStatus?.skills ?? [],
composerTrigger.query,
).map((skill) => ({
id: `skill:${selectedProvider}:${skill.name}`,
type: "skill" as const,
provider: selectedProvider,
skill,
label: formatProviderSkillDisplayName(skill),
description:
skill.shortDescription ??
skill.description ??
(skill.scope ? `${skill.scope} skill` : "Run provider skill"),
}));
).map((skill) => toSkillComposerCommandItem(selectedProvider, skill));
}
return [];
}, [composerTrigger, selectedProvider, selectedProviderStatus, workspaceEntries]);
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/components/chat/ComposerCommandMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ function groupCommandItems(

const builtInItems = items.filter((item) => item.type === "slash-command");
const providerItems = items.filter((item) => item.type === "provider-slash-command");
const skillItems = items.filter((item) => item.type === "skill");

const groups: ComposerCommandGroup[] = [];
if (builtInItems.length > 0) {
Expand All @@ -100,6 +101,9 @@ function groupCommandItems(
if (providerItems.length > 0) {
groups.push({ id: "provider", label: "Provider", items: providerItems });
}
if (skillItems.length > 0) {
groups.push({ id: "skills", label: "Skills", items: skillItems });
}
return groups;
}

Expand Down
Loading