@drawnagency/primitives 0.1.77 → 0.1.78

package/dist/lib/index.js

@@ -7,7 +7,7 @@ import {
   loadStaticSiteContent,
   mergeSiteContent,
   safeRedirect
-} from "../chunk-XFDEUK37.js";
+} from "../chunk-Z5IYWUW3.js";
 import {
   createEvent,
   darkModeEvent,
@@ -33,7 +33,7 @@ import {
   audiencePasses
 } from "../chunk-4YEOTFVU.js";
 import "../chunk-TZQPOR5A.js";
-import "../chunk-SWIHUIFT.js";
+import "../chunk-4SIWBWKZ.js";
 import {
   clearRegistry,
   createRegistry,

package/dist/lib/media-dnd.d.ts

@@ -0,0 +1,26 @@
+import type { MediaFolder, MediaItem } from "../media/types";
+export interface MediaDragData {
+    dragType: "media-item";
+    mediaIds: string[];
+    [key: string | symbol]: unknown;
+}
+export interface MediaFolderDragData {
+    dragType: "media-folder";
+    folderId: string;
+    [key: string | symbol]: unknown;
+}
+export interface MediaFolderDropData {
+    dropType: "media-folder";
+    targetFolderId: string | null;
+    [key: string | symbol]: unknown;
+}
+export declare function buildMediaDragData(mediaIds: string[]): MediaDragData;
+export declare function buildFolderDragData(folderId: string): MediaFolderDragData;
+export declare function buildFolderDropData(targetFolderId: string | null): MediaFolderDropData;
+export declare function isMediaDragData(d: Record<string | symbol, unknown>): d is MediaDragData;
+export declare function isFolderDragData(d: Record<string | symbol, unknown>): d is MediaFolderDragData;
+/** True when at least one dragged item would actually change folder. */
+export declare function canDropMediaInto(drag: MediaDragData, targetFolderId: string | null, folders: Record<string, MediaFolder>, itemsById: Record<string, MediaItem>): boolean;
+/** Folder drops delegate to the tree-integrity guard (self/descendant/no-op). */
+export declare function canDropFolderInto(drag: MediaFolderDragData, targetFolderId: string | null, folders: Record<string, MediaFolder>): boolean;
+//# sourceMappingURL=media-dnd.d.ts.map

package/dist/lib/media-dnd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-dnd.d.ts","sourceRoot":"","sources":["../../src/lib/media-dnd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG7D,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,cAAc,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,aAAa,CAEpE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,mBAAmB,CAEzE;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,mBAAmB,CAEtF;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAEvF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,mBAAmB,CAE9F;AAED,wEAAwE;AACxE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,aAAa,EACnB,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACnC,OAAO,CAKT;AAED,iFAAiF;AACjF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,mBAAmB,EACzB,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GACnC,OAAO,CAET"}

package/dist/lib/media-folders.d.ts

@@ -0,0 +1,59 @@
+import type { MediaFolder, MediaItem, MediaManifest } from "../media/types";
+export interface FolderTreeNode {
+    id: string;
+    name: string;
+    children: FolderTreeNode[];
+}
+export interface FolderUploadPlan {
+    /** New folder entities to merge into manifest.folders, keyed by new id. */
+    newFolders: Record<string, MediaFolder>;
+    /** Display-folder target per uploaded file (null = root). */
+    fileTargets: {
+        file: File;
+        folderId: string | null;
+    }[];
+}
+/** Display-folder id. NOT related to MediaItem.folder (the git storage dir). */
+export declare function createFolderId(): string;
+/** True when this folder's parent chain loops back to itself. */
+export declare function isCyclicFolder(folders: Record<string, MediaFolder>, id: string): boolean;
+/**
+ * Effective parent for rendering: null (root) when the parent is missing,
+ * dangling, or `id` itself sits on a parent cycle. Cycle members re-root,
+ * which breaks the loop for their (kept) descendants — corrupt manifests
+ * always render, and healMediaManifest persists this view on save.
+ */
+export declare function effectiveParentId(folders: Record<string, MediaFolder>, id: string): string | null;
+/** Direct children of `parentId`, alphabetically (case-insensitive). */
+export declare function childFolderIds(folders: Record<string, MediaFolder>, parentId: string | null): string[];
+export declare function buildFolderTree(folders: Record<string, MediaFolder>): FolderTreeNode[];
+/** Names from root to `id` inclusive, cycle-safe. */
+export declare function folderPathNames(folders: Record<string, MediaFolder>, id: string): string[];
+/** Folder ids from root to `id` inclusive, cycle-safe. */
+export declare function folderPathIds(folders: Record<string, MediaFolder>, id: string): string[];
+/** All folders under `id` (by effective parent), INCLUDING `id` itself. */
+export declare function descendantFolderIds(folders: Record<string, MediaFolder>, id: string): Set<string>;
+/** May `id` re-parent to `targetParentId`? Blocks self/descendant targets and no-ops. */
+export declare function canMoveFolder(folders: Record<string, MediaFolder>, id: string, targetParentId: string | null): boolean;
+/** Trimmed `desired`, auto-suffixed " (2)", " (3)"… on case-insensitive sibling collision. */
+export declare function uniqueFolderName(folders: Record<string, MediaFolder>, parentId: string | null, desired: string, excludeId?: string): string;
+/** The folder an item renders in: its folderId when it points at a real folder, else root. */
+export declare function itemFolderId(folders: Record<string, MediaFolder>, item: Pick<MediaItem, "folderId">): string | null;
+/** Recursive item counts per folder id (an item counts toward every ancestor). */
+export declare function recursiveItemCounts(folders: Record<string, MediaFolder>, items: MediaItem[]): Record<string, number>;
+/** Pure heal: dangling folderIds dropped, orphan/cyclic folders re-rooted. */
+export declare function healMediaManifest(manifest: MediaManifest): MediaManifest;
+/**
+ * Save-time manifest assembly: merge uploaded pending items, apply deletions,
+ * preserve every other manifest key (folders!), then heal.
+ */
+export declare function assembleSavedManifest(manifest: MediaManifest, uploadedItems: MediaItem[], deletedIds: string[]): MediaManifest;
+/**
+ * Map webkitRelativePath-style paths onto folder entities under
+ * `currentFolderId`, merging with existing folders by case-insensitive name.
+ */
+export declare function planFolderUpload(files: {
+    file: File;
+    relativePath: string;
+}[], folders: Record<string, MediaFolder>, currentFolderId: string | null, newId?: () => string): FolderUploadPlan;
+//# sourceMappingURL=media-folders.d.ts.map

package/dist/lib/media-folders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-folders.d.ts","sourceRoot":"","sources":["../../src/lib/media-folders.ts"],"names":[],"mappings":"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"}

package/dist/media/folder-drop.d.ts

@@ -0,0 +1,22 @@
+export interface DroppedFile {
+    file: File;
+    relativePath: string;
+}
+/** Structural subset of FileSystemEntry — lets tests fake the tree. */
+export interface EntryLike {
+    isFile: boolean;
+    isDirectory: boolean;
+    name: string;
+    fullPath: string;
+    file?: (cb: (f: File) => void, err: (e: unknown) => void) => void;
+    createReader?: () => {
+        readEntries: (cb: (entries: EntryLike[]) => void, err: (e: unknown) => void) => void;
+    };
+}
+export declare function traverseEntries(entries: EntryLike[]): Promise<DroppedFile[]>;
+/**
+ * Dropped-payload traversal. Returns null when nothing in the drop is a
+ * directory — the caller should fall back to the plain flat-file path.
+ */
+export declare function collectDroppedFiles(dataTransfer: DataTransfer): Promise<DroppedFile[] | null>;
+//# sourceMappingURL=folder-drop.d.ts.map

package/dist/media/folder-drop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"folder-drop.d.ts","sourceRoot":"","sources":["../../src/media/folder-drop.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,CAAC;IAClE,YAAY,CAAC,EAAE,MAAM;QACnB,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,CAAC;KACtF,CAAC;CACH;AAoBD,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAWlF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CASnG"}

package/dist/media/index.js

@@ -5,6 +5,7 @@ import {
   ProcessingQueue,
   displayFilename,
   displayFilenameExt,
+  displayName,
   formatFileSize,
   generateVideoPoster,
   getMediaProvider,
@@ -15,14 +16,15 @@ import {
   resolveMedia,
   sanitizeMediaName,
   setMediaProvider
-} from "../chunk-S55OZ7F2.js";
+} from "../chunk-3LNKOLZP.js";
 import "../chunk-4YEOTFVU.js";
 import {
   ImageManifestSchema,
   MediaConfigSchema,
+  MediaFolderSchema,
   MediaItemSchema,
   VariantSchema
-} from "../chunk-SWIHUIFT.js";
+} from "../chunk-4SIWBWKZ.js";
 import "../chunk-JSBRDJBE.js";
 export {
   BAKED_MEDIA_KEYS,
@@ -30,11 +32,13 @@ export {
   ImageManifestSchema,
   MIME_TO_EXT,
   MediaConfigSchema,
+  MediaFolderSchema,
   MediaItemSchema,
   ProcessingQueue,
   VariantSchema,
   displayFilename,
   displayFilenameExt,
+  displayName,
   formatFileSize,
   generateVideoPoster,
   getMediaProvider,

package/dist/media/types.d.ts

@@ -1,4 +1,4 @@
-export { VariantSchema, MediaItemSchema, ImageManifestSchema, MediaConfigSchema, type Variant, type MediaItem, type MediaManifest, type MediaConfig, } from "../schemas/media";
+export { VariantSchema, MediaItemSchema, ImageManifestSchema, MediaConfigSchema, MediaFolderSchema, type Variant, type MediaItem, type MediaManifest, type MediaConfig, type MediaFolder, } from "../schemas/media";
 export type MediaKind = "image" | "animated" | "video";
 export interface MediaFile {
     buffer: ArrayBuffer;

package/dist/media/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/media/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,WAAW,GACjB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;AAEvD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,KAAK,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,KAAK,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,gBAAgB,GAAG,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/media/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,WAAW,GACjB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;AAEvD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,KAAK,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,KAAK,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,gBAAgB,GAAG,aAAa,CAAC"}

package/dist/media/utils.d.ts

@@ -1,3 +1,4 @@
+import type { MediaItem } from "./types";
 export declare function hashFileBuffer(buffer: ArrayBuffer): Promise<string>;
 export declare function sanitizeMediaName(name: string): string;
 export declare const MIME_TO_EXT: Record<string, string>;
@@ -6,4 +7,10 @@ export declare function mimeToExt(mime: string): string;
 export declare function displayFilenameExt(mime: string): string;
 export declare function displayFilename(originalName: string, mimeType: string): string;
 export declare function formatFileSize(bytes: number): string;
+/**
+ * Display name for a media item. v2 batch-rename seam: will read a future
+ * optional `displayName` field with originalName fallback — UI must call this
+ * instead of touching originalName directly.
+ */
+export declare function displayName(item: Pick<MediaItem, "originalName">): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/media/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/media/utils.ts"],"names":[],"mappings":"AAEA,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAqBzE;AAKD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAI9C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAK9C,CAAC;AAEF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM9E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/media/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAqBzE;AAKD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAI9C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAK9C,CAAC;AAEF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM9E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIpD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,MAAM,CAEzE"}

package/dist/schemas/index.js

@@ -3,7 +3,7 @@ import {
   AudienceNameSchema,
   MediaGridOptionsSchema,
   slugifyAudienceName
-} from "../chunk-SFKYUKVN.js";
+} from "../chunk-MK4POMLZ.js";
 import {
   AudienceSchema,
   RoleSchema,
@@ -28,6 +28,7 @@ import {
   ImageManifestSchema,
   IndexSchema,
   MediaConfigSchema,
+  MediaFolderSchema,
   MediaItemSchema,
   MediaReferenceSchema,
   PageSchema,
@@ -39,7 +40,7 @@ import {
   TextLineSchema,
   VariantSchema,
   normalizeSiteIndex
-} from "../chunk-SWIHUIFT.js";
+} from "../chunk-4SIWBWKZ.js";
 import "../chunk-VKAGMEKE.js";
 import "../chunk-NSCT3AMV.js";
 import "../chunk-JSBRDJBE.js";
@@ -57,6 +58,7 @@ export {
   LinkTargetSchema,
   LinkValueSchema,
   MediaConfigSchema,
+  MediaFolderSchema,
   MediaGridOptionsSchema,
   MediaItemSchema,
   MediaReferenceSchema,

package/dist/schemas/media.d.ts

@@ -5,6 +5,11 @@ export declare const VariantSchema: z.ZodObject<{
     size: z.ZodNumber;
 }, z.core.$strip>;
 export type Variant = z.infer<typeof VariantSchema>;
+export declare const MediaFolderSchema: z.ZodObject<{
+    name: z.ZodString;
+    parentId: z.ZodNullable<z.ZodString>;
+}, z.core.$strip>;
+export type MediaFolder = z.infer<typeof MediaFolderSchema>;
 export declare const MediaItemSchema: z.ZodObject<{
     id: z.ZodString;
     hash: z.ZodString;
@@ -31,6 +36,7 @@ export declare const MediaItemSchema: z.ZodObject<{
     }>>;
     url: z.ZodOptional<z.ZodString>;
     duration: z.ZodOptional<z.ZodNumber>;
+    folderId: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type MediaItem = z.infer<typeof MediaItemSchema>;
 export declare const ImageManifestSchema: z.ZodObject<{
@@ -60,7 +66,12 @@ export declare const ImageManifestSchema: z.ZodObject<{
         }>>;
         url: z.ZodOptional<z.ZodString>;
         duration: z.ZodOptional<z.ZodNumber>;
+        folderId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
+    folders: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
+        name: z.ZodString;
+        parentId: z.ZodNullable<z.ZodString>;
+    }, z.core.$strip>>>;
 }, z.core.$strip>;
 export type MediaManifest = z.infer<typeof ImageManifestSchema>;
 export declare const MediaConfigSchema: z.ZodObject<{

package/dist/schemas/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/schemas/media.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa;;;;iBAIxB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqB1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAE9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,eAAO,MAAM,iBAAiB;;;;;iBAO5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/schemas/media.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa;;;;iBAIxB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAIpD,eAAO,MAAM,iBAAiB;;;iBAG5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwB1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAG9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,eAAO,MAAM,iBAAiB;;;;;iBAO5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawnagency/primitives",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",

package/src/components/shell/EditorShell.tsx

@@ -158,7 +158,7 @@ export default function EditorShell({
   const [showSiteSettings, setShowSiteSettings] = useState(false);
   const [dirtySectionIds, setDirtySectionIds] = useState<Set<string>>(new Set());
   const [siteConfig, setSiteConfig] = useState<SiteConfig | null>(null);
-  const [mediaManifest, setMediaManifest] = useState<MediaManifest>({ images: {} });
+  const [mediaManifest, setMediaManifest] = useState<MediaManifest>({ images: {}, folders: {} });
   const [showMediaLibrary, setShowMediaLibrary] = useState(false);
   const [mediaModalMode, setMediaModalMode] = useState<"select" | "manage">("manage");
   const [mediaSelectCallback, setMediaSelectCallback] = useState<((id: string) => void) | null>(null);
@@ -192,6 +192,9 @@ export default function EditorShell({
   // upload-intent failures, direct-to-bucket PUT failures) in the media
   // library modal, alongside its existing client-side rejection banner.
   const [uploadErrorMessage, setUploadErrorMessage] = useState<string | null>(null);
+  // Surfaces useMediaPipeline's onUploadNotice (e.g. "N files already exist
+  // and were left where they are" on dedup skip) in the media library modal.
+  const [uploadNotice, setUploadNotice] = useState<string | null>(null);
   const [activePageId, setActivePageId] = useState<string | null>(null);
   const [movingSectionId, setMovingSectionId] = useState<string | null>(null);
   // Set by recoverConflict when a rebase surfaces overlapping edits; drives the
@@ -317,6 +320,7 @@ export default function EditorShell({
     setDirtySectionIds,
     markSectionDirty: persistence.markSectionDirty,
     onUploadError: (message) => setUploadErrorMessage(message),
+    onUploadNotice: setUploadNotice,
   });
 
   const buildStatus = useBuildStatus();
@@ -737,7 +741,7 @@ export default function EditorShell({
         for (const id of publishedDeletions) {
           delete images[id];
         }
-        return { images };
+        return { ...prev, images };
       });
     },
     onShasUpdated: (newSavedSha, newMainSha) => {
@@ -866,7 +870,7 @@ export default function EditorShell({
       let loadedSections: LoadedSection[];
       let loadedIndex: SiteIndex;
       let loadedConfig: SiteConfig;
-      let loadedManifest: MediaManifest = { images: {} };
+      let loadedManifest: MediaManifest = { images: {}, folders: {} };
 
       // Key the content cache on the head of the branch we actually load (the
       // draft `saved` branch if it exists, else main), provided by the SSR edit
@@ -1056,7 +1060,7 @@ export default function EditorShell({
       }
     }
     const savedManifest = await getMediaManifest();
-    setMediaManifest(savedManifest ?? { images: {} });
+    setMediaManifest(savedManifest ?? { images: {}, folders: {} });
     persistence.clearConfigDirty();
     // Discard wiped the Dexie siteIndex row — no unsaved structure remains.
     // Tokenless: discard is unconditional, unlike the save-success clear.
@@ -1522,6 +1526,9 @@ export default function EditorShell({
             }}
             title="Media Library"
             size="large"
+            // Padding lives on the two scroll columns inside MediaLibraryModal
+            // so their scrollbars sit at the pane edges.
+            noPadding
           >
             <MediaLibraryModal
               mode={mediaModalMode}
@@ -1545,6 +1552,15 @@ export default function EditorShell({
               uploadProgress={mediaPipeline.uploadProgress}
               uploadError={uploadErrorMessage}
               onDismissUploadError={() => setUploadErrorMessage(null)}
+              folders={mediaManifest.folders}
+              onCreateFolder={mediaPipeline.handleFolderCreate}
+              onRenameFolder={mediaPipeline.handleFolderRename}
+              onMoveFolder={mediaPipeline.handleFolderMove}
+              onDeleteFolder={mediaPipeline.handleFolderDelete}
+              onMoveMedia={mediaPipeline.handleMediaMove}
+              onFolderUpload={mediaPipeline.handleFolderUpload}
+              uploadNotice={uploadNotice}
+              onDismissUploadNotice={() => setUploadNotice(null)}
             />
           </EditorModal>
           <EditorModal

package/src/components/shell/MediaBreadcrumb.tsx

@@ -0,0 +1,77 @@
+import { Fragment, useRef } from "react";
+import { ChevronRight } from "lucide-react";
+import { cn } from "../../lib/cn";
+import type { MediaFolder, MediaItem } from "../../media/types";
+import { folderPathIds } from "../../lib/media-folders";
+import { useFolderDropTarget } from "../../hooks/useMediaFolderDnd";
+import type { MediaFolderDndBindings } from "./MediaFolderTree";
+
+export interface MediaBreadcrumbProps {
+  folders: Record<string, MediaFolder>;
+  currentFolderId: string | null;
+  onNavigate: (id: string | null) => void;
+  dnd?: MediaFolderDndBindings;
+}
+
+
+function Segment({
+  label, target, onNavigate, dnd, isCurrent,
+}: {
+  label: string;
+  target: string | null;
+  onNavigate: (id: string | null) => void;
+  dnd?: MediaFolderDndBindings;
+  isCurrent: boolean;
+}) {
+  const emptyFoldersRef = useRef<Record<string, MediaFolder>>({});
+  const emptyItemsRef = useRef<Record<string, MediaItem>>({});
+  const { ref, isDropTarget } = useFolderDropTarget<HTMLButtonElement>({
+    targetFolderId: target,
+    enabled: dnd !== undefined && !isCurrent,
+    foldersRef: dnd?.foldersRef ?? emptyFoldersRef,
+    itemsByIdRef: dnd?.itemsByIdRef ?? emptyItemsRef,
+    onMoveMedia: dnd?.onMoveMedia ?? (() => {}),
+    onMoveFolder: dnd?.onMoveFolder ?? (() => {}),
+  });
+
+  return (
+    <button
+      ref={ref}
+      type="button"
+      disabled={isCurrent}
+      onClick={() => onNavigate(target)}
+      className={cn(
+        "max-w-40 truncate rounded px-1 py-0.5 text-sm",
+        isCurrent
+          ? "font-medium text-base-contrast"
+          : "cursor-pointer text-base-contrast-light hover:text-base-contrast",
+        isDropTarget && "ring-2 ring-primary ring-inset",
+      )}
+    >
+      {label}
+    </button>
+  );
+}
+
+export function MediaBreadcrumb({ folders, currentFolderId, onNavigate, dnd }: MediaBreadcrumbProps) {
+  if (currentFolderId === null) return null;
+  const pathIds = folderPathIds(folders, currentFolderId);
+
+  return (
+    <div className="flex flex-wrap items-center gap-0.5">
+      <Segment label="All media" target={null} onNavigate={onNavigate} dnd={dnd} isCurrent={false} />
+      {pathIds.map((id, i) => (
+        <Fragment key={id}>
+          <ChevronRight size={12} className="shrink-0 text-base-contrast-light" />
+          <Segment
+            label={folders[id].name}
+            target={id}
+            onNavigate={onNavigate}
+            dnd={dnd}
+            isCurrent={i === pathIds.length - 1}
+          />
+        </Fragment>
+      ))}
+    </div>
+  );
+}

package/src/components/shell/MediaFolderTile.tsx

@@ -0,0 +1,141 @@
+import { useState, useRef, useEffect } from "react";
+import { Folder, MoreVertical } from "lucide-react";
+import { cn } from "../../lib/cn";
+import { buildFolderDragData } from "../../lib/media-dnd";
+import type { MediaFolder, MediaItem } from "../../media/types";
+import { useFolderDropTarget, useMediaDraggable } from "../../hooks/useMediaFolderDnd";
+import type { MediaFolderDndBindings } from "./MediaFolderTree";
+
+export interface MediaFolderTileProps {
+  id: string;
+  name: string;
+  count: number;
+  onOpen: (id: string) => void;
+  manage: boolean;
+  onRename?: (id: string, name: string) => void;
+  onDeleteRequest?: (id: string) => void;
+  dnd?: MediaFolderDndBindings;
+  /** Optional accessible label override for the root element (e.g. "Open folder Logos"). */
+  ariaLabel?: string;
+}
+
+
+export function MediaFolderTile({
+  id, name, count, onOpen, manage, onRename, onDeleteRequest, dnd, ariaLabel,
+}: MediaFolderTileProps) {
+  const [menuOpen, setMenuOpen] = useState(false);
+  const [renaming, setRenaming] = useState(false);
+  const [draft, setDraft] = useState(name);
+  const menuRef = useRef<HTMLDivElement>(null);
+  const emptyFoldersRef = useRef<Record<string, MediaFolder>>({});
+  const emptyItemsRef = useRef<Record<string, MediaItem>>({});
+
+  const drag = useMediaDraggable<HTMLDivElement>({
+    enabled: manage && dnd !== undefined && !renaming,
+    getDragData: () => buildFolderDragData(id),
+  });
+  const drop = useFolderDropTarget<HTMLDivElement>({
+    targetFolderId: id,
+    enabled: dnd !== undefined,
+    foldersRef: dnd?.foldersRef ?? emptyFoldersRef,
+    itemsByIdRef: dnd?.itemsByIdRef ?? emptyItemsRef,
+    onMoveMedia: dnd?.onMoveMedia ?? (() => {}),
+    onMoveFolder: dnd?.onMoveFolder ?? (() => {}),
+  });
+
+  // Dismiss the kebab menu on any pointerdown outside its container.
+  useEffect(() => {
+    if (!menuOpen) return;
+    const handler = (e: PointerEvent) => {
+      if (menuRef.current && e.target instanceof Node && !menuRef.current.contains(e.target)) {
+        setMenuOpen(false);
+      }
+    };
+    document.addEventListener("pointerdown", handler);
+    return () => document.removeEventListener("pointerdown", handler);
+  }, [menuOpen]);
+
+  const commitRename = () => {
+    setRenaming(false);
+    const next = draft.trim();
+    if (next && next !== name) onRename?.(id, next);
+    else setDraft(name);
+  };
+
+  return (
+    <div
+      // The tile is both a draggable and a drop target — a callback ref fills
+      // both hook refs at commit time, BEFORE either hook's registration
+      // effect runs (an effect-based sync would run after and never register).
+      ref={(el) => { drag.ref.current = el; drop.ref.current = el; }}
+      role="button"
+      tabIndex={0}
+      aria-label={ariaLabel}
+      onClick={() => { if (!renaming) onOpen(id); }}
+      onKeyDown={(e) => { if (e.key === "Enter" && !renaming) onOpen(id); }}
+      className={cn(
+        "group/tile relative flex items-center gap-2 rounded-lg border border-base-200 px-3 py-2.5 transition-colors",
+        "cursor-pointer hover:border-base-300 hover:bg-base-accent",
+        drag.isDragging && "opacity-40",
+        drop.isDropTarget && "border-primary ring-2 ring-primary ring-inset",
+      )}
+    >
+      <Folder size={16} className="shrink-0 text-base-contrast-light" />
+      {renaming ? (
+        <input
+          autoFocus
+          value={draft}
+          onChange={(e) => setDraft(e.target.value)}
+          onClick={(e) => e.stopPropagation()}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") commitRename();
+            if (e.key === "Escape") { setRenaming(false); setDraft(name); }
+          }}
+          onBlur={commitRename}
+          className="min-w-0 flex-1 rounded border border-base-200 bg-base px-1 py-0.5 text-sm text-base-contrast focus:outline-none focus:ring-1 focus:ring-primary"
+        />
+      ) : (
+        <span className="min-w-0 flex-1 truncate text-sm text-base-contrast">{name}</span>
+      )}
+      {!renaming && count > 0 && (
+        <span className="shrink-0 text-xs text-base-contrast-light">{count}</span>
+      )}
+      {manage && !renaming && (
+        <div ref={menuRef} className="relative shrink-0">
+          <button
+            type="button"
+            aria-label={`Folder actions: ${name}`}
+            onClick={(e) => { e.stopPropagation(); setMenuOpen((v) => !v); }}
+            // Enter/Space keydown bubbles to the tile root BEFORE the button's
+            // synthetic click fires — stop it so the tile doesn't open (see
+            // the matching chevron fix in MediaFolderTree.tsx).
+            onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") e.stopPropagation(); }}
+            className="rounded p-1 opacity-0 transition-opacity hover:bg-base-200/50 focus:opacity-100 group-hover/tile:opacity-100"
+          >
+            <MoreVertical size={16} />
+          </button>
+          {menuOpen && (
+            <div className="absolute right-0 top-6 z-20 w-28 rounded-md border border-base-200 bg-base py-1 shadow-lg">
+              <button
+                type="button"
+                className="block w-full px-3 py-1.5 text-left text-sm text-base-contrast hover:bg-base-accent"
+                onClick={(e) => { e.stopPropagation(); setMenuOpen(false); setDraft(name); setRenaming(true); }}
+                onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") e.stopPropagation(); }}
+              >
+                Rename
+              </button>
+              <button
+                type="button"
+                className="block w-full px-3 py-1.5 text-left text-sm text-red-600 hover:bg-base-accent dark:text-red-400"
+                onClick={(e) => { e.stopPropagation(); setMenuOpen(false); onDeleteRequest?.(id); }}
+                onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") e.stopPropagation(); }}
+              >
+                Delete
+              </button>
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}