@sanity/runtime-cli 14.12.1 → 14.13.1

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/14.12.1 linux-x64 node-v24.14.1
+@sanity/runtime-cli/14.13.1 linux-x64 node-v24.14.1
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -50,7 +50,7 @@ USAGE
 
 ## `sanity-run blueprints add TYPE`
 
-Add a function resource to a Blueprint
+[deprecated] Use "functions add" instead
 
 ```
 USAGE
@@ -82,12 +82,13 @@ FLAGS
       --[no-]validate-resources  Validate resources
 
 DESCRIPTION
-  Add a function resource to a Blueprint
+  [deprecated] Use "functions add" instead
 
-  Scaffolds a new Sanity Function in your Blueprint. Functions are serverless handlers triggered by document events
-  (create, update, delete, publish) or media library events.
+  This command is deprecated. Use "functions add" instead.
 
-  After adding a function, use 'functions dev' to test locally, then 'blueprints deploy' to publish it.
+  Equivalent usage:
+  $ sanity-run functions add
+  $ sanity-run functions add --name my-function --type document-create
 
 EXAMPLES
   $ sanity-run blueprints add function
@@ -101,7 +102,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/v14.12.1/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -140,7 +141,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/v14.12.1/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -182,7 +183,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --fn-installer npm
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -218,7 +219,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/v14.12.1/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -250,7 +251,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -285,7 +286,7 @@ EXAMPLES
   $ sanity-run blueprints info --project-id <id> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -338,7 +339,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/v14.12.1/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -369,7 +370,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -397,7 +398,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -405,9 +406,11 @@ List remote Stack deployments for your project or organization
 
 ```
 USAGE
-  $ sanity-run blueprints stacks [--json] [--validate-resources] [--project-id <value> | --organization-id <value>]
+  $ sanity-run blueprints stacks [--json] [--validate-resources] [--project-id <value> | --organization-id <value> |
+    --include-projects]
 
 FLAGS
+  --include-projects         Include Stacks from all projects within the organization. Requires --organization-id.
   --json                     Format output as json
   --organization-id=<value>  Sanity organization ID used to scope Blueprint and Stack
   --project-id=<value>       Sanity project ID used to scope Blueprint and Stack
@@ -421,15 +424,19 @@ DESCRIPTION
   Use this to discover existing Stacks you can scope a local Blueprint to (using 'blueprints config --edit'), or to
   audit what's deployed across your project.
 
+  Use --include-projects with --organization-id to also list Stacks from all projects within the organization.
+
 EXAMPLES
   $ sanity-run blueprints stacks
 
   $ sanity-run blueprints stacks --project-id <projectId>
 
   $ sanity-run blueprints stacks --organization-id <organizationId>
+
+  $ sanity-run blueprints stacks --organization-id <organizationId> --include-projects
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -482,7 +489,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/v14.12.1/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -518,7 +525,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -549,7 +556,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/v14.12.1/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -577,7 +584,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -607,7 +614,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/v14.12.1/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -649,7 +656,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -707,7 +714,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/v14.12.1/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v14.13.1/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/logs-polling.d.ts

@@ -0,0 +1,20 @@
+import type { Logger } from '../../utils/logger.js';
+import type { AuthParams, BlueprintLog } from '../../utils/types.js';
+export declare const LOG_POLL_INTERVAL_MS = 725;
+export interface LogPollingConfig {
+    stackId: string;
+    operationId?: string;
+    knownIds?: string[];
+    auth: AuthParams;
+    showBanner?: boolean;
+    verbose?: boolean;
+    log: Logger;
+    onActivity?: () => void;
+    onLogEntry?: (log: BlueprintLog) => void;
+}
+/**
+ * Polls the logs list endpoint at a fixed interval and displays new entries.
+ * Deduplicates by log ID so no dependency on server timestamps.
+ * @returns A cleanup function that stops polling
+ */
+export declare function setupLogPolling(config: LogPollingConfig): () => void;

package/dist/actions/blueprints/logs-polling.js

