@sanity/runtime-cli 17.13.1-next.g13a83b0 → 17.13.1-next.g4fa31d1

package/README.md

@@ -90,7 +90,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/v17.13.1-next.g13a83b0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -127,7 +127,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/v17.13.1-next.g13a83b0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -183,7 +183,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/v17.13.1-next.g13a83b0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -221,7 +221,7 @@ EXAMPLES
   $ 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/v17.13.1-next.g13a83b0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -253,7 +253,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -291,7 +291,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/v17.13.1-next.g13a83b0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -355,7 +355,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/v17.13.1-next.g13a83b0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -401,7 +401,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/v17.13.1-next.g13a83b0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints mint-deploy-token`
 
@@ -446,7 +446,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/v17.13.1-next.g13a83b0/src/commands/blueprints/mint-deploy-token.ts)_
+_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/mint-deploy-token.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -479,7 +479,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/v17.13.1-next.g13a83b0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints promote`
 
@@ -515,7 +515,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/v17.13.1-next.g13a83b0/src/commands/blueprints/promote.ts)_
+_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/promote.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -556,7 +556,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/v17.13.1-next.g13a83b0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -608,7 +608,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/v17.13.1-next.g13a83b0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -643,7 +643,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -676,7 +676,7 @@ EXAMPLES
   $ sanity-run functions env add --stack <name-or-id> MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -706,7 +706,7 @@ EXAMPLES
   $ sanity-run functions env list --stack <name-or-id> MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -738,7 +738,7 @@ EXAMPLES
   $ sanity-run functions env remove --stack <name-or-id> MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -778,7 +778,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g13a83b0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -836,7 +836,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/v17.13.1-next.g13a83b0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.1-next.g4fa31d1/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/pre-deploy.d.ts

