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/constants/querySource.ts

@@ -1,7 +0,0 @@
-/**
- * Stub — query source enum not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type QuerySource = any

src/entrypoints/agentSdkTypes.ts

@@ -442,84 +442,7 @@ export async function connectRemoteControl(
   throw new Error('not implemented')
 }
 
-// add exit reason types for removing the error within gracefulShutdown file
+// add exit reason types for removing the error within gracefulShutdown file 
 export type ExitReason = {
-
-}
-
-// ============================================================================
-// Stub re-exports — types not included in source snapshot.
-//
-// The upstream Anthropic SDK defines these in sub-files (sdk/coreTypes,
-// sdk/runtimeTypes, sdk/controlTypes, sdk/toolTypes) that are stubbed
-// in this open repo. Until the real definitions are restored, alias the
-// names to `any` so callers can resolve their imports and `tsc` becomes
-// actionable. See issue #473 for the typecheck-foundation effort.
-// ============================================================================
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type AnyZodRawShape = any
-export type ApiKeySource = any
-export type AsyncHookJSONOutput = any
-export type ConfigChangeHookInput = any
-export type CwdChangedHookInput = any
-export type ElicitationHookInput = any
-export type ElicitationResultHookInput = any
-export type FileChangedHookInput = any
-export type ForkSessionOptions = any
-export type ForkSessionResult = any
-export type GetSessionInfoOptions = any
-export type GetSessionMessagesOptions = any
-export type HookEvent = any
-export type HookInput = any
-export type HookJSONOutput = any
-export type InferShape<_T> = any
-export type InstructionsLoadedHookInput = any
-export type InternalOptions = any
-export type InternalQuery = any
-export type ListSessionsOptions = any
-export type McpSdkServerConfigWithInstance = any
-export type McpServerConfigForProcessTransport = any
-export type McpServerStatus = any
-export type ModelInfo = any
-export type ModelUsage = any
-export type NotificationHookInput = any
-export type Options = any
-export type PermissionDeniedHookInput = any
-export type PermissionMode = any
-export type PermissionRequestHookInput = any
-export type PermissionResult = any
-export type PermissionUpdate = any
-export type PostCompactHookInput = any
-export type PostToolUseFailureHookInput = any
-export type PostToolUseHookInput = any
-export type PreCompactHookInput = any
-export type PreToolUseHookInput = any
-export type Query = any
-export type RewindFilesResult = any
-export type SDKAssistantMessage = any
-export type SDKAssistantMessageError = any
-export type SDKCompactBoundaryMessage = any
-export type SdkMcpToolDefinition = any
-export type SDKPartialAssistantMessage = any
-export type SDKPermissionDenial = any
-export type SDKRateLimitInfo = any
-export type SDKStatus = any
-export type SDKStatusMessage = any
-export type SDKSystemMessage = any
-export type SDKToolProgressMessage = any
-export type SDKUserMessageReplay = any
-export type SessionEndHookInput = any
-export type SessionMessage = any
-export type SessionMutationOptions = any
-export type SessionStartHookInput = any
-export type SetupHookInput = any
-export type StopFailureHookInput = any
-export type StopHookInput = any
-export type SubagentStartHookInput = any
-export type SubagentStopHookInput = any
-export type SyncHookJSONOutput = any
-export type TaskCompletedHookInput = any
-export type TaskCreatedHookInput = any
-export type TeammateIdleHookInput = any
-export type UserPromptSubmitHookInput = any
+  
+}

src/entrypoints/sdk/controlTypes.ts

@@ -1,10 +0,0 @@
-/**
- * Stub — control protocol types not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type SDKControlRequest = any
-export type SDKControlResponse = any
-export type SDKControlPermissionRequest = any
-export type StdoutMessage = any

src/global.d.ts

@@ -1,16 +0,0 @@
-/**
- * Build-time globals replaced by the bundler at build time.
- *
- * `scripts/build.ts` substitutes these via Bun's `define` option, so at
- * runtime the references are inlined as string literals. This declaration
- * exists only to make `tsc --noEmit` aware of them — without it, every
- * `MACRO.*` access fires TS2304 "Cannot find name 'MACRO'".
- */
-declare const MACRO: {
-  VERSION: string
-  DISPLAY_VERSION: string
-  BUILD_TIME: string
-  ISSUES_EXPLAINER: string
-  PACKAGE_URL: string
-  NATIVE_PACKAGE_URL: string | undefined
-}

