@letterstory/cli 0.147.0 → 0.148.1

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.147.0";
+export const VERSION = "0.148.1";
 
 // 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
@@ -1107,6 +1107,8 @@ Seers (event-driven signals -> drafts):
                                                        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/org.mjs

@@ -28,6 +28,7 @@ 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" },
@@ -111,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;
@@ -149,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) =>
@@ -180,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/lib/commands/site.mjs

@@ -4,6 +4,7 @@
 //   site tree <host> [path]  → get_site_tree            site page <host> <path>    → get_site_page
 //   site builds <host>       → list_build_suggestions  (--limit n)
 //   site research-builds <host> → research_builds (Build's suggestion pass: propose, check, Jev, store)
+//   site research-fixes <host> → research_fixes (Fix's suggestion pass: exact edits on pages that exist)
 //   site metrics <host> [path] → get_site_metrics  (--window 7d|28d|90d, --page <path>…, --no-compare)
 //   site observations <host> → list_site_observations   site observe <host>        → observe_site
 //   site dismiss <host> <id> → dismiss_site_observation
@@ -87,6 +88,9 @@ const ARGS = {
 	research_builds: {
 		host: { positional: 0, required: true, label: "host" },
 	},
+	research_fixes: {
+		host: { positional: 0, required: true, label: "host" },
+	},
 	get_site_metrics: {
 		host: { positional: 0, required: true, label: "host" },
 		path: { positional: 1, label: "path" },
@@ -210,6 +214,8 @@ export async function cmdSite(ctx) {
 			return siteTree(rest);
 		case "research-builds":
 			return siteResearchBuilds(rest);
+		case "research-fixes":
+			return siteResearchFixes(rest);
 		case "builds":
 			return siteBuilds(rest);
 		case "metrics":
@@ -439,6 +445,23 @@ async function siteResearchBuilds(ctx) {
 	return 0;
 }
 
+async function siteResearchFixes(ctx) {
+	const { client, flags, io } = ctx;
+	refuseUnknownFlags(ctx, ARGS.research_fixes);
+	const result = await client.callTool("research_fixes", argsFromFlags(ARGS.research_fixes, flags, ctx.positionals));
+	printResult(io, flags, result, (r) => {
+		if (!r.ran) return `Not run (${r.reason ?? "fresh"}); the stored fixes are on the site's Fix list.`;
+		const lines = r.suggestions.map(
+			(s) => `KEPT ${s.page}: ${s.summary}\n  now:   ${s.current}\n  after: ${s.change}\n  ${s.id}`
+		);
+		for (const x of r.rejected) lines.push(`DROPPED ${x.page}: ${x.summary} (${x.reason})`);
+		if (r.pass?.resolved) lines.push(`Resolved ${r.pass.resolved} open fix(es) whose page changed.`);
+		if (!r.suggestions.length) lines.push("Nothing passed: zero is a valid result.");
+		return lines.join("\n");
+	});
+	return 0;
+}
+
 async function siteMetrics(ctx) {
 	const { client, flags, io } = ctx;
 	refuseUnknownFlags(ctx, ARGS.get_site_metrics);

package/package.json

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