fix(mcp): allow third-party providers to approve project-scope .mcp.json servers (#696)

When a user runs openclaude with a third-party provider, project-scope
MCP servers added via `openclaude mcp add -s project ...` were silently
dropped from `/mcp` and `openclaude mcp list`. Re-adding the same
server printed "MCP server already exists in .mcp.json" but the server
never actually loaded. Reporter @gbmerrall pinpointed the cause to the
`if (usesAnthropicSetup)` gate around `handleMcpjsonServerApprovals`
in src/interactiveHelpers.tsx.

The MCP approval dialog and the CLAUDE.md external-includes warning
are about workspace trust, not about Anthropic auth. Gating them on
`usesAnthropicSetup` meant 3P-provider users never saw the dialog
that writes `enableAllProjectMcpServers: true` and
`enabledMcpjsonServers: [...]` to settings.local.json — without
those settings, the MCP server isn't loaded for use.

Drop the `usesAnthropicSetup` gate around the approval flow. The
inner logic is unchanged and `handleMcpjsonServerApprovals` already
early-returns when no servers are pending, so users without project
`.mcp.json` see no new behavior.

- src/interactiveHelpers.tsx: drop the gate, add a comment explaining
  why (and cite #696 so future readers can find context).
- src/__tests__/bugfixes.test.ts: +2 regression tests asserting the
  gate is gone and the issue is referenced.

Verified locally on Linux: build passes (v0.7.0), 1634 tests pass,
the 4 remaining failures (StartupScreen.test.ts, thinking.test.ts)
reproduce on main and are unrelated. The bundled dist/cli.mjs shows
`handleMcpjsonServerApprovals(root2)` running directly after
`setSessionTrustAccepted(true)` with no auth gate.

src/__tests__/bugfixes.test.ts

@@ -288,3 +288,30 @@ describe('Context overflow 500 fix', () => {
     expect(content).toContain('automatic compaction has failed')
   })
 })
+
+// ---------------------------------------------------------------------------
+// Fix N: Project-scope MCP servers from .mcp.json not detected for 3P providers (issue #696)
+// ---------------------------------------------------------------------------
+describe('Project-scope MCP approval — third-party providers (issue #696)', () => {
+  test('handleMcpjsonServerApprovals is NOT gated behind usesAnthropicSetup', async () => {
+    const content = await file('interactiveHelpers.tsx').text()
+
+    // The call site for handleMcpjsonServerApprovals must not sit inside an
+    // `if (usesAnthropicSetup) { ... }` block, or third-party providers will
+    // never get the dialog and project-scope .mcp.json servers will be silently
+    // dropped from /mcp listings (issue #696).
+    const approvalCallIdx = content.indexOf('await handleMcpjsonServerApprovals(root)')
+    expect(approvalCallIdx).toBeGreaterThan(-1)
+
+    // Look at the 800 chars BEFORE the call site for any `if (usesAnthropicSetup)`
+    // block that would still be open. Pick a window that's definitely inside the
+    // showSetupScreens function but not in earlier dialogs.
+    const before = content.slice(Math.max(0, approvalCallIdx - 800), approvalCallIdx)
+    expect(before).not.toMatch(/if\s*\(\s*usesAnthropicSetup\s*\)\s*{[^}]*$/)
+  })
+
+  test('issue #696 is referenced from the comment so future readers can find context', async () => {
+    const content = await file('interactiveHelpers.tsx').text()
+    expect(content).toContain('#696')
+  })
+})

src/components/PromptInput/PromptInput.tsx

@@ -111,7 +111,7 @@ import { BackgroundTasksDialog } from '../tasks/BackgroundTasksDialog.js';
 import { shouldHideTasksFooter } from '../tasks/taskStatusUtils.js';
 import { TeamsDialog } from '../teams/TeamsDialog.js';
 import VimTextInput from '../VimTextInput.js';
-import { detectModeEntry, getModeFromInput, getValueFromInput } from './inputModes.js';
+import { getModeFromInput, getValueFromInput } from './inputModes.js';
 import { FOOTER_TEMPORARY_STATUS_TIMEOUT, Notifications } from './Notifications.js';
 import PromptInputFooter from './PromptInputFooter.js';
 import type { SuggestionItem } from './PromptInputFooterSuggestions.js';