@@ -8,6 +8,7 @@ type PreDeployFailure = {
     code?: string;
     exitCode?: number;
     suggestions?: string[];
+    requestId?: string;
 };
 export type PreDeployResult = PreDeployFailure | {
     success: true;

package/dist/actions/blueprints/pre-deploy.js

@@ -1,9 +1,9 @@
 import { SANITY_FUNCTION_PREFIX } from '../../constants.js';
 import { resolveDeployedResources } from '../../utils/blueprints/resolve-deployed-resources.js';
+import { BUNDLE_SPECS, prepareBundleAsset, } from '../../utils/bundles/prepare-asset.js';
 import { CODE_OPERATION_UNCONFIRMED, EXIT_OPERATION_UNCONFIRMED } from '../../utils/exit-codes.js';
 import { prepareAsset as prepareFunctionAsset } from '../../utils/functions/prepare-asset.js';
 import { runCommand } from '../../utils/package-manager.js';
-import { prepareStudioAsset } from '../../utils/studios/prepare-asset.js';
 import { setupLogPolling } from './logs-polling.js';
 import { getOperationStateInfo } from './operations-state.js';
 import { processAssets } from './process-assets.js';
@@ -13,9 +13,9 @@ import { updateStack } from './stacks.js';
  */
 const preDeployConfigs = [
     {
-        resourceType: 'sanity.studio',
+        resourceType: (type) => type in BUNDLE_SPECS,
         async prepareAsset(options) {
-            return prepareStudioAsset({
+            return prepareBundleAsset({
                 resource: options.resource,
                 blueprintFileDir: options.blueprintFileDir,
             });
@@ -114,12 +114,13 @@ async function preDeployStack(options) {
         preDeploy: true,
         document: { resources },
     };
-    const { ok: deployOk, stack, error: deployError, } = await updateStack({ stackId, stackMutation, auth, fetchFn });
+    const { ok: deployOk, stack, error: deployError, requestId, } = await updateStack({ stackId, stackMutation, auth, fetchFn });
     if (!deployOk) {
         options.onPreDeployStackFail?.();
         return {
             success: false,
             error: deployError || 'Failed to complete Stack pre-deployment',
+            requestId,
             suggestions: [
                 `Run \`${runCommand(bin)} blueprints plan\` to preview changes before deploying.`,
                 `Run \`${runCommand(bin)} blueprints doctor\` to check your configuration.`,
@@ -162,6 +163,7 @@ async function preDeployStack(options) {
         return {
             success: false,
             error: `Stack pre-deployment was accepted but completion could not be confirmed${outcome.error ? ` (${outcome.error})` : ''}.`,
+            requestId,
             code: CODE_OPERATION_UNCONFIRMED,
             exitCode: EXIT_OPERATION_UNCONFIRMED,
             suggestions: [
@@ -175,6 +177,7 @@ async function preDeployStack(options) {
         return {
             success: false,
             error: 'Stack pre-deployment failed',
+            requestId,
             suggestions: [
                 ...outcome.logHints,
                 'Review the pre-deployment output above for error details.',

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

@@ -1,6 +1,6 @@
 import type { Blueprint } from '@sanity/blueprints-parser';
 import type { Logger } from '../../utils/logger.js';
-import type { AuthParams, ScopeType, Stack, StackMutation, StackSummary } from '../../utils/types.js';
+import type { AuthParams, ScopeType, Stack, StackMutation, StackSummary, UpdatedStack } from '../../utils/types.js';
 export declare const stacksUrl: string;
 type ListStacksResponse = {
     ok: true;
@@ -46,14 +46,15 @@ export declare function createEmptyStack({ token, scopeType, scopeId, name, logg
 type UpdateStackResponse = {
     ok: true;
     error: null;
-    stack: Stack & {
-        operationId: string;
-        changeCount?: number;
-    };
+    stack: UpdatedStack;
+    requestId?: string;
+    response?: Response;
 } | {
     ok: false;
     error: string;
     stack?: unknown;
+    requestId?: string;
+    response?: Response;
 };
 export declare function updateStack({ stackId, stackMutation, auth, fetchFn, }: {
     stackId: string;

package/dist/actions/blueprints/stacks.js

@@ -1,5 +1,6 @@
 import { blueprintsUrl } from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
+import { getRequestId } from '../../utils/request-id.js';
 import { createTracedFetch } from '../../utils/traced-fetch.js';
 export const stacksUrl = blueprintsUrl('stacks');
 export async function listStacks(auth, logger) {
@@ -91,6 +92,28 @@ export async function createEmptyStack({ token, scopeType, scopeId, name, logger
     }
     return response.stack;
 }
+async function parseOperationResponse(response) {
+    let data;
+    try {
+        data = await response.json();
+    }
+    catch {
+        return {
+            ok: false,
+            error: `HTTP ${response.status} ${response.statusText}`.trim(),
+            requestId: getRequestId(response),
+            response,
+        };
+    }
+    const body = data;
+    return {
+        ok: response.ok,
+        error: response.ok ? null : String(body?.message ?? `HTTP ${response.status}`),
+        stack: data,
+        requestId: getRequestId(response, data),
+        response,
+    };
+}
 export async function updateStack({ stackId, stackMutation, auth, fetchFn, }) {
     try {
         const response = await fetchFn(`${stacksUrl}/${stackId}`, {
@@ -98,12 +121,7 @@ export async function updateStack({ stackId, stackMutation, auth, fetchFn, }) {
             headers: getHeaders(auth),
             body: JSON.stringify(stackMutation),
         });
-        const data = await response.json();
-        return {
-            ok: response.ok,
-            error: response.ok ? null : data.message,
-            stack: data,
-        };
+        return await parseOperationResponse(response);
     }
     catch (error) {
         return {
@@ -183,12 +201,7 @@ export async function destroyStack({ stackId, auth, logger, }) {
             method: 'DELETE',
             headers: getHeaders(auth),
         });
-        const data = await response.json();
-        return {
-            ok: response.ok,
-            error: response.ok ? null : data.message,
-            stack: data,
-        };
+        return await parseOperationResponse(response);
     }
     catch (error) {
         return {

package/dist/baseCommands.js

@@ -1,5 +1,5 @@
 // * https://oclif.io/docs/base_class
-import { Command, CommandHelp, Flags as OclifFlags } from '@oclif/core';
+import { Command, CommandHelp, Errors, Flags as OclifFlags } from '@oclif/core';
 import { findBlueprintFile, loadBlueprintFile, parseBlueprintContent, } from './actions/blueprints/blueprint.js';
 import { backfillProjectBasedStackId, readConfigFile, } from './actions/blueprints/config.js';
 import { resolveIds } from './actions/blueprints/resolve.js';
@@ -8,6 +8,7 @@ import config from './config.js';
 import { CI_SETUP_DOCS_URL } from './constants.js';
 import { presentBlueprintParserErrors } from './utils/display/errors.js';
 import { Logger } from './utils/logger.js';
+import { withRequestId } from './utils/request-id.js';
 import { styleText } from './utils/style-text.js';
 import { createTracedFetch } from './utils/traced-fetch.js';
 import { validTokenOrErrorMessage } from './utils/validated-token.js';
@@ -135,12 +136,16 @@ export class RuntimeCommand extends Command {
      * forwarding suggestions, ref, or code to oclif's PrettyPrintableError rendering.
      */
     coreError(result) {
-        this.error(result.error, {
+        const error = new Errors.CLIError(withRequestId(result.error, result.requestId), {
             suggestions: result.suggestions,
             ref: result.ref,
             code: result.code,
             exit: result.exitCode,
         });
+        // oclif's toErrorJson spreads own enumerable properties into the --json error
+        if (result.requestId)
+            Object.assign(error, { requestId: result.requestId });
+        throw error;
     }
     /**
      * Renders any actionable items the user can take that don't warrant throwing an error.

package/dist/constants.d.ts

@@ -13,6 +13,8 @@ export declare const SANITY_PROJECT_CORS = "sanity.project.cors";
 export declare const SANITY_PROJECT_DATASET = "sanity.project.dataset";
 export declare const SANITY_PROJECT_WEBHOOK = "sanity.project.webhook";
 export declare const SANITY_STUDIO = "sanity.studio";
+export declare const SANITY_APPLICATION = "sanity.application";
+export declare const SANITY_INSTALLATION_CONFIG = "sanity.installation.config";
 export declare const EVENT_DOCUMENT_PUBLISH = "document-publish";
 export declare const EVENT_DOCUMENT_CREATE = "document-create";
 export declare const EVENT_DOCUMENT_UPDATE = "document-update";

package/dist/constants.js

@@ -12,6 +12,8 @@ export const SANITY_PROJECT_CORS = 'sanity.project.cors';
 export const SANITY_PROJECT_DATASET = 'sanity.project.dataset';
 export const SANITY_PROJECT_WEBHOOK = 'sanity.project.webhook';
 export const SANITY_STUDIO = 'sanity.studio';
+export const SANITY_APPLICATION = 'sanity.application';
+export const SANITY_INSTALLATION_CONFIG = 'sanity.installation.config';
 export const EVENT_DOCUMENT_PUBLISH = 'document-publish';
 export const EVENT_DOCUMENT_CREATE = 'document-create';
 export const EVENT_DOCUMENT_UPDATE = 'document-update';

package/dist/cores/blueprints/deploy.js

@@ -6,6 +6,7 @@ import { checkUserPermission } from '../../actions/sanity/access.js';
 import { getClientMetadata } from '../../utils/blueprints/deploy-metadata.js';
 import { extractDurableConfig } from '../../utils/blueprints/extract-durable-config.js';
 import { createHintCollector } from '../../utils/blueprints/hints.js';
+import { stampInstallationConfigVersion } from '../../utils/blueprints/stamp-installation-config-version.js';
 import { createWaitFor } from '../../utils/blueprints/wait-for.js';
 import { formatStudioUrls } from '../../utils/display/blueprints-formatting.js';
 import { check, niceId, severe } from '../../utils/display/presenters.js';
@@ -42,6 +43,7 @@ export async function blueprintDeployCore(options) {
         }
         const resources = [...blueprint.resources];
         await extractDurableConfig(resources, blueprintFileDir);
+        await stampInstallationConfigVersion(resources, blueprintFileDir);
         let spinner;
         const preDeployResult = await preDeploy({
             scopeType,
@@ -80,7 +82,7 @@ export async function blueprintDeployCore(options) {
             resources: preDeployResult.resourceMetadata,
         };
         const deploySpinner = logger.ora('Deploying...').start();
-        const { ok: deployOk, stack, error: deployError, } = await updateStack({
+        const { ok: deployOk, stack, error: deployError, requestId, } = await updateStack({
             stackId,
             stackMutation: {
                 scopeType,
@@ -102,6 +104,7 @@ export async function blueprintDeployCore(options) {
             return {
                 success: false,
                 error: deployError || 'Failed to update Stack deployment',
+                requestId,
                 suggestions: [
                     ...hints.getSuggestions(),
                     `Run \`${runCommand(bin)} blueprints plan\` to preview changes before deploying.`,
@@ -110,6 +113,8 @@ export async function blueprintDeployCore(options) {
             };
         }
         deploySpinner.stop().clear();
+        if (requestId)
+            logger.verbose(styleText('dim', `Request ID: ${requestId}`));
         const legacyPermissionsNoticePromise = CHECK_LEGACY_DEPLOY_PERMISSION
             ? checkLegacyDeployPermission({
                 auth,
@@ -121,11 +126,13 @@ export async function blueprintDeployCore(options) {
         if (noWait) {
             logger(styleText(['bold', 'green'], 'Stack deployment started!'));
             logger(`Use \`${runCommand(bin)} blueprints info\` to check status`);
+            if (requestId && !verbose)
+                logger(styleText('dim', `Request ID: ${requestId}`));
             const legacyWarning = await legacyPermissionsNoticePromise;
             const warnings = [...(legacyWarning ? [legacyWarning] : []), ...workspaceWarnings];
             return {
                 success: true,
-                json: { stackId, resources },
+                json: { stackId, resources, requestId },
                 data: { resources },
                 warnings: warnings.length ? warnings : undefined,
             };
@@ -149,7 +156,7 @@ export async function blueprintDeployCore(options) {
             const warnings = [...(legacyWarning ? [legacyWarning] : []), ...workspaceWarnings];
             return {
                 success: true,
-                json: { stackId, resources },
+                json: { stackId, resources, requestId },
                 data: { resources },
                 warnings: warnings.length ? warnings : undefined,
             };
@@ -158,6 +165,7 @@ export async function blueprintDeployCore(options) {
             return {
                 success: false,
                 error: `Stack deployment was accepted but completion could not be confirmed${outcome.error ? ` (${outcome.error})` : ''}.`,
+                requestId,
                 code: CODE_OPERATION_UNCONFIRMED,
                 exitCode: EXIT_OPERATION_UNCONFIRMED,
                 suggestions: [
@@ -170,6 +178,7 @@ export async function blueprintDeployCore(options) {
         return {
             success: false,
             error: 'Stack deployment failed',
+            requestId,
             suggestions: [
                 ...outcome.logHints,
                 'Review the deployment output above for error details.',

package/dist/cores/blueprints/destroy.js

@@ -19,22 +19,21 @@ export async function blueprintDestroyCore(options) {
         }
         const auth = { token, scopeType, scopeId };
         const resolvedId = await resolveStackIdByNameOrId(flagStack, auth, log);
-        const { ok, error, stack } = await destroyStack({
+        const { ok, error, stack, requestId } = await destroyStack({
             stackId: resolvedId,
             auth,
             logger: log,
         });
-        if (!ok)
-            return { success: false, error: error || 'Failed to destroy Stack deployment' };
-        clearLocalStackIdFromConfig(blueprintConfig, stack.id, log);
-        if (noWait) {
-            log(styleText(['bold', 'magenta'], 'Stack destruction started!'));
-            return { success: true, json: { stackId: stack.id, stackName: stack.name } };
+        if (!ok) {
+            return { success: false, error: error || 'Failed to destroy Stack deployment', requestId };
         }
-        return waitForDestruction({
+        clearLocalStackIdFromConfig(blueprintConfig, stack.id, log);
+        return afterDestroyAccepted({
             stackId: stack.id,
             stackName: stack.name,
             operationId: stack.operationId,
+            requestId,
+            noWait,
             auth,
             log,
             bin,
@@ -98,25 +97,23 @@ export async function blueprintDestroyCore(options) {
         else {
             destroySpinner.start();
         }
-        const { ok, error, stack: destroyedStack, } = await destroyStack({
+        const { ok, error, stack: destroyedStack, requestId, } = await destroyStack({
             stackId: stack.id,
             auth,
             logger: log,
         });
         if (!ok) {
             destroySpinner.fail('Failed to destroy Stack deployment');
-            return { success: false, error: error || 'Failed to destroy Stack deployment' };
+            return { success: false, error: error || 'Failed to destroy Stack deployment', requestId };
         }
         destroySpinner.stop().clear();
         clearLocalStackIdFromConfig(blueprintConfig, stack.id, log);
-        if (noWait) {
-            log(styleText(['bold', 'magenta'], 'Stack destruction started!'));
-            return { success: true, json: { stackId: stack.id, stackName: stack.name } };
-        }
-        return waitForDestruction({
+        return afterDestroyAccepted({
             stackId: stack.id,
             stackName: stack.name,
             operationId: destroyedStack.operationId,
+            requestId,
+            noWait,
             auth,
             log,
             bin,
@@ -141,8 +138,20 @@ function clearLocalStackIdFromConfig(blueprintConfig, destroyedStackId, log) {
         log(styleText('yellow', 'Could not update .sanity/blueprint.config.json. Remove stackId manually.'));
     }
 }
+function afterDestroyAccepted(options) {
+    const { stackId, stackName, requestId, noWait, log, verbose = false } = options;
+    if (requestId)
+        log.verbose(styleText('dim', `Request ID: ${requestId}`));
+    if (noWait) {
+        log(styleText(['bold', 'magenta'], 'Stack destruction started!'));
+        if (requestId && !verbose)
+            log(styleText('dim', `Request ID: ${requestId}`));
+        return { success: true, json: { stackId, stackName, requestId } };
+    }
+    return waitForDestruction(options);
+}
 async function waitForDestruction(options) {
-    const { stackId, stackName, operationId, auth, log, bin, verbose = false } = options;
+    const { stackId, stackName, operationId, requestId, auth, log, bin, verbose = false } = options;
     log(styleText('dim', 'Stack destruction progress:'));
     log('');
     const outcome = await waitForOperation({
@@ -157,12 +166,13 @@ async function waitForDestruction(options) {
     });
     if (outcome.type === 'completed') {
         log(styleText(['bold', 'magenta'], 'Stack destruction completed!'));
-        return { success: true, json: { stackId, stackName } };
+        return { success: true, json: { stackId, stackName, requestId } };
     }
     if (outcome.type === 'unconfirmed') {
         return {
             success: false,
             error: `Stack destruction was accepted but completion could not be confirmed${outcome.error ? ` (${outcome.error})` : ''}.`,
+            requestId,
             code: CODE_OPERATION_UNCONFIRMED,
             exitCode: EXIT_OPERATION_UNCONFIRMED,
             suggestions: [
@@ -175,6 +185,7 @@ async function waitForDestruction(options) {
     return {
         success: false,
         error: 'Stack destruction failed',
+        requestId,
         suggestions: [
             ...outcome.logHints,
             'Review the destruction output above for error details.',

package/dist/cores/blueprints/plan.js

@@ -2,6 +2,7 @@ import { dirname } from 'node:path';
 import { planStack, resolveStackIdByNameOrId } from '../../actions/blueprints/stacks.js';
 import { extractDurableConfig } from '../../utils/blueprints/extract-durable-config.js';
 import { createHintCollector } from '../../utils/blueprints/hints.js';
+import { stampInstallationConfigVersion } from '../../utils/blueprints/stamp-installation-config-version.js';
 import { formatDeploymentPlan, formatResourceTree, hasActionableChanges, } from '../../utils/display/blueprints-formatting.js';
 import { runCommand } from '../../utils/package-manager.js';
 import { styleText } from '../../utils/style-text.js';
@@ -12,6 +13,7 @@ export async function blueprintPlanCore(options) {
     const { scopeType, scopeId, stackId: blueprintStackId, parsedBlueprint, resources, fileInfo, } = blueprint;
     log(`${styleText(['bold', 'blueBright'], 'Local Blueprint')} ${styleText('dim', `(${fileInfo.fileName})`)}`);
     await extractDurableConfig(resources, dirname(fileInfo.blueprintFilePath));
+    await stampInstallationConfigVersion(resources, dirname(fileInfo.blueprintFilePath));
     log(formatResourceTree(resources));
     if (!token || !scopeType || !scopeId) {
         log(styleText('dim', 'Unable to retrieve live Stack deployment for comparison'));

package/dist/cores/index.d.ts

@@ -39,6 +39,8 @@ export type CoreResult = {
     ref?: string;
     /** A machine-readable error code. */
     code?: string;
+    /** Request ID of the API call that failed, for support. */
+    requestId?: string;
     /**
      * The user cancelled a prompt. A calling core reads it to keep its own message.
      * Not printed: `code` would surface as `Code:` in the command output.

package/dist/utils/blueprints/stamp-installation-config-version.d.ts

@@ -0,0 +1,9 @@
+import type { BlueprintResource } from '@sanity/blueprints';
+/**
+ * Stamps the installed `sanity` version onto each media-library config resource
+ * before pre-deploy. The version is a label Brett stores on the config snapshot,
+ * mirroring what `sanity deploy` sends for a media-library config; it is not what
+ * the runtime loads. Other installation config types are left alone: the
+ * media-library tie to the `sanity` package is specific to it.
+ */
+export declare const stampInstallationConfigVersion: (resources: BlueprintResource[], blueprintFileDir: string) => Promise<void>;

package/dist/utils/blueprints/stamp-installation-config-version.js

@@ -0,0 +1,28 @@
+import { resolve } from 'node:path';
+import { getLocalPackageVersion } from '@sanity/cli-core/package-manager';
+import { SANITY_INSTALLATION_CONFIG } from '../../constants.js';
+/**
+ * Stamps the installed `sanity` version onto each media-library config resource
+ * before pre-deploy. The version is a label Brett stores on the config snapshot,
+ * mirroring what `sanity deploy` sends for a media-library config; it is not what
+ * the runtime loads. Other installation config types are left alone: the
+ * media-library tie to the `sanity` package is specific to it.
+ */
+export const stampInstallationConfigVersion = async (resources, blueprintFileDir) => {
+    for (const resource of resources) {
+        if (resource.type !== SANITY_INSTALLATION_CONFIG)
+            continue;
+        const config = resource;
+        if (config.appType !== 'media-library')
+            continue;
+        // Update values not included in the blueprint.
+        if (config.version !== undefined)
+            continue;
+        const workDir = resolve(blueprintFileDir, config.root);
+        const version = await getLocalPackageVersion('sanity', workDir);
+        if (!version) {
+            throw new Error(`Unable to determine the installed 'sanity' version for installation config resource '${config.name}'; is 'sanity' installed in '${config.root}'?`);
+        }
+        config.version = version;
+    }
+};