@sanity/cli 6.0.0 → 6.1.0

package/dist/actions/mcp/setupMCP.js

@@ -4,17 +4,20 @@ import { logSymbols } from '@sanity/cli-core/ux';
 import { createMCPToken, MCP_SERVER_URL } from '../../services/mcp.js';
 import { detectAvailableEditors } from './detectAvailableEditors.js';
 import { promptForMCPSetup } from './promptForMCPSetup.js';
+import { validateEditorTokens } from './validateEditorTokens.js';
 import { writeMCPConfig } from './writeMCPConfig.js';
 const mcpDebug = subdebug('mcp:setup');
 const NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server for your editor. Visit ${MCP_SERVER_URL} for setup instructions.`;
 /**
  * Main MCP setup orchestration
- * Opt-out by default: runs automatically unless skipMcp flag is set
- */ export async function setupMCP(mcp) {
+ * Opt-out by default: runs automatically unless skip option is set
+ */ export async function setupMCP(options) {
+    const { explicit = false, skip = false } = options ?? {};
     // 1. Check for explicit opt-out
-    if (mcp === false) {
+    if (skip) {
         ux.warn('Skipping MCP configuration due to --no-mcp flag');
         return {
+            alreadyConfiguredEditors: [],
             configuredEditors: [],
             detectedEditors: [],
             skipped: true
@@ -25,44 +28,79 @@ const NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server f
     const detectedEditors = editors.map((e)=>e.name);
     mcpDebug('Detected %d editors: %s', detectedEditors.length, detectedEditors);
     if (editors.length === 0) {
-        ux.warn(NO_EDITORS_DETECTED_MESSAGE);
+        if (explicit) {
+            ux.warn(NO_EDITORS_DETECTED_MESSAGE);
+        }
         return {
+            alreadyConfiguredEditors: [],
             configuredEditors: [],
             detectedEditors,
             skipped: true
         };
     }
-    // 3. Prompt user (shows existing config status, only pre-selects unconfigured editors)
-    const selected = await promptForMCPSetup(editors);
-    if (!selected || selected.length === 0) {
-        // User deselected all editors
-        ux.stdout('MCP configuration skipped');
+    // 3. Validate existing tokens against the Sanity API
+    await validateEditorTokens(editors);
+    // 4. Check if there's anything actionable
+    const actionable = editors.filter((e)=>!e.configured || e.authStatus !== 'valid');
+    if (actionable.length === 0) {
+        mcpDebug('All editors configured with valid credentials');
+        const alreadyConfiguredEditors = editors.filter((e)=>e.configured && e.authStatus === 'valid').map((e)=>e.name);
+        if (explicit) {
+            ux.stdout(`${logSymbols.success} All detected editors are already configured`);
+        }
         return {
+            alreadyConfiguredEditors,
             configuredEditors: [],
             detectedEditors,
             skipped: true
         };
     }
-    // 4. Create child token for MCP
-    let token;
-    try {
-        token = await createMCPToken();
-    } catch (error) {
-        const err = error instanceof Error ? error : new Error(String(error));
-        mcpDebug('Error creating MCP token', error);
-        ux.warn(`Could not configure MCP: ${err.message}`);
-        ux.warn('You can set up MCP manually later using https://mcp.sanity.io');
+    // Non-actionable editors are already configured with valid credentials
+    const alreadyConfiguredEditors = editors.filter((e)=>!actionable.includes(e)).map((e)=>e.name);
+    // 5. Prompt user (shows only actionable editors, annotates auth issues)
+    const selected = await promptForMCPSetup(actionable);
+    if (!selected || selected.length === 0) {
+        // User deselected all editors
+        ux.stdout('MCP configuration skipped');
         return {
+            alreadyConfiguredEditors,
             configuredEditors: [],
             detectedEditors,
-            error: err,
-            skipped: false
+            skipped: true
         };
     }
-    // 5. Write configs for each selected editor
+    // 6. Get a token — reuse a valid existing one or create a new one
+    let token;
+    // Look for an existing valid token we can reuse
+    const validEditor = editors.find((e)=>e.authStatus === 'valid' && e.existingToken);
+    if (validEditor?.existingToken) {
+        mcpDebug('Reusing valid token from %s', validEditor.name);
+        token = validEditor.existingToken;
+    }
+    // Fall back to creating a new token
+    if (!token) {
+        try {
+            token = await createMCPToken();
+        } catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            mcpDebug('Error creating MCP token', error);
+            ux.warn(`Could not configure MCP: ${err.message}`);
+            ux.warn('You can set up MCP manually later using https://mcp.sanity.io');
+            return {
+                alreadyConfiguredEditors,
+                configuredEditors: [],
+                detectedEditors,
+                error: err,
+                skipped: false
+            };
+        }
+    }
+    // 7. Write configs for each selected editor
+    const configuredEditors = [];
     try {
         for (const editor of selected){
             await writeMCPConfig(editor, token);
+            configuredEditors.push(editor.name);
         }
     } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
@@ -70,15 +108,16 @@ const NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server f
         ux.warn(`Could not configure MCP: ${err.message}`);
         ux.warn('You can set up MCP manually later using https://mcp.sanity.io');
         return {
-            configuredEditors: [],
+            alreadyConfiguredEditors,
+            configuredEditors,
             detectedEditors,
             error: err,
             skipped: false
         };
     }
-    const configuredEditors = selected.map((e)=>e.name);
     ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`);
     return {
+        alreadyConfiguredEditors,
         configuredEditors,
         detectedEditors,
         skipped: false

package/dist/actions/mcp/setupMCP.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/mcp/setupMCP.ts"],"sourcesContent":["import {ux} from '@oclif/core'\nimport {subdebug} from '@sanity/cli-core'\nimport {logSymbols} from '@sanity/cli-core/ux'\n\nimport {createMCPToken, MCP_SERVER_URL} from '../../services/mcp.js'\nimport {detectAvailableEditors} from './detectAvailableEditors.js'\nimport {type EditorName} from './editorConfigs.js'\nimport {promptForMCPSetup} from './promptForMCPSetup.js'\nimport {writeMCPConfig} from './writeMCPConfig.js'\n\nconst mcpDebug = subdebug('mcp:setup')\n\nconst NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server for your editor. Visit ${MCP_SERVER_URL} for setup instructions.`\n\ninterface MCPSetupResult {\n  configuredEditors: EditorName[]\n  detectedEditors: EditorName[]\n  skipped: boolean\n\n  error?: Error\n}\n\n/**\n * Main MCP setup orchestration\n * Opt-out by default: runs automatically unless skipMcp flag is set\n */\nexport async function setupMCP(mcp?: boolean): Promise<MCPSetupResult> {\n  // 1. Check for explicit opt-out\n  if (mcp === false) {\n    ux.warn('Skipping MCP configuration due to --no-mcp flag')\n    return {\n      configuredEditors: [],\n      detectedEditors: [],\n      skipped: true,\n    }\n  }\n\n  // 2. Detect available editors (filters out unparseable configs)\n  const editors = await detectAvailableEditors()\n  const detectedEditors = editors.map((e) => e.name)\n\n  mcpDebug('Detected %d editors: %s', detectedEditors.length, detectedEditors)\n\n  if (editors.length === 0) {\n    ux.warn(NO_EDITORS_DETECTED_MESSAGE)\n    return {\n      configuredEditors: [],\n      detectedEditors,\n      skipped: true,\n    }\n  }\n\n  // 3. Prompt user (shows existing config status, only pre-selects unconfigured editors)\n  const selected = await promptForMCPSetup(editors)\n\n  if (!selected || selected.length === 0) {\n    // User deselected all editors\n    ux.stdout('MCP configuration skipped')\n    return {\n      configuredEditors: [],\n      detectedEditors,\n      skipped: true,\n    }\n  }\n\n  // 4. Create child token for MCP\n  let token: string\n  try {\n    token = await createMCPToken()\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error))\n    mcpDebug('Error creating MCP token', error)\n    ux.warn(`Could not configure MCP: ${err.message}`)\n    ux.warn('You can set up MCP manually later using https://mcp.sanity.io')\n    return {\n      configuredEditors: [],\n      detectedEditors,\n      error: err,\n      skipped: false,\n    }\n  }\n\n  // 5. Write configs for each selected editor\n  try {\n    for (const editor of selected) {\n      await writeMCPConfig(editor, token)\n    }\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error))\n    mcpDebug('Error writing MCP config', error)\n    ux.warn(`Could not configure MCP: ${err.message}`)\n    ux.warn('You can set up MCP manually later using https://mcp.sanity.io')\n    return {\n      configuredEditors: [],\n      detectedEditors,\n      error: err,\n      skipped: false,\n    }\n  }\n\n  const configuredEditors = selected.map((e) => e.name)\n  ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`)\n\n  return {\n    configuredEditors,\n    detectedEditors,\n    skipped: false,\n  }\n}\n"],"names":["ux","subdebug","logSymbols","createMCPToken","MCP_SERVER_URL","detectAvailableEditors","promptForMCPSetup","writeMCPConfig","mcpDebug","NO_EDITORS_DETECTED_MESSAGE","setupMCP","mcp","warn","configuredEditors","detectedEditors","skipped","editors","map","e","name","length","selected","stdout","token","error","err","Error","String","message","editor","success","join"],"mappings":"AAAA,SAAQA,EAAE,QAAO,cAAa;AAC9B,SAAQC,QAAQ,QAAO,mBAAkB;AACzC,SAAQC,UAAU,QAAO,sBAAqB;AAE9C,SAAQC,cAAc,EAAEC,cAAc,QAAO,wBAAuB;AACpE,SAAQC,sBAAsB,QAAO,8BAA6B;AAElE,SAAQC,iBAAiB,QAAO,yBAAwB;AACxD,SAAQC,cAAc,QAAO,sBAAqB;AAElD,MAAMC,WAAWP,SAAS;AAE1B,MAAMQ,8BAA8B,CAAC,iEAAiE,EAAEL,eAAe,wBAAwB,CAAC;AAUhJ;;;CAGC,GACD,OAAO,eAAeM,SAASC,GAAa;IAC1C,gCAAgC;IAChC,IAAIA,QAAQ,OAAO;QACjBX,GAAGY,IAAI,CAAC;QACR,OAAO;YACLC,mBAAmB,EAAE;YACrBC,iBAAiB,EAAE;YACnBC,SAAS;QACX;IACF;IAEA,gEAAgE;IAChE,MAAMC,UAAU,MAAMX;IACtB,MAAMS,kBAAkBE,QAAQC,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI;IAEjDX,SAAS,2BAA2BM,gBAAgBM,MAAM,EAAEN;IAE5D,IAAIE,QAAQI,MAAM,KAAK,GAAG;QACxBpB,GAAGY,IAAI,CAACH;QACR,OAAO;YACLI,mBAAmB,EAAE;YACrBC;YACAC,SAAS;QACX;IACF;IAEA,uFAAuF;IACvF,MAAMM,WAAW,MAAMf,kBAAkBU;IAEzC,IAAI,CAACK,YAAYA,SAASD,MAAM,KAAK,GAAG;QACtC,8BAA8B;QAC9BpB,GAAGsB,MAAM,CAAC;QACV,OAAO;YACLT,mBAAmB,EAAE;YACrBC;YACAC,SAAS;QACX;IACF;IAEA,gCAAgC;IAChC,IAAIQ;IACJ,IAAI;QACFA,QAAQ,MAAMpB;IAChB,EAAE,OAAOqB,OAAO;QACd,MAAMC,MAAMD,iBAAiBE,QAAQF,QAAQ,IAAIE,MAAMC,OAAOH;QAC9DhB,SAAS,4BAA4BgB;QACrCxB,GAAGY,IAAI,CAAC,CAAC,yBAAyB,EAAEa,IAAIG,OAAO,EAAE;QACjD5B,GAAGY,IAAI,CAAC;QACR,OAAO;YACLC,mBAAmB,EAAE;YACrBC;YACAU,OAAOC;YACPV,SAAS;QACX;IACF;IAEA,4CAA4C;IAC5C,IAAI;QACF,KAAK,MAAMc,UAAUR,SAAU;YAC7B,MAAMd,eAAesB,QAAQN;QAC/B;IACF,EAAE,OAAOC,OAAO;QACd,MAAMC,MAAMD,iBAAiBE,QAAQF,QAAQ,IAAIE,MAAMC,OAAOH;QAC9DhB,SAAS,4BAA4BgB;QACrCxB,GAAGY,IAAI,CAAC,CAAC,yBAAyB,EAAEa,IAAIG,OAAO,EAAE;QACjD5B,GAAGY,IAAI,CAAC;QACR,OAAO;YACLC,mBAAmB,EAAE;YACrBC;YACAU,OAAOC;YACPV,SAAS;QACX;IACF;IAEA,MAAMF,oBAAoBQ,SAASJ,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI;IACpDnB,GAAGsB,MAAM,CAAC,GAAGpB,WAAW4B,OAAO,CAAC,oBAAoB,EAAEjB,kBAAkBkB,IAAI,CAAC,OAAO;IAEpF,OAAO;QACLlB;QACAC;QACAC,SAAS;IACX;AACF"}
+{"version":3,"sources":["../../../src/actions/mcp/setupMCP.ts"],"sourcesContent":["import {ux} from '@oclif/core'\nimport {subdebug} from '@sanity/cli-core'\nimport {logSymbols} from '@sanity/cli-core/ux'\n\nimport {createMCPToken, MCP_SERVER_URL} from '../../services/mcp.js'\nimport {detectAvailableEditors} from './detectAvailableEditors.js'\nimport {type EditorName} from './editorConfigs.js'\nimport {promptForMCPSetup} from './promptForMCPSetup.js'\nimport {validateEditorTokens} from './validateEditorTokens.js'\nimport {writeMCPConfig} from './writeMCPConfig.js'\n\nconst mcpDebug = subdebug('mcp:setup')\n\nconst NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server for your editor. Visit ${MCP_SERVER_URL} for setup instructions.`\n\ninterface MCPSetupOptions {\n  /**\n   * Whether the user explicitly requested MCP configuration (e.g. `sanity mcp configure`).\n   * When true, shows status messages even when there's nothing to do.\n   * When false/undefined (e.g. called from `sanity init`), stays quiet.\n   */\n  explicit?: boolean\n\n  /**\n   * If true, skip MCP configuration entirely (e.g. --no-mcp flag).\n   */\n  skip?: boolean\n}\n\ninterface MCPSetupResult {\n  /** Editors that were already configured with valid credentials (nothing to do) */\n  alreadyConfiguredEditors: EditorName[]\n  configuredEditors: EditorName[]\n  detectedEditors: EditorName[]\n  skipped: boolean\n\n  error?: Error\n}\n\n/**\n * Main MCP setup orchestration\n * Opt-out by default: runs automatically unless skip option is set\n */\nexport async function setupMCP(options?: MCPSetupOptions): Promise<MCPSetupResult> {\n  const {explicit = false, skip = false} = options ?? {}\n\n  // 1. Check for explicit opt-out\n  if (skip) {\n    ux.warn('Skipping MCP configuration due to --no-mcp flag')\n    return {\n      alreadyConfiguredEditors: [],\n      configuredEditors: [],\n      detectedEditors: [],\n      skipped: true,\n    }\n  }\n\n  // 2. Detect available editors (filters out unparseable configs)\n  const editors = await detectAvailableEditors()\n  const detectedEditors = editors.map((e) => e.name)\n\n  mcpDebug('Detected %d editors: %s', detectedEditors.length, detectedEditors)\n\n  if (editors.length === 0) {\n    if (explicit) {\n      ux.warn(NO_EDITORS_DETECTED_MESSAGE)\n    }\n    return {\n      alreadyConfiguredEditors: [],\n      configuredEditors: [],\n      detectedEditors,\n      skipped: true,\n    }\n  }\n\n  // 3. Validate existing tokens against the Sanity API\n  await validateEditorTokens(editors)\n\n  // 4. Check if there's anything actionable\n  const actionable = editors.filter((e) => !e.configured || e.authStatus !== 'valid')\n\n  if (actionable.length === 0) {\n    mcpDebug('All editors configured with valid credentials')\n    const alreadyConfiguredEditors = editors\n      .filter((e) => e.configured && e.authStatus === 'valid')\n      .map((e) => e.name)\n    if (explicit) {\n      ux.stdout(`${logSymbols.success} All detected editors are already configured`)\n    }\n    return {\n      alreadyConfiguredEditors,\n      configuredEditors: [],\n      detectedEditors,\n      skipped: true,\n    }\n  }\n\n  // Non-actionable editors are already configured with valid credentials\n  const alreadyConfiguredEditors = editors.filter((e) => !actionable.includes(e)).map((e) => e.name)\n\n  // 5. Prompt user (shows only actionable editors, annotates auth issues)\n  const selected = await promptForMCPSetup(actionable)\n\n  if (!selected || selected.length === 0) {\n    // User deselected all editors\n    ux.stdout('MCP configuration skipped')\n    return {\n      alreadyConfiguredEditors,\n      configuredEditors: [],\n      detectedEditors,\n      skipped: true,\n    }\n  }\n\n  // 6. Get a token — reuse a valid existing one or create a new one\n  let token: string | undefined\n\n  // Look for an existing valid token we can reuse\n  const validEditor = editors.find((e) => e.authStatus === 'valid' && e.existingToken)\n  if (validEditor?.existingToken) {\n    mcpDebug('Reusing valid token from %s', validEditor.name)\n    token = validEditor.existingToken\n  }\n\n  // Fall back to creating a new token\n  if (!token) {\n    try {\n      token = await createMCPToken()\n    } catch (error) {\n      const err = error instanceof Error ? error : new Error(String(error))\n      mcpDebug('Error creating MCP token', error)\n      ux.warn(`Could not configure MCP: ${err.message}`)\n      ux.warn('You can set up MCP manually later using https://mcp.sanity.io')\n      return {\n        alreadyConfiguredEditors,\n        configuredEditors: [],\n        detectedEditors,\n        error: err,\n        skipped: false,\n      }\n    }\n  }\n\n  // 7. Write configs for each selected editor\n  const configuredEditors: EditorName[] = []\n  try {\n    for (const editor of selected) {\n      await writeMCPConfig(editor, token)\n      configuredEditors.push(editor.name)\n    }\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error))\n    mcpDebug('Error writing MCP config', error)\n    ux.warn(`Could not configure MCP: ${err.message}`)\n    ux.warn('You can set up MCP manually later using https://mcp.sanity.io')\n    return {\n      alreadyConfiguredEditors,\n      configuredEditors,\n      detectedEditors,\n      error: err,\n      skipped: false,\n    }\n  }\n\n  ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`)\n\n  return {\n    alreadyConfiguredEditors,\n    configuredEditors,\n    detectedEditors,\n    skipped: false,\n  }\n}\n"],"names":["ux","subdebug","logSymbols","createMCPToken","MCP_SERVER_URL","detectAvailableEditors","promptForMCPSetup","validateEditorTokens","writeMCPConfig","mcpDebug","NO_EDITORS_DETECTED_MESSAGE","setupMCP","options","explicit","skip","warn","alreadyConfiguredEditors","configuredEditors","detectedEditors","skipped","editors","map","e","name","length","actionable","filter","configured","authStatus","stdout","success","includes","selected","token","validEditor","find","existingToken","error","err","Error","String","message","editor","push","join"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/mcp/types.ts"],"sourcesContent":["import {type EditorName} from './editorConfigs.js'\n\nexport interface Editor {\n  configPath: string\n  /** Whether Sanity MCP is already configured for this editor */\n  configured: boolean\n  name: EditorName\n}\n"],"names":[],"mappings":"AAEA,WAKC"}
+{"version":3,"sources":["../../../src/actions/mcp/types.ts"],"sourcesContent":["import {type EditorName} from './editorConfigs.js'\n\n/** Auth credential status for a configured editor */\nexport type AuthStatus = 'unauthorized' | 'valid'\n\nexport interface Editor {\n  configPath: string\n  /** Whether Sanity MCP is already configured for this editor */\n  configured: boolean\n  name: EditorName\n\n  /**\n   * Auth status of the existing token. Only set for editors that have\n   * a Sanity MCP config with a token that has been validated against the API.\n   */\n  authStatus?: AuthStatus\n  /** The existing auth token found in the editor config, if any */\n  existingToken?: string\n}\n"],"names":[],"mappings":"AAKA,WAaC"}

package/dist/actions/mcp/validateEditorTokens.js

@@ -0,0 +1,56 @@
+import { subdebug } from '@sanity/cli-core';
+import { validateMCPToken } from '../../services/mcp.js';
+const debug = subdebug('mcp:validateEditorTokens');
+/**
+ * Validate existing MCP tokens for all configured editors.
+ *
+ * Collects unique tokens, validates each once against the Sanity API,
+ * and sets `authStatus` on each editor that has a token.
+ * Editors without a config or token are left unchanged.
+ */ export async function validateEditorTokens(editors) {
+    // Collect unique tokens and map them to their editors
+    const tokenToEditors = new Map();
+    for (const editor of editors){
+        if (editor.existingToken) {
+            const existing = tokenToEditors.get(editor.existingToken);
+            if (existing) {
+                existing.push(editor);
+            } else {
+                tokenToEditors.set(editor.existingToken, [
+                    editor
+                ]);
+            }
+        }
+    }
+    if (tokenToEditors.size === 0) {
+        debug('No existing tokens to validate');
+        return;
+    }
+    const editorCount = [
+        ...tokenToEditors.values()
+    ].reduce((sum, eds)=>sum + eds.length, 0);
+    debug('Validating %d unique token(s) across %d editor(s)', tokenToEditors.size, editorCount);
+    // Validate all unique tokens in parallel to avoid stacking timeouts
+    await Promise.all([
+        ...tokenToEditors.entries()
+    ].map(async ([token, tokenEditors])=>{
+        let status;
+        try {
+            const valid = await validateMCPToken(token);
+            status = valid ? 'valid' : 'unauthorized';
+        } catch (err) {
+            // Network errors, timeouts, or unexpected failures — assume the token
+            // is valid rather than falsely marking it as expired. We only mark
+            // tokens as unauthorized when the server explicitly says so (401/403).
+            debug('Token validation error (assuming valid): %s', err);
+            status = 'valid';
+        }
+        debug('Token ending ...%s is %s (used by %s)', token.slice(-4), status, tokenEditors.map((e)=>e.name).join(', '));
+        // Apply status to all editors sharing this token
+        for (const editor of tokenEditors){
+            editor.authStatus = status;
+        }
+    }));
+}
+
+//# sourceMappingURL=validateEditorTokens.js.map

package/dist/actions/mcp/validateEditorTokens.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/mcp/validateEditorTokens.ts"],"sourcesContent":["import {subdebug} from '@sanity/cli-core'\n\nimport {validateMCPToken} from '../../services/mcp.js'\nimport {type AuthStatus, type Editor} from './types.js'\n\nconst debug = subdebug('mcp:validateEditorTokens')\n\n/**\n * Validate existing MCP tokens for all configured editors.\n *\n * Collects unique tokens, validates each once against the Sanity API,\n * and sets `authStatus` on each editor that has a token.\n * Editors without a config or token are left unchanged.\n */\nexport async function validateEditorTokens(editors: Editor[]): Promise<void> {\n  // Collect unique tokens and map them to their editors\n  const tokenToEditors = new Map<string, Editor[]>()\n  for (const editor of editors) {\n    if (editor.existingToken) {\n      const existing = tokenToEditors.get(editor.existingToken)\n      if (existing) {\n        existing.push(editor)\n      } else {\n        tokenToEditors.set(editor.existingToken, [editor])\n      }\n    }\n  }\n\n  if (tokenToEditors.size === 0) {\n    debug('No existing tokens to validate')\n    return\n  }\n\n  const editorCount = [...tokenToEditors.values()].reduce((sum, eds) => sum + eds.length, 0)\n  debug('Validating %d unique token(s) across %d editor(s)', tokenToEditors.size, editorCount)\n\n  // Validate all unique tokens in parallel to avoid stacking timeouts\n  await Promise.all(\n    [...tokenToEditors.entries()].map(async ([token, tokenEditors]) => {\n      let status: AuthStatus\n      try {\n        const valid = await validateMCPToken(token)\n        status = valid ? 'valid' : 'unauthorized'\n      } catch (err) {\n        // Network errors, timeouts, or unexpected failures — assume the token\n        // is valid rather than falsely marking it as expired. We only mark\n        // tokens as unauthorized when the server explicitly says so (401/403).\n        debug('Token validation error (assuming valid): %s', err)\n        status = 'valid'\n      }\n\n      debug(\n        'Token ending ...%s is %s (used by %s)',\n        token.slice(-4),\n        status,\n        tokenEditors.map((e) => e.name).join(', '),\n      )\n\n      // Apply status to all editors sharing this token\n      for (const editor of tokenEditors) {\n        editor.authStatus = status\n      }\n    }),\n  )\n}\n"],"names":["subdebug","validateMCPToken","debug","validateEditorTokens","editors","tokenToEditors","Map","editor","existingToken","existing","get","push","set","size","editorCount","values","reduce","sum","eds","length","Promise","all","entries","map","token","tokenEditors","status","valid","err","slice","e","name","join","authStatus"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,mBAAkB;AAEzC,SAAQC,gBAAgB,QAAO,wBAAuB;AAGtD,MAAMC,QAAQF,SAAS;AAEvB;;;;;;CAMC,GACD,OAAO,eAAeG,qBAAqBC,OAAiB;IAC1D,sDAAsD;IACtD,MAAMC,iBAAiB,IAAIC;IAC3B,KAAK,MAAMC,UAAUH,QAAS;QAC5B,IAAIG,OAAOC,aAAa,EAAE;YACxB,MAAMC,WAAWJ,eAAeK,GAAG,CAACH,OAAOC,aAAa;YACxD,IAAIC,UAAU;gBACZA,SAASE,IAAI,CAACJ;YAChB,OAAO;gBACLF,eAAeO,GAAG,CAACL,OAAOC,aAAa,EAAE;oBAACD;iBAAO;YACnD;QACF;IACF;IAEA,IAAIF,eAAeQ,IAAI,KAAK,GAAG;QAC7BX,MAAM;QACN;IACF;IAEA,MAAMY,cAAc;WAAIT,eAAeU,MAAM;KAAG,CAACC,MAAM,CAAC,CAACC,KAAKC,MAAQD,MAAMC,IAAIC,MAAM,EAAE;IACxFjB,MAAM,qDAAqDG,eAAeQ,IAAI,EAAEC;IAEhF,oEAAoE;IACpE,MAAMM,QAAQC,GAAG,CACf;WAAIhB,eAAeiB,OAAO;KAAG,CAACC,GAAG,CAAC,OAAO,CAACC,OAAOC,aAAa;QAC5D,IAAIC;QACJ,IAAI;YACF,MAAMC,QAAQ,MAAM1B,iBAAiBuB;YACrCE,SAASC,QAAQ,UAAU;QAC7B,EAAE,OAAOC,KAAK;YACZ,sEAAsE;YACtE,mEAAmE;YACnE,uEAAuE;YACvE1B,MAAM,+CAA+C0B;YACrDF,SAAS;QACX;QAEAxB,MACE,yCACAsB,MAAMK,KAAK,CAAC,CAAC,IACbH,QACAD,aAAaF,GAAG,CAAC,CAACO,IAAMA,EAAEC,IAAI,EAAEC,IAAI,CAAC;QAGvC,iDAAiD;QACjD,KAAK,MAAMzB,UAAUkB,aAAc;YACjClB,OAAO0B,UAAU,GAAGP;QACtB;IACF;AAEJ"}

package/dist/actions/telemetry/telemetryDebug.js

@@ -1,4 +1,4 @@
-import { subdebug } from '@sanity/cli-core';
-export const telemetryDebug = subdebug('telemetry');
+import debugIt from 'debug';
+export const telemetryDebug = debugIt('telemetry:sanity:cli');
 
 //# sourceMappingURL=telemetryDebug.js.map

package/dist/actions/telemetry/telemetryDebug.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/telemetry/telemetryDebug.ts"],"sourcesContent":["import {subdebug} from '@sanity/cli-core'\n\nexport const telemetryDebug = subdebug('telemetry')\n"],"names":["subdebug","telemetryDebug"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,mBAAkB;AAEzC,OAAO,MAAMC,iBAAiBD,SAAS,aAAY"}
+{"version":3,"sources":["../../../src/actions/telemetry/telemetryDebug.ts"],"sourcesContent":["import debugIt from 'debug'\n\nexport const telemetryDebug = debugIt('telemetry:sanity:cli')\n"],"names":["debugIt","telemetryDebug"],"mappings":"AAAA,OAAOA,aAAa,QAAO;AAE3B,OAAO,MAAMC,iBAAiBD,QAAQ,wBAAuB"}

package/dist/commands/init.js

@@ -399,7 +399,9 @@ export class InitCommand extends SanityCommand {
             workDir
         });
         // Set up MCP integration
-        const mcpResult = await setupMCP(this.flags.mcp);
+        const mcpResult = await setupMCP({
+            skip: !this.flags.mcp
+        });
         this._trace.log({
             configuredEditors: mcpResult.configuredEditors,
             detectedEditors: mcpResult.detectedEditors,
@@ -410,6 +412,12 @@ export class InitCommand extends SanityCommand {
             this._trace.error(mcpResult.error);
         }
         const mcpConfigured = mcpResult.configuredEditors;
+        // Show checkmark for editors that were already configured
+        const { alreadyConfiguredEditors } = mcpResult;
+        if (alreadyConfiguredEditors.length > 0) {
+            const label = alreadyConfiguredEditors.length === 1 ? `${alreadyConfiguredEditors[0]} already configured for Sanity MCP` : `${alreadyConfiguredEditors.length} editors already configured for Sanity MCP`;
+            spinner(label).start().succeed();
+        }
         if (isNextJs) {
             await checkNextJsReactCompatibility({
                 detectedFramework,
@@ -751,11 +759,9 @@ export class InitCommand extends SanityCommand {
                 userAction: 'none'
             };
         }
-        const datasetInfo = 'Your content will be stored in a dataset that can be public or private, depending on\nwhether you want to query your content with or without authentication.\nThe default dataset configuration has a public dataset named "production".';
         if (datasets.length === 0) {
             debug('No datasets found for project, prompting for name');
             if (opts.showDefaultConfigPrompt) {
-                this.log(datasetInfo);
                 defaultConfig = await promptForDefaultConfig();
             }
             const name = defaultConfig ? 'production' : await promptForDatasetName({
@@ -793,7 +799,6 @@ export class InitCommand extends SanityCommand {
             const existingDatasetNames = datasets.map((ds)=>ds.name);
             debug('User wants to create a new dataset, prompting for name');
             if (opts.showDefaultConfigPrompt && !existingDatasetNames.includes('production')) {
-                this.log(datasetInfo);
                 defaultConfig = await promptForDefaultConfig();
             }
             const newDatasetName = defaultConfig ? 'production' : await promptForDatasetName({