@meterapp/glossa 0.3.0 → 0.4.0

package/README.md

@@ -12,12 +12,13 @@ npx @meterapp/glossa fill translations.json                   # write [{"unit","
 npx @meterapp/glossa run_audit --locale es --question "Are brand names consistent?"
 npx @meterapp/glossa ops          # every op, live from the API
 npx @meterapp/glossa mcp          # stdio MCP bridge for hosts without HTTP MCP
-npx @meterapp/glossa pricing      # plans and prices, no key needed
-npx @meterapp/glossa billing      # this workspace's plan and usage
-npx @meterapp/glossa subscribe pro --interval year --open   # Stripe Checkout link for a human
+npx @meterapp/glossa pricing [--json]   # plans, prices and limits, no key needed
+npx @meterapp/glossa account            # plan, usage against every limit, next plan
+npx @meterapp/glossa upgrade --plan pro --yearly --open   # Stripe Checkout link for a human, even before login
+npx @meterapp/glossa billing portal     # invoices, card, plan change, cancel
 ```
 
-`subscribe` prints a Stripe Checkout link and charges nothing; a human pays in
+`upgrade` (alias `subscribe`) prints a Stripe Checkout link and charges nothing; a human pays in
 the browser. With `--confirm` it subscribes on the card already saved for the
 workspace instead, so pass it only after a human approved the plan and price.
 

package/bin/glossa.mjs

@@ -9,7 +9,7 @@ import { dirname, join, relative, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { brotliCompressSync, brotliDecompressSync, constants as zlib } from "node:zlib";
 
-const VERSION = "0.3.0";
+const VERSION = "0.4.0";
 const DEFAULT_HOST = "https://getglossa.dev";
 const CONFIG_PATH = join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "glossa", "config.json");
 const PROJECT_CONFIG = ".glossa.json";
@@ -53,12 +53,13 @@ function fail(message, code = 1) {
 }
 
 // ------------------------------------------------------------------- http
-async function call(op, input = {}, { method = "POST" } = {}) {
+/** `anonymous: true` calls a public op without a key when none is saved (pricing, checkout before signup). */
+async function call(op, input = {}, { method = "POST", anonymous = false } = {}) {
   const key = apiKey();
-  if (!key) fail("not signed in. Run `glossa login` or set GLOSSA_API_KEY.");
+  if (!key && !anonymous) fail("not signed in. Run `glossa login` or set GLOSSA_API_KEY.");
   const response = await fetch(`${host()}/api/v1/${op}`, {
     method,
-    headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json", "X-Glossa-Integration": "cli", "User-Agent": `glossa-cli/${VERSION}` },
+    headers: { ...(key ? { Authorization: `Bearer ${key}` } : {}), "Content-Type": "application/json", "X-Glossa-Integration": "cli", "User-Agent": `glossa-cli/${VERSION}` },
     body: JSON.stringify(input),
   });
   const text = await response.text();
@@ -139,7 +140,7 @@ const money = (cents) => (cents === null || cents === undefined ? "custom" : `$$
 /** `subscribe <plan> [--interval year | --yearly] [--confirm]` as op input. */
 export function subscribeInput(positional, flags) {
   const plan = String(positional[0] ?? flags.plan ?? "").toLowerCase();
-  if (!["pro", "team"].includes(plan)) throw new Error('name a plan: `glossa subscribe pro` or `glossa subscribe team` (see `glossa pricing`).');
+  if (!["pro", "team"].includes(plan)) throw new Error('name a plan: `glossa upgrade --plan pro` or `--plan team` (see `glossa pricing`).');
   const interval = flags.yearly || flags.interval === "year" || flags.interval === "yearly" ? "year" : "month";
   return { plan, interval, ...(flags.confirm ? { confirm: true } : {}) };
 }
@@ -149,28 +150,56 @@ function openUrl(url) {
   spawn(command, [url], { stdio: "ignore", detached: true }).on("error", () => undefined).unref();
 }
 
