adhdev 0.7.33 → 0.7.35

package/dist/cli/index.js

@@ -505,18 +505,18 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs() {
-  const os20 = (0, import_os2.platform)();
+  const os21 = (0, import_os2.platform)();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(def.cli);
-    const appPath = checkPathExists(def.paths[os20] || []);
+    const appPath = checkPathExists(def.paths[os21] || []);
     const installed = !!(cliPath || appPath);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os20 === "darwin") {
+    if (!resolvedCli && appPath && os21 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if ((0, import_fs2.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os20 === "win32") {
+    if (!resolvedCli && appPath && os21 === "win32") {
       const { dirname: dirname10 } = await import("path");
       const appDir = dirname10(appPath);
       const candidates = [
@@ -8507,7 +8507,7 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs15 = require("fs");
+      const fs16 = require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
@@ -8516,8 +8516,8 @@ function detectCurrentWorkspace(ideId) {
           appName,
           "storage.json"
         );
-        if (fs15.existsSync(storagePath)) {
-          const data = JSON.parse(fs15.readFileSync(storagePath, "utf-8"));
+        if (fs16.existsSync(storagePath)) {
+          const data = JSON.parse(fs16.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -9044,9 +9044,9 @@ var init_router = __esm({
                 LOG.info("Upgrade", "Restarting daemon with new version...");
                 try {
                   const path18 = require("path");
-                  const fs15 = require("fs");
+                  const fs16 = require("fs");
                   const pidFile = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "daemon.pid");
-                  if (fs15.existsSync(pidFile)) fs15.unlinkSync(pidFile);
+                  if (fs16.existsSync(pidFile)) fs16.unlinkSync(pidFile);
                 } catch {
                 }
                 const { spawn: spawn4 } = require("child_process");
@@ -18811,12 +18811,12 @@ function findBinary(name) {
 function isScriptBinary(binaryPath) {
   if (!path9.isAbsolute(binaryPath)) return false;
   try {
-    const fs15 = require("fs");
-    const resolved = fs15.realpathSync(binaryPath);
+    const fs16 = require("fs");
+    const resolved = fs16.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs15.openSync(resolved, "r");
-    fs15.readSync(fd, head, 0, 8, 0);
-    fs15.closeSync(fd);
+    const fd = fs16.openSync(resolved, "r");
+    fs16.readSync(fd, head, 0, 8, 0);
+    fs16.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -18827,12 +18827,12 @@ function isScriptBinary(binaryPath) {
 function looksLikeMachOOrElf(filePath) {
   if (!path9.isAbsolute(filePath)) return false;
   try {
-    const fs15 = require("fs");
-    const resolved = fs15.realpathSync(filePath);
+    const fs16 = require("fs");
+    const resolved = fs16.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs15.openSync(resolved, "r");
-    fs15.readSync(fd, buf, 0, 8, 0);
-    fs15.closeSync(fd);
+    const fd = fs16.openSync(resolved, "r");
+    fs16.readSync(fd, buf, 0, 8, 0);
+    fs16.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b2 = buf.subarray(i);
@@ -18953,14 +18953,14 @@ var init_provider_cli_adapter = __esm({
       pty2 = require("node-pty");
       if (os13.platform() !== "win32") {
         try {
-          const fs15 = require("fs");
+          const fs16 = require("fs");
           const ptyDir = path9.resolve(path9.dirname(require.resolve("node-pty")), "..");
           const platformArch = `${os13.platform()}-${os13.arch()}`;
           const helper = path9.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-          if (fs15.existsSync(helper)) {
-            const stat4 = fs15.statSync(helper);
+          if (fs16.existsSync(helper)) {
+            const stat4 = fs16.statSync(helper);
             if (!(stat4.mode & 73)) {
-              fs15.chmodSync(helper, stat4.mode | 493);
+              fs16.chmodSync(helper, stat4.mode | 493);
               LOG.info("CLI", "[node-pty] Fixed spawn-helper permissions");
             }
           }
@@ -43493,8 +43493,8 @@ async function installExtension(ide, extension) {
       const res = await fetch(extension.vsixUrl);
       if (res.ok) {
         const buffer = Buffer.from(await res.arrayBuffer());
-        const fs15 = await import("fs");
-        fs15.writeFileSync(vsixPath, buffer);
+        const fs16 = await import("fs");
+        fs16.writeFileSync(vsixPath, buffer);
         return new Promise((resolve12) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process8.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
@@ -44219,10 +44219,10 @@ var init_server_connection = __esm({
           this.setState("disconnected");
           try {
             const path18 = require("path");
-            const fs15 = require("fs");
+            const fs16 = require("fs");
             const configPath = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "config.json");
-            if (fs15.existsSync(configPath)) {
-              fs15.unlinkSync(configPath);
+            if (fs16.existsSync(configPath)) {
+              fs16.unlinkSync(configPath);
               LOG.info("Server", `[ServerConn] Config file removed. Re-run 'adhdev setup'.`);
             }
           } catch {
@@ -45312,19 +45312,70 @@ var init_screenshot_controller = __esm({
 });
 
 // src/session-host.ts
+var session_host_exports = {};
+__export(session_host_exports, {
+  ensureSessionHostReady: () => ensureSessionHostReady2,
+  listHostedCliRuntimes: () => listHostedCliRuntimes2,
+  stopSessionHost: () => stopSessionHost
+});
 function resolveSessionHostEntry() {
-  const localCandidates = [
+  const packagedCandidates = [
     path16.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
-    path16.resolve(__dirname, "../../vendor/session-host-daemon/index.js"),
-    path16.resolve(__dirname, "../../../oss/packages/session-host-daemon/dist/index.js")
+    path16.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
-  for (const candidate of localCandidates) {
-    if (require("fs").existsSync(candidate)) {
+  for (const candidate of packagedCandidates) {
+    if (fs14.existsSync(candidate)) {
       return candidate;
     }
   }
   return require.resolve("@adhdev/session-host-daemon");
 }
+function getSessionHostPidFile() {
+  return path16.join(os19.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+}
+function killPid(pid) {
+  try {
+    if (process.platform === "win32") {
+      (0, import_child_process9.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+    } else {
+      process.kill(pid, "SIGTERM");
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function stopSessionHost() {
+  let stopped = false;
+  const pidFile = getSessionHostPidFile();
+  try {
+    if (fs14.existsSync(pidFile)) {
+      const pid = Number.parseInt(fs14.readFileSync(pidFile, "utf8").trim(), 10);
+      if (Number.isFinite(pid)) {
+        stopped = killPid(pid) || stopped;
+      }
+    }
+  } catch {
+  } finally {
+    try {
+      fs14.unlinkSync(pidFile);
+    } catch {
+    }
+  }
+  if (process.platform !== "win32") {
+    try {
+      const raw = (0, import_child_process9.execFileSync)("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
+      for (const line of raw.split("\n")) {
+        const pid = Number.parseInt(line.trim(), 10);
+        if (Number.isFinite(pid)) {
+          stopped = killPid(pid) || stopped;
+        }
+      }
+    } catch {
+    }
+  }
+  return stopped;
+}
 async function ensureSessionHostReady2() {
   return ensureSessionHostReady({
     appName: SESSION_HOST_APP_NAME,
@@ -45346,11 +45397,13 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process9, path16, SESSION_HOST_APP_NAME;
+var import_child_process9, fs14, os19, path16, SESSION_HOST_APP_NAME;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process9 = require("child_process");
+    fs14 = __toESM(require("fs"));
+    os19 = __toESM(require("os"));
     path16 = __toESM(require("path"));
     init_src();
     SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
@@ -45365,24 +45418,24 @@ __export(adhdev_daemon_exports, {
   stopDaemon: () => stopDaemon
 });
 function getDaemonPidFile() {
-  const dir = path17.join(os19.homedir(), ".adhdev");
-  if (!fs14.existsSync(dir)) fs14.mkdirSync(dir, { recursive: true });
+  const dir = path17.join(os20.homedir(), ".adhdev");
+  if (!fs15.existsSync(dir)) fs15.mkdirSync(dir, { recursive: true });
   return path17.join(dir, "daemon.pid");
 }
 function writeDaemonPid(pid) {
-  fs14.writeFileSync(getDaemonPidFile(), String(pid), "utf-8");
+  fs15.writeFileSync(getDaemonPidFile(), String(pid), "utf-8");
 }
 function removeDaemonPid() {
   try {
-    fs14.unlinkSync(getDaemonPidFile());
+    fs15.unlinkSync(getDaemonPidFile());
   } catch (e) {
   }
 }
 function isDaemonRunning() {
   const pidFile = getDaemonPidFile();
   try {
-    if (!fs14.existsSync(pidFile)) return false;
-    const pid = parseInt(fs14.readFileSync(pidFile, "utf-8").trim());
+    if (!fs15.existsSync(pidFile)) return false;
+    const pid = parseInt(fs15.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, 0);
     return true;
   } catch {
@@ -45393,8 +45446,8 @@ function isDaemonRunning() {
 function stopDaemon() {
   const pidFile = getDaemonPidFile();
   try {
-    if (!fs14.existsSync(pidFile)) return false;
-    const pid = parseInt(fs14.readFileSync(pidFile, "utf-8").trim());
+    if (!fs15.existsSync(pidFile)) return false;
+    const pid = parseInt(fs15.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, "SIGTERM");
     removeDaemonPid();
     return true;
@@ -45403,7 +45456,7 @@ function stopDaemon() {
     return false;
   }
 }
-var os19, fs14, path17, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
+var os20, fs15, path17, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -45413,11 +45466,11 @@ var init_adhdev_daemon = __esm({
     init_screenshot_controller();
     init_session_host();
     init_dist();
-    os19 = __toESM(require("os"));
-    fs14 = __toESM(require("fs"));
+    os20 = __toESM(require("os"));
+    fs15 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.33";
+    pkgVersion = "0.7.35";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -45426,7 +45479,7 @@ var init_adhdev_daemon = __esm({
         ];
         for (const p of possiblePaths) {
           try {
-            const data = JSON.parse(fs14.readFileSync(p, "utf-8"));
+            const data = JSON.parse(fs15.readFileSync(p, "utf-8"));
             if (data.version) {
               pkgVersion = data.version;
               break;
@@ -45552,8 +45605,8 @@ ${err?.stack || ""}`);
             cliInfo: {
               type: "adhdev-daemon",
               version: pkgVersion,
-              platform: os19.platform(),
-              hostname: os19.hostname(),
+              platform: os20.platform(),
+              hostname: os20.hostname(),
               machineId: config2.machineId,
               instanceId
             }
@@ -45993,16 +46046,16 @@ async function loginFlow() {
   let verificationUrl;
   try {
     const config2 = loadConfig();
-    const os20 = await import("os");
+    const os21 = await import("os");
     const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         clientMachineId: config2.machineId,
         registeredMachineId: config2.registeredMachineId,
-        hostname: os20.hostname(),
-        platform: os20.platform(),
-        arch: os20.arch()
+        hostname: os21.hostname(),
+        platform: os21.platform(),
+        arch: os21.arch()
       })
     });
     if (!res.ok) {
@@ -46101,10 +46154,10 @@ async function startDaemonFlow() {
     const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const daemon = new AdhdevDaemon2();
     const { execSync: execSync7 } = await import("child_process");
-    const os20 = await import("os");
+    const os21 = await import("os");
     const path18 = await import("path");
-    const logPath = path18.join(os20.homedir(), ".adhdev", "daemon.log");
-    const platform11 = os20.platform();
+    const logPath = path18.join(os21.homedir(), ".adhdev", "daemon.log");
+    const platform11 = os21.platform();
     try {
       if (platform11 === "win32") {
         execSync7(`start /B adhdev daemon > "${logPath}" 2>&1`, {
@@ -46796,12 +46849,15 @@ function registerDaemonCommands(program2, pkgVersion3) {
   }));
   hideCommand(program2.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
     const { stopDaemon: stopDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { stopSessionHost: stopSessionHost2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     const { spawn: spawn4 } = await import("child_process");
     if (isDaemonRunning2()) {
       console.log(import_chalk5.default.yellow("\n  Stopping existing daemon..."));
       stopDaemon2();
       await new Promise((r) => setTimeout(r, 2e3));
     }
+    stopSessionHost2();
+    await new Promise((r) => setTimeout(r, 500));
     console.log(import_chalk5.default.cyan("  Starting new daemon..."));
     const args = ["daemon", "-p", options.port || "19222"];
     if (options.server) args.push("--server", options.server);
@@ -46824,6 +46880,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
   }));
   hideCommand(program2.command("daemon:upgrade").description("Upgrade ADHDev to latest version and restart daemon").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
     const { isDaemonRunning: isDaemonRunning2, stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { stopSessionHost: stopSessionHost2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     const { execSync: execSync7, spawn: spawn4 } = await import("child_process");
     const fsMod = await import("fs");
     const pathMod = await import("path");
@@ -46880,6 +46937,8 @@ function registerDaemonCommands(program2, pkgVersion3) {
       console.log(import_chalk5.default.yellow("\n  Restarting daemon..."));
       stopDaemon2();
       await new Promise((r) => setTimeout(r, 2e3));
+      stopSessionHost2();
+      await new Promise((r) => setTimeout(r, 500));
       const child = spawn4(process.execPath, [process.argv[1], "daemon", "-p", "19222"], {
         detached: true,
         stdio: "ignore",
@@ -47089,14 +47148,14 @@ function registerProviderCommands(program2) {
       let osPaths = {};
       let processNames = {};
       if (category === "ide") {
-        const fs15 = await import("fs");
+        const fs16 = await import("fs");
         const path18 = await import("path");
-        const os20 = await import("os");
-        if (os20.platform() === "darwin") {
+        const os21 = await import("os");
+        if (os21.platform() === "darwin") {
           while (true) {
             const p = (await rl.question(`macOS Application Path (e.g. /Applications/${defaultName}.app): `)).trim() || `/Applications/${defaultName}.app`;
             if (p === "skip") break;
-            if (!fs15.existsSync(p)) {
+            if (!fs16.existsSync(p)) {
               console.log(import_chalk6.default.red(`  \u2717 Path not found: ${p}`));
               console.log(import_chalk6.default.gray(`    (Please provide the exact absolute path to the .app or binary, or type 'skip')`));
               continue;
@@ -47106,11 +47165,11 @@ function registerProviderCommands(program2) {
             processNames["darwin"] = path18.basename(p, ".app");
             break;
           }
-        } else if (os20.platform() === "win32") {
+        } else if (os21.platform() === "win32") {
           while (true) {
             const p = (await rl.question(`Windows Executable Path (e.g. C:\\Program Files\\${defaultName}\\${defaultName}.exe): `)).trim();
             if (!p || p === "skip") break;
-            if (!fs15.existsSync(p)) {
+            if (!fs16.existsSync(p)) {
               console.log(import_chalk6.default.red(`  \u2717 Path not found: ${p}`));
               console.log(import_chalk6.default.gray(`    (Please provide the exact absolute path, or type 'skip')`));
               continue;
@@ -47793,8 +47852,8 @@ function registerCdpCommands(program2) {
       }
       const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
       if (options.output) {
-        const fs15 = await import("fs");
-        fs15.writeFileSync(options.output, output, "utf-8");
+        const fs16 = await import("fs");
+        fs16.writeFileSync(options.output, output, "utf-8");
         console.log(import_chalk6.default.green(`
   \u2713 Saved to ${options.output} (${output.length} chars)
 `));
@@ -47897,8 +47956,8 @@ function registerCdpCommands(program2) {
         ws2.on("message", async (data) => {
           const msg = JSON.parse(data.toString());
           if (msg.id === 1 && msg.result?.data) {
-            const fs15 = await import("fs");
-            fs15.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
+            const fs16 = await import("fs");
+            fs16.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
             console.log(import_chalk6.default.green(`
   \u2713 Screenshot saved to ${options.output}
 `));