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

@@ -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,

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: () => {},