@sanity/runtime-cli 17.12.0 → 17.13.0-next.g06897b0

package/dist/cores/blueprints/deploy.js

@@ -3,15 +3,19 @@ import { preDeploy } from '../../actions/blueprints/pre-deploy.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 { getClientMetadata } from '../../utils/blueprints/deploy-metadata.js';
 import { extractDurableConfig } from '../../utils/blueprints/extract-durable-config.js';
 import { createHintCollector } from '../../utils/blueprints/hints.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';
 import { CODE_OPERATION_UNCONFIRMED, EXIT_OPERATION_UNCONFIRMED } from '../../utils/exit-codes.js';
 import { runCommand } from '../../utils/package-manager.js';
 import { styleText } from '../../utils/style-text.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
 import { getWarnings } from '../../utils/warnings.js';
 export async function blueprintDeployCore(options) {
-    const { bin = 'sanity', log: logger, auth, stackId, scopeType, scopeId, deployedStack, blueprint, flags, } = options;
+    const { bin = 'sanity', log: logger, auth, stackId, scopeType, scopeId, deployedStack, blueprint, cliVersion, flags, } = options;
     const { verbose } = flags;
     const noWait = flags['no-wait'] || false;
     const stackName = flags['new-stack-name'] ?? deployedStack.name;
@@ -20,7 +24,8 @@ export async function blueprintDeployCore(options) {
     const workspaceWarnings = getWarnings({ dir: blueprintFileDir });
     logger(`Deploying "${stackName}" ${niceId(deployedStack.id)}...`);
     try {
-        const { ok: checkOk, stack: currentStack } = await getStack({ stackId, auth, logger });
+        const fetchFn = createTracedFetch(logger);
+        const { ok: checkOk, stack: currentStack } = await getStack({ stackId, auth, fetchFn });
         if (!checkOk) {
             return { success: false, error: 'Failed to check current Stack status' };
         }
@@ -37,6 +42,7 @@ export async function blueprintDeployCore(options) {
         }
         const resources = [...blueprint.resources];
         await extractDurableConfig(resources, blueprintFileDir);
+        let spinner;
         const preDeployResult = await preDeploy({
             scopeType,
             scopeId,
@@ -46,13 +52,33 @@ export async function blueprintDeployCore(options) {
             auth,
             blueprintFileDir,
             installer,
-            logger,
             bin,
-            verbose,
+            fetchFn,
+            waitForFn: createWaitFor({ bin, log: logger, verbose }),
             onAssetEvent: createAssetEventHandler(logger),
+            onPreDeployStackStart() {
+                spinner = logger.ora('Starting pre-deploy...').start();
+            },
+            onPreDeployStackFail() {
+                spinner.fail(`${styleText('red', 'Failed')} to complete Stack pre-deployment`);
+            },
+            onPreDeployStackDone() {
+                spinner.stop().clear();
+            },
+            onPreDeployOperationStart() {
+                logger(styleText('dim', 'Stack pre-deployment progress:'));
+                logger('');
+            },
+            onPreDeployOperationDone() {
+                logger(styleText(['bold', 'green'], 'Stack pre-deployment completed!'));
+            },
         });
         if (!preDeployResult?.success)
             return preDeployResult;
+        const metadata = {
+            client: getClientMetadata({ cliVersion, dir: blueprintFileDir }),
+            resources: preDeployResult.resourceMetadata,
+        };
         const deploySpinner = logger.ora('Deploying...').start();
         const { ok: deployOk, stack, error: deployError, } = await updateStack({
             stackId,
@@ -62,9 +88,10 @@ export async function blueprintDeployCore(options) {
                 name: stackName,
                 document: { resources },
                 userMessage: flags.message,
+                metadata,
             },
             auth,
-            logger,
+            fetchFn,
         });
         if (!deployOk) {
             deploySpinner.fail(`${styleText('red', 'Failed')} to update Stack deployment`);
@@ -116,6 +143,8 @@ export async function blueprintDeployCore(options) {
         });
         if (outcome.type === 'completed') {
             logger(styleText(['bold', 'green'], 'Stack deployment completed!'));
+            for (const line of formatStudioUrls(stack.resources))
+                logger(line);
             const legacyWarning = await legacyPermissionsNoticePromise;
             const warnings = [...(legacyWarning ? [legacyWarning] : []), ...workspaceWarnings];
             return {
@@ -192,8 +221,10 @@ function createAssetEventHandler(logger) {
                 logger.error(`   ${result.error}`);
                 continue;
             }
-            logger(` ${check(`${resource.name} ${niceId(resource.src)}`)}`);
-            logger(`   Source: ${resource.src}`);
+            const r = resource;
+            const assetParameter = String(r[result.assetParameter]);
+            logger(` ${check(`${resource.name} ${niceId(assetParameter)}`)}`);
+            logger(`   Source: ${assetParameter}`);
             if (result.hash) {
                 const hash = result.hash;
                 const h = hash.length > 24 ? `${hash.slice(0, 8)}...${hash.slice(-12)}` : hash;

package/dist/cores/blueprints/destroy.js

@@ -7,6 +7,7 @@ import { niceId } from '../../utils/display/presenters.js';
 import { CODE_OPERATION_UNCONFIRMED, EXIT_OPERATION_UNCONFIRMED } from '../../utils/exit-codes.js';
 import { runCommand } from '../../utils/package-manager.js';
 import { styleText } from '../../utils/style-text.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
 export async function blueprintDestroyCore(options) {
     const { bin = 'sanity', log, token, scopeType, scopeId, localStackId, blueprintConfig, flags, } = options;
     const { force = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, stack: flagStack, 'no-wait': noWait = false, verbose = false, } = flags;
@@ -48,14 +49,15 @@ export async function blueprintDestroyCore(options) {
         : undefined;
     let stack;
     try {
+        const fetchFn = createTracedFetch(log);
         if (resolvedStackId) {
-            const overrideStack = await getStack({ stackId: resolvedStackId, auth, logger: log });
+            const overrideStack = await getStack({ stackId: resolvedStackId, auth, fetchFn });
             if (!overrideStack.ok)
                 return { success: false, error: overrideStack.error || 'Failed to get Stack' };
             stack = overrideStack.stack;
         }
         else if (localStackId) {
-            const blueprintStack = await getStack({ stackId: localStackId, auth, logger: log });
+            const blueprintStack = await getStack({ stackId: localStackId, auth, fetchFn });
             if (!blueprintStack.ok)
                 return { success: false, error: blueprintStack.error || 'Failed to get Stack' };
             stack = blueprintStack.stack;

package/dist/cores/blueprints/doctor.js

@@ -1,13 +1,13 @@
 import { readFileSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { arch, cwd, env, version as nodeVersion, platform } from 'node:process';
+import { formatDateTime } from '@sanity/cli-core/dates';
 import * as resolve from 'empathic/resolve';
 import { loadAndParseBlueprint, } from '../../actions/blueprints/blueprint.js';
 import { readConfigFile } from '../../actions/blueprints/config.js';
 import { resolveIds } from '../../actions/blueprints/resolve.js';
 import { getStack } from '../../actions/blueprints/stacks.js';
 import config, { RUNTIME_CLI_VERSION } from '../../config.js';
-import { formatDateTime } from '../../utils/display/dates.js';
 import { presentBlueprintParserErrors } from '../../utils/display/errors.js';
 import { advise, check, filePathRelativeToCwd, niceId, renderSection, severe, unsure, } from '../../utils/display/presenters.js';
 import { runCommand } from '../../utils/package-manager.js';
@@ -172,7 +172,7 @@ export async function blueprintDoctorCore(options) {
             const stackResponse = await getStack({
                 auth: { token, scopeType, scopeId },
                 stackId,
-                logger: log,
+                fetchFn,
             });
             if (stackResponse.ok) {
                 diagnostics.stackReady = { status: true };

package/dist/cores/blueprints/init.js

@@ -15,6 +15,7 @@ import { CancelledError, promptForBlueprintType, promptForInitLocation, promptFo
 import { isInteractive } from '../../utils/interactive.js';
 import { installCommand, runCommand } from '../../utils/package-manager.js';
 import { styleText } from '../../utils/style-text.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
 import { blueprintConfigCore } from './config.js';
 /** Derive scope type and ID from mutually exclusive flag values. */
 function resolveScopeFromFlags(projectId, organizationId) {
@@ -288,11 +289,12 @@ export async function resolveScopeAndStack(params) {
         }
         // --stack-id: validate it exists
         if (resolvedStackId && resolvedStackId === stackId) {
+            const fetchFn = createTracedFetch(log);
             const spinner = log.ora('Validating Stack...').start();
             const { ok, error } = await getStack({
                 stackId: resolvedStackId,
                 auth: { token, scopeType, scopeId },
-                logger: log,
+                fetchFn,
             });
             spinner.stop();
             if (!ok) {

package/dist/cores/blueprints/logs.js

@@ -4,6 +4,7 @@ import { formatTitle } from '../../utils/display/blueprints-formatting.js';
 import { formatLogEntry, formatLogs } from '../../utils/display/logs-formatting.js';
 import { niceId } from '../../utils/display/presenters.js';
 import { styleText } from '../../utils/style-text.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
 /** Number of recent logs to show before entering watch mode */
 const WATCH_PREFETCH_LIMIT = 10;
 export async function blueprintLogsCore(options) {
@@ -11,8 +12,9 @@ export async function blueprintLogsCore(options) {
     const { watch = false, verbose = false, limit, since, before } = flags;
     const spinner = log.ora(`Fetching recent logs for Stack deployment ${niceId(stackId)}`).start();
     try {
+        const fetchFn = createTracedFetch(log);
         if (watch) {
-            const { ok, logs, error } = await getLogs({ stackId, limit: WATCH_PREFETCH_LIMIT }, auth, log);
+            const { ok, logs, error } = await getLogs({ stackId, limit: WATCH_PREFETCH_LIMIT }, auth, fetchFn);
             if (!ok) {
                 spinner.fail(`${styleText('red', 'Failed')} to retrieve logs`);
                 log.error(`Error: ${error || 'Unknown error'}`);
@@ -38,9 +40,13 @@ export async function blueprintLogsCore(options) {
                 stackId,
                 knownIds: logs.map((l) => l.id),
                 auth,
-                log,
-                showBanner: true,
-                verbose,
+                fetchFn,
+                onShowBanner() {
+                    log(`Watching logs... ${styleText('bold', 'ctrl+c')} to cancel`);
+                },
+                onLogEntry(logEntry, previousLog) {
+                    log(formatLogEntry(logEntry, verbose, previousLog));
+                },
             });
             // Return a never-resolving promise so the polling loop keeps running
             return {
@@ -49,7 +55,7 @@ export async function blueprintLogsCore(options) {
             };
         }
         // One-shot fetch (no watch)
-        const { ok, logs, error, hasMore } = await getLogs({ stackId, limit, before, after: since }, auth, log);
+        const { ok, logs, error, hasMore } = await getLogs({ stackId, limit, before, after: since }, auth, fetchFn);
         if (!ok) {
             spinner.fail(`${styleText('red', 'Failed')} to retrieve Stack deployment logs`);
             log.error(`Error: ${error || 'Unknown error'}`);

package/dist/cores/blueprints/mint-deploy-token.js

@@ -1,8 +1,9 @@
 import { hostname } from 'node:os';
 import { confirm, input, select } from '@inquirer/prompts';
+import { formatDateTime } from '@sanity/cli-core/dates';
 import { createRobotToken } from '../../actions/sanity/access.js';
 import { ClipboardUnavailableError, write as clipboardWrite } from '../../utils/clipboard.js';
-import { formatDate, formatDateTime } from '../../utils/display/dates.js';
+import { formatDate } from '../../utils/display/dates.js';
 import { styleText } from '../../utils/style-text.js';
 const ROLE_BY_SCOPE = {
     project: 'blueprints-deployer',

package/dist/cores/functions/build.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { pathToZip } from '../../actions/blueprints/assets.js';
+import { CONVERT_BYTES_TO_MB } from '../../constants.js';
 import { findFunctionInResources } from '../../utils/functions/find.js';
 import { prepareAsset } from '../../utils/functions/prepare-asset.js';
 import { isLocalFunctionResource } from '../../utils/types.js';
@@ -31,14 +31,13 @@ export async function functionBuildCore(options) {
             errors.push({ name: resource.name, error: prepResult.error ?? 'Unknown error' });
             continue;
         }
-        const zip = await pathToZip(prepResult.outputPath);
-        const buffer = zip.toBuffer();
+        const buffer = prepResult.outputBuffer;
         const zipPath = path.join(outDir, `${resource.name}.zip`);
-        await fs.promises.writeFile(zipPath, buffer);
+        await fs.promises.writeFile(zipPath, prepResult.outputBuffer);
         if (prepResult.cleanup) {
             await prepResult.cleanup();
         }
-        const sizeMb = (buffer.length / 1_048_576).toFixed(1);
+        const sizeMb = (buffer.length / CONVERT_BYTES_TO_MB).toFixed(1);
         spinner.succeed(`${resource.name}.zip (${sizeMb} MB) → ${zipPath}`);
         built.push({ name: resource.name, size: buffer.length, path: zipPath });
     }

package/dist/cores/functions/test.js

@@ -7,6 +7,7 @@ import { createDurableJsonCollector } from '../../utils/functions/durable-logs.j
 import { findFunctionInResources, getFunctionNames } from '../../utils/functions/find.js';
 import { runFunction } from '../../utils/functions/invoke/nested.js';
 import { buildContext, buildInvokeOptions, collectInvokeInput, defaultInvocationDeps, resolveInvocationPlan, } from '../../utils/functions/invoke/resolve-invoke-type.js';
+import { createTracedFetch } from '../../utils/traced-fetch.js';
 import { isEventType, } from '../../utils/types.js';
 export async function functionTestCore(options) {
     const { blueprint, log, error, args, flags, helpText } = options;
@@ -36,6 +37,7 @@ export async function functionTestCore(options) {
         };
     }
     try {
+        const fetchFn = createTracedFetch(log);
         const resource = findFunctionInResources(blueprint.resources, fnName); // throws if not found
         const resolvedResources = await resolveDeployedResources({
             resources: blueprint.resources,
@@ -43,7 +45,7 @@ export async function functionTestCore(options) {
             auth: config.token && blueprint.scopeType && blueprint.scopeId
                 ? { token: config.token, scopeType: blueprint.scopeType, scopeId: blueprint.scopeId }
                 : undefined,
-            logger: log,
+            fetchFn,
         });
         const input = {
             flags,

package/dist/cores/index.js

@@ -1,6 +1,7 @@
 import { readLocalBlueprint } from '../actions/blueprints/blueprint.js';
 import { getStack, resolveStackIdByNameOrId } from '../actions/blueprints/stacks.js';
 import { presentBlueprintParserErrors } from '../utils/display/errors.js';
+import { createTracedFetch } from '../utils/traced-fetch.js';
 import { validTokenOrErrorMessage } from '../utils/validated-token.js';
 export async function initBlueprintConfig({ bin, log, token, validateResources = false, validateToken = true, blueprintPath, }) {
     let checkedToken = token;
@@ -51,7 +52,8 @@ export async function initDeployedBlueprintConfig(config) {
         return { ok: false, error: 'Missing Stack deployment configuration for Blueprint' };
     }
     const spinner = config.log.ora('Loading Stack deployment...').start();
-    const stackResponse = await getStack({ stackId, auth, logger: config.log });
+    const fetchFn = createTracedFetch(config.log);
+    const stackResponse = await getStack({ stackId, auth, fetchFn });
     if (!stackResponse.ok) {
         spinner.fail('Could not load Stack deployment');
         return { ok: false, error: 'Missing Stack deployment' };

package/dist/server/app.d.ts

@@ -1,5 +1,6 @@
+import * as http from 'node:http';
 import { type InvokeExecutionOptions } from '../utils/types.js';
-declare const app: (host: string, port: number, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>) => void;
+declare const app: (host: string, port: number, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>) => http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
 declare function parseDocumentUrl(url: string): {
     projectId: string;
     dataset: string;

package/dist/server/app.js

@@ -11,7 +11,6 @@ import { isRecord } from '../utils/is-record.js';
 import { isEventType, isGroqContextOptions, } from '../utils/types.js';
 import { handleInvokeRequest } from './handlers/invoke.js';
 const app = (host, port, validateResources, executionOptions) => {
-    const wss = new WebSocketServer({ port: 8974 });
     // Send a JSON envelope to every connected UI client.
     const broadcast = (envelope) => {
         const message = JSON.stringify(envelope);
@@ -268,6 +267,9 @@ const app = (host, port, validateResources, executionOptions) => {
         }
     };
     const server = http.createServer(requestListener);
+    // Share the HTTP server so live-reload upgrades on the emulator's own port,
+    // rather than reserving a second port that may already be taken.
+    const wss = new WebSocketServer({ server });
     server.listen(port, host, () => { });
     wss.on('connection', function connection(ws) {
         ws.on('error', console.error);
@@ -280,6 +282,7 @@ const app = (host, port, validateResources, executionOptions) => {
                 ws.send('reload-blueprint');
         });
     });
+    return server;
 };
 // Helper function to test URL parsing and document fetching logic
 function parseDocumentUrl(url) {

package/dist/server/handlers/invoke.js

@@ -16,7 +16,7 @@ export async function handleInvokeRequest(functionName, event, metadata, context
         resources,
         stackId,
         auth: config.token && scopeType && scopeId ? { token: config.token, scopeType, scopeId } : undefined,
-        logger: silentLogger,
+        fetchFn: fetch,
     });
     const payload = {
         payload: event,