+/** One line per plan from the shared pricing document (GET /api/v1/pricing). */
+export function pricingLines(doc) {
+  return doc.plans.map((plan) => {
+    const price = plan.price.monthly === null ? "custom" : plan.price.monthly === 0 ? "free" : `$${plan.price.monthly.toLocaleString("en-US")}/mo · $${plan.price.yearly.toLocaleString("en-US")}/yr`;
+    const included = plan.included.ai_translations_per_month === null ? "volume" : plan.included.ai_translations_per_month.toLocaleString("en-US");
+    const members = plan.limits.members === null ? "unlimited" : plan.limits.members;
+    const projects = plan.limits.projects === null ? "unlimited" : plan.limits.projects;
+    return { name: plan.name, text: `${price.padEnd(22)} ${included} AI translations/mo, ${members} members, ${projects} projects` };
+  });
+}
+
 async function pricing(flags) {
-  const response = await fetch(`${host()}/api/v1/get_pricing`, { headers: { "User-Agent": `glossa-cli/${VERSION}`, "X-Glossa-Integration": "cli" } });
+  const response = await fetch(`${host()}/api/v1/pricing`, { headers: { "User-Agent": `glossa-cli/${VERSION}`, "X-Glossa-Integration": "cli" } });
   if (!response.ok) fail(`could not read pricing (HTTP ${response.status}).`);
-  const catalog = await response.json();
-  if (flags.json || !isTTY) return print(catalog, flags);
-  for (const plan of catalog.plans) {
-    const price = plan.monthly_cents === null ? "custom" : plan.monthly_cents === 0 ? "free" : `${money(plan.monthly_cents)}/mo · ${money(plan.yearly_cents)}/yr`;
-    const allowance = plan.ai_translations_per_month === null ? "volume" : plan.ai_translations_per_month.toLocaleString("en-US");
-    console.log(`${bold(plan.name.padEnd(11))} ${price.padEnd(22)} ${allowance} AI translations/mo, ${plan.members} members`);
-  }
-  console.log(dim(`\n${catalog.unit}\nBuy: glossa subscribe pro [--interval year] [--open]`));
+  const doc = await response.json();
+  if (flags.json || !isTTY) return print(doc, flags);
+  for (const line of pricingLines(doc)) console.log(`${bold(line.name.padEnd(11))} ${line.text}`);
+  console.log(dim(`\n${doc.unit}\nBuy (no account needed first): glossa upgrade --plan pro [--yearly] [--open]`));
 }
 
-async function billing(flags) {
+const usageLine = (label, usage) => `  ${label.padEnd(16)} ${usage.used.toLocaleString("en-US")} of ${usage.included === null ? "unlimited" : usage.included.toLocaleString("en-US")}`;
+
+async function billing(positional, flags) {
+  if (positional[0] === "portal") {
+    const result = await call("get_billing_link");
+    if (flags.json || !isTTY) print(result, flags);
+    else console.log(`${result.message}\n${result.url}`);
+    if (flags.open) openUrl(result.url);
+    return;
+  }
   const state = await call("get_billing", flags.refresh ? { refresh: true } : {});
   if (flags.json || !isTTY) return print(state, flags);
   const when = state.ends_at ? `ends ${state.ends_at.slice(0, 10)}` : state.renews_at ? `renews ${state.renews_at.slice(0, 10)}` : "";
   console.log(`${bold(state.plan_name)} ${dim(state.status === "none" ? "" : state.status)} ${state.interval ? `${money(state.price_cents)}/${state.interval}` : ""} ${dim(when)}`.trim());
-  for (const [label, usage] of [["AI translations", state.usage.ai_translations], ["members", state.usage.members], ["projects", state.usage.projects]]) {
-    console.log(`  ${label.padEnd(16)} ${usage.used.toLocaleString("en-US")} of ${usage.included === null ? "unlimited" : usage.included.toLocaleString("en-US")}`);
+  for (const [label, usage] of [["AI translations", state.usage.ai_translations], ["members", state.usage.members], ["projects", state.usage.projects]]) console.log(usageLine(label, usage));
+  console.log(dim(`  card saved: ${state.payment_method_saved ? "yes" : "no"} · invoices and card: glossa billing portal`));
+}
+
+async function account(flags) {
+  const state = await call("get_account");
+  if (flags.json || !isTTY) return print(state, flags);
+  const when = state.ends_at ? `ends ${state.ends_at.slice(0, 10)}` : state.renews_at ? `renews ${state.renews_at.slice(0, 10)}` : "";
+  console.log(`${bold(state.workspace.name)} ${dim(`(${state.workspace.slug}, ${state.role})`)}`);
+  console.log(`${bold(state.plan_name)} ${state.interval ? `${money(state.price_cents)}/${state.interval}` : ""} ${dim(when)}`.trim());
+  for (const [label, usage] of [["AI translations", state.usage.ai_translations], ["members", state.usage.members], ["projects", state.usage.projects]]) console.log(usageLine(label, usage));
+  if (state.next_tier) {
+    const adds = state.next_tier.adds;
+    const more = adds.ai_translations_per_month ? `${adds.ai_translations_per_month.toLocaleString("en-US")} AI translations/mo` : adds.ai_translations_per_month === null ? "volume pricing" : "";
+    console.log(dim(`\nNext: ${state.next_tier.name}${state.next_tier.price.monthly ? ` ($${state.next_tier.price.monthly}/mo)` : ""}${more ? `, ${more}` : ""} → ${state.next_tier.checkout_url}`));
   }
-  console.log(dim(`  card saved: ${state.payment_method_saved ? "yes" : "no"} · ${state.manage_url}`));
 }
 
 /**
@@ -184,13 +213,17 @@ async function subscribe(positional, flags) {
   } catch (error) {
     fail(error.message);
   }
-  const result = input.confirm ? await call("subscribe", input) : await call("create_checkout_link", input);
+  if (input.confirm && !apiKey()) fail("--confirm charges a saved card and needs `glossa login` first. Without it you get a checkout link.");
+  const result = input.confirm ? await call("subscribe", input) : await call("create_checkout_link", input, { anonymous: true });
   const url = result.url ?? result.checkout_url ?? null;
+  // Paid before signing in: remember the session so `glossa login` attaches it to the workspace.
+  if (!apiKey() && result.session_id) saveUserConfig({ ...userConfig(), pending_checkout: result.session_id });
   if (flags.json || !isTTY) {
     print(result, flags);
   } else if (url) {
     console.log(`${bold(`${input.plan} · ${money(result.amount_cents)}/${input.interval}`)}: ${result.reason ?? "complete the purchase in Stripe Checkout (nothing is charged until you do)."}`);
     console.log(url);
+    if (!apiKey()) console.log(dim("After paying, run `glossa login`: the plan attaches to your workspace."));
   } else {
     console.log(green(`✓ ${result.status}: ${result.billing?.plan_name ?? input.plan} (${input.interval}ly)`));
   }
@@ -276,6 +309,26 @@ async function login(flags) {
   }
   const workspace = await call("get_workspace");
   console.log(green(`Signed in to ${workspace.name} (${workspace.slug}). Key saved to ${CONFIG_PATH}.`));
+  await claimPending();
+}
+
+/** Attaches a checkout paid before login (saved by `glossa upgrade`) to the workspace just signed in to. */
+async function claimPending() {
+  const config = userConfig();
+  if (!config.pending_checkout) return;
+  try {
+    const result = await call("claim_checkout", { session_id: config.pending_checkout });
+    console.log(green(`✓ ${result.billing.plan_name} is now this workspace's plan.`));
+    delete config.pending_checkout;
+    saveUserConfig(config);
+  } catch (error) {
+    if (error.body?.code === "checkout_incomplete") return console.log(dim("A checkout link is still open; finish paying, then run `glossa login` again (or `glossa claim_checkout --session-id …`)."));
+    if (["already_claimed", "not_found"].includes(error.body?.code)) {
+      delete config.pending_checkout;
+      saveUserConfig(config);
+    }
+    console.log(dim(`Could not attach the earlier checkout: ${error.message}`));
+  }
 }
 
 function logout() {
@@ -484,11 +537,14 @@ ${bold("Usage")}
                                             [--status reviewed|needs_review] [--overwrite missing|machine|all]
   glossa tasks [--kind k] [--limit n]       the review queue
   glossa mcp                                stdio MCP bridge to the hosted server
-  glossa pricing                            plans and prices (no key needed)
+  glossa pricing [--json]                   plans, prices and limits (no key needed)
+  glossa account                            plan, usage against every limit, next plan
   glossa billing [--refresh]                this workspace's plan and usage
-  glossa subscribe pro|team [--interval year] [--open]
-                                            Stripe Checkout link for a human; --confirm
-                                            charges the saved card (only once approved)
+  glossa billing portal [--open]            invoices, card, plan change, cancel (Stripe)
+  glossa upgrade --plan pro|team [--yearly] [--open]
+                                            Stripe Checkout link for a human, also before
+                                            signing in (\`glossa login\` attaches it after);
+                                            --confirm charges the saved card (once approved)
   glossa <op> [--field value…] [--json '{…}' | @file | -]  run any op (glossa ops lists them)
   glossa ops                                list every op
 
@@ -530,7 +586,9 @@ async function main() {
     case "pricing":
       return pricing(flags);
     case "billing":
-      return billing(flags);
+      return billing(positional, flags);
+    case "account":
+      return account(flags);
     case "subscribe":
     case "upgrade":
       return subscribe(positional, flags);

package/bin/glossa.test.mjs

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { coerceFlags, deviceLogin, fileBody, fileText, parseArgs, readJsonArg, fillBatches, subscribeInput } from "./glossa.mjs";
+import { coerceFlags, deviceLogin, fileBody, fileText, parseArgs, readJsonArg, fillBatches, pricingLines, subscribeInput } from "./glossa.mjs";
+import { pricingDocument } from "../../../lib/billing/pricing";
 
 describe("cli args", () => {
   it("parses flags and positionals", () => {
@@ -100,3 +101,12 @@ describe("file bodies", () => {
     expect(fileText({ content: "x" })).toBe("x");
   });
 });
+
+describe("pricing", () => {
+  it("prints one line per plan from the shared pricing document", () => {
+    const lines = pricingLines(pricingDocument("agent-cli"));
+    expect(lines.map((l) => l.name)).toEqual(["Free", "Pro", "Team", "Enterprise"]);
+    expect(lines[1].text).toMatch(/^\$49\/mo · \$490\/yr .*25,000 AI translations\/mo, 10 members, unlimited projects$/);
+    expect(lines[3].text).toMatch(/^custom/);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meterapp/glossa",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Glossa CLI: push and pull translation files, run the AI review queue, and every other Glossa op from your terminal or CI. Includes a stdio MCP bridge.",
   "type": "module",
   "bin": { "glossa": "bin/glossa.mjs" },