@pixelvibing/cli 0.12.0 → 0.14.0

package/dist/pixel-vibing-cli.js

@@ -520,12 +520,17 @@ class TooFewCredits extends Error {
     this.credits = credits;
   }
 }
-function costIn(prices, kind, quality, frames) {
+function costIn(prices, kind) {
   const price = prices.kinds[kind];
   if (price === void 0) return null;
-  if ("credits" in price) return price.credits;
-  if ("byFrames" in price) return price.byFrames[String(frames ?? 8)] ?? null;
-  return price.byQuality[quality ?? "high"] ?? null;
+  return "credits" in price ? price.credits : price.upTo;
+}
+function costWords(prices, kind) {
+  const price = prices.kinds[kind];
+  if (price === void 0) return null;
+  const most = "credits" in price ? price.credits : price.upTo;
+  const credits = `${most} credit${most === 1 ? "" : "s"}`;
+  return "credits" in price ? credits : `up to ${credits}, what it does not use given back`;
 }
 const id = (value) => encodeURIComponent(value);
 function createWebApi(fetcher = (input, init2) => fetch(input, init2), base = API_BASE) {
@@ -3678,22 +3683,23 @@ function jobDelay(elapsedMs) {
   return 1e4;
 }
 const jobEnded = (job) => job.state === "done" || job.state === "failed";
-function jobWords(job) {
+function jobStage(job) {
+  if (job.progress !== void 0) return job.progress.stage;
   switch (job.state) {
     case "queued":
-      return job.attempts > 0 ? "waiting to be tried again" : "waiting in line";
+      return job.attempts > 0 ? "waiting" : "queued";
     case "running":
-      return "being drawn";
-    case "done":
-      return "done";
-    case "failed":
-      return job.reason === null ? "failed" : `failed: ${job.reason}`;
+      return "generating";
+    default:
+      return job.state;
   }
 }
+function jobWords(job) {
+  const stage = jobStage(job);
+  return stage === "failed" && job.reason !== null ? `failed: ${job.reason}` : stage;
+}
 function costOf(prices, request) {
-  const quality = request.body.quality;
-  const frames = request.body.frameCount;
-  return costIn(prices, request.kind, typeof quality === "string" ? quality : void 0, typeof frames === "number" ? frames : void 0);
+  return costIn(prices, request.kind);
 }
 async function startGeneration(api, project, request) {
   const ids = {};
@@ -3833,8 +3839,8 @@ function sentSketch(sketch, description) {
 function sketchSendProblem(sketch, description) {
   return sketchProblem(sentSketch(sketch, description));
 }
-function sketchBody(sketch, description, quality) {
-  return { ...sentSketch(sketch, description), quality };
+function sketchBody(sketch, description) {
+  return { ...sentSketch(sketch, description) };
 }
 const LARGEST_FOOTPRINT = {
   cols: Math.min(Math.floor(WINDOW_PX.width / SCALES.at(-1)), Math.floor(MAX_ASSEMBLED_PX / TILE_SIZE)),
@@ -3861,7 +3867,6 @@ const MAX_CELL = 16;
 const MIN_CELL = 8;
 const ROUTE_MAX_EDGE = 3840;
 const ROUTE_MAX_PIXELS = 8294400;
-const DEFAULT_QUALITY = "medium";
 const ROUTE_MIN_PIXELS = 655360;
 const ROUTE_STEP = 16;
 function gridForCells(cols, rows, cellsPerTile = CELLS_PER_TILE) {
@@ -3892,10 +3897,6 @@ function designCanvas(tiles) {
   if (scale === null) return null;
   return { cols: tiles.cols, rows: tiles.rows, scale, width: tiles.cols * scale, height: tiles.rows * scale };
 }
-const EDIT_QUALITIES = ["low", "medium", "high", "xhigh", "max"];
-function isEditQuality(value) {
-  return typeof value === "string" && EDIT_QUALITIES.includes(value);
-}
 const GENERATED = {
   object: { references: 8, words: "an object" },
   creature: { references: 3, words: "a creature" },
@@ -4004,8 +4005,8 @@ async function requestOf(context, kind, args) {
   const instruction = stringOf(args, "instruction")?.trim() ?? "";
   const set = kind === "hud" || kind === "icons";
   if (instruction === "" && !set) throw new CliError("say what to make with --instruction");
-  const quality = stringOf(args, "quality") ?? DEFAULT_QUALITY;
-  if (!isEditQuality(quality)) throw new CliError(`--quality is one of ${EDIT_QUALITIES.join(", ")}`);
+  if (stringOf(args, "quality") !== void 0)
+    context.io.warn("--quality is the platform's to choose now: it draws each asset at the quality it needs, and nothing was sent for it.\n");
   const paths = stringsOf(args, "reference");
   if (paths.length > known.references)
     throw new CliError(known.references === 0 ? `${known.words} takes no reference` : `${known.words} takes at most ${known.references} references`);
@@ -4017,7 +4018,7 @@ async function requestOf(context, kind, args) {
     for (const path of paths) styles.push(await referenceOf(context, path));
     return {
       kind,
-      body: sketchBody(sketch, instruction, quality),
+      body: sketchBody(sketch, instruction),
       ...styles.length > 0 ? { images: { references: styles } } : {},
       words: `${words2}${styles.length > 0 ? `, in the style of ${styles.length} reference${styles.length === 1 ? "" : "s"}` : ""}: ${instruction}`
     };
@@ -4026,14 +4027,14 @@ async function requestOf(context, kind, args) {
   if (set) {
     const { fields, words: words2 } = interfaceFields(kind, args);
     if (stringOf(args, "tiles") !== void 0) throw new CliError("--tiles is a level design's");
-    const body2 = { ...fields, ...instruction === "" ? {} : { instruction }, quality };
+    const body2 = { ...fields, ...instruction === "" ? {} : { instruction } };
     return { kind, body: body2, words: instruction === "" ? words2 : `${words2}; ${instruction}` };
   }
   for (const flag of ["pieces", "names", "purpose"])
     if (stringOf(args, flag) !== void 0) throw new CliError(`--${flag} is ${flag === "pieces" ? "a HUD set's" : "an icon set's"}`);
   const references = [];
   for (const path of paths) references.push(await referenceOf(context, path));
-  const body = { instruction, quality };
+  const body = { instruction };
   let words = `${known.words}: ${instruction}`;
   if (kind === "object") {
     const footprint = sizeOf(stringOf(args, "size") ?? "1x1", "--size");
@@ -4054,7 +4055,7 @@ async function requestOf(context, kind, args) {
 }
 async function confirmed(context, platform, what, cost, yes) {
   const credits = (await platform.web.billing()).credits;
-  const priced = cost === null ? "at a cost the platform will say" : `for ${cost} credit${cost === 1 ? "" : "s"}`;
+  const priced = cost === null ? "at a cost the platform will say" : `for ${cost}`;
   context.io.warn(`Making ${what}, ${priced}; the account has ${credits}.
 `);
   if (yes) return;
@@ -4078,7 +4079,7 @@ async function followed(context, platform, jobId) {
 const generate = {
   name: "generate",
   summary: "Generate an object, a creature, a level design, a HUD set, icons, a HUD mockup or a UI sketch on the platform, then pull it",
-  usage: "<object|creature|level-design|hud|icons|hud-mockup|ui-sketch> [--instruction <text>] [--size <c>x<r>|<px>] [--tiles <c>x<r>] [--pieces <list>] [--names <list>] [--purpose skill|item] [--sketch <json>] [--reference <png>]… [--quality <q>] [--yes]",
+  usage: "<object|creature|level-design|hud|icons|hud-mockup|ui-sketch> [--instruction <text>] [--size <c>x<r>|<px>] [--tiles <c>x<r>] [--pieces <list>] [--names <list>] [--purpose skill|item] [--sketch <json>] [--reference <png>]… [--yes]",
   options: {
     instruction: {
       type: "string",
@@ -4100,7 +4101,7 @@ const generate = {
       description: "a UI sketch's file: { canvas: { width, height }, shapes: [{ label, kind, x, y, width, height, radius?, sides?, caption?, note?, border?, hollow? }] }"
     },
     reference: { type: "string", multiple: true, value: "<png>", description: "an image to draw from" },
-    quality: { type: "string", value: "<quality>", description: `${EDIT_QUALITIES.join(", ")}; ${DEFAULT_QUALITY} unless given` },
+    quality: { type: "string", value: "<quality>", description: "the platform's to choose now; ignored, and said so" },
     yes: { type: "boolean", short: "y", description: "start it without asking, once the cost is said" },
     as: { type: "string", value: "<name>", description: "land it under this name instead of the platform's" },
     aside: { type: "boolean", description: "keep a folder's own map and art under pixelvibing/before-platform/, and write it from the platform" }
@@ -4113,8 +4114,9 @@ const generate = {
     const request = await requestOf(context, kind, args);
     await checkFolder(local, flagOf(args, "aside"));
     const platform = await signedIn(context);
-    const cost = costOf(await platform.web.prices(), request);
-    await confirmed(context, platform, request.words, cost, flagOf(args, "yes"));
+    const prices = await platform.web.prices();
+    const cost = costOf(prices, request);
+    await confirmed(context, platform, request.words, costWords(prices, request.kind), flagOf(args, "yes"));
     const jobId = await paying(platform, () => startGeneration(platform.web, project, request));
     context.io.warn(`Started the job ${jobId}.
 `);
@@ -4284,7 +4286,7 @@ const guideRevise = {
     if (instruction === "") throw new CliError("say what to change in the style guide");
     if (!flagOf(args, "force") && await unpushed(local)) throw new CliError(CHANGED);
     const platform = await signedIn(context);
-    const cost = costIn(await platform.web.prices(), GUIDE_KIND);
+    const cost = costWords(await platform.web.prices(), GUIDE_KIND);
     await confirmed(context, platform, `a revision of the style guide: ${instruction}`, cost, flagOf(args, "yes"));
     const jobId = await paying(platform, () => platform.web.reviseGuide(project, instruction));
     context.io.warn(`Started the job ${jobId}.
@@ -4577,7 +4579,7 @@ const move = {
     );
   }
 };
-const version = "0.12.0";
+const version = "0.14.0";
 const manifest = {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixelvibing/cli",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "PixelVibing: pixel art game assets from the command line, and the Skills that teach coding assistants to make them.",
   "license": "MIT",
   "homepage": "https://pixelvibing.com",

package/skills/pixelvibing/SKILL.md

@@ -47,8 +47,8 @@ Each generation spends the account's credits.
 - **The options.**
   - `--size` is an object's footprint in whole tiles, `1x1` unless given.
   - `--tiles` is how many tiles a level design is across, `6x4` unless given.
-  - `--quality` is `low`, `medium` (the default), `high`, `xhigh` or `max`; the higher,
-    the dearer.
+  - No quality is given: the platform draws each asset at the quality it needs. The cost
+    printed is the most it may take, and what it does not use is given back.
   - `--reference` is a PNG to draw from, repeated for several: at most 8 for an object,
     3 for a creature, a level design, a HUD mockup or a UI sketch, none for a HUD set or icons. A UI
     sketch's references are a style to follow (frames, materials, a way of drawing), never what to draw.