@adhdev/daemon-standalone 0.9.82-rc.333 → 0.9.82-rc.335

package/dist/index.js

@@ -30036,10 +30036,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "5d9635b2a6476691469ecfe32b26a17e13484b2b" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "5d9635b2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.333" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-20T02:24:25.156Z" : void 0);
+      const commit = readInjected(true ? "e9e62c9770c0f4a419a90f5287125f3d3bb0fd95" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "e9e62c97" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.335" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-20T04:31:22.998Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -33012,6 +33012,314 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         ledgerImportDone = /* @__PURE__ */ new Set();
       }
     });
+    var fs32;
+    var AsyncBatchWriter;
+    var init_async_batch_writer = __esm2({
+      "src/logging/async-batch-writer.ts"() {
+        "use strict";
+        fs32 = __toESM2(require("fs"));
+        AsyncBatchWriter = class {
+          // Maps filePath -> string buffer
+          static buffers = /* @__PURE__ */ new Map();
+          static writePromises = /* @__PURE__ */ new Map();
+          static flushTimer = null;
+          /**
+           * Queues data to be written to a file asynchronously in a batch.
+           */
+          static write(filePath, data) {
+            let buf = this.buffers.get(filePath);
+            if (!buf) {
+              buf = [];
+              this.buffers.set(filePath, buf);
+            }
+            buf.push(data);
+            if (!this.flushTimer) {
+              this.flushTimer = setTimeout(() => {
+                this.flushTimer = null;
+                this.flushAll();
+              }, 50);
+            }
+          }
+          static async flushAll() {
+            const entries = Array.from(this.buffers.entries());
+            this.buffers.clear();
+            for (const [filePath, buffer] of entries) {
+              const dataToWrite = buffer.join("");
+              const doWrite = async () => {
+                try {
+                  const prevPromise = this.writePromises.get(filePath);
+                  if (prevPromise) await prevPromise;
+                  await fs32.promises.appendFile(filePath, dataToWrite, { encoding: "utf-8", mode: 384 });
+                } catch {
+                }
+              };
+              const writePromise = doWrite();
+              this.writePromises.set(filePath, writePromise);
+              writePromise.finally(() => {
+                if (this.writePromises.get(filePath) === writePromise) {
+                  this.writePromises.delete(filePath);
+                }
+              });
+            }
+          }
+        };
+      }
+    });
+    var logger_exports = {};
+    __export2(logger_exports, {
+      LOG: () => LOG2,
+      LOG_DIR_PATH: () => LOG_DIR_PATH,
+      LOG_PATH: () => LOG_PATH,
+      daemonLog: () => daemonLog,
+      getCurrentDaemonLogPath: () => getCurrentDaemonLogPath,
+      getDaemonLogDir: () => getDaemonLogDir,
+      getLogBufferSize: () => getLogBufferSize,
+      getLogLevel: () => getLogLevel,
+      getLogPath: () => getLogPath,
+      getRecentLogs: () => getRecentLogs,
+      installGlobalInterceptor: () => installGlobalInterceptor,
+      setLogLevel: () => setLogLevel
+    });
+    function setLogLevel(level) {
+      currentLevel = level;
+      daemonLog("Logger", `Log level set to: ${level}`, "info");
+    }
+    function getLogLevel() {
+      return currentLevel;
+    }
+    function getDateStr() {
+      return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+    }
+    function getDaemonLogDir() {
+      return LOG_DIR;
+    }
+    function getCurrentDaemonLogPath(date5 = /* @__PURE__ */ new Date()) {
+      return path9.join(LOG_DIR, `daemon-${date5.toISOString().slice(0, 10)}.log`);
+    }
+    function checkDateRotation() {
+      const today = getDateStr();
+      if (today !== currentDate) {
+        currentDate = today;
+        currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
+        cleanOldLogs();
+      }
+    }
+    function cleanOldLogs() {
+      try {
+        const files = fs4.readdirSync(LOG_DIR).filter((f) => f.startsWith("daemon-") && f.endsWith(".log"));
+        const cutoff = /* @__PURE__ */ new Date();
+        cutoff.setDate(cutoff.getDate() - MAX_LOG_DAYS);
+        const cutoffStr = cutoff.toISOString().slice(0, 10);
+        for (const file2 of files) {
+          const dateMatch = file2.match(/daemon-(\d{4}-\d{2}-\d{2})/);
+          if (dateMatch && dateMatch[1] < cutoffStr) {
+            try {
+              fs4.unlinkSync(path9.join(LOG_DIR, file2));
+            } catch {
+            }
+          }
+        }
+      } catch {
+      }
+    }
+    function rotateSizeIfNeeded() {
+      try {
+        const stat2 = fs4.statSync(currentLogFile);
+        if (stat2.size > MAX_LOG_SIZE) {
+          const backup = currentLogFile.replace(".log", ".1.log");
+          try {
+            fs4.unlinkSync(backup);
+          } catch {
+          }
+          fs4.renameSync(currentLogFile, backup);
+        }
+      } catch {
+      }
+    }
+    function writeToFile(line) {
+      try {
+        if (++writeCount % 1e3 === 0) {
+          checkDateRotation();
+          rotateSizeIfNeeded();
+        }
+        AsyncBatchWriter.write(currentLogFile, line + "\n");
+      } catch {
+      }
+    }
+    function getRecentLogs(count = 50, minLevel = "info") {
+      const minNum = LEVEL_NUM[minLevel];
+      const filtered = ringBuffer.filter((e) => LEVEL_NUM[e.level] >= minNum);
+      return filtered.slice(-count);
+    }
+    function getLogBufferSize() {
+      return ringBuffer.length;
+    }
+    function ts() {
+      return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
+    }
+    function fullTs() {
+      return (/* @__PURE__ */ new Date()).toISOString();
+    }
+    function daemonLog(category, msg, level = "info") {
+      const shouldOutput = LEVEL_NUM[level] >= LEVEL_NUM[currentLevel];
+      const label = LEVEL_LABEL[level];
+      const line = `[${ts()}] [${label}] [${category}] ${msg}`;
+      if (!shouldOutput) return;
+      writeToFile(line);
+      ringBuffer.push({ ts: Date.now(), level, category, message: msg });
+      if (ringBuffer.length > RING_BUFFER_SIZE) {
+        ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
+      }
+      origConsoleLog(line);
+    }
+    function installGlobalInterceptor() {
+      if (interceptorInstalled) return;
+      interceptorInstalled = true;
+      const stripAnsi4 = (str) => str.replace(/\x1B\[[0-9;]*m/g, "");
+      const isDaemonLogLine = (msg) => /\[(DBG|INF|WRN|ERR)\]/.test(msg);
+      console.log = (...args) => {
+        origConsoleLog(...args);
+        try {
+          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
+          const clean = stripAnsi4(msg);
+          if (isDaemonLogLine(clean)) return;
+          const line = clean.startsWith("[20") ? clean : `[${fullTs()}] ${clean}`;
+          writeToFile(line);
+          const catMatch = clean.match(/\[([^\]]+)\]/);
+          ringBuffer.push({
+            ts: Date.now(),
+            level: "info",
+            category: catMatch?.[1] || "System",
+            message: clean
+          });
+          if (ringBuffer.length > RING_BUFFER_SIZE) {
+            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
+          }
+        } catch {
+        }
+      };
+      console.error = (...args) => {
+        origConsoleError(...args);
+        try {
+          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
+          const clean = stripAnsi4(msg);
+          if (isDaemonLogLine(clean)) return;
+          const line = `[${fullTs()}] [ERROR] ${clean}`;
+          writeToFile(line);
+          ringBuffer.push({ ts: Date.now(), level: "error", category: "System", message: clean });
+          if (ringBuffer.length > RING_BUFFER_SIZE) {
+            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
+          }
+        } catch {
+        }
+      };
+      console.warn = (...args) => {
+        origConsoleWarn(...args);
+        try {
+          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
+          const clean = stripAnsi4(msg);
+          if (isDaemonLogLine(clean)) return;
+          const line = `[${fullTs()}] [WARN] ${clean}`;
+          writeToFile(line);
+          ringBuffer.push({ ts: Date.now(), level: "warn", category: "System", message: clean });
+          if (ringBuffer.length > RING_BUFFER_SIZE) {
+            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
+          }
+        } catch {
+        }
+      };
+      writeToFile(`
+=== ADHDev Daemon started at ${fullTs()} ===`);
+      writeToFile(`Log file: ${currentLogFile}`);
+      writeToFile(`Log level: ${currentLevel}`);
+    }
+    function getLogPath() {
+      return currentLogFile;
+    }
+    var fs4;
+    var path9;
+    var os32;
+    var LEVEL_NUM;
+    var LEVEL_LABEL;
+    var currentLevel;
+    var LOG_DIR;
+    var MAX_LOG_SIZE;
+    var MAX_LOG_DAYS;
+    var currentDate;
+    var currentLogFile;
+    var writeCount;
+    var RING_BUFFER_SIZE;
+    var ringBuffer;
+    var origConsoleLog;
+    var origConsoleError;
+    var origConsoleWarn;
+    var LOG2;
+    var interceptorInstalled;
+    var LOG_PATH;
+    var LOG_DIR_PATH;
+    var init_logger = __esm2({
+      "src/logging/logger.ts"() {
+        "use strict";
+        fs4 = __toESM2(require("fs"));
+        path9 = __toESM2(require("path"));
+        os32 = __toESM2(require("os"));
+        init_async_batch_writer();
+        LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
+        LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
+        currentLevel = "info";
+        LOG_DIR = process.platform === "win32" ? path9.join(process.env.LOCALAPPDATA || process.env.APPDATA || path9.join(os32.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os32.homedir(), "Library", "Logs", "adhdev") : path9.join(os32.homedir(), ".local", "share", "adhdev", "logs");
+        MAX_LOG_SIZE = 5 * 1024 * 1024;
+        MAX_LOG_DAYS = 7;
+        try {
+          fs4.mkdirSync(LOG_DIR, { recursive: true });
+        } catch {
+        }
+        currentDate = getDateStr();
+        currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
+        cleanOldLogs();
+        try {
+          const oldLog = path9.join(LOG_DIR, "daemon.log");
+          if (fs4.existsSync(oldLog)) {
+            const stat2 = fs4.statSync(oldLog);
+            const oldDate = stat2.mtime.toISOString().slice(0, 10);
+            fs4.renameSync(oldLog, path9.join(LOG_DIR, `daemon-${oldDate}.log`));
+          }
+          const oldLogBackup = path9.join(LOG_DIR, "daemon.log.old");
+          if (fs4.existsSync(oldLogBackup)) {
+            fs4.unlinkSync(oldLogBackup);
+          }
+        } catch {
+        }
+        writeCount = 0;
+        RING_BUFFER_SIZE = 200;
+        ringBuffer = [];
+        origConsoleLog = console.log.bind(console);
+        origConsoleError = console.error.bind(console);
+        origConsoleWarn = console.warn.bind(console);
+        LOG2 = {
+          debug: (category, msg) => daemonLog(category, msg, "debug"),
+          info: (category, msg) => daemonLog(category, msg, "info"),
+          warn: (category, msg) => daemonLog(category, msg, "warn"),
+          error: (category, msg) => daemonLog(category, msg, "error"),
+          /**
+           * Create a scoped logger for a specific component.
+           * Category is baked in so callers only pass the message.
+           */
+          forComponent(category) {
+            return {
+              debug: (msg) => daemonLog(category, msg, "debug"),
+              info: (msg) => daemonLog(category, msg, "info"),
+              warn: (msg) => daemonLog(category, msg, "warn"),
+              error: (msg) => daemonLog(category, msg, "error"),
+              asLogFn: (level = "info") => (msg) => daemonLog(category, msg, level)
+            };
+          }
+        };
+        interceptorInstalled = false;
+        LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
+        LOG_DIR_PATH = LOG_DIR;
+      }
+    });
     var mesh_work_queue_exports = {};
     __export2(mesh_work_queue_exports, {
       ACTIVE_MESH_QUEUE_STATUSES: () => ACTIVE_MESH_QUEUE_STATUSES,
@@ -33475,11 +33783,18 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
     }
     function updateSessionTaskStatus(meshId, sessionId, status, opts) {
       return withQueueLock(meshId, () => {
+        const store = MeshRuntimeStore.getInstance();
         const occurredAtIso = opts?.occurredAt ? new Date(opts.occurredAt).toISOString() : void 0;
-        const entry = MeshRuntimeStore.getInstance().findAssignedBySession(meshId, sessionId, occurredAtIso);
-        if (!entry) return null;
+        const entry = store.findAssignedBySession(meshId, sessionId, occurredAtIso, opts?.taskId);
+        if (!entry) {
+          const assignedRows = store.getActiveAssignmentDetails(meshId).filter((r) => r.sessionId === sessionId);
+          if (assignedRows.length > 0) {
+            LOG2.warn("MeshQueue", `No assigned queue row matched completion for mesh ${meshId} session ${sessionId} (taskId=${opts?.taskId ?? "none"}, occurredAt=${occurredAtIso ?? "none"}); ${assignedRows.length} assigned row(s) exist: ${assignedRows.map((r) => r.id).join(",")}`);
+          }
+          return null;
+        }
         entry.status = status;
-        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
+        store.updateQueueEntry(entry);
         if (DEPENDENCY_FAILURE_TERMINALS.has(status)) propagateDependencyFailure(meshId, entry.id);
         return entry;
       });
@@ -33597,6 +33912,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         init_repo_mesh_types();
         init_mesh_runtime_store();
         init_mesh_config();
+        init_logger();
         ACTIVE_MESH_QUEUE_STATUSES = ["pending", "assigned"];
         HISTORICAL_MESH_QUEUE_STATUSES = ["completed", "failed", "cancelled"];
         MESH_TASK_MODES = ["code_change", "validation", "live_debug_readonly", "launch_app", "convergence"];
@@ -34256,12 +34572,51 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
               return { id, nodeId: r.assigned_node_id ?? void 0, sessionId: r.assigned_session_id ?? void 0, message };
             });
           }
