@adhdev/daemon-standalone 0.9.82-rc.357 → 0.9.82-rc.359

package/dist/index.js

@@ -30036,10 +30036,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "37b9d1d9e10336707dbc0861a96d5bcc55cc015e" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "37b9d1d9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.357" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-23T00:25:47.104Z" : void 0);
+      const commit = readInjected(true ? "56a1f2a986ab2c2bb7888189d9b027d6067f2317" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "56a1f2a9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.359" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-23T05:03:37.127Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -42804,9 +42804,7 @@ ${cleanBody}`;
       const machineId = readNonEmptyString2(node?.machineId);
       const appConfig = loadConfig2();
       const localMachineId = readNonEmptyString2(appConfig.machineId) || readNonEmptyString2(appConfig.registeredMachineId);
-      const cloudDaemonId = localMachineId ? `daemon_${localMachineId}` : "";
-      const standaloneDaemonId = localMachineId ? `standalone_${localMachineId}` : "";
-      const daemonMatchesLocal = !daemonId || daemonId === cloudDaemonId || daemonId === standaloneDaemonId;
+      const daemonMatchesLocal = !daemonId || daemonIdsEquivalent(daemonId, localMachineId);
       const machineMatchesLocal = !machineId || !!localMachineId && machineId === localMachineId;
       if (node?.isLocalWorktree === true) {
         return daemonMatchesLocal && machineMatchesLocal;
@@ -43540,7 +43538,7 @@ ${cleanBody}`;
           occurredAt: occurredAtMs != null ? new Date(occurredAtMs).toISOString() : void 0,
           taskId: eventTaskId
         });
-        const leaveDirectDispatchActive = !task && opts?.tentativeIfDirect === true;
+        const leaveDirectDispatchActive = !task && opts?.tentativeIfDirect === true || !eventTaskId && !sessionHasActiveAssignment(args.meshId, sessionId);
         if (!leaveDirectDispatchActive) {
           updateDirectDispatchStatus(args.meshId, sessionId, outcome, eventTaskId);
         }
@@ -43639,7 +43637,9 @@ ${cleanBody}`;
         }
         if (sessionId) {
           const startedTaskId = readNonEmptyString2(args.metadataEvent.taskId) || void 0;
-          updateDirectDispatchStatus(args.meshId, sessionId, "acked", startedTaskId);
+          if (startedTaskId || sessionHasActiveAssignment(args.meshId, sessionId)) {
+            updateDirectDispatchStatus(args.meshId, sessionId, "acked", startedTaskId);
+          }
           const activeDeliveries = (() => {
             try {
               return MeshRuntimeStore.getInstance().getActiveSessionDeliveries(args.meshId, sessionId);
@@ -43740,7 +43740,7 @@ ${cleanBody}`;
                   targetNodeId: autoNodeId
                 });
                 LOG2.info("MeshRecovery", `Auto-requeued failed task: ${task.id} for node ${autoNodeId}`);
