@pixelvibing/cli 0.38.2 → 0.39.0

package/README.md

@@ -21,7 +21,7 @@ Each step it finds done already is skipped.
 |---|---|
 | `login`, `logout`, `whoami` | Keep an account token for this machine in the system's credential store, or remove it |
 | `init`, `link` | Make a directory a local project, and name the platform project it generates for |
-| `generate object\|creature\|level-design` | Make art on the platform, after saying its cost in credits, then pull it |
+| `generate object\|creature\|level-design` | Make art on the platform, after saying what it uses of the account's limit, then pull it |
 | `list`, `pull` | List the project's assets by kind, and pull one by id or name into `pixelvibing/out/` |
 | `guide pull\|push\|revise\|show\|versions` | Read and write the project's style guide |
 | `seal` | Seal `pixelvibing/out/` into `pixelvibing/build/assets.eac` |

package/dist/pixel-vibing-cli.js

@@ -525,18 +525,6 @@ class TooFewCredits extends Error {
     this.credits = credits;
   }
 }
-function costIn(prices, kind) {
-  const price = prices.kinds[kind];
-  if (price === void 0) return 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) {
   const call = createCaller(fetcher, base);
@@ -627,8 +615,10 @@ function createWebApi(fetcher = (input, init2) => fetch(input, init2), base = AP
     },
     billing: (before = null) => json2(`/billing${before === null ? "" : `?before=${id(before)}`}`),
     prices: () => json2("/billing/prices"),
-    checkoutPack: async (packId) => (await json2(`/billing/packs/${id(packId)}/checkout`, { method: "POST" })).url,
-    checkoutPlan: async (planId) => (await json2(`/billing/plans/${id(planId)}/checkout`, { method: "POST" })).url,
+    /** A pack's checkout, in `currency` when one is named (R4.5). */
+    checkoutPack: async (packId, currency) => (await json2(`/billing/packs/${id(packId)}/checkout`, { method: "POST", ...currency === void 0 ? {} : { body: { currency } } })).url,
+    /** A plan's checkout, in `currency` when one is named (R4.5). */
+    checkoutPlan: async (planId, currency) => (await json2(`/billing/plans/${id(planId)}/checkout`, { method: "POST", ...currency === void 0 ? {} : { body: { currency } } })).url,
     portal: async () => (await json2("/billing/portal", { method: "POST" })).url
   };
 }
