@sanity/cli 6.0.0-alpha.4 → 6.0.0-alpha.6

package/dist/actions/dataset/create.d.ts

@@ -0,0 +1,49 @@
+import { type Output } from '@sanity/cli-core';
+/**
+ * Options for creating a dataset
+ */
+export interface CreateDatasetOptions {
+    /**
+     * Name of the dataset to create
+     */
+    datasetName: string;
+    /**
+     * Output instance for logging
+     */
+    output: Output;
+    /**
+     * Array of project features to determine capabilities
+     * Used to check if private datasets are available
+     */
+    projectFeatures: string[];
+    /**
+     * Project ID where the dataset will be created
+     */
+    projectId: string;
+    /**
+     * Whether to force disable private dataset creation
+     * Used when default config is selected (which forces public datasets)
+     */
+    forcePublic?: boolean;
+    /**
+     * Whether to run in unattended mode (no prompts)
+     */
+    isUnattended?: boolean;
+    /**
+     * Requested visibility mode from flags/options
+     */
+    visibility?: string;
+}
+/**
+ * Creates a new dataset with the appropriate ACL mode.
+ *
+ * This action handles the business logic for:
+ * - Determining the appropriate ACL mode based on project capabilities
+ * - Creating the dataset via the service layer
+ * - Handling errors and providing user feedback
+ *
+ * @param options - Configuration options
+ * @returns Promise resolving when dataset is created
+ * @throws Error if dataset creation fails
+ */
+export declare function createDataset(options: CreateDatasetOptions): Promise<void>;

package/dist/actions/dataset/create.js

@@ -0,0 +1,48 @@
+import { subdebug } from '@sanity/cli-core';
+import { spinner } from '@sanity/cli-core/ux';
+import { createDataset as createDatasetService } from '../../services/datasets.js';
+import { determineDatasetAclMode } from './determineDatasetAclMode.js';
+const debug = subdebug('dataset:create');
+/**
+ * Creates a new dataset with the appropriate ACL mode.
+ *
+ * This action handles the business logic for:
+ * - Determining the appropriate ACL mode based on project capabilities
+ * - Creating the dataset via the service layer
+ * - Handling errors and providing user feedback
+ *
+ * @param options - Configuration options
+ * @returns Promise resolving when dataset is created
+ * @throws Error if dataset creation fails
+ */ export async function createDataset(options) {
+    const { datasetName, forcePublic = false, isUnattended = false, output, projectFeatures, projectId, visibility } = options;
+    const canCreatePrivate = projectFeatures.includes('privateDataset') && !forcePublic;
+    // Determine the appropriate ACL mode
+    const aclMode = await determineDatasetAclMode({
+        canCreatePrivate,
+        isUnattended,
+        output,
+        visibility
+    });
+    try {
+        const spin = spinner('Creating dataset').start();
+        await createDatasetService({
+            aclMode,
+            datasetName,
+            projectId
+        });
+        spin.succeed();
+        output.log(`Dataset created successfully`);
+    } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        debug('Error creating dataset', {
+            datasetName,
+            error
+        });
+        output.error(`Dataset creation failed: ${message}`, {
+            exit: 1
+        });
+    }
+}
+
+//# sourceMappingURL=create.js.map

