@sanity/runtime-cli 14.12.0 → 14.12.1

package/dist/commands/blueprints/deploy.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../baseCommands.js';
-export default class DeployCommand extends DeployedStackCommand<typeof DeployCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class DeployCommand extends ResolvedCommand<typeof DeployCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/deploy.js

@@ -1,9 +1,10 @@
 import { Flags } from '@oclif/core';
-import { DeployedStackCommand, stackFlag, unhide } from '../../baseCommands.js';
+import { ResolvedCommand, stackFlagConfig } from '../../baseCommands.js';
 import { blueprintDeployCore } from '../../cores/blueprints/deploy.js';
 import { Logger } from '../../utils/logger.js';
 import { INSTALLER_OPTIONS } from '../../utils/types.js';
-export default class DeployCommand extends DeployedStackCommand {
+export default class DeployCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'Deploy the local Blueprint to the remote Stack';
     static 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.
 
@@ -21,7 +22,7 @@ Set SANITY_ASSET_TIMEOUT (seconds) to override the 60-second timeout for process
         '<%= config.bin %> <%= command.id %> --fn-installer npm',
     ];
     static flags = {
-        stack: unhide(stackFlag),
+        stack: Flags.string({ ...stackFlagConfig }),
         message: Flags.string({
             description: 'Message describing the deployment (e.g. reason for change)',
             char: 'm',

package/dist/commands/blueprints/destroy.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class DestroyCommand extends LocalBlueprintCommand<typeof DestroyCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class DestroyCommand extends ResolvedCommand<typeof DestroyCommand> {
+    static needs: readonly ["token", "blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/destroy.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { LocalBlueprintCommand, organizationIdFlagConfig, projectIdFlagConfig, } from '../../baseCommands.js';
+import { organizationIdFlagConfig, projectIdFlagConfig, ResolvedCommand } from '../../baseCommands.js';
 import { blueprintDestroyCore } from '../../cores/blueprints/destroy.js';
 import { Logger } from '../../utils/logger.js';
-export default class DestroyCommand extends LocalBlueprintCommand {
+export default class DestroyCommand extends ResolvedCommand {
+    static needs = ['token', 'blueprint'];
     static summary = 'Destroy a remote Stack deployment and its resources';
     static description = `Permanently removes the remote Stack and all its provisioned resources. Your local Blueprint files remain untouched, allowing you to redeploy later with 'blueprints init' + 'blueprints deploy'.
 

package/dist/commands/blueprints/doctor.d.ts

@@ -6,7 +6,6 @@ export default class DoctorCommand extends RuntimeCommand<typeof DoctorCommand>
     static flags: {
         path: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         fix: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<Record<string, unknown> | undefined>;

package/dist/commands/blueprints/doctor.js

@@ -1,5 +1,5 @@
 import { Flags } from '@oclif/core';
-import { baseFlags, RuntimeCommand, unhide } from '../../baseCommands.js';
+import { pathFlagConfig, RuntimeCommand } from '../../baseCommands.js';
 import config from '../../config.js';
 import { blueprintDoctorCore } from '../../cores/blueprints/doctor.js';
 import { Logger } from '../../utils/logger.js';
@@ -14,12 +14,11 @@ Run this command when encountering errors with other Blueprint commands. Use --f
         '<%= config.bin %> <%= command.id %> --fix',
     ];
     static flags = {
-        path: unhide(baseFlags.path),
+        path: Flags.string({ ...pathFlagConfig }),
         fix: Flags.boolean({
             description: 'Interactively fix configuration issues',
             default: false,
         }),
-        json: unhide(baseFlags.json),
         verbose: Flags.boolean({
             description: 'Verbose output; defaults to true',
             default: true,

package/dist/commands/blueprints/init.d.ts

@@ -14,7 +14,6 @@ export default class InitCommand extends RuntimeCommand<typeof InitCommand> {
         'organization-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'stack-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'stack-name': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/blueprints/init.js

@@ -1,5 +1,5 @@
 import { Args, Flags } from '@oclif/core';
-import { baseFlags, organizationIdFlagConfig, projectIdFlagConfig, RuntimeCommand, unhide, } from '../../baseCommands.js';
+import { organizationIdFlagConfig, projectIdFlagConfig, RuntimeCommand } from '../../baseCommands.js';
 import { blueprintInitCore } from '../../cores/blueprints/init.js';
 import { Logger } from '../../utils/logger.js';
 import { validTokenOrErrorMessage } from '../../utils/validated-token.js';
@@ -50,7 +50,6 @@ After initialization, use 'blueprints plan' to preview changes, then 'blueprints
             aliases: ['name'],
             exclusive: ['stack-id'],
         }),
-        verbose: unhide(baseFlags.verbose),
     };
     async run() {
         const log = Logger(this.log.bind(this), this.flags);

package/dist/commands/blueprints/logs.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../baseCommands.js';
-export default class LogsCommand extends DeployedStackCommand<typeof LogsCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class LogsCommand extends ResolvedCommand<typeof LogsCommand> {
+    static needs: readonly ["deployedStack"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/logs.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { DeployedStackCommand, stackFlag, unhide } from '../../baseCommands.js';
+import { ResolvedCommand, stackFlagConfig } from '../../baseCommands.js';
 import { blueprintLogsCore } from '../../cores/blueprints/logs.js';
 import { Logger } from '../../utils/logger.js';
-export default class LogsCommand extends DeployedStackCommand {
+export default class LogsCommand extends ResolvedCommand {
+    static needs = ['deployedStack'];
     static summary = "Display logs for the current Blueprint's Stack deployment";
     static description = `Retrieves Stack deployment logs, useful for debugging and monitoring deployment activity.
 
@@ -14,7 +15,7 @@ If you're not seeing expected logs, verify your Stack is deployed with 'blueprin
         '<%= config.bin %> <%= command.id %> --watch',
     ];
     static flags = {
-        stack: unhide(stackFlag),
+        stack: Flags.string({ ...stackFlagConfig }),
         watch: Flags.boolean({
             char: 'w',
             description: 'Watch for new Stack logs (streaming mode)',

package/dist/commands/blueprints/plan.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class PlanCommand extends LocalBlueprintCommand<typeof PlanCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class PlanCommand extends ResolvedCommand<typeof PlanCommand> {
+    static needs: readonly ["token", "blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/plan.js

@@ -1,14 +1,16 @@
-import { LocalBlueprintCommand, stackFlag, unhide } from '../../baseCommands.js';
+import { Flags } from '@oclif/core';
+import { ResolvedCommand, stackFlagConfig } from '../../baseCommands.js';
 import { blueprintPlanCore } from '../../cores/blueprints/plan.js';
 import { Logger } from '../../utils/logger.js';
-export default class PlanCommand extends LocalBlueprintCommand {
+export default class PlanCommand extends ResolvedCommand {
+    static needs = ['token', 'blueprint'];
     static summary = 'Preview changes that will be applied to the remote Stack';
     static description = `Use this command to preview what changes will be applied to your remote Stack before deploying. This is a safe, read-only operation—no resources are created, modified, or deleted.
 
 Run 'blueprints plan' after making local changes to your Blueprint manifest to verify the expected diff. When ready, run 'blueprints deploy' to apply changes.`;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
-        stack: unhide(stackFlag),
+        stack: Flags.string({ ...stackFlagConfig }),
     };
     async run() {
         const result = await blueprintPlanCore({

package/dist/commands/blueprints/promote.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../baseCommands.js';
-export default class PromoteCommand extends DeployedStackCommand<typeof PromoteCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class PromoteCommand extends ResolvedCommand<typeof PromoteCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static hidden: boolean;

package/dist/commands/blueprints/promote.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { DeployedStackCommand } from '../../baseCommands.js';
+import { ResolvedCommand } from '../../baseCommands.js';
 import { blueprintPromoteCore } from '../../cores/blueprints/promote.js';
 import { Logger } from '../../utils/logger.js';
-export default class PromoteCommand extends DeployedStackCommand {
+export default class PromoteCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'Promote a Stack from project scope to organization scope';
     static description = `Promotes a deployed Stack to organization scope, enabling management of org-level resources. Promotion cannot be reversed.
 

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

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class StacksCommand extends LocalBlueprintCommand<typeof StacksCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class StacksCommand extends ResolvedCommand<typeof StacksCommand> {
+    static needs: readonly ["token", "blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/stacks.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { LocalBlueprintCommand, organizationIdFlagConfig, projectIdFlagConfig, } from '../../baseCommands.js';
+import { organizationIdFlagConfig, projectIdFlagConfig, ResolvedCommand } from '../../baseCommands.js';
 import { blueprintStacksCore } from '../../cores/blueprints/stacks.js';
 import { Logger } from '../../utils/logger.js';
-export default class StacksCommand extends LocalBlueprintCommand {
+export default class StacksCommand extends ResolvedCommand {
+    static needs = ['token', 'blueprint'];
     static summary = 'List remote Stack deployments for your project or organization';
     static description = `Shows all Stacks associated with a project or organization. By default, lists Stacks scoped to the local Blueprint.
 

package/dist/commands/functions/add.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class AddCommand extends LocalBlueprintCommand<typeof AddCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class AddCommand extends ResolvedCommand<typeof AddCommand> {
+    static needs: readonly ["blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/functions/add.js

@@ -1,10 +1,11 @@
 import { Flags } from '@oclif/core';
-import { LocalBlueprintCommand } from '../../baseCommands.js';
+import { ResolvedCommand } from '../../baseCommands.js';
 import { FUNCTION_TYPES } from '../../constants.js';
 import { functionAddCore } from '../../cores/functions/index.js';
 import { Logger } from '../../utils/logger.js';
 import { INSTALLER_OPTIONS } from '../../utils/types.js';
-export default class AddCommand extends LocalBlueprintCommand {
+export default class AddCommand extends ResolvedCommand {
+    static needs = ['blueprint'];
     static summary = 'Add a Function to your Blueprint';
     static description = `Scaffolds a new Function in the functions/ folder and templates a resource for your Blueprint manifest.
 

package/dist/commands/functions/build.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class BuildCommand extends LocalBlueprintCommand<typeof BuildCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class BuildCommand extends ResolvedCommand<typeof BuildCommand> {
+    static needs: readonly ["blueprint"];
     static summary: string;
     static hidden: boolean;
     static args: {

package/dist/commands/functions/build.js

@@ -1,9 +1,10 @@
 import { Args, Flags } from '@oclif/core';
-import { LocalBlueprintCommand } from '../../baseCommands.js';
+import { ResolvedCommand } from '../../baseCommands.js';
 import { functionBuildCore } from '../../cores/functions/build.js';
 import { Logger } from '../../utils/logger.js';
 import { INSTALLER_OPTIONS } from '../../utils/types.js';
-export default class BuildCommand extends LocalBlueprintCommand {
+export default class BuildCommand extends ResolvedCommand {
+    static needs = ['blueprint'];
     static summary = 'Build Sanity Function(s) to zip archives';
     static hidden = true;
     static args = {

package/dist/commands/functions/dev.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class DevCommand extends LocalBlueprintCommand<typeof DevCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class DevCommand extends ResolvedCommand<typeof DevCommand> {
+    static needs: readonly ["blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/functions/dev.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { LocalBlueprintCommand } from '../../baseCommands.js';
+import { ResolvedCommand } from '../../baseCommands.js';
 import { functionDevCore } from '../../cores/functions/dev.js';
 import { Logger } from '../../utils/logger.js';
-export default class DevCommand extends LocalBlueprintCommand {
+export default class DevCommand extends ResolvedCommand {
+    static needs = ['blueprint'];
     static summary = 'Start the Sanity Function emulator';
     static description = `Runs a local, web-based development server to test your functions before deploying.
 

package/dist/commands/functions/env/add.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../../baseCommands.js';
-export default class EnvAddCommand extends DeployedStackCommand<typeof EnvAddCommand> {
+import { ResolvedCommand } from '../../../baseCommands.js';
+export default class EnvAddCommand extends ResolvedCommand<typeof EnvAddCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static args: {

package/dist/commands/functions/env/add.js

@@ -1,8 +1,9 @@
 import { Args } from '@oclif/core';
-import { DeployedStackCommand } from '../../../baseCommands.js';
+import { ResolvedCommand } from '../../../baseCommands.js';
 import { functionEnvAddCore } from '../../../cores/functions/env/add.js';
 import { Logger } from '../../../utils/logger.js';
-export default class EnvAddCommand extends DeployedStackCommand {
+export default class EnvAddCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'Add or set an environment variable for a deployed function';
     static description = `Sets an environment variable in a deployed Sanity Function. If the variable already exists, its value is updated.
 

package/dist/commands/functions/env/list.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../../baseCommands.js';
-export default class EnvListCommand extends DeployedStackCommand<typeof EnvListCommand> {
+import { ResolvedCommand } from '../../../baseCommands.js';
+export default class EnvListCommand extends ResolvedCommand<typeof EnvListCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static args: {

package/dist/commands/functions/env/list.js

@@ -1,8 +1,9 @@
 import { Args } from '@oclif/core';
-import { DeployedStackCommand } from '../../../baseCommands.js';
+import { ResolvedCommand } from '../../../baseCommands.js';
 import { functionEnvListCore } from '../../../cores/functions/env/list.js';
 import { Logger } from '../../../utils/logger.js';
-export default class EnvListCommand extends DeployedStackCommand {
+export default class EnvListCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'List environment variables for a deployed function';
     static description = `Displays all environment variables (keys only) configured in a deployed Sanity Function.
 

package/dist/commands/functions/env/remove.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../../baseCommands.js';
-export default class EnvRemoveCommand extends DeployedStackCommand<typeof EnvRemoveCommand> {
+import { ResolvedCommand } from '../../../baseCommands.js';
+export default class EnvRemoveCommand extends ResolvedCommand<typeof EnvRemoveCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static args: {

package/dist/commands/functions/env/remove.js

@@ -1,8 +1,9 @@
 import { Args } from '@oclif/core';
-import { DeployedStackCommand } from '../../../baseCommands.js';
+import { ResolvedCommand } from '../../../baseCommands.js';
 import { functionEnvRemoveCore } from '../../../cores/functions/env/remove.js';
 import { Logger } from '../../../utils/logger.js';
-export default class EnvRemoveCommand extends DeployedStackCommand {
+export default class EnvRemoveCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'Remove an environment variable from a deployed function';
     static description = `Deletes an environment variable from a deployed Sanity Function. The change takes effect on the next function invocation.
 

package/dist/commands/functions/logs.d.ts

@@ -1,5 +1,6 @@
-import { DeployedStackCommand } from '../../baseCommands.js';
-export default class LogsCommand extends DeployedStackCommand<typeof LogsCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class LogsCommand extends ResolvedCommand<typeof LogsCommand> {
+    static needs: readonly ["deployedStack", "blueprint"];
     static summary: string;
     static description: string;
     static args: {

package/dist/commands/functions/logs.js

@@ -1,8 +1,9 @@
 import { Args, Flags } from '@oclif/core';
-import { DeployedStackCommand, stackFlag, unhide } from '../../baseCommands.js';
+import { ResolvedCommand, stackFlagConfig } from '../../baseCommands.js';
 import { functionLogsCore } from '../../cores/functions/logs.js';
 import { Logger } from '../../utils/logger.js';
-export default class LogsCommand extends DeployedStackCommand {
+export default class LogsCommand extends ResolvedCommand {
+    static needs = ['deployedStack', 'blueprint'];
     static summary = 'Retrieve or delete logs for a Sanity Function';
     static description = `Fetches execution logs from a deployed function, useful for debugging production issues or monitoring activity.
 
@@ -17,7 +18,7 @@ Use --watch (-w) to stream logs in real-time. Use --delete to clear all logs for
         '<%= config.bin %> <%= command.id %> <name> --delete',
     ];
     static flags = {
-        stack: unhide(stackFlag),
+        stack: Flags.string({ ...stackFlagConfig }),
         limit: Flags.integer({
             char: 'l',
             description: 'Total number of log entries to retrieve',

package/dist/commands/functions/test.d.ts

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class TestCommand extends LocalBlueprintCommand<typeof TestCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class TestCommand extends ResolvedCommand<typeof TestCommand> {
+    static needs: readonly ["blueprint"];
     static summary: string;
     static description: string;
     static args: {

package/dist/commands/functions/test.js

@@ -1,8 +1,9 @@
 import { Args, Flags } from '@oclif/core';
-import { LocalBlueprintCommand, organizationIdFlagConfig, projectIdFlagConfig, } from '../../baseCommands.js';
+import { organizationIdFlagConfig, projectIdFlagConfig, ResolvedCommand } from '../../baseCommands.js';
 import { functionTestCore } from '../../cores/functions/test.js';
 import { Logger } from '../../utils/logger.js';
-export default class TestCommand extends LocalBlueprintCommand {
+export default class TestCommand extends ResolvedCommand {
+    static needs = ['blueprint'];
     static summary = 'Invoke a local Sanity Function';
     static description = `Executes a function locally with the provided payload, simulating how it would run when deployed. Use this to test your function logic before deploying.
 

package/dist/cores/blueprints/config.js

@@ -9,10 +9,15 @@ export async function blueprintConfigCore(options) {
     const providedConfigFlag = [flagProjectId, flagStack, flagOrganizationId].some(Boolean);
     const { stackId: configStackId, scopeType: configScopeType, scopeId: configScopeId, blueprintConfig, fileInfo, } = blueprint;
     const blueprintFilePath = fileInfo.blueprintFilePath;
+    const hasConfigFile = !!blueprintConfig;
     if (!configStackId && !configScopeType && !configScopeId) {
-        log(warn('Incomplete configuration.'));
+        if (hasConfigFile) {
+            log(warn('Incomplete configuration.'));
+        }
+        else {
+            log('No configuration file found.');
+        }
         if (!editConfig) {
-            // blueprint.json exists but no config JSON
             log(`Run \`npx ${bin} blueprints doctor\` for diagnostics.`);
             return { success: true }; // not necessarily fatal
         }
@@ -61,7 +66,7 @@ export async function blueprintConfigCore(options) {
                 // creates a new config file with the given properties
                 try {
                     const newConfig = writeConfigFile(blueprintFilePath, configUpdate);
-                    printConfig({ configLabel: 'Updated', log, config: newConfig });
+                    printConfig({ configLabel: hasConfigFile ? 'Updated' : 'New', log, config: newConfig });
                     return { success: true, json: { config: newConfig } };
                 }
                 catch {
@@ -98,7 +103,7 @@ export async function blueprintConfigCore(options) {
                 projectId: updatedProjectId,
                 stackId: updatedStackId,
             });
-            printConfig({ configLabel: 'Updated', log, config: newConfig });
+            printConfig({ configLabel: hasConfigFile ? 'Updated' : 'New', log, config: newConfig });
             return { success: true, json: { config: newConfig } };
         }
         catch {

package/dist/cores/blueprints/destroy.js

@@ -8,7 +8,7 @@ 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;
-    // 3-flag combo: just destroy it
+    // 3-flag combo: destroy without needing a local blueprint config
     if ((flagProjectId || flagOrganizationId) && flagStack && force) {
         let scopeType;
         let scopeId;
@@ -25,6 +25,7 @@ export async function blueprintDestroyCore(options) {
         }
         const auth = { token, scopeType, scopeId };
         const resolvedId = await resolveStackIdByNameOrId(flagStack, auth, log);
+        const isoNow = new Date().toISOString();
         const { ok, error, stack } = await destroyStack({
             stackId: resolvedId,
             auth,
@@ -32,8 +33,18 @@ export async function blueprintDestroyCore(options) {
         });
         if (!ok)
             return { success: false, error: error || 'Failed to destroy Stack deployment' };
-        log(`Stack deployment "${stack.name}" ${niceId(stack.id)} destroyed`);
-        return { success: true, json: { stackId: stack.id, stackName: stack.name } };
+        if (noWait) {
+            log(styleText(['bold', 'magenta'], 'Stack destruction started!'));
+            return { success: true, json: { stackId: stack.id, stackName: stack.name } };
+        }
+        return waitForDestruction({
+            stackId: stack.id,
+            stackName: stack.name,
+            auth,
+            log,
+            bin,
+            since: isoNow,
+        });
     }
     const { scopeType, scopeId, stackId } = blueprint;
     if (!scopeType || !scopeId)
@@ -103,62 +114,73 @@ export async function blueprintDestroyCore(options) {
             log(styleText(['bold', 'magenta'], 'Stack destruction started!'));
             return { success: true, json: { stackId: stack.id, stackName: stack.name } };
         }
-        log(styleText('dim', 'Stack destruction progress:'));
-        const logHints = createLogHintCollector(bin);
-        let logStreamCleanup = null;
-        try {
-            let lastLogAt = Date.now();
-            let idleMessageShown = false;
-            logStreamCleanup = await setupLogStreaming({
-                stackId: stack.id,
-                after: isoNow,
-                auth,
-                log,
-                onActivity: () => {
-                    lastLogAt = Date.now();
-                },
-                onLogEntry: (logEntry) => logHints.inspect(logEntry),
-            });
-            while (true) {
-                const { ok, stack: currentStack } = await getStack({ stackId: stack.id, 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(styleText(['bold', 'magenta'], 'Stack destruction completed!'));
-                    return { success: true, json: { stackId: stack.id, stackName: stack.name } };
-                }
-                if (operation.status === 'FAILED') {
-                    if (logStreamCleanup)
-                        logStreamCleanup();
-                    return {
-                        success: false,
-                        error: 'Stack destruction failed',
-                        suggestions: [
-                            ...logHints.getSuggestions(),
-                            `Run \`npx ${bin} blueprints logs\` to review destruction logs.`,
-                            `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);
-            }
-        }
-        catch (error) {
-            if (logStreamCleanup)
-                logStreamCleanup();
-            throw error;
-        }
+        return waitForDestruction({
+            stackId: stack.id,
+            stackName: stack.name,
+            auth,
+            log,
+            bin,
+            since: isoNow,
+        });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         return { success: false, error: errorMessage };
     }
 }
+async function waitForDestruction(options) {
+    const { stackId, stackName, auth, log, bin, since } = options;
+    log(styleText('dim', 'Stack destruction progress:'));
+    const logHints = createLogHintCollector(bin);
+    let logStreamCleanup = null;
+    try {
+        let lastLogAt = Date.now();
+        let idleMessageShown = false;
+        logStreamCleanup = await setupLogStreaming({
+            stackId,
+            after: since,
+            auth,
+            log,
+            onActivity: () => {
+                lastLogAt = Date.now();
+            },
+            onLogEntry: (logEntry) => logHints.inspect(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(styleText(['bold', 'magenta'], 'Stack destruction completed!'));
+                return { success: true, json: { stackId, stackName } };
+            }
+            if (operation.status === 'FAILED') {
+                if (logStreamCleanup)
+                    logStreamCleanup();
+                return {
+                    success: false,
+                    error: 'Stack destruction failed',
+                    suggestions: [
+                        ...logHints.getSuggestions(),
+                        `Run \`npx ${bin} blueprints logs\` to review destruction logs.`,
+                        `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);
+        }
+    }
+    catch (error) {
+        if (logStreamCleanup)
+            logStreamCleanup();
+        throw error;
+    }
+}