primitive-admin 1.0.49 → 1.0.51

package/dist/src/commands/workflows.d.ts

@@ -0,0 +1,49 @@
+import { Command } from "commander";
+/**
+ * Render the `Step Results` section of `workflows runs status`. Pure
+ * formatting helper — returns lines as strings so it's unit-testable
+ * (the caller console.logs them). For each step, emits:
+ *
+ *   `  <id>: <status-label> <duration>`
+ *
+ * and, when applicable, indented follow-up lines:
+ *
+ * - `error_captured` step with `error` → `    error: <truncated message>`
+ * - forEach output with `errors[]` non-empty →
+ *   `    forEach errors: <N/M> - first: <truncated message>`
+ *
+ * The truncation length matches `runs steps` ERROR column (80 chars,
+ * trailing "..." when truncated). See #688.
+ */
+/**
+ * Terminal-status predicate for the `workflows preview --wait` poll loop
+ * (issue #941). A status is terminal when the run has reached an end state and
+ * the wait should stop polling — as opposed to a still-in-flight status
+ * ("running"/"queued"/"waiting") that should keep the loop going until the cap.
+ *
+ * The admin preview-status endpoint emits these terminal values (see
+ * `mapWorkflowStatus` / the server-side `isEnded` set in admin-api.ts):
+ *   - "completed" (Cloudflare "complete" normalized)
+ *   - "failed"    (Cloudflare "errored" normalized)
+ *   - "terminated" (an aborted preview — Codex P2: previously NOT treated as
+ *     terminal, so an aborted preview was misreported as a wait timeout)
+ *
+ * We accept the un-normalized Cloudflare spellings too ("complete"/"errored")
+ * defensively, in case a status slips through un-normalized.
+ */
+export declare function isPreviewWaitTerminalStatus(s: unknown): boolean;
+export declare function renderRunStatusStepResults(stepResults: any[]): string[];
+/**
+ * Issue #687 (review feedback): render an unambiguous label for a workflow
+ * config slot ("active config", "draft config", etc.) when the slot may be
+ * unnamed. Falls back to a short ID prefix so users staging multiple unnamed
+ * configs can still tell them apart.
+ *
+ *   formatConfigSlotLabel("active config", "v2", "01KRT...")        → 'active config "v2"'
+ *   formatConfigSlotLabel("active config", null, "01KRTABCDXYZ...") → 'active config (01KRTABCDXYZ…)'
+ *   formatConfigSlotLabel("active config", null, null)              → 'active config'
+ *
+ * Exported for testability.
+ */
+export declare function formatConfigSlotLabel(slot: string, configName: string | null | undefined, configId: string | null | undefined, prefixLength?: number): string;
+export declare function registerWorkflowsCommands(program: Command): void;

package/dist/src/commands/workflows.js

@@ -6,6 +6,7 @@ import { ApiClient } from "../lib/api-client.js";
 import { resolveAppId } from "../lib/config.js";
 import { validateWorkflowToml, formatWorkflowTomlErrors, } from "../lib/workflow-toml-validator.js";
 import { expandWorkflow } from "../lib/workflow-fragments.js";
+import { confirmPrompt } from "../lib/confirm-prompt.js";
 import chalk from "chalk";
 import { success, error, info, warn, keyValue, result as printResult, formatTable, formatId, formatDate, formatStatus, formatDuration, json, divider, progress, progressEnd, } from "../lib/output.js";
 /**
@@ -24,6 +25,29 @@ import { success, error, info, warn, keyValue, result as printResult, formatTabl
  * The truncation length matches `runs steps` ERROR column (80 chars,
  * trailing "..." when truncated). See #688.
  */
