@sanity/runtime-cli 15.1.4 → 15.1.5

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/15.1.4 linux-x64 node-v24.16.0
+@sanity/runtime-cli/15.1.5 linux-x64 node-v24.16.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -103,7 +103,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-create --fn-type document-update --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -140,7 +140,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -175,6 +175,9 @@ DESCRIPTION
 
   Set SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for processing resource assets.
 
+  Exit codes: 0 deployed, 2 deployment failed, 75 deployment accepted but completion could not be confirmed (rerun
+  'blueprints info' to check).
+
 EXAMPLES
   $ sanity-run blueprints deploy
 
@@ -191,7 +194,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -220,13 +223,16 @@ DESCRIPTION
 
   Use this to clean up test environments or decommission a Stack you no longer need.
 
+  Exit codes: 0 destroyed, 2 destruction failed, 75 destruction accepted but completion could not be confirmed (rerun
+  'blueprints info' to check).
+
 EXAMPLES
   $ sanity-run blueprints destroy
 
   $ sanity-run blueprints destroy --stack <name-or-id> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -257,7 +263,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -294,7 +300,7 @@ EXAMPLES
   $ sanity-run blueprints info --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -353,7 +359,7 @@ EXAMPLES
   $ sanity-run blueprints init old-stack --type <json|js|ts> --project-id <projectId> --stack-id <existingStackId>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -399,7 +405,7 @@ EXAMPLES
   $ sanity-run blueprints logs --before 2026-05-01T00:00:00Z
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints mint-deploy-token`
 
@@ -444,7 +450,7 @@ EXAMPLES
   $ sanity-run blueprints mint-deploy-token --organization-id <orgId>
 ```
 
-_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/mint-deploy-token.ts)_
+_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/mint-deploy-token.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -477,7 +483,7 @@ EXAMPLES
   $ sanity-run blueprints plan --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints promote`
 
@@ -513,7 +519,7 @@ EXAMPLES
   $ sanity-run blueprints promote --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/promote.ts)_
+_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/promote.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -549,7 +555,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId> --include-projects
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -601,7 +607,7 @@ EXAMPLES
   $ sanity-run functions add --name my-function --type document-create --type document-update --lang js
 ```
 
-_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -636,7 +642,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -666,7 +672,7 @@ EXAMPLES
   $ sanity-run functions env add MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -693,7 +699,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -722,7 +728,7 @@ EXAMPLES
   $ sanity-run functions env remove MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -762,7 +768,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -819,7 +825,7 @@ EXAMPLES
   $ sanity-run functions test <name> --event update --data-before '{ "title": "before" }' --data-after '{ "title": "after" }'
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.4/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v15.1.5/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/operations.d.ts

@@ -0,0 +1,30 @@
+import type { Logger } from '../../utils/logger.js';
+import type { ActionResponse, AuthParams, StackOperation } from '../../utils/types.js';
+/** Delay before the first operation poll. Override with SANITY_OPERATION_POLL_INITIAL_DELAY_MS. */
+export declare const OPERATION_POLL_INITIAL_DELAY_MS: number;
+/** Interval between operation status polls. Override with SANITY_OPERATION_POLL_INTERVAL_MS. */
+export declare const OPERATION_POLL_INTERVAL_MS: number;
+/** Consecutive failed polls tolerated before giving up on confirming status. */
+export declare const OPERATION_POLL_MAX_CONSECUTIVE_ERRORS = 5;
+/**
+ * Classify a single poll. Terminal status -> 'completed'/'failed'. 404 ->
+ * 'pending' (read-replica lag). Other failed responses -> 'error'. The caller
+ * decides whether an 'error' is retryable.
+ */
+export declare function classifyOperationPoll(options: {
+    ok: boolean;
+    httpStatus: number | undefined;
+    operation: StackOperation | undefined;
+}): 'pending' | 'completed' | 'failed' | 'error';
+interface GetOperationResponse extends ActionResponse {
+    operation: StackOperation;
+    response?: Response;
+}
+export declare function getOperation({ stackId, operationId, auth, logger, includeDestroyed, }: {
+    stackId: string;
+    operationId: string;
+    auth: AuthParams;
+    logger: Logger;
+    includeDestroyed?: boolean;
+}): Promise<GetOperationResponse>;
+export {};

