adhdev 0.9.2 → 0.9.4

package/dist/index.js

@@ -913,8 +913,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os29 === "win32") {
-      const { dirname: dirname9 } = await import("path");
-      const appDir = dirname9(appPath);
+      const { dirname: dirname10 } = await import("path");
+      const appDir = dirname10(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -13110,10 +13110,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;
@@ -32951,10 +32947,10 @@ var init_readdirp = __esm({
       }
       async _formatEntry(dirent, path29) {
         let entry;
-        const basename8 = this._isDirent ? dirent.name : dirent;
+        const basename9 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path29, basename8));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename8 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path29, basename9));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -33485,9 +33481,9 @@ var init_handler2 = __esm({
       _watchWithNodeFs(path29, listener) {
         const opts = this.fsw.options;
         const directory = sp.dirname(path29);
-        const basename8 = sp.basename(path29);
+        const basename9 = sp.basename(path29);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename8);
+        parent.add(basename9);
         const absolutePath = sp.resolve(path29);
         const options = {
           persistent: opts.persistent
@@ -33497,7 +33493,7 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
+          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
           closer = setFsWatchFileListener(path29, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
@@ -33519,11 +33515,11 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname9 = sp.dirname(file2);
-        const basename8 = sp.basename(file2);
-        const parent = this.fsw._getWatchedDir(dirname9);
+        const dirname10 = sp.dirname(file2);
+        const basename9 = sp.basename(file2);
+        const parent = this.fsw._getWatchedDir(dirname10);
         let prevStats = stats;
-        if (parent.has(basename8))
+        if (parent.has(basename9))
           return;
         const listener = async (path29, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -33548,9 +33544,9 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname9, basename8);
+              this.fsw._remove(dirname10, basename9);
             }
-          } else if (parent.has(basename8)) {
+          } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -36865,9 +36861,82 @@ function appendUpgradeLog(message) {
   } 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" };
 }
@@ -36930,11 +36999,12 @@ function removeDaemonPidFile() {
   } 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]);
