@letterstory/cli 0.177.37 → 0.177.39

package/lib/cli.mjs

@@ -88,7 +88,7 @@ import {
 import { fetchParkedSections, withoutParked } from "./parked.mjs";
 
 // Matches cli/package.json; publish-cli.yml rewrites both to the published version.
-export const VERSION = "0.177.37";
+export const VERSION = "0.177.39";
 
 /** The exit code for a gate refusal (CARD_REQUIRED, PAYMENT_FAILED, OUT_OF_TOKENS): 1 is a plain error. */
 export const EXIT_PAYMENT_REQUIRED = 3;
@@ -97,6 +97,8 @@ export const EXIT_PAYMENT_REQUIRED = 3;
 // can't accidentally swallow the id as --json's value. Every `type: "bool"` flag (and its
 // `negate` spelling) in a command's ARGS map must be listed; boolean-flags.test.ts enforces it.
 export const BOOLEAN_FLAGS = new Set([
+	// Models material: retain a request for attachments before preparing it.
+	"stage-only",
 	// visits export: only the people or companies who fit the ICP, or only those who don't.
 	"icp",
 	"not-icp",
@@ -2093,7 +2095,13 @@ Models (your own writing models, each trained on writing you give it so it write
                                                        Budget: the most one training run may cost (default $100)
   models show <id>                                     Its links, its training and what it cost
   models upload <id> <file-or-folder>…                 Import files, folders or ZIPs without training
-  models material <id> "<material or request>"          Paste material or find original sources
+  models material <id> "<material or request>" [--stage-only] [--request <id>] [--from-request <id>]
+                                                       Prepare material; --stage-only creates a request for uploads
+  models material-show <id> <request-id> [--selection <id>] [--offset <n>]
+                                                       Read progress and selected original text
+  models material-review <id> <request-id> [<selection-id>…] [--cancel]
+                                                       Accept this request, or cancel it; never trains
+  models material-history <id> [--offset <n>]          Earlier material requests
   models add <id> <url>… [--train]                     Links to pieces of your writing; --train starts training
   models find <id> "<the writing to find>" [--max <n>] Letter finds the links and proposes them
   models confirm <id> [<link-id>…] [--keep-rest] [--no-train]

package/lib/commands/admin.mjs

@@ -6355,7 +6355,9 @@ const FREE_USAGE = `Usage: admin billing free exposure [--json]               wh
        admin billing free grant <org-id|name> <tokens> --why "…" [--key k]   give an org free tokens (a Lago org: a one-off wallet); the same key is one grant
        admin billing free grants [--org <org-id>] [--limit n]   staff grants, newest first, live and revoked
        admin billing free revoke <org-id> <ref> --why "…"   take a staff grant back (ref from the list: grant:<id> or wallet:staff_…)
-       admin billing free preflight [--json]               who the paywall stops the moment it is enforced, and whether it is ready`;
+       admin billing free preflight [--json]               who the paywall stops the moment it is enforced, and whether it is ready
+       admin billing free pool <org-id|name>... --why "…"   link orgs on free tokens so they spend from one balance
+       admin billing free unpool <org-id|name> --why "…"    take an org out of its shared balance`;
 
 const EXPOSURE_WORDS = {
 	needs_legacy: "pay today: need a legacy mark (admin billing legacy mark --all)",
@@ -6457,6 +6459,28 @@ async function cmdAdminBillingFree(ctx) {
 		});
 		return 0;
 	}
+	if (positionals[1] === "pool" || positionals[1] === "unpool") {
+		const pool = positionals[1] === "pool";
+		const args = positionals.slice(2);
+		if (pool ? args.length < 2 : args.length !== 1) throw new CliError(FREE_USAGE);
+		const why = flagStr(flags.why);
+		if (!why) throw new CliError(`Say why (--why "…"): it is kept with the change.\n${FREE_USAGE}`);
+		const orgIds = [];
+		for (const a of args) orgIds.push((await resolveBillingOrg(ctx, a)).orgId);
+		const r = pool
+			? await staffPost(ctx, "/api/superadmin/billing/token-pools", { orgIds, why })
+			: await staffRequest(ctx, "DELETE", "/api/superadmin/billing/token-pools", { orgId: orgIds[0], why });
+		printResult(io, flags, r, (x) =>
+			pool
+				? `Sharing one token balance (${x.poolId}):\n${x.orgs.map((o) => `  ${o.name}  ${o.orgId}`).join("\n")}`
+				: !x.changed
+					? `${orgIds[0]} is in no pool; nothing changed.`
+					: x.left.length
+						? `Taken out. Still sharing: ${x.left.map((o) => o.name).join(", ")}.`
+						: "Taken out. The pool had one org left, so it ended."
+		);
+		return 0;
+	}
 	if (positionals[1] === "grant") {
 		const [orgArg, tokensArg] = [positionals[2], positionals[3]];
 		const tokens = Number(String(tokensArg ?? "").replace(/[,_]/g, ""));

package/lib/commands/models.mjs

@@ -52,13 +52,31 @@ export const ARGS = {
 	},
 	import_writing_model_files: {
 		model_id: modelId,
+		request_id: "request",
 		files: { internal: "models upload <id> <file-or-folder>…; 3 MB batches" },
 	},
 	ingest_writing_model_material: {
 		model_id: modelId,
+		request_id: "request",
+		from_request_id: "from-request",
+		stage: { flag: "stage-only", type: "bool" },
 		text: { value: (flags, positionals) => positionals.slice(1).join(" ") },
 		documents: { internal: "extract_document then generic mcp call" },
 	},
+	list_writing_model_material: { model_id: modelId, offset: { flag: "offset", type: "num" } },
+	get_writing_model_material: {
+		model_id: modelId,
+		request_id: { positional: 1, required: true, label: "request-id" },
+		offset: { flag: "offset", type: "num" },
+		selection_id: "selection",
+	},
+	review_writing_model_material: {
+		model_id: modelId,
+		request_id: { positional: 1, required: true, label: "request-id" },
+		action: { value: (flags) => (flags.cancel ? "cancel" : "accept") },
+		accept: { value: (flags, p) => rest(2)(flags, p) ?? "all" },
+		exclude: { internal: "generic mcp call" },
+	},
 	add_writing_model_texts: {
 		model_id: modelId,
 		documents: {
@@ -166,7 +184,11 @@ export async function cmdModels(ctx) {
 					bytes += file.size;
 					batch.push({ filename: file.filename, content_base64: readFileSync(file.path).toString("base64") });
 				}
-				result = await next.client.callTool("import_writing_model_files", { model_id: id, files: batch });
+				result = await next.client.callTool("import_writing_model_files", {
+					model_id: id,
+					files: batch,
+					...(flagStr(next.flags.request) ? { request_id: flagStr(next.flags.request) } : {}),
+				});
 				added += result.added;
 				issues.push(...result.issues);
 				uploads.splice(0, batch.length);
@@ -176,6 +198,17 @@ export async function cmdModels(ctx) {
 			);
 			return issues.length ? 1 : 0;
 		}
+		case "material-review":
+			printResult(next.io, next.flags, await call(next, "review_writing_model_material"), (r) =>
+				JSON.stringify(r)
+			);
+			return 0;
+		case "material-history":
+			printResult(next.io, next.flags, await call(next, "list_writing_model_material"), (r) => JSON.stringify(r));
+			return 0;
+		case "material-show":
+			printResult(next.io, next.flags, await call(next, "get_writing_model_material"), (r) => JSON.stringify(r));
+			return 0;
 		case "material": {
 			refuseUnknownFlags(next, ARGS.ingest_writing_model_material, []);
 			return modelShow(next, await call(next, "ingest_writing_model_material"));

package/package.json

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