adhdev 0.1.7 → 0.1.8

package/dist/index.js

@@ -858,14 +858,14 @@ var import_child_process3 = require("child_process");
 var net = __toESM(require("net"));
 var os = __toESM(require("os"));
 var CDP_PORTS = {
-  cursor: 9333,
-  antigravity: 9335,
-  vscode: 9229,
-  windsurf: 9337,
-  "vscode-insiders": 9231,
-  vscodium: 9233
+  cursor: [9333, 9334],
+  antigravity: [9335, 9336],
+  vscode: [9229, 9230],
+  windsurf: [9337, 9338],
+  "vscode-insiders": [9231, 9232],
+  vscodium: [9233, 9234]
 };
-var MAC_APP_NAMES = {
+var MAC_APP_IDENTIFIERS = {
   cursor: "Cursor",
   antigravity: "Antigravity",
   vscode: "Visual Studio Code",
@@ -873,46 +873,120 @@ var MAC_APP_NAMES = {
   "vscode-insiders": "Visual Studio Code - Insiders",
   vscodium: "VSCodium"
 };
-async function findFreePort(startPort) {
+var WIN_PROCESS_NAMES = {
+  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) {
+    const free = await checkPortFree(port2);
+    if (free) return port2;
+  }
+  let port = ports[1] + 1;
+  while (port < ports[1] + 10) {
+    if (await checkPortFree(port)) return port;
+    port++;
+  }
+  throw new Error("No free port found");
+}
+function checkPortFree(port) {
   return new Promise((resolve) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve(findFreePort(startPort + 1)));
-    server.listen(startPort, "127.0.0.1", () => {
-      server.close(() => resolve(startPort));
+    server.on("error", () => resolve(false));
+    server.listen(port, "127.0.0.1", () => {
+      server.close(() => resolve(true));
     });
   });
 }
-async function isPortInUse(port) {
+async function isCdpActive(port) {
   return new Promise((resolve) => {
-    const socket = new net.Socket();
-    socket.setTimeout(1e3);
-    socket.on("connect", () => {
-      socket.destroy();
-      resolve(true);
-    });
-    socket.on("timeout", () => {
-      socket.destroy();
-      resolve(false);
+    const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
+      timeout: 2e3
+    }, (res) => {
+      let data = "";
+      res.on("data", (c) => data += c);
+      res.on("end", () => {
+        try {
+          const info = JSON.parse(data);
+          resolve(!!info["WebKit-Version"] || !!info["Browser"]);
+        } catch {
+          resolve(false);
+        }
+      });
     });
-    socket.on("error", () => {
-      socket.destroy();
+    req.on("error", () => resolve(false));
+    req.on("timeout", () => {
+      req.destroy();
       resolve(false);
     });
-    socket.connect(port, "127.0.0.1");
   });
 }
+async function killIdeProcess(ideId) {
+  const platform3 = os.platform();
+  const appName = MAC_APP_IDENTIFIERS[ideId];
+  const winProcess = WIN_PROCESS_NAMES[ideId];
+  try {
+    if (platform3 === "darwin" && appName) {
+      try {
+        (0, import_child_process3.execSync)(`osascript -e 'tell application "${appName}" to quit' 2>/dev/null`, {
+          timeout: 5e3
+        });
+      } catch {
+        try {
+          (0, import_child_process3.execSync)(`pkill -f "${appName}" 2>/dev/null`);
+        } catch {
+        }
+      }
+    } else if (platform3 === "win32" && winProcess) {
+      try {
+        (0, import_child_process3.execSync)(`taskkill /IM "${winProcess}" /F 2>nul`, { timeout: 5e3 });
+      } catch {
+      }
+    } else {
+      try {
+        (0, import_child_process3.execSync)(`pkill -f "${ideId}" 2>/dev/null`);
+      } catch {
+      }
+    }
+    for (let i = 0; i < 30; i++) {
+      await new Promise((r) => setTimeout(r, 500));
+      if (!isIdeRunning(ideId)) return true;
+    }
+    if (platform3 === "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 {
+      }
+    }
+    await new Promise((r) => setTimeout(r, 2e3));
+    return !isIdeRunning(ideId);
+  } catch {
+    return false;
+  }
+}
 function isIdeRunning(ideId) {
   const platform3 = os.platform();
-  const appName = MAC_APP_NAMES[ideId];
-  if (!appName) return false;
   try {
     if (platform3 === "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 result = (0, import_child_process3.execSync)(`tasklist /FI "IMAGENAME eq ${ideId}.exe" /NH 2>nul`, { encoding: "utf-8" });
-      return result.includes(ideId);
+      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 {
       const result = (0, import_child_process3.execSync)(`pgrep -f "${ideId}" 2>/dev/null`, { encoding: "utf-8" });
       return result.trim().length > 0;
@@ -921,6 +995,22 @@ function isIdeRunning(ideId) {
     return false;
   }
 }
+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 {
+  }
+  return void 0;
+}
 async function launchWithCdp(options = {}) {
   const platform3 = os.platform();
   let targetIde;
@@ -933,8 +1023,8 @@ async function launchWithCdp(options = {}) {
         ideId: options.ideId,
         ideName: options.ideId,
         port: 0,
-        alreadyRunning: false,
-        cdpAlreadyActive: false,
+        action: "failed",
+        message: "",
         error: `IDE '${options.ideId}' not found or not installed`
       };
     }
@@ -952,42 +1042,66 @@ async function launchWithCdp(options = {}) {
         ideId: "unknown",
         ideName: "Unknown",
         port: 0,
-        alreadyRunning: false,
-        cdpAlreadyActive: false,
+        action: "failed",
+        message: "",
         error: "No IDE found. Install VS Code, Cursor, or Antigravity first."
       };
     }
   }
-  const defaultPort = CDP_PORTS[targetIde.id] || 9333;
-  const requestedPort = options.port || defaultPort;
-  const cdpAlreadyActive = await isPortInUse(requestedPort);
-  if (cdpAlreadyActive) {
-    return {
-      success: true,
-      ideId: targetIde.id,
-      ideName: targetIde.displayName,
-      port: requestedPort,
-      alreadyRunning: true,
-      cdpAlreadyActive: true
-    };
+  const portPair = CDP_PORTS[targetIde.id] || [9333, 9334];
+  for (const port2 of portPair) {
+    if (await isCdpActive(port2)) {
+      return {
+        success: true,
+        ideId: targetIde.id,
+        ideName: targetIde.displayName,
+        port: port2,
+        action: "reused",
+        message: `CDP already active on port ${port2}`
+      };
+    }
   }
   const alreadyRunning = isIdeRunning(targetIde.id);
-  const port = await findFreePort(requestedPort);
+  const workspace = options.workspace || (alreadyRunning ? detectCurrentWorkspace(targetIde.id) : void 0);
+  if (alreadyRunning) {
+    const killed = await killIdeProcess(targetIde.id);
+    if (!killed) {
+      return {
+        success: false,
+        ideId: targetIde.id,
+        ideName: targetIde.displayName,
+        port: 0,
+        action: "failed",
+        message: "",
+        error: `Could not stop ${targetIde.displayName}. Close it manually and try again.`
+      };
+    }
+    await new Promise((r) => setTimeout(r, 3e3));
+  }
+  const port = await findFreePort(portPair);
   try {
     if (platform3 === "darwin") {
-      await launchMacOS(targetIde, port, options.workspace, options.newWindow);
+      await launchMacOS(targetIde, port, workspace, options.newWindow);
     } else if (platform3 === "win32") {
-      await launchWindows(targetIde, port, options.workspace, options.newWindow);
+      await launchWindows(targetIde, port, workspace, options.newWindow);
     } else {
-      await launchLinux(targetIde, port, options.workspace, options.newWindow);
+      await launchLinux(targetIde, port, workspace, options.newWindow);
+    }
+    let cdpReady = false;
+    for (let i = 0; i < 30; i++) {
+      await new Promise((r) => setTimeout(r, 500));
+      if (await isCdpActive(port)) {
+        cdpReady = true;
+        break;
+      }
     }
     return {
       success: true,
       ideId: targetIde.id,
       ideName: targetIde.displayName,
       port,
-      alreadyRunning,
-      cdpAlreadyActive: false
+      action: alreadyRunning ? "restarted" : "started",
+      message: cdpReady ? `${targetIde.displayName} launched with CDP on port ${port}` : `${targetIde.displayName} launched (CDP may take a moment to initialize)`
     };
   } catch (e) {
     return {
@@ -995,30 +1109,25 @@ async function launchWithCdp(options = {}) {
       ideId: targetIde.id,
       ideName: targetIde.displayName,
       port,
-      alreadyRunning,
-      cdpAlreadyActive: false,
+      action: "failed",
+      message: "",
       error: e?.message || String(e)
     };
   }
 }
 async function launchMacOS(ide, port, workspace, newWindow) {
-  const appName = MAC_APP_NAMES[ide.id];
-  if (!appName) {
-    if (ide.cliCommand) {
-      const args2 = ["--remote-debugging-port=" + port];
-      if (newWindow) args2.push("--new-window");
-      if (workspace) args2.push(workspace);
-      (0, import_child_process3.spawn)(ide.cliCommand, args2, { detached: true, stdio: "ignore" }).unref();
-      return;
-    }
-    throw new Error(`No app name or CLI for ${ide.displayName}`);
-  }
+  const appName = MAC_APP_IDENTIFIERS[ide.id];
   const args = ["--remote-debugging-port=" + port];
   if (newWindow) args.push("--new-window");
   if (workspace) args.push(workspace);
-  const openArgs = ["-a", appName, "--args", ...args];
-  if (newWindow) openArgs.splice(1, 0, "-n");
-  (0, import_child_process3.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
+  if (appName) {
+    const openArgs = ["-a", appName, "--args", ...args];
+    (0, import_child_process3.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
+  } else if (ide.cliCommand) {
+    (0, import_child_process3.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore" }).unref();
+  } else {
+    throw new Error(`No app identifier or CLI for ${ide.displayName}`);
+  }
 }
 async function launchWindows(ide, port, workspace, newWindow) {
   const cli = ide.cliCommand;
@@ -1032,7 +1141,6 @@ async function launchWindows(ide, port, workspace, newWindow) {
     detached: true,
     stdio: "ignore",
     shell: true
-    // Windows에서 .cmd 파일 실행 위해
   }).unref();
 }
 async function launchLinux(ide, port, workspace, newWindow) {
@@ -1052,13 +1160,12 @@ program.name("adhdev").description("\u{1F309} ADHDev \u2014 Agent Dashboard Hub
 program.command("setup", { isDefault: true }).description("Run the interactive setup wizard").option("-f, --force", "Force re-run setup even if already configured").action(async (options) => {
   await runWizard({ force: options.force });
 });
-program.command("launch [ide]").description("Launch IDE with Chrome DevTools Protocol (CDP) debugging port").option("-p, --port <port>", "CDP port number (default: auto per IDE)").option("-w, --workspace <path>", "Workspace/folder to open").option("-n, --new-window", "Open in a new window").action(async (ideArg, options) => {
+program.command("launch [ide]").description("Launch or relaunch IDE with CDP debugging port (kills existing process first)").option("-w, --workspace <path>", "Workspace/folder to open").option("-n, --new-window", "Open in a new window").action(async (ideArg, options) => {
   const ora2 = await import("ora");
   const spinner = ora2.default("Detecting IDE...").start();
   try {
     const result = await launchWithCdp({
       ideId: ideArg,
-      port: options.port ? parseInt(options.port) : void 0,
       workspace: options.workspace,
       newWindow: options.newWindow
     });
@@ -1075,7 +1182,7 @@ program.command("launch [ide]").description("Launch IDE with Chrome DevTools Pro
         }
       });
       console.log(import_chalk2.default.gray(`
-  Usage: adhdev launch <ide-id> [--port <port>]
+  Usage: adhdev launch <ide-id>
 `));
       process.exit(1);
     }
@@ -1083,13 +1190,16 @@ program.command("launch [ide]").description("Launch IDE with Chrome DevTools Pro
     console.log(import_chalk2.default.bold("  \u{1F680} IDE Launched with CDP\n"));
     console.log(`  ${import_chalk2.default.bold("IDE:")}     ${result.ideName}`);
     console.log(`  ${import_chalk2.default.bold("CDP:")}     ${import_chalk2.default.cyan(`ws://127.0.0.1:${result.port}`)}`);
-    if (result.cdpAlreadyActive) {
-      console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.yellow("CDP already active (reusing)")}`);
-    } else if (result.alreadyRunning) {
-      console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.yellow("\u26A0 IDE was already running without CDP")}`);
-      console.log(import_chalk2.default.gray("           Close and reopen, or use the extension's relaunch command"));
-    } else {
-      console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.green("\u2713 Started fresh with CDP")}`);
+    switch (result.action) {
+      case "reused":
+        console.log(`  ${import_chalk2.default.bold("Action:")}  ${import_chalk2.default.yellow("CDP already active \u2014 reusing existing session")}`);
+        break;
+      case "restarted":
+        console.log(`  ${import_chalk2.default.bold("Action:")}  ${import_chalk2.default.green("\u2713 Killed existing process \u2192 Restarted with CDP")}`);
+        break;
+      case "started":
+        console.log(`  ${import_chalk2.default.bold("Action:")}  ${import_chalk2.default.green("\u2713 Started fresh with CDP")}`);
+        break;
     }
     console.log();
     console.log(import_chalk2.default.gray("  Bridge extension will auto-connect to CDP."));

package/package.json

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