@sanity/cli 6.6.0 → 6.7.0

package/dist/actions/mcp/setupMCP.js

@@ -2,30 +2,116 @@ import { ux } from '@oclif/core';
 import { subdebug } from '@sanity/cli-core';
 import { logSymbols } from '@sanity/cli-core/ux';
 import { createMCPToken, MCP_SERVER_URL } from '../../services/mcp.js';
+import { readSkillState } from '../skills/readSkillState.js';
+import { SANITY_SKILL_NAME } from '../skills/setupSkills.js';
 import { detectAvailableEditors } from './detectAvailableEditors.js';
-import { EDITOR_CONFIGS } from './editorConfigs.js';
+import { EDITOR_CONFIGS, getSkillsCliAgent, getSkillsCliAgentDisplayName } from './editorConfigs.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 skip option is set
+ * Classify each editor into one of four actions based on MCP status and
+ * whether a Sanity skill is already installed for its skills-CLI agent.
+ */ function classifyEditors(editors) {
+    return editors.map((editor)=>{
+        const needsMCP = !editor.configured || editor.authStatus !== 'valid';
+        const skillsCliAgent = getSkillsCliAgent(editor.name);
+        const hasSkillMapping = Boolean(skillsCliAgent);
+        const skillInstalled = editor.skillInstalled === true;
+        if (needsMCP) {
+            return {
+                action: hasSkillMapping ? 'mcp-and-skill' : 'mcp-only',
+                editor
+            };
+        }
+        if (hasSkillMapping && !skillInstalled) {
+            return {
+                action: 'skill-only',
+                editor
+            };
+        }
+        return {
+            action: 'none',
+            editor
+        };
+    });
+}
+/**
+ * Apply masking based on the configured modes. `skip` modes mute the
+ * corresponding action so we never prompt for or run work the user opted out
+ * of via `--no-mcp` / `--no-skills`.
+ */ function applyMasking(classified, mcpMode, skillsMode) {
+    const actionable = [];
+    for (const { action, editor } of classified){
+        if (action === 'none') continue;
+        if (mcpMode === 'skip' && skillsMode === 'skip') continue;
+        if (mcpMode === 'skip') {
+            // No MCP writes — keep only skill-only / mcp-and-skill (downgraded to skill-only)
+            if (action === 'mcp-only') continue;
+            if (action === 'mcp-and-skill') {
+                actionable.push({
+                    action: 'skill-only',
+                    editor
+                });
+                continue;
+            }
+            actionable.push({
+                action,
+                editor
+            });
+            continue;
+        }
+        if (skillsMode === 'skip') {
+            // No skill install — drop skill-only, downgrade mcp-and-skill → mcp-only
+            if (action === 'skill-only') continue;
+            if (action === 'mcp-and-skill') {
+                actionable.push({
+                    action: 'mcp-only',
+                    editor
+                });
+                continue;
+            }
+            actionable.push({
+                action,
+                editor
+            });
+            continue;
+        }
+        actionable.push({
+            action,
+            editor
+        });
+    }
+    return actionable;
+}
+function getPromptMessage(mcpMode, skillsMode) {
+    if (mcpMode === 'skip') return 'Install Sanity agent skills for these editors?';
+    if (skillsMode === 'skip') return 'Configure Sanity MCP server?';
+    return 'Configure Sanity MCP and install agent skills for these editors?';
+}
+/**
+ * Main MCP setup orchestration.
+ *
+ * When `skillsMode !== 'skip'`, the prompt combines MCP and skill offers,
+ * and the result includes `skillsToInstall` — agent IDs the caller should
+ * install via `setupSkills`. `setupMCP` itself never installs skills.
  */ export async function setupMCP(options) {
-    const { explicit = false, mode = 'prompt' } = options ?? {};
-    // 1. Check for explicit opt-out
-    if (mode === 'skip') {
-        mcpDebug('Skipping MCP configuration (mode: skip)');
+    const { explicit = false, mode: mcpMode = 'prompt', skillsMode = 'skip' } = options ?? {};
+    // 1. Both opted out → nothing to do.
+    if (mcpMode === 'skip' && skillsMode === 'skip') {
+        mcpDebug('Skipping setup (mcpMode: skip, skillsMode: skip)');
         return {
             alreadyConfiguredEditors: [],
             configuredEditors: [],
             detectedEditors: [],
+            skillsToInstall: [],
             skipped: true
         };
     }
     // 2. Detect available editors (filters out unparseable configs)
-    const editors = await detectAvailableEditors();
+    const editors = options?.editors ?? await detectAvailableEditors();
     const detectedEditors = editors.map((e)=>e.name);
     mcpDebug('Detected %d editors: %s', detectedEditors.length, detectedEditors);
     if (editors.length === 0) {
@@ -36,16 +122,31 @@ const NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server f
             alreadyConfiguredEditors: [],
             configuredEditors: [],
             detectedEditors,
+            skillsToInstall: [],
             skipped: true
         };
     }
     // 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');
+    // 4. Read skill state when skills are in scope so classification can dedup
+    if (skillsMode !== 'skip') {
+        const { installedAgentDisplayNames } = await readSkillState({
+            skillName: SANITY_SKILL_NAME
+        });
+        for (const editor of editors){
+            const displayName = getSkillsCliAgentDisplayName(editor.name);
+            editor.skillInstalled = displayName ? installedAgentDisplayNames.has(displayName) : false;
+        }
+    }
+    // 5. Classify + mask
+    const classified = classifyEditors(editors);
+    const actionable = applyMasking(classified, mcpMode, skillsMode);
+    // "Already configured" surfaces editors whose MCP setup is valid (skill
+    // state doesn't matter for this signal — that's what skillsToInstall is for).
+    const actionableNames = new Set(actionable.map((c)=>c.editor.name));
+    const alreadyConfiguredEditors = editors.filter((e)=>e.configured && e.authStatus === 'valid' && !actionableNames.has(e.name)).map((e)=>e.name);
     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);
+        mcpDebug('Nothing actionable after classification + masking');
         if (explicit) {
             ux.stdout(`${logSymbols.success} All detected editors are already configured`);
         }
@@ -53,76 +154,94 @@ const NO_EDITORS_DETECTED_MESSAGE = `Couldn't auto-configure Sanity MCP server f
             alreadyConfiguredEditors,
             configuredEditors: [],
             detectedEditors,
+            skillsToInstall: [],
             skipped: true
         };
     }
-    // Non-actionable editors are already configured with valid credentials
-    const alreadyConfiguredEditors = editors.filter((e)=>!actionable.includes(e)).map((e)=>e.name);
-    // 5. Select editors to configure — prompt interactively or auto-select all
-    const selected = mode === 'auto' ? actionable : await promptForMCPSetup(actionable);
+    // 6. Select editors to configure — prompt interactively or auto-select all.
+    // We only auto when neither side wants a prompt: MCP auto, or (MCP skip
+    // + skills auto). Anything that asks `mode: 'prompt'` for MCP wins the
+    // prompt even when skills would have auto-installed.
+    const shouldAuto = mcpMode === 'auto' || mcpMode === 'skip' && skillsMode === 'auto';
+    const selected = shouldAuto ? actionable : await promptForMCPSetup({
+        choices: actionable,
+        message: getPromptMessage(mcpMode, skillsMode)
+    });
     if (!selected || selected.length === 0) {
-        // User deselected all editors
         ux.stdout('MCP configuration skipped');
         return {
             alreadyConfiguredEditors,
             configuredEditors: [],
             detectedEditors,
+            skillsToInstall: [],
             skipped: true
         };
     }
-    // 6. Get a token — reuse a valid existing one or create a new one
+    // 7. MCP write phase — only for choices that need MCP
+    const mcpSelected = selected.filter((c)=>c.action === 'mcp-only' || c.action === 'mcp-and-skill');
     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;
-    }
-    const allOAuth = selected.every((e)=>EDITOR_CONFIGS[e.name].oauthOnly);
-    // Fall back to creating a new token
-    // If all editors use OAuth, we don't need to create a token
-    if (!token && !allOAuth) {
-        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
-            };
+    const configuredEditors = [];
+    let mcpError;
+    if (mcpSelected.length > 0) {
+        const validEditor = editors.find((e)=>e.authStatus === 'valid' && e.existingToken);
+        if (validEditor?.existingToken) {
+            mcpDebug('Reusing valid token from %s', validEditor.name);
+            token = validEditor.existingToken;
+        }
+        const allOAuth = mcpSelected.every((c)=>EDITOR_CONFIGS[c.editor.name].oauthOnly);
+        if (!token && !allOAuth) {
+            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');
+                mcpError = err;
+            }
+        }
+        if (!mcpError) {
+            for (const choice of mcpSelected){
+                try {
+                    await writeMCPConfig(choice.editor, token);
+                    configuredEditors.push(choice.editor.name);
+                } catch (error) {
+                    const err = error instanceof Error ? error : new Error(String(error));
+                    mcpDebug('Error writing MCP config for %s: %O', choice.editor.name, error);
+                    ux.warn(`Could not configure MCP for ${choice.editor.name}: ${err.message}`);
+                    ux.warn('You can set up MCP manually later using https://mcp.sanity.io');
+                    mcpError = err;
+                }
+            }
+        }
+        if (configuredEditors.length > 0) {
+            ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`);
         }
     }
