@letterstory/cli 0.146.1 → 0.148.0

package/lib/cli.mjs

@@ -65,7 +65,7 @@ import {
 
 // Matches cli/package.json; publish-cli.yml rewrites both to the published version.
 // Matches cli/package.json; publish-cli.yml rewrites both to the published version.
-export const VERSION = "0.146.1";
+export const VERSION = "0.148.0";
 
 // Flags that never take a value. Listing them explicitly means `deploy get --json <id>`
 // can't accidentally swallow the id as --json's value. Every `type: "bool"` flag (and its
@@ -945,7 +945,7 @@ Admin (STAFF key — --staff-key / LETTERSTORY_STAFF_API_KEY; acts before an org
           | reconcile [--org <org-id>] | forward
           | payments [--org <org-id>] [--open] | payments retry <lago-invoice-id> | payments run [--dry]
           | signups [--status open|card_saved|provisioned|paid|abandoned]
-          | cap <org-id> <dollars|off> [--why "…"]
+          | cap <org-id> <dollars|off> [--why "…"] | cancel <org-id> --why "…" --yes
                                                        Usage billing on Lago: the plan catalog, an org's
                                                        plan and gifted ratio, Lago's tokens against ours,
                                                        forwarding usage now, failed payments and the
@@ -1103,10 +1103,12 @@ Seers (event-driven signals -> drafts):
   org export --split <dir>                             …as one file per record (for keeping config in git)
   org join <dir> [--file <path>]                       Rebuild the bundle from a --split directory
   org integrations                                     Every integration and whether it's connected
-  org billing [cap <dollars|off> [--why "…"] | request [--note "…"]]
+  org billing [cap <dollars|off> [--why "…"] | request [--note "…"] | cancel [--why "…"] --yes]
                                                        Usage billing: plan, this period against the
                                                        allowance and spend cap, failed payments; set
                                                        the cap (admins) or ask the admins for more
+  org billing usage                                    This period by product and collection: quantities,
+                                                       and tokens and dollars when billed by usage
   org linear [teams [--team <id|key>] | set --team <id|key> [--project <id>|none] | disconnect]
                                                        Where Letter files Linear issues (connect in Settings)
   org diff <file|dir>                                  What applying a bundle would change (reads only)

package/lib/commands/admin.mjs

@@ -5213,7 +5213,8 @@ const LAGO_USAGE = `Usage: admin billing lago <command>
   payments retry <lago-invoice-id>       charge one failed invoice again now
   payments run [--dry]                   one pass of the failed-payment loop now (--dry: report only)
   signups [--status open|card_saved|provisioned|paid|abandoned]   new paying orgs on their way onto Lago
-  cap <org-id> <dollars|off> [--why "…"]  set an account's monthly spend cap on overage (off: no cap)`;
+  cap <org-id> <dollars|off> [--why "…"]  set an account's monthly spend cap on overage (off: no cap)
+  cancel <org-id> --why "…" --yes          end an account's Lago plan now and refund its first invoice`;
 
 /** admin billing lago … — staff operations on Lago (docs/billing/lago-integration.md). */
 async function cmdAdminBilling(ctx) {
@@ -5336,6 +5337,23 @@ async function cmdAdminBilling(ctx) {
 			);
 			return 0;
 		}
+		case "cancel": {
+			const orgId = positionals[2];
+			if (!orgId || !flagStr(flags.why)) throw new CliError(LAGO_USAGE);
+			if (!flagBool(flags.yes))
+				throw new CliError(
+					"This ends the plan now and refunds its first invoice. Run again with --yes to do it."
+				);
+			const result = await staffRequest(ctx, "POST", `${LAGO}/cancel`, { orgId, reason: flagStr(flags.why) });
+			printResult(
+				io,
+				flags,
+				result,
+				(r) =>
+					`Cancelled ${orgId}: first invoice ${r.firstInvoice}${r.refundedCents ? `, $${(r.refundedCents / 100).toFixed(2)} refunded` : ""}.`
+			);
+			return 0;
+		}
 		case "cap": {
 			const orgId = positionals[2];
 			const value = positionals[3];

package/lib/commands/org.mjs

@@ -28,11 +28,13 @@ export const ARGS = {
 	describe_org_config_fields: {},
 	get_org_config_source: {},
 	get_billing_payments: {},
+	get_billing: {},
 	set_billing_spend_cap: {
 		cap_usd: { value: (_flags, positionals) => capFrom(requirePositional(positionals, 0, "dollars|off")) },
 		reason: { flag: "why" },
 	},
 	request_billing_tokens: { note: { flag: "note" } },
+	cancel_billing_plan: { reason: { flag: "why" } },
 	list_integrations: {},
 	get_linear_connection: {},
 	list_linear_targets: { team_id: { flag: "team" } },
@@ -110,7 +112,7 @@ const usd = (n) => `$${Number(n).toFixed(2)}`;
  * `org billing`: the org's plan on Lago, this period against its allowance and spend cap, whether
  * it is past due, and its failed payments (get_billing_payments). `org billing cap <dollars|off>`
  * sets the cap (set_billing_spend_cap, admins); `org billing request` asks the admins for more
- * (request_billing_tokens).
+ * (request_billing_tokens); `org billing usage` is this period by product and collection (get_billing).
  */
 async function orgBilling(ctx) {
 	const { client, flags, io, positionals } = ctx;
@@ -125,6 +127,20 @@ async function orgBilling(ctx) {
 		);
 		return 0;
 	}
+	if (positionals[0] === "cancel") {
+		refuseUnknownFlags(ctx, ARGS.cancel_billing_plan, ["yes"]);
+		if (!flagBool(flags.yes))
+			throw new CliError("This ends the plan now and refunds its first invoice. Run again with --yes to do it.");
+		const result = await client.callTool("cancel_billing_plan", argsFromFlags(ARGS.cancel_billing_plan, flags, []));
+		printResult(io, flags, result, (r) =>
+			r.firstInvoice === "refunded"
+				? `Plan cancelled; $${(r.refundedCents / 100).toFixed(2)} refunded to the card.`
+				: r.firstInvoice === "voided"
+					? "Plan cancelled; its unpaid first invoice is voided."
+					: "Plan cancelled."
+		);
+		return 0;
+	}
 	if (positionals[0] === "request") {
 		refuseUnknownFlags(ctx, ARGS.request_billing_tokens, []);
 		const result = await client.callTool(
@@ -134,6 +150,12 @@ async function orgBilling(ctx) {
 		printResult(io, flags, result, (r) => `Asked ${r.emailedTo} admin${r.emailedTo === 1 ? "" : "s"} for more.`);
 		return 0;
 	}
+	if (positionals[0] === "usage") {
+		refuseUnknownFlags(ctx, ARGS.get_billing, []);
+		const result = await client.callTool("get_billing", argsFromFlags(ARGS.get_billing, flags, []));
+		printResult(io, flags, result, billingUsageText);
+		return 0;
+	}
 	refuseUnknownFlags(ctx, {}, []);
 	const result = await client.callTool("get_billing_payments", {});
 	printResult(io, flags, result, (r) =>
@@ -165,6 +187,29 @@ async function orgBilling(ctx) {
 	return 0;
 }
 
+const tokensOrQty = (p) => `${p.billableQuantity}${p.tokens === null ? "" : `  ${p.tokens} tokens`}`;
+
+/** `org billing usage` as text: the period, the totals, then each product and each collection. */
+function billingUsageText(r) {
+	const lines = [
+		`${r.plan ? `Plan: ${r.plan.name}${r.plan.ratio !== 1 ? ` (${r.plan.ratio}x)` : ""}. ` : ""}This period: ${r.period.from.slice(0, 10)} to ${r.period.to.slice(0, 10)}${r.period.basis === "ours" ? " (Lago unreadable: our own rating)" : ""}.`,
+	];
+	if (r.tokens)
+		lines.push(
+			`Tokens: ${r.tokens.used} used of ${r.tokens.allowance} included${r.tokens.complimentary ? ` (+${r.tokens.complimentary} complimentary)` : ""}${r.tokens.arriving ? ` (${r.tokens.arriving} of them still being counted)` : ""}${r.tokens.running ? `, ${r.tokens.running} held by running work` : ""}.`
+		);
+	else lines.push("Not billed by usage: quantities only.");
+	if (r.usd) lines.push(`Plan fee ${usd(r.usd.planFee)}; overage so far ${usd(r.usd.overage)}.`);
+	if (r.byProduct.length === 0) return [...lines, "No usage this period."].join("\n");
+	lines.push("", "By product:", ...r.byProduct.map((p) => `  ${p.label}  ${tokensOrQty(p)}`));
+	lines.push("", "By collection:");
+	for (const c of r.byCollection) {
+		lines.push(`  ${c.name}${c.tokens === null ? "" : `  ${c.tokens} tokens`}`);
+		for (const p of c.products) lines.push(`    ${p.label}  ${tokensOrQty(p)}`);
+	}
+	return lines.join("\n");
+}
+
 /** `org fields [section]`: what each setting in the bundle means (describe_org_config_fields). */
 async function orgFields(ctx) {
 	const { client, flags, io, positionals } = ctx;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@letterstory/cli",
-	"version": "0.146.1",
+	"version": "0.148.0",
 	"description": "Spin up and manage Letterstory phantom blogs from your terminal.",
 	"type": "module",
 	"license": "UNLICENSED",