primitive-admin 1.1.0-alpha.9 → 1.1.0

package/dist/src/lib/resolve-init-server.js

@@ -0,0 +1,77 @@
+/**
+ * Pure resolution of the target server for `primitive init`.
+ *
+ * Background (issue #2376): the init-config TOML documents a `server` key, but
+ * `init` only ever read the `-s/--server` flag and the current credentials. A
+ * config that named a different server was silently ignored — the app was
+ * created on the CLI's current server and the scaffolded `primitive.json` got
+ * that URL too.
+ *
+ * Precedence (highest first):
+ *   (a) `-s/--server` flag
+ *   (b) init-config `server` key
+ *   (c) the server the CLI is currently logged into
+ *   (d) `DEFAULT_SERVER_URL`
+ *
+ * Case (c) has one interactive twist: when the current server is not the
+ * default and the run is interactive (no flag, no config, TTY stdin), init
+ * asks which server to use. The prompt is TTY- and config-guarded here so a
+ * piped/CI stdin can never trigger the `@inquirer/prompts` closed-stdin crash
+ * (same hazard hardened in #972/#999).
+ *
+ * Extracting the decision into a pure function with an injectable prompt
+ * mirrors `resolve-platform.ts`, which the same command already uses, and makes
+ * the precedence contract unit-testable without a network or a terminal.
+ */
+import { normalizeServerUrl } from "./channel.js";
+/**
+ * Canonical form used for both comparison and the value written into the
+ * scaffold: `channel.ts`'s `normalizeServerUrl` (shared with the
+ * branch-as-channel detection) strips trailing slashes so `https://host/` and
+ * `https://host` compare equal and `${serverUrl}${path}` never doubles up.
+ * Unparseable values are left as-is — `validateServerUrl` (now the shared
+ * validator in `server-url.ts`) rejects them before they reach here.
+ */
+function canonicalize(url) {
+    const trimmed = url.trim();
+    return normalizeServerUrl(trimmed) ?? trimmed;
+}
+/**
+ * Resolve the server `primitive init` should target, per the precedence above.
+ */
+export async function resolveInitServer(options) {
+    const currentServer = options.currentServer
+        ? canonicalize(options.currentServer)
+        : undefined;
+    const defaultServer = canonicalize(options.defaultServer);
+    const changedFrom = (serverUrl) => !!currentServer && currentServer !== serverUrl;
+    // (a)/(b) An explicitly requested server wins; the flag beats the config.
+    const explicit = options.flagServer ?? options.configServer;
+    if (explicit !== undefined) {
+        const serverUrl = canonicalize(explicit);
+        return {
+            serverUrl,
+            source: options.flagServer !== undefined ? "flag" : "config",
+            serverChanged: changedFrom(serverUrl),
+        };
+    }
+    // (c) Interactive runs on a non-default server ask where to create the app.
+    if (currentServer &&
+        currentServer !== defaultServer &&
+        !options.hasConfig &&
+        options.isTTY) {
+        const serverUrl = canonicalize(await options.promptFn());
+        return {
+            serverUrl,
+            source: "prompt",
+            serverChanged: changedFrom(serverUrl),
+        };
+    }
+    // (c)/(d) Stay on the current server, or fall back to the default.
+    return {
+        serverUrl: currentServer || defaultServer,
+        source: currentServer ? "current" : "default",
+        serverChanged: false,
+    };
+}
+//# sourceMappingURL=resolve-init-server.js.map

package/dist/src/lib/resolve-init-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-init-server.js","sourceRoot":"","sources":["../../../src/lib/resolve-init-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AA8ClD;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,OAAO,kBAAkB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAiC;IAEjC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa;QACzC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC;QACrC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAW,EAAE,CACjD,CAAC,CAAC,aAAa,IAAI,aAAa,KAAK,SAAS,CAAC;IAEjD,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC;IAC5D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO;YACL,SAAS;YACT,MAAM,EAAE,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;YAC5D,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC;SACtC,CAAC;IACJ,CAAC;IAED,4EAA4E;IAC5E,IACE,aAAa;QACb,aAAa,KAAK,aAAa;QAC/B,CAAC,OAAO,CAAC,SAAS;QAClB,OAAO,CAAC,KAAK,EACb,CAAC;QACD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzD,OAAO;YACL,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC;SACtC,CAAC;IACJ,CAAC;IAED,mEAAmE;IACnE,OAAO;QACL,SAAS,EAAE,aAAa,IAAI,aAAa;QACzC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAC7C,aAAa,EAAE,KAAK;KACrB,CAAC;AACJ,CAAC"}

