@letterstory/cli 0.14.0 → 0.15.1

package/README.md

@@ -247,10 +247,15 @@ letterstory phantom-onboard domain --sitemap https://acme.com/sitemap.xml --seer
 letterstory phantom-onboard domain --attach <job-id> --watch     # watch a job started elsewhere
 letterstory phantom-onboard domain --status                      # the org's latest domain onboarding
 
-# Staff: create the org itself first (the key exchange), with a STAFF key.
-LETTERSTORY_STAFF_API_KEY=<staff key with org:create> \
-  letterstory admin create-org --domain acme.com --onboard --about "payroll for platform teams"
-# → prints the org id, a fresh ORG-scoped API key (once), and the job id to watch.
+# Staff: the key exchange (create the org first) needs a STAFF key with org:create —
+# mint your OWN, don't share one. --watch makes the whole recipe ONE command: the
+# freshly-minted org key is used only in this process's memory to poll to completion.
+LETTERSTORY_STAFF_API_KEY=<your staff key with org:create> \
+  letterstory admin create-org --domain acme.com --onboard --watch --about "payroll for platform teams"
+
+# Without --watch, it prints the org id, a fresh ORG-scoped API key (once), and the job
+# id — watch it yourself with:
+#   LETTERSTORY_API_KEY=<the printed key> letterstory phantom-onboard domain --attach <job-id> --watch
 ```
 
 Everything the parent job does is also its own tool for existing orgs:

package/lib/cli.mjs

@@ -41,7 +41,7 @@ import {
 } from "./commands.mjs";
 
 // Keep in sync with cli/package.json.
-export const VERSION = "0.14.0";
+export const VERSION = "0.15.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.
@@ -341,12 +341,17 @@ Domain onboarding (ONE SHOT: a bare domain in, a fully-configured organization o
 
 Admin (STAFF key — --staff-key / LETTERSTORY_STAFF_API_KEY; acts before an org exists):
   admin create-org --domain <bare-domain> [--name "Acme"] [--test] [--no-key]
-          [--key-name N] [--capabilities a,b] [--onboard] [+ the onboard domain flags]
+          [--key-name N] [--capabilities a,b] [--onboard] [--watch] [+ the onboard domain flags]
                                                        The key exchange: create the client org from
                                                        its domain (one org per domain), mint an
                                                        ORG-scoped API key and print it ONCE. With
                                                        --onboard the domain onboarding starts in the
-                                                       same call; watch it with the printed key.
+                                                       same call; add --watch to poll it to
+                                                       completion in this same command — the org key
+                                                       is used only in memory for the poll, never
+                                                       written to disk or printed twice — a bare
+                                                       domain in, a fully-configured org out, one
+                                                       command.
 
 Seers (event-driven signals -> drafts):
   seers list                                           List seers with recent activity

package/lib/commands/admin.mjs

@@ -6,19 +6,23 @@
 //   admin create-org --domain acme.com [--name "Acme"] [--test] [--no-key] [--key-name N]
 //                    [--capabilities a,b] [--onboard] [--about "…"] [--sitemap <url>]
 //                    [--cms <provider>] [--posts N] [--seers suggest|skip] [--no-visuals]
-//                    [--no-enhance] [--readiness-minutes N]
+//                    [--no-enhance] [--readiness-minutes N] [--watch]
 //
 // The KEY EXCHANGE: create the client org from its domain (one org per domain; an existing
 // owner is adopted), mint an ORG-scoped API key for it and print the plaintext ONCE. With
 // --onboard, the one-shot domain onboarding (main blog + org visuals + enhance + phantom +
-// seers) starts in the same call; watch it afterwards with
+// seers) starts in the same call. --onboard --watch makes the whole recipe ONE command: the
+// freshly-minted org key is used ONLY in this process's memory (never written to disk, never
+// re-printed) to poll the job to completion, reusing the exact same loop
+// `phantom-onboard domain --watch` uses. Without --watch, watch it afterwards with
 //   LETTERSTORY_API_KEY=<printed key> letterstory phantom-onboard domain --watch --attach <job-id>
 //
 // The staff key comes from --staff-key or LETTERSTORY_STAFF_API_KEY; the base URL from the
 // usual --url / LETTERSTORY_API_URL / config resolution.
 
-import { CliError } from "../client.mjs";
+import { CliError, LetterstoryClient } from "../client.mjs";
 import { flagStr, flagNum, flagBool, flagList, printResult, compact, ok } from "./shared.mjs";
+import { watchDomainJob } from "./onboard.mjs";
 
 const SEER_MODES = ["suggest", "skip"];
 const CMS_PROVIDERS = ["webflow", "framer", "sanity", "contentful"];
@@ -107,10 +111,18 @@ function formatCreateOrg(r) {
 }
 
 async function cmdAdminCreateOrg(ctx) {
-	const { flags, io } = ctx;
+	const { flags, io, client } = ctx;
 	const domain = flagStr(flags.domain);
 	if (!domain) throw new CliError("admin create-org requires --domain <bare-domain>.");
 
+	const watch = flagBool(flags.watch);
+	if (watch && !flagBool(flags.onboard)) {
+		throw new CliError("--watch needs --onboard (nothing to watch without a job).");
+	}
+	if (watch && flagBool(flags["no-key"])) {
+		throw new CliError("--watch needs an org key to poll with — drop --no-key.");
+	}
+
 	// --capabilities a,b or repeated --capabilities a --capabilities b.
 	const capabilities = flagList(flags.capabilities)
 		.flatMap((v) => v.split(","))
@@ -135,8 +147,34 @@ async function cmdAdminCreateOrg(ctx) {
 
 	ok(ctx, `Provisioning ${domain}…`);
 	const result = await staffPost(ctx, "/api/superadmin/orgs", body);
-	printResult(io, flags, result, formatCreateOrg);
-	return 0;
+
+	if (!watch) {
+		printResult(io, flags, result, formatCreateOrg);
+		return 0;
+	}
+
+	// --watch: everything spins up from this one command. The org key exists ONLY in this
+	// process's memory for the rest of the run — never written to disk, never printed again
+	// after the summary above — and is used to build a second, throwaway MCP client that
+	// polls the SAME loop `phantom-onboard domain --watch` uses. `ok(...)` here (not
+	// printResult) so the key/warning above are still shown before the poll starts.
+	ok(ctx, formatCreateOrg(result));
+	if (!result.job_id) {
+		ok(ctx, "No job to watch (the org call didn't start one — see the error above, if any).");
+		return 0;
+	}
+	if (!result.api_key?.plain_key) {
+		throw new CliError("No org key came back to watch with (did --no-key sneak in?).");
+	}
+	const orgClient = new LetterstoryClient({
+		url: client.url,
+		key: result.api_key.plain_key,
+		fetchImpl: client.fetch,
+		verbose: client.verbose,
+		verboseLog: client.verboseLog,
+		bin: ctx.bin,
+	});
+	return watchDomainJob({ ...ctx, client: orgClient }, result.job_id);
 }
 
 export async function cmdAdmin(ctx) {

package/lib/commands/deploy.mjs

@@ -275,7 +275,9 @@ async function deployList(ctx) {
 		return 0;
 	}
 	for (const d of items) {
-		io.log(`${d.status.padEnd(13)} ${d.deployment_id}  ${d.name}${d.url ? `  ${d.url}` : ""}`);
+		io.log(
+			`${d.status.padEnd(13)} ${d.deployment_id}  collection:${d.collection_id ?? "(none)"}  ${d.name}${d.url ? `  ${d.url}` : ""}`
+		);
 	}
 	return 0;
 }

package/lib/commands/onboard.mjs

@@ -228,7 +228,7 @@ const SEER_MODES = ["suggest", "skip"];
 const CMS_PROVIDERS = ["webflow", "framer", "sanity", "contentful"];
 
 // Final readback of a domain-onboarding job — the counts the engine PERSISTED.
-function formatDomainStatus(s) {
+export function formatDomainStatus(s) {
 	const r = s.result ?? {};
 	const lines = [
 		`Domain onboarding ${s.status} at stage "${s.stage}" (${s.domain})`,
@@ -264,7 +264,9 @@ function formatDomainStatus(s) {
 	return lines.join("\n");
 }
 
-async function watchDomainJob(ctx, jobId) {
+// Exported so `admin create-org --onboard --watch` can drive the SAME poll loop against a
+// freshly-minted org key, instead of duplicating it — see admin.mjs.
+export async function watchDomainJob(ctx, jobId) {
 	const { client, flags } = ctx;
 	let printed = 0;
 	let lastStage = null;

package/package.json

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