makeables 0.7.0 → 0.8.0

package/dist/cli.js

@@ -52,7 +52,7 @@ import {
   svgNodeXml,
   version,
   writeAtomic
-} from "./chunk-QJHEOZGN.js";
+} from "./chunk-NOES67KG.js";
 
 // src/cli.ts
 import { spawnSync as spawnSync2 } from "child_process";
@@ -1153,17 +1153,17 @@ import sharp7 from "sharp";
 
 // src/wallet-release.json
 var wallet_release_default = {
-  version: "0.2.0",
+  version: "0.3.0",
   protocol: 1,
   repository: "crafter-station/makeables-community",
   platforms: {
     "darwin-arm64": {
-      asset: "makeables-wallet-0.2.0-darwin-arm64.tar.gz",
-      sha256: "5c51f0bd17c80875c12d5913845f368d22501e0a37b03ce8cbcbdc17a0433c37"
+      asset: "makeables-wallet-0.3.0-darwin-arm64.tar.gz",
+      sha256: "ebd275228d84c75836820e12a999bcaa7e586dfbb215ba06882ae161a2e4a09f"
     },
     "darwin-x64": {
-      asset: "makeables-wallet-0.2.0-darwin-x64.tar.gz",
-      sha256: "39705b13b59034fa04872433ab4fa7cd04f6c5d1714df2a41698b316afcf95d8"
+      asset: "makeables-wallet-0.3.0-darwin-x64.tar.gz",
+      sha256: "c5bd51863895e6612be838b5023f7a1322424568ea4249651125930a66ff4ccb"
     }
   }
 };
