diff --git a/migrations/0033_media_assets_external_ref_unique.sql b/migrations/0033_media_assets_external_ref_unique.sql
new file mode 100644
index 0000000..46d4e0c
--- /dev/null
+++ b/migrations/0033_media_assets_external_ref_unique.sql
@@ -0,0 +1,7 @@
+-- Fix 3 (final review): external_ref's plain index let two concurrent inserts for the
+-- same idempotency key (e.g. "crayo:project:<id>") both pass the findAssetByExternalRef
+-- "not found" check and create two asset rows. A unique partial index makes the second
+-- insert fail at the database instead. The old non-unique index is dropped since the
+-- new unique index already serves equality lookups by external_ref.
+drop index if exists media_assets_external_ref_idx;
+create unique index if not exists media_assets_external_ref_unique on media_assets (external_ref) where external_ref is not null;
diff --git a/package-lock.json b/package-lock.json
index 7d8ca99..b2f073c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -74,6 +74,7 @@
         "@vitejs/plugin-react": "^5.2.0",
         "eslint": "^9.20.0",
         "eslint-config-prettier": "^10.1.1",
+        "eslint-formatter-compact": "^9.0.1",
         "eslint-plugin-prettier": "^5.2.6",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^0.4.20",
@@ -6714,6 +6715,16 @@
         "eslint": ">=7.0.0"
       }
     },
+    "node_modules/eslint-formatter-compact": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-formatter-compact/-/eslint-formatter-compact-9.0.1.tgz",
+      "integrity": "sha512-mBAti2tb403dQGMyilQTYHU80stem3N7jdtKW+tmn5gj3JNF7ki0rgCZtJFw4iMayTH862FTUIqCdp70ug0S0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/eslint-plugin-prettier": {
       "version": "5.5.6",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.6.tgz",
@@ -8354,18 +8365,6 @@
         }
       }
     },
