adhdev 0.5.14 → 0.5.17

package/dist/cli/index.js

@@ -16737,7 +16737,9 @@ var require_dist = __commonJS({
       installExtensions: () => installExtensions,
       installGlobalInterceptor: () => installGlobalInterceptor,
       isExtensionInstalled: () => isExtensionInstalled,
+      isIdeRunning: () => isIdeRunning,
       isSetupComplete: () => isSetupComplete2,
+      killIdeProcess: () => killIdeProcess,
       launchIDE: () => launchIDE,
       launchWithCdp: () => launchWithCdp,
       loadConfig: () => loadConfig3,
@@ -16836,13 +16838,11 @@ var require_dist = __commonJS({
       }
     }
     function checkPathExists(paths) {
+      const home = (0, import_os2.homedir)();
       for (const p of paths) {
         if (p.includes("*")) {
-          const home = (0, import_os2.homedir)();
-          const starIdx = p.indexOf("*");
-          const suffix = p.substring(starIdx + 1);
-          const homeNormalized = home.replace(/\//g, "\\\\");
-          const resolved = homeNormalized + suffix;
+          const username = home.split(/[\\/]/).pop() || "";
+          const resolved = p.replace("*", username);
           if ((0, import_fs22.existsSync)(resolved)) return resolved;
         } else {
           if ((0, import_fs22.existsSync)(p)) return p;
@@ -22315,8 +22315,8 @@ var require_dist = __commonJS({
             if (!targetType) throw new Error("cliType or ideType required");
             const isIde = this.deps.cdpManagers.has(targetType) || this.deps.providerLoader.getMeta(targetType)?.category === "ide";
             if (isIde) {
-              await this.stopIde(targetType);
-              const launchResult = await this.executeDaemonCommand("launch_ide", { ideType: targetType, enableCdp: true });
+              await this.stopIde(targetType, true);
+              const launchResult = await this.executeDaemonCommand("launch_ide", { ideType: targetType, enableCdp: true, workspace: args?.workspace });
               return { success: true, restarted: true, ideType: targetType, launch: launchResult };
             }
             return this.deps.cliManager.handleCliCommand(cmd, args);
@@ -22325,15 +22325,16 @@ var require_dist = __commonJS({
           case "stop_ide": {
             const ideType = args?.ideType;
             if (!ideType) throw new Error("ideType required");
-            await this.stopIde(ideType);
-            return { success: true, ideType, stopped: true };
+            const killProcess = args?.killProcess !== false;
+            await this.stopIde(ideType, killProcess);
+            return { success: true, ideType, stopped: true, processKilled: killProcess };
           }
           // ─── IDE restart ───
           case "restart_ide": {
             const ideType = args?.ideType;
             if (!ideType) throw new Error("ideType required");
-            await this.stopIde(ideType);
-            const launchResult = await this.executeDaemonCommand("launch_ide", { ideType, enableCdp: true });
+            await this.stopIde(ideType, true);
+            const launchResult = await this.executeDaemonCommand("launch_ide", { ideType, enableCdp: true, workspace: args?.workspace });
             return { success: true, ideType, restarted: true, launch: launchResult };
           }
           // ─── IDE launch + CDP connect ───
@@ -22379,10 +22380,48 @@ var require_dist = __commonJS({
             }
             return { success: result.success, ...result };
           }
-          // ─── IDE detection ───
+          // ─── Detect IDEs ───
           case "detect_ides": {
-            this.deps.detectedIdes.value = await detectIDEs();
-            return { success: true, ides: this.deps.detectedIdes.value };
+            const results = await detectIDEs();
+            this.deps.detectedIdes.value = results;
+            return { success: true, detectedInfo: results };
+          }
+          // ─── Set User Name ───
+          case "set_user_name": {
+            const name = args?.userName;
+            if (!name || typeof name !== "string") throw new Error("userName required");
+            updateConfig2({ userName: name });
+            return { success: true, userName: name };
+          }
+          // ─── Daemon Self-Upgrade ───
+          case "daemon_upgrade": {
+            LOG5.info("Upgrade", "Remote upgrade requested from dashboard");
+            try {
+              const { execSync: execSync7 } = await import("child_process");
+              const latest = execSync7("npm view adhdev version", { encoding: "utf-8", timeout: 1e4 }).trim();
+              LOG5.info("Upgrade", `Latest available: v${latest}`);
+              execSync7("npm install -g adhdev@latest", {
+                encoding: "utf-8",
+                timeout: 6e4,
+                stdio: ["pipe", "pipe", "pipe"]
+              });
+              LOG5.info("Upgrade", `\u2705 Upgraded to v${latest}`);
+              setTimeout(() => {
+                LOG5.info("Upgrade", "Restarting daemon with new version...");
+                const { spawn: spawn3 } = require("child_process");
+                const child = spawn3(process.execPath, [process.argv[1], "daemon", "-p", "19222"], {
+                  detached: true,
+                  stdio: "ignore",
+                  env: { ...process.env }
+                });
+                child.unref();
+                process.exit(0);
+              }, 3e3);
+              return { success: true, upgraded: true, version: latest };
+            } catch (e) {
+              LOG5.error("Upgrade", `Failed: ${e.message}`);
+              return { success: false, error: e.message };
+            }
           }
           // ─── Machine Settings ───
           case "set_machine_nickname": {
@@ -22390,38 +22429,85 @@ var require_dist = __commonJS({
             updateConfig2({ machineNickname: nickname || null });
             return { success: true };
           }
+          default:
+            break;
         }
         return null;
       }
       /**
-       * IDE stop: CDP disconnect + remove from InstanceManager + clean instanceIdMap
+       * IDE stop: CDP disconnect + InstanceManager cleanup + optionally kill OS process
        */
-      async stopIde(ideType) {
-        const cdp = this.deps.cdpManagers.get(ideType);
-        if (cdp) {
-          try {
-            cdp.disconnect();
-          } catch {
+      async stopIde(ideType, killProcess = false) {
+        const cdpKeysToRemove = [];
+        for (const key of this.deps.cdpManagers.keys()) {
+          if (key === ideType || key.startsWith(`${ideType}_`)) {
+            cdpKeysToRemove.push(key);
           }
-          this.deps.cdpManagers.delete(ideType);
-          LOG5.info("StopIDE", `CDP disconnected: ${ideType}`);
         }
-        const instanceKey = `ide:${ideType}`;
-        const ideInstance = this.deps.instanceManager.getInstance(instanceKey);
-        if (ideInstance) {
-          if (ideInstance.getInstanceId) {
-            this.deps.instanceIdMap.delete(ideInstance.getInstanceId());
+        for (const key of cdpKeysToRemove) {
+          const cdp = this.deps.cdpManagers.get(key);
+          if (cdp) {
+            try {
+              cdp.disconnect();
+            } catch {
+            }
+            this.deps.cdpManagers.delete(key);
+            LOG5.info("StopIDE", `CDP disconnected: ${key}`);
           }
-          if (ideInstance.getExtensionInstances) {
-            for (const ext of ideInstance.getExtensionInstances()) {
-              if (ext.getInstanceId) this.deps.instanceIdMap.delete(ext.getInstanceId());
+        }
+        const keysToRemove = [];
+        for (const key of this.deps.instanceManager.instances?.keys?.() || []) {
+          if (key === `ide:${ideType}` || typeof key === "string" && key.startsWith(`ide:${ideType}_`)) {
+            keysToRemove.push(key);
+          }
+        }
+        for (const instanceKey of keysToRemove) {
+          const ideInstance = this.deps.instanceManager.getInstance(instanceKey);
+          if (ideInstance) {
+            if (ideInstance.getInstanceId) {
+              this.deps.instanceIdMap.delete(ideInstance.getInstanceId());
+            }
+            if (ideInstance.getExtensionInstances) {
+              for (const ext of ideInstance.getExtensionInstances()) {
+                if (ext.getInstanceId) this.deps.instanceIdMap.delete(ext.getInstanceId());
+              }
+            }
+            this.deps.instanceManager.removeInstance(instanceKey);
+            LOG5.info("StopIDE", `Instance removed: ${instanceKey}`);
+          }
+        }
+        if (keysToRemove.length === 0) {
+          const instanceKey = `ide:${ideType}`;
+          const ideInstance = this.deps.instanceManager.getInstance(instanceKey);
+          if (ideInstance) {
+            if (ideInstance.getInstanceId) {
+              this.deps.instanceIdMap.delete(ideInstance.getInstanceId());
             }
+            if (ideInstance.getExtensionInstances) {
+              for (const ext of ideInstance.getExtensionInstances()) {
+                if (ext.getInstanceId) this.deps.instanceIdMap.delete(ext.getInstanceId());
+              }
+            }
+            this.deps.instanceManager.removeInstance(instanceKey);
+            LOG5.info("StopIDE", `Instance removed: ${instanceKey}`);
+          }
+        }
+        if (killProcess) {
+          const running = isIdeRunning(ideType);
+          if (running) {
+            LOG5.info("StopIDE", `Killing IDE process: ${ideType}`);
+            const killed = await killIdeProcess(ideType);
+            if (killed) {
+              LOG5.info("StopIDE", `\u2705 Process killed: ${ideType}`);
+            } else {
+              LOG5.warn("StopIDE", `\u26A0 Could not kill process: ${ideType} (may need manual intervention)`);
+            }
+          } else {
+            LOG5.info("StopIDE", `Process not running: ${ideType}`);
           }
-          this.deps.instanceManager.removeInstance(instanceKey);
-          LOG5.info("StopIDE", `Instance removed: ${instanceKey}`);
         }
         this.deps.onStatusChange?.();
-        LOG5.info("StopIDE", `IDE stopped: ${ideType}`);
+        LOG5.info("StopIDE", `IDE stopped: ${ideType} (processKill=${killProcess})`);
       }
     };
     var os10 = __toESM2(require("os"));
@@ -22608,7 +22694,6 @@ var require_dist = __commonJS({
             peers: p2p?.connectedPeerCount || 0,
             screenshotActive: p2p?.screenshotActive || false
           },
-          cdpConnected: [...cdpManagers.values()].some((c) => c.isConnected),
           connectedExtensions: [],
           detectedIdes: this.deps.detectedIdes || [],
           availableProviders: this.deps.providerLoader.getAll().map((p) => ({
@@ -22650,7 +22735,6 @@ var require_dist = __commonJS({
               acpName: a.acpName
             })),
             p2p: payload.p2p,
-            cdpConnected: payload.cdpConnected,
             timestamp: now
           };
           serverConn.sendMessage("status_report", wsPayload);
@@ -24264,7 +24348,7 @@ var require_dist = __commonJS({
             return { ...b, text: b.text.slice(0, -3) };
           }
           return b;
-        }).filter((b) => b.type !== "text" || b.text.trim());
+        }).filter((b) => b.type !== "text" || b.type === "text" && b.text.trim());
         if (finalBlocks.length > 0) {
           this.messages.push({
             role: "assistant",
@@ -29894,7 +29978,7 @@ var init_adhdev_daemon = __esm({
     path2 = __toESM(require("path"));
     crypto2 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.14";
+    pkgVersion = "0.5.17";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [