@mevdragon/vidfarm-devcli 0.17.0 → 0.18.1

package/dist/src/app.js

@@ -30,11 +30,13 @@ import { renderReskinLibrary } from "./reskin/library-page.js";
 import { renderReskinDiscover } from "./reskin/discover-page.js";
 import { renderReskinChat } from "./reskin/chat-page.js";
 import { renderReskinCalendar } from "./reskin/calendar-page.js";
-import { renderReskinJobRuns } from "./reskin/job-runs-page.js";
+import { renderReskinInpaint } from "./reskin/inpaint-page.js";
 import { renderReskinAgency } from "./reskin/agency-page.js";
 import { renderReskinPricing } from "./reskin/pricing-page.js";
 import { renderReskinLogin } from "./reskin/login-page.js";
 import { renderReskinHelp } from "./reskin/help-page.js";
+import { renderChatDock, RESKIN_CHROME_SCRIPT } from "./reskin/document.js";
+import { RESKIN_CSS, RESKIN_FONT_LINKS } from "./reskin/theme.js";
 import { POPULAR_INSPIRATION_GROUPS } from "./frontend/homepage-shared.js";
 import { COMPOSITION_RUNTIME_SCRIPT_BODY } from "./composition-runtime.js";
 import { CAPTION_ANIM_CSS, CAPTION_STYLE_MARKER, KEN_BURNS_CSS, KEN_BURNS_STYLE_MARKER, TRANSITION_CSS, TRANSITION_STYLE_MARKER, upgradeLegacyTransitionCss } from "./hyperframes/composition.js";
@@ -68,7 +70,8 @@ import { loadSpeechAudioLocally, MAX_LOCAL_TRANSCRIBE_AUDIO_BYTES } from "./devc
 import { DescribeExecutionCommand, SFNClient, StartExecutionCommand } from "@aws-sdk/client-sfn";
 import { clipRecords, makeUserPreset } from "./services/clip-records.js";
 import { matchScenesToClips, searchUserClips, vectorIndex } from "./services/clip-search.js";
-import { BUILTIN_PRESETS, buildClipEmbeddingText, buildEffectiveGuidance, ClipModelClient, cosineSimilarity, detectLocalAgent, effectiveHuntDurationSec, estimateScanCostFromDuration, hasFfmpeg, LocalAgentClipClient, normalizeCropFocus, normalizeHuntSpec, parseClipHuntPrompt, probeVideo, resolveDurationBand, scanVideo } from "./services/clip-curation/index.js";
+import { ATTACHMENTS_FOLDER_SCOPE, buildDirectoryPath, DIRECTORY_ROOTS, DIRECTORY_ROOT_KEYS, folderItem, immediateChildFolders, normalizeFolderPath, parseDirectoryPath } from "./services/file-directory.js";
+import { applyHuntSpecDefaults, BUILTIN_PRESETS, buildClipEmbeddingText, buildEffectiveGuidance, ClipModelClient, cosineSimilarity, detectLocalAgent, effectiveHuntDurationSec, ACTIVE_TAXONOMY_VERSION, estimateScanCostFromDuration, extractThumbnail, hasFfmpeg, LocalAgentClipClient, normalizeCropFocus, normalizeHuntSpec, parseClipHuntPrompt, pickBestVideoMedia, probeVideo, resolveDurationBand, resolveTargetClipCount, scanVideo } from "./services/clip-curation/index.js";
 import { analyzeCastMembers, annotateScenesFromSource, buildSmartDecomposedHtml, HyperframesService, smartDecomposeVideo, stampCompositionIdentity } from "./services/hyperframes.js";
 import { buildPendingSceneAnnotationsState } from "./services/scene-annotations.js";
 import { createPrimitiveJobContext } from "./primitive-context.js";
@@ -101,7 +104,10 @@ const COMPOSITIONS_PREFIX = `${API_PREFIX}/compositions`;
 const INSPIRATIONS_PREFIX = `${API_PREFIX}/inspirations`;
 const VIDEOS_PREFIX = `${API_PREFIX}/videos`;
 const PRIMITIVES_PREFIX = `${API_PREFIX}/primitives`;
-const CLIPS_PREFIX = "/clips";
+const RAWS_PREFIX = "/raws";
+// Back-compat: the clip library was renamed "raws". Old /clips callers are
+// transparently redispatched to /raws (see the alias registered below).
+const CLIPS_COMPAT_PREFIX = "/clips";
 // Temp folder ("My Files → temporary") hard-TTL. Keep in sync with the
 // tag-scoped S3 lifecycle rule (30 days) in the CDK stacks and the clip-scan
 // Lambda's TEMP_SOURCE_TTL_DAYS — records, sweeps, and object lifecycle must