-                const node = mesh?.nodes.find((n) => n.id === autoNodeId);
+                const node = mesh?.nodes.find((n) => meshNodeIdMatches(n, autoNodeId));
                 if (node) {
                   components.cliManager.handleCliCommand("launch_cli", {
                     cliType: recoveryContext.failedProviderType,
@@ -44485,7 +44485,7 @@ ${cleanBody}`;
       for (const node of mesh.nodes) {
         const nodeDaemonId = readNonEmptyString2(node.daemonId);
         if (!nodeDaemonId) continue;
-        if (localDaemonId && nodeDaemonId === localDaemonId) continue;
+        if (daemonIdsEquivalent(nodeDaemonId, localDaemonId)) continue;
         if (candidateDaemonIds.includes(nodeDaemonId)) continue;
         for (const pendingEventArgs of pulls) {
           let events;
@@ -44542,7 +44542,7 @@ ${cleanBody}`;
         if (!sessionId || !nodeId || !taskId) continue;
         const node = nodeById.get(nodeId);
         const nodeDaemonId = readNonEmptyString2(node?.daemonId);
-        const isLocalNode = !nodeDaemonId || selfIds.includes(nodeDaemonId) || localDaemonId !== void 0 && nodeDaemonId === localDaemonId || !!components.instanceManager.getInstance(sessionId);
+        const isLocalNode = !nodeDaemonId || selfIds.includes(nodeDaemonId) || daemonIdsEquivalent(nodeDaemonId, localDaemonId) || !!components.instanceManager.getInstance(sessionId);
         const providerType = readNonEmptyString2(dispatch.providerType);
         const readArgs = {
           sessionId,
@@ -44617,7 +44617,7 @@ ${cleanBody}`;
       const dispatchMeshCommand = components.dispatchMeshCommand;
       return Promise.all(mesh.nodes.map(async (node) => {
         const nodeDaemonId = readNonEmptyString2(node.daemonId);
-        const isLocalNode = !nodeDaemonId || selfIds.includes(nodeDaemonId) || localDaemonId !== void 0 && nodeDaemonId === localDaemonId;
+        const isLocalNode = !nodeDaemonId || selfIds.includes(nodeDaemonId) || daemonIdsEquivalent(nodeDaemonId, localDaemonId);
         let statusResult;
         try {
           if (isLocalNode) {
@@ -49341,6 +49341,7 @@ ${lastSnapshot}`;
       evaluateCondition: () => evaluateCondition,
       extractButtonsFromRule: () => extractButtonsFromRule,
       extractTitle: () => extractTitle,
+      lastContiguousNumberedBlock: () => lastContiguousNumberedBlock,
       resolveSections: () => resolveSections,
       sectionText: () => sectionText
     });
@@ -49581,7 +49582,6 @@ ${lastSnapshot}`;
             label += " " + next.trim();
             j += 1;
           }
-          if (buttons.some((b) => b.index === idx)) continue;
           const key = keyTemplate.replace(/\{index\}/g, String(idx));
           buttons.push({ index: idx, label, key, current });
           i = j - 1;
@@ -49593,13 +49593,22 @@ ${lastSnapshot}`;
           const idx = Number(m[1]);
           const label = String(m[2] ?? "").trim();
           if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
-          if (buttons.some((b) => b.index === idx)) continue;
           const key = keyTemplate.replace(/\{index\}/g, String(idx));
           buttons.push({ index: idx, label, key, current: hasCursorMarker(m[0]) });
         }
       }
-      buttons.sort((a, b) => a.index - b.index);
-      return buttons;
+      const block2 = lastContiguousNumberedBlock(buttons);
+      block2.sort((a, b) => a.index - b.index);
+      return block2;
+    }
+    function lastContiguousNumberedBlock(entries) {
+      if (entries.length <= 1) return entries.slice();
+      let start = entries.length - 1;
+      for (let i = entries.length - 1; i > 0; i -= 1) {
+        if (entries[i - 1].index === entries[i].index - 1) start = i - 1;
+        else break;
+      }
+      return entries.slice(start);
     }
     function hasCursorMarker(text) {
       return /^\s*[❯›>]/.test(text);
@@ -63885,6 +63894,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         return;
       }
     }
+    init_evaluator();
     var fs13 = __toESM2(require("fs"));
     var os18 = __toESM2(require("os"));
     var path222 = __toESM2(require("path"));
@@ -65096,21 +65106,19 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const ec = action.extract_choices;
         if (!ec?.pattern) return [];
         const text = this.readScreenSectionText(ec.section);
-        const out = [];
-        const seen = /* @__PURE__ */ new Set();
+        const all = [];
         for (const rawLine of text.split("\n")) {
           const line = rawLine.replace(/\r$/, "");
           const m = new RegExp(ec.pattern, ec.flags ?? "").exec(line);
           if (!m) continue;
           const idx = Number(m[1]);
-          if (!Number.isFinite(idx) || seen.has(idx)) continue;
+          if (!Number.isFinite(idx) || idx <= 0) continue;
           const label = (m[2] ?? "").replace(/\s+/g, " ").trim();
           if (!label) continue;
           const current = /^\s*[❯›>]/.test(line) || /[✔✓●]\s*$/.test(label);
-          seen.add(idx);
-          out.push({ index: idx, label, current });
+          all.push({ index: idx, label, current });
         }
-        return out;
+        return lastContiguousNumberedBlock(all);
       }
       /** Live text of a named screen section (or the whole screen when no
        *  section is named), resolved from the driver's current sections. */