@@ -36959,7 +37029,7 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   }
   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)}`);
     }
@@ -36979,19 +37049,27 @@ function spawnDetachedDaemonUpgradeHelper(payload) {
 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",
@@ -37004,7 +37082,7 @@ async function runDaemonUpgradeHelper(payload) {
   }
   if (process.platform === "win32") {
     await new Promise((resolve16) => setTimeout(resolve16, 500));
-    cleanupStaleGlobalInstallDirs(payload.packageName);
+    cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
   if (restartArgv.length > 0) {
@@ -45892,6 +45970,7 @@ __export(src_exports, {
   buildChatMessageSignature: () => buildChatMessageSignature,
   buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
   buildMachineInfo: () => buildMachineInfo,
+  buildPinnedGlobalInstallCommand: () => buildPinnedGlobalInstallCommand,
   buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
   buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
@@ -45974,6 +46053,7 @@ __export(src_exports, {
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
   resolveChatMessageKind: () => resolveChatMessageKind,
+  resolveCurrentGlobalInstallSurface: () => resolveCurrentGlobalInstallSurface,
   resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
@@ -55375,7 +55455,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.2" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.4" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -87473,6 +87553,7 @@ var open_default = open2;
 
 // src/wizard.ts
 init_src();
+init_version();
 var SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
 var LOGO = `
 ${source_default2.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
@@ -87485,6 +87566,36 @@ function hasCloudMachineAuth() {
   const config2 = loadConfig();
   return Boolean(config2.machineSecret && config2.machineSecret.trim());
 }
+function readLatestPublishedCliVersion(execFileSyncLocal) {
+  const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
+  try {
+    return execFileSyncLocal(surface.npmExecutable, ["view", "adhdev", "version"], {
+      encoding: "utf-8",
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+function readInstalledGlobalCliVersion(execFileSyncLocal) {
+  const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
+  const args = ["list", "-g", "adhdev", "--json"];
+  if (surface.installPrefix) {
+    args.push("--prefix", surface.installPrefix);
+  }
+  try {
+    const result = execFileSyncLocal(surface.npmExecutable, args, {
+      encoding: "utf-8",
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const parsed = JSON.parse(result);
+    return parsed.dependencies?.adhdev?.version || null;
+  } catch {
+    return null;
+  }
+}
 async function runWizard(options = {}) {
   console.log(LOGO);
   if (isSetupComplete() && hasCloudMachineAuth() && !options.force) {
@@ -87500,27 +87611,10 @@ async function runWizard(options = {}) {
 }
 async function checkForUpdate() {
   try {
-    const { execSync: execSync7 } = await import("child_process");
-    let currentVersion = null;
-    try {
-      currentVersion = execSync7("adhdev --version", {
-        encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
-    let latestVersion = null;
-    try {
-      latestVersion = execSync7("npm show adhdev version", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
+    const { execFileSync: execFileSync4 } = await import("child_process");
+    const currentVersion = resolvePackageVersion();
+    const latestVersion = readLatestPublishedCliVersion(execFileSync4);
+    if (!latestVersion) return;
     if (!currentVersion || !latestVersion || currentVersion === latestVersion) return;
     console.log(source_default2.yellow(`  Update available: ${currentVersion} \u2192 ${latestVersion}`));
     const { doUpdate } = await (await Promise.resolve().then(() => (init_lib(), lib_exports))).default.prompt([{
@@ -87535,7 +87629,8 @@ async function checkForUpdate() {
     }
     const spinner = (await Promise.resolve().then(() => (init_ora(), ora_exports))).default("Updating adhdev CLI...").start();
     try {
-      execSync7("npm install -g adhdev@latest", {
+      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+      execFileSync4(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -87773,18 +87868,8 @@ async function startDaemonFlow() {
   }
 }
 async function installCliOnly() {
-  const { execSync: execSyncLocal } = await import("child_process");
-  let currentVersion = null;
-  try {
-    const result = execSyncLocal("npm list -g adhdev --json 2>/dev/null || npm list -g adhdev --json 2>nul", {
-      encoding: "utf-8",
-      timeout: 5e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    const parsed = JSON.parse(result);
-    currentVersion = parsed.dependencies?.adhdev?.version || null;
-  } catch {
-  }
+  const { execFileSync: execFileSyncLocal } = await import("child_process");
+  const currentVersion = readInstalledGlobalCliVersion(execFileSyncLocal);
   const isNpx = process.env.npm_execpath?.includes("npx") || process.argv[1]?.includes("npx") || process.argv[1]?.includes("_npx");
   console.log(source_default2.bold("\n\u{1F527} ADHDev CLI\n"));
   console.log(source_default2.gray("  The `adhdev` command lets you:"));
@@ -87795,15 +87880,7 @@ async function installCliOnly() {
   console.log();
   if (currentVersion) {
     console.log(source_default2.green(`  \u2713 Currently installed: v${currentVersion}`));
-    let latestVersion = null;
-    try {
-      latestVersion = execSyncLocal("npm show adhdev version", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-    }
+    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal);
     if (latestVersion && currentVersion === latestVersion) {
       console.log(source_default2.gray("  (Already up to date)"));
       return;
@@ -87838,20 +87915,13 @@ async function installCliOnly() {
   }
   const installSpinner = ora2("Installing adhdev CLI...").start();
   try {
-    execSyncLocal("npm install -g adhdev@latest", {
+    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+    execFileSyncLocal(installCommand.command, installCommand.args, {
       encoding: "utf-8",
       timeout: 6e4,
       stdio: ["pipe", "pipe", "pipe"]
     });
-    let newVersion = "latest";
-    try {
-      newVersion = execSyncLocal("adhdev --version 2>/dev/null || adhdev --version 2>nul", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-    }
+    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || "latest";
     installSpinner.succeed(`adhdev CLI ${currentVersion ? "updated" : "installed"} \u2713 (v${newVersion})`);
     console.log(source_default2.gray("  Try: adhdev daemon"));
     console.log();