@sanity/runtime-cli 17.16.0-next.g26925c0 → 17.16.0-next.g91e6dd2

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.16.0-next.g26925c0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/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.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/promote.ts)_
+_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/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.16.0-next.g26925c0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.g91e6dd2/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,5 +1,5 @@
 import type { BlueprintResource } from '@sanity/blueprints';
-import type { AuthParams, InstallerType, PrepAssetFn } from '../../utils/types.js';
+import type { AuthParams, InstallerType, PrepAssetFn, ResolvedResource } from '../../utils/types.js';
 export declare const assetCheckUrl: string;
 export declare const assetStashUrl: string;
 export type StashAssetResult = {
@@ -18,8 +18,8 @@ export type StashAssetResult = {
     success: false;
     error: string;
 };
-export declare function stashAsset<R extends BlueprintResource>({ resource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }: {
-    resource: R;
+export declare function stashAsset<R extends BlueprintResource>({ resolvedResource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }: {
+    resolvedResource: ResolvedResource<R>;
     prepAsset: PrepAssetFn<R>;
     auth: AuthParams;
     blueprintFileDir: string;

package/dist/actions/blueprints/assets.js

@@ -4,10 +4,10 @@ import getHeaders from '../../utils/get-headers.js';
 const assetsUrl = blueprintsUrl('assets');
 export const assetCheckUrl = `${assetsUrl}/check`;
 export const assetStashUrl = `${assetsUrl}/stash`;
-export async function stashAsset({ resource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }) {
+export async function stashAsset({ resolvedResource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }) {
     let cleanup = async () => { };
     try {
-        const prepResult = await prepAsset({ resource, blueprintFileDir, installer });
+        const prepResult = await prepAsset({ resolvedResource, blueprintFileDir, installer });
         if (prepResult.success === false) {
             await prepResult.cleanup();
             return {
@@ -26,7 +26,7 @@ export async function stashAsset({ resource, prepAsset, auth, blueprintFileDir,
             assetParameter: prepResult.assetParameter,
             metadata: prepResult.metadata,
             cleanup,
-            resourceName: resource.name,
+            resourceName: resolvedResource.resource.name,
             auth,
             fetchFn,
         });

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

@@ -18,7 +18,7 @@ const preDeployConfigs = [
         resourceType: (type) => type in BUNDLE_SPECS,
         async prepareAsset(options) {
             return prepareBundleAsset({
-                resource: options.resource,
+                resolvedResource: options.resolvedResource,
                 blueprintFileDir: options.blueprintFileDir,
             });
         },
@@ -30,7 +30,7 @@ const preDeployConfigs = [
         resourceType: (type) => type.startsWith(SANITY_FUNCTION_PREFIX),
         async prepareAsset(options) {
             return prepareFunctionAsset({
-                resource: options.resource,
+                resource: options.resolvedResource.resource,
                 blueprintFileDir: options.blueprintFileDir,
                 installer: options.installer,
             });
@@ -74,7 +74,7 @@ export async function preDeploy(options) {
         });
         const assetResources = [];
         for (const r of resolvedResources) {
-            const config = getPredeployConfig(r);
+            const config = getPredeployConfig(r.resource);
             if (typeof config !== 'undefined' && typeof config.prepareAsset === 'function') {
                 assetResources.push({ resource: r, prepareAsset: config.prepareAsset });
             }

package/dist/actions/blueprints/process-assets.js

@@ -42,13 +42,14 @@ function getAssetConcurrency() {
     const configured = Number(env.SANITY_ASSET_CONCURRENCY);
     return Number.isSafeInteger(configured) && configured > 0 ? configured : DEFAULT_ASSET_CONCURRENCY;
 }
-async function processAsset(resource, prepAsset, options) {
+async function processAsset(resolvedResource, prepAsset, options) {
+    const { resource } = resolvedResource;
     const { auth, blueprintFileDir, installer, fetchFn } = options;
     let assetTimeoutTimer;
     let result;
     try {
         result = await Promise.race([
-            stashAsset({ resource, prepAsset, blueprintFileDir, auth, fetchFn, installer }),
+            stashAsset({ resolvedResource, prepAsset, blueprintFileDir, auth, fetchFn, installer }),
             new Promise((_, reject) => {
                 assetTimeoutTimer = setTimeout(() => {
                     reject(new Error(`Processing ${resource.name} timed out after ${assetTimeoutS}s`));

package/dist/cores/functions/test.js

@@ -55,7 +55,7 @@ export async function functionTestCore(options) {
             apiHost: config.apiUrl,
             token: config.token || undefined,
             withUserToken,
-            resources: resolvedResources,
+            resolvedResources,
             blueprintFileDir: dirname(blueprint.fileInfo.blueprintFilePath),
             log,
         };
@@ -116,7 +116,9 @@ export async function functionTestCore(options) {
             }
         };
         const logNestedRuns = () => {
-            for (const run of [...nestedRuns].sort((a, b) => a.order - b.order)) {
+            // Remove buffered logs for durable runs
+            const runs = plan.isDurable ? nestedRuns.splice(0) : [...nestedRuns];
+            for (const run of runs.sort((a, b) => a.order - b.order)) {
                 // Skip if is Durable so log ordering is retained
                 if (run.isLiveDurable)
                     continue;
@@ -155,10 +157,19 @@ export async function functionTestCore(options) {
                 if (event.kind === 'delegate') {
                     logNestedRuns();
                 }
-                const glyph = STEP_PHASE_GLYPH[event.phase] ?? '•';
+                const willRetry = event.phase === 'error' && typeof event.retryDelayMs === 'number';
+                const glyph = willRetry ? '⟳' : (STEP_PHASE_GLYPH[event.phase] ?? '•');
                 const duration = typeof event.durationMs === 'number' ? ` (${Math.round(event.durationMs)}ms)` : '';
+                const retriesPerformed = (event.attempt ?? 1) - 1;
+                let retryNote = '';
+                if (willRetry) {
+                    retryNote = ` retry ${event.attempt} of ${event.maxAttempts}`;
+                }
+                else if (event.phase === 'error' && retriesPerformed > 0) {
+                    retryNote = ` failed after ${retriesPerformed} retries`;
+                }
                 const detail = event.phase === 'error' && event.error ? ` ${event.error.message}` : '';
-                lines.push(`  ${glyph} ${event.name} [${event.kind}]${duration}${detail}`);
+                lines.push(`  ${glyph} ${event.name} [${event.kind}]${duration}${detail}${retryNote}`);
             }
             return lines;
         }

package/dist/server/app.js

@@ -8,7 +8,7 @@ import { findBlueprintFile, loadAndParseBlueprint } from '../actions/blueprints/
 import { readConfigFile } from '../actions/blueprints/config.js';
 import config from '../config.js';
 import { isRecord } from '../utils/is-record.js';
-import { isEventType, isGroqContextOptions, } from '../utils/types.js';
+import { isEventType, } from '../utils/types.js';
 import { handleInvokeRequest } from './handlers/invoke.js';
 const app = (host, port, validateResources, executionOptions) => {
     // Send a JSON envelope to every connected UI client.
@@ -75,7 +75,7 @@ const app = (host, port, validateResources, executionOptions) => {
                             const { data, func: functionName, metadata, } = parseInvokeRequest(Buffer.concat(body), dirname(fileInfo.blueprintFilePath));
                             const { context, event } = data;
                             // replace user token if required
-                            if (isGroqContextOptions(context)) {
+                            if ('clientOptions' in context) {
                                 if (context.clientOptions.token) {
                                     context.clientOptions.token = config.token || undefined;
                                 }

package/dist/utils/blueprints/group-resources.d.ts

@@ -1,8 +1,9 @@
 import type { BlueprintResource } from '@sanity/blueprints';
+import type { ResolvedResource } from '../types.js';
 export type GroupedBlueprintResource = {
     id: string;
     name: string;
     type: string;
 };
 export type GroupedBlueprintResources = Record<string, GroupedBlueprintResource[]>;
-export declare function groupBlueprintResources(blueprintResources: BlueprintResource[]): GroupedBlueprintResources;
+export declare function groupBlueprintResources(blueprintResources: ResolvedResource<BlueprintResource>[]): GroupedBlueprintResources;

package/dist/utils/blueprints/group-resources.js

@@ -8,7 +8,8 @@ const BLUEPRINT_TYPE_TO_KEY = {
 };
 export function groupBlueprintResources(blueprintResources) {
     const grouped = {};
-    for (const resource of blueprintResources) {
+    for (const resolvedResource of blueprintResources) {
+        const resource = resolvedResource.resource;
         if (resource.type === 'sanity.access.robot')
             continue;
         const key = (resource.type?.startsWith('sanity.function.')
@@ -18,9 +19,8 @@ export function groupBlueprintResources(blueprintResources) {
             continue;
         if (!grouped[key])
             grouped[key] = [];
-        const externalId = resource.externalId;
         grouped[key].push({
-            id: externalId || 'not-deployed',
+            id: resolvedResource.externalId || 'not-deployed',
             name: resource.name,
             type: resource.type,
         });

package/dist/utils/blueprints/resolve-deployed-resources.d.ts

@@ -1,5 +1,5 @@
 import type { BlueprintResource } from '@sanity/blueprints';
-import type { AuthParams } from '../types.js';
+import type { AuthParams, ResolvedResource } from '../types.js';
 interface ResolveOptions {
     resources: BlueprintResource[];
     stackId?: string;
@@ -12,5 +12,5 @@ interface ResolveOptions {
  * resources that aren't yet deployed are preserved without an externalId.
  * Any failure to fetch the stack falls back to the raw local resources.
  */
-export declare function resolveDeployedResources({ resources, stackId, auth, fetchFn, }: ResolveOptions): Promise<BlueprintResource[]>;
+export declare function resolveDeployedResources({ resources, stackId, auth, fetchFn, }: ResolveOptions): Promise<ResolvedResource<BlueprintResource>[]>;
 export {};

package/dist/utils/blueprints/resolve-deployed-resources.js

@@ -7,11 +7,11 @@ import { getStack } from '../../actions/blueprints/stacks.js';
  */
 export async function resolveDeployedResources({ resources, stackId, auth, fetchFn, }) {
     if (!stackId || !auth?.token || !auth.scopeType || !auth.scopeId)
-        return resources;
+        return resources.map((r) => ({ resource: r }));
     try {
         const response = await getStack({ stackId, auth, fetchFn });
         if (!response.ok || !Array.isArray(response.stack?.resources))
-            return resources;
+            return resources.map((r) => ({ resource: r }));
         const deployedByKey = new Map();
         for (const deployed of response.stack.resources) {
             if (deployed.externalId) {
@@ -20,10 +20,10 @@ export async function resolveDeployedResources({ resources, stackId, auth, fetch
         }
         return resources.map((resource) => {
             const externalId = deployedByKey.get(`${resource.type}:${resource.name}`);
-            return externalId ? { ...resource, externalId } : resource;
+            return { resource, externalId };
         });
     }
     catch {
-        return resources;
+        return resources.map((r) => ({ resource: r }));
     }
 }

package/dist/utils/bundles/prepare-asset.d.ts

@@ -1,7 +1,7 @@
 import type { BlueprintApplicationResource, BlueprintInstallationConfigResource, BlueprintStudioResource } from '@sanity/blueprints';
 import { type BuildStudioEventListener } from '@sanity/cli-build/_internal/build';
 import type { Output } from '@sanity/cli-core';
-import type { AssetPrepResult } from '../types.js';
+import type { AssetPrepResult, ResolvedResource } from '../types.js';
 export type BundleResource = BlueprintStudioResource | BlueprintApplicationResource | BlueprintInstallationConfigResource;
 type BuildContext<R extends BundleResource> = {
     resource: R;
@@ -28,9 +28,9 @@ export declare const BUNDLE_SPECS: {
         build: typeof buildInstallationConfigBundle;
     };
 };
-export declare function prepareBundleAsset<R extends BundleResource>({ blueprintFileDir, resource, }: {
+export declare function prepareBundleAsset<R extends BundleResource>({ blueprintFileDir, resolvedResource, }: {
     blueprintFileDir: string;
-    resource: R;
+    resolvedResource: ResolvedResource<R>;
 }): Promise<AssetPrepResult>;
 declare function buildStudioBundle({ resource, appId, workDir, outDir, output, eventListener, }: BuildContext<BlueprintStudioResource>): Promise<BuildResult>;
 declare function buildApplicationBundle({ resource, appId, workDir, outDir, output, eventListener, }: BuildContext<BlueprintApplicationResource>): Promise<BuildResult>;

package/dist/utils/bundles/prepare-asset.js

@@ -12,10 +12,11 @@ export const BUNDLE_SPECS = {
     'sanity.application': { requiresAppId: true, build: buildApplicationBundle },
     'sanity.installation.config': { requiresAppId: false, build: buildInstallationConfigBundle },
 };
-export async function prepareBundleAsset({ blueprintFileDir, resource, }) {
+export async function prepareBundleAsset({ blueprintFileDir, resolvedResource, }) {
+    const resource = resolvedResource.resource;
     // The lookup can't prove it yields the spec matching this R, so it's asserted once here.
     const spec = BUNDLE_SPECS[resource.type];
-    const appId = getAppId(resource);
+    const appId = getAppId(resolvedResource);
     if (spec.requiresAppId && !appId) {
         return {
             success: false,
@@ -260,12 +261,12 @@ async function getInstalledSanityVersion(workDir) {
         return undefined;
     }
 }
-function getAppId(resource) {
-    if ('externalId' in resource && typeof resource.externalId === 'string' && resource.externalId) {
-        return resource.externalId;
+function getAppId(resolvedResource) {
+    if (resolvedResource.externalId) {
+        return resolvedResource.externalId;
     }
-    else if (resource.lifecycle?.ownershipAction?.type === 'attach') {
-        return resource.lifecycle.ownershipAction.id;
+    else if (resolvedResource.resource.lifecycle?.ownershipAction?.type === 'attach') {
+        return resolvedResource.resource.lifecycle.ownershipAction.id;
     }
     return undefined;
 }

package/dist/utils/functions/child-runtime/durable.js

@@ -1,5 +1,6 @@
 import {performance} from 'node:perf_hooks'
 import {inspect} from 'node:util'
+import {createStepHistory} from './step-history.js'
 
 /**
  *
@@ -26,7 +27,9 @@ const formatArgs = (args) =>
  * @param io
  */
 export async function runDurable(handler, {context, event}, io) {
+  const history = createStepHistory()
   let currentStep = null
+
   const streamLog = (level, args) => {
     const date = new Date()
     const timestamp = `${date.toLocaleDateString()} ${date.toLocaleTimeString()}`
@@ -41,7 +44,6 @@ export async function runDurable(handler, {context, event}, io) {
     })
   }
 
-  // @todo: need to throw error for use of `console.log` in a durable function
   const logger = {
     log: (...a) => streamLog('info', a),
     info: (...a) => streamLog('info', a),
@@ -49,24 +51,57 @@ export async function runDurable(handler, {context, event}, io) {
     error: (...a) => streamLog('error', a),
   }
 
-  const track = async (name, kind, produce) => {
-    io.emit({name, kind, phase: 'start'})
-    const startedAt = performance.now()
+  const emitFailure = (pending) => {
+    history.settle(pending)
+    io.emit(pending.event)
+  }
+
+  const settleUnretried = () => {
+    const pending = history.getPending()
+    if (pending !== null) {
+      emitFailure(pending)
+    }
+  }
+
+  const track = async (name, kind, produce, retry) => {
+    settleUnretried()
+    const {index, saved} = history.nextStep()
+
+    if (saved?.phase === 'complete') {
+      return saved.output
+    }
+
+    const maxAttempts = retry?.maxAttempts ?? 1
+    const retries = Math.max((retry?.maxAttempts ?? 1) - 1, 0)
+    const waitingOnRetry = typeof saved?.retryDelayMs === 'number'
+
+    if (saved?.phase === 'error' && !waitingOnRetry) {
+      throw saved.output
+    }
+
+    const attempt = (saved?.attempt ?? 0) + 1
     const prev = currentStep
     currentStep = name
 
+    io.emit({name, kind, phase: 'start'})
+    const startedAt = performance.now()
+
     try {
-      const value = await produce()
-      io.emit({
+      const value = await produce(attempt)
+      const completeEvent = {
         name,
         kind,
         phase: 'complete',
         output: value,
         durationMs: performance.now() - startedAt,
-      })
+      }
+
+      history.recordSuccess(index, completeEvent)
+      io.emit(completeEvent)
+
       return value
     } catch (err) {
-      io.emit({
+      const errorEvent = {
         name,
         kind,
         phase: 'error',
@@ -76,7 +111,21 @@ export async function runDurable(handler, {context, event}, io) {
           stack: err?.stack ?? '',
         },
         durationMs: performance.now() - startedAt,
+        attempt,
+        retries,
+        maxAttempts,
+      }
+
+      const retryPending = history.recordFailure(index, {
+        event: errorEvent,
+        error: err,
+        delayMs: retry?.delay ? durationToMs(retry.delay) : 0,
       })
+
+      if (!retryPending) {
+        io.emit(errorEvent)
+      }
+
       throw err
     } finally {
       currentStep = prev
@@ -84,12 +133,21 @@ export async function runDurable(handler, {context, event}, io) {
   }
 
   const step = {
-    run: ({name, handler: fn}) => track(name || '', 'run', () => fn({logger, attempt: 1})),
-    wait: ({name, duration}) =>
-      track(name || '', 'wait', async () => {
-        await io.wait(durationToMs(duration))
-        return undefined
-      }),
+    run: ({name, handler: fn, retry}) =>
+      track(name || '', 'run', (attempt) => fn({logger, attempt}), retry),
+    delegate: ({name, handler, event, retry}) =>
+      track(
+        name || '',
+        'delegate',
+        () => {
+          const fn = typeof handler === 'string' ? handler : handler?.name
+          if (!fn) {
+            throw new Error('No function name provided for delegation')
+          }
+          return io.invoke(fn, event?.data ?? {})
+        },
+        retry,
+      ),
     waitForCondition: ({name, initial, poller, next}) =>
       track(name || '', 'wait-for-condition', async () => {
         let state = initial
@@ -107,15 +165,34 @@ export async function runDurable(handler, {context, event}, io) {
         }
         return state
       }),
-    delegate: ({name, handler, event}) =>
-      track(name || '', 'delegate', () => {
-        const fn = typeof handler === 'string' ? handler : handler?.name
-        if (!fn) {
-          throw new Error('No function name provided for delegation')
-        }
-        return io.invoke(fn, event)
+    wait: ({name, duration}) =>
+      track(name || '', 'wait', async () => {
+        await io.wait(durationToMs(duration))
+        return undefined
       }),
   }
 
-  return handler({context, event, step, logger})
+  let result
+  let done = false
+  while (!done) {
+    history.startRun()
+    try {
+      result = await handler({context, event, step, logger})
+      settleUnretried()
+      done = true
+    } catch (err) {
+      const pending = history.getPending()
+      if (pending === null) {
+        throw err
+      }
+      if (err?.name === 'UnrecoverableError') {
+        emitFailure(pending)
+        throw err
+      }
+      io.emit({...pending.event, retryDelayMs: pending.delayMs})
+      await io.wait(pending.delayMs)
+    }
+  }
+
+  return result
 }

package/dist/utils/functions/child-runtime/step-history.d.ts

@@ -0,0 +1,15 @@
+import type {DurableStepEvent} from './types'
+
+type PendingRetry = {index: number; event: DurableStepEvent; delayMs: number}
+
+export function createStepHistory(): {
+  startRun: () => void
+  nextStep: () => {index: number; saved: DurableStepEvent | undefined}
+  recordSuccess: (index: number, event: DurableStepEvent) => void
+  recordFailure: (
+    index: number,
+    failure: {event: DurableStepEvent; error: unknown; delayMs: number},
+  ) => boolean
+  getPending: () => PendingRetry | null
+  settle: (pending: PendingRetry) => void
+}

package/dist/utils/functions/child-runtime/step-history.js

@@ -0,0 +1,52 @@
+const createStepHistory = () => {
+  const history = new Map([])
+  let cursor = 0
+  let pending = null
+
+  const startRun = () => {
+    cursor = 0
+  }
+
+  const nextStep = () => {
+    const index = cursor
+    cursor++
+    return {index, saved: history.get(index)}
+  }
+
+  const recordSuccess = (index, event) => {
+    history.set(index, event)
+  }
+
+  const recordFailure = (index, {event, error, delayMs}) => {
+    const retryable = event.attempt <= event.retries && error?.name !== 'UnrecoverableError'
+
+    if (retryable) {
+      history.set(index, {...event, output: error, retryDelayMs: delayMs})
+      pending = {index, event, delayMs}
+    } else {
+      history.set(index, {...event, output: error})
+    }
+    return retryable
+  }
+
+  const getPending = () => {
+    const item = pending
+    pending = null
+    return item
+  }
+
+  const settle = ({index, event}) => {
+    history.set(index, {...event, output: history.get(index).output})
+  }
+
+  return {
+    startRun,
+    nextStep,
+    recordSuccess,
+    recordFailure,
+    getPending,
+    settle,
+  }
+}
+
+export {createStepHistory}

package/dist/utils/functions/invoke/local.js

@@ -64,10 +64,11 @@ export default async function invoke(resource, payload, context, options) {
     // Apply the GROQ rule before preparing a build so a filtered-out event skips
     // the (potentially expensive) transpile entirely.
     if (isGroqInvocation(resource)) {
-        if (!isGroqContextOptions(context)) {
+        if (!('clientOptions' in context)) {
             throw new Error('GROQ-based functions require a context with clientOptions');
         }
-        const { projectId, dataset } = context.clientOptions;
+        const projectId = 'projectId' in context.clientOptions ? context.clientOptions.projectId : undefined;
+        const dataset = 'dataset' in context.clientOptions ? context.clientOptions.dataset : undefined;
         if ('before' in payload) {
             filteredData = await applyGroqRule(resource, payload, projectId, dataset);
             const filter = resource.event && 'filter' in resource.event ? resource.event.filter : '';
@@ -173,12 +174,22 @@ export default async function invoke(resource, payload, context, options) {
                 // of `nested.error`. The error isn't lost: it travels back in the returned
                 // result and is logged/streamed to the UI by the caller (app/test core).
                 if (child && !child.killed) {
-                    const response = {
-                        type: 'invoke-response',
-                        id,
-                        ok: true,
-                        result: { json: nested.json },
-                    };
+                    // step.delegate errors need to be surfaced to the caller for retry behavior and for the durable step to be marked as failed.
+                    const origin = metadata?.origin || undefined;
+                    const error = nested.error || undefined;
+                    const response = origin === 'step.delegate' && error
+                        ? {
+                            type: 'invoke-response',
+                            id,
+                            ok: false,
+                            error,
+                        }
+                        : {
+                            type: 'invoke-response',
+                            id,
+                            ok: true,
+                            result: { json: nested.json },
+                        };
                     child.send(JSON.stringify(response));
                 }
             }

package/dist/utils/functions/invoke/resolve-invoke-type.d.ts

@@ -1,6 +1,6 @@
 import type { BlueprintResource } from '@sanity/blueprints';
 import type { Logger } from '../../logger.js';
-import type { EventType, FunctionGroqResource, FunctionResource, FunctionTestFlags, InvokeContextOptions, InvokePayloadOptions } from '../../types.js';
+import type { EventType, FunctionGroqResource, FunctionResource, FunctionTestFlags, InvokeContextOptions, InvokePayloadOptions, ResolvedResource } from '../../types.js';
 import buildPayload from '../build-payload.js';
 import { fetchAsset, fetchDocument } from '../fetch-document.js';
 export type InvocationPlan = {
@@ -23,7 +23,7 @@ export type InputContext = {
     apiHost: string;
     token?: string;
     withUserToken?: boolean;
-    resources: BlueprintResource[];
+    resolvedResources: ResolvedResource<BlueprintResource>[];
     blueprintFileDir: string;
     log: Logger;
 };

package/dist/utils/functions/invoke/resolve-invoke-type.js

@@ -51,7 +51,7 @@ export const buildContext = (plan, input) => {
     if (plan.kind === 'plain') {
         return {
             clientOptions: { ...withToken },
-            resources: input.resources,
+            resources: input.resolvedResources,
             blueprintFileDir: input.blueprintFileDir,
         };
     }
@@ -69,7 +69,7 @@ export const buildContext = (plan, input) => {
             '',
         functionResourceType: 'project',
         functionResourceId: input.projectId || '',
-        resources: input.resources,
+        resources: input.resolvedResources,
         blueprintFileDir: input.blueprintFileDir,
     };
 };

package/dist/utils/types.d.ts

@@ -40,6 +40,11 @@ export interface BlueprintResourceRecord extends BlueprintResource {
 export interface DeployedResource extends BlueprintResourceRecord {
     externalId: string;
 }
+/** Wrap a resource and its externalId if it has one. */
+export interface ResolvedResource<R extends BlueprintResource> {
+    resource: R;
+    externalId?: string;
+}
 export declare function isLocalFunctionResource(r: BlueprintResource): r is FunctionResource;
 export declare function hasEventSource(r: FunctionResource): r is EventFunctionResource;
 export declare function isScheduleEvent(e: unknown): e is BlueprintScheduledFunctionResource['event'];
@@ -134,8 +139,14 @@ export type InvokePayloadMetadata = Pick<InvokeGroqPayloadOptions, 'event' | 'be
 export type EventType = 'create' | 'update' | 'delete';
 export type NonGroqEventType = 'plain' | 'nested' | 'durable';
 export declare function isEventType(arg: string): arg is EventType;
+interface BaseContextOptions {
+    /** All resources declared by the blueprint, used to populate `context.resources` at invoke time. */
+    resources?: ResolvedResource<BlueprintResource>[];
+    /** The directory where the blueprint manifest is located. */
+    blueprintFileDir: string;
+}
 /** @internal */
-export interface InvokeGroqContextOptions {
+export interface InvokeGroqContextOptions extends BaseContextOptions {
     clientOptions: {
         apiVersion?: string;
         dataset?: string;
@@ -151,20 +162,12 @@ export interface InvokeGroqContextOptions {
     functionResourceType: string;
     /** The resource ID of the function container; resource ID that houses the function. */
     functionResourceId: string;
-    /** All resources declared by the blueprint, used to populate `context.resources` at invoke time. */
-    resources?: BlueprintResource[];
-    /** The directory where the blueprint manifest is located. */
-    blueprintFileDir: string;
 }
 /** @internal */
-export interface InvokeScheduleContextOptions {
+export interface InvokeScheduleContextOptions extends BaseContextOptions {
     clientOptions: {
         token?: string;
     };
-    /** All resources declared by the blueprint, used to populate `context.resources` at invoke time. */
-    resources?: BlueprintResource[];
-    /** The directory where the blueprint manifest is located. */
-    blueprintFileDir: string;
 }
 export type InvokeContextOptions = InvokeGroqContextOptions | InvokeScheduleContextOptions;
 export declare function isGroqContextOptions(context: InvokeContextOptions): context is InvokeGroqContextOptions;
@@ -338,7 +341,7 @@ export type AssetPrepResult = {
     error: string;
 };
 export type PrepAssetFn<R extends BlueprintResource> = (options: {
-    resource: R;
+    resolvedResource: ResolvedResource<R>;
     blueprintFileDir: string;
     installer?: InstallerType;
 }) => Promise<AssetPrepResult>;
@@ -355,7 +358,7 @@ export type PreDeployConfig = {
     prepareResource?: PrepResourceFn<BlueprintResource>;
 };
 export type AssetResource<R extends BlueprintResource> = {
-    resource: R;
+    resource: ResolvedResource<R>;
     prepareAsset: PrepAssetFn<R>;
 };
 export type Warning = {
@@ -376,6 +379,10 @@ export interface DurableStepEvent {
     output?: unknown;
     error?: InvocationError;
     durationMs?: number;
+    retryDelayMs?: number;
+    attempt?: number;
+    retries?: number;
+    maxAttempts?: number;
 }
 export interface DurableLogEvent {
     kind: 'log';

package/dist/utils/types.js

@@ -38,7 +38,7 @@ export function isEventType(arg) {
     return ['create', 'update', 'delete'].includes(arg);
 }
 export function isGroqContextOptions(context) {
-    return 'clientOptions' in context;
+    return 'eventResourceType' in context;
 }
 /** @internal */
 export var BlueprintParserErrorType;

package/oclif.manifest.json

@@ -3148,5 +3148,5 @@
       ]
     }
   },
-  "version": "17.16.0-next.g26925c0"
+  "version": "17.16.0-next.g91e6dd2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "17.16.0-next.g26925c0",
+  "version": "17.16.0-next.g91e6dd2",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -100,7 +100,7 @@
     "@oclif/test": "^4.2.0",
     "@playwright/test": "^1.63.0",
     "@sanity-labs/design-tokens": "^0.0.2-alpha.2",
-    "@sanity/functions": "^1.7.2",
+    "@sanity/functions": "^1.8.1",
     "@types/cardinal": "^2.1.1",
     "@types/mime-types": "^3.0.1",
     "@types/node": "^22",