@sanity/cli 6.1.3 → 6.1.5

package/dist/commands/mcp/configure.js

@@ -1,6 +1,10 @@
-import { SanityCommand } from '@sanity/cli-core';
+import { SanityCommand, subdebug } from '@sanity/cli-core';
+import { ensureAuthenticated } from '../../actions/auth/ensureAuthenticated.js';
 import { setupMCP } from '../../actions/mcp/setupMCP.js';
+import { LoginError } from '../../errors/LoginError.js';
 import { MCPConfigureTrace } from '../../telemetry/mcp.telemetry.js';
+import { getErrorMessage, toError } from '../../util/getErrorMessage.js';
+const debug = subdebug('mcp:configure');
 export class ConfigureMcpCommand extends SanityCommand {
     static description = 'Configure Sanity MCP server for AI editors (Claude Code, Codex CLI, Cursor, Gemini CLI, GitHub Copilot CLI, VS Code)';
     static examples = [
@@ -12,17 +16,41 @@ export class ConfigureMcpCommand extends SanityCommand {
     async run() {
         const trace = this.telemetry.trace(MCPConfigureTrace);
         trace.start();
-        const mcpResult = await setupMCP({
-            explicit: true
-        });
-        trace.log({
-            configuredEditors: mcpResult.configuredEditors,
-            detectedEditors: mcpResult.detectedEditors
-        });
-        if (mcpResult.error) {
-            trace.error(mcpResult.error);
-        } else {
-            trace.complete();
+        try {
+            await ensureAuthenticated({
+                output: this.output,
+                telemetry: this.telemetry
+            });
+        } catch (error) {
+            debug('Authentication check failed: %O', error);
+            trace.error(toError(error));
+            if (error instanceof LoginError) {
+                this.error(`Failed to verify authentication credentials: ${error.message}. Try running \`sanity login\`.`, {
+                    exit: 1
+                });
+            }
+            this.error(`Failed to check authentication: ${getErrorMessage(error)}`, {
+                exit: 1
+            });
+        }
+        try {
+            const mcpResult = await setupMCP({
+                explicit: true
+            });
+            trace.log({
+                configuredEditors: mcpResult.configuredEditors,
+                detectedEditors: mcpResult.detectedEditors
+            });
+            if (mcpResult.error) {
+                trace.error(mcpResult.error);
+            } else {
+                trace.complete();
+            }
+        } catch (error) {
+            trace.error(toError(error));
+            this.error(getErrorMessage(error), {
+                exit: 1
+            });
         }
     }
 }

package/dist/commands/mcp/configure.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/commands/mcp/configure.ts"],"sourcesContent":["import {SanityCommand} from '@sanity/cli-core'\n\nimport {setupMCP} from '../../actions/mcp/setupMCP.js'\nimport {MCPConfigureTrace} from '../../telemetry/mcp.telemetry.js'\n\nexport class ConfigureMcpCommand extends SanityCommand<typeof ConfigureMcpCommand> {\n  static override description =\n    'Configure Sanity MCP server for AI editors (Claude Code, Codex CLI, Cursor, Gemini CLI, GitHub Copilot CLI, VS Code)'\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Configure Sanity MCP server for detected AI editors',\n    },\n  ]\n\n  public async run(): Promise<void> {\n    const trace = this.telemetry.trace(MCPConfigureTrace)\n    trace.start()\n    const mcpResult = await setupMCP({explicit: true})\n\n    trace.log({\n      configuredEditors: mcpResult.configuredEditors,\n      detectedEditors: mcpResult.detectedEditors,\n    })\n\n    if (mcpResult.error) {\n      trace.error(mcpResult.error)\n    } else {\n      trace.complete()\n    }\n  }\n}\n"],"names":["SanityCommand","setupMCP","MCPConfigureTrace","ConfigureMcpCommand","description","examples","command","run","trace","telemetry","start","mcpResult","explicit","log","configuredEditors","detectedEditors","error","complete"],"mappings":"AAAA,SAAQA,aAAa,QAAO,mBAAkB;AAE9C,SAAQC,QAAQ,QAAO,gCAA+B;AACtD,SAAQC,iBAAiB,QAAO,mCAAkC;AAElE,OAAO,MAAMC,4BAA4BH;IACvC,OAAgBI,cACd,uHAAsH;IAExH,OAAgBC,WAAW;QACzB;YACEC,SAAS;YACTF,aAAa;QACf;KACD,CAAA;IAED,MAAaG,MAAqB;QAChC,MAAMC,QAAQ,IAAI,CAACC,SAAS,CAACD,KAAK,CAACN;QACnCM,MAAME,KAAK;QACX,MAAMC,YAAY,MAAMV,SAAS;YAACW,UAAU;QAAI;QAEhDJ,MAAMK,GAAG,CAAC;YACRC,mBAAmBH,UAAUG,iBAAiB;YAC9CC,iBAAiBJ,UAAUI,eAAe;QAC5C;QAEA,IAAIJ,UAAUK,KAAK,EAAE;YACnBR,MAAMQ,KAAK,CAACL,UAAUK,KAAK;QAC7B,OAAO;YACLR,MAAMS,QAAQ;QAChB;IACF;AACF"}
+{"version":3,"sources":["../../../src/commands/mcp/configure.ts"],"sourcesContent":["import {SanityCommand, subdebug} from '@sanity/cli-core'\n\nimport {ensureAuthenticated} from '../../actions/auth/ensureAuthenticated.js'\nimport {setupMCP} from '../../actions/mcp/setupMCP.js'\nimport {LoginError} from '../../errors/LoginError.js'\nimport {MCPConfigureTrace} from '../../telemetry/mcp.telemetry.js'\nimport {getErrorMessage, toError} from '../../util/getErrorMessage.js'\n\nconst debug = subdebug('mcp:configure')\n\nexport class ConfigureMcpCommand extends SanityCommand<typeof ConfigureMcpCommand> {\n  static override description =\n    'Configure Sanity MCP server for AI editors (Claude Code, Codex CLI, Cursor, Gemini CLI, GitHub Copilot CLI, VS Code)'\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: 'Configure Sanity MCP server for detected AI editors',\n    },\n  ]\n\n  public async run(): Promise<void> {\n    const trace = this.telemetry.trace(MCPConfigureTrace)\n    trace.start()\n\n    try {\n      await ensureAuthenticated({output: this.output, telemetry: this.telemetry})\n    } catch (error) {\n      debug('Authentication check failed: %O', error)\n      trace.error(toError(error))\n\n      if (error instanceof LoginError) {\n        this.error(\n          `Failed to verify authentication credentials: ${error.message}. Try running \\`sanity login\\`.`,\n          {exit: 1},\n        )\n      }\n\n      this.error(`Failed to check authentication: ${getErrorMessage(error)}`, {exit: 1})\n    }\n\n    try {\n      const mcpResult = await setupMCP({explicit: true})\n\n      trace.log({\n        configuredEditors: mcpResult.configuredEditors,\n        detectedEditors: mcpResult.detectedEditors,\n      })\n\n      if (mcpResult.error) {\n        trace.error(mcpResult.error)\n      } else {\n        trace.complete()\n      }\n    } catch (error) {\n      trace.error(toError(error))\n      this.error(getErrorMessage(error), {exit: 1})\n    }\n  }\n}\n"],"names":["SanityCommand","subdebug","ensureAuthenticated","setupMCP","LoginError","MCPConfigureTrace","getErrorMessage","toError","debug","ConfigureMcpCommand","description","examples","command","run","trace","telemetry","start","output","error","message","exit","mcpResult","explicit","log","configuredEditors","detectedEditors","complete"],"mappings":"AAAA,SAAQA,aAAa,EAAEC,QAAQ,QAAO,mBAAkB;AAExD,SAAQC,mBAAmB,QAAO,4CAA2C;AAC7E,SAAQC,QAAQ,QAAO,gCAA+B;AACtD,SAAQC,UAAU,QAAO,6BAA4B;AACrD,SAAQC,iBAAiB,QAAO,mCAAkC;AAClE,SAAQC,eAAe,EAAEC,OAAO,QAAO,gCAA+B;AAEtE,MAAMC,QAAQP,SAAS;AAEvB,OAAO,MAAMQ,4BAA4BT;IACvC,OAAgBU,cACd,uHAAsH;IAExH,OAAgBC,WAAW;QACzB;YACEC,SAAS;YACTF,aAAa;QACf;KACD,CAAA;IAED,MAAaG,MAAqB;QAChC,MAAMC,QAAQ,IAAI,CAACC,SAAS,CAACD,KAAK,CAACT;QACnCS,MAAME,KAAK;QAEX,IAAI;YACF,MAAMd,oBAAoB;gBAACe,QAAQ,IAAI,CAACA,MAAM;gBAAEF,WAAW,IAAI,CAACA,SAAS;YAAA;QAC3E,EAAE,OAAOG,OAAO;YACdV,MAAM,mCAAmCU;YACzCJ,MAAMI,KAAK,CAACX,QAAQW;YAEpB,IAAIA,iBAAiBd,YAAY;gBAC/B,IAAI,CAACc,KAAK,CACR,CAAC,6CAA6C,EAAEA,MAAMC,OAAO,CAAC,+BAA+B,CAAC,EAC9F;oBAACC,MAAM;gBAAC;YAEZ;YAEA,IAAI,CAACF,KAAK,CAAC,CAAC,gCAAgC,EAAEZ,gBAAgBY,QAAQ,EAAE;gBAACE,MAAM;YAAC;QAClF;QAEA,IAAI;YACF,MAAMC,YAAY,MAAMlB,SAAS;gBAACmB,UAAU;YAAI;YAEhDR,MAAMS,GAAG,CAAC;gBACRC,mBAAmBH,UAAUG,iBAAiB;gBAC9CC,iBAAiBJ,UAAUI,eAAe;YAC5C;YAEA,IAAIJ,UAAUH,KAAK,EAAE;gBACnBJ,MAAMI,KAAK,CAACG,UAAUH,KAAK;YAC7B,OAAO;gBACLJ,MAAMY,QAAQ;YAChB;QACF,EAAE,OAAOR,OAAO;YACdJ,MAAMI,KAAK,CAACX,QAAQW;YACpB,IAAI,CAACA,KAAK,CAACZ,gBAAgBY,QAAQ;gBAACE,MAAM;YAAC;QAC7C;IACF;AACF"}

package/dist/errors/LoginError.js

@@ -0,0 +1,11 @@
+/**
+ * Thrown when interactive login fails or is cancelled.
+ * Callers can use this to distinguish login failures (suggest `sanity login`)
+ * from transient network/server errors (don't suggest login).
+ *
+ * @internal
+ */ export class LoginError extends Error {
+    name = 'LoginError';
+}
+
+//# sourceMappingURL=LoginError.js.map

package/dist/errors/LoginError.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/errors/LoginError.ts"],"sourcesContent":["/**\n * Thrown when interactive login fails or is cancelled.\n * Callers can use this to distinguish login failures (suggest `sanity login`)\n * from transient network/server errors (don't suggest login).\n *\n * @internal\n */\nexport class LoginError extends Error {\n  override name = 'LoginError'\n}\n"],"names":["LoginError","Error","name"],"mappings":"AAAA;;;;;;CAMC,GACD,OAAO,MAAMA,mBAAmBC;IACrBC,OAAO,aAAY;AAC9B"}

package/dist/util/getErrorMessage.js

@@ -1,4 +1,13 @@
 import { isHttpError } from '@sanity/client';
+/**
+ * Coerce an unknown thrown value into an Error instance.
+ *
+ * @param value - The thrown value
+ * @returns An Error instance (the original if already an Error, otherwise a new one)
+ * @internal
+ */ export function toError(value) {
+    return value instanceof Error ? value : new Error(String(value));
+}
 /**
  * Get the error message from an error object
  *

package/dist/util/getErrorMessage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/getErrorMessage.ts"],"sourcesContent":["import {isHttpError} from '@sanity/client'\n\n/**\n * Get the error message from an error object\n *\n * @param err - The error object\n * @returns The error message\n * @internal\n */\nexport function getErrorMessage(err: unknown): string {\n  if (isHttpError(err)) {\n    const body = err.response.body\n    if (\n      typeof body === 'object' &&\n      body !== null &&\n      'message' in body &&\n      typeof body.message === 'string'\n    ) {\n      return body.message\n    }\n    return err.message || 'HTTP error'\n  }\n  return err instanceof Error ? err.message : 'Unknown error'\n}\n"],"names":["isHttpError","getErrorMessage","err","body","response","message","Error"],"mappings":"AAAA,SAAQA,WAAW,QAAO,iBAAgB;AAE1C;;;;;;CAMC,GACD,OAAO,SAASC,gBAAgBC,GAAY;IAC1C,IAAIF,YAAYE,MAAM;QACpB,MAAMC,OAAOD,IAAIE,QAAQ,CAACD,IAAI;QAC9B,IACE,OAAOA,SAAS,YAChBA,SAAS,QACT,aAAaA,QACb,OAAOA,KAAKE,OAAO,KAAK,UACxB;YACA,OAAOF,KAAKE,OAAO;QACrB;QACA,OAAOH,IAAIG,OAAO,IAAI;IACxB;IACA,OAAOH,eAAeI,QAAQJ,IAAIG,OAAO,GAAG;AAC9C"}
+{"version":3,"sources":["../../src/util/getErrorMessage.ts"],"sourcesContent":["import {isHttpError} from '@sanity/client'\n\n/**\n * Coerce an unknown thrown value into an Error instance.\n *\n * @param value - The thrown value\n * @returns An Error instance (the original if already an Error, otherwise a new one)\n * @internal\n */\nexport function toError(value: unknown): Error {\n  return value instanceof Error ? value : new Error(String(value))\n}\n\n/**\n * Get the error message from an error object\n *\n * @param err - The error object\n * @returns The error message\n * @internal\n */\nexport function getErrorMessage(err: unknown): string {\n  if (isHttpError(err)) {\n    const body = err.response.body\n    if (\n      typeof body === 'object' &&\n      body !== null &&\n      'message' in body &&\n      typeof body.message === 'string'\n    ) {\n      return body.message\n    }\n    return err.message || 'HTTP error'\n  }\n  return err instanceof Error ? err.message : 'Unknown error'\n}\n"],"names":["isHttpError","toError","value","Error","String","getErrorMessage","err","body","response","message"],"mappings":"AAAA,SAAQA,WAAW,QAAO,iBAAgB;AAE1C;;;;;;CAMC,GACD,OAAO,SAASC,QAAQC,KAAc;IACpC,OAAOA,iBAAiBC,QAAQD,QAAQ,IAAIC,MAAMC,OAAOF;AAC3D;AAEA;;;;;;CAMC,GACD,OAAO,SAASG,gBAAgBC,GAAY;IAC1C,IAAIN,YAAYM,MAAM;QACpB,MAAMC,OAAOD,IAAIE,QAAQ,CAACD,IAAI;QAC9B,IACE,OAAOA,SAAS,YAChBA,SAAS,QACT,aAAaA,QACb,OAAOA,KAAKE,OAAO,KAAK,UACxB;YACA,OAAOF,KAAKE,OAAO;QACrB;QACA,OAAOH,IAAIG,OAAO,IAAI;IACxB;IACA,OAAOH,eAAeH,QAAQG,IAAIG,OAAO,GAAG;AAC9C"}

package/oclif.manifest.json

@@ -4943,5 +4943,5 @@
       ]
     }
   },
-  "version": "6.1.3"
+  "version": "6.1.5"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "description": "Sanity CLI tool for managing Sanity projects and organizations",
   "keywords": [
     "cli",
@@ -51,11 +51,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@oclif/core": "^4.8.3",
+    "@oclif/core": "^4.8.4",
     "@oclif/plugin-help": "^6.2.37",
     "@oclif/plugin-not-found": "^3.2.74",
     "@sanity/client": "^7.17.0",
-    "@sanity/codegen": "^6.0.0",
+    "@sanity/codegen": "^6.0.1",
     "@sanity/descriptors": "^1.3.0",
     "@sanity/export": "^6.1.0",
     "@sanity/generate-help-url": "^4.0.0",
@@ -118,11 +118,11 @@
     "which": "^6.0.1",
     "yaml": "^2.8.2",
     "zod": "^4.3.6",
-    "@sanity/cli-core": "1.1.1"
+    "@sanity/cli-core": "1.1.2"
   },
   "devDependencies": {
     "@eslint/compat": "^2.0.3",
-    "@sanity/pkg-utils": "^10.4.8",
+    "@sanity/pkg-utils": "^10.4.9",
     "@swc/cli": "^0.8.0",
     "@swc/core": "^1.15.18",
     "@types/debug": "^4.1.12",
@@ -142,7 +142,7 @@
     "babel-plugin-react-compiler": "^1.0.0",
     "eslint": "^9.39.4",
     "nock": "^14.0.11",
-    "oclif": "^4.22.85",
+    "oclif": "^4.22.87",
     "publint": "^0.3.18",
     "rimraf": "^6.0.1",
     "sanity": "^5.15.0",
@@ -151,8 +151,8 @@
     "vitest": "^4.0.18",
     "@repo/package.config": "0.0.1",
     "@repo/tsconfig": "3.70.0",
-    "@sanity/cli-test": "0.2.3",
-    "@sanity/eslint-config-cli": "1.0.0"
+    "@sanity/eslint-config-cli": "1.0.0",
+    "@sanity/cli-test": "0.2.4"
   },
   "engines": {
     "node": ">=20.19.1 <22 || >=22.12"