@sanity/runtime-cli 12.1.0 → 12.3.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/12.1.0 linux-x64 node-v24.11.1
+@sanity/runtime-cli/12.3.0 linux-x64 node-v24.11.1
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -92,7 +92,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/v12.1.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -121,7 +121,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack-id <stackId>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -143,7 +143,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --no-wait
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -170,7 +170,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack-id <stackId> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -178,9 +178,10 @@ Diagnose potential issues with Blueprint configuration
 
 ```
 USAGE
-  $ sanity-run blueprints doctor [--verbose] [--path <value>]
+  $ sanity-run blueprints doctor [--verbose] [--path <value>] [--fix]
 
 FLAGS
+  --fix           Interactively fix configuration issues
   --path=<value>  Path to the Blueprint configuration file
   --verbose       Provide detailed information about issues
 
@@ -188,7 +189,7 @@ DESCRIPTION
   Diagnose potential issues with Blueprint configuration
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -210,7 +211,7 @@ EXAMPLES
   $ sanity-run blueprints info --id <stackId>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -250,7 +251,7 @@ EXAMPLES
   $ sanity-run blueprints init --blueprint-type <json|js|ts> --stack-name <stackName>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -272,7 +273,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -289,7 +290,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -314,7 +315,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId>
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -356,7 +357,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/v12.1.0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -379,7 +380,7 @@ EXAMPLES
   $ sanity-run functions dev --host 127.0.0.1 --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -401,7 +402,7 @@ EXAMPLES
   $ sanity-run functions env add MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -421,7 +422,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -442,7 +443,7 @@ EXAMPLES
   $ sanity-run functions env remove MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -476,7 +477,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v12.1.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -525,7 +526,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/v12.1.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v12.3.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,16 +1,15 @@
 import AdmZip from 'adm-zip';
-import type { AuthParams, FunctionResource } from '../../utils/types.js';
+import type { AuthParams, CollectionFunction, FunctionResource } from '../../utils/types.js';
 export declare const ASSET_CHECK_URL: string;
 export declare const ASSET_STASH_URL: string;
 export declare function stashAsset({ resource, auth, }: {
-    resource: FunctionResource;
+    resource: FunctionResource | CollectionFunction;
     auth: AuthParams;
 }): Promise<{
     success: boolean;
+    assetId?: string;
     exists?: boolean;
     hash?: string;
-    assetId?: string;
-    outputPath?: string;
     error?: string;
 }>;
 export declare function hashBuffer(buffer: Buffer): string;

package/dist/actions/blueprints/assets.js

@@ -1,5 +1,6 @@
 import crypto from 'node:crypto';
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { cwd } from 'node:process';
 import AdmZip from 'adm-zip';
@@ -10,12 +11,68 @@ import { shouldAutoResolveDependencies } from '../../utils/functions/should-auto
 import { shouldTranspileFunction } from '../../utils/functions/should-transpile.js';
 import getHeaders from '../../utils/get-headers.js';
 import { transpileFunction } from '../../utils/transpile/transpile-function.js';
+import { isLocalFunctionCollection } from '../../utils/types.js';
 const { apiUrl } = config;
 const ASSETS_URL = `${apiUrl}vX/blueprints/assets`;
 export const ASSET_CHECK_URL = `${ASSETS_URL}/check`;
 export const ASSET_STASH_URL = `${ASSETS_URL}/stash`;
 const MAX_ASSET_SIZE = 209_715_200; // 200 MB in bytes
 export async function stashAsset({ resource, auth, }) {
+    const isCollection = isLocalFunctionCollection(resource);
+    const functions = isCollection ? resource.functions : [resource];
+    const combinedAsset = [];
+    try {
+        for (const func of functions) {
+            const prepResult = await prepareAsset({ resource: func, auth });
+            if (prepResult.success && prepResult.outputPath && prepResult.cleanup) {
+                combinedAsset.push({
+                    name: func.name,
+                    partAsset: { outputPath: prepResult.outputPath, cleanup: prepResult.cleanup },
+                });
+            }
+        }
+        if (combinedAsset.length !== functions.length) {
+            const processedNames = new Set(combinedAsset.map((asset) => asset.name));
+            const failedFunctions = functions.filter((func) => !processedNames.has(func.name));
+            return {
+                success: false,
+                error: `Failed to prepare ${failedFunctions.length} function(s) in collection: ${failedFunctions.map((f) => f.name).join(', ')}`,
+            };
+        }
+        let result = { success: false };
+        if (isCollection) {
+            const combinedResult = await combineAssets(combinedAsset);
+            if (combinedResult.combinedPath && combinedResult.cleanup) {
+                result = await stashSingleAsset({
+                    outputPath: combinedResult.combinedPath,
+                    cleanup: combinedResult.cleanup,
+                    resource: resource,
+                    auth,
+                    collectionInfo: {
+                        name: resource.name,
+                        functionCount: resource.functions.length,
+                    },
+                });
+            }
+            else if (combinedResult.error) {
+                result = { success: false, error: combinedResult.error };
+            }
+        }
+        else {
+            result = await stashSingleAsset({
+                outputPath: combinedAsset[0].partAsset.outputPath,
+                cleanup: combinedAsset[0].partAsset.cleanup,
+                resource: resource,
+                auth,
+            });
+        }
+        return result;
+    }
+    catch (err) {
+        return { success: false, error: err instanceof Error ? err.message : `${err}` };
+    }
+}
+async function prepareAsset({ resource, }) {
     if (!resource.src)
         throw new Error('Resource src is required');
     let functionPath = path.join(cwd(), resource.src);
@@ -41,7 +98,60 @@ export async function stashAsset({ resource, auth, }) {
         if (size > MAX_ASSET_SIZE) {
             throw new Error('Resource is larger than max asset size of 200 MB.');
         }
-        const { b64, hash } = await pathToB64ZipHash(functionPath);
+        return { success: true, outputPath: functionPath, cleanup };
+    }
+    catch (err) {
+        return { success: false, error: err instanceof Error ? err.message : `${err}` };
+    }
+}
+async function combineAssets(allAssets) {
+    const combinedPath = path.join(os.tmpdir(), `assets-${Date.now()}`);
+    await fs.promises.mkdir(combinedPath, { recursive: true });
+    try {
+        for (const asset of allAssets) {
+            try {
+                await fs.promises.mkdir(path.join(combinedPath, asset.name), { recursive: true });
+                await fs.promises.cp(asset.partAsset.outputPath, path.join(combinedPath, asset.name), {
+                    recursive: true,
+                });
+                await asset.partAsset.cleanup();
+            }
+            catch (err) {
+                // Clean up any partial work
+                try {
+                    await fs.promises.rm(combinedPath, { recursive: true, force: true });
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+                // Clean up remaining individual assets
+                await Promise.allSettled(allAssets.map((a) => a.partAsset.cleanup()));
+                return {
+                    error: `Failed to combine asset for function '${asset.name}': ${err instanceof Error ? err.message : String(err)}`,
+                };
+            }
+        }
+        const cleanupCombined = async () => {
+            await fs.promises.rm(combinedPath, { recursive: true, force: true });
+        };
+        return { combinedPath, cleanup: cleanupCombined };
+    }
+    catch (err) {
+        // Clean up any partial work
+        try {
+            await fs.promises.rm(combinedPath, { recursive: true, force: true });
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        // Clean up individual assets that were successfully prepared
+        await Promise.allSettled(allAssets.map((asset) => asset.partAsset.cleanup()));
+        return { error: err instanceof Error ? err.message : `${err}` };
+    }
+}
+async function stashSingleAsset({ outputPath, cleanup, resource, auth, collectionInfo, }) {
+    try {
+        const { b64, hash } = await pathToB64ZipHash(outputPath);
         try {
             const checkResponse = await fetch(`${ASSET_CHECK_URL}/${hash}`, {
                 method: 'GET',
@@ -66,7 +176,13 @@ export async function stashAsset({ resource, auth, }) {
         if (assetResponse.ok) {
             return { success: true, assetId: assetJson.id, exists: false, hash };
         }
-        return { success: false, error: assetJson.message || 'Unknown error' };
+        const contextMsg = collectionInfo
+            ? ` (part of collection '${collectionInfo.name}' with ${collectionInfo.functionCount} functions)`
+            : '';
+        return {
+            success: false,
+            error: `Failed to stash asset for ${resource.name}${contextMsg}: ${assetJson.message || 'Unknown error'}`,
+        };
     }
     catch (err) {
         let error = '';

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

@@ -1,5 +1,6 @@
+import type { BlueprintResource } from '@sanity/blueprints';
 import { type Blueprint } from '@sanity/blueprints-parser';
-import type { BlueprintParserError, Resource } from '../../utils/types.js';
+import type { BlueprintParserError } from '../../utils/types.js';
 import { type ScopeType } from '../../utils/types.js';
 import { type LocatedBlueprintsConfig } from './config.js';
 declare const SUPPORTED_FILE_EXTENSIONS: readonly [".json", ".js", ".mjs", ".ts"];
@@ -51,7 +52,7 @@ export declare function writeBlueprintToDisk({ blueprintFilePath, jsonContent, }
     blueprintFilePath: string;
     jsonContent?: Blueprint;
 }): string;
-export declare function addResourceToBlueprint<T extends Resource>({ blueprintFilePath, resource, }: {
+export declare function addResourceToBlueprint<T extends BlueprintResource>({ blueprintFilePath, resource, }: {
     blueprintFilePath?: string;
     resource: T;
 }): T | undefined;

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

@@ -1,10 +1,14 @@
 import type { AuthParams, ScopeType, Stack, StackMutation } from '../../utils/types.js';
 export declare const stacksUrl: string;
-interface ListStacksResponse {
-    ok: boolean;
-    error: string | null;
+type ListStacksResponse = {
+    ok: true;
+    error: null;
     stacks: Stack[];
-}
+} | {
+    ok: false;
+    error: string;
+    stacks: unknown;
+};
 export declare function listStacks(auth: AuthParams): Promise<ListStacksResponse>;
 interface GetStackResponse {
     ok: boolean;

package/dist/actions/blueprints/stacks.js

@@ -2,32 +2,6 @@ import config from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
 const { apiUrl } = config;
 export const stacksUrl = `${apiUrl}vX/blueprints/stacks`;
-/** Discriminate between Resource and Resource with parameters */
-function hasParameters(obj) {
-    return (typeof obj === 'object' &&
-        obj !== null &&
-        'parameters' in obj &&
-        typeof obj.parameters === 'object' &&
-        obj.parameters !== null);
-}
-/** Flatten Resource with parameters */
-function flattenResource(resource) {
-    if (hasParameters(resource)) {
-        const { parameters, ...rest } = resource;
-        return { ...rest, ...parameters };
-    }
-    return resource;
-}
-/** Flatten a Stack's resources */
-function flattenStackResources(stack) {
-    if (stack && Array.isArray(stack.resources)) {
-        return {
-            ...stack,
-            resources: stack.resources.map(flattenResource),
-        };
-    }
-    return stack;
-}
 export async function listStacks(auth) {
     const response = await fetch(stacksUrl, {
         method: 'GET',
@@ -37,7 +11,7 @@ export async function listStacks(auth) {
     return {
         ok: response.ok,
         error: response.ok ? null : data.message,
-        stacks: response.ok ? data.map(flattenStackResources) : data,
+        stacks: data,
     };
 }
 export async function getStack({ stackId, auth, }) {
@@ -49,7 +23,7 @@ export async function getStack({ stackId, auth, }) {
     return {
         ok: response.ok,
         error: response.ok ? null : data.message,
-        stack: response.ok ? flattenStackResources(data) : data,
+        stack: data,
         response,
     };
 }
@@ -63,7 +37,7 @@ export async function createStack({ stackMutation, auth, }) {
     return {
         ok: response.ok,
         error: response.ok ? null : data.message,
-        stack: response.ok ? flattenStackResources(data) : data,
+        stack: data,
     };
 }
 export async function createEmptyStack({ token, scopeType, scopeId, name, }) {
@@ -80,7 +54,7 @@ export async function createEmptyStack({ token, scopeType, scopeId, name, }) {
     if (!response.ok) {
         throw new Error(response.error || 'Failed to create new Stack');
     }
-    return flattenStackResources(response.stack);
+    return response.stack;
 }
 export async function updateStack({ stackId, stackMutation, auth, }) {
     const response = await fetch(`${stacksUrl}/${stackId}`, {
@@ -92,7 +66,7 @@ export async function updateStack({ stackId, stackMutation, auth, }) {
     return {
         ok: response.ok,
         error: response.ok ? null : data.message,
-        stack: response.ok ? flattenStackResources(data) : data,
+        stack: data,
     };
 }
 export async function destroyStack({ stackId, auth, }) {
@@ -104,6 +78,6 @@ export async function destroyStack({ stackId, auth, }) {
     return {
         ok: response.ok,
         error: response.ok ? null : data.message,
-        stack: response.ok ? flattenStackResources(data) : data,
+        stack: data,
     };
 }

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

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

package/dist/commands/blueprints/doctor.js

@@ -12,6 +12,10 @@ export default class DoctorCommand extends Command {
         path: Flags.string({
             description: 'Path to the Blueprint configuration file',
         }),
+        fix: Flags.boolean({
+            description: 'Interactively fix configuration issues',
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(DoctorCommand);

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class DevCommand extends Command {
+import { BlueprintCommand } from '../../baseCommands.js';
+export default class DevCommand extends BlueprintCommand<typeof DevCommand> {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/functions/dev.js

@@ -1,6 +1,7 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
+import { BlueprintCommand } from '../../baseCommands.js';
 import { functionDevCore } from '../../cores/functions/dev.js';
-export default class DevCommand extends Command {
+export default class DevCommand extends BlueprintCommand {
     static description = 'Start the Sanity Function emulator';
     static examples = ['<%= config.bin %> <%= command.id %> --host 127.0.0.1 --port 8974'];
     static flags = {

package/dist/constants.d.ts

@@ -0,0 +1,7 @@
+export declare const SANITY_ACCESS_ROLE = "sanity.access.role";
+export declare const SANITY_FUNCTION_DOCUMENT = "sanity.function.document";
+export declare const SANITY_FUNCTION_MEDIA_LIBRARY_ASSET = "sanity.function.media-library.asset";
+export declare const SANITY_FUNCTION_SCHEDULE = "sanity.function.cron";
+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";

package/dist/constants.js

@@ -0,0 +1,7 @@
+export const SANITY_ACCESS_ROLE = 'sanity.access.role';
+export const SANITY_FUNCTION_DOCUMENT = 'sanity.function.document';
+export const SANITY_FUNCTION_MEDIA_LIBRARY_ASSET = 'sanity.function.media-library.asset';
+export const SANITY_FUNCTION_SCHEDULE = 'sanity.function.cron';
+export const SANITY_PROJECT_CORS = 'sanity.project.cors';
+export const SANITY_PROJECT_DATASET = 'sanity.project.dataset';
+export const SANITY_PROJECT_WEBHOOK = 'sanity.project.webhook';

package/dist/cores/blueprints/deploy.js

@@ -14,23 +14,37 @@ export async function blueprintDeployCore(options) {
     try {
         const { resources } = blueprint.parsedBlueprint;
         const validResources = resources?.filter((r) => r.type) || [];
-        let functionResources = validResources.filter(isLocalFunctionResource);
-        const experimentalFunctionCollections = validResources.filter(isLocalFunctionCollection);
-        if (experimentalFunctionCollections.length > 0) {
-            const allFunctionResources = experimentalFunctionCollections.flatMap((r) => r.functions);
-            functionResources = [...functionResources, ...allFunctionResources];
-        }
+        const functionResources = validResources.filter(isLocalFunctionResource);
+        const functionCollections = validResources.filter(isLocalFunctionCollection);
+        const allFunctionResources = [...functionResources, ...functionCollections];
         // First stash all function assets
-        if (functionResources.length > 0) {
+        if (allFunctionResources.length > 0) {
             log('Processing function assets...');
-            for (const resource of functionResources) {
+            for (const resource of allFunctionResources) {
                 const fnSpinner = ora({ text: `Processing ${resource.name}...`, prefixText: ' ' }).start();
                 const result = await stashAsset({ resource, auth });
                 if (result.success && result.assetId) {
-                    const src = resource.src;
                     resource.src = result.assetId;
-                    fnSpinner.succeed(`${resource.name} ${niceId(result.assetId)}`);
-                    log(`   Source: ${src}`);
+                    if (isLocalFunctionCollection(resource)) {
+                        try {
+                            for (const func of resource.functions) {
+                                func.src = func.name;
+                            }
+                            fnSpinner.succeed(`${resource.name} collection ${niceId(result.assetId)} (${resource.functions.length} functions)`);
+                            log(`   Functions: ${resource.functions.map((f) => f.name).join(', ')}`);
+                        }
+                        catch (err) {
+                            fnSpinner.fail(`Failed to update function collection ${resource.name}`);
+                            return {
+                                success: false,
+                                error: `Error updating function collection '${resource.name}': ${err instanceof Error ? err.message : String(err)}`,
+                            };
+                        }
+                    }
+                    else {
+                        fnSpinner.succeed(`${resource.name} ${niceId(result.assetId)}`);
+                        log(`   Source: ${resource.src}`);
+                    }
                     if (verbose) {
                         if (result.hash) {
                             if (result.hash.length > 24) {
@@ -45,7 +59,10 @@ export async function blueprintDeployCore(options) {
                     }
                 }
                 else {
-                    fnSpinner.fail(`Failed uploading ${resource.name} asset, deploy has stopped`);
+                    const errorMsg = isLocalFunctionCollection(resource)
+                        ? `Failed uploading function collection ${resource.name} (${resource.functions?.length || 0} functions), deploy has stopped`
+                        : `Failed uploading ${resource.name} asset, deploy has stopped`;
+                    fnSpinner.fail(errorMsg);
                     log(`   Error: ${result.error}`);
                     return { success: false, error: result.error || 'Failed to process function resource' };
                 }

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

@@ -4,6 +4,7 @@ export interface BlueprintDoctorOptions extends CoreConfig {
     flags: {
         verbose?: boolean;
         path?: string;
+        fix?: boolean;
     };
 }
 export declare function blueprintDoctorCore(options: BlueprintDoctorOptions): Promise<CoreResult>;