@sanity/cli 6.0.0-alpha.9 → 6.1.0

package/dist/actions/mcp/promptForMCPSetup.js

@@ -1,19 +1,28 @@
 import { checkbox } from '@sanity/cli-core/ux';
+function getEditorLabel(editor) {
+    if (editor.configured && editor.authStatus === 'unauthorized') {
+        return `${editor.name} (auth expired)`;
+    }
+    if (editor.configured && !editor.existingToken) {
+        return `${editor.name} (missing credentials)`;
+    }
+    return editor.name;
+}
 /**
- * Prompt user to select which editors to configure
- * Shows existing config status - unconfigured editors are pre-selected,
- * configured editors show "(already installed)" and are not pre-selected
+ * Prompt user to select which editors to configure.
+ *
+ * Expects only actionable editors (unconfigured, or configured with
+ * invalid/missing credentials). Annotates entries with auth status.
  */ export async function promptForMCPSetup(editors) {
     const editorChoices = editors.map((e)=>({
-            checked: !e.configured,
-            name: e.configured ? `${e.name} (already installed)` : e.name,
+            checked: true,
+            name: getEditorLabel(e),
             value: e.name
         }));
-    const result = await checkbox({
+    const selectedNames = await checkbox({
         choices: editorChoices,
         message: 'Configure Sanity MCP server?'
     });
-    const selectedNames = result;
     // User can deselect all to skip
     if (!selectedNames || selectedNames.length === 0) {
         return null;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/mcp/promptForMCPSetup.ts"],"sourcesContent":["import {checkbox} from '@sanity/cli-core/ux'\n\nimport {type Editor} from './types.js'\n\n/**\n * Prompt user to select which editors to configure\n * Shows existing config status - unconfigured editors are pre-selected,\n * configured editors show \"(already installed)\" and are not pre-selected\n */\nexport async function promptForMCPSetup(editors: Editor[]): Promise<Editor[] | null> {\n  const editorChoices = editors.map((e) => ({\n    checked: !e.configured, // Only pre-select if NOT already configured\n    name: e.configured ? `${e.name} (already installed)` : e.name,\n    value: e.name,\n  }))\n\n  const result = await checkbox({\n    choices: editorChoices,\n    message: 'Configure Sanity MCP server?',\n  })\n\n  const selectedNames = result\n\n  // User can deselect all to skip\n  if (!selectedNames || selectedNames.length === 0) {\n    return null\n  }\n\n  return editors.filter((e) => selectedNames.includes(e.name))\n}\n"],"names":["checkbox","promptForMCPSetup","editors","editorChoices","map","e","checked","configured","name","value","result","choices","message","selectedNames","length","filter","includes"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,sBAAqB;AAI5C;;;;CAIC,GACD,OAAO,eAAeC,kBAAkBC,OAAiB;IACvD,MAAMC,gBAAgBD,QAAQE,GAAG,CAAC,CAACC,IAAO,CAAA;YACxCC,SAAS,CAACD,EAAEE,UAAU;YACtBC,MAAMH,EAAEE,UAAU,GAAG,GAAGF,EAAEG,IAAI,CAAC,oBAAoB,CAAC,GAAGH,EAAEG,IAAI;YAC7DC,OAAOJ,EAAEG,IAAI;QACf,CAAA;IAEA,MAAME,SAAS,MAAMV,SAAS;QAC5BW,SAASR;QACTS,SAAS;IACX;IAEA,MAAMC,gBAAgBH;IAEtB,gCAAgC;IAChC,IAAI,CAACG,iBAAiBA,cAAcC,MAAM,KAAK,GAAG;QAChD,OAAO;IACT;IAEA,OAAOZ,QAAQa,MAAM,CAAC,CAACV,IAAMQ,cAAcG,QAAQ,CAACX,EAAEG,IAAI;AAC5D"}
+{"version":3,"sources":["../../../src/actions/mcp/promptForMCPSetup.ts"],"sourcesContent":["import {checkbox} from '@sanity/cli-core/ux'\n\nimport {type Editor} from './types.js'\n\nfunction getEditorLabel(editor: Editor): string {\n  if (editor.configured && editor.authStatus === 'unauthorized') {\n    return `${editor.name} (auth expired)`\n  }\n  if (editor.configured && !editor.existingToken) {\n    return `${editor.name} (missing credentials)`\n  }\n  return editor.name\n}\n\n/**\n * Prompt user to select which editors to configure.\n *\n * Expects only actionable editors (unconfigured, or configured with\n * invalid/missing credentials). Annotates entries with auth status.\n */\nexport async function promptForMCPSetup(editors: Editor[]): Promise<Editor[] | null> {\n  const editorChoices = editors.map((e) => ({\n    checked: true, // Pre-select all actionable editors\n    name: getEditorLabel(e),\n    value: e.name,\n  }))\n\n  const selectedNames = await checkbox({\n    choices: editorChoices,\n    message: 'Configure Sanity MCP server?',\n  })\n\n  // User can deselect all to skip\n  if (!selectedNames || selectedNames.length === 0) {\n    return null\n  }\n\n  return editors.filter((e) => selectedNames.includes(e.name))\n}\n"],"names":["checkbox","getEditorLabel","editor","configured","authStatus","name","existingToken","promptForMCPSetup","editors","editorChoices","map","e","checked","value","selectedNames","choices","message","length","filter","includes"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,sBAAqB;AAI5C,SAASC,eAAeC,MAAc;IACpC,IAAIA,OAAOC,UAAU,IAAID,OAAOE,UAAU,KAAK,gBAAgB;QAC7D,OAAO,GAAGF,OAAOG,IAAI,CAAC,eAAe,CAAC;IACxC;IACA,IAAIH,OAAOC,UAAU,IAAI,CAACD,OAAOI,aAAa,EAAE;QAC9C,OAAO,GAAGJ,OAAOG,IAAI,CAAC,sBAAsB,CAAC;IAC/C;IACA,OAAOH,OAAOG,IAAI;AACpB;AAEA;;;;;CAKC,GACD,OAAO,eAAeE,kBAAkBC,OAAiB;IACvD,MAAMC,gBAAgBD,QAAQE,GAAG,CAAC,CAACC,IAAO,CAAA;YACxCC,SAAS;YACTP,MAAMJ,eAAeU;YACrBE,OAAOF,EAAEN,IAAI;QACf,CAAA;IAEA,MAAMS,gBAAgB,MAAMd,SAAS;QACnCe,SAASN;QACTO,SAAS;IACX;IAEA,gCAAgC;IAChC,IAAI,CAACF,iBAAiBA,cAAcG,MAAM,KAAK,GAAG;QAChD,OAAO;IACT;IAEA,OAAOT,QAAQU,MAAM,CAAC,CAACP,IAAMG,cAAcK,QAAQ,CAACR,EAAEN,IAAI;AAC5D"}

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\nexport interface 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/mcp/writeMCPConfig.js

@@ -2,6 +2,7 @@ import { existsSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { applyEdits, modify } from 'jsonc-parser';
+import { parse as parseToml, stringify as stringifyToml } from 'smol-toml';
 import { EDITOR_CONFIGS } from './editorConfigs.js';
 /**
  * Write MCP configuration to editor config file
@@ -10,27 +11,38 @@ import { EDITOR_CONFIGS } from './editorConfigs.js';
  * Note: Config parseability is already validated in detectAvailableEditors()
  */ export async function writeMCPConfig(editor, token) {
     const configPath = editor.configPath;
-    const { buildServerConfig, configKey } = EDITOR_CONFIGS[editor.name];
-    // Read existing content or start with empty object
-    let content = '{}';
+    const { buildServerConfig, configKey, format } = EDITOR_CONFIGS[editor.name];
+    const serverConfig = buildServerConfig(token);
+    // Read existing content or start with empty object/document
+    let content = format === 'toml' ? '' : '{}';
     if (existsSync(configPath)) {
         const fileContent = await fs.readFile(configPath, 'utf8');
         if (fileContent.trim()) {
             content = fileContent;
         }
     }
-    // Modify using jsonc-parser - preserves comments
-    // Setting a nested path automatically creates intermediate objects
-    const edits = modify(content, [
-        configKey,
-        'Sanity'
-    ], buildServerConfig(token), {
-        formattingOptions: {
-            insertSpaces: true,
-            tabSize: 2
-        }
-    });
-    content = applyEdits(content, edits);
+    if (format === 'toml') {
+        const tomlConfig = content.trim() ? parseToml(content) : {};
+        const existingServers = tomlConfig[configKey];
+        tomlConfig[configKey] = {
+            ...existingServers && typeof existingServers === 'object' ? existingServers : {},
+            Sanity: serverConfig
+        };
+        content = stringifyToml(tomlConfig);
+    } else {
+        // Modify using jsonc-parser - preserves comments
+        // Setting a nested path automatically creates intermediate objects
+        const edits = modify(content, [
+            configKey,
+            'Sanity'
+        ], serverConfig, {
+            formattingOptions: {
+                insertSpaces: true,
+                tabSize: 2
+            }
+        });
+        content = applyEdits(content, edits);
+    }
     // Ensure parent directory exists and write
     await fs.mkdir(path.dirname(configPath), {
         recursive: true

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/mcp/writeMCPConfig.ts"],"sourcesContent":["import {existsSync} from 'node:fs'\nimport fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport {applyEdits, modify} from 'jsonc-parser'\n\nimport {EDITOR_CONFIGS} from './editorConfigs.js'\nimport {Editor} from './types.js'\n\n/**\n * Write MCP configuration to editor config file\n * Uses jsonc-parser's modify/applyEdits to preserve comments\n *\n * Note: Config parseability is already validated in detectAvailableEditors()\n */\nexport async function writeMCPConfig(editor: Editor, token: string): Promise<void> {\n  const configPath = editor.configPath\n  const {buildServerConfig, configKey} = EDITOR_CONFIGS[editor.name]\n\n  // Read existing content or start with empty object\n  let content = '{}'\n  if (existsSync(configPath)) {\n    const fileContent = await fs.readFile(configPath, 'utf8')\n    if (fileContent.trim()) {\n      content = fileContent\n    }\n  }\n\n  // Modify using jsonc-parser - preserves comments\n  // Setting a nested path automatically creates intermediate objects\n  const edits = modify(content, [configKey, 'Sanity'], buildServerConfig(token), {\n    formattingOptions: {insertSpaces: true, tabSize: 2},\n  })\n  content = applyEdits(content, edits)\n\n  // Ensure parent directory exists and write\n  await fs.mkdir(path.dirname(configPath), {recursive: true})\n  await fs.writeFile(configPath, content, 'utf8')\n}\n"],"names":["existsSync","fs","path","applyEdits","modify","EDITOR_CONFIGS","writeMCPConfig","editor","token","configPath","buildServerConfig","configKey","name","content","fileContent","readFile","trim","edits","formattingOptions","insertSpaces","tabSize","mkdir","dirname","recursive","writeFile"],"mappings":"AAAA,SAAQA,UAAU,QAAO,UAAS;AAClC,OAAOC,QAAQ,mBAAkB;AACjC,OAAOC,UAAU,YAAW;AAE5B,SAAQC,UAAU,EAAEC,MAAM,QAAO,eAAc;AAE/C,SAAQC,cAAc,QAAO,qBAAoB;AAGjD;;;;;CAKC,GACD,OAAO,eAAeC,eAAeC,MAAc,EAAEC,KAAa;IAChE,MAAMC,aAAaF,OAAOE,UAAU;IACpC,MAAM,EAACC,iBAAiB,EAAEC,SAAS,EAAC,GAAGN,cAAc,CAACE,OAAOK,IAAI,CAAC;IAElE,mDAAmD;IACnD,IAAIC,UAAU;IACd,IAAIb,WAAWS,aAAa;QAC1B,MAAMK,cAAc,MAAMb,GAAGc,QAAQ,CAACN,YAAY;QAClD,IAAIK,YAAYE,IAAI,IAAI;YACtBH,UAAUC;QACZ;IACF;IAEA,iDAAiD;IACjD,mEAAmE;IACnE,MAAMG,QAAQb,OAAOS,SAAS;QAACF;QAAW;KAAS,EAAED,kBAAkBF,QAAQ;QAC7EU,mBAAmB;YAACC,cAAc;YAAMC,SAAS;QAAC;IACpD;IACAP,UAAUV,WAAWU,SAASI;IAE9B,2CAA2C;IAC3C,MAAMhB,GAAGoB,KAAK,CAACnB,KAAKoB,OAAO,CAACb,aAAa;QAACc,WAAW;IAAI;IACzD,MAAMtB,GAAGuB,SAAS,CAACf,YAAYI,SAAS;AAC1C"}
+{"version":3,"sources":["../../../src/actions/mcp/writeMCPConfig.ts"],"sourcesContent":["import {existsSync} from 'node:fs'\nimport fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport {applyEdits, modify} from 'jsonc-parser'\nimport {parse as parseToml, stringify as stringifyToml} from 'smol-toml'\n\nimport {EDITOR_CONFIGS} from './editorConfigs.js'\nimport {Editor} from './types.js'\n\ninterface TomlConfig {\n  [key: string]: Record<string, unknown> | undefined\n}\n\n/**\n * Write MCP configuration to editor config file\n * Uses jsonc-parser's modify/applyEdits to preserve comments\n *\n * Note: Config parseability is already validated in detectAvailableEditors()\n */\nexport async function writeMCPConfig(editor: Editor, token: string): Promise<void> {\n  const configPath = editor.configPath\n  const {buildServerConfig, configKey, format} = EDITOR_CONFIGS[editor.name]\n  const serverConfig = buildServerConfig(token)\n\n  // Read existing content or start with empty object/document\n  let content = format === 'toml' ? '' : '{}'\n  if (existsSync(configPath)) {\n    const fileContent = await fs.readFile(configPath, 'utf8')\n    if (fileContent.trim()) {\n      content = fileContent\n    }\n  }\n\n  if (format === 'toml') {\n    const tomlConfig = content.trim() ? (parseToml(content) as TomlConfig) : {}\n    const existingServers = tomlConfig[configKey]\n\n    tomlConfig[configKey] = {\n      ...(existingServers && typeof existingServers === 'object' ? existingServers : {}),\n      Sanity: serverConfig,\n    }\n\n    content = stringifyToml(tomlConfig)\n  } else {\n    // Modify using jsonc-parser - preserves comments\n    // Setting a nested path automatically creates intermediate objects\n    const edits = modify(content, [configKey, 'Sanity'], serverConfig, {\n      formattingOptions: {insertSpaces: true, tabSize: 2},\n    })\n    content = applyEdits(content, edits)\n  }\n\n  // Ensure parent directory exists and write\n  await fs.mkdir(path.dirname(configPath), {recursive: true})\n  await fs.writeFile(configPath, content, 'utf8')\n}\n"],"names":["existsSync","fs","path","applyEdits","modify","parse","parseToml","stringify","stringifyToml","EDITOR_CONFIGS","writeMCPConfig","editor","token","configPath","buildServerConfig","configKey","format","name","serverConfig","content","fileContent","readFile","trim","tomlConfig","existingServers","Sanity","edits","formattingOptions","insertSpaces","tabSize","mkdir","dirname","recursive","writeFile"],"mappings":"AAAA,SAAQA,UAAU,QAAO,UAAS;AAClC,OAAOC,QAAQ,mBAAkB;AACjC,OAAOC,UAAU,YAAW;AAE5B,SAAQC,UAAU,EAAEC,MAAM,QAAO,eAAc;AAC/C,SAAQC,SAASC,SAAS,EAAEC,aAAaC,aAAa,QAAO,YAAW;AAExE,SAAQC,cAAc,QAAO,qBAAoB;AAOjD;;;;;CAKC,GACD,OAAO,eAAeC,eAAeC,MAAc,EAAEC,KAAa;IAChE,MAAMC,aAAaF,OAAOE,UAAU;IACpC,MAAM,EAACC,iBAAiB,EAAEC,SAAS,EAAEC,MAAM,EAAC,GAAGP,cAAc,CAACE,OAAOM,IAAI,CAAC;IAC1E,MAAMC,eAAeJ,kBAAkBF;IAEvC,4DAA4D;IAC5D,IAAIO,UAAUH,WAAW,SAAS,KAAK;IACvC,IAAIhB,WAAWa,aAAa;QAC1B,MAAMO,cAAc,MAAMnB,GAAGoB,QAAQ,CAACR,YAAY;QAClD,IAAIO,YAAYE,IAAI,IAAI;YACtBH,UAAUC;QACZ;IACF;IAEA,IAAIJ,WAAW,QAAQ;QACrB,MAAMO,aAAaJ,QAAQG,IAAI,KAAMhB,UAAUa,WAA0B,CAAC;QAC1E,MAAMK,kBAAkBD,UAAU,CAACR,UAAU;QAE7CQ,UAAU,CAACR,UAAU,GAAG;YACtB,GAAIS,mBAAmB,OAAOA,oBAAoB,WAAWA,kBAAkB,CAAC,CAAC;YACjFC,QAAQP;QACV;QAEAC,UAAUX,cAAce;IAC1B,OAAO;QACL,iDAAiD;QACjD,mEAAmE;QACnE,MAAMG,QAAQtB,OAAOe,SAAS;YAACJ;YAAW;SAAS,EAAEG,cAAc;YACjES,mBAAmB;gBAACC,cAAc;gBAAMC,SAAS;YAAC;QACpD;QACAV,UAAUhB,WAAWgB,SAASO;IAChC;IAEA,2CAA2C;IAC3C,MAAMzB,GAAG6B,KAAK,CAAC5B,KAAK6B,OAAO,CAAClB,aAAa;QAACmB,WAAW;IAAI;IACzD,MAAM/B,GAAGgC,SAAS,CAACpB,YAAYM,SAAS;AAC1C"}

package/dist/actions/media/buildNdjsonIndex.js

@@ -0,0 +1,32 @@
+import readline from 'node:readline';
+/**
+ * Stream an NDJSON file and build a Map from a key field to a value field.
+ *
+ * Only entries that contain the key field are indexed. If duplicate keys exist,
+ * the last entry wins.
+ *
+ * @internal
+ */ export async function buildNdjsonIndex(ndjson, keyField, valueField) {
+    const lines = readline.createInterface({
+        input: ndjson
+    });
+    const index = new Map();
+    try {
+        for await (const line of lines){
+            const trimmed = line.trim();
+            if (trimmed) {
+                const entry = JSON.parse(trimmed);
+                if (entry[keyField] != null) {
+                    index.set(entry[keyField], entry[valueField]);
+                }
+            }
+        }
+    } finally{
+        lines.close();
+        // Explicitly destroy the underlying stream to prevent file descriptor leaks
+        ndjson.destroy();
+    }
+    return index;
+}
+
+//# sourceMappingURL=buildNdjsonIndex.js.map

package/dist/actions/media/buildNdjsonIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/media/buildNdjsonIndex.ts"],"sourcesContent":["import readline from 'node:readline'\nimport {Readable} from 'node:stream'\n\n/**\n * Stream an NDJSON file and build a Map from a key field to a value field.\n *\n * Only entries that contain the key field are indexed. If duplicate keys exist,\n * the last entry wins.\n *\n * @internal\n */\nexport async function buildNdjsonIndex<Value = unknown>(\n  ndjson: Readable,\n  keyField: string,\n  valueField: string,\n): Promise<Map<string, Value>> {\n  const lines = readline.createInterface({\n    input: ndjson,\n  })\n\n  const index = new Map<string, Value>()\n\n  try {\n    for await (const line of lines) {\n      const trimmed = line.trim()\n      if (trimmed) {\n        const entry = JSON.parse(trimmed)\n        if (entry[keyField] != null) {\n          index.set(entry[keyField], entry[valueField])\n        }\n      }\n    }\n  } finally {\n    lines.close()\n    // Explicitly destroy the underlying stream to prevent file descriptor leaks\n    ndjson.destroy()\n  }\n\n  return index\n}\n"],"names":["readline","buildNdjsonIndex","ndjson","keyField","valueField","lines","createInterface","input","index","Map","line","trimmed","trim","entry","JSON","parse","set","close","destroy"],"mappings":"AAAA,OAAOA,cAAc,gBAAe;AAGpC;;;;;;;CAOC,GACD,OAAO,eAAeC,iBACpBC,MAAgB,EAChBC,QAAgB,EAChBC,UAAkB;IAElB,MAAMC,QAAQL,SAASM,eAAe,CAAC;QACrCC,OAAOL;IACT;IAEA,MAAMM,QAAQ,IAAIC;IAElB,IAAI;QACF,WAAW,MAAMC,QAAQL,MAAO;YAC9B,MAAMM,UAAUD,KAAKE,IAAI;YACzB,IAAID,SAAS;gBACX,MAAME,QAAQC,KAAKC,KAAK,CAACJ;gBACzB,IAAIE,KAAK,CAACV,SAAS,IAAI,MAAM;oBAC3BK,MAAMQ,GAAG,CAACH,KAAK,CAACV,SAAS,EAAEU,KAAK,CAACT,WAAW;gBAC9C;YACF;QACF;IACF,SAAU;QACRC,MAAMY,KAAK;QACX,4EAA4E;QAC5Ef,OAAOgB,OAAO;IAChB;IAEA,OAAOV;AACT"}

package/dist/actions/media/importAspects.js

@@ -1,10 +1,8 @@
 import { access, readdir } from 'node:fs/promises';
 import path from 'node:path';
-import { tryGetDefaultExport } from '@sanity/cli-core';
+import { importModule } from '@sanity/cli-core';
 import { validateMediaLibraryAssetAspect } from '@sanity/schema/_internal';
 import { isAssetAspect } from '@sanity/types';
-import { getTsconfig } from 'get-tsconfig';
-import { tsImport } from 'tsx/esm/api';
 /**
  * File extensions that are considered valid aspect definition files
  */ const ASPECT_FILE_EXTENSIONS = new Set([
@@ -39,8 +37,6 @@ import { tsImport } from 'tsx/esm/api';
     });
     // Filter for valid aspect files
     const aspectFiles = entries.filter((entry)=>entry.isFile() && ASPECT_FILE_EXTENSIONS.has(path.extname(entry.name)));
-    // Get tsconfig for TypeScript compilation
-    const tsconfig = getTsconfig(aspectsPath);
     // Import and validate all aspect files
     const aspects = [];
     for (const file of aspectFiles){
@@ -48,12 +44,7 @@ import { tsImport } from 'tsx/esm/api';
         const filePath = path.resolve(aspectsPath, filename);
         try {
             // Dynamically import the aspect file with TypeScript support
-            const aspectModule = await tsImport(filePath, {
-                parentURL: import.meta.url,
-                tsconfig: tsconfig?.path
-            });
-            // Get the default export
-            const maybeAspect = tryGetDefaultExport(aspectModule);
+            const maybeAspect = await importModule(filePath);
             // Check if user wants to filter this aspect
             if (!filterAspects(maybeAspect)) {
                 continue;

package/dist/actions/media/importAspects.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/media/importAspects.ts"],"sourcesContent":["import {access, readdir} from 'node:fs/promises'\nimport path from 'node:path'\n\nimport {tryGetDefaultExport} from '@sanity/cli-core'\nimport {validateMediaLibraryAssetAspect} from '@sanity/schema/_internal'\nimport {\n  isAssetAspect,\n  type MediaLibraryAssetAspectDocument,\n  type SchemaValidationProblem,\n} from '@sanity/types'\nimport {getTsconfig} from 'get-tsconfig'\nimport {tsImport} from 'tsx/esm/api'\n\n/**\n * File extensions that are considered valid aspect definition files\n */\nconst ASPECT_FILE_EXTENSIONS = new Set(['.js', '.jsx', '.mjs', '.mts', '.ts', '.tsx'])\n\n/**\n * Type for an aspect that has been validated\n */\ninterface ValidAspect {\n  aspect: MediaLibraryAssetAspectDocument\n  filename: string\n  status: 'valid'\n  validationErrors: never[]\n}\n\n/**\n * Type for an aspect that failed validation\n */\ninterface InvalidAspect {\n  aspect: unknown\n  filename: string\n  status: 'invalid'\n  validationErrors: SchemaValidationProblem[][]\n}\n\n/**\n * Union type for aspect containers\n */\ntype AspectContainer = InvalidAspect | ValidAspect\n\n/**\n * Options for importing aspects\n */\ninterface ImportAspectsOptions {\n  /**\n   * Path to the directory containing aspect definition files\n   */\n  aspectsPath: string\n\n  /**\n   * Optional filter function to determine which aspects to include\n   */\n  filterAspects?: (aspect: unknown) => boolean\n}\n\n/**\n * Result of importing aspects, grouped by validation status\n */\ninterface ImportAspectsResult {\n  invalid: InvalidAspect[]\n  valid: ValidAspect[]\n}\n\n/**\n * Import and validate aspect definition files from a directory\n *\n * This function reads all TypeScript/JavaScript files from the specified directory,\n * dynamically imports them using tsx for TypeScript support, validates them,\n * and returns them grouped by validation status.\n *\n * @param options - Options for importing aspects\n * @returns Promise resolving to valid and invalid aspects\n * @internal\n */\nexport async function importAspects(options: ImportAspectsOptions): Promise<ImportAspectsResult> {\n  const {aspectsPath, filterAspects = () => true} = options\n\n  // Check if directory exists\n  try {\n    await access(aspectsPath)\n  } catch {\n    throw new Error(`Aspects directory does not exist: ${aspectsPath}`)\n  }\n\n  // Read directory entries\n  const entries = await readdir(aspectsPath, {withFileTypes: true})\n\n  // Filter for valid aspect files\n  const aspectFiles = entries.filter(\n    (entry) => entry.isFile() && ASPECT_FILE_EXTENSIONS.has(path.extname(entry.name)),\n  )\n\n  // Get tsconfig for TypeScript compilation\n  const tsconfig = getTsconfig(aspectsPath)\n\n  // Import and validate all aspect files\n  const aspects: AspectContainer[] = []\n\n  for (const file of aspectFiles) {\n    const filename = file.name\n    const filePath = path.resolve(aspectsPath, filename)\n\n    try {\n      // Dynamically import the aspect file with TypeScript support\n      const aspectModule = await tsImport(filePath, {\n        parentURL: import.meta.url,\n        tsconfig: tsconfig?.path,\n      })\n\n      // Get the default export\n      const maybeAspect = tryGetDefaultExport(aspectModule)\n\n      // Check if user wants to filter this aspect\n      if (!filterAspects(maybeAspect)) {\n        continue\n      }\n\n      // Validate that it's an asset aspect\n      if (!isAssetAspect(maybeAspect)) {\n        aspects.push({\n          aspect: maybeAspect,\n          filename,\n          status: 'invalid',\n          validationErrors: [],\n        })\n        continue\n      }\n\n      // Validate the aspect schema\n      const [valid, errors] = validateMediaLibraryAssetAspect(maybeAspect.definition)\n\n      if (!valid) {\n        aspects.push({\n          aspect: maybeAspect,\n          filename,\n          status: 'invalid',\n          validationErrors: errors,\n        })\n        continue\n      }\n\n      aspects.push({\n        aspect: maybeAspect,\n        filename,\n        status: 'valid',\n        validationErrors: [],\n      })\n    } catch (error) {\n      aspects.push({\n        aspect: null,\n        filename,\n        status: 'invalid',\n        validationErrors: [\n          [\n            {\n              message: `Failed to import file: ${error instanceof Error ? error.message : 'Unknown error'}`,\n              severity: 'error',\n            },\n          ],\n        ],\n      })\n    }\n  }\n\n  // Group by validation status\n  const result: ImportAspectsResult = {\n    invalid: aspects.filter((a): a is InvalidAspect => a.status === 'invalid'),\n    valid: aspects.filter((a): a is ValidAspect => a.status === 'valid'),\n  }\n\n  return result\n}\n"],"names":["access","readdir","path","tryGetDefaultExport","validateMediaLibraryAssetAspect","isAssetAspect","getTsconfig","tsImport","ASPECT_FILE_EXTENSIONS","Set","importAspects","options","aspectsPath","filterAspects","Error","entries","withFileTypes","aspectFiles","filter","entry","isFile","has","extname","name","tsconfig","aspects","file","filename","filePath","resolve","aspectModule","parentURL","url","maybeAspect","push","aspect","status","validationErrors","valid","errors","definition","error","message","severity","result","invalid","a"],"mappings":"AAAA,SAAQA,MAAM,EAAEC,OAAO,QAAO,mBAAkB;AAChD,OAAOC,UAAU,YAAW;AAE5B,SAAQC,mBAAmB,QAAO,mBAAkB;AACpD,SAAQC,+BAA+B,QAAO,2BAA0B;AACxE,SACEC,aAAa,QAGR,gBAAe;AACtB,SAAQC,WAAW,QAAO,eAAc;AACxC,SAAQC,QAAQ,QAAO,cAAa;AAEpC;;CAEC,GACD,MAAMC,yBAAyB,IAAIC,IAAI;IAAC;IAAO;IAAQ;IAAQ;IAAQ;IAAO;CAAO;AAkDrF;;;;;;;;;;CAUC,GACD,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,WAAW,EAAEC,gBAAgB,IAAM,IAAI,EAAC,GAAGF;IAElD,4BAA4B;IAC5B,IAAI;QACF,MAAMX,OAAOY;IACf,EAAE,OAAM;QACN,MAAM,IAAIE,MAAM,CAAC,kCAAkC,EAAEF,aAAa;IACpE;IAEA,yBAAyB;IACzB,MAAMG,UAAU,MAAMd,QAAQW,aAAa;QAACI,eAAe;IAAI;IAE/D,gCAAgC;IAChC,MAAMC,cAAcF,QAAQG,MAAM,CAChC,CAACC,QAAUA,MAAMC,MAAM,MAAMZ,uBAAuBa,GAAG,CAACnB,KAAKoB,OAAO,CAACH,MAAMI,IAAI;IAGjF,0CAA0C;IAC1C,MAAMC,WAAWlB,YAAYM;IAE7B,uCAAuC;IACvC,MAAMa,UAA6B,EAAE;IAErC,KAAK,MAAMC,QAAQT,YAAa;QAC9B,MAAMU,WAAWD,KAAKH,IAAI;QAC1B,MAAMK,WAAW1B,KAAK2B,OAAO,CAACjB,aAAae;QAE3C,IAAI;YACF,6DAA6D;YAC7D,MAAMG,eAAe,MAAMvB,SAASqB,UAAU;gBAC5CG,WAAW,YAAYC,GAAG;gBAC1BR,UAAUA,UAAUtB;YACtB;YAEA,yBAAyB;YACzB,MAAM+B,cAAc9B,oBAAoB2B;YAExC,4CAA4C;YAC5C,IAAI,CAACjB,cAAcoB,cAAc;gBAC/B;YACF;YAEA,qCAAqC;YACrC,IAAI,CAAC5B,cAAc4B,cAAc;gBAC/BR,QAAQS,IAAI,CAAC;oBACXC,QAAQF;oBACRN;oBACAS,QAAQ;oBACRC,kBAAkB,EAAE;gBACtB;gBACA;YACF;YAEA,6BAA6B;YAC7B,MAAM,CAACC,OAAOC,OAAO,GAAGnC,gCAAgC6B,YAAYO,UAAU;YAE9E,IAAI,CAACF,OAAO;gBACVb,QAAQS,IAAI,CAAC;oBACXC,QAAQF;oBACRN;oBACAS,QAAQ;oBACRC,kBAAkBE;gBACpB;gBACA;YACF;YAEAd,QAAQS,IAAI,CAAC;gBACXC,QAAQF;gBACRN;gBACAS,QAAQ;gBACRC,kBAAkB,EAAE;YACtB;QACF,EAAE,OAAOI,OAAO;YACdhB,QAAQS,IAAI,CAAC;gBACXC,QAAQ;gBACRR;gBACAS,QAAQ;gBACRC,kBAAkB;oBAChB;wBACE;4BACEK,SAAS,CAAC,uBAAuB,EAAED,iBAAiB3B,QAAQ2B,MAAMC,OAAO,GAAG,iBAAiB;4BAC7FC,UAAU;wBACZ;qBACD;iBACF;YACH;QACF;IACF;IAEA,6BAA6B;IAC7B,MAAMC,SAA8B;QAClCC,SAASpB,QAAQP,MAAM,CAAC,CAAC4B,IAA0BA,EAAEV,MAAM,KAAK;QAChEE,OAAOb,QAAQP,MAAM,CAAC,CAAC4B,IAAwBA,EAAEV,MAAM,KAAK;IAC9D;IAEA,OAAOQ;AACT"}
+{"version":3,"sources":["../../../src/actions/media/importAspects.ts"],"sourcesContent":["import {access, readdir} from 'node:fs/promises'\nimport path from 'node:path'\n\nimport {importModule} from '@sanity/cli-core'\nimport {validateMediaLibraryAssetAspect} from '@sanity/schema/_internal'\nimport {\n  isAssetAspect,\n  type MediaLibraryAssetAspectDocument,\n  type SchemaValidationProblem,\n} from '@sanity/types'\n\n/**\n * File extensions that are considered valid aspect definition files\n */\nconst ASPECT_FILE_EXTENSIONS = new Set(['.js', '.jsx', '.mjs', '.mts', '.ts', '.tsx'])\n\n/**\n * Type for an aspect that has been validated\n */\ninterface ValidAspect {\n  aspect: MediaLibraryAssetAspectDocument\n  filename: string\n  status: 'valid'\n  validationErrors: never[]\n}\n\n/**\n * Type for an aspect that failed validation\n */\ninterface InvalidAspect {\n  aspect: unknown\n  filename: string\n  status: 'invalid'\n  validationErrors: SchemaValidationProblem[][]\n}\n\n/**\n * Union type for aspect containers\n */\ntype AspectContainer = InvalidAspect | ValidAspect\n\n/**\n * Options for importing aspects\n */\ninterface ImportAspectsOptions {\n  /**\n   * Path to the directory containing aspect definition files\n   */\n  aspectsPath: string\n\n  /**\n   * Optional filter function to determine which aspects to include\n   */\n  filterAspects?: (aspect: unknown) => boolean\n}\n\n/**\n * Result of importing aspects, grouped by validation status\n */\ninterface ImportAspectsResult {\n  invalid: InvalidAspect[]\n  valid: ValidAspect[]\n}\n\n/**\n * Import and validate aspect definition files from a directory\n *\n * This function reads all TypeScript/JavaScript files from the specified directory,\n * dynamically imports them using tsx for TypeScript support, validates them,\n * and returns them grouped by validation status.\n *\n * @param options - Options for importing aspects\n * @returns Promise resolving to valid and invalid aspects\n * @internal\n */\nexport async function importAspects(options: ImportAspectsOptions): Promise<ImportAspectsResult> {\n  const {aspectsPath, filterAspects = () => true} = options\n\n  // Check if directory exists\n  try {\n    await access(aspectsPath)\n  } catch {\n    throw new Error(`Aspects directory does not exist: ${aspectsPath}`)\n  }\n\n  // Read directory entries\n  const entries = await readdir(aspectsPath, {withFileTypes: true})\n\n  // Filter for valid aspect files\n  const aspectFiles = entries.filter(\n    (entry) => entry.isFile() && ASPECT_FILE_EXTENSIONS.has(path.extname(entry.name)),\n  )\n\n  // Import and validate all aspect files\n  const aspects: AspectContainer[] = []\n\n  for (const file of aspectFiles) {\n    const filename = file.name\n    const filePath = path.resolve(aspectsPath, filename)\n\n    try {\n      // Dynamically import the aspect file with TypeScript support\n      const maybeAspect = await importModule(filePath)\n\n      // Check if user wants to filter this aspect\n      if (!filterAspects(maybeAspect)) {\n        continue\n      }\n\n      // Validate that it's an asset aspect\n      if (!isAssetAspect(maybeAspect)) {\n        aspects.push({\n          aspect: maybeAspect,\n          filename,\n          status: 'invalid',\n          validationErrors: [],\n        })\n        continue\n      }\n\n      // Validate the aspect schema\n      const [valid, errors] = validateMediaLibraryAssetAspect(maybeAspect.definition)\n\n      if (!valid) {\n        aspects.push({\n          aspect: maybeAspect,\n          filename,\n          status: 'invalid',\n          validationErrors: errors,\n        })\n        continue\n      }\n\n      aspects.push({\n        aspect: maybeAspect,\n        filename,\n        status: 'valid',\n        validationErrors: [],\n      })\n    } catch (error) {\n      aspects.push({\n        aspect: null,\n        filename,\n        status: 'invalid',\n        validationErrors: [\n          [\n            {\n              message: `Failed to import file: ${error instanceof Error ? error.message : 'Unknown error'}`,\n              severity: 'error',\n            },\n          ],\n        ],\n      })\n    }\n  }\n\n  // Group by validation status\n  const result: ImportAspectsResult = {\n    invalid: aspects.filter((a): a is InvalidAspect => a.status === 'invalid'),\n    valid: aspects.filter((a): a is ValidAspect => a.status === 'valid'),\n  }\n\n  return result\n}\n"],"names":["access","readdir","path","importModule","validateMediaLibraryAssetAspect","isAssetAspect","ASPECT_FILE_EXTENSIONS","Set","importAspects","options","aspectsPath","filterAspects","Error","entries","withFileTypes","aspectFiles","filter","entry","isFile","has","extname","name","aspects","file","filename","filePath","resolve","maybeAspect","push","aspect","status","validationErrors","valid","errors","definition","error","message","severity","result","invalid","a"],"mappings":"AAAA,SAAQA,MAAM,EAAEC,OAAO,QAAO,mBAAkB;AAChD,OAAOC,UAAU,YAAW;AAE5B,SAAQC,YAAY,QAAO,mBAAkB;AAC7C,SAAQC,+BAA+B,QAAO,2BAA0B;AACxE,SACEC,aAAa,QAGR,gBAAe;AAEtB;;CAEC,GACD,MAAMC,yBAAyB,IAAIC,IAAI;IAAC;IAAO;IAAQ;IAAQ;IAAQ;IAAO;CAAO;AAkDrF;;;;;;;;;;CAUC,GACD,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,WAAW,EAAEC,gBAAgB,IAAM,IAAI,EAAC,GAAGF;IAElD,4BAA4B;IAC5B,IAAI;QACF,MAAMT,OAAOU;IACf,EAAE,OAAM;QACN,MAAM,IAAIE,MAAM,CAAC,kCAAkC,EAAEF,aAAa;IACpE;IAEA,yBAAyB;IACzB,MAAMG,UAAU,MAAMZ,QAAQS,aAAa;QAACI,eAAe;IAAI;IAE/D,gCAAgC;IAChC,MAAMC,cAAcF,QAAQG,MAAM,CAChC,CAACC,QAAUA,MAAMC,MAAM,MAAMZ,uBAAuBa,GAAG,CAACjB,KAAKkB,OAAO,CAACH,MAAMI,IAAI;IAGjF,uCAAuC;IACvC,MAAMC,UAA6B,EAAE;IAErC,KAAK,MAAMC,QAAQR,YAAa;QAC9B,MAAMS,WAAWD,KAAKF,IAAI;QAC1B,MAAMI,WAAWvB,KAAKwB,OAAO,CAAChB,aAAac;QAE3C,IAAI;YACF,6DAA6D;YAC7D,MAAMG,cAAc,MAAMxB,aAAasB;YAEvC,4CAA4C;YAC5C,IAAI,CAACd,cAAcgB,cAAc;gBAC/B;YACF;YAEA,qCAAqC;YACrC,IAAI,CAACtB,cAAcsB,cAAc;gBAC/BL,QAAQM,IAAI,CAAC;oBACXC,QAAQF;oBACRH;oBACAM,QAAQ;oBACRC,kBAAkB,EAAE;gBACtB;gBACA;YACF;YAEA,6BAA6B;YAC7B,MAAM,CAACC,OAAOC,OAAO,GAAG7B,gCAAgCuB,YAAYO,UAAU;YAE9E,IAAI,CAACF,OAAO;gBACVV,QAAQM,IAAI,CAAC;oBACXC,QAAQF;oBACRH;oBACAM,QAAQ;oBACRC,kBAAkBE;gBACpB;gBACA;YACF;YAEAX,QAAQM,IAAI,CAAC;gBACXC,QAAQF;gBACRH;gBACAM,QAAQ;gBACRC,kBAAkB,EAAE;YACtB;QACF,EAAE,OAAOI,OAAO;YACdb,QAAQM,IAAI,CAAC;gBACXC,QAAQ;gBACRL;gBACAM,QAAQ;gBACRC,kBAAkB;oBAChB;wBACE;4BACEK,SAAS,CAAC,uBAAuB,EAAED,iBAAiBvB,QAAQuB,MAAMC,OAAO,GAAG,iBAAiB;4BAC7FC,UAAU;wBACZ;qBACD;iBACF;YACH;QACF;IACF;IAEA,6BAA6B;IAC7B,MAAMC,SAA8B;QAClCC,SAASjB,QAAQN,MAAM,CAAC,CAACwB,IAA0BA,EAAEV,MAAM,KAAK;QAChEE,OAAOV,QAAQN,MAAM,CAAC,CAACwB,IAAwBA,EAAEV,MAAM,KAAK;IAC9D;IAEA,OAAOQ;AACT"}

package/dist/actions/media/importMedia.js

@@ -8,13 +8,12 @@ import { pipeline } from 'node:stream/promises';
 import { styleText } from 'node:util';
 import gunzipMaybe from 'gunzip-maybe';
 // @ts-expect-error `peek-stream` module currently untyped
-import isTar from 'is-tar';
-// @ts-expect-error `peek-stream` module currently untyped
 import peek from 'peek-stream';
 import { catchError, EMPTY, filter, from, map, mergeMap, mergeWith, of, switchMap, tap, zip } from 'rxjs';
 import tar from 'tar-fs';
 import { glob } from 'tinyglobby';
-import { findNdjsonEntry } from '../../util/findNdjsonEntry.js';
+import { isTar } from '../../util/isTar.js';
+import { buildNdjsonIndex } from './buildNdjsonIndex.js';
 import { importMediaDebug } from './importMediaDebug.js';
 const DEFAULT_CONCURRENCY = 6;
 export function importer(options) {
@@ -23,15 +22,20 @@ export function importer(options) {
         if (fileCount === 0) {
             throw new Error('No assets to import');
         }
-        const context = {
-            ...options,
-            ndjson: ()=>createReadStream(aspectsNdjsonPath),
-            workingPath
-        };
-        return from(files).pipe(switchMap((file)=>zip(of('file'), of(file))), mergeWith(from(images).pipe(switchMap((file)=>zip(of('image'), of(file))))), fetchExistingAssets(context), uploadAsset(context), resolveAspectData(context), setAspects(context), map((asset)=>({
-                asset,
-                fileCount
-            })));
+        // Stream the ndjson file once and build an index to avoid creating
+        // multiple read streams (which causes file descriptor leaks)
+        const aspectsIndexPromise = buildNdjsonIndex(createReadStream(aspectsNdjsonPath), 'filename', 'aspects');
+        return from(aspectsIndexPromise).pipe(mergeMap((aspectsIndex)=>{
+            const context = {
+                ...options,
+                aspectsIndex,
+                workingPath
+            };
+            return from(files).pipe(switchMap((file)=>zip(of('file'), of(file))), mergeWith(from(images).pipe(switchMap((file)=>zip(of('image'), of(file))))), fetchExistingAssets(context), uploadAsset(context), resolveAspectData(context), setAspects(context), map((asset)=>({
+                    asset,
+                    fileCount
+                })));
+        }));
     }));
 }
 /**
@@ -141,14 +145,14 @@ function fetchExistingAssets({ client, workingPath }) {
     });
 }
 /**
- * Find the first matching entry in the provided NDJSON stream and attach it to the asset object.
+ * Find the first matching entry in the cached aspect data and attach it to the asset object.
  *
  * @internal
- */ function resolveAspectData({ ndjson }) {
-    return mergeMap((resolvedAsset)=>from(findNdjsonEntry(ndjson(), (line)=>typeof line === 'object' && line !== null && 'filename' in line && line.filename === resolvedAsset.originalFilename)).pipe(map((aspectsFromImport)=>({
-                ...resolvedAsset,
-                aspects: aspectsFromImport?.aspects
-            }))));
+ */ function resolveAspectData({ aspectsIndex }) {
+    return map((resolvedAsset)=>({
+            ...resolvedAsset,
+            aspects: aspectsIndex.get(resolvedAsset.originalFilename)
+        }));
 }
 // TODO: Batch mutations to reduce HTTP request count.
 export function setAspects({ client, replaceAspects }) {