fix(mcp): use explicit mode for setupMCP during init (#744)

Author: binoy14

packages/@sanity/cli-core/src/util/__tests__/isInteractive.test.ts

@@ -55,14 +55,6 @@ describe('isInteractive', () => {
     expect(isInteractive()).toBe(true)
   })
 
-  test('returns true when skipCi is true even if CI env var is set', () => {
-    process.stdin.isTTY = true
-    vi.stubEnv('TERM', undefined)
-    vi.stubEnv('CI', 'true')
-
-    expect(isInteractive({skipCi: true})).toBe(true)
-  })
-
   test('returns false when stdin is not a TTY even if stdout is', () => {
     // stdin is piped (e.g., `echo "input" | sanity command`)
     process.stdin.isTTY = false

packages/@sanity/cli-core/src/util/isInteractive.ts

@@ -1,14 +1,3 @@
-export function isInteractive({
-  skipCi = false,
-}: {
-  /**
-   * IF true, skip checking the CI environment variable
-   */
-  skipCi?: boolean
-} = {}): boolean {
-  return (
-    Boolean(process.stdin.isTTY) &&
-    process.env.TERM !== 'dumb' &&
-    (skipCi || !('CI' in process.env))
-  )
+export function isInteractive(): boolean {
+  return Boolean(process.stdin.isTTY) && process.env.TERM !== 'dumb' && !('CI' in process.env)
 }

packages/@sanity/cli/src/actions/mcp/__tests__/setupMCP.test.ts

@@ -0,0 +1,103 @@
+import {afterEach, describe, expect, test, vi} from 'vitest'
+
+import {setupMCP} from '../setupMCP.js'
+
+const mockDetectAvailableEditors = vi.hoisted(() => vi.fn())
+const mockPromptForMCPSetup = vi.hoisted(() => vi.fn())
+const mockValidateEditorTokens = vi.hoisted(() => vi.fn())
+const mockCreateMCPToken = vi.hoisted(() => vi.fn())
+const mockWriteMCPConfig = vi.hoisted(() => vi.fn())
+
+vi.mock('../detectAvailableEditors.js', () => ({
+  detectAvailableEditors: mockDetectAvailableEditors,
+}))
+
+vi.mock('../promptForMCPSetup.js', () => ({
+  promptForMCPSetup: mockPromptForMCPSetup,
+}))
+
+vi.mock('../validateEditorTokens.js', () => ({
+  validateEditorTokens: mockValidateEditorTokens,
+}))
+
+vi.mock('../../../services/mcp.js', () => ({
+  createMCPToken: mockCreateMCPToken,
+  MCP_SERVER_URL: 'https://mcp.sanity.io',
+}))
+
+vi.mock('../writeMCPConfig.js', () => ({
+  writeMCPConfig: mockWriteMCPConfig,
+}))
+
+describe('setupMCP', () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('mode: skip returns early without detecting editors', async () => {
+    const result = await setupMCP({mode: 'skip'})
+
+    expect(result.skipped).toBe(true)
+    expect(result.configuredEditors).toEqual([])
+    expect(result.detectedEditors).toEqual([])
+    expect(mockDetectAvailableEditors).not.toHaveBeenCalled()
+  })
+
+  test('mode: auto auto-selects all actionable editors without prompting', async () => {
+    mockDetectAvailableEditors.mockResolvedValue([
+      {authStatus: 'unknown', configured: false, name: 'Cursor'},
+      {authStatus: 'unknown', configured: false, name: 'VS Code'},
+    ])
+    mockValidateEditorTokens.mockResolvedValue(undefined)
+    mockCreateMCPToken.mockResolvedValue('test-token')
+    mockWriteMCPConfig.mockResolvedValue(undefined)
+
+    const result = await setupMCP({mode: 'auto'})
+
+    expect(mockPromptForMCPSetup).not.toHaveBeenCalled()
+    expect(mockWriteMCPConfig).toHaveBeenCalledTimes(2)
+    expect(result.configuredEditors).toEqual(['Cursor', 'VS Code'])
+    expect(result.skipped).toBe(false)
+  })
+
+  test('mode: prompt calls promptForMCPSetup', async () => {
+    const editors = [{authStatus: 'unknown', configured: false, name: 'Cursor'}]
+    mockDetectAvailableEditors.mockResolvedValue(editors)
+    mockValidateEditorTokens.mockResolvedValue(undefined)
+    mockPromptForMCPSetup.mockResolvedValue(editors)
+    mockCreateMCPToken.mockResolvedValue('test-token')
+    mockWriteMCPConfig.mockResolvedValue(undefined)
+
+    const result = await setupMCP({mode: 'prompt'})
+
+    expect(mockPromptForMCPSetup).toHaveBeenCalledWith(editors)
+    expect(result.configuredEditors).toEqual(['Cursor'])
+    expect(result.skipped).toBe(false)
+  })
+
+  test('defaults to prompt mode when no mode specified', async () => {
+    const editors = [{authStatus: 'unknown', configured: false, name: 'Cursor'}]
+    mockDetectAvailableEditors.mockResolvedValue(editors)
+    mockValidateEditorTokens.mockResolvedValue(undefined)
+    mockPromptForMCPSetup.mockResolvedValue(editors)
+    mockCreateMCPToken.mockResolvedValue('test-token')
+    mockWriteMCPConfig.mockResolvedValue(undefined)
+
+    await setupMCP()
+
+    expect(mockPromptForMCPSetup).toHaveBeenCalledWith(editors)
+  })
+
+  test('defaults to prompt mode when options provided without mode', async () => {
+    const editors = [{authStatus: 'unknown', configured: false, name: 'Cursor'}]
+    mockDetectAvailableEditors.mockResolvedValue(editors)
+    mockValidateEditorTokens.mockResolvedValue(undefined)
+    mockPromptForMCPSetup.mockResolvedValue(editors)
+    mockCreateMCPToken.mockResolvedValue('test-token')
+    mockWriteMCPConfig.mockResolvedValue(undefined)
+
+    await setupMCP({explicit: true})
+
+    expect(mockPromptForMCPSetup).toHaveBeenCalledWith(editors)
+  })
+})

packages/@sanity/cli/src/actions/mcp/setupMCP.ts

@@ -1,5 +1,5 @@
 import {ux} from '@oclif/core'
-import {isInteractive, subdebug} from '@sanity/cli-core'
+import {subdebug} from '@sanity/cli-core'
 import {logSymbols} from '@sanity/cli-core/ux'
 
 import {createMCPToken, MCP_SERVER_URL} from '../../services/mcp.js'
@@ -22,9 +22,12 @@ interface MCPSetupOptions {
   explicit?: boolean
 
   /**
-   * If true, skip MCP configuration entirely (e.g. --no-mcp flag).
+   * Controls how MCP setup behaves:
+   * - 'prompt': Ask the user which editors to configure (default)
+   * - 'auto': Auto-configure all detected editors without prompting
+   * - 'skip': Skip MCP configuration entirely
    */
-  skip?: boolean
+  mode?: 'auto' | 'prompt' | 'skip'
 }
 
 interface MCPSetupResult {
@@ -42,11 +45,11 @@ interface MCPSetupResult {
  * Opt-out by default: runs automatically unless skip option is set
  */
 export async function setupMCP(options?: MCPSetupOptions): Promise<MCPSetupResult> {
-  const {explicit = false, skip = false} = options ?? {}
+  const {explicit = false, mode = 'prompt'} = options ?? {}
 
   // 1. Check for explicit opt-out
-  if (skip) {
-    ux.warn('Skipping MCP configuration due to --no-mcp flag')
+  if (mode === 'skip') {
+    mcpDebug('Skipping MCP configuration (mode: skip)')
     return {
       alreadyConfiguredEditors: [],
       configuredEditors: [],
@@ -98,12 +101,8 @@ export async function setupMCP(options?: MCPSetupOptions): Promise<MCPSetupResul
   // 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 if non interactive
-  const selected = isInteractive({
-    skipCi: true,
-  })
-    ? await promptForMCPSetup(actionable)
-    : actionable
+  // 5. Select editors to configure — prompt interactively or auto-select all
+  const selected = mode === 'auto' ? actionable : await promptForMCPSetup(actionable)
 
   if (!selected || selected.length === 0) {
     // User deselected all editors

packages/@sanity/cli/src/commands/init.ts

@@ -464,7 +464,13 @@ export class InitCommand extends SanityCommand<typeof InitCommand> {
     })
 
     // Set up MCP integration
-    const mcpResult = await setupMCP({skip: !this.flags.mcp})
+    let mcpMode: 'auto' | 'prompt' | 'skip' = 'prompt'
+    if (!this.flags.mcp || !this.resolveIsInteractive()) {
+      mcpMode = 'skip'
+    } else if (this.flags.yes) {
+      mcpMode = 'auto'
+    }
+    const mcpResult = await setupMCP({mode: mcpMode})
 
     this._trace.log({
       configuredEditors: mcpResult.configuredEditors,

packages/@sanity/cli/src/commands/mcp/__tests__/configure.test.ts

@@ -1157,9 +1157,6 @@ describe('#mcp:configure', () => {
 
     const {stdout} = await testCommand(ConfigureMcpCommand, [])
 
-    // Verify isInteractive was called with skipCi: true (MCP setup should work in CI if TTY present)
-    expect(mockIsInteractive).toHaveBeenCalledWith({skipCi: true})
-
     expect(mockCheckbox).not.toHaveBeenCalled()
     expect(mockWriteFile).toHaveBeenCalledWith(
       expect.stringContaining(convertToSystemPath('.cursor/mcp.json')),

packages/@sanity/cli/src/commands/mcp/configure.ts

@@ -1,4 +1,4 @@
-import {SanityCommand, subdebug} from '@sanity/cli-core'
+import {isInteractive, SanityCommand, subdebug} from '@sanity/cli-core'
 
 import {ensureAuthenticated} from '../../actions/auth/ensureAuthenticated.js'
 import {setupMCP} from '../../actions/mcp/setupMCP.js'
@@ -40,7 +40,7 @@ export class ConfigureMcpCommand extends SanityCommand<typeof ConfigureMcpComman
     }
 
     try {
-      const mcpResult = await setupMCP({explicit: true})
+      const mcpResult = await setupMCP({explicit: true, mode: isInteractive() ? 'prompt' : 'auto'})
 
       trace.log({
         configuredEditors: mcpResult.configuredEditors,