@adhdev/daemon-core 0.9.46 → 0.9.48

package/dist/commands/upgrade-helper.d.ts

@@ -8,24 +8,33 @@ export interface DaemonUpgradeHelperPayload {
 }
 export interface CurrentGlobalInstallSurface {
     npmExecutable: string;
+    npmArgsPrefix?: string[];
     packageRoot: string | null;
     installPrefix: string | null;
+    execOptions?: {
+        shell: boolean;
+    };
 }
 export interface PinnedGlobalInstallCommand {
     command: string;
     args: string[];
     surface: CurrentGlobalInstallSurface;
+    execOptions: {
+        shell: boolean;
+    };
 }
 export declare function resolveCurrentGlobalInstallSurface(options: {
     packageName: string;
     currentCliPath?: string;
     nodeExecutable?: string;
+    platform?: NodeJS.Platform;
 }): CurrentGlobalInstallSurface;
 export declare function buildPinnedGlobalInstallCommand(options: {
     packageName: string;
     targetVersion: string;
     currentCliPath?: string;
     nodeExecutable?: string;
+    platform?: NodeJS.Platform;
 }): PinnedGlobalInstallCommand;
 export declare function stopSessionHostProcesses(appName: string): void;
 export declare function spawnDetachedDaemonUpgradeHelper(payload: DaemonUpgradeHelperPayload): void;

package/dist/index.js

@@ -12333,7 +12333,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 } : {} };
 }
 
 // src/commands/stream-commands.ts
@@ -12591,7 +12592,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((resolve12) => setTimeout(resolve12, 50));
+          await adapter.writeRaw("\r");
+        }
       }
       applyProviderPatch(h, args, parsed.payload);
       return {
@@ -13798,7 +13804,12 @@ var CliProviderInstance = class {
     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((resolve12) => setTimeout(resolve12, 50));
+        await this.adapter.writeRaw("\r");
+      }
     }
     this.applyProviderResponse(parsed.payload, { phase: "immediate" });
   }
@@ -18949,16 +18960,28 @@ function appendUpgradeLog(message) {
   } catch {
   }
 }
-function resolveSiblingNpmExecutable(nodeExecutable) {
+function resolveSiblingNpmInvocation(nodeExecutable, platform10 = process.platform) {
   const binDir = path16.dirname(nodeExecutable);
-  const candidates = process.platform === "win32" ? ["npm.cmd", "npm.exe", "npm"] : ["npm"];
-  for (const candidate of candidates) {
+  if (platform10 === "win32") {
+    const npmCliPath = path16.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 = path16.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 = path16.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;
@@ -19007,26 +19030,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 {
@@ -19121,11 +19148,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 : path16.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -19195,7 +19221,7 @@ async function runDaemonUpgradeHelper(payload) {
       encoding: "utf8",
       stdio: "pipe",
       maxBuffer: 20 * 1024 * 1024,
-      ...getNpmExecOptions()
+      ...installCommand.execOptions
     }
   );
   if (installOutput.trim()) {
@@ -19616,7 +19642,7 @@ var DaemonCommandRouter = class {
         const wantsAll = args?.all === true;
         const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
         const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
-        const providerMeta = this.deps.providerLoader.getMeta(providerType);
+        const providerMeta = this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType);
         const { sessions: historySessions, hasMore, source } = listProviderHistorySessions(providerType, {
           canonicalHistory: providerMeta?.canonicalHistory,
           offset,