From 88b5f209432c06c58b8bdf78d69ac5fccb26838f Mon Sep 17 00:00:00 2001
From: Shreya Keshive <skeshive@gmail.com>
Date: Thu, 17 Jul 2025 12:59:57 -0400
Subject: Update companionPort not existing to be a warning so the user can
 still proceed with running /ide install (#4382)

---
 packages/cli/src/config/config.ts | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'packages/cli/src/config/config.ts')

diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 83549139..c7c23901 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -312,27 +312,28 @@ export async function loadCliConfig(
       );
     }
     const companionPort = process.env.GEMINI_CLI_IDE_SERVER_PORT;
-    if (!companionPort) {
-      throw new Error(
+    if (companionPort) {
+      const httpUrl = `http://localhost:${companionPort}/mcp`;
+      mcpServers[IDE_SERVER_NAME] = new MCPServerConfig(
+        undefined, // command
+        undefined, // args
+        undefined, // env
+        undefined, // cwd
+        undefined, // url
+        httpUrl, // httpUrl
+        undefined, // headers
+        undefined, // tcp
+        undefined, // timeout
+        false, // trust
+        'IDE connection', // description
+        undefined, // includeTools
+        undefined, // excludeTools
+      );
+    } else {
+      logger.warn(
         'Could not connect to IDE. Make sure you have the companion VS Code extension installed from the marketplace or via /ide install.',
       );
     }
-    const httpUrl = `http://localhost:${companionPort}/mcp`;
-    mcpServers[IDE_SERVER_NAME] = new MCPServerConfig(
-      undefined, // command
-      undefined, // args
-      undefined, // env
-      undefined, // cwd
-      undefined, // url
-      httpUrl, // httpUrl
-      undefined, // headers
-      undefined, // tcp
-      undefined, // timeout
-      false, // trust
-      'IDE connection', // description
-      undefined, // includeTools
-      undefined, // excludeTools
-    );
   }
 
   const sandboxConfig = await loadSandboxConfig(settings, argv);
-- 
cgit v1.2.3