pixelkiln 0.80.0 → 0.82.0

package/dist/index.js

@@ -14931,7 +14931,7 @@ async function runPicker(provider, lock, lockPath, opts = {}) {
 // src/gallery/snapshot.ts
 import { createHash as createHash4 } from "crypto";
 import { existsSync as existsSync25 } from "fs";
-import { readFile as readFile22, stat as stat3 } from "fs/promises";
+import { readFile as readFile23, stat as stat3 } from "fs/promises";
 import path31 from "path";
 
 // src/workspace.ts
@@ -15068,6 +15068,7 @@ function validateWorkspace(ws, dir) {
 }
 
 // src/gallery/edit.ts
+import { readFile as readFile22, rename as rename9, writeFile as writeFile14 } from "fs/promises";
 import path30 from "path";
 import { z as z12 } from "zod";
 
@@ -15923,9 +15924,62 @@ var HandEditRequestSchema = z12.discriminatedUnion("action", [
     protocol: z12.number().int().positive()
   }).strict()
 ]);
+var UNDO_DEPTH = 20;
+var UndoRequestSchema = z12.object({
+  action: z12.literal("undo-edit"),
+  project: z12.string().min(1).optional(),
+  /** The manifest as the page last saw it; undo refuses a manifest someone else has changed since. */
+  expectedSha256: z12.string().regex(/^[0-9a-f]{64}$/)
+}).strict();
 function createGalleryEditHandler(opts) {
   const log = opts.onProgress ?? (() => {
   });
+  const apply = createEditApplier(opts, log);
+  const history = /* @__PURE__ */ new Map();
+  const manifestOf = async (project) => {
+    try {
+      return path30.resolve(await opts.manifestFor(typeof project === "string" ? project : void 0));
+    } catch {
+      return null;
+    }
+  };
+  return async (body) => {
+    const undo = UndoRequestSchema.safeParse(body);
+    if (undo.success) {
+      const manifestPath2 = await manifestOf(undo.data.project);
+      if (!manifestPath2) throw new ManifestEditError("no manifest to undo an edit in");
+      const current = await readFile22(manifestPath2, "utf8");
+      if (sha256(current) !== undo.data.expectedSha256) throw new ManifestDriftError(manifestPath2);
+      const stack = history.get(manifestPath2) ?? [];
+      const last = stack[stack.length - 1];
+      if (!last) throw new ManifestEditError("nothing to undo: this gallery has not changed the manifest");
+      if (last.afterSha !== sha256(current)) {
+        history.delete(manifestPath2);
+        throw Object.assign(new Error("the manifest changed outside the gallery since its last edit; undo would discard that change"), { status: 409 });
+      }
+      const tmp = manifestPath2 + ".pixelkiln-undo";
+      await writeFile14(tmp, last.before);
+      await rename9(tmp, manifestPath2);
+      stack.pop();
+      log(`  manifest edit undone in ${path30.relative(process.cwd(), manifestPath2) || manifestPath2}`);
+      return opts.reload();
+    }
+    const manifestPath = await manifestOf(body?.project);
+    const before = manifestPath ? await readFile22(manifestPath, "utf8").catch(() => null) : null;
+    const build = await apply(body);
+    if (manifestPath && before !== null) {
+      const after = await readFile22(manifestPath, "utf8").catch(() => null);
+      if (after !== null && after !== before) {
+        const stack = history.get(manifestPath) ?? [];
+        stack.push({ before, afterSha: sha256(after) });
+        if (stack.length > UNDO_DEPTH) stack.shift();
+        history.set(manifestPath, stack);
+      }
+    }
+    return build;
+  };
+}
+function createEditApplier(opts, log) {
   return async (body) => {
     const handEdit = HandEditRequestSchema.safeParse(body);
     if (handEdit.success) {
@@ -16100,7 +16154,7 @@ function describeHistory(media, entry, cacheDir) {
 var MAX_COMPARED_BYTES = 8 * 1024 * 1024;
 async function samePixels(a, b) {
   try {
-    const [left, right] = await Promise.all([readFile22(a), readFile22(b)]);
+    const [left, right] = await Promise.all([readFile23(a), readFile23(b)]);
     if (left.length > MAX_COMPARED_BYTES || right.length > MAX_COMPARED_BYTES) return false;
     const x = decodePng(left);
     const y = decodePng(right);
@@ -16258,7 +16312,7 @@ async function buildGallerySnapshot(opts) {
   const media = /* @__PURE__ */ new Map();
   const plan = await buildPlan(specs, lock);
   const items = [];
-  const manifestText = await readFile22(loaded.path, "utf8");
+  const manifestText = await readFile23(loaded.path, "utf8");
   const manifestSha256 = sha256(manifestText);
   const cacheDir = path31.resolve(path31.dirname(opts.lockPath), ".pixelkiln", "cache");
   let rawStyles = {};
@@ -16610,7 +16664,7 @@ async function buildWorkspaceGallerySnapshot(opts) {
         root: loaded.root,
         provider: loaded.manifest.provider,
         account: project.account ?? null,
-        manifestSha256: manifestSha256 ?? sha256(await readFile22(manifestPath, "utf8")),
+        manifestSha256: manifestSha256 ?? sha256(await readFile23(manifestPath, "utf8")),
         historyLimit: historyLimit(loaded.manifest),
         entries: Object.keys(lock.entries).length,
         items: projectItems.length,
@@ -16738,26 +16792,35 @@ ${css}</style>
     <span class="project" id="project"></span>
     <span class="grow"></span>
     <label class="search"><input id="q" type="search" placeholder="Search assets, prompts, ids, hashes" autocomplete="off"><kbd>/</kbd></label>
-    <select id="sort" aria-label="Sort">
-      <option value="key">Sort: style / asset</option>
-      <option value="newest">Sort: newest first</option>
-      <option value="oldest">Sort: oldest first</option>
-      <option value="cost">Sort: cost</option>
-      <option value="size">Sort: size</option>
-    </select>
-    <select id="group" aria-label="Group">
-      <option value="style">Group: by style</option>
-      <option value="family">Group: by family</option>
-      <option value="none">Group: none</option>
-    </select>
+    <details class="menu" id="view-menu">
+      <summary title="Sort, group, card size, backdrop, and playback">View</summary>
+      <div class="menu-panel">
+        <label class="menu-row"><span>Sort</span><select id="sort" aria-label="Sort">
+          <option value="key">style / asset</option>
+          <option value="newest">newest first</option>
+          <option value="oldest">oldest first</option>
+          <option value="cost">cost</option>
+          <option value="size">size</option>
+        </select></label>
+        <label class="menu-row"><span>Group</span><select id="group" aria-label="Group">
+          <option value="style">by style</option>
+          <option value="family">by family</option>
+          <option value="none">none</option>
+        </select></label>
+        <div class="menu-row"><span>Cards</span><span class="seg" id="size" role="group" aria-label="Card size">
+          <button type="button" data-size="s" title="Small cards: more on screen">S</button><button type="button" data-size="m" title="Medium cards">M</button><button type="button" data-size="l" title="Large cards: sprites drawn bigger">L</button>
+        </span></div>
+        <div class="menu-row"><span>Backdrop</span><span id="backdrop-slot"></span></div>
+        <label class="menu-row check" title="Play every loop on the grid; without this, a loop plays while the pointer is over it"><input id="playloops" type="checkbox"> Play every loop</label>
+        <label class="menu-row check" title="Refresh every 5 seconds while this tab is visible"><input id="auto" type="checkbox"> Refresh every 5 seconds</label>
+        <label class="menu-row check" id="notify-chip" hidden title="A system notification when a job finishes while this tab is in the background"><input id="notify" type="checkbox"> Notify when a job finishes</label>
+      </div>
+    </details>
     <span id="editing" class="editing" hidden title="This gallery can write the manifest. It never contacts a provider.">editing</span>
     <button id="select" type="button" title="Pick several records to generate, regenerate, compare, or tag together (or ctrl/\u2318-click a card)">Select</button>
     <button id="studio" type="button" hidden title="Draft a new character: its style, base, loops, and portrait, priced as you go">+ New character</button>
     <button id="refresh" type="button" title="Re-read the manifest, lockfile, and disk">Refresh</button>
-    <label class="chip" title="Refresh every 5 seconds while this tab is visible"><input id="auto" type="checkbox"> auto</label>
-    <label class="chip" title="Play every loop on the grid; without this, a loop plays while the pointer is over it"><input id="playloops" type="checkbox"> play loops</label>
-    <span id="backdrop-slot"></span>
-    <label class="chip" id="notify-chip" hidden title="A system notification when a job finishes while this tab is in the background"><input id="notify" type="checkbox"> notify</label>
+    <button id="keys" type="button" title="Keyboard shortcuts (?)" aria-label="Keyboard shortcuts">?</button>
   </div>
   <div class="totals" id="totals"></div>
   <div class="chips" id="chips"></div>
@@ -16766,9 +16829,9 @@ ${css}</style>
 </header>
 <main id="root"></main>
 <div id="selbar" class="selbar" hidden></div>
+<div id="toast" class="toast" role="status" aria-live="polite" hidden></div>
 <footer>
-  Click a sprite for its full record; <kbd>shift</kbd>-click adds it to a side-by-side comparison. <kbd>\u2190</kbd>/<kbd>\u2192</kbd> step through the visible set while a record
-  is open, <kbd>,</kbd>/<kbd>.</kbd> step a loop's frames and <kbd>space</kbd> plays it, <kbd>Esc</kbd> closes it, and <kbd>/</kbd> jumps to search. This page reads the manifest, lockfile,
+  Click a sprite for its full record; press <kbd>?</kbd> for every keyboard shortcut. This page reads the manifest, lockfile,
   and disk only. It never contacts a provider<span id="foot-edit"> and never writes anything</span><span id="foot-editing" hidden>.
   Editing is on: saving rewrites the manifest and nothing else</span><span id="foot-gen" hidden>.
   Generation is on under the session budget shown above; every run is the same submit, poll, and fetch as <code>pixelkiln gen</code></span>.
@@ -16843,7 +16906,7 @@ var EDITOR_RELEASE_BASE = "https://github.com/gfargo/pixelkiln/releases/download
 // src/editor/install.ts
 import { createHash as createHash5 } from "crypto";
 import { existsSync as existsSync27 } from "fs";
-import { mkdir as mkdir11, readFile as readFile23, rename as rename9, rm as rm11, stat as stat4, writeFile as writeFile14 } from "fs/promises";
+import { mkdir as mkdir11, readFile as readFile24, rename as rename10, rm as rm11, stat as stat4, writeFile as writeFile15 } from "fs/promises";
 import os2 from "os";
 import path32 from "path";
 var EditorInstallError = class extends Error {
@@ -16874,7 +16937,7 @@ function editorBaseUrl(pin = EDITOR_PIN) {
 }
 async function sha256Of(file) {
   try {
-    return createHash5("sha256").update(await readFile23(file)).digest("hex");
+    return createHash5("sha256").update(await readFile24(file)).digest("hex");
   } catch {
     return null;
   }
@@ -16948,8 +17011,8 @@ async function installEditor(opts = {}) {
     const final = path32.join(dir, name);
     const tmp = `${final}.${process.pid}.part`;
     try {
-      await writeFile14(tmp, bytes);
-      await rename9(tmp, final);
+      await writeFile15(tmp, bytes);
+      await rename10(tmp, final);
     } finally {
       await rm11(tmp, { force: true });
     }
@@ -16995,7 +17058,7 @@ function editorContentType(name) {
 }
 
 // src/gallery/editor.ts
-import { readFile as readFile24 } from "fs/promises";
+import { readFile as readFile25 } from "fs/promises";
 import path33 from "path";
 function editorRoute(release, name = "index.html") {
   return `/editor/${encodeURIComponent(release)}/${encodeURIComponent(name)}`;
@@ -17069,7 +17132,7 @@ function createGalleryEditorHandlers(opts = {}) {
       if (!status.installed) return null;
       let bytes;
       try {
-        bytes = await readFile24(path33.join(dir, name));
+        bytes = await readFile25(path33.join(dir, name));
       } catch {
         verified = null;
         return null;
@@ -17086,7 +17149,7 @@ function createGalleryEditorHandlers(opts = {}) {
 // src/gallery/server.ts
 import { randomBytes } from "crypto";
 import { createServer as createServer2 } from "http";
-import { readFile as readFile25 } from "fs/promises";
+import { readFile as readFile26 } from "fs/promises";
 var MAX_EDIT_BYTES = 48 * 1024 * 1024;
 var EDITOR_CSP = [
   "default-src 'self'",
@@ -17267,7 +17330,7 @@ async function serveGallery(opts) {
         const asset = reviewAssets.get(jobId)?.get(url2.pathname);
         if (!asset) return fail(404, "no such review asset");
         try {
-          const bytes = await readFile25(asset.path);
+          const bytes = await readFile26(asset.path);
           res.writeHead(200, {
             "Content-Type": asset.contentType,
             "Cache-Control": "no-store",
@@ -17350,7 +17413,7 @@ async function serveGallery(opts) {
         if (!asset) return fail(404, "no such gallery media");
         let bytes;
         try {
-          bytes = await readFile25(asset.path);
+          bytes = await readFile26(asset.path);
         } catch {
           return fail(404, "gallery media is no longer on disk; refresh the page");
         }
@@ -17760,7 +17823,7 @@ function createGenerateHandlers(opts) {
 }
 
 // src/pipeline/salvage.ts
-import { readFile as readFile26 } from "fs/promises";
+import { readFile as readFile27 } from "fs/promises";
 import { existsSync as existsSync28 } from "fs";
 import path34 from "path";
 function providerClaimId(provider, objectId) {
@@ -17772,7 +17835,7 @@ async function loadClaims(lockPaths, opts = {}) {
     if (!existsSync28(p)) throw new Error(`Claim lockfile not found: ${p}`);
     let parsed;
     try {
-      parsed = parseLock(JSON.parse(await readFile26(p, "utf8")));
+      parsed = parseLock(JSON.parse(await readFile27(p, "utf8")));
     } catch {
       throw new Error(`Claim lockfile is malformed: ${p}`);
     }
@@ -18009,7 +18072,7 @@ async function applyTags(provider, decisions, existing, opts = {}) {
 }
 
 // src/pick/salvage-server.ts
-import { mkdir as mkdir12, writeFile as writeFile15, readFile as readFile27 } from "fs/promises";
+import { mkdir as mkdir12, writeFile as writeFile16, readFile as readFile28 } from "fs/promises";
 import path35 from "path";
 
 // src/pick/salvage-sheet.ts
@@ -18235,7 +18298,7 @@ async function runSalvage(provider, orphans, ctx, opts = {}) {
             const rel = path35.join("_salvaged", `${assetId}.png`);
             const outFile = path35.resolve(ctx.importDir, rel);
             await mkdir12(path35.dirname(outFile), { recursive: true });
-            await writeFile15(outFile, buf);
+            await writeFile16(outFile, buf);
             ctx.manifest.assets[assetId] = {
               prompt: orphan.prompt,
               promptByStyle: {},
@@ -18291,9 +18354,9 @@ async function runSalvage(provider, orphans, ctx, opts = {}) {
         }
       }
       await applyTags(provider, decisions, existingTags, { onProgress: log, characters: characterMembers });
-      const raw = JSON.parse(await readFile27(ctx.manifestPath, "utf8"));
+      const raw = JSON.parse(await readFile28(ctx.manifestPath, "utf8"));
       for (const id of importedAssetIds) raw.assets[id] = ctx.manifest.assets[id];
-      await writeFile15(ctx.manifestPath, JSON.stringify(raw, null, 2) + "\n");
+      await writeFile16(ctx.manifestPath, JSON.stringify(raw, null, 2) + "\n");
       await saveLock(ctx.lockPath, ctx.lock);
       if (characterAssetIds.length) result.characterAssetIds = characterAssetIds;
       return result;