+/**
+ * Terminal-status predicate for the `workflows preview --wait` poll loop
+ * (issue #941). A status is terminal when the run has reached an end state and
+ * the wait should stop polling — as opposed to a still-in-flight status
+ * ("running"/"queued"/"waiting") that should keep the loop going until the cap.
+ *
+ * The admin preview-status endpoint emits these terminal values (see
+ * `mapWorkflowStatus` / the server-side `isEnded` set in admin-api.ts):
+ *   - "completed" (Cloudflare "complete" normalized)
+ *   - "failed"    (Cloudflare "errored" normalized)
+ *   - "terminated" (an aborted preview — Codex P2: previously NOT treated as
+ *     terminal, so an aborted preview was misreported as a wait timeout)
+ *
+ * We accept the un-normalized Cloudflare spellings too ("complete"/"errored")
+ * defensively, in case a status slips through un-normalized.
+ */
+export function isPreviewWaitTerminalStatus(s) {
+    return (s === "completed" ||
+        s === "complete" ||
+        s === "failed" ||
+        s === "errored" ||
+        s === "terminated");
+}
 export function renderRunStatusStepResults(stepResults) {
     const lines = [];
     for (const step of stepResults || []) {
@@ -375,24 +399,16 @@ Examples:
         .option("-y, --yes", "Skip confirmation prompt")
         .action(async (workflowId, options) => {
         const resolvedAppId = resolveAppId(undefined, options);
-        if (!options.yes) {
-            const action = options.hard ? "permanently delete" : "archive";
-            const inquirer = await import("inquirer");
-            const { confirm } = await inquirer.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirm",
-                    message: `Are you sure you want to ${action} workflow ${workflowId}?`,
-                    default: false,
-                },
-            ]);
-            if (!confirm) {
-                info("Cancelled.");
-                return;
-            }
-        }
         const client = new ApiClient();
         try {
+            if (!options.yes) {
+                const action = options.hard ? "permanently delete" : "archive";
+                const confirmed = await confirmPrompt(`Are you sure you want to ${action} workflow ${workflowId}?`);
+                if (!confirmed) {
+                    info("Cancelled.");
+                    return;
+                }
+            }
             if (options.hard) {
                 await client.deleteWorkflow(resolvedAppId, workflowId);
                 success("Workflow deleted.");
@@ -486,6 +502,21 @@ Examples:
             }
         }
         catch (err) {
+            // Issue #987: config-model workflows reject the legacy draft slot with
+            // a 409 (the draft never executes). Surface the actionable config path
+            // cleanly instead of dumping a raw API error.
+            if (err?.statusCode === 409 && err?.code === "WORKFLOW_CONFIG_MODEL") {
+                error("This workflow has an active configuration, so the legacy draft slot is inert " +
+                    "(it won't change what runs). For dev-loop edits, use 'sync push' — it writes the\n" +
+                    "active config directly and activates the workflow end-to-end:\n" +
+                    "  primitive sync push\n" +
+                    "For staged rollouts, create + activate a config, then flip the status to active\n" +
+                    "(configs activate only sets the active config; it does not change the workflow status):\n" +
+                    "  primitive workflows configs create <workflow-id> --name <name> --from-file <path>\n" +
+                    "  primitive workflows configs activate <workflow-id> <config-id>\n" +
+                    "  primitive workflows update <workflow-id> --status active");
+                process.exit(1);
+            }
             error(err.message);
             process.exit(1);
         }
@@ -515,6 +546,21 @@ Examples:
             }
         }
         catch (err) {
+            // Issue #987: 'publish' is inert on config-model workflows (production
+            // runs read the active config), so the server rejects with a 409.
+            // Point the user at the config primitives instead of a raw API error.
+            if (err?.statusCode === 409 && err?.code === "WORKFLOW_CONFIG_MODEL") {
+                error("This workflow has an active configuration, so 'publish' is inert " +
+                    "(it bumps a legacy pointer that doesn't change what runs). For dev-loop edits, use\n" +
+                    "'sync push' — it writes the active config directly and activates the workflow end-to-end:\n" +
+                    "  primitive sync push\n" +
+                    "For staged rollouts, create + activate a config, then flip the status to active\n" +
+                    "(configs activate only sets the active config; it does not change the workflow status):\n" +
+                    "  primitive workflows configs create <workflow-id> --name <name> --from-file <path>\n" +
+                    "  primitive workflows configs activate <workflow-id> <config-id>\n" +
+                    "  primitive workflows update <workflow-id> --status active");
+                process.exit(1);
+            }
             error(err.message);
             process.exit(1);
         }
@@ -588,21 +634,49 @@ Examples:
                 info("Use 'workflows runs status' to check progress.");
                 return;
             }
-            // Poll for completion
+            // Poll for completion. Issue #941: track whether the loop broke on a
+            // terminal state vs. ran to exhaustion, so a timed-out wait is
+            // distinguishable from a workflow that legitimately reported "running".
             info("Waiting for completion...");
             let status;
