Compare commits
1 Commits
main
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ae055d30b |
@@ -288,3 +288,30 @@ describe('Context overflow 500 fix', () => {
|
|||||||
expect(content).toContain('automatic compaction has failed')
|
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')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
@@ -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
|
// Now that trust is established, prefetch system context if it wasn't already
|
||||||
void getSystemContext();
|
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
|
||||||
if (allErrors.length === 0) {
|
// /mcp and `mcp list` (issue #696).
|
||||||
await handleMcpjsonServerApprovals(root);
|
const { errors: allErrors } = getSettingsWithAllErrors();
|
||||||
}
|
if (allErrors.length === 0) {
|
||||||
|
await handleMcpjsonServerApprovals(root);
|
||||||
|
}
|
||||||
|
|
||||||
// Check for claude.md includes that need approval
|
// Check for claude.md includes that need approval
|
||||||
if (await shouldShowClaudeMdExternalIncludesWarning()) {
|
if (await shouldShowClaudeMdExternalIncludesWarning()) {
|
||||||
const externalIncludes = getExternalClaudeMdIncludes(await getMemoryFiles(true));
|
const externalIncludes = getExternalClaudeMdIncludes(await getMemoryFiles(true));
|
||||||
const {
|
const {
|
||||||
ClaudeMdExternalIncludesDialog
|
ClaudeMdExternalIncludesDialog
|
||||||
} = await import('./components/ClaudeMdExternalIncludesDialog.js');
|
} = await import('./components/ClaudeMdExternalIncludesDialog.js');
|
||||||
await showSetupDialog(root, done => <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />);
|
await showSetupDialog(root, done => <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user