@@ -0,0 +1,48 @@
+import { formatLogEntry } from '../../utils/display/logs-formatting.js';
+import { styleText } from '../../utils/style-text.js';
+import { getLogs } from './logs.js';
+export const LOG_POLL_INTERVAL_MS = 725;
+/**
+ * Polls the logs list endpoint at a fixed interval and displays new entries.
+ * Deduplicates by log ID so no dependency on server timestamps.
+ * @returns A cleanup function that stops polling
+ */
+export function setupLogPolling(config) {
+    const { stackId, operationId, auth, log, showBanner, verbose = false } = config;
+    const seenIds = new Set(config.knownIds);
+    let previousLog;
+    let stopped = false;
+    if (showBanner) {
+        log(`Watching logs... ${styleText('bold', 'ctrl+c')} to cancel`);
+    }
+    const fetchAndProcessLogs = async () => {
+        if (stopped)
+            return;
+        try {
+            const params = operationId ? { operationId } : { stackId };
+            const { ok, logs } = await getLogs(params, auth, log);
+            if (!ok || stopped)
+                return;
+            // API returns newest first; reverse so we display in chronological order
+            const newLogs = logs.filter((entry) => !seenIds.has(entry.id)).reverse();
+            for (const logEntry of newLogs) {
+                seenIds.add(logEntry.id);
+                config.onActivity?.();
+                config.onLogEntry?.(logEntry);
+                log(formatLogEntry(logEntry, verbose, previousLog));
+                previousLog = logEntry;
+            }
+        }
+        catch {
+            // Swallow fetch errors; the operation status poll in callers handles terminal failure.
+            // Logging noise here is not useful.
+        }
+    };
+    // Fire immediately, then on interval
+    fetchAndProcessLogs();
+    const intervalId = setInterval(fetchAndProcessLogs, LOG_POLL_INTERVAL_MS);
+    return () => {
+        stopped = true;
+        clearInterval(intervalId);
+    };
+}

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

@@ -1,7 +1,13 @@
 import type { Logger } from '../../utils/logger.js';
 import type { ActionResponse, AuthParams, BlueprintLog } from '../../utils/types.js';
 export declare const logsUrl: string;