package/dist/src/lib/resolve-owner.d.ts

@@ -0,0 +1,19 @@
+/**
+ * One email → userId resolution for every `--owner` flag the CLI carries.
+ *
+ * It lived inside `commands/documents.ts` from #2763 until #3641 gave
+ * `collections create` the same flag. Two copies of a lookup would be two
+ * chances to reintroduce the failure #2763 removed — the old admin-only list
+ * wrapper flattened every error, including a 403, into "no such user" — so it
+ * moved here whole rather than being written a second time.
+ */
+import { ApiClient } from "./api-client.js";
+/**
+ * Resolve a `--owner` value to a userId. A value containing "@" is looked up
+ * by exact email through the member-accessible `users/lookup` endpoint
+ * (issue #2763); anything else is already a user id and is passed through.
+ * Failures throw with the server's own message — a permission problem must
+ * not read as "no such user", which is how the old admin-only lookup
+ * reported it.
+ */
+export declare function resolveOwnerUserId(client: ApiClient, appId: string, owner: string): Promise<string>;

package/dist/src/lib/resolve-owner.js

@@ -0,0 +1,20 @@
+import { info } from "./output.js";
+/**
+ * Resolve a `--owner` value to a userId. A value containing "@" is looked up
+ * by exact email through the member-accessible `users/lookup` endpoint
+ * (issue #2763); anything else is already a user id and is passed through.
+ * Failures throw with the server's own message — a permission problem must
+ * not read as "no such user", which is how the old admin-only lookup
+ * reported it.
+ */
+export async function resolveOwnerUserId(client, appId, owner) {
+    if (!owner.includes("@"))
+        return owner;
+    const lookup = await client.lookupUserByEmail(appId, owner);
+    if (!lookup?.exists || !lookup.user) {
+        throw new Error(`No app user found with email "${owner}" in app ${appId}.`);
+    }
+    info(`Resolved owner email to userId: ${lookup.user.userId}`);
+    return lookup.user.userId;
+}
+//# sourceMappingURL=resolve-owner.js.map

package/dist/src/lib/resolve-owner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-owner.js","sourceRoot":"","sources":["../../../src/lib/resolve-owner.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAiB,EACjB,KAAa,EACb,KAAa;IAEb,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,YAAY,KAAK,GAAG,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC,mCAAmC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;AAC5B,CAAC"}

package/dist/src/lib/resolve-platform.d.ts