-          findAssignedBySession(meshId, sessionId, occurredAtIso) {
+          /**
+           * Resolve the `assigned` queue row a completion event belongs to.
+           *
+           * Clock-skew safety (C2): a completion event's `occurredAtIso` carries the
+           * REMOTE WORKER's clock, while `updated_at` carries the COORDINATOR's clock
+           * (set at assignment and re-bumped on every mutation). For a remote node,
+           * coordinator-clock > worker-clock skew used to make an `updated_at <= occurredAt`
+           * filter return nothing, stranding the finished task as `assigned` forever.
+           *
+           * We therefore NEVER filter completion-matching on the mutable `updated_at`:
+           *  1. If `taskId` is given, match the exact `assigned` row by id (no time filter).
+           *  2. Otherwise a session holds at most one `assigned` task — match it without a
+           *     time filter. If several exist (shouldn't normally), disambiguate by the
+           *     IMMUTABLE `dispatchTimestamp`: latest `dispatchTimestamp <= occurredAt`,
+           *     and if skew makes ALL of them later than `occurredAt`, fall back to the
+           *     most-recent `dispatchTimestamp` rather than returning null.
+           */
+          findAssignedBySession(meshId, sessionId, occurredAtIso, taskId) {
             this.ensureLegacyQueueMigrated(meshId);
-            const sql = occurredAtIso ? `SELECT payload FROM mesh_queue WHERE mesh_id = ? AND assigned_session_id = ? AND status = 'assigned' AND updated_at <= ? ORDER BY updated_at DESC LIMIT 1` : `SELECT payload FROM mesh_queue WHERE mesh_id = ? AND assigned_session_id = ? AND status = 'assigned' ORDER BY updated_at DESC LIMIT 1`;
-            const args = occurredAtIso ? [meshId, sessionId, occurredAtIso] : [meshId, sessionId];
-            const row = this.db.prepare(sql).get(...args);
-            return row ? JSON.parse(row.payload) : null;
+            if (taskId) {
+              const row = this.db.prepare(
+                `SELECT payload FROM mesh_queue WHERE mesh_id = ? AND assigned_session_id = ? AND status = 'assigned' AND id = ? LIMIT 1`
+              ).get(meshId, sessionId, taskId);
+              if (row) return JSON.parse(row.payload);
+            }
+            const rows = this.db.prepare(
+              `SELECT payload FROM mesh_queue WHERE mesh_id = ? AND assigned_session_id = ? AND status = 'assigned'`
+            ).all(meshId, sessionId);
+            if (rows.length === 0) return null;
+            const entries = rows.map((r) => {
+              try {
+                return JSON.parse(r.payload);
+              } catch {
+                return null;
+              }
+            }).filter((e) => e !== null);
+            if (entries.length === 0) return null;
+            if (entries.length === 1) return entries[0];
+            const orderKey = (e) => e.dispatchTimestamp ?? e.updatedAt ?? "";
+            const byDispatchDesc = [...entries].sort((a, b) => orderKey(b).localeCompare(orderKey(a)));
+            if (occurredAtIso) {
+              const atOrBefore = byDispatchDesc.find((e) => orderKey(e) <= occurredAtIso);
+              if (atOrBefore) return atOrBefore;
+            }
+            return byDispatchDesc[0];
           }
           toRow(entry) {
             return {
@@ -35512,314 +35867,6 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         MAX_CHANGED_FILES = 100;
       }
     });
