Skip to content

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

feat(skills): improve editing and draft recovery (#18452)

tobi_kl54770339840c
diff --git a/web/src/features/skills/actions/importSkillFiles.ts b/web/src/features/skills/actions/importSkillFiles.ts
index 926aa70f2c..259c140664 100644
--- a/web/src/features/skills/actions/importSkillFiles.ts
+++ b/web/src/features/skills/actions/importSkillFiles.ts
@@ -97,10 +97,11 @@ export async function importSkillFiles(
if (!imports.length) return [];
const state = store.getState();
const nextFiles = { ...state.files };
+ const nextDeletedFiles = { ...state.deletedFiles };
for (const file of imports) {
if (
state.folders.includes(file.path) ||
- Object.keys(nextFiles).some(
+ [...Object.keys(nextFiles), ...Object.keys(nextDeletedFiles)].some(
(path) =>
path.startsWith(`${file.path}/`) || file.path.startsWith(`${path}/`),
)
@@ -109,12 +110,13 @@ export async function importSkillFiles(
`A file or folder already exists at ${file.path}. No files were added.`,
);
}
- const existing = nextFiles[file.path];
+ const existing = nextFiles[file.path] ?? nextDeletedFiles[file.path];
nextFiles[file.path] = {
...file,
sourceSha: existing?.sourceSha ?? null,
sourceContentLength: existing?.sourceContentLength ?? null,
};
+ delete nextDeletedFiles[file.path];
}
if (Object.keys(nextFiles).length > MAX_SKILL_FILES) {
throw new Error(`A skill can contain at most ${MAX_SKILL_FILES} files.`);
@@ -133,6 +135,7 @@ export async function importSkillFiles(
const paths = imports.map((file) => file.path);
store.setState({
files: nextFiles,
+ deletedFiles: nextDeletedFiles,
folders: [
...new Set([...state.folders, ...getParentFolderPaths(paths)]),
].toSorted(),
diff --git a/web/src/features/skills/components/SkillDraftChanges.tsx b/web/src/features/skills/components/SkillDraftChanges.tsx
index 64f25e7a99..b74f09321e 100644
--- a/web/src/features/skills/components/SkillDraftChanges.tsx
+++ b/web/src/features/skills/components/SkillDraftChanges.tsx
@@ -11,18 +11,21 @@ export function SkillDraftChanges({
projectId,
store,
isFirstVersion,
+ comparisonVersion,
}: {
projectId: string;
store: SkillEditorStore;
isFirstVersion: boolean;
+ comparisonVersion?: number;
}) {
const [selectedPath, setSelectedPath] = useState<string>();
const name = useStore(store, (state) => state.name);
const baseVersion = useStore(store, (state) => state.baseVersion);
const draftFiles = useStore(store, (state) => state.files);
- const hasBaseVersion = !isFirstVersion && baseVersion !== null;
+ const version = comparisonVersion ?? baseVersion;
+ const hasBaseVersion = !isFirstVersion && version !== null;
const base = api.skills.byName.useQuery(
- { projectId, name, version: baseVersion ?? 1 },
+ { projectId, name, version: version ?? 1 },
{
enabled: hasBaseVersion,
refetchOnWindowFocus: false,
@@ -70,7 +73,7 @@ export function SkillDraftChanges({
: null
}
newFile={newFile}
- oldLabel={hasBaseVersion ? `Version ${baseVersion}` : "New skill"}
+ oldLabel={hasBaseVersion ? `Version ${version}` : "New skill"}
newLabel="Draft"
/>
) : null}
diff --git a/web/src/features/skills/components/SkillEditor.tsx b/web/src/features/skills/components/SkillEditor.tsx
index 0d66abc85c..dff453b6dc 100644
--- a/web/src/features/skills/components/SkillEditor.tsx
+++ b/web/src/features/skills/components/SkillEditor.tsx
@@ -22,6 +22,7 @@ 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";
import { DialogController } from "@/src/components/design-system/DialogController/DialogController";
import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
@@ -67,6 +68,7 @@ export function SkillEditor({
projectId,
store,
canCreate,
+ view,
onCreated,
history,
metadataOptions,
@@ -76,6 +78,9 @@ export function SkillEditor({
projectId: string;
store: SkillEditorStore;
canCreate: boolean;
+ view:
+ | { kind: "draft"; onDiscard: () => Promise<void> }
+ | { kind: "version"; hasDraft: boolean; onEdit: () => Promise<void> };
onCreated: (created: { name: string; version: number }) => Promise<void>;
history:
| { kind: "new" }
@@ -90,6 +95,8 @@ export function SkillEditor({
creator: string | null | undefined;
}>;
selectedVersion: number;
+ draftStore: SkillEditorStore | null;
+ onSelectDraft: () => Promise<void>;
hasMore: boolean;
isLoadingMore: boolean;
loadMoreError: boolean;
@@ -160,7 +167,7 @@ export function SkillEditor({
const capture = usePostHogClientCapture();
const [isSaving, setIsSaving] = useState(false);
const [isDownloading, setIsDownloading] = useState(false);
- const [isDraft, setIsDraft] = useState(baseVersion === null);
+ const isDraft = view.kind === "draft";
const canEditFiles = isDraft && canCreate && !isSaving;
const isDesktop = useMediaQuery({ query: "(min-width: 768px)" });
const [treeState, setTreeState] = useState<SkillFileExplorerState>(() => ({
@@ -332,7 +339,9 @@ export function SkillEditor({
};
const renderHeaderActions = (
- openDialog: (createNew: boolean) => void,
+ openDialog: (
+ state: { kind: "save"; createNew: boolean } | { kind: "discard" },
+ ) => void,
closeMenu?: () => void,
) => (
<div className="flex max-w-full flex-wrap items-center justify-start gap-2 sm:justify-end">
@@ -401,57 +410,90 @@ export function SkillEditor({
<Button
disabled={!canCreate}
title={!canCreate ? "You do not have write access" : undefined}
- onClick={() => {
+ onClick={async () => {
closeMenu?.();
- setIsDraft(true);
+ if (view.kind === "version") await view.onEdit();
}}
>
<Plus className="icon-base mr-1.5" />
- New version
+ {view.kind === "version" && view.hasDraft ? "Resume draft" : "Edit"}
</Button>
) : (
- <Button
- onClick={() => {
- closeMenu?.();
- openDialog(createsNewSkill);
- }}
- disabled={
- !canCreate ||
- isSaving ||
- isImporting ||
- (!createsNewSkill && !dirty) ||
- Boolean(createDisabledReason) ||
- isCheckingName
- }
- title={createButtonTitle}
- >
- <Save className="icon-base mr-1.5" />
- Save
- </Button>
+ <>
+ <Button
+ variant="outline"
+ disabled={isSaving || isImporting}
+ onClick={async () => {
+ closeMenu?.();
+ if (view.kind !== "draft") return;
+ if (dirty) openDialog({ kind: "discard" });
+ else await view.onDiscard();
+ }}
+ >
+ Discard draft
+ </Button>
+ <Button
+ onClick={() => {
+ closeMenu?.();
+ openDialog({ kind: "save", createNew: createsNewSkill });
+ }}
+ disabled={
+ !canCreate ||
+ isSaving ||
+ isImporting ||
+ (!createsNewSkill && !dirty) ||
+ Boolean(createDisabledReason) ||
+ isCheckingName
+ }
+ title={createButtonTitle}
+ >
+ <Save className="icon-base mr-1.5" />
+ Publish
+ </Button>
+ </>
)}
</div>
);
return (
- <DialogController<boolean>
- renderDialog={({ state: createNew, closeDialog }) => (
- <CreateSkillVersionDialog
- projectId={projectId}
- store={store}
- name={createNew ? draftName : name}
- isFirstVersion={createNew}
- isSaving={isSaving}
- disabled={
- isImporting ||
- Boolean(createDisabledReason) ||
- isCheckingName ||
- (!createNew && (hasNameChanged || !dirty))
- }
- onConfirm={async () => {
- if (await save(createNew)) closeDialog();
- }}
- />
- )}
+ <DialogController<
+ { kind: "save"; createNew: boolean } | { kind: "discard" }
+ >
+ renderDialog={({ state, closeDialog }) =>
+ state.kind === "discard" ? (
+ <Dialog
+ title="Discard draft?"
+ text="Your unsaved file changes and commit note will be lost."
+ actions={[
+ {
+ label: "Discard draft",
+ variant: "destructive",
+ onClick: async () => {
+ if (view.kind === "draft") await view.onDiscard();
+ closeDialog();
+ },
+ },
+ ]}
+ />
+ ) : (
+ <CreateSkillVersionDialog
+ projectId={projectId}
+ store={store}
+ name={state.createNew ? draftName : name}
+ isFirstVersion={state.createNew}
+ isSaving={isSaving}
+ disabled={
+ isImporting ||
+ Boolean(createDisabledReason) ||
+ isCheckingName ||
+ (!state.createNew && (hasNameChanged || !dirty))
+ }
+ onConfirm={async () => {
+ if (await save(state.createNew)) closeDialog();
+ }}
+ />
+ )
+ }
>
{({ openDialog }) => (
<Page
@@ -549,7 +591,6 @@ export function SkillEditor({
projectId={projectId}
name={name}
{...history}
- dirty={dirty}
isDraft={isDraft}
canEdit={canCreate}
labelOptions={metadataOptions.labels}
diff --git a/web/src/features/skills/components/SkillEditorPage.tsx b/web/src/features/skills/components/SkillEditorPage.tsx
index 99728c1367..5a06e0c2e2 100644
--- a/web/src/features/skills/components/SkillEditorPage.tsx
+++ b/web/src/features/skills/components/SkillEditorPage.tsx
@@ -3,6 +3,8 @@ import { useRouter } from "next/router";
import { useStore } from "zustand";
import Page from "@/src/components/layouts/page";
import { Skeleton } from "@/src/components/ui/skeleton";
+import { showErrorToast } from "@/src/features/notifications";
+import { SKILL_LATEST_LABEL } from "@langfuse/shared";
import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import {
NEW_SKILL_INITIAL_VALUE,
@@ -12,6 +14,7 @@ import {
import {
createSkillEditorStore,
type SkillEditorInitialValue,
+ type SkillEditorStore,
} from "@/src/features/skills/components/skillEditorStore";
import { parseSkillFrontmatterMetadata } from "@/src/features/skills/utils/parseSkillFrontmatterMetadata";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
@@ -57,6 +60,12 @@ export function NewSkillPage() {
projectId={projectId ?? ""}
store={store}
canCreate={canCreate}
+ view={{
+ kind: "draft",
+ onDiscard: async () => {
+ await router.push(`/project/${projectId}/skills`);
+ },
+ }}
history={{ kind: "new" }}
metadataOptions={{
labels: ["production"],
@@ -77,10 +86,28 @@ export function NewSkillPage() {
export function ExistingSkillPage() {
const router = useRouter();
- const [editorSession, setEditorSession] = useState(0);
const projectId = useProjectIdFromURL();
const skillName =
typeof router.query.skillName === "string" ? router.query.skillName : "";
+ return (
+ <ExistingSkillSession
+ key={`${projectId}:${skillName}`}
+ projectId={projectId ?? ""}
+ skillName={skillName}
+ />
+ );
+}
+
+function ExistingSkillSession({
+ projectId,
+ skillName,
+}: {
+ projectId: string;
+ skillName: string;
+}) {
+ const router = useRouter();
+ const [draftStore, setDraftStore] = useState<SkillEditorStore | null>(null);
+ const isDraft = draftStore !== null && router.query.draft === "true";
const requestedVersion =
typeof router.query.version === "string"
? Number(router.query.version)
@@ -160,20 +187,76 @@ export function ExistingSkillPage() {
skill.data &&
history.data
) {
+ const initialValue = toSkillEditorInitialValue({
+ ...skill.data,
+ files: skill.data.files.map((file) => ({
+ path: file.path,
+ currentSha: file.sha256Hash,
+ sourceSha: file.sha256Hash,
+ sourceContentLength: file.contentLength,
+ })),
+ });
+ async function selectDraft() {
+ const draft = draftStore ?? createSkillEditorStore(initialValue);
+ const baseVersion = draft.getState().baseVersion;
+ if (draftStore && baseVersion !== null) {
+ try {
+ const saved = await utils.skills.byName.fetch({
+ projectId,
+ name: skillName,
+ version: baseVersion,
+ });
+ draft
+ .getState()
+ .actions.syncLabels(
+ saved.labels.filter((label) => label !== SKILL_LATEST_LABEL),
+ );
+ draft.getState().actions.syncTags(saved.tags);
+ } catch (error) {
+ showErrorToast(
+ "Could not resume draft",
+ error instanceof Error ? error.message : "Please try again.",
+ );
+ return;
+ }
+ }
+ setDraftStore(draft);
+ await router.push({
+ pathname: router.pathname,
+ query: {
+ projectId,
+ skillName,
+ version: draft.getState().baseVersion,
+ draft: "true",
+ },
+ });
+ }
return (
<SkillEditorForInitialValue
headerProps={headerProps}
- key={`${skill.data.id}:${editorSession}`}
+ key={isDraft ? "draft" : skill.data.id}
projectId={projectId ?? ""}
- initialValue={toSkillEditorInitialValue({
- ...skill.data,
- files: skill.data.files.map((file) => ({
- path: file.path,
- currentSha: file.sha256Hash,
- sourceSha: file.sha256Hash,
- sourceContentLength: file.contentLength,
- })),
- })}
+ initialValue={initialValue}
+ store={isDraft ? (draftStore ?? undefined) : undefined}
+ view={
+ isDraft
+ ? {
+ kind: "draft",
+ onDiscard: async () => {
+ const baseVersion = draftStore!.getState().baseVersion;
+ setDraftStore(null);
+ await router.push({
+ pathname: router.pathname,
+ query: { projectId, skillName, version: baseVersion },
+ });
+ },
+ }
+ : {
+ kind: "version",
+ hasDraft: draftStore !== null,
+ onEdit: selectDraft,
+ }
+ }
canCreate={canCreate}
metadataOptions={{
labels: [
@@ -195,12 +278,13 @@ export function ExistingSkillPage() {
loadMoreError: history.isFetchNextPageError,
onLoadMore: () => history.fetchNextPage(),
selectedVersion: skill.data.version,
+ draftStore,
+ onSelectDraft: selectDraft,
onSelect: async (selectedVersion) => {
await router.push({
pathname: router.pathname,
query: { projectId, skillName, version: selectedVersion },
});
- setEditorSession((session) => session + 1);
},
}}
onCreated={async (created) => {
@@ -218,6 +302,7 @@ export function ExistingSkillPage() {
version: created.version,
},
});
+ setDraftStore(null);
}}
/>
);
@@ -228,11 +313,15 @@ export function ExistingSkillPage() {
function SkillEditorForInitialValue({
initialValue,
+ store: draftStore,
...props
}: Omit<ComponentProps<typeof SkillEditor>, "store"> & {
+ store?: SkillEditorStore;
initialValue: SkillEditorInitialValue;
}) {
- const [store] = useState(() => createSkillEditorStore(initialValue));
+ const [store] = useState(
+ () => draftStore ?? createSkillEditorStore(initialValue),
+ );
return <SkillEditor {...props} store={store} />;
}
diff --git a/web/src/features/skills/components/SkillFileExplorer.tsx b/web/src/features/skills/components/SkillFileExplorer.tsx
index 8f15e6a31a..498477104d 100644
--- a/web/src/features/skills/components/SkillFileExplorer.tsx
+++ b/web/src/features/skills/components/SkillFileExplorer.tsx
@@ -32,6 +32,7 @@ import {
FolderOpen,
FolderPlus,
Plus,
+ RotateCcw,
Trash2,
Upload,
X,
@@ -86,8 +87,12 @@ export function SkillFileExplorer({
}) {
const filePaths = useStore(
store,
- useShallow((state) => Object.keys(state.files)),
+ useShallow((state) => [
+ ...Object.keys(state.files),
+ ...Object.keys(state.deletedFiles),
+ ]),
);
+ const fileCount = useStore(store, (state) => Object.keys(state.files).length);
const folders = useStore(store, (state) => state.folders);
const activePath = useStore(store, (state) => state.activePath);
const actions = useStore(store, (state) => state.actions);
@@ -190,7 +195,7 @@ export function SkillFileExplorer({
return;
}
- if (pendingEntry.kind === "file" && filePaths.length >= MAX_SKILL_FILES) {
+ if (pendingEntry.kind === "file" && fileCount >= MAX_SKILL_FILES) {
showErrorToast(
"Could not add file",
`A skill can contain at most ${MAX_SKILL_FILES} files.`,
@@ -300,6 +305,16 @@ export function SkillFileExplorer({
setSelectedFolder(parentFolder(node.path));
}}
onDelete={() => actions.deleteFile(node.path)}
+ onRestore={() => {
+ if (actions.restoreFile(node.path)) {
+ setSelectedFolder(parentFolder(node.path));
+ } else {
+ showErrorToast(
+ "Could not restore file",
+ `A skill can contain at most ${MAX_SKILL_FILES} files. Delete another file before restoring this one.`,
+ );
+ }
+ }}
/>
);
}
@@ -450,6 +465,7 @@ function DraggableSkillFile({
active,
onSelect,
onDelete,
+ onRestore,
}: {
store: SkillEditorStore;
path: string;
@@ -458,9 +474,12 @@ function DraggableSkillFile({
active: boolean;
onSelect: () => void;
onDelete: () => void;
+ onRestore: () => void;
}) {
const changeStatusId = useId();
+ const deleted = useStore(store, (state) => Boolean(state.deletedFiles[path]));
const changeStatus = useStore(store, (state) => {
+ if (state.deletedFiles[path]) return null;
const file = state.files[path];
if (!file) return null;
if (file.sourceSha === null) return "new";
@@ -470,7 +489,7 @@ function DraggableSkillFile({
const indicator = changeStatus ? fileChangeIndicators[changeStatus] : null;
const IndicatorIcon = indicator?.icon;
const movable = path !== "SKILL.md";
- const draggable = movable && !disabled;
+ const draggable = movable && !disabled && !deleted;
const {
attributes,
listeners,
@@ -503,12 +522,13 @@ function DraggableSkillFile({
aria-describedby={
[
draggable ? attributes["aria-describedby"] : undefined,
- indicator ? changeStatusId : undefined,
+ indicator || deleted ? changeStatusId : undefined,
]
.filter(Boolean)
.join(" ") || undefined
}
onClick={onSelect}
+ disabled={deleted}
className={cn(
"flex min-w-0 flex-1 items-center gap-2 px-1.5 py-1.5 text-left",
draggable && "cursor-grab touch-none active:cursor-grabbing",
@@ -519,9 +539,20 @@ function DraggableSkillFile({
) : (
<File className="icon-base shrink-0" />
)}
- <span className="min-w-0 flex-1 truncate" title={path}>
+ <span
+ className={cn(
+ "min-w-0 flex-1 truncate",
+ deleted && "text-muted-foreground line-through",
+ )}
+ title={path}
+ >
{name}
</span>
+ {deleted ? (
+ <span id={changeStatusId} className="sr-only">
+ Deleted file
+ </span>
+ ) : null}
{indicator && IndicatorIcon ? (
<Tooltip label={indicator.label}>
{({ getTriggerProps }) => (
@@ -547,11 +578,20 @@ function DraggableSkillFile({
type="button"
variant="ghost"
size="icon-sm"
- aria-label={`Delete ${path}`}
- onClick={onDelete}
- className="mr-1 opacity-100 md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100"
+ aria-label={`${deleted ? "Restore" : "Delete"} ${path}`}
+ title={deleted ? "Restore file" : "Delete file"}
+ onClick={deleted ? onRestore : onDelete}
+ className={cn(
+ "mr-1",
+ !deleted &&
+ "opacity-100 md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
+ )}
>
- <Trash2 className="icon-base text-icon-foreground" />
+ {deleted ? (
+ <RotateCcw className="icon-base text-icon-foreground" />
+ ) : (
+ <Trash2 className="icon-base text-icon-foreground" />
+ )}
</Button>
) : null}
</div>
diff --git a/web/src/features/skills/components/SkillVersionComparison.tsx b/web/src/features/skills/components/SkillVersionComparison.tsx
index 322a5aeb25..727fae08c8 100644
--- a/web/src/features/skills/components/SkillVersionComparison.tsx
+++ b/web/src/features/skills/components/SkillVersionComparison.tsx
@@ -5,6 +5,8 @@ import { DialogController } from "@/src/components/design-system/DialogControlle
import { SelectInput } from "@/src/components/design-system/SelectInput/SelectInput";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
import { compareSkillFiles } from "@/src/features/skills/utils/compareSkillFiles";
+import { SkillDraftChanges } from "./SkillDraftChanges";
+import { type SkillEditorStore } from "./skillEditorStore";
import { SkillFileChanges } from "./SkillFileChanges";
import { SkillFileDiff } from "./SkillFileDiff";
import { SkillComparisonError } from "./SkillComparisonError";
@@ -14,6 +16,7 @@ type ComparisonProps = {
projectId: string;
name: string;
selectedVersion: number;
+ draftStore: SkillEditorStore | null;
versions: { version: number }[];
hasMore: boolean;
isLoadingMore: boolean;
@@ -26,26 +29,33 @@ export function SkillVersionComparisonController({
...props
}: ComparisonProps & {
children: (control: {
- openComparison: (version: number) => void;
+ openComparison: (version: number, compareDraft?: boolean) => void;
}) => ReactNode;
}) {
const capture = usePostHogClientCapture();
return (
- <DialogController<{ before: number; after: number }>
+ <DialogController<{ before: number; after: number | "draft" }>
renderDialog={({ state }) => (
<SkillVersionComparison {...props} initialVersions={state} />
)}
>
{({ openDialog }) =>
children({
- openComparison: (version) => {
- if (version === props.selectedVersion) return;
+ openComparison: (version, compareDraft = false) => {
+ if (!compareDraft && version === props.selectedVersion) return;
const before = version;
- const after = props.selectedVersion;
+ const after =
+ compareDraft && props.draftStore
+ ? "draft"
+ : props.selectedVersion;
capture("skills:version_compare", {
beforeVersion: before,
- afterVersion: after,
+ afterVersion:
+ after === "draft"
+ ? props.draftStore?.getState().baseVersion
+ : after,
+ isDraftComparison: after === "draft",
});
openDialog({ before, after });
},
@@ -58,7 +68,9 @@ export function SkillVersionComparisonController({
function SkillVersionComparison({
initialVersions,
...props
-}: ComparisonProps & { initialVersions: { before: number; after: number } }) {
+}: ComparisonProps & {
+ initialVersions: { before: number; after: number | "draft" };
+}) {
const [before, setBefore] = useState(initialVersions.before);
const [after, setAfter] = useState(initialVersions.after);
const options = [
@@ -77,14 +89,44 @@ function SkillVersionComparison({
setBefore(Number(value));
}
function handleAfterChange(value: string) {
- setAfter(Number(value));
+ setAfter(value === "draft" ? "draft" : Number(value));
+ }
+
+ function renderComparison() {
+ if (after === "draft") {
+ return props.draftStore ? (
+ <SkillDraftChanges
+ key={`draft:${before}`}
+ projectId={props.projectId}
+ store={props.draftStore}
+ isFirstVersion={false}
+ comparisonVersion={before}
+ />
+ ) : null;
+ }
+ if (before === after) {
+ return (
+ <p role="status" className="text-muted-foreground text-sm">
+ Select two different versions to compare.
+ </p>
+ );
+ }
+ return (
+ <SkillVersionFiles
+ key={`${before}:${after}`}
+ projectId={props.projectId}
+ name={props.name}
+ before={before}
+ after={after}
+ />
+ );
}
return (
<Dialog title="Compare skill versions" size="xxl">
<div className="ph-no-capture flex min-h-0 flex-1 flex-col gap-4 overflow-y-auto p-4">
<p className="text-muted-foreground text-sm">
- Compare saved file contents. Unsaved draft changes are not included.
+ Compare saved versions or your unsaved local draft.
</p>
<div className="grid shrink-0 grid-cols-2 gap-4">
<div className="flex min-w-0 flex-col gap-1">
@@ -102,7 +144,11 @@ function SkillVersionComparison({
<SelectInput
aria-label="To version"
value={String(after)}
- options={options}
+ options={
+ props.draftStore
+ ? [{ value: "draft", label: "Local draft" }, ...options]
+ : options
+ }
placeholder="Select version"
onValueChange={handleAfterChange}
/>
@@ -124,19 +170,7 @@ function SkillVersionComparison({
/>
</div>
) : null}
- {before === after ? (
- <p role="status" className="text-muted-foreground text-sm">
- Select two different versions to compare.
- </p>
- ) : (
- <SkillVersionFiles
- key={`${before}:${after}`}
- projectId={props.projectId}
- name={props.name}
- before={before}
- after={after}
- />
- )}
+ {renderComparison()}
</div>
</Dialog>
);
diff --git a/web/src/features/skills/components/SkillVersionHistory.tsx b/web/src/features/skills/components/SkillVersionHistory.tsx
index 2585ca91f6..91349737e0 100644
--- a/web/src/features/skills/components/SkillVersionHistory.tsx
+++ b/web/src/features/skills/components/SkillVersionHistory.tsx
@@ -8,6 +8,7 @@ import {
TimelineItem,
} from "@/src/features/prompts/components/timeline";
import { cn } from "@/src/utils/tailwind";
+import { type SkillEditorStore } from "./skillEditorStore";
import { SkillLabelsSelect } from "./SkillMetadataSelect";
import { SkillVersionComparisonController } from "./SkillVersionComparison";
@@ -31,7 +32,8 @@ export function SkillVersionHistory(
isLoadingMore: boolean;
loadMoreError: boolean;
onLoadMore: () => void;
- dirty: boolean;
+ draftStore: SkillEditorStore | null;
+ onSelectDraft: () => Promise<void>;
isDraft: boolean;
canEdit: boolean;
labelOptions: string[];
@@ -47,7 +49,7 @@ export function SkillVersionHistory(
(left, right) => right.version - left.version,
)
: [];
- const showDraft = props.kind === "new" || props.isDraft;
+ const showDraft = props.kind === "new" || props.draftStore !== null;
const selectVersion = async (version: number) => {
if (
@@ -55,12 +57,6 @@ export function SkillVersionHistory(
(!props.isDraft && version === props.selectedVersion)
)
return;
- if (
- props.dirty &&
- !window.confirm("Discard this unsaved draft and open another version?")
- ) {
- return;
- }
await props.onSelect(version);
};
@@ -101,21 +97,47 @@ export function SkillVersionHistory(
<div className="overflow-y-auto p-2">
<Timeline>
{showDraft ? (
- <TimelineItem isActive>
- <div
- className="flex w-full flex-col gap-1 text-left"
- aria-current="page"
- >
- <Badge variant="outline" className="w-fit">
- Draft
- </Badge>
- <Badge
- variant="secondary"
- className="h-5 w-fit max-w-full truncate px-1.5 text-[10px]"
- title="Unreleased local changes"
+ <TimelineItem isActive={props.kind === "new" || props.isDraft}>
+ <div className="flex items-start gap-1">
+ <button
+ type="button"
+ className="flex min-w-0 flex-1 flex-col gap-1 text-left"
+ aria-label="Open local draft"
+ aria-current={
+ props.kind === "new" || props.isDraft ? "page" : undefined
+ }
+ onClick={async () => {
+ if (props.kind === "versions")
+ await props.onSelectDraft();
+ }}
>
- Unreleased local changes
- </Badge>
+ <Badge variant="outline" className="w-fit">
+ Draft
+ </Badge>
+ <Badge
+ variant="secondary"
+ className="h-5 w-fit max-w-full truncate px-1.5 text-[10px]"
+ title="Unreleased local changes"
+ >
+ Unreleased local changes
+ </Badge>
+ </button>
+ {props.kind === "versions" ? (
+ <SkillVersionComparisonController {...props}>
+ {({ openComparison }) => (
+ <IconButton
+ icon={FileDiffIcon}
+ label={`Compare local draft with version ${props.selectedVersion}`}
+ title="Compare local draft"
+ variant="outline"
+ size="sm"
+ onClick={() =>
+ openComparison(props.selectedVersion, true)
+ }
+ />
+ )}
+ </SkillVersionComparisonController>
+ ) : null}
</div>
</TimelineItem>
) : null}
@@ -192,24 +214,32 @@ export function SkillVersionHistory(
{creator || createdBy}
</span>
</button>
- {version !== props.selectedVersion ? (
+ {props.isDraft || version !== props.selectedVersion ? (
<SkillVersionComparisonController
{...props}
versions={sortedVersions}
>
{({ openComparison }) => {
- function handleCompareClick(
+ const handleCompareClick = (
event: MouseEvent<HTMLButtonElement>,
- ) {
+ ) => {
event.stopPropagation();
- openComparison(version);
- }
+ openComparison(version, props.isDraft);
+ };
return (
<div className="shrink-0 group-focus-within/skill-version:opacity-100 group-hover/skill-version:opacity-100 [@media(hover:hover)]:opacity-0">
<IconButton
icon={FileDiffIcon}
- label={`Compare version ${version} with selected version ${props.selectedVersion}`}
- title="Compare with selected version"
+ label={
+ props.isDraft
+ ? `Compare version ${version} with local draft`
+ : `Compare version ${version} with selected version ${props.selectedVersion}`
+ }
+ title={
+ props.isDraft
+ ? "Compare with local draft"
+ : "Compare with selected version"
+ }
variant="outline"
size="sm"
onClick={handleCompareClick}
diff --git a/web/src/features/skills/components/skillEditorStore.ts b/web/src/features/skills/components/skillEditorStore.ts
index 0b339133aa..98cc7fa31b 100644
--- a/web/src/features/skills/components/skillEditorStore.ts
+++ b/web/src/features/skills/components/skillEditorStore.ts
@@ -1,5 +1,5 @@
import { createStore, type StoreApi } from "zustand/vanilla";
-import { SkillFilePathSchema } from "@langfuse/shared";
+import { MAX_SKILL_FILES, SkillFilePathSchema } from "@langfuse/shared";
import { getParentFolderPaths } from "./skillFileTree";
import { resetSkillName } from "../utils/resetSkillName";
import { hashSkillFileContent } from "../utils/hashSkillFileContent";
@@ -38,6 +38,7 @@ type SkillEditorState = {
name: string;
baseVersion: number | null;
files: Record<string, SkillDraftFile>;
+ deletedFiles: Record<string, SkillDraftFile>;
folders: string[];
activePath: string;
labels: string[];
@@ -55,6 +56,7 @@ type SkillEditorState = {
moveFolder: (path: string, targetFolder: string) => boolean;
addFolder: (path: string) => boolean;
deleteFile: (path: string) => void;
+ restoreFile: (path: string) => boolean;
deleteFolder: (path: string) => boolean;
syncLabels: (labels: string[]) => void;
syncTags: (tags: string[]) => void;
@@ -79,6 +81,7 @@ export function createSkillEditorStore(
name: initialValue.name,
baseVersion: initialValue.baseVersion,
files,
+ deletedFiles: {},
folders,
activePath: files["SKILL.md"] ? "SKILL.md" : initialValue.files[0]!.path,
labels: initialValue.labels.filter((label) => label !== "latest"),
@@ -166,7 +169,13 @@ export function createSkillEditorStore(
},
addFile: (file) => {
const state = get();
- if (hasFilePathConflict(file.path, state.files, state.folders)) {
+ if (
+ hasFilePathConflict(
+ file.path,
+ { ...state.files, ...state.deletedFiles },
+ state.folders,
+ )
+ ) {
return false;
}
set((state) => ({
@@ -198,7 +207,11 @@ export function createSkillEditorStore(
if (nextPath === path) return true;
if (
!SkillFilePathSchema.safeParse(nextPath).success ||
- hasFilePathConflict(nextPath, state.files, state.folders)
+ hasFilePathConflict(
+ nextPath,
+ { ...state.files, ...state.deletedFiles },
+ state.folders,
+ )
) {
return false;
}
@@ -223,7 +236,13 @@ export function createSkillEditorStore(
const name = path.split("/").at(-1)!;
const nextPath = targetFolder ? `${targetFolder}/${name}` : name;
if (nextPath === path) return true;
- if (hasFilePathConflict(nextPath, state.files, state.folders))
+ if (
+ hasFilePathConflict(
+ nextPath,
+ { ...state.files, ...state.deletedFiles },
+ state.folders,
+ )
+ )
return false;
const relocate = (entryPath: string) =>
@@ -240,8 +259,21 @@ export function createSkillEditorStore(
];
}),
);
+ const nextDeletedFiles = Object.fromEntries(
+ Object.entries(state.deletedFiles).map(([filePath, file]) => {
+ const movedPath = relocate(filePath);
+ return [
+ movedPath,
+ movedPath === filePath ? file : { ...file, path: movedPath },
+ ];
+ }),
+ );
if (
- [...nextFolders, ...Object.keys(nextFiles)].some(
+ [
+ ...nextFolders,
+ ...Object.keys(nextFiles),
+ ...Object.keys(nextDeletedFiles),
+ ].some(
(entryPath) => !SkillFilePathSchema.safeParse(entryPath).success,
)
)
@@ -249,6 +281,7 @@ export function createSkillEditorStore(
set({
files: nextFiles,
+ deletedFiles: nextDeletedFiles,
folders: nextFolders,
activePath: relocate(state.activePath),
dirty: true,
@@ -259,7 +292,7 @@ export function createSkillEditorStore(
const state = get();
if (
state.folders.includes(path) ||
- hasFileAtOrAbove(path, state.files)
+ hasFileAtOrAbove(path, { ...state.files, ...state.deletedFiles })
) {
return false;
}
@@ -275,23 +308,42 @@ export function createSkillEditorStore(
return true;
},
deleteFile: (path) => {
- if (path === "SKILL.md") return;
+ if (path === "SKILL.md" || !get().files[path]) return;
set((state) => {
- const { [path]: _, ...remainingFiles } = state.files;
+ const { [path]: file, ...remainingFiles } = state.files;
return {
files: remainingFiles,
+ deletedFiles: file!.sourceSha
+ ? { ...state.deletedFiles, [path]: file! }
+ : state.deletedFiles,
activePath:
state.activePath === path ? "SKILL.md" : state.activePath,
dirty: true,
};
});
},
+ restoreFile: (path) => {
+ const state = get();
+ const file = state.deletedFiles[path];
+ if (!file || Object.keys(state.files).length >= MAX_SKILL_FILES)
+ return false;
+ const { [path]: _, ...remainingDeletedFiles } = state.deletedFiles;
+ set({
+ files: { ...state.files, [path]: file },
+ deletedFiles: remainingDeletedFiles,
+ activePath: path,
+ dirty: true,
+ });
+ get().actions.hashPendingFiles();
+ return true;
+ },
deleteFolder: (path) => {
const state = get();
const isEmpty =
- !Object.keys(state.files).some((filePath) =>
- filePath.startsWith(`${path}/`),
- ) &&
+ ![
+ ...Object.keys(state.files),
+ ...Object.keys(state.deletedFiles),
+ ].some((filePath) => filePath.startsWith(`${path}/`)) &&
!state.folders.some(
(folderPath) =>
folderPath !== path && folderPath.startsWith(`${path}/`),