@adhdev/daemon-standalone 0.9.2 → 0.9.4

package/dist/index.js

@@ -31321,10 +31321,6 @@ ${data.message || ""}`.trim();
                 throw new Error(`${this.cliName} is still processing the previous prompt`);
               }
             }
-            const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
-            if (blockingModal || this.currentStatus === "waiting_approval") {
-              throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
-            }
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
             this.finishRetryCount = 0;
@@ -31905,6 +31901,7 @@ ${data.message || ""}`.trim();
       buildChatMessageSignature: () => buildChatMessageSignature,
       buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
       buildMachineInfo: () => buildMachineInfo2,
+      buildPinnedGlobalInstallCommand: () => buildPinnedGlobalInstallCommand,
       buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
       buildSessionEntries: () => buildSessionEntries,
       buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
@@ -31987,6 +31984,7 @@ ${data.message || ""}`.trim();
       resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
       resetState: () => resetState,
       resolveChatMessageKind: () => resolveChatMessageKind,
+      resolveCurrentGlobalInstallSurface: () => resolveCurrentGlobalInstallSurface,
       resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
       resolveSessionHostAppName: () => resolveSessionHostAppName,
       resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution2,
@@ -32625,8 +32623,8 @@ ${data.message || ""}`.trim();
           if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
         if (!resolvedCli && appPath && os20 === "win32") {
-          const { dirname: dirname6 } = await import("path");
-          const appDir = dirname6(appPath);
+          const { dirname: dirname7 } = await import("path");
+          const appDir = dirname7(appPath);
           const candidates = [
             `${appDir}\\\\bin\\\\${def.cli}.cmd`,
             `${appDir}\\\\bin\\\\${def.cli}`,
@@ -45653,9 +45651,82 @@ Run 'adhdev doctor' for detailed diagnostics.`
       } catch {
       }
     }
-    function getNpmExecutable() {
+    function resolveSiblingNpmExecutable(nodeExecutable) {
+      const binDir = path16.dirname(nodeExecutable);
+      const candidates = process.platform === "win32" ? ["npm.cmd", "npm.exe", "npm"] : ["npm"];
+      for (const candidate of candidates) {
+        const candidatePath = path16.join(binDir, candidate);
+        if (fs8.existsSync(candidatePath)) {
+          return candidatePath;
+        }
+      }
       return "npm";
     }
+    function findCurrentPackageRoot(currentCliPath, packageName) {
+      if (!currentCliPath) return null;
+      let resolvedPath = currentCliPath;
+      try {
+        resolvedPath = fs8.realpathSync.native(currentCliPath);
+      } catch {
+      }
+      let currentDir = resolvedPath;
+      try {
+        if (fs8.statSync(resolvedPath).isFile()) {
+          currentDir = path16.dirname(resolvedPath);
+        }
+      } catch {
+        currentDir = path16.dirname(resolvedPath);
+      }
+      while (true) {
+        const packageJsonPath = path16.join(currentDir, "package.json");
+        try {
+          if (fs8.existsSync(packageJsonPath)) {
+            const parsed = JSON.parse(fs8.readFileSync(packageJsonPath, "utf8"));
+            if (parsed?.name === packageName) {
+              const normalized = currentDir.replace(/\\/g, "/");
+              return normalized.includes("/node_modules/") ? currentDir : null;
+            }
+          }
+        } catch {
+        }
+        const parentDir = path16.dirname(currentDir);
+        if (parentDir === currentDir) {
+          return null;
+        }
+        currentDir = parentDir;
+      }
+    }
+    function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
+      const nodeModulesDir = packageName.startsWith("@") ? path16.dirname(path16.dirname(packageRoot)) : path16.dirname(packageRoot);
+      if (path16.basename(nodeModulesDir) !== "node_modules") {
+        return null;
+      }
+      const maybeLibDir = path16.dirname(nodeModulesDir);
+      if (path16.basename(maybeLibDir) === "lib") {
+        return path16.dirname(maybeLibDir);
+      }
+      return maybeLibDir;
+    }
+    function resolveCurrentGlobalInstallSurface(options) {
+      const packageRoot = findCurrentPackageRoot(options.currentCliPath || process.argv[1], options.packageName);
+      return {
+        npmExecutable: resolveSiblingNpmExecutable(options.nodeExecutable || process.execPath),
+        packageRoot,
+        installPrefix: packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null
+      };
+    }
+    function buildPinnedGlobalInstallCommand(options) {
+      const surface = resolveCurrentGlobalInstallSurface(options);
+      const args = ["install", "-g", `${options.packageName}@${options.targetVersion || "latest"}`, "--force"];
+      if (surface.installPrefix) {
+        args.push("--prefix", surface.installPrefix);
+      }
+      return {
+        command: surface.npmExecutable,
+        args,
+        surface
+      };
+    }
     function getNpmExecOptions() {
       return { shell: process.platform === "win32" };
     }
@@ -45718,11 +45789,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
       } catch {
       }
     }
-    function cleanupStaleGlobalInstallDirs(pkgName) {
+    function cleanupStaleGlobalInstallDirs(pkgName, surface) {
       const npmExecOpts = getNpmExecOptions();
-      const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
+      const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
+      const npmRoot = (0, import_child_process7.execFileSync)(surface.npmExecutable, ["root", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
       if (!npmRoot) return;
-      const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
+      const npmPrefix = surface.installPrefix || (0, import_child_process7.execFileSync)(surface.npmExecutable, ["prefix", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
       const binDir = process.platform === "win32" ? npmPrefix : path16.join(npmPrefix, "bin");
       const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
       const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -45747,7 +45819,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       if (fs8.existsSync(binDir)) {
         for (const entry of fs8.readdirSync(binDir)) {
-          if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
+          if (!Array.from(binNames).some((name) => entry.startsWith(`.${name}-`))) continue;
           fs8.rmSync(path16.join(binDir, entry), { recursive: true, force: true });
           appendUpgradeLog(`Removed stale bin staging entry: ${path16.join(binDir, entry)}`);
         }
@@ -45767,19 +45839,27 @@ Run 'adhdev doctor' for detailed diagnostics.`
     async function runDaemonUpgradeHelper(payload) {
       const restartArgv = Array.isArray(payload.restartArgv) ? payload.restartArgv : [];
       const sessionHostAppName = payload.sessionHostAppName || process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
+      const installCommand = buildPinnedGlobalInstallCommand({
+        packageName: payload.packageName,
+        targetVersion: payload.targetVersion
+      });
       appendUpgradeLog(`Upgrade helper started for ${payload.packageName}@${payload.targetVersion}`);
+      appendUpgradeLog(`Using npm executable: ${installCommand.command}`);
+      if (installCommand.surface.installPrefix) {
+        appendUpgradeLog(`Pinned install prefix: ${installCommand.surface.installPrefix}`);
+      }
       if (Number.isFinite(payload.parentPid) && payload.parentPid > 0) {
         appendUpgradeLog(`Waiting for parent pid ${payload.parentPid} to exit`);
         await waitForPidExit(payload.parentPid, 15e3);
       }
       stopSessionHostProcesses(sessionHostAppName);
       removeDaemonPidFile();
-      cleanupStaleGlobalInstallDirs(payload.packageName);
+      cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
       const spec = `${payload.packageName}@${payload.targetVersion || "latest"}`;
       appendUpgradeLog(`Installing ${spec}`);
       const installOutput = (0, import_child_process7.execFileSync)(
-        getNpmExecutable(),
-        ["install", "-g", spec, "--force"],
+        installCommand.command,
+        installCommand.args,
         {
           encoding: "utf8",
           stdio: "pipe",
@@ -45792,7 +45872,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       if (process.platform === "win32") {
         await new Promise((resolve12) => setTimeout(resolve12, 500));
-        cleanupStaleGlobalInstallDirs(payload.packageName);
+        cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
         appendUpgradeLog("Post-install staging cleanup complete");
       }
       if (restartArgv.length > 0) {