@@ -0,0 +1,74 @@
+/**
+ * Pure resolution of the target platforms for `primitive init`.
+ *
+ * Background (issue #1009): `primitive init` must become platform-aware. The
+ * commander `-p, --platform` option no longer carries a `"web"` default, so an
+ * omitted flag is `undefined` and distinguishable from an explicit
+ * `--platform web`. Resolution follows a 4-case interactivity contract:
+ *
+ *   (a) explicit `--platform` flag set        -> use it (never prompt)
+ *   (b) init-config TOML present (configPlatform may be set) -> use config
+ *       value, else fall back to "web" (never prompt)
+ *   (c) interactive TTY, no flag, no config    -> prompt with `checkbox`
+ *   (d) non-TTY, no flag, no config            -> fall back to "web" WITHOUT
+ *       hanging and WITHOUT the `ERR_USE_AFTER_CLOSE` crash that
+ *       `@inquirer/prompts` throws on a closed/piped stdin (same hazard family
+ *       hardened in #972/#999 — see `confirm-prompt.ts`).
+ *
+ * Issue #2890 makes the resolved value a LIST: one Primitive app can have a web
+ * client and a native client, and `primitive init my-app --platform web,ios`
+ * scaffolds both into one repository. A single platform is just a list of one,
+ * so the contract above is unchanged — and the interactive case is a
+ * multi-select rather than a single-select.
+ *
+ * Extracting the decision into a pure function (with injectable `isTTY` /
+ * `promptFn`, mirroring `confirm-prompt.ts`) makes the otherwise
+ * terminal-dependent interactivity contract unit-testable.
+ */
+export type Platform = "web" | "ios";
+/**
+ * Every platform `--platform` accepts, in the order a run processes them: the
+ * web client is configured first (it owns the dev-port step). Parsing
+ * normalizes to this order, so `--platform ios,web` and `--platform web,ios`
+ * scaffold the same repository.
+ */
+export declare const SUPPORTED_PLATFORMS: readonly ["web", "ios"];
+/** Prompt thunk returning the chosen platforms. Injectable for testing. */
+export type PlatformPromptFn = () => Promise<Platform[]>;
+export interface ParsePlatformsResult {
+    /** Whether the value named a valid, duplicate-free, non-empty platform set. */
+    ok: boolean;
+    /** The validated platforms in canonical order; empty when `ok` is false. */
+    platforms: Platform[];
+    /** A user-facing message naming the supported set; set when `ok` is false. */
+    error?: string;
+}
+/**
+ * Parses a `--platform` flag value (`"web"`, `"web,ios"`) or an init-config
+ * `platform` key (a string or a TOML array) into a validated platform list.
+ *
+ * Returns a result rather than throwing so `validateInitConfig` can collect the
+ * message alongside its other errors and the flag path can print it and exit.
+ */
+export declare function parsePlatformList(raw: string | readonly string[]): ParsePlatformsResult;
+export interface ResolvePlatformsOptions {
+    /** Parsed `--platform` flag, or `undefined` when omitted. */
+    flag?: Platform[];
+    /** Parsed `platform` key from a loaded `.primitive-init.toml`, if any. */
+    configPlatform?: Platform[];
+    /**
+     * Whether a non-interactive init-config file is in effect. When `true`, the
+     * prompt is skipped entirely (case b) regardless of TTY.
+     */
+    hasConfig: boolean;
+    /** Whether stdin is an interactive TTY. Inject `false` to exercise case (d). */
+    isTTY: boolean;
+    /** Prompt function used only in the interactive case (c). */
+    promptFn: PlatformPromptFn;
+}
+/**
+ * Resolve the target platforms per the 4-case interactivity contract above.
+ *
+ * @returns a non-empty list of platforms to scaffold.
+ */
+export declare function resolvePlatforms(options: ResolvePlatformsOptions): Promise<Platform[]>;

package/dist/src/lib/resolve-platform.js

@@ -0,0 +1,105 @@
+/**
+ * Pure resolution of the target platforms for `primitive init`.
+ *
+ * Background (issue #1009): `primitive init` must become platform-aware. The
+ * commander `-p, --platform` option no longer carries a `"web"` default, so an
+ * omitted flag is `undefined` and distinguishable from an explicit
+ * `--platform web`. Resolution follows a 4-case interactivity contract:
+ *
+ *   (a) explicit `--platform` flag set        -> use it (never prompt)
+ *   (b) init-config TOML present (configPlatform may be set) -> use config
+ *       value, else fall back to "web" (never prompt)
+ *   (c) interactive TTY, no flag, no config    -> prompt with `checkbox`
+ *   (d) non-TTY, no flag, no config            -> fall back to "web" WITHOUT
+ *       hanging and WITHOUT the `ERR_USE_AFTER_CLOSE` crash that
+ *       `@inquirer/prompts` throws on a closed/piped stdin (same hazard family
+ *       hardened in #972/#999 — see `confirm-prompt.ts`).
+ *
+ * Issue #2890 makes the resolved value a LIST: one Primitive app can have a web
+ * client and a native client, and `primitive init my-app --platform web,ios`
+ * scaffolds both into one repository. A single platform is just a list of one,
+ * so the contract above is unchanged — and the interactive case is a
+ * multi-select rather than a single-select.
+ *
+ * Extracting the decision into a pure function (with injectable `isTTY` /
+ * `promptFn`, mirroring `confirm-prompt.ts`) makes the otherwise
+ * terminal-dependent interactivity contract unit-testable.
+ */
+/**
+ * Every platform `--platform` accepts, in the order a run processes them: the
+ * web client is configured first (it owns the dev-port step). Parsing
+ * normalizes to this order, so `--platform ios,web` and `--platform web,ios`
+ * scaffold the same repository.
+ */
+export const SUPPORTED_PLATFORMS = ["web", "ios"];
+const SUPPORTED_LIST = SUPPORTED_PLATFORMS.join(", ");
+/** The CLI compiles with `strict: false`, so callers read `ok` explicitly. */
+function rejected(error) {
+    return { ok: false, platforms: [], error };
+}
+/**
+ * Parses a `--platform` flag value (`"web"`, `"web,ios"`) or an init-config
+ * `platform` key (a string or a TOML array) into a validated platform list.
+ *
+ * Returns a result rather than throwing so `validateInitConfig` can collect the
+ * message alongside its other errors and the flag path can print it and exit.
+ */
+export function parsePlatformList(raw) {
+    const entries = typeof raw === "string" ? raw.split(",") : [...raw];
+    const platforms = [];
+    for (const entry of entries) {
+        if (typeof entry !== "string") {
+            return rejected(`Platform entries must be strings. Supported platforms: ${SUPPORTED_LIST}`);
+        }
+        const value = entry.trim();
+        if (value.length === 0) {
+            return rejected(`Empty platform entry. Supported platforms: ${SUPPORTED_LIST}`);
+        }
+        if (!SUPPORTED_PLATFORMS.includes(value)) {
+            return rejected(`Unknown platform "${value}". Supported platforms: ${SUPPORTED_LIST}`);
+        }
+        if (platforms.includes(value)) {
+            return rejected(`Duplicate platform "${value}". Name each platform once. Supported platforms: ${SUPPORTED_LIST}`);
+        }
+        platforms.push(value);
+    }
+    if (platforms.length === 0) {
+        return rejected(`No platform selected. Supported platforms: ${SUPPORTED_LIST}`);
+    }
+    return {
+        ok: true,
+        platforms: SUPPORTED_PLATFORMS.filter((p) => platforms.includes(p)),
+    };
+}
+/**
+ * Resolve the target platforms per the 4-case interactivity contract above.
+ *
+ * @returns a non-empty list of platforms to scaffold.
+ */
+export async function resolvePlatforms(options) {
+    // A selection with nothing in it has nothing to scaffold. The prompt's own
+    // `validate` re-asks rather than returning one, and `parsePlatformList`
+    // rejects one — this is the backstop, so no caller ever plans a layout with
+    // no clients in it.
+    const required = (platforms) => {
+        if (platforms.length === 0) {
+            throw new Error(`Select at least one platform. Supported platforms: ${SUPPORTED_LIST}`);
+        }
+        return platforms;
+    };
+    // (a) explicit flag wins, no prompt.
+    if (options.flag !== undefined) {
+        return required(options.flag);
+    }
+    // (b) non-interactive config present: use its platforms or default to web.
+    if (options.hasConfig) {
+        return required(options.configPlatform ?? ["web"]);
+    }
+    // (c) interactive TTY, no flag, no config: prompt.
+    if (options.isTTY) {
+        return required(await options.promptFn());
+    }
+    // (d) non-TTY, no flag, no config: never prompt; fall back to web.
+    return ["web"];
+}
+//# sourceMappingURL=resolve-platform.js.map

package/dist/src/lib/resolve-platform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-platform.js","sourceRoot":"","sources":["../../../src/lib/resolve-platform.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/run-status.d.ts

@@ -0,0 +1,19 @@
+/**
+ * The canonical workflow-run status vocabulary, as the CLI sees it (#2348).
+ *
+ * The server reconciles every status surface (the app status endpoints,
+ * `listRuns`, and all three admin status handlers) onto exactly these values
+ * before they go on the wire, so the CLI never has to re-derive terminality
+ * from a raw Cloudflare spelling (`complete`, `errored`, `waiting`) again.
+ * Those spellings no longer reach a client.
+ *
+ * #2636 — the vocabulary itself is no longer copied by hand: it is GENERATED
+ * from the server's `src/workflows/run-status.ts` into
+ * `run-status.generated.ts` (`pnpm gen:run-status`) and re-exported here, so a
+ * future status is a one-site edit plus regeneration rather than four
+ * hand-edits that a lagging copy turns into a hung poll loop. This module stays
+ * the ONE place `cli/` imports the vocabulary from — every command and
+ * formatter reads it from here.
+ */
+export { RUN_STATUSES, RUN_STATUS_LIST, TERMINAL_RUN_STATUSES, APPLY_RUN_STATUSES, IN_FLIGHT_RUN_STATUSES, SETTLED_RUN_STATUSES, isRunStatus, } from "./run-status.generated.js";
+export type { RunStatus } from "./run-status.generated.js";

package/dist/src/lib/run-status.generated.d.ts

@@ -0,0 +1,39 @@
+/**
+ * GENERATED FILE — do not edit by hand.
+ *
+ * The canonical workflow-run status vocabulary, as the CLI sees it.
+ * Generated from the server's `src/workflows/run-status.ts` by
+ * `scripts/gen-run-status-mirrors.mjs` (`pnpm gen:run-status`), because
+ * the CLI is a separately built package and cannot import worker
+ * source. A stale copy is worse than a missing feature: a poll loop whose
+ * terminal set predates a new status hangs until its own timeout, so the
+ * freshness check in `tests/unit/workflows/run-status-mirrors.test.ts` fails
+ * the build rather than letting the two drift.
+ *
+ * Hand-maintained values that belong to the CLI alone (labels, badge
+ * colours, help text) live in `cli/src/lib/run-status.ts`, which re-exports
+ * everything below.
+ */
+export declare const RUN_STATUSES: readonly ["queued", "running", "apply_pending", "apply_claimed", "completed", "failed", "terminated", "missing", "skipped"];
+export type RunStatus = (typeof RUN_STATUSES)[number];
+/** Comma-separated list for help text and error messages. */
+export declare const RUN_STATUS_LIST: string;
+/** True terminal: the run reached a known end state. */
+export declare const TERMINAL_RUN_STATUSES: ReadonlySet<string>;
+/**
+ * Apply-flow states: the run finished executing but is parked waiting for a
+ * client to claim and apply its result. It will not advance on its own.
+ */
+export declare const APPLY_RUN_STATUSES: ReadonlySet<string>;
+/** In-flight statuses — the run has not settled and polling should continue. */
+export declare const IN_FLIGHT_RUN_STATUSES: ReadonlySet<string>;
+/**
+ * Settled statuses: terminal ∪ apply-flow ∪ `missing` — the complement of
+ * `IN_FLIGHT_RUN_STATUSES` over the canonical vocabulary.
+ *
+ * This is the set every poll loop stops on. Waiting past any of these is
+ * pointless: a terminal run is done, an apply-flow run is parked until a client
+ * acts, and a `missing` run has no live instance to observe.
+ */
+export declare const SETTLED_RUN_STATUSES: ReadonlySet<string>;
+export declare function isRunStatus(value: unknown): value is RunStatus;

package/dist/src/lib/run-status.generated.js

@@ -0,0 +1,66 @@
+/**
+ * GENERATED FILE — do not edit by hand.
+ *
+ * The canonical workflow-run status vocabulary, as the CLI sees it.
+ * Generated from the server's `src/workflows/run-status.ts` by
+ * `scripts/gen-run-status-mirrors.mjs` (`pnpm gen:run-status`), because
+ * the CLI is a separately built package and cannot import worker
+ * source. A stale copy is worse than a missing feature: a poll loop whose
+ * terminal set predates a new status hangs until its own timeout, so the
+ * freshness check in `tests/unit/workflows/run-status-mirrors.test.ts` fails
+ * the build rather than letting the two drift.
+ *
+ * Hand-maintained values that belong to the CLI alone (labels, badge
+ * colours, help text) live in `cli/src/lib/run-status.ts`, which re-exports
+ * everything below.
+ */
+export const RUN_STATUSES = [
+    "queued",
+    "running",
+    "apply_pending",
+    "apply_claimed",
+    "completed",
+    "failed",
+    "terminated",
+    "missing",
+    "skipped",
+];
+/** Comma-separated list for help text and error messages. */
+export const RUN_STATUS_LIST = RUN_STATUSES.join(", ");
+/** True terminal: the run reached a known end state. */
+export const TERMINAL_RUN_STATUSES = new Set([
+    "completed",
+    "failed",
+    "terminated",
+    "skipped",
+]);
+/**
+ * Apply-flow states: the run finished executing but is parked waiting for a
+ * client to claim and apply its result. It will not advance on its own.
+ */
+export const APPLY_RUN_STATUSES = new Set([
+    "apply_pending",
+    "apply_claimed",
+]);
+/** In-flight statuses — the run has not settled and polling should continue. */
+export const IN_FLIGHT_RUN_STATUSES = new Set([
+    "queued",
+    "running",
+]);
+/**
+ * Settled statuses: terminal ∪ apply-flow ∪ `missing` — the complement of
+ * `IN_FLIGHT_RUN_STATUSES` over the canonical vocabulary.
+ *
+ * This is the set every poll loop stops on. Waiting past any of these is
+ * pointless: a terminal run is done, an apply-flow run is parked until a client
+ * acts, and a `missing` run has no live instance to observe.
+ */
+export const SETTLED_RUN_STATUSES = new Set([
+    ...TERMINAL_RUN_STATUSES,
+    ...APPLY_RUN_STATUSES,
+    "missing",
+]);
+export function isRunStatus(value) {
+    return (typeof value === "string" && RUN_STATUSES.includes(value));
+}
+//# sourceMappingURL=run-status.generated.js.map

package/dist/src/lib/run-status.generated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-status.generated.js","sourceRoot":"","sources":["../../../src/lib/run-status.generated.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ;IACR,SAAS;IACT,eAAe;IACf,eAAe;IACf,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,SAAS;IACT,SAAS;CACD,CAAC;AAIX,6DAA6D;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEvD,wDAAwD;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAwB,IAAI,GAAG,CAAS;IACxE,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,SAAS;CACV,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CAAS;IACrE,eAAe;IACf,eAAe;CAChB,CAAC,CAAC;AAEH,gFAAgF;AAChF,MAAM,CAAC,MAAM,sBAAsB,GAAwB,IAAI,GAAG,CAAS;IACzE,QAAQ;IACR,SAAS;CACV,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAwB,IAAI,GAAG,CAAS;IACvE,GAAG,qBAAqB;IACxB,GAAG,kBAAkB;IACrB,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ,IAAK,YAAkC,CAAC,QAAQ,CAAC,KAAK,CAAC,CACjF,CAAC;AACJ,CAAC"}

package/dist/src/lib/run-status.js

@@ -0,0 +1,19 @@
+/**
+ * The canonical workflow-run status vocabulary, as the CLI sees it (#2348).
+ *
+ * The server reconciles every status surface (the app status endpoints,
+ * `listRuns`, and all three admin status handlers) onto exactly these values
+ * before they go on the wire, so the CLI never has to re-derive terminality
+ * from a raw Cloudflare spelling (`complete`, `errored`, `waiting`) again.
+ * Those spellings no longer reach a client.
+ *
+ * #2636 — the vocabulary itself is no longer copied by hand: it is GENERATED
+ * from the server's `src/workflows/run-status.ts` into
+ * `run-status.generated.ts` (`pnpm gen:run-status`) and re-exported here, so a
+ * future status is a one-site edit plus regeneration rather than four
+ * hand-edits that a lagging copy turns into a hung poll loop. This module stays
+ * the ONE place `cli/` imports the vocabulary from — every command and
+ * formatter reads it from here.
+ */
+export { RUN_STATUSES, RUN_STATUS_LIST, TERMINAL_RUN_STATUSES, APPLY_RUN_STATUSES, IN_FLIGHT_RUN_STATUSES, SETTLED_RUN_STATUSES, isRunStatus, } from "./run-status.generated.js";
+//# sourceMappingURL=run-status.js.map

package/dist/src/lib/run-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-status.js","sourceRoot":"","sources":["../../../src/lib/run-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,GACZ,MAAM,2BAA2B,CAAC"}

package/dist/src/lib/server-text-normalization.d.ts

