@popcraft/cli 0.32.1 → 0.34.0

package/dist/popcraft.mjs

@@ -594,7 +594,7 @@ var init_openapi = __esm({
     init_api_limits();
     init_listing();
     init_groups();
-    API_VERSION = "1.3.0";
+    API_VERSION = "1.4.0";
     ref = (name2) => ({ $ref: `#/components/schemas/${name2}` });
     str = { type: "string" };
     nstr = { type: ["string", "null"] };
@@ -897,7 +897,7 @@ Lists are paged: follow \`nextCursor\` (passing it as \`?cursor=\`) until it is
         "/files/{key}": {
           get: op("Files", "File metadata, your role and document JSON", "files:read", ok(ref("FileDetail")), { parameters: [key, query("depth", { type: "string", enum: ["metadata"] }, "Omit the document")] }),
           put: op("Files", "Replace the document", "files:write", ok(ref("WriteResult")), {
-            description: "Body: a `Document`, `{ document }` or a .popcraft export. A live file takes the difference as one edit in its collaborative log, so people editing it see the change merge in; private (PopCorn) layers are never written. Send `If-Match: <revision>` to write only if the file has not changed since you read it. Needs edit access.",
+            description: "Body: a `Document`, `{ document }` or a .popcraft export, and may be gzipped (`Content-Encoding: gzip`). Requests are capped at about 4.5 MB on the wire, so upload pictures, video and fonts first (`POST /files/{key}/media`) and send a document that names them as `media://<hash>`. A live file takes the difference as one edit in its collaborative log, so people editing it see the change merge in; private (PopCorn) layers are never written. Send `If-Match: <revision>` to write only if the file has not changed since you read it. Needs edit access.",
             parameters: [key, { name: "If-Match", in: "header", required: false, schema: str, description: "The `revision` you read" }],
             requestBody: { required: true, content: { "application/json": { schema: ref("Document") } } },
             responses: {
@@ -922,6 +922,14 @@ Lists are paged: follow \`nextCursor\` (passing it as \`?cursor=\`) until it is
         "/files/{key}/nodes": { get: op("Files", "Nodes with their subtrees", "files:read", ok(ref("NodeResult")), { parameters: [key, query("ids", str, "Comma-separated node ids (\u2264 200)", true), query("depth", { type: "string", enum: ["1"] }, "Only the nodes themselves, no descendants")], responses: { "400": { description: "`ids` missing", content: errBody } } }) },
         "/files/{key}/images": { get: op("Files", "Thumbnail and media assets the file references", "files:read", ok(ref("Images")), { parameters: [key] }) },
         "/files/{key}/thumbnail": { get: op("Files", "Preview image bytes", "files:read", ok({ type: "string", format: "binary" }, "PNG or WebP bytes", "image/*"), { parameters: [key] }) },
+        "/files/{key}/media": {
+          post: op("Files", "Upload media the file uses", "files:write", null, {
+            description: 'The raw bytes of a picture, video, audio or font file, with `x-media-hash` set to their hash (SHA-256, the first 32 hex characters). The document, or a command such as `font.add` (`src: "media://<hash>"`), can then name them. A workspace stores the same bytes once. Needs edit access.',
+            parameters: [key, { name: "x-media-hash", in: "header", required: true, schema: str, description: "The bytes' hash: the first 32 hex characters of their SHA-256" }],
+            requestBody: { required: true, content: { "*/*": { schema: { type: "string", format: "binary" } } } },
+            responses: { "200": ok(obj({ hash: str, uploaded: bool }, ["hash", "uploaded"]), "Already stored"), "201": ok(obj({ hash: str, uploaded: bool }, ["hash", "uploaded"]), "Stored"), "400": { description: "Missing hash, or the hash does not match the bytes", content: errBody }, "413": { description: "Over the plan's upload size", content: errBody } }
+          })
+        },
         "/files/{key}/media/{hash}": { get: op("Files", "Media asset bytes", "files:read", ok({ type: "string", format: "binary" }, "The asset, with its own content type", "*/*"), { parameters: [key, id("hash", "From `/files/{key}/images`")] }) },
         "/files/{key}/comments": {
           get: op("Comments", "Comments (threads and replies), oldest first", "comments:read", ok(ref("CommentList")), { parameters: [key, query("limit", { ...int, minimum: 1, maximum: 500, default: 500 }, "Page size"), cursor] }),
@@ -1188,7 +1196,7 @@ function operations(spec = openapi) {
 }
 async function call(target2, method, path, opts = {}) {
   const qs = new URLSearchParams(opts.query ?? {}).toString();
-  const headers = { "user-agent": `popcraft-cli/${"0.32.1"}`, ...opts.headers };
+  const headers = { "user-agent": `popcraft-cli/${"0.34.0"}`, ...opts.headers };
   if (target2.token) headers.authorization = `Bearer ${target2.token}`;
   if (opts.contentType) headers["content-type"] = opts.contentType;
   try {
@@ -32175,6 +32183,23 @@ var init_en2 = __esm({
       "apiTokensDialog.used": "used {date}",
       "appHeader.doubleClickToRename": "Double-click to rename",
       "appHeader.fileName": "File name",
+      "appStoreOffers.buyCredits": "Buy AI credits",
+      "appStoreOffers.creditsAdded": "{credits} AI credits added to {teamName}.",
+      "appStoreOffers.creditsGoTo": "Credits are added to {teamName} and pay for AI. They don't expire.",
+      "appStoreOffers.failed": "The purchase did not go through.",
+      "appStoreOffers.loading": "Loading App Store prices\u2026",
+      "appStoreOffers.manage": "Manage in the App Store",
+      "appStoreOffers.pack": "{credits} credits \xB7 {price}",
+      "appStoreOffers.pending": "Your purchase is waiting for approval. It's added as soon as it goes through.",
+      "appStoreOffers.perMonth": " / month",
+      "appStoreOffers.perYear": " / year",
+      "appStoreOffers.privacy": "Privacy Policy",
+      "appStoreOffers.renewalTerms": "Payment is charged to your Apple Account. The subscription renews automatically at the price shown for each period unless you cancel it at least 24 hours before the period ends. Manage or cancel it in your App Store account settings.",
+      "appStoreOffers.restore": "Restore purchases",
+      "appStoreOffers.restored": "{count, plural, =0 {No purchases to restore.} one {Restored # purchase.} other {Restored # purchases.}}",
+      "appStoreOffers.subscribe": "Subscribe",
+      "appStoreOffers.subscribed": "Subscribed to {plan} \xB7 {teamName}.",
+      "appStoreOffers.terms": "Terms of Use",
       "assetsPanel.components": "Components",
       "assetsPanel.documentColors": "Document colors",
       "assetsPanel.editComponent": "Edit component",
@@ -34938,6 +34963,7 @@ var init_en2 = __esm({
       "planDialog.isOnThePlan": "{teamName} is on the {value} plan.",
       "planDialog.largestUpload": "Largest upload",
       "planDialog.loadingPlans": "Loading plans\u2026",
+      "planDialog.managedInAppStore": "Bought in the App Store. Manage or cancel it in the App Store on your iPad or Mac.",
       "planDialog.mediaStorage": "Storage (media and websites)",
       "planDialog.mo": "mo",
       "planDialog.namedVersionsPerFile": "Named versions per file",
@@ -95224,6 +95250,11 @@ var init_idb = __esm({
 });
 
 // lib/storage/media-hash.ts
+var media_hash_exports = {};
+__export(media_hash_exports, {
+  hashBytesSync: () => hashBytesSync,
+  sha256Prefix: () => sha256Prefix
+});
 function hashBytesSync(bytes2) {
   const run4 = (seed2) => {
     let h1 = 3735928559 ^ seed2, h22 = 1103547991 ^ seed2;
@@ -95238,6 +95269,10 @@ function hashBytesSync(bytes2) {
   };
   return run4(2654435769) + run4(2246822507 ^ bytes2.length);
 }
+async function sha256Prefix(bytes2) {
+  const digest = await crypto.subtle.digest("SHA-256", bytes2);
+  return Array.from(new Uint8Array(digest), (b) => b.toString(16).padStart(2, "0")).join("").slice(0, 32);
+}
 var init_media_hash = __esm({
   "lib/storage/media-hash.ts"() {
     "use strict";
@@ -261307,8 +261342,13 @@ var init_plans = __esm({
 });
 
 // lib/billing/purchases.ts
+function purchaseChannel() {
+  const store6 = storePlatform();
+  if (store6 === null) return "web";
+  return store6 === "ios" || store6 === "macos" ? "app_store" : null;
+}
 function purchasesAllowed() {
-  return storePlatform() === null;
+  return purchaseChannel() === "web";
 }
 function limitMessageHere(d) {
   return limitMessage(purchasesAllowed() ? d : { ...d, upgradeTo: null });
@@ -310142,6 +310182,7 @@ async function dispatchShaped(key5, options) {
 var onViolation;
 var init_dispatch = __esm({
   "lib/commands/dispatch.ts"() {
+    "use strict";
     init_errors();
     init_registry();
     init_confirm();
@@ -310532,6 +310573,7 @@ function creditLine(c2) {
 var MAX_PHOTO_PAGE, MAX_PHOTO_QUERY, UUID, isPhotoId, photoImagePath;
 var init_stock = __esm({
   "lib/photos/stock.ts"() {
+    "use strict";
     MAX_PHOTO_PAGE = 12;
     MAX_PHOTO_QUERY = 200;
     UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -315656,6 +315698,7 @@ async function exportSettingFile(renderer, node2, setting, doc2, styles) {
 var MIME, DEFAULT_EXPORT, exportSettingsOf;
 var init_export = __esm({
   "lib/io/export.ts"() {
+    "use strict";
     init_download();
     init_scene_graph();
     init_codecs();
@@ -316090,7 +316133,6 @@ function videoPixelSize(resolution, aspect) {
 var VIDEO_ASPECTS, VIDEO_RESOLUTIONS, SEEDANCE_ASPECTS, range, VIDEO_MODELS, DEFAULT_VIDEO_MODEL, videoModel, VIDEO_LIMITS;
 var init_video_models = __esm({
   "lib/ai/video-models.ts"() {
-    "use strict";
     VIDEO_ASPECTS = ["16:9", "9:16", "1:1", "4:3", "3:4", "21:9"];
     VIDEO_RESOLUTIONS = ["480p", "720p", "1080p"];
     SEEDANCE_ASPECTS = ["16:9", "9:16", "1:1", "4:3", "3:4", "21:9"];
@@ -326442,7 +326484,7 @@ var init_package = __esm({
   "packages/runtime/package.json"() {
     package_default = {
       name: "@popcraft/runtime",
-      version: "0.32.1",
+      version: "0.34.0",
       description: "What code exported from PopCraft shares: the meaning of expressions (operators and functions) and, as it grows, the parts of a design's behaviour that are common code rather than generated React.",
       license: "MIT",
       homepage: "https://popcraft.app/docs/exporting/nextjs",
@@ -351108,6 +351150,7 @@ function exportsOf(source3) {
 var CODE_LIMITS, packageOf;
 var init_source2 = __esm({
   "lib/code/source.ts"() {
+    "use strict";
     CODE_LIMITS = { modules: 100, sourceLength: 2e5, packages: 12 };
     packageOf = (spec) => spec.split("/").slice(0, spec.startsWith("@") ? 2 : 1).join("/");
   }
@@ -351150,6 +351193,7 @@ function compileModule(module2) {
 var import_sucrase, BUILT_IN, memo4;
 var init_compile2 = __esm({
   "lib/code/compile.ts"() {
+    "use strict";
     import_sucrase = __toESM(require_dist2());
     init_source2();
     init_source2();
@@ -360124,6 +360168,7 @@ var init_publish = __esm({
 var storeOpsSeam;
 var init_seams = __esm({
   "lib/commands/seams.ts"() {
+    "use strict";
     storeOpsSeam = (st) => ({
       booleanOperation: (op4) => st().booleanOperation(op4),
       flatten: () => st().flattenSelection(),
@@ -396078,7 +396123,11 @@ async function fontBytes(args2, ctx2) {
     }
   } else if (args2.src) {
     const { isMediaUrl: isMediaUrl2, loadMediaBlob: loadMediaBlob2 } = await Promise.resolve().then(() => (init_media_store(), media_store_exports));
-    if (isMediaUrl2(args2.src)) {
+    if (isMediaUrl2(args2.src) && ctx2.can("media")) {
+      const bytes2 = await ctx2.use("media").read(args2.src);
+      if (!bytes2) throw new CommandError(`${args2.src} is not in this file's media: upload it first (POST /files/{key}/media).`, "not_found");
+      got = { bytes: bytes2 };
+    } else if (isMediaUrl2(args2.src)) {
       const blob = await loadMediaBlob2(args2.src);
       if (!blob) throw new CommandError(`${args2.src} is not on this device.`, "not_found");
       got = { bytes: new Uint8Array(await blob.arrayBuffer()) };
@@ -396155,7 +396204,7 @@ var init_font = __esm({
       params: external_exports.object({
         family: external_exports.string().trim().min(1).max(200).optional().describe("The family name texts will use (default: the name in the file). Texts set in it draw in this file."),
         file: external_exports.string().min(1).max(4096).optional().describe("A font file on this machine, read by the CLI: .ttf, .otf, .ttc, .woff or .woff2."),
-        src: external_exports.string().max(MAX_SRC).optional().describe("The font file as a base64 data URL, or a media:// ref already on this device."),
+        src: external_exports.string().max(MAX_SRC).optional().describe("The font file as a base64 data URL, or a media:// ref already on this device (through the API: already uploaded to the file's media)."),
         weight: external_exports.number().int().min(1).max(1e3).optional().describe("The weight this face stands for (default: the file's)."),
         style: external_exports.enum(["normal", "italic"]).optional().describe("normal or italic (default: the file's)."),
         face: faceParam.optional()
@@ -396170,10 +396219,9 @@ var init_font = __esm({
       run: async (args2, ctx2) => {
         const { bytes: bytes2, fileName: fileName2 } = await fontBytes(args2, ctx2);
         const { face, family, weight, style, info: info2 } = await resolveFace(bytes2, args2);
-        const { internBytes: internBytes2 } = await Promise.resolve().then(() => (init_media_store(), media_store_exports));
         const { fontMime: fontMime2 } = await Promise.resolve().then(() => (init_sfnt(), sfnt_exports));
         const { addDocumentFont: addDocumentFont2 } = await Promise.resolve().then(() => (init_document_fonts(), document_fonts_exports));
-        const src = internBytes2(bytes2, fontMime2(bytes2));
+        const src = ctx2.can("media") ? await ctx2.use("media").store(bytes2, fontMime2(bytes2)) : (await Promise.resolve().then(() => (init_media_store(), media_store_exports))).internBytes(bytes2, fontMime2(bytes2));
         const font = {
           id: `font-${src.slice(8, 20)}-${face.index}-${weight}-${style === "italic" ? "i" : "n"}`,
           family,
@@ -397472,6 +397520,7 @@ function designRecorder() {
 var installed;
 var init_recorders = __esm({
   "lib/agent/design-script/recorders.ts"() {
+    "use strict";
     installed = null;
   }
 });
@@ -407837,6 +407886,7 @@ var init_headless2 = __esm({
 
 // packages/cli/src/cloud.ts
 import { existsSync as existsSync4 } from "node:fs";
+import { gzipSync } from "node:zlib";
 function signedIn2(target2) {
   if (!target2.token) throw new CliError(`Not signed in to ${target2.url}: run \`popcraft login\` (with a files:write token).`);
   return target2;
@@ -407851,25 +407901,79 @@ async function runPush(args2, flags, target2, out) {
   const name2 = flagString(flags, "name");
   if (key5) {
     const ifMatch = flagString(flags, "ifMatch");
-    const body2 = JSON.stringify({ document: name2 ? { ...document2, name: name2 } : document2 });
+    const { doc: doc3, media: media3 } = await separateMedia(document2);
+    await uploadMedia2(t3, key5, media3);
+    const body = gzipJson({ document: name2 ? { ...doc3, name: name2 } : doc3 });
     const res2 = await callJson(t3, "PUT", `/files/${encodeURIComponent(key5)}`, {
-      body: body2,
-      contentType: "application/json",
-      headers: ifMatch ? { "if-match": ifMatch } : void 0
+      ...body,
+      headers: { ...body.headers, ...ifMatch ? { "if-match": ifMatch } : {} }
     });
     out.result(res2.changed ? `Updated ${key5} (revision ${res2.revision})${res2.live ? "; open sessions merged it" : ""}.` : `${key5} already matched ${file2}.`, out.json ? { key: key5, ...res2 } : void 0);
     return;
   }
-  const body = JSON.stringify({
-    document: document2,
+  const { doc: doc2, media: media2 } = await separateMedia(document2);
+  const res = await callJson(t3, "POST", "/files", gzipJson({
+    document: doc2,
     ...name2 ? { name: name2 } : {},
     ...flagString(flags, "workspace") ? { workspaceId: flagString(flags, "workspace") } : {},
     ...flagString(flags, "project") ? { projectId: flagString(flags, "project") } : {},
     ...flagString(flags, "folder") ? { folderId: flagString(flags, "folder") } : {}
-  });
-  const res = await callJson(t3, "POST", "/files", { body, contentType: "application/json" });
+  }));
+  await uploadMedia2(t3, res.key, media2);
   out.result(`Created ${res.key}: ${t3.url}/pop/${res.key}`, out.json ? { ...res, url: `${t3.url}/pop/${res.key}` } : void 0);
 }
+async function separateMedia(document2) {
+  const { MEDIA_SCHEME: MEDIA_SCHEME2, isMediaUrl: isMediaUrl2, loadMediaBlob: loadMediaBlob2 } = await Promise.resolve().then(() => (init_media_store(), media_store_exports));
+  const { hashBytesSync: hashBytesSync2 } = await Promise.resolve().then(() => (init_media_hash(), media_hash_exports));
+  const media2 = /* @__PURE__ */ new Map();
+  const pending8 = [];
+  const walk4 = (v) => {
+    if (typeof v === "string") {
+      if (isMediaUrl2(v)) {
+        const hash3 = v.slice(MEDIA_SCHEME2.length);
+        if (!media2.has(hash3)) {
+          media2.set(hash3, { bytes: new Uint8Array(0), type: "" });
+          pending8.push(loadMediaBlob2(v).then(async (blob) => {
+            if (blob) media2.set(hash3, { bytes: new Uint8Array(await blob.arrayBuffer()), type: blob.type });
+            else media2.delete(hash3);
+          }));
+        }
+        return v;
+      }
+      const m = /^data:([^;,]*)(?:;[^,]*)?;base64,/.exec(v);
+      if (m && v.length > 1024) {
+        const bytes2 = Uint8Array.from(Buffer.from(v.slice(m[0].length), "base64"));
+        const hash3 = hashBytesSync2(bytes2);
+        media2.set(hash3, { bytes: bytes2, type: m[1] || "application/octet-stream" });
+        return MEDIA_SCHEME2 + hash3;
+      }
+      return v;
+    }
+    if (Array.isArray(v)) return v.map(walk4);
+    if (v && typeof v === "object") return Object.fromEntries(Object.entries(v).map(([k2, x2]) => [k2, walk4(x2)]));
+    return v;
+  };
+  const doc2 = walk4(document2);
+  await Promise.all(pending8);
+  return { doc: doc2, media: media2 };
+}
+async function uploadMedia2(t3, key5, media2) {
+  const queue2 = [...media2];
+  const worker2 = async () => {
+    for (let next2 = queue2.shift(); next2; next2 = queue2.shift()) {
+      const [hash3, { bytes: bytes2, type }] = next2;
+      await callJson(t3, "POST", `/files/${encodeURIComponent(key5)}/media`, {
+        body: bytes2,
+        contentType: type || "application/octet-stream",
+        headers: { "x-media-hash": hash3 }
+      });
+    }
+  };
+  await Promise.all(Array.from({ length: Math.min(4, queue2.length) }, worker2));
+}
+function gzipJson(value3) {
+  return { body: gzipSync(JSON.stringify(value3)), contentType: "application/json", headers: { "content-encoding": "gzip" } };
+}
 async function runPull(args2, flags, target2, out) {
   const [key5, dest] = args2;
   if (!key5) throw usage("Usage: popcraft pull <key> [file.popcraft]");
@@ -409792,7 +409896,7 @@ init_resources();
 init_desktop();
 init_hypery();
 import { createInterface } from "node:readline";
-var VERSION2 = "0.32.1";
+var VERSION2 = "0.34.0";
 var HELP = `popcraft ${VERSION2} \u2014 the PopCraft command line
 
 Files (headless, on .popcraft files):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popcraft/cli",
-  "version": "0.32.1",
+  "version": "0.34.0",
   "description": "The PopCraft command line: edit .popcraft files headlessly, call the REST API, publish to the marketplace and manage the desktop app's local plugins, themes, fonts, skills and agents.",
   "license": "MIT",
   "homepage": "https://popcraft.app/docs/api/cli",
@@ -34,7 +34,7 @@
     "esbuild": "0.28.2"
   },
   "dependencies": {
-    "@popcraft/kit": "0.32.1"
+    "@popcraft/kit": "0.34.0"
   },
   "scripts": {
     "build": "node build.mjs",