Merge pull request #9568 from yumosx/fix-lsof

fix(resource-monitoring): fix lsof file descriptor leak

core/context/mcp/MCPConnection.ts

@@ -563,10 +563,15 @@ Org-level secrets can only be used for MCP by Background Agents (https://docs.co
       // Set the initial PATH from process.env
       env.PATH = process.env.PATH;
 
-      // For non-Windows platforms, try to get the PATH from user shell
+      // For non-Windows platforms or WSL remotes, try to get the PATH from user shell
-      if (process.platform !== "win32") {
+      const ideInfo = await this.extras?.ide?.getIdeInfo();
+      const isWindowsHostWithWslRemote =
+        process.platform === "win32" && ideInfo?.remoteName === "wsl";
+      if (process.platform !== "win32" || isWindowsHostWithWslRemote) {
         try {
-          const shellEnvPath = await getEnvPathFromUserShell();
+          const shellEnvPath = await getEnvPathFromUserShell(
+            ideInfo?.remoteName,
+          );
           if (shellEnvPath && shellEnvPath !== process.env.PATH) {
             env.PATH = shellEnvPath;
           }

core/util/shellPath.ts

@@ -2,9 +2,12 @@ import { exec } from "child_process";
 import { promisify } from "util";
 
 const execAsync = promisify(exec);
-export async function getEnvPathFromUserShell(): Promise<string | undefined> {
+export async function getEnvPathFromUserShell(
-  if (process.platform === "win32") {
+  remoteName?: string,
-    console.warn(`${getEnvPathFromUserShell.name} not implemented for Windows`);
+): Promise<string | undefined> {
+  const isWindowsHostWithWslRemote =
+    process.platform === "win32" && remoteName === "wsl";
+  if (process.platform === "win32" && !isWindowsHostWithWslRemote) {
     return undefined;
   }
 

extensions/cli/src/services/ResourceMonitoringService.ts

@@ -45,6 +45,9 @@ class ResourceMonitoringService {
   private maxHistorySize = 300; // Keep 5 minutes at 1s intervals
   private lastCpuUsage = process.cpuUsage();
   private lastTimestamp = Date.now();
+  private lastFdCheckTime = Date.now();
+  private fdCheckIntervalMs = 5000; // Check file descriptors every 5 seconds
+  private cacheFileCount: number | null = null;
 
   async initialize(): Promise<void> {
     // Start monitoring if verbose mode is enabled
@@ -70,6 +73,12 @@ class ResourceMonitoringService {
     this.lastCpuUsage = process.cpuUsage();
     this.lastTimestamp = Date.now();
 
+    // Initialize file descriptor count on start
+    this.updateFileDescriptorCount().catch(() => {
+      // Ignore errors during initialization
+    });
+    this.lastFdCheckTime = Date.now();
+
     this.monitoringInterval = setInterval(() => {
       this.collectResourceUsage();
     }, this.intervalMs);
@@ -127,16 +136,10 @@ class ResourceMonitoringService {
       },
     };
 
-    // Try to get file descriptor count (Unix only)
+    // Use cached file descriptor count to avoid lsof command leak
-    this.getFileDescriptorCount()
+    if (this.cacheFileCount !== null) {
-      .then((count) => {
+      usage.fileDescriptors = this.cacheFileCount;
-        if (count !== null) {
+    }
-          usage.fileDescriptors = count;
-        }
-      })
-      .catch(() => {
-        // Ignore errors for file descriptor counting
-      });
 
     return usage;
   }
@@ -215,6 +218,14 @@ class ResourceMonitoringService {
         this.resourceHistory = this.resourceHistory.slice(-this.maxHistorySize);
       }
 
+      // Periodically update file descriptor count to prevent lsof command leak
+      // Issue: https://github.com/continuedev/continue/issues/9422
+      const now = Date.now();
+      if (now - this.lastFdCheckTime >= this.fdCheckIntervalMs) {
+        this.updateFileDescriptorCount();
+        this.lastFdCheckTime = now;
+      }
+
       // Check for potential issues and log warnings
       this.checkResourceThresholds(usage);
     } catch (error) {
@@ -251,6 +262,13 @@ class ResourceMonitoringService {
     }
   }
 
+  private async updateFileDescriptorCount(): Promise<void> {
+    const count = await this.getFileDescriptorCount();
+    if (count !== null) {
+      this.cacheFileCount = count;
+    }
+  }
+
   private async getFileDescriptorCount(): Promise<number | null> {
     if (process.platform === "win32") {
       return null; // Not supported on Windows