-export declare function getLogs(stackId: string, auth: AuthParams, logger: Logger): Promise<ActionResponse & {
+export interface GetLogsParams {
+    stackId?: string;
+    operationId?: string;
+    limit?: number;
+    before?: string;
+}
+export declare function getLogs(params: GetLogsParams, auth: AuthParams, logger: Logger): Promise<ActionResponse & {
     logs: BlueprintLog[];
 }>;
 export declare function getRecentLogs(logs: BlueprintLog[], limit?: number): BlueprintLog[];

package/dist/actions/blueprints/logs.js

@@ -3,10 +3,17 @@ import getHeaders from '../../utils/get-headers.js';
 import { createTracedFetch } from '../../utils/traced-fetch.js';
 const { apiUrl } = config;
 export const logsUrl = `${apiUrl}vX/blueprints/logs`;
-export async function getLogs(stackId, auth, logger) {
+export async function getLogs(params, auth, logger) {
     const fetchFn = createTracedFetch(logger);
     const url = new URL(logsUrl);
-    url.searchParams.append('stackId', stackId);
+    if (params.stackId)
+        url.searchParams.append('stackId', params.stackId);
+    if (params.operationId)
+        url.searchParams.append('operationId', params.operationId);
+    if (params.limit)
+        url.searchParams.append('limit', String(params.limit));
+    if (params.before)
+        url.searchParams.append('before', params.before);
     const response = await fetchFn(url.toString(), {
         headers: getHeaders(auth),
         method: 'GET',

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

@@ -37,7 +37,9 @@ export declare function createEmptyStack({ token, scopeType, scopeId, name, logg
     logger: Logger;
 }): Promise<Stack>;
 interface UpdateStackResponse extends ActionResponse {
-    stack: Stack;
+    stack: Stack & {
+        operationId?: string;
+    };
 }
 export declare function updateStack({ stackId, stackMutation, auth, logger, }: {
     stackId: string;
@@ -96,7 +98,9 @@ export declare function planStack({ stackId, document, auth, logger, }: {
     logger: Logger;
 }): Promise<PlanStackResponse>;
 interface DestroyStackResponse extends ActionResponse {
-    stack: Stack;
+    stack: Stack & {
+        operationId?: string;
+    };
 }
 export declare function resolveStackIdByNameOrId(value: string, auth: AuthParams, logger: Logger): Promise<string>;
 interface PromoteStackResponse extends ActionResponse {

package/dist/actions/sanity/projects.d.ts

@@ -17,8 +17,9 @@ export interface Project {
 interface ListProjectsResponse extends ActionResponse {
     projects: Project[];
 }
-export declare function listProjects({ token, logger, }: {
+export declare function listProjects({ token, organizationId, logger, }: {
     token: string;
+    organizationId?: string;
     logger: Logger;
 }): Promise<ListProjectsResponse>;
 interface GroupedProjectsByOrganizationResponse extends ActionResponse {

package/dist/actions/sanity/projects.js

@@ -3,9 +3,12 @@ import { createTracedFetch } from '../../utils/traced-fetch.js';
 const { populusApiUrl } = config;
 export const projectsApiPath = `${populusApiUrl}v2021-06-07/projects`;
 export const orgsApiPath = `${populusApiUrl}v2021-06-07/organizations`;
-export async function listProjects({ token, logger, }) {
+export async function listProjects({ token, organizationId, logger, }) {
     const fetchFn = createTracedFetch(logger);
-    const projectsFetch = await fetchFn(projectsApiPath, {
+    const url = organizationId
+        ? `${projectsApiPath}?organizationId=${encodeURIComponent(organizationId)}`
+        : projectsApiPath;
+    const projectsFetch = await fetchFn(url, {
         method: 'GET',
         headers: {
             Authorization: `Bearer ${token}`,

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

@@ -1,11 +1,14 @@
 /**
  * @file
  * @deprecated Use `functions add` instead.
- * We're in the process of deprecating the `blueprints add` command.
  */
 import { ResolvedCommand } from '../../baseCommands.js';
 export default class AddCommand extends ResolvedCommand<typeof AddCommand> {
     static needs: readonly ["blueprint"];
+    static state: string;
+    static deprecationOptions: {
+        to: string;
+    };
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/add.js

@@ -1,25 +1,26 @@
 /**
  * @file
  * @deprecated Use `functions add` instead.
- * We're in the process of deprecating the `blueprints add` command.
  */
 import { Args, Flags } from '@oclif/core';
 import { ResolvedCommand } from '../../baseCommands.js';
 import { FUNCTION_TYPES } from '../../constants.js';
 import { functionAddCore } from '../../cores/functions/index.js';
+import { warn } from '../../utils/display/presenters.js';
 import { Logger } from '../../utils/logger.js';
 import { INSTALLER_OPTIONS } from '../../utils/types.js';
-// import {warn} from '../../utils/display/presenters.js'
 export default class AddCommand extends ResolvedCommand {
     static needs = ['blueprint'];
-    // static state = 'deprecated'
-    // static deprecationOptions = {
-    //   message: '`blueprints add` is deprecated. Use `functions add` instead.',
-    // }
-    static summary = 'Add a function resource to a Blueprint';
-    static description = `Scaffolds a new Sanity Function in your Blueprint. Functions are serverless handlers triggered by document events (create, update, delete, publish) or media library events.
+    static state = 'deprecated';
+    static deprecationOptions = {
+        to: 'functions add',
+    };
+    static summary = '[deprecated] Use "functions add" instead';
+    static description = `This command is deprecated. Use "functions add" instead.
 
-After adding a function, use 'functions dev' to test locally, then 'blueprints deploy' to publish it.`;
+Equivalent usage:
+  $ <%= config.bin %> functions add
+  $ <%= config.bin %> functions add --name my-function --type document-create`;
     static examples = [
         '<%= config.bin %> <%= command.id %> function',
         '<%= config.bin %> <%= command.id %> function --helpers',
@@ -84,11 +85,7 @@ After adding a function, use 'functions dev' to test locally, then 'blueprints d
         if (resourceType !== 'function') {
             this.error(`Unsupported Resource type: ${resourceType}`);
         }
-        // log(
-        //   warn(
-        //     `\`npx ${bin} blueprints add function\` is deprecated. Use \`npx ${bin} functions add\` instead.`,
-        //   ),
-        // )
+        this.log(warn(`"${bin} blueprints add" is deprecated and will be removed in a future release. Use "${bin} functions add" instead.`));
         const result = await functionAddCore({
             bin,
             log: Logger(this.log.bind(this), this.flags),

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

@@ -7,6 +7,7 @@ export default class StacksCommand extends ResolvedCommand<typeof StacksCommand>
     static flags: {
         'project-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'organization-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'include-projects': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<Record<string, unknown> | undefined>;
 }

package/dist/commands/blueprints/stacks.js

@@ -7,15 +7,25 @@ export default class StacksCommand extends ResolvedCommand {
     static summary = 'List remote Stack deployments for your project or organization';
     static description = `Shows all Stacks associated with a project or organization. By default, lists Stacks scoped to the local Blueprint.
 
-Use this to discover existing Stacks you can scope a local Blueprint to (using 'blueprints config --edit'), or to audit what's deployed across your project.`;
+Use this to discover existing Stacks you can scope a local Blueprint to (using 'blueprints config --edit'), or to audit what's deployed across your project.
+
+Use --include-projects with --organization-id to also list Stacks from all projects within the organization.`;
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --project-id <projectId>',
         '<%= config.bin %> <%= command.id %> --organization-id <organizationId>',
+        '<%= config.bin %> <%= command.id %> --organization-id <organizationId> --include-projects',
     ];
     static flags = {
-        'project-id': Flags.string({ ...projectIdFlagConfig, exclusive: ['organization-id'] }),
+        'project-id': Flags.string({
+            ...projectIdFlagConfig,
+            exclusive: ['organization-id', 'include-projects'],
+        }),
         'organization-id': Flags.string({ ...organizationIdFlagConfig, exclusive: ['project-id'] }),
+        'include-projects': Flags.boolean({
+            description: 'Include Stacks from all projects within the organization. Requires --organization-id.',
+            dependsOn: ['organization-id'],
+        }),
     };
     async run() {
         const result = await blueprintStacksCore({

package/dist/cores/blueprints/deploy.js

@@ -1,6 +1,6 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { stashAsset } from '../../actions/blueprints/assets.js';
-import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
+import { setupLogPolling } from '../../actions/blueprints/logs-polling.js';
 import { getStack, updateStack } from '../../actions/blueprints/stacks.js';
 import { createLogHintCollector } from '../../utils/blueprints/log-hints.js';
 import { niceId } from '../../utils/display/presenters.js';
@@ -47,7 +47,6 @@ export async function blueprintDeployCore(options) {
             }
         }
         const spinner = log.ora('Deploying...').start();
-        const isoNow = new Date().toISOString();
         const { ok: deployOk, stack, error: deployError, } = await updateStack({
             stackId,
             stackMutation: {
@@ -87,9 +86,9 @@ export async function blueprintDeployCore(options) {
         try {
             let lastLogAt = Date.now();
             let idleMessageShown = false;
-            logStreamCleanup = await setupLogStreaming({
+            logStreamCleanup = setupLogPolling({
                 stackId: stack.id,
-                after: isoNow,
+                operationId: stack.operationId,
                 auth,
                 log,
                 verbose,

package/dist/cores/blueprints/destroy.js

@@ -1,6 +1,6 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { confirm } from '@inquirer/prompts';
-import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
+import { setupLogPolling } from '../../actions/blueprints/logs-polling.js';
 import { destroyStack, getStack, resolveStackIdByNameOrId } from '../../actions/blueprints/stacks.js';
 import { createLogHintCollector } from '../../utils/blueprints/log-hints.js';
 import { niceId } from '../../utils/display/presenters.js';
@@ -25,7 +25,6 @@ export async function blueprintDestroyCore(options) {
         }
         const auth = { token, scopeType, scopeId };
         const resolvedId = await resolveStackIdByNameOrId(flagStack, auth, log);
-        const isoNow = new Date().toISOString();
         const { ok, error, stack } = await destroyStack({
             stackId: resolvedId,
             auth,
@@ -40,10 +39,10 @@ export async function blueprintDestroyCore(options) {
         return waitForDestruction({
             stackId: stack.id,
             stackName: stack.name,
+            operationId: stack.operationId,
             auth,
             log,
             bin,
-            since: isoNow,
         });
     }
     const { scopeType, scopeId, stackId } = blueprint;
@@ -103,8 +102,11 @@ export async function blueprintDestroyCore(options) {
         else {
             destroySpinner.start();
         }
-        const isoNow = new Date().toISOString();
-        const { ok, error } = await destroyStack({ stackId: stack.id, auth, logger: log });
+        const { ok, error, stack: destroyedStack, } = 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' };
@@ -117,10 +119,10 @@ export async function blueprintDestroyCore(options) {
         return waitForDestruction({
             stackId: stack.id,
             stackName: stack.name,
+            operationId: destroyedStack.operationId,
             auth,
             log,
             bin,
-            since: isoNow,
         });
     }
     catch (error) {
@@ -129,16 +131,16 @@ export async function blueprintDestroyCore(options) {
     }
 }
 async function waitForDestruction(options) {
-    const { stackId, stackName, auth, log, bin, since } = options;
+    const { stackId, stackName, operationId, auth, log, bin } = options;
     log(styleText('dim', 'Stack destruction progress:'));
     const logHints = createLogHintCollector(bin);
     let logStreamCleanup = null;
     try {
         let lastLogAt = Date.now();
         let idleMessageShown = false;
-        logStreamCleanup = await setupLogStreaming({
+        logStreamCleanup = setupLogPolling({
             stackId,
-            after: since,
+            operationId,
             auth,
             log,
             onActivity: () => {

package/dist/cores/blueprints/logs.js

@@ -1,5 +1,5 @@
 import { getLogs, getRecentLogs } from '../../actions/blueprints/logs.js';
-import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
+import { setupLogPolling } from '../../actions/blueprints/logs-polling.js';
 import { formatTitle } from '../../utils/display/blueprints-formatting.js';
 import { formatLogEntry, formatLogs } from '../../utils/display/logs-formatting.js';
 import { niceId } from '../../utils/display/presenters.js';
@@ -10,7 +10,7 @@ export async function blueprintLogsCore(options) {
     const spinner = log.ora(`Fetching recent logs for Stack deployment ${niceId(stackId)}`).start();
     try {
         if (watch) {
-            const { ok, logs, error } = await getLogs(stackId, auth, log);
+            const { ok, logs, error } = await getLogs({ stackId }, auth, log);
             if (!ok) {
                 spinner.fail(`${styleText('red', 'Failed')} to retrieve logs`);
                 log.error(`Error: ${error || 'Unknown error'}`);
@@ -30,22 +30,23 @@ export async function blueprintLogsCore(options) {
             else {
                 log(`No recent logs found for Stack deployment ${niceId(stackId)}`);
             }
-            // Set up streaming log display
-            await setupLogStreaming({
+            // Set up polling log display, seeding with already-displayed log IDs
+            setupLogPolling({
                 stackId,
+                knownIds: logs.map((l) => l.id),
                 auth,
                 log,
                 showBanner: true,
                 verbose,
             });
-            // Return a special key for streaming mode
+            // Return a special key for polling mode
             return {
                 success: true,
                 streaming: new Promise(() => { }),
             };
         }
         // Regular non-streaming logs
-        const { ok, logs, error } = await getLogs(stackId, auth, log);
+        const { ok, logs, error } = await getLogs({ stackId }, auth, log);
         if (!ok) {
             spinner.fail(`${styleText('red', 'Failed')} to retrieve Stack deployment logs`);
             log.error(`Error: ${error || 'Unknown error'}`);

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

@@ -3,6 +3,7 @@ export interface BlueprintStacksOptions extends BlueprintConfig {
     flags: {
         'project-id'?: string;
         'organization-id'?: string;
+        'include-projects'?: boolean;
         verbose?: boolean;
     };
 }

package/dist/cores/blueprints/stacks.js

@@ -1,11 +1,14 @@
 import { listStacks } from '../../actions/blueprints/stacks.js';
+import { listProjects } from '../../actions/sanity/projects.js';
 import { formatStacksListing } from '../../utils/display/blueprints-formatting.js';
-import { capitalize, niceId } from '../../utils/display/presenters.js';
+import { capitalize, niceId, warn } from '../../utils/display/presenters.js';
 import { styleText } from '../../utils/style-text.js';
+/** Max projects to query for stacks during --include-projects */
+const PROJECT_LIMIT = 50;
 export async function blueprintStacksCore(options) {
     const { log, token, blueprint, flags } = options;
     const { scopeType: blueprintScopeType, scopeId: blueprintScopeId, stackId: blueprintStackId, } = blueprint;
-    const { 'project-id': flagProjectId, 'organization-id': flagOrganizationId, verbose: _verbose = false, } = flags;
+    const { 'project-id': flagProjectId, 'organization-id': flagOrganizationId, 'include-projects': includeProjects = false, verbose: _verbose = false, } = flags;
     if (flagOrganizationId && flagProjectId) {
         log.error('Cannot specify both --organization-id and --project-id');
         return { success: false, error: 'Cannot specify both --organization-id and --project-id' };
@@ -27,6 +30,9 @@ export async function blueprintStacksCore(options) {
             suggestions: ['Run in a Blueprint directory or provide a project with --project-id.'],
         };
     }
+    if (includeProjects && scopeType === 'organization') {
+        return deepListStacks({ organizationId: scopeId, token, log, blueprintStackId });
+    }
     try {
         const spinner = log.ora('Fetching Stacks...').start();
         const { ok, stacks, error } = await listStacks({ token, scopeType, scopeId }, log);
@@ -57,3 +63,68 @@ export async function blueprintStacksCore(options) {
         return { success: false, error: errorMessage };
     }
 }
+async function deepListStacks(options) {
+    const { organizationId, token, log, blueprintStackId } = options;
+    const allStacks = [];
+    const spinner = log.ora('Fetching Stacks...').start();
+    try {
+        // 1. Org-scoped stacks
+        const orgResult = await listStacks({ token, scopeType: 'organization', scopeId: organizationId }, log);
+        const orgStacks = orgResult.ok ? orgResult.stacks : [];
+        // 2. Get projects in the organization
+        const projectsResult = await listProjects({ token, organizationId, logger: log });
+        if (!projectsResult.ok) {
+            spinner.fail('Failed to list projects');
+            return { success: false, error: projectsResult.error || 'Failed to list projects' };
+        }
+        const projects = projectsResult.projects;
+        const totalProjects = projects.length;
+        const cappedProjects = projects.slice(0, PROJECT_LIMIT);
+        // 3. Fetch stacks for each project
+        const projectGroups = [];
+        for (let i = 0; i < cappedProjects.length; i++) {
+            const project = cappedProjects[i];
+            spinner.text = `Fetching Stacks... (project ${i + 1}/${cappedProjects.length})`;
+            const result = await listStacks({ token, scopeType: 'project', scopeId: project.id }, log);
+            if (result.ok && result.stacks.length > 0) {
+                projectGroups.push({
+                    projectId: project.id,
+                    displayName: project.displayName,
+                    stacks: result.stacks,
+                });
+                allStacks.push(...result.stacks);
+            }
+        }
+        spinner.stop().clear();
+        // 4. Print results
+        if (orgStacks.length > 0) {
+            log(`${styleText('bold', 'Organization')} ${niceId(organizationId)} ${styleText('bold', 'Stacks')}:\n`);
+            log(formatStacksListing(orgStacks, blueprintStackId));
+            if (projectGroups.length > 0)
+                log(''); // blank line between sections
+        }
+        for (const group of projectGroups) {
+            log(`${styleText('bold', 'Project')} "${group.displayName}" ${niceId(group.projectId)} ${styleText('bold', 'Stacks')}:`);
+            log(formatStacksListing(group.stacks, blueprintStackId));
+            log('');
+        }
+        if (totalProjects > PROJECT_LIMIT) {
+            log(warn(`Organization has ${totalProjects} projects, only checked the first ${PROJECT_LIMIT}.`));
+        }
+        if (orgStacks.length === 0 && allStacks.length === 0) {
+            log('No stacks found');
+            return { success: true };
+        }
+        allStacks.push(...orgStacks);
+        return {
+            success: true,
+            json: { stacks: allStacks, scopeType: 'organization', scopeId: organizationId },
+        };
+    }
+    catch (error) {
+        spinner.stop().clear();
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        log.error(`Error: ${errorMessage}`);
+        return { success: false, error: errorMessage };
+    }
+}

package/dist/utils/display/resources-formatting.js

@@ -28,11 +28,13 @@ function arrayifyEvent(event) {
         if ('projection' in event && event.projection) {
             details.push(formatLabeledValue('projection', event.projection));
         }
-        // TODO: expose event.resource details once we are ready
-        // https://linear.app/sanity/issue/RUN-1246/cli-should-show-eventresource-details-in-blueprints-infoplans
-        // if (event.resource) {
-        //   details.push(formatLabeledValue('resource', JSON.stringify(event.resource)))
-        // }
+        if (event.resource) {
+            details.push(formatLabel('resource'));
+            details.push([
+                formatLabeledValue('type', event.resource.type),
+                formatLabeledValue('id', event.resource.id),
+            ]);
+        }
     }
     return details;
 }

package/oclif.manifest.json

@@ -12,7 +12,10 @@
           "required": true
         }
       },
-      "description": "Scaffolds a new Sanity Function in your Blueprint. Functions are serverless handlers triggered by document events (create, update, delete, publish) or media library events.\n\nAfter adding a function, use 'functions dev' to test locally, then 'blueprints deploy' to publish it.",
+      "deprecationOptions": {
+        "to": "functions add"
+      },
+      "description": "This command is deprecated. Use \"functions add\" instead.\n\nEquivalent usage:\n  $ <%= config.bin %> functions add\n  $ <%= config.bin %> functions add --name my-function --type document-create",
       "examples": [
         "<%= config.bin %> <%= command.id %> function",
         "<%= config.bin %> <%= command.id %> function --helpers",
@@ -216,8 +219,9 @@
       "pluginAlias": "@sanity/runtime-cli",
       "pluginName": "@sanity/runtime-cli",
       "pluginType": "core",
+      "state": "deprecated",
       "strict": true,
-      "summary": "Add a function resource to a Blueprint",
+      "summary": "[deprecated] Use \"functions add\" instead",
       "enableJsonFlag": true,
       "needs": [
         "blueprint"
@@ -1289,11 +1293,12 @@
     "blueprints:stacks": {
       "aliases": [],
       "args": {},
-      "description": "Shows all Stacks associated with a project or organization. By default, lists Stacks scoped to the local Blueprint.\n\nUse this to discover existing Stacks you can scope a local Blueprint to (using 'blueprints config --edit'), or to audit what's deployed across your project.",
+      "description": "Shows all Stacks associated with a project or organization. By default, lists Stacks scoped to the local Blueprint.\n\nUse this to discover existing Stacks you can scope a local Blueprint to (using 'blueprints config --edit'), or to audit what's deployed across your project.\n\nUse --include-projects with --organization-id to also list Stacks from all projects within the organization.",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %> --project-id <projectId>",
-        "<%= config.bin %> <%= command.id %> --organization-id <organizationId>"
+        "<%= config.bin %> <%= command.id %> --organization-id <organizationId>",
+        "<%= config.bin %> <%= command.id %> --organization-id <organizationId> --include-projects"
       ],
       "flags": {
         "json": {
@@ -1350,7 +1355,8 @@
           ],
           "description": "Sanity project ID used to scope Blueprint and Stack",
           "exclusive": [
-            "organization-id"
+            "organization-id",
+            "include-projects"
           ],
           "name": "project-id",
           "hasDynamicHelp": false,
@@ -1371,6 +1377,15 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "include-projects": {
+          "dependsOn": [
+            "organization-id"
+          ],
+          "description": "Include Stacks from all projects within the organization. Requires --organization-id.",
+          "name": "include-projects",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2677,5 +2692,5 @@
       ]
     }
   },
-  "version": "14.12.1"
+  "version": "14.13.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "14.12.1",
+  "version": "14.13.1",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -94,6 +94,7 @@
     "test:api": "cd test/api-types && npm it",
     "test:depmgmt": "vitest run --config ./test-depmgmt/vitest.config.ts",
     "test:vitest": "vitest run",
+    "test:coverage": "npm run test:vitest -- --coverage --coverage.include \"runtime-cli/src/**/*\"",
     "typecheck": "tsc --project tsconfig.typecheck.json",
     "watch": "tsc --watch"
   },
@@ -137,6 +138,7 @@
     "@types/node": "20",
     "@types/tar-stream": "^3.1.4",
     "@types/ws": "^8.18.1",
+    "@vitest/coverage-v8": "^4.1.0",
     "codemirror": "^6.0.2",
     "mentoss": "^0.13.0",
     "oclif": "^4.22.92",

package/dist/actions/blueprints/logs-streaming.d.ts

@@ -1,30 +0,0 @@
-import type { Logger } from '../../utils/logger.js';
-import type { AuthParams, BlueprintLog } from '../../utils/types.js';
-export interface LogStreamingConfig {
-    stackId: string;
-    after?: string;
-    auth: AuthParams;
-    showBanner?: boolean;
-    verbose?: boolean;
-    log: Logger;
-    onActivity?: () => void;
-    onLogEntry?: (log: BlueprintLog) => void;
-}
-export interface StreamLogsOptions {
-    stackId: string;
-    after?: string;
-    auth: AuthParams;
-    onLog: (log: BlueprintLog) => void;
-    onOpen: () => void;
-    onError: (error: string) => void;
-    logger: Logger;
-}
-export declare function streamLogs({ stackId, after, auth, onLog, onOpen, onError, logger, }: StreamLogsOptions): () => void;
-/** Check if a log is newer than a given timestamp */
-export declare function isNewerLog(log: BlueprintLog, timestamp: number): boolean;
-/**
- * Sets up log streaming for operations like deploy or destroy with spinner integration
- * @param config Configuration for log streaming
- * @returns A cleanup function for closing the log stream
- */
-export declare function setupLogStreaming(config: LogStreamingConfig): Promise<() => void>;

package/dist/actions/blueprints/logs-streaming.js

@@ -1,107 +0,0 @@
-import { EventSource } from 'eventsource';
-import { formatLogEntry } from '../../utils/display/logs-formatting.js';
-import getHeaders from '../../utils/get-headers.js';
-import { styleText } from '../../utils/style-text.js';
-import { createTracedFetch } from '../../utils/traced-fetch.js';
-import { logsUrl } from './logs.js';
-export function streamLogs({ stackId, after, auth, onLog, onOpen, onError, logger, }) {
-    const fetchFn = createTracedFetch(logger);
-    const url = new URL(`${logsUrl}/stream`);
-    url.searchParams.append('stackId', stackId);
-    if (after)
-        url.searchParams.append('after', after);
-    const headers = getHeaders(auth);
-    const eventSource = new EventSource(url.toString(), {
-        fetch: (input, init) => fetchFn(input, {
-            ...init,
-            headers: {
-                ...init?.headers,
-                ...headers,
-            },
-        }),
-    });
-    eventSource.onopen = onOpen;
-    eventSource.onmessage = (event) => {
-        try {
-            const log = JSON.parse(event.data);
-            onLog(log);
-        }
-        catch (err) {
-            onError(`Failed to parse log data: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    };
-    eventSource.addEventListener('logs', (event) => {
-        try {
-            const logData = JSON.parse(event.data);
-            // usually an array
-            if (Array.isArray(logData)) {
-                for (const log of logData)
-                    onLog(log);
-            }
-            else {
-                onLog(logData);
-            }
-        }
-        catch (err) {
-            console.error('Error parsing logs event:', err);
-        }
-    });
-    eventSource.onerror = () => {
-        onError('Connection to log stream failed or was closed');
-        if (eventSource.readyState === eventSource.CLOSED) {
-            console.log('Connection is CLOSED');
-        }
-        else if (eventSource.readyState === eventSource.CONNECTING) {
-            console.log('Connection is attempting to reconnect...');
-            return; // Don't close if trying to reconnect
-        }
-        eventSource.close();
-    };
-    return () => {
-        eventSource.close();
-    };
-}
-/** Check if a log is newer than a given timestamp */
-export function isNewerLog(log, timestamp) {
-    const logTimestamp = new Date(log.timestamp).getTime();
-    return logTimestamp > timestamp;
-}
-/**
- * Sets up log streaming for operations like deploy or destroy with spinner integration
- * @param config Configuration for log streaming
- * @returns A cleanup function for closing the log stream
- */
-export async function setupLogStreaming(config) {
-    const { stackId, auth, log, showBanner, verbose = false, after } = config;
-    let newestTimestamp = Date.now();
-    let previousLog;
-    const onLogReceived = (logEntry) => {
-        if (!isNewerLog(logEntry, newestTimestamp))
-            return;
-        newestTimestamp = new Date(logEntry.timestamp).getTime();
-        config.onActivity?.();
-        config.onLogEntry?.(logEntry);
-        log(formatLogEntry(logEntry, verbose, previousLog));
-        previousLog = logEntry;
-    };
-    let alreadyOpened = false;
-    const onStreamOpen = () => {
-        if (!alreadyOpened && showBanner)
-            log(`Streaming logs... ${styleText('bold', 'ctrl+c')} to cancel`);
-        if (alreadyOpened)
-            log(`${styleText('green', 'Reconnected')}`);
-        alreadyOpened = true;
-    };
-    const onStreamError = (error) => {
-        log(`${styleText('red', 'Stream error:')} ${error}`);
-    };
-    return streamLogs({
-        stackId,
-        after,
-        auth,
-        onLog: onLogReceived,
-        onOpen: onStreamOpen,
-        onError: onStreamError,
-        logger: log,
-    });
-}