@adhdev/daemon-core 0.9.82-rc.332 → 0.9.82-rc.334

package/dist/index.mjs

@@ -311,10 +311,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "2466d8b001000d509eb9058a0c51ec6f383741ed" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "2466d8b0" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.332" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-20T01:55:54.421Z" : void 0);
+  const commit = readInjected(true ? "9e5ae5d2814077a6bf9e982b17066ca2051da97b" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "9e5ae5d2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.334" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-20T03:55:49.426Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -582,10 +582,10 @@ async function getGitRepoStatus(workspace, options = {}) {
   } catch (error) {
     const gitError = error instanceof GitCommandError ? error : new GitCommandError("git_command_failed", "Failed to read Git status", { cause: error });
     if (isTransientGitFailure(gitError)) {
-      const cached2 = lastKnownGoodStatus.get(workspace);
-      if (cached2) {
+      const cached3 = lastKnownGoodStatus.get(workspace);
+      if (cached3) {
         return {
-          ...cached2,
+          ...cached3,
           lastCheckedAt,
           upstreamStatus: "unavailable",
           error: gitError.stderr || gitError.message,
@@ -708,9 +708,9 @@ function resolveChangeImpactConfigForRepo(repoRoot, options) {
     return { config: null, sourceKey: "no-repo-root" };
   }
   const loaded = loadChangeImpactConfig(repoRoot);
-  const cached2 = changeImpactConfigCache.get(repoRoot);
-  if (cached2 && cached2.sourceKey === loaded.sourceKey) {
-    return { config: cached2.config, sourceKey: loaded.sourceKey };
+  const cached3 = changeImpactConfigCache.get(repoRoot);
+  if (cached3 && cached3.sourceKey === loaded.sourceKey) {
+    return { config: cached3.config, sourceKey: loaded.sourceKey };
   }
   const config = loaded.sourceType === "repo_file" ? loaded.config ?? null : null;
   changeImpactConfigCache.set(repoRoot, { sourceKey: loaded.sourceKey, config });
@@ -2536,6 +2536,46 @@ Follow these recovery rules:
   }
 });
 
+// src/system/load-better-sqlite3.ts
+import { createRequire } from "module";
+function loadBetterSqlite3() {
+  if (cached2) return cached2;
+  const errors = [];
+  if (typeof __require === "function") {
+    try {
+      cached2 = __require("better-sqlite3");
+      return cached2;
+    } catch (e) {
+      errors.push(e);
+    }
+  }
+  try {
+    const metaUrl = typeof import.meta?.url === "string" ? import.meta.url : void 0;
+    if (metaUrl) {
+      cached2 = createRequire(metaUrl)("better-sqlite3");
+      return cached2;
+    }
+  } catch (e) {
+    errors.push(e);
+  }
+  try {
+    cached2 = createRequire(`${process.cwd()}/__adhdev_better_sqlite3_loader__.js`)(
+      "better-sqlite3"
+    );
+    return cached2;
+  } catch (e) {
+    errors.push(e);
+  }
+  const detail = errors.map((e) => e instanceof Error ? e.message : String(e)).join("; ");
+  throw new Error(`Failed to load better-sqlite3: ${detail}`);
+}
+var cached2;
+var init_load_better_sqlite3 = __esm({
+  "src/system/load-better-sqlite3.ts"() {
+    "use strict";
+  }
+});
+
 // src/mesh/mesh-ledger.ts
 var mesh_ledger_exports = {};
 __export(mesh_ledger_exports, {
@@ -2969,8 +3009,8 @@ function readLedgerFromStore(meshId) {
 }
 function getCachedRawEntries(meshId) {
   const now = Date.now();
-  const cached2 = ledgerReadCache.get(meshId);
-  if (cached2 && now - cached2.cachedAt < LEDGER_CACHE_TTL_MS) return cached2.entries;
+  const cached3 = ledgerReadCache.get(meshId);
+  if (cached3 && now - cached3.cachedAt < LEDGER_CACHE_TTL_MS) return cached3.entries;
   let entries;
   try {
     entries = readLedgerFromStore(meshId);
@@ -3214,6 +3254,297 @@ var init_mesh_ledger = __esm({
   }
 });
 
+// src/logging/async-batch-writer.ts
+import * as fs3 from "fs";
+var AsyncBatchWriter;
+var init_async_batch_writer = __esm({
+  "src/logging/async-batch-writer.ts"() {
+    "use strict";
+    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
+});
+import * as fs4 from "fs";
+import * as path9 from "path";
+import * as os3 from "os";
+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 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";
+    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, {
@@ -3679,11 +4010,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;
   });
@@ -3791,6 +4129,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"];
@@ -3847,33 +4186,31 @@ var init_mesh_work_queue = __esm({
 });
 
 // src/mesh/mesh-runtime-store.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync as renameSync2, statSync as statSync4 } from "fs";
-import { dirname as dirname2, join as join8 } from "path";
-import { createRequire } from "module";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync3, statSync as statSync5 } from "fs";
+import { dirname as dirname2, join as join9 } from "path";
 function loadDatabaseCtor() {
   if (DatabaseCtor) return DatabaseCtor;
-  const runtimeRequire = typeof __require === "function" ? __require : createRequire(import.meta.url);
-  DatabaseCtor = runtimeRequire("better-sqlite3");
+  DatabaseCtor = loadBetterSqlite3();
   return DatabaseCtor;
 }
 function safeMeshId(meshId) {
   return meshId.replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 function legacyQueuePath(meshId) {
-  return join8(getLedgerDir(), `${safeMeshId(meshId)}.queue.json`);
+  return join9(getLedgerDir(), `${safeMeshId(meshId)}.queue.json`);
 }
 function meshRuntimeStorePath() {
   const dir = getLedgerDir();
-  const nextPath = join8(dir, "mesh-runtime.db");
-  if (existsSync7(nextPath)) return nextPath;
-  const legacyPath = join8(dir, "beads.db");
-  if (!existsSync7(legacyPath)) return nextPath;
+  const nextPath = join9(dir, "mesh-runtime.db");
+  if (existsSync8(nextPath)) return nextPath;
+  const legacyPath = join9(dir, "beads.db");
+  if (!existsSync8(legacyPath)) return nextPath;
   try {
-    renameSync2(legacyPath, nextPath);
+    renameSync3(legacyPath, nextPath);
     for (const suffix of ["-wal", "-shm"]) {
       const legacyCompanion = `${legacyPath}${suffix}`;
-      if (existsSync7(legacyCompanion)) {
-        renameSync2(legacyCompanion, `${nextPath}${suffix}`);
+      if (existsSync8(legacyCompanion)) {
+        renameSync3(legacyCompanion, `${nextPath}${suffix}`);
       }
     }
   } catch {
@@ -3884,6 +4221,7 @@ var DatabaseCtor, MeshRuntimeStore;
 var init_mesh_runtime_store = __esm({
   "src/mesh/mesh-runtime-store.ts"() {
     "use strict";
+    init_load_better_sqlite3();
     init_mesh_ledger();
     init_mesh_work_queue();
     MeshRuntimeStore = class _MeshRuntimeStore {
@@ -3898,7 +4236,7 @@ var init_mesh_runtime_store = __esm({
       // 50 MB
       constructor(dbPath) {
         const dir = dirname2(dbPath);
-        if (!existsSync7(dir)) mkdirSync4(dir, { recursive: true });
+        if (!existsSync8(dir)) mkdirSync5(dir, { recursive: true });
         this.dbPath = dbPath;
         this.db = new (loadDatabaseCtor())(dbPath);
         this.db.pragma("journal_mode = WAL");
@@ -4153,8 +4491,8 @@ var init_mesh_runtime_store = __esm({
         this.walWriteCounter = 0;
         try {
           const walPath = `${this.dbPath}-wal`;
-          if (!existsSync7(walPath)) return;
-          const size = statSync4(walPath).size;
+          if (!existsSync8(walPath)) return;
+          const size = statSync5(walPath).size;
           if (size < _MeshRuntimeStore.WAL_MAX_BYTES) return;
           process.stderr.write(
             `[adhdev-mesh] WAL file ${Math.round(size / 1024 / 1024)}MB exceeds threshold; forcing checkpoint
@@ -4170,7 +4508,7 @@ var init_mesh_runtime_store = __esm({
         const count = this.db.prepare("SELECT COUNT(*) AS count FROM mesh_queue WHERE mesh_id = ?").get(meshId);
         if (count.count > 0) return;
         const path42 = legacyQueuePath(meshId);
-        if (!existsSync7(path42)) return;
+        if (!existsSync8(path42)) return;
         try {
           const entries = JSON.parse(readFileSync6(path42, "utf-8"));
           if (!Array.isArray(entries)) return;
@@ -4450,12 +4788,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 {
@@ -5711,297 +6088,6 @@ var init_mesh_review_inbox = __esm({
   }
 });
 
-// src/logging/async-batch-writer.ts
-import * as fs3 from "fs";
-var AsyncBatchWriter;
-var init_async_batch_writer = __esm({
-  "src/logging/async-batch-writer.ts"() {
-    "use strict";
-    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
-});
-import * as fs4 from "fs";
-import * as path9 from "path";
-import * as os3 from "os";
-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 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";
-    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, {
@@ -6403,6 +6489,59 @@ var init_mesh_coordinator = __esm({
   }
 });
 
+// src/cli-adapters/resolve-executable.ts
+import { execFileSync } from "child_process";
+import { existsSync as existsSync12 } from "fs";
+import * as path10 from "path";
+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 (existsSync12(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) && existsSync12(trimmed)) return trimmed;
+  try {
+    const out = 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 DIRECT_EXEC_EXT, WIN_EXEC_EXT;
+var init_resolve_executable = __esm({
+  "src/cli-adapters/resolve-executable.ts"() {
+    "use strict";
+    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() : "";
@@ -7854,8 +7993,8 @@ var init_mesh_events_utils = __esm({
 });
 
 // src/mesh/mesh-events-pending.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync13, readFileSync as readFileSync11, renameSync as renameSync4, statSync as statSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "fs";
-import { join as join14 } from "path";
+import { appendFileSync as appendFileSync2, existsSync as existsSync14, readFileSync as readFileSync11, renameSync as renameSync4, statSync as statSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "fs";
+import { join as join15 } from "path";
 import { randomUUID as randomUUID7 } from "crypto";
 function normalizeCoordinatorDaemonIds(coordinatorDaemonId) {
   const raw = Array.isArray(coordinatorDaemonId) ? coordinatorDaemonId : coordinatorDaemonId != null ? [coordinatorDaemonId] : [];
@@ -7918,9 +8057,9 @@ function getPendingEventsPath(meshId, coordinatorDaemonId) {
   const safe = meshId.replace(/[^a-zA-Z0-9_-]/g, "_");
   if (coordinatorDaemonId) {
     const safeDaemon = coordinatorDaemonId.replace(/[^a-zA-Z0-9_-]/g, "_");
-    return join14(getLedgerDir(), `${safe}-${safeDaemon}.pending-events.jsonl`);
+    return join15(getLedgerDir(), `${safe}-${safeDaemon}.pending-events.jsonl`);
   }
-  return join14(getLedgerDir(), `${safe}.pending-events.jsonl`);
+  return join15(getLedgerDir(), `${safe}.pending-events.jsonl`);
 }
 function readPendingMeshCoordinatorEventsFromDisk(meshId, coordinatorDaemonId) {
   if (!meshId) return [];
@@ -7929,7 +8068,7 @@ function readPendingMeshCoordinatorEventsFromDisk(meshId, coordinatorDaemonId) {
   const paths = primaryDaemonId ? [getPendingEventsPath(meshId, primaryDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
   const events = [];
   for (const path42 of paths) {
-    if (!existsSync13(path42)) continue;
+    if (!existsSync14(path42)) continue;
     try {
       const raw = readFileSync11(path42, "utf-8");
       const parsed = raw.split("\n").filter(Boolean).flatMap((line) => {
@@ -8006,7 +8145,7 @@ function reconcilePendingMeshCoordinatorEvents(meshId, events) {
 }
 function trimPendingEventsIfNeeded(path42) {
   try {
-    if (!existsSync13(path42)) return;
+    if (!existsSync14(path42)) return;
     if (statSync6(path42).size <= MAX_PENDING_EVENTS_BYTES) return;
     const lines = readFileSync11(path42, "utf-8").split("\n").filter(Boolean);
     if (lines.length <= MAX_PENDING_EVENTS_KEEP) return;
@@ -8108,7 +8247,7 @@ function selectiveDrainFile(path42, predicate) {
     unlinkSync2(tmpPath);
   } catch {
     try {
-      if (existsSync13(tmpPath) && !existsSync13(path42)) renameSync4(tmpPath, path42);
+      if (existsSync14(tmpPath) && !existsSync14(path42)) renameSync4(tmpPath, path42);
     } catch {
     }
     return [];
@@ -8202,7 +8341,7 @@ function clearPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId) {
   }
   const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
   for (const path42 of paths) {
-    if (existsSync13(path42)) try {
+    if (existsSync14(path42)) try {
       unlinkSync2(path42);
     } catch {
     }
@@ -8633,7 +8772,7 @@ var init_spawn_env = __esm({
 
 // src/cli-adapters/provider-cli-shared.ts
 import * as os5 from "os";
-import * as path10 from "path";
+import * as path11 from "path";
 function stripAnsi(str) {
   return str.replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
 }
@@ -8709,24 +8848,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 {
     }
   }
@@ -8735,7 +8874,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)) {
@@ -8751,7 +8890,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);
@@ -8767,7 +8906,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);
@@ -9024,8 +9163,8 @@ var init_provider_cli_shared = __esm({
 // src/detection/cli-detector.ts
 import { exec } from "child_process";
 import * as os6 from "os";
-import * as path11 from "path";
-import { existsSync as existsSync14 } from "fs";
+import * as path12 from "path";
+import { existsSync as existsSync15 } from "fs";
 function parseVersion(raw) {
   const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
   return match ? match[1] : raw.split("\n")[0].slice(0, 100);
@@ -9037,19 +9176,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 existsSync14(candidate) ? candidate : null;
+    const candidate = path12.isAbsolute(expanded) ? expanded : path12.resolve(expanded);
+    return existsSync15(candidate) ? candidate : null;
   }
   return null;
 }
@@ -9059,7 +9198,7 @@ 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) && existsSync14(resolved)) return resolved;
+  if (path12.isAbsolute(resolved) && existsSync15(resolved)) return resolved;
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
@@ -9404,7 +9543,7 @@ var init_mesh_unresolved_forward_outbox = __esm({
 });
 
 // src/mesh/mesh-events-coordinator.ts
-import { existsSync as existsSync15 } from "fs";
+import { existsSync as existsSync16 } from "fs";
 function resolveCoordinatorDrainDaemonIds(components) {
   const ids = /* @__PURE__ */ new Set();
   const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
@@ -9415,8 +9554,8 @@ function resolveCoordinatorDrainDaemonIds(components) {
 }
 function getCachedMeshByWorkspace(workspace) {
   const now = Date.now();
-  const cached2 = meshByWorkspaceCache.get(workspace);
-  if (cached2 && now - cached2.cachedAt < MESH_WORKSPACE_CACHE_TTL_MS) return cached2.mesh;
+  const cached3 = meshByWorkspaceCache.get(workspace);
+  if (cached3 && now - cached3.cachedAt < MESH_WORKSPACE_CACHE_TTL_MS) return cached3.mesh;
   const mesh = getMeshByRepo(workspace);
   meshByWorkspaceCache.set(workspace, { mesh, cachedAt: now });
   return mesh;
@@ -10192,7 +10331,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 (!existsSync15(workspace)) return;
+  if (!existsSync16(workspace)) return;
   const policy = resolveAutoFastForwardPolicy(mesh);
   if (!policy.enabled) return;
   if (nodeHasActiveMeshWork(components, args.meshId, args.nodeId, args.sessionId)) return;
@@ -10391,8 +10530,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);
@@ -12689,18 +12830,18 @@ __export(external_sources_exports, {
 });
 import * as fs9 from "fs";
 import * as os11 from "os";
-import * as path17 from "path";
+import * as path18 from "path";
 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();
@@ -12767,7 +12908,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 {
@@ -12778,7 +12919,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 });
@@ -12788,9 +12929,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;
@@ -12994,59 +13135,6 @@ var init_terminal_screen = __esm({
   }
 });
 
-// src/cli-adapters/resolve-executable.ts
-import { execFileSync } from "child_process";
-import { existsSync as existsSync22 } from "fs";
-import * as path18 from "path";
-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 (existsSync22(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) && existsSync22(trimmed)) return trimmed;
-  try {
-    const out = 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 DIRECT_EXEC_EXT, WIN_EXEC_EXT;
-var init_resolve_executable = __esm({
-  "src/cli-adapters/resolve-executable.ts"() {
-    "use strict";
-    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, {
@@ -15260,10 +15348,10 @@ ${lastSnapshot}`;
         return this.accumulatedRawBuffer.replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
       }
       getFreshParsedStatusCache() {
-        const cached2 = this.parsedStatusCache;
+        const cached3 = this.parsedStatusCache;
         const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
-        if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.engine.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.engine.currentStatus && cached2.activeModal === this.engine.activeModal && cached2.cliName === this.cliName) {
-          return cached2.result;
+        if (cached3 && cached3.responseBuffer === this.responseBuffer && cached3.currentTurnScope === this.engine.currentTurnScope && cached3.recentOutputBuffer === this.recentOutputBuffer && cached3.accumulatedBuffer === this.accumulatedBuffer && cached3.accumulatedRawBufferKey === accumulatedRawBufferKey && cached3.screenText === this.lastScreenText && cached3.currentStatus === this.engine.currentStatus && cached3.activeModal === this.engine.activeModal && cached3.cliName === this.cliName) {
+          return cached3.result;
         }
         return null;
       }
@@ -15725,10 +15813,10 @@ ${lastSnapshot}`;
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
         const parseScreenText = this.getParseScreenText(screenText);
-        const cached2 = this.parsedStatusCache;
+        const cached3 = this.parsedStatusCache;
         const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
-        if (!this.providerOwnsTranscript() && cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.engine.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === parseScreenText && cached2.currentStatus === this.engine.currentStatus && cached2.activeModal === this.engine.activeModal && cached2.cliName === this.cliName) {
-          return cached2.result;
+        if (!this.providerOwnsTranscript() && cached3 && cached3.responseBuffer === this.responseBuffer && cached3.currentTurnScope === this.engine.currentTurnScope && cached3.recentOutputBuffer === this.recentOutputBuffer && cached3.accumulatedBuffer === this.accumulatedBuffer && cached3.accumulatedRawBufferKey === accumulatedRawBufferKey && cached3.screenText === parseScreenText && cached3.currentStatus === this.engine.currentStatus && cached3.activeModal === this.engine.activeModal && cached3.cliName === this.cliName) {
+          return cached3.result;
         }
         const parsed = this.runParseSession();
         if (!parsed || !Array.isArray(parsed.messages)) {
@@ -19394,13 +19482,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) {
@@ -19610,8 +19705,9 @@ function resolveMeshRefineValidationPlan(mesh, workspace) {
 }
 
 // src/mesh/worktree-bootstrap-config.ts
-import { existsSync as existsSync12, readFileSync as readFileSync10 } from "fs";
-import { join as join13, resolve as pathResolve } from "path";
+init_resolve_executable();
+import { existsSync as existsSync13, readFileSync as readFileSync10 } from "fs";
+import { join as join14, resolve as pathResolve } from "path";
 import { execFile as execFile3 } from "child_process";
 import { createHash as createHash3 } from "crypto";
 import { promisify as promisify3 } from "util";
@@ -19702,8 +19798,8 @@ function loadMeshWorktreeBootstrapConfig(mesh, workspace) {
     return { config: inline, source: "mesh.policy.worktreeBootstrapConfig", sourceType: "mesh_policy" };
   }
   for (const relative5 of MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS) {
-    const configPath = join13(workspace, relative5);
-    if (!existsSync12(configPath)) continue;
+    const configPath = join14(workspace, relative5);
+    if (!existsSync13(configPath)) continue;
     try {
       const parsed = parseConfigText3(configPath, readFileSync10(configPath, "utf-8"));
       const validation = validateMeshWorktreeBootstrapConfig(parsed, relative5);
@@ -19718,7 +19814,7 @@ function loadMeshWorktreeBootstrapConfig(mesh, workspace) {
 function computeStaleInputsDigest(workspace, staleInputs) {
   const digest = {};
   for (const relative5 of staleInputs ?? []) {
-    const filePath = join13(workspace, relative5);
+    const filePath = join14(workspace, relative5);
     try {
       digest[relative5] = createHash3("sha256").update(readFileSync10(filePath)).digest("hex");
     } catch {
@@ -19790,10 +19886,10 @@ async function runMeshWorktreeBootstrap(mesh, workspace) {
     staleInputs: loaded.config.staleInputs
   };
   const staleInputPaths = loaded.config.staleInputs ?? [];
-  const initiallyAbsent = staleInputPaths.filter((p) => !existsSync12(join13(workspace, p)));
+  const initiallyAbsent = staleInputPaths.filter((p) => !existsSync13(join14(workspace, p)));
   for (const command of validation.commands) {
     if (initiallyAbsent.length > 0) {
-      const appearedNow = initiallyAbsent.filter((p) => existsSync12(join13(workspace, p)));
+      const appearedNow = initiallyAbsent.filter((p) => existsSync13(join14(workspace, p)));
       if (appearedNow.length > 0) {
         state.status = "stale";
         state.completedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -19804,8 +19900,9 @@ async function runMeshWorktreeBootstrap(mesh, workspace) {
     const cwd = command.cwd ? pathResolve(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,
@@ -20041,8 +20138,8 @@ var P2pRelayFailureError = class extends Error {
 
 // src/config/state-store.ts
 init_config();
-import { existsSync as existsSync16, readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "fs";
-import { join as join17 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "fs";
+import { join as join18 } from "path";
 var DEFAULT_STATE = {
   recentActivity: [],
   savedProviderSessions: [],
@@ -20055,7 +20152,7 @@ function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function getStatePath() {
-  return join17(getConfigDir(), "state.json");
+  return join18(getConfigDir(), "state.json");
 }
 function normalizeState(raw) {
   const parsed = isPlainObject2(raw) ? raw : {};
@@ -20091,7 +20188,7 @@ function normalizeState(raw) {
 }
 function loadState() {
   const statePath = getStatePath();
-  if (!existsSync16(statePath)) {
+  if (!existsSync17(statePath)) {
     return { ...DEFAULT_STATE };
   }
   try {
@@ -20113,19 +20210,19 @@ function resetState() {
 // src/detection/ide-detector.ts
 import { exec as exec2 } from "child_process";
 import { promisify as promisify4 } from "util";
-import { existsSync as existsSync18, statSync as statSync8 } from "fs";
+import { existsSync as existsSync19, statSync as statSync8 } from "fs";
 import { platform as platform3, homedir as homedir8 } from "os";
-import * as path13 from "path";
+import * as path14 from "path";
 
 // src/detection/win32-ide-version.ts
 import * as fs5 from "fs";
-import * as path12 from "path";
+import * as path13 from "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) {
@@ -20143,9 +20240,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 {
@@ -20159,7 +20256,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) {
@@ -20191,10 +20288,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(homedir8(), trimmed.slice(1)) : trimmed;
-    const resolved = path13.isAbsolute(candidate) ? candidate : path13.resolve(candidate);
-    return existsSync18(resolved) ? resolved : null;
+  if (path14.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
+    const candidate = trimmed.startsWith("~") ? path14.join(homedir8(), trimmed.slice(1)) : trimmed;
+    const resolved = path14.isAbsolute(candidate) ? candidate : path14.resolve(candidate);
+    return existsSync19(resolved) ? resolved : null;
   }
   const isWin = platform3() === "win32";
   const paths = (process.env.PATH || "").split(isWin ? ";" : ":");
@@ -20202,9 +20299,9 @@ 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 (existsSync18(fullPath)) {
+        if (existsSync19(fullPath)) {
           const stat2 = statSync8(fullPath);
           if (stat2.isFile() && (isWin || stat2.mode & 73)) {
             return fullPath;
@@ -20219,13 +20316,13 @@ function findCliCommand(command) {
 function checkPathExists(paths) {
   const home = homedir8();
   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 (existsSync18(resolved)) return resolved;
+      if (existsSync19(resolved)) return resolved;
     } else {
-      if (existsSync18(normalized)) return normalized;
+      if (existsSync19(normalized)) return normalized;
     }
   }
   return null;
@@ -20239,7 +20336,7 @@ async function detectIDEs(providerLoader) {
     let resolvedCli = cliPath;
     if (!resolvedCli && appPath && os30 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
-      if (existsSync18(bundledCli)) resolvedCli = bundledCli;
+      if (existsSync19(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os30 === "win32") {
       const { dirname: dirname17 } = await import("path");
@@ -20252,7 +20349,7 @@ async function detectIDEs(providerLoader) {
         `${appDir}\\\\resources\\\\app\\\\bin\\\\${def.cli}.cmd`
       ];
       for (const c of candidates) {
-        if (existsSync18(c)) {
+        if (existsSync19(c)) {
           resolvedCli = c;
           break;
         }
@@ -22111,9 +22208,9 @@ ${cleanBody}`;
 // src/config/chat-history.ts
 init_chat_message_normalization();
 import * as fs6 from "fs";
-import * as path14 from "path";
+import * as path15 from "path";
 import * as os8 from "os";
-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";
@@ -22129,11 +22226,11 @@ var savedHistoryRollupInFlight = /* @__PURE__ */ new Set();
 var BOUNDED_TAIL_CACHE_MAX_ENTRIES = 64;
 var boundedTailReadCache = /* @__PURE__ */ new Map();
 function readBoundedTailCache(key, signature) {
-  const cached2 = boundedTailReadCache.get(key);
-  if (!cached2 || cached2.signature !== signature) return null;
+  const cached3 = boundedTailReadCache.get(key);
+  if (!cached3 || cached3.signature !== signature) return null;
   boundedTailReadCache.delete(key);
-  boundedTailReadCache.set(key, cached2);
-  return cached2.result;
+  boundedTailReadCache.set(key, cached3);
+  return cached3.result;
 }
 function writeBoundedTailCache(key, signature, result) {
   boundedTailReadCache.delete(key);
@@ -22299,7 +22396,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`];
@@ -22310,7 +22407,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}`;
@@ -22412,7 +22509,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);
       }
     }
@@ -22438,7 +22535,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;
@@ -22448,14 +22545,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);
@@ -22528,7 +22625,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;
@@ -22615,11 +22712,11 @@ 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 cached2 = savedHistoryFileSummaryCache.get(filePath);
+    const cached3 = savedHistoryFileSummaryCache.get(filePath);
     const persisted = persistedEntries.get(file);
-    const reusableEntry = cached2?.signature === signature ? cached2 : persisted?.signature === signature ? persisted : null;
+    const reusableEntry = cached3?.signature === signature ? cached3 : persisted?.signature === signature ? persisted : null;
     const fileSummary = reusableEntry?.summary || computeSavedHistoryFileSummary(dir, file);
     const nextEntry = reusableEntry || {
       signature,
@@ -22735,12 +22832,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);
@@ -22831,11 +22928,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(),
@@ -22881,14 +22978,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 {
@@ -22922,13 +23019,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) {
@@ -22982,11 +23079,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);
@@ -23115,16 +23212,16 @@ function readFileTailLines(filePath, needed) {
     incrementalTailCache.delete(filePath);
     return { lines: [], coversWholeFile: true };
   }
-  const cached2 = incrementalTailCache.get(filePath);
-  if (cached2) {
-    if (cached2.size === size && cached2.mtimeMs === mtimeMs) {
+  const cached3 = incrementalTailCache.get(filePath);
+  if (cached3) {
+    if (cached3.size === size && cached3.mtimeMs === mtimeMs) {
       incrementalTailCache.delete(filePath);
-      incrementalTailCache.set(filePath, cached2);
-      if (cached2.coversWholeFile || cached2.lines.length >= needed) {
-        return { lines: cached2.lines, coversWholeFile: cached2.coversWholeFile };
+      incrementalTailCache.set(filePath, cached3);
+      if (cached3.coversWholeFile || cached3.lines.length >= needed) {
+        return { lines: cached3.lines, coversWholeFile: cached3.coversWholeFile };
       }
-    } else if (size > cached2.size) {
-      const incremental = tryIncrementalTailGrowth(filePath, cached2, size, mtimeMs, needed);
+    } else if (size > cached3.size) {
+      const incremental = tryIncrementalTailGrowth(filePath, cached3, size, mtimeMs, needed);
       if (incremental) return { lines: incremental.lines, coversWholeFile: incremental.coversWholeFile };
     }
     incrementalTailCache.delete(filePath);
@@ -23150,22 +23247,22 @@ function readFileTailLines(filePath, needed) {
   storeIncrementalTailCache(filePath, result.size, result.mtimeMs, result.lines, result.coversWholeFile);
   return { lines: result.lines, coversWholeFile: result.coversWholeFile };
 }
-function tryIncrementalTailGrowth(filePath, cached2, size, mtimeMs, needed) {
+function tryIncrementalTailGrowth(filePath, cached3, size, mtimeMs, needed) {
   const fd = fs6.openSync(filePath, "r");
   try {
-    if (cached2.size > 0) {
+    if (cached3.size > 0) {
       const boundary = Buffer.alloc(1);
-      fs6.readSync(fd, boundary, 0, 1, cached2.size - 1);
+      fs6.readSync(fd, boundary, 0, 1, cached3.size - 1);
       if (boundary[0] !== 10) return null;
     }
-    const appendedLength = size - cached2.size;
+    const appendedLength = size - cached3.size;
     const appended = Buffer.alloc(appendedLength);
-    fs6.readSync(fd, appended, 0, appendedLength, cached2.size);
+    fs6.readSync(fd, appended, 0, appendedLength, cached3.size);
     const newLines = appended.toString("utf-8").split("\n");
     if (newLines.length && newLines[newLines.length - 1] === "") newLines.pop();
-    const merged = cached2.lines.concat(newLines);
+    const merged = cached3.lines.concat(newLines);
     const trimmed = merged.length > TAIL_LINES_RETAINED ? merged.slice(merged.length - TAIL_LINES_RETAINED) : merged;
-    const coversWholeFile = cached2.coversWholeFile && trimmed.length === merged.length;
+    const coversWholeFile = cached3.coversWholeFile && trimmed.length === merged.length;
     storeIncrementalTailCache(filePath, size, mtimeMs, trimmed, coversWholeFile);
     if (coversWholeFile || trimmed.length >= needed) {
       return { lines: trimmed, coversWholeFile };
@@ -23189,7 +23286,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);
@@ -23222,7 +23319,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);
@@ -23230,8 +23327,8 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
       const fileSignatures = buildSavedHistoryFileSignatureMap(dir, files);
       const cacheKey = `${sanitized}\0${historySessionId || ""}\0${offset}\0${limit}\0${excludeRecentCount}\0${historyBehavior?.collapseConsecutiveAssistantTurns ? "1" : "0"}`;
       const signature = buildSavedHistoryCacheSignature(files, fileSignatures);
-      const cached2 = readBoundedTailCache(cacheKey, signature);
-      if (cached2) return cached2;
+      const cached3 = readBoundedTailCache(cacheKey, signature);
+      if (cached3) return cached3;
       const numericLimit = Math.max(1, Number(limit));
       const numericOffset = Math.max(0, Number(offset));
       const numericExclude = Math.max(0, Number(excludeRecentCount));
@@ -23245,7 +23342,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++) {
@@ -23269,28 +23366,28 @@ 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 };
     }
-    const cached2 = savedHistorySessionCache.get(sanitized);
+    const cached3 = savedHistorySessionCache.get(sanitized);
     const offset = Math.max(0, options.offset || 0);
     const limit = Math.max(1, options.limit || 30);
     const indexSignature = buildSavedHistoryIndexFileSignature(dir);
     let cacheWasInvalidated = false;
-    if (cached2) {
-      const cacheLooksPersisted = cached2.signature.startsWith("index:");
-      const cacheStillValid = cacheLooksPersisted ? cached2.signature === indexSignature : (() => {
+    if (cached3) {
+      const cacheLooksPersisted = cached3.signature.startsWith("index:");
+      const cacheStillValid = cacheLooksPersisted ? cached3.signature === indexSignature : (() => {
         const files2 = listHistoryFiles(dir);
         const fileSignatures2 = buildSavedHistoryFileSignatureMap(dir, files2);
-        return cached2.signature === buildSavedHistoryCacheSignature(files2, fileSignatures2);
+        return cached3.signature === buildSavedHistoryCacheSignature(files2, fileSignatures2);
       })();
       if (cacheStillValid) {
-        const sliced2 = cached2.summaries.slice(offset, offset + limit);
+        const sliced2 = cached3.summaries.slice(offset, offset + limit);
         return {
           sessions: sliced2,
-          hasMore: cached2.summaries.length > offset + limit
+          hasMore: cached3.summaries.length > offset + limit
         };
       }
       cacheWasInvalidated = true;
@@ -23330,11 +23427,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);
@@ -23354,16 +23451,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);
@@ -25969,7 +26066,7 @@ function resolveLegacyProviderScript(fn, scriptName, params) {
 init_contracts();
 import * as fs7 from "fs";
 import * as os9 from "os";
-import * as path15 from "path";
+import * as path16 from "path";
 import { randomUUID as randomUUID11 } from "crypto";
 init_logger();
 
@@ -27019,7 +27116,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;
@@ -27504,7 +27601,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);
@@ -27561,7 +27658,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 });
@@ -29125,7 +29222,7 @@ async function handleResolveAction(h, args) {
 
 // src/commands/cdp-commands.ts
 import * as fs8 from "fs";
-import * as path16 from "path";
+import * as path17 from "path";
 import * as os10 from "os";
 var KEY_TO_VK = {
   Backspace: 8,
@@ -29382,25 +29479,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" });
@@ -29454,7 +29551,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) {
@@ -32235,6 +32332,7 @@ function collectStableSizes(when, sizes) {
 
 // src/providers/spec/native-history-executor.ts
 init_logger();
+init_load_better_sqlite3();
 import * as fs13 from "fs";
 import * as os17 from "os";
 import * as path22 from "path";
@@ -32362,7 +32460,7 @@ function executeSqlite(src, input) {
   if (!resolved || !fs13.existsSync(resolved)) return null;
   let Database;
   try {
-    Database = __require("better-sqlite3");
+    Database = loadBetterSqlite3();
   } catch {
     return null;
   }
@@ -39188,6 +39286,7 @@ function readSession3(sessionPath, sessionId, workspace) {
 }
 
 // src/providers/native-history/hermes-cli-transcript.ts
+init_load_better_sqlite3();
 import * as fs20 from "fs";
 import * as path30 from "path";
 import * as os21 from "os";
@@ -39203,7 +39302,7 @@ function statMtimeMs4(p) {
 function openDb() {
   if (!fs20.existsSync(HERMES_STATE_DB)) return null;
   try {
-    const Database = __require("better-sqlite3");
+    const Database = loadBetterSqlite3();
     return new Database(HERMES_STATE_DB, { readonly: true, fileMustExist: true });
   } catch {
     return null;
@@ -40578,8 +40677,8 @@ var ProviderLoader = class _ProviderLoader {
       return null;
     }
     registerProviderScriptRootSafely(path33.dirname(path33.dirname(providerDir)));
-    const cached2 = this.scriptsCache.get(dir);
-    if (cached2) return cached2;
+    const cached3 = this.scriptsCache.get(dir);
+    if (cached3) return cached3;
     const scriptsJs = path33.join(dir, "scripts.js");
     if (fs22.existsSync(scriptsJs)) {
       try {
@@ -43265,6 +43364,7 @@ import { homedir as homedir26, hostname as osHostname } from "os";
 import { basename as pathBasename, join as pathJoin, resolve as pathResolve2 } from "path";
 import * as fs26 from "fs";
 import { execFileSync as execFileSync6 } from "child_process";
+init_resolve_executable();
 var CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
 var CHANNEL_SERVER_URL = {
   stable: "https://api.adhf.dev",
@@ -43658,13 +43758,13 @@ function sanitizeInlineMesh(inlineMesh) {
     nodes
   };
 }
-function reconcileInlineMeshCache(cached2, incoming) {
-  if (!cached2 || typeof cached2 !== "object" || Array.isArray(cached2)) return incoming;
-  if (!incoming || typeof incoming !== "object" || Array.isArray(incoming)) return cached2;
-  const cachedNodes = Array.isArray(cached2.nodes) ? cached2.nodes : [];
+function reconcileInlineMeshCache(cached3, incoming) {
+  if (!cached3 || typeof cached3 !== "object" || Array.isArray(cached3)) return incoming;
+  if (!incoming || typeof incoming !== "object" || Array.isArray(incoming)) return cached3;
+  const cachedNodes = Array.isArray(cached3.nodes) ? cached3.nodes : [];
   const incomingNodes = Array.isArray(incoming.nodes) ? incoming.nodes : [];
-  if (!cachedNodes.length || !incomingNodes.length) return { ...cached2, ...incoming };
-  const cachedUpdatedAt = Date.parse(readStringValue(cached2.updatedAt, cached2.updated_at) || "");
+  if (!cachedNodes.length || !incomingNodes.length) return { ...cached3, ...incoming };
+  const cachedUpdatedAt = Date.parse(readStringValue(cached3.updatedAt, cached3.updated_at) || "");
   const incomingUpdatedAt = Date.parse(readStringValue(incoming.updatedAt, incoming.updated_at) || "");
   const preserveCachedMembership = Number.isFinite(cachedUpdatedAt) && (!Number.isFinite(incomingUpdatedAt) || cachedUpdatedAt > incomingUpdatedAt);
   const cachedById = /* @__PURE__ */ new Map();
@@ -43693,7 +43793,7 @@ function reconcileInlineMeshCache(cached2, incoming) {
     }
   }
   return {
-    ...cached2,
+    ...cached3,
     ...incoming,
     nodes
   };
@@ -44026,9 +44126,9 @@ var MeshGitProbeCache = class {
    */
   async probe(daemonId, workspace, probe) {
     const key = this.key(daemonId, workspace);
-    const cached2 = this.recent.get(key);
-    if (cached2 && this.now() - cached2.at < this.reuseMs) {
-      return cached2.value;
+    const cached3 = this.recent.get(key);
+    if (cached3 && this.now() - cached3.at < this.reuseMs) {
+      return cached3.value;
     }
     const existing = this.inflight.get(key);
     if (existing) return existing;
@@ -44363,6 +44463,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,
@@ -45264,8 +45376,9 @@ async function runMeshRefineValidationGate(mesh, workspace, opts) {
       const startedAt = Date.now();
       const cwd = candidate.cwd ? pathResolve2(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,
@@ -45274,16 +45387,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;
       }
     }
@@ -45306,8 +45420,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,
@@ -45316,16 +45431,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";
       }
@@ -45676,13 +45796,13 @@ var DaemonCommandRouter = class {
     };
   }
   getCachedAggregateMeshStatus(meshId, mesh, options) {
-    const cached2 = this.aggregateMeshStatusCache.get(meshId);
-    if (!cached2?.snapshot || cached2.snapshot.success !== true || !Array.isArray(cached2.snapshot.nodes)) return null;
-    if (cached2.queueRevision !== getMeshQueueRevision(meshId)) return null;
-    let snapshot = this.cloneJsonValue(cached2.snapshot);
+    const cached3 = this.aggregateMeshStatusCache.get(meshId);
+    if (!cached3?.snapshot || cached3.snapshot.success !== true || !Array.isArray(cached3.snapshot.nodes)) return null;
+    if (cached3.queueRevision !== getMeshQueueRevision(meshId)) return null;
+    let snapshot = this.cloneJsonValue(cached3.snapshot);
     snapshot = this.hydrateCachedAggregateMeshStatusFromInline(snapshot, mesh, options);
     if (shouldRefreshStalePendingAggregate(snapshot, options)) return null;
-    const ageMs = Math.max(0, Date.now() - cached2.builtAt);
+    const ageMs = Math.max(0, Date.now() - cached3.builtAt);
     const sourceOfTruth = snapshot.sourceOfTruth && typeof snapshot.sourceOfTruth === "object" ? snapshot.sourceOfTruth : {};
     snapshot.sourceOfTruth = {
       ...sourceOfTruth,
@@ -45693,7 +45813,7 @@ var DaemonCommandRouter = class {
         source: "memory",
         refreshReason: "memory_cache_hit",
         ageMs,
-        cachedAt: new Date(cached2.builtAt).toISOString(),
+        cachedAt: new Date(cached3.builtAt).toISOString(),
         returnedAt: (/* @__PURE__ */ new Date()).toISOString()
       }
     };
@@ -45740,9 +45860,9 @@ var DaemonCommandRouter = class {
       meshId,
       sanitizeInlineMesh(normalizeInlineMeshNodeIdentity(inlineMesh))
     );
-    const cached2 = this.inlineMeshCache.get(meshId);
-    if (cached2) {
-      const merged = reconcileInlineMeshCache(cached2, sanitizedInlineMesh);
+    const cached3 = this.inlineMeshCache.get(meshId);
+    if (cached3) {
+      const merged = reconcileInlineMeshCache(cached3, sanitizedInlineMesh);
       this.inlineMeshCache.set(meshId, merged);
       return merged;
     }
@@ -45752,17 +45872,17 @@ var DaemonCommandRouter = class {
   async getMeshForCommand(meshId, inlineMesh, options) {
     const preferInline = options?.preferInline === true;
     if (preferInline) {
-      const cached3 = this.getCachedInlineMesh(meshId);
-      if (cached3) {
+      const cached4 = this.getCachedInlineMesh(meshId);
+      if (cached4) {
         if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
           const merged = reconcileInlineMeshCache(
-            cached3,
+            cached4,
             this.applyInlineMeshNodeTombstones(meshId, inlineMesh)
           );
           this.inlineMeshCache.set(meshId, sanitizeInlineMesh(normalizeInlineMeshNodeIdentity(merged)));
           return { mesh: merged, inline: true, source: "inline_cache" };
         }
-        return { mesh: cached3, inline: true, source: "inline_cache" };
+        return { mesh: cached4, inline: true, source: "inline_cache" };
       }
       if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
         this.warmInlineMeshCache(meshId, inlineMesh);
@@ -45775,8 +45895,8 @@ var DaemonCommandRouter = class {
       if (mesh) return { mesh, inline: false, source: "local_config" };
     } catch {
     }
-    const cached2 = this.getCachedInlineMesh(meshId);
-    if (cached2) return { mesh: cached2, inline: true, source: "inline_cache" };
+    const cached3 = this.getCachedInlineMesh(meshId);
+    if (cached3) return { mesh: cached3, inline: true, source: "inline_cache" };
     const warmedInline = this.warmInlineMeshCache(meshId, inlineMesh);
     return warmedInline ? { mesh: warmedInline, inline: true, source: "inline_bootstrap" } : null;
   }
@@ -46586,7 +46706,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");
@@ -47206,8 +47326,8 @@ ${hintLines.join("\n")}` : "",
     const repoRootBaseRef = /* @__PURE__ */ new Map();
     const submodulePathsByRepoRoot = /* @__PURE__ */ new Map();
     const resolveBaseRef = async (repoRoot) => {
-      const cached2 = repoRootBaseRef.get(repoRoot);
-      if (cached2) return cached2;
+      const cached3 = repoRootBaseRef.get(repoRoot);
+      if (cached3) return cached3;
       let baseBranch = "main";
       try {
         const { stdout } = await execFileAsync4("git", ["branch", "--show-current"], { cwd: repoRoot, encoding: "utf8" });