@@ -1219,13 +1219,24 @@ async function execute(command, args, progress) {
   });
 }
 async function invoke(executable, args, progress) {
-  const result = JSON.parse(await execute(executable, args, progress));
+  let result;
+  try {
+    result = JSON.parse(await execute(executable, args, progress));
+    if (!result || typeof result.ok !== "boolean") throw new Error("Missing companion result.");
+  } catch {
+    throw new WalletError({
+      code: "WALLET_COMPANION_FAILED",
+      message: "The Wallet companion ended without a valid receipt. Inspect wallet backups and doctor before another device operation."
+    });
+  }
   if (!result.ok) {
-    if (result.error?.code === "INVALID_INPUT")
-      throw new InputError(result.error.message ?? "Invalid Wallet input.");
     throw new WalletError(result.error ?? {});
   }
-  if (!result.data) throw new Error("Wallet companion returned no receipt.");
+  if (!result.data || typeof result.data !== "object" || Array.isArray(result.data))
+    throw new WalletError({
+      code: "WALLET_COMPANION_FAILED",
+      message: "The Wallet companion returned no receipt. Inspect wallet backups before another device operation."
+    });
   return result.data;
 }
 async function walletDoctor() {
@@ -1278,6 +1289,7 @@ async function setupWallet(progress) {
   const url = `https://github.com/${wallet_release_default.repository}/releases/download/wallet-v${wallet_release_default.version}/${artifact.asset}`;
   progress?.({
     event: "wallet_progress",
+    phase: "setup",
     message: `Downloading the Wallet companion ${wallet_release_default.version} for ${platform}.`
   });
   const response = await fetch(url, { signal: AbortSignal.timeout(18e4) });
@@ -1321,14 +1333,6 @@ async function setupWallet(progress) {
   }
   return walletDoctor();
 }
-async function companion() {
-  const info = await walletDoctor();
-  if (!info.ready || !("installed" in info) || typeof info.installed !== "string")
-    throw new InputError(
-      "Run makeables wallet setup first. It installs the macOS companion without a source checkout."
-    );
-  return info.installed;
-}
 async function walletArtwork(file, side2 = "front") {
   const input = resolve5(file);
   const info = await lstat(input);
@@ -1348,73 +1352,268 @@ async function walletArtwork(file, side2 = "front") {
   }
   return sharp7(source, { limitInputPixels: 24e6, density: 144 }).rotate().resize(1536, 969, { fit: "contain", background: "#000000" }).flatten({ background: "#000000" }).toColourspace("srgb").png().toBuffer();
 }
+async function preparedArtwork(directory) {
+  const path = resolve5(directory);
+  if (!(await lstat(path)).isDirectory())
+    throw new InputError("--assets must be a prepared artwork directory.");
+  for (const name of [
+    "cardBackgroundCombined@3x.png",
+    "cardBackgroundCombined@2x.png",
+    "cardBackgroundCombined.pdf"
+  ]) {
+    const file = join3(path, name);
+    const info = await lstat(file);
+    if (!info.isFile() || info.size === 0 || info.size > 16 * 1024 * 1024)
+      throw new InputError(`Invalid prepared asset: ${name}. Run wallet prep again.`);
+    const signature = Buffer.from(name.endsWith(".pdf") ? "%PDF-" : "\x89PNG\r\n\n", "latin1");
+    if (!(await readFile6(file)).subarray(0, signature.length).equals(signature))
+      throw new InputError(`Invalid prepared asset: ${name}. Run wallet prep again.`);
+  }
+  return { path, preview: join3(path, "cardBackgroundCombined@3x.png") };
+}
 async function walletCommand(command, values, progress) {
+  const started = performance.now();
+  const elapsed = () => Math.round(performance.now() - started);
+  let latestPhase;
+  const report = (phase, message) => {
+    latestPhase = phase;
+    progress({
+      event: "wallet_progress",
+      phase,
+      message,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      elapsedMs: elapsed()
+    });
+  };
+  const forward = (data) => {
+    if (data && typeof data === "object") {
+      if ("phase" in data && typeof data.phase === "string") latestPhase = data.phase;
+      progress({
+        ...data,
+        phase: latestPhase,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        elapsedMs: elapsed()
+      });
+    }
+  };
   const need = (flag) => {
     const value = values[flag];
     if (typeof value !== "string" || !value) throw new InputError(`Supply --${flag}.`);
     return value;
   };
   if (command === "wallet doctor") return walletDoctor();
-  if (command === "wallet setup") return setupWallet(progress);
-  if (command === "wallet apply" || command === "wallet restore" || command === "wallet recover") {
+  if (command === "wallet setup") return setupWallet(forward);
+  const installing = command === "wallet install";
+  const applying = command === "wallet apply" || installing && Boolean(values.card || values.backup);
+  if (applying || command === "wallet restore" || command === "wallet recover") {
     if (!values.yes)
       throw new InputError(
         "Use --yes only after the user requests this operation on the selected card."
       );
   }
-  if (command === "wallet apply" && Boolean(values.card) === Boolean(values.backup))
+  if (applying && Boolean(values.card) === Boolean(values.backup))
     throw new InputError("Choose exactly one --card selection or --backup original.");
-  const executable = await companion();
+  if (installing && values.yes && !applying)
+    throw new InputError("Select an explicit --card or --backup before using --yes.");
+  if (installing && applying && (values.device || values.seconds))
+    throw new InputError(
+      "--device and --seconds are for selection; --card or --backup already binds the target."
+    );
+  if (values.seconds && (!/^\d+$/.test(String(values.seconds)) || Number(values.seconds) < 1 || Number(values.seconds) > 300))
+    throw new InputError("--seconds must be between 1 and 300.");
+  if (installing || applying) {
+    if (Boolean(values.file) === Boolean(values.assets))
+      throw new InputError("Supply exactly one --file artwork or --assets prepared directory.");
+    if (values.assets && values.side)
+      throw new InputError("--side applies to --file, not already prepared --assets.");
+  }
+  if (values.side && !["front", "back"].includes(String(values.side)))
+    throw new InputError("--side must be front or back.");
+  if (command === "wallet prep") {
+    need("file");
+    need("out");
+  }
+  if (command === "wallet restore") need("backup");
+  const existing = values.assets ? await preparedArtwork(need("assets")) : void 0;
+  if (installing) report("setup", "Checking the Wallet companion.");
+  const info = installing ? await setupWallet(forward) : await walletDoctor();
+  if (!info.ready || !("installed" in info) || typeof info.installed !== "string")
+    throw new InputError("Run makeables wallet setup first.");
+  const executable = info.installed;
+  const capabilities = "capabilities" in info && Array.isArray(info.capabilities) ? info.capabilities : [];
   if (command === "wallet list") {
     const args = ["list"];
     for (const flag of ["device", "seconds"])
       if (typeof values[flag] === "string") args.push(`--${flag}`, String(values[flag]));
-    return invoke(executable, args, progress);
+    if (values.first) {
+      if (!capabilities.includes("first-selection"))
+        throw new InputError(
+          "This companion needs an update for --first. Omit --first for a full scan."
+        );
+      args.push("--first");
+    }
+    return invoke(executable, args, forward);
   }
   if (command === "wallet backups") {
     return invoke(
       executable,
       ["backups", ...values.backup ? ["--backup", need("backup")] : []],
-      progress
+      forward
     );
   }
   if (command === "wallet recover") {
     return invoke(
       executable,
       ["recover", "--backup", need("backup"), "--device", need("device"), "--yes"],
-      progress
+      forward
     );
   }
   if (command === "wallet restore") {
-    return invoke(executable, ["restore", "--backup", need("backup"), "--yes"], progress);
-  }
-  if (command === "wallet prep" || command === "wallet apply") {
-    const file = need("file");
-    if (values.side && !["front", "back"].includes(String(values.side)))
-      throw new InputError("--side must be front or back.");
-    const png = await walletArtwork(file, values.side === "back" ? "back" : "front");
-    const work = await mkdtemp(join3(tmpdir2(), "makeables-wallet-"));
+    report("preflight", "Checking the original artwork backup and connected iPhone.");
     try {
-      const raster = join3(work, "artwork.png");
-      await writeFile2(raster, png, { mode: 384 });
-      const target = command === "wallet prep" ? resolve5(need("out")) : join3(work, "assets");
-      const prepared = await invoke(
+      const result = await invoke(
         executable,
-        ["prepare", "--file", raster, "--out", target],
-        progress
+        ["restore", "--backup", need("backup"), "--yes"],
+        forward
       );
+      return { ...result, elapsedMs: elapsed() };
+    } catch (error) {
+      if (error instanceof WalletError)
+        throw new WalletError({
+          ...error.details,
+          phase: error.details.phase ?? latestPhase ?? "preflight",
+          deviceWriteAttempted: error.details.deviceWriteAttempted ?? true,
+          nextAction: error.details.nextAction ?? "inspect-backups"
+        });
+      throw error;
+    }
+  }
+  if (command === "wallet prep" || applying || installing) {
+    const work = await mkdtemp(join3(tmpdir2(), "makeables-wallet-"));
+    let phase = "prepare";
+    let deviceWriteAttempted = false;
+    let persistent;
+    let prepared;
+    try {
+      let target;
+      if (existing) {
+        target = resolve5(need("assets"));
+        prepared = existing;
+      } else {
+        report("prepare", "Preparing the complete card artwork.");
+        const png = await walletArtwork(need("file"), values.side === "back" ? "back" : "front");
+        const raster = join3(work, "artwork.png");
+        await writeFile2(raster, png, { mode: 384 });
+        if (command === "wallet prep") {
+          target = resolve5(need("out"));
+        } else if (installing && !applying) {
+          const root = join3(
+            process.env.MAKEABLES_WALLET_HOME ?? join3(homedir2(), "Library", "Application Support", "Makeables", "Wallet"),
+            "prepared"
+          );
+          await mkdir2(root, { recursive: true, mode: 448 });
+          if ((await lstat(root)).isSymbolicLink())
+            throw new InputError("Prepared artwork storage cannot be a symbolic link.");
+          persistent = await mkdtemp(join3(root, "install-"));
+          target = join3(persistent, "assets");
+        } else {
+          target = join3(work, "assets");
+        }
+        prepared = await invoke(
+          executable,
+          ["prepare", "--file", raster, "--out", target],
+          forward
+        );
+        await preparedArtwork(target);
+      }
       if (command === "wallet prep") return prepared;
-      progress({ event: "wallet_progress", message: "Full artwork rendered and prepared." });
+      if (installing && !applying) {
+        phase = "selection";
+        report("selection", "Artwork is ready. Open Wallet and tap the card to customize.");
+        const args2 = ["list"];
+        for (const flag of ["device", "seconds"])
+          if (typeof values[flag] === "string") args2.push(`--${flag}`, String(values[flag]));
+        if (capabilities.includes("first-selection")) args2.push("--first");
+        const selection = await invoke(executable, args2, forward);
+        const hasCards = Array.isArray(selection.cards) && selection.cards.length > 0;
+        const status = selection.needsDevice ? "needs-device" : hasCards ? "needs-selection" : "needs-card";
+        return {
+          ...selection,
+          status,
+          assets: target,
+          preview: prepared.preview,
+          deviceWriteAttempted: false,
+          nextAction: selection.needsDevice ? "select-device" : hasCards ? "confirm-card" : "tap-card",
+          next: {
+            command: "wallet install",
+            args: ["--assets", target],
+            required: selection.needsDevice ? ["device"] : hasCards ? ["card", "yes"] : []
+          },
+          elapsedMs: elapsed()
+        };
+      }
+      report("preflight", "Artwork is ready. Keep the selected iPhone connected.");
       const args = ["apply", "--assets", target, "--yes"];
       if (values.card) args.push("--card", need("card"));
       if (values.backup) args.push("--backup", need("backup"));
-      return invoke(executable, args, progress);
+      phase = "apply";
+      deviceWriteAttempted = true;
+      const result = await invoke(executable, args, forward);
+      return { ...result, elapsedMs: elapsed() };
+    } catch (error) {
+      if (error instanceof WalletError) {
+        throw new WalletError({
+          ...error.details,
+          phase: error.details.phase ?? latestPhase ?? phase,
+          deviceWriteAttempted: error.details.deviceWriteAttempted ?? deviceWriteAttempted,
+          ...phase === "selection" && prepared ? {
+            assets: String(prepared.path),
+            preview: String(prepared.preview),
+            nextAction: "retry-selection"
+          } : {}
+        });
+      }
+      throw error;
     } finally {
       await rm2(work, { recursive: true, force: true });
+      if (persistent && phase === "prepare") await rm2(persistent, { recursive: true, force: true });
     }
   }
   throw new InputError("Unknown Wallet command.");
 }
+function walletSummary(result) {
+  if (result.status === "restored") {
+    const seconds = typeof result.elapsedMs === "number" ? ` in ${(result.elapsedMs / 1e3).toFixed(1)}s` : "";
+    return [
+      `Original Wallet artwork restored${seconds}.`,
+      ...result.backupVerified ? ["Original backup preserved and verified."] : [],
+      ...typeof result.backup === "string" ? [`Backup: ${result.backup}`] : [],
+      "Force-close Wallet, reopen it and check the original design."
+    ].join("\n");
+  }
+  if (result.status === "complete") {
+    const seconds = typeof result.elapsedMs === "number" ? ` in ${(result.elapsedMs / 1e3).toFixed(1)}s` : "";
+    return [
+      `Wallet artwork installed${seconds}.`,
+      result.backupVerified ? "Original artwork backup saved and verified." : "Original artwork backup saved.",
+      ...typeof result.backup === "string" ? [`Backup: ${result.backup}`] : [],
+      typeof result.refresh === "string" ? result.refresh : "Close and reopen Wallet to see the design."
+    ].join("\n");
+  }
+  if (["needs-device", "needs-selection", "needs-card"].includes(String(result.status)))
+    return [
+      "Artwork prepared. No card has been changed.",
+      `Preview: ${String(result.preview)}`,
+      result.status === "needs-device" ? "Connect an unlocked iPhone or choose a listed device." : result.status === "needs-card" ? "No card was detected. Open Wallet, tap the card, and repeat using the prepared assets." : "Confirm which observed card you want to customize, then use its selection handle with --yes.",
+      JSON.stringify(
+        { assets: result.assets, devices: result.devices, cards: result.cards },
+        null,
+        2
+      ),
+      `Continue: makeables wallet install --assets '${String(result.assets).replaceAll("'", "'\\''")}'${result.status === "needs-selection" ? " --card <selection> --yes" : result.status === "needs-device" ? " --device <selection>" : ""}`
+    ].join("\n");
+  return JSON.stringify(result, null, 2);
+}
 
 // src/cli.ts
 var commands = [
@@ -1442,9 +1641,10 @@ var commands = [
   ),
   "wallet setup",
   "wallet doctor",
-  "wallet list [--device <selection>] [--seconds 45]",
+  "wallet install (--file <artwork> | --assets <directory>) [(--card <selection> | --backup <id|path>) --yes]",
+  "wallet list [--device <selection>] [--seconds 45] [--first]",
   "wallet prep --file <card.json|artwork.svg|image.png> --out <new-directory> [--side front|back]",
-  "wallet apply --file <artwork> --card <selection> | --backup <id|path> --yes",
+  "wallet apply (--file <artwork> | --assets <directory>) (--card <selection> | --backup <id|path>) --yes",
   "wallet restore --backup <id|path> --yes",
   "wallet backups [--backup <id|path>]",
   "wallet recover --backup <transaction-path> --device <selection> --yes",
@@ -1536,6 +1736,8 @@ async function run() {
       backup: { type: "string" },
       device: { type: "string" },
       seconds: { type: "string" },
+      assets: { type: "string" },
+      first: { type: "boolean" },
       type: { type: "string" },
       size: { type: "string" },
       "width-mm": { type: "string" },
@@ -1573,9 +1775,10 @@ From a built checkout: npm run studio -- <command>`,
     ),
     "wallet setup": [],
     "wallet doctor": [],
-    "wallet list": ["device", "seconds"],
+    "wallet install": ["file", "assets", "card", "backup", "side", "device", "seconds", "yes"],
+    "wallet list": ["device", "seconds", "first"],
     "wallet prep": ["file", "out", "side"],
-    "wallet apply": ["file", "card", "backup", "side", "yes"],
+    "wallet apply": ["file", "assets", "card", "backup", "side", "yes"],
     "wallet restore": ["backup", "yes"],
     "wallet backups": ["backup"],
     "wallet recover": ["backup", "device", "yes"],
@@ -1648,8 +1851,16 @@ From a built checkout: npm run studio -- <command>`,
   if (values.product && !["card", "badge", "sticker"].includes(values.product))
     throw new InputError("--product must be card, badge or sticker.");
   if (command.startsWith("wallet ")) {
-    const result2 = await walletCommand(command, values, progress);
-    emit(result2, ["makeables skills get wallet"], JSON.stringify(result2, null, 2), json);
+    const walletProgress = (data) => {
+      if (json) return progress(data);
+      if (data && typeof data === "object" && "message" in data) {
+        const phase = "phase" in data ? `[${String(data.phase)}] ` : "";
+        process.stderr.write(`${phase}${String(data.message)}
+`);
+      }
+    };
+    const result2 = await walletCommand(command, values, walletProgress);
+    emit(result2, ["makeables skills get wallet"], walletSummary(result2), json);
     return;
   }
   if (command.startsWith("image ") && imageTools.some((tool) => command === `image ${tool}`)) {
@@ -1804,7 +2015,7 @@ Run makeables skills get core for setup.`,
   }
   if (command === "mcp") {
     try {
-      const { runMcp } = await import("./mcp-AOJ6UJSC.js");
+      const { runMcp } = await import("./mcp-54KV55QM.js");
       await runMcp(values.root ?? process.cwd());
     } catch (error) {
       process.stderr.write(
@@ -2422,7 +2633,7 @@ ${path ?? `No file written. Add --out ${kind}.json.`}`,
   return false;
 }
 run().catch((error) => {
-  const userError = error instanceof InputError || error instanceof SyntaxError || [
+  const userError = error instanceof InputError || error instanceof WalletError && error.details.code === "INVALID_INPUT" || error instanceof SyntaxError || [
     "ERR_PARSE_ARGS_UNKNOWN_OPTION",
     "ERR_PARSE_ARGS_INVALID_OPTION_VALUE",
     "ERR_PARSE_ARGS_UNEXPECTED_POSITIONAL",

package/dist/{mcp-AOJ6UJSC.js → mcp-54KV55QM.js}

@@ -15,7 +15,7 @@ import {
   stickerStyles,
   version,
   writeAtomic
-} from "./chunk-QJHEOZGN.js";
+} from "./chunk-NOES67KG.js";
 
 // src/mcp.ts
 import { readFile as readFile2 } from "fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makeables",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Create editable cards, badges and stickers with layered designs, live materials and your coding agent.",
   "homepage": "https://makeables.dev",
   "repository": {
@@ -51,9 +51,9 @@
     "@types/proper-lockfile": "4.1.4",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@makeables/design": "0.0.1",
     "@makeables/renderer": "0.0.1",
-    "@makeables/testing": "0.0.0"
+    "@makeables/testing": "0.0.0",
+    "@makeables/design": "0.0.1"
   },
   "engines": {
     "node": ">=22"