@letterstory/cli 0.177.22 → 0.177.24

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.22";
+export const VERSION = "0.177.24";
 
 /** 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([
+	// org mcp add: the server signs in with OAuth instead of a header value.
+	"sign-in",
 	// collection onboard: connect without drafting or scheduling.
 	"connect-only",
 	// admin demo ideas: every live recipe, not only the Ideas that fit.
@@ -106,6 +108,8 @@ export const BOOLEAN_FLAGS = new Set([
 	"pull-requests",
 	"make-orgs",
 	"no-refit",
+	// admin demo sweep --new-org: one fresh test org for exactly the picks.
+	"new-org",
 	// build --check: read every gate a start meets and start nothing.
 	"check",
 	// admin invariants: press every startable row as a check too.
@@ -1226,11 +1230,12 @@ Admin (STAFF key — --staff-key / LETTERSTORY_STAFF_API_KEY; acts before an org
   admin demo ideas <org-id> [--library] [--preview] [--force] | --status [--id <run>]
                                                        Start every Idea on a demo org for real (pull requests, or
                                                        previews), or read how the latest run went.
-  admin demo sweep [--prepare] [--pull-requests] [--recipes a,b] [--variation <n|name>] [--orgs a,b] [--exclude a,b] [--buy a,b] [--make-orgs] [--no-refit] | --status [--id <sweep>] | --reset <recipe> [--id <sweep>]
+  admin demo sweep [--prepare] [--pull-requests] [--recipes a,b] [--variation <n|name>] [--pick <recipe>[:<variation>]]... [--new-org] [--orgs a,b] [--exclude a,b] [--buy a,b] [--make-orgs] [--no-refit] | --status [--id <sweep>] | --reset <recipe> [--id <sweep>]
                                                        Every live recipe end to end: each gets a test org whose Ideas
                                                        offers it, its Start pressed (or, with --prepare, left for you
                                                        to press in the app), and its outcome judged, with who owns a
-                                                       failure. Exits 1 when the sweep failed.
+                                                       failure. --new-org --pick a --pick b:2 makes one fresh test org
+                                                       for exactly those recipes. Exits 1 when the sweep failed.
   admin brand-detection <org-id> [--term <t>]... [--exact <t>]... [--exclude <phrase>]... [--note "…"] | --clear [--note "…"]
                                                        How a client's brand is detected in AI answers, with
                                                        every earlier setting; with flags, set the exact set

package/lib/commands/admin.mjs

@@ -7007,7 +7007,7 @@ const DEMO_ITEM_FLAGS = [
 	"setup",
 ];
 const DEMO_USAGE =
-	"Usage: admin demo guide | list [--enrollable] | show <org-id> [--moves] | set <org-id> [--enroll] [--unenroll] [--file <state.json>] [--phantom parked|shown] [--main-blog …] [--visitors …] [--probes not_run|shown] [--cms hidden|shown] [--publish-target …] [--search-console …] [--github …] [--domain …] [--setup fresh|finished] [--domain-cap n] [--inject <key>]... [--hide <key>]... [--save-as <name>] [--baseline <owner/repo>[@sha] | --clear-baseline] [--copy-from <org-id> [--copy-scenarios a,b] [--overwrite]] [--auto-reset <scenario>|off] [--every <minutes>] [--release] | domains | new <domain> [--name <n>] [--brief <t>] [--full] [--host vercel|pages] [--no-wait] | teardown <org-id> [--keep-repo] | bootstrap <org-id>... --from <org-id> [--scenarios a,b] [--overwrite] | reset <org-id> <scenario> [--clean-slate] [--close-prs since_applied|all_open|none] [--hold <minutes>] [--restore-repo revert|force] [--rebuild] [--reread-company] [--forget-company] [--forget-site] | check <org-id> | ideas <org-id> [--library] [--preview] [--force] | ideas <org-id> --status [--id <run-id>] | sweep [--prepare] [--pull-requests] [--recipes <id>,…] [--variation <n|name>] [--orgs <id>,…] [--exclude <id>,…] [--buy <recipe-id>,…] [--make-orgs] [--no-refit] | sweep --status [--id <sweep-id>] | sweep --reset <recipe-id> [--id <sweep-id>]";
+	"Usage: admin demo guide | list [--enrollable] | show <org-id> [--moves] | set <org-id> [--enroll] [--unenroll] [--file <state.json>] [--phantom parked|shown] [--main-blog …] [--visitors …] [--probes not_run|shown] [--cms hidden|shown] [--publish-target …] [--search-console …] [--github …] [--domain …] [--setup fresh|finished] [--domain-cap n] [--inject <key>]... [--hide <key>]... [--save-as <name>] [--baseline <owner/repo>[@sha] | --clear-baseline] [--copy-from <org-id> [--copy-scenarios a,b] [--overwrite]] [--auto-reset <scenario>|off] [--every <minutes>] [--release] | domains | new <domain> [--name <n>] [--brief <t>] [--full] [--host vercel|pages] [--no-wait] | teardown <org-id> [--keep-repo] | bootstrap <org-id>... --from <org-id> [--scenarios a,b] [--overwrite] | reset <org-id> <scenario> [--clean-slate] [--close-prs since_applied|all_open|none] [--hold <minutes>] [--restore-repo revert|force] [--rebuild] [--reread-company] [--forget-company] [--forget-site] | check <org-id> | ideas <org-id> [--library] [--preview] [--force] | ideas <org-id> --status [--id <run-id>] | sweep [--prepare] [--pull-requests] [--recipes <id>,…] [--variation <n|name>] [--pick <recipe>[:<variation>]]... [--new-org] [--orgs <id>,…] [--exclude <id>,…] [--buy <recipe-id>,…] [--make-orgs] [--no-refit] | sweep --status [--id <sweep-id>] | sweep --reset <recipe-id> [--id <sweep-id>]";
 
 const readinessLines = (r) =>
 	r
@@ -7044,12 +7044,32 @@ const SWEEP_MARK = {
 	pending: "…",
 };
 
+/** A variation flag: a number is its place (1 is the recipe itself); anything else its name. */
+const variationFlag = (v) => (v ? (/^\d+$/.test(v) ? Number(v) : v) : undefined);
+
+/** `--pick <recipe>[:<variation>]`: a recipe in its variation (the first colon splits; a name may hold more). */
+const pickFlag = (v) => {
+	const at = v.indexOf(":");
+	return at < 0
+		? { recipe: v.trim() }
+		: compact({ recipe: v.slice(0, at).trim(), variation: variationFlag(v.slice(at + 1).trim()) });
+};
+
+/** A new test org's stages (get_recipe_sweep `new_org`). */
+const NEW_ORG_STAGE = { site: "site written", connected: "connected", setup: "setup done", fit: "fit decided" };
+
 /** A recipe sweep's report (get_recipe_sweep), one block per recipe. */
 const recipeSweepLines = (sweep, appUrl) =>
 	sweep
 		? [
 				`${sweep.summary}  (${sweep.state}${sweep.note && sweep.state !== "done" ? `: ${sweep.note}` : ""})`,
 				`${sweep.start ? "started by the sweep" : "prepared for you to start"}, ${sweep.delivery === "build" ? "previews" : "pull requests"}, by ${sweep.started_by_name ?? "staff"} at ${sweep.created_at}  sweep ${sweep.id}`,
+				...(sweep.new_org
+					? [
+							`new test org: ${sweep.new_org.name ?? sweep.new_org.domain ?? "being made"}  ${sweep.new_org.status === "done" ? "ready" : `${sweep.new_org.status}: ${NEW_ORG_STAGE[sweep.new_org.current] ?? sweep.new_org.current}`}${sweep.new_org.note ? ` (${sweep.new_org.note})` : ""}`,
+							sweep.new_org.ideas ? `  open org: ${appUrl}${sweep.new_org.ideas}` : null,
+						].filter(Boolean)
+					: []),
 				...sweep.items.map((i) =>
 					[
 						`\n${(SWEEP_MARK[i.result] ?? i.result).padEnd(10)} ${i.name}${i.variation ? ` (variation ${i.variation}: ${i.variation_name ?? ""})` : ""}`,
@@ -7320,18 +7340,6 @@ async function cmdAdminDemo(ctx) {
 			const orgId = requirePositional(positionals, 1, "org-id");
 			const path = `${DEMO}/${encodeURIComponent(orgId)}/ideas`;
 			const id = flagStr(flags.id);
-			// The retest loop: one recipe brought back on its test org (reset_recipe_sweep_item).
-			if (flagStr(flags.reset)) {
-				const reset = await staffPost(ctx, `${path}/reset`, compact({ id, recipe_id: flagStr(flags.reset) }));
-				printResult(io, flags, reset, (r) =>
-					[
-						...r.reset.undone.map((u) => `undone: ${u}`),
-						...r.reset.kept.map((k) => `kept: ${k}`),
-						recipeSweepLines(r.sweep, ctx.client.url),
-					].join("\n")
-				);
-				return 0;
-			}
 			const result =
 				flagBool(flags.status) || id
 					? await staffRequest(ctx, "GET", id ? `${path}?id=${encodeURIComponent(id)}` : path)
@@ -7351,6 +7359,18 @@ async function cmdAdminDemo(ctx) {
 			// Every live recipe end to end on test orgs (run_recipe_sweep), or the latest sweep's report (get_recipe_sweep).
 			const path = `${DEMO}/sweeps`;
 			const id = flagStr(flags.id);
+			// The retest loop: one recipe brought back on its test org (reset_recipe_sweep_item).
+			if (flagStr(flags.reset)) {
+				const reset = await staffPost(ctx, `${path}/reset`, compact({ id, recipe_id: flagStr(flags.reset) }));
+				printResult(io, flags, reset, (r) =>
+					[
+						...r.reset.undone.map((u) => `undone: ${u}`),
+						...r.reset.kept.map((k) => `kept: ${k}`),
+						recipeSweepLines(r.sweep, ctx.client.url),
+					].join("\n")
+				);
+				return 0;
+			}
 			const result =
 				flagBool(flags.status) || id
 					? await staffRequest(ctx, "GET", id ? `${path}?id=${encodeURIComponent(id)}` : path)
@@ -7360,16 +7380,14 @@ async function cmdAdminDemo(ctx) {
 							compact({
 								start: flagBool(flags.prepare) ? false : undefined,
 								delivery: flagBool(flags["pull-requests"]) ? "build_pr" : undefined,
-								recipes: flags.recipes ? flagList(flags.recipes) : undefined,
-								// A number is the variation's place (1 is the recipe itself); anything else its name.
-								variation: flagStr(flags.variation)
-									? /^\d+$/.test(flagStr(flags.variation))
-										? Number(flagStr(flags.variation))
-										: flagStr(flags.variation)
-									: undefined,
-								orgs: flags.orgs ? flagList(flags.orgs) : undefined,
-								exclude: flags.exclude ? flagList(flags.exclude) : undefined,
-								purchases: flags.buy ? flagList(flags.buy) : undefined,
+								recipes: flags.recipes ? flagCsv(flags.recipes) : undefined,
+								variation: variationFlag(flagStr(flags.variation)),
+								// --pick <recipe>[:<variation>], repeatable: each recipe in its variation.
+								picks: flags.pick ? flagList(flags.pick).map(pickFlag) : undefined,
+								new_org: flagBool(flags["new-org"]) || undefined,
+								orgs: flags.orgs ? flagCsv(flags.orgs) : undefined,
+								exclude: flags.exclude ? flagCsv(flags.exclude) : undefined,
+								purchases: flags.buy ? flagCsv(flags.buy) : undefined,
 								make_orgs: flagBool(flags["make-orgs"]) || undefined,
 								refit: flagBool(flags["no-refit"]) ? false : undefined,
 							})

package/lib/commands/org.mjs

@@ -58,6 +58,27 @@ export const ARGS = {
 		project_id: { value: (flags) => (flags.project === "none" ? null : flagStr(flags.project)) },
 	},
 	disconnect_linear: {},
+	list_mcp_connections: {},
+	connect_mcp: {
+		name: { positional: 0, label: "name", required: true },
+		url: { positional: 1, label: "url", required: true },
+		token: { flag: "token" },
+		header_name: { flag: "header" },
+		allow_tools: { flag: "allow", type: "list" },
+		sign_in: { flag: "sign-in", type: "bool" },
+	},
+	test_mcp_connection: { name: { positional: 0, label: "name", required: true } },
+	update_mcp_connection: {
+		name: { positional: 0, label: "name", required: true },
+		enabled: { value: (flags) => (flags.off ? false : flags.on ? true : undefined) },
+		allow_tools: {
+			value: (flags) => (flags.allow === "none" ? [] : flags.allow ? flagStr(flags.allow).split(",") : undefined),
+		},
+		token: { value: (flags) => (flags.clear ? null : flagStr(flags.token)) },
+		header_name: { flag: "header" },
+		sign_in: { flag: "sign-in", type: "bool" },
+	},
+	remove_mcp_connection: { name: { positional: 0, label: "name", required: true } },
 	connect_org_config_source: {
 		repo: { positional: 0, label: "owner/name" },
 		branch: { flag: "branch" },
@@ -91,11 +112,13 @@ export async function cmdOrg(ctx) {
 			return orgFields(rest);
 		case "linear":
 			return orgLinear(rest);
+		case "mcp":
+			return orgMcp(rest);
 		case "billing":
 			return orgBilling(rest);
 		default:
 			throw new CliError(
-				`Unknown org subcommand: ${sub ?? "(none)"}. Try: export, join, diff, apply, git, integrations, linear, fields, billing`
+				`Unknown org subcommand: ${sub ?? "(none)"}. Try: export, join, diff, apply, git, integrations, linear, mcp, fields, billing`
 			);
 	}
 }
@@ -454,6 +477,105 @@ async function orgLinear(ctx) {
 	}
 }
 
+/**
+ * `org mcp` — other products' MCP servers Letter's agent can call (docs/architecture/mcp-connections.md):
+ *   org mcp                                              the connections (list_mcp_connections)
+ *   org mcp add <name> <url> [--token <value> [--header <name>] | --sign-in] [--allow a,b]   (connect_mcp)
+ *   org mcp signin <name>                                sign in again with OAuth (update_mcp_connection)
+ *   org mcp tools <name>                                 read the server's tools again (test_mcp_connection)
+ *   org mcp allow <name> <a,b|none>                      the tools that change things the agent may call (update_mcp_connection)
+ *   org mcp on|off <name>                                (update_mcp_connection)
+ *   org mcp token <name> <value>|--clear                 a new header value (update_mcp_connection)
+ *   org mcp remove <name>                                (remove_mcp_connection)
+ */
+async function orgMcp(ctx) {
+	const { client, flags, io } = ctx;
+	const sub = ctx.positionals[0] ?? "list";
+	const rest = ctx.positionals.slice(1);
+	const call = async (tool, allowed, args) => {
+		refuseUnknownFlags(ctx, {}, allowed);
+		const result = await client.callTool(tool, args ?? argsFromFlags(ARGS[tool], flags, rest));
+		ok(ctx, result.message);
+		return result;
+	};
+	const tools = (r) =>
+		r.tools
+			.map((t) => `${t.allowed ? "●" : "○"} ${t.name}${t.read_only ? "  (reads only)" : ""}  ${t.description}`)
+			.join("\n");
+	switch (sub) {
+		case "list": {
+			const result = await call("list_mcp_connections", []);
+			printResult(
+				io,
+				flags,
+				result,
+				(r) =>
+					r.connections
+						.map(
+							(c) =>
+								`${c.enabled ? "●" : "○"} ${c.name}  ${c.url}  ${c.tool_count ?? "?"} tools${c.last_status === "failed" ? `  (failed: ${c.last_error})` : ""}`
+						)
+						.join("\n") || r.message
+			);
+			return 0;
+		}
+		case "add": {
+			const result = await call("connect_mcp", ["token", "header", "allow", "sign-in"]);
+			printResult(io, flags, result, (r) =>
+				r.sign_in_url ? `${r.message}\n${r.sign_in_url}` : `${r.message}\n${tools(r)}`
+			);
+			return 0;
+		}
+		case "signin": {
+			const result = await call("update_mcp_connection", [], {
+				name: requirePositional(rest, 0, "name"),
+				sign_in: true,
+			});
+			printResult(io, flags, result, (r) => `${r.message}\n${r.sign_in_url}`);
+			return 0;
+		}
+		case "tools": {
+			const result = await call("test_mcp_connection", []);
+			printResult(io, flags, result, tools);
+			return 0;
+		}
+		case "allow": {
+			const list = requirePositional(rest, 1, "a,b|none");
+			const result = await call("update_mcp_connection", [], {
+				name: requirePositional(rest, 0, "name"),
+				allow_tools: list === "none" ? [] : list.split(","),
+			});
+			printResult(io, flags, result, tools);
+			return 0;
+		}
+		case "on":
+		case "off": {
+			const result = await call("update_mcp_connection", [], {
+				name: requirePositional(rest, 0, "name"),
+				enabled: sub === "on",
+			});
+			printResult(io, flags, result, (r) => r.message);
+			return 0;
+		}
+		case "token": {
+			const name = requirePositional(rest, 0, "name");
+			const value = flags.clear ? null : requirePositional(rest, 1, "value");
+			const result = await call("update_mcp_connection", ["clear"], { name, token: value });
+			printResult(io, flags, result, (r) => r.message);
+			return 0;
+		}
+		case "remove": {
+			const result = await call("remove_mcp_connection", []);
+			printResult(io, flags, result, (r) => r.message);
+			return 0;
+		}
+		default:
+			throw new CliError(
+				`Unknown org mcp subcommand: ${sub}. Try: add, signin, tools, allow, on, off, token, remove`
+			);
+	}
+}
+
 const ROOT_FILE = "organization.json";
 
 function slug(name) {

package/package.json

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