@sanity/cli 6.2.1 → 6.3.0

package/dist/commands/login.js

@@ -8,13 +8,17 @@ export class LoginCommand extends SanityCommand {
             command: '<%= config.bin %> <%= command.id %>',
             description: 'Log in using default settings'
         },
+        {
+            command: '<%= config.bin %> <%= command.id %> --provider github --no-open',
+            description: 'Login with GitHub provider, but do not open a browser window automatically'
+        },
         {
             command: '<%= config.bin %> <%= command.id %> --sso my-organization',
             description: 'Log in using Single Sign-On with the "my-organization" slug'
         },
         {
-            command: '<%= config.bin %> <%= command.id %> --provider github --no-open',
-            description: 'Login with GitHub provider, but do not open a browser window automatically'
+            command: '<%= config.bin %> <%= command.id %> --sso my-organization --sso-provider "Okta SSO"',
+            description: 'Log in using a specific SSO provider within an organization'
         }
     ];
     static flags = {
@@ -40,6 +44,13 @@ export class LoginCommand extends SanityCommand {
                 'provider'
             ],
             helpValue: '<slug>'
+        }),
+        'sso-provider': Flags.string({
+            dependsOn: [
+                'sso'
+            ],
+            description: 'Select a specific SSO provider by name (use with --sso)',
+            helpValue: '<name>'
         })
     };
     async run() {
@@ -48,6 +59,7 @@ export class LoginCommand extends SanityCommand {
             await login({
                 ...flags,
                 output: this.output,
+                ssoProvider: flags['sso-provider'],
                 telemetry: this.telemetry
             });
             this.log('Login successful');

package/dist/commands/login.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/login.ts"],"sourcesContent":["import {Command, Flags} from '@oclif/core'\nimport {type FlagInput} from '@oclif/core/interfaces'\nimport {SanityCommand} from '@sanity/cli-core'\n\nimport {login} from '../actions/auth/login/login.js'\n\nexport class LoginCommand extends SanityCommand<typeof LoginCommand> {\n  static override description = 'Authenticates the CLI for access to Sanity projects'\n  static override examples: Array<Command.Example> = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Log in using default settings',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --sso my-organization',\n      description: 'Log in using Single Sign-On with the \"my-organization\" slug',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --provider github --no-open',\n      description: 'Login with GitHub provider, but do not open a browser window automatically',\n    },\n  ]\n  static override flags = {\n    experimental: Flags.boolean({\n      default: false,\n      hidden: true,\n    }),\n    open: Flags.boolean({\n      allowNo: true,\n      default: true,\n      description: 'Open a browser window to log in (`--no-open` only prints URL)',\n    }),\n    provider: Flags.string({\n      description: 'Log in using the given provider',\n      exclusive: ['sso'],\n      helpValue: '<providerId>',\n    }),\n    sso: Flags.string({\n      description: 'Log in using Single Sign-On, using the given organization slug',\n      exclusive: ['provider'],\n      helpValue: '<slug>',\n    }),\n  } satisfies FlagInput\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(LoginCommand)\n\n    try {\n      await login({...flags, output: this.output, telemetry: this.telemetry})\n      this.log('Login successful')\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error)\n      this.error(`Login failed: ${message}`, {exit: 1})\n    }\n  }\n}\n"],"names":["Flags","SanityCommand","login","LoginCommand","description","examples","command","flags","experimental","boolean","default","hidden","open","allowNo","provider","string","exclusive","helpValue","sso","run","parse","output","telemetry","log","error","message","Error","String","exit"],"mappings":"AAAA,SAAiBA,KAAK,QAAO,cAAa;AAE1C,SAAQC,aAAa,QAAO,mBAAkB;AAE9C,SAAQC,KAAK,QAAO,iCAAgC;AAEpD,OAAO,MAAMC,qBAAqBF;IAChC,OAAgBG,cAAc,sDAAqD;IACnF,OAAgBC,WAAmC;QACjD;YACEC,SAAS;YACTF,aAAa;QACf;QACA;YACEE,SAAS;YACTF,aAAa;QACf;QACA;YACEE,SAAS;YACTF,aAAa;QACf;KACD,CAAA;IACD,OAAgBG,QAAQ;QACtBC,cAAcR,MAAMS,OAAO,CAAC;YAC1BC,SAAS;YACTC,QAAQ;QACV;QACAC,MAAMZ,MAAMS,OAAO,CAAC;YAClBI,SAAS;YACTH,SAAS;YACTN,aAAa;QACf;QACAU,UAAUd,MAAMe,MAAM,CAAC;YACrBX,aAAa;YACbY,WAAW;gBAAC;aAAM;YAClBC,WAAW;QACb;QACAC,KAAKlB,MAAMe,MAAM,CAAC;YAChBX,aAAa;YACbY,WAAW;gBAAC;aAAW;YACvBC,WAAW;QACb;IACF,EAAqB;IAErB,MAAaE,MAAqB;QAChC,MAAM,EAACZ,KAAK,EAAC,GAAG,MAAM,IAAI,CAACa,KAAK,CAACjB;QAEjC,IAAI;YACF,MAAMD,MAAM;gBAAC,GAAGK,KAAK;gBAAEc,QAAQ,IAAI,CAACA,MAAM;gBAAEC,WAAW,IAAI,CAACA,SAAS;YAAA;YACrE,IAAI,CAACC,GAAG,CAAC;QACX,EAAE,OAAOC,OAAO;YACd,MAAMC,UAAUD,iBAAiBE,QAAQF,MAAMC,OAAO,GAAGE,OAAOH;YAChE,IAAI,CAACA,KAAK,CAAC,CAAC,cAAc,EAAEC,SAAS,EAAE;gBAACG,MAAM;YAAC;QACjD;IACF;AACF"}
+{"version":3,"sources":["../../src/commands/login.ts"],"sourcesContent":["import {Command, Flags} from '@oclif/core'\nimport {type FlagInput} from '@oclif/core/interfaces'\nimport {SanityCommand} from '@sanity/cli-core'\n\nimport {login} from '../actions/auth/login/login.js'\n\nexport class LoginCommand extends SanityCommand<typeof LoginCommand> {\n  static override description = 'Authenticates the CLI for access to Sanity projects'\n  static override examples: Array<Command.Example> = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Log in using default settings',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --provider github --no-open',\n      description: 'Login with GitHub provider, but do not open a browser window automatically',\n    },\n    {\n      command: '<%= config.bin %> <%= command.id %> --sso my-organization',\n      description: 'Log in using Single Sign-On with the \"my-organization\" slug',\n    },\n    {\n      command:\n        '<%= config.bin %> <%= command.id %> --sso my-organization --sso-provider \"Okta SSO\"',\n      description: 'Log in using a specific SSO provider within an organization',\n    },\n  ]\n  static override flags = {\n    experimental: Flags.boolean({\n      default: false,\n      hidden: true,\n    }),\n    open: Flags.boolean({\n      allowNo: true,\n      default: true,\n      description: 'Open a browser window to log in (`--no-open` only prints URL)',\n    }),\n    provider: Flags.string({\n      description: 'Log in using the given provider',\n      exclusive: ['sso'],\n      helpValue: '<providerId>',\n    }),\n    sso: Flags.string({\n      description: 'Log in using Single Sign-On, using the given organization slug',\n      exclusive: ['provider'],\n      helpValue: '<slug>',\n    }),\n    'sso-provider': Flags.string({\n      dependsOn: ['sso'],\n      description: 'Select a specific SSO provider by name (use with --sso)',\n      helpValue: '<name>',\n    }),\n  } satisfies FlagInput\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(LoginCommand)\n\n    try {\n      await login({\n        ...flags,\n        output: this.output,\n        ssoProvider: flags['sso-provider'],\n        telemetry: this.telemetry,\n      })\n      this.log('Login successful')\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error)\n      this.error(`Login failed: ${message}`, {exit: 1})\n    }\n  }\n}\n"],"names":["Flags","SanityCommand","login","LoginCommand","description","examples","command","flags","experimental","boolean","default","hidden","open","allowNo","provider","string","exclusive","helpValue","sso","dependsOn","run","parse","output","ssoProvider","telemetry","log","error","message","Error","String","exit"],"mappings":"AAAA,SAAiBA,KAAK,QAAO,cAAa;AAE1C,SAAQC,aAAa,QAAO,mBAAkB;AAE9C,SAAQC,KAAK,QAAO,iCAAgC;AAEpD,OAAO,MAAMC,qBAAqBF;IAChC,OAAgBG,cAAc,sDAAqD;IACnF,OAAgBC,WAAmC;QACjD;YACEC,SAAS;YACTF,aAAa;QACf;QACA;YACEE,SAAS;YACTF,aAAa;QACf;QACA;YACEE,SAAS;YACTF,aAAa;QACf;QACA;YACEE,SACE;YACFF,aAAa;QACf;KACD,CAAA;IACD,OAAgBG,QAAQ;QACtBC,cAAcR,MAAMS,OAAO,CAAC;YAC1BC,SAAS;YACTC,QAAQ;QACV;QACAC,MAAMZ,MAAMS,OAAO,CAAC;YAClBI,SAAS;YACTH,SAAS;YACTN,aAAa;QACf;QACAU,UAAUd,MAAMe,MAAM,CAAC;YACrBX,aAAa;YACbY,WAAW;gBAAC;aAAM;YAClBC,WAAW;QACb;QACAC,KAAKlB,MAAMe,MAAM,CAAC;YAChBX,aAAa;YACbY,WAAW;gBAAC;aAAW;YACvBC,WAAW;QACb;QACA,gBAAgBjB,MAAMe,MAAM,CAAC;YAC3BI,WAAW;gBAAC;aAAM;YAClBf,aAAa;YACba,WAAW;QACb;IACF,EAAqB;IAErB,MAAaG,MAAqB;QAChC,MAAM,EAACb,KAAK,EAAC,GAAG,MAAM,IAAI,CAACc,KAAK,CAAClB;QAEjC,IAAI;YACF,MAAMD,MAAM;gBACV,GAAGK,KAAK;gBACRe,QAAQ,IAAI,CAACA,MAAM;gBACnBC,aAAahB,KAAK,CAAC,eAAe;gBAClCiB,WAAW,IAAI,CAACA,SAAS;YAC3B;YACA,IAAI,CAACC,GAAG,CAAC;QACX,EAAE,OAAOC,OAAO;YACd,MAAMC,UAAUD,iBAAiBE,QAAQF,MAAMC,OAAO,GAAGE,OAAOH;YAChE,IAAI,CAACA,KAAK,CAAC,CAAC,cAAc,EAAEC,SAAS,EAAE;gBAACG,MAAM;YAAC;QACjD;IACF;AACF"}

package/dist/commands/logout.js

@@ -1,4 +1,4 @@
-import { getCliToken, SanityCommand, setCliUserConfig } from '@sanity/cli-core';
+import { getCliToken, getUserConfig, SanityCommand, setCliUserConfig } from '@sanity/cli-core';
 import { isHttpError } from '@sanity/client';
 import { logout } from '../services/auth.js';
 export class LogoutCommand extends SanityCommand {
@@ -12,13 +12,13 @@ export class LogoutCommand extends SanityCommand {
         }
         try {
             await logout();
-            await this.clearConfig();
+            this.clearConfig();
         } catch (error) {
             // In the case of session timeouts or missing sessions, we'll get a 401
             // This is an acceptable situation seen from a logout perspective - all we
             // need to do in this case is clear the session from the view of the CLI
             if (isHttpError(error) && error.response.statusCode === 401) {
-                await this.clearConfig();
+                this.clearConfig();
                 return;
             }
             const err = error instanceof Error ? error : new Error(`${error}`);
@@ -27,11 +27,9 @@ export class LogoutCommand extends SanityCommand {
             });
         }
     }
-    async clearConfig() {
-        await Promise.all([
-            setCliUserConfig('authToken', undefined),
-            setCliUserConfig('telemetryConsent', undefined)
-        ]);
+    clearConfig() {
+        setCliUserConfig('authToken', undefined);
+        getUserConfig().delete('telemetryConsent');
         this.log('Logged out successfully');
     }
 }

package/dist/commands/logout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/logout.ts"],"sourcesContent":["import {getCliToken, SanityCommand, setCliUserConfig} from '@sanity/cli-core'\nimport {isHttpError} from '@sanity/client'\n\nimport {logout} from '../services/auth.js'\n\nexport class LogoutCommand extends SanityCommand<typeof LogoutCommand> {\n  static override description = 'Logs out the CLI from the current user session'\n\n  public async run(): Promise<void> {\n    await this.parse(LogoutCommand)\n\n    const previousToken = await getCliToken()\n    if (!previousToken) {\n      this.log('No login credentials found')\n      return\n    }\n\n    try {\n      await logout()\n\n      await this.clearConfig()\n    } catch (error) {\n      // In the case of session timeouts or missing sessions, we'll get a 401\n      // This is an acceptable situation seen from a logout perspective - all we\n      // need to do in this case is clear the session from the view of the CLI\n      if (isHttpError(error) && error.response.statusCode === 401) {\n        await this.clearConfig()\n        return\n      }\n      const err = error instanceof Error ? error : new Error(`${error}`)\n      this.error(`Failed to logout: ${err.message}`, {exit: 1})\n    }\n  }\n\n  private async clearConfig() {\n    await Promise.all([\n      setCliUserConfig('authToken', undefined),\n      setCliUserConfig('telemetryConsent', undefined),\n    ])\n\n    this.log('Logged out successfully')\n  }\n}\n"],"names":["getCliToken","SanityCommand","setCliUserConfig","isHttpError","logout","LogoutCommand","description","run","parse","previousToken","log","clearConfig","error","response","statusCode","err","Error","message","exit","Promise","all","undefined"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,aAAa,EAAEC,gBAAgB,QAAO,mBAAkB;AAC7E,SAAQC,WAAW,QAAO,iBAAgB;AAE1C,SAAQC,MAAM,QAAO,sBAAqB;AAE1C,OAAO,MAAMC,sBAAsBJ;IACjC,OAAgBK,cAAc,iDAAgD;IAE9E,MAAaC,MAAqB;QAChC,MAAM,IAAI,CAACC,KAAK,CAACH;QAEjB,MAAMI,gBAAgB,MAAMT;QAC5B,IAAI,CAACS,eAAe;YAClB,IAAI,CAACC,GAAG,CAAC;YACT;QACF;QAEA,IAAI;YACF,MAAMN;YAEN,MAAM,IAAI,CAACO,WAAW;QACxB,EAAE,OAAOC,OAAO;YACd,uEAAuE;YACvE,0EAA0E;YAC1E,wEAAwE;YACxE,IAAIT,YAAYS,UAAUA,MAAMC,QAAQ,CAACC,UAAU,KAAK,KAAK;gBAC3D,MAAM,IAAI,CAACH,WAAW;gBACtB;YACF;YACA,MAAMI,MAAMH,iBAAiBI,QAAQJ,QAAQ,IAAII,MAAM,GAAGJ,OAAO;YACjE,IAAI,CAACA,KAAK,CAAC,CAAC,kBAAkB,EAAEG,IAAIE,OAAO,EAAE,EAAE;gBAACC,MAAM;YAAC;QACzD;IACF;IAEA,MAAcP,cAAc;QAC1B,MAAMQ,QAAQC,GAAG,CAAC;YAChBlB,iBAAiB,aAAamB;YAC9BnB,iBAAiB,oBAAoBmB;SACtC;QAED,IAAI,CAACX,GAAG,CAAC;IACX;AACF"}
+{"version":3,"sources":["../../src/commands/logout.ts"],"sourcesContent":["import {getCliToken, getUserConfig, SanityCommand, setCliUserConfig} from '@sanity/cli-core'\nimport {isHttpError} from '@sanity/client'\n\nimport {logout} from '../services/auth.js'\n\nexport class LogoutCommand extends SanityCommand<typeof LogoutCommand> {\n  static override description = 'Logs out the CLI from the current user session'\n\n  public async run(): Promise<void> {\n    await this.parse(LogoutCommand)\n\n    const previousToken = await getCliToken()\n    if (!previousToken) {\n      this.log('No login credentials found')\n      return\n    }\n\n    try {\n      await logout()\n\n      this.clearConfig()\n    } catch (error) {\n      // In the case of session timeouts or missing sessions, we'll get a 401\n      // This is an acceptable situation seen from a logout perspective - all we\n      // need to do in this case is clear the session from the view of the CLI\n      if (isHttpError(error) && error.response.statusCode === 401) {\n        this.clearConfig()\n        return\n      }\n      const err = error instanceof Error ? error : new Error(`${error}`)\n      this.error(`Failed to logout: ${err.message}`, {exit: 1})\n    }\n  }\n\n  private clearConfig() {\n    setCliUserConfig('authToken', undefined)\n    getUserConfig().delete('telemetryConsent')\n\n    this.log('Logged out successfully')\n  }\n}\n"],"names":["getCliToken","getUserConfig","SanityCommand","setCliUserConfig","isHttpError","logout","LogoutCommand","description","run","parse","previousToken","log","clearConfig","error","response","statusCode","err","Error","message","exit","undefined","delete"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,aAAa,EAAEC,aAAa,EAAEC,gBAAgB,QAAO,mBAAkB;AAC5F,SAAQC,WAAW,QAAO,iBAAgB;AAE1C,SAAQC,MAAM,QAAO,sBAAqB;AAE1C,OAAO,MAAMC,sBAAsBJ;IACjC,OAAgBK,cAAc,iDAAgD;IAE9E,MAAaC,MAAqB;QAChC,MAAM,IAAI,CAACC,KAAK,CAACH;QAEjB,MAAMI,gBAAgB,MAAMV;QAC5B,IAAI,CAACU,eAAe;YAClB,IAAI,CAACC,GAAG,CAAC;YACT;QACF;QAEA,IAAI;YACF,MAAMN;YAEN,IAAI,CAACO,WAAW;QAClB,EAAE,OAAOC,OAAO;YACd,uEAAuE;YACvE,0EAA0E;YAC1E,wEAAwE;YACxE,IAAIT,YAAYS,UAAUA,MAAMC,QAAQ,CAACC,UAAU,KAAK,KAAK;gBAC3D,IAAI,CAACH,WAAW;gBAChB;YACF;YACA,MAAMI,MAAMH,iBAAiBI,QAAQJ,QAAQ,IAAII,MAAM,GAAGJ,OAAO;YACjE,IAAI,CAACA,KAAK,CAAC,CAAC,kBAAkB,EAAEG,IAAIE,OAAO,EAAE,EAAE;gBAACC,MAAM;YAAC;QACzD;IACF;IAEQP,cAAc;QACpBT,iBAAiB,aAAaiB;QAC9BnB,gBAAgBoB,MAAM,CAAC;QAEvB,IAAI,CAACV,GAAG,CAAC;IACX;AACF"}

package/dist/hooks/prerun/setupTelemetry.js

@@ -70,7 +70,7 @@ export const setupTelemetry = async function({ config }) {
                 SANITY_TELEMETRY_PROJECT_ID: cliConfig?.api?.projectId || ''
             },
             // If debug is enabled, spawn the worker with stdio inherit to see the output
-            stdio: debug.enabled ? 'inherit' : 'ignore'
+            stdio: debug.enabled || telemetryDebug.enabled ? 'inherit' : 'ignore'
         }).unref();
     });
 };

package/dist/hooks/prerun/setupTelemetry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/hooks/prerun/setupTelemetry.ts"],"sourcesContent":["import {spawn} from 'node:child_process'\nimport {fileURLToPath} from 'node:url'\n\nimport {type Hook} from '@oclif/core'\nimport {\n  type CliConfig,\n  debug,\n  findProjectRoot,\n  getCliConfig,\n  setCliTelemetry,\n} from '@sanity/cli-core'\nimport {createSessionId} from '@sanity/telemetry'\n\nimport {resolveConsent} from '../../actions/telemetry/resolveConsent.js'\nimport {telemetryDebug} from '../../actions/telemetry/telemetryDebug.js'\nimport {telemetryDisclosure} from '../../actions/telemetry/telemetryDisclosure.js'\nimport {CliCommandTelemetry, type CLITraceData} from '../../telemetry/cli.telemetry.js'\nimport {detectRuntime} from '../../util/detectRuntime.js'\nimport {parseArguments} from '../../util/parseArguments.js'\nimport {createTelemetryStore} from '../../util/telemetry/createTelemetryStore.js'\n\nexport const setupTelemetry: Hook.Prerun = async function ({config}) {\n  // Show telemetry disclosure\n  telemetryDisclosure()\n\n  const sessionId = createSessionId()\n\n  const telemetry = createTelemetryStore(sessionId, {\n    resolveConsent,\n  })\n\n  let cliConfig: CliConfig | undefined\n  try {\n    const projectRoot = await findProjectRoot(process.cwd())\n    cliConfig = await getCliConfig(projectRoot.directory)\n  } catch {\n    // Accept not finding a project root and/or CLI config\n  }\n\n  telemetry.updateUserProperties({\n    cliVersion: config.version,\n    cpuArchitecture: process.arch,\n    dataset: cliConfig?.api?.dataset,\n    machinePlatform: process.platform,\n    projectId: cliConfig?.api?.projectId,\n    runtime: detectRuntime(),\n    runtimeVersion: process.version,\n  })\n\n  const args = parseArguments()\n\n  const traceOptions: CLITraceData = {\n    commandArguments: args.argsWithoutOptions,\n    coreOptions: {\n      debug: args.coreOptions.debug ?? undefined,\n      help: args.coreOptions.help ?? undefined,\n      version: args.coreOptions.version ?? undefined,\n    },\n    extraArguments: args.extraArguments,\n    groupOrCommand: args.groupOrCommand,\n  }\n\n  telemetryDebug('Starting command trace', traceOptions)\n\n  const cliCommandTrace = telemetry.trace(CliCommandTelemetry, traceOptions)\n  cliCommandTrace.start()\n\n  // Set the global telemetry store and trace error reporter\n  setCliTelemetry(cliCommandTrace.newContext(args.groupOrCommand), {\n    reportTraceError: (error) => cliCommandTrace.error(error),\n  })\n\n  // Handle process exit - complete trace on success, spawn worker to flush telemetry.\n  // On non-zero exit, the trace is either already errored (from SanityCommand.catch)\n  // or it was a user abort (SIGINT/ctrl+c) — left incomplete, matching old CLI behavior.\n  process.once('exit', (status) => {\n    if (status === 0) {\n      cliCommandTrace.complete()\n    }\n\n    const workerPath = fileURLToPath(new URL('flushTelemetry.worker.js', import.meta.url))\n    telemetryDebug(`Spawning \"${process.execPath} ${workerPath}\"`)\n\n    // Spawn detached worker to flush all telemetry files\n    // unref will ensure the child process can keep doing work even after the parent process exits\n    spawn(process.execPath, [workerPath], {\n      detached: true,\n      env: {\n        ...process.env,\n        SANITY_TELEMETRY_PROJECT_ID: cliConfig?.api?.projectId || '',\n      },\n      // If debug is enabled, spawn the worker with stdio inherit to see the output\n      stdio: debug.enabled ? 'inherit' : 'ignore',\n    }).unref()\n  })\n}\n"],"names":["spawn","fileURLToPath","debug","findProjectRoot","getCliConfig","setCliTelemetry","createSessionId","resolveConsent","telemetryDebug","telemetryDisclosure","CliCommandTelemetry","detectRuntime","parseArguments","createTelemetryStore","setupTelemetry","config","sessionId","telemetry","cliConfig","projectRoot","process","cwd","directory","updateUserProperties","cliVersion","version","cpuArchitecture","arch","dataset","api","machinePlatform","platform","projectId","runtime","runtimeVersion","args","traceOptions","commandArguments","argsWithoutOptions","coreOptions","undefined","help","extraArguments","groupOrCommand","cliCommandTrace","trace","start","newContext","reportTraceError","error","once","status","complete","workerPath","URL","url","execPath","detached","env","SANITY_TELEMETRY_PROJECT_ID","stdio","enabled","unref"],"mappings":"AAAA,SAAQA,KAAK,QAAO,qBAAoB;AACxC,SAAQC,aAAa,QAAO,WAAU;AAGtC,SAEEC,KAAK,EACLC,eAAe,EACfC,YAAY,EACZC,eAAe,QACV,mBAAkB;AACzB,SAAQC,eAAe,QAAO,oBAAmB;AAEjD,SAAQC,cAAc,QAAO,4CAA2C;AACxE,SAAQC,cAAc,QAAO,4CAA2C;AACxE,SAAQC,mBAAmB,QAAO,iDAAgD;AAClF,SAAQC,mBAAmB,QAA0B,mCAAkC;AACvF,SAAQC,aAAa,QAAO,8BAA6B;AACzD,SAAQC,cAAc,QAAO,+BAA8B;AAC3D,SAAQC,oBAAoB,QAAO,+CAA8C;AAEjF,OAAO,MAAMC,iBAA8B,eAAgB,EAACC,MAAM,EAAC;IACjE,4BAA4B;IAC5BN;IAEA,MAAMO,YAAYV;IAElB,MAAMW,YAAYJ,qBAAqBG,WAAW;QAChDT;IACF;IAEA,IAAIW;IACJ,IAAI;QACF,MAAMC,cAAc,MAAMhB,gBAAgBiB,QAAQC,GAAG;QACrDH,YAAY,MAAMd,aAAae,YAAYG,SAAS;IACtD,EAAE,OAAM;IACN,sDAAsD;IACxD;IAEAL,UAAUM,oBAAoB,CAAC;QAC7BC,YAAYT,OAAOU,OAAO;QAC1BC,iBAAiBN,QAAQO,IAAI;QAC7BC,SAASV,WAAWW,KAAKD;QACzBE,iBAAiBV,QAAQW,QAAQ;QACjCC,WAAWd,WAAWW,KAAKG;QAC3BC,SAAStB;QACTuB,gBAAgBd,QAAQK,OAAO;IACjC;IAEA,MAAMU,OAAOvB;IAEb,MAAMwB,eAA6B;QACjCC,kBAAkBF,KAAKG,kBAAkB;QACzCC,aAAa;YACXrC,OAAOiC,KAAKI,WAAW,CAACrC,KAAK,IAAIsC;YACjCC,MAAMN,KAAKI,WAAW,CAACE,IAAI,IAAID;YAC/Bf,SAASU,KAAKI,WAAW,CAACd,OAAO,IAAIe;QACvC;QACAE,gBAAgBP,KAAKO,cAAc;QACnCC,gBAAgBR,KAAKQ,cAAc;IACrC;IAEAnC,eAAe,0BAA0B4B;IAEzC,MAAMQ,kBAAkB3B,UAAU4B,KAAK,CAACnC,qBAAqB0B;IAC7DQ,gBAAgBE,KAAK;IAErB,0DAA0D;IAC1DzC,gBAAgBuC,gBAAgBG,UAAU,CAACZ,KAAKQ,cAAc,GAAG;QAC/DK,kBAAkB,CAACC,QAAUL,gBAAgBK,KAAK,CAACA;IACrD;IAEA,oFAAoF;IACpF,mFAAmF;IACnF,uFAAuF;IACvF7B,QAAQ8B,IAAI,CAAC,QAAQ,CAACC;QACpB,IAAIA,WAAW,GAAG;YAChBP,gBAAgBQ,QAAQ;QAC1B;QAEA,MAAMC,aAAapD,cAAc,IAAIqD,IAAI,4BAA4B,YAAYC,GAAG;QACpF/C,eAAe,CAAC,UAAU,EAAEY,QAAQoC,QAAQ,CAAC,CAAC,EAAEH,WAAW,CAAC,CAAC;QAE7D,qDAAqD;QACrD,8FAA8F;QAC9FrD,MAAMoB,QAAQoC,QAAQ,EAAE;YAACH;SAAW,EAAE;YACpCI,UAAU;YACVC,KAAK;gBACH,GAAGtC,QAAQsC,GAAG;gBACdC,6BAA6BzC,WAAWW,KAAKG,aAAa;YAC5D;YACA,6EAA6E;YAC7E4B,OAAO1D,MAAM2D,OAAO,GAAG,YAAY;QACrC,GAAGC,KAAK;IACV;AACF,EAAC"}
+{"version":3,"sources":["../../../src/hooks/prerun/setupTelemetry.ts"],"sourcesContent":["import {spawn} from 'node:child_process'\nimport {fileURLToPath} from 'node:url'\n\nimport {type Hook} from '@oclif/core'\nimport {\n  type CliConfig,\n  debug,\n  findProjectRoot,\n  getCliConfig,\n  setCliTelemetry,\n} from '@sanity/cli-core'\nimport {createSessionId} from '@sanity/telemetry'\n\nimport {resolveConsent} from '../../actions/telemetry/resolveConsent.js'\nimport {telemetryDebug} from '../../actions/telemetry/telemetryDebug.js'\nimport {telemetryDisclosure} from '../../actions/telemetry/telemetryDisclosure.js'\nimport {CliCommandTelemetry, type CLITraceData} from '../../telemetry/cli.telemetry.js'\nimport {detectRuntime} from '../../util/detectRuntime.js'\nimport {parseArguments} from '../../util/parseArguments.js'\nimport {createTelemetryStore} from '../../util/telemetry/createTelemetryStore.js'\n\nexport const setupTelemetry: Hook.Prerun = async function ({config}) {\n  // Show telemetry disclosure\n  telemetryDisclosure()\n\n  const sessionId = createSessionId()\n\n  const telemetry = createTelemetryStore(sessionId, {\n    resolveConsent,\n  })\n\n  let cliConfig: CliConfig | undefined\n  try {\n    const projectRoot = await findProjectRoot(process.cwd())\n    cliConfig = await getCliConfig(projectRoot.directory)\n  } catch {\n    // Accept not finding a project root and/or CLI config\n  }\n\n  telemetry.updateUserProperties({\n    cliVersion: config.version,\n    cpuArchitecture: process.arch,\n    dataset: cliConfig?.api?.dataset,\n    machinePlatform: process.platform,\n    projectId: cliConfig?.api?.projectId,\n    runtime: detectRuntime(),\n    runtimeVersion: process.version,\n  })\n\n  const args = parseArguments()\n\n  const traceOptions: CLITraceData = {\n    commandArguments: args.argsWithoutOptions,\n    coreOptions: {\n      debug: args.coreOptions.debug ?? undefined,\n      help: args.coreOptions.help ?? undefined,\n      version: args.coreOptions.version ?? undefined,\n    },\n    extraArguments: args.extraArguments,\n    groupOrCommand: args.groupOrCommand,\n  }\n\n  telemetryDebug('Starting command trace', traceOptions)\n\n  const cliCommandTrace = telemetry.trace(CliCommandTelemetry, traceOptions)\n  cliCommandTrace.start()\n\n  // Set the global telemetry store and trace error reporter\n  setCliTelemetry(cliCommandTrace.newContext(args.groupOrCommand), {\n    reportTraceError: (error) => cliCommandTrace.error(error),\n  })\n\n  // Handle process exit - complete trace on success, spawn worker to flush telemetry.\n  // On non-zero exit, the trace is either already errored (from SanityCommand.catch)\n  // or it was a user abort (SIGINT/ctrl+c) — left incomplete, matching old CLI behavior.\n  process.once('exit', (status) => {\n    if (status === 0) {\n      cliCommandTrace.complete()\n    }\n\n    const workerPath = fileURLToPath(new URL('flushTelemetry.worker.js', import.meta.url))\n    telemetryDebug(`Spawning \"${process.execPath} ${workerPath}\"`)\n\n    // Spawn detached worker to flush all telemetry files\n    // unref will ensure the child process can keep doing work even after the parent process exits\n    spawn(process.execPath, [workerPath], {\n      detached: true,\n      env: {\n        ...process.env,\n        SANITY_TELEMETRY_PROJECT_ID: cliConfig?.api?.projectId || '',\n      },\n      // If debug is enabled, spawn the worker with stdio inherit to see the output\n      stdio: debug.enabled || telemetryDebug.enabled ? 'inherit' : 'ignore',\n    }).unref()\n  })\n}\n"],"names":["spawn","fileURLToPath","debug","findProjectRoot","getCliConfig","setCliTelemetry","createSessionId","resolveConsent","telemetryDebug","telemetryDisclosure","CliCommandTelemetry","detectRuntime","parseArguments","createTelemetryStore","setupTelemetry","config","sessionId","telemetry","cliConfig","projectRoot","process","cwd","directory","updateUserProperties","cliVersion","version","cpuArchitecture","arch","dataset","api","machinePlatform","platform","projectId","runtime","runtimeVersion","args","traceOptions","commandArguments","argsWithoutOptions","coreOptions","undefined","help","extraArguments","groupOrCommand","cliCommandTrace","trace","start","newContext","reportTraceError","error","once","status","complete","workerPath","URL","url","execPath","detached","env","SANITY_TELEMETRY_PROJECT_ID","stdio","enabled","unref"],"mappings":"AAAA,SAAQA,KAAK,QAAO,qBAAoB;AACxC,SAAQC,aAAa,QAAO,WAAU;AAGtC,SAEEC,KAAK,EACLC,eAAe,EACfC,YAAY,EACZC,eAAe,QACV,mBAAkB;AACzB,SAAQC,eAAe,QAAO,oBAAmB;AAEjD,SAAQC,cAAc,QAAO,4CAA2C;AACxE,SAAQC,cAAc,QAAO,4CAA2C;AACxE,SAAQC,mBAAmB,QAAO,iDAAgD;AAClF,SAAQC,mBAAmB,QAA0B,mCAAkC;AACvF,SAAQC,aAAa,QAAO,8BAA6B;AACzD,SAAQC,cAAc,QAAO,+BAA8B;AAC3D,SAAQC,oBAAoB,QAAO,+CAA8C;AAEjF,OAAO,MAAMC,iBAA8B,eAAgB,EAACC,MAAM,EAAC;IACjE,4BAA4B;IAC5BN;IAEA,MAAMO,YAAYV;IAElB,MAAMW,YAAYJ,qBAAqBG,WAAW;QAChDT;IACF;IAEA,IAAIW;IACJ,IAAI;QACF,MAAMC,cAAc,MAAMhB,gBAAgBiB,QAAQC,GAAG;QACrDH,YAAY,MAAMd,aAAae,YAAYG,SAAS;IACtD,EAAE,OAAM;IACN,sDAAsD;IACxD;IAEAL,UAAUM,oBAAoB,CAAC;QAC7BC,YAAYT,OAAOU,OAAO;QAC1BC,iBAAiBN,QAAQO,IAAI;QAC7BC,SAASV,WAAWW,KAAKD;QACzBE,iBAAiBV,QAAQW,QAAQ;QACjCC,WAAWd,WAAWW,KAAKG;QAC3BC,SAAStB;QACTuB,gBAAgBd,QAAQK,OAAO;IACjC;IAEA,MAAMU,OAAOvB;IAEb,MAAMwB,eAA6B;QACjCC,kBAAkBF,KAAKG,kBAAkB;QACzCC,aAAa;YACXrC,OAAOiC,KAAKI,WAAW,CAACrC,KAAK,IAAIsC;YACjCC,MAAMN,KAAKI,WAAW,CAACE,IAAI,IAAID;YAC/Bf,SAASU,KAAKI,WAAW,CAACd,OAAO,IAAIe;QACvC;QACAE,gBAAgBP,KAAKO,cAAc;QACnCC,gBAAgBR,KAAKQ,cAAc;IACrC;IAEAnC,eAAe,0BAA0B4B;IAEzC,MAAMQ,kBAAkB3B,UAAU4B,KAAK,CAACnC,qBAAqB0B;IAC7DQ,gBAAgBE,KAAK;IAErB,0DAA0D;IAC1DzC,gBAAgBuC,gBAAgBG,UAAU,CAACZ,KAAKQ,cAAc,GAAG;QAC/DK,kBAAkB,CAACC,QAAUL,gBAAgBK,KAAK,CAACA;IACrD;IAEA,oFAAoF;IACpF,mFAAmF;IACnF,uFAAuF;IACvF7B,QAAQ8B,IAAI,CAAC,QAAQ,CAACC;QACpB,IAAIA,WAAW,GAAG;YAChBP,gBAAgBQ,QAAQ;QAC1B;QAEA,MAAMC,aAAapD,cAAc,IAAIqD,IAAI,4BAA4B,YAAYC,GAAG;QACpF/C,eAAe,CAAC,UAAU,EAAEY,QAAQoC,QAAQ,CAAC,CAAC,EAAEH,WAAW,CAAC,CAAC;QAE7D,qDAAqD;QACrD,8FAA8F;QAC9FrD,MAAMoB,QAAQoC,QAAQ,EAAE;YAACH;SAAW,EAAE;YACpCI,UAAU;YACVC,KAAK;gBACH,GAAGtC,QAAQsC,GAAG;gBACdC,6BAA6BzC,WAAWW,KAAKG,aAAa;YAC5D;YACA,6EAA6E;YAC7E4B,OAAO1D,MAAM2D,OAAO,IAAIrD,eAAeqD,OAAO,GAAG,YAAY;QAC/D,GAAGC,KAAK;IACV;AACF,EAAC"}

package/dist/server/devServer.js

@@ -4,9 +4,10 @@ import { writeSanityRuntime } from '../actions/build/writeSanityRuntime.js';
 import { serverDebug } from './serverDebug.js';
 const debug = serverDebug.extend('dev');
 export async function startDevServer(options) {
-    const { basePath, cwd, entry, httpHost, httpPort, isApp, reactCompiler, reactStrictMode, schemaExtraction, typegen, vite: extendViteConfig } = options;
+    const { appTitle, basePath, cwd, entry, httpHost, httpPort, isApp, reactCompiler, reactStrictMode, schemaExtraction, typegen, vite: extendViteConfig } = options;
     debug('Writing Sanity runtime files');
     const watcher = await writeSanityRuntime({
+        appTitle,
         basePath,
         cwd,
         entry,

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  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    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    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","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;AA4BjC,OAAO,eAAeC,eAAeC,OAAyB;IAC5D,MAAM,EACJC,QAAQ,EACRC,GAAG,EACHC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,aAAa,EACbC,eAAe,EACfC,gBAAgB,EAChBC,OAAO,EACPC,MAAMC,gBAAgB,EACvB,GAAGZ;IAEJH,MAAM;IACN,MAAMgB,UAAU,MAAMlB,mBAAmB;QACvCM;QACAC;QACAC;QACAG;QACAE;QACAM,OAAO;IACT;IAEAjB,MAAM;IACN,MAAMkB,OAAO;IAEb,IAAIC,aAA2B,MAAMtB,cAAc;QACjDO;QACAC;QACAI;QACAS,MAAM;QACNR;QACAE;QACAQ,QAAQ;YAACC,MAAMd;YAAUe,MAAMd;QAAQ;QACvCK;IACF;IAEA,sDAAsD;IACtD,IAAIE,kBAAkB;QACpBI,aAAa,MAAMvB,+BACjB;YAAC2B,SAAS;YAASL;QAAI,GACvBC,YACAJ;IAEJ;IAEAf,MAAM;IACN,MAAMoB,SAAS,MAAMzB,aAAawB;IAElCnB,MAAM;IACN,MAAMoB,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 {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"}

package/dist/util/compareDependencyVersions.js

@@ -90,7 +90,9 @@ async function getRemoteResolvedVersion(url, request) {
         });
     } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        throw new Error(`Failed to fetch remote version for ${url}: ${message}`);
+        throw new Error(`Failed to fetch remote version for ${url}: ${message}`, {
+            cause: err
+        });
     }
     // 302 is expected, but lets also handle 2xx
     if (response.statusCode < 400) {

package/dist/util/compareDependencyVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/compareDependencyVersions.ts"],"sourcesContent":["import path from 'node:path'\n\nimport {readPackageJson} from '@sanity/cli-core'\nimport {createRequester} from '@sanity/cli-core/request'\nimport semver from 'semver'\n\nimport {getModuleUrl} from '../actions/build/getAutoUpdatesImportMap.js'\nimport {getLocalPackageVersion} from './getLocalPackageVersion.js'\n\nconst defaultRequester = createRequester({\n  middleware: {httpErrors: false, promise: {onlyBody: false}},\n})\n\ninterface CompareDependencyVersions {\n  installed: string\n  pkg: string\n  remote: string\n}\n\nexport interface UnresolvedPrerelease {\n  pkg: string\n  version: string\n}\n\ninterface CompareDependencyVersionsResult {\n  mismatched: Array<CompareDependencyVersions>\n  unresolvedPrerelease: Array<UnresolvedPrerelease>\n}\n\ninterface CompareDependencyVersionsOptions {\n  /** When provided, uses the app-specific module endpoint instead of the default endpoint. */\n  appId?: string\n  /** Optional requester for dependency injection (primarily for testing). */\n  requester?: typeof defaultRequester\n}\n\n/**\n * @internal\n *\n * Compares the versions of dependencies in the studio or app with their remote versions.\n *\n * This function reads the package.json file in the provided working directory, and compares the versions of the dependencies\n * specified in the `autoUpdatesImports` parameter with their remote versions. If the versions do not match, the dependency is\n * added to a list of failed dependencies, which is returned by the function.\n *\n * The failed dependencies are anything that does not strictly match the remote version.\n * This means that if a version is lower or greater by even a patch it will be marked as failed.\n *\n * @param packages - An array of packages with their name and version to compare against remote.\n * @param workDir - The path to the working directory containing the package.json file.\n * @param options - Optional configuration for version comparison.\n *\n * @returns A promise that resolves to an object containing `mismatched` (packages whose local and remote versions differ)\n * and `unresolvedPrerelease` (packages with prerelease versions that could not be resolved remotely).\n *\n * @throws Throws an error if the remote version of a non-prerelease package cannot be fetched, or if the local version\n * of a package cannot be parsed.\n */\nexport async function compareDependencyVersions(\n  packages: {name: string; version: string}[],\n  workDir: string,\n  {appId, requester = defaultRequester}: CompareDependencyVersionsOptions = {},\n): Promise<CompareDependencyVersionsResult> {\n  const manifest = await readPackageJson(path.join(workDir, 'package.json'), {\n    skipSchemaValidation: true,\n  })\n  const dependencies = {...manifest?.dependencies, ...manifest?.devDependencies}\n\n  const mismatched: Array<CompareDependencyVersions> = []\n  const unresolvedPrerelease: Array<UnresolvedPrerelease> = []\n\n  for (const pkg of packages) {\n    // Skip packages that are not declared in the local package.json\n    if (!dependencies[pkg.name]) {\n      continue\n    }\n\n    const resolvedVersion = await getRemoteResolvedVersion(getModuleUrl(pkg, {appId}), requester)\n\n    if (resolvedVersion === null) {\n      if (semver.prerelease(pkg.version)) {\n        unresolvedPrerelease.push({pkg: pkg.name, version: pkg.version})\n        continue\n      }\n      throw new Error(\n        `Failed to resolve remote version for ${pkg.name}@${pkg.version}: package not found`,\n      )\n    }\n\n    const packageVersion = await getLocalPackageVersion(pkg.name, workDir)\n\n    const manifestVersion = dependencies[pkg.name]\n\n    const installed = semver.coerce(\n      packageVersion ? semver.parse(packageVersion) : semver.coerce(manifestVersion),\n    )\n\n    if (!installed) {\n      throw new Error(`Failed to parse installed version for ${pkg.name}`)\n    }\n\n    if (!semver.eq(resolvedVersion, installed.version)) {\n      mismatched.push({\n        installed: installed.version,\n        pkg: pkg.name,\n        remote: resolvedVersion,\n      })\n    }\n  }\n\n  return {mismatched, unresolvedPrerelease}\n}\n\nasync function getRemoteResolvedVersion(\n  url: string,\n  request: typeof defaultRequester,\n): Promise<string | null> {\n  let response\n  try {\n    response = await request({\n      maxRedirects: 0,\n      method: 'HEAD',\n      url,\n    })\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    throw new Error(`Failed to fetch remote version for ${url}: ${message}`)\n  }\n\n  // 302 is expected, but lets also handle 2xx\n  if (response.statusCode < 400) {\n    const resolved = response.headers['x-resolved-version']\n    if (!resolved) {\n      throw new Error(`Missing 'x-resolved-version' header on response from HEAD ${url}`)\n    }\n    return resolved\n  }\n\n  if (response.statusCode === 404) {\n    return null\n  }\n\n  throw new Error(`Unexpected HTTP response: ${response.statusCode} ${response.statusMessage}`)\n}\n"],"names":["path","readPackageJson","createRequester","semver","getModuleUrl","getLocalPackageVersion","defaultRequester","middleware","httpErrors","promise","onlyBody","compareDependencyVersions","packages","workDir","appId","requester","manifest","join","skipSchemaValidation","dependencies","devDependencies","mismatched","unresolvedPrerelease","pkg","name","resolvedVersion","getRemoteResolvedVersion","prerelease","version","push","Error","packageVersion","manifestVersion","installed","coerce","parse","eq","remote","url","request","response","maxRedirects","method","err","message","String","statusCode","resolved","headers","statusMessage"],"mappings":"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"}
+{"version":3,"sources":["../../src/util/compareDependencyVersions.ts"],"sourcesContent":["import path from 'node:path'\n\nimport {readPackageJson} from '@sanity/cli-core'\nimport {createRequester} from '@sanity/cli-core/request'\nimport semver from 'semver'\n\nimport {getModuleUrl} from '../actions/build/getAutoUpdatesImportMap.js'\nimport {getLocalPackageVersion} from './getLocalPackageVersion.js'\n\nconst defaultRequester = createRequester({\n  middleware: {httpErrors: false, promise: {onlyBody: false}},\n})\n\ninterface CompareDependencyVersions {\n  installed: string\n  pkg: string\n  remote: string\n}\n\nexport interface UnresolvedPrerelease {\n  pkg: string\n  version: string\n}\n\ninterface CompareDependencyVersionsResult {\n  mismatched: Array<CompareDependencyVersions>\n  unresolvedPrerelease: Array<UnresolvedPrerelease>\n}\n\ninterface CompareDependencyVersionsOptions {\n  /** When provided, uses the app-specific module endpoint instead of the default endpoint. */\n  appId?: string\n  /** Optional requester for dependency injection (primarily for testing). */\n  requester?: typeof defaultRequester\n}\n\n/**\n * @internal\n *\n * Compares the versions of dependencies in the studio or app with their remote versions.\n *\n * This function reads the package.json file in the provided working directory, and compares the versions of the dependencies\n * specified in the `autoUpdatesImports` parameter with their remote versions. If the versions do not match, the dependency is\n * added to a list of failed dependencies, which is returned by the function.\n *\n * The failed dependencies are anything that does not strictly match the remote version.\n * This means that if a version is lower or greater by even a patch it will be marked as failed.\n *\n * @param packages - An array of packages with their name and version to compare against remote.\n * @param workDir - The path to the working directory containing the package.json file.\n * @param options - Optional configuration for version comparison.\n *\n * @returns A promise that resolves to an object containing `mismatched` (packages whose local and remote versions differ)\n * and `unresolvedPrerelease` (packages with prerelease versions that could not be resolved remotely).\n *\n * @throws Throws an error if the remote version of a non-prerelease package cannot be fetched, or if the local version\n * of a package cannot be parsed.\n */\nexport async function compareDependencyVersions(\n  packages: {name: string; version: string}[],\n  workDir: string,\n  {appId, requester = defaultRequester}: CompareDependencyVersionsOptions = {},\n): Promise<CompareDependencyVersionsResult> {\n  const manifest = await readPackageJson(path.join(workDir, 'package.json'), {\n    skipSchemaValidation: true,\n  })\n  const dependencies = {...manifest?.dependencies, ...manifest?.devDependencies}\n\n  const mismatched: Array<CompareDependencyVersions> = []\n  const unresolvedPrerelease: Array<UnresolvedPrerelease> = []\n\n  for (const pkg of packages) {\n    // Skip packages that are not declared in the local package.json\n    if (!dependencies[pkg.name]) {\n      continue\n    }\n\n    const resolvedVersion = await getRemoteResolvedVersion(getModuleUrl(pkg, {appId}), requester)\n\n    if (resolvedVersion === null) {\n      if (semver.prerelease(pkg.version)) {\n        unresolvedPrerelease.push({pkg: pkg.name, version: pkg.version})\n        continue\n      }\n      throw new Error(\n        `Failed to resolve remote version for ${pkg.name}@${pkg.version}: package not found`,\n      )\n    }\n\n    const packageVersion = await getLocalPackageVersion(pkg.name, workDir)\n\n    const manifestVersion = dependencies[pkg.name]\n\n    const installed = semver.coerce(\n      packageVersion ? semver.parse(packageVersion) : semver.coerce(manifestVersion),\n    )\n\n    if (!installed) {\n      throw new Error(`Failed to parse installed version for ${pkg.name}`)\n    }\n\n    if (!semver.eq(resolvedVersion, installed.version)) {\n      mismatched.push({\n        installed: installed.version,\n        pkg: pkg.name,\n        remote: resolvedVersion,\n      })\n    }\n  }\n\n  return {mismatched, unresolvedPrerelease}\n}\n\nasync function getRemoteResolvedVersion(\n  url: string,\n  request: typeof defaultRequester,\n): Promise<string | null> {\n  let response\n  try {\n    response = await request({\n      maxRedirects: 0,\n      method: 'HEAD',\n      url,\n    })\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    throw new Error(`Failed to fetch remote version for ${url}: ${message}`, {cause: err})\n  }\n\n  // 302 is expected, but lets also handle 2xx\n  if (response.statusCode < 400) {\n    const resolved = response.headers['x-resolved-version']\n    if (!resolved) {\n      throw new Error(`Missing 'x-resolved-version' header on response from HEAD ${url}`)\n    }\n    return resolved\n  }\n\n  if (response.statusCode === 404) {\n    return null\n  }\n\n  throw new Error(`Unexpected HTTP response: ${response.statusCode} ${response.statusMessage}`)\n}\n"],"names":["path","readPackageJson","createRequester","semver","getModuleUrl","getLocalPackageVersion","defaultRequester","middleware","httpErrors","promise","onlyBody","compareDependencyVersions","packages","workDir","appId","requester","manifest","join","skipSchemaValidation","dependencies","devDependencies","mismatched","unresolvedPrerelease","pkg","name","resolvedVersion","getRemoteResolvedVersion","prerelease","version","push","Error","packageVersion","manifestVersion","installed","coerce","parse","eq","remote","url","request","response","maxRedirects","method","err","message","String","cause","statusCode","resolved","headers","statusMessage"],"mappings":"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"}

package/dist/util/createExpiringConfig.js

@@ -1,7 +1,4 @@
 /**
- * Minimal interface for a config store that supports get/set/delete operations.
- * Compatible with the `configstore` package.
- */ /**
  * Create a config in the provided config store that expires after the provided TTL.
  */ export function createExpiringConfig({ fetchValue, key, onCacheHit = ()=>null, onFetch = ()=>null, onRevalidate = ()=>null, store, ttl, validateValue = (value)=>true }) {
     let currentFetch = null;

package/dist/util/createExpiringConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/createExpiringConfig.ts"],"sourcesContent":["/**\n * Minimal interface for a config store that supports get/set/delete operations.\n * Compatible with the `configstore` package.\n */\ninterface ConfigStoreApi {\n  delete: (key: string) => void\n  get: (key: string) => unknown\n  set: (key: string, value: unknown) => void\n}\n\ninterface ExpiringConfigValue {\n  updatedAt: number\n  value: unknown\n}\n\ninterface ExpiringConfigOptions<Type> {\n  /** Fetch value */\n  fetchValue: () => Promise<Type> | Type\n  /** Config key */\n  key: string\n  /** Config store */\n  store: ConfigStoreApi\n  /** TTL (milliseconds) */\n  ttl: number\n\n  /** Subscribe to cache hit event */\n  onCacheHit?: () => void\n  /** Subscribe to fetch event */\n  onFetch?: () => void\n  /** Subscribe to revalidate event */\n  onRevalidate?: () => void\n\n  /**\n   * Assert the fetched value is valid, or throw if invalid.\n   * If none is provided, it will always accept the fetched value.\n   */\n  validateValue?: (value: unknown) => value is Type\n}\n\ninterface ExpiringConfigApi<Type> {\n  /**\n   * Delete the cached value.\n   */\n  delete: () => void\n  /**\n   * Attempt to get the cached value. If there is no cached value, or the cached value has expired,\n   * fetch, cache, and return the value.\n   */\n  get: () => Promise<Type>\n}\n\n/**\n * Create a config in the provided config store that expires after the provided TTL.\n */\nexport function createExpiringConfig<Type>({\n  fetchValue,\n  key,\n  onCacheHit = () => null,\n  onFetch = () => null,\n  onRevalidate = () => null,\n  store,\n  ttl,\n  validateValue = (value: unknown): value is Type => true,\n}: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type> {\n  let currentFetch: Promise<Type> | null = null\n  return {\n    delete() {\n      store.delete(key)\n    },\n    async get(): Promise<Type> {\n      const stored = store.get(key)\n\n      if (isExpiringValue(stored)) {\n        const {updatedAt, value} = stored\n        if (!validateValue(value)) {\n          throw new Error('Stored value is invalid')\n        }\n\n        const hasExpired = Date.now() - updatedAt > ttl\n\n        if (!hasExpired) {\n          onCacheHit()\n          return value\n        }\n\n        onRevalidate()\n      }\n\n      // Return existing fetch if one is already in progress\n      if (currentFetch) {\n        return currentFetch\n      }\n\n      onFetch()\n\n      currentFetch = Promise.resolve(fetchValue())\n      const nextValue = await currentFetch\n      if (!validateValue(nextValue)) {\n        throw new Error('Fetched value is invalid')\n      }\n\n      currentFetch = null\n\n      store.set(key, {\n        updatedAt: Date.now(),\n        value: nextValue,\n      })\n\n      return nextValue\n    },\n  }\n}\n\n/**\n * Checks if the given stored value is valid (does not check if expired, only verified shape)\n *\n * @param stored - The stored value to check\n * @returns True if the stored value is valid\n * @internal\n */\nfunction isExpiringValue(stored: unknown): stored is ExpiringConfigValue {\n  if (typeof stored !== 'object' || stored === null || Array.isArray(stored)) {\n    return false\n  }\n\n  if (!('updatedAt' in stored) || typeof stored.updatedAt !== 'number') {\n    return false\n  }\n\n  if (!('value' in stored)) {\n    return false\n  }\n\n  return true\n}\n"],"names":["createExpiringConfig","fetchValue","key","onCacheHit","onFetch","onRevalidate","store","ttl","validateValue","value","currentFetch","delete","get","stored","isExpiringValue","updatedAt","Error","hasExpired","Date","now","Promise","resolve","nextValue","set","Array","isArray"],"mappings":"AAAA;;;CAGC,GAgDD;;CAEC,GACD,OAAO,SAASA,qBAA2B,EACzCC,UAAU,EACVC,GAAG,EACHC,aAAa,IAAM,IAAI,EACvBC,UAAU,IAAM,IAAI,EACpBC,eAAe,IAAM,IAAI,EACzBC,KAAK,EACLC,GAAG,EACHC,gBAAgB,CAACC,QAAkC,IAAI,EAC3B;IAC5B,IAAIC,eAAqC;IACzC,OAAO;QACLC;YACEL,MAAMK,MAAM,CAACT;QACf;QACA,MAAMU;YACJ,MAAMC,SAASP,MAAMM,GAAG,CAACV;YAEzB,IAAIY,gBAAgBD,SAAS;gBAC3B,MAAM,EAACE,SAAS,EAAEN,KAAK,EAAC,GAAGI;gBAC3B,IAAI,CAACL,cAAcC,QAAQ;oBACzB,MAAM,IAAIO,MAAM;gBAClB;gBAEA,MAAMC,aAAaC,KAAKC,GAAG,KAAKJ,YAAYR;gBAE5C,IAAI,CAACU,YAAY;oBACfd;oBACA,OAAOM;gBACT;gBAEAJ;YACF;YAEA,sDAAsD;YACtD,IAAIK,cAAc;gBAChB,OAAOA;YACT;YAEAN;YAEAM,eAAeU,QAAQC,OAAO,CAACpB;YAC/B,MAAMqB,YAAY,MAAMZ;YACxB,IAAI,CAACF,cAAcc,YAAY;gBAC7B,MAAM,IAAIN,MAAM;YAClB;YAEAN,eAAe;YAEfJ,MAAMiB,GAAG,CAACrB,KAAK;gBACba,WAAWG,KAAKC,GAAG;gBACnBV,OAAOa;YACT;YAEA,OAAOA;QACT;IACF;AACF;AAEA;;;;;;CAMC,GACD,SAASR,gBAAgBD,MAAe;IACtC,IAAI,OAAOA,WAAW,YAAYA,WAAW,QAAQW,MAAMC,OAAO,CAACZ,SAAS;QAC1E,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,eAAeA,MAAK,KAAM,OAAOA,OAAOE,SAAS,KAAK,UAAU;QACpE,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,WAAWF,MAAK,GAAI;QACxB,OAAO;IACT;IAEA,OAAO;AACT"}
+{"version":3,"sources":["../../src/util/createExpiringConfig.ts"],"sourcesContent":["import {type ConfigStore} from '@sanity/cli-core'\n\ninterface ExpiringConfigValue {\n  updatedAt: number\n  value: unknown\n}\n\ninterface ExpiringConfigOptions<Type> {\n  /** Fetch value */\n  fetchValue: () => Promise<Type> | Type\n  /** Config key */\n  key: string\n  /** Config store */\n  store: ConfigStore\n  /** TTL (milliseconds) */\n  ttl: number\n\n  /** Subscribe to cache hit event */\n  onCacheHit?: () => void\n  /** Subscribe to fetch event */\n  onFetch?: () => void\n  /** Subscribe to revalidate event */\n  onRevalidate?: () => void\n\n  /**\n   * Assert the fetched value is valid, or throw if invalid.\n   * If none is provided, it will always accept the fetched value.\n   */\n  validateValue?: (value: unknown) => value is Type\n}\n\ninterface ExpiringConfigApi<Type> {\n  /**\n   * Delete the cached value.\n   */\n  delete: () => void\n  /**\n   * Attempt to get the cached value. If there is no cached value, or the cached value has expired,\n   * fetch, cache, and return the value.\n   */\n  get: () => Promise<Type>\n}\n\n/**\n * Create a config in the provided config store that expires after the provided TTL.\n */\nexport function createExpiringConfig<Type>({\n  fetchValue,\n  key,\n  onCacheHit = () => null,\n  onFetch = () => null,\n  onRevalidate = () => null,\n  store,\n  ttl,\n  validateValue = (value: unknown): value is Type => true,\n}: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type> {\n  let currentFetch: Promise<Type> | null = null\n  return {\n    delete() {\n      store.delete(key)\n    },\n    async get(): Promise<Type> {\n      const stored = store.get(key)\n\n      if (isExpiringValue(stored)) {\n        const {updatedAt, value} = stored\n        if (!validateValue(value)) {\n          throw new Error('Stored value is invalid')\n        }\n\n        const hasExpired = Date.now() - updatedAt > ttl\n\n        if (!hasExpired) {\n          onCacheHit()\n          return value\n        }\n\n        onRevalidate()\n      }\n\n      // Return existing fetch if one is already in progress\n      if (currentFetch) {\n        return currentFetch\n      }\n\n      onFetch()\n\n      currentFetch = Promise.resolve(fetchValue())\n      const nextValue = await currentFetch\n      if (!validateValue(nextValue)) {\n        throw new Error('Fetched value is invalid')\n      }\n\n      currentFetch = null\n\n      store.set(key, {\n        updatedAt: Date.now(),\n        value: nextValue,\n      })\n\n      return nextValue\n    },\n  }\n}\n\n/**\n * Checks if the given stored value is valid (does not check if expired, only verified shape)\n *\n * @param stored - The stored value to check\n * @returns True if the stored value is valid\n * @internal\n */\nfunction isExpiringValue(stored: unknown): stored is ExpiringConfigValue {\n  if (typeof stored !== 'object' || stored === null || Array.isArray(stored)) {\n    return false\n  }\n\n  if (!('updatedAt' in stored) || typeof stored.updatedAt !== 'number') {\n    return false\n  }\n\n  if (!('value' in stored)) {\n    return false\n  }\n\n  return true\n}\n"],"names":["createExpiringConfig","fetchValue","key","onCacheHit","onFetch","onRevalidate","store","ttl","validateValue","value","currentFetch","delete","get","stored","isExpiringValue","updatedAt","Error","hasExpired","Date","now","Promise","resolve","nextValue","set","Array","isArray"],"mappings":"AA2CA;;CAEC,GACD,OAAO,SAASA,qBAA2B,EACzCC,UAAU,EACVC,GAAG,EACHC,aAAa,IAAM,IAAI,EACvBC,UAAU,IAAM,IAAI,EACpBC,eAAe,IAAM,IAAI,EACzBC,KAAK,EACLC,GAAG,EACHC,gBAAgB,CAACC,QAAkC,IAAI,EAC3B;IAC5B,IAAIC,eAAqC;IACzC,OAAO;QACLC;YACEL,MAAMK,MAAM,CAACT;QACf;QACA,MAAMU;YACJ,MAAMC,SAASP,MAAMM,GAAG,CAACV;YAEzB,IAAIY,gBAAgBD,SAAS;gBAC3B,MAAM,EAACE,SAAS,EAAEN,KAAK,EAAC,GAAGI;gBAC3B,IAAI,CAACL,cAAcC,QAAQ;oBACzB,MAAM,IAAIO,MAAM;gBAClB;gBAEA,MAAMC,aAAaC,KAAKC,GAAG,KAAKJ,YAAYR;gBAE5C,IAAI,CAACU,YAAY;oBACfd;oBACA,OAAOM;gBACT;gBAEAJ;YACF;YAEA,sDAAsD;YACtD,IAAIK,cAAc;gBAChB,OAAOA;YACT;YAEAN;YAEAM,eAAeU,QAAQC,OAAO,CAACpB;YAC/B,MAAMqB,YAAY,MAAMZ;YACxB,IAAI,CAACF,cAAcc,YAAY;gBAC7B,MAAM,IAAIN,MAAM;YAClB;YAEAN,eAAe;YAEfJ,MAAMiB,GAAG,CAACrB,KAAK;gBACba,WAAWG,KAAKC,GAAG;gBACnBV,OAAOa;YACT;YAEA,OAAOA;QACT;IACF;AACF;AAEA;;;;;;CAMC,GACD,SAASR,gBAAgBD,MAAe;IACtC,IAAI,OAAOA,WAAW,YAAYA,WAAW,QAAQW,MAAMC,OAAO,CAACZ,SAAS;QAC1E,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,eAAeA,MAAK,KAAM,OAAOA,OAAOE,SAAS,KAAK,UAAU;QACpE,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,WAAWF,MAAK,GAAI;QACxB,OAAO;IACT;IAEA,OAAO;AACT"}

package/dist/util/getCliVersion.js

@@ -20,7 +20,9 @@ import { packageDirectory } from 'package-directory';
     try {
         pkg = await readPackageJson(path.join(cliPath, 'package.json'));
     } catch (err) {
-        throw new Error(`Unable to read @sanity/cli/package.json: ${err.message}`);
+        throw new Error(`Unable to read @sanity/cli/package.json: ${err.message}`, {
+            cause: err
+        });
     }
     return pkg.version;
 }

package/dist/util/getCliVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/getCliVersion.ts"],"sourcesContent":["import path from 'node:path'\nimport {fileURLToPath} from 'node:url'\n\nimport {type PackageJson, readPackageJson} from '@sanity/cli-core'\nimport {packageDirectory} from 'package-directory'\n\n/**\n * Get the version of the `@sanity/cli` package.\n *\n * @internal\n * @returns The version of the `@sanity/cli` package.\n */\nexport async function getCliVersion(): Promise<string> {\n  // using the meta.url will resolve to the code running from the cli\n  // this will find the package.json in cli package.\n  const cliPath = await packageDirectory({cwd: fileURLToPath(import.meta.url)})\n  if (!cliPath) {\n    throw new Error('Unable to resolve root of @sanity/cli module')\n  }\n\n  let pkg: PackageJson | undefined\n  try {\n    pkg = await readPackageJson(path.join(cliPath, 'package.json'))\n  } catch (err) {\n    throw new Error(`Unable to read @sanity/cli/package.json: ${(err as Error).message}`)\n  }\n\n  return pkg.version\n}\n"],"names":["path","fileURLToPath","readPackageJson","packageDirectory","getCliVersion","cliPath","cwd","url","Error","pkg","join","err","message","version"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAC5B,SAAQC,aAAa,QAAO,WAAU;AAEtC,SAA0BC,eAAe,QAAO,mBAAkB;AAClE,SAAQC,gBAAgB,QAAO,oBAAmB;AAElD;;;;;CAKC,GACD,OAAO,eAAeC;IACpB,mEAAmE;IACnE,kDAAkD;IAClD,MAAMC,UAAU,MAAMF,iBAAiB;QAACG,KAAKL,cAAc,YAAYM,GAAG;IAAC;IAC3E,IAAI,CAACF,SAAS;QACZ,MAAM,IAAIG,MAAM;IAClB;IAEA,IAAIC;IACJ,IAAI;QACFA,MAAM,MAAMP,gBAAgBF,KAAKU,IAAI,CAACL,SAAS;IACjD,EAAE,OAAOM,KAAK;QACZ,MAAM,IAAIH,MAAM,CAAC,yCAAyC,EAAE,AAACG,IAAcC,OAAO,EAAE;IACtF;IAEA,OAAOH,IAAII,OAAO;AACpB"}
+{"version":3,"sources":["../../src/util/getCliVersion.ts"],"sourcesContent":["import path from 'node:path'\nimport {fileURLToPath} from 'node:url'\n\nimport {type PackageJson, readPackageJson} from '@sanity/cli-core'\nimport {packageDirectory} from 'package-directory'\n\n/**\n * Get the version of the `@sanity/cli` package.\n *\n * @internal\n * @returns The version of the `@sanity/cli` package.\n */\nexport async function getCliVersion(): Promise<string> {\n  // using the meta.url will resolve to the code running from the cli\n  // this will find the package.json in cli package.\n  const cliPath = await packageDirectory({cwd: fileURLToPath(import.meta.url)})\n  if (!cliPath) {\n    throw new Error('Unable to resolve root of @sanity/cli module')\n  }\n\n  let pkg: PackageJson | undefined\n  try {\n    pkg = await readPackageJson(path.join(cliPath, 'package.json'))\n  } catch (err) {\n    throw new Error(`Unable to read @sanity/cli/package.json: ${(err as Error).message}`, {\n      cause: err,\n    })\n  }\n\n  return pkg.version\n}\n"],"names":["path","fileURLToPath","readPackageJson","packageDirectory","getCliVersion","cliPath","cwd","url","Error","pkg","join","err","message","cause","version"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAC5B,SAAQC,aAAa,QAAO,WAAU;AAEtC,SAA0BC,eAAe,QAAO,mBAAkB;AAClE,SAAQC,gBAAgB,QAAO,oBAAmB;AAElD;;;;;CAKC,GACD,OAAO,eAAeC;IACpB,mEAAmE;IACnE,kDAAkD;IAClD,MAAMC,UAAU,MAAMF,iBAAiB;QAACG,KAAKL,cAAc,YAAYM,GAAG;IAAC;IAC3E,IAAI,CAACF,SAAS;QACZ,MAAM,IAAIG,MAAM;IAClB;IAEA,IAAIC;IACJ,IAAI;QACFA,MAAM,MAAMP,gBAAgBF,KAAKU,IAAI,CAACL,SAAS;IACjD,EAAE,OAAOM,KAAK;QACZ,MAAM,IAAIH,MAAM,CAAC,yCAAyC,EAAE,AAACG,IAAcC,OAAO,EAAE,EAAE;YACpFC,OAAOF;QACT;IACF;IAEA,OAAOF,IAAIK,OAAO;AACpB"}

package/dist/util/telemetry/logger.js

@@ -49,8 +49,21 @@ const logSampleTracker = new Map();
         };
         emit(userPropsEvent);
     };
+    const resume = (events)=>{
+        for (const event of events){
+            emit({
+                createdAt: event.createdAt,
+                data: event.data ?? null,
+                name: event.event.name,
+                sessionId,
+                type: 'log',
+                version: event.event.version
+            });
+        }
+    };
     return {
         log,
+        resume,
         trace,
         updateUserProperties
     };

package/dist/util/telemetry/logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/util/telemetry/logger.ts"],"sourcesContent":["import {\n  type DefinedTelemetryLog,\n  type DefinedTelemetryTrace,\n  type TelemetryEvent,\n  type TelemetryLogger,\n  type TelemetryTrace,\n} from '@sanity/telemetry'\n\nimport {telemetryStoreDebug} from './telemetryStoreDebug.js'\nimport {createTrace} from './trace.js'\n\n// Process-wide sample rate tracking for log events, shared across all logger instances\n// to deduplicate events regardless of which logger emits them.\n// Use resetLogSampleTracker() in tests to prevent state leaking between test runs.\nconst logSampleTracker = new Map<string, number>()\n\n/** @public Reset sample rate tracking state. Intended for use in tests only. */\nexport function resetLogSampleTracker(): void {\n  logSampleTracker.clear()\n}\n\n/**\n * Creates a telemetry logger that emits events via the provided emit function\n * @internal\n */\nexport function createLogger<UserProperties>(\n  sessionId: string,\n  emit: (event: TelemetryEvent) => void,\n): TelemetryLogger<UserProperties> {\n  telemetryStoreDebug('Creating logger for session: %s', sessionId)\n\n  const log = <Data>(event: DefinedTelemetryLog<Data>, data?: Data) => {\n    telemetryStoreDebug('Logging event: %s', event.name)\n\n    // Handle sampling if maxSampleRate is specified\n    if (event.maxSampleRate && event.maxSampleRate > 0) {\n      const now = Date.now()\n      const lastEmit = logSampleTracker.get(event.name) || 0\n\n      if (now - lastEmit < event.maxSampleRate) {\n        telemetryStoreDebug(\n          'Skipping event %s due to sampling (maxSampleRate: %d)',\n          event.name,\n          event.maxSampleRate,\n        )\n        return // Skip due to sampling\n      }\n\n      logSampleTracker.set(event.name, now)\n      telemetryStoreDebug('Event %s passed sampling check', event.name)\n    }\n\n    const logEvent: TelemetryEvent = {\n      createdAt: new Date().toISOString(),\n      data: data ?? null,\n      name: event.name,\n      sessionId,\n      type: 'log',\n      version: event.version,\n    }\n\n    emit(logEvent)\n  }\n\n  const trace = <Data, Context = unknown>(\n    event: DefinedTelemetryTrace<Data, Context>,\n    context?: Context,\n  ): TelemetryTrace<UserProperties, Data> => {\n    telemetryStoreDebug('Creating trace: %s', event.name)\n    return createTrace(event, context, sessionId, emit, createLogger)\n  }\n\n  const updateUserProperties = (properties: UserProperties) => {\n    telemetryStoreDebug('Updating user properties: %o', properties)\n    const userPropsEvent: TelemetryEvent = {\n      createdAt: new Date().toISOString(),\n      properties,\n      sessionId,\n      type: 'userProperties',\n    }\n\n    emit(userPropsEvent)\n  }\n\n  return {\n    log,\n    trace,\n    updateUserProperties,\n  }\n}\n"],"names":["telemetryStoreDebug","createTrace","logSampleTracker","Map","resetLogSampleTracker","clear","createLogger","sessionId","emit","log","event","data","name","maxSampleRate","now","Date","lastEmit","get","set","logEvent","createdAt","toISOString","type","version","trace","context","updateUserProperties","properties","userPropsEvent"],"mappings":"AAQA,SAAQA,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,WAAW,QAAO,aAAY;AAEtC,uFAAuF;AACvF,+DAA+D;AAC/D,mFAAmF;AACnF,MAAMC,mBAAmB,IAAIC;AAE7B,8EAA8E,GAC9E,OAAO,SAASC;IACdF,iBAAiBG,KAAK;AACxB;AAEA;;;CAGC,GACD,OAAO,SAASC,aACdC,SAAiB,EACjBC,IAAqC;IAErCR,oBAAoB,mCAAmCO;IAEvD,MAAME,MAAM,CAAOC,OAAkCC;QACnDX,oBAAoB,qBAAqBU,MAAME,IAAI;QAEnD,gDAAgD;QAChD,IAAIF,MAAMG,aAAa,IAAIH,MAAMG,aAAa,GAAG,GAAG;YAClD,MAAMC,MAAMC,KAAKD,GAAG;YACpB,MAAME,WAAWd,iBAAiBe,GAAG,CAACP,MAAME,IAAI,KAAK;YAErD,IAAIE,MAAME,WAAWN,MAAMG,aAAa,EAAE;gBACxCb,oBACE,yDACAU,MAAME,IAAI,EACVF,MAAMG,aAAa;gBAErB,QAAO,uBAAuB;YAChC;YAEAX,iBAAiBgB,GAAG,CAACR,MAAME,IAAI,EAAEE;YACjCd,oBAAoB,kCAAkCU,MAAME,IAAI;QAClE;QAEA,MAAMO,WAA2B;YAC/BC,WAAW,IAAIL,OAAOM,WAAW;YACjCV,MAAMA,QAAQ;YACdC,MAAMF,MAAME,IAAI;YAChBL;YACAe,MAAM;YACNC,SAASb,MAAMa,OAAO;QACxB;QAEAf,KAAKW;IACP;IAEA,MAAMK,QAAQ,CACZd,OACAe;QAEAzB,oBAAoB,sBAAsBU,MAAME,IAAI;QACpD,OAAOX,YAAYS,OAAOe,SAASlB,WAAWC,MAAMF;IACtD;IAEA,MAAMoB,uBAAuB,CAACC;QAC5B3B,oBAAoB,gCAAgC2B;QACpD,MAAMC,iBAAiC;YACrCR,WAAW,IAAIL,OAAOM,WAAW;YACjCM;YACApB;YACAe,MAAM;QACR;QAEAd,KAAKoB;IACP;IAEA,OAAO;QACLnB;QACAe;QACAE;IACF;AACF"}
+{"version":3,"sources":["../../../src/util/telemetry/logger.ts"],"sourcesContent":["import {\n  type DeferredEvent,\n  type DefinedTelemetryLog,\n  type DefinedTelemetryTrace,\n  type TelemetryEvent,\n  type TelemetryLogger,\n  type TelemetryTrace,\n} from '@sanity/telemetry'\n\nimport {telemetryStoreDebug} from './telemetryStoreDebug.js'\nimport {createTrace} from './trace.js'\n\n// Process-wide sample rate tracking for log events, shared across all logger instances\n// to deduplicate events regardless of which logger emits them.\n// Use resetLogSampleTracker() in tests to prevent state leaking between test runs.\nconst logSampleTracker = new Map<string, number>()\n\n/** @public Reset sample rate tracking state. Intended for use in tests only. */\nexport function resetLogSampleTracker(): void {\n  logSampleTracker.clear()\n}\n\n/**\n * Creates a telemetry logger that emits events via the provided emit function\n * @internal\n */\nexport function createLogger<UserProperties>(\n  sessionId: string,\n  emit: (event: TelemetryEvent) => void,\n): TelemetryLogger<UserProperties> {\n  telemetryStoreDebug('Creating logger for session: %s', sessionId)\n\n  const log = <Data>(event: DefinedTelemetryLog<Data>, data?: Data) => {\n    telemetryStoreDebug('Logging event: %s', event.name)\n\n    // Handle sampling if maxSampleRate is specified\n    if (event.maxSampleRate && event.maxSampleRate > 0) {\n      const now = Date.now()\n      const lastEmit = logSampleTracker.get(event.name) || 0\n\n      if (now - lastEmit < event.maxSampleRate) {\n        telemetryStoreDebug(\n          'Skipping event %s due to sampling (maxSampleRate: %d)',\n          event.name,\n          event.maxSampleRate,\n        )\n        return // Skip due to sampling\n      }\n\n      logSampleTracker.set(event.name, now)\n      telemetryStoreDebug('Event %s passed sampling check', event.name)\n    }\n\n    const logEvent: TelemetryEvent = {\n      createdAt: new Date().toISOString(),\n      data: data ?? null,\n      name: event.name,\n      sessionId,\n      type: 'log',\n      version: event.version,\n    }\n\n    emit(logEvent)\n  }\n\n  const trace = <Data, Context = unknown>(\n    event: DefinedTelemetryTrace<Data, Context>,\n    context?: Context,\n  ): TelemetryTrace<UserProperties, Data> => {\n    telemetryStoreDebug('Creating trace: %s', event.name)\n    return createTrace(event, context, sessionId, emit, createLogger)\n  }\n\n  const updateUserProperties = (properties: UserProperties) => {\n    telemetryStoreDebug('Updating user properties: %o', properties)\n    const userPropsEvent: TelemetryEvent = {\n      createdAt: new Date().toISOString(),\n      properties,\n      sessionId,\n      type: 'userProperties',\n    }\n\n    emit(userPropsEvent)\n  }\n\n  const resume = (events: DeferredEvent[]) => {\n    for (const event of events) {\n      emit({\n        createdAt: event.createdAt,\n        data: event.data ?? null,\n        name: event.event.name,\n        sessionId,\n        type: 'log',\n        version: event.event.version,\n      })\n    }\n  }\n\n  return {\n    log,\n    resume,\n    trace,\n    updateUserProperties,\n  }\n}\n"],"names":["telemetryStoreDebug","createTrace","logSampleTracker","Map","resetLogSampleTracker","clear","createLogger","sessionId","emit","log","event","data","name","maxSampleRate","now","Date","lastEmit","get","set","logEvent","createdAt","toISOString","type","version","trace","context","updateUserProperties","properties","userPropsEvent","resume","events"],"mappings":"AASA,SAAQA,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,WAAW,QAAO,aAAY;AAEtC,uFAAuF;AACvF,+DAA+D;AAC/D,mFAAmF;AACnF,MAAMC,mBAAmB,IAAIC;AAE7B,8EAA8E,GAC9E,OAAO,SAASC;IACdF,iBAAiBG,KAAK;AACxB;AAEA;;;CAGC,GACD,OAAO,SAASC,aACdC,SAAiB,EACjBC,IAAqC;IAErCR,oBAAoB,mCAAmCO;IAEvD,MAAME,MAAM,CAAOC,OAAkCC;QACnDX,oBAAoB,qBAAqBU,MAAME,IAAI;QAEnD,gDAAgD;QAChD,IAAIF,MAAMG,aAAa,IAAIH,MAAMG,aAAa,GAAG,GAAG;YAClD,MAAMC,MAAMC,KAAKD,GAAG;YACpB,MAAME,WAAWd,iBAAiBe,GAAG,CAACP,MAAME,IAAI,KAAK;YAErD,IAAIE,MAAME,WAAWN,MAAMG,aAAa,EAAE;gBACxCb,oBACE,yDACAU,MAAME,IAAI,EACVF,MAAMG,aAAa;gBAErB,QAAO,uBAAuB;YAChC;YAEAX,iBAAiBgB,GAAG,CAACR,MAAME,IAAI,EAAEE;YACjCd,oBAAoB,kCAAkCU,MAAME,IAAI;QAClE;QAEA,MAAMO,WAA2B;YAC/BC,WAAW,IAAIL,OAAOM,WAAW;YACjCV,MAAMA,QAAQ;YACdC,MAAMF,MAAME,IAAI;YAChBL;YACAe,MAAM;YACNC,SAASb,MAAMa,OAAO;QACxB;QAEAf,KAAKW;IACP;IAEA,MAAMK,QAAQ,CACZd,OACAe;QAEAzB,oBAAoB,sBAAsBU,MAAME,IAAI;QACpD,OAAOX,YAAYS,OAAOe,SAASlB,WAAWC,MAAMF;IACtD;IAEA,MAAMoB,uBAAuB,CAACC;QAC5B3B,oBAAoB,gCAAgC2B;QACpD,MAAMC,iBAAiC;YACrCR,WAAW,IAAIL,OAAOM,WAAW;YACjCM;YACApB;YACAe,MAAM;QACR;QAEAd,KAAKoB;IACP;IAEA,MAAMC,SAAS,CAACC;QACd,KAAK,MAAMpB,SAASoB,OAAQ;YAC1BtB,KAAK;gBACHY,WAAWV,MAAMU,SAAS;gBAC1BT,MAAMD,MAAMC,IAAI,IAAI;gBACpBC,MAAMF,MAAMA,KAAK,CAACE,IAAI;gBACtBL;gBACAe,MAAM;gBACNC,SAASb,MAAMA,KAAK,CAACa,OAAO;YAC9B;QACF;IACF;IAEA,OAAO;QACLd;QACAoB;QACAL;QACAE;IACF;AACF"}