Skip to content

Use consolidated MCP server lists in the ACP and policy-engine paths #27605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adilburaksen wants to merge 1 commit into from
Closed

Use consolidated MCP server lists in the ACP and policy-engine paths #27605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/cli/src/acp/acpSessionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,15 @@ export class AcpSessionManager {
mcpServers: mergedMcpServers,
};

const config = await loadCliConfig(settings, sessionId, this.argv, { cwd });
const config = await loadCliConfig(settings, sessionId, this.argv, {
cwd,
// Pass the LoadedSettings so loadCliConfig uses the consolidated (union
// of excluded / intersection of allowed) MCP server lists across all
// settings scopes, matching the interactive path. Without this, the ACP
// path fell back to the raw merged settings, where a workspace
// mcp.excluded could REPLACE (drop) a user-level block.
loadedSettings: currentSettings,
});

createPolicyUpdater(
config.getPolicyEngine(),
Expand Down
12 changes: 11 additions & 1 deletion packages/cli/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,17 @@ export async function loadCliConfig(
},
mcp: {
...settings.mcp,
allowed: argv.allowedMcpServerNames ?? settings.mcp?.allowed,
// Use the consolidated MCP lists (union of excluded across all scopes,
// intersection of allowed) for the policy engine, so a workspace-scoped
// mcp.excluded cannot drop a user/system block via REPLACE merge.
allowed:
argv.allowedMcpServerNames ??
(loadedSettings
? loadedSettings.getConsolidatedAllowedMcpServers()
: settings.mcp?.allowed),
excluded: loadedSettings
? loadedSettings.getConsolidatedExcludedMcpServers()
: settings.mcp?.excluded,
},
policyPaths: (argv.policy ?? settings.policyPaths)?.map((p) =>
resolvePath(p),
Expand Down