@adhdev/daemon-standalone 0.8.12 → 0.8.14

package/dist/index.js

@@ -9129,6 +9129,591 @@ ${h.join(`
   }
 });
 
+// ../session-host-core/dist/index.js
+var require_dist = __commonJS({
+  "../session-host-core/dist/index.js"(exports2, module2) {
+    "use strict";
+    var __create2 = Object.create;
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __getProtoOf2 = Object.getPrototypeOf;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
+      // If the importer is in node compatibility mode or this is not an ESM
+      // file that has been converted to a CommonJS file using a Babel-
+      // compatible transform (i.e. "__esModule" has not been set), then set
+      // "default" to the CommonJS "module.exports" for node compatibility.
+      isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
+      mod
+    ));
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var index_exports = {};
+    __export2(index_exports, {
+      SessionHostClient: () => SessionHostClient2,
+      SessionHostRegistry: () => SessionHostRegistry,
+      SessionRingBuffer: () => SessionRingBuffer,
+      applyTerminalColorEnv: () => applyTerminalColorEnv,
+      buildRuntimeDisplayName: () => buildRuntimeDisplayName,
+      buildRuntimeKey: () => buildRuntimeKey,
+      createLineParser: () => createLineParser2,
+      createResponseEnvelope: () => createResponseEnvelope,
+      ensureNodePtySpawnHelperPermissions: () => ensureNodePtySpawnHelperPermissions,
+      formatRuntimeOwner: () => formatRuntimeOwner,
+      getDefaultSessionHostEndpoint: () => getDefaultSessionHostEndpoint2,
+      getWorkspaceLabel: () => getWorkspaceLabel,
+      resolveRuntimeRecord: () => resolveRuntimeRecord,
+      sanitizeSpawnEnv: () => sanitizeSpawnEnv,
+      writeEnvelope: () => writeEnvelope
+    });
+    module2.exports = __toCommonJS2(index_exports);
+    var SessionRingBuffer = class {
+      maxBytes;
+      chunks = [];
+      nextSeq = 1;
+      totalBytes = 0;
+      constructor(options = {}) {
+        this.maxBytes = options.maxBytes ?? 512 * 1024;
+      }
+      append(data) {
+        const normalized = typeof data === "string" ? data : String(data ?? "");
+        const bytes = Buffer.byteLength(normalized, "utf8");
+        const seq = this.nextSeq++;
+        this.chunks.push({ seq, data: normalized, bytes });
+        this.totalBytes += bytes;
+        this.trim();
+        return seq;
+      }
+      snapshot(sinceSeq) {
+        const relevant = typeof sinceSeq === "number" ? this.chunks.filter((chunk) => chunk.seq > sinceSeq) : this.chunks;
+        const text = relevant.map((chunk) => chunk.data).join("");
+        const truncated = !!this.chunks[0] && typeof sinceSeq === "number" && sinceSeq < this.chunks[0].seq - 1;
+        return {
+          seq: this.nextSeq - 1,
+          text,
+          truncated
+        };
+      }
+      getState() {
+        return {
+          scrollbackBytes: this.totalBytes,
+          snapshotSeq: this.nextSeq - 1
+        };
+      }
+      clear() {
+        this.chunks = [];
+        this.totalBytes = 0;
+        this.nextSeq = 1;
+      }
+      restore(snapshot) {
+        this.clear();
+        const text = String(snapshot.text || "");
+        if (!text) {
+          this.nextSeq = Math.max(1, Number(snapshot.seq || 0) + 1);
+          return;
+        }
+        const bytes = Buffer.byteLength(text, "utf8");
+        const seq = Math.max(1, Number(snapshot.seq || 1));
+        this.chunks = [{ seq, data: text, bytes }];
+        this.totalBytes = bytes;
+        this.nextSeq = seq + 1;
+        this.trim();
+      }
+      trim() {
+        while (this.totalBytes > this.maxBytes && this.chunks.length > 1) {
+          const removed = this.chunks.shift();
+          if (!removed) break;
+          this.totalBytes -= removed.bytes;
+        }
+      }
+    };
+    var import_crypto2 = require("crypto");
+    var path5 = __toESM2(require("path"));
+    function normalizeSlug(input) {
+      return input.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
+    }
+    function normalizeValue(input) {
+      return input.trim().toLowerCase();
+    }
+    function getWorkspaceLabel(workspace) {
+      const trimmed = workspace.trim();
+      if (!trimmed) return "workspace";
+      const normalized = trimmed.replace(/[\\/]+$/, "");
+      const base = path5.basename(normalized);
+      return base || normalized;
+    }
+    function buildRuntimeDisplayName(payload) {
+      const explicit = payload.displayName?.trim();
+      if (explicit) return explicit;
+      const workspaceLabel = getWorkspaceLabel(payload.workspace);
+      const providerLabel = payload.providerType.trim() || "runtime";
+      return `${providerLabel} @ ${workspaceLabel}`;
+    }
+    function buildRuntimeKey(payload, existingKeys) {
+      const requested = payload.runtimeKey?.trim();
+      const existing = new Set(Array.from(existingKeys, (key) => key.toLowerCase()));
+      const displayName = buildRuntimeDisplayName(payload);
+      const baseKey = normalizeSlug(requested || displayName || getWorkspaceLabel(payload.workspace) || payload.providerType || "runtime") || "runtime";
+      if (!existing.has(baseKey)) return baseKey;
+      let suffix = 2;
+      let candidate = `${baseKey}-${suffix}`;
+      while (existing.has(candidate)) {
+        suffix += 1;
+        candidate = `${baseKey}-${suffix}`;
+      }
+      return candidate;
+    }
+    function uniqueMatch(records, predicate) {
+      const matches = records.filter(predicate);
+      if (matches.length === 1) return matches[0] || null;
+      if (matches.length === 0) return null;
+      const labels = matches.map((record2) => `${record2.runtimeKey} (${record2.sessionId})`).join(", ");
+      throw new Error(`Ambiguous runtime target. Matches: ${labels}`);
+    }
+    function resolveRuntimeRecord(records, identifier) {
+      const target = identifier.trim();
+      if (!target) {
+        throw new Error("Runtime target is required");
+      }
+      const exact = uniqueMatch(
+        records,
+        (record2) => record2.sessionId === target || normalizeValue(record2.runtimeKey) === normalizeValue(target) || normalizeValue(record2.displayName) === normalizeValue(target)
+      );
+      if (exact) return exact;
+      const prefix = uniqueMatch(
+        records,
+        (record2) => record2.sessionId.startsWith(target) || normalizeValue(record2.runtimeKey).startsWith(normalizeValue(target))
+      );
+      if (prefix) return prefix;
+      throw new Error(`Unknown runtime target: ${target}`);
+    }
+    function formatRuntimeOwner(record2) {
+      if (!record2.writeOwner) return "none";
+      return `${record2.writeOwner.ownerType}:${record2.writeOwner.clientId}`;
+    }
+    var SessionHostRegistry = class {
+      sessions = /* @__PURE__ */ new Map();
+      createSession(payload) {
+        const sessionId = payload.sessionId || (0, import_crypto2.randomUUID)();
+        if (this.sessions.has(sessionId)) {
+          throw new Error(`Session already exists: ${sessionId}`);
+        }
+        const now = Date.now();
+        const initialClient = payload.clientId ? [{
+          clientId: payload.clientId,
+          type: payload.clientType || "daemon",
+          readOnly: false,
+          attachedAt: now,
+          lastSeenAt: now
+        }] : [];
+        const record2 = {
+          sessionId,
+          runtimeKey: buildRuntimeKey(
+            payload,
+            Array.from(this.sessions.values(), (state) => state.record.runtimeKey)
+          ),
+          displayName: buildRuntimeDisplayName(payload),
+          workspaceLabel: getWorkspaceLabel(payload.workspace),
+          transport: "pty",
+          providerType: payload.providerType,
+          category: payload.category,
+          workspace: payload.workspace,
+          launchCommand: payload.launchCommand,
+          createdAt: now,
+          lastActivityAt: now,
+          lifecycle: "starting",
+          writeOwner: null,
+          attachedClients: initialClient,
+          buffer: {
+            scrollbackBytes: 0,
+            snapshotSeq: 0
+          },
+          meta: payload.meta || {}
+        };
+        record2.meta = {
+          sessionHostCols: payload.cols || 80,
+          sessionHostRows: payload.rows || 24,
+          ...record2.meta
+        };
+        this.sessions.set(sessionId, {
+          record: record2,
+          buffer: new SessionRingBuffer()
+        });
+        return this.cloneRecord(record2);
+      }
+      restoreSession(record2, snapshot) {
+        const cloned = this.cloneRecord(record2);
+        this.sessions.set(cloned.sessionId, {
+          record: cloned,
+          buffer: (() => {
+            const buffer = new SessionRingBuffer();
+            if (snapshot) buffer.restore(snapshot);
+            return buffer;
+          })()
+        });
+        return this.cloneRecord(cloned);
+      }
+      listSessions() {
+        return Array.from(this.sessions.values()).map((state) => this.cloneRecord(state.record)).sort((a, b2) => b2.lastActivityAt - a.lastActivityAt);
+      }
+      getSession(sessionId) {
+        const state = this.sessions.get(sessionId);
+        return state ? this.cloneRecord(state.record) : null;
+      }
+      attachClient(payload) {
+        const state = this.requireSession(payload.sessionId);
+        const now = Date.now();
+        let removedDaemonOwner = false;
+        if (payload.clientType === "daemon") {
+          const staleDaemonClientIds = state.record.attachedClients.filter((client) => client.type === "daemon" && client.clientId !== payload.clientId).map((client) => client.clientId);
+          if (staleDaemonClientIds.length > 0) {
+            state.record.attachedClients = state.record.attachedClients.filter(
+              (client) => !(client.type === "daemon" && client.clientId !== payload.clientId)
+            );
+            if (state.record.writeOwner && staleDaemonClientIds.includes(state.record.writeOwner.clientId)) {
+              removedDaemonOwner = true;
+            }
+          }
+        }
+        const existing = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
+        if (existing) {
+          existing.type = payload.clientType;
+          existing.readOnly = !!payload.readOnly;
+          existing.lastSeenAt = now;
+        } else {
+          state.record.attachedClients.push({
+            clientId: payload.clientId,
+            type: payload.clientType,
+            readOnly: !!payload.readOnly,
+            attachedAt: now,
+            lastSeenAt: now
+          });
+        }
+        if (removedDaemonOwner) {
+          state.record.writeOwner = null;
+        }
+        state.record.lastActivityAt = now;
+        return this.cloneRecord(state.record);
+      }
+      detachClient(payload) {
+        const state = this.requireSession(payload.sessionId);
+        state.record.attachedClients = state.record.attachedClients.filter((client) => client.clientId !== payload.clientId);
+        if (state.record.writeOwner?.clientId === payload.clientId) {
+          state.record.writeOwner = null;
+        }
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      acquireWrite(payload) {
+        const state = this.requireSession(payload.sessionId);
+        if (state.record.writeOwner && state.record.writeOwner.clientId !== payload.clientId && !payload.force) {
+          throw new Error(`Write owned by ${state.record.writeOwner.clientId}`);
+        }
+        const attachedClient = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
+        if (attachedClient) {
+          attachedClient.readOnly = false;
+          attachedClient.lastSeenAt = Date.now();
+        }
+        state.record.writeOwner = {
+          clientId: payload.clientId,
+          ownerType: payload.ownerType,
+          acquiredAt: Date.now()
+        };
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      releaseWrite(payload) {
+        const state = this.requireSession(payload.sessionId);
+        const attachedClient = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
+        if (attachedClient) {
+          attachedClient.readOnly = false;
+          attachedClient.lastSeenAt = Date.now();
+        }
+        if (state.record.writeOwner?.clientId === payload.clientId) {
+          state.record.writeOwner = null;
+        }
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      appendOutput(sessionId, data) {
+        const state = this.requireSession(sessionId);
+        const seq = state.buffer.append(data);
+        state.record.buffer = state.buffer.getState();
+        state.record.lastActivityAt = Date.now();
+        return { record: this.cloneRecord(state.record), seq };
+      }
+      getSnapshot(sessionId, sinceSeq) {
+        const state = this.requireSession(sessionId);
+        state.record.buffer = state.buffer.getState();
+        return state.buffer.snapshot(sinceSeq);
+      }
+      clearBuffer(sessionId) {
+        const state = this.requireSession(sessionId);
+        state.buffer.clear();
+        state.record.buffer = state.buffer.getState();
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      updateSessionMeta(sessionId, meta3, replace = false) {
+        const state = this.requireSession(sessionId);
+        state.record.meta = replace ? { ...meta3 } : {
+          ...state.record.meta || {},
+          ...meta3
+        };
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      markStarted(sessionId, pid) {
+        const state = this.requireSession(sessionId);
+        state.record.lifecycle = "running";
+        state.record.startedAt = state.record.startedAt || Date.now();
+        if (typeof pid === "number") state.record.osPid = pid;
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      markStopped(sessionId, lifecycle = "stopped") {
+        const state = this.requireSession(sessionId);
+        state.record.lifecycle = lifecycle;
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      setLifecycle(sessionId, lifecycle) {
+        const state = this.requireSession(sessionId);
+        state.record.lifecycle = lifecycle;
+        state.record.lastActivityAt = Date.now();
+        return this.cloneRecord(state.record);
+      }
+      requireSession(sessionId) {
+        const state = this.sessions.get(sessionId);
+        if (!state) throw new Error(`Unknown session: ${sessionId}`);
+        return state;
+      }
+      cloneRecord(record2) {
+        return {
+          ...record2,
+          launchCommand: {
+            ...record2.launchCommand,
+            args: [...record2.launchCommand.args],
+            env: record2.launchCommand.env ? { ...record2.launchCommand.env } : void 0
+          },
+          writeOwner: record2.writeOwner ? { ...record2.writeOwner } : null,
+          attachedClients: record2.attachedClients.map((client) => ({ ...client })),
+          buffer: { ...record2.buffer },
+          meta: { ...record2.meta }
+        };
+      }
+    };
+    var os6 = __toESM2(require("os"));
+    var path22 = __toESM2(require("path"));
+    var net3 = __toESM2(require("net"));
+    var import_crypto22 = require("crypto");
+    function getDefaultSessionHostEndpoint2(appName = "adhdev") {
+      if (process.platform === "win32") {
+        return {
+          kind: "pipe",
+          path: `\\\\.\\pipe\\${appName}-session-host`
+        };
+      }
+      return {
+        kind: "unix",
+        path: path22.join(os6.tmpdir(), `${appName}-session-host.sock`)
+      };
+    }
+    function serializeEnvelope3(envelope) {
+      return `${JSON.stringify(envelope)}
+`;
+    }
+    function createLineParser2(onEnvelope) {
+      let buffer = "";
+      return (chunk) => {
+        buffer += chunk.toString();
+        let newlineIndex = buffer.indexOf("\n");
+        while (newlineIndex >= 0) {
+          const rawLine = buffer.slice(0, newlineIndex).trim();
+          buffer = buffer.slice(newlineIndex + 1);
+          if (rawLine) {
+            onEnvelope(JSON.parse(rawLine));
+          }
+          newlineIndex = buffer.indexOf("\n");
+        }
+      };
+    }
+    var SessionHostClient2 = class {
+      endpoint;
+      socket = null;
+      requestWaiters = /* @__PURE__ */ new Map();
+      eventListeners = /* @__PURE__ */ new Set();
+      constructor(options = {}) {
+        this.endpoint = options.endpoint || getDefaultSessionHostEndpoint2(options.appName || "adhdev");
+      }
+      async connect() {
+        if (this.socket && !this.socket.destroyed) return;
+        if (this.socket) {
+          try {
+            this.socket.destroy();
+          } catch {
+          }
+          this.socket = null;
+        }
+        const socket = net3.createConnection(this.endpoint.path);
+        this.socket = socket;
+        socket.on("data", createLineParser2((envelope) => {
+          if (envelope.kind === "response") {
+            const waiter = this.requestWaiters.get(envelope.requestId);
+            if (waiter) {
+              this.requestWaiters.delete(envelope.requestId);
+              waiter.resolve(envelope.response);
+            }
+            return;
+          }
+          if (envelope.kind === "event") {
+            for (const listener of this.eventListeners) listener(envelope.event);
+          }
+        }));
+        socket.on("error", (error48) => {
+          for (const waiter of this.requestWaiters.values()) {
+            waiter.reject(error48);
+          }
+          this.requestWaiters.clear();
+          if (this.socket === socket) {
+            this.socket = null;
+          }
+          try {
+            socket.destroy();
+          } catch {
+          }
+        });
+        await new Promise((resolve22, reject) => {
+          socket.once("connect", () => resolve22());
+          socket.once("error", reject);
+        });
+      }
+      onEvent(listener) {
+        this.eventListeners.add(listener);
+        return () => {
+          this.eventListeners.delete(listener);
+        };
+      }
+      async request(request) {
+        await this.connect();
+        if (!this.socket) throw new Error("Session host socket unavailable");
+        const requestId = (0, import_crypto22.randomUUID)();
+        const envelope = {
+          kind: "request",
+          requestId,
+          request
+        };
+        const response = await new Promise((resolve22, reject) => {
+          const timeout = setTimeout(() => {
+            this.requestWaiters.delete(requestId);
+            reject(new Error(`Session host request timed out after 30s (${request.type})`));
+          }, 3e4);
+          this.requestWaiters.set(requestId, {
+            resolve: (value) => {
+              clearTimeout(timeout);
+              resolve22(value);
+            },
+            reject: (error48) => {
+              clearTimeout(timeout);
+              reject(error48);
+            }
+          });
+          this.socket?.write(serializeEnvelope3(envelope));
+        });
+        return response;
+      }
+      async close() {
+        if (!this.socket) return;
+        const socket = this.socket;
+        this.socket = null;
+        for (const waiter of this.requestWaiters.values()) {
+          waiter.reject(new Error("Session host client closed"));
+        }
+        this.requestWaiters.clear();
+        await new Promise((resolve22) => {
+          let settled = false;
+          const done = () => {
+            if (settled) return;
+            settled = true;
+            resolve22();
+          };
+          socket.once("close", done);
+          socket.end();
+          socket.destroy();
+          setTimeout(done, 50);
+        });
+      }
+    };
+    function createResponseEnvelope(requestId, response) {
+      return {
+        kind: "response",
+        requestId,
+        response
+      };
+    }
+    function writeEnvelope(socket, envelope) {
+      socket.write(serializeEnvelope3(envelope));
+    }
+    var os22 = __toESM2(require("os"));
+    var path32 = __toESM2(require("path"));
+    function sanitizeSpawnEnv(baseEnv, overrides) {
+      const env = {};
+      const source = { ...baseEnv, ...overrides || {} };
+      for (const [key, value] of Object.entries(source)) {
+        if (typeof value !== "string") continue;
+        env[key] = value;
+      }
+      for (const key of Object.keys(env)) {
+        if (key === "INIT_CWD" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_")) {
+          delete env[key];
+        }
+      }
+      applyTerminalColorEnv(env);
+      return env;
+    }
+    function applyTerminalColorEnv(env) {
+      if (env.NO_COLOR) return;
+      if (!env.TERM || env.TERM === "xterm-color") {
+        env.TERM = "xterm-256color";
+      }
+      if (!env.COLORTERM) env.COLORTERM = "truecolor";
+      if (process.platform === "win32") {
+        if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
+        if (!env.CLICOLOR) env.CLICOLOR = "1";
+      }
+    }
+    function ensureNodePtySpawnHelperPermissions(logFn) {
+      if (os22.platform() === "win32") return;
+      try {
+        const fs4 = require("fs");
+        const ptyDir = path32.resolve(path32.dirname(require.resolve("node-pty")), "..");
+        const platformArch = `${os22.platform()}-${os22.arch()}`;
+        const helper = path32.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
+        if (fs4.existsSync(helper)) {
+          const stat4 = fs4.statSync(helper);
+          if (!(stat4.mode & 73)) {
+            fs4.chmodSync(helper, stat4.mode | 493);
+            logFn?.(`Fixed spawn-helper permissions: ${helper}`);
+          }
+        }
+      } catch {
+      }
+    }
+  }
+});
+
 // ../../node_modules/zod/v4/core/core.js
 // @__NO_SIDE_EFFECTS__
 function $constructor(name, initializer3, params) {
@@ -27022,691 +27607,168 @@ var init_chokidar = __esm({
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
-            }
-            const now2 = Number(/* @__PURE__ */ new Date());
-            if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path5).lastChange = now2;
-            }
-            const pw = writes.get(path5);
-            const df = now2 - pw.lastChange;
-            if (df >= threshold) {
-              writes.delete(path5);
-              awfEmit(void 0, curStat);
-            } else {
-              timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
-            }
-          });
-        }
-        if (!writes.has(path5)) {
-          writes.set(path5, {
-            lastChange: now,
-            cancelWait: () => {
-              writes.delete(path5);
-              clearTimeout(timeoutHandler);
-              return event;
-            }
-          });
-          timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval);
-        }
-      }
-      /**
-       * Determines whether user has asked to ignore this path.
-       */
-      _isIgnored(path5, stats) {
-        if (this.options.atomic && DOT_RE.test(path5))
-          return true;
-        if (!this._userIgnored) {
-          const { cwd } = this.options;
-          const ign = this.options.ignored;
-          const ignored = (ign || []).map(normalizeIgnored(cwd));
-          const ignoredPaths = [...this._ignoredPaths];
-          const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
-          this._userIgnored = anymatch(list, void 0);
-        }
-        return this._userIgnored(path5, stats);
-      }
-      _isntIgnored(path5, stat4) {
-        return !this._isIgnored(path5, stat4);
-      }
-      /**
-       * Provides a set of common helpers and properties relating to symlink handling.
-       * @param path file or directory pattern being watched
-       */
-      _getWatchHelpers(path5) {
-        return new WatchHelper(path5, this.options.followSymlinks, this);
-      }
-      // Directory helpers
-      // -----------------
-      /**
-       * Provides directory tracking objects
-       * @param directory path of the directory
-       */
-      _getWatchedDir(directory) {
-        const dir = sp2.resolve(directory);
-        if (!this._watched.has(dir))
-          this._watched.set(dir, new DirEntry(dir, this._boundRemove));
-        return this._watched.get(dir);
-      }
-      // File helpers
-      // ------------
-      /**
-       * Check for read permissions: https://stackoverflow.com/a/11781404/1358405
-       */
-      _hasReadPermissions(stats) {
-        if (this.options.ignorePermissionErrors)
-          return true;
-        return Boolean(Number(stats.mode) & 256);
-      }
-      /**
-       * Handles emitting unlink events for
-       * files and directories, and via recursion, for
-       * files and directories within directories that are unlinked
-       * @param directory within which the following item is located
-       * @param item      base path of item/directory
-       */
-      _remove(directory, item, isDirectory) {
-        const path5 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path5);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path5) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path5, 100))
-          return;
-        if (!isDirectory && this._watched.size === 1) {
-          this.add(directory, item, true);
-        }
-        const wp = this._getWatchedDir(path5);
-        const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path5, nested));
-        const parent = this._getWatchedDir(directory);
-        const wasTracked = parent.has(item);
-        parent.remove(item);
-        if (this._symlinkPaths.has(fullPath)) {
-          this._symlinkPaths.delete(fullPath);
-        }
-        let relPath = path5;
-        if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path5);
-        if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
-          const event = this._pendingWrites.get(relPath).cancelWait();
-          if (event === EVENTS.ADD)
-            return;
-        }
-        this._watched.delete(path5);
-        this._watched.delete(fullPath);
-        const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path5))
-          this._emit(eventName, path5);
-        this._closePath(path5);
-      }
-      /**
-       * Closes all watchers for a path
-       */
-      _closePath(path5) {
-        this._closeFile(path5);
-        const dir = sp2.dirname(path5);
-        this._getWatchedDir(dir).remove(sp2.basename(path5));
-      }
-      /**
-       * Closes only file-specific watchers
-       */
-      _closeFile(path5) {
-        const closers = this._closers.get(path5);
-        if (!closers)
-          return;
-        closers.forEach((closer) => closer());
-        this._closers.delete(path5);
-      }
-      _addPathCloser(path5, closer) {
-        if (!closer)
-          return;
-        let list = this._closers.get(path5);
-        if (!list) {
-          list = [];
-          this._closers.set(path5, list);
-        }
-        list.push(closer);
-      }
-      _readdirp(root, opts) {
-        if (this.closed)
-          return;
-        const options = { type: EVENTS.ALL, alwaysStat: true, lstat: true, ...opts, depth: 0 };
-        let stream = readdirp(root, options);
-        this._streams.add(stream);
-        stream.once(STR_CLOSE, () => {
-          stream = void 0;
-        });
-        stream.once(STR_END, () => {
-          if (stream) {
-            this._streams.delete(stream);
-            stream = void 0;
-          }
-        });
-        return stream;
-      }
-    };
-    chokidar_default = { watch, FSWatcher };
-  }
-});
-
-// ../session-host-core/dist/index.js
-var require_dist = __commonJS({
-  "../session-host-core/dist/index.js"(exports2, module2) {
-    "use strict";
-    var __create2 = Object.create;
-    var __defProp2 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __getProtoOf2 = Object.getPrototypeOf;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-      // If the importer is in node compatibility mode or this is not an ESM
-      // file that has been converted to a CommonJS file using a Babel-
-      // compatible transform (i.e. "__esModule" has not been set), then set
-      // "default" to the CommonJS "module.exports" for node compatibility.
-      isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
-      mod
-    ));
-    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
-    var index_exports = {};
-    __export2(index_exports, {
-      SessionHostClient: () => SessionHostClient2,
-      SessionHostRegistry: () => SessionHostRegistry,
-      SessionRingBuffer: () => SessionRingBuffer,
-      buildRuntimeDisplayName: () => buildRuntimeDisplayName,
-      buildRuntimeKey: () => buildRuntimeKey,
-      createLineParser: () => createLineParser2,
-      createResponseEnvelope: () => createResponseEnvelope,
-      formatRuntimeOwner: () => formatRuntimeOwner,
-      getDefaultSessionHostEndpoint: () => getDefaultSessionHostEndpoint2,
-      getWorkspaceLabel: () => getWorkspaceLabel,
-      resolveRuntimeRecord: () => resolveRuntimeRecord,
-      writeEnvelope: () => writeEnvelope
-    });
-    module2.exports = __toCommonJS2(index_exports);
-    var SessionRingBuffer = class {
-      maxBytes;
-      chunks = [];
-      nextSeq = 1;
-      totalBytes = 0;
-      constructor(options = {}) {
-        this.maxBytes = options.maxBytes ?? 512 * 1024;
-      }
-      append(data) {
-        const normalized = typeof data === "string" ? data : String(data ?? "");
-        const bytes = Buffer.byteLength(normalized, "utf8");
-        const seq = this.nextSeq++;
-        this.chunks.push({ seq, data: normalized, bytes });
-        this.totalBytes += bytes;
-        this.trim();
-        return seq;
-      }
-      snapshot(sinceSeq) {
-        const relevant = typeof sinceSeq === "number" ? this.chunks.filter((chunk) => chunk.seq > sinceSeq) : this.chunks;
-        const text = relevant.map((chunk) => chunk.data).join("");
-        const truncated = !!this.chunks[0] && typeof sinceSeq === "number" && sinceSeq < this.chunks[0].seq - 1;
-        return {
-          seq: this.nextSeq - 1,
-          text,
-          truncated
-        };
-      }
-      getState() {
-        return {
-          scrollbackBytes: this.totalBytes,
-          snapshotSeq: this.nextSeq - 1
-        };
-      }
-      clear() {
-        this.chunks = [];
-        this.totalBytes = 0;
-        this.nextSeq = 1;
-      }
-      restore(snapshot) {
-        this.clear();
-        const text = String(snapshot.text || "");
-        if (!text) {
-          this.nextSeq = Math.max(1, Number(snapshot.seq || 0) + 1);
-          return;
-        }
-        const bytes = Buffer.byteLength(text, "utf8");
-        const seq = Math.max(1, Number(snapshot.seq || 1));
-        this.chunks = [{ seq, data: text, bytes }];
-        this.totalBytes = bytes;
-        this.nextSeq = seq + 1;
-        this.trim();
-      }
-      trim() {
-        while (this.totalBytes > this.maxBytes && this.chunks.length > 1) {
-          const removed = this.chunks.shift();
-          if (!removed) break;
-          this.totalBytes -= removed.bytes;
-        }
-      }
-    };
-    var import_crypto2 = require("crypto");
-    var path5 = __toESM2(require("path"));
-    function normalizeSlug(input) {
-      return input.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
-    }
-    function normalizeValue(input) {
-      return input.trim().toLowerCase();
-    }
-    function getWorkspaceLabel(workspace) {
-      const trimmed = workspace.trim();
-      if (!trimmed) return "workspace";
-      const normalized = trimmed.replace(/[\\/]+$/, "");
-      const base = path5.basename(normalized);
-      return base || normalized;
-    }
-    function buildRuntimeDisplayName(payload) {
-      const explicit = payload.displayName?.trim();
-      if (explicit) return explicit;
-      const workspaceLabel = getWorkspaceLabel(payload.workspace);
-      const providerLabel = payload.providerType.trim() || "runtime";
-      return `${providerLabel} @ ${workspaceLabel}`;
-    }
-    function buildRuntimeKey(payload, existingKeys) {
-      const requested = payload.runtimeKey?.trim();
-      const existing = new Set(Array.from(existingKeys, (key) => key.toLowerCase()));
-      const displayName = buildRuntimeDisplayName(payload);
-      const baseKey = normalizeSlug(requested || displayName || getWorkspaceLabel(payload.workspace) || payload.providerType || "runtime") || "runtime";
-      if (!existing.has(baseKey)) return baseKey;
-      let suffix = 2;
-      let candidate = `${baseKey}-${suffix}`;
-      while (existing.has(candidate)) {
-        suffix += 1;
-        candidate = `${baseKey}-${suffix}`;
-      }
-      return candidate;
-    }
-    function uniqueMatch(records, predicate) {
-      const matches = records.filter(predicate);
-      if (matches.length === 1) return matches[0] || null;
-      if (matches.length === 0) return null;
-      const labels = matches.map((record2) => `${record2.runtimeKey} (${record2.sessionId})`).join(", ");
-      throw new Error(`Ambiguous runtime target. Matches: ${labels}`);
-    }
-    function resolveRuntimeRecord(records, identifier) {
-      const target = identifier.trim();
-      if (!target) {
-        throw new Error("Runtime target is required");
-      }
-      const exact = uniqueMatch(
-        records,
-        (record2) => record2.sessionId === target || normalizeValue(record2.runtimeKey) === normalizeValue(target) || normalizeValue(record2.displayName) === normalizeValue(target)
-      );
-      if (exact) return exact;
-      const prefix = uniqueMatch(
-        records,
-        (record2) => record2.sessionId.startsWith(target) || normalizeValue(record2.runtimeKey).startsWith(normalizeValue(target))
-      );
-      if (prefix) return prefix;
-      throw new Error(`Unknown runtime target: ${target}`);
-    }
-    function formatRuntimeOwner(record2) {
-      if (!record2.writeOwner) return "none";
-      return `${record2.writeOwner.ownerType}:${record2.writeOwner.clientId}`;
-    }
-    var SessionHostRegistry = class {
-      sessions = /* @__PURE__ */ new Map();
-      createSession(payload) {
-        const sessionId = payload.sessionId || (0, import_crypto2.randomUUID)();
-        if (this.sessions.has(sessionId)) {
-          throw new Error(`Session already exists: ${sessionId}`);
-        }
-        const now = Date.now();
-        const initialClient = payload.clientId ? [{
-          clientId: payload.clientId,
-          type: payload.clientType || "daemon",
-          readOnly: false,
-          attachedAt: now,
-          lastSeenAt: now
-        }] : [];
-        const record2 = {
-          sessionId,
-          runtimeKey: buildRuntimeKey(
-            payload,
-            Array.from(this.sessions.values(), (state) => state.record.runtimeKey)
-          ),
-          displayName: buildRuntimeDisplayName(payload),
-          workspaceLabel: getWorkspaceLabel(payload.workspace),
-          transport: "pty",
-          providerType: payload.providerType,
-          category: payload.category,
-          workspace: payload.workspace,
-          launchCommand: payload.launchCommand,
-          createdAt: now,
-          lastActivityAt: now,
-          lifecycle: "starting",
-          writeOwner: null,
-          attachedClients: initialClient,
-          buffer: {
-            scrollbackBytes: 0,
-            snapshotSeq: 0
-          },
-          meta: payload.meta || {}
-        };
-        record2.meta = {
-          sessionHostCols: payload.cols || 80,
-          sessionHostRows: payload.rows || 24,
-          ...record2.meta
-        };
-        this.sessions.set(sessionId, {
-          record: record2,
-          buffer: new SessionRingBuffer()
-        });
-        return this.cloneRecord(record2);
-      }
-      restoreSession(record2, snapshot) {
-        const cloned = this.cloneRecord(record2);
-        this.sessions.set(cloned.sessionId, {
-          record: cloned,
-          buffer: (() => {
-            const buffer = new SessionRingBuffer();
-            if (snapshot) buffer.restore(snapshot);
-            return buffer;
-          })()
-        });
-        return this.cloneRecord(cloned);
-      }
-      listSessions() {
-        return Array.from(this.sessions.values()).map((state) => this.cloneRecord(state.record)).sort((a, b2) => b2.lastActivityAt - a.lastActivityAt);
-      }
-      getSession(sessionId) {
-        const state = this.sessions.get(sessionId);
-        return state ? this.cloneRecord(state.record) : null;
-      }
-      attachClient(payload) {
-        const state = this.requireSession(payload.sessionId);
-        const now = Date.now();
-        let removedDaemonOwner = false;
-        if (payload.clientType === "daemon") {
-          const staleDaemonClientIds = state.record.attachedClients.filter((client) => client.type === "daemon" && client.clientId !== payload.clientId).map((client) => client.clientId);
-          if (staleDaemonClientIds.length > 0) {
-            state.record.attachedClients = state.record.attachedClients.filter(
-              (client) => !(client.type === "daemon" && client.clientId !== payload.clientId)
-            );
-            if (state.record.writeOwner && staleDaemonClientIds.includes(state.record.writeOwner.clientId)) {
-              removedDaemonOwner = true;
-            }
-          }
-        }
-        const existing = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
-        if (existing) {
-          existing.type = payload.clientType;
-          existing.readOnly = !!payload.readOnly;
-          existing.lastSeenAt = now;
-        } else {
-          state.record.attachedClients.push({
-            clientId: payload.clientId,
-            type: payload.clientType,
-            readOnly: !!payload.readOnly,
-            attachedAt: now,
-            lastSeenAt: now
-          });
-        }
-        if (removedDaemonOwner) {
-          state.record.writeOwner = null;
-        }
-        state.record.lastActivityAt = now;
-        return this.cloneRecord(state.record);
-      }
-      detachClient(payload) {
-        const state = this.requireSession(payload.sessionId);
-        state.record.attachedClients = state.record.attachedClients.filter((client) => client.clientId !== payload.clientId);
-        if (state.record.writeOwner?.clientId === payload.clientId) {
-          state.record.writeOwner = null;
-        }
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
-      }
-      acquireWrite(payload) {
-        const state = this.requireSession(payload.sessionId);
-        if (state.record.writeOwner && state.record.writeOwner.clientId !== payload.clientId && !payload.force) {
-          throw new Error(`Write owned by ${state.record.writeOwner.clientId}`);
+            }
+            const now2 = Number(/* @__PURE__ */ new Date());
+            if (prevStat && curStat.size !== prevStat.size) {
+              writes.get(path5).lastChange = now2;
+            }
+            const pw = writes.get(path5);
+            const df = now2 - pw.lastChange;
+            if (df >= threshold) {
+              writes.delete(path5);
+              awfEmit(void 0, curStat);
+            } else {
+              timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
+            }
+          });
         }
-        const attachedClient = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
-        if (attachedClient) {
-          attachedClient.readOnly = false;
-          attachedClient.lastSeenAt = Date.now();
+        if (!writes.has(path5)) {
+          writes.set(path5, {
+            lastChange: now,
+            cancelWait: () => {
+              writes.delete(path5);
+              clearTimeout(timeoutHandler);
+              return event;
+            }
+          });
+          timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval);
         }
-        state.record.writeOwner = {
-          clientId: payload.clientId,
-          ownerType: payload.ownerType,
-          acquiredAt: Date.now()
-        };
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
       }
-      releaseWrite(payload) {
-        const state = this.requireSession(payload.sessionId);
-        const attachedClient = state.record.attachedClients.find((client) => client.clientId === payload.clientId);
-        if (attachedClient) {
-          attachedClient.readOnly = false;
-          attachedClient.lastSeenAt = Date.now();
-        }
-        if (state.record.writeOwner?.clientId === payload.clientId) {
-          state.record.writeOwner = null;
+      /**
+       * Determines whether user has asked to ignore this path.
+       */
+      _isIgnored(path5, stats) {
+        if (this.options.atomic && DOT_RE.test(path5))
+          return true;
+        if (!this._userIgnored) {
+          const { cwd } = this.options;
+          const ign = this.options.ignored;
+          const ignored = (ign || []).map(normalizeIgnored(cwd));
+          const ignoredPaths = [...this._ignoredPaths];
+          const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
+          this._userIgnored = anymatch(list, void 0);
         }
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
-      }
-      appendOutput(sessionId, data) {
-        const state = this.requireSession(sessionId);
-        const seq = state.buffer.append(data);
-        state.record.buffer = state.buffer.getState();
-        state.record.lastActivityAt = Date.now();
-        return { record: this.cloneRecord(state.record), seq };
-      }
-      getSnapshot(sessionId, sinceSeq) {
-        const state = this.requireSession(sessionId);
-        state.record.buffer = state.buffer.getState();
-        return state.buffer.snapshot(sinceSeq);
-      }
-      clearBuffer(sessionId) {
-        const state = this.requireSession(sessionId);
-        state.buffer.clear();
-        state.record.buffer = state.buffer.getState();
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
-      }
-      updateSessionMeta(sessionId, meta3, replace = false) {
-        const state = this.requireSession(sessionId);
-        state.record.meta = replace ? { ...meta3 } : {
-          ...state.record.meta || {},
-          ...meta3
-        };
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
-      }
-      markStarted(sessionId, pid) {
-        const state = this.requireSession(sessionId);
-        state.record.lifecycle = "running";
-        state.record.startedAt = state.record.startedAt || Date.now();
-        if (typeof pid === "number") state.record.osPid = pid;
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
-      }
-      markStopped(sessionId, lifecycle = "stopped") {
-        const state = this.requireSession(sessionId);
-        state.record.lifecycle = lifecycle;
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
+        return this._userIgnored(path5, stats);
       }
-      setLifecycle(sessionId, lifecycle) {
-        const state = this.requireSession(sessionId);
-        state.record.lifecycle = lifecycle;
-        state.record.lastActivityAt = Date.now();
-        return this.cloneRecord(state.record);
+      _isntIgnored(path5, stat4) {
+        return !this._isIgnored(path5, stat4);
       }
-      requireSession(sessionId) {
-        const state = this.sessions.get(sessionId);
-        if (!state) throw new Error(`Unknown session: ${sessionId}`);
-        return state;
+      /**
+       * Provides a set of common helpers and properties relating to symlink handling.
+       * @param path file or directory pattern being watched
+       */
+      _getWatchHelpers(path5) {
+        return new WatchHelper(path5, this.options.followSymlinks, this);
       }
-      cloneRecord(record2) {
-        return {
-          ...record2,
-          launchCommand: {
-            ...record2.launchCommand,
-            args: [...record2.launchCommand.args],
-            env: record2.launchCommand.env ? { ...record2.launchCommand.env } : void 0
-          },
-          writeOwner: record2.writeOwner ? { ...record2.writeOwner } : null,
-          attachedClients: record2.attachedClients.map((client) => ({ ...client })),
-          buffer: { ...record2.buffer },
-          meta: { ...record2.meta }
-        };
+      // Directory helpers
+      // -----------------
+      /**
+       * Provides directory tracking objects
+       * @param directory path of the directory
+       */
+      _getWatchedDir(directory) {
+        const dir = sp2.resolve(directory);
+        if (!this._watched.has(dir))
+          this._watched.set(dir, new DirEntry(dir, this._boundRemove));
+        return this._watched.get(dir);
       }
-    };
-    var os6 = __toESM2(require("os"));
-    var path22 = __toESM2(require("path"));
-    var net3 = __toESM2(require("net"));
-    var import_crypto22 = require("crypto");
-    function getDefaultSessionHostEndpoint2(appName = "adhdev") {
-      if (process.platform === "win32") {
-        return {
-          kind: "pipe",
-          path: `\\\\.\\pipe\\${appName}-session-host`
-        };
+      // File helpers
+      // ------------
+      /**
+       * Check for read permissions: https://stackoverflow.com/a/11781404/1358405
+       */
+      _hasReadPermissions(stats) {
+        if (this.options.ignorePermissionErrors)
+          return true;
+        return Boolean(Number(stats.mode) & 256);
       }
-      return {
-        kind: "unix",
-        path: path22.join(os6.tmpdir(), `${appName}-session-host.sock`)
-      };
-    }
-    function serializeEnvelope3(envelope) {
-      return `${JSON.stringify(envelope)}
-`;
-    }
-    function createLineParser2(onEnvelope) {
-      let buffer = "";
-      return (chunk) => {
-        buffer += chunk.toString();
-        let newlineIndex = buffer.indexOf("\n");
-        while (newlineIndex >= 0) {
-          const rawLine = buffer.slice(0, newlineIndex).trim();
-          buffer = buffer.slice(newlineIndex + 1);
-          if (rawLine) {
-            onEnvelope(JSON.parse(rawLine));
-          }
-          newlineIndex = buffer.indexOf("\n");
+      /**
+       * Handles emitting unlink events for
+       * files and directories, and via recursion, for
+       * files and directories within directories that are unlinked
+       * @param directory within which the following item is located
+       * @param item      base path of item/directory
+       */
+      _remove(directory, item, isDirectory) {
+        const path5 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path5);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path5) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path5, 100))
+          return;
+        if (!isDirectory && this._watched.size === 1) {
+          this.add(directory, item, true);
         }
-      };
-    }
-    var SessionHostClient2 = class {
-      endpoint;
-      socket = null;
-      requestWaiters = /* @__PURE__ */ new Map();
-      eventListeners = /* @__PURE__ */ new Set();
-      constructor(options = {}) {
-        this.endpoint = options.endpoint || getDefaultSessionHostEndpoint2(options.appName || "adhdev");
-      }
-      async connect() {
-        if (this.socket && !this.socket.destroyed) return;
-        const socket = net3.createConnection(this.endpoint.path);
-        this.socket = socket;
-        socket.on("data", createLineParser2((envelope) => {
-          if (envelope.kind === "response") {
-            const waiter = this.requestWaiters.get(envelope.requestId);
-            if (waiter) {
-              this.requestWaiters.delete(envelope.requestId);
-              waiter.resolve(envelope.response);
-            }
+        const wp = this._getWatchedDir(path5);
+        const nestedDirectoryChildren = wp.getChildren();
+        nestedDirectoryChildren.forEach((nested) => this._remove(path5, nested));
+        const parent = this._getWatchedDir(directory);
+        const wasTracked = parent.has(item);
+        parent.remove(item);
+        if (this._symlinkPaths.has(fullPath)) {
+          this._symlinkPaths.delete(fullPath);
+        }
+        let relPath = path5;
+        if (this.options.cwd)
+          relPath = sp2.relative(this.options.cwd, path5);
+        if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
+          const event = this._pendingWrites.get(relPath).cancelWait();
+          if (event === EVENTS.ADD)
             return;
-          }
-          if (envelope.kind === "event") {
-            for (const listener of this.eventListeners) listener(envelope.event);
-          }
-        }));
-        socket.on("error", (error48) => {
-          for (const waiter of this.requestWaiters.values()) {
-            waiter.reject(error48);
-          }
-          this.requestWaiters.clear();
-        });
-        await new Promise((resolve4, reject) => {
-          socket.once("connect", () => resolve4());
-          socket.once("error", reject);
-        });
+        }
+        this._watched.delete(path5);
+        this._watched.delete(fullPath);
+        const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
+        if (wasTracked && !this._isIgnored(path5))
+          this._emit(eventName, path5);
+        this._closePath(path5);
       }
-      onEvent(listener) {
-        this.eventListeners.add(listener);
-        return () => {
-          this.eventListeners.delete(listener);
-        };
+      /**
+       * Closes all watchers for a path
+       */
+      _closePath(path5) {
+        this._closeFile(path5);
+        const dir = sp2.dirname(path5);
+        this._getWatchedDir(dir).remove(sp2.basename(path5));
       }
-      async request(request) {
-        await this.connect();
-        if (!this.socket) throw new Error("Session host socket unavailable");
-        const requestId = (0, import_crypto22.randomUUID)();
-        const envelope = {
-          kind: "request",
-          requestId,
-          request
-        };
-        const response = await new Promise((resolve4, reject) => {
-          const timeout = setTimeout(() => {
-            this.requestWaiters.delete(requestId);
-            reject(new Error(`Session host request timed out after 30s (${request.type})`));
-          }, 3e4);
-          this.requestWaiters.set(requestId, {
-            resolve: (value) => {
-              clearTimeout(timeout);
-              resolve4(value);
-            },
-            reject: (error48) => {
-              clearTimeout(timeout);
-              reject(error48);
-            }
-          });
-          this.socket?.write(serializeEnvelope3(envelope));
-        });
-        return response;
+      /**
+       * Closes only file-specific watchers
+       */
+      _closeFile(path5) {
+        const closers = this._closers.get(path5);
+        if (!closers)
+          return;
+        closers.forEach((closer) => closer());
+        this._closers.delete(path5);
       }
-      async close() {
-        if (!this.socket) return;
-        const socket = this.socket;
-        this.socket = null;
-        for (const waiter of this.requestWaiters.values()) {
-          waiter.reject(new Error("Session host client closed"));
+      _addPathCloser(path5, closer) {
+        if (!closer)
+          return;
+        let list = this._closers.get(path5);
+        if (!list) {
+          list = [];
+          this._closers.set(path5, list);
         }
-        this.requestWaiters.clear();
-        await new Promise((resolve4) => {
-          let settled = false;
-          const done = () => {
-            if (settled) return;
-            settled = true;
-            resolve4();
-          };
-          socket.once("close", done);
-          socket.end();
-          socket.destroy();
-          setTimeout(done, 50);
+        list.push(closer);
+      }
+      _readdirp(root, opts) {
+        if (this.closed)
+          return;
+        const options = { type: EVENTS.ALL, alwaysStat: true, lstat: true, ...opts, depth: 0 };
+        let stream = readdirp(root, options);
+        this._streams.add(stream);
+        stream.once(STR_CLOSE, () => {
+          stream = void 0;
+        });
+        stream.once(STR_END, () => {
+          if (stream) {
+            this._streams.delete(stream);
+            stream = void 0;
+          }
         });
+        return stream;
       }
     };
-    function createResponseEnvelope(requestId, response) {
-      return {
-        kind: "response",
-        requestId,
-        response
-      };
-    }
-    function writeEnvelope(socket, envelope) {
-      socket.write(serializeEnvelope3(envelope));
-    }
+    chokidar_default = { watch, FSWatcher };
   }
 });
 
@@ -28370,6 +28432,13 @@ var require_dist2 = __commonJS({
       const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
       if (loggedTerminalBackends.has(key)) return;
       loggedTerminalBackends.add(key);
+      if (backendKind === "xterm" && preference !== "xterm" && !ghosttyAvailable) {
+        LOG2.warn(
+          "Terminal",
+          `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`
+        );
+        return;
+      }
       LOG2.info(
         "Terminal",
         `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
@@ -28432,12 +28501,14 @@ var require_dist2 = __commonJS({
         };
       }
     });