-            const maxAttempts = 60;
+            // Fixed ~60s cap (60 × 1s sleep + RTT). PRIMITIVE_PREVIEW_WAIT_ATTEMPTS
+            // overrides the iteration count for tests that exercise the
+            // poll-loop-exhaustion path without a full 60s wait; unset in normal use.
+            const maxAttempts = (() => {
+                const raw = process.env.PRIMITIVE_PREVIEW_WAIT_ATTEMPTS;
+                const parsed = raw ? parseInt(raw, 10) : NaN;
+                return Number.isInteger(parsed) && parsed > 0 ? parsed : 60;
+            })();
+            let reachedTerminal = false;
             for (let i = 0; i < maxAttempts; i++) {
                 await new Promise((r) => setTimeout(r, 1000));
                 const statusResult = await client.getPreviewStatus(resolvedAppId, workflowId, result.instanceId);
                 status = statusResult.status;
                 const s = status?.status;
-                if (s === "completed" || s === "complete" || s === "failed" || s === "errored") {
+                // Issue #941 (Codex P2): an aborted preview reports
+                // status:"terminated" from the admin preview-status endpoint, which
+                // is a real terminal state — the wait did NOT time out. The shared
+                // predicate includes it so the loop breaks and `waitTimedOut` stays
+                // false (vs. the prior check that omitted "terminated" and let the
+                // loop run to the cap, misreporting an abort as a timeout).
+                if (isPreviewWaitTerminalStatus(s)) {
+                    reachedTerminal = true;
                     break;
                 }
             }
+            // Issue #941: on poll-loop exhaustion with a still-non-terminal run,
+            // emit an explicit timeout signal and exit non-zero (124, the GNU
+            // `timeout` convention) instead of silently returning the bare
+            // non-terminal status as if the wait succeeded.
+            const waitTimedOut = !reachedTerminal;
             if (options.json) {
-                json({ instanceId: result.instanceId, status });
+                // Additive field only — `status` is preserved so existing parsers
+                // don't break; `waitTimedOut` lets automation tell "still running,
+                // wait gave up" from "finished".
+                json({ instanceId: result.instanceId, status, waitTimedOut });
+                if (waitTimedOut) {
+                    process.exit(124);
+                }
                 return;
             }
             if (status?.status === "completed" || status?.status === "complete") {
@@ -626,8 +700,17 @@ Examples:
                     console.log(JSON.stringify(status.error, null, 2));
                 }
             }
+            else if (status?.status === "terminated") {
+                // Issue #941 (Codex P2): the preview was aborted (e.g. via
+                // `workflows preview ... abort`, or an external terminate). This is a
+                // real terminal state — NOT a timeout — so render it distinctly and
+                // exit 0 (the wait succeeded in observing a terminal result).
+                warn("Preview was terminated (aborted before completion).");
+            }
             else {
-                info("Preview still running. Check status with 'workflows runs status'.");
+                // Timed out without ever reaching a terminal state (issue #941).
+                error(`Wait timed out after ${maxAttempts}s; preview still running. Check status with 'workflows runs status'.`);
+                process.exit(124);
             }
         }
         catch (err) {
@@ -1339,15 +1422,14 @@ Examples:
         .action(async (workflowId, configId, options) => {
         const resolvedAppId = resolveAppId(undefined, options);
         if (!options.yes) {
-            const inquirer = await import("inquirer");
-            const { confirm } = await inquirer.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirm",
-                    message: `Are you sure you want to archive configuration ${configId}?`,
-                    default: false,
-                },
-            ]);
+            let confirm;
+            try {
+                confirm = await confirmPrompt(`Are you sure you want to archive configuration ${configId}?`);
+            }
+            catch (err) {
+                error(err.message);
+                process.exit(1);
+            }
             if (!confirm) {
                 info("Cancelled.");
                 return;
@@ -1631,15 +1713,14 @@ Examples:
         .action(async (workflowId, testCaseId, options) => {
         const resolvedAppId = resolveAppId(undefined, options);
         if (!options.yes) {
-            const inquirer = await import("inquirer");
-            const { confirm } = await inquirer.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirm",
-                    message: `Are you sure you want to delete test case ${testCaseId}?`,
-                    default: false,
-                },
-            ]);
+            let confirm;
+            try {
+                confirm = await confirmPrompt(`Are you sure you want to delete test case ${testCaseId}?`);
+            }
+            catch (err) {
+                error(err.message);
+                process.exit(1);
+            }
             if (!confirm) {
                 info("Cancelled.");
                 return;
@@ -1959,15 +2040,14 @@ Examples:
         .action(async (workflowId, batchId, options) => {
         const resolvedAppId = resolveAppId(undefined, options);
         if (!options.yes) {
-            const inquirer = await import("inquirer");
-            const { confirm } = await inquirer.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirm",
-                    message: `Are you sure you want to cancel batch ${batchId}?`,
-                    default: false,
-                },
-            ]);
+            let confirm;
+            try {
+                confirm = await confirmPrompt(`Are you sure you want to cancel batch ${batchId}?`);
+            }
+            catch (err) {
+                error(err.message);
+                process.exit(1);
+            }
             if (!confirm) {
                 info("Cancelled.");
                 return;
@@ -2131,15 +2211,14 @@ Examples:
         .action(async (workflowId, testCaseId, filename, options) => {
         const resolvedAppId = resolveAppId(undefined, options);
         if (!options.yes) {
-            const inquirer = await import("inquirer");
-            const { confirm } = await inquirer.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirm",
-                    message: `Are you sure you want to delete attachment "${filename}"?`,
-                    default: false,
-                },
-            ]);
+            let confirm;
+            try {
+                confirm = await confirmPrompt(`Are you sure you want to delete attachment "${filename}"?`);
+            }
+            catch (err) {
+                error(err.message);
+                process.exit(1);
+            }
             if (!confirm) {
                 info("Cancelled.");
                 return;