From f7413564acc813db9313157cb5aa7ab4e0671ea1 Mon Sep 17 00:00:00 2001
From: Taylor Mullen <ntaylormullen@google.com>
Date: Mon, 23 Mar 2026 21:43:12 -0700
Subject: [PATCH] fix(cli): clean up plugin.ts and fix MCP expansion test build

- Remove stray conflict markers in plugin.ts
- Add missing MCPServerConfig import and type assertions in plugin.ts
- Fix missing sanitizationConfig property in mcp-plugin-expansion.test.ts

Part of https://github.com/google-gemini/maintainers-gemini-cli/issues/1595
---
 packages/cli/src/config/plugin.ts                    | 1 +
 packages/core/src/tools/mcp-plugin-expansion.test.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/cli/src/config/plugin.ts b/packages/cli/src/config/plugin.ts
index f08dc67d88..201df79224 100644
--- a/packages/cli/src/config/plugin.ts
+++ b/packages/cli/src/config/plugin.ts
@@ -257,6 +257,7 @@ export async function createOpenPlugin(
     description: config.description,
     author: config.author,
     license: config.license,
+    // Features partially enabled for Open Plugins
     contextFiles: [],
     mcpServers: config.mcpServers,
     excludeTools: undefined,
diff --git a/packages/core/src/tools/mcp-plugin-expansion.test.ts b/packages/core/src/tools/mcp-plugin-expansion.test.ts
index 9ebe2257d1..07eb288829 100644
--- a/packages/core/src/tools/mcp-plugin-expansion.test.ts
+++ b/packages/core/src/tools/mcp-plugin-expansion.test.ts
@@ -20,6 +20,7 @@ describe('MCP Plugin Variable Expansion', () => {
     sanitizationConfig: {
       allowedEnvironmentVariables: [],
       blockedEnvironmentVariables: [],
+      enableEnvironmentVariableRedaction: false,
     },
     isTrustedFolder: () => true,
     emitMcpDiagnostic: () => {},