Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

feat(skills): improve browsing and editing UX (#18940)

tobi_kl6c490a9735bf
diff --git a/web/src/features/skills/components/ImportSkillsDialog.tsx b/web/src/features/skills/components/ImportSkillsDialog.tsx
index 4f043020ff..0e0a034a69 100644
--- a/web/src/features/skills/components/ImportSkillsDialog.tsx
+++ b/web/src/features/skills/components/ImportSkillsDialog.tsx
@@ -269,11 +269,7 @@ export function ImportSkillsDialog({
layout="full"
aria-label="Import method"
>
- <Tabs.Trigger
- value="local"
- label="Upload files"
- disabled={busy}
- />
+ <Tabs.Trigger value="local" label="Upload" disabled={busy} />
<Tabs.Trigger value="cli" label="CLI" disabled={busy} />
</Tabs.List>
<div className="pt-4">
diff --git a/web/src/features/skills/components/SkillEditor.tsx b/web/src/features/skills/components/SkillEditor.tsx
index 201e79de6f..531fc6ad62 100644
--- a/web/src/features/skills/components/SkillEditor.tsx
+++ b/web/src/features/skills/components/SkillEditor.tsx
@@ -22,8 +22,6 @@ import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { IconButton } from "@/src/components/design-system/IconButton/IconButton";
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { SkillLinkedTraces } from "@/src/features/skills/components/SkillLinkedTraces";
-import { Badge } from "@/src/components/design-system/Badge/Badge";
-import { CodeMirrorEditor } from "@/src/components/editor";
import Page from "@/src/components/layouts/page";
import { Button } from "@/src/components/ui/button";
import { Dialog } from "@/src/components/design-system/Dialog/Dialog";
@@ -50,7 +48,6 @@ import {
import { importSkillFiles } from "@/src/features/skills/actions/importSkillFiles";
import { getParentFolderPaths } from "@/src/features/skills/components/skillFileTree";
import { classifyTrpcToastError } from "@/src/utils/trpcErrorClassification";
-import { getSkillFileLanguageExtensions } from "@/src/features/skills/utils/getSkillFileLanguageExtensions";
import {
createSkillDraftFile,
type SkillDraftFile,
@@ -62,7 +59,7 @@ import {
SkillTagsSelect,
} from "@/src/features/skills/components/SkillMetadataSelect";
import { SkillVersionHistory } from "@/src/features/skills/components/SkillVersionHistory";
-import { SkillFilePreview } from "@/src/features/skills/components/SkillFilePreview";
+import { SkillFileView } from "@/src/features/skills/components/SkillFileView";
import { useSkillFileContents } from "@/src/features/skills/hooks/useSkillFileContents";
import {
parseSkillFrontmatterMetadata,
@@ -664,9 +661,11 @@ export function SkillEditor({
>
<Tabs.List variant="underline">
<Tabs.Trigger value="files" label="Files" />
- {!isDraft ? (
- <Tabs.Trigger value="linked-traces" label="Traces" />
- ) : null}
+ <Tabs.Trigger
+ value="linked-traces"
+ label="Traces"
+ disabled={isDraft}
+ />
</Tabs.List>
{!isDraft && baseVersion !== null ? (
<Tabs.Content value="linked-traces" layout="fill">
@@ -789,7 +788,7 @@ function SkillFileEditor({
const { refetch } = fileContents;
const content = activeFile.content ?? fileContents.data?.content;
- const editorContent = useMemo(() => {
+ const placeholder = useMemo(() => {
if (content === undefined && fileContents.isError) {
return (
<div className="flex flex-col items-start gap-2 text-sm">
@@ -813,46 +812,22 @@ function SkillFileEditor({
</div>
);
}
- if (!isDraft) {
- return <SkillFilePreview path={activePath} content={content} />;
- }
- return (
- <CodeMirrorEditor
- key={activePath}
- value={content}
- onChange={editable ? updateActiveFile : undefined}
- editable={editable}
- mode="text"
- extensions={getSkillFileLanguageExtensions(activePath)}
- minHeight="500px"
- lineNumbers
- className="h-full"
- />
- );
- }, [
- content,
- fileContents.isError,
- fileContents.error,
- refetch,
- activePath,
- isDraft,
- editable,
- updateActiveFile,
- ]);
+ return null;
+ }, [content, fileContents.isError, fileContents.error, refetch]);
return (
- <section className="ph-no-capture flex h-full min-w-0 flex-col">
- <div className="flex min-h-11 items-center justify-between gap-2 border-b px-3">
- <span className="min-w-0 truncate font-mono text-xs" title={activePath}>
- {activePath}
- </span>
- <Badge
- text={isDraft ? "Editing draft" : "Viewing"}
- color={isDraft ? "blue" : "primary"}
- />
- </div>
- <div className="min-h-0 flex-1 overflow-auto p-3">{editorContent}</div>
- </section>
+ <SkillFileView
+ key={isDraft ? "draft" : "version"}
+ path={activePath}
+ content={content}
+ mode={
+ isDraft
+ ? { kind: "draft", editable, onChange: updateActiveFile }
+ : { kind: "view" }
+ }
+ >
+ {placeholder}
+ </SkillFileView>
);
}
diff --git a/web/src/features/skills/components/SkillFilePreview.stories.tsx b/web/src/features/skills/components/SkillFilePreview.stories.tsx
index 8589650969..c30b683250 100644
--- a/web/src/features/skills/components/SkillFilePreview.stories.tsx
+++ b/web/src/features/skills/components/SkillFilePreview.stories.tsx
@@ -1,5 +1,5 @@
import preview from "../../../../.storybook/preview";
-import { expect, userEvent, within } from "storybook/test";
+import { expect, within } from "storybook/test";
import { SkillFilePreview } from "./SkillFilePreview";
const meta = preview.meta({ component: SkillFilePreview });
@@ -50,13 +50,13 @@ export const Python = meta.story({
});
export const PreservesFrontmatter = meta.story({
- name: "(Test) Switches between front matter preview and raw source",
+ name: "(Test) Preserves front matter values",
args: {
path: "SKILL.md",
content:
"---\r\nname: review-code\r\nmetadata:\r\n enabled: false\r\n retries: 0\r\n---\r\n# Instructions\r\n\r\n---\r\n\r\nRead **carefully**.",
},
- play: async ({ canvasElement, args }) => {
+ play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const metadata = canvas.getByRole("region", { name: "Skill front matter" });
await expect(metadata).toHaveTextContent("review-code");
@@ -67,20 +67,6 @@ export const PreservesFrontmatter = meta.story({
).toBeVisible();
await expect(canvas.getByRole("separator")).toBeVisible();
await expect(canvas.getByText("carefully").tagName).toBe("STRONG");
- await userEvent.click(canvas.getByRole("tab", { name: "Raw" }));
- await expect(
- canvas.queryByRole("region", { name: "Skill front matter" }),
- ).toBeNull();
- await expect(
- canvas
- .getByRole("tabpanel")
- .querySelector("pre")
- ?.textContent?.replace(/\r?\n/g, ""),
- ).toBe(args.content.replace(/\r?\n/g, ""));
- await userEvent.click(canvas.getByRole("tab", { name: "Preview" }));
- await expect(
- canvas.getByRole("region", { name: "Skill front matter" }),
- ).toBeVisible();
},
});
diff --git a/web/src/features/skills/components/SkillFilePreview.tsx b/web/src/features/skills/components/SkillFilePreview.tsx
index 426ec65241..950d9e507a 100644
--- a/web/src/features/skills/components/SkillFilePreview.tsx
+++ b/web/src/features/skills/components/SkillFilePreview.tsx
@@ -1,15 +1,16 @@
import { isMap, parseDocument, stringify } from "yaml";
import { Codeblock } from "@/src/components/design-system/Codeblock/Codeblock";
import { normalizeCodeblockLanguage } from "@/src/utils/normalizeCodeblockLanguage";
-import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { MarkdownView } from "@/src/components/ui/MarkdownViewer";
export function SkillFilePreview({
path,
content,
+ format = "formatted",
}: {
path: string;
content: string;
+ format?: "formatted" | "raw";
}) {
if (content.length === 0) {
return <p className="text-muted-foreground text-sm">This file is empty.</p>;
@@ -17,21 +18,10 @@ export function SkillFilePreview({
const filename = path.split("/").at(-1)?.toLowerCase() ?? "";
if (/\.(md|markdown)$/i.test(filename)) {
- return (
- <Tabs defaultValue="preview">
- <div className="mb-3 flex justify-end">
- <Tabs.List aria-label="File display" variant="inset" size="sm">
- <Tabs.Trigger value="preview" label="Preview" />
- <Tabs.Trigger value="raw" label="Raw" />
- </Tabs.List>
- </div>
- <Tabs.Content value="preview">
- <MarkdownFilePreview filename={filename} content={content} />
- </Tabs.Content>
- <Tabs.Content value="raw">
- <Codeblock language="text" value={content} variant="read-only" />
- </Tabs.Content>
- </Tabs>
+ return format === "formatted" ? (
+ <MarkdownFilePreview filename={filename} content={content} />
+ ) : (
+ <Codeblock language="text" value={content} variant="read-only" />
);
}
@@ -88,13 +78,12 @@ function MarkdownFilePreview({
}
return (
- <article className="mx-auto flex w-full max-w-4xl flex-col gap-4 p-3">
+ <article className="mx-auto flex w-full max-w-4xl flex-col gap-2">
{parsed.kind === "parsed" ? (
<section
aria-label="Skill front matter"
className="bg-muted/30 rounded-md border p-3"
>
- <h2 className="mb-2 text-sm font-bold">Skill front matter</h2>
<dl className="grid grid-cols-[minmax(0,7rem)_minmax(0,1fr)] gap-x-3 gap-y-1.5 text-sm">
{parsed.fields.map(([key, value]) => (
<div key={key} className="contents">
diff --git a/web/src/features/skills/components/SkillFileView.stories.tsx b/web/src/features/skills/components/SkillFileView.stories.tsx
new file mode 100644
index 0000000000..df83ce844c
--- /dev/null
+++ b/web/src/features/skills/components/SkillFileView.stories.tsx
@@ -0,0 +1,68 @@
+import { useState } from "react";
+import { expect, userEvent, within } from "storybook/test";
+import preview from "../../../../.storybook/preview";
+import { SkillFileView } from "./SkillFileView";
+
+const meta = preview.meta({ component: SkillFileView });
+
+const content =
+ "---\nname: review-code\ndescription: Review a change for correctness.\n---\n\n# Instructions\n\nRead **carefully**.";
+
+export const Viewing = meta.story({
+ args: { path: "SKILL.md", content, mode: { kind: "view" } },
+});
+
+export const DraftPreview = meta.story({
+ name: "(Test) Preview preserves unsaved edits",
+ args: { path: "SKILL.md", content, mode: { kind: "view" } },
+ render: function Render(args) {
+ const [draft, setDraft] = useState(args.content);
+ return (
+ <SkillFileView
+ {...args}
+ content={draft}
+ mode={{ kind: "draft", editable: true, onChange: setDraft }}
+ />
+ );
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await expect(canvas.getByRole("tab", { name: "Raw" })).toHaveAttribute(
+ "aria-selected",
+ "true",
+ );
+ const editor = canvas.getByRole("textbox");
+ await userEvent.click(editor);
+ await userEvent.keyboard(
+ /Mac|iPhone|iPad/.test(navigator.platform)
+ ? "{Meta>}{ArrowDown}{/Meta}"
+ : "{Control>}{End}{/Control}",
+ );
+ await userEvent.keyboard("{End}{Enter}{Enter}Unsaved preview text");
+ await userEvent.click(canvas.getByRole("tab", { name: "Formatted" }));
+ await expect(canvas.getByText("Unsaved preview text")).toBeVisible();
+ await expect(
+ canvas.getByRole("region", { name: "Skill front matter" }),
+ ).toHaveTextContent("review-code");
+ await userEvent.click(canvas.getByRole("tab", { name: "Raw" }));
+ await expect(canvas.getByRole("textbox")).toHaveTextContent(
+ "Unsaved preview text",
+ );
+ },
+});
+
+export const RawSource = meta.story({
+ name: "(Test) Views original source",
+ args: { path: "SKILL.md", content, mode: { kind: "view" } },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await userEvent.click(canvas.getByRole("tab", { name: "Raw" }));
+ await expect(
+ canvas.getByRole("tabpanel").querySelector("pre")?.textContent,
+ ).toBe(content);
+ await userEvent.click(canvas.getByRole("tab", { name: "Formatted" }));
+ await expect(
+ canvas.getByRole("heading", { name: "Instructions" }),
+ ).toBeVisible();
+ },
+});
diff --git a/web/src/features/skills/components/SkillFileView.tsx b/web/src/features/skills/components/SkillFileView.tsx
new file mode 100644
index 0000000000..4500c41f37
--- /dev/null
+++ b/web/src/features/skills/components/SkillFileView.tsx
@@ -0,0 +1,88 @@
+import { type ReactNode, useState } from "react";
+import { Badge } from "@/src/components/design-system/Badge/Badge";
+import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
+import { CodeMirrorEditor } from "@/src/components/editor";
+import { SkillFilePreview } from "./SkillFilePreview";
+import { getSkillFileLanguageExtensions } from "../utils/getSkillFileLanguageExtensions";
+
+export function SkillFileView({
+ path,
+ content,
+ mode,
+ children,
+}: {
+ path: string;
+ content: string | undefined;
+ mode:
+ | { kind: "view" }
+ | {
+ kind: "draft";
+ editable: boolean;
+ onChange: (content: string) => void;
+ };
+ children?: ReactNode;
+}) {
+ const [formatted, setFormatted] = useState(mode.kind === "view");
+ const isMarkdown = /\.(md|markdown)$/i.test(path);
+ const showFormatted = isMarkdown && formatted;
+ const display = showFormatted ? "formatted" : "raw";
+ function renderFileContent() {
+ if (content === undefined) return children;
+ if (mode.kind === "draft" && !showFormatted) {
+ return (
+ <CodeMirrorEditor
+ key={path}
+ value={content}
+ onChange={mode.editable ? mode.onChange : undefined}
+ editable={mode.editable}
+ mode="text"
+ extensions={getSkillFileLanguageExtensions(path)}
+ minHeight="500px"
+ lineNumbers
+ className="h-full"
+ />
+ );
+ }
+ return <SkillFilePreview path={path} content={content} format={display} />;
+ }
+ const fileBody = (
+ <div className="min-h-0 flex-1 overflow-auto p-3">
+ {renderFileContent()}
+ </div>
+ );
+
+ return (
+ <section className="ph-no-capture flex h-full min-w-0 flex-col">
+ <Tabs
+ value={display}
+ onValueChange={(value) => setFormatted(value === "formatted")}
+ layout="fill"
+ >
+ <div className="flex min-h-11 shrink-0 items-center justify-between gap-2 border-b px-3">
+ <span className="min-w-0 truncate font-mono text-xs" title={path}>
+ {path}
+ </span>
+ <div className="flex shrink-0 items-center gap-2">
+ <Badge
+ text={mode.kind === "draft" ? "Editing draft" : "Viewing"}
+ color={mode.kind === "draft" ? "blue" : "primary"}
+ />
+ {isMarkdown ? (
+ <Tabs.List aria-label="File display" variant="inset" size="sm">
+ <Tabs.Trigger value="formatted" label="Formatted" />
+ <Tabs.Trigger value="raw" label="Raw" />
+ </Tabs.List>
+ ) : null}
+ </div>
+ </div>
+ {isMarkdown ? (
+ <Tabs.Content value={display} layout="fill">
+ {fileBody}
+ </Tabs.Content>
+ ) : (
+ fileBody
+ )}
+ </Tabs>
+ </section>
+ );
+}
diff --git a/web/src/features/skills/components/SkillLinkedTraces.tsx b/web/src/features/skills/components/SkillLinkedTraces.tsx
index c81672ce52..f8a24f8524 100644
--- a/web/src/features/skills/components/SkillLinkedTraces.tsx
+++ b/web/src/features/skills/components/SkillLinkedTraces.tsx
@@ -14,7 +14,7 @@ export function SkillLinkedTraces({
const { timeRange, setTimeRange } = useTableDateRange(projectId);
return (
- <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+ <div className="-mt-px flex min-h-0 flex-1 flex-col overflow-hidden">
<TableHeaderControls timeRange={timeRange} setTimeRange={setTimeRange} />
<EventsTable
projectId={projectId}
diff --git a/web/src/features/skills/components/SkillVersionHistory.stories.tsx b/web/src/features/skills/components/SkillVersionHistory.stories.tsx
new file mode 100644
index 0000000000..822373d6e0
--- /dev/null
+++ b/web/src/features/skills/components/SkillVersionHistory.stories.tsx
@@ -0,0 +1,8 @@
+import preview from "../../../../.storybook/preview";
+import { SkillVersionHistory } from "./SkillVersionHistory";
+
+const meta = preview.meta({ component: SkillVersionHistory });
+
+export const NewSkill = meta.story({
+ args: { kind: "new" },
+});
diff --git a/web/src/features/skills/components/SkillVersionHistory.tsx b/web/src/features/skills/components/SkillVersionHistory.tsx
index 2127a7436f..a4404ccbba 100644
--- a/web/src/features/skills/components/SkillVersionHistory.tsx
+++ b/web/src/features/skills/components/SkillVersionHistory.tsx
@@ -61,13 +61,13 @@ export function SkillVersionHistory(
<aside
className={cn(
"ph-no-capture bg-muted/10 flex w-full shrink-0 flex-col border-b transition-[width,max-height] md:max-h-none md:border-r md:border-b-0",
- isCollapsed ? "max-h-11 md:w-11" : "max-h-56 md:w-56",
+ isCollapsed ? "max-h-9 md:w-11" : "max-h-56 md:w-56",
)}
>
<div
className={cn(
- "flex min-h-11 items-center border-b px-2",
- isCollapsed ? "justify-center" : "justify-between",
+ "flex min-h-9 shrink-0 items-center border-b",
+ isCollapsed ? "justify-center px-2" : "justify-between px-4",
)}
>
{isCollapsed ? null : (
diff --git a/web/src/features/skills/components/SkillsPage.tsx b/web/src/features/skills/components/SkillsPage.tsx
index 3d213353b4..a47e5e971f 100644
--- a/web/src/features/skills/components/SkillsPage.tsx
+++ b/web/src/features/skills/components/SkillsPage.tsx
@@ -9,7 +9,12 @@ import {
Terminal,
Trash,
} from "lucide-react";
-import { NumberParam, useQueryParams, withDefault } from "use-query-params";
+import {
+ NumberParam,
+ ObjectParam,
+ useQueryParams,
+ withDefault,
+} from "use-query-params";
import Page from "@/src/components/layouts/page";
import { Button } from "@/src/components/ui/button";
import { Button as DesignSystemButton } from "@/src/components/design-system/Button/Button";
@@ -51,6 +56,10 @@ import {
import { ImportSkillsDialog } from "./ImportSkillsDialog";
import { InstallSkillDialog } from "./InstallSkillDialog";
import { useSkillInstallOptions } from "../hooks/useSkillInstallOptions";
+import {
+ DEFAULT_SKILL_LIST_ORDER_BY,
+ SkillListOrderBySchema,
+} from "../constants/skillsSorting";
type SkillRow = RouterOutput["skills"]["all"]["data"][number];
@@ -176,16 +185,21 @@ function SkillsList({
}) {
const utils = api.useUtils();
const capture = usePostHogClientCapture();
- const [pagination, setPagination] = useQueryParams({
+ const [tableState, setTableState] = useQueryParams({
pageIndex: withDefault(NumberParam, 0),
pageSize: withDefault(NumberParam, 50),
+ orderBy: withDefault(ObjectParam, DEFAULT_SKILL_LIST_ORDER_BY),
});
+ const parsedOrderBy = SkillListOrderBySchema.safeParse(tableState.orderBy);
+ const orderBy = parsedOrderBy.success
+ ? parsedOrderBy.data
+ : DEFAULT_SKILL_LIST_ORDER_BY;
const paginationState = {
- pageIndex: Number.isFinite(pagination.pageIndex)
- ? Math.max(0, Math.floor(pagination.pageIndex))
+ pageIndex: Number.isFinite(tableState.pageIndex)
+ ? Math.max(0, Math.floor(tableState.pageIndex))
: 0,
- pageSize: Number.isFinite(pagination.pageSize)
- ? Math.max(1, Math.min(100, Math.floor(pagination.pageSize)))
+ pageSize: Number.isFinite(tableState.pageSize)
+ ? Math.max(1, Math.min(100, Math.floor(tableState.pageSize)))
: 50,
};
const { searchQuery, setSearchQuery } = useFullTextSearch({
@@ -204,7 +218,7 @@ function SkillsList({
sessionFilterContextId: projectId,
loading: filterOptions.isPending,
isV4: false,
- onExplicitFilterStateChange: () => setPagination({ pageIndex: 0 }),
+ onExplicitFilterStateChange: () => setTableState({ pageIndex: 0 }),
},
);
const skills = api.skills.all.useQuery(
@@ -214,6 +228,7 @@ function SkillsList({
limit: paginationState.pageSize,
search: searchQuery || undefined,
filter: queryFilter.filterState,
+ orderBy,
},
{ enabled: Boolean(projectId) },
);
@@ -221,7 +236,7 @@ function SkillsList({
onSuccess: async () => {
capture("skills:delete");
if (skills.data?.data.length === 1 && paginationState.pageIndex > 0) {
- setPagination({ pageIndex: paginationState.pageIndex - 1 });
+ setTableState({ pageIndex: paginationState.pageIndex - 1 });
}
await utils.skills.invalidate();
},
@@ -241,6 +256,7 @@ function SkillsList({
createLinkTableColumn<SkillRow>({
accessorKey: "name",
header: "Name",
+ enableSorting: true,
size: 220,
cellClassName: "ph-no-capture",
getCell: (name) =>
@@ -263,6 +279,7 @@ function SkillsList({
createNumberTableColumn<SkillRow>({
accessorKey: "latestVersion",
header: "Latest version",
+ enableSorting: true,
size: 100,
formatter: (version) => `v${version}`,
}),
@@ -276,12 +293,14 @@ function SkillsList({
createBadgeListTableColumn<SkillRow>({
accessorKey: "tags",
header: "Tags",
+ enableSorting: true,
size: 120,
cellClassName: "ph-no-capture",
}),
createDateTableColumn<SkillRow>({
accessorKey: "latestVersionCreatedAt",
header: "Latest version created",
+ enableSorting: true,
size: 175,
}),
];
@@ -293,8 +312,9 @@ function SkillsList({
<div className="md:hidden">
<FilterToggleButton filterState={queryFilter.filterState} />
</div>
- <div className="min-w-0 flex-1">
+ <div className="min-w-0 flex-1 p-2">
<TableSearchBar
+ inset
size="large"
key={`${projectId}:${queryFilter.draftResetKey}`}
projectId={projectId}
@@ -311,7 +331,7 @@ function SkillsList({
query: searchQuery,
type: ["id"],
setQuery: (query) => {
- setPagination({ pageIndex: 0 });
+ setTableState({ pageIndex: 0 });
setSearchQuery(query);
},
}}
@@ -371,6 +391,17 @@ function SkillsList({
tableName="skills"
columns={columns}
data={tableData}
+ orderBy={orderBy}
+ setOrderBy={(nextOrderBy) => {
+ const parsed =
+ SkillListOrderBySchema.safeParse(nextOrderBy);
+ setTableState({
+ orderBy: parsed.success
+ ? parsed.data
+ : DEFAULT_SKILL_LIST_ORDER_BY,
+ pageIndex: 0,
+ });
+ }}
loadingRowCount={Math.min(paginationState.pageSize, 8)}
noResultsMessage="No skills match your search or filters."
actions={(skill) => [
@@ -391,7 +422,7 @@ function SkillsList({
mode="offset"
totalCount={skills.data?.meta.totalItems ?? null}
state={paginationState}
- onChange={setPagination}
+ onChange={setTableState}
/>
</div>
)}
diff --git a/web/src/features/skills/constants/skillsSorting.ts b/web/src/features/skills/constants/skillsSorting.ts
new file mode 100644
index 0000000000..a11230dc3c
--- /dev/null
+++ b/web/src/features/skills/constants/skillsSorting.ts
@@ -0,0 +1,13 @@
+import { z } from "zod/v4";
+
+export const SkillListOrderBySchema = z.object({
+ column: z.enum(["name", "latestVersion", "tags", "latestVersionCreatedAt"]),
+ order: z.enum(["ASC", "DESC"]),
+});
+
+export type SkillListOrderBy = z.infer<typeof SkillListOrderBySchema>;
+
+export const DEFAULT_SKILL_LIST_ORDER_BY = {
+ column: "latestVersionCreatedAt",
+ order: "DESC",
+} satisfies SkillListOrderBy;
diff --git a/web/src/features/skills/server/skill-router.ts b/web/src/features/skills/server/skill-router.ts
index 162d93d895..aaba2d2b9c 100644
--- a/web/src/features/skills/server/skill-router.ts
+++ b/web/src/features/skills/server/skill-router.ts
@@ -17,6 +17,7 @@ import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { SkillService } from "./index";
import { GetSkillFileContentsInputSchema } from "@/src/features/public-api/types/unstable-skills";
+import { SkillListOrderBySchema } from "../constants/skillsSorting";
const projectInput = z.object({ projectId: z.string() });
@@ -25,6 +26,7 @@ export const skillRouter = createTRPCRouter({
.input(
projectInput
.extend({
+ orderBy: SkillListOrderBySchema.optional(),
filter: singleFilterList
.refine((filters) => filters.length <= 50, "Too many filters")
.optional(),
diff --git a/web/src/features/skills/server/skill-service.ts b/web/src/features/skills/server/skill-service.ts
index 164f946a24..8c80cbcdb8 100644
--- a/web/src/features/skills/server/skill-service.ts
+++ b/web/src/features/skills/server/skill-service.ts
@@ -29,6 +29,7 @@ import {
authorizeProtectedLabelMutation,
type ApiKeyProjectContext,
} from "@/src/features/prompts/server/utils/authorizeProtectedLabelMutation";
+import { type SkillListOrderBy } from "../constants/skillsSorting";
type SkillActor =
| Pick<ProjectAuthedContext, "session">
@@ -333,7 +334,10 @@ export class SkillService {
async list(params: {
projectId: string;
- input: ListSkillsQuery & { filter?: FilterState };
+ input: ListSkillsQuery & {
+ filter?: FilterState;
+ orderBy?: SkillListOrderBy;
+ };
}) {
const filters = this.listFilterConditions(params.input.filter ?? []);
const where: Prisma.SkillWhereInput = {
@@ -373,10 +377,23 @@ export class SkillService {
}
: {}),
};
+ const sortFields = {
+ name: "name",
+ latestVersion: "version",
+ tags: "tags",
+ latestVersionCreatedAt: "createdAt",
+ } satisfies Record<
+ SkillListOrderBy["column"],
+ keyof Prisma.SkillOrderByWithRelationInput
+ >;
+ const sortField = params.input.orderBy
+ ? sortFields[params.input.orderBy.column]
+ : "updatedAt";
+ const sortOrder = params.input.orderBy?.order === "ASC" ? "asc" : "desc";
const [latestVersions, totalItems] = await Promise.all([
this.prisma.skill.findMany({
where,
- orderBy: [{ updatedAt: "desc" }, { name: "asc" }],
+ orderBy: [{ [sortField]: sortOrder }, { name: "asc" }],
skip: (params.input.page - 1) * params.input.limit,
take: params.input.limit,
select: {