@@ -0,0 +1,51 @@
+/**
+ * The CLI's mirror of the server's normalization of accepted TEXT fields
+ * (issue #2880, DSO-003) — the scalar sibling of `integration-request-config`.
+ *
+ * Every write handler for the types this issue converted rewrites the text it
+ * accepts: display names, workflow keys and bucket names are trimmed
+ * (`src/admin-api.ts` for integrations and webhooks,
+ * `cron-triggers-controller.ts`, `blob-buckets-controller.ts`), descriptions
+ * are trimmed and a blank one is stored as `null`, and a `signingSecret` is
+ * stored as the canonical `{{secrets.KEY}}` form (`canonicalSecretReference`).
+ * So a hand-authored `displayName = " Billing "` is not the value the server
+ * returns — and compared raw it is a `Modified` row on every run, with push
+ * re-applying an update that changes nothing. Baseline restamping cannot fix
+ * it: after an apply the remote hash equals the fresh baseline while the local
+ * hash still does not.
+ *
+ * Applied to BOTH sides of a comparison (a spec's `canonicalize` hook runs on
+ * the projection, whichever side it came from), so these must be idempotent —
+ * and so a value some older write path stored untrimmed compares equal to the
+ * trimmed text a file states, rather than the two disagreeing forever.
+ *
+ * Mirrored rather than imported, for the reason the request-config mirror
+ * gives: the published CLI must not import server `src/` at runtime. Every
+ * step is total — a value the server would REJECT is left exactly as authored,
+ * so the server's own error is what the operator sees.
+ */
+/** `displayName`, `workflowKey`, bucket `name`: trimmed, never emptied. */
+export declare function canonicalizeTrimmedText(value: unknown): unknown;
+/**
+ * `description`: trimmed, and a blank one is the same state as none at all.
+ *
+ * The handlers spell this two ways — `description.trim() || null` (integrations,
+ * webhooks) and a bare `description || null` (cron triggers, blob buckets) —
+ * which differ only for a whitespace-only string. Trimming here is the
+ * stricter, idempotent reading: `"  "` and `null` are one state on both sides
+ * either way, and a stored `" x "` from either path meets an authored `"x"`.
+ */
+export declare function canonicalizeOptionalText(value: unknown): unknown;
+export declare function canonicalizeSecretReference(value: unknown): unknown;
+/**
+ * Apply the rules above to a parsed entity, in place.
+ *
+ * `undefined` stays `undefined`: a key the entity does not carry is not a
+ * cleared one, and the projection's own emission rules decide what an absent
+ * value means.
+ */
+export declare function canonicalizeServerTextFields(entity: any, fields: {
+    trimmed?: readonly string[];
+    optional?: readonly string[];
+    secretReference?: readonly string[];
+}): void;

package/dist/src/lib/server-text-normalization.js

@@ -0,0 +1,90 @@
+/**
+ * The CLI's mirror of the server's normalization of accepted TEXT fields
+ * (issue #2880, DSO-003) — the scalar sibling of `integration-request-config`.
+ *
+ * Every write handler for the types this issue converted rewrites the text it
+ * accepts: display names, workflow keys and bucket names are trimmed
+ * (`src/admin-api.ts` for integrations and webhooks,
+ * `cron-triggers-controller.ts`, `blob-buckets-controller.ts`), descriptions
+ * are trimmed and a blank one is stored as `null`, and a `signingSecret` is
+ * stored as the canonical `{{secrets.KEY}}` form (`canonicalSecretReference`).
+ * So a hand-authored `displayName = " Billing "` is not the value the server
+ * returns — and compared raw it is a `Modified` row on every run, with push
+ * re-applying an update that changes nothing. Baseline restamping cannot fix
+ * it: after an apply the remote hash equals the fresh baseline while the local
+ * hash still does not.
+ *
+ * Applied to BOTH sides of a comparison (a spec's `canonicalize` hook runs on
+ * the projection, whichever side it came from), so these must be idempotent —
+ * and so a value some older write path stored untrimmed compares equal to the
+ * trimmed text a file states, rather than the two disagreeing forever.
+ *
+ * Mirrored rather than imported, for the reason the request-config mirror
+ * gives: the published CLI must not import server `src/` at runtime. Every
+ * step is total — a value the server would REJECT is left exactly as authored,
+ * so the server's own error is what the operator sees.
+ */
+/** `displayName`, `workflowKey`, bucket `name`: trimmed, never emptied. */
+export function canonicalizeTrimmedText(value) {
+    return typeof value === "string" ? value.trim() : value;
+}
+/**
+ * `description`: trimmed, and a blank one is the same state as none at all.
+ *
+ * The handlers spell this two ways — `description.trim() || null` (integrations,
+ * webhooks) and a bare `description || null` (cron triggers, blob buckets) —
+ * which differ only for a whitespace-only string. Trimming here is the
+ * stricter, idempotent reading: `"  "` and `null` are one state on both sides
+ * either way, and a stored `" x "` from either path meets an authored `"x"`.
+ */
+export function canonicalizeOptionalText(value) {
+    if (typeof value !== "string")
+        return value;
+    const trimmed = value.trim();
+    return trimmed === "" ? null : trimmed;
+}
+/**
+ * A whole `{{secrets.KEY}}` reference, in the canonical at-rest spelling.
+ *
+ * Mirrors `canonicalSecretReference`: interior spacing is dropped and the value
+ * is trimmed, because a stored reference has to resolve to exactly the secret's
+ * value. Anything that is not plainly one whole reference is returned as
+ * authored — including a reference spoiled by invisible text beside it, which
+ * the server refuses (`isSpoiledSecretReference`, #2297): only ORDINARY
+ * whitespace is stripped here, so a value carrying a byte-order mark does not
+ * quietly canonicalize into the reference the server will not store.
+ */
+const WHOLE_SECRET_REFERENCE_RE = /^\{\{[ \t]*secrets\.([A-Z][A-Z0-9_]{0,63})[ \t]*\}\}$/;
+export function canonicalizeSecretReference(value) {
+    if (typeof value !== "string")
+        return value;
+    const match = WHOLE_SECRET_REFERENCE_RE.exec(value.replace(/^[ \t\r\n]+|[ \t\r\n]+$/g, ""));
+    return match ? `{{secrets.${match[1]}}}` : value;
+}
+/**
+ * Apply the rules above to a parsed entity, in place.
+ *
+ * `undefined` stays `undefined`: a key the entity does not carry is not a
+ * cleared one, and the projection's own emission rules decide what an absent
+ * value means.
+ */
+export function canonicalizeServerTextFields(entity, fields) {
+    if (!entity || typeof entity !== "object")
+        return;
+    for (const field of fields.trimmed ?? []) {
+        if (entity[field] === undefined)
+            continue;
+        entity[field] = canonicalizeTrimmedText(entity[field]);
+    }
+    for (const field of fields.optional ?? []) {
+        if (entity[field] === undefined)
+            continue;
+        entity[field] = canonicalizeOptionalText(entity[field]);
+    }
+    for (const field of fields.secretReference ?? []) {
+        if (entity[field] === undefined)
+            continue;
+        entity[field] = canonicalizeSecretReference(entity[field]);
+    }
+}
+//# sourceMappingURL=server-text-normalization.js.map

