adhdev 0.1.10 → 0.1.11

package/dist/index.js

@@ -810,16 +810,16 @@ async function injectTokenToIDE(ide, connectionToken) {
   try {
     const os2 = await import("os");
     const fs = await import("fs");
-    const path = await import("path");
+    const path2 = await import("path");
     const platform3 = os2.platform();
     const home = os2.homedir();
     const getSettingsPath = (appName2) => {
       if (platform3 === "darwin") {
-        return path.join(home, "Library", "Application Support", appName2, "User", "settings.json");
+        return path2.join(home, "Library", "Application Support", appName2, "User", "settings.json");
       } else if (platform3 === "win32") {
-        return path.join(process.env.APPDATA || path.join(home, "AppData", "Roaming"), appName2, "User", "settings.json");
+        return path2.join(process.env.APPDATA || path2.join(home, "AppData", "Roaming"), appName2, "User", "settings.json");
       } else {
-        return path.join(home, ".config", appName2, "User", "settings.json");
+        return path2.join(home, ".config", appName2, "User", "settings.json");
       }
     };
     const appNameMap = {
@@ -841,7 +841,7 @@ async function injectTokenToIDE(ide, connectionToken) {
         settings = {};
       }
     } else {
-      fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
+      fs.mkdirSync(path2.dirname(settingsPath), { recursive: true });
     }
     settings["adhdev.connectionToken"] = connectionToken;
     settings["adhdev.autoConnect"] = true;
@@ -948,6 +948,7 @@ async function suggestGlobalInstall() {
 var import_child_process3 = require("child_process");
 var net = __toESM(require("net"));
 var os = __toESM(require("os"));
+var path = __toESM(require("path"));
 var CDP_PORTS = {
   cursor: [9333, 9334],
   antigravity: [9335, 9336],
@@ -965,12 +966,12 @@ var MAC_APP_IDENTIFIERS = {
   vscodium: "VSCodium"
 };
 var WIN_PROCESS_NAMES = {
-  cursor: "Cursor.exe",
-  antigravity: "Antigravity.exe",
-  vscode: "Code.exe",
-  windsurf: "Windsurf.exe",
-  "vscode-insiders": "Code - Insiders.exe",
-  vscodium: "VSCodium.exe"
+  cursor: ["Cursor.exe"],
+  antigravity: ["Antigravity.exe"],
+  vscode: ["Code.exe"],
+  windsurf: ["Windsurf.exe"],
+  "vscode-insiders": ["Code - Insiders.exe"],
+  vscodium: ["VSCodium.exe"]
 };
 async function findFreePort(ports) {
   for (const port2 of ports) {
@@ -1018,11 +1019,11 @@ async function isCdpActive(port) {
   });
 }
 async function killIdeProcess(ideId) {
-  const platform3 = os.platform();
+  const plat = os.platform();
   const appName = MAC_APP_IDENTIFIERS[ideId];
-  const winProcess = WIN_PROCESS_NAMES[ideId];
+  const winProcesses = WIN_PROCESS_NAMES[ideId];
   try {
-    if (platform3 === "darwin" && appName) {
+    if (plat === "darwin" && appName) {
       try {
         (0, import_child_process3.execSync)(`osascript -e 'tell application "${appName}" to quit' 2>/dev/null`, {
           timeout: 5e3
@@ -1033,9 +1034,18 @@ async function killIdeProcess(ideId) {
         } catch {
         }
       }
-    } else if (platform3 === "win32" && winProcess) {
+    } else if (plat === "win32" && winProcesses) {
+      for (const proc of winProcesses) {
+        try {
+          (0, import_child_process3.execSync)(`taskkill /IM "${proc}" /F 2>nul`, { timeout: 5e3 });
+        } catch {
+        }
+      }
       try {
-        (0, import_child_process3.execSync)(`taskkill /IM "${winProcess}" /F 2>nul`, { timeout: 5e3 });
+        const exeName = winProcesses[0].replace(".exe", "");
+        (0, import_child_process3.execSync)(`powershell -Command "Get-Process -Name '${exeName}' -ErrorAction SilentlyContinue | Stop-Process -Force"`, {
+          timeout: 1e4
+        });
       } catch {
       }
     } else {
@@ -1048,15 +1058,17 @@ async function killIdeProcess(ideId) {
       await new Promise((r) => setTimeout(r, 500));
       if (!isIdeRunning(ideId)) return true;
     }
-    if (platform3 === "darwin" && appName) {
+    if (plat === "darwin" && appName) {
       try {
         (0, import_child_process3.execSync)(`pkill -9 -f "${appName}" 2>/dev/null`);
       } catch {
       }
-    } else if (platform3 === "win32" && winProcess) {
-      try {
-        (0, import_child_process3.execSync)(`taskkill /IM "${winProcess}" /F 2>nul`);
-      } catch {
+    } else if (plat === "win32" && winProcesses) {
+      for (const proc of winProcesses) {
+        try {
+          (0, import_child_process3.execSync)(`taskkill /IM "${proc}" /F 2>nul`);
+        } catch {
+        }
       }
     }
     await new Promise((r) => setTimeout(r, 2e3));
@@ -1066,18 +1078,33 @@ async function killIdeProcess(ideId) {
   }
 }
 function isIdeRunning(ideId) {
-  const platform3 = os.platform();
+  const plat = os.platform();
   try {
-    if (platform3 === "darwin") {
+    if (plat === "darwin") {
       const appName = MAC_APP_IDENTIFIERS[ideId];
       if (!appName) return false;
       const result = (0, import_child_process3.execSync)(`pgrep -f "${appName}" 2>/dev/null`, { encoding: "utf-8" });
       return result.trim().length > 0;
-    } else if (platform3 === "win32") {
-      const winProc = WIN_PROCESS_NAMES[ideId];
-      if (!winProc) return false;
-      const result = (0, import_child_process3.execSync)(`tasklist /FI "IMAGENAME eq ${winProc}" /NH 2>nul`, { encoding: "utf-8" });
-      return result.includes(winProc);
+    } else if (plat === "win32") {
+      const winProcesses = WIN_PROCESS_NAMES[ideId];
+      if (!winProcesses) return false;
+      for (const proc of winProcesses) {
+        try {
+          const result = (0, import_child_process3.execSync)(`tasklist /FI "IMAGENAME eq ${proc}" /NH 2>nul`, { encoding: "utf-8" });
+          if (result.includes(proc)) return true;
+        } catch {
+        }
+      }
+      try {
+        const exeName = winProcesses[0].replace(".exe", "");
+        const result = (0, import_child_process3.execSync)(
+          `powershell -Command "(Get-Process -Name '${exeName}' -ErrorAction SilentlyContinue).Count"`,
+          { encoding: "utf-8", timeout: 5e3 }
+        );
+        return parseInt(result.trim()) > 0;
+      } catch {
+      }
+      return false;
     } else {
       const result = (0, import_child_process3.execSync)(`pgrep -f "${ideId}" 2>/dev/null`, { encoding: "utf-8" });
       return result.trim().length > 0;
@@ -1087,18 +1114,50 @@ function isIdeRunning(ideId) {
   }
 }
 function detectCurrentWorkspace(ideId) {
-  const platform3 = os.platform();
-  if (platform3 !== "darwin") return void 0;
-  try {
-    const appName = MAC_APP_IDENTIFIERS[ideId];
-    if (!appName) return void 0;
-    const result = (0, import_child_process3.execSync)(
-      `lsof -c "${appName}" 2>/dev/null | grep cwd | head -1 | awk '{print $NF}'`,
-      { encoding: "utf-8", timeout: 3e3 }
-    );
-    const dir = result.trim();
-    if (dir && dir !== "/") return dir;
-  } catch {
+  const plat = os.platform();
+  if (plat === "darwin") {
+    try {
+      const appName = MAC_APP_IDENTIFIERS[ideId];
+      if (!appName) return void 0;
+      const result = (0, import_child_process3.execSync)(
+        `lsof -c "${appName}" 2>/dev/null | grep cwd | head -1 | awk '{print $NF}'`,
+        { encoding: "utf-8", timeout: 3e3 }
+      );
+      const dir = result.trim();
+      if (dir && dir !== "/") return dir;
+    } catch {
+    }
+  } else if (plat === "win32") {
+    try {
+      const fs = require("fs");
+      const appNameMap = {
+        vscode: "Code",
+        cursor: "Cursor",
+        antigravity: "Antigravity",
+        windsurf: "Windsurf",
+        vscodium: "VSCodium"
+      };
+      const appName = appNameMap[ideId];
+      if (appName) {
+        const storagePath = path.join(
+          process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"),
+          appName,
+          "storage.json"
+        );
+        if (fs.existsSync(storagePath)) {
+          const data = JSON.parse(fs.readFileSync(storagePath, "utf-8"));
+          const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
+          if (workspaces.length > 0) {
+            const recent = workspaces[0];
+            const uri = typeof recent === "string" ? recent : recent?.folderUri;
+            if (uri?.startsWith("file:///")) {
+              return decodeURIComponent(uri.replace("file:///", ""));
+            }
+          }
+        }
+      }
+    } catch {
+    }
   }
   return void 0;
 }
@@ -1227,12 +1286,22 @@ async function launchWindows(ide, port, workspace, newWindow) {
   }
   const args = ["--remote-debugging-port=" + port];
   if (newWindow) args.push("--new-window");
-  if (workspace) args.push(workspace);
-  (0, import_child_process3.spawn)(cli, args, {
-    detached: true,
-    stdio: "ignore",
-    shell: true
-  }).unref();
+  if (workspace) args.push(`"${workspace}"`);
+  const isCmd = cli.endsWith(".cmd") || cli.endsWith(".bat");
+  if (isCmd) {
+    const cmdLine = `start "" /b "${cli}" ${args.join(" ")}`;
+    (0, import_child_process3.spawn)("cmd", ["/c", cmdLine], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true
+    }).unref();
+  } else {
+    (0, import_child_process3.spawn)(cli, args, {
+      detached: true,
+      stdio: "ignore",
+      shell: false
+    }).unref();
+  }
 }
 async function launchLinux(ide, port, workspace, newWindow) {
   const cli = ide.cliCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "adhdev",
-    "version": "0.1.10",
+    "version": "0.1.11",
     "description": "ADHDev CLI — Detect, install and configure your IDE + AI agent extensions",
     "main": "dist/index.js",
     "bin": {