@@ -843,7 +849,7 @@ function consumeLoginReturnPath(c) {
 function resolvePostLoginRedirect(c, customer) {
     const returnPath = consumeLoginReturnPath(c) ?? sanitizeLoginReturnPath(c.req.query("return_to"));
     if (!returnPath) {
-        return withAccountQuery("/settings", customer.id);
+        return withAccountQuery("/settings/profile", customer.id);
     }
     const parsed = new URL(returnPath, "https://vidfarm.local");
     if (parsed.pathname === "/settings" || parsed.pathname.startsWith("/settings/")) {
@@ -858,6 +864,10 @@ function setSettingsFlash(c, input) {
 function clearSettingsFlash(c) {
     appendCookie(c, `${SETTINGS_FLASH_COOKIE}=; Path=/; HttpOnly; SameSite=Lax; Max-Age=0${cookieSecureAttribute()}`);
 }
+const SETTINGS_TABS = ["profile", "wallet", "channels", "developer"];
+function isSettingsTab(value) {
+    return value === "profile" || value === "wallet" || value === "channels" || value === "developer";
+}
 function consumeSettingsFlash(c) {
     const cookies = parseCookieHeader(c.req.header("cookie"));
     const raw = cookies.get(SETTINGS_FLASH_COOKIE);
@@ -1045,19 +1055,15 @@ function parseTracerList(searchParams) {
     return output.slice(0, 24);
 }
 function redirectToSettings(c, input) {
-    if (input?.notice || input?.error || input?.tab) {
-        setSettingsFlash(c, input);
+    // Notice/error still travel in a short-lived flash cookie; the tab now travels
+    // in the path (/settings/<tab>) so the URL matches the panel that's shown.
+    if (input?.notice || input?.error) {
+        setSettingsFlash(c, { notice: input.notice, error: input.error, tab: input.tab });
     }
-    const params = new URLSearchParams();
     const accountId = input?.accountId ?? getRequestedAccountId(c);
-    if (input?.tab) {
-        params.set("tab", input.tab);
-    }
-    if (input?.refreshChannels) {
-        params.set("refresh", "channels");
-    }
-    const suffix = params.size ? `?${params.toString()}` : "";
-    return redirect(c, `${accountId ? withAccountQuery("/settings", accountId) : "/settings"}${suffix}`, 303);
+    const tab = isSettingsTab(input?.tab) ? input.tab : "profile";
+    const suffix = input?.refreshChannels ? "?refresh=channels" : "";
+    return redirect(c, `${withAccountQuery(`/settings/${tab}`, accountId)}${suffix}`, 303);
 }
 async function validateFlockPosterApiKey(apiKey) {
     await fetchFlockPosterIntegrations(apiKey);
@@ -2889,6 +2895,16 @@ function sanitizeStorageSubpath(value) {
         .filter((segment) => segment && segment !== "." && segment !== "..")
         .join("/");
 }
+// Temp files auto-organize by date: an upload with no explicit folder lands in
+// today's YYYY-MM-DD subfolder (canonical `/temp/2026-07-08/…`), so the scratch
+// space stays browsable instead of a flat dump. Applied at the write points
+// (presign + direct upload); finalize trusts the folder the presign echoed back.
+function todayDateFolder() {
+    return new Date().toISOString().slice(0, 10);
+}
+function withTempDateFolder(folderPath) {
+    return folderPath || todayDateFolder();
+}
 function inferAttachmentContentType(fileName) {
     switch (path.extname(fileName).toLowerCase()) {
         case ".png":
@@ -2966,6 +2982,107 @@ function serializeUserTemporaryFile(c, file) {
 function buildFolderList(items) {
     return Array.from(new Set(items.map((item) => item.folderPath ?? "").filter(Boolean))).sort();
 }
+// ── Unified file directory: convert each backend's record into the one
+// canonical DirectoryItem shape so /files, /temp, /raws browse uniformly. ─────
+function attachmentToDirectoryItem(c, a) {
+    const s = serializeUserAttachment(c, a);
+    const folderPath = normalizeFolderPath(a.folderPath);
+    return {
+        path: buildDirectoryPath("files", folderPath, a.fileName),
+        root: "files",
+        folderPath,
+        name: a.fileName,
+        kind: "file",
+        id: a.id,
+        contentType: a.contentType,
+        viewUrl: s.viewUrl,
+        sizeBytes: a.sizeBytes,
+        meta: { notes: s.notes, hasNotesEmbedding: s.hasNotesEmbedding, createdAt: a.createdAt }
+    };
+}
+function temporaryFileToDirectoryItem(c, f) {
+    const s = serializeUserTemporaryFile(c, f);
+    const folderPath = normalizeFolderPath(f.folderPath);
+    return {
+        path: buildDirectoryPath("temp", folderPath, f.fileName),
+        root: "temp",
+        folderPath,
+        name: f.fileName,
+        kind: "file",
+        id: f.id,
+        contentType: f.contentType,
+        viewUrl: s.viewUrl,
+        sizeBytes: f.sizeBytes,
+        meta: { expiresAt: f.expiresAt, createdAt: f.createdAt, s3Url: s.s3Url }
+    };
+}
+// Takes the OUTPUT of serializeClip (view/thumbnail URLs already resolved).
+function clipSerializedToDirectoryItem(s) {
+    const folderPath = normalizeFolderPath(s.folder_path);
+    const name = s.source_filename || s.description || "clip";
+    const duration = s.duration_sec;
+    return {
+        path: buildDirectoryPath("raws", folderPath, name),
+        root: "raws",
+        folderPath,
+        name,
+        kind: "file",
+        id: s.clip_id,
+        contentType: "video/mp4",
+        viewUrl: s.view_url || undefined,
+        thumbUrl: s.thumbnail_url || undefined,
+        durationSec: typeof duration === "number" ? duration : undefined,
+        meta: { description: s.description, tags: s.tags, created_at: s.created_at, source_video_id: s.source_video_id }
+    };
+}
+/**
+ * List one folder of one directory root, returning immediate child folders + the
+ * files directly in this folder as canonical DirectoryItems. The single place
+ * that dispatches a canonical path to its backend (attachments / temp / raws).
+ */
+async function listDirectoryFolder(c, customerId, root, folderPath) {
+    const cur = normalizeFolderPath(folderPath);
+    if (root === "files") {
+        const atts = await serverlessRecords.listUserAttachments(customerId);
+        const explicit = await serverlessRecords.listUserFileFolders(customerId, ATTACHMENTS_FOLDER_SCOPE);
+        const childNames = immediateChildFolders([...explicit, ...atts.map((a) => a.folderPath)], cur);
+        const files = atts
+            .filter((a) => normalizeFolderPath(a.folderPath) === cur)
+            .map((a) => attachmentToDirectoryItem(c, a));
+        return { folders: childNames.map((n) => folderItem("files", cur, n)), files };
+    }
+    if (root === "temp") {
+        const list = await serverlessRecords.listUserTemporaryFiles(customerId);
+        const explicit = await serverlessRecords.listUserFileFolders(customerId, "temporary");
+        const childNames = immediateChildFolders([...explicit, ...list.map((f) => f.folderPath)], cur);
+        const files = list
+            .filter((f) => normalizeFolderPath(f.folderPath) === cur)
+            .map((f) => temporaryFileToDirectoryItem(c, f));
+        return { folders: childNames.map((n) => folderItem("temp", cur, n)), files };
+    }
+    // raws
+    const clips = await clipRecords.listClips(customerId, { limit: 5000 });
+    const explicitRawFolders = await serverlessRecords.listUserFileFolders(customerId, "raws");
+    const childNames = immediateChildFolders([...explicitRawFolders, ...clips.map((clip) => clip.folder_path)], cur);
+    const here = clips.filter((clip) => normalizeFolderPath(clip.folder_path) === cur);
+    const files = (await Promise.all(here.map(serializeClip))).map(clipSerializedToDirectoryItem);
+    return { folders: childNames.map((n) => folderItem("raws", cur, n)), files };
+}
+// The user_file_folder scope backing each directory root's empty folders.
+function directoryFolderScope(root) {
+    return root === "files" ? ATTACHMENTS_FOLDER_SCOPE : root === "temp" ? "temporary" : "raws";
+}
+// The three roots presented as folders at the virtual root ("/").
+function directoryRootFolders() {
+    return DIRECTORY_ROOTS.map((r) => ({
+        path: `/${r.key}`,
+        root: r.key,
+        folderPath: "",
+        name: r.label,
+        kind: "folder",
+        meta: { description: r.description }
+    }));
+}
 function isFormFile(value) {
     return Boolean(value
         && typeof value === "object"
@@ -3142,6 +3259,7 @@ function buildPrimitiveEditorDocsRoutes() {
         { method: "POST", path: `${PRIMITIVES_PREFIX}/images/edit`, summary: "Primitive whole-image edit job. Body must be { tracer, payload: { source_image_url, instruction, reference_attachments?, aspect_ratio?, image_size?, output_format? }, webhook_url? }." },
         { method: "POST", path: `${PRIMITIVES_PREFIX}/images/inpaint`, summary: "Primitive masked image edit job. Body must be { tracer, payload: { source_image_url, mask_url, instruction, reference_attachments?, aspect_ratio?, image_size?, output_format? }, webhook_url? }." },
         { method: "POST", path: `${PRIMITIVES_PREFIX}/images/render-html`, summary: "Primitive HTML still-image render job. Body must be { tracer, payload: { html, css?, width?, height?, background_color?, output_format? }, webhook_url? }." },
+        { method: "POST", path: `${PRIMITIVES_PREFIX}/images/remove-background`, summary: "Primitive background-removal job. Returns a transparent-background PNG cut-out of the subject (subject isolation for overlays, product cut-outs, sprite cards, caption matting). Body must be { tracer, payload: { source_image_url }, webhook_url? }. BILLS THE WALLET (RapidAPI) — unlike the BYOK images/generate and images/edit routes." },
         { method: "POST", path: `${PRIMITIVES_PREFIX}/videos/download`, summary: "Primitive social/media video download job. Body must be { tracer, payload: { source_url|video_url|url, quality? }, webhook_url? }. Use this to turn supported page/post URLs into a durable Vidfarm-hosted MP4 before later template work." },
         { method: "POST", path: `${PRIMITIVES_PREFIX}/videos/generate`, summary: "Primitive AI video generation job using saved OpenAI, Gemini, or OpenRouter provider keys. Body must be { tracer, payload: { prompt, provider?, model?, input_references?, frame_images?, aspect_ratio?, duration?, resolution?, generate_audio? }, webhook_url? }. input_references must be direct image asset URLs, not webpage or social post URLs. duration is seconds, not milliseconds; use duration: 4 for a 4-second AI video. Defaults: openai/sora-2, gemini/veo-3.0-generate-001, openrouter/bytedance/seedance-2.0. Use this for new AI-generated footage." },
         { method: "POST", path: `${PRIMITIVES_PREFIX}/videos/normalize`, summary: "Primitive video normalization job. Body must be { tracer, payload: { source_video_url, max_width?, max_height?, crf?, preset?, max_video_bitrate_kbps?, audio_bitrate_kbps? }, webhook_url? }." },
@@ -3259,11 +3377,11 @@ async function buildClipsEditorChatBoot(input) {
     const directorSkill = readRootSkillFile("SKILL.director.md", "SKILL.user.md") || null;
     const availableProviders = (await normalizeEditorChatProviderRows(input.customer.id)).map((entry) => entry.provider);
     const docsRoutes = [
-        { method: "GET", path: `${CLIPS_PREFIX}/feed`, summary: "List the caller's reusable clip library (optional ?q, ?source, ?limit)." },
-        { method: "POST", path: `${CLIPS_PREFIX}/search`, summary: "Hybrid structured + semantic clip search. Body is { query } (natural language) or { criteria } (structured filter)." },
-        { method: "POST", path: `${CLIPS_PREFIX}/scan`, summary: "Import a source video and mine it into clips. Body accepts source_url (a public/durable video URL), raw_s3_uri, or s3_key, plus an optional prompt describing which scenes to keep (e.g. 'people with food, no on-screen text, vertical, 5-10s')." },
-        { method: "GET", path: `${CLIPS_PREFIX}/scan/:scanId`, summary: "Poll clip-scan status for an in-progress import." },
-        { method: "GET", path: `${CLIPS_PREFIX}/presets`, summary: "List the caller's saved clip-search presets." }
+        { method: "GET", path: `${RAWS_PREFIX}/feed`, summary: "List the caller's reusable clip library (optional ?q, ?source, ?limit)." },
+        { method: "POST", path: `${RAWS_PREFIX}/search`, summary: "Hybrid structured + semantic clip search. Body is { query } (natural language) or { criteria } (structured filter)." },
+        { method: "POST", path: `${RAWS_PREFIX}/scan`, summary: "Import a source video and mine it into clips. Body accepts source_url (a public/durable video URL), raw_s3_uri, or s3_key, plus an optional prompt describing which scenes to keep (e.g. 'people with food, no on-screen text, vertical, 5-10s')." },
+        { method: "GET", path: `${RAWS_PREFIX}/scan/:scanId`, summary: "Poll clip-scan status for an in-progress import." },
+        { method: "GET", path: `${RAWS_PREFIX}/presets`, summary: "List the caller's saved clip-search presets." }
     ];
     return {
         apiUrl: resolveEditorChatApiUrl(),
@@ -3606,6 +3724,10 @@ function normalizeEditorChatPath(input) {
         PRIMITIVES_PREFIX,
         APPROVED_POSTS_PREFIX,
         `${USER_PREFIX}/me/jobs`,
+        // Unified file directory: browse/search /files, /temp, /raws by canonical
+        // path (GET /me/directory, POST /me/directory/search). browse_files uses the
+        // same endpoints; this lets the agent hit them directly via http_request too.
+        `${USER_PREFIX}/me/directory`,
         // Read-only catalog discovery so the copilot can answer "which templates
         // suit my <offer>?": the template feed (supports ?q=&limit=) and the source
         // video / inspiration catalog (supports ?q=&limit=&mine=). Ingest lives at
@@ -3627,7 +3749,11 @@ function normalizeEditorChatPath(input) {
         // and NEVER runs GhostCut on the long-form source — "no text" is a
         // scene-selection filter; caption removal stays a per-finished-clip
         // primitive (/api/v1/primitives/videos/remove-captions).
-        CLIPS_PREFIX,
+        RAWS_PREFIX,
+        // Legacy /clips alias (server redispatches /clips/* → /raws/*). Allowed so a
+        // prompt that still says /clips/scan works identically to /raws/scan and the
+        // allowlist doesn't drift from the deployed Lambda copy.
+        CLIPS_COMPAT_PREFIX,
         // Public skill knowledge: the vendored skill packs (load_skill fetches
         // these too) and per-template SKILL.md manifests. Read-only markdown.
         "/skill/",
@@ -4010,19 +4136,24 @@ function browseFilesTextContentType(fileName) {
 }
 function createBrowseFilesTool(input) {
     return tool({
-        description: "Browse AND write the user's My Files filesystem — their personal library of uploaded assets (mp4, mov, webm, png, jpg, jpeg, gif, webp, svg, mp3, wav, m4a, aac, pdf, md, txt, csv, and more) organized into virtual folders. Use action=list to enumerate files and virtual folders so you can discover what assets exist; pass folder_path to scope the listing to one folder (omit or empty for the root). Use action=search to find files by MEANING when you don't know where something lives: pass query (plain language, e.g. 'character reference sheet for the mascot' or 'logo on transparent background') and it matches keywords AND vector-embedded metadata notes across every file's name, folder, and notes — prefer search over paging through list when My Files is large or the user references an asset vaguely. Use action=read to fetch one file by file_id (preferred; copy it from a prior list/search result) or by file_name: it returns the file's durable view_url plus metadata, and for text files (md, txt, csv, srt, vtt, json) it also returns the full text_content inline so you can read it. For images, video, audio, and PDFs it returns view_url only — reference that URL directly (drop it into composition layers, or pass it into primitive routes like images/edit source_image_url, videos/generate input_references, or videos/download); you cannot read their raw bytes as text. Use action=write to SAVE a text file into My Files — pass file_name (e.g. About.md), content (the full text), optional folder_path to namescope it under a product/offer folder, and optional notes. This is how you persist Getting Started context the user can reuse later: a product About.md or Interview.md, and awareness-levels.md / persuasive-angles.md / ad-hooks.md distilled from brainstorm output. write saves text files (md, txt, csv, json, srt, vtt) via content, or IMPORTS any media asset into the library by passing its durable URL as source_url — e.g. save a finished image job's output as character_sprite_card.png so it persists in My Files instead of living only in a job result. write returns the new file_id and view_url. Use action=annotate to set metadata notes on ANY existing file (including binary assets): notes say what the file is, who/what it depicts, and when to use it, and they are vector-embedded so future sessions can search their way back to the asset. Annotate every asset worth finding again — especially character references: keep a character_sprite_card.png plus an about_character.md per recurring character in that character's folder, annotate both, and pass the sprite card's view_url into generation reference inputs (images prompt_attachments / videos input_references) for character consistency. Always list or search before you read so you use a real file_id; never invent file ids or view URLs.",
+        description: "Browse AND write the user's file directory — a navigable tree with THREE roots: /files (durable My Files: uploaded assets like mp4, mov, png, jpg, mp3, pdf, md, txt, csv, plus text context you save — vector-searchable via notes), /temp (scratch space auto-foldered by date YYYY-MM-DD, auto-deleted after 30 days), and /raws (the reusable clip/source-footage library, foldered by source). Every folder can have nested subfolders and every file has a canonical copyable path like /raws/product-demos/clip.mp4.\n\nNAVIGATE BY PATH: pass `path` to list or search any location — path='/' lists the three roots; path='/raws' or '/files/brand-assets' lists that folder's subfolders + files. Use action=list to enumerate a folder (folders[] + files[], each a canonical item with path, name, kind, view_url). (Legacy: action=list with folder_path and no path still lists /files only.)\n\nSEARCH: action=search with `query` (plain language) and optional `path` scope finds files by MEANING across roots — it combines semantic vector match, substring, and absolute-path match (control with `mode`: auto|semantic|substring|path). Prefer search when the user references an asset vaguely or you don't know which root/folder it's in; scope with path='/raws' to search only footage, path='/files' for durable assets, or path='/' for everything.\n\nMOVE: action=move with `file_id` (a raw's id) and `path` (target folder, e.g. /raws/demos) reorganizes a raw between /raws folders. Use action=search to find files by MEANING when you don't know where something lives: pass query (plain language, e.g. 'character reference sheet for the mascot' or 'logo on transparent background') and it matches keywords AND vector-embedded metadata notes across every file's name, folder, and notes — prefer search over paging through list when My Files is large or the user references an asset vaguely. Use action=read to fetch one file by file_id (preferred; copy it from a prior list/search result) or by file_name: it returns the file's durable view_url plus metadata, and for text files (md, txt, csv, srt, vtt, json) it also returns the full text_content inline so you can read it. For images, video, audio, and PDFs it returns view_url only — reference that URL directly (drop it into composition layers, or pass it into primitive routes like images/edit source_image_url, videos/generate input_references, or videos/download); you cannot read their raw bytes as text. Use action=write to SAVE a text file into My Files — pass file_name (e.g. About.md), content (the full text), optional folder_path to namescope it under a product/offer folder, and optional notes. This is how you persist Getting Started context the user can reuse later: a product About.md or Interview.md, and awareness-levels.md / persuasive-angles.md / ad-hooks.md distilled from brainstorm output. write saves text files (md, txt, csv, json, srt, vtt) via content, or IMPORTS any media asset into the library by passing its durable URL as source_url — e.g. save a finished image job's output as character_sprite_card.png so it persists in My Files instead of living only in a job result. write returns the new file_id and view_url. Use action=annotate to set metadata notes on ANY existing file (including binary assets): notes say what the file is, who/what it depicts, and when to use it, and they are vector-embedded so future sessions can search their way back to the asset. Annotate every asset worth finding again — especially character references: keep a character_sprite_card.png plus an about_character.md per recurring character in that character's folder, annotate both, and pass the sprite card's view_url into generation reference inputs (images prompt_attachments / videos input_references) for character consistency. Always list or search before you read so you use a real file_id; never invent file ids or view URLs.",
         inputSchema: z.object({
-            action: z.enum(["list", "read", "write", "annotate", "search"]).describe("list = enumerate files and folders; read = fetch one file's view_url and, for text files, its contents; write = save a text file into My Files; annotate = set the metadata notes on one existing file; search = find files by meaning across names, folders, and notes."),
-            folder_path: z.string().optional().describe("Folder to scope a list or search to, the folder of the file to read, or the folder to write into. Omit or leave empty for the root."),
+            action: z.enum(["list", "read", "write", "annotate", "search", "move"]).describe("list = enumerate a folder's subfolders + files (pass path for any root); read = fetch one file's view_url and, for text files, its contents; write = save a text file into /files; annotate = set the metadata notes on one existing /files entry; search = find files by meaning/name/path across roots; move = move a raw between /raws folders."),
+            path: z.string().optional().describe("Canonical directory path to list or search: '/' for the three roots, '/raws' or '/files/brand-assets' for a folder. For move, the target folder (e.g. /raws/demos). Preferred over folder_path for cross-root navigation."),
+            mode: z.enum(["auto", "semantic", "substring", "path"]).optional().describe("For search: which signals to combine. auto (default) = semantic vector + substring + absolute-path; or force one."),
+            folder_path: z.string().optional().describe("Legacy /files-only scope for a list or search, the folder of the file to read, or the folder to write into. Omit or leave empty for the root. Prefer `path` for anything outside /files."),
             file_id: z.string().optional().describe("Attachment id to read or annotate, copied from a prior list/search result. Preferred over file_name."),
             file_name: z.string().optional().describe("File name to read/annotate when you do not have the id, or the name to save under for write (e.g. About.md). Matched within folder_path when one is provided."),
             content: z.string().optional().describe("For write: the full text content of the file to save (e.g. Markdown for About.md). Required for text writes; mutually exclusive with source_url."),
             source_url: z.string().optional().describe("For write: a durable media URL (from a finished primitive job result or an existing asset) to IMPORT into My Files as file_name — this is how you save a generated character_sprite_card.png or other binary asset into the library. Mutually exclusive with content."),
             notes: z.string().optional().describe("For annotate (required) or write (optional): metadata notes describing what the file is, who/what it depicts, and when to use it — e.g. 'Sprite card for Zara, our mascot: front/side/back views, teal jacket. Use as the reference image whenever generating Zara.' Notes are vector-embedded so search finds the file by meaning. For annotate, an empty string clears existing notes."),
             query: z.string().optional().describe("For search: what you're looking for, in plain language. Required for search; ignored otherwise."),
+            content_type: z.string().optional().describe("For list/search of /raws: an EXACT shot-kind filter (not semantic) — one or a comma-separated OR set of talking_head, b_roll, product_shot, screen_recording, demo, reaction, interview, establishing, lifestyle, text_graphic. Narrows raw clips to those kinds; ignored outside /raws."),
+            offset: z.number().int().optional().describe("For list: page offset into a large folder (default 0). The response's next_offset is the offset to pass for the next page; null means no more."),
+            limit: z.number().int().optional().describe("For list/search: max items to return (list default 200, max 500; search default 30, max 50)."),
             explanation: z.string().optional().describe("Short reason for the browse, save, annotation, or search.")
         }),
-        execute: async ({ action, folder_path, file_id, file_name, content, source_url, notes, query, explanation }) => {
+        execute: async ({ action, path, mode, folder_path, file_id, file_name, content, source_url, notes, query, content_type, offset, limit, explanation }) => {
             const listUrl = new URL(`${USER_PREFIX}/me/attachments`, config.PUBLIC_BASE_URL);
             const headers = new Headers();
             headers.set("vidfarm-api-key", input.vidfarmApiKey);
@@ -4031,7 +4162,67 @@ function createBrowseFilesTool(input) {
                 timeoutController.abort(new Error("Browse files request timed out after 30 seconds."));
             }, 30_000);
             const normalizedFolder = (folder_path ?? "").trim().replace(/^\/+|\/+$/g, "");
+            // Default list/search to the WHOLE directory ('/') when neither a canonical
+            // path nor a legacy folder_path is given — otherwise these silently fell
+            // back to a /files-only search and the user's /raws + /temp were invisible.
+            const canonicalPath = (path ?? "").trim()
+                || ((action === "list" || action === "search") && !normalizedFolder ? "/" : "");
+            const contentTypeParam = (content_type ?? "").trim();
             try {
+                // ── unified directory navigation (any of /files, /temp, /raws) ──
+                if (action === "list" && canonicalPath) {
+                    const url = new URL(`${USER_PREFIX}/me/directory`, config.PUBLIC_BASE_URL);
+                    url.searchParams.set("path", canonicalPath);
+                    if (contentTypeParam)
+                        url.searchParams.set("content_type", contentTypeParam);
+                    if (offset !== undefined && Number.isFinite(offset))
+                        url.searchParams.set("offset", String(Math.max(0, Math.trunc(offset))));
+                    if (limit !== undefined && Number.isFinite(limit))
+                        url.searchParams.set("limit", String(Math.max(1, Math.trunc(limit))));
+                    const r = await fetch(url, { method: "GET", headers, signal: mergeAbortSignals(input.abortSignal, timeoutController.signal) });
+                    const body = await r.json().catch(() => null);
+                    return { action, explanation: explanation ?? null, status: r.status, ...(body || {}) };
+                }
+                if (action === "search" && canonicalPath) {
+                    const url = new URL(`${USER_PREFIX}/me/directory/search`, config.PUBLIC_BASE_URL);
+                    const searchHeaders = new Headers(headers);
+                    searchHeaders.set("content-type", "application/json");
+                    const searchLimit = limit !== undefined && Number.isFinite(limit) ? Math.max(1, Math.trunc(limit)) : 30;
+                    const r = await fetch(url, {
+                        method: "POST",
+                        headers: searchHeaders,
+                        body: JSON.stringify({
+                            query: (query ?? "").trim(),
+                            path: canonicalPath,
+                            mode: mode ?? "auto",
+                            limit: searchLimit,
+                            ...(contentTypeParam ? { content_type: contentTypeParam } : {})
+                        }),
+                        signal: mergeAbortSignals(input.abortSignal, timeoutController.signal)
+                    });
+                    const body = await r.json().catch(() => null);
+                    return { action, explanation: explanation ?? null, status: r.status, ...(body || {}) };
+                }
+                if (action === "move") {
+                    const id = (file_id ?? "").trim();
+                    const seg = canonicalPath.split("/").map((s) => s.trim()).filter(Boolean);
+                    const root = seg[0];
+                    if (!id || !root)
+                        return { action, explanation: explanation ?? null, status: 400, error: "move requires file_id and a target path like /raws/demos." };
+                    if (root !== "raws")
+                        return { action, explanation: explanation ?? null, status: 400, error: "move is currently supported only within /raws." };
+                    const url = new URL(`${RAWS_PREFIX}/${encodeURIComponent(id)}`, config.PUBLIC_BASE_URL);
+                    const moveHeaders = new Headers(headers);
+                    moveHeaders.set("content-type", "application/json");
+                    const r = await fetch(url, {
+                        method: "PATCH",
+                        headers: moveHeaders,
+                        body: JSON.stringify({ folder_path: seg.slice(1).join("/") }),
+                        signal: mergeAbortSignals(input.abortSignal, timeoutController.signal)
+                    });
+                    const body = await r.json().catch(() => null);
+                    return { action, explanation: explanation ?? null, status: r.status, ...(body || {}) };
+                }
                 if (action === "write") {
                     const name = (file_name ?? "").trim();
                     if (!name) {
@@ -4412,8 +4603,13 @@ function createEditorActionTool() {
                 "export_composition",
                 "generate_layer",
                 "set_captions",
-                "set_transitions"
-            ]).describe("Which mutation to perform. Use generate_layer to AI-generate a video/image and auto-place it on the timeline (fill a gap or replace a scene). Use export_composition to trigger the same Export button available in the editor UI — this queues an AWS Lambda render and the finished MP4 URL will surface in the next editor_context as last_export_url. Use set_captions to lay down a full run of ANIMATED word-by-word captions (TikTok/CapCut style): pass captions[] cues (or text + start/duration to auto-page), plus caption_style; it replaces any existing animated caption layers. To restyle existing captions without changing text/timing, use set_layer_style with caption_* fields on each caption layer. Use set_transitions to configure scene transitions across the WHOLE timeline in one call: transition = the junction preset applied at every cut (every scene clip except each track's first; 'none' clears), transition_intro = the first clip's entrance, transition_outro = the last clip's exit."),
+                "set_transitions",
+                "set_layer_keyframes",
+                "nudge_layers",
+                "ripple_edit",
+                "set_layer_zindex",
+                "trim_layer"
+            ]).describe("Which mutation to perform. Use generate_layer to AI-generate a video/image and auto-place it on the timeline (fill a gap or replace a scene). Use export_composition to trigger the same Export button available in the editor UI — this queues an AWS Lambda render and the finished MP4 URL will surface in the next editor_context as last_export_url. Use set_captions to lay down a full run of ANIMATED word-by-word captions (TikTok/CapCut style): pass captions[] cues (or text + start/duration to auto-page), plus caption_style; it replaces any existing animated caption layers. To restyle existing captions without changing text/timing, use set_layer_style with caption_* fields on each caption layer. Use set_transitions to configure scene transitions across the WHOLE timeline in one call: transition = the junction preset applied at every cut (every scene clip except each track's first; 'none' clears), transition_intro = the first clip's entrance, transition_outro = the last clip's exit. FINE TIMELINE CONTROL: set_layer_keyframes authors a custom script-free CSS @keyframes animation on ONE layer (opacity/translate/scale/rotate over the clip) that previews AND renders; nudge_layers moves one or more layers by a relative delta_start/delta_track (group-aware); ripple_edit inserts or closes time at at_time and shifts all downstream clips; trim_layer moves one edge (start|end) of a clip to a time, coupling media in-point on a left trim; set_layer_zindex restacks a layer (front|back|forward|backward) — stacking is the track index."),
             layer_key: z.string().optional().describe("Existing layer key from editor_context (required for remove/set/duplicate/split). MAY be either the element_id (data-hf-id) or the slug (data-hf-slug). For add_layer, optionally provide a stable id (starts with a letter, [A-Za-z0-9_-], <=64 chars) to reuse in later tool calls this turn."),
             slug: z.string().optional().describe("snake_case slug for the layer. On add_layer, seeds data-hf-slug. On set_layer_identity, sets it. Slugs give viral DNA a stable handle for the element."),
             note: z.string().optional().describe("Human-facing note explaining the layer's role, referenced by viral DNA. On add_layer seeds data-hf-note. On set_layer_identity, sets it. Empty string removes."),
@@ -4483,6 +4679,22 @@ function createEditorActionTool() {
             resolution: z.string().optional().describe("generate_layer (video): optional resolution (480p|720p|1080p|1K|2K|4K)."),
             generate_audio: z.boolean().optional().describe("generate_layer (video): whether the model should generate an audio track."),
             replace_layer_key: z.string().optional().describe("generate_layer intent=replace_layer: the existing layer_key/slug whose scene slot (timing+geometry) the generated clip should take over."),
+            keyframes: z.array(z.object({
+                offset: z.number().describe("Position along the animation as a 0..1 fraction (0 = clip start, 1 = end)."),
+                opacity: z.number().optional().describe("Opacity 0..1 at this stop."),
+                translate_x: z.number().optional().describe("Horizontal move as a percent of the layer's own width (e.g. -100 = fully off to the left, 0 = rest)."),
+                translate_y: z.number().optional().describe("Vertical move as a percent of the layer's own height (e.g. 100 = one height below, 0 = rest)."),
+                scale: z.number().optional().describe("Uniform scale factor (1 = natural size, 1.2 = 20% larger)."),
+                rotate: z.number().optional().describe("Rotation in degrees.")
+            })).optional().describe("set_layer_keyframes: an ordered list of >=2 animation stops for ONE layer. The editor writes a script-free CSS @keyframes rule + inline animation that both previews and renders (the JS runtime adapters like anime.js/GSAP are NOT available in the web editor). Each stop sets any of opacity/translate_x/translate_y/scale/rotate at its offset. Example fly-in: [{offset:0,opacity:0,translate_y:40},{offset:1,opacity:1,translate_y:0}]."),
+            keyframe_easing: z.string().optional().describe("set_layer_keyframes timing function: linear (default), ease, ease-in, ease-out, ease-in-out, or a cubic-bezier(...)/steps(...) value."),
+            keyframe_duration: z.number().optional().describe("set_layer_keyframes: seconds the animation spans (default = the clip's full duration). The keyframe offsets map across this window."),
+            delta_start: z.number().optional().describe("nudge_layers: seconds to shift the layer(s) along the timeline (negative = earlier). ripple_edit: seconds to insert (positive) or close (negative) at at_time."),
+            delta_track: z.number().int().optional().describe("nudge_layers: lanes to shift the layer(s) by (negative = down/behind)."),
+            at_time: z.number().optional().describe("ripple_edit: the composition-time boundary (seconds) — every clip that starts at or after it shifts by delta_start."),
+            edge: z.enum(["start", "end"]).optional().describe("trim_layer: which edge to move. 'start' (left) advances the in-point and, for video/audio, pushes the media start so the visible frame stays put; 'end' (right) only changes duration."),
+            to_time: z.number().optional().describe("trim_layer: the new composition-time position (seconds) for the chosen edge."),
+            z_order: z.enum(["front", "back", "forward", "backward"]).optional().describe("set_layer_zindex: restack a layer. Stacking == track index (higher draws on top); 'front'/'forward' raise it, 'back'/'backward' lower it. Alternatively pass an explicit track."),
             explanation: z.string().describe("One-sentence reason shown in the UI.")
         }),
         execute: async (args) => {
@@ -4750,6 +4962,24 @@ function renderHyperframesTimelineRuler(durationSeconds) {
     }).join("");
     return `<div class="hf-timeline-ruler" aria-hidden="true">${marks}</div>`;
 }
+// A not-yet-decomposed project is the raw single-video base: one <video> that
+// is BOTH the playback source AND its own timeline layer (data-layer-kind).
+// In the EDITOR its own audio is the point, so strip the baked-in `muted`
+// attribute when serving the composition to the editor stage (the editor plays
+// on a user gesture, so muted-autoplay is not needed). This is scoped to the
+// editor's composition.html load ONLY — card/swipe previews load a different
+// path and keep `muted` so their silent autoplay-loop still works. Decomposed
+// compositions emit a data-vf-playback-source WITHOUT data-layer-kind, so they
+// are left untouched.
+function unmuteRawPlaybackSourceVideo(html) {
+    return html.replace(/<video\b[^>]*>/gi, (tag) => {
+        if (!/data-vf-playback-source\s*=\s*["']?true/i.test(tag))
+            return tag;
+        if (!/data-layer-kind\s*=\s*["']?video/i.test(tag))
+            return tag;
+        return tag.replace(/\smuted(?=(\s|\/?>))/i, "");
+    });
+}
 function rewriteHyperframesDraftCompositionHtml(html, draftPath) {
     const baseHref = `/${normalizeDraftRelativePath(draftPath)}/`;
     const baseTag = `<base href="${escapeAttribute(baseHref)}">`;
@@ -4825,6 +5055,72 @@ function rewriteHyperframesDraftCompositionHtml(html, draftPath) {
     }
     return rewritten;
 }
+// Reskin overrides layered on top of the editor's own /assets/editor/app.css.
+// RESKIN_CSS scopes its element rules under .rk-root, so the only thing it changes
+// globally is the --rk-* token set + box-sizing. The editor chrome stays on its
+// original DARK theme; these rules only pin the reused reskin chat dock as a
+// permanent left column (the one farmville element we keep here).
+const EDITOR_FARMVILLE_CSS = `
+html,body{margin:0;background:#050604;color:#fffbe6}
+#root{min-height:100vh}
+
+/* The reused farmville chat dock, pinned flush as a permanent LEFT column
+   (desktop). Width stays natural: 440px for the clean chat column, widening to
+   overlay the editor's left edge only while the Files/History drawer is open. */
+@media (min-width:1025px){
+  .rk-aichat.rk-aichat--editor{
+    left:0 !important;top:0 !important;bottom:0 !important;right:auto !important;
+    height:100vh !important;max-height:100vh !important;
+    margin:0 !important;border-radius:0 !important;border-right:1px solid var(--rk-border) !important;
+    box-shadow:var(--rk-shadow-lg) !important;transform:none !important;z-index:40
+  }
+  /* Make room for the docked chat: shift the SPA workbench right + drop its
+     now-empty first grid column (the old embedded chat lived there). */
+  .vidfarm-workbench{margin-left:440px !important;grid-template-columns:minmax(0,1fr) !important}
+}
+.rk-aichat,.rk-fab{font-family:var(--rk-font-body)}
+
+/* ── Dark-mode the reused farmville chat dock so it matches the editor's dark
+   chrome. The reskin /reskin pages keep the light warm theme; this remap is
+   scoped to the editor dock only. Almost every dock surface reads a --rk-*
+   token, so remapping the token set here re-themes the panel wholesale; the
+   few hardcoded #fff backgrounds from the shared sheet are overridden below. */
+.rk-aichat.rk-aichat--editor{
+  --rk-white:#12160d;
+  --rk-surface:#0c0f08;--rk-bg:#0c0f08;--rk-bg-section:#0a0d07;
+  --rk-n-50:#0a0d07;--rk-n-100:#191d12;--rk-n-200:#262b1a;--rk-n-300:#333a24;
+  --rk-n-400:#6b7057;--rk-n-500:#8f9472;--rk-n-600:#b7bd97;--rk-n-700:#dcddc4;--rk-n-800:#eceada;
+  --rk-ink:#fffbe6;--rk-text:#e7e6cd;--rk-text-muted:#9a9d80;--rk-text-faint:#71745c;
+  --rk-border:rgba(255,251,230,.10);--rk-border-strong:rgba(255,251,230,.20);
+  --rk-gold-tint:rgba(252,185,0,.14);--rk-gold-tint2:rgba(252,185,0,.22);
+  --rk-shadow-xs:0 1px 2px 0 rgba(0,0,0,.4);
+  background:#0c0f08;
+}
+/* surfaces hardcoded #fff in the shared sheet → dark cards on the editor dock */
+.rk-aichat--editor .rk-aichat-msg.is-ai,
+.rk-aichat--editor .rk-aichat-composer,
+.rk-aichat--editor .rk-aichat-tool,
+.rk-aichat--editor .rk-aichat-back,
+.rk-aichat--editor .rk-aichat-fstate button,
+.rk-aichat--editor .rk-aichat-drop,
+.rk-aichat--editor .rk-aichat-toolnote,
+.rk-aichat--editor .rk-aichat-http,
+.rk-aichat--editor .rk-input,
+.rk-aichat--editor .rk-aichat-loadmore{background:#141810}
+.rk-aichat--editor .rk-aichat-back:hover{background:#1b2013}
+.rk-aichat--editor .rk-aichat-loadmore:hover{background:#1b2013}
+.rk-aichat--editor .rk-input{color:var(--rk-ink)}
+.rk-aichat--editor .rk-aichat-frow:hover,
+.rk-aichat--editor .rk-aichat-hist-body .rk-aichat-frow.is-active{background:#1b2013}
+.rk-aichat--editor .rk-aichat-err{background:#141810;color:#ff9b8f}
+.rk-aichat--editor .rk-aichat-toolnote.is-ok{color:#7ee2a8}
+.rk-aichat--editor .rk-aichat-toolnote.is-ok::before{background:#33d17a}
+.rk-aichat--editor .rk-aichat-toolnote.is-err{color:#ff9b8f}
+.rk-aichat--editor .rk-aichat-toolnote.is-err::before{background:#ff6a5a}
+
+/* Hide the SPA's own embedded chat (replaced by the farmville dock). */
+.chat-dock,.chat-dock-fab{display:none !important}
+`;
 async function renderHyperframesStudioEditorPage(input) {
     const accountId = input.customer?.id ?? null;
     const compositionId = input.composition.templateId ?? input.composition.slugId;
@@ -4833,6 +5129,8 @@ async function renderHyperframesStudioEditorPage(input) {
         slugId: input.composition.slugId,
         templateId: input.composition.templateId,
         title: input.composition.title,
+        // "raw" = the user's own new/blank project — never auto-prompt Decompose.
+        origin: input.composition.origin ?? null,
         originalUrl: input.composition.originalUrl ?? null,
         songName: input.composition.songName ?? null,
         songUrl: input.composition.songUrl ?? null,
@@ -4854,17 +5152,19 @@ async function renderHyperframesStudioEditorPage(input) {
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>${escapeHtml(input.composition.title)} | Studio</title>
-  <link rel="preconnect" href="https://fonts.googleapis.com" />
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <title>${escapeHtml(input.composition.title)} | VidFarm Studio</title>
   <link rel="icon" href="/assets/favicon.ico" />
   <link rel="stylesheet" href="/assets/editor/app.css" />
-  <style>html,body{margin:0;background:#050604;color:#fffbe6;}#root{min-height:100vh;}</style>
+  ${RESKIN_FONT_LINKS}
+  <style>${RESKIN_CSS}</style>
+  <style>${EDITOR_FARMVILLE_CSS}</style>
   <script src="/assets/sentry-config.js"></script>
 </head>
-<body>
+<body data-rk-editor-dock>
   <div id="root"></div>
+  ${renderChatDock("editor")}
   <script id="hf-boot" type="application/json">${escapeJsonForHtml(boot)}</script>
+  <script>${RESKIN_CHROME_SCRIPT}</script>
   <script type="module" src="/assets/editor/app.js"></script>
 </body>
 </html>`;
@@ -4911,30 +5211,444 @@ app.get("/", async (c) => {
 // Each page is a standalone document with its own CSS; renders sample data so
 // it's viewable without auth. Ported pages are wired here one at a time.
 app.get("/reskin", (c) => c.html(renderReskinIndex()));
-app.get("/reskin/settings", (c) => c.html(renderReskinSettings()));
-// Library hosts two tabs at distinct URLs (approved projects + mined clips).
-app.get("/reskin/library", (c) => redirect(c, "/reskin/library/approved"));
-app.get("/reskin/library/approved", (c) => c.html(renderReskinLibrary("approved")));
-app.get("/reskin/library/clips", (c) => c.html(renderReskinLibrary("clips")));
-app.get("/reskin/clips", (c) => redirect(c, "/reskin/library/clips")); // merged into Library
-// Discover has three modes at distinct URLs (feed / swipe / categories).
-app.get("/reskin/discover", (c) => redirect(c, "/reskin/discover/feed"));
+// Settings lives at /settings/<tab> (profile · wallet · channels · developer).
+// Tabs still switch client-side without a reload (the page renders every panel
+// and toggles visibility) but each has its own canonical URL so links,
+// bookmarks and back/forward land on the right tab.
+async function renderSettingsTabPage(c, tabOverride) {
+    const customer = await requireBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    const flash = consumeSettingsFlash(c);
+    const flockPosterApiKey = customer.flockposterApiKey?.trim() || null;
+    const activeTab = tabOverride
+        ?? (isSettingsTab(flash?.tab)
+            ? flash.tab
+            : isSettingsTab(c.req.query("tab"))
+                ? c.req.query("tab")
+                : "profile");
+    const directorSkill = readRootSkillFile("SKILL.director.md", "SKILL.user.md");
+    const emailChannels = await getEmailPseudoChannels(customer.id, c);
+    const [wallet, walletEvents] = await Promise.all([
+        fetchBillingWalletSummary(customer.id).catch((error) => ({
+            balanceUsd: 0, totalFundsAddedUsd: 0, totalChargeUsd: 0, totalBaseCostUsd: 0,
+            totalEventCount: 0, updatedAtMs: 0,
+            unavailableReason: error instanceof Error ? error.message : "Unable to load wallet."
+        })),
+        fetchBillingWalletEvents({ customerId: customer.id, limit: 50 }).catch((error) => ({
+            events: [],
+            nextCursor: null,
+            unavailableReason: error instanceof Error ? error.message : "Unable to load billing history."
+        }))
+    ]);
+    return c.html(renderReskinSettings({
+        userId: customer.id,
+        currentAccountId: customer.id,
+        name: customer.name,
+        notice: flash?.notice ?? null,
+        error: flash?.error ?? null,
+        activeTab,
+        openFlockPosterDialog: c.req.query("connect") === "flockposter" || (activeTab === "channels" && !flockPosterApiKey),
+        email: customer.email,
+        isPaidPlan: customer.isPaidPlan,
+        isDeveloper: customer.isDeveloper,
+        about: customer.about,
+        groupchatUrl: customer.groupchatUrl,
+        flockposterApiKey: flockPosterApiKey,
+        emailChannelIconUrl: await getEmailChannelIconUrl(c),
+        emailChannels,
+        vidfarmApiKey: await getVisibleApiKey(customer.id),
+        billingUrl: config.VIDFARM_BILLING_URL?.trim() || null,
+        directorSkill,
+        wallet,
+        walletEvents,
+        flockposterChannels: [],
+        flockposterChannelsError: null,
+        providerKeys: (await listProviderKeysWithSecretsForCustomer(customer.id)).map((entry) => ({
+            id: String(entry.id),
+            provider: String(entry.provider),
+            label: entry.label ? String(entry.label) : null,
+            secret: readStoredSecret(String(entry.secret)),
+            status: String(entry.status),
+            created_at: String(entry.created_at),
+            last_used_at: entry.last_used_at ? String(entry.last_used_at) : null
+        })),
+        attachments: (await serverlessRecords.listUserAttachments(customer.id)).map((attachment) => serializeUserAttachment(c, attachment))
+    }));
+}
+// Bare /settings redirects to its canonical first tab; legacy ?tab= / ?connect=
+// links are preserved by folding them into the path/query of the target.
+app.get("/settings", (c) => {
+    const q = c.req.query("tab");
+    const tab = isSettingsTab(q) ? q : "profile";
+    const connect = c.req.query("connect");
+    const path = connect ? `/settings/${tab}?connect=${encodeURIComponent(connect)}` : `/settings/${tab}`;
+    return redirect(c, withAccountQuery(path, getRequestedAccountId(c)));
+});
+app.get("/settings/profile", (c) => renderSettingsTabPage(c, "profile"));
+app.get("/settings/wallet", (c) => renderSettingsTabPage(c, "wallet"));
+app.get("/settings/channels", (c) => renderSettingsTabPage(c, "channels"));
+app.get("/settings/developer", (c) => renderSettingsTabPage(c, "developer"));
+// Library hosts tabs at distinct URLs: Approved projects, mined Raws, and the
+// full-page Files directory explorer (plus a right-floated Logs button → /library/logs).
+app.get("/library", (c) => redirect(c, "/library/approved"));
+const reskinLibraryHandler = async (c, tab) => {
+    const customer = await getPreferredBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    // Files is the self-contained directory explorer (client-fetches /me/directory),
+    // so it needs none of the posts/channels payload — skip that comparatively
+    // expensive work for it.
+    if (tab === "files") {
+        return c.html(renderReskinLibrary(tab, {
+            userId: customer.id,
+            currentAccountId: customer.id,
+            name: customer.name,
+            email: customer.email,
+            posts: [],
+            schedule: { channels: [], connectHref: "/settings/channels?connect=flockposter" },
+            editorChat: null
+        }));
+    }
+    const emailChannels = await getEmailPseudoChannels(customer.id, c);
+    const flockPoster = await getFlockPosterChannels(customer.flockposterApiKey?.trim() || null);
+    const scheduleChannels = [
+        ...emailChannels.map((channel) => ({ id: channel.id, name: channel.name, title: channel.title, handle: channel.handle, platform: channel.platform, status: channel.status, avatarUrl: channel.avatarUrl })),
+        ...flockPoster.channels.map((channel) => ({ id: channel.id, name: channel.title, title: channel.title, handle: channel.handle, platform: channel.platform, status: channel.status, avatarUrl: channel.avatarUrl }))
+    ];
+    const localPosts = await Promise.all((await serverlessRecords.listReadyPosts(customer.id))
+        .filter((post) => (post.source ?? "legacy") === "hyperframes")
+        .filter((post) => post.status === "ready" || post.status === "scheduled")
+        .map(async (post) => ({ ...serializeReadyPost(c, post, { includePrivate: true }), template_id: post.compositionId ?? null })));
+    const posts = await mergeUpstreamReadyPosts(localPosts);
+    return c.html(renderReskinLibrary(tab, {
+        userId: customer.id,
+        currentAccountId: customer.id,
+        name: customer.name,
+        email: customer.email,
+        posts,
+        schedule: { channels: scheduleChannels, connectHref: "/settings/channels?connect=flockposter" },
+        editorChat: null
+    }));
+};
+app.get("/library/approved", (c) => reskinLibraryHandler(c, "approved"));
+app.get("/library/raws", (c) => reskinLibraryHandler(c, "raws"));
+app.get("/library/logs", (c) => reskinLibraryHandler(c, "logs")); // job-runs, floated-right button (not a tab)
+app.get("/library/files", (c) => reskinLibraryHandler(c, "files")); // full-page file-directory explorer
+app.get("/library/clips", (c) => redirect(c, "/library/raws")); // renamed Clips → Raws
+// Discover has three modes, each on its own path: /discover (feed default),
+// /discover/swipe, /discover/categories. These exact page paths sit alongside
+// the JSON APIs at /discover/feed, /discover/popular and /discover/swipe/*
+// (which are all deeper/other paths, so there's no collision).
+// Shared feed builder — the single source of both the JSON /discover/feed
+// response and the SSR seed inlined into the reskin Feed page's boot. Feed
+// browses INSPIRATIONS (the caller's OWN inspirations plus the curated
+// popularGroup catalog), never the global public pool; raw own-projects are
+// excluded (they live in the Library). NOTE: for a logged-in caller this
+// finalizes still-downloading inspirations as a side effect — the feed poll
+// doubles as the completion check.
+async function collectDiscoverFeedEntries(customer, opts) {
+    const { query, limit } = opts;
+    const entries = [];
+    const seenInspirations = new Set();
+    const pushInspiration = (inspiration) => {
+        if (seenInspirations.has(inspiration.id))
+            return;
+        if ((inspiration.origin ?? "inspiration") === "raw")
+            return;
+        seenInspirations.add(inspiration.id);
+        entries.push(buildInspirationFeedEntry(inspiration));
+    };
+    if (customer) {
+        // The caller's own inspirations rank first (finalized → "ready" here).
+        const ownInspirations = (await serverlessRecords.listInspirationsForCustomer(customer.id));
+        const finalized = await Promise.all(ownInspirations.map(finalizeInspirationIfReady));
+        finalized
+            .filter((inspiration) => recordMatchesSearchQuery(inspiration, query))
+            .sort((a, b) => String(b.createdAt).localeCompare(String(a.createdAt)))
+            .forEach(pushInspiration);
+    }
+    // Curated/official catalog: public, ready inspirations flagged popularGroup.
+    const curated = (await serverlessRecords.listInspirationsFeed({ limit, query }))
+        .filter((inspiration) => typeof inspiration.popularGroup === "string" && inspiration.popularGroup.trim().length > 0);
+    curated.forEach(pushInspiration);
+    // Cloud passthrough (vidfarm serve): surface the upstream Feed behind the
+    // local one, deduped on inspirationId (→ templateId). Fail-soft.
+    if (isUpstreamEnabled()) {
+        const search = new URLSearchParams({ limit: String(limit) });
+        if (query)
+            search.set("q", query);
+        const upstreamFeed = (await upstreamJson(`/discover/feed?${search.toString()}`)).json?.templates ?? [];
+        const seen = new Set(entries.map((entry) => entry.inspirationId || entry.templateId));
+        for (const entry of upstreamFeed) {
+            const key = entry && (entry.inspirationId || entry.templateId);
+            if (entry && typeof key === "string" && key && !seen.has(key) && entry.origin !== "raw") {
+                entries.push(entry);
+                seen.add(key);
+            }
+        }
+    }
+    return entries.slice(0, limit);
+}
+const renderDiscoverMode = async (c, mode) => {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    let feedInitial;
+    let feedFetchedAt;
+    if (mode === "feed") {
+        // SSR-seed the first page of the default feed into the boot so the client
+        // paints instantly, skipping the redundant follow-up fetch. Fail-soft: on
+        // any error we omit the seed and the client cold-fetches as before. The
+        // limit mirrors the client's un-parameterized fetch (clampPageLimit → 100).
+        try {
+            feedInitial = await collectDiscoverFeedEntries(customer, { query: null, limit: clampPageLimit(Number.NaN, 100, 200) });
+            feedFetchedAt = new Date().toISOString();
+        }
+        catch {
+            feedInitial = undefined;
+        }
+    }
+    return c.html(renderReskinDiscover(mode, {
+        accountId: customer?.id,
+        isLoggedIn: Boolean(customer),
+        name: customer?.name ?? null,
+        email: customer?.email ?? null,
+        feedInitial,
+        feedFetchedAt
+    }));
+};
+app.get("/discover", async (c) => {
+    // Every mode has its own canonical path — Feed included — so redirect the bare
+    // /discover (and old ?view= links) onto it. Feed then lives at /discover/feed,
+    // which content-negotiates: browser navigations get the page, fetch/API get
+    // the JSON feed (see the /discover/feed handler below).
+    const view = c.req.query("view");
+    const account = c.req.query(ACCOUNT_QUERY_PARAM);
+    const suffix = account ? `?${ACCOUNT_QUERY_PARAM}=${encodeURIComponent(account)}` : "";
+    if (view === "swipe" || view === "categories") {
+        return redirect(c, `/discover/${view}${suffix}`);
+    }
+    return redirect(c, `/discover/feed${suffix}`);
+});
+app.get("/discover/swipe", (c) => renderDiscoverMode(c, "swipe"));
+app.get("/discover/categories", (c) => renderDiscoverMode(c, "categories"));
+// Brainstorm chat. /chat is a fresh conversation; /chat/:id deep-links to a
+// saved thread (the client auto-opens it and keeps the URL in sync as the user
+// switches / starts conversations).
+const renderChatBrainstorm = async (c, initialThreadId) => {
+    const customer = await getPreferredBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    return c.html(renderReskinChat({
+        userId: customer.id,
+        currentAccountId: customer.id,
+        name: customer.name,
+        email: customer.email,
+        editorChat: await buildChatBrainstormEditorChatBoot({ customer })
+    }, { initialThreadId: initialThreadId ?? null }));
+};
+app.get("/chat", (c) => renderChatBrainstorm(c));
+app.get("/chat/:id", (c) => renderChatBrainstorm(c, c.req.param("id")));
+// Boot for the global pop-panel AI chat (renderChatDock, on every reskin page).
+// The dock is shared chrome so we can't thread a boot through every route —
+// instead it fetches this lazily on first open (cookie-authed, same-origin) to
+// get the real editor-chat endpoint + api key + brainstorm template context.
+// Returns { editorChat: null } for signed-out visitors so the dock degrades to
+// a friendly "sign in to chat" state instead of erroring.
+app.get("/chat-dock/boot", async (c) => {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    if (!customer)
+        return c.json({ editorChat: null });
+    return c.json({ editorChat: await buildChatBrainstormEditorChatBoot({ customer }) });
+});
+// /reskin/inpaint — the "Create Image" masked-image editor (reached from the
+// chat page's studio-mode select). Auth-gated like the other tools.
+app.get("/inpaint", async (c) => {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    return c.html(renderReskinInpaint({ accountId: customer.id, isLoggedIn: true }));
+});
+app.get("/calendar", async (c) => {
+    const customer = await requireBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    const flockPosterApiKey = customer.flockposterApiKey?.trim() || null;
+    const emailChannels = await getEmailPseudoChannels(customer.id, c);
+    return c.html(renderReskinCalendar({
+        userId: customer.id,
+        currentAccountId: customer.id,
+        name: customer.name,
+        email: customer.email,
+        channels: emailChannels.map((channel) => ({
+            id: channel.id,
+            name: channel.title,
+            handle: channel.handle,
+            platform: channel.platform,
+            avatarUrl: channel.avatarUrl,
+            platformIconUrl: channel.platformIconUrl
+        })),
+        posts: [],
+        loadEndpoint: withAccountQuery("/calendar/feed", customer.id),
+        hasFlockPosterKey: Boolean(flockPosterApiKey || emailChannels.length),
+        connectChannelsHref: "/settings/channels?connect=flockposter"
+    }));
+});
+// Job runs were renamed and folded into the Library "Logs" tab.
+app.get("/job-runs", (c) => redirect(c, "/library/logs"));
+app.get("/agency", async (c) => {
+    const customer = await requireBrowserCustomer(c);
+    return c.html(renderReskinAgency({
+        userId: customer?.id ?? null,
+        currentAccountId: customer?.id ?? null,
+        name: customer?.name ?? null,
+        email: customer?.email ?? null,
+        loggedIn: Boolean(customer)
+    }));
+});
+app.get("/pricing", async (c) => {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    return c.html(renderReskinPricing({ email: customer?.email ?? "" }));
+});
+app.get("/login", (c) => c.html(renderReskinLogin({ mode: getLoginMode(c.req.query("mode")), routePrefix: "/login" })));
+app.post("/login/password", async (c) => {
+    const mode = getLoginMode(c.req.query("mode"));
+    const routePrefix = "/login";
+    const parsed = passwordLoginSchema.safeParse(await parseFormBody(c));
+    if (!parsed.success)
+        return c.html(renderReskinLogin({ mode, routePrefix, error: "Enter a valid email and password." }), 400);
+    try {
+        const result = await auth.authenticateWithPassword(parsed.data.email, parsed.data.password);
+        if (result.status === "pricing")
+            return redirect(c, "/pricing");
+        setBrowserSession(c, result.customer);
+        return redirect(c, resolvePostLoginRedirect(c, result.customer));
+    }
+    catch (error) {
+        return c.html(renderReskinLogin({ mode, routePrefix, email: parsed.data.email, error: error instanceof Error ? error.message : "Unable to login." }), 401);
+    }
+});
+app.post("/login/otp/request", async (c) => {
+    const mode = getLoginMode(c.req.query("mode"));
+    const routePrefix = "/login";
+    const parsed = otpRequestSchema.safeParse(await parseFormBody(c));
+    if (!parsed.success)
+        return c.html(renderReskinLogin({ mode, routePrefix, error: "Enter a valid email address." }), 400);
+    try {
+        const result = await auth.requestOtp(parsed.data.email);
+        const message = result.delivery === "console" && result.code
+            ? `Local dev mode: OTP is ${result.code}.`
+            : "OTP sent. Enter the code to continue.";
+        return c.html(renderReskinLogin({ mode, routePrefix, email: parsed.data.email, otpSent: true, message }));
+    }
+    catch (error) {
+        return c.html(renderReskinLogin({ mode, routePrefix, email: parsed.data.email, error: error instanceof Error ? error.message : "Unable to send OTP." }), 502);
+    }
+});
+app.post("/login/otp/verify", async (c) => {
+    const mode = getLoginMode(c.req.query("mode"));
+    const routePrefix = "/login";
+    const parsed = otpVerifySchema.safeParse(await parseFormBody(c));
+    if (!parsed.success)
+        return c.html(renderReskinLogin({ mode, routePrefix, error: "Enter the email and 6-digit OTP." }), 400);
+    try {
+        const result = await auth.verifyOtpForBrowserLogin(parsed.data.email, parsed.data.code, parsed.data.name);
+        if (result.status === "pricing") {
+            clearBrowserSession(c, result.customer.id);
+            return redirect(c, "/pricing");
+        }
+        setBrowserSession(c, result.customer);
+        return redirect(c, resolvePostLoginRedirect(c, result.customer));
+    }
+    catch (error) {
+        return c.html(renderReskinLogin({ mode, routePrefix, email: parsed.data.email, otpSent: true, error: error instanceof Error ? error.message : "Unable to verify OTP." }), 401);
+    }
+});
+app.post("/logout", async (c) => {
+    const formBody = await parseFormBody(c);
+    const customer = await requireBrowserCustomer(c, formBody);
+    if (customer) {
+        clearBrowserSession(c, customer.id);
+    }
+    return redirect(c, "/login");
+});
+app.get("/help", async (c) => {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    return c.html(renderReskinHelp({
+        account: { isLoggedIn: Boolean(customer), userId: customer?.id ?? null, displayName: customer?.name ?? null, email: customer?.email ?? null },
+        expand: c.req.query("expand") ?? null
+    }));
+});
+// The reskin IS the app now — every old /reskin/* URL 301/302s to its promoted
+// canonical route so existing bookmarks/links keep working. The /reskin gallery
+// (above) is kept as a dev reference; its cards link to the canonical routes.
+app.get("/reskin/settings", (c) => redirect(c, "/settings"));
+app.get("/reskin/library", (c) => redirect(c, "/library/approved"));
+app.get("/reskin/library/approved", (c) => redirect(c, "/library/approved"));
+app.get("/reskin/library/raws", (c) => redirect(c, "/library/raws"));
+app.get("/reskin/library/logs", (c) => redirect(c, "/library/logs"));
+app.get("/reskin/library/clips", (c) => redirect(c, "/library/raws"));
+app.get("/reskin/clips", (c) => redirect(c, "/library/raws"));
+app.get("/reskin/discover", (c) => redirect(c, "/discover"));
 app.get("/reskin/discover/:mode", (c) => {
-    const mode = c.req.param("mode");
-    if (mode !== "feed" && mode !== "swipe" && mode !== "categories")
-        return c.notFound();
-    return c.html(renderReskinDiscover(mode));
-});
-app.get("/reskin/chat", (c) => c.html(renderReskinChat()));
-app.get("/reskin/calendar", (c) => c.html(renderReskinCalendar()));
-app.get("/reskin/job-runs", (c) => c.html(renderReskinJobRuns()));
-app.get("/reskin/agency", (c) => c.html(renderReskinAgency()));
-app.get("/reskin/pricing", (c) => c.html(renderReskinPricing()));
-app.get("/reskin/login", (c) => c.html(renderReskinLogin()));
-app.get("/reskin/help", (c) => c.html(renderReskinHelp()));
+    const m = c.req.param("mode");
+    return redirect(c, m === "swipe" || m === "categories" ? `/discover/${m}` : "/discover");
+});
+app.get("/reskin/chat", (c) => redirect(c, "/chat"));
+app.get("/reskin/inpaint", (c) => redirect(c, "/inpaint"));
+app.get("/reskin/calendar", (c) => redirect(c, "/calendar"));
+app.get("/reskin/job-runs", (c) => redirect(c, "/library/logs"));
+app.get("/reskin/agency", (c) => redirect(c, "/agency"));
+app.get("/reskin/pricing", (c) => redirect(c, "/pricing"));
+app.get("/reskin/help", (c) => redirect(c, "/help"));
+app.get("/reskin/login", (c) => redirect(c, "/login"));
 app.get("/discover", async (c) => renderApprovedHomepage(c));
-app.get("/editor/:templateId", async (c) => {
-    const templateId = c.req.param("templateId");
+// Blank / new-project editor. The "New project" button and the empty-library
+// CTAs point here. There is no template or fork yet: we boot the SPA into an
+// empty composition, and the client mints a real template_* + fork_* on the
+// first save/generate/decompose, then history.replaceState's the URL to the
+// canonical /editor/:templateId/fork/:forkId form.
+async function renderBlankEditorPage(c) {
+    const customer = await getOptionalPreferredBrowserCustomer(c);
+    if (!customer) {
+        setLoginReturnPath(c, currentPathWithSearch(c));
+        return redirect(c, "/login");
+    }
+    const threadParam = c.req.query("thread");
+    const blankComposition = {
+        title: "Untitled project",
+        templateId: "original",
+        slugId: "original",
+        difficulty: "easy",
+        viralDna: "",
+        previewUrl: null,
+        approvedAt: null,
+        sourceType: "tiktok",
+        durationSeconds: null,
+        originalUrl: null,
+        songName: null,
+        songUrl: null,
+        // Raw origin: a brand-new project, so the SPA never auto-opens Decompose.
+        origin: "raw",
+        initialThreadId: threadParam ?? null
+    };
+    return c.html(await renderHyperframesStudioEditorPage({ composition: blankComposition, customer }));
+}
+// Shared handler for both the bare /editor/:templateId (resolver) route and the
+// canonical /editor/:templateId/fork/:forkId (path-form) route. `forkParam` is
+// the fork id from the URL path (path route) or null (bare route). We validate
+// it, and when it's missing/stale/uneditable we resolve a per-user fork and
+// redirect to the canonical path form.
+async function renderEditorPage(c, templateId, forkParam) {
     const customer = await getOptionalPreferredBrowserCustomer(c);
     if (!templateId.startsWith("template_"))
         return c.notFound();
@@ -4947,7 +5661,7 @@ app.get("/editor/:templateId", async (c) => {
         await seedFromUpstream({
             customerId: customer.id,
             templateId,
-            forkId: c.req.query("fork") ?? undefined,
+            forkId: forkParam ?? undefined,
             shareToken: readShareToken(c) ?? undefined
         });
         template = await serverlessRecords.getTemplate(templateId);
@@ -4958,7 +5672,6 @@ app.get("/editor/:templateId", async (c) => {
     // template id doesn't leak to other accounts.
     if (template.visibility === "private" && template.customerId !== customer?.id)
         return c.notFound();
-    const forkParam = c.req.query("fork");
     const threadParam = c.req.query("thread");
     // Validate the caller-provided fork. Stale bookmarks / share links keep
     // pointing at forks we've since hard-deleted, and if we blindly pass the
@@ -5035,11 +5748,11 @@ app.get("/editor/:templateId", async (c) => {
             // source of truth for "which chat is active" via localStorage. Injecting
             // the server's most-recent thread into the URL blows away a fresh
             // client-side "New chat" the user just started but hasn't persisted.
-            const path = `/editor/${encodeURIComponent(template.id)}?fork=${encodeURIComponent(targetForkId)}`;
+            const path = `/editor/${encodeURIComponent(template.id)}/fork/${encodeURIComponent(targetForkId)}`;
             return redirect(c, path);
         }
         // No fork exists yet for this template + user — redirect to the bare
-        // /editor/{templateId} URL so any stale `?fork=` gets stripped and the
+        // /editor/{templateId} URL so any stale fork segment gets stripped and the
         // Decompose modal opens fresh (client-side flow mints a new fork on
         // first save/decompose).
         if (forkParam) {
@@ -5066,6 +5779,21 @@ app.get("/editor/:templateId", async (c) => {
         initialThreadId: threadParam ?? null
     };
     return c.html(await renderHyperframesStudioEditorPage({ composition: syntheticComposition, customer }));
+}
+// Canonical path-form editor route. Sentinel /editor/original/fork/new opens a
+// blank new project; everything else validates/resolves the fork in the path.
+app.get("/editor/:templateId/fork/:forkId", async (c) => {
+    const templateId = c.req.param("templateId");
+    const forkId = c.req.param("forkId");
+    if (templateId === "original" && forkId === "new") {
+        return renderBlankEditorPage(c);
+    }
+    return renderEditorPage(c, templateId, forkId);
+});
+// Bare editor route: resolves a per-user fork and redirects to the path form.
+app.get("/editor/:templateId", async (c) => {
+    const templateId = c.req.param("templateId");
+    return renderEditorPage(c, templateId, null);
 });
 app.get("/editor/:templateId/composition", async (c) => {
     const templateId = c.req.param("templateId");
@@ -5092,6 +5820,7 @@ app.get(`${ACCOUNT_FRONTEND_PREFIX}`, (c) => redirect(c, withAccountQuery("/libr
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/discover`, (c) => redirectToPublicPath(c, "/discover"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/help`, (c) => redirectToPublicPath(c, "/help"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/chat`, (c) => dispatchScopedGetToLegacyRoute(c, "/chat"));
+app.get(`${ACCOUNT_FRONTEND_PREFIX}/chat/:id`, (c) => dispatchScopedGetToLegacyRoute(c, `/chat/${c.req.param("id")}`));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/library`, (c) => dispatchScopedGetToLegacyRoute(c, "/library"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/clips`, (c) => dispatchScopedGetToLegacyRoute(c, "/clips"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/inpaint`, (c) => dispatchScopedGetToLegacyRoute(c, "/inpaint"));
@@ -5101,8 +5830,24 @@ app.get(`${ACCOUNT_FRONTEND_PREFIX}/job-runs`, (c) => dispatchScopedGetToLegacyR
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/job-runs/history`, (c) => dispatchScopedGetToLegacyRoute(c, "/job-runs/history"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/calendar/feed`, (c) => dispatchScopedGetToLegacyRoute(c, "/calendar/feed"));
 app.get(`${ACCOUNT_FRONTEND_PREFIX}/settings/flockposter`, (c) => dispatchScopedGetToLegacyRoute(c, "/settings/flockposter"));
+// Per-tab settings pages under an account scope (registered AFTER the static
+// /settings/flockposter route so that stays reachable).
+app.get(`${ACCOUNT_FRONTEND_PREFIX}/settings/:tab`, (c) => {
+    const tab = c.req.param("tab");
+    return dispatchScopedGetToLegacyRoute(c, `/settings/${isSettingsTab(tab) ? tab : "profile"}`);
+});
 app.post(`${ACCOUNT_FRONTEND_PREFIX}/settings/wallet/funding-link`, (c) => dispatchScopedPostToLegacyRoute(c, "/settings/wallet/funding-link"));
 app.get("/discover/feed", async (c) => {
+    // Content negotiation: a browser NAVIGATION to /discover/feed (Accept:
+    // text/html) renders the Feed page — this is the canonical Feed URL now that
+    // /discover redirects here. Everything else (the in-page loader, which sends
+    // Accept: application/json, plus agents/devcli/upstream passthrough) falls
+    // through to the JSON feed below. The two never collide because the page's
+    // own fetch is explicitly application/json.
+    const acceptHeader = (c.req.header("accept") || "").toLowerCase();
+    if (acceptHeader.includes("text/html") && !acceptHeader.includes("application/json")) {
+        return renderDiscoverMode(c, "feed");
+    }
     const limit = clampPageLimit(Number(c.req.query("limit") || ""), 100, 200);
     // Optional keyword search so callers (UI, agents, devcli) can ask "which
     // templates suit my <offer>?" and get a ranked subset instead of the full
@@ -5110,66 +5855,12 @@ app.get("/discover/feed", async (c) => {
     // decompose-derived promotions/keywords/summary.
     const query = (c.req.query("q") || c.req.query("query") || "").trim() || null;
     const customer = await getOptionalPreferredBrowserCustomer(c);
-    const templateEntries = [];
-    if (customer) {
-        // The caller's own private submissions rank above the public catalog.
-        // Finalizing pending inspirations here is what mints the private template
-        // as soon as the download job completes — the feed poll doubles as the
-        // completion check.
-        const ownInspirations = (await serverlessRecords.listInspirationsForCustomer(customer.id))
-            .filter((inspiration) => inspiration.visibility === "private");
-        const finalized = await Promise.all(ownInspirations.map(finalizeInspirationIfReady));
-        const ownTemplates = (await serverlessRecords.listTemplatesForCustomer(customer.id))
-            .filter((template) => template.visibility === "private")
-            .sort((a, b) => String(b.createdAt).localeCompare(String(a.createdAt)));
-        const pending = finalized
-            .filter((inspiration) => !inspiration.templateId)
-            .filter((inspiration) => recordMatchesSearchQuery(inspiration, query))
-            .sort((a, b) => String(b.createdAt).localeCompare(String(a.createdAt)));
-        for (const inspiration of pending) {
-            templateEntries.push(buildPendingInspirationHomepageEntry(inspiration));
-        }
-        for (const template of ownTemplates.filter((template) => recordMatchesSearchQuery(template, query))) {
-            const entry = buildTemplateHomepageEntry(template);
-            if (entry)
-                templateEntries.push(entry);
-        }
-    }
-    const templates = await serverlessRecords.listTemplatesFeed({ limit, query });
-    for (const template of templates) {
-        // Curated "Popular" picks live only under the Popular toggle
-        // (GET /discover/popular) — keep them out of the continuously-grown Feed
-        // so the two views stay distinct.
-        if (typeof template.popularGroup === "string" && template.popularGroup.trim().length > 0)
-            continue;
-        const entry = buildTemplateHomepageEntry(template);
-        if (entry)
-            templateEntries.push(entry);
-    }
-    // Cloud passthrough (vidfarm serve): the local records are just the working
-    // set of seeded templates, so surface the upstream (cloud) catalog behind
-    // them. Local entries win on id conflicts — a seeded template also exists
-    // upstream and the local copy reflects any local edits. Fail-soft: an
-    // unreachable upstream degrades to the local-only feed.
-    if (isUpstreamEnabled()) {
-        const search = new URLSearchParams({ limit: String(limit) });
-        if (query)
-            search.set("q", query);
-        const upstreamFeed = (await upstreamJson(`/discover/feed?${search.toString()}`)).json?.templates ?? [];
-        const seen = new Set(templateEntries.map((entry) => entry.templateId));
-        for (const entry of upstreamFeed) {
-            if (entry && typeof entry.templateId === "string" && !seen.has(entry.templateId) && !entry.popularGroup) {
-                templateEntries.push(entry);
-                seen.add(entry.templateId);
-            }
-        }
-    }
-    // The public feed is identical for every caller, but a logged-in response
-    // interleaves the caller's private templates — never let a shared cache
-    // serve that to someone else.
+    const entries = await collectDiscoverFeedEntries(customer, { query, limit });
+    // The Feed interleaves the caller's own inspirations, so a logged-in response
+    // must never be served from a shared cache.
     c.header("cache-control", customer ? "private, max-age=10" : "public, max-age=60");
     return c.json({
-        templates: templateEntries,
+        templates: entries,
         next_cursor: null
     });
 });
@@ -5318,8 +6009,40 @@ function injectSwipePreviewFit(doc, cardId) {
       function play() {
         try { if (window.__player) { window.__player.play(); } } catch (e) {}
       }
+      // The runtime paints video through a single backing <video> whose CSS
+      // background is near-black, so until a frame decodes the card shows solid
+      // black behind the captions. Drive that element directly as a
+      // belt-and-suspenders fallback: a muted backing video may autoplay even
+      // if the runtime's own play() was swallowed, and forcing a load()/frame
+      // decode guarantees the first frame paints instead of the black
+      // background — many source clips fade in from black, so we also nudge a
+      // hair off 0 to avoid parking on a dark intro frame.
+      var backingVideo = document.querySelector('[data-vf-playback-source]');
+      var framePainted = false;
+      function kickBackingVideo() {
+        if (!backingVideo) return;
+        try { backingVideo.muted = true; backingVideo.playsInline = true; } catch (e) {}
+        try { if (backingVideo.readyState < 2) { backingVideo.load(); } } catch (e) {}
+        try { var p = backingVideo.play(); if (p && p.catch) { p.catch(function () {}); } } catch (e) {}
+      }
+      if (backingVideo) {
+        backingVideo.addEventListener('loadeddata', function () {
+          kickBackingVideo();
+          if (!framePainted) {
+            framePainted = true;
+            // Only nudge if the runtime hasn't already advanced playback.
+            try {
+              if (backingVideo.currentTime < 0.05 && (!window.__player || !window.__player.isPlaying())) {
+                backingVideo.currentTime = 0.12;
+              }
+            } catch (e) {}
+          }
+        });
+        backingVideo.addEventListener('canplay', kickBackingVideo);
+      }
       applySound(false);
       play();
+      kickBackingVideo();
       var lastWant = false;
       var stalled = 0;
       var mutedFallback = false;
@@ -5328,7 +6051,7 @@ function injectSwipePreviewFit(doc, cardId) {
           var want = wantSound();
           if (want !== lastWant) { lastWant = want; mutedFallback = false; stalled = 0; }
           applySound(want && !mutedFallback);
-          if (!window.__player || !window.__player.getDuration) { return; }
+          if (!window.__player || !window.__player.getDuration) { kickBackingVideo(); return; }
           var t = window.__player.getTime(), d = window.__player.getDuration();
           if (d > 0 && t >= d - 0.08) { window.__player.seek(0, { keepPlaying: true }); }
           else if (!window.__player.isPlaying()) {
@@ -5338,6 +6061,7 @@ function injectSwipePreviewFit(doc, cardId) {
             // the preview never freezes on a frame.
             if (stalled >= 3 && want && !mutedFallback) { mutedFallback = true; applySound(false); }
             play();
+            kickBackingVideo();
           } else { stalled = 0; }
         } catch (e) {}
       }, 400);
@@ -5847,6 +6571,36 @@ app.post("/discover/templates", async (c) => {
     });
     return c.json(serializeInspiration(inspiration), 202);
 });
+// Remix (decompose on demand): mint the template for a Feed inspiration the
+// moment the user chooses to open it. The Feed browses lightweight inspirations
+// with no template, so this is where a template is first created — for the
+// caller's own inspirations and for curated/public ones alike (a non-owner then
+// gets their own fork when the editor opens template_<id>). Idempotent: an
+// already-decomposed inspiration just returns its existing template id.
+app.post("/discover/inspirations/:id/decompose", async (c) => {
+    const customer = await requireBrowserCustomer(c);
+    if (!customer)
+        return c.json({ ok: false, error: "Log in to remix an inspiration." }, 401);
+    const inspiration = await serverlessRecords.getInspiration(c.req.param("id"));
+    if (!inspiration)
+        return c.json({ ok: false, error: "Inspiration not found." }, 404);
+    // Only the owner may open a PRIVATE inspiration; public/curated ones are
+    // remixable by anyone (the editor forks per-user on open).
+    if (inspiration.visibility === "private" && inspiration.customerId !== customer.id) {
+        return c.notFound();
+    }
+    if (inspiration.templateId) {
+        return c.json({ ok: true, templateId: inspiration.templateId });
+    }
+    if (inspiration.status !== "ready" || !inspiration.videoUrl) {
+        return c.json({ ok: false, error: "This inspiration is still processing — try again in a moment." }, 409);
+    }
+    const decomposed = await mintTemplateForInspiration(inspiration);
+    if (!decomposed.templateId) {
+        return c.json({ ok: false, error: "Could not prepare this inspiration for editing." }, 500);
+    }
+    return c.json({ ok: true, templateId: decomposed.templateId });
+});
 // Delete a private discover entry the caller owns. Accepts either the minted
 // template id (template_...) or the raw inspiration id (inspiration_..., i.e.
 // a still-processing/failed card) and removes both records. Public catalog
@@ -5900,6 +6654,51 @@ app.delete("/discover/templates/:entryId", async (c) => {
 // on its owner's /discover as a placeholder card so the Add Template flow has
 // immediate feedback. It has no template yet, so the editor CTA is disabled
 // client-side via status.
+// Feed card for a single INSPIRATION (Feed browses inspirations, not templates).
+// Lightweight: no template is required. If the inspiration has already minted a
+// template (templateId set), the card opens the editor directly; otherwise the
+// card previews the source video and its CTA decomposes on demand (preview →
+// Remix). Covers ready / downloading / failed states in one shape.
+function buildInspirationFeedEntry(inspiration) {
+    const isReady = inspiration.status === "ready";
+    const isFailed = inspiration.status === "failed";
+    const title = (inspiration.sourceHost === "upload"
+        ? (inspiration.title || inspiration.trendTagline)
+        : (inspiration.trendTagline || inspiration.title)) || inspiration.sourceHost || "New inspiration";
+    // Prefer the raw source video so the Feed + TikTok viewer actually play; fall
+    // back to the poster thumbnail (image) when the video URL isn't available yet.
+    const previewUrl = inspiration.videoUrl || inspiration.thumbnailUrl || "";
+    const viralDna = isFailed
+        ? (inspiration.errorMessage || "Video ingest failed. Try adding it again.")
+        : isReady
+            ? (inspiration.notes || inspiration.searchSummary || inspiration.trendTagline
+                || `A proven viral ${inspiration.sourceHost || "social"} post. Preview it, then remix it into an ad for your product.`)
+            : (inspiration.notes || (inspiration.sourceHost === "upload"
+                ? "Processing your uploaded video. This card unlocks automatically once it's ready."
+                : "Downloading the source video. This card unlocks automatically once it's ready."));
+    return {
+        title,
+        // Real template id when already decomposed; "" means "decompose on open".
+        templateId: inspiration.templateId ?? "",
+        inspirationId: inspiration.id,
+        slugId: inspiration.templateId ?? inspiration.id,
+        difficulty: "easy",
+        viralDna,
+        previewUrl,
+        approvedAt: inspiration.createdAt,
+        sourceType: inspiration.sourceHost || "social",
+        durationSeconds: inspiration.durationSeconds ?? null,
+        promotions: inspiration.promotions ?? null,
+        keywords: inspiration.keywords ?? null,
+        summary: inspiration.searchSummary ?? null,
+        visibility: inspiration.visibility,
+        origin: inspiration.origin ?? "inspiration",
+        popularGroup: inspiration.popularGroup ?? null,
+        popularRank: inspiration.popularRank ?? null,
+        notes: inspiration.notes,
+        status: isFailed ? "failed" : isReady ? "ready" : "processing"
+    };
+}
 function buildPendingInspirationHomepageEntry(inspiration) {
     return {
         // Uploads: explicit title (or file name, stored at submit time) outranks
@@ -6294,6 +7093,8 @@ app.get("/assets/sentry-config.js", (c) => {
 });
 app.get("/assets/homepage-client-app.js", (c) => serveRootJsBundle(c, "public/assets/homepage-client-app.js"));
 app.get("/assets/page-runtime-client-app.js", (c) => serveRootJsBundle(c, "public/assets/page-runtime-client-app.js"));
+app.get("/assets/file-directory-app.js", (c) => serveRootJsBundle(c, "public/assets/file-directory-app.js"));
+app.get("/assets/discover-client-app.js", (c) => serveRootJsBundle(c, "public/assets/discover-client-app.js"));
 function serveRootJsBundle(c, relativePath) {
     const filePath = resolveRootFileCandidates(relativePath).find((candidate) => existsSync(candidate));
     if (!filePath) {
@@ -7019,7 +7820,11 @@ app.get(`${COMPOSITIONS_PREFIX}/:forkId/composition.html`, async (c) => {
         const html = await storage.readText(storage.compositionForkWorkingKey(access.fork.id, "composition.html"));
         if (!html)
             return c.json({ ok: false, error: "Composition missing" }, 404);
-        return c.body(html, 200, { "content-type": "text/html; charset=utf-8" });
+        // The editor stage loads the composition here (then injects its own runtime),
+        // so unmute the not-yet-decomposed raw single-video base so its own audio
+        // plays. Older stored raw bases baked in a `muted` attribute; strip it on the
+        // way out. Decomposed compositions are left untouched (see helper).
+        return c.body(unmuteRawPlaybackSourceVideo(html), 200, { "content-type": "text/html; charset=utf-8" });
     }
     catch (error) {
         return forkAccessErrorResponse(c, error);
@@ -9583,6 +10388,101 @@ function serializeInspiration(inspiration) {
         updated_at: inspiration.updatedAt
     };
 }
+// Mint the template for a READY inspiration (idempotent): creates a template
+// inheriting the inspiration's visibility + origin and links it back via
+// templateId. Returns the inspiration with templateId set — or unchanged if it
+// already has one / isn't ready / has no source video. Shared by the eager
+// (private, on-download) path and the lazy Remix path (POST
+// /discover/inspirations/:id/decompose).
+async function mintTemplateForInspiration(inspiration) {
+    if (inspiration.templateId || inspiration.status !== "ready" || !inspiration.videoUrl)
+        return inspiration;
+    const template = await serverlessRecords.createTemplate({
+        inspirationId: inspiration.id,
+        customerId: inspiration.customerId,
+        originalUrl: inspiration.originalUrl,
+        sourceHost: inspiration.sourceHost,
+        // No host/"Untitled" fallback: a template without an explicit title or
+        // tagline displays as its template id on /discover.
+        title: (inspiration.sourceHost === "upload"
+            ? (inspiration.title || inspiration.trendTagline)
+            : (inspiration.trendTagline || inspiration.title)) || null,
+        thumbnailUrl: inspiration.thumbnailUrl,
+        videoUrl: inspiration.videoUrl,
+        durationSeconds: inspiration.durationSeconds,
+        songName: inspiration.songName,
+        songUrl: inspiration.songUrl,
+        visibility: inspiration.visibility === "private" ? "private" : "public",
+        origin: inspiration.origin ?? "inspiration",
+        notes: inspiration.notes
+    });
+    // Seed the template's canonical DEFAULT fork with the raw single-video
+    // timeline so opening the editor lands on an editable project immediately —
+    // the whole clip as ONE element across the trackpad. Because origin stays
+    // "inspiration" the editor still auto-prompts Decompose; decomposing rebuilds
+    // this same default fork in place, so the multi-scene version becomes the new
+    // default everyone forks off. Non-fatal: on failure the template just falls
+    // back to the on-demand raw seed in POST /api/v1/compositions.
+    try {
+        await seedRawDefaultForkForTemplate(template);
+    }
+    catch (error) {
+        console.error("seed raw default fork failed", error instanceof Error ? error.message : error);
+    }
+    return (await serverlessRecords.updateInspiration({
+        inspirationId: inspiration.id,
+        patch: { templateId: template.id }
+    })) ?? { ...inspiration, templateId: template.id };
+}
+// Create + stamp a template's canonical DEFAULT fork holding the raw
+// single-video composition (the full source clip as one timeline element).
+// Idempotent: returns the existing default fork id if one is already stamped,
+// or null if the template has no source video to seed from. Owned privately by
+// the template owner — other users never touch it through permissions; POST
+// /api/v1/compositions seeds their forks by copying its composition html.
+async function seedRawDefaultForkForTemplate(template) {
+    if (template.defaultForkId)
+        return template.defaultForkId;
+    const sourceUrl = template.videoUrl?.trim();
+    if (!sourceUrl)
+        return null;
+    const title = template.title ?? `Template ${template.id}`;
+    const fork = await serverlessRecords.createCompositionFork({
+        customerId: template.customerId,
+        templateId: template.id,
+        parentForkId: null,
+        parentVersion: null,
+        visibility: "private",
+        title
+    });
+    const html = buildRawTikTokCompositionHtml({
+        compositionId: fork.id,
+        sourceUrl,
+        durationSeconds: template.durationSeconds ?? 12,
+        title,
+        origin: template.origin ?? "inspiration"
+    });
+    await storage.putText(storage.compositionForkWorkingKey(fork.id, "composition.html"), html, "text/html; charset=utf-8");
+    await writeForkManifest(storage, fork, { kind: "working" });
+    // Snapshot v1 (reason "clone" bypasses the version ceiling) so version
+    // history + revert work from the very first raw base.
+    try {
+        await snapshotForkVersion({
+            fork,
+            callerCustomerId: template.customerId,
+            reason: "clone",
+            message: "Raw single-video base"
+        });
+    }
+    catch (error) {
+        console.error("seed raw default fork snapshot failed", error instanceof Error ? error.message : error);
+    }
+    const stamp = await serverlessRecords.stampDefaultForkIfUnset({
+        templateId: template.id,
+        forkId: fork.id
+    });
+    return stamp.template?.defaultForkId ?? fork.id;
+}
 async function finalizeInspirationIfReady(inspiration) {
     if (inspiration.status !== "downloading" || !inspiration.downloadJobId)
         return inspiration;
@@ -9612,38 +10512,12 @@ async function finalizeInspirationIfReady(inspiration) {
                 songUrl: songUrl ?? null
             }
         })) ?? inspiration;
-        // Private (user-added) inspirations mint their template as soon as the
-        // download lands so the card on the owner's /discover becomes openable.
-        // Public inspirations keep the existing behavior: templates only come
-        // from the admin ingest flow.
-        if (ready.visibility === "private" && !ready.templateId && ready.videoUrl) {
-            const template = await serverlessRecords.createTemplate({
-                inspirationId: ready.id,
-                customerId: ready.customerId,
-                originalUrl: ready.originalUrl,
-                sourceHost: ready.sourceHost,
-                // No host/"Untitled" fallback: a template without an explicit title or
-                // tagline displays as its template id on /discover. For uploads the
-                // manifest title IS the caller's explicit title, so it outranks the
-                // tagline; URL ingests keep tagline-first (manifest title is just the
-                // social post's own caption).
-                title: (ready.sourceHost === "upload"
-                    ? (ready.title || ready.trendTagline)
-                    : (ready.trendTagline || ready.title)) || null,
-                thumbnailUrl: ready.thumbnailUrl,
-                videoUrl: ready.videoUrl,
-                durationSeconds: ready.durationSeconds,
-                songName: ready.songName,
-                songUrl: ready.songUrl,
-                visibility: "private",
-                origin: ready.origin ?? "inspiration",
-                notes: ready.notes
-            });
-            ready = (await serverlessRecords.updateInspiration({
-                inspirationId: ready.id,
-                patch: { templateId: template.id }
-            })) ?? ready;
-        }
+        // EVERY ready inspiration eagerly mints a template + a raw single-video
+        // default fork, so every card opens the editor directly onto an editable
+        // project (the whole clip as one timeline element) with the Decompose
+        // prompt still available. The Feed browses inspirations (deduped on
+        // inspirationId||templateId) so a template per upload doesn't flood it.
+        ready = await mintTemplateForInspiration(ready);
         return ready;
     }
     if (job.status === "failed" || job.status === "cancelled") {
@@ -10582,7 +11456,7 @@ app.get("/library", async (c) => {
         posts,
         schedule: {
             channels: scheduleChannels,
-            connectHref: withAccountQuery("/settings?tab=channels&connect=flockposter", customer.id)
+            connectHref: withAccountQuery("/settings/channels?connect=flockposter", customer.id)
         },
         editorChat: await buildLibraryEditorChatBoot({
             customer,
@@ -10753,7 +11627,7 @@ app.get("/calendar", async (c) => {
         posts: [],
         loadEndpoint: withAccountQuery("/calendar/feed", customer.id),
         hasFlockPosterKey: Boolean(flockPosterApiKey || emailChannels.length),
-        connectChannelsHref: withAccountQuery("/settings?tab=channels&connect=flockposter", customer.id)
+        connectChannelsHref: withAccountQuery("/settings/channels?connect=flockposter", customer.id)
     }));
 });
 app.get("/agency", async (c) => {
@@ -11063,7 +11937,7 @@ app.get("/email-channels/confirm", async (c) => {
         <h1 style="overflow-wrap: anywhere;">${escapeHtml(title)}</h1>
         <p>${channel ? "Your email has been confirmed and can receive email tasks from Vidfarm." : "This confirmation link is invalid or has already been used."}</p>
         <div class="toolbar">
-          <a class="button" href="/settings?tab=channels">Go to settings</a>
+          <a class="button" href="/settings/channels">Go to settings</a>
           <a class="button secondary" href="/discover">Back to Discover</a>
         </div>
       </section>
@@ -12134,9 +13008,21 @@ app.use(`${USER_PREFIX}/me/*`, requireAuth);
 // is the public HTML gallery page (like /discover vs /discover/feed). Hono's
 // `/clips/*` also matches the bare `/clips`, so let that one path through
 // unauthenticated.
-const isClipsGalleryPage = (c) => c.req.path === CLIPS_PREFIX || c.req.path === `${CLIPS_PREFIX}/`;
-app.use(`${CLIPS_PREFIX}/*`, (c, next) => (isClipsGalleryPage(c) ? next() : requireAuth(c, next)));
-app.use(`${CLIPS_PREFIX}/*`, (c, next) => (isClipsGalleryPage(c) ? next() : captureApiCallHistory(c, next)));
+const isClipsGalleryPage = (c) => c.req.path === RAWS_PREFIX || c.req.path === `${RAWS_PREFIX}/`;
+app.use(`${RAWS_PREFIX}/*`, (c, next) => (isClipsGalleryPage(c) ? next() : requireAuth(c, next)));
+app.use(`${RAWS_PREFIX}/*`, (c, next) => (isClipsGalleryPage(c) ? next() : captureApiCallHistory(c, next)));
+// Deprecated /clips/* → /raws/* alias: transparently redispatch legacy paths so
+// existing skills, editor-chat prompts, and the devcli keep working during the
+// clips→raws rename. Remove once all callers emit /raws.
+const rawsCompatAlias = (c) => {
+    const url = new URL(c.req.url);
+    url.pathname = RAWS_PREFIX + url.pathname.slice(CLIPS_COMPAT_PREFIX.length);
+    // Redispatch through the app with just the rewritten request — do NOT forward
+    // c.executionCtx (its getter throws in the Node adapter when absent).
+    return app.fetch(new Request(url.toString(), c.req.raw));
+};
+app.all(CLIPS_COMPAT_PREFIX, rawsCompatAlias);
+app.all(`${CLIPS_COMPAT_PREFIX}/*`, rawsCompatAlias);
 app.use(AGENCY_PREFIX, requireAuth);
 app.use(`${AGENCY_PREFIX}/*`, requireAuth);
 app.use(`${API_PREFIX}/rate-limit-status`, requireAuth);
@@ -13171,38 +14057,58 @@ function countReadyPostMediaMatches(job, post) {
     return matches;
 }
 async function resolveReadyPostEditorHref(post, accountId) {
+    // "Edit Post" must land in the NEW /editor experience, never the retired
+    // /templates/:id/editor/docs editor. The /editor routes live at the top
+    // level and read the agency sub-account from the ?account= query param (there
+    // is no /u/:account/editor route), so account context is attached that way.
+    const withAccount = (path) => {
+        if (!accountId)
+            return path;
+        const sep = path.includes("?") ? "&" : "?";
+        return `${path}${sep}${ACCOUNT_QUERY_PARAM}=${encodeURIComponent(accountId)}`;
+    };
+    const editorForkHref = (templateId, forkId) => withAccount(`/editor/${encodeURIComponent(templateId)}/fork/${encodeURIComponent(forkId)}`);
+    // Bare editor: the route resolves (or mints) the caller's own fork.
+    const editorTemplateHref = (templateId) => withAccount(`/editor/${encodeURIComponent(templateId)}`);
+    // Fresh blank project in the new editor — used when nothing editable is
+    // linked to this post (e.g. a post approved straight from a primitive render
+    // with no composition fork or tracer).
+    const blankEditorHref = () => withAccount("/editor/original/fork/new");
+    // 1) Preferred: deep-link to the exact composition fork the post came from.
+    const compositionId = post.compositionId?.trim();
+    if (compositionId) {
+        const fork = await serverlessRecords.getCompositionFork(compositionId);
+        if (fork && !fork.deletedAt && fork.templateId) {
+            return editorForkHref(fork.templateId, fork.id);
+        }
+        // Some create paths stash a serverless template id in compositionId rather
+        // than a fork id — open the bare editor for that template.
+        if (compositionId.startsWith("template_")) {
+            return editorTemplateHref(compositionId);
+        }
+    }
+    // 2) Fall back to the tracer's most-relevant render job, but only when that
+    // job points at a serverless (template_) template the new editor can open.
+    // Legacy catalog jobs (plain-UUID templateIds) are skipped on purpose so we
+    // never route back into the old editor.
     const tracer = post.tracer?.trim();
-    const buildDocsHref = (templateId, tracers) => {
-        const params = new URLSearchParams();
-        if (accountId) {
-            params.set(ACCOUNT_QUERY_PARAM, accountId);
-        }
-        if (tracers) {
-            params.set("tracers", tracers);
+    if (tracer) {
+        const matchingJob = (await jobs.listJobsAsync({ customerId: post.customerId, tracer, limit: 100 }))
+            .filter((job) => job.templateId.startsWith("template_"))
+            .map((job) => ({
+            job,
+            score: (countReadyPostMediaMatches(job, post) * 1000)
+                + (job.parentJobId ? 0 : 120)
+                + (job.status === "succeeded" ? 30 : 0)
+        }))
+            .sort((a, b) => (b.score - a.score
+            || Date.parse(b.job.completedAt ?? b.job.updatedAt ?? b.job.createdAt) - Date.parse(a.job.completedAt ?? a.job.updatedAt ?? a.job.createdAt)))[0]?.job ?? null;
+        if (matchingJob && await serverlessRecords.getTemplate(matchingJob.templateId)) {
+            return editorTemplateHref(matchingJob.templateId);
         }
-        const suffix = params.size ? `?${params.toString()}` : "";
-        return `/templates/${encodeURIComponent(templateId)}/editor/docs${suffix}`;
-    };
-    if (!tracer) {
-        const firstTemplate = templateRegistry.list().find((template) => !template.id.startsWith("primitive:"));
-        return firstTemplate ? buildDocsHref(firstTemplate.id) : withAccountQuery("/templates", accountId);
     }
-    const candidates = (await jobs.listJobsAsync({ customerId: post.customerId, tracer, limit: 100 }))
-        .filter((job) => !job.templateId.startsWith("primitive:") && Boolean(templateRegistry.get(job.templateId)));
-    const matchingJob = candidates
-        .map((job) => ({
-        job,
-        score: (countReadyPostMediaMatches(job, post) * 1000)
-            + (job.parentJobId ? 0 : 120)
-            + (job.status === "succeeded" ? 30 : 0)
-    }))
-        .sort((a, b) => (b.score - a.score
-        || Date.parse(b.job.completedAt ?? b.job.updatedAt ?? b.job.createdAt) - Date.parse(a.job.completedAt ?? a.job.updatedAt ?? a.job.createdAt)))[0]?.job ?? null;
-    if (matchingJob) {
-        return buildDocsHref(matchingJob.templateId, tracer);
-    }
-    const firstTemplate = templateRegistry.list().find((template) => !template.id.startsWith("primitive:"));
-    return firstTemplate ? buildDocsHref(firstTemplate.id, tracer) : withAccountQuery("/templates", accountId);
+    // 3) Nothing editable is linked — open a fresh project in the new editor.
+    return blankEditorHref();
 }
 async function renderReadyPostPage(c, post, viewer) {
     const visiblePost = serializeReadyPost(c, post, { password: viewer.hasPasswordAccess ? viewer.password : null });
@@ -13232,7 +14138,7 @@ async function renderReadyPostPage(c, post, viewer) {
         error: scheduleChannels.error,
         feedEndpoint: viewer.canManage && viewer.customer ? withAccountQuery("/calendar/feed", viewer.customer.id) : null,
         scheduleEndpoint: viewer.canManage && viewer.customer ? scopedApprovedPostSchedulePath(viewer.customer.id, post.id) : null,
-        connectHref: viewer.customer ? withAccountQuery("/settings?tab=channels&connect=flockposter", viewer.customer.id) : "/settings?tab=channels&connect=flockposter",
+        connectHref: viewer.customer ? withAccountQuery("/settings/channels?connect=flockposter", viewer.customer.id) : "/settings/channels?connect=flockposter",
         userId: viewer.customer?.id ?? null
     };
     const shareUrl = viewer.canView
@@ -14052,6 +14958,282 @@ async function renderReadyPostPage(c, post, viewer) {
       gap: 8px;
       margin-top: 4px;
     }
+
+    /* ─────────────────────────────────────────────────────────────────────
+       farmville-saas-ux restyle (honey-gold accent, Hanken Grotesk display,
+       soft rounded white cards). SCOPED to .ready-post-shell so it never
+       leaks into other legacy pages, and placed last so it wins over both the
+       page-shell base CSS and the ready-post rules above. Structure + JS are
+       untouched — this is a pure visual reskin via token remap + component
+       overrides. Hanken Grotesk is loaded by a <link> in the page body.
+       ───────────────────────────────────────────────────────────────────── */
+    /* page canvas → clean warm-neutral farmville surface. Drops the old
+       beige/tan gradient + technical grid overlay baked into the base shell
+       <body> (which the .ready-post-shell scope can't reach). A whisper of
+       honey glow up top keeps the "sunny afternoon" warmth without the grid. */
+    body:has(.ready-post-shell) {
+      background:
+        radial-gradient(1150px 520px at 50% -12%, rgba(255, 199, 56, 0.10), transparent 62%),
+        linear-gradient(180deg, #fdfcf9 0%, #fbfaf6 46%, #f6f4ee 100%);
+      background-attachment: fixed;
+    }
+    body:has(.ready-post-shell)::before {
+      content: none;
+    }
+    @media (max-width: 1024px) {
+      body:has(.ready-post-shell) {
+        background-attachment: scroll;
+      }
+    }
+    .ready-post-shell {
+      --accent: #ffc738;
+      font-family: "Inter", "Manrope", sans-serif;
+      --accent-deep: #171717;
+      --accent-soft: rgba(255, 199, 56, 0.22);
+      --ink: #171717;
+      --muted: #6f6f70;
+      --line: #ededed;
+      --line-strong: #e0e0e0;
+      --bg: #fbfaf6;
+      --paper: #ffffff;
+      --paper-strong: #ffffff;
+      --panel-muted: #faf9f6;
+      --radius-lg: 24px;
+      --radius-md: 18px;
+      --radius-sm: 12px;
+      --shadow: 0 1px 2px rgba(0, 0, 0, 0.05), 0 18px 40px -20px rgba(0, 0, 0, 0.12);
+      --shadow-soft: 0 1px 2px rgba(0, 0, 0, 0.05), 0 10px 26px -16px rgba(0, 0, 0, 0.14);
+    }
+    .ready-post-shell h1,
+    .ready-post-shell h2,
+    .ready-post-shell .ready-post-schedule-head h2 {
+      font-family: "Hanken Grotesk", "Manrope", sans-serif;
+      font-weight: 800;
+      letter-spacing: -0.02em;
+      color: #171717;
+    }
+    /* buttons → honey-gold pill / white ghost / red danger */
+    .ready-post-shell .button,
+    .ready-post-shell button,
+    .ready-post-shell .link-button,
+    .ready-post-shell .cta-button {
+      border: 1px solid transparent;
+      border-radius: 999px;
+      background: #ffc738;
+      color: #171717;
+      font-family: "Hanken Grotesk", "Manrope", sans-serif;
+      font-weight: 700;
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
+    }
+    @media (hover: hover) {
+      .ready-post-shell .button:hover,
+      .ready-post-shell button:hover,
+      .ready-post-shell .link-button:hover {
+        background: #fcb900;
+        border-color: transparent;
+        transform: translateY(-1px);
+        box-shadow: 0 10px 22px -8px rgba(252, 185, 0, 0.55);
+      }
+    }
+    .ready-post-shell .button.secondary,
+    .ready-post-shell button.secondary,
+    .ready-post-shell .link-button.secondary {
+      background: #ffffff;
+      color: #171717;
+      border: 1px solid #e5e5e5;
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+    }
+    @media (hover: hover) {
+      .ready-post-shell .button.secondary:hover,
+      .ready-post-shell button.secondary:hover {
+        background: #ffffff;
+        border-color: #d4d4d4;
+        box-shadow: 0 4px 12px -6px rgba(0, 0, 0, 0.12);
+      }
+    }
+    .ready-post-shell .button.danger,
+    .ready-post-shell button.danger,
+    .ready-post-shell .ready-post-danger {
+      background: #ef4444;
+      color: #fff;
+      border-color: transparent;
+    }
+    .ready-post-shell button[disabled] {
+      opacity: 0.5;
+    }
+    /* inputs → soft farmville field, gold focus ring */
+    .ready-post-shell input,
+    .ready-post-shell select,
+    .ready-post-shell textarea {
+      border: 1px solid #e5e5e5;
+      border-radius: 12px;
+      background: #ffffff;
+      color: #171717;
+      box-shadow: none;
+    }
+    .ready-post-shell textarea {
+      border-radius: 16px;
+    }
+    .ready-post-shell input:focus,
+    .ready-post-shell select:focus,
+    .ready-post-shell textarea:focus {
+      border-color: #ffc738;
+      box-shadow: 0 0 0 3px rgba(255, 199, 56, 0.28);
+    }
+    /* tracer / status chip */
+    .ready-post-shell .pill {
+      background: #fff5e4;
+      color: #8a6d1f;
+      border: 1px solid #ffe9cc;
+      border-radius: 999px;
+      font-weight: 700;
+    }
+    /* cards / panels → white farmville card */
+    .ready-post-shell .ready-post-card,
+    .ready-post-shell .ready-post-panel {
+      background: #ffffff;
+      border: 1px solid #ededed;
+      border-radius: 24px;
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04), 0 12px 30px -18px rgba(0, 0, 0, 0.14);
+    }
+    /* copy + menu buttons → neutral ghost */
+    .ready-post-shell .ready-post-copy,
+    .ready-post-shell .ready-post-actions [data-menu-button] {
+      background: #ffffff;
+      border: 1px solid #e5e5e5;
+      color: #525252;
+      box-shadow: none;
+    }
+    .ready-post-shell .ready-post-copy[data-copied="true"] {
+      background: #dcfce7;
+      border-color: #86efac;
+      color: #15803d;
+      box-shadow: 0 0 0 3px rgba(34, 197, 94, 0.15);
+    }
+    .ready-post-shell .ready-post-menu {
+      border: 1px solid #ededed;
+      border-radius: 16px;
+      background: #ffffff;
+      box-shadow: 0 20px 40px -16px rgba(0, 0, 0, 0.22);
+    }
+    /* video/slides mode toggle → farmville pill toggle */
+    .ready-post-shell .ready-post-media-mode-toggle button.active {
+      background: #ffc738;
+      color: #171717;
+    }
+    /* login modal card */
+    .ready-post-shell .ready-post-login-modal-card {
+      border: 1px solid #ededed;
+      border-radius: 24px;
+      background: #ffffff;
+      box-shadow: 0 24px 60px -20px rgba(0, 0, 0, 0.3);
+    }
+    /* schedule modal → farmville surface + gold selected day */
+    .ready-post-shell .ready-post-schedule-modal {
+      border-radius: 24px;
+    }
+    /* ── de-saturate: structural buttons must NOT inherit the blanket gold ──
+       The broad gold button rule above is meant for primary
+       CTAs only, but it also painted calendar days, the channel-picker trigger,
+       channel rows and kebab-menu items gold (a wall of yellow). Restore their
+       neutral surfaces here (placed last so they win); only true primaries and
+       genuinely-selected states stay honey-gold. */
+    .ready-post-shell .ready-post-calendar-day {
+      background: #ffffff;
+      color: #3a3a3c;
+      border: 1px solid #ececec;
+      box-shadow: none;
+      font-weight: 700;
+    }
+    .ready-post-shell .ready-post-calendar-day.is-muted {
+      background: #faf9f6;
+      color: #b5b5b7;
+    }
+    .ready-post-shell .ready-post-calendar-day.has-posts {
+      background: rgba(83, 114, 89, 0.10);
+      border-color: rgba(83, 114, 89, 0.30);
+    }
+    .ready-post-shell .ready-post-calendar-day.has-many-posts {
+      background: rgba(255, 199, 56, 0.16);
+      border-color: rgba(255, 199, 56, 0.42);
+    }
+    @media (hover: hover) {
+      .ready-post-shell .ready-post-calendar-day:hover {
+        background: #fff8e8;
+        border-color: #ffc738;
+        transform: none;
+        box-shadow: none;
+      }
+    }
+    .ready-post-shell .ready-post-calendar-day.is-selected,
+    .ready-post-shell .ready-post-calendar-day.is-selected:hover {
+      background: #ffc738;
+      color: #171717;
+      border-color: transparent;
+    }
+    .ready-post-shell .ready-post-calendar-day.is-today {
+      border-color: #ffc738;
+    }
+    /* channel-picker trigger → neutral field, not a gold pill */
+    .ready-post-shell .ready-post-channel-trigger {
+      background: #ffffff;
+      color: #171717;
+      border: 1px solid #e5e5e5;
+      box-shadow: none;
+      font-weight: 600;
+    }
+    .ready-post-shell .ready-post-channel-trigger.is-placeholder {
+      color: #6f6f70;
+    }
+    @media (hover: hover) {
+      .ready-post-shell .ready-post-channel-trigger:hover {
+        background: #ffffff;
+        border-color: #d4d4d4;
+        transform: none;
+        box-shadow: none;
+      }
+    }
+    /* channel rows + kebab-menu items → transparent, gold tint only on hover/selected */
+    .ready-post-shell .ready-post-channel-option,
+    .ready-post-shell .ready-post-menu a,
+    .ready-post-shell .ready-post-menu button {
+      background: transparent;
+      color: #171717;
+      border: 0;
+      box-shadow: none;
+      font-weight: 600;
+    }
+    @media (hover: hover) {
+      .ready-post-shell .ready-post-channel-option:hover,
+      .ready-post-shell .ready-post-menu a:hover,
+      .ready-post-shell .ready-post-menu button:hover {
+        background: #fff5e4;
+        transform: none;
+        box-shadow: none;
+      }
+    }
+    .ready-post-shell .ready-post-channel-option.is-selected {
+      background: #fff5e4;
+    }
+    .ready-post-shell .ready-post-menu .ready-post-danger {
+      color: #dc2626;
+      font-weight: 700;
+    }
+    @media (hover: hover) {
+      .ready-post-shell .ready-post-menu .ready-post-danger:hover {
+        background: #fef2f2;
+      }
+    }
+    /* popover close chip stays a neutral ghost */
+    .ready-post-shell .ready-post-calendar-popover-close {
+      background: #ffffff;
+      color: #6f6f70;
+      border: 1px solid #e5e5e5;
+      box-shadow: none;
+    }
+    .ready-post-shell .ready-post-locked {
+      font-family: "Hanken Grotesk", "Manrope", sans-serif;
+    }
   `;
     const readyPostBody = viewer.canView ? `
     <section class="ready-post-frame">
@@ -14093,10 +15275,19 @@ async function renderReadyPostPage(c, post, viewer) {
         </footer>
       </div>
     </div>` : `<section class="ready-post-locked"><form method="get" action="${escapeAttribute(accountApprovedPostPath(post.customerId, post.id))}"><h1>Approved post</h1><p>Enter the share password to preview and download this approved post.</p><input name="password" type="password" value="${escapeAttribute(DEFAULT_APPROVED_POST_VIEW_PASSWORD)}" autofocus autocomplete="current-password"><button type="submit">View post</button></form></section>`;
+    const socialImage = thumbnail?.url ?? slides[0]?.url;
+    const socialDescription = post.caption?.trim() || undefined;
     return c.html(renderPageShell({
         title: post.title ?? "Approved post",
         shellClass: "ready-post-shell",
+        description: socialDescription,
+        social: {
+            image: socialImage,
+            url: shareUrl,
+            type: primaryVideo ? "video.other" : "website"
+        },
         body: `
+      <link href="https://fonts.googleapis.com/css2?family=Hanken+Grotesk:wght@500;600;700;800&family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
       ${readyPostBody}
   <script id="ready-post-data" type="application/json">${escapeJsonForHtml(serialized)}</script>
   <script id="ready-post-zip-data" type="application/json">${escapeJsonForHtml({
@@ -16113,7 +17304,7 @@ app.post(`${USER_PREFIX}/me/temporary-files/presign`, async (c) => {
         const body = userTemporaryFilePresignSchema.parse(await c.req.json());
         const fileName = sanitizeFileName(body.file_name);
         const contentType = body.content_type?.trim() || inferAttachmentContentType(fileName);
-        const folderPath = sanitizeStorageSubpath(body.folder_path);
+        const folderPath = withTempDateFolder(sanitizeStorageSubpath(body.folder_path));
         if (!isAllowedAttachment(fileName, contentType)) {
             return c.json({ error: `Unsupported temporary file type: ${fileName}` }, 400);
         }
@@ -16171,7 +17362,7 @@ app.post(`${USER_PREFIX}/me/temporary-files/upload`, async (c) => {
         }
         const fileName = sanitizeFileName(file.name || "upload.bin");
         const contentType = file.type || inferAttachmentContentType(fileName);
-        const folderPath = sanitizeStorageSubpath(String(formData.get("folder_path") ?? ""));
+        const folderPath = withTempDateFolder(sanitizeStorageSubpath(String(formData.get("folder_path") ?? "")));
         if (!isAllowedAttachment(fileName, contentType)) {
             return c.json({ error: `Unsupported temporary file type: ${fileName}` }, 400);
         }
@@ -16293,6 +17484,189 @@ app.delete(`${USER_PREFIX}/me/temporary-files/:fileId`, async (c) => {
     await serverlessRecords.deleteUserTemporaryFile(customer.id, file.id);
     return c.json({ ok: true, file_id: file.id });
 });
+// ── Unified file directory ───────────────────────────────────────────────────
+// The first-class, navigable view over all three file backends as one tree:
+//   /files  → My Files attachments   /temp → temp scratch   /raws → clip library
+// Both the reskin explorer UI and the AI chat agent browse through here, so a
+// path like /raws/product-demos is a real, copyable, agent-addressable location.
+// GET /me/directory?path=/raws/demos → folders[] + files[] under that path.
+// path "/" (or omitted) lists the three roots as folders.
+app.get(`${USER_PREFIX}/me/directory`, async (c) => {
+    const customer = requireCustomer(c);
+    const parsed = parseDirectoryPath(c.req.query("path") ?? "");
+    if (!parsed.root) {
+        return c.json({ path: "/", root: null, folders: directoryRootFolders(), files: [], next_offset: null });
+    }
+    const limit = clampPageLimit(Number(c.req.query("limit") || "200"), 500);
+    const offset = Math.max(0, Math.trunc(Number(c.req.query("offset") || "0")) || 0);
+    // Exact shot-kind filter (raws only): comma-separated OR set of content_type tags.
+    const contentTypes = (c.req.query("content_type") || "")
+        .split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
+    try {
+        const { folders, files } = await listDirectoryFolder(c, customer.id, parsed.root, parsed.folderPath);
+        const filtered = (parsed.root === "raws" && contentTypes.length)
+            ? files.filter((f) => {
+                const tags = (f.meta && f.meta.tags) || null;
+                const ct = Array.isArray(tags?.content_type) ? tags?.content_type : [];
+                return ct.some((x) => contentTypes.includes(String(x).toLowerCase()));
+            })
+            : files;
+        const page = filtered.slice(offset, offset + limit);
+        const nextOffset = filtered.length > offset + limit ? offset + limit : null;
+        return c.json({
+            path: buildDirectoryPath(parsed.root, parsed.folderPath),
+            root: parsed.root,
+            folders,
+            files: page,
+            next_offset: nextOffset
+        });
+    }
+    catch (error) {
+        return c.json({ error: error instanceof Error ? error.message : "Unable to list directory." }, 400);
+    }
+});
+// POST /me/directory/search { query, path?, mode?, limit? }
+// Unified search combining semantic (vector), substring, and absolute-path
+// matching across the in-scope roots. `path` narrows scope to one root/folder;
+// `mode` ∈ auto|semantic|substring|path (default auto = all three signals).
+function directoryPathContains(itemPath, query) {
+    return itemPath.toLowerCase().includes(query.toLowerCase());
+}
+app.post(`${USER_PREFIX}/me/directory/search`, async (c) => {
+    const customer = requireCustomer(c);
+    try {
+        const body = (await c.req.json().catch(() => ({})));
+        const query = (body.query ?? "").trim();
+        if (!query)
+            return c.json({ error: "Provide a search query." }, 400);
+        const limit = Math.max(1, Math.min(50, Number(body.limit) || 20));
+        // Exact shot-kind filter applied to the /raws branch only.
+        const contentTypes = (body.content_type || "")
+            .split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
+        const parsed = parseDirectoryPath(body.path ?? "");
+        const scopeRoots = parsed.root ? [parsed.root] : DIRECTORY_ROOT_KEYS;
+        const scopeFolder = normalizeFolderPath(parsed.folderPath);
+        const inScopeFolder = (fp) => !scopeFolder || (normalizeFolderPath(fp) + "/").indexOf(scopeFolder + "/") === 0;
+        const mode = ["semantic", "substring", "path"].includes(String(body.mode)) ? body.mode : "auto";
+        const wantSemantic = mode === "auto" || mode === "semantic";
+        const wantSubstring = mode === "auto" || mode === "substring";
+        const wantPath = mode === "auto" || mode === "path";
+        const scored = [];
+        let semanticUsed = false;
+        // ── /files: notes embedding (semantic) + name/folder/notes substring ──────
+        if (scopeRoots.includes("files")) {
+            const atts = (await serverlessRecords.listUserAttachments(customer.id)).filter((a) => inScopeFolder(a.folderPath));
+            let queryEmbedding;
+            if (wantSemantic) {
+                try {
+                    const embedder = await buildFileNotesEmbedder(customer.id);
+                    if (embedder)
+                        queryEmbedding = await embedder.embedQuery(query);
+                }
+                catch (error) {
+                    devLog("directory_search.files_embed_failed", devErrorFields(error));
+                }
+            }
+            if (queryEmbedding)
+                semanticUsed = true;
+            for (const a of atts) {
+                const item = attachmentToDirectoryItem(c, a);
+                let score = 0;
+                let sem = false;
+                if (queryEmbedding && Array.isArray(a.notesEmbedding) && a.notesEmbedding.length > 0) {
+                    const sim = cosineSimilarity(a.notesEmbedding, queryEmbedding);
+                    if (sim > 0) {
+                        score += sim;
+                        sem = true;
+                    }
+                }
+                if (wantSubstring && attachmentKeywordMatch(a, query))
+                    score += 0.5;
+                if (wantPath && directoryPathContains(item.path, query))
+                    score += 0.6;
+                if (score > 0)
+                    scored.push({ item, score, semantic: sem });
+            }
+        }
+        // ── /temp: no embeddings → substring + absolute-path only ─────────────────
+        if (scopeRoots.includes("temp")) {
+            const files = (await serverlessRecords.listUserTemporaryFiles(customer.id)).filter((f) => inScopeFolder(f.folderPath));
+            for (const f of files) {
+                const item = temporaryFileToDirectoryItem(c, f);
+                let score = 0;
+                if (wantSubstring && attachmentKeywordMatch(f, query))
+                    score += 0.5;
+                if (wantPath && directoryPathContains(item.path, query))
+                    score += 0.6;
+                if (score > 0)
+                    scored.push({ item, score, semantic: false });
+            }
+        }
+        // ── /raws: semantic-first clip search, or keyword/path filter otherwise ────
+        if (scopeRoots.includes("raws")) {
+            if (wantSemantic) {
+                let queryEmbedding;
+                try {
+                    const embedder = await buildMatchEmbedder(customer.id);
+                    if (embedder)
+                        [queryEmbedding] = await embedder.embedQueries([query]);
+                }
+                catch (error) {
+                    devLog("directory_search.raws_embed_failed", devErrorFields(error));
+                }
+                if (queryEmbedding)
+                    semanticUsed = true;
+                const hits = await searchUserClips(customer.id, {
+                    criteria: { semantic_text: query, ...(contentTypes.length ? { content_type: contentTypes } : {}) },
+                    queryEmbedding,
+                    limit: limit * 3
+                });
+                for (const h of hits) {
+                    if (!inScopeFolder(h.clip.folder_path))
+                        continue;
+                    const item = clipSerializedToDirectoryItem(await serializeClip(h.clip));
+                    scored.push({ item, score: h.similarity ?? h.score ?? 0.1, semantic: Boolean(queryEmbedding) });
+                }
+            }
+            else {
+                const clips = (await clipRecords.listClips(customer.id, { limit: 5000 }))
+                    .filter((cl) => inScopeFolder(cl.folder_path))
+                    .filter((cl) => !contentTypes.length || (cl.tags?.content_type ?? []).some((ct) => contentTypes.includes(String(ct).toLowerCase())));
+                for (const cl of clips) {
+                    const kw = wantSubstring && clipKeywordMatch(cl, query);
+                    const item = clipSerializedToDirectoryItem(await serializeClip(cl));
+                    const pm = wantPath && directoryPathContains(item.path, query);
+                    if (kw || pm)
+                        scored.push({ item, score: (kw ? 0.5 : 0) + (pm ? 0.6 : 0), semantic: false });
+                }
+            }
+        }
+        scored.sort((x, y) => y.score - x.score);
+        const results = scored.slice(0, limit).map((s) => ({ ...s.item, score: s.score }));
+        return c.json({ results, query, mode, scope: parsed.root ?? "all", semantic: semanticUsed });
+    }
+    catch (error) {
+        return c.json({ error: error instanceof Error ? error.message : "Directory search failed." }, 400);
+    }
+});
+// POST /me/directory/folders { path } — create an empty folder at a canonical
+// path (e.g. /files/brand-assets, /raws/demos). Persisted as a user_file_folder
+// record scoped to the root, so it shows up in listings before any file lands.
+app.post(`${USER_PREFIX}/me/directory/folders`, async (c) => {
+    const customer = requireCustomer(c);
+    try {
+        const body = (await c.req.json().catch(() => ({})));
+        const parsed = parseDirectoryPath(body.path ?? "");
+        if (!parsed.root || !parsed.folderPath) {
+            return c.json({ error: "Provide a folder path under a root, e.g. /files/brand-assets or /raws/demos." }, 400);
+        }
+        await serverlessRecords.createUserFileFolder(customer.id, directoryFolderScope(parsed.root), parsed.folderPath);
+        return c.json({ ok: true, path: buildDirectoryPath(parsed.root, parsed.folderPath), root: parsed.root, folder_path: parsed.folderPath });
+    }
+    catch (error) {
+        return c.json({ error: error instanceof Error ? error.message : "Unable to create folder." }, 400);
+    }
+});
 app.post(`${USER_PREFIX}/me/developer/preview-media/presign`, async (c) => {
     try {
         const customer = requireCustomer(c);
@@ -17045,7 +18419,7 @@ function clipKeywordMatch(clip, q) {
 // GET /clips — the Clips gallery, rendered in the same shell as the rest of the
 // frontend and reached via the Library page's "Finished / Clips" toggle. The
 // client fetches /clips/feed with the session cookie (mirrors /discover vs /feed).
-app.get(CLIPS_PREFIX, async (c) => {
+app.get(RAWS_PREFIX, async (c) => {
     const customer = await getPreferredBrowserCustomer(c);
     if (!customer) {
         return redirect(c, "/login");
@@ -17058,21 +18432,76 @@ app.get(CLIPS_PREFIX, async (c) => {
         editorChat: await buildClipsEditorChatBoot({ customer })
     }));
 });
-// GET /clips/feed — the caller's clip library as JSON (optional ?source, ?q, ?limit).
-app.get(`${CLIPS_PREFIX}/feed`, async (c) => {
+// GET /clips/feed — the caller's clip library as JSON (optional ?source, ?q,
+// ?content_type, ?limit, ?offset). ?content_type is an exact tag filter
+// (comma-separated = OR) over each raw's content_type tags — the /library/raws
+// content-type chips use it for real structured filtering, distinct from ?q
+// semantic/keyword search. ?offset pages the (descending) result set for the
+// chat file browser; the response carries next_offset (null when exhausted).
+app.get(`${RAWS_PREFIX}/feed`, async (c) => {
     const customer = requireCustomer(c);
     const limit = clampPageLimit(Number(c.req.query("limit") || "60"), 200);
+    const offset = Math.max(0, Math.trunc(Number(c.req.query("offset") || "0")) || 0);
     const q = c.req.query("q")?.trim();
+    const contentTypes = (c.req.query("content_type") || "")
+        .split(",")
+        .map((s) => s.trim().toLowerCase())
+        .filter(Boolean);
+    // ?folder= scopes the feed to one virtual Raws subfolder (exact match, or ""
+    // for the raws root) — the directory browser navigates with it.
+    const folderParam = c.req.query("folder");
+    const folderScoped = folderParam != null;
+    const folder = normalizeFolderPath(folderParam ?? "");
+    const narrowed = Boolean(q) || contentTypes.length > 0 || folderScoped;
+    // Unfiltered: load only up to the page window (+1 to detect a next page),
+    // capped so a huge library never pulls unbounded. Filtered paths must scan a
+    // wider set before slicing, since the filter runs in memory.
+    const loadLimit = narrowed ? 5000 : Math.min(offset + limit + 1, 2000);
     let clips = await clipRecords.listClips(customer.id, {
         sourceVideoId: c.req.query("source") || undefined,
-        limit: q ? 5000 : limit
+        limit: loadLimit
     });
+    // Derive the folder tree from every loaded clip BEFORE the folder scope trims
+    // the set (so the browser can see sibling folders). Complete whenever the load
+    // scanned the whole library (all narrowed paths do).
+    const folders = buildFolderList(clips.map((clip) => ({ folderPath: clip.folder_path })));
+    if (contentTypes.length) {
+        clips = clips.filter((clip) => (clip.tags.content_type ?? []).some((ct) => contentTypes.includes(ct)));
+    }
+    if (folderScoped) {
+        clips = clips.filter((clip) => normalizeFolderPath(clip.folder_path) === folder);
+    }
     if (q)
-        clips = clips.filter((clip) => clipKeywordMatch(clip, q)).slice(0, limit);
-    return c.json({ clips: await Promise.all(clips.map(serializeClip)) });
+        clips = clips.filter((clip) => clipKeywordMatch(clip, q));
+    const page = clips.slice(offset, offset + limit);
+    const nextOffset = clips.length > offset + limit ? offset + limit : null;
+    return c.json({ clips: await Promise.all(page.map(serializeClip)), folders, next_offset: nextOffset });
+});
+// PATCH /raws/:clipId — move a clip between virtual Raws folders (or to the
+// root with folder_path: ""). Registered before other /raws/:param routes so a
+// literal like "feed"/"search" never matches as a clip id (those are GET/POST).
+app.patch(`${RAWS_PREFIX}/:clipId`, async (c) => {
+    const customer = requireCustomer(c);
+    try {
+        const body = (await c.req.json().catch(() => ({})));
+        if (typeof body.folder_path !== "string") {
+            return c.json({ error: "Provide folder_path (\"\" moves to the raws root)." }, 400);
+        }
+        const clipId = c.req.param("clipId");
+        const existing = await clipRecords.getClip(customer.id, clipId);
+        if (!existing)
+            return c.json({ error: "Raw not found." }, 404);
+        const folderPath = normalizeFolderPath(body.folder_path);
+        await clipRecords.updateClipFolder(customer.id, clipId, folderPath);
+        const updated = await clipRecords.getClip(customer.id, clipId);
+        return c.json({ ok: true, clip: updated ? await serializeClip(updated) : null });
+    }
+    catch (error) {
+        return c.json({ error: error instanceof Error ? error.message : "Unable to move raw." }, 400);
+    }
 });
 // POST /clips/search — hybrid structured + semantic search.
-app.post(`${CLIPS_PREFIX}/search`, async (c) => {
+app.post(`${RAWS_PREFIX}/search`, async (c) => {
     const customer = requireCustomer(c);
     try {
         const body = (await c.req.json().catch(() => ({})));
@@ -17120,7 +18549,7 @@ function normalizeMatchScene(s, index) {
 }
 // POST /clips/match — find the top library clips that could REPLACE one scene.
 // Body: a scene annotation, or {criteria, embedding_text|text, limit}.
-app.post(`${CLIPS_PREFIX}/match`, async (c) => {
+app.post(`${RAWS_PREFIX}/match`, async (c) => {
     const customer = requireCustomer(c);
     try {
         const body = (await c.req.json().catch(() => ({})));
@@ -17143,7 +18572,7 @@ app.post(`${CLIPS_PREFIX}/match`, async (c) => {
 // POST /clips/match-scenes — batch: take a decomposed video's scene annotations
 // and return the top replacement-clip matches per scene (one library read).
 // Body: { scenes | annotations: SceneAnnotation[], limit? }.
-app.post(`${CLIPS_PREFIX}/match-scenes`, async (c) => {
+app.post(`${RAWS_PREFIX}/match-scenes`, async (c) => {
     const customer = requireCustomer(c);
     try {
         const body = (await c.req.json());
@@ -17184,10 +18613,11 @@ app.post(`${CLIPS_PREFIX}/match-scenes`, async (c) => {
 // pipeline runs the hunt and GET /clips/scan/:scanId polls it. Billing is AWS
 // compute only (clip_scan_lambda + step_functions_standard) — the AI spend is
 // the caller's own provider key (BYOK) and is never wallet-billed.
-app.post(`${CLIPS_PREFIX}/scan`, async (c) => {
+app.post(`${RAWS_PREFIX}/scan`, async (c) => {
     const customer = requireCustomer(c);
     try {
         const body = (await c.req.json());
+        const importOnly = body.import_only === true;
         const guidancePrompt = body.prompt?.trim() || "";
         // Build the hunt spec: explicit structured fields win, the free "what to
         // clip for" prompt fills the gaps (duration band, vertical/aspect, no-text).
@@ -17198,7 +18628,7 @@ app.post(`${CLIPS_PREFIX}/scan`, async (c) => {
         if (sourceUrl && !/^https?:\/\//i.test(sourceUrl)) {
             return c.json({ error: "That doesn't look like a valid video URL." }, 400);
         }
-        const huntSpec = normalizeHuntSpec({
+        let huntSpec = normalizeHuntSpec({
             ...(body.hunt_spec && typeof body.hunt_spec === "object" ? body.hunt_spec : {}),
             ...(body.ranges != null ? { ranges: body.ranges } : {}),
             ...(body.target_duration_sec != null ? { target_duration_sec: body.target_duration_sec } : {}),
@@ -17219,8 +18649,15 @@ app.post(`${CLIPS_PREFIX}/scan`, async (c) => {
             huntSpec.aspect = parsedPrompt.aspect;
         if (!huntSpec.avoid_text && parsedPrompt.avoid_text)
             huntSpec.avoid_text = true;
+        if (!huntSpec.max_clips && parsedPrompt.max_clips)
+            huntSpec.max_clips = parsedPrompt.max_clips;
         if (!huntSpec.source_url && sourceUrl)
             huntSpec.source_url = sourceUrl;
+        // Fill the unspecified-prompt mining defaults (5–15s clips, vertical 9:16,
+        // avoid on-screen text). Explicit user/prompt choices above already won;
+        // this only fills the gaps. Skipped for import_only (no mining happens).
+        if (!importOnly)
+            huntSpec = applyHuntSpecDefaults(huntSpec);
         // Uploaded-source hunts: resolve a temp-folder file (the canonical home for
         // hunt originals — 30-day TTL) or a My Files attachment to its S3 key.
         let resolvedS3Key = readNonEmptyString(body.s3_key) ?? undefined;
@@ -17295,6 +18732,33 @@ app.post(`${CLIPS_PREFIX}/scan`, async (c) => {
             pipeline: input.pipeline,
             pipeline_deployed: cloudPipeline
         }, 202);
+        // ── Import individual video (no clip mining) ─────────────────────────────
+        // The Import Source modal's unchecked "Clip raws" box: just pull the source
+        // into the raws library as ONE whole-video raw. No BYOK key, no AI tagging,
+        // no wallet bill. Runs inline (awaited) so it's reliable on Lambda, then
+        // returns a "complete" scan the poller sees immediately.
+        if (importOnly) {
+            const importSourcePath = resolvedS3Key ? storage.getLocalPath(resolvedS3Key) : null;
+            if (resolvedS3Key && (!importSourcePath || !existsSync(importSourcePath)) && !huntSpec.source_url) {
+                return c.json({ error: "That upload isn't reachable for a direct import — pass source_url instead." }, 400);
+            }
+            await putScanRecords({ scanStatus: "running" });
+            try {
+                await importWholeVideoAsRaw({
+                    ownerId: customer.id,
+                    scanId,
+                    sourceVideoId,
+                    filename,
+                    tracer,
+                    localSourcePath: importSourcePath && existsSync(importSourcePath) ? importSourcePath : null,
+                    sourceUrl: huntSpec.source_url ?? null
+                });
+            }
+            catch (error) {
+                return c.json({ error: error instanceof Error ? error.message : "Could not import that video." }, 502);
+            }
+            return scanResponse({ status: "complete", pipeline: "local" });
+        }
         if (cloudPipeline) {
             // ── Deployed pipeline (Lambda + Step Functions): BYOK API keys only ──
             if (choice === "agent") {
@@ -17503,7 +18967,7 @@ app.post(`${CLIPS_PREFIX}/scan`, async (c) => {
 // GET /clips/scan-options — what the Import Source modal can run a hunt with:
 // which BYOK providers have saved keys, whether a local agent CLI is available
 // (vidfarm serve boxes only), what "auto" resolves to, and where the hunt runs.
-app.get(`${CLIPS_PREFIX}/scan-options`, async (c) => {
+app.get(`${RAWS_PREFIX}/scan-options`, async (c) => {
     const customer = requireCustomer(c);
     const keys = await loadCustomerVisionKeys(customer.id);
     const cloudPipeline = Boolean(config.VIDFARM_CLIP_SCAN_STATE_MACHINE_ARN);
@@ -17524,7 +18988,11 @@ app.get(`${CLIPS_PREFIX}/scan-options`, async (c) => {
 });
 function looksLikeDirectVideoUrl(url) {
     try {
-        return /\.(mp4|mov|m4v|webm|mkv)$/i.test(new URL(url).pathname);
+        const u = new URL(url);
+        // Match a video extension in the path OR a query value (signed/CDN links
+        // often carry the real filename as `?file=clip.mp4` with a path-less route).
+        return /\.(mp4|mov|m4v|webm|mkv)(\?|$)/i.test(u.pathname) ||
+            /\.(mp4|mov|m4v|webm|mkv)(&|$)/i.test(u.search);
     }
     catch {
         return false;
@@ -17533,10 +19001,13 @@ function looksLikeDirectVideoUrl(url) {
 // Local URL ingest for serve-box hunts: direct video links download straight;
 // social URLs (TikTok/YouTube/IG/X) resolve through the same RapidAPI
 // downloader the video_download primitive uses (needs RAPIDAPI_KEY locally).
+// Returns the local path plus the source's human title (when RapidAPI gives one)
+// so callers can name the raw/folder something better than a bare URL slug.
 async function ingestClipSourceUrlLocally(sourceUrl, workDir) {
     if (!sourceUrl)
         throw new Error("Clip scan needs a source video.");
     let mediaUrl = sourceUrl;
+    let title = null;
     if (!looksLikeDirectVideoUrl(sourceUrl)) {
         const apiKey = (config.RAPIDAPI_KEY || "").trim();
         if (!apiKey) {
@@ -17554,11 +19025,14 @@ async function ingestClipSourceUrlLocally(sourceUrl, workDir) {
         if (!lookupRes.ok)
             throw new Error(`Video download lookup failed with HTTP ${lookupRes.status}.`);
         const lookup = (await lookupRes.json());
-        const playable = (lookup.medias ?? []).filter((m) => m.url && m.videoAvailable !== false && (m.type ? /video/i.test(m.type) : true));
-        const chosen = playable.find((m) => (m.extension ?? "").toLowerCase() === "mp4" || /\.mp4(\?|$)/i.test(m.url ?? "")) ?? playable[0];
+        // Pick the HIGHEST-resolution playable MP4 (not just the first one) so the
+        // ingested source — and every clip cut from it — is as high-quality as the
+        // provider offers.
+        const chosen = pickBestVideoMedia(lookup.medias ?? []);
         if (!chosen?.url)
             throw new Error("Video download lookup returned no playable MP4 media URL.");
         mediaUrl = chosen.url;
+        title = typeof lookup.title === "string" && lookup.title.trim() ? lookup.title.trim() : null;
     }
     const localPath = path.join(workDir, "ingest", "source.mp4");
     mkdirSync(path.dirname(localPath), { recursive: true });
@@ -17566,7 +19040,148 @@ async function ingestClipSourceUrlLocally(sourceUrl, workDir) {
     if (!res.ok || !res.body)
         throw new Error(`Source video download failed with HTTP ${res.status}.`);
     await streamPipeline(Readable.fromWeb(res.body), createWriteStream(localPath));
-    return localPath;
+    return { videoPath: localPath, title };
+}
+// Record the RapidAPI social-download cost for an in-process URL ingest (the
+// whole-video import path bypasses the clip-scan Lambda, which is where this
+// third-party cost is normally billed). Mirrors the Lambda's cost center +
+// idempotency key so a retry never double-bills. Non-fatal.
+async function recordRapidApiIngestCost(input) {
+    // Direct .mp4 links never touch RapidAPI, so there's nothing to bill.
+    if (!input.sourceUrl || looksLikeDirectVideoUrl(input.sourceUrl))
+        return;
+    try {
+        await billing.record({
+            customerId: input.ownerId,
+            jobId: input.scanId,
+            tracer: input.tracer ?? null,
+            templateId: "clips/scan",
+            type: "cpu_estimate",
+            costUsd: config.RAPIDAPI_VIDEO_DOWNLOAD_BASE_COST_USD,
+            costCenterSlug: "rapidapi_video_download",
+            idempotencyKey: `rapidapi_video_download:${input.scanId}`,
+            occurredAtMs: Date.now(),
+            metadata: { operation: "clip_import_ingest", source_url: input.sourceUrl }
+        });
+    }
+    catch (error) {
+        devLog("clip_import.ingest_billing_failed", { scan_id: input.scanId, ...devErrorFields(error) }, "warn");
+    }
+}
+// Import a whole video as a SINGLE raw — the plain "import individual video"
+// path behind the Import Source modal's unchecked "Clip raws" box. Ingests the
+// source (direct link or RapidAPI social download), probes its duration, cuts
+// one thumbnail, and writes ONE clip record spanning the entire video. No BYOK
+// key, no AI tagging, no wallet bill. Awaited by the caller so it completes
+// inside the request (reliable on Lambda, which freezes detached work).
+async function importWholeVideoAsRaw(input) {
+    const workRoot = path.join(config.VIDFARM_DATA_DIR, "clip-scans", input.scanId);
+    const touchScan = async (patch) => {
+        const scan = await clipRecords.getScan(input.ownerId, input.scanId);
+        if (scan)
+            await clipRecords.putScan({ ...scan, ...patch, updated_at: nowIso() });
+    };
+    const touchSource = async (patch) => {
+        const source = await clipRecords.getSource(input.ownerId, input.sourceVideoId);
+        if (source)
+            await clipRecords.putSource({ ...source, ...patch, updated_at: nowIso() });
+    };
+    try {
+        mkdirSync(workRoot, { recursive: true });
+        let videoPath = input.localSourcePath;
+        let ingestedTitle = null;
+        if (!videoPath) {
+            const ingested = await ingestClipSourceUrlLocally(input.sourceUrl ?? "", workRoot);
+            videoPath = ingested.videoPath;
+            ingestedTitle = ingested.title;
+            // URL ingest hits RapidAPI (same third-party cost the clip-scan Lambda
+            // bills on its own ingest); the whole-video path skips the Lambda, so
+            // record the download here or it goes unbilled. Non-fatal on failure.
+            await recordRapidApiIngestCost({
+                ownerId: input.ownerId,
+                scanId: input.scanId,
+                tracer: input.tracer,
+                sourceUrl: input.sourceUrl ?? ""
+            });
+        }
+        const probe = await probeVideo(videoPath);
+        const durationSec = probe.duration_sec || 0;
+        await touchSource({ status: "scanning", duration_sec: durationSec });
+        // A RapidAPI title beats a URL-slug filename for the raw's description and
+        // its source-folder name in the /library/raws explorer.
+        const displayName = ingestedTitle || input.filename;
+        const clipId = createIdV7("clip");
+        const clipKey = `clips/${input.ownerId}/${clipId}.mp4`;
+        // Stream the source to storage instead of readFileSync-into-Buffer — whole
+        // videos can be hundreds of MB and would otherwise pin the entire file in
+        // memory on the request Lambda.
+        await storage.putFile(clipKey, videoPath, "video/mp4");
+        let thumbKey = "";
+        const thumbLocal = path.join(workRoot, `${clipId}.jpg`);
+        const wroteThumb = await extractThumbnail({
+            videoPath,
+            scene: { index: 0, start_time_sec: 0, end_time_sec: durationSec, duration_sec: durationSec },
+            outPath: thumbLocal
+        }).catch(() => false);
+        if (wroteThumb && existsSync(thumbLocal)) {
+            thumbKey = `thumbs/${input.ownerId}/${clipId}.jpg`;
+            await storage.putFile(thumbKey, thumbLocal, "image/jpeg");
+        }
+        const clip = {
+            clip_id: clipId,
+            source_video_id: input.sourceVideoId,
+            source_filename: displayName,
+            start_time_sec: 0,
+            end_time_sec: durationSec,
+            duration_sec: durationSec,
+            file_path: clipKey,
+            thumbnail_path: thumbKey,
+            tags: { content_type: [], subject: [], action: [], emotion: [], setting: [], composition: [], motion: [], energy: "", audio_type: [], transcript: "" },
+            description: displayName,
+            taxonomy_version: ACTIVE_TAXONOMY_VERSION,
+            tier: "flash-lite",
+            tracer: input.tracer,
+            // Default into a source-derived Raws subfolder (canonical `/raws/<slug>`).
+            folder_path: normalizeFolderPath(String(displayName || "")
+                .toLowerCase()
+                .replace(/\.[a-z0-9]+$/i, "")
+                .replace(/[^a-z0-9]+/g, "-")
+                .replace(/^-+|-+$/g, "")
+                .slice(0, 60)),
+            owner_id: input.ownerId,
+            created_at: nowIso()
+        };
+        // Best-effort semantic-search embedding of the title/description so an
+        // imported whole video is findable by meaning (not just visible in its
+        // folder). No AI tagging call, no wallet bill — fail-soft when the owner
+        // has no embed-capable key (keyword-only, as before).
+        try {
+            const embedder = await buildClipLibraryEmbedder(input.ownerId);
+            if (embedder?.embeddingModelId) {
+                const [vector] = await embedder.embedDocuments([buildClipEmbeddingText(clip.tags, clip.description)]);
+                if (vector?.length) {
+                    clip.embedding = vector;
+                    clip.embedding_model = embedder.embeddingModelId;
+                }
+            }
+        }
+        catch (error) {
+            devLog("clip_import.embed_failed", { scan_id: input.scanId, ...devErrorFields(error) }, "warn");
+        }
+        await clipRecords.putClip(clip);
+        await vectorIndex.upsert(input.ownerId, clip).catch(() => undefined);
+        await touchSource({ status: "complete", clip_count: 1, filename: displayName });
+        await touchScan({ status: "complete" });
+    }
+    catch (error) {
+        devLog("clip_import.failed", { scan_id: input.scanId, ...devErrorFields(error) }, "error");
+        await touchSource({ status: "failed" }).catch(() => undefined);
+        await touchScan({ status: "failed", error: error instanceof Error ? error.message : String(error) }).catch(() => undefined);
+        throw error;
+    }
+    finally {
+        rmSync(workRoot, { recursive: true, force: true });
+    }
 }
 // In-process clip hunt for `vidfarm serve` boxes (no Step Functions worker).
 // Mirrors the clip-scan Lambda pipeline — ingest → probe/detect → refine →
@@ -17587,7 +19202,7 @@ async function runClipScanInProcess(input) {
     };
     try {
         mkdirSync(workRoot, { recursive: true });
-        const videoPath = input.localSourcePath ?? (await ingestClipSourceUrlLocally(input.sourceUrl ?? "", workRoot));
+        const videoPath = input.localSourcePath ?? (await ingestClipSourceUrlLocally(input.sourceUrl ?? "", workRoot)).videoPath;
         const probe = await probeVideo(videoPath);
         await touchSource({ status: "scanning", duration_sec: probe.duration_sec });
         const spec = input.huntSpec;
@@ -17604,6 +19219,9 @@ async function runClipScanInProcess(input) {
                 ? { aspect: spec.aspect, focus: normalizeCropFocus(spec.crop_focus) }
                 : undefined
         };
+        // Aim for a distinct, density-bounded set (default ~10 clips / 10 min) over
+        // the effective (windowed) source duration.
+        const targetClipCount = resolveTargetClipCount(effectiveHuntDurationSec(probe.duration_sec, spec.windows), spec);
         let stored = 0;
         await scanVideo({
             ctx,
@@ -17611,6 +19229,7 @@ async function runClipScanInProcess(input) {
             probe,
             windows: spec.windows,
             durationBand: spec.duration_band ?? null,
+            targetClipCount,
             sourceVideoId: input.sourceVideoId,
             sourceFilename: input.filename,
             ownerId: input.ownerId,
@@ -17748,7 +19367,7 @@ async function mirrorUpstreamClipsToLocal(input) {
     await clipRecords.putScan({ ...(current ?? scan), status: "complete", updated_at: nowIso() });
 }
 // GET /clips/scan/:scanId — poll scan status.
-app.get(`${CLIPS_PREFIX}/scan/:scanId`, async (c) => {
+app.get(`${RAWS_PREFIX}/scan/:scanId`, async (c) => {
     const customer = requireCustomer(c);
     let scan = await clipRecords.getScan(customer.id, c.req.param("scanId"));
     if (!scan)
@@ -17786,17 +19405,17 @@ app.get(`${CLIPS_PREFIX}/scan/:scanId`, async (c) => {
     return c.json({ scan, source });
 });
 // GET /clips/sources — scanned source videos.
-app.get(`${CLIPS_PREFIX}/sources`, async (c) => {
+app.get(`${RAWS_PREFIX}/sources`, async (c) => {
     const customer = requireCustomer(c);
     return c.json({ sources: await clipRecords.listSources(customer.id) });
 });
 // GET /clips/presets — built-in + saved presets.
-app.get(`${CLIPS_PREFIX}/presets`, async (c) => {
+app.get(`${RAWS_PREFIX}/presets`, async (c) => {
     const customer = requireCustomer(c);
     return c.json({ presets: await clipRecords.listPresets(customer.id) });
 });
 // POST /clips/presets — save a custom preset from criteria or a NL query.
-app.post(`${CLIPS_PREFIX}/presets`, async (c) => {
+app.post(`${RAWS_PREFIX}/presets`, async (c) => {
     const customer = requireCustomer(c);
     try {
         const body = (await c.req.json());
@@ -17824,7 +19443,7 @@ app.post(`${CLIPS_PREFIX}/presets`, async (c) => {
     }
 });
 // DELETE /clips/presets/:presetId — delete a saved (non-builtin) preset.
-app.delete(`${CLIPS_PREFIX}/presets/:presetId`, async (c) => {
+app.delete(`${RAWS_PREFIX}/presets/:presetId`, async (c) => {
     const customer = requireCustomer(c);
     const id = c.req.param("presetId");
     if (id.startsWith("preset_") && BUILTIN_CLIP_PRESET_IDS.has(id)) {
@@ -17834,7 +19453,7 @@ app.delete(`${CLIPS_PREFIX}/presets/:presetId`, async (c) => {
     return c.json({ ok: true });
 });
 // GET /clips/:clipId/download — presigned redirect to the clip mp4.
-app.get(`${CLIPS_PREFIX}/:clipId/download`, async (c) => {
+app.get(`${RAWS_PREFIX}/:clipId/download`, async (c) => {
     const customer = requireCustomer(c);
     const clip = await clipRecords.getClip(customer.id, c.req.param("clipId"));
     if (!clip)
@@ -17845,7 +19464,7 @@ app.get(`${CLIPS_PREFIX}/:clipId/download`, async (c) => {
     return redirect(c, url, 302);
 });
 // GET /clips/:clipId — one clip (+ presigned view/thumbnail urls).
-app.get(`${CLIPS_PREFIX}/:clipId`, async (c) => {
+app.get(`${RAWS_PREFIX}/:clipId`, async (c) => {
     const customer = requireCustomer(c);
     const clip = await clipRecords.getClip(customer.id, c.req.param("clipId"));
     if (!clip)
@@ -17853,7 +19472,7 @@ app.get(`${CLIPS_PREFIX}/:clipId`, async (c) => {
     return c.json({ clip: await serializeClip(clip) });
 });
 // DELETE /clips/:clipId — remove a clip record (+ vector).
-app.delete(`${CLIPS_PREFIX}/:clipId`, async (c) => {
+app.delete(`${RAWS_PREFIX}/:clipId`, async (c) => {
     const customer = requireCustomer(c);
     await clipRecords.deleteClip(customer.id, c.req.param("clipId"));
     return c.json({ ok: true });