adhdev 0.9.47 → 0.9.48

package/dist/cli/index.js

@@ -9522,7 +9522,8 @@ function getCliScriptCommand(payload) {
   if (command.type !== "send_message" && command.type !== "pty_write") return null;
   const text = typeof command.text === "string" ? command.text.trim() : typeof command.message === "string" ? command.message.trim() : "";
   if (!text) return null;
-  return { type: command.type, text };
+  const enterCount = Number.isInteger(command.enterCount) && command.enterCount > 0 && command.enterCount <= 5 ? command.enterCount : void 0;
+  return { type: command.type, text, ...enterCount ? { enterCount } : {} };
 }
 var init_cli_script_results = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-script-results.ts"() {
@@ -9784,7 +9785,12 @@ async function executeProviderScript(h, args, scriptName) {
       if (cliCommand?.type === "send_message" && cliCommand.text) {
         await adapter.sendMessage(cliCommand.text);
       } else if (cliCommand?.type === "pty_write" && cliCommand.text && adapter.writeRaw) {
+        const enterCount = cliCommand.enterCount || 1;
         await adapter.writeRaw(cliCommand.text + "\r");
+        for (let i = 1; i < enterCount; i += 1) {
+          await new Promise((resolve18) => setTimeout(resolve18, 50));
+          await adapter.writeRaw("\r");
+        }
       }
       applyProviderPatch(h, args, parsed.payload);
       return {
@@ -15581,7 +15587,12 @@ var init_cli_provider_instance = __esm({
         if (cliCommand?.type === "send_message" && cliCommand.text) {
           await this.adapter.sendMessage(cliCommand.text);
         } else if (cliCommand?.type === "pty_write" && cliCommand.text) {
+          const enterCount = cliCommand.enterCount || 1;
           await this.adapter.writeRaw(cliCommand.text + "\r");
+          for (let i = 1; i < enterCount; i += 1) {
+            await new Promise((resolve18) => setTimeout(resolve18, 50));
+            await this.adapter.writeRaw("\r");
+          }
         }
         this.applyProviderResponse(parsed.payload, { phase: "immediate" });
       }
@@ -38851,16 +38862,28 @@ function appendUpgradeLog(message) {
   } catch {
   }
 }
-function resolveSiblingNpmExecutable(nodeExecutable) {
+function resolveSiblingNpmInvocation(nodeExecutable, platform12 = process.platform) {
   const binDir = path17.dirname(nodeExecutable);
-  const candidates = process.platform === "win32" ? ["npm.cmd", "npm.exe", "npm"] : ["npm"];
-  for (const candidate of candidates) {
+  if (platform12 === "win32") {
+    const npmCliPath = path17.join(binDir, "node_modules", "npm", "bin", "npm-cli.js");
+    if (fs8.existsSync(npmCliPath)) {
+      return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: { shell: false } };
+    }
+    for (const candidate of ["npm.exe", "npm"]) {
+      const candidatePath = path17.join(binDir, candidate);
+      if (fs8.existsSync(candidatePath)) {
+        return { executable: candidatePath, argsPrefix: [], execOptions: { shell: false } };
+      }
+    }
+    return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: { shell: false } };
+  }
+  for (const candidate of ["npm"]) {
     const candidatePath = path17.join(binDir, candidate);
     if (fs8.existsSync(candidatePath)) {
-      return candidatePath;
+      return { executable: candidatePath, argsPrefix: [], execOptions: { shell: false } };
     }
   }
-  return "npm";
+  return { executable: "npm", argsPrefix: [], execOptions: { shell: false } };
 }
 function findCurrentPackageRoot(currentCliPath, packageName) {
   if (!currentCliPath) return null;
@@ -38909,26 +38932,30 @@ function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
 }
 function resolveCurrentGlobalInstallSurface(options) {
   const packageRoot = findCurrentPackageRoot(options.currentCliPath || process.argv[1], options.packageName);
+  const npmInvocation = resolveSiblingNpmInvocation(options.nodeExecutable || process.execPath, options.platform);
   return {
-    npmExecutable: resolveSiblingNpmExecutable(options.nodeExecutable || process.execPath),
+    npmExecutable: npmInvocation.executable,
+    npmArgsPrefix: npmInvocation.argsPrefix,
     packageRoot,
-    installPrefix: packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null
+    installPrefix: packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null,
+    execOptions: npmInvocation.execOptions
   };
 }
 function buildPinnedGlobalInstallCommand(options) {
   const surface = resolveCurrentGlobalInstallSurface(options);
-  const args = ["install", "-g", `${options.packageName}@${options.targetVersion || "latest"}`, "--force"];
+  const args = [...surface.npmArgsPrefix || [], "install", "-g", `${options.packageName}@${options.targetVersion || "latest"}`, "--force"];
   if (surface.installPrefix) {
     args.push("--prefix", surface.installPrefix);
   }
   return {
     command: surface.npmExecutable,
     args,
-    surface
+    surface,
+    execOptions: surface.execOptions || getNpmExecOptions(options.platform)
   };
 }
-function getNpmExecOptions() {
-  return { shell: process.platform === "win32" };
+function getNpmExecOptions(_platform = process.platform) {
+  return { shell: false };
 }
 function killPid(pid) {
   try {
@@ -39023,11 +39050,10 @@ function removeDaemonPidFile() {
   }
 }
 function cleanupStaleGlobalInstallDirs(pkgName, surface) {
-  const npmExecOpts = getNpmExecOptions();
   const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
-  const npmRoot = (0, import_child_process8.execFileSync)(surface.npmExecutable, ["root", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
+  const npmRoot = (0, import_child_process8.execFileSync)(surface.npmExecutable, [...surface.npmArgsPrefix || [], "root", "-g", ...prefixArgs], { encoding: "utf8", ...surface.execOptions }).trim();
   if (!npmRoot) return;
-  const npmPrefix = surface.installPrefix || (0, import_child_process8.execFileSync)(surface.npmExecutable, ["prefix", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
+  const npmPrefix = surface.installPrefix || (0, import_child_process8.execFileSync)(surface.npmExecutable, [...surface.npmArgsPrefix || [], "prefix", "-g", ...prefixArgs], { encoding: "utf8", ...surface.execOptions }).trim();
   const binDir = process.platform === "win32" ? npmPrefix : path17.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -39097,7 +39123,7 @@ async function runDaemonUpgradeHelper(payload) {
       encoding: "utf8",
       stdio: "pipe",
       maxBuffer: 20 * 1024 * 1024,
-      ...getNpmExecOptions()
+      ...installCommand.execOptions
     }
   );
   if (installOutput.trim()) {
@@ -87844,12 +87870,15 @@ function verifyPublishedMandatoryUpdateTarget(packageName, targetVersion, deps =
   const validation = validateMandatoryUpdateTarget(targetVersion);
   if (!validation.valid) throw new Error(validation.error || "invalid mandatory update target");
   const run = deps.execFileSync || import_child_process14.execFileSync;
-  const npmExecutable = deps.npmExecutable || resolveCurrentGlobalInstallSurface({ packageName }).npmExecutable;
-  const published = String(run(npmExecutable, ["view", `${packageName}@${targetVersion}`, "version"], {
+  const surface = resolveCurrentGlobalInstallSurface({ packageName });
+  const npmExecutable = deps.npmExecutable || surface.npmExecutable;
+  const npmArgsPrefix = deps.npmArgsPrefix || surface.npmArgsPrefix || [];
+  const execOptions = deps.execOptions || surface.execOptions || {};
+  const published = String(run(npmExecutable, [...npmArgsPrefix, "view", `${packageName}@${targetVersion}`, "version"], {
     encoding: "utf-8",
     timeout: 1e4,
     stdio: ["pipe", "pipe", "pipe"],
-    ...process.platform === "win32" ? { shell: true, windowsHide: true } : {}
+    ...execOptions
   })).trim();
   if (published !== targetVersion) {
     throw new Error(`Published version mismatch: expected ${targetVersion}, got ${published || "unknown"}`);
@@ -88056,7 +88085,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.47" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.48" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -89191,10 +89220,11 @@ function hasCloudMachineAuth() {
 function readLatestPublishedCliVersion(execFileSyncLocal) {
   const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
   try {
-    return execFileSyncLocal(surface.npmExecutable, ["view", "adhdev", "version"], {
+    return execFileSyncLocal(surface.npmExecutable, [...surface.npmArgsPrefix || [], "view", "adhdev", "version"], {
       encoding: "utf-8",
       timeout: 5e3,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      ...surface.execOptions
     }).trim();
   } catch {
     return null;
@@ -89202,7 +89232,7 @@ function readLatestPublishedCliVersion(execFileSyncLocal) {
 }
 function readInstalledGlobalCliVersion(execFileSyncLocal) {
   const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
-  const args = ["list", "-g", "adhdev", "--json"];
+  const args = [...surface.npmArgsPrefix || [], "list", "-g", "adhdev", "--json"];
   if (surface.installPrefix) {
     args.push("--prefix", surface.installPrefix);
   }
@@ -89210,7 +89240,8 @@ function readInstalledGlobalCliVersion(execFileSyncLocal) {
     const result = execFileSyncLocal(surface.npmExecutable, args, {
       encoding: "utf-8",
       timeout: 5e3,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      ...surface.execOptions
     });
     const parsed = JSON.parse(result);
     return parsed.dependencies?.adhdev?.version || null;
@@ -89255,7 +89286,8 @@ async function checkForUpdate() {
       execFileSync6(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
-        stdio: ["pipe", "pipe", "pipe"]
+        stdio: ["pipe", "pipe", "pipe"],
+        ...installCommand.execOptions
       });
       spinner.succeed(`Updated to v${latestVersion}`);
       console.log();
@@ -89541,7 +89573,8 @@ async function installCliOnly() {
     execFileSyncLocal(installCommand.command, installCommand.args, {
       encoding: "utf-8",
       timeout: 6e4,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      ...installCommand.execOptions
     });
     const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || "latest";
     installSpinner.succeed(`adhdev CLI ${currentVersion ? "updated" : "installed"} \u2713 (v${newVersion})`);