package/dist/actions/blueprints/operations.js

@@ -0,0 +1,50 @@
+import getHeaders from '../../utils/get-headers.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
+import { stacksUrl } from './stacks.js';
+const envMs = (value, fallback) => {
+    if (!value)
+        return fallback;
+    const parsed = Number(value);
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
+};
+/** Delay before the first operation poll. Override with SANITY_OPERATION_POLL_INITIAL_DELAY_MS. */
+export const OPERATION_POLL_INITIAL_DELAY_MS = envMs(process.env.SANITY_OPERATION_POLL_INITIAL_DELAY_MS, 1000);
+/** Interval between operation status polls. Override with SANITY_OPERATION_POLL_INTERVAL_MS. */
+export const OPERATION_POLL_INTERVAL_MS = envMs(process.env.SANITY_OPERATION_POLL_INTERVAL_MS, 1500);
+/** Consecutive failed polls tolerated before giving up on confirming status. */
+export const OPERATION_POLL_MAX_CONSECUTIVE_ERRORS = 5;
+/**
+ * Classify a single poll. Terminal status -> 'completed'/'failed'. 404 ->
+ * 'pending' (read-replica lag). Other failed responses -> 'error'. The caller
+ * decides whether an 'error' is retryable.
+ */
+export function classifyOperationPoll(options) {
+    const { ok, httpStatus, operation } = options;
+    if (ok) {
+        if (operation?.status === 'COMPLETED')
+            return 'completed';
+        if (operation?.status === 'FAILED')
+            return 'failed';
+        return 'pending';
+    }
+    if (httpStatus === 404)
+        return 'pending';
+    return 'error';
+}
+export async function getOperation({ stackId, operationId, auth, logger, includeDestroyed, }) {
+    const fetchFn = createTracedFetch(logger);
+    const url = new URL(`${stacksUrl}/${stackId}/operations/${operationId}`);
+    if (includeDestroyed)
+        url.searchParams.append('includeDestroyed', 'true');
+    const response = await fetchFn(url.toString(), {
+        method: 'GET',
+        headers: getHeaders(auth),
+    });
+    const data = await response.json();
+    return {
+        ok: response.ok,
+        error: response.ok ? null : data.message,
+        operation: data,
+        response,
+    };
+}

package/dist/actions/blueprints/stacks.d.ts

