@vosjs/cli 0.58.1 → 0.59.1

package/dist/{chunk-RZZUR2IF.js → chunk-CYU7LVPB.js}

@@ -36,7 +36,7 @@ import {
   videoFormat,
   writeCredential,
   writeSyncState
-} from "./chunk-IH5JJBIB.js";
+} from "./chunk-YC3LY4LW.js";
 import {
   deadLine,
   deadWarns
@@ -176,6 +176,7 @@ import {
   pinCandidates,
   pinRectOnScreen,
   pinReferent,
+  parseEmphasis,
   ratedSegments,
   recommendedExportResolution,
   resolvePins,
@@ -479,6 +480,23 @@ function lintDoc(docIn) {
       if (z.focusMode !== void 0 && z.focusMode !== "manual" && z.focusMode !== "auto") {
         problems.push(`${name}: focusMode must be 'manual' or 'auto'`);
       }
+      if (z.screen !== void 0) {
+        const sp = z.screen;
+        const ok = !!sp && typeof sp === "object" && isNum(sp.x) && isNum(sp.y) && sp.x >= 0 && sp.x <= 1 && sp.y >= 0 && sp.y <= 1;
+        if (!ok) {
+          problems.push(
+            `${name}: screen must be { x, y } in 0..1 \u2014 where the target lands as FRACTIONS of the frame (0.35, 0.5 = a third across, centred), not pixels`
+          );
+        } else if (z.focusMode === "auto") {
+          warnings.push(
+            `${name}: screen is ignored on a span that follows the cursor (focusMode 'auto'); drop one or the other`
+          );
+        } else if (cameraModel(doc.frame) !== "stage") {
+          warnings.push(
+            `${name}: screen places the target under the stage camera only (frame.camera: 'stage'); the magnifier keeps the target where it is`
+          );
+        }
+      }
       if (z.source !== void 0 && z.source !== "manual" && z.source !== "auto") {
         problems.push(`${name}: source must be 'manual' or 'auto'`);
       }
@@ -1000,6 +1018,23 @@ function lintDoc(docIn) {
           `${name}.preset "${String(o.preset)}" is not a known preset (${PRESETS.join("|")}) \u2014 falls back to "title"`
         );
       }
+      if (o.emphasis !== void 0) {
+        const em = o.emphasis;
+        if (!em || typeof em !== "object" || Array.isArray(em)) {
+          problems.push(
+            `${name}.emphasis must be { weight?, color? } ({} turns *markers* on)`
+          );
+        } else {
+          if (em.weight !== void 0 && (!isNum(em.weight) || em.weight < 100 || em.weight > 900))
+            problems.push(`${name}.emphasis.weight must be 100..900`);
+          if (em.color !== void 0 && typeof em.color !== "string")
+            problems.push(`${name}.emphasis.color must be a CSS colour`);
+        }
+      } else if (typeof o.text === "string" && parseEmphasis(o.text) !== null) {
+        warnings.push(
+          `${name}.text has *marked* words but no emphasis, so the asterisks show as typed; add emphasis: {} to set them bold (\\* keeps one literal)`
+        );
+      }
       if (o.size !== void 0 && (!isNum(o.size) || o.size < 12 || o.size > 200)) {
         problems.push(`${name}.size must be design px in 12..200`);
       }
@@ -1632,7 +1667,13 @@ function framingWarnings(docIn, doc, zoom, overlays, warnings) {
       }
       const rect = { x: x0, y: y0, w: x1 - x0, h: y1 - y0 };
       if (!zoomCoversRect(
-        { level: z.level, cx: z.cx, cy: z.cy },
+        {
+          level: z.level,
+          cx: z.cx,
+          cy: z.cy,
+          screen: z.screen,
+          focusMode: z.focusMode
+        },
         rect,
         layout,
         0.02,
@@ -1659,7 +1700,7 @@ function framingWarnings(docIn, doc, zoom, overlays, warnings) {
       if (!tf || !isNum(tf.x) || !isNum(tf.y)) return;
       const pinned = pins.get(String(o.id));
       if (!pinned && o.pin === void 0 && (o.kind === "html" || o.kind === "image" || o.kind === "video")) {
-        const words = layerWords(o);
+        const words2 = layerWords(o);
         let layerBox = null;
         try {
           const b = pinBox(o, layout);
@@ -1677,7 +1718,7 @@ function framingWarnings(docIn, doc, zoom, overlays, warnings) {
           start: o.start,
           duration: o.duration
         })) {
-          const named = c.selector ? selectorLabelWords(c.selector).filter((x) => words.has(x)) : [];
+          const named = c.selector ? selectorLabelWords(c.selector).filter((x) => words2.has(x)) : [];
           if (named.length) {
             about.push({
               step: String(c.step),
@@ -2042,6 +2083,60 @@ function isTakeRelativeKey(key) {
   return !!key && !/^(https?:|blob:|data:|media:|\/\/)/.test(key) && !key.startsWith("/api/");
 }
 var takeRelativeFile = (key) => key.replace(/^\/+/, "");
+function sourceSidecarRefs(doc, keep = isTakeRelativeKey) {
+  const out = [];
+  for (const [field, where] of [
+    ["micKey", "mic track"],
+    ["camKey", "cam track"]
+  ]) {
+    const key = doc.source[field];
+    if (!key || !keep(key)) continue;
+    out.push({
+      where,
+      key,
+      set: (next) => {
+        doc.source[field] = next;
+      }
+    });
+  }
+  return out;
+}
+function docObjectRefs(doc, keep = isTakeRelativeKey) {
+  const out = [];
+  for (const clip of doc.objects ?? []) {
+    const asset = clip.asset;
+    if (asset.kind !== "gltf" || !keep(asset.key)) continue;
+    out.push({
+      where: `object ${clip.id}`,
+      key: asset.key,
+      set: (next) => {
+        asset.key = next;
+      }
+    });
+  }
+  return out;
+}
+function docOverlayRefs(doc, keep = isTakeRelativeKey) {
+  const out = [];
+  for (const clip of doc.overlays ?? []) {
+    if (!isKeyedOverlay(clip) || !keep(clip.key)) continue;
+    out.push({
+      where: `overlay ${clip.id}`,
+      key: clip.key,
+      set: (next) => {
+        clip.key = next;
+      }
+    });
+  }
+  return out;
+}
+function docLayerRefs(doc, keep = isTakeRelativeKey) {
+  return [
+    ...docOverlayRefs(doc, keep),
+    ...docObjectRefs(doc, keep),
+    ...docAudioRefs(doc, keep)
+  ];
+}
 function docMediaRefs(doc, keep = isTakeRelativeKey) {
   const out = [];
   for (const m of doc.media ?? []) {
@@ -2072,16 +2167,8 @@ function docMediaRefs(doc, keep = isTakeRelativeKey) {
         }
       });
   }
-  for (const clip of doc.overlays ?? []) {
-    if (!isKeyedOverlay(clip) || !keep(clip.key)) continue;
-    out.push({
-      where: `overlay ${clip.id}`,
-      key: clip.key,
-      set: (next) => {
-        clip.key = next;
-      }
-    });
-  }
+  out.push(...docOverlayRefs(doc, keep));
+  out.push(...docObjectRefs(doc, keep));
   const mark = doc.endCard?.mark;
   if (mark && keep(mark.key))
     out.push({
@@ -2688,9 +2775,9 @@ async function renderInPage(opts) {
     w.__error = String(e instanceof Error && e.stack || e);
   }
 }
-async function renderChunk(context, serverBase, chunk2, opts, onChunkProgress) {
+async function renderChunk(context2, serverBase, chunk2, opts, onChunkProgress) {
   const outName = `render-chunk-${chunk2.index}.tmp`;
-  const page = await context.newPage();
+  const page = await context2.newPage();
   try {
     page.on("console", (m) => {
       if (m.type() === "error" || process.env.VOS_RENDER_DEBUG)
@@ -2755,7 +2842,7 @@ async function renderAnimation(browser, opts) {
   const server = await startTakeServer(opts.workDir, {
     "/render.html": renderPageHtml()
   });
-  const context = await browser.newContext({
+  const context2 = await browser.newContext({
     viewport: { width: opts.width, height: opts.height }
   });
   try {
@@ -2769,7 +2856,7 @@ async function renderAnimation(browser, opts) {
     };
     const outNames = await Promise.all(
       chunks.map(
-        (chunk2) => renderChunk(context, server.base, chunk2, effOpts, (fraction) => {
+        (chunk2) => renderChunk(context2, server.base, chunk2, effOpts, (fraction) => {
           progress[chunk2.index] = fraction;
           reportProgress();
         })
@@ -2793,7 +2880,7 @@ async function renderAnimation(browser, opts) {
     );
     return { bytes, totalFrames, chunks: chunks.length };
   } finally {
-    await context.close();
+    await context2.close();
     server.close();
   }
 }
@@ -3297,11 +3384,11 @@ async function digestTake(browser, dir, opts = {}) {
     const server = await startTakeServer(dir, {
       "/digest.html": digestPageHtml()
     });
-    const context = await browser.newContext({
+    const context2 = await browser.newContext({
       viewport: { width: 640, height: 360 }
     });
     try {
-      const page = await context.newPage();
+      const page = await context2.newPage();
       page.on("console", (m) => {
         if (m.type() === "error")
           process.stderr.write(`   [digest page] ${m.text()}
@@ -3369,7 +3456,7 @@ async function digestTake(browser, dir, opts = {}) {
       }
       if (sizes["sheet.png"]) sheet = "sheet.png";
     } finally {
-      await context.close();
+      await context2.close();
       server.close();
     }
   } else {
@@ -3636,11 +3723,11 @@ async function framesTake(browser, dir, opts) {
     "/render.html": renderPageHtml()
   });
   const ss = stillSupersample(width, height);
-  const context = await browser.newContext({
+  const context2 = await browser.newContext({
     viewport: { width: width * ss, height: height * ss }
   });
   try {
-    const page = await context.newPage();
+    const page = await context2.newPage();
     page.on("console", (m) => {
       if (m.type() === "error")
         process.stderr.write(`   [stills page] ${m.text()}
@@ -3683,7 +3770,7 @@ async function framesTake(browser, dir, opts) {
     }
     return { frames, width, height, duration, outDir };
   } finally {
-    await context.close();
+    await context2.close();
     server.close();
   }
 }
@@ -4442,11 +4529,11 @@ var outputLength = (doc) => ratedSegments4(doc).reduce((acc, s) => {
   const rate = s.rate && s.rate > 0 ? s.rate : 1;
   return acc + (s.out - s.in) / rate;
 }, 0);
-function templateWords(words) {
-  const headline = (words.headline ?? "").trim();
-  const kicker = (words.kicker ?? "").trim();
-  const brand = (words.brand ?? "").trim();
-  const sub = [brand, (words.release ?? "").trim()].filter(Boolean).join(" ");
+function templateWords(words2) {
+  const headline = (words2.headline ?? "").trim();
+  const kicker = (words2.kicker ?? "").trim();
+  const brand = (words2.brand ?? "").trim();
+  const sub = [brand, (words2.release ?? "").trim()].filter(Boolean).join(" ");
   const out = {};
   if (headline) {
     out["stage-title"] = headline;
@@ -4472,7 +4559,7 @@ var anchorWord = (at2) => typeof at2 === "object" ? `step ${at2.step}` : typeof
 var onWord = (v) => v === void 0 || /^(on|yes|true)$/i.test(v.trim());
 function proposeMotion(input, opts) {
   let doc = migrateMotion(structuredClone(input));
-  const { words, launch, catalog } = opts;
+  const { words: words2, launch, catalog } = opts;
   const notes = [];
   const skipped = [];
   const footage = outputLength(doc);
@@ -4502,7 +4589,7 @@ function proposeMotion(input, opts) {
     (t) => !(t.from === END_CARD_FROM && off(endCardRole))
   );
   const namedEndCard = templates.some((t) => t.from === END_CARD_FROM);
-  const tWords = templateWords(words);
+  const tWords = templateWords(words2);
   const keys = opts.mark ? { "stage-mark": opts.mark.key, "endcard-markimg": opts.mark.key } : void 0;
   for (const t of templates) {
     const at2 = resolveAnchor(doc, t.at);
@@ -4527,9 +4614,9 @@ function proposeMotion(input, opts) {
       else delete doc.frame.anim;
     }
   } else if (onWord(endCardRole) && !namedEndCard) {
-    const headline = (words.headline ?? "").trim();
-    const brand = (words.brand ?? "").trim();
-    const sub = [brand, (words.release ?? "").trim()].filter(Boolean).join(" ");
+    const headline = (words2.headline ?? "").trim();
+    const brand = (words2.brand ?? "").trim();
+    const sub = [brand, (words2.release ?? "").trim()].filter(Boolean).join(" ");
     if (headline || brand) {
       const card = { seconds: END_CARD_SECONDS };
       if (opts.ink) card.ink = opts.ink;
@@ -6996,11 +7083,11 @@ async function readDigestActivity(dir) {
     return null;
   }
 }
-function patchStageWords(doc, words) {
+function patchStageWords(doc, words2) {
   const map = {
-    "stage-title": words.headline,
-    "stage-kicker": words.kicker,
-    "stage-brand": words.brand
+    "stage-title": words2.headline,
+    "stage-kicker": words2.kicker,
+    "stage-brand": words2.brand
   };
   for (const clip of doc.overlays ?? []) {
     if (clip.kind !== "text" || !isStageClip(clip)) continue;
@@ -7675,13 +7762,15 @@ async function pushTake(dir, flags, r) {
   if (upload.reused) r.log("  recording already hosted \u2014 reused");
   const docForPush = structuredClone(take.doc);
   docForPush.source.videoKey = assetUrl;
-  if (docForPush.source.camKey && !/^(https?:)?\//.test(docForPush.source.camKey)) {
-    r.log("  cam track is local-only \u2014 dropped from the push");
-    delete docForPush.source.camKey;
-  }
-  if (docForPush.source.micKey && !/^(https?:)?\//.test(docForPush.source.micKey)) {
-    r.log("  mic track is local-only \u2014 dropped from the push");
-    delete docForPush.source.micKey;
+  await uploadDocRefs(sourceSidecarRefs(docForPush), dir, ctx, (l) => r.log(l));
+  for (const field of ["micKey", "camKey"]) {
+    const key = docForPush.source[field];
+    if (key && isTakeRelativeKey(key)) {
+      r.log(
+        `  ${field === "micKey" ? "mic" : "cam"} track ${key} is not beside the take \u2014 left out of the push`
+      );
+      delete docForPush.source[field];
+    }
   }
   await uploadDocRefs(docMediaRefs(docForPush), dir, ctx, (l) => r.log(l));
   const lowered = lowerToComposition3(docForPush);
@@ -8345,7 +8434,7 @@ with their key: vos push ${source} --vos ${String(created2.id ?? "<id>")}`
   void flags.yes;
   if (programDoc) {
     await uploadDocRefs(
-      docAudioRefs(soundOf(programDoc)),
+      docLayerRefs(layersOf(programDoc)),
       dir,
       { origin, key },
       (l) => r.log(l)
@@ -8692,6 +8781,13 @@ function isTakeDir(target) {
 function soundOf(doc) {
   return { audio: Array.isArray(doc.audio) ? doc.audio : [] };
 }
+function layersOf(doc) {
+  return {
+    ...soundOf(doc),
+    overlays: Array.isArray(doc.overlays) ? doc.overlays : [],
+    objects: Array.isArray(doc.objects) ? doc.objects : []
+  };
+}
 function storedProgramConfig(config, programDoc) {
   if (!programDoc) return config;
   const doc = { audio: [], ...programDoc };
@@ -8872,12 +8968,177 @@ async function cmdAsset(argv) {
 import { existsSync as existsSync16, rmSync as rmSync2, statSync as statSync4 } from "fs";
 import { join as join18 } from "path";
 import { createInterface as createInterface3 } from "readline/promises";
-var BOOLEAN_FLAGS4 = /* @__PURE__ */ new Set(["json", "help", "yes"]);
-async function cmdDelete(argv) {
+
+// src/plugin/trash.ts
+var BOOLEAN_FLAGS4 = /* @__PURE__ */ new Set(["json", "help"]);
+var MONTHS = [
+  "Jan",
+  "Feb",
+  "Mar",
+  "Apr",
+  "May",
+  "Jun",
+  "Jul",
+  "Aug",
+  "Sep",
+  "Oct",
+  "Nov",
+  "Dec"
+];
+function restoreDate(iso, now = /* @__PURE__ */ new Date()) {
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime())) return iso;
+  const day = `${d.getUTCDate()} ${MONTHS[d.getUTCMonth()]}`;
+  return d.getUTCFullYear() === now.getUTCFullYear() ? day : `${day} ${d.getUTCFullYear()}`;
+}
+function trashedBy(entry) {
+  if (entry.deletedVia === "key") {
+    return entry.deletedClient ?? entry.deletedKeyName ?? "a key";
+  }
+  if (entry.deletedVia === "admin") return "an admin";
+  if (entry.deletedVia === "service") return "vos.so";
+  return "you";
+}
+function sinceMoment(value, now = /* @__PURE__ */ new Date()) {
+  const rel = /^(\d+(?:\.\d+)?)(s|m|h|d)$/.exec(value.trim());
+  if (rel) {
+    const unit = { s: 1e3, m: 6e4, h: 36e5, d: 864e5 }[rel[2]];
+    return new Date(now.getTime() - Number(rel[1]) * unit);
+  }
+  const at2 = new Date(value);
+  return Number.isNaN(at2.getTime()) ? null : at2;
+}
+function words(kind) {
+  return kind === "vos" ? "vos" : kind === "folder" ? "project" : "file";
+}
+function context(flags) {
+  const origin = platformOrigin({
+    origin: strFlag(flags, "origin"),
+    api: strFlag(flags, "api")
+  }).replace(/\/+$/, "");
+  return { origin, key: requireCredential(strFlag(flags, "key")) };
+}
+async function readTrash(ctx) {
+  const res = await apiJson(ctx.origin, "/api/trash", { key: ctx.key });
+  if (res.status !== 200) throw new Error(apiError("read Trash", res));
+  return res.body.entries ?? [];
+}
+async function restore(ctx, body) {
+  let restored = [];
+  let missing = [];
+  for (let pass = 0; pass < 100; pass++) {
+    const res = await apiJson(ctx.origin, "/api/trash/restore", {
+      method: "POST",
+      key: ctx.key,
+      body
+    });
+    if (res.status !== 200) throw new Error(apiError("restore", res));
+    if (pass === 0) {
+      restored = res.body.restored ?? [];
+      missing = res.body.missing ?? [];
+    }
+    if (res.body.done !== false) break;
+  }
+  return { restored, missing };
+}
+async function cmdTrash(argv) {
   const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS4);
+  const r = createReporter(flags.json === true);
+  const ctx = context(flags);
+  if (positionals[0] === "restore") {
+    const raw = strFlag(flags, "since");
+    const since = raw ? sinceMoment(raw) : null;
+    if (!since)
+      throw new UsageError(
+        "vos trash restore --since <30m|1h|2d|ISO time> [--by <key name>] [--json]"
+      );
+    const by = strFlag(flags, "by");
+    let keyId = null;
+    if (by) {
+      const match = (await readTrash(ctx)).find(
+        (e) => e.deletedKeyName === by || e.deletedKeyId?.startsWith(by)
+      );
+      keyId = match?.deletedKeyId ?? null;
+      if (!keyId)
+        throw new Error(`nothing in Trash was moved there by a key named ${by}`);
+    } else {
+      const me = await apiJson(ctx.origin, "/api/user/whoami", {
+        key: ctx.key
+      });
+      keyId = (me.body.key ?? null)?.id ?? null;
+      if (me.status !== 200 || !keyId)
+        throw new Error(
+          "could not tell which key this is: pass --by <key name> (vos trash lists them)"
+        );
+    }
+    const done = await restore(ctx, { keyId, since: since.toISOString() });
+    r.done(
+      { restored: done.restored, count: done.restored.length },
+      done.restored.length ? `restored ${done.restored.length} item${done.restored.length === 1 ? "" : "s"} moved to Trash since ${since.toISOString()}` : `nothing was moved to Trash by that key since ${since.toISOString()}`
+    );
+    return EXIT_OK;
+  }
+  if (positionals[0])
+    throw new UsageError(
+      `vos trash has no "${positionals[0]}": vos trash, or vos trash restore --since <time>. Trash is emptied by a person, at vos.so/app/trash`
+    );
+  const entries2 = await readTrash(ctx);
+  if (flags.json === true) {
+    r.done({ entries: entries2, count: entries2.length }, "");
+    return EXIT_OK;
+  }
+  if (entries2.length === 0) {
+    r.done({ entries: entries2, count: 0 }, "Trash is empty");
+    return EXIT_OK;
+  }
+  const lines = entries2.map((e) => {
+    const inside = e.members ? ` (${e.members.voses} vos, ${e.members.assets} files)` : "";
+    return `  ${words(e.kind).padEnd(7)} ${e.id}  "${e.title}"${inside}: moved by ${trashedBy(e)}, restorable until ${restoreDate(e.restoreUntil)}`;
+  });
+  r.done(
+    { entries: entries2, count: entries2.length },
+    `${entries2.length} in Trash
+${lines.join("\n")}
+restore one: vos restore <id>   (emptying Trash is the person's act, at vos.so/app/trash)`
+  );
+  return EXIT_OK;
+}
+async function cmdRestore(argv) {
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS4);
+  if (positionals.length === 0)
+    throw new UsageError("vos restore <id|watch-url> [...] [--json]");
+  const r = createReporter(flags.json === true);
+  const ctx = context(flags);
+  const entries2 = await readTrash(ctx);
+  const wanted = positionals.map((p) => parseVosId(p) ?? p);
+  const units = wanted.map((id) => {
+    const entry = entries2.find((e) => e.id === id);
+    if (!entry)
+      throw new Error(
+        `${id} is not in Trash (vos trash lists what is; something inside a trashed project comes back with the project)`
+      );
+    return { kind: entry.kind, id: entry.id, title: entry.title };
+  });
+  const done = await restore(ctx, {
+    ids: units.map(({ kind, id }) => ({ kind, id }))
+  });
+  const names = units.map((u) => `"${u.title}"`).join(", ");
+  r.done(
+    { restored: done.restored, count: done.restored.length },
+    `restored ${names}`
+  );
+  return EXIT_OK;
+}
+
+// src/plugin/remove.ts
+var BOOLEAN_FLAGS5 = /* @__PURE__ */ new Set(["json", "help", "yes", "dry-run"]);
+async function cmdDelete(argv) {
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS5);
   const target = positionals[0];
   if (!target)
-    throw new UsageError("vos delete <vosId|watch-url|dir> [--yes] [--json]");
+    throw new UsageError(
+      "vos delete <vosId|watch-url|dir> [--yes] [--dry-run] [--json]"
+    );
   const r = createReporter(flags.json === true);
   const origin = platformOrigin({
     origin: strFlag(flags, "origin"),
@@ -8894,24 +9155,33 @@ async function cmdDelete(argv) {
   if (meta.status !== 200) throw new Error(apiError(`read ${vosId}`, meta));
   const vos = meta.body.vos ?? {};
   const title = typeof vos.title === "string" ? vos.title : vosId;
+  if (flags["dry-run"] === true) {
+    r.done(
+      { id: vosId, title, deleted: false, dryRun: true },
+      `would move "${title}" (${vosId}) to Trash; nothing was changed`
+    );
+    return EXIT_OK;
+  }
   if (flags.yes !== true) {
     if (!process.stdin.isTTY)
       throw new UsageError(
-        `deleting "${title}" (${vosId}) cannot be undone: re-run with --yes to confirm`
+        `"${title}" (${vosId}) would move to Trash: re-run with --yes to confirm, or --dry-run to only look`
       );
     const rl = createInterface3({ input: process.stdin, output: process.stderr });
     const answer = await rl.question(
-      `Delete "${title}" (${vosId}) and every version of it? This cannot be undone. [y/N] `
+      `Move "${title}" (${vosId}) to Trash? It stays restorable there for a while (vos restore ${vosId}). [y/N] `
     );
     rl.close();
     if (!/^y(es)?$/i.test(answer.trim())) {
-      r.done({ id: vosId, deleted: false }, "kept \u2014 nothing was deleted");
+      r.done({ id: vosId, deleted: false }, "kept: nothing was deleted");
       return EXIT_OK;
     }
   }
   const res = await apiJson(origin, `/api/vos/${vosId}`, {
     method: "DELETE",
-    key
+    key,
+    // Who did it, for the person reading Trash later (display only).
+    headers: { "x-vos-client": clientId() }
   });
   if (res.status !== 200 && res.status !== 204)
     throw new Error(apiError(`delete ${vosId}`, res));
@@ -8920,9 +9190,23 @@ async function cmdDelete(argv) {
     rmSync2(join18(dir, SYNC_STATE_NAME), { force: true });
     unlinked = true;
   }
+  const trashed = res.body.trashed === true;
+  const restoreUntil = typeof res.body.restoreUntil === "string" ? res.body.restoreUntil : null;
+  const tail = unlinked ? `; ${dir} no longer tracks it` : "";
   r.done(
-    { id: vosId, title, deleted: true, unlinked },
-    `deleted "${title}" (${vosId})${unlinked ? `; ${dir} no longer tracks it` : ""}`
+    {
+      id: vosId,
+      title,
+      deleted: true,
+      trashed,
+      ...restoreUntil ? { restoreUntil } : {},
+      unlinked
+    },
+    trashed ? `moved "${title}" (${vosId}) to Trash${restoreUntil ? `, restorable until ${restoreDate(restoreUntil)}` : ""}: vos restore ${vosId}${tail}` : (
+      // A vos with no version (a refused hosted take's empty shell) has
+      // nothing to restore, so the platform erases it.
+      `deleted "${title}" (${vosId})${tail}`
+    )
   );
   return EXIT_OK;
 }
@@ -9122,9 +9406,9 @@ function nonJson(value, path) {
   }
   return null;
 }
-var BOOLEAN_FLAGS5 = /* @__PURE__ */ new Set(["json", "help"]);
+var BOOLEAN_FLAGS6 = /* @__PURE__ */ new Set(["json", "help"]);
 async function cmdBuild(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS5);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS6);
   const source = positionals[0];
   if (!source)
     throw new UsageError("vos build <program.mjs> [--out config.json] [--json]");
@@ -9166,7 +9450,7 @@ async function cmdBuild(argv) {
 import { spawnSync } from "child_process";
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "fs";
 import { join as join20, resolve as resolve8 } from "path";
-var BOOLEAN_FLAGS6 = /* @__PURE__ */ new Set(["json", "help"]);
+var BOOLEAN_FLAGS7 = /* @__PURE__ */ new Set(["json", "help"]);
 function sampleTimes(duration, every) {
   const step = every > 0 ? every : 1;
   const out = [];
@@ -9217,7 +9501,7 @@ function probeSize(video) {
   return m ? { width: Number(m[1]), height: Number(m[2]) } : null;
 }
 async function cmdCompare(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS6);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS7);
   const source = positionals[0];
   const against = strFlag(flags, "against");
   if (!source || !against)
@@ -10362,8 +10646,8 @@ function toHex(css) {
   return `#${hex2(+m[1])}${hex2(+m[2])}${hex2(+m[3])}${a < 1 ? hex2(a * 255) : ""}`;
 }
 function keyFor(label, taken, prefix = "t") {
-  const words = label.replace(/[^A-Za-z0-9]+/g, " ").trim().split(" ").filter(Boolean).slice(0, 4);
-  let base = words.map(
+  const words2 = label.replace(/[^A-Za-z0-9]+/g, " ").trim().split(" ").filter(Boolean).slice(0, 4);
+  let base = words2.map(
     (w, i) => i === 0 ? w.toLowerCase() : w[0].toUpperCase() + w.slice(1).toLowerCase()
   ).join("");
   if (!base || /^[0-9]/.test(base)) base = prefix + (base || "");
@@ -10424,8 +10708,8 @@ function planScaffold(inv, opts) {
   for (const t of inv.texts) {
     const generic = /^(div|span|p|h[1-6]|li|a|b|i|em|strong)-\d+$/.test(t.id);
     const key = keyFor(generic ? t.text : t.id, taken);
-    const words = t.font.transform === "uppercase" ? t.text.toUpperCase() : t.font.transform === "lowercase" ? t.text.toLowerCase() : t.text;
-    data[key] = words;
+    const words2 = t.font.transform === "uppercase" ? t.text.toUpperCase() : t.font.transform === "lowercase" ? t.text.toLowerCase() : t.text;
+    data[key] = words2;
     const family = faceFor(t);
     elements.push({
       id: key,
@@ -10444,7 +10728,7 @@ function planScaffold(inv, opts) {
         } : {}
       }
     });
-    textKeys.push({ key, size: t.font.size, label: words.slice(0, 40) });
+    textKeys.push({ key, size: t.font.size, label: words2.slice(0, 40) });
     if (t.scene && sceneNames.has(t.scene))
       (sceneElements[t.scene] ??= []).push(key);
   }
@@ -10742,7 +11026,7 @@ function reportText(inv, r) {
       "",
       "## Images and video",
       "",
-      "Not placed: upload each with `vos asset upload` and add an image or video element over its hosted URL.",
+      "Not placed: upload each with `vos asset push` and add an image or video element over its hosted URL.",
       "",
       ...inv.media.filter((m) => m.kind === "image" || m.kind === "video").map((m) => `- ${m.kind} ${m.src ?? "(inline)"}`)
     ] : [],
@@ -10776,7 +11060,7 @@ function probeAudioDuration(file) {
 }
 
 // src/plugin/port.ts
-var BOOLEAN_FLAGS7 = /* @__PURE__ */ new Set(["json", "help"]);
+var BOOLEAN_FLAGS8 = /* @__PURE__ */ new Set(["json", "help"]);
 async function cmdPort(argv) {
   const [sub, ...rest] = argv;
   if (sub === "inventory") return await inventory(rest);
@@ -10786,7 +11070,7 @@ async function cmdPort(argv) {
   );
 }
 async function inventory(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS7);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS8);
   const source = positionals[0] ?? ".";
   const r = createReporter(flags.json === true);
   const outDir = resolve11(strFlag(flags, "out") ?? "port");
@@ -10827,7 +11111,7 @@ function summary(inv) {
   };
 }
 async function scaffold(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS7);
+  const { flags } = parseArgs(argv, BOOLEAN_FLAGS8);
   const r = createReporter(flags.json === true);
   const from = resolve11(strFlag(flags, "from") ?? join24("port", "inventory.json"));
   if (!existsSync20(from))
@@ -10866,7 +11150,7 @@ function scaffoldSourceDir(inv) {
 // src/plugin/recipe.ts
 import { readFileSync as readFileSync8 } from "fs";
 import { basename as basename9 } from "path";
-var BOOLEAN_FLAGS8 = /* @__PURE__ */ new Set(["json", "help"]);
+var BOOLEAN_FLAGS9 = /* @__PURE__ */ new Set(["json", "help"]);
 var USAGE = "vos recipe push <file.md> (--folder <folderId|slug> | --asset <assetId>)";
 function recipeFilename(file) {
   const name = basename9(file);
@@ -10876,7 +11160,7 @@ function recipeFilename(file) {
   return name;
 }
 async function cmdPush2(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS8);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS9);
   const [file] = positionals;
   const folderRef = strFlag(flags, "folder");
   const assetId = strFlag(flags, "asset");
@@ -11977,7 +12261,7 @@ import {
   Output,
   WebMOutputFormat
 } from "mediabunny";
-var BOOLEAN_FLAGS9 = /* @__PURE__ */ new Set(["json", "help"]);
+var BOOLEAN_FLAGS10 = /* @__PURE__ */ new Set(["json", "help"]);
 async function probeVideoFile(path) {
   const input = new Input({
     source: new FilePathSource(path),
@@ -12068,7 +12352,7 @@ function parseViewport(v) {
   return { width: Number(m[1]), height: Number(m[2]) };
 }
 async function cmdIngest(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS9, MULTI_FLAGS2);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS10, MULTI_FLAGS2);
   const source = positionals[0];
   if (!source)
     throw new UsageError(
@@ -12274,6 +12558,7 @@ var RULES_BODY = `## Product videos (vosso)
 - Look before you cut: vos frames take --at-zooms; edit take/doc.json and re-render, never re-record
 - Hand back: vos open take serves the take into the studio at vos.so, doc.json intact
 - Local by default: vos push only when asked for a link, the shelf or a cloud render
+- Deleting: vos delete moves a vos to Trash and vos restore brings it back; if you deleted by mistake, restore it and say so. Only the person can delete forever, at vos.so/app/trash
 - Credentials: VOS_API_KEY, then ~/.config/vos/credentials, then vos login; never print one
 - Reference: https://vos.so/llms-full.txt`;
 var RULES_BLOCK = `${RULES_BEGIN}
@@ -12422,7 +12707,7 @@ function bundledSkillsDir(from) {
 }
 
 // src/plugin/machineCmd.ts
-var BOOLEAN_FLAGS10 = /* @__PURE__ */ new Set([
+var BOOLEAN_FLAGS11 = /* @__PURE__ */ new Set([
   "json",
   "help",
   "global",
@@ -12500,7 +12785,7 @@ async function doctorFacts(opts) {
   };
 }
 async function cmdSetup(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS10);
+  const { flags } = parseArgs(argv, BOOLEAN_FLAGS11);
   const r = reporterFor(flags);
   const root = process.cwd();
   const global = flags.global === true;
@@ -12619,7 +12904,7 @@ Next: ${report.next_step}`
   return report.ok ? EXIT_OK : EXIT_NO_BROWSER;
 }
 async function cmdDoctor(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS10);
+  const { flags } = parseArgs(argv, BOOLEAN_FLAGS11);
   const r = reporterFor(flags);
   const root = process.cwd();
   const homes = detectAgents(root, { home: homedir2(), global: true });
@@ -12638,7 +12923,7 @@ Next: ${report.next_step}`
   return report.ok ? EXIT_OK : EXIT_NO_BROWSER;
 }
 async function cmdWhoami(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS10);
+  const { flags } = parseArgs(argv, BOOLEAN_FLAGS11);
   const r = reporterFor(flags);
   const origin = platformOrigin({
     origin: strFlag(flags, "origin"),
@@ -12700,7 +12985,7 @@ async function cmdWhoami(argv) {
   return EXIT_OK;
 }
 function cmdLogout(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS10);
+  const { flags } = parseArgs(argv, BOOLEAN_FLAGS11);
   const r = reporterFor(flags);
   const had = existsSync23(CREDENTIALS_PATH);
   rmSync3(CREDENTIALS_PATH, { force: true });
@@ -12718,7 +13003,7 @@ function cmdLogout(argv) {
 }
 
 // src/plugin/run.ts
-var BOOLEAN_FLAGS11 = /* @__PURE__ */ new Set([
+var BOOLEAN_FLAGS12 = /* @__PURE__ */ new Set([
   "json",
   "help",
   "wait",
@@ -12820,16 +13105,29 @@ Platform (vos.so) \u2014 fetch, edit, push, pull, repeat
             --override consents to touching
             protected (human-edited) nodes, ONLY when the user asked.
             Without --folder a new vos lands unfiled, at the root of your
-            shelf. A document's local sound (doc.json audio keys) uploads
-            with the push. --wait stays until the version's still has
+            shelf. A document's local files (doc.json: picture and video
+            overlays, 3D props, sound; a take's mic and cam too) upload
+            with the push, each once. --wait stays until the version's still has
             rendered and prints absolute still and preview links.
             --still <seconds> sets a PROGRAM's cover (doc.json "still", kept
             by every later push); without it the platform picks an early
             frame. A take's cover is its doc.json "still".
-  vos delete <vosId|watch-url|dir> [--yes] [--json]
-            take a vos off vos.so, every version of it, for good. Asks on a
-            terminal; headless it needs --yes. A dir that tracked it is
-            unlinked (its vos.json removed)
+  vos delete <vosId|watch-url|dir> [--yes] [--dry-run] [--json]
+            move a vos to Trash on vos.so. Nothing is erased: it stays
+            restorable until the date the delete prints (vos restore <id>).
+            Asks on a terminal; headless it needs --yes. --dry-run names
+            what would move and changes nothing. A dir that tracked it is
+            unlinked (its vos.json removed). Needs a key with the delete
+            scope; no key can delete forever, only the person can, on the
+            web
+  vos trash [--json]
+            what is in Trash on vos.so: what, moved by whom, restorable
+            until when
+  vos restore <id|watch-url> [...] [--json]
+            bring those back from Trash, as they were
+  vos trash restore --since <30m|1h|2d|ISO> [--by <key name>] [--json]
+            undo everything this key (or the named one) moved to Trash
+            since then
   vos pull  [dir|take] [--vos <id>] [--since versionId] [--check] [--media] [--json]
             what changed on vos.so since your base; syncs config.json (backup
             kept) or the take's doc.json. ALWAYS pull before editing pushed work.
@@ -13175,7 +13473,7 @@ function wallGate(flags, r, opts) {
 async function cmdRecord(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const actionsPath = strFlag(flags, "actions") ?? positionals[0];
@@ -13296,10 +13594,10 @@ async function cmdRecord(argv) {
       const rec = await inSession(
         sessionName,
         actions,
-        (context) => recordTake(browser2, url, actions, takePaths(outDir), r.log, {
+        (context2) => recordTake(browser2, url, actions, takePaths(outDir), r.log, {
           storageState,
           headers,
-          context,
+          context: context2,
           dryRun: true,
           // A rehearsal is always strict, and it touches no directory.
           onArrival: wallGate(flags, r, { strict: true })
@@ -13358,11 +13656,11 @@ ${lines.join("\n")}
     const rec = await inSession(
       sessionName,
       actions,
-      (context) => recordTake(browser, url, actions, paths, r.log, {
+      (context2) => recordTake(browser, url, actions, paths, r.log, {
         maxDurationSeconds,
         storageState,
         headers,
-        context,
+        context: context2,
         onArrival: wallGate(flags, r, {
           strict: flags.strict === true,
           prepare
@@ -13417,7 +13715,7 @@ ${lines.join("\n")}
 async function cmdCreate2(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const actionsPath = strFlag(flags, "actions");
@@ -13462,11 +13760,11 @@ async function cmdCreate2(argv) {
     const rec = await inSession(
       sessionName,
       actions,
-      (context) => recordTake(browser, url, actions, paths, r.log, {
+      (context2) => recordTake(browser, url, actions, paths, r.log, {
         maxDurationSeconds,
         storageState,
         headers,
-        context,
+        context: context2,
         onArrival: wallGate(flags, r, {
           strict: flags.strict === true,
           prepare
@@ -13543,7 +13841,7 @@ async function cmdCreate2(argv) {
 async function cmdPlan(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     /* @__PURE__ */ new Set(["with"])
   );
   const dir = positionals[0];
@@ -13644,7 +13942,7 @@ async function releaseInputs(dir, flags, r, withRefs = []) {
   }
   const launch = await readLaunchBesideTake(dir, strFlag(flags, "launch"));
   const lines = (v) => v === null || v === void 0 ? null : v.replace(/\\n/g, "\n");
-  const words = {
+  const words2 = {
     headline: lines(strFlag(flags, "headline") ?? launch?.roles.headline),
     kicker: lines(strFlag(flags, "kicker") ?? launch?.roles.kicker),
     brand: strFlag(flags, "brand-name") ?? lookPick.roles?.wordmark ?? null,
@@ -13729,7 +14027,7 @@ async function releaseInputs(dir, flags, r, withRefs = []) {
     }
   }
   return {
-    words,
+    words: words2,
     launchRoles,
     ink: endCardInk(lookPick.look, lookPick.roles),
     mark,
@@ -13741,7 +14039,7 @@ async function releaseInputs(dir, flags, r, withRefs = []) {
 async function cmdRender(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const dir = positionals[0];
@@ -13809,7 +14107,7 @@ async function cmdRender(argv) {
 async function cmdFrames(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const dir = positionals[0];
@@ -13882,7 +14180,7 @@ async function cmdFrames(argv) {
 async function cmdDeliver(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const dir = positionals[0];
@@ -14048,7 +14346,7 @@ async function officialTemplate(origin, ref) {
   }
 }
 async function cmdDigest(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const dir = positionals[0];
   if (!dir)
     throw new UsageError(
@@ -14112,7 +14410,7 @@ async function cmdDigest(argv) {
   }
 }
 async function cmdOpen(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const dir = positionals[0];
   if (!dir) throw new UsageError("vos open <take> [--studio <url>]");
   const r = createReporter(flags.json === true);
@@ -14150,7 +14448,7 @@ async function cmdOpen(argv) {
   return EXIT_OK;
 }
 async function cmdJudge(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const target = positionals[0];
   const against = strFlag(flags, "against");
   if (!target || !against)
@@ -14179,7 +14477,7 @@ Win rate so far: ${rate.wins} win(s), ${rate.ties} tie(s) of ${rate.judged} judg
   return EXIT_OK;
 }
 async function cmdCallout(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const dir = positionals[0];
   const shape = positionals[1];
   if (!dir || !shape || !isCalloutShape(shape))
@@ -14204,19 +14502,19 @@ async function cmdCallout(argv) {
     );
   const codeFile = strFlag(flags, "code-file");
   const code = codeFile ? await readFile17(codeFile, "utf8") : strFlag(flags, "code");
-  const words = {
+  const words2 = {
     kicker: strFlag(flags, "kicker"),
     title: strFlag(flags, "title"),
     body: strFlag(flags, "body"),
     code: code?.replace(/\\n/g, "\n")
   };
-  if (shape === "code" && !words.code)
+  if (shape === "code" && !words2.code)
     throw new UsageError(
       'a code callout needs --code "\u2026" or --code-file <file>'
     );
-  if (shape === "note" && !words.title)
+  if (shape === "note" && !words2.title)
     throw new UsageError('a note needs --title "\u2026"');
-  if (shape === "tag" && !words.kicker && !words.title)
+  if (shape === "tag" && !words2.kicker && !words2.title)
     throw new UsageError('a tag needs --kicker "\u2026"');
   const stepRaw = strFlag(flags, "step");
   const atRaw = strFlag(flags, "at");
@@ -14227,7 +14525,7 @@ async function cmdCallout(argv) {
   try {
     composed = composeCallout(take.doc, register, {
       shape,
-      words,
+      words: words2,
       id: strFlag(flags, "id"),
       step: stepRaw !== void 0 ? /^\d+$/.test(stepRaw) ? Number(stepRaw) : stepRaw : void 0,
       at: atRaw !== void 0 ? Number(atRaw) : void 0,
@@ -14278,7 +14576,7 @@ async function cmdCallout(argv) {
   return EXIT_OK;
 }
 async function cmdValidate(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const target = positionals[0];
   if (!target) throw new UsageError("vos validate <actions.json|take>");
   const r = createReporter(flags.json === true);
@@ -14440,7 +14738,7 @@ async function cmdValidate(argv) {
 async function cmdPush3(argv) {
   const { positionals, flags, multi } = parseArgs(
     argv,
-    BOOLEAN_FLAGS11,
+    BOOLEAN_FLAGS12,
     MULTI_FLAGS2
   );
   const dir = positionals[0];
@@ -14504,7 +14802,7 @@ ${landedLines(landed)}` : "")
   return EXIT_OK;
 }
 async function cmdPull2(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11, MULTI_FLAGS2);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12, MULTI_FLAGS2);
   const dir = positionals[0] ?? ".";
   const r = createReporter(flags.json === true);
   const result = await pullTake(
@@ -14617,6 +14915,10 @@ async function run(argv) {
       }
       case "delete":
         return await cmdDelete(rest);
+      case "trash":
+        return await cmdTrash(rest);
+      case "restore":
+        return await cmdRestore(rest);
       case "build":
         return await cmdBuild(rest);
       case "compare":
@@ -14669,7 +14971,7 @@ async function run(argv) {
   }
 }
 async function cmdSession(argv) {
-  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS11);
+  const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS12);
   const [sub, arg] = positionals;
   const r = createReporter(flags.json === true);
   const usage = "vos session open <url> --name <app> | check <name> [--url <url>] | list | rm <name>";
@@ -14809,4 +15111,4 @@ export {
   verbHelp,
   run
 };
-//# sourceMappingURL=chunk-RZZUR2IF.js.map
+//# sourceMappingURL=chunk-CYU7LVPB.js.map