-    // 7. Write configs for each selected editor
-    const configuredEditors = [];
-    try {
-        for (const editor of selected){
-            await writeMCPConfig(editor, token);
-            configuredEditors.push(editor.name);
+    // 8. Build skillsToInstall — only for choices the user kept, only when the
+    // associated MCP write succeeded (or wasn't needed).
+    const skillsToInstall = [];
+    if (skillsMode !== 'skip') {
+        for (const choice of selected){
+            if (choice.action === 'skill-only') {
+                const agent = getSkillsCliAgent(choice.editor.name);
+                if (agent) skillsToInstall.push(agent);
+                continue;
+            }
+            if (choice.action === 'mcp-and-skill' && configuredEditors.includes(choice.editor.name)) {
+                const agent = getSkillsCliAgent(choice.editor.name);
+                if (agent) skillsToInstall.push(agent);
+            }
         }
-    } catch (error) {
-        const err = error instanceof Error ? error : new Error(String(error));
-        mcpDebug('Error writing MCP config', 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
-        };
     }
-    ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`);
     return {
         alreadyConfiguredEditors,
         configuredEditors,
         detectedEditors,
+        error: mcpError,
+        skillsToInstall: [
+            ...new Set(skillsToInstall)
+        ],
         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 {EDITOR_CONFIGS, 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   * Controls how MCP setup behaves:\n   * - 'prompt': Ask the user which editors to configure (default)\n   * - 'auto': Auto-configure all detected editors without prompting\n   * - 'skip': Skip MCP configuration entirely\n   */\n  mode?: 'auto' | 'prompt' | 'skip'\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, mode = 'prompt'} = options ?? {}\n\n  // 1. Check for explicit opt-out\n  if (mode === 'skip') {\n    mcpDebug('Skipping MCP configuration (mode: skip)')\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. Select editors to configure — prompt interactively or auto-select all\n  const selected = mode === 'auto' ? actionable : 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  const allOAuth = selected.every((e) => EDITOR_CONFIGS[e.name].oauthOnly)\n\n  // Fall back to creating a new token\n  // If all editors use OAuth, we don't need to create a token\n  if (!token && !allOAuth) {\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","EDITOR_CONFIGS","promptForMCPSetup","validateEditorTokens","writeMCPConfig","mcpDebug","NO_EDITORS_DETECTED_MESSAGE","setupMCP","options","explicit","mode","alreadyConfiguredEditors","configuredEditors","detectedEditors","skipped","editors","map","e","name","length","warn","actionable","filter","configured","authStatus","stdout","success","includes","selected","token","validEditor","find","existingToken","allOAuth","every","oauthOnly","error","err","Error","String","message","editor","push","join"],"mappings":"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"}
+{"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 {readSkillState} from '../skills/readSkillState.js'\nimport {SANITY_SKILL_NAME} from '../skills/setupSkills.js'\nimport {detectAvailableEditors} from './detectAvailableEditors.js'\nimport {\n  EDITOR_CONFIGS,\n  type EditorName,\n  getSkillsCliAgent,\n  getSkillsCliAgentDisplayName,\n} from './editorConfigs.js'\nimport {type EditorAction, type EditorChoice, promptForMCPSetup} from './promptForMCPSetup.js'\nimport {type Editor} from './types.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\ntype Mode = 'auto' | 'prompt' | 'skip'\n\ninterface MCPSetupOptions {\n  /**\n   * Pre-detected editors. When omitted, `detectAvailableEditors()` is called.\n   * Accepting this from the caller avoids re-running detection (which probes\n   * the filesystem and shells out to CLI binaries) when the result is already\n   * available — e.g. when `sanity init` runs both MCP and skills setup.\n   */\n  editors?: Editor[]\n\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   * Controls how MCP setup behaves:\n   * - 'prompt': Ask the user which editors to configure (default)\n   * - 'auto': Auto-configure all detected editors without prompting\n   * - 'skip': Skip MCP configuration entirely\n   */\n  mode?: Mode\n\n  /**\n   * Controls whether skills install is also offered in the same prompt:\n   * - 'prompt': Combine MCP + skills offers in one checkbox\n   * - 'auto': Combine, but skip the prompt and select everything\n   * - 'skip' (default): Skip skills entirely — today's MCP-only behavior\n   */\n  skillsMode?: Mode\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  /** Skills-CLI agent IDs that the caller should install. Deduplicated. */\n  skillsToInstall: string[]\n  skipped: boolean\n\n  error?: Error\n}\n\ninterface ClassifiedEditor {\n  action: 'none' | EditorAction\n  editor: Editor\n}\n\n/**\n * Classify each editor into one of four actions based on MCP status and\n * whether a Sanity skill is already installed for its skills-CLI agent.\n */\nfunction classifyEditors(editors: Editor[]): ClassifiedEditor[] {\n  return editors.map((editor) => {\n    const needsMCP = !editor.configured || editor.authStatus !== 'valid'\n    const skillsCliAgent = getSkillsCliAgent(editor.name)\n    const hasSkillMapping = Boolean(skillsCliAgent)\n    const skillInstalled = editor.skillInstalled === true\n\n    if (needsMCP) {\n      return {action: hasSkillMapping ? 'mcp-and-skill' : 'mcp-only', editor}\n    }\n    if (hasSkillMapping && !skillInstalled) {\n      return {action: 'skill-only', editor}\n    }\n    return {action: 'none', editor}\n  })\n}\n\n/**\n * Apply masking based on the configured modes. `skip` modes mute the\n * corresponding action so we never prompt for or run work the user opted out\n * of via `--no-mcp` / `--no-skills`.\n */\nfunction applyMasking(\n  classified: ClassifiedEditor[],\n  mcpMode: Mode,\n  skillsMode: Mode,\n): EditorChoice[] {\n  const actionable: EditorChoice[] = []\n\n  for (const {action, editor} of classified) {\n    if (action === 'none') continue\n\n    if (mcpMode === 'skip' && skillsMode === 'skip') continue\n\n    if (mcpMode === 'skip') {\n      // No MCP writes — keep only skill-only / mcp-and-skill (downgraded to skill-only)\n      if (action === 'mcp-only') continue\n      if (action === 'mcp-and-skill') {\n        actionable.push({action: 'skill-only', editor})\n        continue\n      }\n      actionable.push({action, editor})\n      continue\n    }\n\n    if (skillsMode === 'skip') {\n      // No skill install — drop skill-only, downgrade mcp-and-skill → mcp-only\n      if (action === 'skill-only') continue\n      if (action === 'mcp-and-skill') {\n        actionable.push({action: 'mcp-only', editor})\n        continue\n      }\n      actionable.push({action, editor})\n      continue\n    }\n\n    actionable.push({action, editor})\n  }\n\n  return actionable\n}\n\nfunction getPromptMessage(mcpMode: Mode, skillsMode: Mode): string {\n  if (mcpMode === 'skip') return 'Install Sanity agent skills for these editors?'\n  if (skillsMode === 'skip') return 'Configure Sanity MCP server?'\n  return 'Configure Sanity MCP and install agent skills for these editors?'\n}\n\n/**\n * Main MCP setup orchestration.\n *\n * When `skillsMode !== 'skip'`, the prompt combines MCP and skill offers,\n * and the result includes `skillsToInstall` — agent IDs the caller should\n * install via `setupSkills`. `setupMCP` itself never installs skills.\n */\nexport async function setupMCP(options?: MCPSetupOptions): Promise<MCPSetupResult> {\n  const {explicit = false, mode: mcpMode = 'prompt', skillsMode = 'skip'} = options ?? {}\n\n  // 1. Both opted out → nothing to do.\n  if (mcpMode === 'skip' && skillsMode === 'skip') {\n    mcpDebug('Skipping setup (mcpMode: skip, skillsMode: skip)')\n    return {\n      alreadyConfiguredEditors: [],\n      configuredEditors: [],\n      detectedEditors: [],\n      skillsToInstall: [],\n      skipped: true,\n    }\n  }\n\n  // 2. Detect available editors (filters out unparseable configs)\n  const editors = options?.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      skillsToInstall: [],\n      skipped: true,\n    }\n  }\n\n  // 3. Validate existing tokens against the Sanity API\n  await validateEditorTokens(editors)\n\n  // 4. Read skill state when skills are in scope so classification can dedup\n  if (skillsMode !== 'skip') {\n    const {installedAgentDisplayNames} = await readSkillState({skillName: SANITY_SKILL_NAME})\n    for (const editor of editors) {\n      const displayName = getSkillsCliAgentDisplayName(editor.name)\n      editor.skillInstalled = displayName ? installedAgentDisplayNames.has(displayName) : false\n    }\n  }\n\n  // 5. Classify + mask\n  const classified = classifyEditors(editors)\n  const actionable = applyMasking(classified, mcpMode, skillsMode)\n\n  // \"Already configured\" surfaces editors whose MCP setup is valid (skill\n  // state doesn't matter for this signal — that's what skillsToInstall is for).\n  const actionableNames = new Set(actionable.map((c) => c.editor.name))\n  const alreadyConfiguredEditors = editors\n    .filter((e) => e.configured && e.authStatus === 'valid' && !actionableNames.has(e.name))\n    .map((e) => e.name)\n\n  if (actionable.length === 0) {\n    mcpDebug('Nothing actionable after classification + masking')\n    if (explicit) {\n      ux.stdout(`${logSymbols.success} All detected editors are already configured`)\n    }\n    return {\n      alreadyConfiguredEditors,\n      configuredEditors: [],\n      detectedEditors,\n      skillsToInstall: [],\n      skipped: true,\n    }\n  }\n\n  // 6. Select editors to configure — prompt interactively or auto-select all.\n  // We only auto when neither side wants a prompt: MCP auto, or (MCP skip\n  // + skills auto). Anything that asks `mode: 'prompt'` for MCP wins the\n  // prompt even when skills would have auto-installed.\n  const shouldAuto = mcpMode === 'auto' || (mcpMode === 'skip' && skillsMode === 'auto')\n  const selected = shouldAuto\n    ? actionable\n    : await promptForMCPSetup({\n        choices: actionable,\n        message: getPromptMessage(mcpMode, skillsMode),\n      })\n\n  if (!selected || selected.length === 0) {\n    ux.stdout('MCP configuration skipped')\n    return {\n      alreadyConfiguredEditors,\n      configuredEditors: [],\n      detectedEditors,\n      skillsToInstall: [],\n      skipped: true,\n    }\n  }\n\n  // 7. MCP write phase — only for choices that need MCP\n  const mcpSelected = selected.filter(\n    (c) => c.action === 'mcp-only' || c.action === 'mcp-and-skill',\n  )\n\n  let token: string | undefined\n  const configuredEditors: EditorName[] = []\n  let mcpError: Error | undefined\n\n  if (mcpSelected.length > 0) {\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    const allOAuth = mcpSelected.every((c) => EDITOR_CONFIGS[c.editor.name].oauthOnly)\n\n    if (!token && !allOAuth) {\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        mcpError = err\n      }\n    }\n\n    if (!mcpError) {\n      for (const choice of mcpSelected) {\n        try {\n          await writeMCPConfig(choice.editor, token)\n          configuredEditors.push(choice.editor.name)\n        } catch (error) {\n          const err = error instanceof Error ? error : new Error(String(error))\n          mcpDebug('Error writing MCP config for %s: %O', choice.editor.name, error)\n          ux.warn(`Could not configure MCP for ${choice.editor.name}: ${err.message}`)\n          ux.warn('You can set up MCP manually later using https://mcp.sanity.io')\n          mcpError = err\n        }\n      }\n    }\n\n    if (configuredEditors.length > 0) {\n      ux.stdout(`${logSymbols.success} MCP configured for ${configuredEditors.join(', ')}`)\n    }\n  }\n\n  // 8. Build skillsToInstall — only for choices the user kept, only when the\n  // associated MCP write succeeded (or wasn't needed).\n  const skillsToInstall: string[] = []\n  if (skillsMode !== 'skip') {\n    for (const choice of selected) {\n      if (choice.action === 'skill-only') {\n        const agent = getSkillsCliAgent(choice.editor.name)\n        if (agent) skillsToInstall.push(agent)\n        continue\n      }\n      if (choice.action === 'mcp-and-skill' && configuredEditors.includes(choice.editor.name)) {\n        const agent = getSkillsCliAgent(choice.editor.name)\n        if (agent) skillsToInstall.push(agent)\n      }\n    }\n  }\n\n  return {\n    alreadyConfiguredEditors,\n    configuredEditors,\n    detectedEditors,\n    error: mcpError,\n    skillsToInstall: [...new Set(skillsToInstall)],\n    skipped: false,\n  }\n}\n"],"names":["ux","subdebug","logSymbols","createMCPToken","MCP_SERVER_URL","readSkillState","SANITY_SKILL_NAME","detectAvailableEditors","EDITOR_CONFIGS","getSkillsCliAgent","getSkillsCliAgentDisplayName","promptForMCPSetup","validateEditorTokens","writeMCPConfig","mcpDebug","NO_EDITORS_DETECTED_MESSAGE","classifyEditors","editors","map","editor","needsMCP","configured","authStatus","skillsCliAgent","name","hasSkillMapping","Boolean","skillInstalled","action","applyMasking","classified","mcpMode","skillsMode","actionable","push","getPromptMessage","setupMCP","options","explicit","mode","alreadyConfiguredEditors","configuredEditors","detectedEditors","skillsToInstall","skipped","e","length","warn","installedAgentDisplayNames","skillName","displayName","has","actionableNames","Set","c","filter","stdout","success","shouldAuto","selected","choices","message","mcpSelected","token","mcpError","validEditor","find","existingToken","allOAuth","every","oauthOnly","error","err","Error","String","choice","join","agent","includes"],"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\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"}
+{"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   * Whether the Sanity agent skill is already installed globally for this\n   * editor's skills-CLI agent. Populated during setup classification when\n   * skill state has been probed; absent when skill installation isn't being\n   * considered (e.g. `mcp configure`).\n   */\n  skillInstalled?: boolean\n}\n"],"names":[],"mappings":"AAKA,WAoBC"}

package/dist/actions/schema/deploySchemas.js

@@ -1,6 +1,6 @@
+import { SchemaExtractionError } from '@sanity/cli-build/_internal/extract';
 import { studioWorkerTask } from '@sanity/cli-core';
 import { updateWorkspacesSchemas } from './updateWorkspaceSchema.js';
-import { SchemaExtractionError } from './utils/SchemaExtractionError.js';
 export async function deploySchemas(options) {
     const { tag, verbose, workDir, workspaceName } = options;
     const result = await studioWorkerTask(new URL('extractSanityWorkspace.worker.js', import.meta.url), {

package/dist/actions/schema/deploySchemas.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/deploySchemas.ts"],"sourcesContent":["import {studioWorkerTask} from '@sanity/cli-core'\nimport {type SchemaValidationProblemGroup} from '@sanity/types'\nimport {type Workspace} from 'sanity'\n\nimport {type ManifestSchemaType} from '../manifest/types.js'\nimport {type ExtractWorkspaceWorkerData} from './types.js'\nimport {updateWorkspacesSchemas, type WorkspaceSchemaInput} from './updateWorkspaceSchema.js'\nimport {SchemaExtractionError} from './utils/SchemaExtractionError.js'\n\ninterface DeploySchemasOptions {\n  verbose: boolean\n  workDir: string\n\n  tag?: string\n  workspaceName?: string\n}\n\ntype WorkspaceWithManifest = Workspace & {manifestSchema: ManifestSchemaType[]}\n\ntype ExtractWorkspaceWorkerMessage =\n  | {\n      error: string\n      type: 'error'\n      validation?: SchemaValidationProblemGroup[]\n    }\n  | {\n      type: 'success'\n      workspaces: WorkspaceWithManifest[]\n    }\n\nexport async function deploySchemas(options: DeploySchemasOptions): Promise<void> {\n  const {tag, verbose, workDir, workspaceName} = options\n\n  const result = await studioWorkerTask<ExtractWorkspaceWorkerMessage>(\n    new URL('extractSanityWorkspace.worker.js', import.meta.url),\n    {\n      name: 'extractSanityWorkspace',\n      studioRootPath: workDir,\n      workerData: {\n        configPath: workDir,\n        workDir,\n      } satisfies ExtractWorkspaceWorkerData,\n    },\n  )\n\n  if (result.type === 'error') {\n    throw new SchemaExtractionError(result.error, result.validation)\n  }\n\n  const workspaces: WorkspaceSchemaInput[] = result.workspaces\n    .filter((workspace) => !workspaceName || workspace.name === workspaceName)\n    .map((workspace) => ({\n      dataset: workspace.dataset,\n      manifestSchema: workspace.manifestSchema,\n      name: workspace.name,\n      projectId: workspace.projectId,\n      title: workspace.title,\n    }))\n\n  if (workspaces.length === 0) {\n    const error = workspaceName\n      ? new Error(`Found no workspaces named \"${workspaceName}\"`)\n      : new Error('No workspaces found')\n    throw error\n  }\n\n  await updateWorkspacesSchemas({\n    tag,\n    verbose,\n    workspaces,\n  })\n}\n"],"names":["studioWorkerTask","updateWorkspacesSchemas","SchemaExtractionError","deploySchemas","options","tag","verbose","workDir","workspaceName","result","URL","url","name","studioRootPath","workerData","configPath","type","error","validation","workspaces","filter","workspace","map","dataset","manifestSchema","projectId","title","length","Error"],"mappings":"AAAA,SAAQA,gBAAgB,QAAO,mBAAkB;AAMjD,SAAQC,uBAAuB,QAAkC,6BAA4B;AAC7F,SAAQC,qBAAqB,QAAO,mCAAkC;AAuBtE,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,OAAO,EAAEC,aAAa,EAAC,GAAGJ;IAE/C,MAAMK,SAAS,MAAMT,iBACnB,IAAIU,IAAI,oCAAoC,YAAYC,GAAG,GAC3D;QACEC,MAAM;QACNC,gBAAgBN;QAChBO,YAAY;YACVC,YAAYR;YACZA;QACF;IACF;IAGF,IAAIE,OAAOO,IAAI,KAAK,SAAS;QAC3B,MAAM,IAAId,sBAAsBO,OAAOQ,KAAK,EAAER,OAAOS,UAAU;IACjE;IAEA,MAAMC,aAAqCV,OAAOU,UAAU,CACzDC,MAAM,CAAC,CAACC,YAAc,CAACb,iBAAiBa,UAAUT,IAAI,KAAKJ,eAC3Dc,GAAG,CAAC,CAACD,YAAe,CAAA;YACnBE,SAASF,UAAUE,OAAO;YAC1BC,gBAAgBH,UAAUG,cAAc;YACxCZ,MAAMS,UAAUT,IAAI;YACpBa,WAAWJ,UAAUI,SAAS;YAC9BC,OAAOL,UAAUK,KAAK;QACxB,CAAA;IAEF,IAAIP,WAAWQ,MAAM,KAAK,GAAG;QAC3B,MAAMV,QAAQT,gBACV,IAAIoB,MAAM,CAAC,2BAA2B,EAAEpB,cAAc,CAAC,CAAC,IACxD,IAAIoB,MAAM;QACd,MAAMX;IACR;IAEA,MAAMhB,wBAAwB;QAC5BI;QACAC;QACAa;IACF;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/deploySchemas.ts"],"sourcesContent":["import {SchemaExtractionError} from '@sanity/cli-build/_internal/extract'\nimport {studioWorkerTask} from '@sanity/cli-core'\nimport {type SchemaValidationProblemGroup} from '@sanity/types'\nimport {type Workspace} from 'sanity'\n\nimport {type ManifestSchemaType} from '../manifest/types.js'\nimport {type ExtractWorkspaceWorkerData} from './types.js'\nimport {updateWorkspacesSchemas, type WorkspaceSchemaInput} from './updateWorkspaceSchema.js'\n\ninterface DeploySchemasOptions {\n  verbose: boolean\n  workDir: string\n\n  tag?: string\n  workspaceName?: string\n}\n\ntype WorkspaceWithManifest = Workspace & {manifestSchema: ManifestSchemaType[]}\n\ntype ExtractWorkspaceWorkerMessage =\n  | {\n      error: string\n      type: 'error'\n      validation?: SchemaValidationProblemGroup[]\n    }\n  | {\n      type: 'success'\n      workspaces: WorkspaceWithManifest[]\n    }\n\nexport async function deploySchemas(options: DeploySchemasOptions): Promise<void> {\n  const {tag, verbose, workDir, workspaceName} = options\n\n  const result = await studioWorkerTask<ExtractWorkspaceWorkerMessage>(\n    new URL('extractSanityWorkspace.worker.js', import.meta.url),\n    {\n      name: 'extractSanityWorkspace',\n      studioRootPath: workDir,\n      workerData: {\n        configPath: workDir,\n        workDir,\n      } satisfies ExtractWorkspaceWorkerData,\n    },\n  )\n\n  if (result.type === 'error') {\n    throw new SchemaExtractionError(result.error, result.validation)\n  }\n\n  const workspaces: WorkspaceSchemaInput[] = result.workspaces\n    .filter((workspace) => !workspaceName || workspace.name === workspaceName)\n    .map((workspace) => ({\n      dataset: workspace.dataset,\n      manifestSchema: workspace.manifestSchema,\n      name: workspace.name,\n      projectId: workspace.projectId,\n      title: workspace.title,\n    }))\n\n  if (workspaces.length === 0) {\n    const error = workspaceName\n      ? new Error(`Found no workspaces named \"${workspaceName}\"`)\n      : new Error('No workspaces found')\n    throw error\n  }\n\n  await updateWorkspacesSchemas({\n    tag,\n    verbose,\n    workspaces,\n  })\n}\n"],"names":["SchemaExtractionError","studioWorkerTask","updateWorkspacesSchemas","deploySchemas","options","tag","verbose","workDir","workspaceName","result","URL","url","name","studioRootPath","workerData","configPath","type","error","validation","workspaces","filter","workspace","map","dataset","manifestSchema","projectId","title","length","Error"],"mappings":"AAAA,SAAQA,qBAAqB,QAAO,sCAAqC;AACzE,SAAQC,gBAAgB,QAAO,mBAAkB;AAMjD,SAAQC,uBAAuB,QAAkC,6BAA4B;AAuB7F,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,OAAO,EAAEC,aAAa,EAAC,GAAGJ;IAE/C,MAAMK,SAAS,MAAMR,iBACnB,IAAIS,IAAI,oCAAoC,YAAYC,GAAG,GAC3D;QACEC,MAAM;QACNC,gBAAgBN;QAChBO,YAAY;YACVC,YAAYR;YACZA;QACF;IACF;IAGF,IAAIE,OAAOO,IAAI,KAAK,SAAS;QAC3B,MAAM,IAAIhB,sBAAsBS,OAAOQ,KAAK,EAAER,OAAOS,UAAU;IACjE;IAEA,MAAMC,aAAqCV,OAAOU,UAAU,CACzDC,MAAM,CAAC,CAACC,YAAc,CAACb,iBAAiBa,UAAUT,IAAI,KAAKJ,eAC3Dc,GAAG,CAAC,CAACD,YAAe,CAAA;YACnBE,SAASF,UAAUE,OAAO;YAC1BC,gBAAgBH,UAAUG,cAAc;YACxCZ,MAAMS,UAAUT,IAAI;YACpBa,WAAWJ,UAAUI,SAAS;YAC9BC,OAAOL,UAAUK,KAAK;QACxB,CAAA;IAEF,IAAIP,WAAWQ,MAAM,KAAK,GAAG;QAC3B,MAAMV,QAAQT,gBACV,IAAIoB,MAAM,CAAC,2BAA2B,EAAEpB,cAAc,CAAC,CAAC,IACxD,IAAIoB,MAAM;QACd,MAAMX;IACR;IAEA,MAAMf,wBAAwB;QAC5BG;QACAC;QACAa;IACF;AACF"}

