@sanity/cli 6.5.3 → 6.7.0

package/dist/commands/schemas/deploy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/commands/schemas/deploy.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {Flags} from '@oclif/core'\nimport {CLIError} from '@oclif/core/errors'\nimport {SanityCommand} from '@sanity/cli-core'\n\nimport {deploySchemas} from '../../actions/schema/deploySchemas.js'\nimport {formatSchemaValidation} from '../../actions/schema/formatSchemaValidation.js'\nimport {schemasDeployDebug} from '../../actions/schema/utils/debug.js'\nimport {SchemaExtractionError} from '../../actions/schema/utils/SchemaExtractionError.js'\nimport {parseTag} from '../../actions/schema/utils/schemaStoreValidation.js'\n\nconst description = `\nDeploy schema documents into workspace datasets.\n\nNote: This command is experimental and subject to change.\n\nRegenerates a manifest file by default. To re-use an existing manifest, use --no-extract-manifest.\n`.trim()\n\nexport class DeploySchemaCommand extends SanityCommand<typeof DeploySchemaCommand> {\n  static override description = description\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Deploy all workspace schemas',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --workspace default',\n      description: 'Deploy the schema for only the workspace \"default\"',\n    },\n  ]\n\n  static override flags = {\n    'extract-manifest': Flags.boolean({\n      allowNo: true,\n      default: true,\n      description: 'Regenerate manifest before deploying (use --no-extract-manifest to skip)',\n    }),\n    'manifest-dir': Flags.directory({\n      default: './dist/static',\n      description: 'Directory containing manifest file',\n      helpValue: '<directory>',\n    }),\n    tag: Flags.string({\n      description: 'Add a tag suffix to the schema id',\n      helpValue: '<tag>',\n      parse: parseTag,\n    }),\n    verbose: Flags.boolean({\n      default: false,\n      description: 'Print detailed information during deployment',\n    }),\n    workspace: Flags.string({\n      description: 'The name of the workspace to deploy a schema for',\n      helpValue: '<name>',\n      parse: async (input) => {\n        if (!input) throw new CLIError('workspace argument cannot be empty if specified', {exit: 1})\n        return input\n      },\n    }),\n  }\n\n  static override hiddenAliases: string[] = ['schema:deploy']\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(DeploySchemaCommand)\n    const {tag, workspace} = flags\n\n    try {\n      const workDir = (await this.getProjectRoot()).directory\n\n      await deploySchemas({\n        tag,\n        verbose: flags['verbose'],\n        workDir,\n        workspaceName: workspace,\n      })\n\n      this.log(\n        `${styleText('gray', '↳ List deployed schemas with:')} ${styleText('cyan', 'sanity schema list')}`,\n      )\n    } catch (error) {\n      if (\n        error instanceof SchemaExtractionError &&\n        error.validation &&\n        error.validation.length > 0\n      ) {\n        this.output.log(formatSchemaValidation(error.validation))\n        this.exit(1)\n      }\n\n      schemasDeployDebug('Failed to deploy schemas', error)\n      const errorMessage = error instanceof Error ? error.message : String(error)\n      this.error(`Failed to deploy schemas:\\n${errorMessage}`, {exit: 1})\n    }\n  }\n}\n"],"names":["styleText","Flags","CLIError","SanityCommand","deploySchemas","formatSchemaValidation","schemasDeployDebug","SchemaExtractionError","parseTag","description","trim","DeploySchemaCommand","examples","command","flags","boolean","allowNo","default","directory","helpValue","tag","string","parse","verbose","workspace","input","exit","hiddenAliases","run","workDir","getProjectRoot","workspaceName","log","error","validation","length","output","errorMessage","Error","message","String"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,KAAK,QAAO,cAAa;AACjC,SAAQC,QAAQ,QAAO,qBAAoB;AAC3C,SAAQC,aAAa,QAAO,mBAAkB;AAE9C,SAAQC,aAAa,QAAO,wCAAuC;AACnE,SAAQC,sBAAsB,QAAO,iDAAgD;AACrF,SAAQC,kBAAkB,QAAO,sCAAqC;AACtE,SAAQC,qBAAqB,QAAO,sDAAqD;AACzF,SAAQC,QAAQ,QAAO,sDAAqD;AAE5E,MAAMC,cAAc,CAAC;;;;;;AAMrB,CAAC,CAACC,IAAI;AAEN,OAAO,MAAMC,4BAA4BR;IACvC,OAAgBM,cAAcA,YAAW;IAEzC,OAAgBG,WAAW;QACzB;YACEC,SAAS;YACTJ,aAAa;QACf;QACA;YACEI,SAAS;YACTJ,aAAa;QACf;KACD,CAAA;IAED,OAAgBK,QAAQ;QACtB,oBAAoBb,MAAMc,OAAO,CAAC;YAChCC,SAAS;YACTC,SAAS;YACTR,aAAa;QACf;QACA,gBAAgBR,MAAMiB,SAAS,CAAC;YAC9BD,SAAS;YACTR,aAAa;YACbU,WAAW;QACb;QACAC,KAAKnB,MAAMoB,MAAM,CAAC;YAChBZ,aAAa;YACbU,WAAW;YACXG,OAAOd;QACT;QACAe,SAAStB,MAAMc,OAAO,CAAC;YACrBE,SAAS;YACTR,aAAa;QACf;QACAe,WAAWvB,MAAMoB,MAAM,CAAC;YACtBZ,aAAa;YACbU,WAAW;YACXG,OAAO,OAAOG;gBACZ,IAAI,CAACA,OAAO,MAAM,IAAIvB,SAAS,mDAAmD;oBAACwB,MAAM;gBAAC;gBAC1F,OAAOD;YACT;QACF;IACF,EAAC;IAED,OAAgBE,gBAA0B;QAAC;KAAgB,CAAA;IAE3D,MAAaC,MAAqB;QAChC,MAAM,EAACd,KAAK,EAAC,GAAG,MAAM,IAAI,CAACQ,KAAK,CAACX;QACjC,MAAM,EAACS,GAAG,EAAEI,SAAS,EAAC,GAAGV;QAEzB,IAAI;YACF,MAAMe,UAAU,AAAC,CAAA,MAAM,IAAI,CAACC,cAAc,EAAC,EAAGZ,SAAS;YAEvD,MAAMd,cAAc;gBAClBgB;gBACAG,SAAST,KAAK,CAAC,UAAU;gBACzBe;gBACAE,eAAeP;YACjB;YAEA,IAAI,CAACQ,GAAG,CACN,GAAGhC,UAAU,QAAQ,iCAAiC,CAAC,EAAEA,UAAU,QAAQ,uBAAuB;QAEtG,EAAE,OAAOiC,OAAO;YACd,IACEA,iBAAiB1B,yBACjB0B,MAAMC,UAAU,IAChBD,MAAMC,UAAU,CAACC,MAAM,GAAG,GAC1B;gBACA,IAAI,CAACC,MAAM,CAACJ,GAAG,CAAC3B,uBAAuB4B,MAAMC,UAAU;gBACvD,IAAI,CAACR,IAAI,CAAC;YACZ;YAEApB,mBAAmB,4BAA4B2B;YAC/C,MAAMI,eAAeJ,iBAAiBK,QAAQL,MAAMM,OAAO,GAAGC,OAAOP;YACrE,IAAI,CAACA,KAAK,CAAC,CAAC,2BAA2B,EAAEI,cAAc,EAAE;gBAACX,MAAM;YAAC;QACnE;IACF;AACF"}
+{"version":3,"sources":["../../../src/commands/schemas/deploy.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {Flags} from '@oclif/core'\nimport {CLIError} from '@oclif/core/errors'\nimport {formatSchemaValidation, SchemaExtractionError} from '@sanity/cli-build/_internal/extract'\nimport {SanityCommand} from '@sanity/cli-core'\n\nimport {deploySchemas} from '../../actions/schema/deploySchemas.js'\nimport {schemasDeployDebug} from '../../actions/schema/utils/debug.js'\nimport {parseTag} from '../../actions/schema/utils/schemaStoreValidation.js'\n\nconst description = `\nDeploy schema documents into workspace datasets.\n\nNote: This command is experimental and subject to change.\n\nRegenerates a manifest file by default. To re-use an existing manifest, use --no-extract-manifest.\n`.trim()\n\nexport class DeploySchemaCommand extends SanityCommand<typeof DeploySchemaCommand> {\n  static override description = description\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Deploy all workspace schemas',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --workspace default',\n      description: 'Deploy the schema for only the workspace \"default\"',\n    },\n  ]\n\n  static override flags = {\n    'extract-manifest': Flags.boolean({\n      allowNo: true,\n      default: true,\n      description: 'Regenerate manifest before deploying (use --no-extract-manifest to skip)',\n    }),\n    'manifest-dir': Flags.directory({\n      default: './dist/static',\n      description: 'Directory containing manifest file',\n      helpValue: '<directory>',\n    }),\n    tag: Flags.string({\n      description: 'Add a tag suffix to the schema id',\n      helpValue: '<tag>',\n      parse: parseTag,\n    }),\n    verbose: Flags.boolean({\n      default: false,\n      description: 'Print detailed information during deployment',\n    }),\n    workspace: Flags.string({\n      description: 'The name of the workspace to deploy a schema for',\n      helpValue: '<name>',\n      parse: async (input) => {\n        if (!input) throw new CLIError('workspace argument cannot be empty if specified', {exit: 1})\n        return input\n      },\n    }),\n  }\n\n  static override hiddenAliases: string[] = ['schema:deploy']\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(DeploySchemaCommand)\n    const {tag, workspace} = flags\n\n    try {\n      const workDir = (await this.getProjectRoot()).directory\n\n      await deploySchemas({\n        tag,\n        verbose: flags['verbose'],\n        workDir,\n        workspaceName: workspace,\n      })\n\n      this.log(\n        `${styleText('gray', '↳ List deployed schemas with:')} ${styleText('cyan', 'sanity schema list')}`,\n      )\n    } catch (error) {\n      if (\n        error instanceof SchemaExtractionError &&\n        error.validation &&\n        error.validation.length > 0\n      ) {\n        this.output.log(formatSchemaValidation(error.validation))\n        this.exit(1)\n      }\n\n      schemasDeployDebug('Failed to deploy schemas', error)\n      const errorMessage = error instanceof Error ? error.message : String(error)\n      this.error(`Failed to deploy schemas:\\n${errorMessage}`, {exit: 1})\n    }\n  }\n}\n"],"names":["styleText","Flags","CLIError","formatSchemaValidation","SchemaExtractionError","SanityCommand","deploySchemas","schemasDeployDebug","parseTag","description","trim","DeploySchemaCommand","examples","command","flags","boolean","allowNo","default","directory","helpValue","tag","string","parse","verbose","workspace","input","exit","hiddenAliases","run","workDir","getProjectRoot","workspaceName","log","error","validation","length","output","errorMessage","Error","message","String"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,KAAK,QAAO,cAAa;AACjC,SAAQC,QAAQ,QAAO,qBAAoB;AAC3C,SAAQC,sBAAsB,EAAEC,qBAAqB,QAAO,sCAAqC;AACjG,SAAQC,aAAa,QAAO,mBAAkB;AAE9C,SAAQC,aAAa,QAAO,wCAAuC;AACnE,SAAQC,kBAAkB,QAAO,sCAAqC;AACtE,SAAQC,QAAQ,QAAO,sDAAqD;AAE5E,MAAMC,cAAc,CAAC;;;;;;AAMrB,CAAC,CAACC,IAAI;AAEN,OAAO,MAAMC,4BAA4BN;IACvC,OAAgBI,cAAcA,YAAW;IAEzC,OAAgBG,WAAW;QACzB;YACEC,SAAS;YACTJ,aAAa;QACf;QACA;YACEI,SAAS;YACTJ,aAAa;QACf;KACD,CAAA;IAED,OAAgBK,QAAQ;QACtB,oBAAoBb,MAAMc,OAAO,CAAC;YAChCC,SAAS;YACTC,SAAS;YACTR,aAAa;QACf;QACA,gBAAgBR,MAAMiB,SAAS,CAAC;YAC9BD,SAAS;YACTR,aAAa;YACbU,WAAW;QACb;QACAC,KAAKnB,MAAMoB,MAAM,CAAC;YAChBZ,aAAa;YACbU,WAAW;YACXG,OAAOd;QACT;QACAe,SAAStB,MAAMc,OAAO,CAAC;YACrBE,SAAS;YACTR,aAAa;QACf;QACAe,WAAWvB,MAAMoB,MAAM,CAAC;YACtBZ,aAAa;YACbU,WAAW;YACXG,OAAO,OAAOG;gBACZ,IAAI,CAACA,OAAO,MAAM,IAAIvB,SAAS,mDAAmD;oBAACwB,MAAM;gBAAC;gBAC1F,OAAOD;YACT;QACF;IACF,EAAC;IAED,OAAgBE,gBAA0B;QAAC;KAAgB,CAAA;IAE3D,MAAaC,MAAqB;QAChC,MAAM,EAACd,KAAK,EAAC,GAAG,MAAM,IAAI,CAACQ,KAAK,CAACX;QACjC,MAAM,EAACS,GAAG,EAAEI,SAAS,EAAC,GAAGV;QAEzB,IAAI;YACF,MAAMe,UAAU,AAAC,CAAA,MAAM,IAAI,CAACC,cAAc,EAAC,EAAGZ,SAAS;YAEvD,MAAMZ,cAAc;gBAClBc;gBACAG,SAAST,KAAK,CAAC,UAAU;gBACzBe;gBACAE,eAAeP;YACjB;YAEA,IAAI,CAACQ,GAAG,CACN,GAAGhC,UAAU,QAAQ,iCAAiC,CAAC,EAAEA,UAAU,QAAQ,uBAAuB;QAEtG,EAAE,OAAOiC,OAAO;YACd,IACEA,iBAAiB7B,yBACjB6B,MAAMC,UAAU,IAChBD,MAAMC,UAAU,CAACC,MAAM,GAAG,GAC1B;gBACA,IAAI,CAACC,MAAM,CAACJ,GAAG,CAAC7B,uBAAuB8B,MAAMC,UAAU;gBACvD,IAAI,CAACR,IAAI,CAAC;YACZ;YAEAnB,mBAAmB,4BAA4B0B;YAC/C,MAAMI,eAAeJ,iBAAiBK,QAAQL,MAAMM,OAAO,GAAGC,OAAOP;YACrE,IAAI,CAACA,KAAK,CAAC,CAAC,2BAA2B,EAAEI,cAAc,EAAE;gBAACX,MAAM;YAAC;QACnE;IACF;AACF"}

package/dist/exports/_internal.d.ts

@@ -100,7 +100,8 @@ declare type ManifestValidationRule = {
 };
 
 /**
- * The params for the `getStudioEnvironmentVariables` function that gets Studio focused environment variables.
+ * The params for the `getStudioEnvironmentVariables` and `getAppEnvironmentVariables` function
+ * that gets Studio/App-focused environment variables.
  *
  * @public
  */

package/dist/exports/_internal.js

@@ -1,4 +1,4 @@
-export { getStudioEnvironmentVariables } from '../actions/build/getStudioEnvironmentVariables.js';
+export { getStudioEnvironmentVariables } from '../actions/build/getEnvironmentVariables.js';
 export { extractManifestSchemaTypes } from '../actions/manifest/extractWorkspaceManifest.js';
 
 //# sourceMappingURL=_internal.js.map

package/dist/exports/_internal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/_internal.ts"],"sourcesContent":["export {getStudioEnvironmentVariables} from '../actions/build/getStudioEnvironmentVariables.js'\nexport type {StudioEnvVariablesOptions} from '../actions/build/getStudioEnvironmentVariables.js'\nexport {extractManifestSchemaTypes} from '../actions/manifest/extractWorkspaceManifest.js'\n"],"names":["getStudioEnvironmentVariables","extractManifestSchemaTypes"],"mappings":"AAAA,SAAQA,6BAA6B,QAAO,oDAAmD;AAE/F,SAAQC,0BAA0B,QAAO,kDAAiD"}
+{"version":3,"sources":["../../src/exports/_internal.ts"],"sourcesContent":["export {getStudioEnvironmentVariables} from '../actions/build/getEnvironmentVariables.js'\nexport type {StudioEnvVariablesOptions} from '../actions/build/getEnvironmentVariables.js'\nexport {extractManifestSchemaTypes} from '../actions/manifest/extractWorkspaceManifest.js'\n"],"names":["getStudioEnvironmentVariables","extractManifestSchemaTypes"],"mappings":"AAAA,SAAQA,6BAA6B,QAAO,8CAA6C;AAEzF,SAAQC,0BAA0B,QAAO,kDAAiD"}

package/dist/server/devServer.js

@@ -1,7 +1,9 @@
+import { extendViteConfigWithUserConfig, getViteConfig, writeSanityRuntime } from '@sanity/cli-build/_internal/build';
+import { getCliTelemetry } from '@sanity/cli-core';
 import { createServer } from 'vite';
-import { extendViteConfigWithUserConfig, getViteConfig } from '../actions/build/getViteConfig.js';
-import { writeSanityRuntime } from '../actions/build/writeSanityRuntime.js';
+import { getAppEnvironmentVariables, getStudioEnvironmentVariables } from '../actions/build/getEnvironmentVariables.js';
 import { serverDebug } from './serverDebug.js';
+import { sanityTypegenPlugin } from './vite/plugin-typegen.js';
 const debug = serverDebug.extend('dev');
 export async function startDevServer(options) {
     const { appTitle, basePath, cwd, entry, httpHost, httpPort, isApp, reactCompiler, reactStrictMode, schemaExtraction, typegen, vite: extendViteConfig } = options;
@@ -17,9 +19,29 @@ export async function startDevServer(options) {
     });
     debug('Resolving vite config');
     const mode = 'development';
+    function getEnvironmentVariables() {
+        return isApp ? getAppEnvironmentVariables({
+            jsonEncode: true,
+            prefix: 'process.env.'
+        }) : getStudioEnvironmentVariables({
+            jsonEncode: true,
+            prefix: 'process.env.'
+        });
+    }
     let viteConfig = await getViteConfig({
+        additionalPlugins: [
+            // Add typegen when enabled
+            ...typegen?.enabled ? [
+                sanityTypegenPlugin({
+                    config: typegen,
+                    telemetryLogger: getCliTelemetry(),
+                    workDir: cwd
+                })
+            ] : []
+        ],
         basePath,
         cwd,
+        getEnvironmentVariables,
         isApp,
         mode: 'development',
         reactCompiler,
@@ -27,8 +49,7 @@ export async function startDevServer(options) {
         server: {
             host: httpHost,
             port: httpPort
-        },
-        typegen
+        }
     });
     // Extend Vite configuration with user-provided config
     if (extendViteConfig) {

package/dist/server/devServer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/server/devServer.ts"],"sourcesContent":["import {CliConfig, type UserViteConfig} from '@sanity/cli-core'\nimport {type PluginOptions as ReactCompilerConfig} from 'babel-plugin-react-compiler'\nimport {type FSWatcher} from 'chokidar'\nimport {createServer, type InlineConfig, type ViteDevServer} from 'vite'\n\nimport {extendViteConfigWithUserConfig, getViteConfig} from '../actions/build/getViteConfig.js'\nimport {writeSanityRuntime} from '../actions/build/writeSanityRuntime.js'\nimport {serverDebug} from './serverDebug.js'\n\nconst debug = serverDebug.extend('dev')\n\nexport interface DevServerOptions {\n  basePath: string\n  cwd: string\n  httpPort: number\n\n  reactCompiler: ReactCompilerConfig | undefined\n  reactStrictMode: boolean\n\n  staticPath: string\n\n  appTitle?: string\n  entry?: string\n  httpHost?: string\n  isApp?: boolean\n  projectName?: string\n  schemaExtraction?: CliConfig['schemaExtraction']\n  typegen?: CliConfig['typegen']\n  vite?: UserViteConfig\n}\n\ninterface DevServer {\n  close(): Promise<void>\n  server: ViteDevServer\n\n  watcher?: FSWatcher\n}\n\nexport async function startDevServer(options: DevServerOptions): Promise<DevServer> {\n  const {\n    appTitle,\n    basePath,\n    cwd,\n    entry,\n    httpHost,\n    httpPort,\n    isApp,\n    reactCompiler,\n    reactStrictMode,\n    schemaExtraction,\n    typegen,\n    vite: extendViteConfig,\n  } = options\n\n  debug('Writing Sanity runtime files')\n  const watcher = await writeSanityRuntime({\n    appTitle,\n    basePath,\n    cwd,\n    entry,\n    isApp,\n    reactStrictMode,\n    watch: true,\n  })\n\n  debug('Resolving vite config')\n  const mode = 'development'\n\n  let viteConfig: InlineConfig = await getViteConfig({\n    basePath,\n    cwd,\n    isApp,\n    mode: 'development',\n    reactCompiler,\n    schemaExtraction,\n    server: {host: httpHost, port: httpPort},\n    typegen,\n  })\n\n  // Extend Vite configuration with user-provided config\n  if (extendViteConfig) {\n    viteConfig = await extendViteConfigWithUserConfig(\n      {command: 'serve', mode},\n      viteConfig,\n      extendViteConfig,\n    )\n  }\n\n  debug('Creating vite server')\n  const server = await createServer(viteConfig)\n\n  debug('Listening on specified port')\n  await server.listen()\n\n  return {\n    close: async () => {\n      if (watcher) {\n        await watcher.close()\n      }\n      await server.close()\n    },\n    server,\n    watcher,\n  }\n}\n"],"names":["createServer","extendViteConfigWithUserConfig","getViteConfig","writeSanityRuntime","serverDebug","debug","extend","startDevServer","options","appTitle","basePath","cwd","entry","httpHost","httpPort","isApp","reactCompiler","reactStrictMode","schemaExtraction","typegen","vite","extendViteConfig","watcher","watch","mode","viteConfig","server","host","port","command","listen","close"],"mappings":"AAGA,SAAQA,YAAY,QAA8C,OAAM;AAExE,SAAQC,8BAA8B,EAAEC,aAAa,QAAO,oCAAmC;AAC/F,SAAQC,kBAAkB,QAAO,yCAAwC;AACzE,SAAQC,WAAW,QAAO,mBAAkB;AAE5C,MAAMC,QAAQD,YAAYE,MAAM,CAAC;AA6BjC,OAAO,eAAeC,eAAeC,OAAyB;IAC5D,MAAM,EACJC,QAAQ,EACRC,QAAQ,EACRC,GAAG,EACHC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,aAAa,EACbC,eAAe,EACfC,gBAAgB,EAChBC,OAAO,EACPC,MAAMC,gBAAgB,EACvB,GAAGb;IAEJH,MAAM;IACN,MAAMiB,UAAU,MAAMnB,mBAAmB;QACvCM;QACAC;QACAC;QACAC;QACAG;QACAE;QACAM,OAAO;IACT;IAEAlB,MAAM;IACN,MAAMmB,OAAO;IAEb,IAAIC,aAA2B,MAAMvB,cAAc;QACjDQ;QACAC;QACAI;QACAS,MAAM;QACNR;QACAE;QACAQ,QAAQ;YAACC,MAAMd;YAAUe,MAAMd;QAAQ;QACvCK;IACF;IAEA,sDAAsD;IACtD,IAAIE,kBAAkB;QACpBI,aAAa,MAAMxB,+BACjB;YAAC4B,SAAS;YAASL;QAAI,GACvBC,YACAJ;IAEJ;IAEAhB,MAAM;IACN,MAAMqB,SAAS,MAAM1B,aAAayB;IAElCpB,MAAM;IACN,MAAMqB,OAAOI,MAAM;IAEnB,OAAO;QACLC,OAAO;YACL,IAAIT,SAAS;gBACX,MAAMA,QAAQS,KAAK;YACrB;YACA,MAAML,OAAOK,KAAK;QACpB;QACAL;QACAJ;IACF;AACF"}
+{"version":3,"sources":["../../src/server/devServer.ts"],"sourcesContent":["import {\n  extendViteConfigWithUserConfig,\n  getViteConfig,\n  writeSanityRuntime,\n} from '@sanity/cli-build/_internal/build'\nimport {CliConfig, getCliTelemetry, type UserViteConfig} from '@sanity/cli-core'\nimport {type PluginOptions as ReactCompilerConfig} from 'babel-plugin-react-compiler'\nimport {type FSWatcher} from 'chokidar'\nimport {createServer, type InlineConfig, type ViteDevServer} from 'vite'\n\nimport {\n  getAppEnvironmentVariables,\n  getStudioEnvironmentVariables,\n} from '../actions/build/getEnvironmentVariables.js'\nimport {serverDebug} from './serverDebug.js'\nimport {sanityTypegenPlugin} from './vite/plugin-typegen.js'\n\nconst debug = serverDebug.extend('dev')\n\nexport interface DevServerOptions {\n  basePath: string\n  cwd: string\n  httpPort: number\n\n  reactCompiler: ReactCompilerConfig | undefined\n  reactStrictMode: boolean\n\n  staticPath: string\n\n  appTitle?: string\n  entry?: string\n  httpHost?: string\n  isApp?: boolean\n  projectName?: string\n  schemaExtraction?: CliConfig['schemaExtraction']\n  typegen?: CliConfig['typegen']\n  vite?: UserViteConfig\n}\n\ninterface DevServer {\n  close(): Promise<void>\n  server: ViteDevServer\n\n  watcher?: FSWatcher\n}\n\nexport async function startDevServer(options: DevServerOptions): Promise<DevServer> {\n  const {\n    appTitle,\n    basePath,\n    cwd,\n    entry,\n    httpHost,\n    httpPort,\n    isApp,\n    reactCompiler,\n    reactStrictMode,\n    schemaExtraction,\n    typegen,\n    vite: extendViteConfig,\n  } = options\n\n  debug('Writing Sanity runtime files')\n  const watcher = await writeSanityRuntime({\n    appTitle,\n    basePath,\n    cwd,\n    entry,\n    isApp,\n    reactStrictMode,\n    watch: true,\n  })\n\n  debug('Resolving vite config')\n  const mode = 'development'\n\n  function getEnvironmentVariables() {\n    return isApp\n      ? getAppEnvironmentVariables({jsonEncode: true, prefix: 'process.env.'})\n      : getStudioEnvironmentVariables({jsonEncode: true, prefix: 'process.env.'})\n  }\n\n  let viteConfig: InlineConfig = await getViteConfig({\n    additionalPlugins: [\n      // Add typegen when enabled\n      ...(typegen?.enabled\n        ? [\n            sanityTypegenPlugin({\n              config: typegen,\n              telemetryLogger: getCliTelemetry(),\n              workDir: cwd,\n            }),\n          ]\n        : []),\n    ],\n    basePath,\n    cwd,\n    getEnvironmentVariables,\n    isApp,\n    mode: 'development',\n    reactCompiler,\n    schemaExtraction,\n    server: {host: httpHost, port: httpPort},\n  })\n\n  // Extend Vite configuration with user-provided config\n  if (extendViteConfig) {\n    viteConfig = await extendViteConfigWithUserConfig(\n      {command: 'serve', mode},\n      viteConfig,\n      extendViteConfig,\n    )\n  }\n\n  debug('Creating vite server')\n  const server = await createServer(viteConfig)\n\n  debug('Listening on specified port')\n  await server.listen()\n\n  return {\n    close: async () => {\n      if (watcher) {\n        await watcher.close()\n      }\n      await server.close()\n    },\n    server,\n    watcher,\n  }\n}\n"],"names":["extendViteConfigWithUserConfig","getViteConfig","writeSanityRuntime","getCliTelemetry","createServer","getAppEnvironmentVariables","getStudioEnvironmentVariables","serverDebug","sanityTypegenPlugin","debug","extend","startDevServer","options","appTitle","basePath","cwd","entry","httpHost","httpPort","isApp","reactCompiler","reactStrictMode","schemaExtraction","typegen","vite","extendViteConfig","watcher","watch","mode","getEnvironmentVariables","jsonEncode","prefix","viteConfig","additionalPlugins","enabled","config","telemetryLogger","workDir","server","host","port","command","listen","close"],"mappings":"AAAA,SACEA,8BAA8B,EAC9BC,aAAa,EACbC,kBAAkB,QACb,oCAAmC;AAC1C,SAAmBC,eAAe,QAA4B,mBAAkB;AAGhF,SAAQC,YAAY,QAA8C,OAAM;AAExE,SACEC,0BAA0B,EAC1BC,6BAA6B,QACxB,8CAA6C;AACpD,SAAQC,WAAW,QAAO,mBAAkB;AAC5C,SAAQC,mBAAmB,QAAO,2BAA0B;AAE5D,MAAMC,QAAQF,YAAYG,MAAM,CAAC;AA6BjC,OAAO,eAAeC,eAAeC,OAAyB;IAC5D,MAAM,EACJC,QAAQ,EACRC,QAAQ,EACRC,GAAG,EACHC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,aAAa,EACbC,eAAe,EACfC,gBAAgB,EAChBC,OAAO,EACPC,MAAMC,gBAAgB,EACvB,GAAGb;IAEJH,MAAM;IACN,MAAMiB,UAAU,MAAMxB,mBAAmB;QACvCW;QACAC;QACAC;QACAC;QACAG;QACAE;QACAM,OAAO;IACT;IAEAlB,MAAM;IACN,MAAMmB,OAAO;IAEb,SAASC;QACP,OAAOV,QACHd,2BAA2B;YAACyB,YAAY;YAAMC,QAAQ;QAAc,KACpEzB,8BAA8B;YAACwB,YAAY;YAAMC,QAAQ;QAAc;IAC7E;IAEA,IAAIC,aAA2B,MAAM/B,cAAc;QACjDgC,mBAAmB;YACjB,2BAA2B;eACvBV,SAASW,UACT;gBACE1B,oBAAoB;oBAClB2B,QAAQZ;oBACRa,iBAAiBjC;oBACjBkC,SAAStB;gBACX;aACD,GACD,EAAE;SACP;QACDD;QACAC;QACAc;QACAV;QACAS,MAAM;QACNR;QACAE;QACAgB,QAAQ;YAACC,MAAMtB;YAAUuB,MAAMtB;QAAQ;IACzC;IAEA,sDAAsD;IACtD,IAAIO,kBAAkB;QACpBO,aAAa,MAAMhC,+BACjB;YAACyC,SAAS;YAASb;QAAI,GACvBI,YACAP;IAEJ;IAEAhB,MAAM;IACN,MAAM6B,SAAS,MAAMlC,aAAa4B;IAElCvB,MAAM;IACN,MAAM6B,OAAOI,MAAM;IAEnB,OAAO;QACLC,OAAO;YACL,IAAIjB,SAAS;gBACX,MAAMA,QAAQiB,KAAK;YACrB;YACA,MAAML,OAAOK,KAAK;QACpB;QACAL;QACAZ;IACF;AACF"}

package/dist/server/previewServer.js

@@ -1,9 +1,9 @@
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { styleText } from 'node:util';
+import { extendViteConfigWithUserConfig } from '@sanity/cli-build/_internal/build';
 import { getLocalPackageVersion } from '@sanity/cli-core';
 import { preview } from 'vite';
-import { extendViteConfigWithUserConfig } from '../actions/build/getViteConfig.js';
 import { serverDebug } from './serverDebug.js';
 import { sanityBasePathRedirectPlugin } from './vite/plugin-sanity-basepath-redirect.js';
 const debug = serverDebug.extend('preview');

package/dist/server/previewServer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/server/previewServer.ts"],"sourcesContent":["import {readFile} from 'node:fs/promises'\nimport path from 'node:path'\nimport {styleText} from 'node:util'\n\nimport {getLocalPackageVersion, type UserViteConfig} from '@sanity/cli-core'\nimport {type InlineConfig, preview} from 'vite'\n\nimport {extendViteConfigWithUserConfig} from '../actions/build/getViteConfig.js'\nimport {serverDebug} from './serverDebug.js'\nimport {sanityBasePathRedirectPlugin} from './vite/plugin-sanity-basepath-redirect.js'\n\nconst debug = serverDebug.extend('preview')\n\n/**\n * @internal\n */\nexport interface PreviewServer {\n  close(): Promise<void>\n  urls: {local: string[]; network: string[]}\n}\n\ninterface PreviewServerOptions {\n  cwd: string\n  httpPort: number\n\n  root: string\n\n  workDir: string\n\n  httpHost?: string\n  isApp?: boolean\n  vite?: UserViteConfig\n}\n\n/**\n * Starts a Vite preview server for the given build output directory\n *\n * @param options - Preview server options\n * @returns A promise that resolves to the started preview server\n * @internal\n */\nexport async function startPreviewServer(options: PreviewServerOptions): Promise<PreviewServer> {\n  const {httpHost, httpPort, isApp, root, vite: extendViteConfig, workDir} = options\n  const startTime = Date.now()\n\n  const indexPath = path.join(root, 'index.html')\n  let basePath: string | undefined\n  try {\n    const index = await readFile(indexPath, 'utf8')\n    basePath = tryResolveBasePathFromIndex(index)\n  } catch (err: unknown) {\n    if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {\n      const error = new Error(`Could not find a production build in the '${root}' directory.`)\n      error.name = 'BUILD_NOT_FOUND'\n      throw error\n    }\n\n    throw err\n  }\n\n  const mode = 'production'\n  let previewConfig: InlineConfig = {\n    base: basePath || '/',\n    // Needed for vite to not serve `root/dist`\n    build: {\n      outDir: root,\n    },\n    configFile: false,\n    mode,\n    plugins: [sanityBasePathRedirectPlugin(basePath)],\n    preview: {\n      host: httpHost,\n      port: httpPort,\n      strictPort: true,\n    },\n    root: workDir,\n  }\n\n  // Extend Vite configuration with user-provided config\n  if (extendViteConfig) {\n    previewConfig = await extendViteConfigWithUserConfig(\n      {command: 'serve', mode},\n      previewConfig,\n      extendViteConfig,\n    )\n  }\n\n  debug('Creating vite server')\n  const server = await preview(previewConfig)\n  const warn = server.config.logger.warn\n  const info = server.config.logger.info\n  const url = server.resolvedUrls!.local[0]\n\n  if (basePath === undefined) {\n    warn('Could not determine base path from index.html, using \"/\" as default')\n  } else if (basePath && basePath !== '/') {\n    info(`Using resolved base path from static build: ${styleText('cyan', basePath)}`)\n  }\n\n  const startupDuration = Date.now() - startTime\n\n  const viteVersion = await getLocalPackageVersion('vite', import.meta.url)\n\n  info(\n    `Sanity ${isApp ? 'application' : 'Studio'} ` +\n      `using ${styleText('cyan', `vite@${viteVersion}`)} ` +\n      `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` +\n      `and running at ${styleText('cyan', url)} (production preview mode)`,\n  )\n\n  return {\n    close: () =>\n      new Promise((resolve, reject) =>\n        server.httpServer.close((err) => (err ? reject(err) : resolve())),\n      ),\n    urls: server.resolvedUrls!,\n  }\n}\n\nfunction tryResolveBasePathFromIndex(index: string): string | undefined {\n  // <script ... src=\"/some-base-path/static/sanity-a3cc3d86.js\"></script>\n  const basePath = index.match(/<script[^>]+src=\"(.*?)\\/static\\/sanity-/)?.[1]\n\n  // We _expect_ to be able to find the base path. If we can't, we should warn.\n  // Note that we're checking for `undefined` here, since an empty string is a\n  // valid base path.\n  if (basePath === undefined) {\n    return undefined\n  }\n\n  // In the case of an empty base path, we still want to return `/` to indicate\n  // that we _found_ the basepath - it just happens to be empty. Eg:\n  // <script ... src = \"/static/sanity-a3cc3d86.js\"></script>\n  // Which differs from not being able to find the script tag at all, in which\n  // case we'll want to show a warning to indicate that it is an abnormality.\n  return basePath === '' ? '/' : basePath\n}\n"],"names":["readFile","path","styleText","getLocalPackageVersion","preview","extendViteConfigWithUserConfig","serverDebug","sanityBasePathRedirectPlugin","debug","extend","startPreviewServer","options","httpHost","httpPort","isApp","root","vite","extendViteConfig","workDir","startTime","Date","now","indexPath","join","basePath","index","tryResolveBasePathFromIndex","err","Error","code","error","name","mode","previewConfig","base","build","outDir","configFile","plugins","host","port","strictPort","command","server","warn","config","logger","info","url","resolvedUrls","local","undefined","startupDuration","viteVersion","Math","ceil","close","Promise","resolve","reject","httpServer","urls","match"],"mappings":"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"}
+{"version":3,"sources":["../../src/server/previewServer.ts"],"sourcesContent":["import {readFile} from 'node:fs/promises'\nimport path from 'node:path'\nimport {styleText} from 'node:util'\n\nimport {extendViteConfigWithUserConfig} from '@sanity/cli-build/_internal/build'\nimport {getLocalPackageVersion, type UserViteConfig} from '@sanity/cli-core'\nimport {type InlineConfig, preview} from 'vite'\n\nimport {serverDebug} from './serverDebug.js'\nimport {sanityBasePathRedirectPlugin} from './vite/plugin-sanity-basepath-redirect.js'\n\nconst debug = serverDebug.extend('preview')\n\n/**\n * @internal\n */\nexport interface PreviewServer {\n  close(): Promise<void>\n  urls: {local: string[]; network: string[]}\n}\n\ninterface PreviewServerOptions {\n  cwd: string\n  httpPort: number\n\n  root: string\n\n  workDir: string\n\n  httpHost?: string\n  isApp?: boolean\n  vite?: UserViteConfig\n}\n\n/**\n * Starts a Vite preview server for the given build output directory\n *\n * @param options - Preview server options\n * @returns A promise that resolves to the started preview server\n * @internal\n */\nexport async function startPreviewServer(options: PreviewServerOptions): Promise<PreviewServer> {\n  const {httpHost, httpPort, isApp, root, vite: extendViteConfig, workDir} = options\n  const startTime = Date.now()\n\n  const indexPath = path.join(root, 'index.html')\n  let basePath: string | undefined\n  try {\n    const index = await readFile(indexPath, 'utf8')\n    basePath = tryResolveBasePathFromIndex(index)\n  } catch (err: unknown) {\n    if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {\n      const error = new Error(`Could not find a production build in the '${root}' directory.`)\n      error.name = 'BUILD_NOT_FOUND'\n      throw error\n    }\n\n    throw err\n  }\n\n  const mode = 'production'\n  let previewConfig: InlineConfig = {\n    base: basePath || '/',\n    // Needed for vite to not serve `root/dist`\n    build: {\n      outDir: root,\n    },\n    configFile: false,\n    mode,\n    plugins: [sanityBasePathRedirectPlugin(basePath)],\n    preview: {\n      host: httpHost,\n      port: httpPort,\n      strictPort: true,\n    },\n    root: workDir,\n  }\n\n  // Extend Vite configuration with user-provided config\n  if (extendViteConfig) {\n    previewConfig = await extendViteConfigWithUserConfig(\n      {command: 'serve', mode},\n      previewConfig,\n      extendViteConfig,\n    )\n  }\n\n  debug('Creating vite server')\n  const server = await preview(previewConfig)\n  const warn = server.config.logger.warn\n  const info = server.config.logger.info\n  const url = server.resolvedUrls!.local[0]\n\n  if (basePath === undefined) {\n    warn('Could not determine base path from index.html, using \"/\" as default')\n  } else if (basePath && basePath !== '/') {\n    info(`Using resolved base path from static build: ${styleText('cyan', basePath)}`)\n  }\n\n  const startupDuration = Date.now() - startTime\n\n  const viteVersion = await getLocalPackageVersion('vite', import.meta.url)\n\n  info(\n    `Sanity ${isApp ? 'application' : 'Studio'} ` +\n      `using ${styleText('cyan', `vite@${viteVersion}`)} ` +\n      `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` +\n      `and running at ${styleText('cyan', url)} (production preview mode)`,\n  )\n\n  return {\n    close: () =>\n      new Promise((resolve, reject) =>\n        server.httpServer.close((err) => (err ? reject(err) : resolve())),\n      ),\n    urls: server.resolvedUrls!,\n  }\n}\n\nfunction tryResolveBasePathFromIndex(index: string): string | undefined {\n  // <script ... src=\"/some-base-path/static/sanity-a3cc3d86.js\"></script>\n  const basePath = index.match(/<script[^>]+src=\"(.*?)\\/static\\/sanity-/)?.[1]\n\n  // We _expect_ to be able to find the base path. If we can't, we should warn.\n  // Note that we're checking for `undefined` here, since an empty string is a\n  // valid base path.\n  if (basePath === undefined) {\n    return undefined\n  }\n\n  // In the case of an empty base path, we still want to return `/` to indicate\n  // that we _found_ the basepath - it just happens to be empty. Eg:\n  // <script ... src = \"/static/sanity-a3cc3d86.js\"></script>\n  // Which differs from not being able to find the script tag at all, in which\n  // case we'll want to show a warning to indicate that it is an abnormality.\n  return basePath === '' ? '/' : basePath\n}\n"],"names":["readFile","path","styleText","extendViteConfigWithUserConfig","getLocalPackageVersion","preview","serverDebug","sanityBasePathRedirectPlugin","debug","extend","startPreviewServer","options","httpHost","httpPort","isApp","root","vite","extendViteConfig","workDir","startTime","Date","now","indexPath","join","basePath","index","tryResolveBasePathFromIndex","err","Error","code","error","name","mode","previewConfig","base","build","outDir","configFile","plugins","host","port","strictPort","command","server","warn","config","logger","info","url","resolvedUrls","local","undefined","startupDuration","viteVersion","Math","ceil","close","Promise","resolve","reject","httpServer","urls","match"],"mappings":"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"}

package/dist/services/mcp.js

@@ -1,6 +1,6 @@
 import { getGlobalCliClient, subdebug } from '@sanity/cli-core';
 import { isHttpError } from '@sanity/client';
-export const MCP_API_VERSION = '2025-12-09';
+const MCP_API_VERSION = '2025-12-09';
 export const MCP_SERVER_URL = 'https://mcp.sanity.io';
 export const MCP_JOURNEY_API_VERSION = 'v2024-02-23';
 const debug = subdebug('mcp:service');

package/dist/services/mcp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/mcp.ts"],"sourcesContent":["import {getGlobalCliClient, subdebug} from '@sanity/cli-core'\nimport {isHttpError} from '@sanity/client'\n\nexport const MCP_API_VERSION = '2025-12-09'\nexport const MCP_SERVER_URL = 'https://mcp.sanity.io'\nexport const MCP_JOURNEY_API_VERSION = 'v2024-02-23'\n\nconst debug = subdebug('mcp:service')\n\ninterface PostInitPromptResponse {\n  message?: string\n}\n\n/**\n * Create a child token for MCP usage\n * This token is tied to the parent CLI token and will be invalidated\n * when the parent token is invalidated (e.g., on logout)\n *\n * @returns The MCP token string\n * @internal\n */\nexport async function createMCPToken(): Promise<string> {\n  const client = await getGlobalCliClient({\n    apiVersion: MCP_API_VERSION,\n    requireUser: true,\n  })\n\n  const sessionResponse = await client.request<{id: string; sid: string}>({\n    body: {\n      sourceId: 'sanity-mcp',\n      withStamp: false,\n    },\n    method: 'POST',\n    uri: '/auth/session/create',\n  })\n\n  const tokenResponse = await client.request<{label: string; token: string}>({\n    method: 'GET',\n    query: {sid: sessionResponse.sid},\n    uri: '/auth/fetch',\n  })\n\n  return tokenResponse.token\n}\n\n/**\n * Validate an MCP token by checking it against the Sanity API.\n *\n * MCP tokens are standard Sanity session tokens (`sk…`), so we validate\n * by calling `/users/me` on `api.sanity.io`. A 200 means the token is\n * alive; a 401/403 means it is dead and the caller should prompt for\n * re-configuration.\n *\n * Transient errors (5xx, network failures, timeouts) are rethrown so the\n * caller can decide how to handle them — typically by assuming the token\n * is still valid rather than falsely marking it as expired.\n *\n * We intentionally do NOT probe `mcp.sanity.io` because the MCP server\n * lets invalid bearer tokens through for protocol-compatibility reasons,\n * which causes the CLI to falsely treat dead tokens as valid.\n *\n * @internal\n */\nexport async function validateMCPToken(token: string): Promise<boolean> {\n  const client = await getGlobalCliClient({\n    apiVersion: MCP_API_VERSION,\n    requireUser: false,\n    token,\n  })\n\n  try {\n    await client.request({timeout: 2500, uri: '/users/me'})\n    return true\n  } catch (err) {\n    // 401/403 definitively mean \"dead token\"\n    if (isHttpError(err) && (err.statusCode === 401 || err.statusCode === 403)) {\n      debug('MCP token validation failed with %d', err.statusCode)\n      return false\n    }\n\n    // Everything else (5xx, network errors, timeouts) is rethrown so the\n    // caller can decide — typically assumes valid rather than forcing re-auth.\n    throw err\n  }\n}\n\n/**\n * Fetches the post-init MCP prompt from the Journey API and interpolates editor names.\n * Falls back to a hardcoded default if the API call fails, times out, or returns empty.\n * Text wrapped in **markers** will be formatted with cyan color.\n */\nexport async function getPostInitPrompt() {\n  const client = await getGlobalCliClient({apiVersion: MCP_JOURNEY_API_VERSION, requireUser: false})\n  return await client.request<PostInitPromptResponse | null>({\n    method: 'GET',\n    timeout: 1000,\n    uri: '/journey/mcp/post-init-prompt',\n  })\n}\n"],"names":["getGlobalCliClient","subdebug","isHttpError","MCP_API_VERSION","MCP_SERVER_URL","MCP_JOURNEY_API_VERSION","debug","createMCPToken","client","apiVersion","requireUser","sessionResponse","request","body","sourceId","withStamp","method","uri","tokenResponse","query","sid","token","validateMCPToken","timeout","err","statusCode","getPostInitPrompt"],"mappings":"AAAA,SAAQA,kBAAkB,EAAEC,QAAQ,QAAO,mBAAkB;AAC7D,SAAQC,WAAW,QAAO,iBAAgB;AAE1C,OAAO,MAAMC,kBAAkB,aAAY;AAC3C,OAAO,MAAMC,iBAAiB,wBAAuB;AACrD,OAAO,MAAMC,0BAA0B,cAAa;AAEpD,MAAMC,QAAQL,SAAS;AAMvB;;;;;;;CAOC,GACD,OAAO,eAAeM;IACpB,MAAMC,SAAS,MAAMR,mBAAmB;QACtCS,YAAYN;QACZO,aAAa;IACf;IAEA,MAAMC,kBAAkB,MAAMH,OAAOI,OAAO,CAA4B;QACtEC,MAAM;YACJC,UAAU;YACVC,WAAW;QACb;QACAC,QAAQ;QACRC,KAAK;IACP;IAEA,MAAMC,gBAAgB,MAAMV,OAAOI,OAAO,CAAiC;QACzEI,QAAQ;QACRG,OAAO;YAACC,KAAKT,gBAAgBS,GAAG;QAAA;QAChCH,KAAK;IACP;IAEA,OAAOC,cAAcG,KAAK;AAC5B;AAEA;;;;;;;;;;;;;;;;;CAiBC,GACD,OAAO,eAAeC,iBAAiBD,KAAa;IAClD,MAAMb,SAAS,MAAMR,mBAAmB;QACtCS,YAAYN;QACZO,aAAa;QACbW;IACF;IAEA,IAAI;QACF,MAAMb,OAAOI,OAAO,CAAC;YAACW,SAAS;YAAMN,KAAK;QAAW;QACrD,OAAO;IACT,EAAE,OAAOO,KAAK;QACZ,yCAAyC;QACzC,IAAItB,YAAYsB,QAASA,CAAAA,IAAIC,UAAU,KAAK,OAAOD,IAAIC,UAAU,KAAK,GAAE,GAAI;YAC1EnB,MAAM,uCAAuCkB,IAAIC,UAAU;YAC3D,OAAO;QACT;QAEA,qEAAqE;QACrE,2EAA2E;QAC3E,MAAMD;IACR;AACF;AAEA;;;;CAIC,GACD,OAAO,eAAeE;IACpB,MAAMlB,SAAS,MAAMR,mBAAmB;QAACS,YAAYJ;QAAyBK,aAAa;IAAK;IAChG,OAAO,MAAMF,OAAOI,OAAO,CAAgC;QACzDI,QAAQ;QACRO,SAAS;QACTN,KAAK;IACP;AACF"}
+{"version":3,"sources":["../../src/services/mcp.ts"],"sourcesContent":["import {getGlobalCliClient, subdebug} from '@sanity/cli-core'\nimport {isHttpError} from '@sanity/client'\n\nconst MCP_API_VERSION = '2025-12-09'\nexport const MCP_SERVER_URL = 'https://mcp.sanity.io'\nexport const MCP_JOURNEY_API_VERSION = 'v2024-02-23'\n\nconst debug = subdebug('mcp:service')\n\ninterface PostInitPromptResponse {\n  message?: string\n}\n\n/**\n * Create a child token for MCP usage\n * This token is tied to the parent CLI token and will be invalidated\n * when the parent token is invalidated (e.g., on logout)\n *\n * @returns The MCP token string\n * @internal\n */\nexport async function createMCPToken(): Promise<string> {\n  const client = await getGlobalCliClient({\n    apiVersion: MCP_API_VERSION,\n    requireUser: true,\n  })\n\n  const sessionResponse = await client.request<{id: string; sid: string}>({\n    body: {\n      sourceId: 'sanity-mcp',\n      withStamp: false,\n    },\n    method: 'POST',\n    uri: '/auth/session/create',\n  })\n\n  const tokenResponse = await client.request<{label: string; token: string}>({\n    method: 'GET',\n    query: {sid: sessionResponse.sid},\n    uri: '/auth/fetch',\n  })\n\n  return tokenResponse.token\n}\n\n/**\n * Validate an MCP token by checking it against the Sanity API.\n *\n * MCP tokens are standard Sanity session tokens (`sk…`), so we validate\n * by calling `/users/me` on `api.sanity.io`. A 200 means the token is\n * alive; a 401/403 means it is dead and the caller should prompt for\n * re-configuration.\n *\n * Transient errors (5xx, network failures, timeouts) are rethrown so the\n * caller can decide how to handle them — typically by assuming the token\n * is still valid rather than falsely marking it as expired.\n *\n * We intentionally do NOT probe `mcp.sanity.io` because the MCP server\n * lets invalid bearer tokens through for protocol-compatibility reasons,\n * which causes the CLI to falsely treat dead tokens as valid.\n *\n * @internal\n */\nexport async function validateMCPToken(token: string): Promise<boolean> {\n  const client = await getGlobalCliClient({\n    apiVersion: MCP_API_VERSION,\n    requireUser: false,\n    token,\n  })\n\n  try {\n    await client.request({timeout: 2500, uri: '/users/me'})\n    return true\n  } catch (err) {\n    // 401/403 definitively mean \"dead token\"\n    if (isHttpError(err) && (err.statusCode === 401 || err.statusCode === 403)) {\n      debug('MCP token validation failed with %d', err.statusCode)\n      return false\n    }\n\n    // Everything else (5xx, network errors, timeouts) is rethrown so the\n    // caller can decide — typically assumes valid rather than forcing re-auth.\n    throw err\n  }\n}\n\n/**\n * Fetches the post-init MCP prompt from the Journey API and interpolates editor names.\n * Falls back to a hardcoded default if the API call fails, times out, or returns empty.\n * Text wrapped in **markers** will be formatted with cyan color.\n */\nexport async function getPostInitPrompt() {\n  const client = await getGlobalCliClient({apiVersion: MCP_JOURNEY_API_VERSION, requireUser: false})\n  return await client.request<PostInitPromptResponse | null>({\n    method: 'GET',\n    timeout: 1000,\n    uri: '/journey/mcp/post-init-prompt',\n  })\n}\n"],"names":["getGlobalCliClient","subdebug","isHttpError","MCP_API_VERSION","MCP_SERVER_URL","MCP_JOURNEY_API_VERSION","debug","createMCPToken","client","apiVersion","requireUser","sessionResponse","request","body","sourceId","withStamp","method","uri","tokenResponse","query","sid","token","validateMCPToken","timeout","err","statusCode","getPostInitPrompt"],"mappings":"AAAA,SAAQA,kBAAkB,EAAEC,QAAQ,QAAO,mBAAkB;AAC7D,SAAQC,WAAW,QAAO,iBAAgB;AAE1C,MAAMC,kBAAkB;AACxB,OAAO,MAAMC,iBAAiB,wBAAuB;AACrD,OAAO,MAAMC,0BAA0B,cAAa;AAEpD,MAAMC,QAAQL,SAAS;AAMvB;;;;;;;CAOC,GACD,OAAO,eAAeM;IACpB,MAAMC,SAAS,MAAMR,mBAAmB;QACtCS,YAAYN;QACZO,aAAa;IACf;IAEA,MAAMC,kBAAkB,MAAMH,OAAOI,OAAO,CAA4B;QACtEC,MAAM;YACJC,UAAU;YACVC,WAAW;QACb;QACAC,QAAQ;QACRC,KAAK;IACP;IAEA,MAAMC,gBAAgB,MAAMV,OAAOI,OAAO,CAAiC;QACzEI,QAAQ;QACRG,OAAO;YAACC,KAAKT,gBAAgBS,GAAG;QAAA;QAChCH,KAAK;IACP;IAEA,OAAOC,cAAcG,KAAK;AAC5B;AAEA;;;;;;;;;;;;;;;;;CAiBC,GACD,OAAO,eAAeC,iBAAiBD,KAAa;IAClD,MAAMb,SAAS,MAAMR,mBAAmB;QACtCS,YAAYN;QACZO,aAAa;QACbW;IACF;IAEA,IAAI;QACF,MAAMb,OAAOI,OAAO,CAAC;YAACW,SAAS;YAAMN,KAAK;QAAW;QACrD,OAAO;IACT,EAAE,OAAOO,KAAK;QACZ,yCAAyC;QACzC,IAAItB,YAAYsB,QAASA,CAAAA,IAAIC,UAAU,KAAK,OAAOD,IAAIC,UAAU,KAAK,GAAE,GAAI;YAC1EnB,MAAM,uCAAuCkB,IAAIC,UAAU;YAC3D,OAAO;QACT;QAEA,qEAAqE;QACrE,2EAA2E;QAC3E,MAAMD;IACR;AACF;AAEA;;;;CAIC,GACD,OAAO,eAAeE;IACpB,MAAMlB,SAAS,MAAMR,mBAAmB;QAACS,YAAYJ;QAAyBK,aAAa;IAAK;IAChG,OAAO,MAAMF,OAAOI,OAAO,CAAgC;QACzDI,QAAQ;QACRO,SAAS;QACTN,KAAK;IACP;AACF"}

package/dist/telemetry/init.telemetry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/telemetry/init.telemetry.ts"],"sourcesContent":["import {defineTrace} from '@sanity/telemetry'\n\nimport {type EditorName} from '../actions/mcp/editorConfigs.js'\n\ninterface StartStep {\n  flags: Record<string, boolean | number | string | undefined>\n  step: 'start'\n}\n\ninterface LoginStep {\n  step: 'login'\n\n  alreadyLoggedIn?: boolean\n}\n\ninterface FetchJourneyConfigStep {\n  datasetName: string\n  displayName: string\n  isFirstProject: boolean\n  projectId: string\n  step: 'fetchJourneyConfig'\n}\n\ninterface CreateOrSelectProjectStep {\n  projectId: string\n  selectedOption: 'create' | 'none' | 'select'\n  step: 'createOrSelectProject'\n}\n\ninterface CreateOrSelectDatasetStep {\n  datasetName: string\n  selectedOption: 'create' | 'none' | 'select'\n  step: 'createOrSelectDataset'\n\n  visibility?: 'private' | 'public'\n}\n\ninterface UseDefaultPlanCoupon {\n  selectedOption: 'no' | 'yes'\n  step: 'useDefaultPlanCoupon'\n\n  coupon?: string\n}\n\ninterface UseDefaultPlanId {\n  selectedOption: 'no' | 'yes'\n  step: 'useDefaultPlanId'\n\n  planId?: string\n}\n\ninterface UseDetectedFrameworkStep {\n  selectedOption: 'no' | 'yes'\n  step: 'useDetectedFramework'\n\n  detectedFramework?: string\n}\n\ninterface UseTypeScriptStep {\n  selectedOption: 'no' | 'yes'\n  step: 'useTypeScript'\n}\n\ninterface SelectTemplateStep {\n  selectedOption: string\n  step: 'selectProjectTemplate'\n}\ninterface ImportTemplateDatasetStep {\n  selectedOption: 'no' | 'yes'\n  step: 'importTemplateDataset'\n}\n\ninterface SendCommunityInviteStep {\n  selectedOption: 'no' | 'yes'\n  step: 'sendCommunityInvite'\n}\n\ninterface SelectPackageManagerStep {\n  selectedOption: string\n  step: 'selectPackageManager'\n}\n\ninterface MCPSetupStep {\n  configuredEditors: EditorName[]\n  detectedEditors: EditorName[]\n  skipped: boolean\n  step: 'mcpSetup'\n}\n\ninterface ConfigureAppProjectStep {\n  selectedOption: 'create' | 'existing' | 'skip'\n  step: 'configureAppProject'\n}\n\nexport type InitStepResult =\n  | ConfigureAppProjectStep\n  | CreateOrSelectDatasetStep\n  | CreateOrSelectProjectStep\n  | FetchJourneyConfigStep\n  | ImportTemplateDatasetStep\n  | LoginStep\n  | MCPSetupStep\n  | SelectPackageManagerStep\n  | SelectTemplateStep\n  | SendCommunityInviteStep\n  | StartStep\n  | UseDefaultPlanCoupon\n  | UseDefaultPlanId\n  | UseDetectedFrameworkStep\n  | UseTypeScriptStep\n\nexport const CLIInitStepCompleted = defineTrace<InitStepResult>({\n  description: 'User completed a step in the CLI init flow',\n  name: 'CLI Init Step Completed',\n  version: 1,\n})\n"],"names":["defineTrace","CLIInitStepCompleted","description","name","version"],"mappings":"AAAA,SAAQA,WAAW,QAAO,oBAAmB;AA+G7C,OAAO,MAAMC,uBAAuBD,YAA4B;IAC9DE,aAAa;IACbC,MAAM;IACNC,SAAS;AACX,GAAE"}
+{"version":3,"sources":["../../src/telemetry/init.telemetry.ts"],"sourcesContent":["import {defineTrace} from '@sanity/telemetry'\n\nimport {type EditorName} from '../actions/mcp/editorConfigs.js'\n\ninterface StartStep {\n  flags: Record<string, boolean | number | string | undefined>\n  step: 'start'\n}\n\ninterface LoginStep {\n  step: 'login'\n\n  alreadyLoggedIn?: boolean\n}\n\ninterface FetchJourneyConfigStep {\n  datasetName: string\n  displayName: string\n  isFirstProject: boolean\n  projectId: string\n  step: 'fetchJourneyConfig'\n}\n\ninterface CreateOrSelectProjectStep {\n  projectId: string\n  selectedOption: 'create' | 'none' | 'select'\n  step: 'createOrSelectProject'\n}\n\ninterface CreateOrSelectDatasetStep {\n  datasetName: string\n  selectedOption: 'create' | 'none' | 'select'\n  step: 'createOrSelectDataset'\n\n  visibility?: 'private' | 'public'\n}\n\ninterface UseDefaultPlanCoupon {\n  selectedOption: 'no' | 'yes'\n  step: 'useDefaultPlanCoupon'\n\n  coupon?: string\n}\n\ninterface UseDefaultPlanId {\n  selectedOption: 'no' | 'yes'\n  step: 'useDefaultPlanId'\n\n  planId?: string\n}\n\ninterface UseDetectedFrameworkStep {\n  selectedOption: 'no' | 'yes'\n  step: 'useDetectedFramework'\n\n  detectedFramework?: string\n}\n\ninterface UseTypeScriptStep {\n  selectedOption: 'no' | 'yes'\n  step: 'useTypeScript'\n}\n\ninterface SelectTemplateStep {\n  selectedOption: string\n  step: 'selectProjectTemplate'\n}\ninterface ImportTemplateDatasetStep {\n  selectedOption: 'no' | 'yes'\n  step: 'importTemplateDataset'\n}\n\ninterface SendCommunityInviteStep {\n  selectedOption: 'no' | 'yes'\n  step: 'sendCommunityInvite'\n}\n\ninterface SelectPackageManagerStep {\n  selectedOption: string\n  step: 'selectPackageManager'\n}\n\ninterface MCPSetupStep {\n  configuredEditors: EditorName[]\n  detectedEditors: EditorName[]\n  skipped: boolean\n  step: 'mcpSetup'\n}\n\ninterface SkillsSetupStep {\n  /** `--agent` values that received the Sanity skills bundle */\n  installedAgents: string[]\n  skipped: boolean\n  step: 'skillsSetup'\n}\n\ninterface ConfigureAppProjectStep {\n  selectedOption: 'create' | 'existing' | 'skip'\n  step: 'configureAppProject'\n}\n\nexport type InitStepResult =\n  | ConfigureAppProjectStep\n  | CreateOrSelectDatasetStep\n  | CreateOrSelectProjectStep\n  | FetchJourneyConfigStep\n  | ImportTemplateDatasetStep\n  | LoginStep\n  | MCPSetupStep\n  | SelectPackageManagerStep\n  | SelectTemplateStep\n  | SendCommunityInviteStep\n  | SkillsSetupStep\n  | StartStep\n  | UseDefaultPlanCoupon\n  | UseDefaultPlanId\n  | UseDetectedFrameworkStep\n  | UseTypeScriptStep\n\nexport const CLIInitStepCompleted = defineTrace<InitStepResult>({\n  description: 'User completed a step in the CLI init flow',\n  name: 'CLI Init Step Completed',\n  version: 1,\n})\n"],"names":["defineTrace","CLIInitStepCompleted","description","name","version"],"mappings":"AAAA,SAAQA,WAAW,QAAO,oBAAmB;AAuH7C,OAAO,MAAMC,uBAAuBD,YAA4B;IAC9DE,aAAa;IACbC,MAAM;IACNC,SAAS;AACX,GAAE"}