@@ -74456,6 +74464,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const pathKey = Object.keys(env2).find((k) => k.toLowerCase() === "path") || "PATH";
       const current = env2[pathKey] || "";
       env2[pathKey] = current ? `${nodeBinDir};${current}` : nodeBinDir;
+      env2.ADHDEV_BOOTSTRAP = "1";
       return env2;
     }
     function getNpmExecOptions(platform10 = process.platform) {
@@ -74565,6 +74574,94 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
         await waitForPidExit(killedPid, 15e3);
       }
     }
+    var LOCKED_NATIVE_ADDON_BASENAMES = ["conpty.node", "ghostty-vt.dll"];
+    function listForeignNativeAddonHolders(packageRoot) {
+      if (process.platform !== "win32" || !packageRoot) return [];
+      const rootLower = packageRoot.replace(/\//g, "\\").replace(/'/g, "''").toLowerCase();
+      const endsWithChecks = LOCKED_NATIVE_ADDON_BASENAMES.map((name) => `$lf.EndsWith('${name}')`).join(" -or ");
+      const script = [
+        `$root = '${rootLower}'`,
+        `Get-Process node -ErrorAction SilentlyContinue | ForEach-Object {`,
+        `  $p = $_`,
+        `  try {`,
+        `    foreach ($m in $p.Modules) {`,
+        `      $fn = $m.FileName`,
+        `      if ($fn) {`,
+        `        $lf = $fn.ToLower()`,
+        `        if ($lf.StartsWith($root) -and (${endsWithChecks})) { $p.Id; break }`,
+        `      }`,
+        `    }`,
+        `  } catch {}`,
+        `}`
+      ].join("\n");
+      let out = "";
+      try {
+        out = String((0, import_child_process8.execFileSync)("powershell.exe", [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          script
+        ], { encoding: "utf8", timeout: 8e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true })).trim();
+      } catch {
+        return [];
+      }
+      const selfPid = process.pid;
+      const seen = /* @__PURE__ */ new Set();
+      const holders = [];
+      for (const line of out.split(/\r?\n/)) {
+        const pid = Number.parseInt(line.trim(), 10);
+        if (!Number.isFinite(pid) || pid <= 0 || pid === selfPid || seen.has(pid)) continue;
+        seen.add(pid);
+        holders.push({ pid, commandLine: getProcessCommandLine(pid) });
+      }
+      return holders;
+    }
+    async function stopForeignNativeAddonHolders(packageRoot, options = {}) {
+      if (process.platform !== "win32" || !packageRoot) return [];
+      const parentPid = Number.isFinite(options.parentPid) ? Number(options.parentPid) : -1;
+      const holders = listForeignNativeAddonHolders(packageRoot);
+      const results = [];
+      for (const holder of holders) {
+        if (holder.pid === parentPid) continue;
+        appendUpgradeLog(
+          `Foreign native-addon holder found: pid ${holder.pid}${holder.commandLine ? ` \u2014 ${holder.commandLine}` : ""}`
+        );
+        const killed = killPid2(holder.pid);
+        if (killed) {
+          await waitForPidExit(holder.pid, 15e3);
+          appendUpgradeLog(`Terminated foreign native-addon holder pid ${holder.pid}`);
+        } else {
+          appendUpgradeLog(`Failed to terminate foreign native-addon holder pid ${holder.pid}`);
+        }
+        results.push({ ...holder, killed });
+      }
+      return results;
+    }
+    function getUpgradeFailureNoticePath() {
+      const home = os27.homedir();
+      const dir = path36.join(home, ".adhdev");
+      try {
+        fs25.mkdirSync(dir, { recursive: true });
+      } catch {
+      }
+      return path36.join(dir, "daemon-upgrade-last-error.txt");
+    }
+    function buildManualRecoveryCommand(installCommand) {
+      return [installCommand.command, ...installCommand.args].map((part) => /\s/.test(part) ? `"${part}"` : part).join(" ");
+    }
+    function emitUpgradeFailureNotice(lines) {
+      const body = lines.join("\n");
+      appendUpgradeLog(`Upgrade blocked \u2014 user action required:
+${body}`);
+      try {
+        fs25.writeFileSync(getUpgradeFailureNoticePath(), `[${(/* @__PURE__ */ new Date()).toISOString()}]
+${body}
+`, "utf8");
+      } catch {
+      }
+    }
     function isRetriableInstallLockError(error48) {
       const code = error48?.code;
       if (code === "EBUSY" || code === "EPERM") return true;
@@ -74651,6 +74748,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
       await stopSessionHostProcesses(sessionHostAppName);
       removeDaemonPidFile();
+      await stopForeignNativeAddonHolders(installCommand.surface.packageRoot, { parentPid: payload.parentPid });
       cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
       const spec = `${payload.packageName}@${payload.targetVersion || "latest"}`;
       appendUpgradeLog(`Installing ${spec}`);
@@ -74672,11 +74770,30 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           break;
         } catch (error48) {
           if (attempt < maxInstallAttempts && isRetriableInstallLockError(error48)) {
-            appendUpgradeLog(`Install attempt ${attempt} hit a file lock (${error48?.code || "lock"}); cleaning staging and retrying after backoff`);
+            appendUpgradeLog(`Install attempt ${attempt} hit a file lock (${error48?.code || "lock"}); clearing holders + staging and retrying after backoff`);
+            await stopForeignNativeAddonHolders(installCommand.surface.packageRoot, { parentPid: payload.parentPid });
             cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
             await new Promise((resolve24) => setTimeout(resolve24, attempt * 1500));
             continue;
           }
+          if (isRetriableInstallLockError(error48)) {
+            const blockers = listForeignNativeAddonHolders(installCommand.surface.packageRoot);
+            const notice = [
+              `adhdev ${spec} could not be installed: a file lock (${error48?.code || "EBUSY/EPERM"}) is blocking the native addon.`
+            ];
+            if (blockers.length > 0) {
+              notice.push("Processes still holding the lock:");
+              for (const b of blockers) {
+                notice.push(`  pid ${b.pid}${b.commandLine ? ` \u2014 ${b.commandLine}` : ""}`);
+              }
+              notice.push("To recover, stop them and reinstall:");
+              notice.push(`  Stop-Process -Id ${blockers.map((b) => b.pid).join(",")} -Force`);
+            } else {
+              notice.push("To recover, reinstall manually:");
+            }
+            notice.push(`  ${buildManualRecoveryCommand(installCommand)}`);
+            emitUpgradeFailureNotice(notice);
+          }
           throw error48;
         }
       }
