@adhdev/daemon-core 1.0.23-rc.1 → 1.0.24-rc.1

package/dist/index.mjs

@@ -786,10 +786,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "946a0b8bd9b5f44e063993f6f313a33847e1b3f9" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "946a0b8b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "1.0.23-rc.1" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-24T07:05:19.963Z" : void 0);
+  const commit = readInjected(true ? "159c481abed0a48a043711e3c9c8a3a12b900336" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "159c481a" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "1.0.24-rc.1" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-24T11:39:26.052Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -13070,6 +13070,7 @@ var init_spawn_env = __esm({
 // src/cli-adapters/provider-cli-shared.ts
 import * as os6 from "os";
 import * as path11 from "path";
+import { execSync } from "child_process";
 function isPurePtyTranscriptProvider(provider) {
   if (!provider) return false;
   if (provider.transcriptAuthority === "provider") return false;
@@ -13225,6 +13226,73 @@ function buildCliScreenSnapshot(text) {
     linesBelowPrompt: promptLineIndex >= 0 ? lines.slice(promptLineIndex + 1) : []
   };
 }
+function windowsExecutableExtensions() {
+  const raw = process.env.PATHEXT;
+  const fromEnv = raw ? raw.split(";").map((e) => e.trim().toLowerCase()).filter(Boolean) : [".exe", ".cmd", ".bat"];
+  const merged = [...fromEnv];
+  if (!merged.includes(".ps1")) merged.push(".ps1");
+  if (!merged.includes("")) merged.push("");
+  return Array.from(new Set(merged));
+}
+function npmGlobalPrefix() {
+  if (cachedNpmPrefix !== void 0) return cachedNpmPrefix ?? void 0;
+  try {
+    const prefix = execSync("npm config get prefix", {
+      encoding: "utf-8",
+      timeout: 2e3,
+      windowsHide: true,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    cachedNpmPrefix = prefix && prefix !== "undefined" ? prefix : null;
+  } catch {
+    cachedNpmPrefix = null;
+  }
+  return cachedNpmPrefix ?? void 0;
+}
+function windowsExtraBinDirs() {
+  const dirs = [];
+  const fs44 = __require("fs");
+  const push = (dir) => {
+    if (!dir) return;
+    try {
+      if (fs44.existsSync(dir)) dirs.push(dir);
+    } catch {
+    }
+  };
+  if (process.env.APPDATA) push(path11.join(process.env.APPDATA, "npm"));
+  if (process.env.LOCALAPPDATA) push(path11.join(process.env.LOCALAPPDATA, "npm"));
+  if (process.env.USERPROFILE) push(path11.join(process.env.USERPROFILE, "scoop", "shims"));
+  push(npmGlobalPrefix());
+  try {
+    push(path11.dirname(process.execPath));
+  } catch {
+  }
+  return dirs;
+}
+function unixExtraBinDirs() {
+  const dirs = [];
+  const fs44 = __require("fs");
+  const home = os6.homedir();
+  const push = (dir) => {
+    if (!dir) return;
+    try {
+      if (fs44.existsSync(dir)) dirs.push(dir);
+    } catch {
+    }
+  };
+  push(path11.join(home, ".local", "bin"));
+  push(path11.join(home, ".claude", "local", "bin"));
+  push(path11.join(home, ".npm-global", "bin"));
+  push("/usr/local/bin");
+  push("/opt/homebrew/bin");
+  const prefix = npmGlobalPrefix();
+  if (prefix) push(path11.join(prefix, "bin"));
+  try {
+    push(path11.dirname(process.execPath));
+  } catch {
+  }
+  return dirs;
+}
 function findBinary(name) {
   const trimmed = String(name || "").trim();
   if (!trimmed) return trimmed;
@@ -13236,21 +13304,12 @@ function findBinary(name) {
   const paths = (process.env.PATH || "").split(path11.delimiter);
   const extraDirs = [];
   if (isWin) {
-    if (process.env.APPDATA) extraDirs.push(path11.join(process.env.APPDATA, "npm"));
-    try {
-      extraDirs.push(path11.dirname(process.execPath));
-    } catch {
-    }
+    extraDirs.push(...windowsExtraBinDirs());
   } else {
-    extraDirs.push(path11.join(os6.homedir(), ".npm-global", "bin"));
-    extraDirs.push("/usr/local/bin", "/opt/homebrew/bin");
-    try {
-      extraDirs.push(path11.dirname(process.execPath));
-    } catch {
-    }
+    extraDirs.push(...unixExtraBinDirs());
   }
   const searchDirs = [...paths, ...extraDirs];
-  const exes = isWin ? [".exe", ".cmd", ".bat", ""] : [""];
+  const exes = isWin ? windowsExecutableExtensions() : [""];
   for (const p of searchDirs) {
     if (!p) continue;
     for (const ext of exes) {
@@ -13375,7 +13434,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var TerminalTranscriptAccumulator, MESH_SEND_KEY_ENCODING, MESH_DESTRUCTIVE_KEYS, MESH_SEND_KEYS_MAX_ITEMS, MESH_SEND_KEYS_MAX_TEXT_BYTES, buildCliSpawnEnv;
+var TerminalTranscriptAccumulator, MESH_SEND_KEY_ENCODING, MESH_DESTRUCTIVE_KEYS, MESH_SEND_KEYS_MAX_ITEMS, MESH_SEND_KEYS_MAX_TEXT_BYTES, buildCliSpawnEnv, cachedNpmPrefix;
 var init_provider_cli_shared = __esm({
   "src/cli-adapters/provider-cli-shared.ts"() {
     "use strict";
@@ -13551,6 +13610,7 @@ var init_provider_cli_shared = __esm({
     MESH_SEND_KEYS_MAX_ITEMS = 64;
     MESH_SEND_KEYS_MAX_TEXT_BYTES = 4096;
     buildCliSpawnEnv = sanitizeSpawnEnv;
+    cachedNpmPrefix = void 0;
   }
 });
 
@@ -43873,10 +43933,16 @@ var ADHDEV_OWNED_MARKERS = [
 function normalizeForCompare(value) {
   return path20.resolve(value).replace(/[\\/]+$/, "").toLowerCase();
 }
+var DEFAULT_INSTANCE_DIR = ".adhdev";
+function normalizeInstanceDir(instanceDir) {
+  const trimmed = instanceDir?.trim();
+  return trimmed ? trimmed : DEFAULT_INSTANCE_DIR;
+}
 function resolveWindowsInstallerLayout(options) {
   if ((options.platform || process.platform) !== "win32" || !options.installPrefix) return null;
-  const installRoot = path20.join(options.homeDir, ".adhdev", "npm-installs");
-  const stablePrefix = path20.join(options.homeDir, ".adhdev", "npm-global");
+  const instanceDir = normalizeInstanceDir(options.instanceDir);
+  const installRoot = path20.join(options.homeDir, instanceDir, "npm-installs");
+  const stablePrefix = path20.join(options.homeDir, instanceDir, "npm-global");
   const pointerPath = path20.join(stablePrefix, POINTER_NAME);
   const activeVersionName = path20.basename(options.installPrefix);
   if (!activeVersionName.startsWith("version-")) return null;
@@ -43904,9 +43970,9 @@ function nodeMajor(nodeExecutable) {
     return null;
   }
 }
-function findPortableNode22(homeDir, currentNode = process.execPath) {
+function findPortableNode22(homeDir, currentNode = process.execPath, instanceDir = DEFAULT_INSTANCE_DIR) {
   const candidates = [currentNode];
-  const portableRoot = path20.join(homeDir, ".adhdev", "tools", "node22");
+  const portableRoot = path20.join(homeDir, normalizeInstanceDir(instanceDir), "tools", "node22");
   try {
     const dirs = fs14.readdirSync(portableRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => path20.join(portableRoot, entry.name, "node.exe"));
     candidates.push(...dirs);
@@ -44290,7 +44356,12 @@ function removeInactivePrefix(target, log) {
 }
 
 // src/commands/upgrade-helper.ts
+init_config();
 var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
+function resolveInstanceDir(configDir = getConfigDir()) {
+  const base = path21.basename(configDir).trim();
+  return base || ".adhdev";
+}
 function getUpgradeLogPath(home = os14.homedir()) {
   const dir = path21.join(home, ".adhdev");
   fs15.mkdirSync(dir, { recursive: true });
@@ -44372,16 +44443,16 @@ function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
   }
   return maybeLibDir;
 }
-function isPortableNode22Prefix(prefix, homeDir) {
+function isPortableNode22Prefix(prefix, homeDir, instanceDir = ".adhdev") {
   if (!prefix) return false;
-  const portableRoot = path21.join(homeDir, ".adhdev", "tools", "node22");
+  const portableRoot = path21.join(homeDir, instanceDir, "tools", "node22");
   const normalizedPrefix = path21.resolve(prefix).replace(/[\\/]+$/, "").toLowerCase();
   const normalizedRoot = path21.resolve(portableRoot).replace(/[\\/]+$/, "").toLowerCase();
   return normalizedPrefix === normalizedRoot || normalizedPrefix.startsWith(`${normalizedRoot}${path21.sep.toLowerCase()}`);
 }
-function canonicalDispatcherInstallPrefix(homeDir) {
-  const installRoot = path21.join(homeDir, ".adhdev", "npm-installs");
-  const pointerPath = path21.join(homeDir, ".adhdev", "npm-global", ".adhdev-current");
+function canonicalDispatcherInstallPrefix(homeDir, instanceDir = ".adhdev") {
+  const installRoot = path21.join(homeDir, instanceDir, "npm-installs");
+  const pointerPath = path21.join(homeDir, instanceDir, "npm-global", ".adhdev-current");
   try {
     const activeVersion = fs15.readFileSync(pointerPath, "utf8").trim();
     if (activeVersion.startsWith("version-")) return path21.join(installRoot, activeVersion);
@@ -44394,9 +44465,10 @@ function resolveCurrentGlobalInstallSurface(options) {
   const npmInvocation = resolveSiblingNpmInvocation(options.nodeExecutable || process.execPath, options.platform);
   const platform10 = options.platform || process.platform;
   const homeDir = options.homeDir || os14.homedir();
+  const instanceDir = options.instanceDir || resolveInstanceDir();
   let installPrefix = packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null;
-  if (platform10 === "win32" && isPortableNode22Prefix(installPrefix, homeDir)) {
-    installPrefix = canonicalDispatcherInstallPrefix(homeDir);
+  if (platform10 === "win32" && isPortableNode22Prefix(installPrefix, homeDir, instanceDir)) {
+    installPrefix = canonicalDispatcherInstallPrefix(homeDir, instanceDir);
   }
   return {
     npmExecutable: npmInvocation.executable,
@@ -44646,12 +44718,14 @@ async function runDaemonUpgradeHelper(payload) {
   }
   await stopSessionHostProcesses(sessionHostAppName);
   removeDaemonPidFile();
+  const instanceDir = resolveInstanceDir();
   const windowsInstallerLayout = resolveWindowsInstallerLayout({
     homeDir: os14.homedir(),
-    installPrefix: installCommand.surface.installPrefix
+    installPrefix: installCommand.surface.installPrefix,
+    instanceDir
   });
   if (windowsInstallerLayout) {
-    const portableNode = findPortableNode22(os14.homedir());
+    const portableNode = findPortableNode22(os14.homedir(), process.execPath, instanceDir);
     if (!portableNode) {
       throw new Error("installer-managed Windows update requires the portable Node.js 22 runtime");
     }
@@ -49032,6 +49106,7 @@ init_logger();
 init_debug_trace();
 init_debug_config();
 init_mesh_event_trace();
+init_mesh_events_utils();
 init_control_effects();
 init_approval_utils();
 init_provider_patch_state();
@@ -50515,6 +50590,17 @@ var CliProviderInstance = class _CliProviderInstance {
   // this to refuse a SECOND completion for a turn whose completion already fired —
   // so a worker that finished cleanly and is simply being auto-cleaned never emits a
   // duplicate. taskId '' covers an ad-hoc (no-task) turn. null = none emitted yet.
+  //
+  // COMPLETION-WEAK-REARM (fix1): the latch now carries the EVIDENCE STRENGTH of the
+  // recorded emit. `weak` mirrors isWeakCompletionEvidence() over the exact event that
+  // was pushed (evidenceLevel ∈ {weak,insufficient}, reviewRecommended, or a
+  // missing_final_assistant diagnostic — the CANON-C decoupled-immediate emit and the
+  // startup-grace fast-collapse synth are the two weak producers). `emittedAtEpoch`
+  // snapshots busyEpoch at emit time so the transcript re-emit paths can require a real
+  // generating→idle transition (busyEpoch advanced past this) before re-arming — a
+  // static idle screen can never re-fire the same weak frame. A weak latch is a
+  // ONE-SHOT re-arm: the genuine re-emit overwrites this with weak=false, so a
+  // subsequent idle tick hits the non-weak latch and stops (never a third emit).
   lastEmittedCompletion = null;
   async enforceFreshSessionLaunchIfNeeded() {
     const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
@@ -51270,7 +51356,7 @@ var CliProviderInstance = class _CliProviderInstance {
   flushMeshCompletionBeforeCleanup() {
     if (!this.isMeshWorkerSession()) return false;
     const taskId = this.completingTurnTaskId();
-    if (this.lastEmittedCompletion && this.lastEmittedCompletion.taskId === (taskId ?? "")) {
+    if (this.shouldSuppressCompletionReEmit(taskId)) {
       return false;
     }
     if (!this.injectedTaskHasStartedGenerating()) return false;
@@ -51334,7 +51420,7 @@ var CliProviderInstance = class _CliProviderInstance {
     if (observedStatus !== "idle") return false;
     if (this.hasAdapterPendingResponse()) return false;
     const taskId = this.completingTurnTaskId();
-    if (this.lastEmittedCompletion && this.lastEmittedCompletion.taskId === (taskId ?? "")) {
+    if (this.shouldSuppressCompletionReEmit(taskId)) {
       return false;
     }
     if (!this.injectedTaskHasStartedGenerating()) return false;
@@ -51399,7 +51485,7 @@ var CliProviderInstance = class _CliProviderInstance {
     if (observedStatus !== "idle") return false;
     if (this.hasAdapterPendingResponse()) return false;
     const taskId = this.completingTurnTaskId();
-    if (this.lastEmittedCompletion && this.lastEmittedCompletion.taskId === (taskId ?? "")) {
+    if (this.shouldSuppressCompletionReEmit(taskId)) {
       return false;
     }
     if (!this.injectedTaskHasStartedGenerating()) return false;
@@ -51832,8 +51918,7 @@ var CliProviderInstance = class _CliProviderInstance {
     if (summary) {
       this.lastCompletionSummary = { content: summary, receivedAt: opts.timestamp };
     }
-    this.lastEmittedCompletion = { taskId: typeof opts.taskId === "string" ? opts.taskId : "", at: Date.now() };
-    this.pushEvent({
+    const completionEvent = {
       event: "agent:generating_completed",
       chatTitle: opts.chatTitle,
       duration: opts.duration,
@@ -51845,11 +51930,49 @@ var CliProviderInstance = class _CliProviderInstance {
       finalSummary: opts.finalSummary,
       ...opts.evidenceLevel !== void 0 ? { evidenceLevel: opts.evidenceLevel } : {},
       ...opts.completionDiagnostic !== void 0 ? { completionDiagnostic: opts.completionDiagnostic } : {}
-    });
+    };
+    this.lastEmittedCompletion = {
+      taskId: typeof opts.taskId === "string" ? opts.taskId : "",
+      at: Date.now(),
+      evidenceLevel: opts.evidenceLevel,
+      weak: isWeakCompletionEvidence(completionEvent),
+      emittedAtEpoch: this.busyEpoch
+    };
+    this.pushEvent(completionEvent);
     if (this.settings?.silentNextIdlePush === true) {
       this.updateSettings({ silentNextIdlePush: void 0, silentNextIdlePushArmedAt: void 0 });
     }
   }
+  /**
+   * COMPLETION-WEAK-REARM (fix1): the double-emit guard shared by the three transcript
+   * re-emit paths (flushMeshCompletionBeforeCleanup, tryReconcilePurePtyCompletionForStall,
+   * tryReconcileNativeSourceCompletionForStall). Returns true when a re-emit for `taskId`
+   * must be SUPPRESSED because this turn's completion already fired with strong evidence.
+   *
+   * The defect this replaces: the old guard short-circuited on ANY prior emit for the
+   * taskId, regardless of its evidence. After a WEAK completion (CANON-C decoupled-immediate
+   * missing_final_assistant, or a startup-grace fast-collapse synth), the same session
+   * reaching a GENUINE idle later (final assistant present) was silently swallowed — the
+   * worker never emitted the genuine completion and the coordinator held on the acked-death
+   * deadline (8 min).
+   *
+   * New behavior:
+   *   • no latch / taskId mismatch → NOT suppressed (the caller's own evidence gate runs).
+   *   • prior emit was GENUINE (not weak) → SUPPRESSED (single-shot; a clean completion is
+   *     never re-emitted).
+   *   • prior emit was WEAK → re-arm ONE-SHOT, but only across a real generating→idle
+   *     transition: require busyEpoch to have advanced past the weak emit's epoch, so a
+   *     static idle screen cannot re-fire the same weak frame. The genuine re-emit passes
+   *     evidenceLevel:'transcript' (non-weak), overwriting the latch → any subsequent idle
+   *     tick hits the now-genuine latch and is suppressed. Never a third emit.
+   */
+  shouldSuppressCompletionReEmit(taskId) {
+    const latch = this.lastEmittedCompletion;
+    if (!latch || latch.taskId !== (taskId ?? "")) return false;
+    if (!latch.weak) return true;
+    if (this.busyEpoch <= latch.emittedAtEpoch) return true;
+    return false;
+  }
   /**
    * AUTOAPPROVE-FLAP-INBOX-MISSING sticky-approval overlay. Returns the adapterStatus a
    * flap-prone claude-cli approval SHOULD present this frame — either the raw status
@@ -75931,8 +76054,31 @@ function createManagedSessionHost(options) {
       return false;
     }
   }
+  function resolveSessionHostNode() {
+    if (process.platform !== "win32") {
+      return process.execPath;
+    }
+    let portableNode = null;
+    try {
+      portableNode = findPortableNode22(os32.homedir(), process.execPath, resolveInstanceDir());
+    } catch (error) {
+      LOG.warn(
+        "SessionHost",
+        `Failed to resolve portable Node 22 for the session-host spawn: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    if (portableNode) {
+      return portableNode;
+    }
+    LOG.warn(
+      "SessionHost",
+      `Portable Node 22 not found; spawning the session-host with ${process.execPath}. node-pty may fail to load its conpty.node prebuild under a non-22 Node on win32.`
+    );
+    return process.execPath;
+  }
   function spawnHost() {
     const entry = resolveEntry();
+    const nodeExecutable = resolveSessionHostNode();
     let stdio = "ignore";
     let logFd = null;
     if (options.spawnStdio === "logfile") {
@@ -75941,7 +76087,7 @@ function createManagedSessionHost(options) {
       logFd = fs43.openSync(path45.join(logDir, "session-host.log"), "a");
       stdio = ["ignore", logFd, logFd];
     }
-    const child = spawn5(process.execPath, [entry], {
+    const child = spawn5(nodeExecutable, [entry], {
       detached: true,
       stdio,
       windowsHide: true,
@@ -77087,6 +77233,7 @@ export {
   getActiveMeshMissionSummaries,
   getActiveSessionDeliveries,
   getAvailableIdeIds,
+  getConfigDir,
   getCoordinatorForSession,
   getCurrentDaemonLogPath,
   getDaemonBuildInfo,
@@ -77263,6 +77410,7 @@ export {
   resolveDeliveryDecision,
   resolveEffectiveMeshNodeHealth,
   resolveGitRepository,
+  resolveInstanceDir,
   resolveMagiSessionCleanupMode,
   resolveMaxParallelTasks,
   resolveMeshHostStatus,