@sanity/runtime-cli 2.1.0 → 2.2.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/2.1.0 linux-x64 node-v22.14.0
+@sanity/runtime-cli/2.2.0 linux-x64 node-v22.14.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -63,7 +63,7 @@ EXAMPLES
   $ sanity-run blueprints add function
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -85,7 +85,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -102,7 +102,7 @@ EXAMPLES
   $ sanity-run blueprints deploy
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -124,7 +124,7 @@ EXAMPLES
   $ sanity-run blueprints info --id abc123
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init`
 
@@ -141,7 +141,7 @@ EXAMPLES
   $ sanity-run blueprints init
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -163,7 +163,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -180,7 +180,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -197,7 +197,7 @@ EXAMPLES
   $ sanity-run blueprints stacks
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions dev`
 
@@ -217,7 +217,7 @@ EXAMPLES
   $ sanity-run functions dev --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -239,7 +239,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/v2.1.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -260,7 +260,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/v2.1.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions invoke NAME`
 
@@ -286,7 +286,7 @@ EXAMPLES
   $ sanity-run functions invoke <ID> --file 'payload.json'
 ```
 
-_See code: [src/commands/functions/invoke.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/functions/invoke.ts)_
+_See code: [src/commands/functions/invoke.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/invoke.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -306,7 +306,7 @@ EXAMPLES
   $ sanity-run functions logs <ID>
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -335,7 +335,7 @@ EXAMPLES
   $ sanity-run functions test echo-fn --data '{ "id": 1 }' --timeout 60
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v2.1.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v2.2.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,8 +1,8 @@
-import type { BlueprintResource } from '../../utils/types.js';
+import type { AuthParams, BlueprintResource } from '../../utils/types.js';
 export declare const stashUrl: string;
-export declare function stashAsset({ resource, projectId, }: {
+export declare function stashAsset({ resource, auth, }: {
     resource: BlueprintResource;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     success: boolean;
     assetId: any;

package/dist/actions/blueprints/assets.js

@@ -3,17 +3,10 @@ import path from 'node:path';
 import { cwd } from 'node:process';
 import JSZip from 'jszip';
 import config from '../../config.js';
+import getHeaders from '../../utils/get-headers.js';
 const { blueprints } = config.server;
 export const stashUrl = `${blueprints}vX/blueprints/assets/stash`;
-function getHeaders(projectId) {
-    return {
-        Authorization: `Bearer ${config.token}`,
-        'Content-Type': 'application/json',
-        'X-Sanity-Scope-Type': 'project',
-        'X-Sanity-Scope-Id': projectId,
-    };
-}
-export async function stashAsset({ resource, projectId, }) {
+export async function stashAsset({ resource, auth, }) {
     try {
         const source = await fs.readFileSync(path.join(cwd(), resource.src), 'utf8');
         const zip = new JSZip();
@@ -22,7 +15,7 @@ export async function stashAsset({ resource, projectId, }) {
         const base64Zip = zipBuffer.toString('base64');
         const assetResponse = await fetch(stashUrl, {
             method: 'POST',
-            headers: getHeaders(projectId),
+            headers: getHeaders(auth),
             body: JSON.stringify({
                 file: base64Zip,
                 filename: `${resource.name}.zip`,

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

@@ -3,14 +3,15 @@ export declare const DEFAULT_BLUEPRINT_CONTENT: {
     blueprintVersion: string;
     resources: never[];
 };
-export declare function findBlueprintFile(blueprintPath: string | undefined): {
+export declare function findBlueprintFile(blueprintPath?: string): {
     path: string;
     fileName: string;
     extension: string;
 } | null;
-export declare function readBlueprintOnDisk({ blueprintPath, getStack, }?: {
+export declare function readBlueprintOnDisk({ blueprintPath, getStack, token, }?: {
     blueprintPath?: string;
     getStack?: boolean;
+    token?: string;
 }): Promise<{
     fileInfo: {
         path: string;

package/dist/actions/blueprints/blueprint.js

@@ -31,7 +31,7 @@ export function findBlueprintFile(blueprintPath) {
     }
     return null;
 }
-export async function readBlueprintOnDisk({ blueprintPath, getStack, } = {}) {
+export async function readBlueprintOnDisk({ blueprintPath, getStack, token, } = {}) {
     try {
         const blueprintFile = findBlueprintFile(blueprintPath);
         if (!blueprintFile)
@@ -115,8 +115,8 @@ export async function readBlueprintOnDisk({ blueprintPath, getStack, } = {}) {
                 stackId = stackResource.id;
         }
         let deployedStack;
-        if (getStack && projectId && stackId) {
-            const { stack } = await getStackById({ stackId, projectId });
+        if (getStack && token && stackId && projectId) {
+            const { stack } = await getStackById({ stackId, auth: { token, projectId } });
             if (!stack) {
                 errors.push({
                     message: 'Stack not found',

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

@@ -1,6 +1,6 @@
-import type { BlueprintLog } from '../../utils/types.js';
+import type { AuthParams, BlueprintLog } from '../../utils/types.js';
 export declare const logsUrl: string;
-export declare function getLogs(stackId: string, projectId: string, token: string): Promise<{
+export declare function getLogs(stackId: string, auth: AuthParams): Promise<{
     logs: BlueprintLog[];
     ok: boolean;
     error: string | null;
@@ -8,4 +8,4 @@ export declare function getLogs(stackId: string, projectId: string, token: strin
 export declare function findNewestLogTimestamp(logs: BlueprintLog[]): number;
 export declare function isNewerLog(log: BlueprintLog, timestamp: number): boolean;
 export declare function getRecentLogs(logs: BlueprintLog[], limit?: number): BlueprintLog[];
-export declare function streamLogs(stackId: string, projectId: string, token: string, onLog: (log: BlueprintLog) => void, onOpen: () => void, onError: (error: string) => void): () => void;
+export declare function streamLogs(stackId: string, auth: AuthParams, onLog: (log: BlueprintLog) => void, onOpen: () => void, onError: (error: string) => void): () => void;

package/dist/actions/blueprints/logs.js

@@ -1,18 +1,13 @@
 import { EventSource } from 'eventsource';
 import config from '../../config.js';
+import getHeaders from '../../utils/get-headers.js';
 const { blueprints } = config.server;
 export const logsUrl = `${blueprints}vX/blueprints/logs`;
-export async function getLogs(stackId, projectId, token) {
+export async function getLogs(stackId, auth) {
     const url = new URL(logsUrl);
     url.searchParams.append('stackId', stackId);
     const response = await fetch(url.toString(), {
-        headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${token}`,
-            'X-Sanity-Scope-Type': 'project',
-            'X-Sanity-Scope-Id': projectId,
-        },
+        headers: getHeaders(auth),
         method: 'GET',
     });
     const result = await response.json();
@@ -46,14 +41,10 @@ export function getRecentLogs(logs, limit = 10) {
     return sortedLogs.slice(-limit);
 }
 // Create streaming logs connection
-export function streamLogs(stackId, projectId, token, onLog, onOpen, onError) {
+export function streamLogs(stackId, auth, onLog, onOpen, onError) {
     const url = new URL(`${logsUrl}/stream`);
     url.searchParams.append('stackId', stackId);
-    const headers = {
-        Authorization: `Bearer ${token}`,
-        'X-Sanity-Scope-Type': 'project',
-        'X-Sanity-Scope-Id': projectId,
-    };
+    const headers = getHeaders(auth);
     const eventSource = new EventSource(url.toString(), {
         fetch: (input, init) => fetch(input, {
             ...init,

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

@@ -1,17 +1,17 @@
-import type { BlueprintOperation } from '../../utils/types.js';
+import type { AuthParams, BlueprintOperation } from '../../utils/types.js';
 export declare const stacksUrl: string;
-export declare function getOperation({ stackId, operationId, projectId, }: {
+export declare function getOperation({ stackId, operationId, auth, }: {
     stackId: string;
     operationId: string;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: string | null;
     operation: BlueprintOperation | null;
 }>;
-export declare function listOperations({ stackId, projectId, }: {
+export declare function listOperations({ stackId, auth, }: {
     stackId: string;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: string | null;

package/dist/actions/blueprints/operations.js

@@ -1,19 +1,12 @@
 import config from '../../config.js';
+import getHeaders from '../../utils/get-headers.js';
 const { blueprints } = config.server;
 export const stacksUrl = `${blueprints}vX/blueprints/stacks`;
-function getHeaders(projectId) {
-    return {
-        Authorization: `Bearer ${config.token}`,
-        'Content-Type': 'application/json',
-        'X-Sanity-Scope-Type': 'project',
-        'X-Sanity-Scope-Id': projectId,
-    };
-}
-export async function getOperation({ stackId, operationId, projectId, }) {
+export async function getOperation({ stackId, operationId, auth, }) {
     const path = `${stacksUrl}/${stackId}/operations/${operationId}`;
     const response = await fetch(path, {
         method: 'GET',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
     });
     if (!response.ok) {
         const errorText = await response.text();
@@ -30,11 +23,11 @@ export async function getOperation({ stackId, operationId, projectId, }) {
         operation,
     };
 }
-export async function listOperations({ stackId, projectId, }) {
+export async function listOperations({ stackId, auth, }) {
     const path = `${stacksUrl}/${stackId}/operations`;
     const response = await fetch(path, {
         method: 'GET',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
     });
     if (!response.ok) {
         const errorText = await response.text();

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

@@ -1,4 +1,6 @@
-export declare function listProjects(): Promise<{
+export declare function listProjects({ token }: {
+    token: string;
+}): Promise<{
     ok: boolean;
     error: any;
     projects: any;

package/dist/actions/blueprints/projects.js

@@ -1,16 +1,13 @@
 import config from '../../config.js';
-const { apiUrl, token } = config;
-function getHeaders() {
-    return {
-        Authorization: `Bearer ${token}`,
-        'Content-Type': 'application/json',
-    };
-}
+const { apiUrl } = config;
 const projectsUrl = `${apiUrl.toString()}v2021-06-07/projects`;
-export async function listProjects() {
+export async function listProjects({ token }) {
     const response = await fetch(projectsUrl, {
         method: 'GET',
-        headers: getHeaders(),
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
     });
     const projects = await response.json();
     return {

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

@@ -1,15 +1,14 @@
-import type { BlueprintJob } from '../../utils/types.js';
+import type { AuthParams, BlueprintJob } from '../../utils/types.js';
 export declare const stacksUrl: string;
-export declare function listStacks({ projectId }: {
-    projectId: string;
-}): Promise<{
+export declare function listStacks(auth: AuthParams): Promise<{
     ok: boolean;
     error: any;
     stacks: any;
 }>;
-export declare function getStackByName({ name, projectId }: {
+/** @deprecated Use getStack instead */
+export declare function getStackByName({ name, auth }: {
     name: string;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: null;
@@ -23,26 +22,26 @@ export declare function getStackByName({ name, projectId }: {
     stackId: any;
     availableStacks?: undefined;
 }>;
-export declare function getStack({ stackId, projectId }: {
+export declare function getStack({ stackId, auth }: {
     stackId: string;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: any;
     stack: any;
 }>;
-export declare function createStack({ blueprint, projectId, }: {
+export declare function createStack({ blueprint, auth }: {
     blueprint: BlueprintJob;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: any;
     stack: any;
 }>;
-export declare function updateStack({ stackId, blueprint, projectId, }: {
+export declare function updateStack({ stackId, blueprint, auth, }: {
     stackId: string;
     blueprint: BlueprintJob;
-    projectId: string;
+    auth: AuthParams;
 }): Promise<{
     ok: boolean;
     error: any;

package/dist/actions/blueprints/stacks.js

@@ -1,18 +1,11 @@
 import config from '../../config.js';
+import getHeaders from '../../utils/get-headers.js';
 const { blueprints } = config.server;
 export const stacksUrl = `${blueprints}vX/blueprints/stacks`;
-function getHeaders(projectId) {
-    return {
-        Authorization: `Bearer ${config.token}`,
-        'Content-Type': 'application/json',
-        'X-Sanity-Scope-Type': 'project',
-        'X-Sanity-Scope-Id': projectId,
-    };
-}
-export async function listStacks({ projectId }) {
+export async function listStacks(auth) {
     const response = await fetch(stacksUrl, {
         method: 'GET',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
     });
     const stacks = await response.json();
     return {
@@ -21,8 +14,9 @@ export async function listStacks({ projectId }) {
         stacks,
     };
 }
-export async function getStackByName({ name, projectId }) {
-    const { ok, stacks, error } = await listStacks({ projectId });
+/** @deprecated Use getStack instead */
+export async function getStackByName({ name, auth }) {
+    const { ok, stacks, error } = await listStacks(auth);
     if (!ok || !stacks) {
         return {
             ok: false,
@@ -41,7 +35,7 @@ export async function getStackByName({ name, projectId }) {
             availableStacks: stacks.map((s) => s.name),
         };
     }
-    const stackResult = await getStack({ stackId: foundStack.id, projectId });
+    const stackResult = await getStack({ stackId: foundStack.id, auth });
     return {
         ok: stackResult.ok,
         error: stackResult.error,
@@ -49,10 +43,10 @@ export async function getStackByName({ name, projectId }) {
         stackId: foundStack.id,
     };
 }
-export async function getStack({ stackId, projectId }) {
+export async function getStack({ stackId, auth }) {
     const response = await fetch(`${stacksUrl}/${stackId}`, {
         method: 'GET',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
     });
     const stack = await response.json();
     return {
@@ -61,10 +55,10 @@ export async function getStack({ stackId, projectId }) {
         stack,
     };
 }
-export async function createStack({ blueprint, projectId, }) {
+export async function createStack({ blueprint, auth }) {
     const response = await fetch(stacksUrl, {
         method: 'POST',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
         body: JSON.stringify(blueprint),
     });
     const stack = await response.json();
@@ -74,10 +68,10 @@ export async function createStack({ blueprint, projectId, }) {
         stack,
     };
 }
-export async function updateStack({ stackId, blueprint, projectId, }) {
+export async function updateStack({ stackId, blueprint, auth, }) {
     const response = await fetch(`${stacksUrl}/${stackId}`, {
         method: 'PUT',
-        headers: getHeaders(projectId),
+        headers: getHeaders(auth),
         body: JSON.stringify(blueprint),
     });
     const stack = await response.json();

package/dist/actions/functions/logs.js

@@ -6,10 +6,10 @@ export async function logs(id, auth) {
         headers: getHeaders(auth),
         method: 'GET',
     });
-    const logs = await response.json();
+    const json = await response.json();
     return {
         ok: response.ok,
-        error: response.ok ? null : logs?.error?.message,
-        logs: response.ok ? logs : [],
+        error: response.ok ? null : json?.error?.message,
+        logs: response.ok ? json.logs : [],
     };
 }

package/dist/commands/blueprints/add.js

@@ -15,7 +15,7 @@ export default class Add extends Command {
     };
     async run() {
         const { args } = await this.parse(Add);
-        const existingBlueprint = findBlueprintFile(undefined);
+        const existingBlueprint = findBlueprintFile();
         if (!existingBlueprint) {
             this.error('No blueprint file found. Run `sanity blueprints init` first.');
         }

package/dist/commands/blueprints/config.js

@@ -4,6 +4,8 @@ import inquirer from 'inquirer';
 import { readConfigFile, writeConfigFile } from '../../actions/blueprints/blueprint.js';
 import { listProjects } from '../../actions/blueprints/projects.js';
 import { listStacks } from '../../actions/blueprints/stacks.js';
+import config from '../../config.js';
+const { token } = config;
 export default class Config extends Command {
     static description = 'View or edit Blueprint configuration';
     static examples = [
@@ -26,7 +28,7 @@ export default class Config extends Command {
         this.log(highlight(JSON.stringify(config, null, 2)));
         if (!flags.edit)
             return;
-        const { ok, projects, error } = await listProjects();
+        const { ok, projects, error } = await listProjects({ token });
         if (!ok)
             this.error(error);
         if (projects.length === 0) {
@@ -45,8 +47,9 @@ export default class Config extends Command {
                 default: config.projectId,
             },
         ]);
+        const auth = { token, projectId };
         // get stacks for selected project
-        const { ok: stacksOk, stacks, error: stacksError } = await listStacks({ projectId });
+        const { ok: stacksOk, stacks, error: stacksError } = await listStacks(auth);
         if (!stacksOk)
             this.error(stacksError);
         let stackId;

package/dist/commands/blueprints/deploy.js

@@ -4,12 +4,14 @@ import Spinner from 'yocto-spinner';
 import { stashAsset } from '../../actions/blueprints/assets.js';
 import { readBlueprintOnDisk, writeConfigFile } from '../../actions/blueprints/blueprint.js';
 import { createStack, updateStack } from '../../actions/blueprints/stacks.js';
+import config from '../../config.js';
 import { bold, green, red, yellow } from '../../utils/display/colors.js';
+const { token } = config;
 export default class Deploy extends Command {
     static description = 'Deploy a Blueprint';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
-        const { errors, projectId: configuredProjectId, stackId, parsedBlueprint: { resources }, deployedStack, } = await readBlueprintOnDisk({ getStack: true });
+        const { errors, projectId: configuredProjectId, stackId, parsedBlueprint: { resources }, deployedStack, } = await readBlueprintOnDisk({ getStack: true, token });
         if (errors.length > 0) {
             // printErrors(errors) // TODO: error printer in formatting
             this.log('Blueprint parse errors:');
@@ -32,6 +34,7 @@ export default class Deploy extends Command {
         }
         if (!projectId)
             this.error('Sanity Project context is required');
+        const auth = { token, projectId };
         let name = deployedStack?.name;
         if (!name) {
             const { stackName } = await inquirer.prompt([
@@ -52,7 +55,7 @@ export default class Deploy extends Command {
         if (functionResources.length > 0) {
             for (const resource of functionResources) {
                 const fnSpinner = Spinner({ text: `Processing ${resource.name}...` }).start();
-                const result = await stashAsset({ resource, projectId });
+                const result = await stashAsset({ resource, auth });
                 if (result.success) {
                     const src = resource.src;
                     resource.src = result.assetId; // TODO: properly reference asset - for now, the API expects the assetId
@@ -74,8 +77,8 @@ export default class Deploy extends Command {
         this.debug('BLUEPRINT DOCUMENT:', blueprint);
         const spinner = Spinner({ text: 'Deploying stack...' }).start();
         const { ok: deployOk, stack, error: deployError, } = deployedStack
-            ? await updateStack({ stackId: deployedStack.id, blueprint, projectId })
-            : await createStack({ blueprint, projectId });
+            ? await updateStack({ stackId: deployedStack.id, blueprint, auth })
+            : await createStack({ blueprint, auth });
         this.debug('STACK RESPONSE:', stack);
         if (deployOk) {
             spinner.success(`${green('Success!')} Stack "${bold(stack.name)}" ${deployedStack ? 'updated' : 'created'} <${yellow(stack.id)}>`);

package/dist/commands/blueprints/info.js

@@ -1,7 +1,9 @@
 import { Command, Flags } from '@oclif/core';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { getStack } from '../../actions/blueprints/stacks.js';
+import config from '../../config.js';
 import { formatResourceTree, formatStackInfo } from '../../utils/display/blueprints-formatting.js';
+const { token } = config;
 export default class Info extends Command {
     static description = 'Show information about a Blueprint';
     static examples = [
@@ -16,7 +18,7 @@ export default class Info extends Command {
     };
     async run() {
         const { flags } = await this.parse(Info);
-        const { errors, deployedStack, projectId } = await readBlueprintOnDisk({ getStack: true });
+        const { errors, deployedStack, projectId } = await readBlueprintOnDisk({ getStack: true, token });
         if (errors.length > 0) {
             // printErrors(errors)
             this.warn('Blueprint parse errors:');
@@ -25,9 +27,10 @@ export default class Info extends Command {
         }
         if (!projectId)
             this.error('Project resource not found in blueprint');
+        const auth = { token, projectId };
         let stack = deployedStack;
         if (flags.id) {
-            const { ok, stack: foundStack, error } = await getStack({ stackId: flags.id, projectId });
+            const { ok, stack: foundStack, error } = await getStack({ stackId: flags.id, auth });
             if (!ok)
                 this.error(error || 'Failed to get stack');
             stack = foundStack;

package/dist/commands/blueprints/init.js

@@ -4,6 +4,8 @@ import { Command } from '@oclif/core';
 import inquirer from 'inquirer';
 import { findBlueprintFile, writeBlueprintToDisk, writeConfigFile, } from '../../actions/blueprints/blueprint.js';
 import { listProjects } from '../../actions/blueprints/projects.js';
+import config from '../../config.js';
+const { token } = config;
 export default class Init extends Command {
     static description = 'Initialize a new Blueprint';
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -25,7 +27,7 @@ export default class Init extends Command {
                 default: 'json',
             },
         ]);
-        const { ok, projects, error } = await listProjects();
+        const { ok, projects, error } = await listProjects({ token });
         if (!ok)
             this.error(error);
         if (projects.length === 0) {

package/dist/commands/blueprints/logs.js

@@ -6,6 +6,7 @@ import config from '../../config.js';
 import { formatTitle } from '../../utils/display/blueprints-formatting.js';
 import { bold, red, yellow } from '../../utils/display/colors.js';
 import { formatLogEntry, formatLogsByDay, organizeLogsByDay, } from '../../utils/display/logs-formatting.js';
+const { token } = config;
 export default class Logs extends Command {
     static description = 'Display logs for a Blueprint stack';
     static examples = [
@@ -24,7 +25,7 @@ export default class Logs extends Command {
         const { flags } = await this.parse(Logs);
         const watchMode = flags.watch;
         try {
-            const { errors, deployedStack } = await readBlueprintOnDisk({ getStack: true });
+            const { errors, deployedStack } = await readBlueprintOnDisk({ getStack: true, token });
             if (errors.length > 0) {
                 this.log('Blueprint parse errors:');
                 console.dir(errors, { depth: null });
@@ -33,9 +34,10 @@ export default class Logs extends Command {
             if (!deployedStack)
                 this.error('Stack not found'); // returns
             const { id: stackId, projectId, name } = deployedStack;
+            const auth = { token, projectId };
             const spinner = Spinner({ text: `Fetching logs for stack ${yellow(`<${stackId}>`)}` }).start();
             if (watchMode) {
-                const { ok, logs, error } = await getLogs(stackId, projectId, config.token);
+                const { ok, logs, error } = await getLogs(stackId, auth);
                 if (!ok) {
                     spinner.error(`${red('Failed')} to retrieve logs`);
                     this.log(`Error: ${error || 'Unknown error'}`);
@@ -64,12 +66,12 @@ export default class Logs extends Command {
                     this.log(formatLogEntry(log, true));
                 };
                 this.debug(`${yellow('Debug:')} Connecting to streaming endpoint for stack ${stackId}...`);
-                streamLogs(stackId, projectId, config.token, renderLog, onOpen, (error) => this.log(`${red('Error:')} ${error}`));
+                streamLogs(stackId, auth, renderLog, onOpen, (error) => this.log(`${red('Error:')} ${error}`));
                 return new Promise(() => {
                     // hold the line until the user terminates with Ctrl+C
                 });
             }
-            const { ok, logs, error } = await getLogs(stackId, projectId, config.token);
+            const { ok, logs, error } = await getLogs(stackId, auth);
             if (!ok) {
                 spinner.error(`${red('Failed')} to retrieve logs`);
                 this.log(`Error: ${error || 'Unknown error'}`);

package/dist/commands/blueprints/plan.js

@@ -1,16 +1,17 @@
 import { Command } from '@oclif/core';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
+import config from '../../config.js';
 import { formatResourceTree, formatTitle } from '../../utils/display/blueprints-formatting.js';
+const { token } = config;
 export default class Plan extends Command {
     static description = 'Enumerate resources to be deployed - will not modify any resources';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
-        const { errors, projectId, stackId, parsedBlueprint: { resources }, fileInfo, } = await readBlueprintOnDisk();
+        const { errors, projectId, stackId, parsedBlueprint: { resources }, fileInfo, } = await readBlueprintOnDisk({ token });
         if (errors.length > 0) {
             // printErrors(errors)
             this.log('Blueprint parse errors:');
             console.dir(errors, { depth: null });
-            // return // don't return, show the plan
         }
         if (!projectId)
             this.log('Blueprint must contain a project resource');

package/dist/commands/blueprints/stacks.js

@@ -1,8 +1,10 @@
 import { Command } from '@oclif/core';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { listStacks } from '../../actions/blueprints/stacks.js';
+import config from '../../config.js';
 import { formatStacksListing } from '../../utils/display/blueprints-formatting.js';
 import { bold, yellow } from '../../utils/display/colors.js';
+const { token } = config;
 export default class Stacks extends Command {
     static description = 'List all Blueprint stacks';
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -15,7 +17,8 @@ export default class Stacks extends Command {
         }
         if (!projectId)
             this.error('Project resource not found in blueprint');
-        const { ok, stacks, error } = await listStacks({ projectId });
+        const auth = { token, projectId };
+        const { ok, stacks, error } = await listStacks(auth);
         if (!ok)
             this.error(error || 'Failed to list stacks');
         if (!stacks || stacks.length === 0) {

package/dist/commands/functions/env/add.js

@@ -20,7 +20,7 @@ export default class Add extends Command {
         const spinner = Spinner({
             text: `Updating "${args.key}" environment variable in "${args.name}"`,
         }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;

package/dist/commands/functions/env/remove.js

@@ -17,7 +17,7 @@ export default class Remove extends Command {
         const spinner = Spinner({
             text: `Removing "${args.key}" environment variable in "${args.name}"`,
         }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;

package/dist/commands/functions/invoke.js

@@ -25,7 +25,7 @@ export default class Invoke extends Command {
     async run() {
         const { args, flags } = await this.parse(Invoke);
         const spinner = Spinner({ text: `Invoking function "${args.name}"` }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;

package/dist/commands/functions/logs.js

@@ -1,10 +1,20 @@
 import { Args, Command } from '@oclif/core';
 import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
-import { logs } from '../../actions/functions/logs.js';
+import { logs as logsAction } from '../../actions/functions/logs.js';
 import config from '../../config.js';
-import { bold, red, yellow } from '../../utils/display/colors.js';
+import { formatTitle } from '../../utils/display/blueprints-formatting.js';
+import { blue, bold, green, red, yellow } from '../../utils/display/colors.js';
 import { findFunctionByName } from '../../utils/find-function.js';
+function logLevel(level) {
+    if (level === 'ERROR') {
+        return red(level);
+    }
+    if (level === 'ERROR') {
+        return yellow(level);
+    }
+    return green(level);
+}
 export default class Logs extends Command {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -14,34 +24,28 @@ export default class Logs extends Command {
     async run() {
         const { args } = await this.parse(Logs);
         const spinner = Spinner({ text: `Finding logs for function "${args.name}"` }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { name, projectId } = deployedStack;
         const { externalId } = findFunctionByName(deployedStack, args.name);
-        const result = await logs(externalId, { token: config.token, projectId });
-        if (result.ok) {
-            spinner.success(`Found logs ${args.name} for blueprint "${name}"`);
-            for (const logGroup of result.logs) {
-                for (const log of logGroup.events) {
-                    const { message, timestamp } = log;
-                    // INFO log format:   year  month date  hr    min   sec    ms      req uuid
-                    const logPattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z\s+[0-9a-f-]+/;
-                    if (logPattern.test(message)) {
-                        const content = message.replace(logPattern, '').trim().replace(/^INFO/, '').trim();
-                        if (content) {
-                            const date = new Date(timestamp);
-                            const time = date.toLocaleTimeString();
-                            const day = date.toLocaleDateString();
-                            this.log(`  ${bold(day)} ${yellow(time)} ${content}`);
-                        }
-                    }
-                }
-            }
-        }
-        else {
+        const { ok, error, logs } = await logsAction(externalId, { token: config.token, projectId });
+        if (!ok) {
             spinner.error(`${red('Failed')} to retrieve logs`);
-            this.log(`Error: ${result.error || 'Unknown error'}`);
+            this.log(`Error: ${error || 'Unknown error'}`);
+            return;
+        }
+        const filteredLogs = logs.filter((entry) => entry.level && entry.message);
+        if (filteredLogs.length === 0) {
+            spinner.info(`No logs found for function ${args.name}`);
+            return;
+        }
+        spinner.success(`${formatTitle('Function', args.name)} Logs`);
+        this.log(`Found ${bold(filteredLogs.length.toString())} log entries for function ${yellow(args.name)}\n`);
+        for (const log of filteredLogs) {
+            const { time, level, message } = log;
+            const date = new Date(time);
+            this.log(`${bold(date.toLocaleDateString())} ${bold(blue(date.toLocaleTimeString()))} ${logLevel(level)} ${message}`);
         }
     }
 }

package/dist/config.js

@@ -22,8 +22,9 @@ const blueprintsUrls = {
 };
 const functionsUrl = new URL(functionsUrls[nodeEnv] ?? functionsUrls.default);
 const blueprintsUrl = new URL(blueprintsUrls[nodeEnv] ?? blueprintsUrls.default);
+const token = isDev || isTest || isPublishing ? 'token' : getToken({ prod: useProd });
 export default {
-    token: isDev || isTest || isPublishing ? 'token' : getToken({ prod: useProd }),
+    token,
     apiUrl,
     server: {
         functions: functionsUrl,

package/dist/server/static/vendor/vendor.bundle.js

@@ -9400,7 +9400,6 @@ var browser = {
     chrome_version: chrome ? +chrome[1] : 0,
     ios,
     android: /*@__PURE__*//Android\b/.test(nav.userAgent),
-    webkit,
     safari,
     webkit_version: webkit ? +(/*@__PURE__*//\bAppleWebKit\/(\d+)/.exec(nav.userAgent) || [0, 0])[1] : 0,
     tabSize: doc.documentElement.style.tabSize != null ? "tab-size" : "-moz-tab-size"
@@ -9726,7 +9725,7 @@ function coordsInChildren(view, pos, side) {
                 if (child.children.length) {
                     scan(child, pos - off);
                 }
-                else if ((!after || after.isHidden && side > 0) &&
+                else if ((!after || after.isHidden && (side > 0 || onSameLine(after, child))) &&
                     (end > pos || off == end && child.getSide() > 0)) {
                     after = child;
                     afterPos = pos - off;
@@ -9752,6 +9751,10 @@ function fallbackRect(view) {
     let rects = clientRectsFor(last);
     return rects[rects.length - 1] || null;
 }
+function onSameLine(a, b) {
+    let posA = a.coordsAt(0, 1), posB = b.coordsAt(0, 1);
+    return posA && posB && posB.top < posA.bottom;
+}
 
 function combineAttrs(source, target) {
     for (let name in source) {
@@ -15270,6 +15273,7 @@ const baseTheme$1$3 = /*@__PURE__*/buildTheme("." + baseThemeID, {
         color: "#888",
         display: "inline-block",
         verticalAlign: "top",
+        userSelect: "none"
     },
     ".cm-highlightSpace": {
         backgroundImage: "radial-gradient(circle at 50% 55%, #aaa 20%, transparent 5%)",
@@ -17684,7 +17688,6 @@ function layer(config) {
     ];
 }
 
-const CanHidePrimary = !(browser.ios && browser.webkit && browser.webkit_version < 534);
 const selectionConfig = /*@__PURE__*/Facet.define({
     combine(configs) {
         return combineConfig(configs, {
@@ -17733,7 +17736,7 @@ const cursorLayer = /*@__PURE__*/layer({
         let cursors = [];
         for (let r of state.selection.ranges) {
             let prim = r == state.selection.main;
-            if (r.empty ? !prim || CanHidePrimary : conf.drawRangeCursor) {
+            if (r.empty || conf.drawRangeCursor) {
                 let className = prim ? "cm-cursor cm-cursor-primary" : "cm-cursor cm-cursor-secondary";
                 let cursor = r.empty ? r : EditorSelection.cursor(r.head, r.head > r.anchor ? -1 : 1);
                 for (let piece of RectangleMarker.forRange(view, className, cursor))
@@ -17769,11 +17772,13 @@ const selectionLayer = /*@__PURE__*/layer({
     },
     class: "cm-selectionLayer"
 });
-const themeSpec = {
+const hideNativeSelection = /*@__PURE__*/Prec.highest(/*@__PURE__*/EditorView.theme({
     ".cm-line": {
         "& ::selection, &::selection": { backgroundColor: "transparent !important" },
+        caretColor: "transparent !important"
     },
     ".cm-content": {
+        caretColor: "transparent !important",
         "& :focus": {
             caretColor: "initial !important",
             "&::selection, & ::selection": {
@@ -17781,10 +17786,7 @@ const themeSpec = {
             }
         }
     }
-};
-if (CanHidePrimary)
-    themeSpec[".cm-line"].caretColor = themeSpec[".cm-content"].caretColor = "transparent !important";
-const hideNativeSelection = /*@__PURE__*/Prec.highest(/*@__PURE__*/EditorView.theme(themeSpec));
+}));
 
 const setDropCursorPos = /*@__PURE__*/StateEffect.define({
     map(pos, mapping) { return pos == null ? null : mapping.mapPos(pos); }
@@ -21621,7 +21623,7 @@ block comments.
 */
 const toggleBlockCommentByLine = /*@__PURE__*/command((o, s) => changeBlockComment(o, s, selectedLineRanges(s)), 0 /* CommentOption.Toggle */);
 function getConfig(state, pos) {
-    let data = state.languageDataAt("commentTokens", pos);
+    let data = state.languageDataAt("commentTokens", pos, 1);
     return data.length ? data[0] : {};
 }
 const SearchMargin = 50;
@@ -25922,10 +25924,9 @@ class LintState {
     }
     static init(diagnostics, panel, state) {
         // Filter the list of diagnostics for which to create markers
-        let markedDiagnostics = diagnostics;
         let diagnosticFilter = state.facet(lintConfig).markerFilter;
         if (diagnosticFilter)
-            markedDiagnostics = diagnosticFilter(markedDiagnostics, state);
+            diagnostics = diagnosticFilter(diagnostics, state);
         let sorted = diagnostics.slice().sort((a, b) => a.from - b.from || a.to - b.to);
         let deco = new RangeSetBuilder(), active = [], pos = 0;
         for (let i = 0;;) {

package/dist/utils/types.d.ts

@@ -84,15 +84,9 @@ export interface AuthParams {
 }
 /** @internal */
 export interface FunctionLog {
-    eventId: string;
-    ingestionTime: string;
-    timestamp: string;
+    time: string;
+    requestId: string;
+    level: string;
     message: string;
 }
-/** @internal */
-export interface FunctionLogGroup {
-    events: Array<FunctionLog>;
-    nextBackwardToken: string;
-    nextForwardToken: string;
-}
 export {};

package/oclif.manifest.json

@@ -481,5 +481,5 @@
       ]
     }
   },
-  "version": "2.1.0"
+  "version": "2.2.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "array-treeify": "^0.1.3",
     "color-json": "^3.0.5",
     "eventsource": "^3.0.6",
-    "inquirer": "^12.5.0",
+    "inquirer": "^12.5.2",
     "jszip": "^3.10.1",
     "mime-types": "^3.0.1",
     "xdg-basedir": "^5.1.0",
@@ -63,15 +63,15 @@
     "@types/node": "18",
     "codemirror": "^6.0.1",
     "mentoss": "^0.9.1",
-    "oclif": "^4.17.41",
+    "oclif": "^4.17.42",
     "pretty-bytes": "^6.1.1",
     "pretty-ms": "^9.2.0",
-    "rollup": "^4.38.0",
+    "rollup": "^4.39.0",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2",
-    "vitest": "3.0.9"
+    "vitest": "3.1.1"
   },
   "oclif": {
     "bin": "sanity-run",