@letterstory/cli 0.144.0 → 0.145.2

package/lib/cli.mjs

@@ -63,8 +63,8 @@ import {
 	cmdSim,
 } from "./commands.mjs";
 
-// Keep in sync with cli/package.json.
-export const VERSION = "0.144.0";
+// Matches cli/package.json; publish-cli.yml rewrites both to the published version.
+export const VERSION = "0.145.2";
 
 // 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
@@ -907,7 +907,8 @@ Admin (STAFF key — --staff-key / LETTERSTORY_STAFF_API_KEY; acts before an org
                                                        ledger entry. Written by \`npm run lab --
                                                        publish\` in the kernels repo.
   admin models runs [--search T] [--model M] [--starred] | run <id> | star|unstar <id> | scoreboard --model M
-                                                       The model hub's saved runs and blind arena (models.letter.dev)
+         | requests [--model M] [--outcome O] [--run ID] | request <id> | sampling [--model M --percent P]
+                                                       The model hub's saved runs, blind arena and request log (models.letter.dev)
   admin spend summary [--range day|week|month|year | --from D --to D] [--grain day|week|month]
           | reconcile [--from D --to D] | pnl [--range day|week|month|year | --from D --to D]
           | reference add --vendor V [--key K] --metric billed_usd --value N --from D [--to D] --ref "…"
@@ -1440,6 +1441,7 @@ Repo changes (Claude Code edits your repo in a sandbox; the Letterstory GitHub A
   repo list [--status running|succeeded|no_changes|failed|cancelled] [--limit n] [--audit <id>]
              [--source site_audit_issue|site_quick_check|letterprove_install|visitors_install]
   repo publish <run-id>                                Make PR on a preview in review
+  repo merge <run-id>                                  Merge its open PR (a squash; the repo's branch rules decide)
   repo revise <run-id> --instructions <text>|--instructions-file <path|->
                                                        Ask for more on a preview; it takes over the preview's link
   repo cancel <run-id>                                 Stop it and delete the sandbox; no PR (Discard a preview)

package/lib/commands/admin.mjs

@@ -19,7 +19,7 @@
 //   admin brand-detection <org-id>                                                   (fleet:read)
 //   admin brand-detection <org-id> [--term t]... [--exact t]... [--exclude p]... [--note "…"] | --clear [--note "…"]   (fleet:instrument)
 //   admin recipes list|show|vocab|export|import|save|delete …                        (recipes:read / recipes:write)
-//   admin models runs|run|star|unstar|scoreboard …                                    (models:read / models:write)
+//   admin models runs|run|star|unstar|scoreboard|requests|request|sampling …       (models:read / models:write)
 //   admin replays [--org <id>] [--target <id>] [--status …] [--limit n]                (fleet:read)
 //   admin replay --org <id> [<response-id> | --target <id>] [--surface …]           (fleet:replay)
 //   admin create-org --domain acme.com [--name "Acme"] [--test] [--no-key] [--key-name N]
@@ -4067,7 +4067,7 @@ function spendEntryFromFlags(flags) {
 
 const MODELS = "/api/superadmin/models";
 const MODELS_USAGE =
-	"Usage: admin models runs [--search TEXT] [--model ballpoint-1] [--starred] [--limit N] | run <id> | star <id> | unstar <id> | scoreboard --model ballpoint-1";
+	"Usage: admin models runs [--search TEXT] [--model ballpoint-1] [--starred] [--limit N] | run <id> | star <id> | unstar <id> | scoreboard --model ballpoint-1 | requests [--model M] [--consumer C] [--org ORG_ID] [--outcome ok|error|waking|rejected] [--operation generate] [--run ID] [--from ISO] [--to ISO] [--limit N] [--cursor NEXT] | request <id> | sampling [--model M --percent P]";
 
 /** The model hub's saved runs and blind arena (models.letter.dev), same functions as its pages. */
 async function cmdAdminModels(ctx) {
@@ -4118,6 +4118,80 @@ async function cmdAdminModels(ctx) {
 			printResult(io, flags, result, () => "");
 			return 0;
 		}
+		case "requests": {
+			const params = new URLSearchParams(
+				compact({
+					model: flagStr(flags.model),
+					consumer: flagStr(flags.consumer),
+					org_id: flagStr(flags.org),
+					outcome: flagStr(flags.outcome),
+					operation: flagStr(flags.operation),
+					run: flagStr(flags.run),
+					from: flagStr(flags.from),
+					to: flagStr(flags.to),
+					limit: flagNum(flags.limit)?.toString(),
+					cursor: flagStr(flags.cursor),
+				})
+			);
+			const result = await staffRequest(ctx, "GET", `${MODELS}/requests${params.size ? `?${params}` : ""}`);
+			printResult(io, flags, result, (r) =>
+				(r.requests ?? [])
+					.map(
+						(x) =>
+							`${x.created_at.slice(0, 19)}  ${x.model.padEnd(16)} ${x.consumer.padEnd(18)} ${String(x.status).padStart(3)} ${x.outcome.padEnd(8)} ${String(x.latency_ms).padStart(6)} ms  ${x.error ? `${x.error.slice(0, 60)}  ` : ""}${x.id}`
+					)
+					.concat(r.next ? [`Older: --cursor '${r.next}'`] : [])
+					.join("\n")
+			);
+			return 0;
+		}
+		case "request": {
+			const id = positionals[1];
+			if (!id) throw new CliError("Usage: admin models request <id>");
+			const result = await staffRequest(ctx, "GET", `${MODELS}/requests/${id}`);
+			printResult(io, flags, result, (r) =>
+				[
+					`${r.model} ${r.operation} · ${r.created_at} · ${r.consumer}${r.org_id ? ` · org ${r.org_id}` : ""}${r.run_id ? ` · run ${r.run_id}` : ""}`,
+					`${r.status} ${r.outcome} · ${r.latency_ms} ms${r.error ? ` · ${r.error}` : ""}`,
+					...(r.calls ?? []).map(
+						(c, i) =>
+							`  call ${i + 1}: ${c.outcome} ${c.ms} ms ${c.input_tokens ?? 0} → ${c.output_tokens ?? 0} tokens${c.error ? ` · ${c.error}` : ""}`
+					),
+					r.has_bodies
+						? [
+								`request:  ${JSON.stringify(r.request)}`,
+								`response: ${JSON.stringify(r.response)}`,
+								...(r.raw ?? []).map((t, i) => `raw ${i + 1}:  ${t ?? "—"}`),
+							].join("\n")
+						: "bodies: gone (kept 14 days)",
+				].join("\n")
+			);
+			return 0;
+		}
+		case "sampling": {
+			const model = flagStr(flags.model);
+			const percent = flagNum(flags.percent);
+			if (percent != null) {
+				if (!model) throw new CliError("Usage: admin models sampling --model ballpoint-1 --percent 30");
+				const result = await staffRequest(ctx, "PUT", `${MODELS}/request-sampling`, { model, percent });
+				ok(ctx, `${result.model} keeps ${result.percent}% of its requests`);
+				printResult(io, flags, result, () => "");
+				return 0;
+			}
+			const result = await staffRequest(ctx, "GET", `${MODELS}/request-sampling`);
+			printResult(io, flags, result, (r) =>
+				[
+					`Every model keeps ${r.default_percent}% unless set below; bodies are kept ${r.body_days} days.`,
+					...(r.models ?? [])
+						.filter((m) => !model || m.model === model)
+						.map(
+							(m) =>
+								`  ${m.model.padEnd(18)} ${String(m.percent).padStart(6)}%  set ${m.updated_at.slice(0, 10)}`
+						),
+				].join("\n")
+			);
+			return 0;
+		}
 		case "scoreboard": {
 			const model = flagStr(flags.model);
 			if (!model) throw new CliError("Usage: admin models scoreboard --model ballpoint-1");

package/lib/commands/repo.mjs

@@ -4,6 +4,7 @@
 //   repo activity → get_repo_change_activity (what the sandbox is doing; --follow polls)
 //   repo list    → list_repo_changes     repo cancel → cancel_repo_change
 //   repo publish → publish_repo_change (Make PR on a preview)
+//   repo merge   → merge_repo_change (merge its open PR, as a squash)
 //   repo revise  → revise_repo_change (ask for more on a preview, before the PR)
 //   repo say     → send_repo_change_message (steer a build while its agent works)
 //   repo repos   → list_github_app_repos  repo branches → list_repo_branches
@@ -220,6 +221,7 @@ const ARGS = {
 	},
 	cancel_repo_change: { run_id: { positional: 0, required: true, label: "run-id" } },
 	publish_repo_change: { run_id: { positional: 0, required: true, label: "run-id" } },
+	merge_repo_change: { run_id: { positional: 0, required: true, label: "run-id" } },
 	revise_repo_change: {
 		run_id: { positional: 0, required: true, label: "run-id" },
 		instructions: { value: (flags) => readTextInput(flags, "instructions", "instructions-file") },
@@ -277,6 +279,7 @@ function describe(run) {
 		lines.push(`  Ask for more: letterstory repo revise ${run.id} --instructions "…"`);
 	}
 	if (run.prUrl) lines.push(`  PR: ${run.prUrl} (${run.prState ?? "state unknown"})`);
+	if (run.prState === "open") lines.push(`  Merge: letterstory repo merge ${run.id}`);
 	if (run.errorCode) lines.push(`  Error (${run.errorCode}): ${run.errorDetail ?? ""}`);
 	if (run.summary) lines.push(...run.summary.split("\n").map((l) => `  ${l}`));
 	return lines.join("\n");
@@ -316,6 +319,8 @@ export async function cmdRepo(ctx) {
 			return repoCancel(rest);
 		case "publish":
 			return repoPublish(rest);
+		case "merge":
+			return repoMerge(rest);
 		case "revise":
 			return repoRevise(rest);
 		case "say":
@@ -336,7 +341,7 @@ export async function cmdRepo(ctx) {
 			return repoSlackTest(rest);
 		default:
 			throw new CliError(
-				`Unknown repo subcommand: ${sub ?? "(none)"}. Try: start, fix-audit, install-letterprove, install-visitors, sites, set-site, reset-site, secrets, set-secret, delete-secret, status, list, publish, revise, say, cancel, repos, branches, prs, settings, suggestions, slack-targets, slack-test`
+				`Unknown repo subcommand: ${sub ?? "(none)"}. Try: start, fix-audit, install-letterprove, install-visitors, sites, set-site, reset-site, secrets, set-secret, delete-secret, status, list, publish, merge, revise, say, cancel, repos, branches, prs, settings, suggestions, slack-targets, slack-test`
 			);
 	}
 }
@@ -660,6 +665,18 @@ async function repoPublish(ctx) {
 	return 0;
 }
 
+/** `repo merge <run-id>`: merge its open pull request, as a squash; the repo's branch rules decide. */
+async function repoMerge(ctx) {
+	const { client, flags, io } = ctx;
+	const result = await client.callTool(
+		"merge_repo_change",
+		argsFromFlags(ARGS.merge_repo_change, flags, ctx.positionals)
+	);
+	ok(ctx, result.message);
+	printResult(io, flags, result.run, describe);
+	return 0;
+}
+
 /** `repo say <run-id> <message…>` (or --message): steer a build while its agent works. */
 async function repoSay(ctx) {
 	const { client, flags, io } = ctx;

package/package.json

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