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

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "5d9635b2a6476691469ecfe32b26a17e13484b2b" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "5d9635b2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = 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:23:56.856Z" : 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 version = 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:30:54.863Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -3260,6 +3260,297 @@ var init_mesh_ledger = __esm({
   }
 });
 
+// src/logging/async-batch-writer.ts
+var fs3, AsyncBatchWriter;
+var init_async_batch_writer = __esm({
+  "src/logging/async-batch-writer.ts"() {
+    "use strict";
+    fs3 = __toESM(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 fs3.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);
+            }
+          });
+        }
+      }
+    };
+  }
+});
+
+// src/logging/logger.ts
+var logger_exports = {};
+__export(logger_exports, {
+  LOG: () => LOG,
+  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(date = /* @__PURE__ */ new Date()) {
+  return path9.join(LOG_DIR, `daemon-${date.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 file of files) {
+      const dateMatch = file.match(/daemon-(\d{4}-\d{2}-\d{2})/);
+      if (dateMatch && dateMatch[1] < cutoffStr) {
+        try {
+          fs4.unlinkSync(path9.join(LOG_DIR, file));
+        } 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, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH, LOG_DIR_PATH;
+var init_logger = __esm({
+  "src/logging/logger.ts"() {
+    "use strict";
+    fs4 = __toESM(require("fs"));
+    path9 = __toESM(require("path"));
+    os3 = __toESM(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(os3.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os3.homedir(), "Library", "Logs", "adhdev") : path9.join(os3.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);
+    LOG = {
+      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;
+  }
+});
+
 // src/mesh/mesh-work-queue.ts
 var mesh_work_queue_exports = {};
 __export(mesh_work_queue_exports, {
@@ -3724,11 +4015,18 @@ function requeueTask(meshId, taskId, opts) {
 }
 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) {
+        LOG.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;
   });
@@ -3837,6 +4135,7 @@ var init_mesh_work_queue = __esm({
     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"];
@@ -4495,12 +4794,51 @@ var init_mesh_runtime_store = __esm({
           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 {
@@ -5756,297 +6094,6 @@ var init_mesh_review_inbox = __esm({
   }
 });
 
-// src/logging/async-batch-writer.ts
-var fs3, AsyncBatchWriter;
-var init_async_batch_writer = __esm({
-  "src/logging/async-batch-writer.ts"() {
-    "use strict";
-    fs3 = __toESM(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 fs3.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);
-            }
-          });
-        }
-      }
-    };
-  }
-});
-
-// src/logging/logger.ts
-var logger_exports = {};
-__export(logger_exports, {
-  LOG: () => LOG,
-  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(date = /* @__PURE__ */ new Date()) {
-  return path9.join(LOG_DIR, `daemon-${date.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 file of files) {
-      const dateMatch = file.match(/daemon-(\d{4}-\d{2}-\d{2})/);
-      if (dateMatch && dateMatch[1] < cutoffStr) {
-        try {
-          fs4.unlinkSync(path9.join(LOG_DIR, file));
-        } 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, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH, LOG_DIR_PATH;
-var init_logger = __esm({
-  "src/logging/logger.ts"() {
-    "use strict";
-    fs4 = __toESM(require("fs"));
-    path9 = __toESM(require("path"));
-    os3 = __toESM(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(os3.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os3.homedir(), "Library", "Logs", "adhdev") : path9.join(os3.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);
-    LOG = {
-      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;
-  }
-});
-
 // src/commands/mesh-coordinator.ts
 var mesh_coordinator_exports = {};
 __export(mesh_coordinator_exports, {
@@ -6448,6 +6495,59 @@ var init_mesh_coordinator = __esm({
   }
 });
 
+// src/cli-adapters/resolve-executable.ts
+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, import_fs8, path10, DIRECT_EXEC_EXT, WIN_EXEC_EXT;
+var init_resolve_executable = __esm({
+  "src/cli-adapters/resolve-executable.ts"() {
+    "use strict";
+    import_child_process = require("child_process");
+    import_fs8 = require("fs");
+    path10 = __toESM(require("path"));
+    DIRECT_EXEC_EXT = /* @__PURE__ */ new Set([".exe", ".com"]);
+    WIN_EXEC_EXT = [".exe", ".com", ".cmd", ".bat"];
+  }
+});
+
 // src/mesh/mesh-fast-forward.ts
 async function fastForwardMeshNode(args) {
   const workspace = typeof args.workspace === "string" ? args.workspace.trim() : "";
@@ -7971,9 +8071,9 @@ function readPendingMeshCoordinatorEventsFromDisk(meshId, coordinatorDaemonId) {
   const paths = primaryDaemonId ? [getPendingEventsPath(meshId, primaryDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
   const events = [];
   for (const path42 of paths) {
-    if (!(0, import_fs9.existsSync)(path42)) continue;
+    if (!(0, import_fs10.existsSync)(path42)) continue;
     try {
-      const raw = (0, import_fs9.readFileSync)(path42, "utf-8");
+      const raw = (0, import_fs10.readFileSync)(path42, "utf-8");
       const parsed = raw.split("\n").filter(Boolean).flatMap((line) => {
         try {
           return [JSON.parse(line)];
@@ -8048,11 +8148,11 @@ function reconcilePendingMeshCoordinatorEvents(meshId, events) {
 }
 function trimPendingEventsIfNeeded(path42) {
   try {
-    if (!(0, import_fs9.existsSync)(path42)) return;
-    if ((0, import_fs9.statSync)(path42).size <= MAX_PENDING_EVENTS_BYTES) return;
-    const lines = (0, import_fs9.readFileSync)(path42, "utf-8").split("\n").filter(Boolean);
+    if (!(0, import_fs10.existsSync)(path42)) return;
+    if ((0, import_fs10.statSync)(path42).size <= MAX_PENDING_EVENTS_BYTES) return;
+    const lines = (0, import_fs10.readFileSync)(path42, "utf-8").split("\n").filter(Boolean);
     if (lines.length <= MAX_PENDING_EVENTS_KEEP) return;
-    (0, import_fs9.writeFileSync)(path42, lines.slice(-MAX_PENDING_EVENTS_KEEP).join("\n") + "\n", "utf-8");
+    (0, import_fs10.writeFileSync)(path42, lines.slice(-MAX_PENDING_EVENTS_KEEP).join("\n") + "\n", "utf-8");
   } catch {
   }
 }
@@ -8081,7 +8181,7 @@ function queuePendingMeshCoordinatorEvent(event) {
     }
     const path42 = getPendingEventsPath(event.meshId, event.targetCoordinatorDaemonId);
     trimPendingEventsIfNeeded(path42);
-    (0, import_fs9.appendFileSync)(path42, JSON.stringify(event) + "\n", "utf-8");
+    (0, import_fs10.appendFileSync)(path42, JSON.stringify(event) + "\n", "utf-8");
     return true;
   } catch (e) {
     LOG.warn("MeshEvents", `Failed to persist pending coordinator event: ${e?.message || e}`);
@@ -8091,20 +8191,20 @@ function queuePendingMeshCoordinatorEvent(event) {
 function atomicDrainFile(path42) {
   const tmpPath = `${path42}.draining`;
   try {
-    (0, import_fs9.renameSync)(path42, tmpPath);
+    (0, import_fs10.renameSync)(path42, 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;
@@ -8113,16 +8213,16 @@ function atomicDrainFile(path42) {
 function selectiveDrainFile(path42, predicate) {
   const tmpPath = `${path42}.draining`;
   try {
-    (0, import_fs9.renameSync)(path42, tmpPath);
+    (0, import_fs10.renameSync)(path42, 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 [];
@@ -8145,12 +8245,12 @@ function selectiveDrainFile(path42, predicate) {
   }
   try {
     if (keptLines.length > 0) {
-      (0, import_fs9.writeFileSync)(path42, keptLines.join("\n") + "\n", "utf-8");
+      (0, import_fs10.writeFileSync)(path42, 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)(path42)) (0, import_fs9.renameSync)(tmpPath, path42);
+      if ((0, import_fs10.existsSync)(tmpPath) && !(0, import_fs10.existsSync)(path42)) (0, import_fs10.renameSync)(tmpPath, path42);
     } catch {
     }
     return [];
@@ -8244,17 +8344,17 @@ function clearPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId) {
   }
   const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
   for (const path42 of paths) {
-    if ((0, import_fs9.existsSync)(path42)) try {
-      (0, import_fs9.unlinkSync)(path42);
+    if ((0, import_fs10.existsSync)(path42)) try {
+      (0, import_fs10.unlinkSync)(path42);
     } catch {
     }
   }
 }
-var import_fs9, import_path9, import_crypto7, REFINE_TERMINAL_EVENTS, MAX_PENDING_EVENTS_BYTES, MAX_PENDING_EVENTS_KEEP;
+var import_fs10, import_path9, import_crypto7, REFINE_TERMINAL_EVENTS, MAX_PENDING_EVENTS_BYTES, MAX_PENDING_EVENTS_KEEP;
 var init_mesh_events_pending = __esm({
   "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();
@@ -8749,24 +8849,24 @@ function buildCliScreenSnapshot(text) {
 function findBinary(name) {
   const trimmed = String(name || "").trim();
   if (!trimmed) return trimmed;
-  const expanded = trimmed.startsWith("~") ? path10.join(os5.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(os5.homedir(), trimmed.slice(1)) : trimmed;
+  if (path11.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
+    return path11.isAbsolute(expanded) ? expanded : path11.resolve(expanded);
   }
   const isWin = os5.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(os5.homedir(), ".npm-global", "bin"));
+    extraDirs.push(path11.join(os5.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 {
     }
   }
@@ -8775,7 +8875,7 @@ function findBinary(name) {
   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 fs32 = require("fs");
         if (fs32.existsSync(fullPath)) {
@@ -8791,7 +8891,7 @@ function findBinary(name) {
   return isWin ? `${trimmed}.cmd` : trimmed;
 }
 function isScriptBinary(binaryPath) {
-  if (!path10.isAbsolute(binaryPath)) return false;
+  if (!path11.isAbsolute(binaryPath)) return false;
   try {
     const fs32 = require("fs");
     const resolved = fs32.realpathSync(binaryPath);
@@ -8807,7 +8907,7 @@ function isScriptBinary(binaryPath) {
   }
 }
 function looksLikeMachOOrElf(filePath) {
-  if (!path10.isAbsolute(filePath)) return false;
+  if (!path11.isAbsolute(filePath)) return false;
   try {
     const fs32 = require("fs");
     const resolved = fs32.realpathSync(filePath);
@@ -8896,12 +8996,12 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os5, path10, TerminalTranscriptAccumulator, buildCliSpawnEnv;
+var os5, path11, TerminalTranscriptAccumulator, buildCliSpawnEnv;
 var init_provider_cli_shared = __esm({
   "src/cli-adapters/provider-cli-shared.ts"() {
     "use strict";
     os5 = __toESM(require("os"));
-    path10 = __toESM(require("path"));
+    path11 = __toESM(require("path"));
     init_spawn_env();
     TerminalTranscriptAccumulator = class {
       lines = [[]];
@@ -9075,19 +9175,19 @@ function shellQuote(value) {
 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;
 }
@@ -9097,12 +9197,12 @@ async function resolveDetectionPath(command, whichCmd) {
   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 } : {}
@@ -9192,14 +9292,14 @@ async function detectCLI(cliId, providerLoader, options) {
   const all = await detectCLIs(providerLoader, options);
   return all.find((c) => c.id === resolvedId && c.installed) || null;
 }
-var import_child_process, os6, path11, import_fs10;
+var import_child_process2, os6, path12, import_fs11;
 var init_cli_detector = __esm({
   "src/detection/cli-detector.ts"() {
     "use strict";
-    import_child_process = require("child_process");
+    import_child_process2 = require("child_process");
     os6 = __toESM(require("os"));
-    path11 = __toESM(require("path"));
-    import_fs10 = require("fs");
+    path12 = __toESM(require("path"));
+    import_fs11 = require("fs");
     init_provider_cli_shared();
   }
 });
@@ -10234,7 +10334,7 @@ async function maybeAutoFastForwardIdleNode(components, args) {
   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;
@@ -10433,8 +10533,10 @@ function injectMeshSystemMessage(components, args) {
     }
   }
   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);
@@ -10845,11 +10947,11 @@ function setupMeshEventForwarding(components) {
     });
   });
 }
-var import_fs11, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS;
+var import_fs12, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS;
 var init_mesh_events_coordinator = __esm({
   "src/mesh/mesh-events-coordinator.ts"() {
     "use strict";
-    import_fs11 = require("fs");
+    import_fs12 = require("fs");
     init_config();
     init_mesh_config();
     init_cli_detector();
@@ -12731,16 +12833,16 @@ __export(external_sources_exports, {
   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();
@@ -12807,7 +12909,7 @@ function inventoryExternalSources() {
   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 {
@@ -12818,7 +12920,7 @@ function inventoryExternalSources() {
     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 });
@@ -12828,9 +12930,9 @@ function inventoryExternalSources() {
       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;
@@ -12853,13 +12955,13 @@ function resolveActiveSource(category, type, activeFile) {
   }
   return { source: candidates[0], ambiguous: true, candidates };
 }
-var fs9, os11, path17, SOURCES_FILENAME, ACTIVE_FILENAME;
+var fs9, os11, path18, SOURCES_FILENAME, ACTIVE_FILENAME;
 var init_external_sources = __esm({
   "src/providers/external-sources.ts"() {
     "use strict";
     fs9 = __toESM(require("fs"));
     os11 = __toESM(require("os"));
-    path17 = __toESM(require("path"));
+    path18 = __toESM(require("path"));
     SOURCES_FILENAME = "providers-sources.json";
     ACTIVE_FILENAME = "providers-active.json";
   }
@@ -13037,59 +13139,6 @@ var init_terminal_screen = __esm({
   }
 });
 
-// src/cli-adapters/resolve-executable.ts
-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, import_fs14, path18, DIRECT_EXEC_EXT, WIN_EXEC_EXT;
-var init_resolve_executable = __esm({
-  "src/cli-adapters/resolve-executable.ts"() {
-    "use strict";
-    import_child_process4 = require("child_process");
-    import_fs14 = require("fs");
-    path18 = __toESM(require("path"));
-    DIRECT_EXEC_EXT = /* @__PURE__ */ new Set([".exe", ".com"]);
-    WIN_EXEC_EXT = [".exe", ".com", ".cmd", ".bat"];
-  }
-});
-
 // src/cli-adapters/pty-transport.ts
 var pty_transport_exports = {};
 __export(pty_transport_exports, {
@@ -15079,7 +15128,7 @@ function appendBoundedText(current, chunk, maxChars) {
   if (current.length <= keepFromCurrent) return current + chunk;
   return current.slice(-keepFromCurrent) + chunk;
 }
-var os14, import_session_host_core5, ProviderCliAdapter;
+var os14, import_session_host_core5, FORCE_SUBMIT_SETTLE_MS, FORCE_SUBMIT_MAX_WAIT_MS, FORCE_SUBMIT_POLL_MS, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -15096,6 +15145,9 @@ var init_provider_cli_adapter = __esm({
     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;
@@ -16024,9 +16076,23 @@ ${lastSnapshot}`;
           return;
         }
         LOG.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);
@@ -19793,13 +19859,20 @@ var MESH_REFINE_CONFIG_SCHEMA = {
 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) {
@@ -20009,12 +20082,13 @@ function resolveMeshRefineValidationPlan(mesh, workspace) {
 }
 
 // src/mesh/worktree-bootstrap-config.ts
-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 = __toESM(require("js-yaml"));
+init_resolve_executable();
 var MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS = [
   ".adhdev/worktree_bootstrap.json",
   ".adhdev/worktree_bootstrap.yaml",
@@ -20102,9 +20176,9 @@ function loadMeshWorktreeBootstrapConfig(mesh, workspace) {
   }
   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 };
@@ -20119,7 +20193,7 @@ function computeStaleInputsDigest(workspace, staleInputs) {
   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";
     }
@@ -20189,10 +20263,10 @@ async function runMeshWorktreeBootstrap(mesh, workspace) {
     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();
@@ -20203,8 +20277,9 @@ async function runMeshWorktreeBootstrap(mesh, workspace) {
     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,
@@ -20439,7 +20514,7 @@ var P2pRelayFailureError = class extends Error {
 };
 
 // src/config/state-store.ts
-var import_fs12 = require("fs");
+var import_fs13 = require("fs");
 var import_path10 = require("path");
 init_config();
 var DEFAULT_STATE = {
@@ -20490,11 +20565,11 @@ function normalizeState(raw) {
 }
 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 };
@@ -20503,28 +20578,28 @@ function loadState() {
 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 });
 }
 
 // src/detection/ide-detector.ts
-var import_child_process2 = require("child_process");
+var import_child_process3 = require("child_process");
 var import_util = require("util");
-var import_fs13 = require("fs");
+var import_fs14 = require("fs");
 var import_os2 = require("os");
-var path13 = __toESM(require("path"));
+var path14 = __toESM(require("path"));
 
 // src/detection/win32-ide-version.ts
 var fs5 = __toESM(require("fs"));
-var path12 = __toESM(require("path"));
+var path13 = __toESM(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) {
@@ -20542,9 +20617,9 @@ function readWin32IdeVersionFromDisk(exePath) {
   if (!exePath) return null;
   let exeDir;
   try {
-    exeDir = fs5.statSync(exePath).isDirectory() ? exePath : path12.dirname(exePath);
+    exeDir = fs5.statSync(exePath).isDirectory() ? exePath : path13.dirname(exePath);
   } catch {
-    exeDir = path12.dirname(exePath);
+    exeDir = path13.dirname(exePath);
   }
   for (const candidate of manifestCandidates(exeDir)) {
     try {
@@ -20558,7 +20633,7 @@ function readWin32IdeVersionFromDisk(exePath) {
 }
 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) {
@@ -20571,7 +20646,7 @@ function isKnownWin32GuiExe(binPath, win32ProcessNames) {
 }
 
 // src/detection/ide-detector.ts
-var execAsync2 = (0, import_util.promisify)(import_child_process2.exec);
+var execAsync2 = (0, import_util.promisify)(import_child_process3.exec);
 var BUILTIN_IDE_DEFINITIONS = [];
 var registeredIDEs = /* @__PURE__ */ new Map();
 function registerIDEDefinition(def) {
@@ -20590,10 +20665,10 @@ function getMergedDefinitions() {
 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_os2.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_os2.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_os2.platform)() === "win32";
   const paths = (process.env.PATH || "").split(isWin ? ";" : ":");
@@ -20601,10 +20676,10 @@ function findCliCommand(command) {
   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;
           }
@@ -20618,13 +20693,13 @@ function findCliCommand(command) {
 function checkPathExists(paths) {
   const home = (0, import_os2.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;
@@ -20638,7 +20713,7 @@ async function detectIDEs(providerLoader) {
     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");
@@ -20651,7 +20726,7 @@ async function detectIDEs(providerLoader) {
         `${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;
         }
@@ -20678,9 +20753,9 @@ init_cli_detector();
 
 // src/system/host-memory.ts
 var os7 = __toESM(require("os"));
-var import_child_process3 = require("child_process");
+var import_child_process4 = require("child_process");
 var import_util2 = require("util");
-var execAsync3 = (0, import_util2.promisify)(import_child_process3.exec);
+var execAsync3 = (0, import_util2.promisify)(import_child_process4.exec);
 var cachedDarwinAvail = null;
 var darwinMemoryInterval = null;
 async function updateDarwinMemoryCache() {
@@ -22509,10 +22584,10 @@ ${cleanBody}`;
 
 // src/config/chat-history.ts
 var fs6 = __toESM(require("fs"));
-var path14 = __toESM(require("path"));
+var path15 = __toESM(require("path"));
 var os8 = __toESM(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";
@@ -22698,7 +22773,7 @@ function extractSavedHistorySessionIdFromFile(file) {
 function buildSavedHistoryFileSignatureMap(dir, files) {
   return new Map(files.map((file) => {
     try {
-      const stat2 = fs6.statSync(path14.join(dir, file));
+      const stat2 = fs6.statSync(path15.join(dir, file));
       return [file, `${file}:${stat2.size}:${Math.trunc(stat2.mtimeMs)}`];
     } catch {
       return [file, `${file}:missing`];
@@ -22709,7 +22784,7 @@ function buildSavedHistoryCacheSignature(files, fileSignatures) {
   return files.map((file) => fileSignatures.get(file) || `${file}: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}`;
@@ -22811,7 +22886,7 @@ function savePersistedSavedHistoryIndex(dir, entries) {
     }
     for (const file of Array.from(currentEntries.keys())) {
       if (incomingFiles.has(file)) continue;
-      if (!fs6.existsSync(path14.join(dir, file))) {
+      if (!fs6.existsSync(path15.join(dir, file))) {
         currentEntries.delete(file);
       }
     }
@@ -22837,7 +22912,7 @@ function historyDirectoryHasFilesNewerThanIndex(dir) {
     const indexStat = fs6.statSync(getSavedHistoryIndexFilePath(dir));
     const files = listHistoryFiles(dir);
     for (const file of files) {
-      const stat2 = fs6.statSync(path14.join(dir, file));
+      const stat2 = fs6.statSync(path15.join(dir, file));
       if (stat2.mtimeMs > indexStat.mtimeMs) return true;
     }
     return false;
@@ -22847,14 +22922,14 @@ function historyDirectoryHasFilesNewerThanIndex(dir) {
 }
 function buildSavedHistoryFileSignature(dir, file) {
   try {
-    const stat2 = fs6.statSync(path14.join(dir, file));
+    const stat2 = fs6.statSync(path15.join(dir, file));
     return `${file}:${stat2.size}:${Math.trunc(stat2.mtimeMs)}`;
   } catch {
     return `${file}:missing`;
   }
 }
 function persistSavedHistoryFileSummaryEntry(agentType, dir, file, updater) {
-  const filePath = path14.join(dir, file);
+  const filePath = path15.join(dir, file);
   const result = withLockedPersistedSavedHistoryIndex(dir, (entries) => {
     const currentEntry = entries.get(file) || null;
     const nextSummary = updater(currentEntry?.summary || null);
@@ -22927,7 +23002,7 @@ function updateSavedHistoryIndexForAppendedMessages(agentType, dir, file, histor
 function computeSavedHistoryFileSummary(dir, file) {
   const historySessionId = extractSavedHistorySessionIdFromFile(file);
   if (!historySessionId) return null;
-  const filePath = path14.join(dir, file);
+  const filePath = path15.join(dir, file);
   const content = fs6.readFileSync(filePath, "utf-8");
   const lines = content.split("\n").filter(Boolean);
   let messageCount = 0;
@@ -23014,7 +23089,7 @@ function computeSavedHistorySessionSummaries(agentType, dir, files, fileSignatur
   const summaryBySessionId = /* @__PURE__ */ new Map();
   const nextPersistedEntries = /* @__PURE__ */ new Map();
   for (const file of files.slice().sort()) {
-    const filePath = path14.join(dir, file);
+    const filePath = path15.join(dir, file);
     const signature = fileSignatures.get(file) || `${file}:missing`;
     const cached3 = savedHistoryFileSummaryCache.get(filePath);
     const persisted = persistedEntries.get(file);
@@ -23134,12 +23209,12 @@ var ChatHistoryWriter = class {
         });
       }
       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 date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
       const filePrefix = effectiveHistoryKey ? `${this.sanitize(effectiveHistoryKey)}_` : "";
       const fileName = `${filePrefix}${date}.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);
@@ -23230,11 +23305,11 @@ var ChatHistoryWriter = class {
     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 date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
       const fileName = `${this.sanitize(id)}_${date}.jsonl`;
-      const filePath = path14.join(dir, fileName);
+      const filePath = path15.join(dir, fileName);
       const record = {
         ts: (/* @__PURE__ */ new Date()).toISOString(),
         receivedAt: Date.now(),
@@ -23280,14 +23355,14 @@ var ChatHistoryWriter = class {
         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((file) => file.startsWith(fromPrefix) && file.endsWith(".jsonl"));
       for (const file of files) {
-        const sourcePath = path14.join(dir, file);
-        const targetPath = path14.join(dir, `${toPrefix}${file.slice(fromPrefix.length)}`);
+        const sourcePath = path15.join(dir, file);
+        const targetPath = path15.join(dir, `${toPrefix}${file.slice(fromPrefix.length)}`);
         const sourceLines = fs6.readFileSync(sourcePath, "utf-8").split("\n").filter(Boolean);
         const rewritten = sourceLines.map((line) => {
           try {
@@ -23321,13 +23396,13 @@ var ChatHistoryWriter = class {
     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((file) => file.startsWith(prefix) && file.endsWith(".jsonl")).sort();
       const seen = /* @__PURE__ */ new Set();
       for (const file of files) {
-        const filePath = path14.join(dir, file);
+        const filePath = path15.join(dir, file);
         const lines = fs6.readFileSync(filePath, "utf-8").split("\n").filter(Boolean);
         const next = [];
         for (const line of lines) {
@@ -23381,11 +23456,11 @@ var ChatHistoryWriter = class {
       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 file of files) {
-          const filePath = path14.join(dirPath, file);
+          const filePath = path15.join(dirPath, file);
           const stat2 = fs6.statSync(filePath);
           if (stat2.mtimeMs < cutoff) {
             fs6.unlinkSync(filePath);
@@ -23588,7 +23663,7 @@ function readBoundedTailRecords(agentType, dir, files, needed) {
   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);
@@ -23621,7 +23696,7 @@ function readBoundedTailRecords(agentType, dir, files, needed) {
 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);
@@ -23644,7 +23719,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
     const allMessages = [];
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
-      const filePath = path14.join(dir, file);
+      const filePath = path15.join(dir, file);
       const content = fs6.readFileSync(filePath, "utf-8");
       const lines = content.trim().split("\n").filter(Boolean);
       for (let i = 0; i < lines.length; i++) {
@@ -23668,7 +23743,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
 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 };
@@ -23729,11 +23804,11 @@ function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
 }
 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 file of files) {
-      const lines = fs6.readFileSync(path14.join(dir, file), "utf-8").split("\n").filter(Boolean);
+      const lines = fs6.readFileSync(path15.join(dir, file), "utf-8").split("\n").filter(Boolean);
       for (const line of lines) {
         try {
           const parsed = JSON.parse(line);
@@ -23753,16 +23828,16 @@ function readExistingSessionStartRecord(agentType, historySessionId) {
 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 file of fs6.readdirSync(dir)) {
       if (file.startsWith(prefix) && file.endsWith(".jsonl")) {
-        fs6.unlinkSync(path14.join(dir, file));
+        fs6.unlinkSync(path15.join(dir, file));
       }
     }
     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((record) => JSON.stringify(record)).join("\n")}
 `, "utf-8");
     invalidatePersistedSavedHistoryIndex(agentType, dir);
@@ -26367,7 +26442,7 @@ function resolveLegacyProviderScript(fn, scriptName, params) {
 // src/commands/chat-commands.ts
 var fs7 = __toESM(require("fs"));
 var os9 = __toESM(require("os"));
-var path15 = __toESM(require("path"));
+var path16 = __toESM(require("path"));
 var import_node_crypto3 = require("crypto");
 init_contracts();
 init_logger();
@@ -27418,7 +27493,7 @@ function readExactRuntimeMirrorMessages(args) {
 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;
@@ -27903,7 +27978,7 @@ function buildDebugBundleText(bundle) {
 }
 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);
@@ -27960,7 +28035,7 @@ function storeChatDebugBundleOnDaemon(bundle, targetSessionId) {
   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 json = `${JSON.stringify(bundle, null, 2)}
 `;
   fs7.writeFileSync(savedPath, json, { encoding: "utf8", mode: 384 });
@@ -29524,7 +29599,7 @@ async function handleResolveAction(h, args) {
 
 // src/commands/cdp-commands.ts
 var fs8 = __toESM(require("fs"));
-var path16 = __toESM(require("path"));
+var path17 = __toESM(require("path"));
 var os10 = __toESM(require("os"));
 var KEY_TO_VK = {
   Backspace: 8,
@@ -29781,25 +29856,25 @@ function resolveSafePath(requestedPath) {
   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" });
@@ -29853,7 +29928,7 @@ async function handleFileRead(h, args) {
 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) {
@@ -43661,6 +43736,7 @@ var import_os3 = require("os");
 var import_path12 = require("path");
 var fs26 = __toESM(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",
@@ -44759,6 +44835,18 @@ function truncateValidationOutput(value) {
   return `${text.slice(0, REFINE_VALIDATION_SUMMARY_CHARS)}
 [truncated ${text.length - REFINE_VALIDATION_SUMMARY_CHARS} chars]`;
 }
+function isSpawnResolutionError(error) {
+  if (!error) return false;
+  if (error.code === "ENOENT" && typeof error.syscall === "string" && error.syscall.startsWith("spawn")) return true;
+  return error.code === "ENOENT" && (error.syscall === void 0 || String(error.syscall).startsWith("spawn"));
+}
+function describeSpawnError(error, 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(error?.message || error);
+}
 function recordMeshRefineStage(stages, stage, status, startedAt, details) {
   stages.push({
     stage,
@@ -45660,8 +45748,9 @@ async function runMeshRefineValidationGate(mesh, workspace, opts) {
       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,
@@ -45670,16 +45759,17 @@ async function runMeshRefineValidationGate(mesh, workspace, opts) {
         });
         summary.bootstrapCommandsRun.push(commandRecord(candidate, cwd, startedAt, result, true, { exitCode: 0 }));
       } catch (error) {
+        const spawnResolutionFailed = isSpawnResolutionError(error);
         summary.bootstrapCommandsRun.push(commandRecord(candidate, cwd, startedAt, error, false, {
           exitCode: typeof error?.code === "number" ? error.code : null,
           signal: typeof error?.signal === "string" ? error.signal : null,
           timedOut: error?.killed === true || /timed out/i.test(String(error?.message || "")),
-          failureKind: "dependency_bootstrap_failed"
+          ...spawnResolutionFailed ? { failureKind: "spawn_resolution_failed", resolvedCommand } : { failureKind: "dependency_bootstrap_failed" }
         }));
-        summary.bootstrap = { stage: "failed", error: String(error?.message || error) };
+        summary.bootstrap = { stage: "failed", error: describeSpawnError(error, 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;
       }
     }
@@ -45702,8 +45792,9 @@ async function runMeshRefineValidationGate(mesh, workspace, opts) {
       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,
@@ -45712,16 +45803,21 @@ async function runMeshRefineValidationGate(mesh, workspace, opts) {
       });
       summary.commandsRun.push(commandRecord(candidate, cwd, startedAt, result, true, { exitCode: 0 }));
     } catch (error) {
+      const spawnResolutionFailed = isSpawnResolutionError(error);
       const stderr = truncateValidationOutput(error?.stderr || error?.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, error, false, {
         exitCode: typeof error?.code === "number" ? error.code : null,
         signal: typeof error?.signal === "string" ? error.signal : null,
         timedOut: error?.killed === true || /timed out/i.test(String(error?.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(error, candidate.command, true);
+      } else if (missingDependencyFailure) {
         summary.failureKind = "missing_dependencies";
         summary.failureCode = "missing_dependencies";
       }
@@ -46982,7 +47078,7 @@ var DaemonCommandRouter = class {
       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");