-    "node_modules/nitro/node_modules/lru-cache": {
-      "version": "11.5.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
-      "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/nitro/node_modules/rou3": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/rou3/-/rou3-0.8.1.tgz",
diff --git a/package.json b/package.json
index 408316f..c1991fe 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
     "@vitejs/plugin-react": "^5.2.0",
     "eslint": "^9.20.0",
     "eslint-config-prettier": "^10.1.1",
+    "eslint-formatter-compact": "^9.0.1",
     "eslint-plugin-prettier": "^5.2.6",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
diff --git a/src/components/agent/results.tsx b/src/components/agent/results.tsx
index 43c870c..f1e65b1 100644
--- a/src/components/agent/results.tsx
+++ b/src/components/agent/results.tsx
@@ -1,12 +1,90 @@
-import { collectAgentVisualResults } from "@/lib/agent-results";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { collectAgentVisualResults, type AgentVisualResults } from "@/lib/agent-results";
 import type { AgentRunDetail } from "@/lib/agent";
+import { agentRunQueryKey, isAgentBusy } from "@/lib/agent";
+import { signLibraryAssetsFn } from "@/lib/server/library-fns";
+import { retryClipExportFn } from "@/lib/server/agent-fns";
 import { GlassCard } from "@/components/ui/glass-card";
-import { isAgentBusy } from "@/lib/agent";
+import { Button } from "@/components/ui/button";
+import { toast } from "sonner";
+import { userFacingErrorMessage } from "@/lib/errors";
+
+function LibraryClips({
+  runId,
+  clips,
+}: {
+  runId: string;
+  clips: AgentVisualResults["libraryClips"];
+}) {
+  const queryClient = useQueryClient();
+  const ids = clips.map((c) => c.assetId).filter((id): id is string => Boolean(id));
+  const signed = useQuery({
+    queryKey: ["library-signed", ids.join(",")],
+    queryFn: () => signLibraryAssetsFn({ data: { assetIds: ids } }),
+    enabled: ids.length > 0,
+    staleTime: 10 * 60 * 1000,
+  });
+  const retry = useMutation({
+    mutationFn: (projectId: string) => retryClipExportFn({ data: { runId, projectId } }),
+    onSuccess: async () => {
+      toast.success("Export retried");
+      await queryClient.invalidateQueries({ queryKey: agentRunQueryKey(runId) });
+    },
+    onError: (error) => toast.error(userFacingErrorMessage(error)),
+  });
+  return (
+    <div className="mt-3 grid gap-3 sm:grid-cols-2">
+      {clips.map((clip) => {
+        const row = signed.data?.find((r) => r.assetId === clip.assetId);
+        return (
+          <figure key={clip.projectId} className="overflow-hidden rounded-control bg-black/40">
+            {row?.previewUrl ? (
+              <video
+                src={row.previewUrl}
+                poster={row.thumbnailUrl ?? undefined}
+                controls
+                className="max-h-72 w-full"
+                preload="metadata"
+              />
+            ) : (
+              <div className="grid h-40 place-items-center text-caption text-muted">
+                {clip.status === "failed" ? "Export failed" : "Preparing…"}
+              </div>
+            )}
+            <figcaption className="flex items-center justify-between gap-2 px-2 py-1 text-caption text-muted">
+              <span className="truncate">
+                {clip.title}
+                {row
+                  ? ` · ${row.backend === "supabase" ? "Supabase Storage" : row.backend === "s3" ? "S3" : "local disk"}`
+                  : ""}
+              </span>
+              {row?.downloadUrl ? (
+                <Button size="sm" variant="secondary" asChild>
+                  <a href={row.downloadUrl}>Download</a>
+                </Button>
+              ) : clip.status === "failed" ? (
+                <Button
+                  size="sm"
+                  variant="secondary"
+                  disabled={retry.isPending}
+                  onClick={() => retry.mutate(clip.projectId)}
+                  title={clip.error ?? undefined}
+                >
+                  Retry
+                </Button>
+              ) : null}
+            </figcaption>
+          </figure>
+        );
+      })}
+    </div>
+  );
+}
 
 export function AgentResults({ detail }: { detail: AgentRunDetail }) {
   if (isAgentBusy(detail.run.status)) return null;
   const results = collectAgentVisualResults(detail);
-  if (results.empty && !results.summary) {
+  if (results.empty) {
     if (detail.run.status !== "succeeded" && detail.run.status !== "failed") return null;
     return (
       <GlassCard>
@@ -25,7 +103,12 @@ export function AgentResults({ detail }: { detail: AgentRunDetail }) {
   return (
     <GlassCard>
       <p className="text-caption text-muted">Results</p>
-      {results.summary ? <p className="mt-2 whitespace-pre-wrap text-body">{results.summary}</p> : null}
+      {results.summary ? (
+        <p className="mt-2 whitespace-pre-wrap text-body">{results.summary}</p>
+      ) : null}
+      {results.libraryClips.length > 0 ? (
+        <LibraryClips runId={detail.run.id} clips={results.libraryClips} />
+      ) : null}
       {videos.length > 0 ? (
         <div className="mt-3 grid gap-3 sm:grid-cols-2">
           {videos.map((row) => (
@@ -39,7 +122,13 @@ export function AgentResults({ detail }: { detail: AgentRunDetail }) {
       {images.length > 0 ? (
         <div className="mt-3 grid grid-cols-2 gap-2 sm:grid-cols-3">
           {images.map((row) => (
-            <a key={row.url} href={row.url} target="_blank" rel="noreferrer" className="block overflow-hidden rounded-control">
+            <a
+              key={row.url}
+              href={row.url}
+              target="_blank"
+              rel="noreferrer"
+              className="block overflow-hidden rounded-control"
+            >
               <img src={row.url} alt={row.label} className="h-36 w-full object-cover" />
             </a>
           ))}
@@ -73,7 +162,12 @@ export function AgentResults({ detail }: { detail: AgentRunDetail }) {
         <ul className="mt-3 grid gap-1 text-caption">
           {links.map((row) => (
             <li key={row.url}>
-              <a href={row.url} target="_blank" rel="noreferrer" className="text-accent underline-offset-2 hover:underline">
+              <a
+                href={row.url}
+                target="_blank"
+                rel="noreferrer"
+                className="text-accent underline-offset-2 hover:underline"
+              >
                 {row.label}: {row.url}
               </a>
             </li>
diff --git a/src/components/agent/tool-cards.tsx b/src/components/agent/tool-cards.tsx
index d0bf376..a11767d 100644
--- a/src/components/agent/tool-cards.tsx
+++ b/src/components/agent/tool-cards.tsx
@@ -115,14 +115,23 @@ export function AgentToolCardView({
       ) : null}
       {!crayoReady && RUNNABLE.has(card.ui) ? (
         <p className="mt-2 text-caption text-warning">
-          Crayo isn’t connected. Paste your Crayo API key in Settings → Integrations → Crayo.ai (no redeploy needed).
+          Crayo isn’t connected. Paste your Crayo API key in Settings → Integrations → Crayo.ai (no
+          redeploy needed).
         </p>
       ) : null}
     </GlassCard>
   );
 }
 
-const RUNNABLE = new Set<AgentSlashUi>(["short", "autoclip", "voiceover", "image", "import", "export", "ingest"]);
+const RUNNABLE = new Set<AgentSlashUi>([
+  "short",
+  "autoclip",
+  "voiceover",
+  "image",
+  "import",
+  "export",
+  "ingest",
+]);
 
 const CARD_COPY: Record<
   AgentSlashUi,
@@ -166,7 +175,7 @@ const CARD_COPY: Record<
   },
   ingest: {
     title: "Ingest to library",
-    hint: "Crayo CDN https only → Filebase, source=AGENT.",
+    hint: "Crayo CDN https only → Library, source=AGENT.",
     action: "Ingest",
     icon: <Upload className="size-4" aria-hidden="true" />,
   },
@@ -192,7 +201,8 @@ const CARD_COPY: Record<
 
 function canSubmit(ui: AgentSlashUi, draft: Record<string, string>): boolean {
   if (ui === "short") return Boolean(draft.topic?.trim() || draft.script?.trim());
-  if (ui === "autoclip") return Boolean(draft.url?.trim()) && autoclipSourceProblem(draft.url ?? "") === null;
+  if (ui === "autoclip")
+    return Boolean(draft.url?.trim()) && autoclipSourceProblem(draft.url ?? "") === null;
   if (ui === "import" || ui === "ingest") return Boolean(draft.url?.startsWith("https://"));
   if (ui === "voiceover") return Boolean(draft.script?.trim() && draft.voiceId?.trim());
   if (ui === "image") return Boolean(draft.prompt?.trim());
@@ -208,13 +218,20 @@ function buildGoal(
   if (ui === "short") {
     return {
       preset: "crayo-short",
-      goal: buildCrayoShortGoal({ topic: draft.topic ?? "", script: draft.script ?? "", clientName }),
+      goal: buildCrayoShortGoal({
+        topic: draft.topic ?? "",
+        script: draft.script ?? "",
+        clientName,
+      }),
     };
   }
   if (ui === "autoclip") {
     return {
       preset: "crayo-autoclip",
-      goal: buildCrayoAutoclipGoal({ url: draft.url ?? "", clipCount: Number(draft.clipCount ?? 5) }),
+      goal: buildCrayoAutoclipGoal({
+        url: draft.url ?? "",
+        clipCount: Number(draft.clipCount ?? 5),
+      }),
     };
   }
   if (ui === "voiceover") {
@@ -230,17 +247,29 @@ function buildGoal(
   if (ui === "image") {
     return {
       preset: "crayo-image",
-      goal: buildCrayoImageGoal({ prompt: draft.prompt ?? "", aspectRatio: draft.aspectRatio || "9:16" }),
+      goal: buildCrayoImageGoal({
+        prompt: draft.prompt ?? "",
+        aspectRatio: draft.aspectRatio || "9:16",
+      }),
     };
   }
   if (ui === "import") {
-    return { preset: "crayo-import", goal: buildCrayoImportGoal({ url: draft.url ?? "", name: draft.name }) };
+    return {
+      preset: "crayo-import",
+      goal: buildCrayoImportGoal({ url: draft.url ?? "", name: draft.name }),
+    };
   }
   if (ui === "export") {
-    return { preset: "crayo-export", goal: buildCrayoExportGoal({ projectId: draft.projectId ?? "" }) };
+    return {
+      preset: "crayo-export",
+      goal: buildCrayoExportGoal({ projectId: draft.projectId ?? "" }),
+    };
   }
   if (ui === "ingest") {
-    return { preset: "crayo-ingest", goal: buildCrayoIngestGoal({ url: draft.url ?? "", title: draft.title }) };
+    return {
+      preset: "crayo-ingest",
+      goal: buildCrayoIngestGoal({ url: draft.url ?? "", title: draft.title }),
+    };
   }
   return null;
 }
@@ -300,7 +329,11 @@ function AutoclipFields({
           aria-invalid={problem ? true : undefined}
           aria-describedby="card-long-url-hint"
         />
-        <p id="card-long-url-hint" className={problem ? "text-caption text-warning" : "text-caption text-muted-foreground"} role={problem ? "alert" : undefined}>
+        <p
+          id="card-long-url-hint"
+          className={problem ? "text-caption text-warning" : "text-caption text-muted-foreground"}
+          role={problem ? "alert" : undefined}
+        >
           {problem ??
             "YouTube, TikTok, Vimeo, X or Twitch links are fetched in a sandbox at 720p and uploaded to Crayo. Streams over 3 h are split into ~70-min segments, each its own AutoClip job (clips and credits spread across them). Direct file links (mp4/mov ≤100MB) import straight away."}
         </p>
@@ -363,7 +396,10 @@ function VoiceoverFields({
               : "No voices returned. Check Crayo credits, then retry."}
           </p>
         ) : (
-          <Select value={draft.voiceId || undefined} onValueChange={(value) => set({ voiceId: value })}>
+          <Select
+            value={draft.voiceId || undefined}
+            onValueChange={(value) => set({ voiceId: value })}
+          >
             <SelectTrigger id="card-voice">
               <SelectValue placeholder="Pick a voice" />
             </SelectTrigger>
@@ -412,7 +448,10 @@ function ImageFields({
       </div>
       <div className="flex flex-col gap-1.5">
         <Label htmlFor="card-aspect">Aspect</Label>
-        <Select value={draft.aspectRatio || "9:16"} onValueChange={(value) => set({ aspectRatio: value })}>
+        <Select
+          value={draft.aspectRatio || "9:16"}
+          onValueChange={(value) => set({ aspectRatio: value })}
+        >
           <SelectTrigger id="card-aspect">
             <SelectValue />
           </SelectTrigger>
@@ -534,7 +573,10 @@ function VoicesBrowser({ crayoReady }: { crayoReady: boolean }) {
   return (
     <ul className="grid max-h-64 gap-1 overflow-y-auto">
       {voicesQuery.data.voices.map((voice) => (
-        <li key={voice.id} className="flex items-baseline justify-between gap-2 rounded-control bg-secondary-surface/50 px-3 py-2">
+        <li
+          key={voice.id}
+          className="flex items-baseline justify-between gap-2 rounded-control bg-secondary-surface/50 px-3 py-2"
+        >
           <span className="text-body">{voice.name}</span>
           <span className="font-mono text-caption text-muted">{voice.id}</span>
         </li>
@@ -581,7 +623,11 @@ function AssetsBrowser({ crayoReady }: { crayoReady: boolean }) {
   }
   if (query.isPending) return <Skeleton className="h-24" />;
   if (!query.data?.ok) {
-    return <p className="text-caption text-warning">{explainAgentToolError(query.data?.error ?? "MISSING")}</p>;
+    return (
+      <p className="text-caption text-warning">
+        {explainAgentToolError(query.data?.error ?? "MISSING")}
+      </p>
+    );
   }
   if (query.data.assets.length === 0) {
     return <p className="text-caption text-muted">No assets in this Crayo account yet.</p>;
@@ -589,7 +635,10 @@ function AssetsBrowser({ crayoReady }: { crayoReady: boolean }) {
   return (
     <ul className="grid max-h-64 gap-1 overflow-y-auto">
       {query.data.assets.map((asset) => (
-        <li key={asset.id} className="flex items-baseline justify-between gap-2 rounded-control bg-secondary-surface/50 px-3 py-2">
+        <li
+          key={asset.id}
+          className="flex items-baseline justify-between gap-2 rounded-control bg-secondary-surface/50 px-3 py-2"
+        >
           <span className="min-w-0 truncate text-body">{asset.name}</span>
           <span className="shrink-0 text-caption text-muted">{asset.type}</span>
         </li>
diff --git a/src/components/library/asset-card.tsx b/src/components/library/asset-card.tsx
index 4de15a9..1de026d 100644
--- a/src/components/library/asset-card.tsx
+++ b/src/components/library/asset-card.tsx
@@ -1,14 +1,9 @@
-import { Film, Image as ImageIcon } from "lucide-react";
+import { Download, Film, Image as ImageIcon } from "lucide-react";
 import { Badge, statusTone } from "@/components/ui/badge";
 import { GlassCard } from "@/components/ui/glass-card";
 import { ScoreBadge } from "@/components/performance/score-badge";
 import { cn } from "@/lib/utils";
-import {
-  SOURCE_LABELS,
-  formatBytes,
-  formatDurationSec,
-  type LibraryAsset,
-} from "@/lib/library";
+import { SOURCE_LABELS, formatBytes, formatDurationSec, type LibraryAsset } from "@/lib/library";
 import type { AssetPerformanceRollup } from "@/lib/performance";
 import { formatUnknownNumber } from "@/lib/performance";
 import { formatCompactCount } from "@/lib/format";
@@ -89,24 +84,35 @@ export function AssetCard({
           <Badge tone="neutral">{SOURCE_LABELS[asset.source]}</Badge>
           {asset.aspectRatio ? <Badge tone="blue">{asset.aspectRatio}</Badge> : null}
           {rollup ? (
-            <ScoreBadge
-              score={rollup.score}
-              verdict={rollup.winnerCount > 0 ? "WINNER" : null}
-            />
+            <ScoreBadge score={rollup.score} verdict={rollup.winnerCount > 0 ? "WINNER" : null} />
+          ) : null}
+        </div>
+        <div className="flex items-center justify-between gap-2">
+          <p className="text-caption text-muted">
+            {[
+              asset.kind.toLowerCase(),
+              formatBytes(asset.byteSize),
+              rollup?.viewsTotal != null
+                ? `${formatUnknownNumber(rollup.viewsTotal, formatCompactCount)} views`
+                : null,
+            ]
+              .filter(Boolean)
+              .join(" · ")}
+          </p>
+          {asset.previewUrl &&
+          (asset.kind === "VIDEO" || asset.kind === "IMAGE" || asset.kind === "AUDIO") ? (
+            <a
+              href={`${asset.previewUrl}&download=1`}
+              className="inline-flex items-center gap-1 text-caption text-accent"
+              aria-label={`Download ${asset.title}`}
+              onClick={(e) => e.stopPropagation()}
+            >
+              <Download className="size-3.5" aria-hidden="true" />
+              Download
+            </a>
           ) : null}
         </div>
-        <p className="text-caption text-muted">
-          {[
-            asset.kind.toLowerCase(),
-            formatBytes(asset.byteSize),
-            rollup?.viewsTotal != null
-              ? `${formatUnknownNumber(rollup.viewsTotal, formatCompactCount)} views`
-              : null,
-          ]
-            .filter(Boolean)
-            .join(" · ")}
-        </p>
       </div>
     </GlassCard>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/library/asset-drawer.tsx b/src/components/library/asset-drawer.tsx
index 92220f9..282ff72 100644
--- a/src/components/library/asset-drawer.tsx
+++ b/src/components/library/asset-drawer.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState } from "react";
+import { Download } from "lucide-react";
 import { Badge, statusTone } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
@@ -23,7 +24,12 @@ import {
   type MediaPipelineSettings,
   type RenderPreset,
 } from "@/lib/library";
-import { PLATFORM_LABELS, WINDOW_LABELS, formatEngagementPct, formatUnknownNumber } from "@/lib/performance";
+import {
+  PLATFORM_LABELS,
+  WINDOW_LABELS,
+  formatEngagementPct,
+  formatUnknownNumber,
+} from "@/lib/performance";
 import { formatCompactCount } from "@/lib/format";
 
 export function AssetDrawer({
@@ -66,7 +72,8 @@ export function AssetDrawer({
 
   const media = useMemo(() => {
     if (!asset?.previewUrl) return null;
-    if (asset.kind === "IMAGE") return <img src={asset.previewUrl} alt="" className="w-full rounded-control" />;
+    if (asset.kind === "IMAGE")
+      return <img src={asset.previewUrl} alt="" className="w-full rounded-control" />;
     if (asset.kind === "VIDEO") {
       return (
         <video src={asset.previewUrl} controls playsInline className="w-full rounded-control" />
@@ -98,6 +105,24 @@ export function AssetDrawer({
             <p className="mt-2 text-caption text-muted">
               {[formatBytes(asset.byteSize), asset.mimeType].filter(Boolean).join(" · ")}
             </p>
+            <div className="mt-2 flex items-center gap-2">
+              {asset.previewUrl && asset.kind !== "SUBTITLE" ? (
+                <Button size="sm" variant="secondary" asChild>
+                  <a href={`${asset.previewUrl}&download=1`}>
+                    <Download className="size-3.5" aria-hidden="true" />
+                    Download
+                  </a>
+                </Button>
+              ) : null}
+              <span className="text-caption text-muted">
+                Stored in{" "}
+                {settings.libraryBackend === "supabase"
+                  ? "Supabase Storage"
+                  : settings.libraryBackend === "s3"
+                    ? "S3-compatible storage"
+                    : "local preview disk"}
+              </span>
+            </div>
 
             {detail?.performance || (detail?.snapshots && detail.snapshots.length > 0) ? (
               <section className="mt-6">
@@ -105,7 +130,9 @@ export function AssetDrawer({
                 <div className="mt-2 flex flex-wrap items-center gap-2">
                   <ScoreBadge
                     score={detail.performance?.score ?? null}
-                    verdict={detail.performance && detail.performance.winnerCount > 0 ? "WINNER" : null}
+                    verdict={
+                      detail.performance && detail.performance.winnerCount > 0 ? "WINNER" : null
+                    }
                   />
                   {detail.performance?.viewsTotal != null ? (
                     <span className="text-caption text-muted">
@@ -115,7 +142,9 @@ export function AssetDrawer({
                         : ""}
                     </span>
                   ) : (
-                    <span className="text-caption text-muted">No stats yet — unknown, not zero.</span>
+                    <span className="text-caption text-muted">
+                      No stats yet — unknown, not zero.
+                    </span>
                   )}
                 </div>
                 {detail.snapshots && detail.snapshots.length > 0 ? (
@@ -158,8 +187,8 @@ export function AssetDrawer({
               <section className="mt-6">
                 <h3 className="text-card font-semibold tracking-tight">Performance</h3>
                 <p className="mt-2 text-caption text-muted">
-                  No published stats on this asset yet. After a social post succeeds, refresh stats on
-                  Analytics or enter them manually.
+                  No published stats on this asset yet. After a social post succeeds, refresh stats
+                  on Analytics or enter them manually.
                 </p>
               </section>
             ) : null}
@@ -219,7 +248,10 @@ export function AssetDrawer({
               <div className="mt-2 grid gap-3 sm:grid-cols-2">
                 <div className="flex flex-col gap-1.5">
                   <Label htmlFor="preset">Preset</Label>
-                  <Select value={preset} onValueChange={(value) => setPreset(value as RenderPreset)}>
+                  <Select
+                    value={preset}
+                    onValueChange={(value) => setPreset(value as RenderPreset)}
+                  >
                     <SelectTrigger id="preset">
                       <SelectValue />
                     </SelectTrigger>
@@ -246,7 +278,7 @@ export function AssetDrawer({
                 className="mt-3"
                 disabled={pending || asset.kind === "SUBTITLE"}
                 onClick={() =>
-                  onQueueRender(preset, burnIn, burnIn ? readyCaption?.id ?? null : null)
+                  onQueueRender(preset, burnIn, burnIn ? (readyCaption?.id ?? null) : null)
                 }
               >
                 Queue {PRESET_LABELS[preset]}
diff --git a/src/lib/agent-crayo.ts b/src/lib/agent-crayo.ts
index ca47e8d..2936114 100644
--- a/src/lib/agent-crayo.ts
+++ b/src/lib/agent-crayo.ts
@@ -14,8 +14,10 @@ export function buildCrayoShortGoal(input: {
     topic
       ? `Topic / hook: ${topic}`
       : "Invent a tight spoken hook from the client niche if known, otherwise ask is not available — use a generic personal-brand authority hook.",
-    script ? `Spoken script:\n${script}` : "Write a 12–20 second spoken hook, then generate_voiceover from it.",
-    "Pipeline: crayo.run_short (image + voice + project + export) then crayo.ingest_to_library so the mp4 lands in the Filebase library with tags crayo,agent.",
+    script
+      ? `Spoken script:\n${script}`
+      : "Write a 12–20 second spoken hook, then generate_voiceover from it.",
+    "Pipeline: crayo.run_short (image + voice + project + export) then crayo.ingest_to_library so the mp4 lands in the Library with tags crayo,agent.",
     "Return the library asset id, preview URL, and Crayo video URL. Never start the Social Machine. Never echo the API key. Never invent URLs.",
   ];
   return lines.join("\n\n");
@@ -40,7 +42,9 @@ export function isCrayoMediaUrl(url: string): boolean {
 export function crayoShortFieldsFromGoal(goal: string): { prompt: string; script: string } {
   const topic = /Topic \/ hook:\s*(.+)/i.exec(goal)?.[1]?.trim() ?? "";
   const scriptBlock =
-    /Spoken script:\s*\n([\s\S]*?)(?:\n\nPipeline:|\n\nReturn |\n\nNever )/i.exec(goal)?.[1]?.trim() ?? "";
+    /Spoken script:\s*\n([\s\S]*?)(?:\n\nPipeline:|\n\nReturn |\n\nNever )/i
+      .exec(goal)?.[1]
+      ?.trim() ?? "";
   const fallback = goal.replace(/\s+/g, " ").trim().slice(0, 400);
   return { prompt: topic || fallback, script: scriptBlock };
 }
@@ -48,7 +52,10 @@ export function crayoShortFieldsFromGoal(goal: string): { prompt: string; script
 export function crayoAutoclipFieldsFromGoal(goal: string): { url: string; clipCount: number } {
   const url = /https:\/\/[^\s)]+/i.exec(goal)?.[0] ?? "";
   const count = Number(/clip_count=(\d+)/i.exec(goal)?.[1] ?? 5);
-  return { url, clipCount: Number.isFinite(count) ? Math.min(20, Math.max(2, Math.floor(count))) : 5 };
+  return {
+    url,
+    clipCount: Number.isFinite(count) ? Math.min(20, Math.max(2, Math.floor(count))) : 5,
+  };
 }
 
 /** Share-page hosts nothing can fetch unattended (sign-in or share-token walls). */
@@ -70,7 +77,10 @@ export function autoclipSourceProblem(raw: string): string | null {
     return "That is not a valid https URL.";
   }
   if (parsed.protocol !== "https:") return "Crayo only downloads from https URLs.";
-  const host = parsed.hostname.toLowerCase().replace(/^www\./, "").replace(/^m\./, "");
+  const host = parsed.hostname
+    .toLowerCase()
+    .replace(/^www\./, "")
+    .replace(/^m\./, "");
   if (PAGE_ONLY_HOSTS.some((h) => host === h || host.endsWith(`.${h}`))) {
     return `${host} share links need a sign-in, so they can’t be fetched automatically. Download the file, upload it to the Library, then paste that file URL — or paste a YouTube/TikTok/Vimeo link, which ClippyOS fetches for you.`;
   }
@@ -79,7 +89,9 @@ export function autoclipSourceProblem(raw: string): string | null {
 
 export function buildCrayoAutoclipGoal(input: { url: string; clipCount: number }): string {
   const url = input.url.trim();
-  const count = Number.isFinite(input.clipCount) ? Math.min(20, Math.max(2, Math.floor(input.clipCount))) : 5;
+  const count = Number.isFinite(input.clipCount)
+    ? Math.min(20, Math.max(2, Math.floor(input.clipCount)))
+    : 5;
   return [
     "AutoClip a long-form video in Crayo.",
     `Source URL (https): ${url || "(paste a public https video URL)"}`,
@@ -109,10 +121,15 @@ export function buildCrayoVoiceoverGoal(input: {
     .join("\n\n");
 }
 
-export function crayoVoiceoverFieldsFromGoal(goal: string): { script: string; voiceId: string; title: string } {
+export function crayoVoiceoverFieldsFromGoal(goal: string): {
+  script: string;
+  voiceId: string;
+  title: string;
+} {
   const script =
-    /Spoken script:\s*\n([\s\S]*?)(?:\n\nvoice_id=|\n\ntitle=|\n\nPipeline:|\n\nNever )/i.exec(goal)?.[1]?.trim() ??
-    "";
+    /Spoken script:\s*\n([\s\S]*?)(?:\n\nvoice_id=|\n\ntitle=|\n\nPipeline:|\n\nNever )/i
+      .exec(goal)?.[1]
+      ?.trim() ?? "";
   const voiceId = /voice_id=([^\s]+)/i.exec(goal)?.[1]?.trim() ?? "";
   const title = /title=([^\n]+)/i.exec(goal)?.[1]?.trim() ?? "";
   return { script, voiceId, title };
@@ -173,7 +190,7 @@ export function buildCrayoIngestGoal(input: { url: string; title?: string }): st
   const url = input.url.trim();
   const title = input.title?.trim() ?? "";
   return [
-    "Ingest a Crayo CDN https file into the Filebase library (source=AGENT).",
+    "Ingest a Crayo CDN https file into the Library (source=AGENT).",
     `Source URL (https): ${url || "(paste a cdn-crayo.com or *.crayo.ai https URL)"}`,
     title ? `title=${title}` : "",
     "Pipeline: crayo.ingest_to_library. Reject non-Crayo hosts. Never start the Social Machine. Never echo the API key.",
diff --git a/src/lib/agent-results.test.ts b/src/lib/agent-results.test.ts
index b706145..1a101ec 100644
--- a/src/lib/agent-results.test.ts
+++ b/src/lib/agent-results.test.ts
@@ -3,7 +3,9 @@ import { test } from "node:test";
 import { collectAgentVisualResults } from "./agent-results.ts";
 import type { AgentRunDetail } from "./agent.ts";
 
-function detail(partial: Partial<AgentRunDetail["run"]> & { iterations?: AgentRunDetail["iterations"] }): AgentRunDetail {
+function detail(
+  partial: Partial<AgentRunDetail["run"]> & { iterations?: AgentRunDetail["iterations"] },
+): AgentRunDetail {
   return {
     clientName: "Ada",
     skillName: null,
@@ -54,3 +56,31 @@ test("empty run has no visual results", () => {
   const result = collectAgentVisualResults(detail({ summary: null, outputs: null }));
   assert.equal(result.empty, true);
 });
+
+test("a run with a stored library clip is not empty and round-trips the fields", () => {
+  const result = collectAgentVisualResults(
+    detail({
+      summary: null,
+      outputs: {
+        libraryClips: [
+          {
+            title: "Clip one",
+            projectId: "proj_1",
+            assetId: "asset_1",
+            status: "stored",
+            error: null,
+          },
+        ],
+      },
+    }),
+  );
+  assert.equal(result.empty, false);
+  assert.equal(result.libraryClips.length, 1);
+  assert.deepEqual(result.libraryClips[0], {
+    title: "Clip one",
+    projectId: "proj_1",
+    assetId: "asset_1",
+    status: "stored",
+    error: null,
+  });
+});
diff --git a/src/lib/agent-results.ts b/src/lib/agent-results.ts
index b53cc30..510ce7a 100644
--- a/src/lib/agent-results.ts
+++ b/src/lib/agent-results.ts
@@ -8,11 +8,20 @@ export type AgentResultMedia = {
   label: string;
 };
 
+export type AgentLibraryClip = {
+  title: string;
+  projectId: string;
+  assetId: string | null;
+  status: string;
+  error: string | null;
+};
+
 export type AgentVisualResults = {
   media: AgentResultMedia[];
   ideas: { title: string; rationale?: string }[];
   titles: string[];
   summary: string | null;
+  libraryClips: AgentLibraryClip[];
   empty: boolean;
 };
 
@@ -28,10 +37,18 @@ function isHttps(url: string): boolean {
 
 function classify(url: string): AgentResultMedia["kind"] {
   const lower = url.toLowerCase();
-  if (/\.(mp4|webm|mov)(\?|$)/.test(lower) || /\/video\./.test(lower) || lower.includes("cdn-crayo.com") && lower.includes("video")) {
+  if (
+    /\.(mp4|webm|mov)(\?|$)/.test(lower) ||
+    /\/video\./.test(lower) ||
+    (lower.includes("cdn-crayo.com") && lower.includes("video"))
+  ) {
     return "video";
   }
-  if (/\.(png|jpe?g|webp|gif)(\?|$)/.test(lower) || lower.includes("thumbnail") || lower.includes("/image")) {
+  if (
+    /\.(png|jpe?g|webp|gif)(\?|$)/.test(lower) ||
+    lower.includes("thumbnail") ||
+    lower.includes("/image")
+  ) {
     return "image";
   }
   if (/\.(mp3|wav|m4a)(\?|$)/.test(lower)) return "audio";
@@ -45,7 +62,13 @@ function pushUrl(acc: AgentResultMedia[], url: string, label: string) {
   acc.push({ url: clean, kind: classify(clean), label: label.slice(0, 80) });
 }
 
-function walk(value: unknown, acc: AgentResultMedia[], ideas: AgentVisualResults["ideas"], titles: string[], depth = 0) {
+function walk(
+  value: unknown,
+  acc: AgentResultMedia[],
+  ideas: AgentVisualResults["ideas"],
+  titles: string[],
+  depth = 0,
+) {
   if (depth > 8 || value == null) return;
   if (typeof value === "string") {
     const matches = value.match(URL_RE) ?? [];
@@ -67,7 +90,11 @@ function walk(value: unknown, acc: AgentResultMedia[], ideas: AgentVisualResults
     }
   }
   for (const [key, child] of Object.entries(row)) {
-    if (typeof child === "string" && /url|href|thumbnail/i.test(key) && child.startsWith("https://")) {
+    if (
+      typeof child === "string" &&
+      /url|href|thumbnail/i.test(key) &&
+      child.startsWith("https://")
+    ) {
       pushUrl(acc, child, key);
     } else {
       walk(child, acc, ideas, titles, depth + 1);
@@ -85,11 +112,33 @@ export function collectAgentVisualResults(detail: AgentRunDetail): AgentVisualRe
     walk(item.resultSummary, media, ideas, titles);
   }
   const summary = detail.run.summary?.trim() || null;
+  const rawClips = (detail.run.outputs as Record<string, unknown> | null)?.libraryClips;
+  const libraryClips: AgentLibraryClip[] = Array.isArray(rawClips)
+    ? rawClips.flatMap((row) => {
+        const r = row as Record<string, unknown>;
+        if (typeof r.projectId !== "string") return [];
+        return [
+          {
+            title: String(r.title ?? "Clip"),
+            projectId: r.projectId,
+            assetId: typeof r.assetId === "string" ? r.assetId : null,
+            status: String(r.status ?? "failed"),
+            error: typeof r.error === "string" ? r.error : null,
+          },
+        ];
+      })
+    : [];
   return {
     media,
     ideas: ideas.slice(0, 12),
     titles: titles.slice(0, 24),
     summary,
-    empty: media.length === 0 && ideas.length === 0 && titles.length === 0 && !summary,
+    libraryClips,
+    empty:
+      media.length === 0 &&
+      ideas.length === 0 &&
+      titles.length === 0 &&
+      libraryClips.length === 0 &&
+      !summary,
   };
 }
diff --git a/src/lib/agent.ts b/src/lib/agent.ts
index 11008bd..ccb81d6 100644
--- a/src/lib/agent.ts
+++ b/src/lib/agent.ts
@@ -168,91 +168,89 @@ export const AGENT_MAX_CONCURRENT = 2;
 export const AGENT_STEP_RETRIES = 2;
 export const AGENT_PROPOSE_MIN_STEPS = 5;
 
-export const AGENT_PRESET_COPY: Record<
-  AgentPreset,
-  { label: string; goal: string; hint: string }
-> = {
-  "clipping-ideation-pack": {
-    label: "Ideation pack",
-    goal: "Research this client's channel (long-form only, ≥ 4 minutes). Produce 5 packaging-ready ideas: each with a working title, hook mechanism, promise/tension/payoff, spoken 3-second hook, and a ≤4-word thumbnail overlay. Then generate 3 mechanistically distinct title alternatives for the latest long-form upload. Do not duplicate existing titles. No social, no VM.",
-    hint: "Ideas + titles. No social, no VM.",
-  },
-  "clipping-thumbnail-pass": {
-    label: "Thumbnail pass",
-    goal: "If a latest thumbnail image exists, vision-critique it (emotion, contrast, overlay ≤4 words, postage-stamp legibility). Then generate a fresh 16:9 4K direction whose overlay complements — not repeats — the title. One focal face/object, mandatory emotion, complementary palette.",
-    hint: "Vision critique + Higgsfield generation.",
-  },
-  "clipping-full-package": {
-    label: "Full clip package",
-    goal: "End-to-end production brief for this client: research long-form (≥ 4 min), 5 ideas with hooks + overlays, 3 titles for the latest long-form, one thumbnail direction, optional stage note only if evidence exists. Write package.json. Never invent analytics. Never start the Social Machine.",
-    hint: "SKILL.md plan + orchestrate.py export. Never auto-starts Social.",
-  },
-  "clipping-social-draft-distribute": {
-    label: "Social drafts",
-    goal: "Queue draft Instagram / X / TikTok posts for the latest publishable library asset (prefer 9:16). preferredRail=AUTO, mode=draft. Do not start the Social Machine. If MACHINE_STOPPED, wait for a human — do not imply start.",
-    hint: "create_upload_job in draft mode. MACHINE_STOPPED waits for a human.",
-  },
-  "clipping-social-verify": {
-    label: "Social verify",
-    goal: "After an upload job, screenshot the desktop and verify compose/success UI with vision. Never type passwords, 2FA, or CAPTCHA. If needs_login, stop for a human.",
-    hint: "Needs a running Social Machine. Never types passwords.",
-  },
-  "clipping-pipeline-nudge": {
-    label: "Pipeline nudge",
-    goal: "Read this client's progress (including Discord-sourced stages). Recommend the next human action with evidence. Only set_stage if notes can cite a real artifact. Never fabricate views or CTR.",
-    hint: "Cautious set_client_stage. No fabricated analytics.",
-  },
-  "clipping-30d-guarantee-check": {
-    label: "30-day check",
-    goal: "Single-client 30-day views check from AnalyticsSnapshots only. Need ≥2 real snapshots to call a delta. If missing, say Insufficient data — never invent views or treat unknown as zero.",
-    hint: "Honest insufficient-data when snapshots are missing.",
-  },
-  "clipping-agent-self-improve": {
-    label: "Self-improve",
-    goal: "From the last successful Agent run (≥5 tool steps), draft a pending_review skill capturing the plan and pitfalls. No secrets in SKILL.md. Do not auto-publish.",
-    hint: "skill_manage.create pending. Never auto-publishes.",
-  },
-  custom: {
-    label: "Custom goal",
-    goal: "",
-    hint: "Describe the clipping or Crayo workflow. The planner cannot call undeclared tools.",
-  },
-  "crayo-short": {
-    label: "Crayo short",
-    goal: "Using the connected Crayo API (Bearer key, never echo it): 1) crayo.get_account to confirm credits. 2) crayo.list_voices and pick one voice_id. 3) crayo.generate_image 9:16 for a hook still from this client's niche. 4) crayo.generate_voiceover from a 12–20s spoken hook script. 5) crayo.create_project with one scene covering the narration duration_ms, optional subtitles. 6) crayo.export_project and return the finished video URL plus thumbnail. Do not start the Social Machine. If Crayo is missing, say so and stop.",
-    hint: "Image + voice + project + export via api.crayo.ai. Shows the file when done.",
-  },
-  "crayo-autoclip": {
-    label: "Crayo AutoClip",
-    goal: "Using Crayo AutoClip: import or pick a long-form https video asset (1 min–3 h). crayo.create_autoclip clip_count=5 clip_length=60 edit_level=full. Then crayo.get_autoclip until clips[] has project_id + thumbnail_url. List each clip title and thumbnail. Do not start the Social Machine. Never invent URLs.",
-    hint: "Long video → vertical shorts. Poll until clips are ready.",
-  },
-  "crayo-voiceover": {
-    label: "Crayo voiceover",
-    goal: "Using Crayo: crayo.generate_voiceover with the spoken script and voice_id from the operator. Return the audio URL. Do not start the Social Machine. Never echo the API key.",
-    hint: "Script + voice_id → audio. Credits per second.",
-  },
-  "crayo-image": {
-    label: "Crayo image",
-    goal: "Using Crayo: crayo.generate_image with the prompt, prefer aspect_ratio=9:16. Return the still URL. Do not start the Social Machine. Never echo the API key.",
-    hint: "Prompt → 9:16 still. 1 image credit.",
-  },
-  "crayo-import": {
-    label: "Crayo import",
-    goal: "Using Crayo: crayo.import_asset a public https URL (≤100MB). Return the asset id. Do not start the Social Machine. Never echo the API key.",
-    hint: "Public https file into Crayo assets.",
-  },
-  "crayo-export": {
-    label: "Crayo export",
-    goal: "Using Crayo: crayo.export_project for the given project_id, then poll until the file is ready. Return the video URL. Never invent URLs. Do not start the Social Machine.",
-    hint: "Queue a project render and poll.",
-  },
-  "crayo-ingest": {
-    label: "Crayo ingest",
-    goal: "Using Crayo: crayo.ingest_to_library a Crayo CDN https URL into Filebase (source=AGENT). Reject non-Crayo hosts. Do not start the Social Machine.",
-    hint: "Crayo CDN file → library.",
-  },
-};
+export const AGENT_PRESET_COPY: Record<AgentPreset, { label: string; goal: string; hint: string }> =
+  {
+    "clipping-ideation-pack": {
+      label: "Ideation pack",
+      goal: "Research this client's channel (long-form only, ≥ 4 minutes). Produce 5 packaging-ready ideas: each with a working title, hook mechanism, promise/tension/payoff, spoken 3-second hook, and a ≤4-word thumbnail overlay. Then generate 3 mechanistically distinct title alternatives for the latest long-form upload. Do not duplicate existing titles. No social, no VM.",
+      hint: "Ideas + titles. No social, no VM.",
+    },
+    "clipping-thumbnail-pass": {
+      label: "Thumbnail pass",
+      goal: "If a latest thumbnail image exists, vision-critique it (emotion, contrast, overlay ≤4 words, postage-stamp legibility). Then generate a fresh 16:9 4K direction whose overlay complements — not repeats — the title. One focal face/object, mandatory emotion, complementary palette.",
+      hint: "Vision critique + Higgsfield generation.",
+    },
+    "clipping-full-package": {
+      label: "Full clip package",
+      goal: "End-to-end production brief for this client: research long-form (≥ 4 min), 5 ideas with hooks + overlays, 3 titles for the latest long-form, one thumbnail direction, optional stage note only if evidence exists. Write package.json. Never invent analytics. Never start the Social Machine.",
+      hint: "SKILL.md plan + orchestrate.py export. Never auto-starts Social.",
+    },
+    "clipping-social-draft-distribute": {
+      label: "Social drafts",
+      goal: "Queue draft Instagram / X / TikTok posts for the latest publishable library asset (prefer 9:16). preferredRail=AUTO, mode=draft. Do not start the Social Machine. If MACHINE_STOPPED, wait for a human — do not imply start.",
+      hint: "create_upload_job in draft mode. MACHINE_STOPPED waits for a human.",
+    },
+    "clipping-social-verify": {
+      label: "Social verify",
+      goal: "After an upload job, screenshot the desktop and verify compose/success UI with vision. Never type passwords, 2FA, or CAPTCHA. If needs_login, stop for a human.",
+      hint: "Needs a running Social Machine. Never types passwords.",
+    },
+    "clipping-pipeline-nudge": {
+      label: "Pipeline nudge",
+      goal: "Read this client's progress (including Discord-sourced stages). Recommend the next human action with evidence. Only set_stage if notes can cite a real artifact. Never fabricate views or CTR.",
+      hint: "Cautious set_client_stage. No fabricated analytics.",
+    },
+    "clipping-30d-guarantee-check": {
+      label: "30-day check",
+      goal: "Single-client 30-day views check from AnalyticsSnapshots only. Need ≥2 real snapshots to call a delta. If missing, say Insufficient data — never invent views or treat unknown as zero.",
+      hint: "Honest insufficient-data when snapshots are missing.",
+    },
+    "clipping-agent-self-improve": {
+      label: "Self-improve",
+      goal: "From the last successful Agent run (≥5 tool steps), draft a pending_review skill capturing the plan and pitfalls. No secrets in SKILL.md. Do not auto-publish.",
+      hint: "skill_manage.create pending. Never auto-publishes.",
+    },
+    custom: {
+      label: "Custom goal",
+      goal: "",
+      hint: "Describe the clipping or Crayo workflow. The planner cannot call undeclared tools.",
+    },
+    "crayo-short": {
+      label: "Crayo short",
+      goal: "Using the connected Crayo API (Bearer key, never echo it): 1) crayo.get_account to confirm credits. 2) crayo.list_voices and pick one voice_id. 3) crayo.generate_image 9:16 for a hook still from this client's niche. 4) crayo.generate_voiceover from a 12–20s spoken hook script. 5) crayo.create_project with one scene covering the narration duration_ms, optional subtitles. 6) crayo.export_project and return the finished video URL plus thumbnail. Do not start the Social Machine. If Crayo is missing, say so and stop.",
+      hint: "Image + voice + project + export via api.crayo.ai. Shows the file when done.",
+    },
+    "crayo-autoclip": {
+      label: "Crayo AutoClip",
+      goal: "Using Crayo AutoClip: import or pick a long-form https video asset (1 min–3 h). crayo.create_autoclip clip_count=5 clip_length=60 edit_level=full. Then crayo.get_autoclip until clips[] has project_id + thumbnail_url. List each clip title and thumbnail. Do not start the Social Machine. Never invent URLs.",
+      hint: "Long video → vertical shorts. Poll until clips are ready.",
+    },
+    "crayo-voiceover": {
+      label: "Crayo voiceover",
+      goal: "Using Crayo: crayo.generate_voiceover with the spoken script and voice_id from the operator. Return the audio URL. Do not start the Social Machine. Never echo the API key.",
+      hint: "Script + voice_id → audio. Credits per second.",
+    },
+    "crayo-image": {
+      label: "Crayo image",
+      goal: "Using Crayo: crayo.generate_image with the prompt, prefer aspect_ratio=9:16. Return the still URL. Do not start the Social Machine. Never echo the API key.",
+      hint: "Prompt → 9:16 still. 1 image credit.",
+    },
+    "crayo-import": {
+      label: "Crayo import",
+      goal: "Using Crayo: crayo.import_asset a public https URL (≤100MB). Return the asset id. Do not start the Social Machine. Never echo the API key.",
+      hint: "Public https file into Crayo assets.",
+    },
+    "crayo-export": {
+      label: "Crayo export",
+      goal: "Using Crayo: crayo.export_project for the given project_id, then poll until the file is ready. Return the video URL. Never invent URLs. Do not start the Social Machine.",
+      hint: "Queue a project render and poll.",
+    },
+    "crayo-ingest": {
+      label: "Crayo ingest",
+      goal: "Using Crayo: crayo.ingest_to_library a Crayo CDN https URL into Library (source=AGENT). Reject non-Crayo hosts. Do not start the Social Machine.",
+      hint: "Crayo CDN file → library.",
+    },
+  };
 
 export function presetCopy(preset: string): { label: string; goal: string; hint: string } {
   return AGENT_PRESET_COPY[normalizePreset(preset)];
@@ -455,32 +453,116 @@ export const PRESET_PLAN_SKELETONS: Record<ClippingPresetSkill, AgentPlanStep[]>
 
 export const CRAYO_PLAN_SKELETONS: Record<CrayoAgentPreset, AgentPlanStep[]> = {
   "crayo-short": [
-    { id: "run", tool: "crayo.run_short", args: {}, purpose: "Generate a 9:16 short and ingest the mp4 into the Filebase library.", successCriteria: "library.assetId or videoUrl returned." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Crayo short in the library." }, purpose: "Operator-facing summary with library asset id.", successCriteria: "Summary names the asset id or honest gap." },
+    {
+      id: "run",
+      tool: "crayo.run_short",
+      args: {},
+      purpose: "Generate a 9:16 short and ingest the mp4 into the Library.",
+      successCriteria: "library.assetId or videoUrl returned.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Crayo short in the library." },
+      purpose: "Operator-facing summary with library asset id.",
+      successCriteria: "Summary names the asset id or honest gap.",
+    },
   ],
   "crayo-autoclip": [
-    { id: "run", tool: "crayo.run_autoclip", args: {}, purpose: "Import the long-form URL, AutoClip, ingest thumbnails into the library.", successCriteria: "clips[] with project_id and library asset ids." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "AutoClip clips in the library." }, purpose: "List clip titles and library ids.", successCriteria: "No invented URLs." },
+    {
+      id: "run",
+      tool: "crayo.run_autoclip",
+      args: {},
+      purpose: "Import the long-form URL, AutoClip, ingest thumbnails into the library.",
+      successCriteria: "clips[] with project_id and library asset ids.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "AutoClip clips in the library." },
+      purpose: "List clip titles and library ids.",
+      successCriteria: "No invented URLs.",
+    },
   ],
   "crayo-voiceover": [
-    { id: "run", tool: "crayo.generate_voiceover", args: {}, purpose: "Generate spoken audio from the script and voice_id.", successCriteria: "Audio URL or honest error." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Crayo voiceover ready." }, purpose: "Operator-facing summary with audio URL.", successCriteria: "No invented URLs." },
+    {
+      id: "run",
+      tool: "crayo.generate_voiceover",
+      args: {},
+      purpose: "Generate spoken audio from the script and voice_id.",
+      successCriteria: "Audio URL or honest error.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Crayo voiceover ready." },
+      purpose: "Operator-facing summary with audio URL.",
+      successCriteria: "No invented URLs.",
+    },
   ],
   "crayo-image": [
-    { id: "run", tool: "crayo.generate_image", args: {}, purpose: "Generate a still from the prompt.", successCriteria: "Image URL or honest error." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Crayo still ready." }, purpose: "Operator-facing summary with image URL.", successCriteria: "No invented URLs." },
+    {
+      id: "run",
+      tool: "crayo.generate_image",
+      args: {},
+      purpose: "Generate a still from the prompt.",
+      successCriteria: "Image URL or honest error.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Crayo still ready." },
+      purpose: "Operator-facing summary with image URL.",
+      successCriteria: "No invented URLs.",
+    },
   ],
   "crayo-import": [
-    { id: "run", tool: "crayo.import_asset", args: {}, purpose: "Import a public https file into Crayo assets.", successCriteria: "asset id returned." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Asset imported in Crayo." }, purpose: "Name the asset id.", successCriteria: "Honest gap if missing." },
+    {
+      id: "run",
+      tool: "crayo.import_asset",
+      args: {},
+      purpose: "Import a public https file into Crayo assets.",
+      successCriteria: "asset id returned.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Asset imported in Crayo." },
+      purpose: "Name the asset id.",
+      successCriteria: "Honest gap if missing.",
+    },
   ],
   "crayo-export": [
-    { id: "run", tool: "crayo.export_project", args: {}, purpose: "Queue the project render and poll.", successCriteria: "Video URL or still-processing export id." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Crayo export finished." }, purpose: "Operator-facing summary with video URL.", successCriteria: "No invented URLs." },
+    {
+      id: "run",
+      tool: "crayo.export_project",
+      args: {},
+      purpose: "Queue the project render and poll.",
+      successCriteria: "Video URL or still-processing export id.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Crayo export finished." },
+      purpose: "Operator-facing summary with video URL.",
+      successCriteria: "No invented URLs.",
+    },
   ],
   "crayo-ingest": [
-    { id: "run", tool: "crayo.ingest_to_library", args: {}, purpose: "Copy a Crayo CDN file into the Filebase library.", successCriteria: "library.assetId or UNTRUSTED_URL." },
-    { id: "finish", tool: "clipping.finish", args: { summary: "Ingested into the library." }, purpose: "Name the library asset id.", successCriteria: "Honest gap if rejected." },
+    {
+      id: "run",
+      tool: "crayo.ingest_to_library",
+      args: {},
+      purpose: "Copy a Crayo CDN file into the Library.",
+      successCriteria: "library.assetId or UNTRUSTED_URL.",
+    },
+    {
+      id: "finish",
+      tool: "clipping.finish",
+      args: { summary: "Ingested into the library." },
+      purpose: "Name the library asset id.",
+      successCriteria: "Honest gap if rejected.",
+    },
   ],
 };
 
@@ -674,6 +756,10 @@ export function explainAgentToolError(code: string): string {
       return "The video downloaded but the upload to Crayo’s signed URL failed. Retry; if it keeps failing, check Crayo storage headroom on crayo.ai.";
     case "UPLOAD_NOT_FOUND":
       return "Crayo never received the bytes on its signed upload URL. Retry the run.";
+    case "EXPORT_BUDGET":
+      return "Not enough Crayo export credits for these clips.";
+    case "EXPORT_FAILED":
+      return "Crayo could not export that project.";
     case "VALIDATION_ERROR":
       return "Crayo rejected the request: the URL could not be fetched, is not a public https media file, or the video is too short/long (AutoClip needs 1 min–3 h). No credits were spent on a rejected request.";
     case "UNSUPPORTED_MEDIA_TYPE":
@@ -689,7 +775,7 @@ export function explainAgentToolError(code: string): string {
     case "FAILED":
       return "Crayo returned an error for this step. The provider message is shown with the step.";
     case "INGEST_FAILED":
-      return "The video rendered, but Filebase/library ingest failed. The Crayo URL may still be in the step output.";
+      return "The video rendered, but the Library ingest failed. The Crayo URL may still be in the step output.";
     case "GROK_BOT_NOT_CONNECTED":
       return "Grok Bot isn’t online. Turn off the Grok Bot switch to run on this server, or open the Bot so it can claim work.";
     case "AI_TIER_GATED":
diff --git a/src/lib/server/agent-fns.ts b/src/lib/server/agent-fns.ts
index df5d362..9211c56 100644
--- a/src/lib/server/agent-fns.ts
+++ b/src/lib/server/agent-fns.ts
@@ -75,3 +75,44 @@ export const cancelAgentRunFn = createServerFn({ method: "POST" })
     await cancelAgentRun(id);
     return { ok: true as const };
   });
+
+export const retryClipExportFn = createServerFn({ method: "POST" })
+  .middleware([authMiddleware])
+  .validator((input: unknown) =>
+    z.object({ runId: z.string().min(1), projectId: z.string().min(1) }).parse(input),
+  )
+  .handler(async ({ context, data }) => {
+    if (!context.userId) throw new Error("Unauthorized");
+    const { getAgentRun, patchAgentRun } = await import("@/lib/server/agent.server");
+    const run = await getAgentRun(data.runId);
+    if (!run) throw new Error("RUN_MISSING");
+    const clips = ((run.outputs?.libraryClips as unknown) ?? []) as {
+      title: string;
+      projectId: string;
+      assetId: string | null;
+      status: string;
+      error: string | null;
+    }[];
+    const clip = clips.find((c) => c.projectId === data.projectId);
+    if (!clip) throw new Error("CLIP_MISSING");
+    const { exportClipToLibrary } = await import("@/lib/server/clip-export.server");
+    const mf = (run.outputs?.mediaFetch as { url?: string } | undefined) ?? {};
+    const result = await exportClipToLibrary({
+      projectId: clip.projectId,
+      title: clip.title,
+      thumbnailUrl: null,
+      actorId: context.userId,
+      clientId: run.clientId ?? null,
+      sourceUrl: mf.url ?? `crayo:project:${clip.projectId}`,
+      tags: ["autoclip", "retry"],
+    });
+    const next = clips.map((c) =>
+      c.projectId === clip.projectId
+        ? { ...c, assetId: result.assetId, status: result.status, error: result.error }
+        : c,
+    );
+    await patchAgentRun(run.id, {
+      outputs: { ...(run.outputs ?? {}), libraryClips: next as never },
+    });
+    return { status: result.status, assetId: result.assetId, error: result.error };
+  });
diff --git a/src/lib/server/agent-loop.server.ts b/src/lib/server/agent-loop.server.ts
index 39e9cc2..92d97c2 100644
--- a/src/lib/server/agent-loop.server.ts
+++ b/src/lib/server/agent-loop.server.ts
@@ -118,6 +118,20 @@ function asJson(value: unknown): JsonValue {
   }
 }
 
+/**
+ * Some crayo.* tool results (run_autoclip's direct-file path, export_project) carry a
+ * `libraryClips` array alongside their step-scoped output. The Agent-results UI reads a
+ * top-level `outputs.libraryClips`, which only the background media-fetch job set directly —
+ * lift it here too, accumulating across every step that produces one (not just the last).
+ */
+function appendLibraryClips(outputs: Record<string, JsonValue>, data: unknown): void {
+  if (!data || typeof data !== "object" || Array.isArray(data)) return;
+  const clips = (data as Record<string, unknown>).libraryClips;
+  if (!Array.isArray(clips)) return;
+  const existing = Array.isArray(outputs.libraryClips) ? (outputs.libraryClips as JsonValue[]) : [];
+  outputs.libraryClips = [...existing, ...(asJson(clips) as JsonValue[])];
+}
+
 function parsePlan(raw: unknown, allow: Set<string>): AgentPlanStep[] {
   const row = raw && typeof raw === "object" ? (raw as Record<string, unknown>) : {};
   const steps = Array.isArray(row.steps) ? row.steps : Array.isArray(raw) ? raw : [];
@@ -200,7 +214,13 @@ export async function startAgentRun(input: {
   if (!(await readAutomationEnabled())) throw new Error("AUTOMATION_DISABLED");
   if (input.idempotencyKey) {
     const existing = await findRunByIdempotency(input.idempotencyKey, input.createdBy);
-    if (existing && (existing.status === "queued" || existing.status === "planning" || existing.status === "stepping" || existing.status === "succeeded")) {
+    if (
+      existing &&
+      (existing.status === "queued" ||
+        existing.status === "planning" ||
+        existing.status === "stepping" ||
+        existing.status === "succeeded")
+    ) {
       return { id: existing.id };
     }
   }
@@ -224,7 +244,9 @@ export async function startAgentRun(input: {
   if (triggeredByTeamMemberId) {
     const team = await import("@/lib/server/team.server");
     const seats = await team.readTeamMembersInternal();
-    const seat = seats.find((row) => row.id === triggeredByTeamMemberId && row.isAutomation && row.isActive);
+    const seat = seats.find(
+      (row) => row.id === triggeredByTeamMemberId && row.isAutomation && row.isActive,
+    );
     if (!seat) throw new Error("TEAM_MEMBER_MISSING");
     triggeredByTeamMemberId = seat.id;
   }
@@ -419,13 +441,17 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
           typeof args.arguments === "object" &&
           !Array.isArray(args.arguments)
         ) {
-          args.arguments = { ...(args.arguments as Record<string, unknown>), clientId: run.clientId };
+          args.arguments = {
+            ...(args.arguments as Record<string, unknown>),
+            clientId: run.clientId,
+          };
         }
       }
       if (step.tool === "crayo.run_short") {
         const fields = crayoShortFieldsFromGoal(run.goal);
         if (typeof args.prompt !== "string" || !args.prompt.trim()) args.prompt = fields.prompt;
-        if ((typeof args.script !== "string" || !args.script.trim()) && fields.script) args.script = fields.script;
+        if ((typeof args.script !== "string" || !args.script.trim()) && fields.script)
+          args.script = fields.script;
       }
       if (step.tool === "crayo.run_autoclip") {
         const fields = crayoAutoclipFieldsFromGoal(run.goal);
@@ -434,21 +460,29 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
       }
       if (step.tool === "crayo.generate_voiceover") {
         const fields = crayoVoiceoverFieldsFromGoal(run.goal);
-        if ((typeof args.script !== "string" || !args.script.trim()) && fields.script) args.script = fields.script;
-        if ((typeof args.voiceId !== "string" || !args.voiceId.trim()) && fields.voiceId) args.voiceId = fields.voiceId;
-        if ((typeof args.title !== "string" || !args.title.trim()) && fields.title) args.title = fields.title;
+        if ((typeof args.script !== "string" || !args.script.trim()) && fields.script)
+          args.script = fields.script;
+        if ((typeof args.voiceId !== "string" || !args.voiceId.trim()) && fields.voiceId)
+          args.voiceId = fields.voiceId;
+        if ((typeof args.title !== "string" || !args.title.trim()) && fields.title)
+          args.title = fields.title;
       }
       if (step.tool === "crayo.generate_image") {
         const fields = crayoImageFieldsFromGoal(run.goal);
-        if ((typeof args.prompt !== "string" || !args.prompt.trim()) && fields.prompt) args.prompt = fields.prompt;
-        if ((typeof args.aspectRatio !== "string" || !args.aspectRatio.trim()) && fields.aspectRatio) {
+        if ((typeof args.prompt !== "string" || !args.prompt.trim()) && fields.prompt)
+          args.prompt = fields.prompt;
+        if (
+          (typeof args.aspectRatio !== "string" || !args.aspectRatio.trim()) &&
+          fields.aspectRatio
+        ) {
           args.aspectRatio = fields.aspectRatio;
         }
       }
       if (step.tool === "crayo.import_asset") {
         const fields = crayoImportFieldsFromGoal(run.goal);
         if ((typeof args.url !== "string" || !args.url.trim()) && fields.url) args.url = fields.url;
-        if ((typeof args.name !== "string" || !args.name.trim()) && fields.name) args.name = fields.name;
+        if ((typeof args.name !== "string" || !args.name.trim()) && fields.name)
+          args.name = fields.name;
       }
       if (step.tool === "crayo.export_project") {
         const fields = crayoExportFieldsFromGoal(run.goal);
@@ -459,7 +493,8 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
       if (step.tool === "crayo.ingest_to_library") {
         const fields = crayoIngestFieldsFromGoal(run.goal);
         if ((typeof args.url !== "string" || !args.url.trim()) && fields.url) args.url = fields.url;
-        if ((typeof args.title !== "string" || !args.title.trim()) && fields.title) args.title = fields.title;
+        if ((typeof args.title !== "string" || !args.title.trim()) && fields.title)
+          args.title = fields.title;
       }
       if (run.skillId && (step.tool === "clipping.run_skill" || step.tool === "skills.invoke")) {
         args.skillId = run.skillId;
@@ -499,7 +534,8 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
                 ? "Calling Crayo image generator (1 image credit). This is waiting on api.crayo.ai — not frozen."
                 : step.tool === "crayo.export_project"
                   ? "Queueing a Crayo export. Renders can take a few minutes. This is waiting on api.crayo.ai — not frozen."
-                  : step.tool === "crayo.run_autoclip" && mediaSourceKind(String(args.url ?? "")) === "fetch"
+                  : step.tool === "crayo.run_autoclip" &&
+                      mediaSourceKind(String(args.url ?? "")) === "fetch"
                     ? "Fetching the page link in a Daytona sandbox (yt-dlp), uploading it to Crayo, then AutoClipping. Up to ~4 minutes for a long video. Progress lines follow — not frozen."
                     : "Calling Crayo now. Image, voice, and export can take up to 3 minutes. This is waiting on api.crayo.ai — not frozen.",
           status: "running",
@@ -519,7 +555,13 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
       while (attempt <= AGENT_STEP_RETRIES && !done) {
         const started = Date.now();
         try {
-          const result = await executeAgentTool({ name: step.tool, payload: args, actorId, onProgress, runId });
+          const result = await executeAgentTool({
+            name: step.tool,
+            payload: args,
+            actorId,
+            onProgress,
+            runId,
+          });
           await writeAuditLog({
             requestId: runId,
             actor: { source: "api" as const, keyId: null, label: actorId },
@@ -553,11 +595,13 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
             status: "ok",
           });
           outputs[step.id] = asJson(result.data);
+          appendLibraryClips(outputs, result.data);
 
           if (result.needsLogin || result.waitingHuman) {
             await patchAgentRun(runId, {
               status: "waiting_human",
-              summary: "Needs a human (login, CAPTCHA, or approval). Open Social if this is a session wall.",
+              summary:
+                "Needs a human (login, CAPTCHA, or approval). Open Social if this is a session wall.",
               iterationCount: stepIndex + 1,
               outputs,
             });
@@ -571,11 +615,16 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
               .catch(() => {});
             return;
           }
-          if (result.machineStopped && !policies.socialAutoStartForUpload && step.tool !== "social.get_machine_status") {
+          if (
+            result.machineStopped &&
+            !policies.socialAutoStartForUpload &&
+            step.tool !== "social.get_machine_status"
+          ) {
             await patchAgentRun(runId, {
               status: "waiting_resource",
               errorCode: "MACHINE_STOPPED",
-              summary: "Social Machine is stopped. Start it on the Social tab, then re-run. Auto-start is off.",
+              summary:
+                "Social Machine is stopped. Start it on the Social tab, then re-run. Auto-start is off.",
               iterationCount: stepIndex + 1,
               outputs,
             });
@@ -591,10 +640,16 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
           const code = error instanceof Error ? error.message : "TOOL_FAILED";
           // Provider detail (Crayo/Higgsfield message) — operator-safe, never a credential.
           const detail =
-            error && typeof error === "object" && "detail" in error && typeof (error as { detail?: unknown }).detail === "string"
+            error &&
+            typeof error === "object" &&
+            "detail" in error &&
+            typeof (error as { detail?: unknown }).detail === "string"
               ? (error as { detail: string }).detail.trim().slice(0, 300)
               : "";
-          const explained = detail && detail !== code ? `${explainAgentToolError(code)}\n\nProvider said: ${detail}` : explainAgentToolError(code);
+          const explained =
+            detail && detail !== code
+              ? `${explainAgentToolError(code)}\n\nProvider said: ${detail}`
+              : explainAgentToolError(code);
           await writeAuditLog({
             requestId: runId,
             actor: { source: "api" as const, keyId: null, label: actorId },
@@ -665,7 +720,11 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
             resultSummary: explained.slice(0, 800),
             status: "error",
           });
-          if (code === "AI_TIER_GATED" || isFatalAgentToolError(code) || step.tool.startsWith("crayo.")) {
+          if (
+            code === "AI_TIER_GATED" ||
+            isFatalAgentToolError(code) ||
+            step.tool.startsWith("crayo.")
+          ) {
             const summary = explained.slice(0, 800);
             await patchAgentRun(runId, {
               status: "failed",
@@ -711,7 +770,9 @@ export async function executeAgentRun(runId: string, actorId: string): Promise<v
     }
 
     const summary =
-      (outputs.finish && typeof outputs.finish === "object" && "summary" in (outputs.finish as object)
+      (outputs.finish &&
+      typeof outputs.finish === "object" &&
+      "summary" in (outputs.finish as object)
         ? String((outputs.finish as { summary?: string }).summary)
         : null) || "Run complete.";
 
diff --git a/src/lib/server/clip-export.server.test.ts b/src/lib/server/clip-export.server.test.ts
new file mode 100644
index 0000000..73b691d
--- /dev/null
+++ b/src/lib/server/clip-export.server.test.ts
@@ -0,0 +1,181 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import {
+  exportClipStep,
+  readExportCredits,
+  type ClipExportDeps,
+  type ClipExportState,
+} from "./clip-export.server.ts";
+
+function fakeDeps(
+  over: Partial<ClipExportDeps> & { exportStatuses?: string[] } = {},
+): ClipExportDeps & { calls: string[] } {
+  const calls: string[] = [];
+  const statuses = [...(over.exportStatuses ?? ["processing", "completed"])];
+  return {
+    calls,
+    crayo: {
+      async exportProject(id) {
+        calls.push(`export:${id}`);
+        return { export: { id: "exp_1", status: "queued" } };
+      },
+      async getExport(id) {
+        calls.push(`poll:${id}`);
+        const s = statuses.shift() ?? "completed";
+        return {
+          export: { id, status: s, video_url: "https://cdn-crayo.com/c.mp4", file_size: 1000 },
+        };
+      },
+      async getAccount() {
+        return { credits: { export: 7 } };
+      },
+    },
+    findByExternalRef: over.findByExternalRef ?? (async () => null),
+    download:
+      over.download ??
+      (async (url) => {
+        calls.push(`download:${url}`);
+        return {
+          path: "/tmp/fake.mp4",
+          bytes: 1000,
+          mime: "video/mp4",
+          cleanup: async () => {
+            calls.push("cleanup");
+          },
+        };
+      }),
+    ingest:
+      over.ingest ??
+      (async () => {
+        calls.push("ingest");
+        return { assetId: "asset_1" };
+      }),
+    attachThumbnail:
+      over.attachThumbnail ??
+      (async () => {
+        calls.push("thumb");
+      }),
+  };
+}
+const base = (): ClipExportState => ({
+  projectId: "p1",
+  title: "Clip",
+  thumbnailUrl: "https://cdn-crayo.com/t.jpg",
+  exportId: null,
+  status: "pending",
+  assetId: null,
+  error: null,
+  bytes: null,
+});
+const ctx = {
+  actorId: "u1",
+  clientId: null,
+  sourceUrl: "https://www.youtube.com/watch?v=x",
+  tags: ["autoclip"],
+};
+
+test("pending → exporting starts the export once", async () => {
+  const deps = fakeDeps();
+  const s1 = await exportClipStep(base(), ctx, deps);
+  assert.equal(s1.status, "exporting");
+  assert.equal(s1.exportId, "exp_1");
+  assert.deepEqual(deps.calls, ["export:p1"]);
+});
+
+test("exporting polls until done, then downloads, ingests, attaches thumbnail, cleans up", async () => {
+  const deps = fakeDeps();
+  let s = await exportClipStep(base(), ctx, deps);
+  s = await exportClipStep(s, ctx, deps); // processing
+  assert.equal(s.status, "exporting");
+  s = await exportClipStep(s, ctx, deps); // completed
+  assert.equal(s.status, "stored");
+  assert.equal(s.assetId, "asset_1");
+  assert.equal(s.bytes, 1000);
+  assert.deepEqual(deps.calls, [
+    "export:p1",
+    "poll:exp_1",
+    "poll:exp_1",
+    "download:https://cdn-crayo.com/c.mp4",
+    "ingest",
+    "thumb",
+    "cleanup",
+  ]);
+});
+
+test("already-stored project is a no-op via external ref", async () => {
+  const deps = fakeDeps({ findByExternalRef: async () => ({ id: "asset_9" }) });
+  const s = await exportClipStep(base(), ctx, deps);
+  assert.equal(s.status, "stored");
+  assert.equal(s.assetId, "asset_9");
+  assert.deepEqual(deps.calls, []);
+});
+
+test("failed export marks only this clip failed with the provider message", async () => {
+  const deps = fakeDeps({ exportStatuses: ["failed"] });
+  let s = await exportClipStep(base(), ctx, deps);
+  s = await exportClipStep(s, ctx, deps);
+  assert.equal(s.status, "failed");
+  assert.match(s.error ?? "", /export failed/i);
+});
+
+test("storage failure cleans up and fails the clip", async () => {
+  const deps = fakeDeps({
+    exportStatuses: ["completed"],
+    ingest: async () => {
+      throw new Error("SUPABASE_DOWN");
+    },
+  });
+  let s = await exportClipStep(base(), ctx, deps);
+  s = await exportClipStep(s, ctx, deps);
+  assert.equal(s.status, "failed");
+  assert.equal(s.error, "SUPABASE_DOWN");
+  assert.ok(deps.calls.includes("cleanup"));
+});
+
+test("oversized export is refused before download", async () => {
+  const deps = fakeDeps();
+  deps.crayo.getExport = async (id) => ({
+    export: {
+      id,
+      status: "completed",
+      video_url: "https://cdn-crayo.com/big.mp4",
+      file_size: 600 * 1024 * 1024,
+    },
+  });
+  let s = await exportClipStep(base(), ctx, deps);
+  s = await exportClipStep(s, ctx, deps);
+  assert.equal(s.status, "failed");
+  assert.match(s.error ?? "", /512 MB/);
+  assert.ok(!deps.calls.some((c) => c.startsWith("download:")));
+});
+
+test("readExportCredits tolerates a failing account call", async () => {
+  assert.equal(
+    await readExportCredits({
+      async exportProject() {
+        return null;
+      },
+      async getExport() {
+        return null;
+      },
+      async getAccount() {
+        return { credits: { export: 7 } };
+      },
+    }),
+    7,
+  );
+  assert.equal(
+    await readExportCredits({
+      async exportProject() {
+        return null;
+      },
+      async getExport() {
+        return null;
+      },
+      async getAccount() {
+        throw new Error("x");
+      },
+    }),
+    null,
+  );
+});
diff --git a/src/lib/server/clip-export.server.ts b/src/lib/server/clip-export.server.ts
new file mode 100644
index 0000000..7724001
--- /dev/null
+++ b/src/lib/server/clip-export.server.ts
@@ -0,0 +1,251 @@
+/**
+ * Crayo clip project → stored Library asset. Pure orchestration over injected deps so the
+ * transitions are unit-testable; `defaultClipExportDeps()` wires the real Crayo client,
+ * library pipeline and storage. Never import from client code.
+ */
+import { BUCKET_OBJECT_LIMIT_BYTES, clipExternalRef, readExportPayload } from "@/lib/clip-export";
+
+export type CrayoExportClient = {
+  exportProject(projectId: string): Promise<unknown>;
+  getExport(exportId: string): Promise<unknown>;
+  getAccount(): Promise<unknown>;
+};
+
+export type ClipExportState = {
+  projectId: string;
+  title: string;
+  thumbnailUrl: string | null;
+  exportId: string | null;
+  status: "pending" | "exporting" | "stored" | "failed";
+  assetId: string | null;
+  error: string | null;
+  bytes: number | null;
+};
+
+export type ClipExportDeps = {
+  crayo: CrayoExportClient;
+  findByExternalRef(ref: string): Promise<{ id: string } | null>;
+  download(
+    url: string,
+    maxBytes: number,
+  ): Promise<{ path: string; bytes: number; mime: string; cleanup(): Promise<void> }>;
+  ingest(input: {
+    path: string;
+    bytes: number;
+    mime: string;
+    title: string;
+    externalRef: string;
+    sourceRef: string;
+    actorId: string;
+    clientId: string | null;
+    tags: string[];
+  }): Promise<{ assetId: string }>;
+  attachThumbnail(assetId: string, thumbnailUrl: string): Promise<void>;
+};
+
+export type ClipExportContext = {
+  actorId: string;
+  clientId: string | null;
+  sourceUrl: string;
+  tags: string[];
+};
+
+const POLL_MS = 3000;
+const MAX_POLLS = 60;
+
+function message(error: unknown): string {
+  return (error instanceof Error ? error.message : String(error))
+    .replace(/https?:\/\/\S+/g, "<url>")
+    .slice(0, 300);
+}
+
+export async function readExportCredits(crayo: CrayoExportClient): Promise<number | null> {
+  try {
+    const raw = (await crayo.getAccount()) as { credits?: { export?: unknown } } | null;
+    const value = raw?.credits?.export;
+    return typeof value === "number" && Number.isFinite(value) ? value : null;
+  } catch {
+    return null;
+  }
+}
+
+/** One transition. Safe to call repeatedly; terminal states return unchanged. */
+export async function exportClipStep(
+  state: ClipExportState,
+  ctx: ClipExportContext,
+  deps: ClipExportDeps,
+): Promise<ClipExportState> {
+  if (state.status === "stored" || state.status === "failed") return state;
+  const ref = clipExternalRef(state.projectId);
+  try {
+    if (state.status === "pending") {
+      const existing = await deps.findByExternalRef(ref);
+      if (existing) return { ...state, status: "stored", assetId: existing.id, error: null };
+      const queued = readExportPayload(await deps.crayo.exportProject(state.projectId));
+      if (!queued.exportId)
+        return { ...state, status: "failed", error: "Crayo did not return an export id." };
+      return { ...state, status: "exporting", exportId: queued.exportId };
+    }
+    // exporting
+    const polled = readExportPayload(await deps.crayo.getExport(state.exportId!));
+    if (polled.status === "pending") return state;
+    if (polled.status === "failed" || !polled.url)
+      return { ...state, status: "failed", error: "Crayo export failed." };
+    if (polled.bytes != null && polled.bytes > BUCKET_OBJECT_LIMIT_BYTES) {
+      return {
+        ...state,
+        status: "failed",
+        error: `Export is ${Math.round(polled.bytes / 1048576)} MB; the library bucket allows 512 MB per file.`,
+      };
+    }
+    const file = await deps.download(polled.url, BUCKET_OBJECT_LIMIT_BYTES);
+    try {
+      const { assetId } = await deps.ingest({
+        path: file.path,
+        bytes: file.bytes,
+        mime: file.mime,
+        title: state.title,
+        externalRef: ref,
+        sourceRef: ctx.sourceUrl,
+        actorId: ctx.actorId,
+        clientId: ctx.clientId,
+        tags: ctx.tags,
+      });
+      if (state.thumbnailUrl)
+        await deps.attachThumbnail(assetId, state.thumbnailUrl).catch(() => {});
+      return { ...state, status: "stored", assetId, bytes: file.bytes, error: null };
+    } finally {
+      await file.cleanup();
+    }
+  } catch (error) {
+    return { ...state, status: "failed", error: message(error) };
+  }
+}
+
+/** Synchronous convenience for callers that can wait (direct-file /autoclip, /export). */
+export async function exportClipToLibrary(
+  input: {
+    projectId: string;
+    title: string;
+    thumbnailUrl: string | null;
+    actorId: string;
+    clientId: string | null;
+    sourceUrl: string;
+    tags?: string[];
+  },
+  deps: ClipExportDeps = defaultClipExportDeps(),
+): Promise<ClipExportState> {
+  let state: ClipExportState = {
+    projectId: input.projectId,
+    title: input.title,
+    thumbnailUrl: input.thumbnailUrl,
+    exportId: null,
+    status: "pending",
+    assetId: null,
+    error: null,
+    bytes: null,
+  };
+  const ctx: ClipExportContext = {
+    actorId: input.actorId,
+    clientId: input.clientId,
+    sourceUrl: input.sourceUrl,
+    tags: input.tags ?? ["crayo", "autoclip"],
+  };
+  for (let i = 0; i < MAX_POLLS + 2; i += 1) {
+    const next = await exportClipStep(state, ctx, deps);
+    if (next.status === "stored" || next.status === "failed") return next;
+    if (next.status === "exporting" && state.status === "exporting")
+      await new Promise((r) => setTimeout(r, POLL_MS));
+    state = next;
+  }
+  return { ...state, status: "failed", error: "Crayo export is still processing." };
+}
+
+/** Stream an https URL to a temp file with a byte ceiling. */
+export async function downloadToTempFile(
+  url: string,
+  maxBytes: number,
+): Promise<{ path: string; bytes: number; mime: string; cleanup(): Promise<void> }> {
+  const { mkdtemp, rm } = await import("node:fs/promises");
+  const { createWriteStream } = await import("node:fs");
+  const { tmpdir } = await import("node:os");
+  const { join } = await import("node:path");
+  const { pipeline } = await import("node:stream/promises");
+  const { Readable, Transform } = await import("node:stream");
+  const { isTrustedLibraryUrl } = await import("@/lib/server/library-pipeline.server");
+  if (!isTrustedLibraryUrl(url)) throw new Error("UNTRUSTED_URL");
+  const response = await fetch(url, {
+    redirect: "follow",
+    headers: { "User-Agent": "ClippyAdmin/1.0" },
+    signal: AbortSignal.timeout(10 * 60 * 1000),
+  });
+  if (!response.ok || !response.body) throw new Error("UNTRUSTED_URL");
+  const declared = Number(response.headers.get("content-length") ?? 0);
+  if (declared > maxBytes) throw new Error("MEDIA_TOO_LARGE");
+  const dir = await mkdtemp(join(tmpdir(), "clip-export-"));
+  const path = join(dir, "clip.mp4");
+  let bytes = 0;
+  const limiter = new Transform({
+    transform(chunk, _enc, cb) {
+      bytes += chunk.length;
+      if (bytes > maxBytes) cb(new Error("MEDIA_TOO_LARGE"));
+      else cb(null, chunk);
+    },
+  });
+  const cleanup = async () => {
+    await rm(dir, { recursive: true, force: true });
+  };
+  try {
+    await pipeline(Readable.fromWeb(response.body as never), limiter, createWriteStream(path));
+  } catch (error) {
+    await cleanup();
+    throw error;
+  }
+  const mime = response.headers.get("content-type")?.split(";")[0]?.trim() || "video/mp4";
+  return { path, bytes, mime, cleanup };
+}
+
+export function defaultClipExportDeps(): ClipExportDeps {
+  return {
+    crayo: {
+      exportProject: async (id) =>
+        (await import("@/lib/server/crayo.server")).crayoExportProject(id),
+      getExport: async (id) => (await import("@/lib/server/crayo.server")).crayoGetExport(id),
+      getAccount: async () => (await import("@/lib/server/crayo.server")).crayoGetAccount(),
+    },
+    findByExternalRef: async (ref) =>
+      (await import("@/lib/server/library.server")).findAssetByExternalRef(ref),
+    download: downloadToTempFile,
+    ingest: async (input) => {
+      const { ingestFile } = await import("@/lib/server/library-pipeline.server");
+      const { asset } = await ingestFile({
+        actorId: input.actorId,
+        clientId: input.clientId,
+        title: input.title,
+        filePath: input.path,
+        mimeHint: input.mime,
+        filename: `${input.title}.mp4`,
+        source: "AGENT",
+        sourceRef: input.sourceRef.slice(0, 500),
+        externalRef: input.externalRef,
+        tags: ["crayo", ...input.tags],
+        note: "crayo export",
+      });
+      return { assetId: asset.id };
+    },
+    attachThumbnail: async (assetId, thumbnailUrl) => {
+      const { isTrustedLibraryUrl, attachThumbnail } =
+        await import("@/lib/server/library-pipeline.server");
+      if (!isTrustedLibraryUrl(thumbnailUrl)) return;
+      const response = await fetch(thumbnailUrl, { signal: AbortSignal.timeout(20_000) });
+      if (!response.ok) return;
+      const bytes = Buffer.from(await response.arrayBuffer());
+      if (bytes.length > 5 * 1024 * 1024) return;
+      await attachThumbnail({
+        assetId,
+        bytes,
+        mimeHint: response.headers.get("content-type") ?? "image/jpeg",
+      });
+    },
+  };
+}
diff --git a/src/lib/server/crayo-tools.server.ts b/src/lib/server/crayo-tools.server.ts
index 86cd6d0..37b2dc9 100644
--- a/src/lib/server/crayo-tools.server.ts
+++ b/src/lib/server/crayo-tools.server.ts
@@ -29,7 +29,13 @@ function str(payload: Record<string, unknown>, ...keys: string[]): string {
   return "";
 }
 
-function num(payload: Record<string, unknown>, key: string, fallback: number, min: number, max: number): number {
+function num(
+  payload: Record<string, unknown>,
+  key: string,
+  fallback: number,
+  min: number,
+  max: number,
+): number {
   const raw = Number(payload[key]);
   if (!Number.isFinite(raw)) return fallback;
   return Math.min(max, Math.max(min, Math.floor(raw)));
@@ -101,7 +107,11 @@ export async function ingestCrayoMedia(
   url: string,
   title: string,
   extraTags: string[],
-): Promise<{ assetId: string; title: string; status: string; kind: string; duplicate: boolean } | { error: string; url: string } | null> {
+): Promise<
+  | { assetId: string; title: string; status: string; kind: string; duplicate: boolean }
+  | { error: string; url: string }
+  | null
+> {
   if (!url.startsWith("https://")) return null;
   if (!isCrayoMediaUrl(url)) return { error: "UNTRUSTED_URL", url };
   try {
@@ -131,7 +141,8 @@ async function crayoPollAutoclip(id: string): Promise<unknown> {
     const payload = await crayoGetAutoclip(id);
     const status = pickField(payload, "status").toLowerCase();
     if (status === "completed" || status === "complete" || status === "succeeded") return payload;
-    if (status === "failed" || status === "error") throw new CrayoApiError("FAILED", "Crayo AutoClip failed.", 400);
+    if (status === "failed" || status === "error")
+      throw new CrayoApiError("FAILED", "Crayo AutoClip failed.", 400);
     await new Promise((resolve) => setTimeout(resolve, 3000));
   }
   throw new CrayoApiError("TIMEOUT", "Crayo AutoClip is still processing.", 504);
@@ -140,7 +151,8 @@ async function crayoPollAutoclip(id: string): Promise<unknown> {
 async function runShort(payload: Record<string, unknown>, actorId: string): Promise<unknown> {
   const prompt = sanitizeText(str(payload, "prompt", "topic")).slice(0, 2000);
   const script = sanitizeText(str(payload, "script")).slice(0, 5000) || prompt;
-  const title = sanitizeText(str(payload, "title")).slice(0, 80) || prompt.slice(0, 80) || "Crayo short";
+  const title =
+    sanitizeText(str(payload, "title")).slice(0, 80) || prompt.slice(0, 80) || "Crayo short";
   const clientId = str(payload, "clientId") || null;
   if (!prompt) throw new Error("VALIDATION");
 
@@ -161,7 +173,8 @@ async function runShort(payload: Record<string, unknown>, actorId: string): Prom
     }),
   );
   const audioId = pickField(voice, "id") || pickField(voice, "asset_id");
-  const durationSec = Number(pickField(voice, "duration_seconds") || pickField(voice, "duration")) || 15;
+  const durationSec =
+    Number(pickField(voice, "duration_seconds") || pickField(voice, "duration")) || 15;
   const endMs = Math.min(60_000, Math.max(4_000, Math.round(durationSec * 1000)));
   if (!imageId || !audioId) throw new Error("CRAYO_FAILED");
 
@@ -184,7 +197,9 @@ async function runShort(payload: Record<string, unknown>, actorId: string): Prom
 
   const queued = await wrap(() => crayoExportProject(projectId));
   const exportId = pickField(queued, "id");
-  const exported = exportId ? await wrap(() => crayoPollExport(exportId)).catch(() => queued) : queued;
+  const exported = exportId
+    ? await wrap(() => crayoPollExport(exportId)).catch(() => queued)
+    : queued;
   const videoUrl = firstHttps(exported) || firstHttps(queued);
 
   const library = videoUrl
@@ -238,12 +253,16 @@ async function runAutoclip(
       });
     } catch (error) {
       const code = error instanceof Error ? error.message : "MEDIA_FETCH_FAILED";
-      throw new CrayoToolError(/^[A-Z_]{3,60}$/.test(code) ? code : "MEDIA_FETCH_FAILED", error instanceof Error ? error.message : "");
+      throw new CrayoToolError(
+        /^[A-Z_]{3,60}$/.test(code) ? code : "MEDIA_FETCH_FAILED",
+        error instanceof Error ? error.message : "",
+      );
     }
     throw new CrayoToolError("MEDIA_FETCH_PENDING", "Background fetch started.");
   }
   if (mediaSourceKind(url) === "fetch") {
-    const { fetchPageVideoToCrayoAsset, MediaFetchError } = await import("@/lib/server/media-fetch.server");
+    const { fetchPageVideoToCrayoAsset, MediaFetchError } =
+      await import("@/lib/server/media-fetch.server");
     try {
       const result = await fetchPageVideoToCrayoAsset({ url, name, onProgress });
       assetId = result.assetId;
@@ -257,7 +276,9 @@ async function runAutoclip(
     assetId = pickField(imported, "id") || pickField(imported, "asset_id");
   }
   if (!assetId) throw new Error("CRAYO_FAILED");
-  await onProgress?.(`Crayo asset ${assetId} is ready. Starting AutoClip (credits are charged per requested clip).`);
+  await onProgress?.(
+    `Crayo asset ${assetId} is ready. Starting AutoClip (credits are charged per requested clip).`,
+  );
 
   const job = await wrap(() =>
     crayoCreateAutoclip({
@@ -272,26 +293,46 @@ async function runAutoclip(
   if (!autoclipId) throw new Error("CRAYO_FAILED");
 
   const finished = await wrap(() => crayoPollAutoclip(autoclipId));
-  const clipsRaw =
-    finished && typeof finished === "object" && Array.isArray((finished as { clips?: unknown }).clips)
-      ? ((finished as { clips: unknown[] }).clips)
-      : [];
+  const { readAutoclipClips, planExportBudget } = await import("@/lib/clip-export");
+  const { exportClipToLibrary, readExportCredits, defaultClipExportDeps } =
+    await import("@/lib/server/clip-export.server");
+  const found = readAutoclipClips(finished);
+  const deps = defaultClipExportDeps();
+  const budget = planExportBudget({
+    exportCredits: await readExportCredits(deps.crayo),
+    clipCount: found.length,
+  });
+  if (!budget.ok) throw new CrayoToolError("EXPORT_BUDGET", budget.reason);
   const clips = [];
-  for (const clip of clipsRaw.slice(0, 20)) {
-    const title = pickField(clip, "title") || "AutoClip";
-    const thumbnailUrl = pickField(clip, "thumbnail_url") || firstHttps(clip);
-    const projectId = pickField(clip, "project_id") || pickField(clip, "id");
-    const library = thumbnailUrl
-      ? await ingestCrayoMedia(actorId, clientId, thumbnailUrl, title, ["autoclip"])
-      : null;
-    clips.push({
-      title,
-      projectId: projectId || null,
-      thumbnailUrl: thumbnailUrl || null,
-      library,
-    });
+  for (const [i, clip] of found.slice(0, budget.count).entries()) {
+    await onProgress?.(`Exporting clip ${i + 1} of ${budget.count}: ${clip.title}`);
+    const result = await exportClipToLibrary(
+      {
+        projectId: clip.projectId,
+        title: clip.title,
+        thumbnailUrl: clip.thumbnailUrl,
+        actorId,
+        clientId,
+        sourceUrl: url,
+        tags: ["autoclip"],
+      },
+      deps,
+    );
+    clips.push(result);
+    await onProgress?.(
+      result.status === "stored"
+        ? `Stored clip ${i + 1} of ${budget.count} (${Math.round((result.bytes ?? 0) / 1048576)} MB).`
+        : `Clip ${i + 1} failed: ${result.error}`,
+    );
   }
-  return { autoclipId, assetId, clips, ...(fetched ? { source: fetched } : {}) };
+  const libraryClips = clips.map((c) => ({
+    title: c.title,
+    projectId: c.projectId,
+    assetId: c.assetId,
+    status: c.status,
+    error: c.error,
+  }));
+  return { autoclipId, assetId, clips, libraryClips, ...(fetched ? { source: fetched } : {}) };
 }
 
 export async function handleCrayoAction(
@@ -321,7 +362,12 @@ export async function handleCrayoAction(
     case "crayo.import_asset": {
       const url = str(payload, "url");
       if (!url.startsWith("https://")) throw new Error("VALIDATION");
-      return wrap(() => crayoImportAsset({ url, name: sanitizeText(str(payload, "name")).slice(0, 200) || undefined }));
+      return wrap(() =>
+        crayoImportAsset({
+          url,
+          name: sanitizeText(str(payload, "name")).slice(0, 200) || undefined,
+        }),
+      );
     }
     case "crayo.generate_image": {
       const prompt = sanitizeText(str(payload, "prompt")).slice(0, 2000);
@@ -336,7 +382,13 @@ export async function handleCrayoAction(
       );
       const imageUrl = firstHttps(image);
       const library = imageUrl
-        ? await ingestCrayoMedia(actorId, clientId, imageUrl, prompt.slice(0, 80) || "Crayo still", ["still"])
+        ? await ingestCrayoMedia(
+            actorId,
+            clientId,
+            imageUrl,
+            prompt.slice(0, 80) || "Crayo still",
+            ["still"],
+          )
         : null;
       return { image, thumbnailUrl: imageUrl || null, library };
     }
@@ -354,9 +406,13 @@ export async function handleCrayoAction(
       );
       const audioUrl = firstHttps(voice);
       const library = audioUrl
-        ? await ingestCrayoMedia(actorId, clientId, audioUrl, script.slice(0, 80) || "Crayo voiceover", [
-            "voiceover",
-          ])
+        ? await ingestCrayoMedia(
+            actorId,
+            clientId,
+            audioUrl,
+            script.slice(0, 80) || "Crayo voiceover",
+            ["voiceover"],
+          )
         : null;
       return { voice, audioUrl: audioUrl || null, library };
     }
@@ -369,14 +425,28 @@ export async function handleCrayoAction(
     case "crayo.export_project": {
       const id = str(payload, "projectId", "id");
       if (!id) throw new Error("VALIDATION");
-      const queued = await wrap(() => crayoExportProject(id));
-      const exportId = pickField(queued, "id");
-      if (!exportId) return queued;
-      try {
-        return await wrap(() => crayoPollExport(exportId));
-      } catch {
-        return queued;
-      }
+      const { exportClipToLibrary } = await import("@/lib/server/clip-export.server");
+      const result = await exportClipToLibrary({
+        projectId: id,
+        title: sanitizeText(str(payload, "title")).slice(0, 160) || `Crayo project ${id}`,
+        thumbnailUrl: null,
+        actorId,
+        clientId: str(payload, "clientId") || null,
+        sourceUrl: `crayo:project:${id}`,
+        tags: ["export"],
+      });
+      if (result.status === "failed") throw new CrayoToolError("EXPORT_FAILED", result.error ?? "");
+      return {
+        libraryClips: [
+          {
+            title: result.title,
+            projectId: id,
+            assetId: result.assetId,
+            status: result.status,
+            error: null,
+          },
+        ],
+      };
     }
     case "crayo.get_export": {
       const id = str(payload, "exportId", "id");
diff --git a/src/lib/server/library-fns.ts b/src/lib/server/library-fns.ts
index a727042..532622e 100644
--- a/src/lib/server/library-fns.ts
+++ b/src/lib/server/library-fns.ts
@@ -22,14 +22,17 @@ export const getLibrarySnapshot = createServerFn({ method: "GET" })
   .middleware([authMiddleware])
   .handler(async ({ context }) => {
     const role = await requireUser(context.userId);
-    const { listAssets, listRenders, readMediaSettings } = await import("@/lib/server/library.server");
+    const { listAssets, listRenders, readMediaSettings } =
+      await import("@/lib/server/library.server");
     const clients = await readClients();
     const [assets, renders, settings] = await Promise.all([
       listAssets({}, 80),
       listRenders(),
       readMediaSettings(),
     ]);
-    let rollups: Awaited<ReturnType<typeof import("@/lib/server/performance.server").listAssetRollups>> = [];
+    let rollups: Awaited<
+      ReturnType<typeof import("@/lib/server/performance.server").listAssetRollups>
+    > = [];
     try {
       const perf = await import("@/lib/server/performance.server");
       rollups = await perf.listAssetRollups();
@@ -41,7 +44,12 @@ export const getLibrarySnapshot = createServerFn({ method: "GET" })
       renders,
       clients: clients
         .filter((row) => !row.deletedAt)
-        .map((row) => ({ id: row.id, name: row.name, status: row.status, deletedAt: row.deletedAt })),
+        .map((row) => ({
+          id: row.id,
+          name: row.name,
+          status: row.status,
+          deletedAt: row.deletedAt,
+        })),
       role,
       settings,
       rollups,
@@ -74,9 +82,8 @@ export const getLibraryAssetFn = createServerFn({ method: "POST" })
   .validator((input: unknown) => z.object({ id: z.string().min(1) }).parse(input))
   .handler(async ({ context, data }) => {
     await requireUser(context.userId);
-    const { getAsset, listVersions, listCaptions, derivedRenders, listRenders } = await import(
-      "@/lib/server/library.server"
-    );
+    const { getAsset, listVersions, listCaptions, derivedRenders, listRenders } =
+      await import("@/lib/server/library.server");
     const asset = await getAsset(data.id);
     if (!asset) throw new Error("ASSET_MISSING");
     const [versions, captions, derived, renders] = await Promise.all([
@@ -85,8 +92,12 @@ export const getLibraryAssetFn = createServerFn({ method: "POST" })
       derivedRenders(asset.id),
       listRenders({ sourceAssetId: asset.id }),
     ]);
-    let performance = null as Awaited<ReturnType<typeof import("@/lib/server/performance.server").getAssetRollup>>;
-    let snapshots: Awaited<ReturnType<typeof import("@/lib/server/performance.server").listPostPerformance>> = [];
+    let performance = null as Awaited<
+      ReturnType<typeof import("@/lib/server/performance.server").getAssetRollup>
+    >;
+    let snapshots: Awaited<
+      ReturnType<typeof import("@/lib/server/performance.server").listPostPerformance>
+    > = [];
     try {
       const perf = await import("@/lib/server/performance.server");
       performance = await perf.getAssetRollup(asset.id);
@@ -313,7 +324,9 @@ export const archiveAssetFn = createServerFn({ method: "POST" })
 export const tagAssetsFn = createServerFn({ method: "POST" })
   .middleware([authMiddleware])
   .validator((input: unknown) =>
-    z.object({ assetIds: z.array(z.string()).min(1).max(24), tag: z.string().min(1).max(32) }).parse(input),
+    z
+      .object({ assetIds: z.array(z.string()).min(1).max(24), tag: z.string().min(1).max(32) })
+      .parse(input),
   )
   .handler(async ({ context, data }) => {
     await requireUser(context.userId);
@@ -372,9 +385,8 @@ export const saveIpfsSettingsFn = createServerFn({ method: "POST" })
   .handler(async ({ context, data }) => {
     const role = await requireUser(context.userId);
     if (role !== "admin") throw new Error("Forbidden");
-    const { persistIpfsSettings, testPinataConnection } = await import(
-      "@/lib/server/library-storage.server"
-    );
+    const { persistIpfsSettings, testPinataConnection } =
+      await import("@/lib/server/library-storage.server");
     await persistIpfsSettings(data);
     if (data.pinataJwt?.trim()) await testPinataConnection();
     const { readMediaSettings } = await import("@/lib/server/library.server");
@@ -427,6 +439,37 @@ export const ingestThumbnailFn = createServerFn({ method: "POST" })
     return ingestThumbnailMessage({ actorId: context.userId, messageId: data.messageId });
   });
 
+export const signLibraryAssetsFn = createServerFn({ method: "POST" })
+  .middleware([authMiddleware])
+  .validator((input: unknown) =>
+    z.object({ assetIds: z.array(z.string().min(1)).max(50) }).parse(input),
+  )
+  .handler(async ({ context, data }) => {
+    await requireUser(context.userId);
+    const { getAsset, getVersionRow } = await import("@/lib/server/library.server");
+    const { signVersionUrl, backendFromStorageKey } =
+      await import("@/lib/server/library-storage.server");
+    const rows = [];
+    for (const assetId of data.assetIds) {
+      const asset = await getAsset(assetId);
+      if (!asset) continue;
+      const version = asset.currentVersionId ? await getVersionRow(asset.currentVersionId) : null;
+      const previewUrl = asset.currentVersionId
+        ? await signVersionUrl(asset.currentVersionId).catch(() => null)
+        : null;
+      rows.push({
+        assetId,
+        title: asset.title,
+        status: asset.status,
+        previewUrl,
+        downloadUrl: previewUrl ? `${previewUrl}&download=1` : null,
+        thumbnailUrl: asset.thumbnailUrl,
+        backend: backendFromStorageKey(version?.storageKey ?? ""),
+      });
+    }
+    return rows;
+  });
+
 export const listClientClipsFn = createServerFn({ method: "POST" })
   .middleware([authMiddleware])
   .validator((input: unknown) => z.object({ clientId: z.string().min(1) }).parse(input))
diff --git a/src/lib/server/library-pipeline.server.ts b/src/lib/server/library-pipeline.server.ts
index 248be54..b37336a 100644
--- a/src/lib/server/library-pipeline.server.ts
+++ b/src/lib/server/library-pipeline.server.ts
@@ -65,7 +65,12 @@ function nowIso() {
   return new Date().toISOString();
 }
 
-async function audit(actorId: string, action: string, entityId: string, result: "ok" | "error" = "ok") {
+async function audit(
+  actorId: string,
+  action: string,
+  entityId: string,
+  result: "ok" | "error" = "ok",
+) {
   try {
     await writeAuditLog({
       requestId: `${action}:${entityId}`,
@@ -135,9 +140,7 @@ async function probeFile(path: string): Promise<Probe> {
     const text = `${result.stdout}\n${result.stderr}`;
     const dur = /Duration:\s*(\d+):(\d+):(\d+(?:\.\d+)?)/.exec(text);
     const dim = /Stream #.*Video:.*\s(\d{2,5})x(\d{2,5})/.exec(text);
-    const durationSec = dur
-      ? Number(dur[1]) * 3600 + Number(dur[2]) * 60 + Number(dur[3])
-      : null;
+    const durationSec = dur ? Number(dur[1]) * 3600 + Number(dur[2]) * 60 + Number(dur[3]) : null;
     return {
       durationSec: Number.isFinite(durationSec) ? durationSec : null,
       width: dim ? Number(dim[1]) : null,
@@ -208,7 +211,8 @@ export async function ingestBytes(input: {
   const ext = extFromMime(mime, input.filename);
   const key = makeStorageKey(assetId, versionId, ext);
   await writeLibraryBytes(key, input.bytes);
-  const title = sanitizeText(input.title || input.filename || "Untitled").slice(0, 160) || "Untitled";
+  const title =
+    sanitizeText(input.title || input.filename || "Untitled").slice(0, 160) || "Untitled";
   await insertAsset({
     id: assetId,
     client_id: input.clientId,
@@ -248,6 +252,154 @@ export async function ingestBytes(input: {
   return { asset, duplicate: false };
 }
 
+async function hashFile(path: string): Promise<string> {
+  const { createHash } = await import("node:crypto");
+  const { createReadStream } = await import("node:fs");
+  return new Promise((resolve, reject) => {
+    const hash = createHash("sha256");
+    createReadStream(path)
+      .on("data", (chunk) => hash.update(chunk))
+      .on("error", reject)
+      .on("end", () => resolve(hash.digest("hex")));
+  });
+}
+
+/** Disk-backed twin of ingestBytes: streams into storage and probes the file where it sits. */
+export async function ingestFile(input: {
+  actorId: string;
+  clientId: string | null;
+  title: string;
+  filePath: string;
+  mimeHint: string;
+  filename: string;
+  source: AssetSource;
+  sourceRef?: string | null;
+  externalRef?: string | null;
+  tags?: string[];
+  note?: string;
+}): Promise<{ asset: LibraryAsset; duplicate: boolean }> {
+  const { stat } = await import("node:fs/promises");
+  const { writeLibraryFile } = await import("@/lib/server/library-storage.server");
+  const byteSize = (await stat(input.filePath)).size;
+  const mime = input.mimeHint || "application/octet-stream";
+  const kind = kindFromMime(mime);
+  const checksum = await hashFile(input.filePath);
+  const existing = await findByChecksum(input.clientId, checksum);
+  if (existing) {
+    // Duplicate content: still record the caller's idempotency key (e.g.
+    // "crayo:project:<id>") on the pre-existing asset so a retried export finds it
+    // via findAssetByExternalRef instead of spending another provider credit.
+    if (input.externalRef && !existing.externalRef) {
+      await patchAsset(existing.id, { external_ref: input.externalRef });
+    }
+    return { asset: existing, duplicate: true };
+  }
+
+  const assetId = libraryNewId();
+  const versionId = libraryNewId();
+  const ext = extFromMime(mime, input.filename);
+  const key = makeStorageKey(assetId, versionId, ext);
+  // writeLibraryFile's return value is prefixed for cloud backends (`supabase:<key>`,
+  // `s3:<key>`) but is an ABSOLUTE PATH for the local-disk fallback, not the plain
+  // relative key — storing that in storage_key double-joins onto ROOT on every later
+  // read/delete. Store the plain `key` we already have (matches ingestBytes); the
+  // writer's return value is only used here to confirm the write succeeded.
+  await writeLibraryFile(key, input.filePath, mime);
+  const title =
+    sanitizeText(input.title || input.filename || "Untitled").slice(0, 160) || "Untitled";
+  await insertAsset({
+    id: assetId,
+    client_id: input.clientId,
+    kind,
+    title,
+    source: input.source,
+    source_ref: input.sourceRef ?? null,
+    external_ref: input.externalRef ?? null,
+    status: "PROCESSING",
+    mime_type: mime,
+    byte_size: byteSize,
+    checksum,
+    current_version_id: versionId,
+    tags: input.tags,
+    created_by: input.actorId,
+  });
+  await insertVersion({
+    id: versionId,
+    asset_id: assetId,
+    version_number: 1,
+    storage_key: key,
+    mime_type: mime,
+    byte_size: byteSize,
+    checksum,
+    note: input.note ?? "original",
+  });
+  await finalizeProbeFromPath(assetId, versionId, input.filePath, mime, byteSize, checksum);
+  await audit(input.actorId, "library.ingest", assetId);
+  emitAutonomyEvent({
+    type: "library.asset.ready",
+    entityType: "media_asset",
+    entityId: assetId,
+    data: { source: input.source, kind, clientId: input.clientId },
+  });
+  const asset = await getAsset(assetId);
+  if (!asset) throw new Error("ASSET_MISSING");
+  return { asset, duplicate: false };
+}
+
+async function finalizeProbeFromPath(
+  assetId: string,
+  versionId: string,
+  path: string,
+  mime: string,
+  byteSize: number,
+  checksum: string,
+) {
+  try {
+    await assertReadableMedia(path);
+  } catch {
+    await patchAsset(assetId, { status: "FAILED" });
+    return;
+  }
+  const probe = await probeFile(path);
+  await patchAsset(assetId, {
+    status: "READY",
+    mime_type: mime,
+    byte_size: byteSize,
+    checksum,
+    current_version_id: versionId,
+    duration_sec: probe.durationSec,
+    width: probe.width,
+    height: probe.height,
+    aspect_ratio: aspectLabel(probe.width, probe.height),
+  });
+}
+
+/** Store a small thumbnail as an extra version row and point the asset at it. */
+export async function attachThumbnail(input: {
+  assetId: string;
+  bytes: Buffer;
+  mimeHint: string;
+}): Promise<string> {
+  const { writeLibraryBytes } = await import("@/lib/server/library-storage.server");
+  const mime = sniffMime(input.bytes, input.mimeHint, "thumb.jpg");
+  const versionId = libraryNewId();
+  const key = makeStorageKey(input.assetId, versionId, extFromMime(mime, "thumb.jpg"));
+  // Same local-disk-return-value pitfall as ingestFile — store the plain key.
+  await writeLibraryBytes(key, input.bytes);
+  await insertVersion({
+    id: versionId,
+    asset_id: input.assetId,
+    version_number: 0,
+    storage_key: key,
+    mime_type: mime,
+    byte_size: input.bytes.length,
+    checksum: await hashBytes(input.bytes),
+    note: "thumbnail",
+  });
+  await patchAsset(input.assetId, { thumbnail_version_id: versionId });
+  return versionId;
+}
+
 async function finalizeProbe(
   assetId: string,
   versionId: string,
@@ -295,10 +447,17 @@ function hostAllowed(host: string): boolean {
   if (isBlockedFetchHost(h)) return false;
   if (URL_HOST_ALLOW.includes(h)) return true;
   if (h.endsWith(".twitch.tv") || h.endsWith(".jtvnw.net")) return true;
-  if (h.endsWith(".tiktokcdn.com") || h.endsWith(".tiktok.com") || h.endsWith(".muscdn.com")) return true;
+  if (h.endsWith(".tiktokcdn.com") || h.endsWith(".tiktok.com") || h.endsWith(".muscdn.com"))
+    return true;
   if (h.endsWith(".cdninstagram.com") || h.endsWith(".fbcdn.net")) return true;
   if (h.endsWith(".googleusercontent.com") || h.endsWith(".ggpht.com")) return true;
-  if (h === "cdn-crayo.com" || h.endsWith(".cdn-crayo.com") || h === "crayo.ai" || h.endsWith(".crayo.ai")) return true;
+  if (
+    h === "cdn-crayo.com" ||
+    h.endsWith(".cdn-crayo.com") ||
+    h === "crayo.ai" ||
+    h.endsWith(".crayo.ai")
+  )
+    return true;
   return false;
 }
 
@@ -358,7 +517,8 @@ export async function ingestFromUrl(input: {
     } catch {
       throw new Error("UNTRUSTED_URL");
     }
-    if (parsed.protocol !== "https:" || parsed.username || parsed.password) throw new Error("UNTRUSTED_URL");
+    if (parsed.protocol !== "https:" || parsed.username || parsed.password)
+      throw new Error("UNTRUSTED_URL");
     if (!hostAllowed(parsed.hostname.replace(/^\[|\]$/g, ""))) throw new Error("UNTRUSTED_URL");
     const len = Number(response.headers.get("content-length") ?? 0);
     if (len > max) throw new Error("MEDIA_TOO_LARGE");
@@ -382,7 +542,8 @@ export async function ingestFromUrl(input: {
       reader.releaseLock();
     }
     const buf = Buffer.concat(chunks, written);
-    const mime = response.headers.get("content-type")?.split(";")[0]?.trim() || "application/octet-stream";
+    const mime =
+      response.headers.get("content-type")?.split(";")[0]?.trim() || "application/octet-stream";
     const name = parsed.pathname.split("/").pop() || "import";
     return ingestBytes({
       actorId: input.actorId,
@@ -396,7 +557,10 @@ export async function ingestFromUrl(input: {
       tags: input.tags,
     });
   } catch (error) {
-    if (error instanceof Error && (error.message === "MEDIA_TOO_LARGE" || error.message === "UNTRUSTED_URL")) {
+    if (
+      error instanceof Error &&
+      (error.message === "MEDIA_TOO_LARGE" || error.message === "UNTRUSTED_URL")
+    ) {
       throw error;
     }
     throw new Error("UNTRUSTED_URL");
@@ -530,7 +694,10 @@ export async function ingestThumbnailMessage(input: {
 }
 
 function parseSrt(raw: string): CaptionCue[] {
-  const blocks = raw.replace(/^\uFEFF/, "").replace(/\r/g, "").split(/\n\n+/);
+  const blocks = raw
+    .replace(/^\uFEFF/, "")
+    .replace(/\r/g, "")
+    .split(/\n\n+/);
   const cues: CaptionCue[] = [];
   for (const block of blocks) {
     const lines = block.split("\n").filter(Boolean);
@@ -540,7 +707,10 @@ function parseSrt(raw: string): CaptionCue[] {
     const match = /(\d+):(\d+):(\d+)[,.](\d+)\s*-->\s*(\d+):(\d+):(\d+)[,.](\d+)/.exec(timeLine);
     if (!match) continue;
     const toMs = (h: string, m: string, s: string, f: string) =>
-      Number(h) * 3_600_000 + Number(m) * 60_000 + Number(s) * 1000 + Number(f.padEnd(3, "0").slice(0, 3));
+      Number(h) * 3_600_000 +
+      Number(m) * 60_000 +
+      Number(s) * 1000 +
+      Number(f.padEnd(3, "0").slice(0, 3));
     const text = lines
       .slice(lines.indexOf(timeLine) + 1)
       .join(" ")
@@ -564,7 +734,11 @@ function wordsToCues(words: Array<{ text: string; start: number; end: number }>)
     cues.push({
       startMs: Math.round(bucket[0].start * 1000),
       endMs: Math.round(bucket[bucket.length - 1].end * 1000),
-      text: bucket.map((w) => w.text).join(" ").replace(/\s+/g, " ").trim(),
+      text: bucket
+        .map((w) => w.text)
+        .join(" ")
+        .replace(/\s+/g, " ")
+        .trim(),
     });
     bucket = [];
   };
@@ -603,7 +777,11 @@ export async function generateCaptions(input: {
     status: "TRANSCRIBING",
     engine: "XAI_OR_PROVIDER",
   });
-  void runTranscription({ trackId: track.id, storageKey: version.storageKey, language: input.language ?? "en" });
+  void runTranscription({
+    trackId: track.id,
+    storageKey: version.storageKey,
+    language: input.language ?? "en",
+  });
   await audit(input.actorId, "library.generate_captions", track.id);
   return track;
 }
@@ -720,14 +898,20 @@ export async function saveCues(input: {
   return updated;
 }
 
-export async function captionExport(trackId: string, format: "SRT" | "VTT"): Promise<{ filename: string; body: string }> {
+export async function captionExport(
+  trackId: string,
+  format: "SRT" | "VTT",
+): Promise<{ filename: string; body: string }> {
   const track = await getCaption(trackId);
   if (!track || track.status !== "READY") throw new Error("CAPTION_NOT_READY");
   const body = format === "VTT" ? cuesToVtt(track.cues) : cuesToSrt(track.cues);
   return { filename: `captions.${format.toLowerCase()}`, body };
 }
 
-function presetSize(preset: RenderPreset, options: RenderOptions): { width: number; height: number } {
+function presetSize(
+  preset: RenderPreset,
+  options: RenderOptions,
+): { width: number; height: number } {
   if (preset === "CUSTOM") {
     return {
       width: options.customWidth || options.maxWidth || 1080,
@@ -785,7 +969,8 @@ export async function queueRender(input: {
 export async function cancelRender(input: { actorId: string; jobId: string }): Promise<RenderJob> {
   const job = await getRender(input.jobId);
   if (!job) throw new Error("JOB_MISSING");
-  if (job.status === "SUCCEEDED" || job.status === "FAILED" || job.status === "CANCELED") return job;
+  if (job.status === "SUCCEEDED" || job.status === "FAILED" || job.status === "CANCELED")
+    return job;
   cancelFlags.add(job.id);
   await patchRender(job.id, {
     status: "CANCELED",
@@ -864,7 +1049,8 @@ async function runRenderJob(jobId: string): Promise<void> {
     let srtPath: string | null = null;
     if (job.options.burnInCaptions && job.captionTrackId) {
       const track = await getCaption(job.captionTrackId);
-      if (!track || track.status !== "READY" || track.cues.length === 0) throw new Error("CAPTION_NOT_READY");
+      if (!track || track.status !== "READY" || track.cues.length === 0)
+        throw new Error("CAPTION_NOT_READY");
       srtPath = join(dir, "burn.srt");
       await writeFile(srtPath, cuesToSrt(track.cues), "utf8");
       const escaped = srtPath.replace(/\\/g, "/").replace(/:/g, "\\:").replace(/'/g, "\\'");
@@ -883,7 +1069,8 @@ async function runRenderJob(jobId: string): Promise<void> {
       args.push("-t", String(job.options.targetMaxDurationSec));
     }
     args.push("-vf", vf.join(","));
-    if (job.options.loudnorm && asset.kind === "VIDEO") args.push("-af", "loudnorm=I=-16:TP=-1.5:LRA=11");
+    if (job.options.loudnorm && asset.kind === "VIDEO")
+      args.push("-af", "loudnorm=I=-16:TP=-1.5:LRA=11");
     args.push(
       "-c:v",
       "libx264",
@@ -966,16 +1153,16 @@ async function runRenderJob(jobId: string): Promise<void> {
       data: { error: code },
     });
     void import("@/lib/server/safety-hooks.server")
-      .then((mod) =>
-        mod.onRenderFailed({ jobId, error: code, actorId: job.createdBy ?? null }),
-      )
+      .then((mod) => mod.onRenderFailed({ jobId, error: code, actorId: job.createdBy ?? null }))
       .catch(() => {});
   } finally {
     await rm(dir, { recursive: true, force: true });
   }
 }
 
-export async function testRender(actorId: string): Promise<{ ok: boolean; jobId?: string; message: string }> {
+export async function testRender(
+  actorId: string,
+): Promise<{ ok: boolean; jobId?: string; message: string }> {
   const settings = await readMediaSettings();
   if (!settings.ffmpegAvailable) {
     return { ok: false, message: "FFmpeg is not available on this worker." };
@@ -1039,7 +1226,8 @@ export async function resolvePublishAsset(input: {
   platforms?: string[];
 }): Promise<{ asset: LibraryAsset; mediaUrl: string | null; fileBytes?: Buffer; mime?: string }> {
   const asset = await getAsset(input.mediaAssetId);
-  if (!asset || (asset.clientId && asset.clientId !== input.clientId)) throw new Error("ASSET_MISSING");
+  if (!asset || (asset.clientId && asset.clientId !== input.clientId))
+    throw new Error("ASSET_MISSING");
   if (asset.status !== "READY") throw new Error("ASSET_NOT_READY");
   let chosen = asset;
   const wantsVertical = (input.platforms ?? []).some((p) => p === "tiktok" || p === "instagram");
@@ -1072,7 +1260,11 @@ export async function resolvePublishAsset(input: {
   };
 }
 
-export async function archiveAsset(input: { actorId: string; assetId: string; role: "admin" | "member" }) {
+export async function archiveAsset(input: {
+  actorId: string;
+  assetId: string;
+  role: "admin" | "member";
+}) {
   if (input.role !== "admin") throw new Error("Forbidden");
   const asset = await getAsset(input.assetId);
   if (!asset) throw new Error("ASSET_MISSING");
@@ -1081,6 +1273,13 @@ export async function archiveAsset(input: { actorId: string; assetId: string; ro
     const version = await getVersionRow(asset.currentVersionId);
     if (version) await deleteLibraryBytes(version.storageKey);
   }
+  if (asset.thumbnailVersionId) {
+    // Otherwise the thumbnail version row and its stored JPG survive forever, and
+    // withPreview keeps signing a working thumbnailUrl for an asset whose video is gone.
+    const thumbnailVersion = await getVersionRow(asset.thumbnailVersionId);
+    if (thumbnailVersion) await deleteLibraryBytes(thumbnailVersion.storageKey);
+    await patchAsset(asset.id, { thumbnail_version_id: null });
+  }
   await audit(input.actorId, "library.archive", asset.id);
   void import("@/lib/server/safety-hooks.server")
     .then((mod) =>
diff --git a/src/lib/server/library-storage.server.test.ts b/src/lib/server/library-storage.server.test.ts
index 9c363b3..baabf01 100644
--- a/src/lib/server/library-storage.server.test.ts
+++ b/src/lib/server/library-storage.server.test.ts
@@ -25,9 +25,13 @@ try {
 }
 
 if (!mod) {
-  test("library-storage.server.ts (skipped: unloadable under node --test)", {
-    skip: `Cannot load this module outside Vite: ${loadError?.message.split("\n")[0]}`,
-  }, () => {});
+  test(
+    "library-storage.server.ts (skipped: unloadable under node --test)",
+    {
+      skip: `Cannot load this module outside Vite: ${loadError?.message.split("\n")[0]}`,
+    },
+    () => {},
+  );
 } else {
   const { writeLibraryFile, backendFromStorageKey, storagePath } = mod;
 
diff --git a/src/lib/server/library.server.ts b/src/lib/server/library.server.ts
index cfc7e24..697bce3 100644
--- a/src/lib/server/library.server.ts
+++ b/src/lib/server/library.server.ts
@@ -1,5 +1,5 @@
 import { getAgencyAdmin, localSql } from "@/lib/server/agency-db.server";
-import { isMissingColumn, isMissingTable } from "@/lib/server/mappers";
+import { isMissingColumn, isMissingTable, isUniqueViolation } from "@/lib/server/mappers";
 import { readAppSetting, writeAppSetting } from "@/lib/server/app-settings.server";
 import { signVersionUrl } from "@/lib/server/library-storage.server";
 import {
@@ -74,6 +74,7 @@ create index if not exists media_assets_client_idx on media_assets (client_id, c
 alter table media_assets add column if not exists external_ref text;
 alter table media_assets add column if not exists thumbnail_version_id text;
 create index if not exists media_assets_external_ref_idx on media_assets (external_ref);
+create unique index if not exists media_assets_external_ref_unique on media_assets (external_ref) where external_ref is not null;
 create table if not exists media_asset_versions (
   id              text primary key,
   asset_id        text not null,
@@ -145,6 +146,9 @@ export async function ensureLibrarySchema(): Promise<void> {
     }
     await sql.query("alter table media_assets add column if not exists external_ref text");
     await sql.query("alter table media_assets add column if not exists thumbnail_version_id text");
+    await sql.query(
+      "create unique index if not exists media_assets_external_ref_unique on media_assets (external_ref) where external_ref is not null",
+    );
   })().catch((error) => {
     schemaReady = null;
     throw error;
@@ -430,44 +434,63 @@ export async function insertAsset(row: {
   const admin = await getAgencyAdmin();
   if (admin) {
     const { error } = await admin.from("media_assets").insert(payload);
-    if (error && !isMissingTable(error) && !isMissingColumn(error))
-      throw new Error("DATA_UNAVAILABLE");
+    if (error) {
+      // A concurrent insert for the same external_ref (e.g. two racing Crayo exports
+      // for the same project id) can lose this narrow race even after the caller's
+      // own findAssetByExternalRef check passed — the unique partial index on
+      // external_ref is the actual guard. Treat that specific conflict as "already
+      // exists" instead of a hard failure.
+      if (payload.external_ref && isUniqueViolation(error)) {
+        const existing = await findAssetByExternalRef(payload.external_ref);
+        if (existing) return existing;
+      }
+      if (!isMissingTable(error) && !isMissingColumn(error)) throw new Error("DATA_UNAVAILABLE");
+    }
   }
   const sql = await localSql();
-  await sql.query(
-    `insert into media_assets (
-      id, workspace_id, client_id, kind, title, description, source, source_ref, status,
-      duration_sec, width, height, aspect_ratio, mime_type, byte_size, checksum,
-      current_version_id, parent_asset_id, tags, created_at, updated_at, created_by,
-      external_ref, thumbnail_version_id
-    ) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24)`,
-    [
-      payload.id,
-      payload.workspace_id,
-      payload.client_id,
-      payload.kind,
-      payload.title,
-      payload.description,
-      payload.source,
-      payload.source_ref,
-      payload.status,
-      payload.duration_sec,
-      payload.width,
-      payload.height,
-      payload.aspect_ratio,
-      payload.mime_type,
-      payload.byte_size,
-      payload.checksum,
-      payload.current_version_id,
-      payload.parent_asset_id,
-      payload.tags,
-      payload.created_at,
-      payload.updated_at,
-      payload.created_by,
-      payload.external_ref,
-      payload.thumbnail_version_id,
-    ],
-  );
+  try {
+    await sql.query(
+      `insert into media_assets (
+        id, workspace_id, client_id, kind, title, description, source, source_ref, status,
+        duration_sec, width, height, aspect_ratio, mime_type, byte_size, checksum,
+        current_version_id, parent_asset_id, tags, created_at, updated_at, created_by,
+        external_ref, thumbnail_version_id
+      ) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24)`,
+      [
+        payload.id,
+        payload.workspace_id,
+        payload.client_id,
+        payload.kind,
+        payload.title,
+        payload.description,
+        payload.source,
+        payload.source_ref,
+        payload.status,
+        payload.duration_sec,
+        payload.width,
+        payload.height,
+        payload.aspect_ratio,
+        payload.mime_type,
+        payload.byte_size,
+        payload.checksum,
+        payload.current_version_id,
+        payload.parent_asset_id,
+        payload.tags,
+        payload.created_at,
+        payload.updated_at,
+        payload.created_by,
+        payload.external_ref,
+        payload.thumbnail_version_id,
+      ],
+    );
+  } catch (error) {
+    const pgError = error as { code?: string; message?: string };
+    if (payload.external_ref && isUniqueViolation(pgError)) {
+      const existing = await findAssetByExternalRef(payload.external_ref);
+      if (existing) return existing;
+    }
+    throw error;
+  }
   return mapAsset(payload);
 }
 
diff --git a/src/lib/server/mappers.test.ts b/src/lib/server/mappers.test.ts
index 95cb0d8..617a322 100644
--- a/src/lib/server/mappers.test.ts
+++ b/src/lib/server/mappers.test.ts
@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { isMissingColumn, isMissingTable } from "./mappers.ts";
+import { isMissingColumn, isMissingTable, isUniqueViolation } from "./mappers.ts";
 
 test("PGRST205 schema-cache miss is a missing table, not a missing column", () => {
   const error = {
@@ -34,3 +34,17 @@ test("null and empty errors are neither missing table nor missing column", () =>
   assert.equal(isMissingTable(empty), false);
   assert.equal(isMissingColumn(empty), false);
 });
+
+test("Postgres 23505 is a unique violation, by code or by message", () => {
+  const byCode = { code: "23505", message: "duplicate key value violates unique constraint" };
+  assert.equal(isUniqueViolation(byCode), true);
+
+  const byMessage = {
+    message: 'duplicate key value violates unique constraint "media_assets_external_ref_unique"',
+  };
+  assert.equal(isUniqueViolation(byMessage), true);
+
+  assert.equal(isUniqueViolation(null), false);
+  assert.equal(isUniqueViolation({}), false);
+  assert.equal(isUniqueViolation({ code: "23502", message: "not null violation" }), false);
+});
diff --git a/src/lib/server/mappers.ts b/src/lib/server/mappers.ts
index a54b359..50ccb99 100644
--- a/src/lib/server/mappers.ts
+++ b/src/lib/server/mappers.ts
@@ -153,7 +153,9 @@ function oneOfOrNull<T extends string>(value: unknown, allowed: readonly T[]): T
 
 function parseStringArray(value: unknown): string[] {
   if (Array.isArray(value)) {
-    return value.filter((item): item is string => typeof item === "string" && item.trim().length > 0);
+    return value.filter(
+      (item): item is string => typeof item === "string" && item.trim().length > 0,
+    );
   }
   if (typeof value === "string" && value.trim()) {
     try {
@@ -365,9 +367,7 @@ export function mapSocialPost(row: Record<string, unknown>): SocialPost {
         : null,
     igContainerId: asNullable(row.ig_container_id),
     uploadPercent:
-      row.upload_percent == null || row.upload_percent === ""
-        ? null
-        : Number(row.upload_percent),
+      row.upload_percent == null || row.upload_percent === "" ? null : Number(row.upload_percent),
     uploadPhase:
       row.upload_phase === "init" ||
       row.upload_phase === "uploading" ||
@@ -402,3 +402,11 @@ export function isMissingTable(error: { code?: string; message?: string } | null
     /relation .* does not exist/i.test(error.message ?? "")
   );
 }
+
+export function isUniqueViolation(error: { code?: string; message?: string } | null): boolean {
+  if (!error) return false;
+  return (
+    error.code === "23505" ||
+    /duplicate key value violates unique constraint/i.test(error.message ?? "")
+  );
+}
diff --git a/src/lib/server/media-fetch-job.server.ts b/src/lib/server/media-fetch-job.server.ts
index bf6fd6d..d8ad54a 100644
--- a/src/lib/server/media-fetch-job.server.ts
+++ b/src/lib/server/media-fetch-job.server.ts
@@ -63,18 +63,13 @@ type SegmentState = {
   uploadId?: string;
   assetId?: string;
   autoclipId?: string;
-  clips?: {
-    title: string;
-    projectId: string | null;
-    thumbnailUrl: string | null;
-    library: unknown;
-  }[];
+  clips?: import("@/lib/server/clip-export.server").ClipExportState[];
   error?: string;
 };
 
 export type MediaFetchJobState = {
   version: 1;
-  phase: "booting" | "downloading" | "uploading" | "autoclipping" | "done" | "failed";
+  phase: "booting" | "downloading" | "uploading" | "autoclipping" | "exporting" | "done" | "failed";
   url: string;
   sandboxId: string | null;
   actorId: string;
@@ -94,6 +89,7 @@ export type MediaFetchJobState = {
   error: string | null;
   /** Consecutive ticks that failed on a transient sandbox/API error; reset once a tick reads the sandbox. */
   transientErrors?: number;
+  exportBudget?: { count: number; credits: number | null } | null;
 };
 
 const LOCK_MS = 25_000;
@@ -608,25 +604,23 @@ export async function tickMediaFetchJob(
         } | null;
         const status = String(payload?.autoclip?.status ?? "").toLowerCase();
         if (status === "completed" || status === "complete" || status === "succeeded") {
-          const { ingestCrayoMedia } = await import("@/lib/server/crayo-tools.server");
-          const clips = [];
-          for (const clip of (payload?.autoclip?.clips ?? []).slice(0, 20) as Record<
-            string,
-            unknown
-          >[]) {
-            const title = String(clip.title ?? "AutoClip");
-            const thumbnailUrl = typeof clip.thumbnail_url === "string" ? clip.thumbnail_url : null;
-            const projectId = typeof clip.project_id === "string" ? clip.project_id : null;
-            const library = thumbnailUrl
-              ? await ingestCrayoMedia(state.actorId, state.clientId, thumbnailUrl, title, [
-                  "autoclip",
-                ])
-              : null;
-            clips.push({ title, projectId, thumbnailUrl, library });
-          }
-          seg.clips = clips;
+          const { readAutoclipClips } = await import("@/lib/clip-export");
+          seg.clips = readAutoclipClips(payload).map((clip) => ({
+            projectId: clip.projectId,
+            title: clip.title,
+            thumbnailUrl: clip.thumbnailUrl,
+            exportId: null,
+            status: "pending" as const,
+            assetId: null,
+            error: null,
+            bytes: null,
+          }));
           seg.state = "done";
-          await progress(runId, state, `Segment ${seg.index + 1}: ${clips.length} clip(s) ready.`);
+          await progress(
+            runId,
+            state,
+            `Segment ${seg.index + 1}: ${seg.clips.length} clip(s) ready in Crayo. Exporting next.`,
+          );
         } else if (status === "failed" || status === "error") {
           return await fail(
             "FAILED",
@@ -635,10 +629,83 @@ export async function tickMediaFetchJob(
         }
       }
       if (state.segments.every((seg) => seg.state === "done")) {
+        const { planExportBudget } = await import("@/lib/clip-export");
+        const { readExportCredits, defaultClipExportDeps } =
+          await import("@/lib/server/clip-export.server");
+        const allClips = state.segments.flatMap((seg) => seg.clips ?? []);
+        const credits = await readExportCredits(defaultClipExportDeps().crayo);
+        const budget = planExportBudget({ exportCredits: credits, clipCount: allClips.length });
+        if (!budget.ok) return await fail("EXPORT_BUDGET", budget.reason);
+        // Trim to the budget: clips beyond the ceiling stay in Crayo untouched.
+        let remaining = budget.count;
+        for (const seg of state.segments) {
+          seg.clips = (seg.clips ?? []).map((clip) =>
+            remaining-- > 0
+              ? clip
+              : {
+                  ...clip,
+                  status: "failed" as const,
+                  error: "Over the per-run export ceiling; still available in Crayo.",
+                },
+          );
+        }
+        state.exportBudget = { count: budget.count, credits };
+        state.phase = "exporting";
+        await progress(
+          runId,
+          state,
+          `Exporting ${budget.count} clip(s) to the Library${credits != null ? ` (${credits} export credits available)` : ""}.`,
+        );
+      }
+      await saveState(runId, run.outputs, { ...state, lockUntil: null });
+      return "advanced";
+    }
+
+    // ---- Export phase: push each Crayo clip project into the Library ----
+    if (state.phase === "exporting") {
+      const { EXPORT_CONCURRENCY } = await import("@/lib/clip-export");
+      const { exportClipStep, defaultClipExportDeps } =
+        await import("@/lib/server/clip-export.server");
+      const deps = defaultClipExportDeps();
+      const ctx = {
+        actorId: state.actorId,
+        clientId: state.clientId,
+        sourceUrl: state.url,
+        tags: ["autoclip"],
+      };
+      const active = state.segments
+        .flatMap((seg) => seg.clips ?? [])
+        .filter((c) => c.status === "pending" || c.status === "exporting");
+      const batch = active.slice(0, EXPORT_CONCURRENCY);
+      for (const clip of batch) {
+        const before = clip.status;
+        const next = await exportClipStep(clip, ctx, deps);
+        Object.assign(clip, next);
+        const all = state.segments.flatMap((seg) => seg.clips ?? []);
+        const idx = all.indexOf(clip) + 1;
+        if (next.status === "stored" && before !== "stored") {
+          await progress(
+            runId,
+            state,
+            `Stored clip ${idx} of ${all.length} (${Math.round((next.bytes ?? 0) / 1048576)} MB): ${next.title}`,
+          );
+        } else if (next.status === "failed" && before !== "failed") {
+          await progress(
+            runId,
+            state,
+            `Clip ${idx} of ${all.length} failed: ${next.error ?? "unknown error"}`,
+          );
+        } else if (next.status === "exporting" && before === "pending") {
+          await progress(runId, state, `Exporting clip ${idx} of ${all.length}: ${next.title}`);
+        }
+      }
+      const all = state.segments.flatMap((seg) => seg.clips ?? []);
+      if (all.every((c) => c.status === "stored" || c.status === "failed")) {
         state.phase = "done";
         state.lockUntil = null;
-        const clips = state.segments.flatMap((seg) => seg.clips ?? []);
-        const summary = `AutoClip finished: ${clips.length} clip(s) across ${state.segments.length} segment(s) of “${state.probe?.title ?? "video"}”. ${clips
+        const stored = all.filter((c) => c.status === "stored");
+        const failed = all.filter((c) => c.status === "failed");
+        const summary = `AutoClip finished: ${stored.length} clip(s) in the Library${failed.length ? `, ${failed.length} failed` : ""} from “${state.probe?.title ?? "video"}”. ${stored
           .map((c) => c.title)
           .slice(0, 8)
           .join(" · ")}`;
@@ -658,11 +725,12 @@ export async function tickMediaFetchJob(
           outputs: {
             ...(run.outputs ?? {}),
             mediaFetch: state as unknown as JsonValue,
-            autoclips: state.segments.map((seg) => ({
-              segment: seg.index,
-              assetId: seg.assetId ?? null,
-              autoclipId: seg.autoclipId ?? null,
-              clips: seg.clips ?? [],
+            libraryClips: all.map((c) => ({
+              title: c.title,
+              projectId: c.projectId,
+              assetId: c.assetId,
+              status: c.status,
+              error: c.error,
             })) as unknown as JsonValue,
           },
         });
@@ -687,11 +755,18 @@ export async function tickMediaFetchJob(
       state.lockUntil = null;
       console.error("[media-fetch-job] transient", runId, attempts, scrub(detail));
       if (attempts >= MAX_TRANSIENT_ERRORS) {
-        return await fail("MEDIA_FETCH_FAILED", `Gave up after ${attempts} consecutive transient errors. Last: ${detail}`);
+        return await fail(
+          "MEDIA_FETCH_FAILED",
+          `Gave up after ${attempts} consecutive transient errors. Last: ${detail}`,
+        );
       }
       // Surface the retry on the run (1st, 2nd, 4th, 8th… attempt) so it never looks frozen.
       if ((attempts & (attempts - 1)) === 0) {
-        await progress(runId, state, `Retrying (attempt ${attempts}) after a transient error: ${scrub(detail)}`);
+        await progress(
+          runId,
+          state,
+          `Retrying (attempt ${attempts}) after a transient error: ${scrub(detail)}`,
+        );
       }
       await saveState(runId, run.outputs, state).catch(() => {});
       return "idle";
diff --git a/src/routes/api/library.file.ts b/src/routes/api/library.file.ts
index e484684..56a91ff 100644
--- a/src/routes/api/library.file.ts
+++ b/src/routes/api/library.file.ts
@@ -20,14 +20,31 @@ export const Route = createFileRoute("/api/library/file")({
           return new Response("Not found", { status: 404 });
         }
         const mime = version.mimeType || "application/octet-stream";
-        const unsafe = /svg|xml|html|javascript/i.test(mime) || !/^(video|image|audio)\//i.test(mime);
+        const unsafe =
+          /svg|xml|html|javascript/i.test(mime) || !/^(video|image|audio)\//i.test(mime);
+        const wantsDownload = url.searchParams.get("download") === "1";
+        let disposition = unsafe ? "attachment" : "inline";
+        if (wantsDownload && !unsafe) {
+          const { getAsset } = await import("@/lib/server/library.server");
+          const asset = await getAsset(version.assetId);
+          const ext =
+            (version.mimeType?.split("/")[1] ?? "bin").replace(/[^a-z0-9]/gi, "").slice(0, 5) ||
+            "bin";
+          const base =
+            (asset?.title ?? "clip")
+              .replace(/[^\w\- ]+/g, "")
+              .trim()
+              .replace(/\s+/g, "-")
+              .slice(0, 80) || "clip";
+          disposition = `attachment; filename="${base}.${ext}"`;
+        }
         return new Response(new Uint8Array(bytes), {
           status: 200,
           headers: {
             "content-type": unsafe ? "application/octet-stream" : mime,
             "x-content-type-options": "nosniff",
             "cache-control": "private, max-age=60",
-            "content-disposition": unsafe ? "attachment" : "inline",
+            "content-disposition": disposition,
           },
         });
       },