@@ -77341,7 +77458,7 @@ ${mergeTreeErr?.stderr || ""}`;
         return sanitizedInlineMesh;
       }
       async getMeshForCommand(meshId, inlineMesh, options) {
-        const preferInline = options?.preferInline === true;
+        const preferInline = options?.preferInline !== false;
         if (preferInline) {
           const cached4 = this.getCachedInlineMesh(meshId);
           if (cached4) {
@@ -81700,7 +81817,7 @@ ${ptyResult.output.slice(-2e3)}`);
                   workspace
                 };
               }
-              const { existsSync: existsSync46, readFileSync: readFileSync37, writeFileSync: writeFileSync23, copyFileSync: copyFileSync4, mkdirSync: mkdirSync21 } = await import("fs");
+              const { existsSync: existsSync46, readFileSync: readFileSync37, writeFileSync: writeFileSync24, copyFileSync: copyFileSync4, mkdirSync: mkdirSync21 } = await import("fs");
               const { dirname: dirname17 } = await import("path");
               const mcpConfigPath = coordinatorSetup.configPath;
               const hermesManualFallback = cliType === "hermes-cli" && configFormat === "hermes_config_yaml" ? createHermesManualMeshCoordinatorSetup(meshId, workspace) : null;
@@ -81773,7 +81890,7 @@ ${ptyResult.output.slice(-2e3)}`);
                 }
               };
               try {
-                writeFileSync23(mcpConfigPath, serializeMeshCoordinatorMcpConfig(mcpConfig, configFormat), "utf-8");
+                writeFileSync24(mcpConfigPath, serializeMeshCoordinatorMcpConfig(mcpConfig, configFormat), "utf-8");
               } catch (error48) {
                 const message = `Could not write MCP config for automatic setup: ${error48?.message || error48}`;
                 LOG2.error("MeshCoordinator", message);