@usefillo/cli 0.23.1 → 0.24.0

package/dist/index.js

@@ -104,7 +104,7 @@ function printTable(header, rows) {
   for (const cells of rows) console.log(line(cells));
 }
 var dateOnly = (iso) => iso.slice(0, 10);
-var plural = (count, noun) => `${count} ${noun}${count === 1 ? "" : "s"}`;
+var plural = (count2, noun) => `${count2} ${noun}${count2 === 1 ? "" : "s"}`;
 function die(msg) {
   if (jsonOutput) emitResult({ error: terminalText(msg) });
   console.error(`${failMark()} ${terminalText(msg)}`);
@@ -1600,13 +1600,192 @@ var agentCommand = {
   help: agentHelp
 };
 
+// src/commands/billing.ts
+var VOLUMES = [
+  { tier: "5k", responses: 5e3 },
+  { tier: "25k", responses: 25e3 },
+  { tier: "100k", responses: 1e5 }
+];
+var TRIAL_DAYS = 30;
+var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+var count = (value) => new Intl.NumberFormat("en-US").format(value);
+function parseDate(iso) {
+  if (typeof iso !== "string" || !iso) return null;
+  const date2 = new Date(iso);
+  return Number.isNaN(date2.getTime()) ? null : date2;
+}
+var longDate = (date2) => `${date2.getUTCDate()} ${MONTHS[date2.getUTCMonth()]} ${date2.getUTCFullYear()}`;
+var shortDate = (date2) => `${date2.getUTCDate()} ${MONTHS[date2.getUTCMonth()]}`;
+function periodLabel(period, currentYear) {
+  const match = /^(\d{4})-(\d{2})$/.exec(period);
+  const month = match ? MONTHS[Number(match[2]) - 1] : void 0;
+  if (!match || !month) return terminalText(period);
+  return match[1] === currentYear ? month : `${month} ${match[1]}`;
+}
+function daysLeft(end, now = Date.now()) {
+  const days = Math.max(0, Math.ceil((end.getTime() - now) / 864e5));
+  return days === 0 ? "ends today" : days === 1 ? "1 day left" : `${days} days left`;
+}
+var tierName = (tier) => tier ? `Everything ${terminalText(tier)}` : "Everything";
+function planLine(body) {
+  if (body.billingEnabled === false) {
+    return body.plan === "free" ? "Free" : "Everything";
+  }
+  switch (body.plan) {
+    case "free":
+      return `Free \xB7 ${count(body.allowance)} responses a month`;
+    case "trial": {
+      const end = parseDate(body.trialEndsAt);
+      const ends = end ? ` \xB7 ends ${longDate(end)} (${daysLeft(end)})` : "";
+      return `Everything trial \xB7 ${count(body.allowance)} responses${ends} \xB7 no card`;
+    }
+    case "complimentary":
+      return `${tierName(body.tier)} \xB7 complimentary (no charge, no renewal date)`;
+    case "subscribed": {
+      const billed = body.interval === "year" ? "billed yearly" : "billed monthly";
+      const end = parseDate(body.currentPeriodEnd);
+      let next = "";
+      if (body.status === "past_due") next = " \xB7 payment failed";
+      else if (body.cancelAtPeriodEnd) next = end ? ` \xB7 cancels ${longDate(end)}` : " \xB7 canceling";
+      else if (end)
+        next = `${body.status === "trialing" ? " \xB7 first payment" : " \xB7 renews"} ${longDate(end)}`;
+      return `${tierName(body.tier)} \xB7 ${billed}${next}`;
+    }
+    default:
+      return terminalText(body.plan);
+  }
+}
+function usageLine(body) {
+  const { responses: responses2 } = body.usage;
+  const reset = parseDate(body.usage.resetsAt);
+  const resets = reset ? ` \xB7 resets ${shortDate(reset)}` : "";
+  if (!(body.allowance > 0)) return `${count(responses2)} responses this month${resets}`;
+  const percent = Math.floor(responses2 / body.allowance * 100);
+  return `${count(responses2)} of ${count(body.allowance)} responses this month (${percent}%)${resets}`;
+}
+function historyLine(body) {
+  const currentYear = body.usage.period?.slice(0, 4);
+  const earlier = (body.history ?? []).filter(
+    (row) => typeof row.period === "string" && row.period !== body.usage.period && typeof row.responses === "number"
+  );
+  if (!earlier.some((row) => row.responses > 0)) return null;
+  return earlier.map((row) => `${periodLabel(row.period, currentYear)} ${count(row.responses)}`).join(" \xB7 ");
+}
+function manageUrl(body) {
+  try {
+    const url = new URL(body.manageUrl ?? "");
+    if (url.protocol === "https:" || url.protocol === "http:") return terminalText(url.href);
+  } catch {
+  }
+  return `${terminalText(API)}/settings/plan`;
+}
+function fittingVolume(body) {
+  return VOLUMES.find(
+    (volume) => volume.responses > body.allowance && volume.responses >= body.usage.responses
+  );
+}
+function notes(body) {
+  const lines = [];
+  const billing2 = body.billingEnabled !== false;
+  if (billing2 && body.plan === "subscribed" && body.status === "past_due") {
+    lines.push(
+      "The last payment failed. Stripe is retrying it, and Everything stays on meanwhile.",
+      "An owner or admin updates the card from Manage billing at the link above."
+    );
+  } else if (billing2 && body.plan === "subscribed" && body.cancelAtPeriodEnd) {
+    lines.push(
+      "Everything stays active until the period ends; the workspace returns to Free after that."
+    );
+  } else if (billing2 && body.plan === "trial") {
+    lines.push("When the trial ends without a subscription, the workspace returns to Free.");
+  } else if (billing2 && body.plan === "free" && body.trialAvailable) {
+    lines.push(
+      `The one-time ${TRIAL_DAYS}-day Everything trial (no card) is unused.`,
+      "An owner or admin can start it at the link above."
+    );
+  }
+  if (body.allowance > 0) {
+    const ratio = body.usage.responses / body.allowance;
+    if (ratio >= 0.8) {
+      lines.push(
+        ratio >= 1 ? `${body.usage.responses > body.allowance ? "Past this month's allowance." : "This month's allowance is used up."} Forms keep collecting and nothing is dropped.` : `${Math.floor(ratio * 100)}% of this month's allowance is used. Forms keep collecting if it runs over.`
+      );
+      if (billing2) {
+        const next = fittingVolume(body);
+        if (next) {
+          lines.push(
+            `${ratio >= 1 ? "The volume that fits" : "The next volume"} is Everything ${next.tier} (${count(next.responses)} a month).`
+          );
+        } else {
+          lines.push(
+            `For steady volume above ${count(body.allowance)} a month, write to hello@fillo.so.`
+          );
+        }
+      }
+    }
+  }
+  if (!billing2) lines.push("Billing isn't enabled on this Fillo server.");
+  return lines;
+}
+async function billing(subcommand, flags) {
+  if (subcommand === "help") return billingHelp();
+  if (subcommand !== void 0) {
+    die(`Unknown billing command: ${subcommand} (fillo billing takes no arguments).`);
+  }
+  const body = await callApi(
+    "/cli/workspace/billing",
+    {},
+    {
+      fallback: failed("billing"),
+      expect: (b) => typeof b.plan === "string" && typeof b.allowance === "number" && typeof b.usage?.responses === "number"
+    }
+  );
+  if (jsonMode(flags)) return emitResult(body);
+  const rows = [
+    ["Plan:", planLine(body)],
+    ["Usage:", usageLine(body)]
+  ];
+  const earlier = historyLine(body);
+  if (earlier) rows.push(["Earlier:", earlier]);
+  if (body.billingEnabled !== false) rows.push(["Manage:", `${manageUrl(body)} (owner or admin)`]);
+  console.log("");
+  for (const [label, value] of rows) console.log(`  ${label.padEnd(9)}${value}`);
+  const extra = notes(body);
+  if (extra.length > 0) {
+    console.log("");
+    for (const line of extra) console.log(`  ${dim(line)}`);
+  }
+  console.log("");
+}
+function billingHelp() {
+  console.log(`
+  ${boldRaw("fillo billing")} \u2014 the workspace's plan and this month's response usage
+
+  ${boldRaw("Usage")}
+    billing            Print the plan, usage against the monthly allowance,
+                       recent months, and the Manage link
+
+  ${dimRaw("Read-only. Needs an owner or admin login. Subscribing, the one-time")}
+  ${dimRaw("30-day trial, volume changes, cards, and invoices are a human click in")}
+  ${dimRaw("Settings \u2192 Billing & plan (the printed Manage link). Allowances are soft:")}
+  ${dimRaw("forms keep collecting past them.")}
+  ${dimRaw("--json prints the raw server response on stdout.")}
+`);
+}
+var billingCommand = {
+  name: "billing",
+  flags: [],
+  run: (args, flags) => billing(args[0], flags),
+  help: billingHelp
+};
+
 // src/commands/branding.ts
 function printState(body) {
   const plan = body.plan === "pro" ? "Everything" : "Free";
   console.log(`  Plan:   ${plan}`);
   console.log(`  Badge:  ${body.poweredBy ? "shown" : "hidden"}`);
   if (body.canHide === false) {
-    console.log(dim("  Turning it off needs the Everything plan (Settings \u2192 Plan)."));
+    console.log(dim("  Turning it off needs the Everything plan (Settings \u2192 Billing & plan)."));
   }
 }
 async function branding(subcommand, flags) {
@@ -1639,8 +1818,9 @@ function brandingHelp() {
     branding off       Hide the badge on Fillo-rendered forms (Everything plan)
     branding on        Show the badge again
 
-  ${dimRaw("Hiding needs the Everything plan; a workspace owner or admin selects")}
-  ${dimRaw("that in Settings \u2192 Plan. Headless embeds never show a badge.")}
+  ${dimRaw("Hiding needs the Everything plan: a workspace owner or admin subscribes")}
+  ${dimRaw("(or starts the one-time 30-day trial) in Settings \u2192 Billing & plan.")}
+  ${dimRaw("The CLI never buys the plan. Headless embeds never show a badge.")}
   ${dimRaw("--json prints the raw server response on stdout.")}
 `);
 }
@@ -4711,7 +4891,7 @@ var schemaShape = object({
 });
 var MAX_SCHEMA_VERSION = 1;
 var FILLO_SCHEMA_VERSION = 1;
-var FILLO_SDK_VERSION = true ? "0.23.1" : "0.0.0-dev";
+var FILLO_SDK_VERSION = true ? "0.24.0" : "0.0.0-dev";
 function str(value, max, fallback = "") {
   return typeof value === "string" ? value.trim().slice(0, max) : fallback;
 }
@@ -7461,7 +7641,7 @@ async function summary(handle, flags) {
     );
     const distribution = Object.entries(field2.distribution ?? {});
     if (distribution.length > 0) {
-      const shown = distribution.slice(0, 5).map(([label, count]) => `${terminalText(label)} \u2014 ${count}`).join(" \xB7 ");
+      const shown = distribution.slice(0, 5).map(([label, count2]) => `${terminalText(label)} \u2014 ${count2}`).join(" \xB7 ");
       const rest = distribution.length - Math.min(distribution.length, 5);
       console.log(`    ${shown}${rest > 0 ? dim(` +${rest} more`) : ""}`);
     }
@@ -8790,10 +8970,10 @@ async function origins(subcommand, flags) {
     body.origins.length === 0 ? `  ${okMark()} Cleared the allow-list \u2014 any origin may stage with the publishable key.` : `  ${okMark()} Allowed origins: ${terminalText(body.origins.join(", "))}.`
   );
 }
-function printProtectedForms(count) {
-  if (count === 0) return;
+function printProtectedForms(count2) {
+  if (count2 === 0) return;
   console.log(
-    `  ${dim(`${count} ${count === 1 ? "form requires" : "forms require"} verified respondents.`)}`
+    `  ${dim(`${count2} ${count2 === 1 ? "form requires" : "forms require"} verified respondents.`)}`
   );
 }
 async function identityStatus(flags) {
@@ -9171,6 +9351,7 @@ var REGISTRY = [
   webhooksCommand,
   settingsCommand,
   brandingCommand,
+  billingCommand,
   membersCommand,
   workspaceCommand,
   syncTokensCommand,
@@ -9262,6 +9443,7 @@ function help() {
                        ${dimRaw("--auth none|bearer|x-api-key    secret via prompt or env, never argv")}
     settings <cmd>     A form's operational settings: get, set key=value
     branding [on|off]  The workspace's "Powered by Fillo" badge (off needs Everything)
+    billing            Plan and this month's response usage (read-only)
     members <cmd>      Workspace members: list, invite, cancel-invite, role, remove
     workspace rename   Rename the workspace (ids, keys, and URLs stay put)
     sync-tokens <cmd>  Stage-only deploy credentials: list, create, revoke

package/dist/skill/build-with-fillo/SKILL.md

@@ -160,17 +160,27 @@ could not be verified.
   `"light"` or `"dark"`. Use `"auto"` only for a deliberately OS-driven page.
   Verify every theme the host exposes, at desktop and narrow widths.
 - The "Powered by Fillo" badge is a server-driven workspace checkbox: always
-  visible on Free, hideable on the paid plan (default stays visible until
-  someone turns it off), and never present in a fully headless layout
-  (headless is free on every plan). Never hide or obscure it with CSS, DOM
-  edits, or style overrides — on Free that violates Fillo's terms. When the
-  user asks to remove it: with a CLI login on the paid plan, run
+  visible on Free, hideable on the paid Everything plan and its trial (default
+  stays visible until someone turns it off), and never present in a fully
+  headless layout (headless is free on every plan). Never hide or obscure it
+  with CSS, DOM edits, or style overrides — on Free that violates Fillo's
+  terms. When the user asks to remove it: with a CLI login on Everything, run
   `npx @usefillo/cli@latest branding off` (`branding` alone prints the state,
   `branding on` restores it). On Free, present the two honest paths and let
-  the user choose: select the paid plan in Fillo Settings → Plan (a human
-  clicks — the page explains pre-billing selection; never select a plan on the
-  user's behalf), or rebuild the embed headless with the host's own
+  the user choose: a workspace owner or admin subscribes to Everything (or
+  starts the workspace's one-time 30-day no-card trial) in Fillo Settings →
+  Billing & plan, or rebuild the embed headless with the host's own
   components. Do not bring up plans unprompted.
+- Billing is a human's decision. Everything is real paid billing through
+  Stripe checkout, in monthly volumes (5k, 25k, or 100k responses; Free is
+  200). Never select a plan, start the trial, change a volume, or open
+  checkout on the user's behalf. When the user asks about their plan or usage,
+  run `npx @usefillo/cli@latest billing` (owner or admin login; `--json` for
+  the raw result) or the MCP `fillo_get_billing` tool, report the plan and
+  this month's usage against the allowance, and hand the human the printed
+  Manage link. Allowances are soft: forms never stop collecting over them, so
+  never describe going over as losing responses. For prices, read
+  `https://fillo.so/pricing.md` rather than quoting from memory.
 - Use `onSubmitted` only for host-side follow-up after Fillo stores the
   response. Use a webhook when another backend needs durable delivery.
 - When the user asks to build, deploy, or make the form usable, use a plain

package/dist/skill/build-with-fillo/references/operations.md

@@ -301,8 +301,12 @@ reference: `https://fillo.so/docs/cli/reference.md`.
 - **Workspace:** `workspace rename`, `project rename`, `members`
   (`invite|cancel-invite|role|remove`), `keys create|list|revoke`,
   `tokens create-connector|list|revoke`, `sync-tokens create|list|revoke`,
-  `developers policy|origins|identity`, `branding`, `mcp list|revoke`,
-  `delete form|workspace`.
+  `developers policy|origins|identity`, `branding`, `billing` (read-only plan
+  and usage), `mcp list|revoke`, `delete form|workspace`.
+
+Paying for Fillo is the exception. Subscribing, the one-time trial, changing
+a volume, and cards or invoices stay a human click in Settings → Billing &
+plan; `billing` only reports and prints that page's Manage link.
 
 Add `--json` for a machine-readable result: one JSON object on stdout, progress
 and consent notices as JSON lines on stderr, `{"error": "…"}` and a non-zero

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usefillo/cli",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "Create and publish Fillo forms, and install the Fillo Agent Skill.",
   "license": "MIT",
   "keywords": [
@@ -34,11 +34,11 @@
     "@types/node": "^22.10.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@usefillo/core": "0.23.1"
+    "@usefillo/core": "0.24.0"
   },
   "scripts": {
     "build": "tsup && node scripts/copy-skill.mjs",
-    "test": "node scripts/test-skill-bundle.mjs && node scripts/test-skill-install.mjs && node scripts/test-agent-account.mjs && node scripts/test-stage-push.mjs && node scripts/test-local-validation.mjs && node scripts/test-loopback.mjs && node scripts/test-init.mjs && node scripts/test-api-target.mjs && node scripts/test-init-tty.mjs && node scripts/test-keys-claim.mjs && node scripts/test-responses.mjs && node scripts/test-workspace-commands.mjs && node scripts/test-form-lifecycle.mjs && node scripts/test-discord-tokens.mjs && node scripts/test-confirm.mjs && node scripts/test-integrations.mjs && node scripts/test-responses-ops.mjs && node scripts/test-workspace-admin.mjs",
+    "test": "node scripts/test-skill-bundle.mjs && node scripts/test-skill-install.mjs && node scripts/test-agent-account.mjs && node scripts/test-stage-push.mjs && node scripts/test-local-validation.mjs && node scripts/test-loopback.mjs && node scripts/test-init.mjs && node scripts/test-api-target.mjs && node scripts/test-init-tty.mjs && node scripts/test-keys-claim.mjs && node scripts/test-responses.mjs && node scripts/test-workspace-commands.mjs && node scripts/test-form-lifecycle.mjs && node scripts/test-discord-tokens.mjs && node scripts/test-confirm.mjs && node scripts/test-integrations.mjs && node scripts/test-responses-ops.mjs && node scripts/test-workspace-admin.mjs && node scripts/test-billing.mjs",
     "typecheck": "tsc --noEmit"
   }
 }