-    var fs32;
-    var AsyncBatchWriter;
-    var init_async_batch_writer = __esm2({
-      "src/logging/async-batch-writer.ts"() {
-        "use strict";
-        fs32 = __toESM2(require("fs"));
-        AsyncBatchWriter = class {
-          // Maps filePath -> string buffer
-          static buffers = /* @__PURE__ */ new Map();
-          static writePromises = /* @__PURE__ */ new Map();
-          static flushTimer = null;
-          /**
-           * Queues data to be written to a file asynchronously in a batch.
-           */
-          static write(filePath, data) {
-            let buf = this.buffers.get(filePath);
-            if (!buf) {
-              buf = [];
-              this.buffers.set(filePath, buf);
-            }
-            buf.push(data);
-            if (!this.flushTimer) {
-              this.flushTimer = setTimeout(() => {
-                this.flushTimer = null;
-                this.flushAll();
-              }, 50);
-            }
-          }
-          static async flushAll() {
-            const entries = Array.from(this.buffers.entries());
-            this.buffers.clear();
-            for (const [filePath, buffer] of entries) {
-              const dataToWrite = buffer.join("");
-              const doWrite = async () => {
-                try {
-                  const prevPromise = this.writePromises.get(filePath);
-                  if (prevPromise) await prevPromise;
-                  await fs32.promises.appendFile(filePath, dataToWrite, { encoding: "utf-8", mode: 384 });
-                } catch {
-                }
-              };
-              const writePromise = doWrite();
-              this.writePromises.set(filePath, writePromise);
-              writePromise.finally(() => {
-                if (this.writePromises.get(filePath) === writePromise) {
-                  this.writePromises.delete(filePath);
-                }
-              });
-            }
-          }
-        };
-      }
-    });
-    var logger_exports = {};
-    __export2(logger_exports, {
-      LOG: () => LOG2,
-      LOG_DIR_PATH: () => LOG_DIR_PATH,
-      LOG_PATH: () => LOG_PATH,
-      daemonLog: () => daemonLog,
-      getCurrentDaemonLogPath: () => getCurrentDaemonLogPath,
-      getDaemonLogDir: () => getDaemonLogDir,
-      getLogBufferSize: () => getLogBufferSize,
-      getLogLevel: () => getLogLevel,
-      getLogPath: () => getLogPath,
-      getRecentLogs: () => getRecentLogs,
-      installGlobalInterceptor: () => installGlobalInterceptor,
-      setLogLevel: () => setLogLevel
-    });
-    function setLogLevel(level) {
-      currentLevel = level;
-      daemonLog("Logger", `Log level set to: ${level}`, "info");
-    }
-    function getLogLevel() {
-      return currentLevel;
-    }
-    function getDateStr() {
-      return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-    }
-    function getDaemonLogDir() {
-      return LOG_DIR;
-    }
-    function getCurrentDaemonLogPath(date5 = /* @__PURE__ */ new Date()) {
-      return path9.join(LOG_DIR, `daemon-${date5.toISOString().slice(0, 10)}.log`);
-    }
-    function checkDateRotation() {
-      const today = getDateStr();
-      if (today !== currentDate) {
-        currentDate = today;
-        currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
-        cleanOldLogs();
-      }
-    }
-    function cleanOldLogs() {
-      try {
-        const files = fs4.readdirSync(LOG_DIR).filter((f) => f.startsWith("daemon-") && f.endsWith(".log"));
-        const cutoff = /* @__PURE__ */ new Date();
-        cutoff.setDate(cutoff.getDate() - MAX_LOG_DAYS);
-        const cutoffStr = cutoff.toISOString().slice(0, 10);
-        for (const file2 of files) {
-          const dateMatch = file2.match(/daemon-(\d{4}-\d{2}-\d{2})/);
-          if (dateMatch && dateMatch[1] < cutoffStr) {
-            try {
-              fs4.unlinkSync(path9.join(LOG_DIR, file2));
-            } catch {
-            }
-          }
-        }
-      } catch {
-      }
-    }
-    function rotateSizeIfNeeded() {
-      try {
-        const stat2 = fs4.statSync(currentLogFile);
-        if (stat2.size > MAX_LOG_SIZE) {
-          const backup = currentLogFile.replace(".log", ".1.log");
-          try {
-            fs4.unlinkSync(backup);
-          } catch {
-          }
-          fs4.renameSync(currentLogFile, backup);
-        }
-      } catch {
-      }
-    }
-    function writeToFile(line) {
-      try {
-        if (++writeCount % 1e3 === 0) {
-          checkDateRotation();
-          rotateSizeIfNeeded();
-        }
-        AsyncBatchWriter.write(currentLogFile, line + "\n");
-      } catch {
-      }
-    }
-    function getRecentLogs(count = 50, minLevel = "info") {
-      const minNum = LEVEL_NUM[minLevel];
-      const filtered = ringBuffer.filter((e) => LEVEL_NUM[e.level] >= minNum);
-      return filtered.slice(-count);
-    }
-    function getLogBufferSize() {
-      return ringBuffer.length;
-    }
-    function ts() {
-      return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-    }
-    function fullTs() {
-      return (/* @__PURE__ */ new Date()).toISOString();
-    }
-    function daemonLog(category, msg, level = "info") {
-      const shouldOutput = LEVEL_NUM[level] >= LEVEL_NUM[currentLevel];
-      const label = LEVEL_LABEL[level];
-      const line = `[${ts()}] [${label}] [${category}] ${msg}`;
-      if (!shouldOutput) return;
-      writeToFile(line);
-      ringBuffer.push({ ts: Date.now(), level, category, message: msg });
-      if (ringBuffer.length > RING_BUFFER_SIZE) {
-        ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
-      }
-      origConsoleLog(line);
-    }
-    function installGlobalInterceptor() {
-      if (interceptorInstalled) return;
-      interceptorInstalled = true;
-      const stripAnsi4 = (str) => str.replace(/\x1B\[[0-9;]*m/g, "");
-      const isDaemonLogLine = (msg) => /\[(DBG|INF|WRN|ERR)\]/.test(msg);
-      console.log = (...args) => {
-        origConsoleLog(...args);
-        try {
-          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
-          const clean = stripAnsi4(msg);
-          if (isDaemonLogLine(clean)) return;
-          const line = clean.startsWith("[20") ? clean : `[${fullTs()}] ${clean}`;
-          writeToFile(line);
-          const catMatch = clean.match(/\[([^\]]+)\]/);
-          ringBuffer.push({
-            ts: Date.now(),
-            level: "info",
-            category: catMatch?.[1] || "System",
-            message: clean
-          });
-          if (ringBuffer.length > RING_BUFFER_SIZE) {
-            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
-          }
-        } catch {
-        }
-      };
-      console.error = (...args) => {
-        origConsoleError(...args);
-        try {
-          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
-          const clean = stripAnsi4(msg);
-          if (isDaemonLogLine(clean)) return;
-          const line = `[${fullTs()}] [ERROR] ${clean}`;
-          writeToFile(line);
-          ringBuffer.push({ ts: Date.now(), level: "error", category: "System", message: clean });
-          if (ringBuffer.length > RING_BUFFER_SIZE) {
-            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
-          }
-        } catch {
-        }
-      };
-      console.warn = (...args) => {
-        origConsoleWarn(...args);
-        try {
-          const msg = args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ");
-          const clean = stripAnsi4(msg);
-          if (isDaemonLogLine(clean)) return;
-          const line = `[${fullTs()}] [WARN] ${clean}`;
-          writeToFile(line);
-          ringBuffer.push({ ts: Date.now(), level: "warn", category: "System", message: clean });
-          if (ringBuffer.length > RING_BUFFER_SIZE) {
-            ringBuffer.splice(0, ringBuffer.length - RING_BUFFER_SIZE);
-          }
-        } catch {
-        }
-      };
-      writeToFile(`
-=== ADHDev Daemon started at ${fullTs()} ===`);
-      writeToFile(`Log file: ${currentLogFile}`);
-      writeToFile(`Log level: ${currentLevel}`);
-    }
-    function getLogPath() {
-      return currentLogFile;
-    }
-    var fs4;
-    var path9;
-    var os32;
-    var LEVEL_NUM;
-    var LEVEL_LABEL;
-    var currentLevel;
-    var LOG_DIR;
-    var MAX_LOG_SIZE;
-    var MAX_LOG_DAYS;
-    var currentDate;
-    var currentLogFile;
-    var writeCount;
-    var RING_BUFFER_SIZE;
-    var ringBuffer;
-    var origConsoleLog;
-    var origConsoleError;
-    var origConsoleWarn;
-    var LOG2;
-    var interceptorInstalled;
-    var LOG_PATH;
-    var LOG_DIR_PATH;
-    var init_logger = __esm2({
-      "src/logging/logger.ts"() {
-        "use strict";
-        fs4 = __toESM2(require("fs"));
-        path9 = __toESM2(require("path"));
-        os32 = __toESM2(require("os"));
-        init_async_batch_writer();
-        LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
-        LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
-        currentLevel = "info";
-        LOG_DIR = process.platform === "win32" ? path9.join(process.env.LOCALAPPDATA || process.env.APPDATA || path9.join(os32.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os32.homedir(), "Library", "Logs", "adhdev") : path9.join(os32.homedir(), ".local", "share", "adhdev", "logs");
-        MAX_LOG_SIZE = 5 * 1024 * 1024;
-        MAX_LOG_DAYS = 7;
-        try {
-          fs4.mkdirSync(LOG_DIR, { recursive: true });
-        } catch {
-        }
-        currentDate = getDateStr();
-        currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
-        cleanOldLogs();
-        try {
-          const oldLog = path9.join(LOG_DIR, "daemon.log");
-          if (fs4.existsSync(oldLog)) {
-            const stat2 = fs4.statSync(oldLog);
-            const oldDate = stat2.mtime.toISOString().slice(0, 10);
-            fs4.renameSync(oldLog, path9.join(LOG_DIR, `daemon-${oldDate}.log`));
-          }
-          const oldLogBackup = path9.join(LOG_DIR, "daemon.log.old");
-          if (fs4.existsSync(oldLogBackup)) {
-            fs4.unlinkSync(oldLogBackup);
-          }
-        } catch {
-        }
-        writeCount = 0;
-        RING_BUFFER_SIZE = 200;
-        ringBuffer = [];
-        origConsoleLog = console.log.bind(console);
-        origConsoleError = console.error.bind(console);
-        origConsoleWarn = console.warn.bind(console);
-        LOG2 = {
-          debug: (category, msg) => daemonLog(category, msg, "debug"),
-          info: (category, msg) => daemonLog(category, msg, "info"),
-          warn: (category, msg) => daemonLog(category, msg, "warn"),
-          error: (category, msg) => daemonLog(category, msg, "error"),
-          /**
-           * Create a scoped logger for a specific component.
-           * Category is baked in so callers only pass the message.
-           */
-          forComponent(category) {
-            return {
-              debug: (msg) => daemonLog(category, msg, "debug"),
-              info: (msg) => daemonLog(category, msg, "info"),
-              warn: (msg) => daemonLog(category, msg, "warn"),
-              error: (msg) => daemonLog(category, msg, "error"),
-              asLogFn: (level = "info") => (msg) => daemonLog(category, msg, level)
-            };
-          }
-        };
-        interceptorInstalled = false;
-        LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
-        LOG_DIR_PATH = LOG_DIR;
-      }
-    });
     var mesh_coordinator_exports = {};
     __export2(mesh_coordinator_exports, {
       applyMeshCoordinatorSystemPromptInjection: () => applyMeshCoordinatorSystemPromptInjection,
@@ -36227,6 +36274,61 @@ ${rendered}`, "utf-8");
         HERMES_MCP_CONFIG_PATH = "~/.hermes/config.yaml";
       }
     });
+    function resolveWin32GlobalBin(trimmed) {
+      if (path10.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\")) {
+        return null;
+      }
+      const extraDirs = [];
+      if (process.env.APPDATA) extraDirs.push(path10.join(process.env.APPDATA, "npm"));
+      try {
+        extraDirs.push(path10.dirname(process.execPath));
+      } catch {
+      }
+      for (const dir of extraDirs) {
+        if (!dir) continue;
+        for (const ext of WIN_EXEC_EXT) {
+          const full = path10.join(dir, trimmed + ext);
+          if ((0, import_fs8.existsSync)(full)) return full;
+        }
+      }
+      return null;
+    }
+    function resolveWin32Executable(command) {
+      if (process.platform !== "win32") return command;
+      const trimmed = (command || "").trim();
+      if (!trimmed) return command;
+      if (path10.isAbsolute(trimmed) && (0, import_fs8.existsSync)(trimmed)) return trimmed;
+      try {
+        const out = (0, import_child_process.execFileSync)("where", [trimmed], {
+          encoding: "utf8",
+          windowsHide: true
+        }).trim();
+        if (out) {
+          const matches = out.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+          const direct = matches.find((m) => DIRECT_EXEC_EXT.has(path10.extname(m).toLowerCase()));
+          return direct || matches[0] || command;
+        }
+      } catch {
+      }
+      const globalBin = resolveWin32GlobalBin(trimmed);
+      if (globalBin) return globalBin;
+      return command;
+    }
+    var import_child_process;
+    var import_fs8;
+    var path10;
+    var DIRECT_EXEC_EXT;
+    var WIN_EXEC_EXT;
+    var init_resolve_executable = __esm2({
+      "src/cli-adapters/resolve-executable.ts"() {
+        "use strict";
+        import_child_process = require("child_process");
+        import_fs8 = require("fs");
+        path10 = __toESM2(require("path"));
+        DIRECT_EXEC_EXT = /* @__PURE__ */ new Set([".exe", ".com"]);
+        WIN_EXEC_EXT = [".exe", ".com", ".cmd", ".bat"];
+      }
+    });
     async function fastForwardMeshNode(args) {
       const workspace = typeof args.workspace === "string" ? args.workspace.trim() : "";
       const nodeId = normalizeOptionalString(args.nodeId);
@@ -37743,9 +37845,9 @@ Next step: ${nextStep}`;
       const paths = primaryDaemonId ? [getPendingEventsPath(meshId, primaryDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
       const events = [];
       for (const path422 of paths) {
-        if (!(0, import_fs9.existsSync)(path422)) continue;
+        if (!(0, import_fs10.existsSync)(path422)) continue;
         try {
-          const raw = (0, import_fs9.readFileSync)(path422, "utf-8");
+          const raw = (0, import_fs10.readFileSync)(path422, "utf-8");
           const parsed = raw.split("\n").filter(Boolean).flatMap((line) => {
             try {
               return [JSON.parse(line)];
@@ -37820,11 +37922,11 @@ Next step: ${nextStep}`;
     }
     function trimPendingEventsIfNeeded(path422) {
       try {
-        if (!(0, import_fs9.existsSync)(path422)) return;
-        if ((0, import_fs9.statSync)(path422).size <= MAX_PENDING_EVENTS_BYTES) return;
-        const lines = (0, import_fs9.readFileSync)(path422, "utf-8").split("\n").filter(Boolean);
+        if (!(0, import_fs10.existsSync)(path422)) return;
+        if ((0, import_fs10.statSync)(path422).size <= MAX_PENDING_EVENTS_BYTES) return;
+        const lines = (0, import_fs10.readFileSync)(path422, "utf-8").split("\n").filter(Boolean);
         if (lines.length <= MAX_PENDING_EVENTS_KEEP) return;
-        (0, import_fs9.writeFileSync)(path422, lines.slice(-MAX_PENDING_EVENTS_KEEP).join("\n") + "\n", "utf-8");
+        (0, import_fs10.writeFileSync)(path422, lines.slice(-MAX_PENDING_EVENTS_KEEP).join("\n") + "\n", "utf-8");
       } catch {
       }
     }
@@ -37853,7 +37955,7 @@ Next step: ${nextStep}`;
         }
         const path422 = getPendingEventsPath(event.meshId, event.targetCoordinatorDaemonId);
         trimPendingEventsIfNeeded(path422);
-        (0, import_fs9.appendFileSync)(path422, JSON.stringify(event) + "\n", "utf-8");
+        (0, import_fs10.appendFileSync)(path422, JSON.stringify(event) + "\n", "utf-8");
         return true;
       } catch (e) {
         LOG2.warn("MeshEvents", `Failed to persist pending coordinator event: ${e?.message || e}`);
@@ -37863,20 +37965,20 @@ Next step: ${nextStep}`;
     function atomicDrainFile(path422) {
       const tmpPath = `${path422}.draining`;
       try {
-        (0, import_fs9.renameSync)(path422, tmpPath);
+        (0, import_fs10.renameSync)(path422, tmpPath);
       } catch {
         return null;
       }
       try {
-        const content = (0, import_fs9.readFileSync)(tmpPath, "utf-8");
+        const content = (0, import_fs10.readFileSync)(tmpPath, "utf-8");
         try {
-          (0, import_fs9.unlinkSync)(tmpPath);
+          (0, import_fs10.unlinkSync)(tmpPath);
         } catch {
         }
         return content;
       } catch {
         try {
-          (0, import_fs9.unlinkSync)(tmpPath);
+          (0, import_fs10.unlinkSync)(tmpPath);
         } catch {
         }
         return null;
@@ -37885,16 +37987,16 @@ Next step: ${nextStep}`;
     function selectiveDrainFile(path422, predicate) {
       const tmpPath = `${path422}.draining`;
       try {
-        (0, import_fs9.renameSync)(path422, tmpPath);
+        (0, import_fs10.renameSync)(path422, tmpPath);
       } catch {
         return [];
       }
       let content;
       try {
-        content = (0, import_fs9.readFileSync)(tmpPath, "utf-8");
+        content = (0, import_fs10.readFileSync)(tmpPath, "utf-8");
       } catch {
         try {
-          (0, import_fs9.unlinkSync)(tmpPath);
+          (0, import_fs10.unlinkSync)(tmpPath);
         } catch {
         }
         return [];
@@ -37917,12 +38019,12 @@ Next step: ${nextStep}`;
       }
       try {
         if (keptLines.length > 0) {
-          (0, import_fs9.writeFileSync)(path422, keptLines.join("\n") + "\n", "utf-8");
+          (0, import_fs10.writeFileSync)(path422, keptLines.join("\n") + "\n", "utf-8");
         }
-        (0, import_fs9.unlinkSync)(tmpPath);
+        (0, import_fs10.unlinkSync)(tmpPath);
       } catch {
         try {
-          if ((0, import_fs9.existsSync)(tmpPath) && !(0, import_fs9.existsSync)(path422)) (0, import_fs9.renameSync)(tmpPath, path422);
+          if ((0, import_fs10.existsSync)(tmpPath) && !(0, import_fs10.existsSync)(path422)) (0, import_fs10.renameSync)(tmpPath, path422);
         } catch {
         }
         return [];
@@ -38016,13 +38118,13 @@ Next step: ${nextStep}`;
       }
       const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
       for (const path422 of paths) {
-        if ((0, import_fs9.existsSync)(path422)) try {
-          (0, import_fs9.unlinkSync)(path422);
+        if ((0, import_fs10.existsSync)(path422)) try {
+          (0, import_fs10.unlinkSync)(path422);
         } catch {
         }
       }
     }
-    var import_fs9;
+    var import_fs10;
     var import_path9;
     var import_crypto7;
     var REFINE_TERMINAL_EVENTS;
@@ -38031,7 +38133,7 @@ Next step: ${nextStep}`;
     var init_mesh_events_pending = __esm2({
       "src/mesh/mesh-events-pending.ts"() {
         "use strict";
-        import_fs9 = require("fs");
+        import_fs10 = require("fs");
         import_path9 = require("path");
         import_crypto7 = require("crypto");
         init_logger();
@@ -38521,24 +38623,24 @@ Next step: ${nextStep}`;
     function findBinary(name) {
       const trimmed = String(name || "").trim();
       if (!trimmed) return trimmed;
-      const expanded = trimmed.startsWith("~") ? path10.join(os52.homedir(), trimmed.slice(1)) : trimmed;
-      if (path10.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
-        return path10.isAbsolute(expanded) ? expanded : path10.resolve(expanded);
+      const expanded = trimmed.startsWith("~") ? path11.join(os52.homedir(), trimmed.slice(1)) : trimmed;
+      if (path11.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
+        return path11.isAbsolute(expanded) ? expanded : path11.resolve(expanded);
       }
       const isWin = os52.platform() === "win32";
-      const paths = (process.env.PATH || "").split(path10.delimiter);
+      const paths = (process.env.PATH || "").split(path11.delimiter);
       const extraDirs = [];
       if (isWin) {
-        if (process.env.APPDATA) extraDirs.push(path10.join(process.env.APPDATA, "npm"));
+        if (process.env.APPDATA) extraDirs.push(path11.join(process.env.APPDATA, "npm"));
         try {
-          extraDirs.push(path10.dirname(process.execPath));
+          extraDirs.push(path11.dirname(process.execPath));
         } catch {
         }
       } else {
-        extraDirs.push(path10.join(os52.homedir(), ".npm-global", "bin"));
+        extraDirs.push(path11.join(os52.homedir(), ".npm-global", "bin"));
         extraDirs.push("/usr/local/bin", "/opt/homebrew/bin");
         try {
-          extraDirs.push(path10.dirname(process.execPath));
+          extraDirs.push(path11.dirname(process.execPath));
         } catch {
         }
       }
@@ -38547,7 +38649,7 @@ Next step: ${nextStep}`;
       for (const p of searchDirs) {
         if (!p) continue;
         for (const ext of exes) {
-          const fullPath = path10.join(p, trimmed + ext);
+          const fullPath = path11.join(p, trimmed + ext);
           try {
             const fs322 = require("fs");
             if (fs322.existsSync(fullPath)) {
@@ -38563,7 +38665,7 @@ Next step: ${nextStep}`;
       return isWin ? `${trimmed}.cmd` : trimmed;
     }
     function isScriptBinary(binaryPath) {
-      if (!path10.isAbsolute(binaryPath)) return false;
+      if (!path11.isAbsolute(binaryPath)) return false;
       try {
         const fs322 = require("fs");
         const resolved = fs322.realpathSync(binaryPath);
@@ -38579,7 +38681,7 @@ Next step: ${nextStep}`;
       }
     }
     function looksLikeMachOOrElf(filePath) {
-      if (!path10.isAbsolute(filePath)) return false;
+      if (!path11.isAbsolute(filePath)) return false;
       try {
         const fs322 = require("fs");
         const resolved = fs322.realpathSync(filePath);
@@ -38669,14 +38771,14 @@ Next step: ${nextStep}`;
       };
     }
     var os52;
-    var path10;
+    var path11;
     var TerminalTranscriptAccumulator;
     var buildCliSpawnEnv;
     var init_provider_cli_shared = __esm2({
       "src/cli-adapters/provider-cli-shared.ts"() {
         "use strict";
         os52 = __toESM2(require("os"));
-        path10 = __toESM2(require("path"));
+        path11 = __toESM2(require("path"));
         init_spawn_env();
         TerminalTranscriptAccumulator = class {
           lines = [[]];
@@ -38848,19 +38950,19 @@ Next step: ${nextStep}`;
     function expandHome(value) {
       const trimmed = value.trim();
       if (!trimmed.startsWith("~")) return trimmed;
-      return path11.join(os6.homedir(), trimmed.slice(1));
+      return path12.join(os6.homedir(), trimmed.slice(1));
     }
     function isExplicitCommandPath(command) {
       const trimmed = command.trim();
-      return path11.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
+      return path12.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
     }
     function resolveCommandPath(command) {
       const trimmed = command.trim();
       if (!trimmed) return null;
       if (isExplicitCommandPath(trimmed)) {
         const expanded = expandHome(trimmed);
-        const candidate = path11.isAbsolute(expanded) ? expanded : path11.resolve(expanded);
-        return (0, import_fs10.existsSync)(candidate) ? candidate : null;
+        const candidate = path12.isAbsolute(expanded) ? expanded : path12.resolve(expanded);
+        return (0, import_fs11.existsSync)(candidate) ? candidate : null;
       }
       return null;
     }
@@ -38870,12 +38972,12 @@ Next step: ${nextStep}`;
       const whichResult = await execAsync(`${whichCmd} ${shellQuote(command)}`);
       if (whichResult) return whichResult.split("\n")[0];
       const resolved = findBinary(command);
-      if (path11.isAbsolute(resolved) && (0, import_fs10.existsSync)(resolved)) return resolved;
+      if (path12.isAbsolute(resolved) && (0, import_fs11.existsSync)(resolved)) return resolved;
       return null;
     }
     function execAsync(cmd, timeoutMs = 5e3) {
       return new Promise((resolve24) => {
-        const child = (0, import_child_process.exec)(cmd, {
+        const child = (0, import_child_process2.exec)(cmd, {
           encoding: "utf-8",
           timeout: timeoutMs,
           ...process.platform === "win32" ? { windowsHide: true } : {}
@@ -38965,17 +39067,17 @@ Next step: ${nextStep}`;
       const all = await detectCLIs(providerLoader, options);
       return all.find((c) => c.id === resolvedId && c.installed) || null;
     }
-    var import_child_process;
+    var import_child_process2;
     var os6;
-    var path11;
-    var import_fs10;
+    var path12;
+    var import_fs11;
     var init_cli_detector = __esm2({
       "src/detection/cli-detector.ts"() {
         "use strict";
-        import_child_process = require("child_process");
+        import_child_process2 = require("child_process");
         os6 = __toESM2(require("os"));
-        path11 = __toESM2(require("path"));
-        import_fs10 = require("fs");
+        path12 = __toESM2(require("path"));
+        import_fs11 = require("fs");
         init_provider_cli_shared();
       }
     });
@@ -40008,7 +40110,7 @@ Next step: ${nextStep}`;
       const node = mesh?.nodes?.find((candidate) => meshNodeIdMatches(candidate, args.nodeId));
       const workspace = readNonEmptyString2(node?.workspace);
       if (!workspace) return;
-      if (!(0, import_fs11.existsSync)(workspace)) return;
+      if (!(0, import_fs12.existsSync)(workspace)) return;
       const policy = resolveAutoFastForwardPolicy(mesh);
       if (!policy.enabled) return;
       if (nodeHasActiveMeshWork(components, args.meshId, args.nodeId, args.sessionId)) return;
@@ -40207,8 +40309,10 @@ Next step: ${nextStep}`;
         }
       }
       function markSessionTerminal(sessionId, outcome, occurredAtMs) {
+        const eventTaskId = readNonEmptyString2(args.metadataEvent.taskId) || void 0;
         const task = updateSessionTaskStatus(args.meshId, sessionId, outcome, {
-          occurredAt: occurredAtMs != null ? new Date(occurredAtMs).toISOString() : void 0
+          occurredAt: occurredAtMs != null ? new Date(occurredAtMs).toISOString() : void 0,
+          taskId: eventTaskId
         });
         updateDirectDispatchStatus(args.meshId, sessionId, outcome);
         markSessionDeliveriesTerminal(args.meshId, sessionId, outcome);
@@ -40619,7 +40723,7 @@ Next step: ${nextStep}`;
         });
       });
     }
-    var import_fs11;
+    var import_fs12;
     var REMOTE_IDLE_SESSION_TTL_MS;
     var meshByWorkspaceCache;
     var MESH_WORKSPACE_CACHE_TTL_MS;
@@ -40639,7 +40743,7 @@ Next step: ${nextStep}`;
     var init_mesh_events_coordinator = __esm2({
       "src/mesh/mesh-events-coordinator.ts"() {
         "use strict";
-        import_fs11 = require("fs");
+        import_fs12 = require("fs");
         init_config();
         init_mesh_config();
         init_cli_detector();
@@ -42522,16 +42626,16 @@ Next step: ${nextStep}`;
       sourcesProviding: () => sourcesProviding
     });
     function adhdevDir() {
-      return path17.join(os11.homedir(), ".adhdev");
+      return path18.join(os11.homedir(), ".adhdev");
     }
     function externalRoot() {
-      return path17.join(adhdevDir(), "external");
+      return path18.join(adhdevDir(), "external");
     }
     function sourcesFilePath() {
-      return path17.join(adhdevDir(), SOURCES_FILENAME);
+      return path18.join(adhdevDir(), SOURCES_FILENAME);
     }
     function activeFilePath() {
-      return path17.join(adhdevDir(), ACTIVE_FILENAME);
+      return path18.join(adhdevDir(), ACTIVE_FILENAME);
     }
     function ensureAdhdevDir() {
       const d = adhdevDir();
@@ -42598,7 +42702,7 @@ Next step: ${nextStep}`;
       for (const sourceEntry of entries) {
         if (!sourceEntry.isDirectory()) continue;
         const sourceName = sourceEntry.name;
-        const sourceDir = path17.join(root, sourceName);
+        const sourceDir = path18.join(root, sourceName);
         const providers = {};
         let categoryEntries;
         try {
@@ -42609,7 +42713,7 @@ Next step: ${nextStep}`;
         for (const categoryEntry of categoryEntries) {
           if (!categoryEntry.isDirectory()) continue;
           const category = categoryEntry.name;
-          const categoryDir = path17.join(sourceDir, category);
+          const categoryDir = path18.join(sourceDir, category);
           let typeEntries;
           try {
             typeEntries = fs9.readdirSync(categoryDir, { withFileTypes: true });
@@ -42619,9 +42723,9 @@ Next step: ${nextStep}`;
           const types = [];
           for (const typeEntry of typeEntries) {
             if (!typeEntry.isDirectory()) continue;
-            const typeDir = path17.join(categoryDir, typeEntry.name);
-            const hasV1 = fs9.existsSync(path17.join(typeDir, "provider.v1.json"));
-            const hasV0 = fs9.existsSync(path17.join(typeDir, "provider.json"));
+            const typeDir = path18.join(categoryDir, typeEntry.name);
+            const hasV1 = fs9.existsSync(path18.join(typeDir, "provider.v1.json"));
+            const hasV0 = fs9.existsSync(path18.join(typeDir, "provider.json"));
             if (hasV1 || hasV0) types.push(typeEntry.name);
           }
           if (types.length > 0) providers[category] = types;
@@ -42646,7 +42750,7 @@ Next step: ${nextStep}`;
     }
     var fs9;
     var os11;
-    var path17;
+    var path18;
     var SOURCES_FILENAME;
     var ACTIVE_FILENAME;
     var init_external_sources = __esm2({
@@ -42654,7 +42758,7 @@ Next step: ${nextStep}`;
         "use strict";
         fs9 = __toESM2(require("fs"));
         os11 = __toESM2(require("os"));
-        path17 = __toESM2(require("path"));
+        path18 = __toESM2(require("path"));
         SOURCES_FILENAME = "providers-sources.json";
         ACTIVE_FILENAME = "providers-active.json";
       }
@@ -42832,61 +42936,6 @@ Next step: ${nextStep}`;
         };
       }
     });
-    function resolveWin32GlobalBin(trimmed) {
-      if (path18.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\")) {
-        return null;
-      }
-      const extraDirs = [];
-      if (process.env.APPDATA) extraDirs.push(path18.join(process.env.APPDATA, "npm"));
-      try {
-        extraDirs.push(path18.dirname(process.execPath));
-      } catch {
-      }
-      for (const dir of extraDirs) {
-        if (!dir) continue;
-        for (const ext of WIN_EXEC_EXT) {
-          const full = path18.join(dir, trimmed + ext);
-          if ((0, import_fs14.existsSync)(full)) return full;
-        }
-      }
-      return null;
-    }
-    function resolveWin32Executable(command) {
-      if (process.platform !== "win32") return command;
-      const trimmed = (command || "").trim();
-      if (!trimmed) return command;
-      if (path18.isAbsolute(trimmed) && (0, import_fs14.existsSync)(trimmed)) return trimmed;
-      try {
-        const out = (0, import_child_process4.execFileSync)("where", [trimmed], {
-          encoding: "utf8",
-          windowsHide: true
-        }).trim();
-        if (out) {
-          const matches = out.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
-          const direct = matches.find((m) => DIRECT_EXEC_EXT.has(path18.extname(m).toLowerCase()));
-          return direct || matches[0] || command;
-        }
-      } catch {
-      }
-      const globalBin = resolveWin32GlobalBin(trimmed);
-      if (globalBin) return globalBin;
-      return command;
-    }
-    var import_child_process4;
-    var import_fs14;
-    var path18;
-    var DIRECT_EXEC_EXT;
-    var WIN_EXEC_EXT;
-    var init_resolve_executable = __esm2({
-      "src/cli-adapters/resolve-executable.ts"() {
-        "use strict";
-        import_child_process4 = require("child_process");
-        import_fs14 = require("fs");
-        path18 = __toESM2(require("path"));
-        DIRECT_EXEC_EXT = /* @__PURE__ */ new Set([".exe", ".com"]);
-        WIN_EXEC_EXT = [".exe", ".com", ".cmd", ".bat"];
-      }
-    });
     var pty_transport_exports = {};
     __export2(pty_transport_exports, {
       NodePtyTransportFactory: () => NodePtyTransportFactory
@@ -44873,6 +44922,9 @@ ${cont}` : cont;
     }
     var os14;
     var import_session_host_core5;
+    var FORCE_SUBMIT_SETTLE_MS;
+    var FORCE_SUBMIT_MAX_WAIT_MS;
+    var FORCE_SUBMIT_POLL_MS;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -44890,6 +44942,9 @@ ${cont}` : cont;
         init_provider_cli_config();
         init_provider_cli_runtime();
         init_provider_cli_shared();
+        FORCE_SUBMIT_SETTLE_MS = 150;
+        FORCE_SUBMIT_MAX_WAIT_MS = 1500;
+        FORCE_SUBMIT_POLL_MS = 50;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], extraEnv = {}, transportFactory = new NodePtyTransportFactory()) {
             this.extraArgs = extraArgs;
@@ -45818,9 +45873,23 @@ ${lastSnapshot}`;
               return;
             }
             LOG2.info("CLI", `[${this.cliType}] force-sending prompt while status=${this.engine.currentStatus}`);
-            await this.writeToPty(content + this.sendKey);
+            await this.writeToPty(content);
+            await this.waitForForceSubmitSettle(content);
+            await this.writeToPty(this.sendKey);
             this.onStatusChange?.();
           }
+          async waitForForceSubmitSettle(content) {
+            const startedAt = Date.now();
+            const normalizedPromptSnippet = normalizePromptText(extractPromptRetrySnippet(content));
+            await new Promise((resolve24) => setTimeout(resolve24, FORCE_SUBMIT_SETTLE_MS));
+            if (!normalizedPromptSnippet) return;
+            while (Date.now() - startedAt < FORCE_SUBMIT_MAX_WAIT_MS) {
+              if (!this.ptyProcess) return;
+              const screenText = this.terminalScreen.getText();
+              if (promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+              await new Promise((resolve24) => setTimeout(resolve24, FORCE_SUBMIT_POLL_MS));
+            }
+          }
           enqueuePendingOutboundMessage(text, reason) {
             const content = String(text || "");
             const duplicate = this.pendingOutboundQueue.some((message2) => message2.content === content);
@@ -49556,13 +49625,20 @@ ${lastSnapshot}`;
     function isMeshConfigRecord(value) {
       return !!value && typeof value === "object" && !Array.isArray(value);
     }
+    var SHELL_METACHAR_RE = /[;&|<>`$\n\r'"]/;
+    var SAFE_TOKEN_RE = /^[A-Za-z0-9_@./:=+-]+$/;
+    var SAFE_WIN32_EXEC_TOKEN_RE = /^[A-Za-z0-9_@./:=+\\-]+$/;
     function tokenizeCommandString(command) {
       const trimmed = command.trim();
       if (!trimmed) return null;
-      if (/[;&|<>`$\\\n\r'\"]/.test(trimmed)) return null;
+      if (SHELL_METACHAR_RE.test(trimmed)) return null;
       const tokens = trimmed.split(/\s+/).filter(Boolean);
       if (!tokens.length) return null;
-      if (tokens.some((token) => !/^[A-Za-z0-9_@./:=+-]+$/.test(token))) return null;
+      const isWin32 = process.platform === "win32";
+      for (let i = 0; i < tokens.length; i++) {
+        const re = isWin32 && i === 0 ? SAFE_WIN32_EXEC_TOKEN_RE : SAFE_TOKEN_RE;
+        if (!re.test(tokens[i])) return null;
+      }
       return tokens;
     }
     function validateCategory(value) {
@@ -49770,12 +49846,13 @@ ${lastSnapshot}`;
         unavailableReason: validation.commands.length ? void 0 : "validation_unavailable: repo mesh/refine config has no validation.commands"
       };
     }
-    var import_fs8 = require("fs");
+    var import_fs9 = require("fs");
     var import_path8 = require("path");
     var import_node_child_process3 = require("child_process");
     var import_node_crypto2 = require("crypto");
     var import_node_util3 = require("util");
     var yaml3 = __toESM2(require_js_yaml());
+    init_resolve_executable();
     var MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS = [
       ".adhdev/worktree_bootstrap.json",
       ".adhdev/worktree_bootstrap.yaml",
@@ -49863,9 +49940,9 @@ ${lastSnapshot}`;
       }
       for (const relative5 of MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS) {
         const configPath = (0, import_path8.join)(workspace, relative5);
-        if (!(0, import_fs8.existsSync)(configPath)) continue;
+        if (!(0, import_fs9.existsSync)(configPath)) continue;
         try {
-          const parsed = parseConfigText3(configPath, (0, import_fs8.readFileSync)(configPath, "utf-8"));
+          const parsed = parseConfigText3(configPath, (0, import_fs9.readFileSync)(configPath, "utf-8"));
           const validation = validateMeshWorktreeBootstrapConfig(parsed, relative5);
           if (!validation.valid) return { source: relative5, sourceType: "invalid", path: configPath, error: String(validation.rejectedCommands[0]?.reason || validation.errors.join("; ")) };
           return { config: parsed, source: relative5, sourceType: "repo_file", path: configPath };
@@ -49880,7 +49957,7 @@ ${lastSnapshot}`;
       for (const relative5 of staleInputs ?? []) {
         const filePath = (0, import_path8.join)(workspace, relative5);
         try {
-          digest[relative5] = (0, import_node_crypto2.createHash)("sha256").update((0, import_fs8.readFileSync)(filePath)).digest("hex");
+          digest[relative5] = (0, import_node_crypto2.createHash)("sha256").update((0, import_fs9.readFileSync)(filePath)).digest("hex");
         } catch {
           digest[relative5] = "absent";
         }
@@ -49950,10 +50027,10 @@ ${lastSnapshot}`;
         staleInputs: loaded.config.staleInputs
       };
       const staleInputPaths = loaded.config.staleInputs ?? [];
-      const initiallyAbsent = staleInputPaths.filter((p) => !(0, import_fs8.existsSync)((0, import_path8.join)(workspace, p)));
+      const initiallyAbsent = staleInputPaths.filter((p) => !(0, import_fs9.existsSync)((0, import_path8.join)(workspace, p)));
       for (const command of validation.commands) {
         if (initiallyAbsent.length > 0) {
-          const appearedNow = initiallyAbsent.filter((p) => (0, import_fs8.existsSync)((0, import_path8.join)(workspace, p)));
+          const appearedNow = initiallyAbsent.filter((p) => (0, import_fs9.existsSync)((0, import_path8.join)(workspace, p)));
           if (appearedNow.length > 0) {
             state.status = "stale";
             state.completedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -49964,8 +50041,9 @@ ${lastSnapshot}`;
         const cwd = command.cwd ? (0, import_path8.resolve)(workspace, command.cwd) : workspace;
         const startedAt = Date.now();
         state.lastCommand = command.displayCommand;
+        const resolvedCommand = resolveWin32Executable(command.command);
         try {
-          const result = await execFileAsync4(command.command, command.args, {
+          const result = await execFileAsync4(resolvedCommand, command.args, {
             cwd,
             encoding: "utf8",
             timeout: command.timeoutMs || DEFAULT_TIMEOUT_MS2,
@@ -50190,7 +50268,7 @@ ${lastSnapshot}`;
         this.targetDaemonId = context.targetDaemonId;
       }
     };
-    var import_fs12 = require("fs");
+    var import_fs13 = require("fs");
     var import_path10 = require("path");
     init_config();
     var DEFAULT_STATE = {
@@ -50241,11 +50319,11 @@ ${lastSnapshot}`;
     }
     function loadState() {
       const statePath = getStatePath();
-      if (!(0, import_fs12.existsSync)(statePath)) {
+      if (!(0, import_fs13.existsSync)(statePath)) {
         return { ...DEFAULT_STATE };
       }
       try {
-        const raw = (0, import_fs12.readFileSync)(statePath, "utf-8");
+        const raw = (0, import_fs13.readFileSync)(statePath, "utf-8");
         return normalizeState(JSON.parse(raw));
       } catch {
         return { ...DEFAULT_STATE };
@@ -50254,24 +50332,24 @@ ${lastSnapshot}`;
     function saveState(state) {
       const statePath = getStatePath();
       const normalized = normalizeState(state);
-      (0, import_fs12.writeFileSync)(statePath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
+      (0, import_fs13.writeFileSync)(statePath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
     }
     function resetState() {
       saveState({ ...DEFAULT_STATE });
     }
-    var import_child_process2 = require("child_process");
+    var import_child_process3 = require("child_process");
     var import_util3 = require("util");
-    var import_fs13 = require("fs");
+    var import_fs14 = require("fs");
     var import_os22 = require("os");
-    var path13 = __toESM2(require("path"));
+    var path14 = __toESM2(require("path"));
     var fs52 = __toESM2(require("fs"));
-    var path12 = __toESM2(require("path"));
+    var path13 = __toESM2(require("path"));
     function manifestCandidates(exeDir) {
       return [
-        path12.join(exeDir, "resources", "app", "product.json"),
-        path12.join(exeDir, "resources", "app", "package.json"),
+        path13.join(exeDir, "resources", "app", "product.json"),
+        path13.join(exeDir, "resources", "app", "package.json"),
         // Some packagings keep product.json one level up.
-        path12.join(exeDir, "product.json")
+        path13.join(exeDir, "product.json")
       ];
     }
     function parseVersionFromManifest(raw) {
@@ -50289,9 +50367,9 @@ ${lastSnapshot}`;
       if (!exePath) return null;
       let exeDir;
       try {
-        exeDir = fs52.statSync(exePath).isDirectory() ? exePath : path12.dirname(exePath);
+        exeDir = fs52.statSync(exePath).isDirectory() ? exePath : path13.dirname(exePath);
       } catch {
-        exeDir = path12.dirname(exePath);
+        exeDir = path13.dirname(exePath);
       }
       for (const candidate of manifestCandidates(exeDir)) {
         try {
@@ -50305,7 +50383,7 @@ ${lastSnapshot}`;
     }
     function isKnownWin32GuiExe(binPath, win32ProcessNames) {
       if (!binPath) return false;
-      const base = path12.win32.basename(binPath).toLowerCase();
+      const base = path13.win32.basename(binPath).toLowerCase();
       if (!base.endsWith(".exe")) return false;
       for (const names of Object.values(win32ProcessNames)) {
         for (const name of names) {
@@ -50316,7 +50394,7 @@ ${lastSnapshot}`;
       }
       return false;
     }
-    var execAsync2 = (0, import_util3.promisify)(import_child_process2.exec);
+    var execAsync2 = (0, import_util3.promisify)(import_child_process3.exec);
     var BUILTIN_IDE_DEFINITIONS = [];
     var registeredIDEs = /* @__PURE__ */ new Map();
     function registerIDEDefinition(def) {
@@ -50335,10 +50413,10 @@ ${lastSnapshot}`;
     function findCliCommand(command) {
       const trimmed = String(command || "").trim();
       if (!trimmed) return null;
-      if (path13.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
-        const candidate = trimmed.startsWith("~") ? path13.join((0, import_os22.homedir)(), trimmed.slice(1)) : trimmed;
-        const resolved = path13.isAbsolute(candidate) ? candidate : path13.resolve(candidate);
-        return (0, import_fs13.existsSync)(resolved) ? resolved : null;
+      if (path14.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
+        const candidate = trimmed.startsWith("~") ? path14.join((0, import_os22.homedir)(), trimmed.slice(1)) : trimmed;
+        const resolved = path14.isAbsolute(candidate) ? candidate : path14.resolve(candidate);
+        return (0, import_fs14.existsSync)(resolved) ? resolved : null;
       }
       const isWin = (0, import_os22.platform)() === "win32";
       const paths = (process.env.PATH || "").split(isWin ? ";" : ":");
@@ -50346,10 +50424,10 @@ ${lastSnapshot}`;
       for (const p of paths) {
         if (!p) continue;
         for (const ext of exes) {
-          const fullPath = path13.join(p, trimmed + ext);
+          const fullPath = path14.join(p, trimmed + ext);
           try {
-            if ((0, import_fs13.existsSync)(fullPath)) {
-              const stat2 = (0, import_fs13.statSync)(fullPath);
+            if ((0, import_fs14.existsSync)(fullPath)) {
+              const stat2 = (0, import_fs14.statSync)(fullPath);
               if (stat2.isFile() && (isWin || stat2.mode & 73)) {
                 return fullPath;
               }
@@ -50363,13 +50441,13 @@ ${lastSnapshot}`;
     function checkPathExists(paths) {
       const home = (0, import_os22.homedir)();
       for (const p of paths) {
-        const normalized = p.startsWith("~") ? path13.join(home, p.slice(1)) : p;
+        const normalized = p.startsWith("~") ? path14.join(home, p.slice(1)) : p;
         if (normalized.includes("*")) {
           const username = home.split(/[\\/]/).pop() || "";
           const resolved = normalized.replace("*", username);
-          if ((0, import_fs13.existsSync)(resolved)) return resolved;
+          if ((0, import_fs14.existsSync)(resolved)) return resolved;
         } else {
-          if ((0, import_fs13.existsSync)(normalized)) return normalized;
+          if ((0, import_fs14.existsSync)(normalized)) return normalized;
         }
       }
       return null;
@@ -50383,7 +50461,7 @@ ${lastSnapshot}`;
         let resolvedCli = cliPath;
         if (!resolvedCli && appPath && os30 === "darwin") {
           const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
-          if ((0, import_fs13.existsSync)(bundledCli)) resolvedCli = bundledCli;
+          if ((0, import_fs14.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
         if (!resolvedCli && appPath && os30 === "win32") {
           const { dirname: dirname17 } = await import("path");
@@ -50396,7 +50474,7 @@ ${lastSnapshot}`;
             `${appDir}\\\\resources\\\\app\\\\bin\\\\${def.cli}.cmd`
           ];
           for (const c of candidates) {
-            if ((0, import_fs13.existsSync)(c)) {
+            if ((0, import_fs14.existsSync)(c)) {
               resolvedCli = c;
               break;
             }
@@ -50419,9 +50497,9 @@ ${lastSnapshot}`;
     }
     init_cli_detector();
     var os72 = __toESM2(require("os"));
-    var import_child_process3 = require("child_process");
+    var import_child_process4 = require("child_process");
     var import_util22 = require("util");
-    var execAsync3 = (0, import_util22.promisify)(import_child_process3.exec);
+    var execAsync3 = (0, import_util22.promisify)(import_child_process4.exec);
     var cachedDarwinAvail = null;
     var darwinMemoryInterval = null;
     async function updateDarwinMemoryCache() {
@@ -52232,10 +52310,10 @@ ${cleanBody}`;
       return cleanTitle || cleanBody;
     }
     var fs6 = __toESM2(require("fs"));
-    var path14 = __toESM2(require("path"));
+    var path15 = __toESM2(require("path"));
     var os8 = __toESM2(require("os"));
     init_chat_message_normalization();
-    var HISTORY_DIR = path14.join(os8.homedir(), ".adhdev", "history");
+    var HISTORY_DIR = path15.join(os8.homedir(), ".adhdev", "history");
     var RETAIN_DAYS = 30;
     var SAVED_HISTORY_INDEX_VERSION = 1;
     var SAVED_HISTORY_INDEX_FILE = ".saved-history-index.json";
@@ -52421,7 +52499,7 @@ ${cleanBody}`;
     function buildSavedHistoryFileSignatureMap(dir, files) {
       return new Map(files.map((file2) => {
         try {
-          const stat2 = fs6.statSync(path14.join(dir, file2));
+          const stat2 = fs6.statSync(path15.join(dir, file2));
           return [file2, `${file2}:${stat2.size}:${Math.trunc(stat2.mtimeMs)}`];
         } catch {
           return [file2, `${file2}:missing`];
@@ -52432,7 +52510,7 @@ ${cleanBody}`;
       return files.map((file2) => fileSignatures.get(file2) || `${file2}:missing`).join("|");
     }
     function getSavedHistoryIndexFilePath(dir) {
-      return path14.join(dir, SAVED_HISTORY_INDEX_FILE);
+      return path15.join(dir, SAVED_HISTORY_INDEX_FILE);
     }
     function getSavedHistoryIndexLockPath(dir) {
       return `${getSavedHistoryIndexFilePath(dir)}${SAVED_HISTORY_INDEX_LOCK_SUFFIX}`;
@@ -52534,7 +52612,7 @@ ${cleanBody}`;
         }
         for (const file2 of Array.from(currentEntries.keys())) {
           if (incomingFiles.has(file2)) continue;
-          if (!fs6.existsSync(path14.join(dir, file2))) {
+          if (!fs6.existsSync(path15.join(dir, file2))) {
             currentEntries.delete(file2);
           }
         }
@@ -52560,7 +52638,7 @@ ${cleanBody}`;
         const indexStat = fs6.statSync(getSavedHistoryIndexFilePath(dir));
         const files = listHistoryFiles(dir);
         for (const file2 of files) {
-          const stat2 = fs6.statSync(path14.join(dir, file2));
+          const stat2 = fs6.statSync(path15.join(dir, file2));
           if (stat2.mtimeMs > indexStat.mtimeMs) return true;
         }
         return false;
@@ -52570,14 +52648,14 @@ ${cleanBody}`;
     }
     function buildSavedHistoryFileSignature(dir, file2) {
       try {
-        const stat2 = fs6.statSync(path14.join(dir, file2));
+        const stat2 = fs6.statSync(path15.join(dir, file2));
         return `${file2}:${stat2.size}:${Math.trunc(stat2.mtimeMs)}`;
       } catch {
         return `${file2}:missing`;
       }
     }
     function persistSavedHistoryFileSummaryEntry(agentType, dir, file2, updater) {
-      const filePath = path14.join(dir, file2);
+      const filePath = path15.join(dir, file2);
       const result = withLockedPersistedSavedHistoryIndex(dir, (entries) => {
         const currentEntry = entries.get(file2) || null;
         const nextSummary = updater(currentEntry?.summary || null);
@@ -52650,7 +52728,7 @@ ${cleanBody}`;
     function computeSavedHistoryFileSummary(dir, file2) {
       const historySessionId = extractSavedHistorySessionIdFromFile(file2);
       if (!historySessionId) return null;
-      const filePath = path14.join(dir, file2);
+      const filePath = path15.join(dir, file2);
       const content = fs6.readFileSync(filePath, "utf-8");
       const lines = content.split("\n").filter(Boolean);
       let messageCount = 0;
@@ -52737,7 +52815,7 @@ ${cleanBody}`;
       const summaryBySessionId = /* @__PURE__ */ new Map();
       const nextPersistedEntries = /* @__PURE__ */ new Map();
       for (const file2 of files.slice().sort()) {
-        const filePath = path14.join(dir, file2);
+        const filePath = path15.join(dir, file2);
         const signature = fileSignatures.get(file2) || `${file2}:missing`;
         const cached3 = savedHistoryFileSummaryCache.get(filePath);
         const persisted = persistedEntries.get(file2);
@@ -52857,12 +52935,12 @@ ${cleanBody}`;
             });
           }
           if (newMessages.length === 0) return;
-          const dir = path14.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path15.join(HISTORY_DIR, this.sanitize(agentType));
           fs6.mkdirSync(dir, { recursive: true });
           const date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
           const filePrefix = effectiveHistoryKey ? `${this.sanitize(effectiveHistoryKey)}_` : "";
           const fileName = `${filePrefix}${date5}.jsonl`;
-          const filePath = path14.join(dir, fileName);
+          const filePath = path15.join(dir, fileName);
           const lines = newMessages.map((m) => JSON.stringify(m)).join("\n") + "\n";
           fs6.appendFileSync(filePath, lines, "utf-8");
           updateSavedHistoryIndexForAppendedMessages(agentType, dir, fileName, effectiveHistoryKey, newMessages);
@@ -52953,11 +53031,11 @@ ${cleanBody}`;
         const ws = String(workspace || "").trim();
         if (!id || !ws) return;
         try {
-          const dir = path14.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path15.join(HISTORY_DIR, this.sanitize(agentType));
           fs6.mkdirSync(dir, { recursive: true });
           const date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
           const fileName = `${this.sanitize(id)}_${date5}.jsonl`;
-          const filePath = path14.join(dir, fileName);
+          const filePath = path15.join(dir, fileName);
           const record2 = {
             ts: (/* @__PURE__ */ new Date()).toISOString(),
             receivedAt: Date.now(),
@@ -53003,14 +53081,14 @@ ${cleanBody}`;
             this.lastSeenCounts.set(toDedupKey, Math.max(fromCount, this.lastSeenCounts.get(toDedupKey) || 0));
             this.lastSeenCounts.delete(fromDedupKey);
           }
-          const dir = path14.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path15.join(HISTORY_DIR, this.sanitize(agentType));
           if (!fs6.existsSync(dir)) return;
           const fromPrefix = `${this.sanitize(fromId)}_`;
           const toPrefix = `${this.sanitize(toId)}_`;
           const files = fs6.readdirSync(dir).filter((file2) => file2.startsWith(fromPrefix) && file2.endsWith(".jsonl"));
           for (const file2 of files) {
-            const sourcePath = path14.join(dir, file2);
-            const targetPath = path14.join(dir, `${toPrefix}${file2.slice(fromPrefix.length)}`);
+            const sourcePath = path15.join(dir, file2);
+            const targetPath = path15.join(dir, `${toPrefix}${file2.slice(fromPrefix.length)}`);
             const sourceLines = fs6.readFileSync(sourcePath, "utf-8").split("\n").filter(Boolean);
             const rewritten = sourceLines.map((line) => {
               try {
@@ -53044,13 +53122,13 @@ ${cleanBody}`;
         const sessionId = String(historySessionId || "").trim();
         if (!sessionId) return;
         try {
-          const dir = path14.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path15.join(HISTORY_DIR, this.sanitize(agentType));
           if (!fs6.existsSync(dir)) return;
           const prefix = `${this.sanitize(sessionId)}_`;
           const files = fs6.readdirSync(dir).filter((file2) => file2.startsWith(prefix) && file2.endsWith(".jsonl")).sort();
           const seen = /* @__PURE__ */ new Set();
           for (const file2 of files) {
-            const filePath = path14.join(dir, file2);
+            const filePath = path15.join(dir, file2);
             const lines = fs6.readFileSync(filePath, "utf-8").split("\n").filter(Boolean);
             const next = [];
             for (const line of lines) {
@@ -53104,11 +53182,11 @@ ${cleanBody}`;
           const cutoff = Date.now() - RETAIN_DAYS * 24 * 60 * 60 * 1e3;
           const agentDirs = fs6.readdirSync(HISTORY_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
           for (const dir of agentDirs) {
-            const dirPath = path14.join(HISTORY_DIR, dir.name);
+            const dirPath = path15.join(HISTORY_DIR, dir.name);
             const files = fs6.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl") || f.endsWith(".terminal.log"));
             let removedAny = false;
             for (const file2 of files) {
-              const filePath = path14.join(dirPath, file2);
+              const filePath = path15.join(dirPath, file2);
               const stat2 = fs6.statSync(filePath);
               if (stat2.mtimeMs < cutoff) {
                 fs6.unlinkSync(filePath);
@@ -53311,7 +53389,7 @@ ${cleanBody}`;
       const seen = /* @__PURE__ */ new Set();
       let readAllFiles = true;
       for (let f = 0; f < files.length; f++) {
-        const filePath = path14.join(dir, files[f]);
+        const filePath = path15.join(dir, files[f]);
         const remaining = Math.max(0, needed - collected.length);
         const perFileNeeded = Math.min(needed, remaining + BOUNDED_TAIL_SLACK);
         const { lines, coversWholeFile } = readFileTailLines(filePath, perFileNeeded);
@@ -53344,7 +53422,7 @@ ${cleanBody}`;
     function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0, historyBehavior) {
       try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const dir = path14.join(HISTORY_DIR, sanitized);
+        const dir = path15.join(HISTORY_DIR, sanitized);
         if (!fs6.existsSync(dir)) return { messages: [], hasMore: false };
         const files = listHistoryFiles(dir, historySessionId);
         const bounded = isBoundedTailRequest(limit, offset, excludeRecentCount);
@@ -53367,7 +53445,7 @@ ${cleanBody}`;
         const allMessages = [];
         const seen = /* @__PURE__ */ new Set();
         for (const file2 of files) {
-          const filePath = path14.join(dir, file2);
+          const filePath = path15.join(dir, file2);
           const content = fs6.readFileSync(filePath, "utf-8");
           const lines = content.trim().split("\n").filter(Boolean);
           for (let i = 0; i < lines.length; i++) {
@@ -53391,7 +53469,7 @@ ${cleanBody}`;
     function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
       try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const dir = path14.join(HISTORY_DIR, sanitized);
+        const dir = path15.join(HISTORY_DIR, sanitized);
         if (!fs6.existsSync(dir)) {
           savedHistorySessionCache.delete(sanitized);
           return { sessions: [], hasMore: false };
@@ -53452,11 +53530,11 @@ ${cleanBody}`;
     }
     function readExistingSessionStartRecord(agentType, historySessionId) {
       try {
-        const dir = path14.join(HISTORY_DIR, agentType);
+        const dir = path15.join(HISTORY_DIR, agentType);
         if (!fs6.existsSync(dir)) return null;
         const files = listHistoryFiles(dir, historySessionId).sort();
         for (const file2 of files) {
-          const lines = fs6.readFileSync(path14.join(dir, file2), "utf-8").split("\n").filter(Boolean);
+          const lines = fs6.readFileSync(path15.join(dir, file2), "utf-8").split("\n").filter(Boolean);
           for (const line of lines) {
             try {
               const parsed = JSON.parse(line);
@@ -53476,16 +53554,16 @@ ${cleanBody}`;
     function rewriteCanonicalSavedHistory(agentType, historySessionId, records) {
       if (records.length === 0) return false;
       try {
-        const dir = path14.join(HISTORY_DIR, agentType);
+        const dir = path15.join(HISTORY_DIR, agentType);
         fs6.mkdirSync(dir, { recursive: true });
         const prefix = `${historySessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
         for (const file2 of fs6.readdirSync(dir)) {
           if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
-            fs6.unlinkSync(path14.join(dir, file2));
+            fs6.unlinkSync(path15.join(dir, file2));
           }
         }
         const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
-        const filePath = path14.join(dir, `${prefix}${targetDate}.jsonl`);
+        const filePath = path15.join(dir, `${prefix}${targetDate}.jsonl`);
         fs6.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
 `, "utf-8");
         invalidatePersistedSavedHistoryIndex(agentType, dir);
@@ -56044,7 +56122,7 @@ ${effect.notification.body || ""}`.trim();
     }
     var fs7 = __toESM2(require("fs"));
     var os9 = __toESM2(require("os"));
-    var path15 = __toESM2(require("path"));
+    var path16 = __toESM2(require("path"));
     var import_node_crypto3 = require("crypto");
     init_contracts();
     init_logger();
@@ -57085,7 +57163,7 @@ ${effect.notification.body || ""}`.trim();
     function normalizeComparableWorkspace(value) {
       const text = typeof value === "string" ? value.trim() : "";
       if (!text) return "";
-      return path15.resolve(text);
+      return path16.resolve(text);
     }
     function isCurrentRuntimePtySafelyAttributed(args) {
       if (args.adapter.cliType !== "codex-cli") return false;
@@ -57570,7 +57648,7 @@ ${effect.notification.body || ""}`.trim();
     }
     function getChatDebugBundleDir() {
       const override = typeof process.env.ADHDEV_DEBUG_BUNDLE_DIR === "string" ? process.env.ADHDEV_DEBUG_BUNDLE_DIR.trim() : "";
-      return override || path15.join(os9.homedir(), ".adhdev", "debug-bundles", "chat");
+      return override || path16.join(os9.homedir(), ".adhdev", "debug-bundles", "chat");
     }
     function safeBundleIdSegment(value, fallback) {
       const normalized = String(value || fallback).trim().replace(/[^A-Za-z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80);
@@ -57627,7 +57705,7 @@ ${effect.notification.body || ""}`.trim();
       const bundleId = createChatDebugBundleId(targetSessionId);
       const dir = getChatDebugBundleDir();
       fs7.mkdirSync(dir, { recursive: true });
-      const savedPath = path15.join(dir, `${bundleId}.json`);
+      const savedPath = path16.join(dir, `${bundleId}.json`);
       const json2 = `${JSON.stringify(bundle, null, 2)}
 `;
       fs7.writeFileSync(savedPath, json2, { encoding: "utf8", mode: 384 });
@@ -59189,7 +59267,7 @@ ${effect.notification.body || ""}`.trim();
       return { success: false, error: "resolveAction script not available for this provider" };
     }
     var fs8 = __toESM2(require("fs"));
-    var path16 = __toESM2(require("path"));
+    var path17 = __toESM2(require("path"));
     var os10 = __toESM2(require("os"));
     var KEY_TO_VK = {
       Backspace: 8,
@@ -59446,25 +59524,25 @@ ${effect.notification.body || ""}`.trim();
       const inputPath = rawPath || ".";
       const home = os10.homedir();
       if (inputPath.startsWith("~")) {
-        return path16.resolve(path16.join(home, inputPath.slice(1)));
+        return path17.resolve(path17.join(home, inputPath.slice(1)));
       }
       if (process.platform === "win32") {
         const normalized = normalizeWindowsRequestedPath(inputPath);
-        if (path16.win32.isAbsolute(normalized)) {
-          return path16.win32.normalize(normalized);
+        if (path17.win32.isAbsolute(normalized)) {
+          return path17.win32.normalize(normalized);
         }
-        return path16.win32.resolve(normalized);
+        return path17.win32.resolve(normalized);
       }
-      if (path16.isAbsolute(inputPath)) {
-        return path16.normalize(inputPath);
+      if (path17.isAbsolute(inputPath)) {
+        return path17.normalize(inputPath);
       }
-      return path16.resolve(inputPath);
+      return path17.resolve(inputPath);
     }
     function listDirectoryEntriesSafe(dirPath) {
       const entries = fs8.readdirSync(dirPath, { withFileTypes: true });
       const files = [];
       for (const entry of entries) {
-        const entryPath = path16.join(dirPath, entry.name);
+        const entryPath = path17.join(dirPath, entry.name);
         try {
           if (entry.isDirectory()) {
             files.push({ name: entry.name, type: "directory" });
@@ -59518,7 +59596,7 @@ ${effect.notification.body || ""}`.trim();
     async function handleFileWrite(h, args) {
       try {
         const filePath = resolveSafePath(args?.path);
-        fs8.mkdirSync(path16.dirname(filePath), { recursive: true });
+        fs8.mkdirSync(path17.dirname(filePath), { recursive: true });
         fs8.writeFileSync(filePath, args?.content || "", "utf-8");
         return { success: true, path: filePath };
       } catch (e) {
@@ -73220,6 +73298,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
     var import_path12 = require("path");
     var fs26 = __toESM2(require("fs"));
     var import_node_child_process6 = require("child_process");
+    init_resolve_executable();
     var CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
     var CHANNEL_SERVER_URL = {
       stable: "https://api.adhf.dev",
@@ -74318,6 +74397,18 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       return `${text.slice(0, REFINE_VALIDATION_SUMMARY_CHARS)}
 [truncated ${text.length - REFINE_VALIDATION_SUMMARY_CHARS} chars]`;
     }
+    function isSpawnResolutionError(error48) {
+      if (!error48) return false;
+      if (error48.code === "ENOENT" && typeof error48.syscall === "string" && error48.syscall.startsWith("spawn")) return true;
+      return error48.code === "ENOENT" && (error48.syscall === void 0 || String(error48.syscall).startsWith("spawn"));
+    }
+    function describeSpawnError(error48, command, spawnResolutionFailed) {
+      if (spawnResolutionFailed) {
+        const hint = process.platform === "win32" ? " On Windows, npm-family commands (npm/npx/tsc/vitest) are .cmd shims that the bare-command spawn search does not resolve; configure an absolute path or ensure the command is on PATH." : "";
+        return `Could not resolve executable "${command}" (spawn ENOENT).${hint}`;
+      }
+      return String(error48?.message || error48);
+    }
     function recordMeshRefineStage(stages, stage, status, startedAt, details) {
       stages.push({
         stage,
@@ -75219,8 +75310,9 @@ ${mergeTreeErr?.stderr || ""}`;
           const startedAt = Date.now();
           const cwd = candidate.cwd ? (0, import_path12.resolve)(workspace, candidate.cwd) : workspace;
           const timeout = candidate.timeoutMs || REFINE_VALIDATION_TIMEOUT_MS;
+          const resolvedCommand = resolveWin32Executable(candidate.command);
           try {
-            const result = await execFileAsync4(candidate.command, candidate.args, {
+            const result = await execFileAsync4(resolvedCommand, candidate.args, {
               cwd,
               encoding: "utf8",
               timeout,
@@ -75229,16 +75321,17 @@ ${mergeTreeErr?.stderr || ""}`;
             });
             summary.bootstrapCommandsRun.push(commandRecord(candidate, cwd, startedAt, result, true, { exitCode: 0 }));
           } catch (error48) {
+            const spawnResolutionFailed = isSpawnResolutionError(error48);
             summary.bootstrapCommandsRun.push(commandRecord(candidate, cwd, startedAt, error48, false, {
               exitCode: typeof error48?.code === "number" ? error48.code : null,
               signal: typeof error48?.signal === "string" ? error48.signal : null,
               timedOut: error48?.killed === true || /timed out/i.test(String(error48?.message || "")),
-              failureKind: "dependency_bootstrap_failed"
+              ...spawnResolutionFailed ? { failureKind: "spawn_resolution_failed", resolvedCommand } : { failureKind: "dependency_bootstrap_failed" }
             }));
-            summary.bootstrap = { stage: "failed", error: String(error48?.message || error48) };
+            summary.bootstrap = { stage: "failed", error: describeSpawnError(error48, candidate.command, spawnResolutionFailed) };
             summary.status = "failed";
-            summary.failureKind = "dependency_bootstrap_failed";
-            summary.failureCode = "dependency_bootstrap_failed";
+            summary.failureKind = spawnResolutionFailed ? "spawn_resolution_failed" : "dependency_bootstrap_failed";
+            summary.failureCode = spawnResolutionFailed ? "spawn_resolution_failed" : "dependency_bootstrap_failed";
             return summary;
           }
         }
@@ -75261,8 +75354,9 @@ ${mergeTreeErr?.stderr || ""}`;
           summary.failureCode = "missing_dependencies";
           return summary;
         }
+        const resolvedCommand = resolveWin32Executable(candidate.command);
         try {
-          const result = await execFileAsync4(candidate.command, candidate.args, {
+          const result = await execFileAsync4(resolvedCommand, candidate.args, {
             cwd,
             encoding: "utf8",
             timeout,
@@ -75271,16 +75365,21 @@ ${mergeTreeErr?.stderr || ""}`;
           });
           summary.commandsRun.push(commandRecord(candidate, cwd, startedAt, result, true, { exitCode: 0 }));
         } catch (error48) {
+          const spawnResolutionFailed = isSpawnResolutionError(error48);
           const stderr = truncateValidationOutput(error48?.stderr || error48?.message);
-          const missingDependencyFailure = /Cannot find module|MODULE_NOT_FOUND|node_modules|command not found|not found/i.test(stderr);
+          const missingDependencyFailure = !spawnResolutionFailed && /Cannot find module|MODULE_NOT_FOUND|node_modules|command not found|not found/i.test(stderr);
           summary.commandsRun.push(commandRecord(candidate, cwd, startedAt, error48, false, {
             exitCode: typeof error48?.code === "number" ? error48.code : null,
             signal: typeof error48?.signal === "string" ? error48.signal : null,
             timedOut: error48?.killed === true || /timed out/i.test(String(error48?.message || "")),
-            ...missingDependencyFailure ? { failureKind: "missing_dependencies" } : {}
+            ...spawnResolutionFailed ? { failureKind: "spawn_resolution_failed", resolvedCommand } : missingDependencyFailure ? { failureKind: "missing_dependencies" } : {}
           }));
           summary.status = "failed";
-          if (missingDependencyFailure) {
+          if (spawnResolutionFailed) {
+            summary.failureKind = "spawn_resolution_failed";
+            summary.failureCode = "spawn_resolution_failed";
+            summary.spawnResolutionError = describeSpawnError(error48, candidate.command, true);
+          } else if (missingDependencyFailure) {
             summary.failureKind = "missing_dependencies";
             summary.failureCode = "missing_dependencies";
           }
@@ -76541,7 +76640,7 @@ ${mergeTreeErr?.stderr || ""}`;
           if (validationSummary.status === "failed") {
             const firstFailedCmd = Array.isArray(validationSummary.commandsRun) ? validationSummary.commandsRun.find((c) => c.success === false) : void 0;
             const buildValidationFailedError = () => {
-              const base = validationSummary.failureCode === "missing_dependencies" ? "Refinery validation dependencies are missing; merge/refine was not attempted. Configure validation.bootstrapCommands if Refinery should bootstrap dependencies before validation." : validationSummary.failureCode === "dependency_bootstrap_failed" ? "Refinery dependency/bootstrap command failed; merge/refine was not attempted." : "Refinery validation gate failed; merge/refine was not attempted.";
+              const base = validationSummary.failureCode === "missing_dependencies" ? "Refinery validation dependencies are missing; merge/refine was not attempted. Configure validation.bootstrapCommands if Refinery should bootstrap dependencies before validation." : validationSummary.failureCode === "dependency_bootstrap_failed" ? "Refinery dependency/bootstrap command failed; merge/refine was not attempted." : validationSummary.failureCode === "spawn_resolution_failed" ? validationSummary.spawnResolutionError || "Refinery validation command could not be spawned (executable not found); merge/refine was not attempted." : "Refinery validation gate failed; merge/refine was not attempted.";
               if (!firstFailedCmd) return base;
               const cmdName = typeof firstFailedCmd.displayCommand === "string" ? firstFailedCmd.displayCommand : typeof firstFailedCmd.command === "string" ? [firstFailedCmd.command, ...Array.isArray(firstFailedCmd.args) ? firstFailedCmd.args : []].join(" ").trim() : typeof firstFailedCmd.cmd === "string" ? firstFailedCmd.cmd : "";
               const rawOutput = [firstFailedCmd.stdout, firstFailedCmd.stderr, firstFailedCmd.output].filter((s) => typeof s === "string" && s.length > 0).join("\n");