src/interactiveHelpers.tsx

@@ -158,24 +158,25 @@ 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)
-    if (usesAnthropicSetup) {
-      // If settings are valid, check for any mcp.json servers that need approval
-      const {
-        errors: allErrors
-      } = getSettingsWithAllErrors();
-      if (allErrors.length === 0) {
-        await handleMcpjsonServerApprovals(root);
-      }
+    // MCP approval and external-includes warnings are about workspace
+    // trust, not about Anthropic auth. They must run for all providers
+    // — including third-party — otherwise project-scoped .mcp.json
+    // servers never get the approval that writes
+    // enableAllProjectMcpServers / enabledMcpjsonServers into
+    // 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);
+    }
 
-      // Check for claude.md includes that need approval
-      if (await shouldShowClaudeMdExternalIncludesWarning()) {
-        const externalIncludes = getExternalClaudeMdIncludes(await getMemoryFiles(true));
-        const {
-          ClaudeMdExternalIncludesDialog
-        } = await import('./components/ClaudeMdExternalIncludesDialog.js');
-        await showSetupDialog(root, done => <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />);
-      }
+    // Check for claude.md includes that need approval
+    if (await shouldShowClaudeMdExternalIncludesWarning()) {
+      const externalIncludes = getExternalClaudeMdIncludes(await getMemoryFiles(true));
+      const {
+        ClaudeMdExternalIncludesDialog
+      } = await import('./components/ClaudeMdExternalIncludesDialog.js');
+      await showSetupDialog(root, done => <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />);
     }
   }
 

src/types/message.ts

@@ -1,25 +0,0 @@
-/**
- * Stub — message type definitions not included in source snapshot.
- *
- * The upstream Anthropic source defines a rich Message discriminated union
- * with structured Content blocks, role tags, tool_use payloads, and so on.
- * That file is not mirrored to this open snapshot. This stub exists so
- * `tsc --noEmit` can resolve `import { Message, ... } from 'src/types/message'`
- * across the ~21 callers without fixing every transitive type the call
- * sites use.
- *
- * Once the real definitions are restored upstream-side or reconstructed
- * from runtime usage, replace these `any` aliases with proper types and
- * delete this comment. See issue #473 for the typecheck-foundation effort.
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type Message = any
-export type AssistantMessage = any
-export type UserMessage = any
-export type SystemMessage = any
-export type SystemAPIErrorMessage = any
-export type AttachmentMessage = any
-export type ProgressMessage = any
-export type HookResultMessage = any
-export type NormalizedUserMessage = any

src/types/tools.ts

@@ -1,7 +0,0 @@
-/**
- * Stub — tool type definitions not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type ShellProgress = any

src/types/utils.ts

@@ -1,15 +0,0 @@
-/**
- * Stub — utility type definitions not included in source snapshot. See
- * src/types/message.ts for the same scoping caveat (issue #473).
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type DeepImmutable<T> = T extends any[]
-  ? readonly DeepImmutable<T[number]>[]
-  : T extends object
-    ? { readonly [K in keyof T]: DeepImmutable<T[K]> }
-    : T
-
-export type Permutations<T extends string, U extends string = T> = T extends T
-  ? T | `${T}${Permutations<Exclude<U, T>>}`
-  : never

tsconfig.json

@@ -1,14 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2023",
-    "lib": ["ES2023", "DOM"],
+    "target": "ES2022",
     "module": "ESNext",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
     "strict": true,
-    "noImplicitAny": false,
-    "noEmit": true,
-    "allowImportingTsExtensions": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,