@@ -878,23 +878,25 @@ function PromptInput({
     abortPromptSuggestion();
     abortSpeculation(setAppState);
 
-    // Strip the mode character from the buffer when entering bash mode — the
+    // Check if this is a single character insertion at the start
-    // mode itself is shown via the prompt prefix in the UI. Without this,
+    const isSingleCharInsertion = value.length === input.length + 1;
-    // typing `!` into empty input would enter bash mode but leave the literal
+    const insertedAtStart = cursorOffset === 0;
-    // `!` in the buffer (issue #662).
+    const mode = getModeFromInput(value);
-    const modeEntry = detectModeEntry({
+    if (insertedAtStart && mode !== 'prompt') {
-      value,
+      if (isSingleCharInsertion) {
-      prevInputLength: input.length,
+        onModeChange(mode);
-      cursorOffset,
-    });
-    if (modeEntry) {
-      onModeChange(modeEntry.mode);
-      const cleaned = modeEntry.strippedValue.replaceAll('\t', '    ');
-      pushToBuffer(input, cursorOffset, pastedContents);
-      trackAndSetInput(cleaned);
-      setCursorOffset(cleaned.length);
         return;
       }
+      // Multi-char insertion into empty input (e.g. tab-accepting "! gcloud auth login")
+      if (input.length === 0) {
+        onModeChange(mode);
+        const valueWithoutMode = getValueFromInput(value).replaceAll('\t', '    ');
+        pushToBuffer(input, cursorOffset, pastedContents);
+        trackAndSetInput(valueWithoutMode);
+        setCursorOffset(valueWithoutMode.length);
+        return;
+      }
+    }
     const processedValue = value.replaceAll('\t', '    ');
 
     // Push current state to buffer before making changes

src/components/PromptInput/inputModes.test.ts

@@ -1,104 +0,0 @@
-import { describe, expect, it } from 'bun:test'
-import {
-  detectModeEntry,
-  getModeFromInput,
-  getValueFromInput,
-  isInputModeCharacter,
-  prependModeCharacterToInput,
-} from './inputModes.js'
-
-describe('inputModes', () => {
-  describe('getModeFromInput', () => {
-    it('returns bash mode for input starting with !', () => {
-      expect(getModeFromInput('!')).toBe('bash')
-      expect(getModeFromInput('!ls')).toBe('bash')
-    })
-
-    it('returns prompt mode for non-bash input', () => {
-      expect(getModeFromInput('')).toBe('prompt')
-      expect(getModeFromInput('hello')).toBe('prompt')
-      expect(getModeFromInput(' !')).toBe('prompt')
-    })
-  })
-
-  describe('getValueFromInput', () => {
-    it('strips the leading ! when entering bash mode', () => {
-      expect(getValueFromInput('!')).toBe('')
-      expect(getValueFromInput('!ls -la')).toBe('ls -la')
-    })
-
-    it('returns input unchanged in prompt mode', () => {
-      expect(getValueFromInput('')).toBe('')
-      expect(getValueFromInput('hello')).toBe('hello')
-    })
-  })
-
-  describe('isInputModeCharacter', () => {
-    it('returns true only for the bare ! character', () => {
-      expect(isInputModeCharacter('!')).toBe(true)
-      expect(isInputModeCharacter('!ls')).toBe(false)
-      expect(isInputModeCharacter('')).toBe(false)
-    })
-  })
-
-  describe('prependModeCharacterToInput', () => {
-    it('prepends ! when mode is bash', () => {
-      expect(prependModeCharacterToInput('ls', 'bash')).toBe('!ls')
-      expect(prependModeCharacterToInput('', 'bash')).toBe('!')
-    })
-
-    it('returns input unchanged in prompt mode', () => {
-      expect(prependModeCharacterToInput('hello', 'prompt')).toBe('hello')
-    })
-  })
-
-  describe('detectModeEntry', () => {
-    // Regression for #662 — typing `!` into empty input must switch to bash
-    // mode AND yield an empty stripped buffer. Before the fix the single-char
-    // path returned without stripping, leaving `!` visible in the buffer.
-    it('strips the mode character when typing ! into empty input', () => {
-      expect(
-        detectModeEntry({ value: '!', prevInputLength: 0, cursorOffset: 0 }),
-      ).toEqual({ mode: 'bash', strippedValue: '' })
-    })
-
-    it('strips the mode character when pasting !cmd into empty input', () => {
-      expect(
-        detectModeEntry({ value: '!ls -la', prevInputLength: 0, cursorOffset: 0 }),
-      ).toEqual({ mode: 'bash', strippedValue: 'ls -la' })
-    })
-
-    it('returns null when the cursor is not at the start', () => {
-      expect(
-        detectModeEntry({ value: '!', prevInputLength: 0, cursorOffset: 1 }),
-      ).toBeNull()
-    })
-
-    it('returns null when the value does not start with !', () => {
-      expect(
-        detectModeEntry({ value: 'hello', prevInputLength: 0, cursorOffset: 0 }),
-      ).toBeNull()
-    })
-
-    it('returns null when typing ! after existing text', () => {
-      // value="ab!" with prevInputLength=2 is a single-char insertion but does
-      // not start with ! — getModeFromInput returns 'prompt'.
-      expect(
-        detectModeEntry({ value: 'ab!', prevInputLength: 2, cursorOffset: 0 }),
-      ).toBeNull()
-    })
-
-    it('returns null when prepending ! to non-empty existing text', () => {
-      // Single-char insertion at start that produces "!ab" from "ab" — value
-      // length is 3, prevInputLength is 2, so isSingleCharInsertion is true
-      // and isMultiCharIntoEmpty is false. We accept the mode change here so
-      // that typing ! at the start of existing text still toggles mode.
-      const result = detectModeEntry({
-        value: '!ab',
-        prevInputLength: 2,
-        cursorOffset: 0,
-      })
-      expect(result).toEqual({ mode: 'bash', strippedValue: 'ab' })
-    })
-  })
-})

src/components/PromptInput/inputModes.ts

@@ -31,30 +31,3 @@ export function getValueFromInput(input: string): string {
 export function isInputModeCharacter(input: string): boolean {
   return input === '!'
 }
-
-export type ModeEntryDecision = {
-  mode: HistoryMode
-  strippedValue: string
-}
-
-/**
- * Decide whether an onChange `value` should switch the input mode (e.g.
- * `prompt` → `bash`) and what the stripped buffer value should be.
- *
- * Returns null when no mode change applies. Returns a decision otherwise so
- * callers run a single update path — no separate single-char vs multi-char
- * branches that can drift apart.
- */
-export function detectModeEntry(args: {
-  value: string
-  prevInputLength: number
-  cursorOffset: number
-}): ModeEntryDecision | null {
-  if (args.cursorOffset !== 0) return null
-  const mode = getModeFromInput(args.value)
-  if (mode === 'prompt') return null
-  const isSingleCharInsertion = args.value.length === args.prevInputLength + 1
-  const isMultiCharIntoEmpty = args.prevInputLength === 0
-  if (!isSingleCharInsertion && !isMultiCharIntoEmpty) return null
-  return { mode, strippedValue: getValueFromInput(args.value) }
-}

src/interactiveHelpers.tsx

@@ -158,12 +158,14 @@ export async function showSetupScreens(root: Root, permissionMode: PermissionMod
     // Now that trust is established, prefetch system context if it wasn't already
     void getSystemContext();
 
-    // Skip MCP approval dialogs for third-party providers (no interactive auth prompts)
+    // MCP approval and external-includes warnings are about workspace
-    if (usesAnthropicSetup) {
+    // trust, not about Anthropic auth. They must run for all providers
-      // If settings are valid, check for any mcp.json servers that need approval
+    // — including third-party — otherwise project-scoped .mcp.json
-      const {
+    // servers never get the approval that writes
-        errors: allErrors
+    // enableAllProjectMcpServers / enabledMcpjsonServers into
-      } = getSettingsWithAllErrors();
+    // settings.local.json, and the servers are silently dropped from
+    // /mcp and `mcp list` (issue #696).
+    const { errors: allErrors } = getSettingsWithAllErrors();
     if (allErrors.length === 0) {
       await handleMcpjsonServerApprovals(root);
     }
@@ -177,7 +179,6 @@ export async function showSetupScreens(root: Root, permissionMode: PermissionMod
       await showSetupDialog(root, done => <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />);
     }
   }
-  }
 
   // Track current repo path for teleport directory switching (fire-and-forget)
   // This must happen AFTER trust to prevent untrusted directories from poisoning the mapping