@@ -38,7 +38,7 @@ export declare function createEmptyStack({ token, scopeType, scopeId, name, logg
 }): Promise<Stack>;
 interface UpdateStackResponse extends ActionResponse {
     stack: Stack & {
-        operationId?: string;
+        operationId: string;
     };
 }
 export declare function updateStack({ stackId, stackMutation, auth, logger, }: {
@@ -99,7 +99,7 @@ export declare function planStack({ stackId, document, auth, logger, }: {
 }): Promise<PlanStackResponse>;
 interface DestroyStackResponse extends ActionResponse {
     stack: Stack & {
-        operationId?: string;
+        operationId: string;
     };
 }
 export declare function resolveStackIdByNameOrId(value: string, auth: AuthParams, logger: Logger): Promise<string>;

package/dist/actions/blueprints/wait-for-operation.d.ts

@@ -0,0 +1,30 @@
+import type { Logger } from '../../utils/logger.js';
+import type { AuthParams } from '../../utils/types.js';
+/** Result of waiting for a deploy/destroy operation to settle. */
+export type OperationOutcome = {
+    type: 'completed';
+} | {
+    type: 'failed';
+    logHints: string[];
+} | {
+    type: 'unconfirmed';
+    error?: string;
+};
+export interface WaitForOperationOptions {
+    stackId: string;
+    operationId: string;
+    auth: AuthParams;
+    log: Logger;
+    bin: string;
+    verbose?: boolean;
+    /** Keep the operation queryable after the stack is gone (destroy). */
+    includeDestroyed?: boolean;
+    /** Noun for the idle message, e.g. "deployment" or "destruction". */
+    progressNoun: string;
+}
+/**
+ * Stream logs and poll an operation until it settles.
+ * handles log-stream lifecycle, retry budget, and idle messaging;
+ * the caller maps the returned outcome to its own result/messaging.
+ */
+export declare function waitForOperation(options: WaitForOperationOptions): Promise<OperationOutcome>;

package/dist/actions/blueprints/wait-for-operation.js

@@ -0,0 +1,88 @@
+import { setTimeout as sleep } from 'node:timers/promises';
+import { createHintCollector } from '../../utils/blueprints/hints.js';
+import { setupLogPolling } from './logs-polling.js';
+import { classifyOperationPoll, getOperation, OPERATION_POLL_INITIAL_DELAY_MS, OPERATION_POLL_INTERVAL_MS, OPERATION_POLL_MAX_CONSECUTIVE_ERRORS, } from './operations.js';
+/**
+ * Stream logs and poll an operation until it settles.
+ * handles log-stream lifecycle, retry budget, and idle messaging;
+ * the caller maps the returned outcome to its own result/messaging.
+ */
+export async function waitForOperation(options) {
+    const { stackId, operationId, auth, log, bin, verbose = false, includeDestroyed, progressNoun, } = options;
+    const logHints = createHintCollector(bin);
+    let logStreamCleanup = null;
+    try {
+        let lastLogAt = Date.now();
+        let idleMessageShown = false;
+        let consecutiveErrors = 0;
+        let lastStatus;
+        logStreamCleanup = setupLogPolling({
+            stackId,
+            operationId,
+            auth,
+            log,
+            verbose,
+            onActivity: () => {
+                lastLogAt = Date.now();
+            },
+            onLogEntry: (logEntry) => logHints.inspectLog(logEntry),
+        });
+        // balk in case read replica lags
+        await sleep(OPERATION_POLL_INITIAL_DELAY_MS);
+        while (true) {
+            const { ok, error: pollError, operation, response, } = await getOperation({
+                stackId,
+                operationId,
+                auth,
+                logger: log,
+                includeDestroyed,
+            });
+            const httpStatus = response?.status;
+            const state = classifyOperationPoll({ ok, httpStatus, operation });
+            if (state === 'completed') {
+                if (logStreamCleanup)
+                    logStreamCleanup();
+                log('');
+                return { type: 'completed' };
+            }
+            if (state === 'failed') {
+                if (logStreamCleanup)
+                    logStreamCleanup();
+                log('');
+                return { type: 'failed', logHints: logHints.getSuggestions() };
+            }
+            // tolerate a few consecutive errors; the operation was accepted and may still be running
+            if (state === 'error') {
+                consecutiveErrors += 1;
+                log.verbose(`Could not read ${progressNoun} status (HTTP ${httpStatus ?? 'unknown'}${pollError ? `: ${pollError}` : ''}); retrying (${consecutiveErrors}/${OPERATION_POLL_MAX_CONSECUTIVE_ERRORS}).`);
+                if (consecutiveErrors >= OPERATION_POLL_MAX_CONSECUTIVE_ERRORS) {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    log('');
+                    return { type: 'unconfirmed', error: pollError ?? undefined };
+                }
+            }
+            else {
+                consecutiveErrors = 0;
+                if (httpStatus === 404) {
+                    log.verbose(`Waiting for ${progressNoun} status (HTTP 404); retrying.`);
+                }
+                else if (operation && operation.status !== lastStatus) {
+                    log.verbose(`${progressNoun} operation status: ${operation.status}.`);
+                    lastStatus = operation.status;
+                }
+            }
+            if (!idleMessageShown && Date.now() - lastLogAt > 60_000) {
+                log(`No new activity for 60 seconds. The ${progressNoun} is still running on Sanity servers.`);
+                log(`You can safely exit and check status later with \`npx ${bin} blueprints info\`.`);
+                idleMessageShown = true;
+            }
+            await sleep(OPERATION_POLL_INTERVAL_MS);
+        }
+    }
+    catch (error) {
+        if (logStreamCleanup)
+            logStreamCleanup();
+        throw error;
+    }
+}

package/dist/baseCommands.js

@@ -136,6 +136,7 @@ export class RuntimeCommand extends Command {
             suggestions: result.suggestions,
             ref: result.ref,
             code: result.code,
+            exit: result.exitCode,
         });
     }
     /**

package/dist/commands/blueprints/deploy.js

@@ -14,7 +14,9 @@ Use --no-wait to queue the deployment and return immediately without waiting for
 
 Use --fn-installer to force which package manager to use when deploying functions.
 
-Set SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for processing resource assets.`;
+Set SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for processing resource assets.
+
+Exit codes: 0 deployed, 2 deployment failed, 75 deployment accepted but completion could not be confirmed (rerun 'blueprints info' to check).`;
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --message "Enable staging dataset"',

package/dist/commands/blueprints/destroy.js

@@ -9,7 +9,9 @@ export default class DestroyCommand extends ResolvedCommand {
 
 This is a destructive operation. You will be prompted to confirm unless --force is specified.
 
-Use this to clean up test environments or decommission a Stack you no longer need.`;
+Use this to clean up test environments or decommission a Stack you no longer need.
+
+Exit codes: 0 destroyed, 2 destruction failed, 75 destruction accepted but completion could not be confirmed (rerun 'blueprints info' to check).`;
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --stack <name-or-id> --project-id <projectId> --force --no-wait',

package/dist/cores/blueprints/deploy.js

@@ -1,10 +1,10 @@
-import { setTimeout as sleep } from 'node:timers/promises';
 import { stashAsset } from '../../actions/blueprints/assets.js';
-import { setupLogPolling } from '../../actions/blueprints/logs-polling.js';
 import { getStack, updateStack } from '../../actions/blueprints/stacks.js';
+import { waitForOperation } from '../../actions/blueprints/wait-for-operation.js';
 import { checkUserPermission } from '../../actions/sanity/access.js';
 import { createHintCollector } from '../../utils/blueprints/hints.js';
 import { niceId } from '../../utils/display/presenters.js';
+import { CODE_OPERATION_UNCONFIRMED, EXIT_OPERATION_UNCONFIRMED } from '../../utils/exit-codes.js';
 import { styleText } from '../../utils/style-text.js';
 import { isAssetResource } from '../../utils/types.js';
 const DEFAULT_ASSET_TIMEOUT = 60;
@@ -91,90 +91,55 @@ export async function blueprintDeployCore(options) {
             const legacyWarning = await legacyPermissionsNoticePromise;
             return {
                 success: true,
-                json: { stackId: stack.id, resources },
+                json: { stackId, resources },
                 data: { resources },
                 warnings: legacyWarning ? [legacyWarning] : undefined,
             };
         }
         log(styleText('dim', 'Stack deployment progress:'));
         log('');
-        const logHints = createHintCollector(bin);
-        let logStreamCleanup = null;
-        try {
-            let lastLogAt = Date.now();
-            let idleMessageShown = false;
-            logStreamCleanup = setupLogPolling({
-                stackId: stack.id,
-                operationId: stack.operationId,
-                auth,
-                log,
-                verbose,
-                onActivity: () => {
-                    lastLogAt = Date.now();
-                },
-                onLogEntry: (logEntry) => logHints.inspectLog(logEntry),
-            });
-            while (true) {
-                const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth, logger: log });
-                if (!ok) {
-                    if (logStreamCleanup)
-                        logStreamCleanup();
-                    return {
-                        success: false,
-                        error: 'Failed to check Stack deployment status',
-                        suggestions: [
-                            'The deployment may still be running on Sanity servers.',
-                            `Run \`npx ${bin} blueprints info\` to check status.`,
-                        ],
-                    };
-                }
-                const operation = currentStack.recentOperation;
-                if (!operation) {
-                    if (logStreamCleanup)
-                        logStreamCleanup();
-                    return { success: false, error: 'No Stack deployment operation found' };
-                }
-                if (operation.status === 'FAILED') {
-                    if (logStreamCleanup)
-                        logStreamCleanup();
-                    log('');
-                    return {
-                        success: false,
-                        error: 'Stack deployment failed',
-                        suggestions: [
-                            ...logHints.getSuggestions(),
-                            'Review the deployment output above for error details.',
-                            `Run \`npx ${bin} blueprints logs --verbose\` for more context.`,
-                            `Run \`npx ${bin} blueprints plan\` to identify issues with your Blueprint.`,
-                        ],
-                    };
-                }
-                if (operation.status === 'COMPLETED') {
-                    if (logStreamCleanup)
-                        logStreamCleanup();
-                    log('');
-                    log(styleText(['bold', 'green'], 'Stack deployment completed!'));
-                    const legacyWarning = await legacyPermissionsNoticePromise;
-                    return {
-                        success: true,
-                        json: { stackId: stack.id, resources },
-                        data: { resources },
-                        warnings: legacyWarning ? [legacyWarning] : undefined,
-                    };
-                }
-                if (!idleMessageShown && Date.now() - lastLogAt > 60_000) {
-                    log(`No new activity for 60 seconds. The deployment is still running on Sanity servers.`);
-                    log(`You can safely exit and check status later with \`npx ${bin} blueprints info\`.`);
-                    idleMessageShown = true;
-                }
-                await sleep(1500);
-            }
+        const outcome = await waitForOperation({
+            stackId,
+            operationId: stack.operationId,
+            auth,
+            log,
+            bin,
+            verbose,
+            progressNoun: 'deployment',
+        });
+        if (outcome.type === 'completed') {
+            log(styleText(['bold', 'green'], 'Stack deployment completed!'));
+            const legacyWarning = await legacyPermissionsNoticePromise;
+            return {
+                success: true,
+                json: { stackId, resources },
+                data: { resources },
+                warnings: legacyWarning ? [legacyWarning] : undefined,
+            };
         }
-        catch (error) {
-            if (logStreamCleanup)
-                logStreamCleanup();
-            throw error;
+        if (outcome.type === 'unconfirmed') {
+            return {
+                success: false,
+                error: `Stack deployment was accepted but completion could not be confirmed${outcome.error ? ` (${outcome.error})` : ''}.`,
+                code: CODE_OPERATION_UNCONFIRMED,
+                exitCode: EXIT_OPERATION_UNCONFIRMED,
+                suggestions: [
+                    'The deployment may or may not have finished on Sanity servers.',
+                    `Run \`npx ${bin} blueprints info\` to check status.`,
+                    `Run \`npx ${bin} blueprints logs --watch\` to keep streaming logs.`,
+                ],
+            };
         }
+        return {
+            success: false,
+            error: 'Stack deployment failed',
+            suggestions: [
+                ...outcome.logHints,
+                'Review the deployment output above for error details.',
+                `Run \`npx ${bin} blueprints logs --verbose\` for more context.`,
+                `Run \`npx ${bin} blueprints plan\` to identify issues with your Blueprint.`,
+            ],
+        };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);

package/dist/cores/blueprints/destroy.js

@@ -1,14 +1,14 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { confirm } from '@inquirer/prompts';
 import { patchConfigFile } from '../../actions/blueprints/config.js';
-import { setupLogPolling } from '../../actions/blueprints/logs-polling.js';
 import { destroyStack, getStack, resolveStackIdByNameOrId } from '../../actions/blueprints/stacks.js';
-import { createHintCollector } from '../../utils/blueprints/hints.js';
+import { waitForOperation } from '../../actions/blueprints/wait-for-operation.js';
 import { niceId } from '../../utils/display/presenters.js';
+import { CODE_OPERATION_UNCONFIRMED, EXIT_OPERATION_UNCONFIRMED } from '../../utils/exit-codes.js';
 import { styleText } from '../../utils/style-text.js';
 export async function blueprintDestroyCore(options) {
     const { bin = 'sanity', log, token, blueprint, flags } = options;
-    const { force = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, stack: flagStack, 'no-wait': noWait = false, verbose: _verbose = false, } = flags;
+    const { force = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, stack: flagStack, 'no-wait': noWait = false, verbose = false, } = flags;
     // 3-flag combo: destroy without needing a local blueprint config
     if ((flagProjectId || flagOrganizationId) && flagStack && force) {
         let scopeType;
@@ -45,6 +45,7 @@ export async function blueprintDestroyCore(options) {
             auth,
             log,
             bin,
+            verbose,
         });
     }
     const { scopeType, scopeId, stackId } = blueprint;
@@ -126,6 +127,7 @@ export async function blueprintDestroyCore(options) {
             auth,
             log,
             bin,
+            verbose,
         });
     }
     catch (error) {
@@ -147,62 +149,44 @@ function clearLocalStackIdFromConfig(blueprint, destroyedStackId, log) {
     }
 }
 async function waitForDestruction(options) {
-    const { stackId, stackName, operationId, auth, log, bin } = options;
+    const { stackId, stackName, operationId, auth, log, bin, verbose = false } = options;
     log(styleText('dim', 'Stack destruction progress:'));
     log('');
-    const logHints = createHintCollector(bin);
-    let logStreamCleanup = null;
-    try {
-        let lastLogAt = Date.now();
-        let idleMessageShown = false;
-        logStreamCleanup = setupLogPolling({
-            stackId,
-            operationId,
-            auth,
-            log,
-            onActivity: () => {
-                lastLogAt = Date.now();
-            },
-            onLogEntry: (logEntry) => logHints.inspectLog(logEntry),
-        });
-        while (true) {
-            const { ok, stack: currentStack } = await getStack({ stackId, auth, logger: log });
-            const operation = currentStack?.recentOperation;
-            if (!ok || !operation || operation?.status === 'COMPLETED') {
-                // Operation is also marked destroyed when stack is deleted;
-                // it's possible that the operation is "gone" or available and "COMPLETED"
-                if (logStreamCleanup)
-                    logStreamCleanup();
-                log('');
-                log(styleText(['bold', 'magenta'], 'Stack destruction completed!'));
-                return { success: true, json: { stackId, stackName } };
-            }
-            if (operation.status === 'FAILED') {
-                if (logStreamCleanup)
-                    logStreamCleanup();
-                log('');
-                return {
-                    success: false,
-                    error: 'Stack destruction failed',
-                    suggestions: [
-                        ...logHints.getSuggestions(),
-                        'Review the destruction output above for error details.',
-                        `Run \`npx ${bin} blueprints logs --verbose\` for more context.`,
-                        `Run \`npx ${bin} blueprints info\` to view current Stack status.`,
-                    ],
-                };
-            }
-            if (!idleMessageShown && Date.now() - lastLogAt > 60_000) {
-                log(`No new activity for 60 seconds. The destruction is still running on Sanity servers.`);
-                log(`You can safely exit and check status later with \`npx ${bin} blueprints info\`.`);
-                idleMessageShown = true;
-            }
-            await sleep(1500);
-        }
+    const outcome = await waitForOperation({
+        stackId,
+        operationId,
+        auth,
+        log,
+        bin,
+        verbose,
+        includeDestroyed: true,
+        progressNoun: 'destruction',
+    });
+    if (outcome.type === 'completed') {
+        log(styleText(['bold', 'magenta'], 'Stack destruction completed!'));
+        return { success: true, json: { stackId, stackName } };
     }
-    catch (error) {
-        if (logStreamCleanup)
-            logStreamCleanup();
-        throw error;
+    if (outcome.type === 'unconfirmed') {
+        return {
+            success: false,
+            error: `Stack destruction was accepted but completion could not be confirmed${outcome.error ? ` (${outcome.error})` : ''}.`,
+            code: CODE_OPERATION_UNCONFIRMED,
+            exitCode: EXIT_OPERATION_UNCONFIRMED,
+            suggestions: [
+                'The destruction may or may not have finished on Sanity servers.',
+                `Run \`npx ${bin} blueprints info\` to view current Stack status.`,
+                `Run \`npx ${bin} blueprints logs --watch\` to keep streaming logs.`,
+            ],
+        };
     }
+    return {
+        success: false,
+        error: 'Stack destruction failed',
+        suggestions: [
+            ...outcome.logHints,
+            'Review the destruction output above for error details.',
+            `Run \`npx ${bin} blueprints logs --verbose\` for more context.`,
+            `Run \`npx ${bin} blueprints info\` to view current Stack status.`,
+        ],
+    };
 }

package/dist/cores/index.d.ts

@@ -40,6 +40,8 @@ export type CoreResult = {
     ref?: string;
     /** A machine-readable error code. */
     code?: string;