package/dist/actions/dataset/create.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/dataset/create.ts"],"sourcesContent":["import {type Output, subdebug} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {type DatasetAclMode} from '@sanity/client'\n\nimport {createDataset as createDatasetService} from '../../services/datasets.js'\nimport {determineDatasetAclMode} from './determineDatasetAclMode.js'\n\nconst debug = subdebug('dataset:create')\n\n/**\n * Options for creating a dataset\n */\nexport interface CreateDatasetOptions {\n  /**\n   * Name of the dataset to create\n   */\n  datasetName: string\n\n  /**\n   * Output instance for logging\n   */\n  output: Output\n\n  /**\n   * Array of project features to determine capabilities\n   * Used to check if private datasets are available\n   */\n  projectFeatures: string[]\n\n  /**\n   * Project ID where the dataset will be created\n   */\n  projectId: string\n\n  /**\n   * Whether to force disable private dataset creation\n   * Used when default config is selected (which forces public datasets)\n   */\n  forcePublic?: boolean\n\n  /**\n   * Whether to run in unattended mode (no prompts)\n   */\n  isUnattended?: boolean\n\n  /**\n   * Requested visibility mode from flags/options\n   */\n  visibility?: string\n}\n\n/**\n * Creates a new dataset with the appropriate ACL mode.\n *\n * This action handles the business logic for:\n * - Determining the appropriate ACL mode based on project capabilities\n * - Creating the dataset via the service layer\n * - Handling errors and providing user feedback\n *\n * @param options - Configuration options\n * @returns Promise resolving when dataset is created\n * @throws Error if dataset creation fails\n */\nexport async function createDataset(options: CreateDatasetOptions): Promise<void> {\n  const {\n    datasetName,\n    forcePublic = false,\n    isUnattended = false,\n    output,\n    projectFeatures,\n    projectId,\n    visibility,\n  } = options\n\n  const canCreatePrivate = projectFeatures.includes('privateDataset') && !forcePublic\n\n  // Determine the appropriate ACL mode\n  const aclMode: DatasetAclMode = await determineDatasetAclMode({\n    canCreatePrivate,\n    isUnattended,\n    output,\n    visibility,\n  })\n\n  try {\n    const spin = spinner('Creating dataset').start()\n    await createDatasetService({\n      aclMode,\n      datasetName,\n      projectId,\n    })\n    spin.succeed()\n    output.log(`Dataset created successfully`)\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error)\n    debug('Error creating dataset', {datasetName, error})\n    output.error(`Dataset creation failed: ${message}`, {exit: 1})\n  }\n}\n"],"names":["subdebug","spinner","createDataset","createDatasetService","determineDatasetAclMode","debug","options","datasetName","forcePublic","isUnattended","output","projectFeatures","projectId","visibility","canCreatePrivate","includes","aclMode","spin","start","succeed","log","error","message","Error","String","exit"],"mappings":"AAAA,SAAqBA,QAAQ,QAAO,mBAAkB;AACtD,SAAQC,OAAO,QAAO,sBAAqB;AAG3C,SAAQC,iBAAiBC,oBAAoB,QAAO,6BAA4B;AAChF,SAAQC,uBAAuB,QAAO,+BAA8B;AAEpE,MAAMC,QAAQL,SAAS;AA4CvB;;;;;;;;;;;CAWC,GACD,OAAO,eAAeE,cAAcI,OAA6B;IAC/D,MAAM,EACJC,WAAW,EACXC,cAAc,KAAK,EACnBC,eAAe,KAAK,EACpBC,MAAM,EACNC,eAAe,EACfC,SAAS,EACTC,UAAU,EACX,GAAGP;IAEJ,MAAMQ,mBAAmBH,gBAAgBI,QAAQ,CAAC,qBAAqB,CAACP;IAExE,qCAAqC;IACrC,MAAMQ,UAA0B,MAAMZ,wBAAwB;QAC5DU;QACAL;QACAC;QACAG;IACF;IAEA,IAAI;QACF,MAAMI,OAAOhB,QAAQ,oBAAoBiB,KAAK;QAC9C,MAAMf,qBAAqB;YACzBa;YACAT;YACAK;QACF;QACAK,KAAKE,OAAO;QACZT,OAAOU,GAAG,CAAC,CAAC,4BAA4B,CAAC;IAC3C,EAAE,OAAOC,OAAO;QACd,MAAMC,UAAUD,iBAAiBE,QAAQF,MAAMC,OAAO,GAAGE,OAAOH;QAChEhB,MAAM,0BAA0B;YAACE;YAAac;QAAK;QACnDX,OAAOW,KAAK,CAAC,CAAC,yBAAyB,EAAEC,SAAS,EAAE;YAACG,MAAM;QAAC;IAC9D;AACF"}

package/dist/actions/dataset/determineDatasetAclMode.d.ts

@@ -0,0 +1,37 @@
+import { type Output } from '@sanity/cli-core';
+import { type DatasetAclMode } from '@sanity/client';
+/**
+ * Options for determining the ACL mode for a dataset
+ */
+export interface DetermineDatasetAclModeOptions {
+    /**
+     * Whether the project has the capability to create private datasets
+     */
+    canCreatePrivate: boolean;
+    /**
+     * Output instance for logging warnings
+     */
+    output: Output;
+    /**
+     * Whether to run in unattended mode (no prompts)
+     */
+    isUnattended?: boolean;
+    /**
+     * Requested visibility mode from flags/options
+     */
+    visibility?: string;
+}
+/**
+ * Determines the appropriate ACL mode for a dataset based on project capabilities
+ * and user preferences.
+ *
+ * This action handles the business logic for:
+ * - Validating requested visibility against project capabilities
+ * - Falling back to public when private is not available
+ * - Prompting user when necessary
+ * - Warning user about limitations
+ *
+ * @param options - Configuration options
+ * @returns Promise resolving to the determined ACL mode
+ */
+export declare function determineDatasetAclMode(options: DetermineDatasetAclModeOptions): Promise<DatasetAclMode>;

package/dist/actions/dataset/determineDatasetAclMode.js

@@ -0,0 +1,36 @@
+import { promptForDatasetAclMode } from '../../prompts/promptForDatasetAclMode.js';
+/**
+ * Determines the appropriate ACL mode for a dataset based on project capabilities
+ * and user preferences.
+ *
+ * This action handles the business logic for:
+ * - Validating requested visibility against project capabilities
+ * - Falling back to public when private is not available
+ * - Prompting user when necessary
+ * - Warning user about limitations
+ *
+ * @param options - Configuration options
+ * @returns Promise resolving to the determined ACL mode
+ */ export async function determineDatasetAclMode(options) {
+    const { canCreatePrivate, isUnattended = false, output, visibility } = options;
+    // Handle explicit custom/public requests
+    if (visibility === 'custom' || visibility === 'public') {
+        return visibility;
+    }
+    // Handle private visibility request
+    if (visibility === 'private') {
+        if (canCreatePrivate) {
+            return 'private';
+        }
+        output.warn('Private datasets are not available for this project. Creating as public.');
+        return 'public';
+    }
+    // No explicit request - determine based on capabilities and mode
+    if (isUnattended || !canCreatePrivate) {
+        return 'public';
+    }
+    // Interactive mode with private capability - prompt user
+    return promptForDatasetAclMode(output);
+}
+
+//# sourceMappingURL=determineDatasetAclMode.js.map

package/dist/actions/dataset/determineDatasetAclMode.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/dataset/determineDatasetAclMode.ts"],"sourcesContent":["import {type Output} from '@sanity/cli-core'\nimport {type DatasetAclMode} from '@sanity/client'\n\nimport {promptForDatasetAclMode} from '../../prompts/promptForDatasetAclMode.js'\n\n/**\n * Options for determining the ACL mode for a dataset\n */\nexport interface DetermineDatasetAclModeOptions {\n  /**\n   * Whether the project has the capability to create private datasets\n   */\n  canCreatePrivate: boolean\n  /**\n   * Output instance for logging warnings\n   */\n  output: Output\n\n  /**\n   * Whether to run in unattended mode (no prompts)\n   */\n  isUnattended?: boolean\n  /**\n   * Requested visibility mode from flags/options\n   */\n  visibility?: string\n}\n\n/**\n * Determines the appropriate ACL mode for a dataset based on project capabilities\n * and user preferences.\n *\n * This action handles the business logic for:\n * - Validating requested visibility against project capabilities\n * - Falling back to public when private is not available\n * - Prompting user when necessary\n * - Warning user about limitations\n *\n * @param options - Configuration options\n * @returns Promise resolving to the determined ACL mode\n */\nexport async function determineDatasetAclMode(\n  options: DetermineDatasetAclModeOptions,\n): Promise<DatasetAclMode> {\n  const {canCreatePrivate, isUnattended = false, output, visibility} = options\n\n  // Handle explicit custom/public requests\n  if (visibility === 'custom' || visibility === 'public') {\n    return visibility\n  }\n\n  // Handle private visibility request\n  if (visibility === 'private') {\n    if (canCreatePrivate) {\n      return 'private'\n    }\n\n    output.warn('Private datasets are not available for this project. Creating as public.')\n\n    return 'public'\n  }\n\n  // No explicit request - determine based on capabilities and mode\n  if (isUnattended || !canCreatePrivate) {\n    return 'public'\n  }\n\n  // Interactive mode with private capability - prompt user\n  return promptForDatasetAclMode(output)\n}\n"],"names":["promptForDatasetAclMode","determineDatasetAclMode","options","canCreatePrivate","isUnattended","output","visibility","warn"],"mappings":"AAGA,SAAQA,uBAAuB,QAAO,2CAA0C;AAyBhF;;;;;;;;;;;;CAYC,GACD,OAAO,eAAeC,wBACpBC,OAAuC;IAEvC,MAAM,EAACC,gBAAgB,EAAEC,eAAe,KAAK,EAAEC,MAAM,EAAEC,UAAU,EAAC,GAAGJ;IAErE,yCAAyC;IACzC,IAAII,eAAe,YAAYA,eAAe,UAAU;QACtD,OAAOA;IACT;IAEA,oCAAoC;IACpC,IAAIA,eAAe,WAAW;QAC5B,IAAIH,kBAAkB;YACpB,OAAO;QACT;QAEAE,OAAOE,IAAI,CAAC;QAEZ,OAAO;IACT;IAEA,iEAAiE;IACjE,IAAIH,gBAAgB,CAACD,kBAAkB;QACrC,OAAO;IACT;IAEA,yDAAyD;IACzD,OAAOH,wBAAwBK;AACjC"}

package/dist/actions/debug/gatherDebugInfo.js

@@ -1,7 +1,9 @@
-import { getCliToken, getConfig as getCliUserConfig } from '@sanity/cli-core';
+import { getCliToken, getUserConfig } from '@sanity/cli-core';
+import { getProjectById } from '../../services/projects.js';
+import { getCliUser, getProjectUser } from '../../services/user.js';
 import { findSanityModulesVersions } from '../versions/findSanityModulesVersions.js';
 export async function gatherDebugInfo(options) {
-    const { cliConfig, client, includeSecrets, projectRoot } = options;
+    const { cliConfig, includeSecrets, projectRoot } = options;
     // Gather all info in parallel where possible
     const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([
         gatherAuthInfo(includeSecrets),
@@ -10,8 +12,8 @@ export async function gatherDebugInfo(options) {
         gatherVersionsInfo(projectRoot)
     ]);
     // Gather user and project info that depend on auth
-    const user = await gatherUserInfo(client, auth.hasToken);
-    const project = await gatherProjectInfo(client, projectConfigResult, auth.hasToken, user);
+    const user = await gatherUserInfo(projectConfigResult, auth.hasToken);
+    const project = await gatherProjectInfo(projectConfigResult, auth.hasToken, user);
     return {
         auth,
         globalConfig,
@@ -30,19 +32,8 @@ async function gatherAuthInfo(includeSecrets) {
         userType: 'normal'
     };
 }
-async function gatherGlobalConfig() {
-    try {
-        const [authToken, telemetryConsent] = await Promise.all([
-            getCliUserConfig('authToken'),
-            getCliUserConfig('telemetryConsent')
-        ]);
-        return {
-            authToken,
-            telemetryConsent
-        };
-    } catch  {
-        return {};
-    }
+function gatherGlobalConfig() {
+    return getUserConfig().all;
 }
 async function gatherProjectConfig(cliConfig) {
     try {
@@ -64,12 +55,15 @@ async function gatherVersionsInfo(projectRoot) {
         return [];
     }
 }
-async function gatherUserInfo(client, hasToken) {
+async function gatherUserInfo(projectConfig, hasToken) {
     if (!hasToken) {
         return new Error('Not logged in');
     }
     try {
-        const userInfo = await client.users.getById('me');
+        /**
+     * If the project config has a project ID, get the user for the project
+     * Otherwise, get the user for the global client
+     */ const userInfo = projectConfig instanceof Error || !projectConfig.api?.projectId ? await getCliUser() : await getProjectUser(projectConfig.api.projectId);
         return {
             email: userInfo.email,
             id: userInfo.id,
@@ -79,7 +73,7 @@ async function gatherUserInfo(client, hasToken) {
         return error instanceof Error ? error : new Error('Failed to fetch user info');
     }
 }
-async function gatherProjectInfo(client, projectConfig, hasToken, user) {
+async function gatherProjectInfo(projectConfig, hasToken, user) {
     if (!hasToken || projectConfig instanceof Error) {
         return null;
     }
@@ -88,7 +82,7 @@ async function gatherProjectInfo(client, projectConfig, hasToken, user) {
         return null;
     }
     try {
-        const projectInfo = await client.projects.getById(projectId);
+        const projectInfo = await getProjectById(projectId);
         if (!projectInfo) {
             return new Error(`Project specified in configuration (${projectId}) does not exist in API`);
         }

package/dist/actions/debug/gatherDebugInfo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/debug/gatherDebugInfo.ts"],"sourcesContent":["import {\n  type CliConfig,\n  getCliToken,\n  getConfig as getCliUserConfig,\n  type ProjectRootResult,\n} from '@sanity/cli-core'\nimport {type SanityClient} from '@sanity/client'\n\nimport {findSanityModulesVersions} from '../versions/findSanityModulesVersions.js'\nimport {type ModuleVersionResult} from '../versions/types.js'\nimport {\n  type AuthInfo,\n  type DebugInfo,\n  type DebugInfoOptions,\n  type ProjectInfo,\n  type UserInfo,\n} from './types.js'\n\nexport async function gatherDebugInfo(options: DebugInfoOptions): Promise<DebugInfo> {\n  const {cliConfig, client, includeSecrets, projectRoot} = options\n\n  // Gather all info in parallel where possible\n  const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([\n    gatherAuthInfo(includeSecrets),\n    gatherGlobalConfig(),\n    gatherProjectConfig(cliConfig),\n    gatherVersionsInfo(projectRoot),\n  ])\n\n  // Gather user and project info that depend on auth\n  const user = await gatherUserInfo(client, auth.hasToken)\n  const project = await gatherProjectInfo(client, projectConfigResult, auth.hasToken, user)\n\n  return {\n    auth,\n    globalConfig,\n    project,\n    projectConfig: projectConfigResult,\n    user,\n    versions,\n  }\n}\n\nasync function gatherAuthInfo(includeSecrets: boolean): Promise<AuthInfo> {\n  const token = await getCliToken()\n  const hasToken = Boolean(token)\n\n  return {\n    authToken: includeSecrets && token ? token : '<redacted>',\n    hasToken,\n    userType: 'normal',\n  }\n}\n\nasync function gatherGlobalConfig(): Promise<Record<string, unknown>> {\n  try {\n    const [authToken, telemetryConsent] = await Promise.all([\n      getCliUserConfig('authToken'),\n      getCliUserConfig('telemetryConsent'),\n    ])\n\n    return {\n      authToken,\n      telemetryConsent,\n    }\n  } catch {\n    return {}\n  }\n}\n\nasync function gatherProjectConfig(cliConfig: CliConfig): Promise<CliConfig | Error> {\n  try {\n    const config = cliConfig\n\n    if (!config.api?.projectId) {\n      return new Error('Missing required \"api.projectId\" key')\n    }\n\n    return config\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to load project config')\n  }\n}\n\nasync function gatherVersionsInfo(projectRoot: ProjectRootResult): Promise<ModuleVersionResult[]> {\n  try {\n    return await findSanityModulesVersions({cwd: projectRoot.directory})\n  } catch {\n    return []\n  }\n}\n\nasync function gatherUserInfo(\n  client: SanityClient,\n  hasToken: boolean,\n): Promise<Error | UserInfo | null> {\n  if (!hasToken) {\n    return new Error('Not logged in')\n  }\n\n  try {\n    const userInfo = await client.users.getById('me')\n\n    return {\n      email: userInfo.email,\n      id: userInfo.id,\n      name: userInfo.name,\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch user info')\n  }\n}\n\nasync function gatherProjectInfo(\n  client: SanityClient,\n  projectConfig: CliConfig | Error,\n  hasToken: boolean,\n  user: Error | UserInfo | null,\n): Promise<Error | ProjectInfo | null> {\n  if (!hasToken || projectConfig instanceof Error) {\n    return null\n  }\n\n  const projectId = projectConfig.api?.projectId\n  if (!projectId) {\n    return null\n  }\n\n  try {\n    const projectInfo = await client.projects.getById(projectId)\n\n    if (!projectInfo) {\n      return new Error(`Project specified in configuration (${projectId}) does not exist in API`)\n    }\n\n    const userId = user instanceof Error || !user ? null : user.id\n    const member = (projectInfo.members || []).find((member) => member.id === userId)\n\n    return {\n      displayName: projectInfo.displayName,\n      id: projectId,\n      // @ts-expect-error - Incorrect type definition in @sanity/client\n      userRoles: member && member.roles ? member.roles.map((role) => role.name) : ['<none>'],\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch project info')\n  }\n}\n"],"names":["getCliToken","getConfig","getCliUserConfig","findSanityModulesVersions","gatherDebugInfo","options","cliConfig","client","includeSecrets","projectRoot","auth","globalConfig","projectConfigResult","versions","Promise","all","gatherAuthInfo","gatherGlobalConfig","gatherProjectConfig","gatherVersionsInfo","user","gatherUserInfo","hasToken","project","gatherProjectInfo","projectConfig","token","Boolean","authToken","userType","telemetryConsent","config","api","projectId","Error","error","cwd","directory","userInfo","users","getById","email","id","name","projectInfo","projects","userId","member","members","find","displayName","userRoles","roles","map","role"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/debug/gatherDebugInfo.ts"],"sourcesContent":["import {type CliConfig, getCliToken, getUserConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {getProjectById} from '../../services/projects.js'\nimport {getCliUser, getProjectUser} from '../../services/user.js'\nimport {findSanityModulesVersions} from '../versions/findSanityModulesVersions.js'\nimport {type ModuleVersionResult} from '../versions/types.js'\nimport {\n  type AuthInfo,\n  type DebugInfo,\n  type DebugInfoOptions,\n  type ProjectInfo,\n  type UserInfo,\n} from './types.js'\n\nexport async function gatherDebugInfo(options: DebugInfoOptions): Promise<DebugInfo> {\n  const {cliConfig, includeSecrets, projectRoot} = options\n\n  // Gather all info in parallel where possible\n  const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([\n    gatherAuthInfo(includeSecrets),\n    gatherGlobalConfig(),\n    gatherProjectConfig(cliConfig),\n    gatherVersionsInfo(projectRoot),\n  ])\n\n  // Gather user and project info that depend on auth\n  const user = await gatherUserInfo(projectConfigResult, auth.hasToken)\n  const project = await gatherProjectInfo(projectConfigResult, auth.hasToken, user)\n\n  return {\n    auth,\n    globalConfig,\n    project,\n    projectConfig: projectConfigResult,\n    user,\n    versions,\n  }\n}\n\nasync function gatherAuthInfo(includeSecrets: boolean): Promise<AuthInfo> {\n  const token = await getCliToken()\n  const hasToken = Boolean(token)\n\n  return {\n    authToken: includeSecrets && token ? token : '<redacted>',\n    hasToken,\n    userType: 'normal',\n  }\n}\n\nfunction gatherGlobalConfig(): Record<string, unknown> {\n  return getUserConfig().all\n}\n\nasync function gatherProjectConfig(cliConfig: CliConfig): Promise<CliConfig | Error> {\n  try {\n    const config = cliConfig\n\n    if (!config.api?.projectId) {\n      return new Error('Missing required \"api.projectId\" key')\n    }\n\n    return config\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to load project config')\n  }\n}\n\nasync function gatherVersionsInfo(projectRoot: ProjectRootResult): Promise<ModuleVersionResult[]> {\n  try {\n    return await findSanityModulesVersions({cwd: projectRoot.directory})\n  } catch {\n    return []\n  }\n}\n\nasync function gatherUserInfo(\n  projectConfig: CliConfig | Error,\n  hasToken: boolean,\n): Promise<Error | UserInfo | null> {\n  if (!hasToken) {\n    return new Error('Not logged in')\n  }\n\n  try {\n    /**\n     * If the project config has a project ID, get the user for the project\n     * Otherwise, get the user for the global client\n     */\n    const userInfo =\n      projectConfig instanceof Error || !projectConfig.api?.projectId\n        ? await getCliUser()\n        : await getProjectUser(projectConfig.api.projectId)\n\n    return {\n      email: userInfo.email,\n      id: userInfo.id,\n      name: userInfo.name,\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch user info')\n  }\n}\n\nasync function gatherProjectInfo(\n  projectConfig: CliConfig | Error,\n  hasToken: boolean,\n  user: Error | UserInfo | null,\n): Promise<Error | ProjectInfo | null> {\n  if (!hasToken || projectConfig instanceof Error) {\n    return null\n  }\n\n  const projectId = projectConfig.api?.projectId\n  if (!projectId) {\n    return null\n  }\n\n  try {\n    const projectInfo = await getProjectById(projectId)\n\n    if (!projectInfo) {\n      return new Error(`Project specified in configuration (${projectId}) does not exist in API`)\n    }\n\n    const userId = user instanceof Error || !user ? null : user.id\n    const member = (projectInfo.members || []).find((member) => member.id === userId)\n\n    return {\n      displayName: projectInfo.displayName,\n      id: projectId,\n      // @ts-expect-error - Incorrect type definition in @sanity/client\n      userRoles: member && member.roles ? member.roles.map((role) => role.name) : ['<none>'],\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch project info')\n  }\n}\n"],"names":["getCliToken","getUserConfig","getProjectById","getCliUser","getProjectUser","findSanityModulesVersions","gatherDebugInfo","options","cliConfig","includeSecrets","projectRoot","auth","globalConfig","projectConfigResult","versions","Promise","all","gatherAuthInfo","gatherGlobalConfig","gatherProjectConfig","gatherVersionsInfo","user","gatherUserInfo","hasToken","project","gatherProjectInfo","projectConfig","token","Boolean","authToken","userType","config","api","projectId","Error","error","cwd","directory","userInfo","email","id","name","projectInfo","userId","member","members","find","displayName","userRoles","roles","map","role"],"mappings":"AAAA,SAAwBA,WAAW,EAAEC,aAAa,QAA+B,mBAAkB;AAEnG,SAAQC,cAAc,QAAO,6BAA4B;AACzD,SAAQC,UAAU,EAAEC,cAAc,QAAO,yBAAwB;AACjE,SAAQC,yBAAyB,QAAO,2CAA0C;AAUlF,OAAO,eAAeC,gBAAgBC,OAAyB;IAC7D,MAAM,EAACC,SAAS,EAAEC,cAAc,EAAEC,WAAW,EAAC,GAAGH;IAEjD,6CAA6C;IAC7C,MAAM,CAACI,MAAMC,cAAcC,qBAAqBC,SAAS,GAAG,MAAMC,QAAQC,GAAG,CAAC;QAC5EC,eAAeR;QACfS;QACAC,oBAAoBX;QACpBY,mBAAmBV;KACpB;IAED,mDAAmD;IACnD,MAAMW,OAAO,MAAMC,eAAeT,qBAAqBF,KAAKY,QAAQ;IACpE,MAAMC,UAAU,MAAMC,kBAAkBZ,qBAAqBF,KAAKY,QAAQ,EAAEF;IAE5E,OAAO;QACLV;QACAC;QACAY;QACAE,eAAeb;QACfQ;QACAP;IACF;AACF;AAEA,eAAeG,eAAeR,cAAuB;IACnD,MAAMkB,QAAQ,MAAM3B;IACpB,MAAMuB,WAAWK,QAAQD;IAEzB,OAAO;QACLE,WAAWpB,kBAAkBkB,QAAQA,QAAQ;QAC7CJ;QACAO,UAAU;IACZ;AACF;AAEA,SAASZ;IACP,OAAOjB,gBAAgBe,GAAG;AAC5B;AAEA,eAAeG,oBAAoBX,SAAoB;IACrD,IAAI;QACF,MAAMuB,SAASvB;QAEf,IAAI,CAACuB,OAAOC,GAAG,EAAEC,WAAW;YAC1B,OAAO,IAAIC,MAAM;QACnB;QAEA,OAAOH;IACT,EAAE,OAAOI,OAAO;QACd,OAAOA,iBAAiBD,QAAQC,QAAQ,IAAID,MAAM;IACpD;AACF;AAEA,eAAed,mBAAmBV,WAA8B;IAC9D,IAAI;QACF,OAAO,MAAML,0BAA0B;YAAC+B,KAAK1B,YAAY2B,SAAS;QAAA;IACpE,EAAE,OAAM;QACN,OAAO,EAAE;IACX;AACF;AAEA,eAAef,eACbI,aAAgC,EAChCH,QAAiB;IAEjB,IAAI,CAACA,UAAU;QACb,OAAO,IAAIW,MAAM;IACnB;IAEA,IAAI;QACF;;;KAGC,GACD,MAAMI,WACJZ,yBAAyBQ,SAAS,CAACR,cAAcM,GAAG,EAAEC,YAClD,MAAM9B,eACN,MAAMC,eAAesB,cAAcM,GAAG,CAACC,SAAS;QAEtD,OAAO;YACLM,OAAOD,SAASC,KAAK;YACrBC,IAAIF,SAASE,EAAE;YACfC,MAAMH,SAASG,IAAI;QACrB;IACF,EAAE,OAAON,OAAO;QACd,OAAOA,iBAAiBD,QAAQC,QAAQ,IAAID,MAAM;IACpD;AACF;AAEA,eAAeT,kBACbC,aAAgC,EAChCH,QAAiB,EACjBF,IAA6B;IAE7B,IAAI,CAACE,YAAYG,yBAAyBQ,OAAO;QAC/C,OAAO;IACT;IAEA,MAAMD,YAAYP,cAAcM,GAAG,EAAEC;IACrC,IAAI,CAACA,WAAW;QACd,OAAO;IACT;IAEA,IAAI;QACF,MAAMS,cAAc,MAAMxC,eAAe+B;QAEzC,IAAI,CAACS,aAAa;YAChB,OAAO,IAAIR,MAAM,CAAC,oCAAoC,EAAED,UAAU,uBAAuB,CAAC;QAC5F;QAEA,MAAMU,SAAStB,gBAAgBa,SAAS,CAACb,OAAO,OAAOA,KAAKmB,EAAE;QAC9D,MAAMI,SAAS,AAACF,CAAAA,YAAYG,OAAO,IAAI,EAAE,AAAD,EAAGC,IAAI,CAAC,CAACF,SAAWA,OAAOJ,EAAE,KAAKG;QAE1E,OAAO;YACLI,aAAaL,YAAYK,WAAW;YACpCP,IAAIP;YACJ,iEAAiE;YACjEe,WAAWJ,UAAUA,OAAOK,KAAK,GAAGL,OAAOK,KAAK,CAACC,GAAG,CAAC,CAACC,OAASA,KAAKV,IAAI,IAAI;gBAAC;aAAS;QACxF;IACF,EAAE,OAAON,OAAO;QACd,OAAOA,iBAAiBD,QAAQC,QAAQ,IAAID,MAAM;IACpD;AACF"}

package/dist/actions/debug/types.d.ts

@@ -1,9 +1,7 @@
 import { type CliConfig, type ProjectRootResult } from '@sanity/cli-core';
-import { type SanityClient } from '@sanity/client';
 import { type ModuleVersionResult } from '../versions/types.js';
 export interface DebugInfoOptions {
     cliConfig: CliConfig;
-    client: SanityClient;
     includeSecrets: boolean;
     projectRoot: ProjectRootResult;
 }

package/dist/actions/debug/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/debug/types.ts"],"sourcesContent":["import {type CliConfig, type ProjectRootResult} from '@sanity/cli-core'\nimport {type SanityClient} from '@sanity/client'\n\nimport {type ModuleVersionResult} from '../versions/types.js'\n\nexport interface DebugInfoOptions {\n  cliConfig: CliConfig\n  client: SanityClient\n  includeSecrets: boolean\n  projectRoot: ProjectRootResult\n}\n\nexport interface UserInfo {\n  email: string\n  id: string\n  name: string\n}\n\nexport interface ProjectInfo {\n  displayName: string\n  id: string\n  userRoles: string[]\n}\n\nexport interface AuthInfo {\n  authToken: string\n  hasToken: boolean\n  userType: string\n}\n\nexport interface DebugInfo {\n  auth: AuthInfo\n  globalConfig: Record<string, unknown>\n  project: Error | ProjectInfo | null\n  projectConfig: CliConfig | Error\n  user: Error | UserInfo | null\n  versions: ModuleVersionResult[]\n}\n"],"names":[],"mappings":"AA8BA,WAOC"}
+{"version":3,"sources":["../../../src/actions/debug/types.ts"],"sourcesContent":["import {type CliConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ModuleVersionResult} from '../versions/types.js'\n\nexport interface DebugInfoOptions {\n  cliConfig: CliConfig\n  includeSecrets: boolean\n  projectRoot: ProjectRootResult\n}\n\nexport interface UserInfo {\n  email: string\n  id: string\n  name: string\n}\n\nexport interface ProjectInfo {\n  displayName: string\n  id: string\n  userRoles: string[]\n}\n\nexport interface AuthInfo {\n  authToken: string\n  hasToken: boolean\n  userType: string\n}\n\nexport interface DebugInfo {\n  auth: AuthInfo\n  globalConfig: Record<string, unknown>\n  project: Error | ProjectInfo | null\n  projectConfig: CliConfig | Error\n  user: Error | UserInfo | null\n  versions: ModuleVersionResult[]\n}\n"],"names":[],"mappings":"AA4BA,WAOC"}

package/dist/actions/deploy/deployApp.js

@@ -10,6 +10,7 @@ import { readModuleVersion } from '../../util/readModuleVersion.js';
 import { warnAboutMissingAppId } from '../../util/warnAboutMissingAppId.js';
 import { buildApp } from '../build/buildApp.js';
 import { shouldAutoUpdate } from '../build/shouldAutoUpdate.js';
+import { extractAppManifest } from '../manifest/extractAppManifest.js';
 import { checkDir } from './checkDir.js';
 import { createUserApplicationForApp } from './createUserApplicationForApp.js';
 import { deployDebug } from './deployDebug.js';
@@ -95,11 +96,23 @@ import { findUserApplicationForApp } from './findUserApplicationForApp.js';
                 base
             ]
         }).pipe(createGzip());
+        let manifest;
+        try {
+            manifest = await extractAppManifest({
+                flags,
+                workDir
+            });
+        } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            deployDebug('Error extracting app manifest', err);
+            output.warn(`Error extracting app manifest: ${message}`);
+        }
         spin = spinner('Deploying...').start();
         await createDeployment({
             applicationId: userApplication.id,
             isApp: true,
             isAutoUpdating,
+            manifest,
             tarball,
             version: installedSdkVersion
         });

package/dist/actions/deploy/deployApp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/deployApp.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {chalk, spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_ORGANIZATION_ID} from '../../util/errorMessages.js'\nimport {readModuleVersion} from '../../util/readModuleVersion.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {buildApp} from '../build/buildApp.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {checkDir} from './checkDir.js'\nimport {createUserApplicationForApp} from './createUserApplicationForApp.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForApp} from './findUserApplicationForApp.js'\nimport {type DeployAppOptions} from './types.js'\n\n/**\n * Deploy a Sanity application.\n *\n * @internal\n */\nexport async function deployApp(options: DeployAppOptions) {\n  const {cliConfig, exit, flags, output, sourceDir, workDir} = options\n\n  const organizationId = cliConfig.app?.organizationId\n  const appId = getAppId(cliConfig)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n  const installedSdkVersion = await readModuleVersion(sourceDir, '@sanity/sdk-react')\n\n  if (!installedSdkVersion) {\n    output.error(`Failed to find installed @sanity/sdk-react version`, {exit: 1})\n    return\n  }\n\n  if (!organizationId) {\n    output.error(NO_ORGANIZATION_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content...')\n\n  try {\n    let userApplication = await findUserApplicationForApp({\n      cliConfig,\n      organizationId,\n      output,\n    })\n\n    deployDebug(`User application found`, userApplication)\n\n    if (!userApplication) {\n      deployDebug(`No user application found. Creating a new one`)\n\n      userApplication = await createUserApplicationForApp(organizationId)\n      deployDebug(`User application created`, userApplication)\n    }\n\n    // Warn about missing app ID if auto updates are enabled\n    if (isAutoUpdating && !appId) {\n      warnAboutMissingAppId({appType: 'app', output})\n    }\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building app`)\n      await buildApp({\n        autoUpdatesEnabled: isAutoUpdating,\n        cliConfig,\n        exit,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n      return\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n\n    spin = spinner('Deploying...').start()\n    await createDeployment({\n      applicationId: userApplication.id,\n      isApp: true,\n      isAutoUpdating,\n      tarball,\n      version: installedSdkVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\n🚀 ${chalk.bold('Success!')} Application deployed`)\n\n    if (!appId) {\n      output.log(`\\n════ ${chalk.bold('Next step:')} ════`)\n      output.log(\n        chalk.bold('\\nAdd the deployment.appId to your sanity.cli.js or sanity.cli.ts file:'),\n      )\n      output.log(`\n${chalk.dim(`app: {\n  // your application config here…\n}`)},\n${chalk.bold.green(`deployment: {\n  appId: '${userApplication.id}',\n}\\n`)}`)\n    }\n  } catch (error) {\n    spin.clear()\n    // Don't throw generic error if user cancels\n    if (error.name === 'ExitPromptError') {\n      output.error('Deployment cancelled by user', {exit: 1})\n      return\n    }\n    // If the error is a CLIError, we can just output the message & error options (if any), while ensuring we exit\n    if (error instanceof CLIError) {\n      const {message, ...errorOptions} = error\n      output.error(message, {...errorOptions, exit: 1})\n      return\n    }\n\n    deployDebug('Error deploying application', error)\n    output.error('Error deploying application', {exit: 1})\n  }\n}\n"],"names":["basename","dirname","createGzip","CLIError","chalk","spinner","pack","createDeployment","getAppId","NO_ORGANIZATION_ID","readModuleVersion","warnAboutMissingAppId","buildApp","shouldAutoUpdate","checkDir","createUserApplicationForApp","deployDebug","findUserApplicationForApp","deployApp","options","cliConfig","exit","flags","output","sourceDir","workDir","organizationId","app","appId","isAutoUpdating","installedSdkVersion","error","spin","userApplication","appType","shouldBuild","build","autoUpdatesEnabled","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","applicationId","id","isApp","version","log","bold","dim","green","clear","name","message","errorOptions"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/deploy/deployApp.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {chalk, spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_ORGANIZATION_ID} from '../../util/errorMessages.js'\nimport {readModuleVersion} from '../../util/readModuleVersion.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {buildApp} from '../build/buildApp.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {extractAppManifest} from '../manifest/extractAppManifest.js'\nimport {type AppManifest} from '../manifest/types.js'\nimport {checkDir} from './checkDir.js'\nimport {createUserApplicationForApp} from './createUserApplicationForApp.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForApp} from './findUserApplicationForApp.js'\nimport {type DeployAppOptions} from './types.js'\n\n/**\n * Deploy a Sanity application.\n *\n * @internal\n */\nexport async function deployApp(options: DeployAppOptions) {\n  const {cliConfig, exit, flags, output, sourceDir, workDir} = options\n\n  const organizationId = cliConfig.app?.organizationId\n  const appId = getAppId(cliConfig)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n  const installedSdkVersion = await readModuleVersion(sourceDir, '@sanity/sdk-react')\n\n  if (!installedSdkVersion) {\n    output.error(`Failed to find installed @sanity/sdk-react version`, {exit: 1})\n    return\n  }\n\n  if (!organizationId) {\n    output.error(NO_ORGANIZATION_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content...')\n\n  try {\n    let userApplication = await findUserApplicationForApp({\n      cliConfig,\n      organizationId,\n      output,\n    })\n\n    deployDebug(`User application found`, userApplication)\n\n    if (!userApplication) {\n      deployDebug(`No user application found. Creating a new one`)\n\n      userApplication = await createUserApplicationForApp(organizationId)\n      deployDebug(`User application created`, userApplication)\n    }\n\n    // Warn about missing app ID if auto updates are enabled\n    if (isAutoUpdating && !appId) {\n      warnAboutMissingAppId({appType: 'app', output})\n    }\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building app`)\n      await buildApp({\n        autoUpdatesEnabled: isAutoUpdating,\n        cliConfig,\n        exit,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n      return\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n    let manifest: AppManifest | undefined\n    try {\n      manifest = await extractAppManifest({flags, workDir})\n    } catch (err) {\n      const message = err instanceof Error ? err.message : String(err)\n      deployDebug('Error extracting app manifest', err)\n      output.warn(`Error extracting app manifest: ${message}`)\n    }\n\n    spin = spinner('Deploying...').start()\n    await createDeployment({\n      applicationId: userApplication.id,\n      isApp: true,\n      isAutoUpdating,\n      manifest,\n      tarball,\n      version: installedSdkVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\n🚀 ${chalk.bold('Success!')} Application deployed`)\n\n    if (!appId) {\n      output.log(`\\n════ ${chalk.bold('Next step:')} ════`)\n      output.log(\n        chalk.bold('\\nAdd the deployment.appId to your sanity.cli.js or sanity.cli.ts file:'),\n      )\n      output.log(`\n${chalk.dim(`app: {\n  // your application config here…\n}`)},\n${chalk.bold.green(`deployment: {\n  appId: '${userApplication.id}',\n}\\n`)}`)\n    }\n  } catch (error) {\n    spin.clear()\n    // Don't throw generic error if user cancels\n    if (error.name === 'ExitPromptError') {\n      output.error('Deployment cancelled by user', {exit: 1})\n      return\n    }\n    // If the error is a CLIError, we can just output the message & error options (if any), while ensuring we exit\n    if (error instanceof CLIError) {\n      const {message, ...errorOptions} = error\n      output.error(message, {...errorOptions, exit: 1})\n      return\n    }\n\n    deployDebug('Error deploying application', error)\n    output.error('Error deploying application', {exit: 1})\n  }\n}\n"],"names":["basename","dirname","createGzip","CLIError","chalk","spinner","pack","createDeployment","getAppId","NO_ORGANIZATION_ID","readModuleVersion","warnAboutMissingAppId","buildApp","shouldAutoUpdate","extractAppManifest","checkDir","createUserApplicationForApp","deployDebug","findUserApplicationForApp","deployApp","options","cliConfig","exit","flags","output","sourceDir","workDir","organizationId","app","appId","isAutoUpdating","installedSdkVersion","error","spin","userApplication","appType","shouldBuild","build","autoUpdatesEnabled","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","manifest","message","Error","String","warn","applicationId","id","isApp","version","log","bold","dim","green","clear","name","errorOptions"],"mappings":"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"}

package/dist/actions/dev/startStudioDevServer.js

@@ -3,6 +3,7 @@ import { chalk, confirm, logSymbols, spinner } from '@sanity/cli-core/ux';
 import semver from 'semver';
 import { startDevServer } from '../../server/devServer.js';
 import { gracefulServerDeath } from '../../server/gracefulServerDeath.js';
+import { getProjectById } from '../../services/projects.js';
 import { getAppId } from '../../util/appId.js';
 import { compareDependencyVersions } from '../../util/compareDependencyVersions.js';
 import { getPackageManagerChoice } from '../../util/packageManager/packageManagerChoice.js';
@@ -16,7 +17,7 @@ import { devDebug } from './devDebug.js';
 import { getCoreAppURL } from './getCoreAppUrl.js';
 import { getDevServerConfig } from './getDevServerConfig.js';
 export async function startStudioDevServer(options) {
-    const { apiClient, cliConfig, flags, output, workDir } = options;
+    const { cliConfig, flags, output, workDir } = options;
     const projectId = cliConfig?.api?.projectId;
     let organizationId;
     const loadInDashboard = flags['load-in-dashboard'];
@@ -103,14 +104,8 @@ export async function startStudioDevServer(options) {
                 exit: 1
             });
         }
-        const client = await apiClient({
-            apiVersion: '2025-08-25',
-            requireUser: true
-        });
         try {
-            const project = await client.request({
-                uri: `/projects/${projectId}`
-            });
+            const project = await getProjectById(projectId);
             organizationId = project.organizationId;
         } catch (error) {
             devDebug('Error getting organization id from project id', error);

package/dist/actions/dev/startStudioDevServer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/startStudioDevServer.ts"],"sourcesContent":["import {isInteractive} from '@sanity/cli-core'\nimport {chalk, confirm, logSymbols, spinner} from '@sanity/cli-core/ux'\nimport semver from 'semver'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {getAppId} from '../../util/appId.js'\nimport {compareDependencyVersions} from '../../util/compareDependencyVersions.js'\nimport {getPackageManagerChoice} from '../../util/packageManager/packageManagerChoice.js'\nimport {upgradePackages} from '../../util/packageManager/upgradePackages.js'\nimport {readModuleVersion} from '../../util/readModuleVersion.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {checkRequiredDependencies} from '../build/checkRequiredDependencies.js'\nimport {checkStudioDependencyVersions} from '../build/checkStudioDependencyVersions.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {devDebug} from './devDebug.js'\nimport {getCoreAppURL} from './getCoreAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\nimport {type DevActionOptions} from './types.js'\n\nexport async function startStudioDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {apiClient, cliConfig, flags, output, workDir} = options\n  const projectId = cliConfig?.api?.projectId\n  let organizationId: string | undefined\n\n  const loadInDashboard = flags['load-in-dashboard']\n\n  // Check studio dependency versions\n  await checkStudioDependencyVersions(workDir, output)\n\n  const {installedSanityVersion} = await checkRequiredDependencies(options)\n\n  // Check if auto-updates are enabled\n  const autoUpdatesEnabled = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (autoUpdatesEnabled) {\n    // Get the clean version without build metadata: https://semver.org/#spec-item-10\n    const cleanSanityVersion = semver.parse(installedSanityVersion)?.version\n    if (!cleanSanityVersion) {\n      throw new Error(`Failed to parse installed Sanity version: ${installedSanityVersion}`)\n    }\n\n    const sanityDependencies = [\n      {name: 'sanity', version: cleanSanityVersion},\n      {name: '@sanity/vision', version: cleanSanityVersion},\n    ]\n\n    output.log(`${logSymbols.info} Running with auto-updates enabled`)\n\n    // Check local versions against deployed versions\n    let result: Awaited<ReturnType<typeof compareDependencyVersions>> | undefined\n\n    const appId = getAppId(cliConfig)\n\n    try {\n      result = await compareDependencyVersions(sanityDependencies, workDir, {appId})\n    } catch (err) {\n      output.warn(`Failed to compare local versions against auto-updating versions: ${err}`)\n    }\n\n    if (!appId) {\n      warnAboutMissingAppId({\n        appType: 'studio',\n        output,\n        projectId,\n      })\n    }\n\n    // mismatch between local and auto-updating dependencies\n    if (result?.length) {\n      const message =\n        `The following local package versions are different from the versions currently served at runtime.\\n` +\n        `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\\n\\n` +\n        `${result.map((mod) => ` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\\n')}\\n\\n`\n\n      if (isInteractive()) {\n        const shouldUpgrade = await confirm({\n          default: true,\n          message: chalk.yellow(`${message}Do you want to upgrade local versions?`),\n        })\n        if (shouldUpgrade) {\n          await upgradePackages(\n            {\n              packageManager: (await getPackageManagerChoice(workDir, {interactive: false})).chosen,\n              packages: result.map((res) => [res.pkg, res.remote]),\n            },\n            {output, workDir},\n          )\n        }\n      } else {\n        // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.\n        output.log(chalk.yellow(message))\n      }\n    }\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  if (loadInDashboard) {\n    if (!projectId) {\n      output.error('Project Id is required to load in dashboard', {exit: 1})\n    }\n\n    const client = await apiClient({\n      apiVersion: '2025-08-25',\n      requireUser: true,\n    })\n\n    try {\n      const project = await client.request<{organizationId: string}>({\n        uri: `/projects/${projectId}`,\n      })\n      organizationId = project.organizationId\n    } catch (error) {\n      devDebug('Error getting organization id from project id', error)\n      output.error('Failed to get organization id from project id', {exit: 1})\n    }\n  }\n\n  try {\n    const startTime = Date.now()\n    const spin = spinner('Starting dev server').start()\n    const {close, server} = await startDevServer(config)\n\n    const {info: loggerInfo} = server.config.logger\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    if (loadInDashboard) {\n      spin.succeed()\n\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your studio in the Sanity dashboard here:`)\n      output.log(\n        chalk.blue(\n          chalk.underline(\n            getCoreAppURL({\n              httpHost,\n              httpPort: port,\n              organizationId: organizationId!,\n            }),\n          ),\n        ),\n      )\n    } else {\n      const startupDuration = Date.now() - startTime\n      const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`\n      const appType = 'Sanity Studio'\n\n      const viteVersion = await readModuleVersion(import.meta.url, 'vite')\n      spin.succeed()\n\n      loggerInfo(\n        `${appType} ` +\n          `using ${chalk.cyan(`vite@${viteVersion}`)} ` +\n          `ready in ${chalk.cyan(`${Math.ceil(startupDuration)}ms`)} ` +\n          `and running at ${chalk.cyan(url)}`,\n      )\n    }\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting studio dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["isInteractive","chalk","confirm","logSymbols","spinner","semver","startDevServer","gracefulServerDeath","getAppId","compareDependencyVersions","getPackageManagerChoice","upgradePackages","readModuleVersion","warnAboutMissingAppId","checkRequiredDependencies","checkStudioDependencyVersions","shouldAutoUpdate","devDebug","getCoreAppURL","getDevServerConfig","startStudioDevServer","options","apiClient","cliConfig","flags","output","workDir","projectId","api","organizationId","loadInDashboard","installedSanityVersion","autoUpdatesEnabled","cleanSanityVersion","parse","version","Error","sanityDependencies","name","log","info","result","appId","err","warn","appType","length","message","map","mod","pkg","installed","remote","join","shouldUpgrade","default","yellow","packageManager","interactive","chosen","packages","res","config","error","exit","client","apiVersion","requireUser","project","request","uri","startTime","Date","now","spin","start","close","server","loggerInfo","logger","port","httpHost","succeed","blue","underline","httpPort","startupDuration","url","basePath","viteVersion","cyan","Math","ceil"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/dev/startStudioDevServer.ts"],"sourcesContent":["import {isInteractive} from '@sanity/cli-core'\nimport {chalk, confirm, logSymbols, spinner} from '@sanity/cli-core/ux'\nimport semver from 'semver'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {getProjectById} from '../../services/projects.js'\nimport {getAppId} from '../../util/appId.js'\nimport {compareDependencyVersions} from '../../util/compareDependencyVersions.js'\nimport {getPackageManagerChoice} from '../../util/packageManager/packageManagerChoice.js'\nimport {upgradePackages} from '../../util/packageManager/upgradePackages.js'\nimport {readModuleVersion} from '../../util/readModuleVersion.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {checkRequiredDependencies} from '../build/checkRequiredDependencies.js'\nimport {checkStudioDependencyVersions} from '../build/checkStudioDependencyVersions.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {devDebug} from './devDebug.js'\nimport {getCoreAppURL} from './getCoreAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\nimport {type DevActionOptions} from './types.js'\n\nexport async function startStudioDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {cliConfig, flags, output, workDir} = options\n  const projectId = cliConfig?.api?.projectId\n  let organizationId: string | undefined\n\n  const loadInDashboard = flags['load-in-dashboard']\n\n  // Check studio dependency versions\n  await checkStudioDependencyVersions(workDir, output)\n\n  const {installedSanityVersion} = await checkRequiredDependencies(options)\n\n  // Check if auto-updates are enabled\n  const autoUpdatesEnabled = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (autoUpdatesEnabled) {\n    // Get the clean version without build metadata: https://semver.org/#spec-item-10\n    const cleanSanityVersion = semver.parse(installedSanityVersion)?.version\n    if (!cleanSanityVersion) {\n      throw new Error(`Failed to parse installed Sanity version: ${installedSanityVersion}`)\n    }\n\n    const sanityDependencies = [\n      {name: 'sanity', version: cleanSanityVersion},\n      {name: '@sanity/vision', version: cleanSanityVersion},\n    ]\n\n    output.log(`${logSymbols.info} Running with auto-updates enabled`)\n\n    // Check local versions against deployed versions\n    let result: Awaited<ReturnType<typeof compareDependencyVersions>> | undefined\n\n    const appId = getAppId(cliConfig)\n\n    try {\n      result = await compareDependencyVersions(sanityDependencies, workDir, {appId})\n    } catch (err) {\n      output.warn(`Failed to compare local versions against auto-updating versions: ${err}`)\n    }\n\n    if (!appId) {\n      warnAboutMissingAppId({\n        appType: 'studio',\n        output,\n        projectId,\n      })\n    }\n\n    // mismatch between local and auto-updating dependencies\n    if (result?.length) {\n      const message =\n        `The following local package versions are different from the versions currently served at runtime.\\n` +\n        `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\\n\\n` +\n        `${result.map((mod) => ` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\\n')}\\n\\n`\n\n      if (isInteractive()) {\n        const shouldUpgrade = await confirm({\n          default: true,\n          message: chalk.yellow(`${message}Do you want to upgrade local versions?`),\n        })\n        if (shouldUpgrade) {\n          await upgradePackages(\n            {\n              packageManager: (await getPackageManagerChoice(workDir, {interactive: false})).chosen,\n              packages: result.map((res) => [res.pkg, res.remote]),\n            },\n            {output, workDir},\n          )\n        }\n      } else {\n        // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.\n        output.log(chalk.yellow(message))\n      }\n    }\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  if (loadInDashboard) {\n    if (!projectId) {\n      output.error('Project Id is required to load in dashboard', {exit: 1})\n    }\n\n    try {\n      const project = await getProjectById(projectId!)\n      organizationId = project.organizationId!\n    } catch (error) {\n      devDebug('Error getting organization id from project id', error)\n      output.error('Failed to get organization id from project id', {exit: 1})\n    }\n  }\n\n  try {\n    const startTime = Date.now()\n    const spin = spinner('Starting dev server').start()\n    const {close, server} = await startDevServer(config)\n\n    const {info: loggerInfo} = server.config.logger\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    if (loadInDashboard) {\n      spin.succeed()\n\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your studio in the Sanity dashboard here:`)\n      output.log(\n        chalk.blue(\n          chalk.underline(\n            getCoreAppURL({\n              httpHost,\n              httpPort: port,\n              organizationId: organizationId!,\n            }),\n          ),\n        ),\n      )\n    } else {\n      const startupDuration = Date.now() - startTime\n      const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`\n      const appType = 'Sanity Studio'\n\n      const viteVersion = await readModuleVersion(import.meta.url, 'vite')\n      spin.succeed()\n\n      loggerInfo(\n        `${appType} ` +\n          `using ${chalk.cyan(`vite@${viteVersion}`)} ` +\n          `ready in ${chalk.cyan(`${Math.ceil(startupDuration)}ms`)} ` +\n          `and running at ${chalk.cyan(url)}`,\n      )\n    }\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting studio dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["isInteractive","chalk","confirm","logSymbols","spinner","semver","startDevServer","gracefulServerDeath","getProjectById","getAppId","compareDependencyVersions","getPackageManagerChoice","upgradePackages","readModuleVersion","warnAboutMissingAppId","checkRequiredDependencies","checkStudioDependencyVersions","shouldAutoUpdate","devDebug","getCoreAppURL","getDevServerConfig","startStudioDevServer","options","cliConfig","flags","output","workDir","projectId","api","organizationId","loadInDashboard","installedSanityVersion","autoUpdatesEnabled","cleanSanityVersion","parse","version","Error","sanityDependencies","name","log","info","result","appId","err","warn","appType","length","message","map","mod","pkg","installed","remote","join","shouldUpgrade","default","yellow","packageManager","interactive","chosen","packages","res","config","error","exit","project","startTime","Date","now","spin","start","close","server","loggerInfo","logger","port","httpHost","succeed","blue","underline","httpPort","startupDuration","url","basePath","viteVersion","cyan","Math","ceil"],"mappings":"AAAA,SAAQA,aAAa,QAAO,mBAAkB;AAC9C,SAAQC,KAAK,EAAEC,OAAO,EAAEC,UAAU,EAAEC,OAAO,QAAO,sBAAqB;AACvE,OAAOC,YAAY,SAAQ;AAE3B,SAAQC,cAAc,QAAO,4BAA2B;AACxD,SAAQC,mBAAmB,QAAO,sCAAqC;AACvE,SAAQC,cAAc,QAAO,6BAA4B;AACzD,SAAQC,QAAQ,QAAO,sBAAqB;AAC5C,SAAQC,yBAAyB,QAAO,0CAAyC;AACjF,SAAQC,uBAAuB,QAAO,oDAAmD;AACzF,SAAQC,eAAe,QAAO,+CAA8C;AAC5E,SAAQC,iBAAiB,QAAO,kCAAiC;AACjE,SAAQC,qBAAqB,QAAO,sCAAqC;AACzE,SAAQC,yBAAyB,QAAO,wCAAuC;AAC/E,SAAQC,6BAA6B,QAAO,4CAA2C;AACvF,SAAQC,gBAAgB,QAAO,+BAA8B;AAC7D,SAAQC,QAAQ,QAAO,gBAAe;AACtC,SAAQC,aAAa,QAAO,qBAAoB;AAChD,SAAQC,kBAAkB,QAAO,0BAAyB;AAG1D,OAAO,eAAeC,qBACpBC,OAAyB;IAEzB,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAEC,MAAM,EAAEC,OAAO,EAAC,GAAGJ;IAC5C,MAAMK,YAAYJ,WAAWK,KAAKD;IAClC,IAAIE;IAEJ,MAAMC,kBAAkBN,KAAK,CAAC,oBAAoB;IAElD,mCAAmC;IACnC,MAAMR,8BAA8BU,SAASD;IAE7C,MAAM,EAACM,sBAAsB,EAAC,GAAG,MAAMhB,0BAA0BO;IAEjE,oCAAoC;IACpC,MAAMU,qBAAqBf,iBAAiB;QAACM;QAAWC;QAAOC;IAAM;IAErE,IAAIO,oBAAoB;QACtB,iFAAiF;QACjF,MAAMC,qBAAqB5B,OAAO6B,KAAK,CAACH,yBAAyBI;QACjE,IAAI,CAACF,oBAAoB;YACvB,MAAM,IAAIG,MAAM,CAAC,0CAA0C,EAAEL,wBAAwB;QACvF;QAEA,MAAMM,qBAAqB;YACzB;gBAACC,MAAM;gBAAUH,SAASF;YAAkB;YAC5C;gBAACK,MAAM;gBAAkBH,SAASF;YAAkB;SACrD;QAEDR,OAAOc,GAAG,CAAC,GAAGpC,WAAWqC,IAAI,CAAC,kCAAkC,CAAC;QAEjE,iDAAiD;QACjD,IAAIC;QAEJ,MAAMC,QAAQjC,SAASc;QAEvB,IAAI;YACFkB,SAAS,MAAM/B,0BAA0B2B,oBAAoBX,SAAS;gBAACgB;YAAK;QAC9E,EAAE,OAAOC,KAAK;YACZlB,OAAOmB,IAAI,CAAC,CAAC,iEAAiE,EAAED,KAAK;QACvF;QAEA,IAAI,CAACD,OAAO;YACV5B,sBAAsB;gBACpB+B,SAAS;gBACTpB;gBACAE;YACF;QACF;QAEA,wDAAwD;QACxD,IAAIc,QAAQK,QAAQ;YAClB,MAAMC,UACJ,CAAC,mGAAmG,CAAC,GACrG,CAAC,qHAAqH,CAAC,GACvH,GAAGN,OAAOO,GAAG,CAAC,CAACC,MAAQ,CAAC,GAAG,EAAEA,IAAIC,GAAG,CAAC,iBAAiB,EAAED,IAAIE,SAAS,CAAC,mBAAmB,EAAEF,IAAIG,MAAM,CAAC,CAAC,CAAC,EAAEC,IAAI,CAAC,MAAM,IAAI,CAAC;YAE5H,IAAIrD,iBAAiB;gBACnB,MAAMsD,gBAAgB,MAAMpD,QAAQ;oBAClCqD,SAAS;oBACTR,SAAS9C,MAAMuD,MAAM,CAAC,GAAGT,QAAQ,sCAAsC,CAAC;gBAC1E;gBACA,IAAIO,eAAe;oBACjB,MAAM1C,gBACJ;wBACE6C,gBAAgB,AAAC,CAAA,MAAM9C,wBAAwBe,SAAS;4BAACgC,aAAa;wBAAK,EAAC,EAAGC,MAAM;wBACrFC,UAAUnB,OAAOO,GAAG,CAAC,CAACa,MAAQ;gCAACA,IAAIX,GAAG;gCAAEW,IAAIT,MAAM;6BAAC;oBACrD,GACA;wBAAC3B;wBAAQC;oBAAO;gBAEpB;YACF,OAAO;gBACL,4GAA4G;gBAC5GD,OAAOc,GAAG,CAACtC,MAAMuD,MAAM,CAACT;YAC1B;QACF;IACF;IAEA,MAAMe,SAAS1C,mBAAmB;QAACG;QAAWC;QAAOC;QAAQC;IAAO;IAEpE,IAAII,iBAAiB;QACnB,IAAI,CAACH,WAAW;YACdF,OAAOsC,KAAK,CAAC,+CAA+C;gBAACC,MAAM;YAAC;QACtE;QAEA,IAAI;YACF,MAAMC,UAAU,MAAMzD,eAAemB;YACrCE,iBAAiBoC,QAAQpC,cAAc;QACzC,EAAE,OAAOkC,OAAO;YACd7C,SAAS,iDAAiD6C;YAC1DtC,OAAOsC,KAAK,CAAC,iDAAiD;gBAACC,MAAM;YAAC;QACxE;IACF;IAEA,IAAI;QACF,MAAME,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,OAAOjE,QAAQ,uBAAuBkE,KAAK;QACjD,MAAM,EAACC,KAAK,EAAEC,MAAM,EAAC,GAAG,MAAMlE,eAAewD;QAE7C,MAAM,EAACtB,MAAMiC,UAAU,EAAC,GAAGD,OAAOV,MAAM,CAACY,MAAM;QAC/C,MAAM,EAACC,IAAI,EAAC,GAAGH,OAAOV,MAAM,CAACU,MAAM;QACnC,MAAMI,WAAWd,OAAOc,QAAQ,IAAI;QAEpC,IAAI9C,iBAAiB;YACnBuC,KAAKQ,OAAO;YAEZpD,OAAOc,GAAG,CAAC,CAAC,2BAA2B,EAAEoC,MAAM;YAC/ClD,OAAOc,GAAG,CAAC,CAAC,8CAA8C,CAAC;YAC3Dd,OAAOc,GAAG,CACRtC,MAAM6E,IAAI,CACR7E,MAAM8E,SAAS,CACb5D,cAAc;gBACZyD;gBACAI,UAAUL;gBACV9C,gBAAgBA;YAClB;QAIR,OAAO;YACL,MAAMoD,kBAAkBd,KAAKC,GAAG,KAAKF;YACrC,MAAMgB,MAAM,CAAC,OAAO,EAAEN,YAAY,YAAY,CAAC,EAAED,OAAOb,OAAOqB,QAAQ,EAAE;YACzE,MAAMtC,UAAU;YAEhB,MAAMuC,cAAc,MAAMvE,kBAAkB,YAAYqE,GAAG,EAAE;YAC7Db,KAAKQ,OAAO;YAEZJ,WACE,GAAG5B,QAAQ,CAAC,CAAC,GACX,CAAC,MAAM,EAAE5C,MAAMoF,IAAI,CAAC,CAAC,KAAK,EAAED,aAAa,EAAE,CAAC,CAAC,GAC7C,CAAC,SAAS,EAAEnF,MAAMoF,IAAI,CAAC,GAAGC,KAAKC,IAAI,CAACN,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC,GAC5D,CAAC,eAAe,EAAEhF,MAAMoF,IAAI,CAACH,MAAM;QAEzC;QAEA,OAAO;YAACX;QAAK;IACf,EAAE,OAAO5B,KAAK;QACZzB,SAAS,oCAAoCyB;QAC7C,MAAMpC,oBAAoB,OAAOuD,OAAOc,QAAQ,EAAEd,OAAOkB,QAAQ,EAAErC;IACrE;AACF"}

package/dist/actions/dev/types.d.ts

@@ -1,9 +1,7 @@
-import { type CliConfig, type GlobalCliClientOptions, type Output } from '@sanity/cli-core';
-import { type SanityClient } from '@sanity/client';
+import { type CliConfig, type Output } from '@sanity/cli-core';
 import { type DevCommand } from '../../commands/dev.js';
 export type DevFlags = DevCommand['flags'];
 export interface DevActionOptions {
-    apiClient: (args: GlobalCliClientOptions) => Promise<SanityClient>;
     cliConfig: CliConfig;
     flags: DevFlags;
     isApp: boolean;

package/dist/actions/dev/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/types.ts"],"sourcesContent":["import {type CliConfig, type GlobalCliClientOptions, type Output} from '@sanity/cli-core'\nimport {type SanityClient} from '@sanity/client'\n\nimport {type DevCommand} from '../../commands/dev.js'\n\nexport type DevFlags = DevCommand['flags']\n\nexport interface DevActionOptions {\n  apiClient: (args: GlobalCliClientOptions) => Promise<SanityClient>\n  cliConfig: CliConfig\n  flags: DevFlags\n  isApp: boolean\n  output: Output\n  workDir: string\n}\n"],"names":[],"mappings":"AAOA,WAOC"}
+{"version":3,"sources":["../../../src/actions/dev/types.ts"],"sourcesContent":["import {type CliConfig, type Output} from '@sanity/cli-core'\n\nimport {type DevCommand} from '../../commands/dev.js'\n\nexport type DevFlags = DevCommand['flags']\n\nexport interface DevActionOptions {\n  cliConfig: CliConfig\n  flags: DevFlags\n  isApp: boolean\n  output: Output\n  workDir: string\n}\n"],"names":[],"mappings":"AAMA,WAMC"}

package/dist/actions/documents/validate.d.ts

@@ -1,10 +1,8 @@
-import { type ClientConfig } from '@sanity/client';
 import { type ValidationMarker } from '@sanity/types';
 import { type ValidationWorkerChannel } from '../../threads/validateDocuments.js';
 import { type WorkerChannelReceiver } from '../../util/workerChannels.js';
 import { Level } from './types.js';
 interface ValidateDocumentsOptions<TReturn = unknown> {
-    clientConfig: ClientConfig;
     dataset?: string;
     level?: Level;
     maxCustomValidationConcurrency?: number;

package/dist/actions/documents/validate.js

@@ -1,8 +1,10 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Worker } from 'node:worker_threads';
+import { getGlobalCliClient } from '@sanity/cli-core';
 import { readPackageUp } from 'read-package-up';
 import { createReceiver } from '../../util/workerChannels.js';
+import { DOCUMENTS_API_VERSION } from './constants.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const defaultReporter = ({ dispose, stream })=>{
     async function* createValidationGenerator() {
@@ -21,7 +23,11 @@ const defaultReporter = ({ dispose, stream })=>{
     return createValidationGenerator();
 };
 export async function validateDocuments(options) {
-    const { clientConfig, dataset, level, maxCustomValidationConcurrency, maxFetchConcurrency, ndjsonFilePath, projectId, reporter = defaultReporter, workDir = process.cwd(), workspace } = options;
+    const { dataset, level, maxCustomValidationConcurrency, maxFetchConcurrency, ndjsonFilePath, projectId, reporter = defaultReporter, workDir = process.cwd(), workspace } = options;
+    const apiClient = await getGlobalCliClient({
+        apiVersion: DOCUMENTS_API_VERSION,
+        requireUser: true
+    });
     const rootPkgPath = (await readPackageUp({
         cwd: __dirname
     }))?.path;
@@ -29,6 +35,20 @@ export async function validateDocuments(options) {
         throw new Error('Could not find root directory for `sanity` package');
     }
     const workerPath = path.join(path.dirname(rootPkgPath), 'dist', 'threads', 'validateDocuments.js');
+    const clientConfig = {
+        ...apiClient.config(),
+        // we set this explictly to true because we pass in a token via the
+        // `clientConfiguration` object and also mock a browser environment in
+        // this worker which triggers the browser warning
+        ignoreBrowserTokenWarning: true,
+        // Removing from object so config can be serialized
+        // before sent to validation worker
+        requester: undefined,
+        // we set this explictly to true because the default client configuration
+        // from the CLI comes configured with `useProjectHostname: false` when
+        // `requireProject` is set to false
+        useProjectHostname: true
+    };
     const worker = new Worker(workerPath, {
         env: process.env,
         workerData: {

package/dist/actions/documents/validate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/documents/validate.ts"],"sourcesContent":["import path from 'node:path'\nimport {fileURLToPath} from 'node:url'\nimport {Worker} from 'node:worker_threads'\n\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\nimport {readPackageUp} from 'read-package-up'\n\nimport {\n  type ValidateDocumentsWorkerData,\n  type ValidationWorkerChannel,\n} from '../../threads/validateDocuments.js'\nimport {createReceiver, type WorkerChannelReceiver} from '../../util/workerChannels.js'\nimport {Level} from './types.js'\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url))\n\ninterface ValidateDocumentsOptions<TReturn = unknown> {\n  clientConfig: ClientConfig\n\n  dataset?: string // override\n  level?: Level\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string // override\n  reporter?: (worker: WorkerChannelReceiver<ValidationWorkerChannel>) => TReturn\n  studioHost?: string\n  workDir?: string\n  workspace?: string\n}\n\ninterface DocumentValidationResult {\n  documentId: string\n  documentType: string\n  level: ValidationMarker['level']\n  markers: ValidationMarker[]\n  revision: string\n}\n\nconst defaultReporter = ({dispose, stream}: WorkerChannelReceiver<ValidationWorkerChannel>) => {\n  async function* createValidationGenerator() {\n    for await (const {documentId, documentType, level, markers, revision} of stream.validation()) {\n      const result: DocumentValidationResult = {\n        documentId,\n        documentType,\n        level,\n        markers,\n        revision,\n      }\n\n      yield result\n    }\n\n    await dispose()\n  }\n\n  return createValidationGenerator()\n}\n\nexport function validateDocuments<TReturn>(\n  options: Required<Pick<ValidateDocumentsOptions<TReturn>, 'reporter'>> &\n    ValidateDocumentsOptions<TReturn>,\n): Promise<TReturn>\nexport function validateDocuments(\n  options: ValidateDocumentsOptions,\n): Promise<AsyncIterable<DocumentValidationResult>>\nexport async function validateDocuments(options: ValidateDocumentsOptions): Promise<unknown> {\n  const {\n    clientConfig,\n    dataset,\n    level,\n    maxCustomValidationConcurrency,\n    maxFetchConcurrency,\n    ndjsonFilePath,\n    projectId,\n    reporter = defaultReporter,\n    workDir = process.cwd(),\n    workspace,\n  } = options\n\n  const rootPkgPath = (await readPackageUp({cwd: __dirname}))?.path\n\n  if (!rootPkgPath) {\n    throw new Error('Could not find root directory for `sanity` package')\n  }\n\n  const workerPath = path.join(path.dirname(rootPkgPath), 'dist', 'threads', 'validateDocuments.js')\n\n  const worker = new Worker(workerPath, {\n    env: process.env,\n    workerData: {\n      // removes props in the config that make this object fail to serialize\n      clientConfig: structuredClone(clientConfig),\n      dataset,\n      level,\n      maxCustomValidationConcurrency,\n      maxFetchConcurrency,\n      ndjsonFilePath,\n      projectId,\n      studioHost: options.studioHost,\n      workDir,\n      workspace,\n    } satisfies ValidateDocumentsWorkerData,\n  })\n\n  return reporter(createReceiver<ValidationWorkerChannel>(worker))\n}\n"],"names":["path","fileURLToPath","Worker","readPackageUp","createReceiver","__dirname","dirname","url","defaultReporter","dispose","stream","createValidationGenerator","documentId","documentType","level","markers","revision","validation","result","validateDocuments","options","clientConfig","dataset","maxCustomValidationConcurrency","maxFetchConcurrency","ndjsonFilePath","projectId","reporter","workDir","process","cwd","workspace","rootPkgPath","Error","workerPath","join","worker","env","workerData","structuredClone","studioHost"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAC5B,SAAQC,aAAa,QAAO,WAAU;AACtC,SAAQC,MAAM,QAAO,sBAAqB;AAI1C,SAAQC,aAAa,QAAO,kBAAiB;AAM7C,SAAQC,cAAc,QAAmC,+BAA8B;AAGvF,MAAMC,YAAYL,KAAKM,OAAO,CAACL,cAAc,YAAYM,GAAG;AAyB5D,MAAMC,kBAAkB,CAAC,EAACC,OAAO,EAAEC,MAAM,EAAiD;IACxF,gBAAgBC;QACd,WAAW,MAAM,EAACC,UAAU,EAAEC,YAAY,EAAEC,KAAK,EAAEC,OAAO,EAAEC,QAAQ,EAAC,IAAIN,OAAOO,UAAU,GAAI;YAC5F,MAAMC,SAAmC;gBACvCN;gBACAC;gBACAC;gBACAC;gBACAC;YACF;YAEA,MAAME;QACR;QAEA,MAAMT;IACR;IAEA,OAAOE;AACT;AASA,OAAO,eAAeQ,kBAAkBC,OAAiC;IACvE,MAAM,EACJC,YAAY,EACZC,OAAO,EACPR,KAAK,EACLS,8BAA8B,EAC9BC,mBAAmB,EACnBC,cAAc,EACdC,SAAS,EACTC,WAAWnB,eAAe,EAC1BoB,UAAUC,QAAQC,GAAG,EAAE,EACvBC,SAAS,EACV,GAAGX;IAEJ,MAAMY,cAAe,CAAA,MAAM7B,cAAc;QAAC2B,KAAKzB;IAAS,EAAC,GAAIL;IAE7D,IAAI,CAACgC,aAAa;QAChB,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,aAAalC,KAAKmC,IAAI,CAACnC,KAAKM,OAAO,CAAC0B,cAAc,QAAQ,WAAW;IAE3E,MAAMI,SAAS,IAAIlC,OAAOgC,YAAY;QACpCG,KAAKR,QAAQQ,GAAG;QAChBC,YAAY;YACV,sEAAsE;YACtEjB,cAAckB,gBAAgBlB;YAC9BC;YACAR;YACAS;YACAC;YACAC;YACAC;YACAc,YAAYpB,QAAQoB,UAAU;YAC9BZ;YACAG;QACF;IACF;IAEA,OAAOJ,SAASvB,eAAwCgC;AAC1D"}
+{"version":3,"sources":["../../../src/actions/documents/validate.ts"],"sourcesContent":["import path from 'node:path'\nimport {fileURLToPath} from 'node:url'\nimport {Worker} from 'node:worker_threads'\n\nimport {getGlobalCliClient} from '@sanity/cli-core'\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\nimport {readPackageUp} from 'read-package-up'\n\nimport {\n  type ValidateDocumentsWorkerData,\n  type ValidationWorkerChannel,\n} from '../../threads/validateDocuments.js'\nimport {createReceiver, type WorkerChannelReceiver} from '../../util/workerChannels.js'\nimport {DOCUMENTS_API_VERSION} from './constants.js'\nimport {Level} from './types.js'\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url))\n\ninterface ValidateDocumentsOptions<TReturn = unknown> {\n  dataset?: string // override\n  level?: Level\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string // override\n  reporter?: (worker: WorkerChannelReceiver<ValidationWorkerChannel>) => TReturn\n  studioHost?: string\n  workDir?: string\n  workspace?: string\n}\n\ninterface DocumentValidationResult {\n  documentId: string\n  documentType: string\n  level: ValidationMarker['level']\n  markers: ValidationMarker[]\n  revision: string\n}\n\nconst defaultReporter = ({dispose, stream}: WorkerChannelReceiver<ValidationWorkerChannel>) => {\n  async function* createValidationGenerator() {\n    for await (const {documentId, documentType, level, markers, revision} of stream.validation()) {\n      const result: DocumentValidationResult = {\n        documentId,\n        documentType,\n        level,\n        markers,\n        revision,\n      }\n\n      yield result\n    }\n\n    await dispose()\n  }\n\n  return createValidationGenerator()\n}\n\nexport function validateDocuments<TReturn>(\n  options: Required<Pick<ValidateDocumentsOptions<TReturn>, 'reporter'>> &\n    ValidateDocumentsOptions<TReturn>,\n): Promise<TReturn>\nexport function validateDocuments(\n  options: ValidateDocumentsOptions,\n): Promise<AsyncIterable<DocumentValidationResult>>\nexport async function validateDocuments(options: ValidateDocumentsOptions): Promise<unknown> {\n  const {\n    dataset,\n    level,\n    maxCustomValidationConcurrency,\n    maxFetchConcurrency,\n    ndjsonFilePath,\n    projectId,\n    reporter = defaultReporter,\n    workDir = process.cwd(),\n    workspace,\n  } = options\n\n  const apiClient = await getGlobalCliClient({\n    apiVersion: DOCUMENTS_API_VERSION,\n    requireUser: true,\n  })\n\n  const rootPkgPath = (await readPackageUp({cwd: __dirname}))?.path\n\n  if (!rootPkgPath) {\n    throw new Error('Could not find root directory for `sanity` package')\n  }\n\n  const workerPath = path.join(path.dirname(rootPkgPath), 'dist', 'threads', 'validateDocuments.js')\n\n  const clientConfig: ClientConfig = {\n    ...apiClient.config(),\n    // we set this explictly to true because we pass in a token via the\n    // `clientConfiguration` object and also mock a browser environment in\n    // this worker which triggers the browser warning\n    ignoreBrowserTokenWarning: true,\n    // Removing from object so config can be serialized\n    // before sent to validation worker\n    requester: undefined,\n    // we set this explictly to true because the default client configuration\n    // from the CLI comes configured with `useProjectHostname: false` when\n    // `requireProject` is set to false\n    useProjectHostname: true,\n  }\n\n  const worker = new Worker(workerPath, {\n    env: process.env,\n    workerData: {\n      // removes props in the config that make this object fail to serialize\n      clientConfig: structuredClone(clientConfig),\n      dataset,\n      level,\n      maxCustomValidationConcurrency,\n      maxFetchConcurrency,\n      ndjsonFilePath,\n      projectId,\n      studioHost: options.studioHost,\n      workDir,\n      workspace,\n    } satisfies ValidateDocumentsWorkerData,\n  })\n\n  return reporter(createReceiver<ValidationWorkerChannel>(worker))\n}\n"],"names":["path","fileURLToPath","Worker","getGlobalCliClient","readPackageUp","createReceiver","DOCUMENTS_API_VERSION","__dirname","dirname","url","defaultReporter","dispose","stream","createValidationGenerator","documentId","documentType","level","markers","revision","validation","result","validateDocuments","options","dataset","maxCustomValidationConcurrency","maxFetchConcurrency","ndjsonFilePath","projectId","reporter","workDir","process","cwd","workspace","apiClient","apiVersion","requireUser","rootPkgPath","Error","workerPath","join","clientConfig","config","ignoreBrowserTokenWarning","requester","undefined","useProjectHostname","worker","env","workerData","structuredClone","studioHost"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAC5B,SAAQC,aAAa,QAAO,WAAU;AACtC,SAAQC,MAAM,QAAO,sBAAqB;AAE1C,SAAQC,kBAAkB,QAAO,mBAAkB;AAGnD,SAAQC,aAAa,QAAO,kBAAiB;AAM7C,SAAQC,cAAc,QAAmC,+BAA8B;AACvF,SAAQC,qBAAqB,QAAO,iBAAgB;AAGpD,MAAMC,YAAYP,KAAKQ,OAAO,CAACP,cAAc,YAAYQ,GAAG;AAuB5D,MAAMC,kBAAkB,CAAC,EAACC,OAAO,EAAEC,MAAM,EAAiD;IACxF,gBAAgBC;QACd,WAAW,MAAM,EAACC,UAAU,EAAEC,YAAY,EAAEC,KAAK,EAAEC,OAAO,EAAEC,QAAQ,EAAC,IAAIN,OAAOO,UAAU,GAAI;YAC5F,MAAMC,SAAmC;gBACvCN;gBACAC;gBACAC;gBACAC;gBACAC;YACF;YAEA,MAAME;QACR;QAEA,MAAMT;IACR;IAEA,OAAOE;AACT;AASA,OAAO,eAAeQ,kBAAkBC,OAAiC;IACvE,MAAM,EACJC,OAAO,EACPP,KAAK,EACLQ,8BAA8B,EAC9BC,mBAAmB,EACnBC,cAAc,EACdC,SAAS,EACTC,WAAWlB,eAAe,EAC1BmB,UAAUC,QAAQC,GAAG,EAAE,EACvBC,SAAS,EACV,GAAGV;IAEJ,MAAMW,YAAY,MAAM9B,mBAAmB;QACzC+B,YAAY5B;QACZ6B,aAAa;IACf;IAEA,MAAMC,cAAe,CAAA,MAAMhC,cAAc;QAAC2B,KAAKxB;IAAS,EAAC,GAAIP;IAE7D,IAAI,CAACoC,aAAa;QAChB,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,aAAatC,KAAKuC,IAAI,CAACvC,KAAKQ,OAAO,CAAC4B,cAAc,QAAQ,WAAW;IAE3E,MAAMI,eAA6B;QACjC,GAAGP,UAAUQ,MAAM,EAAE;QACrB,mEAAmE;QACnE,sEAAsE;QACtE,iDAAiD;QACjDC,2BAA2B;QAC3B,mDAAmD;QACnD,mCAAmC;QACnCC,WAAWC;QACX,yEAAyE;QACzE,sEAAsE;QACtE,mCAAmC;QACnCC,oBAAoB;IACtB;IAEA,MAAMC,SAAS,IAAI5C,OAAOoC,YAAY;QACpCS,KAAKjB,QAAQiB,GAAG;QAChBC,YAAY;YACV,sEAAsE;YACtER,cAAcS,gBAAgBT;YAC9BjB;YACAP;YACAQ;YACAC;YACAC;YACAC;YACAuB,YAAY5B,QAAQ4B,UAAU;YAC9BrB;YACAG;QACF;IACF;IAEA,OAAOJ,SAASvB,eAAwCyC;AAC1D"}