package/dist/actions/schema/extractSanityWorkspace.worker.js

@@ -1,8 +1,8 @@
 import { isMainThread, parentPort, workerData } from 'node:worker_threads';
+import { extractValidationFromSchemaError } from '@sanity/cli-build/_internal/extract';
 import { getStudioWorkspaces, safeStructuredClone } from '@sanity/cli-core';
 import { extractManifestSchemaTypes } from '../manifest/extractWorkspaceManifest.js';
 import { extractWorkspaceWorkerData } from './types.js';
-import { extractValidationFromSchemaError } from './utils/extractValidationFromSchemaError.js';
 if (isMainThread || !parentPort) {
     throw new Error('Should only be run in a worker!');
 }

package/dist/actions/schema/extractSanityWorkspace.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/extractSanityWorkspace.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, safeStructuredClone} from '@sanity/cli-core'\nimport {type Schema} from '@sanity/types'\n\nimport {extractManifestSchemaTypes} from '../manifest/extractWorkspaceManifest.js'\nimport {extractWorkspaceWorkerData} from './types.js'\nimport {extractValidationFromSchemaError} from './utils/extractValidationFromSchemaError.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst {configPath, workDir} = extractWorkspaceWorkerData.parse(workerData)\n\ntry {\n  const workspaces = await getStudioWorkspaces(configPath)\n\n  // Extract manifest schemas while Schema objects are still live (before structured clone\n  // strips class methods like getTypeNames/get). The API expects ManifestSchemaType[], not\n  // the runtime Schema class instance.\n  const workspacesWithManifest = await Promise.all(\n    workspaces.map(async (workspace) => ({\n      ...safeStructuredClone(workspace),\n      manifestSchema: await extractManifestSchemaTypes(workspace.schema as Schema, workDir),\n    })),\n  )\n\n  parentPort.postMessage({\n    type: 'success',\n    workspaces: workspacesWithManifest,\n  })\n} catch (error) {\n  const validation = await extractValidationFromSchemaError(error, workDir)\n  parentPort.postMessage({\n    error: error instanceof Error ? error.message : String(error),\n    type: 'error',\n    validation,\n  })\n}\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","safeStructuredClone","extractManifestSchemaTypes","extractWorkspaceWorkerData","extractValidationFromSchemaError","Error","configPath","workDir","parse","workspaces","workspacesWithManifest","Promise","all","map","workspace","manifestSchema","schema","postMessage","type","error","validation","message","String"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,mBAAmB,QAAO,mBAAkB;AAGzE,SAAQC,0BAA0B,QAAO,0CAAyC;AAClF,SAAQC,0BAA0B,QAAO,aAAY;AACrD,SAAQC,gCAAgC,QAAO,8CAA6C;AAE5F,IAAIP,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIO,MAAM;AAClB;AAEA,MAAM,EAACC,UAAU,EAAEC,OAAO,EAAC,GAAGJ,2BAA2BK,KAAK,CAACT;AAE/D,IAAI;IACF,MAAMU,aAAa,MAAMT,oBAAoBM;IAE7C,wFAAwF;IACxF,yFAAyF;IACzF,qCAAqC;IACrC,MAAMI,yBAAyB,MAAMC,QAAQC,GAAG,CAC9CH,WAAWI,GAAG,CAAC,OAAOC,YAAe,CAAA;YACnC,GAAGb,oBAAoBa,UAAU;YACjCC,gBAAgB,MAAMb,2BAA2BY,UAAUE,MAAM,EAAYT;QAC/E,CAAA;IAGFT,WAAWmB,WAAW,CAAC;QACrBC,MAAM;QACNT,YAAYC;IACd;AACF,EAAE,OAAOS,OAAO;IACd,MAAMC,aAAa,MAAMhB,iCAAiCe,OAAOZ;IACjET,WAAWmB,WAAW,CAAC;QACrBE,OAAOA,iBAAiBd,QAAQc,MAAME,OAAO,GAAGC,OAAOH;QACvDD,MAAM;QACNE;IACF;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/extractSanityWorkspace.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {extractValidationFromSchemaError} from '@sanity/cli-build/_internal/extract'\nimport {getStudioWorkspaces, safeStructuredClone} from '@sanity/cli-core'\nimport {type Schema} from '@sanity/types'\n\nimport {extractManifestSchemaTypes} from '../manifest/extractWorkspaceManifest.js'\nimport {extractWorkspaceWorkerData} from './types.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst {configPath, workDir} = extractWorkspaceWorkerData.parse(workerData)\n\ntry {\n  const workspaces = await getStudioWorkspaces(configPath)\n\n  // Extract manifest schemas while Schema objects are still live (before structured clone\n  // strips class methods like getTypeNames/get). The API expects ManifestSchemaType[], not\n  // the runtime Schema class instance.\n  const workspacesWithManifest = await Promise.all(\n    workspaces.map(async (workspace) => ({\n      ...safeStructuredClone(workspace),\n      manifestSchema: await extractManifestSchemaTypes(workspace.schema as Schema, workDir),\n    })),\n  )\n\n  parentPort.postMessage({\n    type: 'success',\n    workspaces: workspacesWithManifest,\n  })\n} catch (error) {\n  const validation = await extractValidationFromSchemaError(error, workDir)\n  parentPort.postMessage({\n    error: error instanceof Error ? error.message : String(error),\n    type: 'error',\n    validation,\n  })\n}\n"],"names":["isMainThread","parentPort","workerData","extractValidationFromSchemaError","getStudioWorkspaces","safeStructuredClone","extractManifestSchemaTypes","extractWorkspaceWorkerData","Error","configPath","workDir","parse","workspaces","workspacesWithManifest","Promise","all","map","workspace","manifestSchema","schema","postMessage","type","error","validation","message","String"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,gCAAgC,QAAO,sCAAqC;AACpF,SAAQC,mBAAmB,EAAEC,mBAAmB,QAAO,mBAAkB;AAGzE,SAAQC,0BAA0B,QAAO,0CAAyC;AAClF,SAAQC,0BAA0B,QAAO,aAAY;AAErD,IAAIP,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIO,MAAM;AAClB;AAEA,MAAM,EAACC,UAAU,EAAEC,OAAO,EAAC,GAAGH,2BAA2BI,KAAK,CAACT;AAE/D,IAAI;IACF,MAAMU,aAAa,MAAMR,oBAAoBK;IAE7C,wFAAwF;IACxF,yFAAyF;IACzF,qCAAqC;IACrC,MAAMI,yBAAyB,MAAMC,QAAQC,GAAG,CAC9CH,WAAWI,GAAG,CAAC,OAAOC,YAAe,CAAA;YACnC,GAAGZ,oBAAoBY,UAAU;YACjCC,gBAAgB,MAAMZ,2BAA2BW,UAAUE,MAAM,EAAYT;QAC/E,CAAA;IAGFT,WAAWmB,WAAW,CAAC;QACrBC,MAAM;QACNT,YAAYC;IACd;AACF,EAAE,OAAOS,OAAO;IACd,MAAMC,aAAa,MAAMpB,iCAAiCmB,OAAOZ;IACjET,WAAWmB,WAAW,CAAC;QACrBE,OAAOA,iBAAiBd,QAAQc,MAAME,OAAO,GAAGC,OAAOH;QACvDD,MAAM;QACNE;IACF;AACF"}

package/dist/actions/schema/extractSchema.js

@@ -1,11 +1,8 @@
 import { exit } from '@oclif/core/errors';
+import { formatSchemaValidation, runSchemaExtraction, SchemaExtractedTrace, SchemaExtractionError } from '@sanity/cli-build/_internal/extract';
 import { getCliTelemetry } from '@sanity/cli-core';
 import { spinner } from '@sanity/cli-core/ux';
-import { SchemaExtractedTrace } from '../../telemetry/extractSchema.telemetry.js';
-import { formatSchemaValidation } from './formatSchemaValidation.js';
-import { runSchemaExtraction } from './runSchemaExtraction.js';
 import { schemasExtractDebug } from './utils/debug.js';
-import { SchemaExtractionError } from './utils/SchemaExtractionError.js';
 export async function extractSchema(options) {
     const { extractOptions, output } = options;
     const { enforceRequiredFields, format, outputPath } = extractOptions;

package/dist/actions/schema/extractSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/extractSchema.ts"],"sourcesContent":["import {exit} from '@oclif/core/errors'\nimport {getCliTelemetry, type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {SchemaExtractedTrace} from '../../telemetry/extractSchema.telemetry.js'\nimport {formatSchemaValidation} from './formatSchemaValidation.js'\nimport {type ExtractOptions} from './getExtractOptions.js'\nimport {runSchemaExtraction} from './runSchemaExtraction.js'\nimport {schemasExtractDebug} from './utils/debug.js'\nimport {SchemaExtractionError} from './utils/SchemaExtractionError.js'\n\ninterface ExtractSchemaActionOptions {\n  extractOptions: ExtractOptions\n  output: Output\n}\n\nexport async function extractSchema(options: ExtractSchemaActionOptions): Promise<void> {\n  const {extractOptions, output} = options\n  const {enforceRequiredFields, format, outputPath} = extractOptions\n\n  const spin = spinner(\n    enforceRequiredFields ? 'Extracting schema with enforced required fields' : 'Extracting schema',\n  ).start()\n\n  const trace = getCliTelemetry().trace(SchemaExtractedTrace)\n  trace.start()\n\n  try {\n    spin.text = `Writing schema to ${outputPath}`\n\n    const schema = await runSchemaExtraction(extractOptions)\n\n    trace.log({\n      enforceRequiredFields,\n      schemaAllTypesCount: schema.length,\n      schemaDocumentTypesCount: schema.filter((type) => type.type === 'document').length,\n      schemaFormat: format,\n      schemaTypesCount: schema.filter((type) => type.type === 'type').length,\n    })\n\n    spin.succeed(\n      enforceRequiredFields\n        ? `Extracted schema to ${outputPath} with enforced required fields`\n        : `Extracted schema to ${outputPath}`,\n    )\n\n    trace.complete()\n  } catch (err) {\n    trace.error(err)\n    schemasExtractDebug('Failed to extract schema', err)\n    spin.fail(\n      enforceRequiredFields\n        ? 'Failed to extract schema with enforced required fields'\n        : 'Failed to extract schema',\n    )\n\n    // Display validation errors if available and exit\n    if (err instanceof SchemaExtractionError && err.validation && err.validation.length > 0) {\n      output.log('')\n      output.log(formatSchemaValidation(err.validation))\n      exit(1)\n    }\n\n    output.error(err instanceof Error ? err.message : 'Failed to extract schema', {exit: 1})\n  }\n}\n"],"names":["exit","getCliTelemetry","spinner","SchemaExtractedTrace","formatSchemaValidation","runSchemaExtraction","schemasExtractDebug","SchemaExtractionError","extractSchema","options","extractOptions","output","enforceRequiredFields","format","outputPath","spin","start","trace","text","schema","log","schemaAllTypesCount","length","schemaDocumentTypesCount","filter","type","schemaFormat","schemaTypesCount","succeed","complete","err","error","fail","validation","Error","message"],"mappings":"AAAA,SAAQA,IAAI,QAAO,qBAAoB;AACvC,SAAQC,eAAe,QAAoB,mBAAkB;AAC7D,SAAQC,OAAO,QAAO,sBAAqB;AAE3C,SAAQC,oBAAoB,QAAO,6CAA4C;AAC/E,SAAQC,sBAAsB,QAAO,8BAA6B;AAElE,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,mBAAkB;AACpD,SAAQC,qBAAqB,QAAO,mCAAkC;AAOtE,OAAO,eAAeC,cAAcC,OAAmC;IACrE,MAAM,EAACC,cAAc,EAAEC,MAAM,EAAC,GAAGF;IACjC,MAAM,EAACG,qBAAqB,EAAEC,MAAM,EAAEC,UAAU,EAAC,GAAGJ;IAEpD,MAAMK,OAAOb,QACXU,wBAAwB,oDAAoD,qBAC5EI,KAAK;IAEP,MAAMC,QAAQhB,kBAAkBgB,KAAK,CAACd;IACtCc,MAAMD,KAAK;IAEX,IAAI;QACFD,KAAKG,IAAI,GAAG,CAAC,kBAAkB,EAAEJ,YAAY;QAE7C,MAAMK,SAAS,MAAMd,oBAAoBK;QAEzCO,MAAMG,GAAG,CAAC;YACRR;YACAS,qBAAqBF,OAAOG,MAAM;YAClCC,0BAA0BJ,OAAOK,MAAM,CAAC,CAACC,OAASA,KAAKA,IAAI,KAAK,YAAYH,MAAM;YAClFI,cAAcb;YACdc,kBAAkBR,OAAOK,MAAM,CAAC,CAACC,OAASA,KAAKA,IAAI,KAAK,QAAQH,MAAM;QACxE;QAEAP,KAAKa,OAAO,CACVhB,wBACI,CAAC,oBAAoB,EAAEE,WAAW,8BAA8B,CAAC,GACjE,CAAC,oBAAoB,EAAEA,YAAY;QAGzCG,MAAMY,QAAQ;IAChB,EAAE,OAAOC,KAAK;QACZb,MAAMc,KAAK,CAACD;QACZxB,oBAAoB,4BAA4BwB;QAChDf,KAAKiB,IAAI,CACPpB,wBACI,2DACA;QAGN,kDAAkD;QAClD,IAAIkB,eAAevB,yBAAyBuB,IAAIG,UAAU,IAAIH,IAAIG,UAAU,CAACX,MAAM,GAAG,GAAG;YACvFX,OAAOS,GAAG,CAAC;YACXT,OAAOS,GAAG,CAAChB,uBAAuB0B,IAAIG,UAAU;YAChDjC,KAAK;QACP;QAEAW,OAAOoB,KAAK,CAACD,eAAeI,QAAQJ,IAAIK,OAAO,GAAG,4BAA4B;YAACnC,MAAM;QAAC;IACxF;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/extractSchema.ts"],"sourcesContent":["import {exit} from '@oclif/core/errors'\nimport {\n  type ExtractOptions,\n  formatSchemaValidation,\n  runSchemaExtraction,\n  SchemaExtractedTrace,\n  SchemaExtractionError,\n} from '@sanity/cli-build/_internal/extract'\nimport {getCliTelemetry, type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {schemasExtractDebug} from './utils/debug.js'\n\ninterface ExtractSchemaActionOptions {\n  extractOptions: ExtractOptions\n  output: Output\n}\n\nexport async function extractSchema(options: ExtractSchemaActionOptions): Promise<void> {\n  const {extractOptions, output} = options\n  const {enforceRequiredFields, format, outputPath} = extractOptions\n\n  const spin = spinner(\n    enforceRequiredFields ? 'Extracting schema with enforced required fields' : 'Extracting schema',\n  ).start()\n\n  const trace = getCliTelemetry().trace(SchemaExtractedTrace)\n  trace.start()\n\n  try {\n    spin.text = `Writing schema to ${outputPath}`\n\n    const schema = await runSchemaExtraction(extractOptions)\n\n    trace.log({\n      enforceRequiredFields,\n      schemaAllTypesCount: schema.length,\n      schemaDocumentTypesCount: schema.filter((type) => type.type === 'document').length,\n      schemaFormat: format,\n      schemaTypesCount: schema.filter((type) => type.type === 'type').length,\n    })\n\n    spin.succeed(\n      enforceRequiredFields\n        ? `Extracted schema to ${outputPath} with enforced required fields`\n        : `Extracted schema to ${outputPath}`,\n    )\n\n    trace.complete()\n  } catch (err) {\n    trace.error(err)\n    schemasExtractDebug('Failed to extract schema', err)\n    spin.fail(\n      enforceRequiredFields\n        ? 'Failed to extract schema with enforced required fields'\n        : 'Failed to extract schema',\n    )\n\n    // Display validation errors if available and exit\n    if (err instanceof SchemaExtractionError && err.validation && err.validation.length > 0) {\n      output.log('')\n      output.log(formatSchemaValidation(err.validation))\n      exit(1)\n    }\n\n    output.error(err instanceof Error ? err.message : 'Failed to extract schema', {exit: 1})\n  }\n}\n"],"names":["exit","formatSchemaValidation","runSchemaExtraction","SchemaExtractedTrace","SchemaExtractionError","getCliTelemetry","spinner","schemasExtractDebug","extractSchema","options","extractOptions","output","enforceRequiredFields","format","outputPath","spin","start","trace","text","schema","log","schemaAllTypesCount","length","schemaDocumentTypesCount","filter","type","schemaFormat","schemaTypesCount","succeed","complete","err","error","fail","validation","Error","message"],"mappings":"AAAA,SAAQA,IAAI,QAAO,qBAAoB;AACvC,SAEEC,sBAAsB,EACtBC,mBAAmB,EACnBC,oBAAoB,EACpBC,qBAAqB,QAChB,sCAAqC;AAC5C,SAAQC,eAAe,QAAoB,mBAAkB;AAC7D,SAAQC,OAAO,QAAO,sBAAqB;AAE3C,SAAQC,mBAAmB,QAAO,mBAAkB;AAOpD,OAAO,eAAeC,cAAcC,OAAmC;IACrE,MAAM,EAACC,cAAc,EAAEC,MAAM,EAAC,GAAGF;IACjC,MAAM,EAACG,qBAAqB,EAAEC,MAAM,EAAEC,UAAU,EAAC,GAAGJ;IAEpD,MAAMK,OAAOT,QACXM,wBAAwB,oDAAoD,qBAC5EI,KAAK;IAEP,MAAMC,QAAQZ,kBAAkBY,KAAK,CAACd;IACtCc,MAAMD,KAAK;IAEX,IAAI;QACFD,KAAKG,IAAI,GAAG,CAAC,kBAAkB,EAAEJ,YAAY;QAE7C,MAAMK,SAAS,MAAMjB,oBAAoBQ;QAEzCO,MAAMG,GAAG,CAAC;YACRR;YACAS,qBAAqBF,OAAOG,MAAM;YAClCC,0BAA0BJ,OAAOK,MAAM,CAAC,CAACC,OAASA,KAAKA,IAAI,KAAK,YAAYH,MAAM;YAClFI,cAAcb;YACdc,kBAAkBR,OAAOK,MAAM,CAAC,CAACC,OAASA,KAAKA,IAAI,KAAK,QAAQH,MAAM;QACxE;QAEAP,KAAKa,OAAO,CACVhB,wBACI,CAAC,oBAAoB,EAAEE,WAAW,8BAA8B,CAAC,GACjE,CAAC,oBAAoB,EAAEA,YAAY;QAGzCG,MAAMY,QAAQ;IAChB,EAAE,OAAOC,KAAK;QACZb,MAAMc,KAAK,CAACD;QACZvB,oBAAoB,4BAA4BuB;QAChDf,KAAKiB,IAAI,CACPpB,wBACI,2DACA;QAGN,kDAAkD;QAClD,IAAIkB,eAAe1B,yBAAyB0B,IAAIG,UAAU,IAAIH,IAAIG,UAAU,CAACX,MAAM,GAAG,GAAG;YACvFX,OAAOS,GAAG,CAAC;YACXT,OAAOS,GAAG,CAACnB,uBAAuB6B,IAAIG,UAAU;YAChDjC,KAAK;QACP;QAEAW,OAAOoB,KAAK,CAACD,eAAeI,QAAQJ,IAAIK,OAAO,GAAG,4BAA4B;YAACnC,MAAM;QAAC;IACxF;AACF"}

package/dist/actions/schema/extractSchemaWatcher.js

@@ -1,12 +1,9 @@
 import { dirname, isAbsolute, join, relative } from 'node:path';
+import { createSchemaPatternMatcher, formatSchemaValidation, runSchemaExtraction, SchemaExtractionError } from '@sanity/cli-build/_internal/extract';
 import { spinner } from '@sanity/cli-core/ux';
 import { watch as chokidarWatch } from 'chokidar';
 import debounce from 'lodash-es/debounce.js';
-import { formatSchemaValidation } from './formatSchemaValidation.js';
-import { createSchemaPatternMatcher } from './matchSchemaPattern.js';
-import { runSchemaExtraction } from './runSchemaExtraction.js';
 import { schemasExtractDebug } from './utils/debug.js';
-import { SchemaExtractionError } from './utils/SchemaExtractionError.js';
 /** Default glob patterns to watch for schema changes */ export const DEFAULT_WATCH_PATTERNS = [
     'sanity.config.{js,jsx,ts,tsx,mjs}',
     'schema*/**/*.{js,jsx,ts,tsx,mjs}'

package/dist/actions/schema/extractSchemaWatcher.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/extractSchemaWatcher.ts"],"sourcesContent":["import {dirname, isAbsolute, join, relative} from 'node:path'\n\nimport {type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {watch as chokidarWatch, type FSWatcher} from 'chokidar'\nimport debounce from 'lodash-es/debounce.js'\n\nimport {formatSchemaValidation} from './formatSchemaValidation.js'\nimport {type ExtractOptions} from './getExtractOptions.js'\nimport {createSchemaPatternMatcher} from './matchSchemaPattern.js'\nimport {runSchemaExtraction} from './runSchemaExtraction.js'\nimport {schemasExtractDebug} from './utils/debug.js'\nimport {SchemaExtractionError} from './utils/SchemaExtractionError.js'\n\n/** Default glob patterns to watch for schema changes */\nexport const DEFAULT_WATCH_PATTERNS = [\n  'sanity.config.{js,jsx,ts,tsx,mjs}',\n  'schema*/**/*.{js,jsx,ts,tsx,mjs}',\n]\n\n/** Default patterns to ignore when watching */\nconst IGNORED_PATTERNS = [\n  '**/node_modules/**',\n  '**/.git/**',\n  '**/dist/**',\n  '**/lib/**',\n  '**/.sanity/**',\n]\n\ninterface ExtractSchemaWatcherOptions {\n  extractOptions: ExtractOptions\n  output: Output\n  watchPatterns: string[]\n\n  onExtraction?: (result: {duration: number; success: boolean}) => void\n}\n\ninterface ExtractSchemaWatcher {\n  close: () => Promise<void>\n  watcher: FSWatcher\n}\n\n/** State for tracking extraction status */\ninterface WatchState {\n  isExtracting: boolean\n  pendingExtraction: boolean\n}\n\n/** Return type for createExtractionRunner */\ninterface ExtractionRunner {\n  runExtraction: () => Promise<void>\n  state: WatchState\n}\n\n/**\n * Creates an extraction runner with concurrency control.\n * If extraction is already running, queues one more extraction to run after completion.\n * Multiple queued requests are coalesced into a single pending extraction.\n */\nfunction createExtractionRunner(onExtract: () => Promise<void>): ExtractionRunner {\n  const state: WatchState = {\n    isExtracting: false,\n    pendingExtraction: false,\n  }\n\n  async function runExtraction(): Promise<void> {\n    if (state.isExtracting) {\n      state.pendingExtraction = true\n      return\n    }\n\n    state.isExtracting = true\n    state.pendingExtraction = false\n\n    try {\n      await onExtract()\n    } finally {\n      state.isExtracting = false\n\n      // If a change came in during extraction, run again\n      if (state.pendingExtraction) {\n        state.pendingExtraction = false\n        await runExtraction()\n      }\n    }\n  }\n\n  return {runExtraction, state}\n}\n\n/**\n * Starts a schema watcher that extracts schema on file changes.\n * Returns a watcher instance and a stop function.\n */\nexport async function startExtractSchemaWatcher(\n  options: ExtractSchemaWatcherOptions,\n): Promise<ExtractSchemaWatcher> {\n  const {extractOptions, onExtraction, output, watchPatterns} = options\n\n  const {configPath, enforceRequiredFields, outputPath} = extractOptions\n  const workDir = dirname(configPath)\n\n  // Helper function to run extraction with spinner and error handling\n  const runExtraction = async (): Promise<boolean> => {\n    const spin = spinner(\n      enforceRequiredFields\n        ? 'Extracting schema with enforced required fields'\n        : 'Extracting schema...',\n    ).start()\n    const extractionStartTime = Date.now()\n\n    try {\n      await runSchemaExtraction(extractOptions)\n\n      spin.succeed(\n        enforceRequiredFields\n          ? `Extracted schema to ${outputPath} with enforced required fields`\n          : `Extracted schema to ${outputPath}`,\n      )\n\n      const duration = Date.now() - extractionStartTime\n      onExtraction?.({duration, success: true})\n\n      return true\n    } catch (err) {\n      const duration = Date.now() - extractionStartTime\n      onExtraction?.({duration, success: false})\n\n      schemasExtractDebug('Failed to extract schema', err)\n      spin.fail('Extraction failed')\n\n      // Display validation errors if available\n      if (err instanceof SchemaExtractionError && err.validation && err.validation.length > 0) {\n        output.log('')\n        output.log(formatSchemaValidation(err.validation))\n      } else if (err instanceof Error) {\n        output.error(err.message, {exit: 1})\n      }\n\n      return false\n    }\n  }\n\n  // Run initial extraction\n  await runExtraction()\n\n  const absoluteWatchPatterns = watchPatterns.map((pattern) => join(workDir, pattern))\n\n  // Create extraction runner with concurrency control\n  const {runExtraction: runConcurrentExtraction} = createExtractionRunner(async () => {\n    await runExtraction()\n  })\n\n  // Debounced extraction trigger (1 second delay)\n  const debouncedExtract = debounce(() => {\n    void runConcurrentExtraction()\n  }, 1000)\n\n  const {isMatch} = createSchemaPatternMatcher(watchPatterns)\n\n  const watcher: FSWatcher = chokidarWatch(absoluteWatchPatterns, {\n    cwd: workDir,\n    ignored: IGNORED_PATTERNS,\n    ignoreInitial: true,\n  })\n\n  watcher.on('all', (event, filePath) => {\n    if (!isMatch(filePath, workDir)) {\n      return\n    }\n\n    const timestamp = new Date().toLocaleTimeString()\n    const relativePath = isAbsolute(filePath) ? relative(workDir, filePath) : filePath\n    output.log(`[${timestamp}] ${event}: ${relativePath}`)\n    debouncedExtract()\n  })\n\n  watcher.on('error', (err) => {\n    output.error(`Watcher error: ${err instanceof Error ? err.message : String(err)}`)\n  })\n\n  return {\n    close: () => watcher.close(),\n    watcher,\n  }\n}\n"],"names":["dirname","isAbsolute","join","relative","spinner","watch","chokidarWatch","debounce","formatSchemaValidation","createSchemaPatternMatcher","runSchemaExtraction","schemasExtractDebug","SchemaExtractionError","DEFAULT_WATCH_PATTERNS","IGNORED_PATTERNS","createExtractionRunner","onExtract","state","isExtracting","pendingExtraction","runExtraction","startExtractSchemaWatcher","options","extractOptions","onExtraction","output","watchPatterns","configPath","enforceRequiredFields","outputPath","workDir","spin","start","extractionStartTime","Date","now","succeed","duration","success","err","fail","validation","length","log","Error","error","message","exit","absoluteWatchPatterns","map","pattern","runConcurrentExtraction","debouncedExtract","isMatch","watcher","cwd","ignored","ignoreInitial","on","event","filePath","timestamp","toLocaleTimeString","relativePath","String","close"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/schema/extractSchemaWatcher.ts"],"sourcesContent":["import {dirname, isAbsolute, join, relative} from 'node:path'\n\nimport {\n  createSchemaPatternMatcher,\n  type ExtractOptions,\n  formatSchemaValidation,\n  runSchemaExtraction,\n  SchemaExtractionError,\n} from '@sanity/cli-build/_internal/extract'\nimport {type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {watch as chokidarWatch, type FSWatcher} from 'chokidar'\nimport debounce from 'lodash-es/debounce.js'\n\nimport {schemasExtractDebug} from './utils/debug.js'\n\n/** Default glob patterns to watch for schema changes */\nexport const DEFAULT_WATCH_PATTERNS = [\n  'sanity.config.{js,jsx,ts,tsx,mjs}',\n  'schema*/**/*.{js,jsx,ts,tsx,mjs}',\n]\n\n/** Default patterns to ignore when watching */\nconst IGNORED_PATTERNS = [\n  '**/node_modules/**',\n  '**/.git/**',\n  '**/dist/**',\n  '**/lib/**',\n  '**/.sanity/**',\n]\n\ninterface ExtractSchemaWatcherOptions {\n  extractOptions: ExtractOptions\n  output: Output\n  watchPatterns: string[]\n\n  onExtraction?: (result: {duration: number; success: boolean}) => void\n}\n\ninterface ExtractSchemaWatcher {\n  close: () => Promise<void>\n  watcher: FSWatcher\n}\n\n/** State for tracking extraction status */\ninterface WatchState {\n  isExtracting: boolean\n  pendingExtraction: boolean\n}\n\n/** Return type for createExtractionRunner */\ninterface ExtractionRunner {\n  runExtraction: () => Promise<void>\n  state: WatchState\n}\n\n/**\n * Creates an extraction runner with concurrency control.\n * If extraction is already running, queues one more extraction to run after completion.\n * Multiple queued requests are coalesced into a single pending extraction.\n */\nfunction createExtractionRunner(onExtract: () => Promise<void>): ExtractionRunner {\n  const state: WatchState = {\n    isExtracting: false,\n    pendingExtraction: false,\n  }\n\n  async function runExtraction(): Promise<void> {\n    if (state.isExtracting) {\n      state.pendingExtraction = true\n      return\n    }\n\n    state.isExtracting = true\n    state.pendingExtraction = false\n\n    try {\n      await onExtract()\n    } finally {\n      state.isExtracting = false\n\n      // If a change came in during extraction, run again\n      if (state.pendingExtraction) {\n        state.pendingExtraction = false\n        await runExtraction()\n      }\n    }\n  }\n\n  return {runExtraction, state}\n}\n\n/**\n * Starts a schema watcher that extracts schema on file changes.\n * Returns a watcher instance and a stop function.\n */\nexport async function startExtractSchemaWatcher(\n  options: ExtractSchemaWatcherOptions,\n): Promise<ExtractSchemaWatcher> {\n  const {extractOptions, onExtraction, output, watchPatterns} = options\n\n  const {configPath, enforceRequiredFields, outputPath} = extractOptions\n  const workDir = dirname(configPath)\n\n  // Helper function to run extraction with spinner and error handling\n  const runExtraction = async (): Promise<boolean> => {\n    const spin = spinner(\n      enforceRequiredFields\n        ? 'Extracting schema with enforced required fields'\n        : 'Extracting schema...',\n    ).start()\n    const extractionStartTime = Date.now()\n\n    try {\n      await runSchemaExtraction(extractOptions)\n\n      spin.succeed(\n        enforceRequiredFields\n          ? `Extracted schema to ${outputPath} with enforced required fields`\n          : `Extracted schema to ${outputPath}`,\n      )\n\n      const duration = Date.now() - extractionStartTime\n      onExtraction?.({duration, success: true})\n\n      return true\n    } catch (err) {\n      const duration = Date.now() - extractionStartTime\n      onExtraction?.({duration, success: false})\n\n      schemasExtractDebug('Failed to extract schema', err)\n      spin.fail('Extraction failed')\n\n      // Display validation errors if available\n      if (err instanceof SchemaExtractionError && err.validation && err.validation.length > 0) {\n        output.log('')\n        output.log(formatSchemaValidation(err.validation))\n      } else if (err instanceof Error) {\n        output.error(err.message, {exit: 1})\n      }\n\n      return false\n    }\n  }\n\n  // Run initial extraction\n  await runExtraction()\n\n  const absoluteWatchPatterns = watchPatterns.map((pattern) => join(workDir, pattern))\n\n  // Create extraction runner with concurrency control\n  const {runExtraction: runConcurrentExtraction} = createExtractionRunner(async () => {\n    await runExtraction()\n  })\n\n  // Debounced extraction trigger (1 second delay)\n  const debouncedExtract = debounce(() => {\n    void runConcurrentExtraction()\n  }, 1000)\n\n  const {isMatch} = createSchemaPatternMatcher(watchPatterns)\n\n  const watcher: FSWatcher = chokidarWatch(absoluteWatchPatterns, {\n    cwd: workDir,\n    ignored: IGNORED_PATTERNS,\n    ignoreInitial: true,\n  })\n\n  watcher.on('all', (event, filePath) => {\n    if (!isMatch(filePath, workDir)) {\n      return\n    }\n\n    const timestamp = new Date().toLocaleTimeString()\n    const relativePath = isAbsolute(filePath) ? relative(workDir, filePath) : filePath\n    output.log(`[${timestamp}] ${event}: ${relativePath}`)\n    debouncedExtract()\n  })\n\n  watcher.on('error', (err) => {\n    output.error(`Watcher error: ${err instanceof Error ? err.message : String(err)}`)\n  })\n\n  return {\n    close: () => watcher.close(),\n    watcher,\n  }\n}\n"],"names":["dirname","isAbsolute","join","relative","createSchemaPatternMatcher","formatSchemaValidation","runSchemaExtraction","SchemaExtractionError","spinner","watch","chokidarWatch","debounce","schemasExtractDebug","DEFAULT_WATCH_PATTERNS","IGNORED_PATTERNS","createExtractionRunner","onExtract","state","isExtracting","pendingExtraction","runExtraction","startExtractSchemaWatcher","options","extractOptions","onExtraction","output","watchPatterns","configPath","enforceRequiredFields","outputPath","workDir","spin","start","extractionStartTime","Date","now","succeed","duration","success","err","fail","validation","length","log","Error","error","message","exit","absoluteWatchPatterns","map","pattern","runConcurrentExtraction","debouncedExtract","isMatch","watcher","cwd","ignored","ignoreInitial","on","event","filePath","timestamp","toLocaleTimeString","relativePath","String","close"],"mappings":"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"}

package/dist/actions/schema/getExtractOptions.js

@@ -1,23 +1,13 @@
-import { existsSync, statSync } from 'node:fs';
-import { extname, join, resolve } from 'node:path';
+import { getExtractOptions as internalExtractOptions } from '@sanity/cli-build/_internal/extract';
 export function getExtractOptions({ flags, projectRoot, schemaExtraction }) {
-    const pathFlag = flags.path ?? schemaExtraction?.path;
-    let outputPath;
-    if (pathFlag) {
-        const resolved = resolve(join(projectRoot.directory, pathFlag));
-        const isExistingDirectory = existsSync(resolved) && statSync(resolved).isDirectory();
-        outputPath = isExistingDirectory || !extname(resolved) ? join(resolved, 'schema.json') : resolved;
-    } else {
-        outputPath = resolve(join(projectRoot.directory, 'schema.json'));
-    }
-    return {
-        configPath: projectRoot.path,
-        enforceRequiredFields: flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields ?? false,
-        format: flags.format ?? 'groq-type-nodes',
-        outputPath,
-        watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns ?? [],
+    return internalExtractOptions({
+        enforceRequiredFields: flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields,
+        format: flags.format,
+        path: flags.path ?? schemaExtraction?.path,
+        projectRoot: projectRoot,
+        watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns,
         workspace: flags.workspace ?? schemaExtraction?.workspace
-    };
+    });
 }
 
 //# sourceMappingURL=getExtractOptions.js.map

package/dist/actions/schema/getExtractOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/getExtractOptions.ts"],"sourcesContent":["import {existsSync, statSync} from 'node:fs'\nimport {extname, join, resolve} from 'node:path'\n\nimport {type CliConfig, ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ExtractSchemaCommand} from '../../commands/schemas/extract.js'\n\nexport interface ExtractOptions {\n  configPath: string\n  enforceRequiredFields: boolean\n  format: string\n  outputPath: string\n  watchPatterns: string[]\n  workspace: string | undefined\n}\n\ninterface GetExtractionOptions {\n  flags: ExtractSchemaCommand['flags']\n  projectRoot: ProjectRootResult\n  schemaExtraction: CliConfig['schemaExtraction']\n}\n\nexport function getExtractOptions({\n  flags,\n  projectRoot,\n  schemaExtraction,\n}: GetExtractionOptions): ExtractOptions {\n  const pathFlag = flags.path ?? schemaExtraction?.path\n  let outputPath: string\n  if (pathFlag) {\n    const resolved = resolve(join(projectRoot.directory, pathFlag))\n    const isExistingDirectory = existsSync(resolved) && statSync(resolved).isDirectory()\n\n    outputPath =\n      isExistingDirectory || !extname(resolved) ? join(resolved, 'schema.json') : resolved\n  } else {\n    outputPath = resolve(join(projectRoot.directory, 'schema.json'))\n  }\n\n  return {\n    configPath: projectRoot.path,\n    enforceRequiredFields:\n      flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields ?? false,\n    format: flags.format ?? 'groq-type-nodes',\n    outputPath,\n    watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns ?? [],\n    workspace: flags.workspace ?? schemaExtraction?.workspace,\n  }\n}\n"],"names":["existsSync","statSync","extname","join","resolve","getExtractOptions","flags","projectRoot","schemaExtraction","pathFlag","path","outputPath","resolved","directory","isExistingDirectory","isDirectory","configPath","enforceRequiredFields","format","watchPatterns","workspace"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,QAAQ,QAAO,UAAS;AAC5C,SAAQC,OAAO,EAAEC,IAAI,EAAEC,OAAO,QAAO,YAAW;AAqBhD,OAAO,SAASC,kBAAkB,EAChCC,KAAK,EACLC,WAAW,EACXC,gBAAgB,EACK;IACrB,MAAMC,WAAWH,MAAMI,IAAI,IAAIF,kBAAkBE;IACjD,IAAIC;IACJ,IAAIF,UAAU;QACZ,MAAMG,WAAWR,QAAQD,KAAKI,YAAYM,SAAS,EAAEJ;QACrD,MAAMK,sBAAsBd,WAAWY,aAAaX,SAASW,UAAUG,WAAW;QAElFJ,aACEG,uBAAuB,CAACZ,QAAQU,YAAYT,KAAKS,UAAU,iBAAiBA;IAChF,OAAO;QACLD,aAAaP,QAAQD,KAAKI,YAAYM,SAAS,EAAE;IACnD;IAEA,OAAO;QACLG,YAAYT,YAAYG,IAAI;QAC5BO,uBACEX,KAAK,CAAC,0BAA0B,IAAIE,kBAAkBS,yBAAyB;QACjFC,QAAQZ,MAAMY,MAAM,IAAI;QACxBP;QACAQ,eAAeb,KAAK,CAAC,iBAAiB,IAAIE,kBAAkBW,iBAAiB,EAAE;QAC/EC,WAAWd,MAAMc,SAAS,IAAIZ,kBAAkBY;IAClD;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/getExtractOptions.ts"],"sourcesContent":["import {\n  type ExtractOptions,\n  getExtractOptions as internalExtractOptions,\n} from '@sanity/cli-build/_internal/extract'\nimport {type CliConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ExtractSchemaCommand} from '../../commands/schemas/extract.js'\n\ninterface GetExtractionOptions {\n  flags: ExtractSchemaCommand['flags']\n  projectRoot: ProjectRootResult\n  schemaExtraction: CliConfig['schemaExtraction']\n}\n\nexport function getExtractOptions({\n  flags,\n  projectRoot,\n  schemaExtraction,\n}: GetExtractionOptions): ExtractOptions {\n  return internalExtractOptions({\n    enforceRequiredFields:\n      flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields,\n    format: flags.format,\n    path: flags.path ?? schemaExtraction?.path,\n    projectRoot: projectRoot,\n    watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns,\n    workspace: flags.workspace ?? schemaExtraction?.workspace,\n  })\n}\n"],"names":["getExtractOptions","internalExtractOptions","flags","projectRoot","schemaExtraction","enforceRequiredFields","format","path","watchPatterns","workspace"],"mappings":"AAAA,SAEEA,qBAAqBC,sBAAsB,QACtC,sCAAqC;AAW5C,OAAO,SAASD,kBAAkB,EAChCE,KAAK,EACLC,WAAW,EACXC,gBAAgB,EACK;IACrB,OAAOH,uBAAuB;QAC5BI,uBACEH,KAAK,CAAC,0BAA0B,IAAIE,kBAAkBC;QACxDC,QAAQJ,MAAMI,MAAM;QACpBC,MAAML,MAAMK,IAAI,IAAIH,kBAAkBG;QACtCJ,aAAaA;QACbK,eAAeN,KAAK,CAAC,iBAAiB,IAAIE,kBAAkBI;QAC5DC,WAAWP,MAAMO,SAAS,IAAIL,kBAAkBK;IAClD;AACF"}

package/dist/actions/schema/types.js

@@ -1,10 +1,4 @@
 import { z } from 'zod/mini';
-export const extractSchemaWorkerData = z.object({
-    configPath: z.string(),
-    enforceRequiredFields: z.boolean(),
-    workDir: z.string(),
-    workspaceName: z.optional(z.string())
-});
 export const uniqWorkspaceWorkerDataSchema = z.object({
     configPath: z.string(),
     dataset: z.optional(z.string())