+    /** Overrides the process exit code (defaults to oclif's 2). */
+    exitCode?: number;
     streaming?: never;
     json?: never;
 } | {

package/dist/utils/exit-codes.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Process exit codes used by the CLI.
+ *
+ * oclif exits 0 on success and 2 on error by default. Codes defined here are
+ * deliberate, documented signals for scripts/CI to branch on.
+ */
+/**
+ * A deploy/destroy was accepted but the CLI could not confirm completion
+ * (e.g. the operation status endpoint was unavailable). The operation may or
+ * may not have finished; rerun `blueprints info` to check. Mirrors EX_TEMPFAIL
+ * from sysexits.h ("temporary failure; the user is invited to retry").
+ */
+export declare const EXIT_OPERATION_UNCONFIRMED = 75;
+/** Machine-readable error code paired with {@link EXIT_OPERATION_UNCONFIRMED}. */
+export declare const CODE_OPERATION_UNCONFIRMED = "OPERATION_UNCONFIRMED";

package/dist/utils/exit-codes.js

@@ -0,0 +1,15 @@
+/**
+ * Process exit codes used by the CLI.
+ *
+ * oclif exits 0 on success and 2 on error by default. Codes defined here are
+ * deliberate, documented signals for scripts/CI to branch on.
+ */
+/**
+ * A deploy/destroy was accepted but the CLI could not confirm completion
+ * (e.g. the operation status endpoint was unavailable). The operation may or
+ * may not have finished; rerun `blueprints info` to check. Mirrors EX_TEMPFAIL
+ * from sysexits.h ("temporary failure; the user is invited to retry").
+ */
+export const EXIT_OPERATION_UNCONFIRMED = 75;
+/** Machine-readable error code paired with {@link EXIT_OPERATION_UNCONFIRMED}. */
+export const CODE_OPERATION_UNCONFIRMED = 'OPERATION_UNCONFIRMED';

package/oclif.manifest.json

@@ -373,7 +373,7 @@
     "blueprints:deploy": {
       "aliases": [],
       "args": {},
-      "description": "Applies your local Blueprint to the remote Stack, creating, updating, or removing resources as needed. This is the primary command for applying infrastructure changes.\n\nBefore deploying, run 'blueprints plan' to preview changes. After deployment, use 'blueprints info' to verify Stack status or 'blueprints logs' to monitor activity.\n\nUse --no-wait to queue the deployment and return immediately without waiting for completion.\n\nUse --fn-installer to force which package manager to use when deploying functions.\n\nSet SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for processing resource assets.",
+      "description": "Applies your local Blueprint to the remote Stack, creating, updating, or removing resources as needed. This is the primary command for applying infrastructure changes.\n\nBefore deploying, run 'blueprints plan' to preview changes. After deployment, use 'blueprints info' to verify Stack status or 'blueprints logs' to monitor activity.\n\nUse --no-wait to queue the deployment and return immediately without waiting for completion.\n\nUse --fn-installer to force which package manager to use when deploying functions.\n\nSet SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for processing resource assets.\n\nExit codes: 0 deployed, 2 deployment failed, 75 deployment accepted but completion could not be confirmed (rerun 'blueprints info' to check).",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %> --message \"Enable staging dataset\"",
@@ -523,7 +523,7 @@
     "blueprints:destroy": {
       "aliases": [],
       "args": {},
-      "description": "Permanently removes the remote Stack and all its provisioned resources. Your Blueprint manifest and resource files remain intact; \"stackId\" is unset in your local config.\n\nThis is a destructive operation. You will be prompted to confirm unless --force is specified.\n\nUse this to clean up test environments or decommission a Stack you no longer need.",
+      "description": "Permanently removes the remote Stack and all its provisioned resources. Your Blueprint manifest and resource files remain intact; \"stackId\" is unset in your local config.\n\nThis is a destructive operation. You will be prompted to confirm unless --force is specified.\n\nUse this to clean up test environments or decommission a Stack you no longer need.\n\nExit codes: 0 destroyed, 2 destruction failed, 75 destruction accepted but completion could not be confirmed (rerun 'blueprints info' to check).",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %> --stack <name-or-id> --project-id <projectId> --force --no-wait"
@@ -2998,5 +2998,5 @@
       ]
     }
   },
-  "version": "15.1.4"
+  "version": "15.1.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "15.1.4",
+  "version": "15.1.5",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",