@@ -670,7 +660,7 @@ async function paying(platform, run) {
   } catch (error) {
     if (error instanceof TooFewCredits) {
       throw new CliError(
-        `this costs ${error.cost} credits and the account has ${error.credits}: nothing was started. Buy credits at ${creditsPage(platform.apiUrl)}`
+        `the account's usage limit is reached: this needs more than is left of it, and nothing was started. See the packs and the plans at ${creditsPage(platform.apiUrl)}`
       );
     }
     throw error;
@@ -3726,9 +3716,6 @@ function jobWords(job) {
   const stage = jobStage(job);
   return stage === "failed" && job.reason !== null ? `failed: ${job.reason}` : stage;
 }
-function costOf(prices, request) {
-  return costIn(prices, request.kind);
-}
 async function startGeneration(api, project, request) {
   const ids = {};
   for (const [field, images] of Object.entries(request.images ?? {})) {
@@ -3870,6 +3857,29 @@ function sketchSendProblem(sketch, description) {
 function sketchBody(sketch, description) {
   return { ...sentSketch(sketch, description) };
 }
+function usageOf$1(billing) {
+  return billing.usage ?? { used: 0, limit: billing.credits };
+}
+function usedPercent(usage) {
+  if (usage.limit <= 0) return 100;
+  return Math.min(100, Math.max(0, Math.round(usage.used / usage.limit * 100)));
+}
+function shareWords(credits, limit) {
+  if (limit <= 0) return "more than is left";
+  const share = credits / limit * 100;
+  if (share > 0 && share < 1) return "less than 1%";
+  return `about ${Math.round(share)}%`;
+}
+function leftWords(usage) {
+  return `${100 - usedPercent(usage)}% of your limit left`;
+}
+function costShareWords(prices, kind, usage) {
+  const price = prices.kinds[kind];
+  if (price === void 0) return null;
+  const most = "credits" in price ? price.credits : price.upTo;
+  const share = `${shareWords(most, usage.limit)} of your limit`;
+  return "credits" in price ? share : `up to ${share}, what it does not use given back`;
+}
 const LARGEST_FOOTPRINT = {
   cols: Math.min(Math.floor(WINDOW_PX.width / SCALES.at(-1)), Math.floor(MAX_ASSEMBLED_PX / TILE_SIZE)),
   rows: Math.min(Math.floor(WINDOW_PX.height / SCALES.at(-1)), Math.floor(MAX_ASSEMBLED_PX / TILE_SIZE))
@@ -4070,15 +4080,17 @@ async function requestOf(context, asked, args) {
   } else if (stringOf(args, "tiles") !== void 0) throw new CliError("--tiles is a level design's");
   return { kind, body, ...references.length > 0 ? { images: { references } } : {}, words };
 }
-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}`;
-  context.io.warn(`Making ${what}, ${priced}; the account has ${credits}.
+async function confirmed(context, platform, what, prices, kind, yes) {
+  const usage = usageOf$1(await platform.web.billing());
+  const share = costShareWords(prices, kind, usage);
+  const priced = share === null ? "using what the platform will say of your limit" : `using ${share}`;
+  context.io.warn(`Making ${what}, ${priced}; ${leftWords(usage)}.
 `);
-  if (yes) return;
+  if (yes) return share;
   if (!context.io.interactive) throw new CliError("nothing was started: pass --yes to start it without a question");
   const said = (await context.io.ask("Start it? [y/N] ")).trim().toLowerCase();
   if (said !== "y" && said !== "yes") throw new CliError("nothing was started");
+  return share;
 }
 async function followed(context, platform, jobId) {
   const since = context.services.now();
@@ -4118,7 +4130,7 @@ const generate = {
     },
     reference: { type: "string", multiple: true, value: "<png>", description: "an image to draw from" },
     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" },
+    yes: { type: "boolean", short: "y", description: "start it without asking, once what it uses of your limit 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" }
   },
@@ -4131,15 +4143,14 @@ const generate = {
     await checkFolder(local, flagOf(args, "aside"));
     const platform = await signedIn(context);
     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 uses = await confirmed(context, platform, request.words, prices, request.kind, flagOf(args, "yes"));
     const jobId = await paying(platform, () => startGeneration(platform.web, project, request));
     context.io.warn(`Started the job ${jobId}.
 `);
     const job = await followed(context, platform, jobId);
     if (job.state === "failed") throw new CliError(`the generation failed: ${job.reason ?? "the platform gave no reason"}`);
     const pulled = await pullAsset(platform, local, jobId, stringOf(args, "as"), { aside: flagOf(args, "aside") });
-    answer(context, { job: jobId, cost, ...pulled }, pulledWords(pulled));
+    answer(context, { job: jobId, uses, ...pulled }, pulledWords(pulled));
   }
 };
 const mcpHeaders = {
@@ -4291,7 +4302,7 @@ const guideRevise = {
   summary: "Ask the platform to revise the style guide by an instruction, then pull it",
   usage: "<instruction> [--yes] [--force]",
   options: {
-    yes: { type: "boolean", short: "y", description: "start it without asking, once the cost is said" },
+    yes: { type: "boolean", short: "y", description: "start it without asking, once what it uses of your limit is said" },
     force: { type: "boolean", description: "replace changes to the local copy that were never pushed" }
   },
   positionals: [1, 1],
@@ -4302,8 +4313,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 = costWords(await platform.web.prices(), GUIDE_KIND);
-    await confirmed(context, platform, `a revision of the style guide: ${instruction}`, cost, flagOf(args, "yes"));
+    await confirmed(context, platform, `a revision of the style guide: ${instruction}`, await platform.web.prices(), GUIDE_KIND, flagOf(args, "yes"));
     const jobId = await paying(platform, () => platform.web.reviseGuide(project, instruction));
     context.io.warn(`Started the job ${jobId}.
 `);
@@ -4595,7 +4605,7 @@ const move = {
     );
   }
 };
-const version = "0.38.2";
+const version = "0.39.0";
 const manifest = {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixelvibing/cli",
-  "version": "0.38.2",
+  "version": "0.39.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

@@ -36,17 +36,17 @@ pixel-vibing-cli generate icons --names "<name>,<name>,..." --purpose <skill|ite
 pixel-vibing-cli generate ui --sketch <file.json> --instruction "<the set, in a line>" --yes --json
 ```
 
-Each generation spends the account's credits.
-- **The cost.** The command prints the cost and the balance before it starts. Without
-  `--yes` it asks, and with nobody at the terminal it starts nothing. Tell the person what
-  a batch will cost before you start one.
+Each generation uses part of the account's usage limit for the month.
+- **What it uses.** The command prints the most it uses and what is left, as shares of the
+  limit, before it starts. Without `--yes` it asks, and with nobody at the terminal it starts
+  nothing. Tell the person how much of their limit a batch will use before you start one.
 - **The instruction.** Describe the thing as a person would: its look, its material, what
   it is for in the game. Describe the thing itself, not a prompt for a model.
 - **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.
-  - 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.
+  - No quality is given: the platform draws each asset at the quality it needs. The share
+    printed is the most it may use, 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 or a UI, none for icons. A UI's references are a style
     to follow (frames, materials, a way of drawing), never what to draw.
@@ -68,8 +68,8 @@ Each generation spends the account's credits.
     counts and values in the game.
 - **Success.** The asset is pulled at once. The answer's `files` are where its pictures
   are, relative to `pixelvibing/`.
-- **Failure.** Too few credits starts nothing and names the page where the person buys
-  more: tell them, and do not retry. A failed job prints its reason.
+- **Failure.** A reached limit starts nothing and names the page where the person adds to
+  it with a pack or a plan: tell them, and do not retry. A failed job prints its reason.
 
 ## Listing and pulling
 

package/skills/pixelvibing-style-guide/SKILL.md

@@ -31,7 +31,7 @@ Do not change it for one asset: say that in the asset's instruction instead.
      changes, bring it up to date too. The whole guide is at most 8000 characters.
    - **Ask the platform.** `pixel-vibing-cli guide revise "<what changed in the game>"
      --yes` revises the guide by that instruction, keeping what it does not change, and
-     pulls the result. It costs a credit.
+     pulls the result. It uses a sliver of the account's limit.
 3. `pixel-vibing-cli guide push` keeps the file as the guide's next version.
    - If the platform's guide moved on since your pull, nothing is kept.
    - Save your changes aside, run `pixel-vibing-cli guide pull --force`, make them again on