Merge branch 'main' into dupe-listing

Fixes a bug where disconnected MCP servers were listed twice in '/mcp list' (once as 'Disconnected' and once as 'Blocked') due to a strict string equality check that failed when extension server names had different casing or trailing whitespace compared to user configuration. Updated the filter in 'McpStatus.tsx' to use '.trim().toLowerCase()'.

packages/cli/src/gemini.tsx

@@ -358,8 +358,8 @@ export async function main() {
 
   const isDebugMode = cliConfig.isDebugMode(argv);
   const consolePatcher = new ConsolePatcher({
-    stderr: true,
-    interactive: isHeadlessMode() ? false : true,
+    stderr: argv.isCommand ? false : true,
+    interactive: isHeadlessMode() && !argv.isCommand ? false : true,
     debugMode: isDebugMode,
     onNewMessage: (msg) => {
       coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -786,20 +786,16 @@ export function initializeOutputListenersAndFlush() {
     if (coreEvents.listenerCount(CoreEvent.ConsoleLog) === 0) {
       coreEvents.on(CoreEvent.ConsoleLog, (payload: ConsoleLogPayload) => {
         if (payload.type === 'error' || payload.type === 'warn') {
-          writeToStderr(payload.content);
+          writeToStderr(payload.content + '\n');
         } else {
-          writeToStdout(payload.content);
+          writeToStderr(payload.content + '\n');
         }
       });
     }
 
     if (coreEvents.listenerCount(CoreEvent.UserFeedback) === 0) {
       coreEvents.on(CoreEvent.UserFeedback, (payload: UserFeedbackPayload) => {
-        if (payload.severity === 'error' || payload.severity === 'warning') {
-          writeToStderr(payload.message);
-        } else {
-          writeToStdout(payload.message);
-        }
+        writeToStderr(payload.message + '\n');
       });
     }
   }

packages/cli/src/ui/components/views/McpStatus.test.tsx

@@ -202,6 +202,30 @@ describe('McpStatus', () => {
     unmount();
   });
 
+  it('filters blocked servers case-insensitively and ignores whitespace', async () => {
+    const { lastFrame, unmount } = await render(
+      <McpStatus
+        {...baseProps}
+        servers={{
+          'SERVER-1 ': {
+            url: 'http://localhost:8080',
+            description: 'A test server',
+          },
+          ' server-2': {
+            url: 'http://localhost:8081',
+            description: 'A blocked server',
+          },
+        }}
+        blockedServers={[
+          { name: ' server-1', extensionName: 'test-extension' },
+          { name: 'SERVER-2 ', extensionName: 'test-extension' },
+        ]}
+      />,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+    unmount();
+  });
+
   it('renders only blocked servers when no configured servers exist', async () => {
     const { lastFrame, unmount } = await render(
       <McpStatus

packages/cli/src/ui/components/views/McpStatus.tsx

@@ -50,7 +50,9 @@ export const McpStatus: React.FC<McpStatusProps> = ({
   const serverNames = Object.keys(servers).filter(
     (serverName) =>
       !blockedServers.some(
-        (blockedServer) => blockedServer.name === serverName,
+        (blockedServer) =>
+          blockedServer.name.trim().toLowerCase() ===
+          serverName.trim().toLowerCase(),
       ),
   );
 

packages/cli/src/ui/components/views/__snapshots__/McpStatus.test.tsx.snap

@@ -1,5 +1,14 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`McpStatus > filters blocked servers case-insensitively and ignores whitespace 1`] = `
+"Configured MCP servers:
+
+🔴  server-1 (from test-extension) - Blocked
+
+🔴 SERVER-2  (from test-extension) - Blocked
+"
+`;
+
 exports[`McpStatus > renders correctly when discovery is in progress 1`] = `
 "⏳ MCP servers are starting up (0 initializing)...
 Note: First startup may take longer. Tool availability will update automatically.