@adhdev/daemon-standalone 1.0.18-rc.2 → 1.0.18-rc.3

package/dist/index.js

@@ -2872,6 +2872,7 @@ var require_dist = __commonJS({
       applyTerminalColorEnv: () => applyTerminalColorEnv,
       buildRuntimeDisplayName: () => buildRuntimeDisplayName,
       buildRuntimeKey: () => buildRuntimeKey,
+      classifyTermination: () => classifyTermination,
       createLineParser: () => createLineParser2,
       createResponseEnvelope: () => createResponseEnvelope,
       createSessionHostControlPlane: () => createSessionHostControlPlane2,
@@ -2915,6 +2916,37 @@ var require_dist = __commonJS({
       "prune_duplicate_sessions",
       "list_sessions"
     ];
+    function classifyTermination(input) {
+      const { exitCode, terminatedAt } = input;
+      const signal = input.signal ?? null;
+      let reason;
+      let lifecycle;
+      if (signal !== null && signal !== 0) {
+        reason = "signal";
+        lifecycle = "failed";
+      } else if (exitCode === null) {
+        reason = "unknown";
+        lifecycle = "failed";
+      } else if (exitCode === 0) {
+        reason = "exit";
+        lifecycle = "stopped";
+      } else {
+        reason = "failed";
+        lifecycle = "failed";
+      }
+      const termination = {
+        exitCode,
+        signal,
+        reason,
+        lifecycle,
+        terminatedAt
+      };
+      if (typeof input.osPid === "number") termination.osPid = input.osPid;
+      if (input.previousLifecycle) termination.previousLifecycle = input.previousLifecycle;
+      if (typeof input.lastOutputAt === "number") termination.lastOutputAt = input.lastOutputAt;
+      if (input.requestedStop) termination.requestedStop = input.requestedStop;
+      return termination;
+    }
     var DEFAULT_SESSION_RING_BUFFER_MAX_BYTES2 = 4 * 1024 * 1024;
     var SessionRingBuffer = class {
       maxBytes;
@@ -3314,10 +3346,11 @@ var require_dist = __commonJS({
         state.record.lastActivityAt = Date.now();
         return this.cloneRecord(state.record);
       }
-      markStopped(sessionId, lifecycle = "stopped") {
+      markStopped(sessionId, lifecycle = "stopped", termination) {
         const state = this.requireSession(sessionId);
         state.record.lifecycle = lifecycle;
         state.record.lastActivityAt = Date.now();
+        if (termination) state.record.termination = termination;
         return this.cloneRecord(state.record);
       }
       setLifecycle(sessionId, lifecycle) {
@@ -30232,10 +30265,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "dcf5798b77def59c325d533c744c7d57b4fc8eac" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "dcf5798b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.18-rc.2" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-07-21T07:46:01.928Z" : void 0);
+      const commit = readInjected(true ? "96f3f1365be0d875f5089fc7ce7e4e254ca8e08d" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "96f3f136" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.18-rc.3" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-07-21T13:00:54.179Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -55727,6 +55760,22 @@ ${cont}` : cont;
           // ── Approval ─────────────────────────────────────
           lastApprovalResolvedAt = 0;
           lastResolvedModalMessage = "";
+          /**
+           * Normalized approval-context signature captured at resolve time (see
+           * `computeApprovalContentSignature`) — the screen text with blank-line
+           * padding and any manifest-declared chrome (transcriptPty.chromePatterns,
+           * spinner.patterns) stripped out. Used by applyWaitingApproval's
+           * isStaleResolvedRepaint check to tell "the same already-answered modal,
+           * re-parsed from a screen that has not meaningfully changed" apart from
+           * "a genuinely new approval" — content-based, not time-based, because
+           * ordinary TUI chrome (status bar, context meter, blank-line repaint)
+           * keeps producing fresh PTY bytes on an otherwise-unchanged screen and
+           * defeats any output-timestamp discriminator within a few hundred ms.
+           * Cleared whenever a turn starts or the session tears down (see
+           * onTurnStarted / resetActiveTurnState / onPtyExit) so a next-turn
+           * approval is never compared against stale prior-turn state.
+           */
+          lastApprovalResolvedContentSignature = "";
           /**
            * Monotonic counter bumped every time the FSM *enters* waiting_approval
            * with a freshly captured modal (see `applyWaitingApproval`). It is the
@@ -55846,11 +55895,17 @@ ${cont}` : cont;
             this.currentTurnTaskId = typeof turnScope.taskId === "string" && turnScope.taskId.trim() ? turnScope.taskId : null;
             this.currentTurnStartedAt = Date.now();
             this.responseEpoch += 1;
+            this.clearApprovalResolutionMemory();
+            if (this.provider.transcriptAuthority === "provider" && this.currentStatus !== "waiting_approval") {
+              this.setStatus("generating", "turn_started");
+              this.callbacks.onStatusChange();
+            }
           }
           /** Called when PTY exits */
           onPtyExit() {
             this.clearAllTimers();
             this.setStatus("stopped", "pty_exit");
+            this.clearApprovalResolutionMemory();
           }
           /** Called when adapter starts up successfully */
           onSpawnReady() {
@@ -55892,6 +55947,7 @@ ${cont}` : cont;
             this.activeModal = null;
             this.lastApprovalResolvedAt = Date.now();
             this.lastResolvedModalMessage = currentModalMessage;
+            this.lastApprovalResolvedContentSignature = this.computeApprovalContentSignature(snap);
             this.lastResolvedEntrySeq = this.approvalEntrySeq;
             this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
             if (this.approvalExitTimeout) {
@@ -56014,6 +56070,7 @@ ${cont}` : cont;
             this.pendingScriptStatusSince = 0;
             this.approvalResumeDeferSince = 0;
             this.approvalResumeDeferEpoch = -1;
+            this.clearApprovalResolutionMemory();
           }
           clearIdleFinishCandidate(reason) {
             if (!this.idleFinishCandidate) return;
@@ -56172,7 +56229,15 @@ ${cont}` : cont;
             }
             if (!status) return;
             const prevStatus = this.currentStatus;
-            const ctx = { now, modal, status, parsedMessages, lastParsedAssistant, parsedStatus: parsedStatus || null, prevStatus };
+            const ctx = {
+              now,
+              modal,
+              status,
+              parsedMessages,
+              lastParsedAssistant,
+              parsedStatus: parsedStatus || null,
+              prevStatus
+            };
             if (!this.applyPendingScriptStatusDebounce(ctx)) return;
             const recentInteractiveActivity = this.hasRecentInteractiveActivity(snap, now);
             LOG2.debug(
@@ -56208,7 +56273,7 @@ ${cont}` : cont;
               return;
             }
             if (status === "waiting_approval") {
-              this.applyWaitingApproval(ctx);
+              this.applyWaitingApproval(ctx, snap);
               return;
             }
             if (status === "generating") {
@@ -56268,7 +56333,7 @@ ${cont}` : cont;
             }, this.timeouts.generatingIdle);
             this.callbacks.onStatusChange();
           }
-          applyWaitingApproval(ctx) {
+          applyWaitingApproval(ctx, snap) {
             const { modal } = ctx;
             this.clearIdleFinishCandidate("waiting_approval");
             const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
@@ -56315,6 +56380,11 @@ ${cont}` : cont;
                 }
                 return;
               }
+              const isStaleResolvedRepaint = !this.activeModal && this.isStaleResolvedApproval(modal, snap);
+              if (isStaleResolvedRepaint) {
+                LOG2.debug("CLI", `[${this.provider.type}] ignoring stale re-parsed approval matching the just-resolved modal (approval-context signature unchanged)`);
+                return;
+              }
               this.modalLostAt = 0;
               this.isWaitingForResponse = true;
               this.setStatus("waiting_approval", "script_detect");
@@ -56600,6 +56670,86 @@ ${cont}` : cont;
             this.recordTrace("idle_finish_cancelled", { trigger: reason });
           }
           // ─── Helpers ────────────────────────────────────────────────────────────
+          /**
+           * Derive a stable approval-context signature from the current screen,
+           * with blank-line padding and any manifest-declared chrome stripped out.
+           *
+           * Generic by design — no kimi- or provider-specific hardcoding: it reads
+           * whatever `tui.transcriptPty.chromePatterns` and `tui.spinner.patterns`
+           * the ACTIVE provider's own manifest already declares (present on any
+           * declarative-TUI provider; simply absent/empty for scripted providers,
+           * in which case this degrades to blank-line stripping only — never worse
+           * than comparing the raw screen). Those pattern lists exist precisely to
+           * name "known volatile repaint noise" (status bar, context meter, spinner
+           * ticks, banners) — reusing them here means the SAME declared knowledge
+           * that governs transcript-chrome stripping also governs staleness
+           * detection, instead of re-encoding provider knowledge into daemon-core.
+           *
+           * Deliberately NOT a hash of the whole screen/buffer: an ordinary TUI
+           * repaints its footer/status/context-meter chrome continuously even while
+           * genuinely idle, so a raw whole-screen or whole-buffer fingerprint (or a
+           * mere "did any bytes arrive" timestamp) changes on every repaint tick
+           * regardless of whether anything approval-relevant actually happened.
+           * Stripping the declared chrome first yields a signature that only
+           * changes when the surrounding conversation/tool-output content itself
+           * changes — exactly the discriminator applyWaitingApproval's
+           * isStaleResolvedRepaint check needs.
+           */
+          computeApprovalContentSignature(snap) {
+            const screenText = snap.screenText || snap.accumulatedBuffer || "";
+            if (!screenText) return "";
+            const tui = this.provider.tui;
+            const patternSpecs = [
+              ...Array.isArray(tui?.transcriptPty?.chromePatterns) ? tui.transcriptPty.chromePatterns : [],
+              ...Array.isArray(tui?.spinner?.patterns) ? tui.spinner.patterns : []
+            ];
+            const chromeRegexes = [];
+            for (const spec of patternSpecs) {
+              if (spec && typeof spec.regex === "string") {
+                try {
+                  chromeRegexes.push(new RegExp(spec.regex, typeof spec.flags === "string" ? spec.flags : ""));
+                } catch {
+                }
+              }
+            }
+            const kept = [];
+            for (const rawLine of screenText.split("\n")) {
+              const line = rawLine.trim();
+              if (!line) continue;
+              if (chromeRegexes.some((re) => re.test(line))) continue;
+              kept.push(line);
+            }
+            return kept.join("\n");
+          }
+          /**
+           * True when `modal` is a stale re-parse of an already-resolved approval:
+           * same message text, and the chrome-stripped approval-context signature
+           * of `snap` is unchanged from the signature captured at resolve time.
+           *
+           * Public and reused verbatim by BOTH the settled-eval capture path
+           * (applyWaitingApproval, below) and any OUTSIDE re-parse the adapter
+           * performs independently of the settle loop — e.g. provider-cli-adapter's
+           * getStatus()/getDebugState() startup-gate modal detection, which reads
+           * `recentOutputBuffer` directly while `startupParseGate` is open and can
+           * re-surface the same already-resolved modal before the gate closes.
+           * Centralizing the discriminator here means there is exactly ONE
+           * definition of "stale" for the whole session — no divergent duplicate
+           * heuristic re-implemented per call site.
+           */
+          isStaleResolvedApproval(modal, snap) {
+            if (!modal) return false;
+            const normalizedMessage = typeof modal.message === "string" ? modal.message.trim() : "";
+            if (!normalizedMessage) return false;
+            return this.lastApprovalResolvedAt > 0 && normalizedMessage === this.lastResolvedModalMessage && this.computeApprovalContentSignature(snap) === this.lastApprovalResolvedContentSignature;
+          }
+          /** Clear all resolve-time approval bookkeeping (message, timestamp, content
+           *  signature) — called at turn/session boundaries so a next-turn or
+           *  next-session approval is never compared against stale prior state. */
+          clearApprovalResolutionMemory() {
+            this.lastApprovalResolvedAt = 0;
+            this.lastResolvedModalMessage = "";
+            this.lastApprovalResolvedContentSignature = "";
+          }
           /**
            * Schedule one more settled evaluation while pinned to `waiting_approval`
            * with no actionable modal. The settled FSM normally only re-runs on new
@@ -57425,8 +57575,8 @@ ${lastSnapshot}`;
                 }
               }
             });
-            this.ptyProcess.onExit(({ exitCode }) => {
-              LOG2.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
+            this.ptyProcess.onExit(({ exitCode, signal }) => {
+              LOG2.info("CLI", `[${this.cliType}] Exit code ${exitCode === null || exitCode === void 0 ? "unknown" : exitCode}${signal ? ` (signal ${signal})` : ""}`);
               this.flushPendingOutputParse();
               this.ptyProcess = null;
               this.engine.onPtyExit();
@@ -57732,7 +57882,10 @@ ${lastSnapshot}`;
           // ─── Public API (CliAdapter) ───────────────────
           getStatus(options = {}) {
             const allowParse = options.allowParse !== false;
-            const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+            let startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+            if (startupModal && this.engine.isStaleResolvedApproval(startupModal, { screenText: this.terminalScreen.getText(), accumulatedBuffer: this.accumulatedBuffer })) {
+              startupModal = null;
+            }
             const startupDetectedStatus = allowParse && this.startupParseGate && !startupModal ? this.runDetectStatus(this.recentOutputBuffer || this.terminalScreen.getText()) : null;
             if (allowParse && this.engine.currentStatus === "generating" && !this.engine.currentTurnScope && !this.engine.activeModal) {
               const now = Date.now();
@@ -57766,7 +57919,7 @@ ${lastSnapshot}`;
               if (liveDetect === "waiting_approval") {
                 const liveModal = this.runParseApproval(this.terminalScreen.getText()) || this.runParseApproval(this.recentOutputBuffer);
                 const buttonsOk = liveModal && Array.isArray(liveModal.buttons) && liveModal.buttons.some((b) => typeof b === "string" && b.trim());
-                if (liveModal && buttonsOk) {
+                if (liveModal && buttonsOk && !this.engine.isStaleResolvedApproval(liveModal, { screenText: this.terminalScreen.getText(), accumulatedBuffer: this.accumulatedBuffer })) {
                   effectiveModal = liveModal;
                   if (!this.engine.activeModal) this.engine.activeModal = liveModal;
                 }
@@ -58892,7 +59045,10 @@ ${lastSnapshot}`;
           }
           getDebugState() {
             const screenText = sanitizeTerminalText(this.terminalScreen.getText());
-            const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+            let startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+            if (startupModal && this.engine.isStaleResolvedApproval(startupModal, { screenText: this.terminalScreen.getText(), accumulatedBuffer: this.accumulatedBuffer })) {
+              startupModal = null;
+            }
             const startupDetectedStatus = this.startupParseGate && !startupModal ? this.runDetectStatus(this.recentOutputBuffer || screenText) : null;
             const effectiveReady = this.ready || !!startupModal || startupDetectedStatus === "waiting_approval";
             const parsedDebugState = this.getParsedDebugState();
@@ -72529,18 +72685,196 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       }
     };
     init_config();
-    var import_child_process6 = require("child_process");
     var import_child_process7 = require("child_process");
+    var import_child_process8 = require("child_process");
     var fs15 = __toESM2(require("fs"));
     var os13 = __toESM2(require("os"));
     var path21 = __toESM2(require("path"));
-    var import_child_process5 = require("child_process");
+    var import_child_process6 = require("child_process");
     var fs14 = __toESM2(require("fs"));
     var http2 = __toESM2(require("http"));
     var path20 = __toESM2(require("path"));
+    var import_child_process5 = require("child_process");
+    function defaultExecFileSync() {
+      return import_child_process5.execFileSync;
+    }
+    function getWindowsProcessCommandLine(pid, exec7) {
+      const pidFilter = `ProcessId=${pid}`;
+      try {
+        const psOut = exec7("powershell.exe", [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
+        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+        const text = String(psOut).trim();
+        if (text) return text;
+      } catch {
+      }
+      try {
+        const wmicOut = exec7("wmic", [
+          "process",
+          "where",
+          pidFilter,
+          "get",
+          "CommandLine"
+        ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+        const text = String(wmicOut).trim();
+        if (text) return text;
+      } catch {
+      }
+      return null;
+    }
+    function getProcessCommandLine(pid, options = {}) {
+      if (!Number.isFinite(pid) || pid <= 0) return null;
+      const exec7 = options.execFileSync ?? defaultExecFileSync();
+      const platform10 = options.platform ?? process.platform;
+      if (platform10 === "win32") {
+        return getWindowsProcessCommandLine(pid, exec7);
+      }
+      try {
+        const text = String(exec7("ps", ["-o", "command=", "-p", String(pid)], {
+          encoding: "utf8",
+          timeout: 3e3,
+          stdio: ["ignore", "pipe", "ignore"]
+        })).trim();
+        return text || null;
+      } catch {
+        return null;
+      }
+    }
+    function parseNodeScriptPath(commandLine) {
+      if (!commandLine) return null;
+      let rest = commandLine.trim();
+      if (rest.startsWith('"')) {
+        const end = rest.indexOf('"', 1);
+        if (end === -1) return null;
+        rest = rest.slice(end + 1).trim();
+      } else {
+        const idx2 = rest.search(/\s/);
+        if (idx2 === -1) return null;
+        rest = rest.slice(idx2 + 1).trim();
+      }
+      if (!rest) return null;
+      if (rest.startsWith('"')) {
+        const end = rest.indexOf('"', 1);
+        return end === -1 ? rest.slice(1) : rest.slice(1, end);
+      }
+      const idx = rest.search(/\s/);
+      return idx === -1 ? rest : rest.slice(0, idx);
+    }
+    function normalizeWindowsPath(value) {
+      return value.toLowerCase().replace(/\//g, "\\").replace(/\\+$/, "");
+    }
+    function killProcess(pid, options = {}) {
+      if (!Number.isFinite(pid) || pid <= 0) return false;
+      const exec7 = options.execFileSync ?? defaultExecFileSync();
+      const platform10 = options.platform ?? process.platform;
+      try {
+        if (platform10 === "win32") {
+          exec7("taskkill", ["/PID", String(pid), "/T", "/F"], {
+            stdio: "ignore",
+            windowsHide: true
+          });
+        } else {
+          process.kill(pid, "SIGTERM");
+        }
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    async function waitForPidExit(pid, timeoutMs) {
+      const start = Date.now();
+      while (Date.now() - start < timeoutMs) {
+        try {
+          process.kill(pid, 0);
+          await new Promise((resolve27) => setTimeout(resolve27, 250));
+        } catch {
+          return true;
+        }
+      }
+      return false;
+    }
+    function listOwnedNodeProcesses(options) {
+      const platform10 = options.platform ?? process.platform;
+      if (platform10 !== "win32") return [];
+      const exec7 = options.execFileSync ?? defaultExecFileSync();
+      const prefixes = options.prefixes.map((p) => normalizeWindowsPath(p));
+      const exclude = new Set((options.excludePids ?? []).filter((n) => Number.isFinite(n) && n > 0));
+      const markers = (options.markers ?? []).map((m) => m.toLowerCase().replace(/\//g, "\\"));
+      let pids = [];
+      try {
+        const out = String(exec7("powershell.exe", [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          "Get-Process node -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Id | ConvertTo-Json -Compress"
+        ], { encoding: "utf8", timeout: 8e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true })).trim();
+        if (out) {
+          const parsed = JSON.parse(out);
+          pids = Array.isArray(parsed) ? parsed : [parsed];
+        }
+      } catch {
+        return [];
+      }
+      const results = [];
+      for (const pid of pids) {
+        if (!Number.isFinite(pid) || pid <= 0 || exclude.has(pid)) continue;
+        const commandLine = getProcessCommandLine(pid, { platform: platform10, execFileSync: exec7 });
+        if (!commandLine) continue;
+        const lower = commandLine.toLowerCase();
+        const underPrefix = prefixes.some((prefix) => lower.includes(prefix));
+        if (!underPrefix) continue;
+        if (markers.length > 0 && !markers.some((marker) => lower.includes(marker))) continue;
+        results.push({ pid, commandLine });
+      }
+      return results;
+    }
+    async function stopOwnedProcesses(options) {
+      const waitMs = options.waitMs ?? 15e3;
+      const killed = /* @__PURE__ */ new Set();
+      for (const p of options.processes) {
+        if (killProcess(p.pid, options)) killed.add(p.pid);
+      }
+      const survivors = [];
+      for (const p of options.processes) {
+        if (!killed.has(p.pid)) {
+          survivors.push(p);
+          continue;
+        }
+        const exited = await waitForPidExit(p.pid, waitMs);
+        if (!exited) survivors.push(p);
+      }
+      return { stopped: options.processes.length - survivors.length, survivors };
+    }
+    async function stopOwnedProcessesForPrefixes(options) {
+      const processes = listOwnedNodeProcesses(options);
+      if (processes.length === 0) return { stopped: 0, survivors: [] };
+      options.log?.(`Stopping ${processes.length} owned process(es) under prefixes: ${options.prefixes.join(", ")}`);
+      const result = await stopOwnedProcesses({
+        processes,
+        waitMs: options.waitMs,
+        platform: options.platform,
+        execFileSync: options.execFileSync
+      });
+      if (result.survivors.length > 0) {
+        options.log?.(`Could not stop ${result.survivors.length} owned process(es): ${result.survivors.map((s2) => s2.pid).join(", ")}`);
+      }
+      return result;
+    }
     var POINTER_NAME = ".adhdev-current";
     var STABLE_FILES = [POINTER_NAME, "adhdev.cmd", "adhdev.ps1", "adhdev"];
     var DEFAULT_HEALTH_PORT = 19222;
+    var ADHDEV_OWNED_MARKERS = [
+      "session-host-daemon",
+      "node_modules/adhdev",
+      "node_modules/@adhdev/daemon-standalone"
+    ];
     function normalizeForCompare(value) {
       return path20.resolve(value).replace(/[\\/]+$/, "").toLowerCase();
     }
@@ -72563,7 +72897,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     }
     function nodeMajor(nodeExecutable) {
       try {
-        const version2 = String((0, import_child_process5.execFileSync)(nodeExecutable, ["-p", "process.versions.node"], {
+        const version2 = String((0, import_child_process6.execFileSync)(nodeExecutable, ["-p", "process.versions.node"], {
           encoding: "utf8",
           timeout: 5e3,
           windowsHide: true,
@@ -72625,7 +72959,7 @@ exit $LASTEXITCODE\r
       }
     }
     function validateStagedCli(portableNode, cliEntry, targetVersion) {
-      const output = String((0, import_child_process5.execFileSync)(portableNode, [cliEntry, "--version"], {
+      const output = String((0, import_child_process6.execFileSync)(portableNode, [cliEntry, "--version"], {
         encoding: "utf8",
         timeout: 15e3,
         windowsHide: true,
@@ -72654,7 +72988,7 @@ exit $LASTEXITCODE\r
           `} finally { if ([IO.File]::Exists($temporary)) { [IO.File]::Delete($temporary) } }`
         ].join("\n");
         const encoded = Buffer.from(script, "utf16le").toString("base64");
-        const result = (0, import_child_process5.spawnSync)("powershell.exe", [
+        const result = (0, import_child_process6.spawnSync)("powershell.exe", [
           "-NoLogo",
           "-NoProfile",
           "-NonInteractive",
@@ -72739,6 +73073,19 @@ exit $LASTEXITCODE\r
         pinStagedShims(stagedPrefix, portableNode, stagedCliEntry);
         validateStagedCli(portableNode, stagedCliEntry, targetVersion);
         hooks.log(`Validated staged CLI and portable Node 22 shims in ${stagedPrefix}`);
+        const excludedPids = new Set([process.pid, ...options.excludePids ?? []].filter((n) => Number.isFinite(n) && n > 0));
+        const preStop = await stopOwnedProcessesForPrefixes({
+          prefixes: [layout.activePrefix, layout.stablePrefix],
+          excludePids: Array.from(excludedPids),
+          markers: Array.from(ADHDEV_OWNED_MARKERS),
+          waitMs: 15e3,
+          log: hooks.log
+        });
+        if (preStop.survivors.length > 0) {
+          throw new Error(
+            `Cannot activate ${versionName}: ${preStop.survivors.length} owned process(es) still running under the current prefix`
+          );
+        }
         activated = true;
         publishStableShimsAndPointer(layout, versionName);
         hooks.log(`Atomically activated ${versionName}`);
@@ -72748,7 +73095,7 @@ exit $LASTEXITCODE\r
           throw new Error("replacement daemon did not pass the health/version gate");
         }
         hooks.log(`Replacement daemon pid ${daemonPid} passed health for ${targetVersion}`);
-        hooks.cleanup(layout, stagedPrefix);
+        await hooks.cleanup(layout, stagedPrefix);
         return { stagedPrefix, stagedCliEntry, daemonPid };
       } catch (error48) {
         if (restarted?.pid) hooks.stopProcess(restarted.pid);
@@ -72766,7 +73113,7 @@ exit $LASTEXITCODE\r
           hooks.log("Failed to restart the previous daemon during rollback");
         }
         try {
-          hooks.cleanup(layout, layout.activePrefix);
+          await hooks.cleanup(layout, layout.activePrefix);
         } catch {
         }
         throw error48;
@@ -72778,7 +73125,7 @@ exit $LASTEXITCODE\r
           const env2 = { ...options.env, ADHDEV_BOOTSTRAP: "1" };
           const pathKey = Object.keys(env2).find((key2) => key2.toLowerCase() === "path") || "Path";
           env2[pathKey] = `${path20.dirname(portableNode)};${env2[pathKey] || ""}`;
-          (0, import_child_process5.execFileSync)(portableNode, [
+          (0, import_child_process6.execFileSync)(portableNode, [
             options.npmCliPath,
             "install",
             "-g",
@@ -72798,7 +73145,7 @@ exit $LASTEXITCODE\r
         restart: (portableNode, stagedCliEntry) => {
           const restartArgv = options.restartArgv.map((arg, index) => index === 0 ? stagedCliEntry : arg);
           if (restartArgv.length === 0) throw new Error("replacement daemon restart arguments are missing");
-          const child = (0, import_child_process5.spawn)(portableNode, restartArgv, {
+          const child = (0, import_child_process6.spawn)(portableNode, restartArgv, {
             detached: true,
             stdio: "ignore",
             windowsHide: true,
@@ -72810,7 +73157,7 @@ exit $LASTEXITCODE\r
         },
         restartOld: (portableNode) => {
           if (options.restartArgv.length === 0) return;
-          const child = (0, import_child_process5.spawn)(portableNode, options.restartArgv, {
+          const child = (0, import_child_process6.spawn)(portableNode, options.restartArgv, {
             detached: true,
             stdio: "ignore",
             windowsHide: true,
@@ -72848,15 +73195,23 @@ exit $LASTEXITCODE\r
         },
         stopProcess: (pid) => {
           try {
-            (0, import_child_process5.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+            (0, import_child_process6.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
           } catch {
           }
         },
-        cleanup: (layout, activePrefix) => boundedCleanupInactivePrefixes(layout, activePrefix, options.log),
+        cleanup: async (layout, activePrefix) => cleanupInactivePrefixesWithGuard({
+          layout,
+          activePrefix,
+          excludePids: [process.pid],
+          markers: Array.from(ADHDEV_OWNED_MARKERS),
+          waitMs: 15e3,
+          log: options.log
+        }),
         log: options.log
       };
     }
-    function boundedCleanupInactivePrefixes(layout, activePrefix, log) {
+    async function cleanupInactivePrefixesWithGuard(options) {
+      const { layout, activePrefix, log } = options;
       let candidates = [];
       try {
         candidates = fs14.readdirSync(layout.installRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.startsWith("version-")).map((entry) => path20.join(layout.installRoot, entry.name)).filter((entry) => normalizeForCompare(entry) !== normalizeForCompare(activePrefix)).sort().slice(0, 8);
@@ -72864,19 +73219,41 @@ exit $LASTEXITCODE\r
         return;
       }
       if (candidates.length === 0) return;
-      const escaped = candidates.map((candidate) => quotePowerShellLiteral(candidate)).join(",");
-      const script = `$ErrorActionPreference='Stop'; @(${escaped}) | ForEach-Object { if (Test-Path -LiteralPath $_) { Remove-Item -LiteralPath $_ -Recurse -Force } }`;
-      const encoded = Buffer.from(script, "utf16le").toString("base64");
-      const result = (0, import_child_process5.spawnSync)("powershell.exe", [
-        "-NoLogo",
-        "-NoProfile",
-        "-NonInteractive",
-        "-ExecutionPolicy",
-        "Bypass",
-        "-EncodedCommand",
-        encoded
-      ], { timeout: 5e3, windowsHide: true, stdio: "ignore" });
-      if (result.error || result.status !== 0) log("Bounded inactive-prefix cleanup was incomplete; future updates will retry");
+      for (const candidate of candidates) {
+        const stopResult = await stopOwnedProcessesForPrefixes({
+          prefixes: [candidate],
+          excludePids: options.excludePids,
+          markers: options.markers,
+          waitMs: options.waitMs ?? 15e3,
+          log
+        });
+        if (stopResult.survivors.length > 0) {
+          log?.(`Skipping cleanup of ${candidate}: ${stopResult.survivors.length} owned process(es) could not be stopped`);
+          continue;
+        }
+        removeInactivePrefix(candidate, log);
+      }
+    }
+    function removeInactivePrefix(target, log) {
+      try {
+        const escaped = quotePowerShellLiteral(target);
+        const script = `if (Test-Path -LiteralPath ${escaped}) { Remove-Item -LiteralPath ${escaped} -Recurse -Force }`;
+        const encoded = Buffer.from(script, "utf16le").toString("base64");
+        const result = (0, import_child_process6.spawnSync)("powershell.exe", [
+          "-NoLogo",
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-EncodedCommand",
+          encoded
+        ], { timeout: 5e3, windowsHide: true, stdio: "ignore" });
+        if (result.error || result.status !== 0) {
+          log?.(`Failed to remove inactive prefix ${target}: ${result.error?.message || `exit ${result.status}`}`);
+        }
+      } catch (error48) {
+        log?.(`Failed to remove inactive prefix ${target}: ${error48?.message || String(error48)}`);
+      }
     }
     var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
     function getUpgradeLogPath(home = os13.homedir()) {
@@ -73003,7 +73380,7 @@ exit $LASTEXITCODE\r
     }
     function execNpmCommandSync(args, options = {}, surface) {
       const execOptions = surface?.execOptions || getNpmExecOptions();
-      return (0, import_child_process6.execFileSync)(
+      return (0, import_child_process7.execFileSync)(
         surface?.npmExecutable || "npm",
         [...surface?.npmArgsPrefix || [], ...args],
         {
@@ -73013,74 +73390,10 @@ exit $LASTEXITCODE\r
         }
       );
     }
-    function killPid(pid) {
-      try {
-        if (process.platform === "win32") {
-          (0, import_child_process6.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
-        } else {
-          process.kill(pid, "SIGTERM");
-        }
-        return true;
-      } catch {
-        return false;
-      }
-    }
-    function getWindowsProcessCommandLine(pid) {
-      const pidFilter = `ProcessId=${pid}`;
-      try {
-        const psOut = (0, import_child_process6.execFileSync)("powershell.exe", [
-          "-NoProfile",
-          "-NonInteractive",
-          "-ExecutionPolicy",
-          "Bypass",
-          "-Command",
-          `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
-        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true }).trim();
-        if (psOut) return psOut;
-      } catch {
-      }
-      try {
-        const wmicOut = (0, import_child_process6.execFileSync)("wmic", [
-          "process",
-          "where",
-          pidFilter,
-          "get",
-          "CommandLine"
-        ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true }).trim();
-        if (wmicOut) return wmicOut;
-      } catch {
-      }
-      return null;
-    }
-    function getProcessCommandLine(pid) {
-      if (!Number.isFinite(pid) || pid <= 0) return null;
-      if (process.platform === "win32") return getWindowsProcessCommandLine(pid);
-      try {
-        const text = (0, import_child_process6.execFileSync)("ps", ["-o", "command=", "-p", String(pid)], {
-          encoding: "utf8",
-          timeout: 3e3,
-          stdio: ["ignore", "pipe", "ignore"]
-        }).trim();
-        return text || null;
-      } catch {
-        return null;
-      }
-    }
     function isManagedSessionHostPid(pid) {
       const commandLine = getProcessCommandLine(pid);
       return !!commandLine && /session-host-daemon/i.test(commandLine);
     }
-    async function waitForPidExit(pid, timeoutMs) {
-      const start = Date.now();
-      while (Date.now() - start < timeoutMs) {
-        try {
-          process.kill(pid, 0);
-          await new Promise((resolve27) => setTimeout(resolve27, 250));
-        } catch {
-          return;
-        }
-      }
-    }
     async function stopSessionHostProcesses(appName) {
       const pidFile = path21.join(os13.homedir(), ".adhdev", `${appName}-session-host.pid`);
       let killedPid = null;
@@ -73088,7 +73401,7 @@ exit $LASTEXITCODE\r
         if (fs15.existsSync(pidFile)) {
           const pid = Number.parseInt(fs15.readFileSync(pidFile, "utf8").trim(), 10);
           if (Number.isFinite(pid) && pid !== process.pid && isManagedSessionHostPid(pid)) {
-            if (killPid(pid)) killedPid = pid;
+            if (killProcess(pid)) killedPid = pid;
           }
         }
       } catch {
@@ -73124,7 +73437,7 @@ exit $LASTEXITCODE\r
       ].join("\n");
       let out = "";
       try {
-        out = String((0, import_child_process6.execFileSync)("powershell.exe", [
+        out = String((0, import_child_process7.execFileSync)("powershell.exe", [
           "-NoProfile",
           "-NonInteractive",
           "-ExecutionPolicy",
@@ -73156,7 +73469,7 @@ exit $LASTEXITCODE\r
         appendUpgradeLog(
           `Foreign native-addon holder found: pid ${holder.pid}${holder.commandLine ? ` \u2014 ${holder.commandLine}` : ""}`
         );
-        const killed = killPid(holder.pid);
+        const killed = killProcess(holder.pid);
         if (killed) {
           await waitForPidExit(holder.pid, 15e3);
           appendUpgradeLog(`Terminated foreign native-addon holder pid ${holder.pid}`);
@@ -73248,7 +73561,7 @@ ${body}
     }
     function spawnDetachedDaemonUpgradeHelper(payload) {
       const env2 = { ...process.env, [UPGRADE_HELPER_ENV]: JSON.stringify(payload) };
-      const child = (0, import_child_process7.spawn)(process.execPath, process.argv.slice(1), {
+      const child = (0, import_child_process8.spawn)(process.execPath, process.argv.slice(1), {
         detached: true,
         stdio: "ignore",
         windowsHide: true,
@@ -73289,11 +73602,25 @@ ${body}
           throw new Error(`portable Node.js 22 npm CLI is missing: ${npmCliPath}`);
         }
         appendUpgradeLog(`Installer-managed pointer layout detected; active prefix will remain untouched: ${windowsInstallerLayout.activePrefix}`);
+        const upgradePids = [process.pid, payload.parentPid].filter((n) => Number.isFinite(n) && n > 0);
+        const preStop = await stopOwnedProcessesForPrefixes({
+          prefixes: [windowsInstallerLayout.activePrefix, windowsInstallerLayout.stablePrefix],
+          excludePids: upgradePids,
+          markers: Array.from(ADHDEV_OWNED_MARKERS),
+          waitMs: 15e3,
+          log: appendUpgradeLog
+        });
+        if (preStop.survivors.length > 0) {
+          throw new Error(
+            `Cannot upgrade: owned processes still running under current prefix: ${preStop.survivors.map((s2) => s2.pid).join(", ")}`
+          );
+        }
         await performWindowsAtomicUpgrade({
           layout: windowsInstallerLayout,
           packageName: payload.packageName,
           targetVersion: payload.targetVersion,
           portableNode,
+          excludePids: upgradePids,
           hooks: createDefaultWindowsAtomicHooks({
             packageName: payload.packageName,
             targetVersion: payload.targetVersion,
@@ -73319,7 +73646,7 @@ ${body}
       let installOutput = "";
       for (let attempt = 1; attempt <= maxInstallAttempts; attempt++) {
         try {
-          installOutput = String((0, import_child_process6.execFileSync)(
+          installOutput = String((0, import_child_process7.execFileSync)(
             installCommand.command,
             installCommand.args,
             {
@@ -73372,7 +73699,7 @@ ${body}
         const env2 = { ...process.env };
         delete env2[UPGRADE_HELPER_ENV];
         appendUpgradeLog(`Restarting daemon with args: ${restartArgv.join(" ")}`);
-        const child = (0, import_child_process7.spawn)(process.execPath, restartArgv, {
+        const child = (0, import_child_process8.spawn)(process.execPath, restartArgv, {
           detached: true,
           stdio: "ignore",
           windowsHide: true,
@@ -73936,7 +74263,7 @@ ${body}
     var path30 = __toESM2(require("path"));
     var crypto6 = __toESM2(require("crypto"));
     var import_fs16 = require("fs");
-    var import_child_process9 = require("child_process");
+    var import_child_process10 = require("child_process");
     var import_chalk = __toESM2((init_source(), __toCommonJS(source_exports)));
     init_provider_cli_adapter();
     init_cli_detector();
@@ -80984,7 +81311,7 @@ ${buttons.join("\n")}`;
     };
     var path29 = __toESM2(require("path"));
     var import_stream = require("stream");
-    var import_child_process8 = require("child_process");
+    var import_child_process9 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
     init_contracts2();
     init_provider_input_support();
@@ -81508,7 +81835,7 @@ ${buttons.join("\n")}`;
         this.errorMessage = null;
         this.errorReason = null;
         this.stderrBuffer = [];
-        this.process = (0, import_child_process8.spawn)(command, args, {
+        this.process = (0, import_child_process9.spawn)(command, args, {
           cwd: this.workingDir,
           env: env2,
           stdio: ["pipe", "pipe", "pipe"],
@@ -82252,7 +82579,7 @@ ${rawInput}` : rawInput;
         return (0, import_fs16.existsSync)(expandExecutable(trimmed));
       }
       try {
-        (0, import_child_process9.execFileSync)(process.platform === "win32" ? "where" : "which", [trimmed], {
+        (0, import_child_process10.execFileSync)(process.platform === "win32" ? "where" : "which", [trimmed], {
           stdio: "ignore",
           ...process.platform === "win32" ? { windowsHide: true } : {}
         });
@@ -83728,7 +84055,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         return ctx.deps.cliManager.handleCliCommand("restart_session", args);
       }
     };
-    var import_child_process10 = require("child_process");
+    var import_child_process11 = require("child_process");
     var net3 = __toESM2(require("net"));
     var os27 = __toESM2(require("os"));
     var path38 = __toESM2(require("path"));
@@ -87626,7 +87953,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
     }
     async function execQuiet(command, options = {}) {
       return new Promise((resolve27) => {
-        (0, import_child_process10.exec)(command, options, (error48, stdout) => {
+        (0, import_child_process11.exec)(command, options, (error48, stdout) => {
           if (error48) return resolve27("");
           resolve27(stdout.toString());
         });
@@ -88026,10 +88353,10 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const canUseAppLauncher = !!appName;
       const useAppLauncher = preferredMethod === "app" ? canUseAppLauncher : preferredMethod === "cli" ? false : !canUseCli && canUseAppLauncher;
       if (!useAppLauncher && ide.cliCommand) {
-        (0, import_child_process10.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
+        (0, import_child_process11.spawn)(ide.cliCommand, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
       } else if (appName) {
         const openArgs = ["-a", appName, "--args", ...args];
-        (0, import_child_process10.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
+        (0, import_child_process11.spawn)("open", openArgs, { detached: true, stdio: "ignore" }).unref();
       } else {
         throw new Error(`No app identifier or CLI for ${ide.displayName}`);
       }
@@ -88055,7 +88382,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const args = ["--remote-debugging-port=" + port];
       if (newWindow) args.push("--new-window");
       if (workspace) args.push(workspace);
-      (0, import_child_process10.spawn)(cli, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
+      (0, import_child_process11.spawn)(cli, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
     }
     function getAvailableIdeIds() {
       return getProviderLoader().getAvailableIdeTypes();
@@ -88133,15 +88460,15 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       stop_ide: async (ctx, args) => {
         const ideType = args?.ideType;
         if (!ideType) throw new Error("ideType required");
-        const killProcess = args?.killProcess !== false;
-        await ctx.stopIde(ideType, killProcess);
+        const killProcess2 = args?.killProcess !== false;
+        await ctx.stopIde(ideType, killProcess2);
         try {
           const results = await detectIDEs(ctx.deps.providerLoader);
           ctx.deps.detectedIdes.value = results;
           ctx.deps.providerLoader.setIdeDetectionResults(results, true);
         } catch {
         }
-        return { success: true, ideType, stopped: true, processKilled: killProcess };
+        return { success: true, ideType, stopped: true, processKilled: killProcess2 };
       },
       // ─── IDE restart ───
       restart_ide: async (ctx, args) => {
@@ -91380,18 +91707,18 @@ ${ptyResult.output.slice(-2e3)}`);
       return { enabled: false };
     }
     async function computeGitPatchId(cwd, fromRef, toRef, excludePaths = []) {
-      const { execFileSync: execFileSync11 } = await import("child_process");
+      const { execFileSync: execFileSync12 } = await import("child_process");
       const diffArgs = ["diff", "--patch", "--full-index", fromRef, toRef];
       if (excludePaths.length > 0) {
         diffArgs.push("--", ".", ...excludePaths.map((path46) => `:(exclude)${path46}`));
       }
-      const diff = execFileSync11(GIT2, diffArgs, {
+      const diff = execFileSync12(GIT2, diffArgs, {
         cwd,
         encoding: "utf8",
         maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
       });
       if (!diff.trim()) return "";
-      const patchId = execFileSync11(GIT2, ["patch-id", "--stable"], {
+      const patchId = execFileSync12(GIT2, ["patch-id", "--stable"], {
         cwd,
         input: diff,
         encoding: "utf8",
@@ -91402,8 +91729,8 @@ ${ptyResult.output.slice(-2e3)}`);
     async function runMeshRefinePatchEquivalenceGate(repoRoot, baseHead, branchHead) {
       const startedAt = Date.now();
       try {
-        const { execFileSync: execFileSync11 } = await import("child_process");
-        const git = (args) => execFileSync11(GIT2, args, {
+        const { execFileSync: execFileSync12 } = await import("child_process");
+        const git = (args) => execFileSync12(GIT2, args, {
           cwd: repoRoot,
           encoding: "utf8",
           maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
@@ -91638,8 +91965,8 @@ ${e?.stderr || ""}`
     async function checkWorktreeChangesPatchEquivalentInRef(repoRoot, ref, worktreeHead) {
       const startedAt = Date.now();
       try {
-        const { execFileSync: execFileSync11 } = await import("child_process");
-        const git = (gitArgs) => execFileSync11(GIT2, gitArgs, {
+        const { execFileSync: execFileSync12 } = await import("child_process");
+        const git = (gitArgs) => execFileSync12(GIT2, gitArgs, {
           cwd: repoRoot,
           encoding: "utf8",
           maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
@@ -91702,8 +92029,8 @@ ${mergeTreeErr?.stderr || ""}`;
     async function runMeshRefineEffectiveDiffGate(repoRoot, baseHead, branchHead) {
       const startedAt = Date.now();
       try {
-        const { execFileSync: execFileSync11 } = await import("child_process");
-        const git = (args, opts) => execFileSync11(GIT2, args, {
+        const { execFileSync: execFileSync12 } = await import("child_process");
+        const git = (args, opts) => execFileSync12(GIT2, args, {
           cwd: opts?.cwd || repoRoot,
           encoding: "utf8",
           maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
@@ -95798,7 +96125,7 @@ ${e?.stderr || ""}`;
       /**
        * IDE stop: CDP disconnect + InstanceManager cleanup + optionally kill OS process
        */
-      async stopIde(ideType, killProcess = false) {
+      async stopIde(ideType, killProcess2 = false) {
         const cdpKeysToRemove = [];
         for (const key2 of this.deps.cdpManagers.keys()) {
           if (key2 === ideType || key2.startsWith(`${ideType}_`)) {
@@ -95836,7 +96163,7 @@ ${e?.stderr || ""}`;
             LOG2.info("StopIDE", `Instance removed: ${instanceKey}`);
           }
         }
-        if (killProcess) {
+        if (killProcess2) {
           const running = await isIdeRunning(ideType);
           if (running) {
             LOG2.info("StopIDE", `Killing IDE process: ${ideType}`);
@@ -95851,7 +96178,7 @@ ${e?.stderr || ""}`;
           }
         }
         this.deps.onStatusChange?.();
-        LOG2.info("StopIDE", `IDE stopped: ${ideType} (processKill=${killProcess})`);
+        LOG2.info("StopIDE", `IDE stopped: ${ideType} (processKill=${killProcess2})`);
       }
     };
     init_logger();
@@ -97535,7 +97862,7 @@ ${e?.stderr || ""}`;
     var path40 = __toESM2(require("path"));
     var os29 = __toESM2(require("os"));
     var import_os5 = require("os");
-    var import_child_process11 = require("child_process");
+    var import_child_process12 = require("child_process");
     var ARCHIVE_PATH = path40.join(os29.homedir(), ".adhdev", "version-history.json");
     var MAX_ENTRIES_PER_PROVIDER = 20;
     var VersionArchive = class {
@@ -97591,7 +97918,7 @@ ${e?.stderr || ""}`;
     };
     async function runCommand(cmd, timeout = 1e4) {
       return new Promise((resolve27) => {
-        (0, import_child_process11.exec)(cmd, {
+        (0, import_child_process12.exec)(cmd, {
           encoding: "utf-8",
           timeout
         }, (error48, stdout) => {
@@ -102742,8 +103069,10 @@ data: ${JSON.stringify(msg.data)}
           return;
         }
         if (event.type === "session_exit") {
+          const exitCode = typeof event.exitCode === "number" ? event.exitCode : null;
+          const signal = typeof event.signal === "number" ? event.signal : null;
           for (const callback of this.exitCallbacks) {
-            callback({ exitCode: event.exitCode ?? 0 });
+            callback({ exitCode, signal });
           }
           void this.closeClient(false);
         }
@@ -103122,11 +103451,12 @@ data: ${JSON.stringify(msg.data)}
         });
       }
     }
-    var import_child_process12 = require("child_process");
+    var import_child_process13 = require("child_process");
     var fs43 = __toESM2(require("fs"));
     var os31 = __toESM2(require("os"));
     var path45 = __toESM2(require("path"));
     var import_session_host_core13 = require_dist();
+    init_logger();
     init_runtime_defaults();
     function createManagedSessionHost2(options) {
       const appName = options.appName;
@@ -103150,6 +103480,14 @@ data: ${JSON.stringify(msg.data)}
         }
         return require.resolve("@adhdev/session-host-daemon");
       }
+      function pathsEquivalent(left, right) {
+        return path45.resolve(left).toLowerCase() === path45.resolve(right).toLowerCase();
+      }
+      function getRunningSessionHostScriptPath(pid) {
+        const commandLine = getProcessCommandLine(pid);
+        if (!commandLine || !/session-host-daemon/i.test(commandLine)) return null;
+        return parseNodeScriptPath(commandLine);
+      }
       function getPidFile() {
         return path45.join(os31.homedir(), ".adhdev", `${appName}-session-host.pid`);
       }
@@ -103163,12 +103501,12 @@ data: ${JSON.stringify(msg.data)}
           return null;
         }
       }
-      function killPid2(pid) {
+      function killPid(pid) {
         try {
           if (process.platform === "win32") {
             const spawnOpts = { stdio: "ignore" };
             if (options.killWindowsHide) spawnOpts.windowsHide = true;
-            (0, import_child_process12.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], spawnOpts);
+            (0, import_child_process13.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], spawnOpts);
           } else {
             process.kill(pid, "SIGTERM");
           }
@@ -103187,7 +103525,7 @@ data: ${JSON.stringify(msg.data)}
           logFd = fs43.openSync(path45.join(logDir, "session-host.log"), "a");
           stdio = ["ignore", logFd, logFd];
         }
-        const child = (0, import_child_process12.spawn)(process.execPath, [entry], {
+        const child = (0, import_child_process13.spawn)(process.execPath, [entry], {
           detached: true,
           stdio,
           windowsHide: true,
@@ -103208,7 +103546,7 @@ data: ${JSON.stringify(msg.data)}
           if (fs43.existsSync(pidFile)) {
             const pid = Number.parseInt(fs43.readFileSync(pidFile, "utf8").trim(), 10);
             if (Number.isFinite(pid) && pid !== process.pid && isManagedPid(pid)) {
-              stopped = killPid2(pid) || stopped;
+              stopped = killPid(pid) || stopped;
             }
           }
         } catch {
@@ -103225,6 +103563,20 @@ data: ${JSON.stringify(msg.data)}
       }
       async function ensureReady() {
         options.beforeEnsureReady?.();
+        if (process.platform === "win32") {
+          const existingPid = getPid();
+          if (existingPid !== null) {
+            const runningPath = getRunningSessionHostScriptPath(existingPid);
+            const currentEntry = resolveEntry();
+            if (runningPath && !pathsEquivalent(runningPath, currentEntry)) {
+              LOG2.warn(
+                "SessionHost",
+                `Detected stale host pid ${existingPid} running from ${runningPath}; restarting from ${currentEntry}`
+              );
+              stopManagedSessionHostProcess();
+            }
+          }
+        }
         try {
           return await ensureSessionHostReady2({
             appName,
@@ -103253,7 +103605,7 @@ data: ${JSON.stringify(msg.data)}
         getPid,
         buildEnv,
         resolveEntry,
-        killPid: killPid2,
+        killPid,
         spawnHost,
         stopManagedSessionHostProcess,
         ensureReady,
@@ -103269,7 +103621,7 @@ data: ${JSON.stringify(msg.data)}
       if (raw === "0" || raw === "false" || raw === "no") return false;
       return raw === "1" || raw === "true" || raw === "yes";
     }
-    var import_child_process13 = require("child_process");
+    var import_child_process14 = require("child_process");
     var import_util32 = require("util");
     var EXTENSION_CATALOG = [
       // AI Agent extensions
@@ -103357,7 +103709,7 @@ data: ${JSON.stringify(msg.data)}
         apiKeyName: "OpenAI/Anthropic API key"
       }
     ];
-    var execAsync4 = (0, import_util32.promisify)(import_child_process13.exec);
+    var execAsync4 = (0, import_util32.promisify)(import_child_process14.exec);
     async function isExtensionInstalled(ide, marketplaceId) {
       if (!ide.cliCommand) return false;
       try {
@@ -103401,7 +103753,7 @@ data: ${JSON.stringify(msg.data)}
             fs44.writeFileSync(vsixPath, buffer);
             return new Promise((resolve27) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
-              (0, import_child_process13.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
+              (0, import_child_process14.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
                 resolve27({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
@@ -103417,7 +103769,7 @@ data: ${JSON.stringify(msg.data)}
       }
       return new Promise((resolve27) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
-        (0, import_child_process13.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
+        (0, import_child_process14.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
             resolve27({
               extensionId: extension.id,
@@ -103454,7 +103806,7 @@ data: ${JSON.stringify(msg.data)}
       if (!ide.cliCommand) return false;
       try {
         const args = workspacePath ? `"${workspacePath}"` : "";
-        (0, import_child_process13.exec)(`"${ide.cliCommand}" ${args}`, { timeout: 1e4 });
+        (0, import_child_process14.exec)(`"${ide.cliCommand}" ${args}`, { timeout: 1e4 });
         return true;
       } catch {
         return false;