+    var os7;
     var pty;
     var NodePtyRuntimeTransport;
     var NodePtyTransportFactory;
     var init_pty_transport = __esm2({
       "src/cli-adapters/pty-transport.ts"() {
         "use strict";
+        os7 = __toESM2(require("os"));
         try {
           pty = require("node-pty");
         } catch {
@@ -28474,11 +28545,21 @@ var require_dist2 = __commonJS({
         NodePtyTransportFactory = class {
           spawn(command, args, options) {
             if (!pty) throw new Error("node-pty is not installed");
+            let cwd = options.cwd;
+            if (cwd) {
+              try {
+                const fs15 = require("fs");
+                const stat4 = fs15.statSync(cwd);
+                if (!stat4.isDirectory()) cwd = os7.homedir();
+              } catch {
+                cwd = os7.homedir();
+              }
+            }
             const handle = pty.spawn(command, args, {
               name: "xterm-256color",
               cols: options.cols,
               rows: options.rows,
-              cwd: options.cwd,
+              cwd,
               env: options.env
             });
             return new NodePtyRuntimeTransport(handle);
@@ -28486,6 +28567,13 @@ var require_dist2 = __commonJS({
         };
       }
     });
+    var import_session_host_core2;
+    var init_spawn_env = __esm2({
+      "src/cli-adapters/spawn-env.ts"() {
+        "use strict";
+        import_session_host_core2 = require_dist();
+      }
+    });
     var provider_cli_adapter_exports = {};
     __export2(provider_cli_adapter_exports, {
       ProviderCliAdapter: () => ProviderCliAdapter,
@@ -28500,32 +28588,6 @@ var require_dist2 = __commonJS({
     function sanitizeTerminalText(str) {
       return stripTerminalNoise(stripAnsi(str));
     }
-    function applyPreferredTerminalColorEnv(env) {
-      if (env.NO_COLOR) return;
-      if (!env.TERM || env.TERM === "xterm-color") {
-        env.TERM = "xterm-256color";
-      }
-      if (!env.COLORTERM) env.COLORTERM = "truecolor";
-      if (process.platform === "win32") {
-        if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
-        if (!env.CLICOLOR) env.CLICOLOR = "1";
-      }
-    }
-    function buildCliSpawnEnv(baseEnv, overrides) {
-      const env = {};
-      const source = { ...baseEnv, ...overrides || {} };
-      for (const [key, value] of Object.entries(source)) {
-        if (typeof value !== "string") continue;
-        env[key] = value;
-      }
-      for (const key of Object.keys(env)) {
-        if (key === "INIT_CWD" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_")) {
-          delete env[key];
-        }
-      }
-      applyPreferredTerminalColorEnv(env);
-      return env;
-    }
     function computeTerminalQueryTail(buffer) {
       const prefixes = ["\x1B[6n", "\x1B[?6n"];
       const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
@@ -28539,7 +28601,7 @@ var require_dist2 = __commonJS({
       return "";
     }
     function findBinary(name) {
-      const isWin = os7.platform() === "win32";
+      const isWin = os8.platform() === "win32";
       try {
         const cmd = isWin ? `where ${name}` : `which ${name}`;
         return (0, import_child_process4.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
@@ -28587,7 +28649,7 @@ var require_dist2 = __commonJS({
     }
     function shSingleQuote(arg) {
       if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-      if (os7.platform() === "win32") {
+      if (os8.platform() === "win32") {
         return `"${arg.replace(/"/g, '""')}"`;
       }
       return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -28654,41 +28716,29 @@ var require_dist2 = __commonJS({
         }
       };
     }
-    var os7;
+    var os8;
     var path7;
     var import_child_process4;
     var pty2;
+    var buildCliSpawnEnv;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
         "use strict";
-        os7 = __toESM2(require("os"));
+        os8 = __toESM2(require("os"));
         path7 = __toESM2(require("path"));
         import_child_process4 = require("child_process");
         init_logger();
         init_terminal_screen();
         init_pty_transport();
+        init_spawn_env();
         try {
           pty2 = require("node-pty");
-          if (os7.platform() !== "win32") {
-            try {
-              const fs15 = require("fs");
-              const ptyDir = path7.resolve(path7.dirname(require.resolve("node-pty")), "..");
-              const platformArch = `${os7.platform()}-${os7.arch()}`;
-              const helper = path7.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-              if (fs15.existsSync(helper)) {
-                const stat4 = fs15.statSync(helper);
-                if (!(stat4.mode & 73)) {
-                  fs15.chmodSync(helper, stat4.mode | 493);
-                  LOG2.info("CLI", "[node-pty] Fixed spawn-helper permissions");
-                }
-              }
-            } catch {
-            }
-          }
+          (0, import_session_host_core2.ensureNodePtySpawnHelperPermissions)((msg) => LOG2.info("CLI", msg));
         } catch {
           LOG2.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
         }
+        buildCliSpawnEnv = import_session_host_core2.sanitizeSpawnEnv;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
             this.extraArgs = extraArgs;
@@ -28696,7 +28746,7 @@ var require_dist2 = __commonJS({
             this.transportFactory = transportFactory;
             this.cliType = provider.type;
             this.cliName = provider.name;
-            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os7.homedir()) : workingDir;
+            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os8.homedir()) : workingDir;
             const t = provider.timeouts || {};
             this.timeouts = {
               ptyFlush: t.ptyFlush ?? 50,
@@ -29003,7 +29053,7 @@ var require_dist2 = __commonJS({
             if (this.ptyProcess) return;
             const { spawn: spawnConfig } = this.provider;
             const binaryPath = findBinary(spawnConfig.command);
-            const isWin = os7.platform() === "win32";
+            const isWin = os8.platform() === "win32";
             const allArgs = [...spawnConfig.args, ...this.extraArgs];
             LOG2.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
             this.resetTraceSession();
@@ -29011,13 +29061,16 @@ var require_dist2 = __commonJS({
             let shellArgs;
             const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
             const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-            const useShell = isWin ? !!spawnConfig.shell || isCmdShim : useShellUnix;
+            const useShellWin = isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+            const useShell = isWin ? useShellWin : useShellUnix;
             if (useShell) {
               if (!spawnConfig.shell && !isWin) {
                 LOG2.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
               }
               if (isCmdShim) {
                 LOG2.info("CLI", `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
+              } else if (isWin) {
+                LOG2.info("CLI", `[${this.cliType}] Using cmd.exe shell on Windows: ${binaryPath}`);
               }
               shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
               if (isWin) {
@@ -29027,6 +29080,9 @@ var require_dist2 = __commonJS({
                 shellArgs = ["-l", "-c", fullCmd];
               }
             } else {
+              if (isWin && spawnConfig.shell) {
+                LOG2.info("CLI", `[${this.cliType}] Spawning Windows binary directly without cmd.exe: ${binaryPath}`);
+              }
               shellCmd = binaryPath;
               shellArgs = allArgs;
             }
@@ -29055,6 +29111,12 @@ var require_dist2 = __commonJS({
                 shellArgs = ["-l", "-c", fullCmd];
                 this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
               } else {
+                if (isWin) {
+                  const hint = /error code 267|ERROR_DIRECTORY/i.test(msg) ? " (working directory does not exist or is not a directory)" : /error code 740|elevation/i.test(msg) ? " (requires administrator privileges)" : /error code 2|ENOENT|not found/i.test(msg) ? ` (executable not found: ${shellCmd})` : "";
+                  if (hint) {
+                    throw new Error(`Failed to spawn CLI${hint}: ${msg}`);
+                  }
+                }
                 throw err;
               }
             }
@@ -29229,7 +29291,7 @@ var require_dist2 = __commonJS({
                   `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)}`
                 );
               }
-              await new Promise((resolve10) => setTimeout(resolve10, 50));
+              await new Promise((resolve9) => setTimeout(resolve9, 50));
             }
             const finalScreenText = this.terminalScreen.getText() || "";
             LOG2.warn(
@@ -29616,7 +29678,7 @@ ${data.message || ""}`.trim();
             if (this.startupParseGate) {
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
-                await new Promise((resolve10) => setTimeout(resolve10, 50));
+                await new Promise((resolve9) => setTimeout(resolve9, 50));
               }
             }
             if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
@@ -29807,7 +29869,8 @@ ${data.message || ""}`.trim();
                   const payload = stopCommand.endsWith("\r") || stopCommand.endsWith("\n") ? stopCommand : `${stopCommand}${this.sendKey}`;
                   this.ptyProcess.write(payload);
                 };
-                if (wasProcessing) setTimeout(writeCommand, 250);
+                const interruptGraceMs = typeof resume.interruptGraceMs === "number" ? Math.max(100, resume.interruptGraceMs) : 500;
+                if (wasProcessing) setTimeout(writeCommand, interruptGraceMs);
                 else writeCommand();
               } else {
                 this.ptyProcess.write("");
@@ -29823,17 +29886,17 @@ ${data.message || ""}`.trim();
             }
           }
           waitForStopped(timeoutMs) {
-            return new Promise((resolve10) => {
+            return new Promise((resolve9) => {
               const startedAt = Date.now();
               const timer = setInterval(() => {
                 if (!this.ptyProcess || this.currentStatus === "stopped") {
                   clearInterval(timer);
-                  resolve10(true);
+                  resolve9(true);
                   return;
                 }
                 if (Date.now() - startedAt >= timeoutMs) {
                   clearInterval(timer);
-                  resolve10(false);
+                  resolve9(false);
                 }
               }, 100);
             });
@@ -29852,6 +29915,18 @@ ${data.message || ""}`.trim();
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.responseTimeout) {
+              clearTimeout(this.responseTimeout);
+              this.responseTimeout = null;
+            }
+            if (this.idleTimeout) {
+              clearTimeout(this.idleTimeout);
+              this.idleTimeout = null;
+            }
+            if (this.pendingScriptStatusTimer) {
+              clearTimeout(this.pendingScriptStatusTimer);
+              this.pendingScriptStatusTimer = null;
+            }
             if (this.pendingOutputParseTimer) {
               clearTimeout(this.pendingOutputParseTimer);
               this.pendingOutputParseTimer = null;
@@ -29893,6 +29968,18 @@ ${data.message || ""}`.trim();
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.responseTimeout) {
+              clearTimeout(this.responseTimeout);
+              this.responseTimeout = null;
+            }
+            if (this.idleTimeout) {
+              clearTimeout(this.idleTimeout);
+              this.idleTimeout = null;
+            }
+            if (this.pendingScriptStatusTimer) {
+              clearTimeout(this.pendingScriptStatusTimer);
+              this.pendingScriptStatusTimer = null;
+            }
             if (this.pendingOutputParseTimer) {
               clearTimeout(this.pendingOutputParseTimer);
               this.pendingOutputParseTimer = null;
@@ -30476,20 +30563,20 @@ ${data.message || ""}`.trim();
       return null;
     }
     async function detectIDEs() {
-      const os17 = (0, import_os22.platform)();
+      const os18 = (0, import_os22.platform)();
       const results = [];
       for (const def of getMergedDefinitions()) {
         const cliPath = findCliCommand(def.cli);
-        const appPath = checkPathExists(def.paths[os17] || []);
+        const appPath = checkPathExists(def.paths[os18] || []);
         const installed = !!(cliPath || appPath);
         let resolvedCli = cliPath;
-        if (!resolvedCli && appPath && os17 === "darwin") {
+        if (!resolvedCli && appPath && os18 === "darwin") {
           const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
           if ((0, import_fs2.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
-        if (!resolvedCli && appPath && os17 === "win32") {
-          const { dirname: dirname7 } = await import("path");
-          const appDir = dirname7(appPath);
+        if (!resolvedCli && appPath && os18 === "win32") {
+          const { dirname: dirname6 } = await import("path");
+          const appDir = dirname6(appPath);
           const candidates = [
             `${appDir}\\\\bin\\\\${def.cli}.cmd`,
             `${appDir}\\\\bin\\\\${def.cli}`,
@@ -30525,15 +30612,15 @@ ${data.message || ""}`.trim();
       return match ? match[1] : raw.split("\n")[0].slice(0, 100);
     }
     function execAsync(cmd, timeoutMs = 5e3) {
-      return new Promise((resolve10) => {
+      return new Promise((resolve9) => {
         const child = (0, import_child_process22.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
           if (err || !stdout?.trim()) {
-            resolve10(null);
+            resolve9(null);
           } else {
-            resolve10(stdout.trim());
+            resolve9(stdout.trim());
           }
         });
-        child.on("error", () => resolve10(null));
+        child.on("error", () => resolve9(null));
       });
     }
     async function detectCLIs(providerLoader) {
@@ -30573,6 +30660,39 @@ ${data.message || ""}`.trim();
     }
     async function detectCLI(cliId, providerLoader) {
       const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
+      if (providerLoader) {
+        const cliList = providerLoader.getCliDetectionList();
+        const target = cliList.find((c) => c.id === resolvedId);
+        if (target) {
+          const platform9 = os22.platform();
+          const whichCmd = platform9 === "win32" ? "where" : "which";
+          try {
+            const pathResult = await execAsync(`${whichCmd} ${target.command}`);
+            if (!pathResult) return null;
+            const firstPath = pathResult.split("\n")[0];
+            let version2;
+            try {
+              const versionCommands = [
+                target.versionCommand,
+                `${target.command} --version`,
+                `${target.command} -V`,
+                `${target.command} -v`
+              ].filter((v2) => !!v2);
+              for (const versionCommand of versionCommands) {
+                const versionResult = await execAsync(versionCommand, 3e3);
+                if (versionResult) {
+                  version2 = parseVersion(versionResult);
+                  break;
+                }
+              }
+            } catch {
+            }
+            return { ...target, installed: true, version: version2, path: firstPath };
+          } catch {
+            return null;
+          }
+        }
+      }
       const all = await detectCLIs(providerLoader);
       return all.find((c) => c.id === resolvedId && c.installed) || null;
     }
@@ -30696,7 +30816,7 @@ ${data.message || ""}`.trim();
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -30712,16 +30832,16 @@ ${data.message || ""}`.trim();
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve10(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve9(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve10([]);
+                resolve9([]);
               }
             });
           });
-          req.on("error", () => resolve10([]));
+          req.on("error", () => resolve9([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve10([]);
+            resolve9([]);
           });
         });
       }
@@ -30761,7 +30881,7 @@ ${data.message || ""}`.trim();
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -30772,7 +30892,7 @@ ${data.message || ""}`.trim();
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve10(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve9(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -30782,24 +30902,24 @@ ${data.message || ""}`.trim();
                   const specific = list.find((t) => t.id === this._targetId);
                   if (specific) {
                     this._pageTitle = specific.title || "";
-                    resolve10(specific);
+                    resolve9(specific);
                   } else {
                     this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                    resolve10(null);
+                    resolve9(null);
                   }
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve10(list[0]);
+                resolve9(list[0]);
               } catch {
-                resolve10(null);
+                resolve9(null);
               }
             });
           });
-          req.on("error", () => resolve10(null));
+          req.on("error", () => resolve9(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve10(null);
+            resolve9(null);
           });
         });
       }
@@ -30810,7 +30930,7 @@ ${data.message || ""}`.trim();
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -30820,17 +30940,17 @@ ${data.message || ""}`.trim();
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve10(true);
+            resolve9(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve11, reject } = this.pending.get(msg.id);
+                const { resolve: resolve10, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve11(msg.result);
+                else resolve10(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -30853,7 +30973,7 @@ ${data.message || ""}`.trim();
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve10(false);
+            resolve9(false);
           });
         });
       }
@@ -30867,7 +30987,7 @@ ${data.message || ""}`.trim();
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve10, reject) => {
+          await new Promise((resolve9, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -30877,16 +30997,16 @@ ${data.message || ""}`.trim();
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve10();
+              resolve9();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve11, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve10, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve11(msg.result);
+                  else resolve10(msg.result);
                 }
               } catch {
               }
@@ -30906,31 +31026,31 @@ ${data.message || ""}`.trim();
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
             res.on("end", () => {
               try {
                 const info = JSON.parse(data);
-                resolve10(info.webSocketDebuggerUrl || null);
+                resolve9(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve10(null);
+                resolve9(null);
               }
             });
           });
-          req.on("error", () => resolve10(null));
+          req.on("error", () => resolve9(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve10(null);
+            resolve9(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve9, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve10, reject });
+          this.browserPending.set(id, { resolve: resolve9, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -30970,11 +31090,11 @@ ${data.message || ""}`.trim();
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve9, reject) => {
           if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
           if (this.ws.readyState !== import_ws2.default.OPEN) return reject(new Error("WebSocket not open"));
           const id = this.msgId++;
-          this.pending.set(id, { resolve: resolve10, reject });
+          this.pending.set(id, { resolve: resolve9, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -31223,7 +31343,7 @@ ${data.message || ""}`.trim();
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve10, reject) => {
+          return new Promise((resolve9, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -31232,7 +31352,7 @@ ${data.message || ""}`.trim();
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve10(msg.result);
+                  else resolve9(msg.result);
                 }
               } catch {
               }
@@ -31423,14 +31543,14 @@ ${data.message || ""}`.trim();
         if (!ws2 || ws2.readyState !== import_ws2.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve9, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve10(result?.result?.value);
+                resolve9(result?.result?.value);
               }
             },
             reject
@@ -31462,10 +31582,10 @@ ${data.message || ""}`.trim();
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve10, reject) => {
+          return new Promise((resolve9, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve10, reject });
+            pendingMap.set(id, { resolve: resolve9, reject });
             ws2.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -34965,8 +35085,24 @@ ${data.message || ""}`.trim();
       return { success: false, error: "Failed to save setting" };
     }
     init_config();
+    function loadWorkspaceConfig() {
+      try {
+        return loadConfig2();
+      } catch (e) {
+        return { error: `Could not load config: ${e?.message || "unknown error"}` };
+      }
+    }
+    function persistWorkspaceConfig(config2) {
+      try {
+        saveConfig(config2);
+        return { ok: true };
+      } catch (e) {
+        return { error: `Could not save config: ${e?.message || "unknown error"}` };
+      }
+    }
     function handleWorkspaceList() {
-      const config2 = loadConfig2();
+      const config2 = loadWorkspaceConfig();
+      if ("error" in config2) return { success: false, error: config2.error };
       const state = getWorkspaceState2(config2);
       return {
         success: true,
@@ -34980,31 +35116,37 @@ ${data.message || ""}`.trim();
       const label = (args?.label || "").trim() || void 0;
       const createIfMissing = args?.createIfMissing === true;
       if (!rawPath) return { success: false, error: "path required" };
-      const config2 = loadConfig2();
+      const config2 = loadWorkspaceConfig();
+      if ("error" in config2) return { success: false, error: config2.error };
       const result = addWorkspaceEntry(config2, rawPath, label, { createIfMissing });
       if ("error" in result) return { success: false, error: result.error };
-      saveConfig(result.config);
+      const saveResult = persistWorkspaceConfig(result.config);
+      if ("error" in saveResult) return { success: false, error: saveResult.error };
       const state = getWorkspaceState2(result.config);
       return { success: true, entry: result.entry, ...state };
     }
     function handleWorkspaceRemove(args) {
       const id = (args?.id || "").trim();
       if (!id) return { success: false, error: "id required" };
-      const config2 = loadConfig2();
+      const config2 = loadWorkspaceConfig();
+      if ("error" in config2) return { success: false, error: config2.error };
       const removed = (config2.workspaces || []).find((w) => w.id === id);
       const result = removeWorkspaceEntry(config2, id);
       if ("error" in result) return { success: false, error: result.error };
-      saveConfig(result.config);
+      const saveResult = persistWorkspaceConfig(result.config);
+      if ("error" in saveResult) return { success: false, error: saveResult.error };
       const state = getWorkspaceState2(result.config);
       return { success: true, removedId: id, ...state };
     }
     function handleWorkspaceSetDefault(args) {
       const clear = args?.clear === true || args?.id === null || args?.id === "";
       if (clear) {
-        const config22 = loadConfig2();
+        const config22 = loadWorkspaceConfig();
+        if ("error" in config22) return { success: false, error: config22.error };
         const result2 = setDefaultWorkspaceId(config22, null);
         if ("error" in result2) return { success: false, error: result2.error };
-        saveConfig(result2.config);
+        const saveResult2 = persistWorkspaceConfig(result2.config);
+        if ("error" in saveResult2) return { success: false, error: saveResult2.error };
         const state2 = getWorkspaceState2(result2.config);
         return {
           success: true,
@@ -35016,7 +35158,9 @@ ${data.message || ""}`.trim();
       if (!pathArg && !idArg) {
         return { success: false, error: "id or path required (or clear: true)" };
       }
-      let config2 = loadConfig2();
+      const configResult = loadWorkspaceConfig();
+      if ("error" in configResult) return { success: false, error: configResult.error };
+      let config2 = configResult;
       let nextId;
       if (pathArg) {
         let w = findWorkspaceByPath(config2, pathArg);
@@ -35032,7 +35176,8 @@ ${data.message || ""}`.trim();
       }
       const result = setDefaultWorkspaceId(config2, nextId);
       if ("error" in result) return { success: false, error: result.error };
-      saveConfig(result.config);
+      const saveResult = persistWorkspaceConfig(result.config);
+      if ("error" in saveResult) return { success: false, error: saveResult.error };
       const state = getWorkspaceState2(result.config);
       return { success: true, ...state };
     }
@@ -35432,7 +35577,7 @@ ${data.message || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve10, reject) => {
+          const result = await new Promise((resolve9, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -35444,9 +35589,9 @@ ${data.message || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve10(JSON.parse(data));
+                  resolve9(JSON.parse(data));
                 } catch {
-                  resolve10({ raw: data });
+                  resolve9({ raw: data });
                 }
               });
             });
@@ -35464,15 +35609,15 @@ ${data.message || ""}`.trim();
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve10, reject) => {
+          const result = await new Promise((resolve9, reject) => {
             http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
               let data = "";
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve10(JSON.parse(data));
+                  resolve9(JSON.parse(data));
                 } catch {
-                  resolve10({ raw: data });
+                  resolve9({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -35486,7 +35631,7 @@ ${data.message || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve10, reject) => {
+          const result = await new Promise((resolve9, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -35498,9 +35643,9 @@ ${data.message || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve10(JSON.parse(data));
+                  resolve9(JSON.parse(data));
                 } catch {
-                  resolve10({ raw: data });
+                  resolve9({ raw: data });
                 }
               });
             });
@@ -35514,13 +35659,13 @@ ${data.message || ""}`.trim();
         }
       }
     };
-    var os9 = __toESM2(require("os"));
+    var os10 = __toESM2(require("os"));
     var path9 = __toESM2(require("path"));
     var crypto4 = __toESM2(require("crypto"));
     var import_chalk = __toESM2(require("chalk"));
     init_provider_cli_adapter();
     init_config();
-    var os8 = __toESM2(require("os"));
+    var os9 = __toESM2(require("os"));
     var path8 = __toESM2(require("path"));
     var crypto3 = __toESM2(require("crypto"));
     var fs5 = __toESM2(require("fs"));
@@ -35609,17 +35754,60 @@ ${data.message || ""}`.trim();
       async onTick() {
         if (this.providerSessionId) return;
         let probedSessionId = null;
-        if (this.type === "opencode-cli") {
-          probedSessionId = this.probeOpenCodeSessionId();
-        } else if (this.type === "codex-cli") {
-          probedSessionId = this.probeCodexSessionId();
-        } else if (this.type === "goose-cli") {
-          probedSessionId = this.probeGooseSessionId();
+        const probeConfig = this.provider.sessionProbe;
+        if (probeConfig) {
+          probedSessionId = this.probeSessionIdFromConfig(probeConfig);
+        } else {
+          if (this.type === "opencode-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.local/share/opencode/opencode.db",
+              query: "select id from session where directory in ({dirs}) and time_created >= ? and time_archived is null order by time_updated desc limit 1",
+              timestampFormat: "unix_ms"
+            });
+          } else if (this.type === "codex-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.codex/state_5.sqlite",
+              query: "select id from threads where cwd in ({dirs}) and created_at >= ? and archived = 0 order by created_at desc limit 1",
+              timestampFormat: "unix_s"
+            });
+          } else if (this.type === "goose-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.local/share/goose/sessions/sessions.db",
+              query: "select id from sessions where working_dir in ({dirs}) and created_at >= ? order by updated_at desc limit 1",
+              timestampFormat: "iso"
+            });
+          }
         }
         if (probedSessionId) {
           this.promoteProviderSessionId(probedSessionId);
         }
       }
+      /**
+       * Generic session ID probe using declarative ProviderSessionProbe config.
+       * Replaces the previously duplicated probeOpenCode/Codex/Goose functions.
+       */
+      probeSessionIdFromConfig(probe) {
+        const resolvedDbPath = probe.dbPath.replace(/^~/, os9.homedir());
+        if (!fs5.existsSync(resolvedDbPath)) return null;
+        const directories = this.getProbeDirectories();
+        const minCreatedAt = Math.max(0, this.startedAt - 6e4);
+        const tsFormat = probe.timestampFormat || "unix_ms";
+        let timestampParam;
+        if (tsFormat === "unix_s") {
+          timestampParam = Math.floor(minCreatedAt / 1e3);
+        } else if (tsFormat === "iso") {
+          timestampParam = new Date(minCreatedAt).toISOString().slice(0, 19).replace("T", " ");
+        } else {
+          timestampParam = minCreatedAt;
+        }
+        const placeholders = this.buildSqlPlaceholderList(directories.length);
+        const query = probe.query.replace("{dirs}", placeholders);
+        try {
+          return this.querySqliteText(resolvedDbPath, query, [...directories, timestampParam]);
+        } catch {
+          return null;
+        }
+      }
       getState() {
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
@@ -35917,34 +36105,6 @@ ${data.message || ""}`.trim();
         });
         LOG2.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
-      probeOpenCodeSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".local", "share", "opencode", "opencode.db");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAt = Math.max(0, this.startedAt - 6e4);
-        const directories = this.getProbeDirectories();
-        const query = `select id from session where directory in (${this.buildSqlPlaceholderList(directories.length)}) and time_created >= ? and time_archived is null order by time_updated desc limit 1;`;
-        return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-      }
-      probeCodexSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".codex", "state_5.sqlite");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAt = Math.max(0, Math.floor((this.startedAt - 6e4) / 1e3));
-        const directories = this.getProbeDirectories();
-        const query = `select id from threads where cwd in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? and archived = 0 order by created_at desc limit 1;`;
-        return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-      }
-      probeGooseSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".local", "share", "goose", "sessions", "sessions.db");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAtIso = new Date(Math.max(0, this.startedAt - 6e4)).toISOString().slice(0, 19).replace("T", " ");
-        const directories = this.getProbeDirectories();
-        const query = `select id from sessions where working_dir in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? order by updated_at desc limit 1;`;
-        try {
-          return this.querySqliteText(dbPath, query, [...directories, minCreatedAtIso]);
-        } catch {
-          return null;
-        }
-      }
       getProbeDirectories() {
         const dirs = /* @__PURE__ */ new Set();
         const addDir = (value) => {
@@ -36410,13 +36570,13 @@ ${data.message || ""}`.trim();
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve10) => {
-              this.permissionResolvers.push(resolve10);
+            const approved = await new Promise((resolve9) => {
+              this.permissionResolvers.push(resolve9);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve10);
+                const idx = this.permissionResolvers.indexOf(resolve9);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve10(false);
+                  resolve9(false);
                 }
               }, 3e5);
             });
@@ -37121,7 +37281,7 @@ ${data.message || ""}`.trim();
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os9.homedir()) : path9.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os10.homedir()) : path9.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
@@ -37205,7 +37365,19 @@ ${installInfo}`
           return { runtimeSessionId: sessionId };
         }
         const cliInfo = await detectCLI(cliType, this.providerLoader);
-        if (!cliInfo) throw new Error(`${cliType} not found`);
+        if (!cliInfo) {
+          const installHint = provider?.install || "";
+          const displayName = provider?.displayName || provider?.name || cliType;
+          const spawnCmd = provider?.spawn?.command || cliType;
+          throw new Error(
+            `${displayName} is not installed.
+Command '${spawnCmd}' not found on PATH.
+` + (installHint ? `
+${installHint}
+` : "") + `
+Run 'adhdev doctor' for detailed diagnostics.`
+          );
+        }
         console.log(colorize("yellow", `  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
         if (provider) {
           console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
@@ -37521,8 +37693,9 @@ ${installInfo}`
             const dir = rdir.path;
             if (!cliType) throw new Error("cliType required");
             const found = this.findAdapter(cliType, { instanceKey: args?.targetSessionId, dir });
+            const prevCliArgs = found ? found.adapter.extraArgs : void 0;
             if (found) await this.stopSession(found.key);
-            await this.startSession(cliType, dir);
+            await this.startSession(cliType, dir, args?.cliArgs || prevCliArgs, args?.initialModel);
             return { success: true, restarted: true };
           }
           case "agent_command": {
@@ -37555,11 +37728,11 @@ ${installInfo}`
     };
     var import_child_process6 = require("child_process");
     var net3 = __toESM2(require("net"));
-    var os11 = __toESM2(require("os"));
+    var os12 = __toESM2(require("os"));
     var path11 = __toESM2(require("path"));
     var fs6 = __toESM2(require("fs"));
     var path10 = __toESM2(require("path"));
-    var os10 = __toESM2(require("os"));
+    var os11 = __toESM2(require("os"));
     var chokidar = __toESM2((init_chokidar(), __toCommonJS(chokidar_exports)));
     init_logger();
     var ProviderLoader = class _ProviderLoader {
@@ -37579,7 +37752,7 @@ ${installInfo}`
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG2.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path10.join(os10.homedir(), ".adhdev", "providers");
+        const defaultProvidersDir = path10.join(os11.homedir(), ".adhdev", "providers");
         if (options?.userDir) {
           this.userDir = options.userDir;
           this.log(`Config 'providerDir' applied: ${this.userDir}`);
@@ -38136,7 +38309,7 @@ ${installInfo}`
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve10, reject) => {
+          const etag = await new Promise((resolve9, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -38154,7 +38327,7 @@ ${installInfo}`
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve10(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve9(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -38163,7 +38336,7 @@ ${installInfo}`
                 });
                 req2.end();
               } else {
-                resolve10(res.headers.etag || res.headers["last-modified"] || "");
+                resolve9(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -38179,8 +38352,8 @@ ${installInfo}`
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path10.join(os10.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path10.join(os10.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path10.join(os11.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path10.join(os11.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
           fs6.mkdirSync(tmpExtract, { recursive: true });
           execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
@@ -38227,7 +38400,7 @@ ${installInfo}`
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve9, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -38247,7 +38420,7 @@ ${installInfo}`
               res.pipe(ws2);
               ws2.on("finish", () => {
                 ws2.close();
-                resolve10();
+                resolve9();
               });
               ws2.on("error", reject);
             });
@@ -38610,17 +38783,17 @@ ${installInfo}`
       throw new Error("No free port found");
     }
     function checkPortFree(port) {
-      return new Promise((resolve10) => {
+      return new Promise((resolve9) => {
         const server = net3.createServer();
         server.unref();
-        server.on("error", () => resolve10(false));
+        server.on("error", () => resolve9(false));
         server.listen(port, "127.0.0.1", () => {
-          server.close(() => resolve10(true));
+          server.close(() => resolve9(true));
         });
       });
     }
     async function isCdpActive(port) {
-      return new Promise((resolve10) => {
+      return new Promise((resolve9) => {
         const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
           timeout: 2e3
         }, (res) => {
@@ -38629,21 +38802,21 @@ ${installInfo}`
           res.on("end", () => {
             try {
               const info = JSON.parse(data);
-              resolve10(!!info["WebKit-Version"] || !!info["Browser"]);
+              resolve9(!!info["WebKit-Version"] || !!info["Browser"]);
             } catch {
-              resolve10(false);
+              resolve9(false);
             }
           });
         });
-        req.on("error", () => resolve10(false));
+        req.on("error", () => resolve9(false));
         req.on("timeout", () => {
           req.destroy();
-          resolve10(false);
+          resolve9(false);
         });
       });
     }
     async function killIdeProcess(ideId) {
-      const plat = os11.platform();
+      const plat = os12.platform();
       const appName = getMacAppIdentifiers()[ideId];
       const winProcesses = getWinProcessNames()[ideId];
       try {
@@ -38702,7 +38875,7 @@ ${installInfo}`
       }
     }
     function isIdeRunning(ideId) {
-      const plat = os11.platform();
+      const plat = os12.platform();
       try {
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
@@ -38738,7 +38911,7 @@ ${installInfo}`
       }
     }
     function detectCurrentWorkspace(ideId) {
-      const plat = os11.platform();
+      const plat = os12.platform();
       if (plat === "darwin") {
         try {
           const appName = getMacAppIdentifiers()[ideId];
@@ -38758,7 +38931,7 @@ ${installInfo}`
           const appName = appNameMap[ideId];
           if (appName) {
             const storagePath = path11.join(
-              process.env.APPDATA || path11.join(os11.homedir(), "AppData", "Roaming"),
+              process.env.APPDATA || path11.join(os12.homedir(), "AppData", "Roaming"),
               appName,
               "storage.json"
             );
@@ -38780,7 +38953,7 @@ ${installInfo}`
       return void 0;
     }
     async function launchWithCdp(options = {}) {
-      const platform9 = os11.platform();
+      const platform9 = os12.platform();
       let targetIde;
       const ides = await detectIDEs();
       if (options.ideId) {
@@ -38928,8 +39101,8 @@ ${installInfo}`
     init_logger();
     var fs7 = __toESM2(require("fs"));
     var path12 = __toESM2(require("path"));
-    var os12 = __toESM2(require("os"));
-    var LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os12.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os12.homedir(), "Library", "Logs", "adhdev") : path12.join(os12.homedir(), ".local", "share", "adhdev", "logs");
+    var os13 = __toESM2(require("os"));
+    var LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os13.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os13.homedir(), "Library", "Logs", "adhdev") : path12.join(os13.homedir(), ".local", "share", "adhdev", "logs");
     var MAX_FILE_SIZE = 5 * 1024 * 1024;
     var MAX_DAYS = 7;
     try {
@@ -39060,7 +39233,7 @@ ${installInfo}`
     }
     cleanOldFiles();
     init_logger();
-    var os13 = __toESM2(require("os"));
+    var os14 = __toESM2(require("os"));
     init_config();
     init_terminal_screen();
     init_logger();
@@ -39176,16 +39349,16 @@ ${installInfo}`
         version: options.version,
         daemonMode: options.daemonMode,
         machine: {
-          hostname: os13.hostname(),
-          platform: os13.platform(),
-          arch: os13.arch(),
-          cpus: os13.cpus().length,
+          hostname: os14.hostname(),
+          platform: os14.platform(),
+          arch: os14.arch(),
+          cpus: os14.cpus().length,
           totalMem: memSnap.totalMem,
           freeMem: memSnap.freeMem,
           availableMem: memSnap.availableMem,
-          loadavg: os13.loadavg(),
-          uptime: os13.uptime(),
-          release: os13.release()
+          loadavg: os14.loadavg(),
+          uptime: os14.uptime(),
+          release: os14.release()
         },
         machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
         timestamp: options.timestamp ?? Date.now(),
@@ -39203,11 +39376,11 @@ ${installInfo}`
     var import_child_process7 = require("child_process");
     var import_child_process8 = require("child_process");
     var fs8 = __toESM2(require("fs"));
-    var os14 = __toESM2(require("os"));
+    var os15 = __toESM2(require("os"));
     var path13 = __toESM2(require("path"));
     var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
     function getUpgradeLogPath() {
-      const home = os14.homedir();
+      const home = os15.homedir();
       const dir = path13.join(home, ".adhdev");
       fs8.mkdirSync(dir, { recursive: true });
       return path13.join(dir, "daemon-upgrade.log");
@@ -39240,14 +39413,14 @@ ${installInfo}`
       while (Date.now() - start < timeoutMs) {
         try {
           process.kill(pid, 0);
-          await new Promise((resolve10) => setTimeout(resolve10, 250));
+          await new Promise((resolve9) => setTimeout(resolve9, 250));
         } catch {
           return;
         }
       }
     }
     function stopSessionHostProcesses(appName) {
-      const pidFile = path13.join(os14.homedir(), ".adhdev", `${appName}-session-host.pid`);
+      const pidFile = path13.join(os15.homedir(), ".adhdev", `${appName}-session-host.pid`);
       try {
         if (fs8.existsSync(pidFile)) {
           const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -39276,7 +39449,7 @@ ${installInfo}`
       }
     }
     function removeDaemonPidFile() {
-      const pidFile = path13.join(os14.homedir(), ".adhdev", "daemon.pid");
+      const pidFile = path13.join(os15.homedir(), ".adhdev", "daemon.pid");
       try {
         fs8.unlinkSync(pidFile);
       } catch {
@@ -40766,10 +40939,10 @@ ${installInfo}`
     };
     var fs10 = __toESM2(require("fs"));
     var path14 = __toESM2(require("path"));
-    var os15 = __toESM2(require("os"));
+    var os16 = __toESM2(require("os"));
     var import_child_process9 = require("child_process");
     var import_os3 = require("os");
-    var ARCHIVE_PATH = path14.join(os15.homedir(), ".adhdev", "version-history.json");
+    var ARCHIVE_PATH = path14.join(os16.homedir(), ".adhdev", "version-history.json");
     var MAX_ENTRIES_PER_PROVIDER = 20;
     var VersionArchive = class {
       history = {};
@@ -40856,7 +41029,7 @@ ${installInfo}`
     function checkPathExists2(paths) {
       for (const p of paths) {
         if (p.includes("*")) {
-          const home = os15.homedir();
+          const home = os16.homedir();
           const resolved = p.replace(/\*/g, home.split(path14.sep).pop() || "");
           if (fs10.existsSync(resolved)) return resolved;
         } else {
@@ -42443,7 +42616,7 @@ async (params) => {
       return { target, instance, adapter };
     }
     function sleep(ms2) {
-      return new Promise((resolve10) => setTimeout(resolve10, ms2));
+      return new Promise((resolve9) => setTimeout(resolve9, ms2));
     }
     async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
       const startedAt = Date.now();
@@ -43172,7 +43345,7 @@ async (params) => {
     }
     var fs13 = __toESM2(require("fs"));
     var path17 = __toESM2(require("path"));
-    var os16 = __toESM2(require("os"));
+    var os17 = __toESM2(require("os"));
     function getAutoImplPid(ctx) {
       const proc = ctx.autoImplProcess;
       return proc && typeof proc.pid === "number" && proc.pid > 0 ? proc.pid : null;
@@ -43375,7 +43548,7 @@ async (params) => {
         });
         const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
         const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-        const tmpDir = path17.join(os16.tmpdir(), "adhdev-autoimpl");
+        const tmpDir = path17.join(os17.tmpdir(), "adhdev-autoimpl");
         if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
         const promptFile = path17.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
         fs13.writeFileSync(promptFile, prompt, "utf-8");
@@ -43529,7 +43702,7 @@ async (params) => {
         const interactiveFlags = ["--yolo", "--interactive", "-i"];
         const baseArgs = [...spawn4.args || []].filter((a) => !interactiveFlags.includes(a));
         let shellCmd;
-        const isWin = os16.platform() === "win32";
+        const isWin = os17.platform() === "win32";
         const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
         if (command === "claude") {
           const args = [...baseArgs, "--dangerously-skip-permissions"];
@@ -43573,7 +43746,7 @@ async (params) => {
         try {
           const pty3 = require("node-pty");
           ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-          const isWin2 = os16.platform() === "win32";
+          const isWin2 = os17.platform() === "win32";
           child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
             name: "xterm-256color",
             cols: 120,
@@ -44609,15 +44782,15 @@ data: ${JSON.stringify(msg.data)}
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve9, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve10();
+            resolve9();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve10();
+              resolve9();
             } else {
               reject(e);
             }
@@ -44700,20 +44873,20 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve10) => {
+          await new Promise((resolve9) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve10();
+              resolve9();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve10();
+              resolve9();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve10();
+                resolve9();
               }, 500);
             });
           });
@@ -45222,14 +45395,14 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve10) => {
+          await new Promise((resolve9) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve10();
+              resolve9();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve10();
+              resolve9();
             });
           });
           const elapsed = Date.now() - start;
@@ -45904,14 +46077,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve10(JSON.parse(body));
+              resolve9(JSON.parse(body));
             } catch {
-              resolve10({});
+              resolve9({});
             }
           });
         });
@@ -45980,12 +46153,12 @@ data: ${JSON.stringify(msg.data)}
     };
     init_provider_cli_adapter();
     init_pty_transport();
-    var import_session_host_core2 = require_dist();
+    var import_session_host_core22 = require_dist();
     init_logger();
     var SessionHostRuntimeTransport = class {
       constructor(options) {
         this.options = options;
-        this.client = new import_session_host_core2.SessionHostClient({
+        this.client = new import_session_host_core22.SessionHostClient({
           endpoint: options.endpoint,
           appName: options.appName
         });
@@ -46352,11 +46525,11 @@ data: ${JSON.stringify(msg.data)}
         });
       }
     };
-    var import_session_host_core22 = require_dist();
+    var import_session_host_core3 = require_dist();
     var STARTUP_TIMEOUT_MS = 8e3;
     var STARTUP_POLL_MS = 200;
     async function canConnect(endpoint) {
-      const client = new import_session_host_core22.SessionHostClient({ endpoint });
+      const client = new import_session_host_core3.SessionHostClient({ endpoint });
       try {
         await client.connect();
         await client.close();
@@ -46369,19 +46542,19 @@ data: ${JSON.stringify(msg.data)}
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         if (await canConnect(endpoint)) return;
-        await new Promise((resolve10) => setTimeout(resolve10, STARTUP_POLL_MS));
+        await new Promise((resolve9) => setTimeout(resolve9, STARTUP_POLL_MS));
       }
       throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
     }
     async function ensureSessionHostReady2(options) {
-      const endpoint = (0, import_session_host_core22.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
+      const endpoint = (0, import_session_host_core3.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
       if (await canConnect(endpoint)) return endpoint;
       options.spawnHost();
       await waitForReady(endpoint, options.timeoutMs);
       return endpoint;
     }
     async function listHostedCliRuntimes2(endpoint) {
-      const client = new import_session_host_core22.SessionHostClient({ endpoint });
+      const client = new import_session_host_core3.SessionHostClient({ endpoint });
       try {
         const response = await client.request({
           type: "list_sessions",
@@ -46523,10 +46696,10 @@ data: ${JSON.stringify(msg.data)}
             const buffer = Buffer.from(await res.arrayBuffer());
             const fs15 = await import("fs");
             fs15.writeFileSync(vsixPath, buffer);
-            return new Promise((resolve10) => {
+            return new Promise((resolve9) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
               (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-                resolve10({
+                resolve9({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -46539,11 +46712,11 @@ data: ${JSON.stringify(msg.data)}
         } catch (e) {
         }
       }
-      return new Promise((resolve10) => {
+      return new Promise((resolve9) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
         (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve10({
+            resolve9({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -46551,7 +46724,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve10({
+            resolve9({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,
@@ -47029,6 +47202,13 @@ var SessionHostClient = class {
   }
   async connect() {
     if (this.socket && !this.socket.destroyed) return;
+    if (this.socket) {
+      try {
+        this.socket.destroy();
+      } catch {
+      }
+      this.socket = null;
+    }
     const socket = net.createConnection(this.endpoint.path);
     this.socket = socket;
     socket.on("data", createLineParser((envelope) => {
@@ -47049,9 +47229,16 @@ var SessionHostClient = class {
         waiter.reject(error48);
       }
       this.requestWaiters.clear();
+      if (this.socket === socket) {
+        this.socket = null;
+      }
+      try {
+        socket.destroy();
+      } catch {
+      }
     });
-    await new Promise((resolve4, reject) => {
-      socket.once("connect", () => resolve4());
+    await new Promise((resolve22, reject) => {
+      socket.once("connect", () => resolve22());
       socket.once("error", reject);
     });
   }
@@ -47070,7 +47257,7 @@ var SessionHostClient = class {
       requestId,
       request
     };
-    const response = await new Promise((resolve4, reject) => {
+    const response = await new Promise((resolve22, reject) => {
       const timeout = setTimeout(() => {
         this.requestWaiters.delete(requestId);
         reject(new Error(`Session host request timed out after 30s (${request.type})`));
@@ -47078,7 +47265,7 @@ var SessionHostClient = class {
       this.requestWaiters.set(requestId, {
         resolve: (value) => {
           clearTimeout(timeout);
-          resolve4(value);
+          resolve22(value);
         },
         reject: (error48) => {
           clearTimeout(timeout);
@@ -47097,12 +47284,12 @@ var SessionHostClient = class {
       waiter.reject(new Error("Session host client closed"));
     }
     this.requestWaiters.clear();
-    await new Promise((resolve4) => {
+    await new Promise((resolve22) => {
       let settled = false;
       const done = () => {
         if (settled) return;
         settled = true;
-        resolve4();
+        resolve22();
       };
       socket.once("close", done);
       socket.end();