package/dist/src/lib/server-text-normalization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-text-normalization.js","sourceRoot":"","sources":["../../../src/lib/server-text-normalization.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,2EAA2E;AAC3E,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAc;IACrD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;AACzC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,yBAAyB,GAC7B,uDAAuD,CAAC;AAE1D,MAAM,UAAU,2BAA2B,CAAC,KAAc;IACxD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAC1C,KAAK,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAC9C,CAAC;IACF,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACnD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,MAAW,EACX,MAIC;IAED,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO;IAClD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACzC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS;YAAE,SAAS;QAC1C,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS;YAAE,SAAS;QAC1C,MAAM,CAAC,KAAK,CAAC,GAAG,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS;YAAE,SAAS;QAC1C,MAAM,CAAC,KAAK,CAAC,GAAG,2BAA2B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC"}

package/dist/src/lib/server-url.d.ts

@@ -0,0 +1,22 @@
+/**
+ * The one server-URL validator the CLI shares (issue #2927).
+ *
+ * It returns the `string | true` shape `@inquirer/prompts` expects from a
+ * `validate` callback, so the same function backs the `primitive init` prompt,
+ * the `--server` flag check and init-config validation, `project-config.ts`'s
+ * `apiUrl` check, and `env add --api-url`. It used to live in the
+ * init-specific `resolve-init-server.ts` while the last two hand-rolled their
+ * own `try { new URL(x) } catch`.
+ *
+ * The parse deliberately runs on the *raw* string: JavaScript `trim()` strips
+ * Unicode whitespace (U+00A0, U+2028, U+FEFF, …) that the WHATWG URL parser
+ * does not, so trimming first would accept values like `" https://x"`
+ * that later URL construction cannot use — and `env add` would persist them.
+ * `trim()` is therefore used only to decide whether the input is empty; the
+ * URL parser already ignores the ASCII padding it is willing to strip.
+ */
+/**
+ * Validates a server URL. Returns `true` when valid, otherwise the message to
+ * show the user.
+ */
+export declare function validateServerUrl(url: string): string | true;