@oar-sh/oar 0.9.12 → 0.9.13

package/server/services/background-task-persistence.mjs

@@ -0,0 +1,133 @@
+'use strict';
+
+import { backgroundTaskRowsTableProblem } from '../migrations/0018-background-task-rows.mjs';
+
+// Persistence for the background-task store's console rows: the
+// `background_task_rows` table (migration 0018) behind a small adapter, so
+// the store restores its rows after a restart and stays testable without a
+// database. Without a usable table every call is a no-op and the store keeps
+// its rows in memory only, as before; a problem is logged once and never
+// stops the relay.
+
+function unavailable(reason) {
+  return {
+    available: false,
+    reason,
+    load: () => [],
+    saveLive: () => false,
+    saveEnded: () => false,
+    remove: () => false,
+    forget: () => false,
+    pruneEnded: () => 0,
+    touchLive: () => false,
+  };
+}
+
+function parseRow(text) {
+  try {
+    const row = JSON.parse(String(text || ''));
+    return row && typeof row === 'object' && !Array.isArray(row) ? row : null;
+  } catch {
+    return null;
+  }
+}
+
+/** A row as stored: no health reading (the poller reads the file again). */
+function storedRowJson(row) {
+  const { health: _health, ...rest } = row || {};
+  return JSON.stringify(rest);
+}
+
+export function createSqliteBackgroundTaskPersistence(db, { logger = console, now = () => Date.now() } = {}) {
+  let stmts;
+  try {
+    const problem = backgroundTaskRowsTableProblem(db);
+    if (problem) return unavailable(problem);
+    stmts = {
+      list: db.prepare(`SELECT store_key, task_id, state, row_json, ended_at, updated_at FROM background_task_rows`),
+      touchLive: db.prepare(`UPDATE background_task_rows SET updated_at = ? WHERE store_key = ? AND state = 'live'`),
+      upsert: db.prepare(`
+        INSERT INTO background_task_rows (store_key, task_id, state, row_json, ended_at, updated_at)
+        VALUES (?, ?, ?, ?, ?, ?)
+        ON CONFLICT(store_key, task_id) DO UPDATE SET
+          state = excluded.state, row_json = excluded.row_json, ended_at = excluded.ended_at, updated_at = excluded.updated_at
+      `),
+      liveOfKey: db.prepare(`SELECT task_id FROM background_task_rows WHERE store_key = ? AND state = 'live'`),
+      remove: db.prepare(`DELETE FROM background_task_rows WHERE store_key = ? AND task_id = ?`),
+      removeLive: db.prepare(`DELETE FROM background_task_rows WHERE store_key = ? AND task_id = ? AND state = 'live'`),
+      forget: db.prepare(`DELETE FROM background_task_rows WHERE store_key = ?`),
+      prune: db.prepare(`DELETE FROM background_task_rows WHERE state = 'ended' AND ended_at < ?`),
+    };
+  } catch (error) {
+    const reason = error?.message || String(error);
+    logger?.warn?.(`[background-tasks] console rows are not persisted: ${reason}`);
+    return unavailable(reason);
+  }
+
+  // One warning per kind of failure: a write that fails keeps failing, and
+  // the store goes on in memory either way.
+  const warned = new Set();
+  function guard(what, run, fallback) {
+    try {
+      return run();
+    } catch (error) {
+      if (!warned.has(what)) {
+        warned.add(what);
+        logger?.warn?.(`[background-tasks] could not ${what} a console row: ${error?.message || error}`);
+      }
+      return fallback;
+    }
+  }
+
+  const saveLiveTx = db.transaction((key, rows) => {
+    const keep = new Set(rows.map((row) => String(row.taskId)));
+    for (const { task_id: taskId } of stmts.liveOfKey.all(key)) {
+      if (!keep.has(taskId)) stmts.removeLive.run(key, taskId);
+    }
+    const at = now();
+    for (const row of rows) stmts.upsert.run(key, String(row.taskId), 'live', storedRowJson(row), null, at);
+  });
+
+  return {
+    available: true,
+    reason: '',
+    /** Every stored row: `{ key, taskId, state, row, endedAt, updatedAt }`. */
+    load() {
+      return guard('read', () => stmts.list.all().map((entry) => ({
+        key: String(entry.store_key),
+        taskId: String(entry.task_id),
+        state: String(entry.state),
+        row: parseRow(entry.row_json),
+        endedAt: Number.isFinite(Number(entry.ended_at)) && entry.ended_at !== null ? Number(entry.ended_at) : null,
+        updatedAt: Number.isFinite(Number(entry.updated_at)) ? Number(entry.updated_at) : null,
+      })).filter((entry) => entry.row), []);
+    },
+    /** The key's live console rows are exactly these (an ended row of the same task is replaced). */
+    saveLive(key, rows) {
+      return guard('write', () => { saveLiveTx(String(key), Array.isArray(rows) ? rows : []); return true; }, false);
+    },
+    saveEnded(key, row) {
+      return guard('write', () => {
+        stmts.upsert.run(String(key), String(row.taskId), 'ended', storedRowJson(row), Number(row.endedAt) || now(), now());
+        return true;
+      }, false);
+    },
+    remove(key, taskId) {
+      return guard('delete', () => stmts.remove.run(String(key), String(taskId)).changes > 0, false);
+    },
+    forget(keys) {
+      return guard('delete', () => {
+        for (const key of keys) stmts.forget.run(String(key));
+        return true;
+      }, false);
+    },
+    /** The key's live rows were confirmed running now (its worker's digest agreed). */
+    touchLive(key) {
+      return guard('write', () => stmts.touchLive.run(now(), String(key)).changes > 0, false);
+    },
+    /** Drops the ended rows that ended before `cutoff` (epoch ms). */
+    pruneEnded(cutoff) {
+      return guard('prune', () => stmts.prune.run(Number(cutoff) || 0).changes, 0);
+    },
+  };
+}

package/server/services/background-task-store.mjs

@@ -22,6 +22,17 @@
  * Health: the health poller's last reading per live task (`setHealth`), served
  * with the task rows (`withHealth`) and carried onto the ended row, where the
  * poller's reading after the end replaces it (`setEndedHealth`).
+ *
+ * Across a restart (`persistence`, the `background_task_rows` table): the
+ * console rows survive, the live sets do not. Ended rows come back as they
+ * were, for the rest of their hour. A live task with a console comes back
+ * held (`restored`): its console stays readable, but no panel, state or
+ * suspend check counts it as running, because only the worker can say that.
+ * The worker's next set settles it: a task in the set is live again, one not
+ * in it ended while the relay was away. A worker that never reports (it died
+ * with the relay) has its held tasks marked ended (`endUnconfirmed`), never
+ * running again. Health readings are not stored: the poller reads the files
+ * again. Sub-agent rows have no console and are not stored either.
  */
 
 import { backgroundTaskDigest, sameBackgroundTaskDigest } from '../../shared/worker-runtime/background-task-digest.mjs';
@@ -52,10 +63,29 @@ function exitCodeOf(value) {
   return Number.isInteger(number) ? number : null;
 }
 
+// A stored live row is confirmed at most this often while its worker's
+// digest agrees (its `updated_at`), and one not confirmed for this long is a
+// leftover of a worker that went away without a word: not restored.
+const LIVE_TOUCH_EVERY_MS = 30 * 60_000;
+const LIVE_STALE_MS = 6 * 60 * 60_000;
+
+// What of a live console task is stored: what the console and an ended row
+// need, not what changes with every progress post.
+const STORED_LIVE_FIELDS = ['taskId', 'taskType', 'description', 'command', 'startedAt', 'outputPath', 'outputKind', 'stoppable', 'toolUseId'];
+
+function storedLiveRow(task, ahead) {
+  const row = {};
+  for (const field of STORED_LIVE_FIELDS) if (task?.[field] !== undefined && task?.[field] !== null) row[field] = task[field];
+  // How it ended, told before the set dropped it.
+  if (ahead) row.settled = { status: ahead.status, exitCode: ahead.exitCode, ...(ahead.steps !== undefined ? { steps: ahead.steps } : {}) };
+  return row;
+}
+
 export function createBackgroundTaskStore({
   now = () => Date.now(),
   endedKeepMs = TASK_OUTPUT_LIMITS.endedKeepMs,
   endedMax = TASK_OUTPUT_LIMITS.endedMax,
+  persistence = null,
 } = {}) {
   const sets = new Map();
   // key → Map(taskId → ended row), newest last.
@@ -75,6 +105,18 @@ export function createBackgroundTaskStore({
   const holders = new Map();
   // Keys whose pages were told of the placeholder for unreported work.
   const announced = new Set();
+  // key → Map(taskId → row): live console tasks of the runtime before, held
+  // until the worker's set says what became of them.
+  const restored = new Map();
+  // key → what was stored of its live console tasks last, to write only on change.
+  const storedLive = new Map();
+  // key → when its stored live rows were last written or confirmed.
+  const touchedAt = new Map();
+  // key → Map(taskId → when the runtime before last knew the held task running).
+  const heldSince = new Map();
+  const store = persistence && persistence.available !== false ? persistence : null;
+
+  restore();
 
   return {
     sets,
@@ -97,9 +139,33 @@ export function createBackgroundTaskStore({
           health: healthByKey.get(id)?.get(taskId) || task.health || undefined,
         });
       }
+      // Tasks held since the restart: the worker's set says which still run
+      // (their console is the one they had; the first path a task names
+      // wins), and the others ended while the relay was away.
+      const held = restored.get(id);
+      if (held) {
+        restored.delete(id);
+        for (const [taskId, row] of held) {
+          const live = next.find((task) => keyOf(task?.taskId) === taskId);
+          if (live) {
+            if (row.outputPath && live.outputPath !== row.outputPath) {
+              live.outputPath = row.outputPath;
+              live.outputKind = row.outputKind;
+            }
+            if (row.settled && !settledAhead.get(id)?.has(taskId)) {
+              let ahead = settledAhead.get(id);
+              if (!ahead) settledAhead.set(id, ahead = new Map());
+              ahead.set(taskId, { ...row.settled, at: now() });
+            }
+            continue;
+          }
+          endRestored(id, row);
+        }
+        heldSince.delete(id);
+      }
       // A task back in the set (a resync after a restart) is not ended.
       for (const taskId of nextIds) {
-        endedRows.get(id)?.delete(taskId);
+        if (endedRows.get(id)?.delete(taskId)) store?.remove(id, taskId);
         settledAhead.get(id)?.delete(taskId);
       }
       const health = healthByKey.get(id);
@@ -107,11 +173,9 @@ export function createBackgroundTaskStore({
         for (const taskId of [...health.keys()]) if (!nextIds.has(taskId)) health.delete(taskId);
         if (!health.size) healthByKey.delete(id);
       }
-      if (next.length === 0) {
-        sets.delete(id);
-        return;
-      }
-      sets.set(id, { tasks: next, updatedAt: now() });
+      if (next.length === 0) sets.delete(id);
+      else sets.set(id, { tasks: next, updatedAt: now() });
+      storeLive(id);
     },
     /**
      * How a task ended (`/api/background-task-settled`): updates its ended
@@ -119,7 +183,7 @@ export function createBackgroundTaskStore({
      * runtime never saw live that names its output, becomes an ended row of
      * its own. Returns the ended row when there is one.
      */
-    settle(conversationId, taskId, { status, exitCode, outputPath, description, taskType, startedAt, outputKind, steps } = {}) {
+    settle(conversationId, taskId, { status, exitCode, outputPath, description, command, taskType, startedAt, outputKind, steps } = {}) {
       const id = keyOf(conversationId);
       const task = keyOf(taskId);
       if (!id || !task) return null;
@@ -136,8 +200,21 @@ export function createBackgroundTaskStore({
           if (existing.outputKind !== 'file' && existing.outputKind !== 'spool') existing.outputKind = outputKind === 'spool' ? 'spool' : 'file';
         }
         if (stepCount !== undefined) existing.steps = stepCount;
+        store?.saveEnded(id, existing);
         return existing;
       }
+      // A task held since the restart that ended while the relay was away
+      // (the worker sends the settle again): it is not running any more.
+      const heldRow = restored.get(id)?.get(task);
+      if (heldRow) {
+        restored.get(id).delete(task);
+        if (!restored.get(id).size) restored.delete(id);
+        return endRestored(id, {
+          ...heldRow,
+          settled: { status: normalized, exitCode: code, ...(stepCount !== undefined ? { steps: stepCount } : {}) },
+          ...(!heldRow.outputPath && outputPath ? { outputPath, outputKind: outputKind === 'spool' ? 'spool' : 'file' } : {}),
+        });
+      }
       const live = (sets.get(id)?.tasks || []).find((entry) => keyOf(entry?.taskId) === task);
       if (live) {
         let ahead = settledAhead.get(id);
@@ -149,6 +226,7 @@ export function createBackgroundTaskStore({
           live.outputPath = outputPath;
           if (live.outputKind !== 'file' && live.outputKind !== 'spool') live.outputKind = outputKind === 'spool' ? 'spool' : 'file';
         }
+        storeLive(id);
         return null;
       }
       if (!outputPath) return null;
@@ -156,6 +234,7 @@ export function createBackgroundTaskStore({
         taskId: task,
         taskType: keyOf(taskType) || 'local_bash',
         description: String(description || '').trim().slice(0, 500),
+        ...(command ? { command } : {}),
         startedAt: Number(startedAt) || null,
         outputPath,
         outputKind: outputKind || 'file',
@@ -202,6 +281,7 @@ export function createBackgroundTaskStore({
     setEndedHealth(conversationId, taskId, value) {
       const row = endedRows.get(keyOf(conversationId))?.get(keyOf(taskId));
       if (!row || !value) return false;
+      // Not stored: the poller reads the file again after a restart.
       row.health = value;
       return true;
     },
@@ -234,6 +314,15 @@ export function createBackgroundTaskStore({
         const row = endedRows.get(id)?.get(task);
         if (row) return { key: id, task: { ...row }, ended: true };
       }
+      // Held since the restart: its console is readable while the worker
+      // has not reported yet.
+      for (const id of ids) {
+        const row = restored.get(id)?.get(task);
+        if (row) {
+          const { settled: _settled, ...rest } = row;
+          return { key: id, task: { ...rest }, ended: false, restored: true };
+        }
+      }
       return null;
     },
     get(conversationId) {
@@ -249,8 +338,20 @@ export function createBackgroundTaskStore({
      * they agree. Agreement counts as a report, an empty set included.
      */
     matches(digest, ...keys) {
+      // Tasks held since the restart are settled only by a set the worker
+      // sends: until then the worker is asked for it, whatever its digest.
+      if (keys.map(keyOf).some((key) => key && restored.has(key))) return false;
       const same = sameBackgroundTaskDigest(digest, this.digestFor(...keys));
-      if (same) for (const key of keys.map(keyOf).filter(Boolean)) reported.add(key);
+      if (same) {
+        for (const key of keys.map(keyOf).filter(Boolean)) {
+          reported.add(key);
+          // Its stored rows are still running: say so now and then, so a
+          // restart can tell them from a dead worker's leftovers.
+          if (store && storedLive.get(key) && now() - (touchedAt.get(key) || 0) >= LIVE_TOUCH_EVERY_MS) {
+            if (store.touchLive?.(key)) touchedAt.set(key, now());
+          }
+        }
+      }
       return same;
     },
     /** Whether this runtime has heard from the worker about its tasks. */
@@ -305,7 +406,40 @@ export function createBackgroundTaskStore({
       else announced.delete(id);
       return true;
     },
-    /** The conversation is gone: everything held for these keys goes. */
+    /**
+     * Read only: every task held since the restart, as `{ key, task }`
+     * (the stored row). Not running for any panel or check until the
+     * worker's set confirms it.
+     */
+    listRestored() {
+      const rows = [];
+      for (const [key, held] of restored) {
+        for (const row of held.values()) {
+          const { settled, ...task } = row;
+          rows.push({ key, task });
+        }
+      }
+      return rows;
+    },
+    /** Whether tasks of these keys are held since the restart. */
+    hasRestored(...keys) {
+      return keys.map(keyOf).some((key) => key && restored.has(key));
+    },
+    /**
+     * The workers that did not report since the restart: their held tasks
+     * are marked ended (how is unknown), never running again. Returns the
+     * keys whose ended rows changed.
+     */
+    endUnconfirmed() {
+      const changed = [];
+      for (const [id, held] of [...restored]) {
+        restored.delete(id);
+        for (const row of held.values()) endRestored(id, row);
+        storeLive(id);
+        changed.push(id);
+      }
+      return changed;
+    },
     /**
      * Drops expired ended rows and pending settles of every key, also of
      * conversations nobody reads again (the per-key prune runs on reads).
@@ -313,9 +447,17 @@ export function createBackgroundTaskStore({
      */
     pruneAll() {
       for (const id of new Set([...endedRows.keys(), ...settledAhead.keys()])) prune(id);
+      store?.pruneEnded(now() - endedKeepMs);
     },
+    /** The conversation is gone: everything held for these keys goes. */
     forget(...keys) {
-      for (const id of keys.map(keyOf).filter(Boolean)) {
+      const ids = keys.map(keyOf).filter(Boolean);
+      if (ids.length) store?.forget(ids);
+      for (const id of ids) {
+        restored.delete(id);
+        heldSince.delete(id);
+        touchedAt.delete(id);
+        storedLive.delete(id);
         sets.delete(id);
         reported.delete(id);
         applied.delete(id);
@@ -328,6 +470,86 @@ export function createBackgroundTaskStore({
     },
   };
 
+  // The rows the runtime before kept: ended rows for the rest of their
+  // hour, live console tasks held for the worker's word.
+  function restore() {
+    if (!store) return;
+    const cutoff = now() - endedKeepMs;
+    const ended = [];
+    for (const entry of store.load()) {
+      const id = keyOf(entry.key);
+      const taskId = keyOf(entry.taskId);
+      if (!id || !taskId) continue;
+      if (entry.state === 'ended') {
+        const endedAt = Number(entry.endedAt ?? entry.row.endedAt);
+        if (!Number.isFinite(endedAt) || endedAt < cutoff) continue;
+        ended.push({ id, row: { ...entry.row, taskId, endedAt, stoppable: false } });
+        continue;
+      }
+      if (entry.state !== 'live') continue;
+      // Not confirmed for hours: its worker went away in a runtime before
+      // without a word. Nothing to show, now or as an ended row.
+      const since = Number(entry.updatedAt);
+      if (!Number.isFinite(since) || now() - since > LIVE_STALE_MS) {
+        store.remove(id, taskId);
+        continue;
+      }
+      let held = restored.get(id);
+      if (!held) restored.set(id, held = new Map());
+      held.set(taskId, { ...entry.row, taskId });
+      let sinceOf = heldSince.get(id);
+      if (!sinceOf) heldSince.set(id, sinceOf = new Map());
+      sinceOf.set(taskId, Math.min(since, now()));
+      storedLive.set(id, null);
+    }
+    // Oldest first, as `addEnded` keeps them.
+    ended.sort((a, b) => a.row.endedAt - b.row.endedAt);
+    for (const { id, row } of ended) {
+      let rows = endedRows.get(id);
+      if (!rows) endedRows.set(id, rows = new Map());
+      rows.set(row.taskId, row);
+      while (rows.size > endedMax) rows.delete(rows.keys().next().value);
+    }
+    store.pruneEnded(cutoff);
+  }
+
+  // A held task that is not running any more becomes an ended row, with how
+  // it ended when the runtime before was told.
+  // It ended at the latest when the runtime before last knew it running, so
+  // that is its end time: a leftover from long ago does not count as fresh.
+  function endRestored(id, row) {
+    const { settled, ...task } = row;
+    const since = heldSince.get(id)?.get(keyOf(task.taskId));
+    heldSince.get(id)?.delete(keyOf(task.taskId));
+    if (!heldSince.get(id)?.size) heldSince.delete(id);
+    return addEnded(id, {
+      ...task,
+      ...(settled?.steps !== undefined ? { steps: settled.steps } : {}),
+      status: settled?.status || 'unknown',
+      exitCode: settled ? settled.exitCode : null,
+    }, { endedAt: Number.isFinite(since) ? since : undefined });
+  }
+
+  // Stores the key's live console tasks when they changed (what is stored,
+  // not every progress post).
+  function storeLive(id) {
+    if (!store) return;
+    const ahead = settledAhead.get(id);
+    const rows = (sets.get(id)?.tasks || [])
+      .filter((task) => task?.outputPath && keyOf(task?.taskId))
+      .map((task) => storedLiveRow(task, ahead?.get(keyOf(task.taskId))));
+    // Held tasks stay stored until the worker's set settles them.
+    for (const row of restored.get(id)?.values() || []) rows.push(row);
+    const signature = JSON.stringify(rows);
+    if (storedLive.get(id) === signature) return;
+    if (!rows.length && !storedLive.has(id)) return;
+    if (store.saveLive(id, rows)) {
+      touchedAt.set(id, now());
+      if (rows.length) storedLive.set(id, signature);
+      else storedLive.delete(id);
+    }
+  }
+
   function prune(id) {
     const cutoff = now() - endedKeepMs;
     const rows = endedRows.get(id);
@@ -342,7 +564,7 @@ export function createBackgroundTaskStore({
     }
   }
 
-  function addEnded(id, task) {
+  function addEnded(id, task, { endedAt = now() } = {}) {
     let rows = endedRows.get(id);
     if (!rows) endedRows.set(id, rows = new Map());
     const taskId = keyOf(task.taskId);
@@ -352,13 +574,18 @@ export function createBackgroundTaskStore({
       taskId,
       status: normalizeEndedTaskStatus(task.status, exitCodeOf(task.exitCode)),
       exitCode: exitCodeOf(task.exitCode),
-      endedAt: now(),
+      endedAt,
       stoppable: false,
     };
     if (!row.health) delete row.health;
     rows.set(taskId, row);
     settledAhead.get(id)?.delete(taskId);
-    while (rows.size > endedMax) rows.delete(rows.keys().next().value);
+    store?.saveEnded(id, row);
+    while (rows.size > endedMax) {
+      const oldest = rows.keys().next().value;
+      rows.delete(oldest);
+      store?.remove(id, oldest);
+    }
     prune(id);
     return row;
   }

package/server/services/conversation-model-fallback.mjs

@@ -0,0 +1,57 @@
+'use strict';
+
+// What a send to an existing conversation runs with when the request names no
+// model or no effort. The answer is the conversation's own choice, never the
+// relay-wide catalog default: a plain POST /api/message from a script or an
+// agent used to switch a Copilot conversation to the catalog's first model and
+// to effort 'none', and then saved that as the conversation's preference.
+//
+// The effort clamp is the composer's own (public/app/conversation-preferences.mjs),
+// so the relay and the page settle on the same level for the same model.
+import { nearestSupportedReasoningEffort } from '../public/app/conversation-preferences.mjs';
+
+const AUTO_MODEL = 'auto';
+
+function toText(value) {
+  return String(value ?? '').trim();
+}
+
+/**
+ * The model an existing conversation was last set to, in this order:
+ *   1. the conversation's saved preference (what the composer shows);
+ *   2. the runtime session's model (provider_model, else model);
+ *   3. the model of the latest user message.
+ * 'auto' is not a model a later turn can run on, so it is skipped. Null when
+ * the conversation has none of these: the caller falls back to the catalog.
+ */
+export function inheritedConversationModel({
+  conversation = null,
+  runtimeSession = null,
+  latestUserMessageModel = '',
+} = {}) {
+  // provider_model and model are looked at one by one, so an 'auto' in one
+  // does not hide a real model in the other.
+  const candidates = [
+    { source: 'conversation', model: toText(conversation?.preferred_model) },
+    { source: 'runtime', model: toText(runtimeSession?.provider_model) },
+    { source: 'runtime', model: toText(runtimeSession?.model) },
+    { source: 'message', model: toText(latestUserMessageModel) },
+  ];
+  return candidates.find((entry) => entry.model && entry.model.toLowerCase() !== AUTO_MODEL) || null;
+}
+
+/**
+ * The effort for a turn that names none: the first candidate the model
+ * supports (or the nearest level to it), else the model's lowest level that
+ * is not 'none'. 'none' comes back only when it is the only level, or when a
+ * candidate asks for it and the model has it. '' when the model lists no
+ * levels at all. A provider whose own default is better than "the lowest
+ * level" passes `fallback`, returned when no candidate matches or clamps.
+ */
+export function fallbackReasoningEffort(candidates = [], supportedEfforts = [], { fallback } = {}) {
+  return nearestSupportedReasoningEffort(
+    (Array.isArray(candidates) ? candidates : [candidates]).map(toText).filter(Boolean),
+    supportedEfforts,
+    { fallback },
+  );
+}

package/server/services/host-suspend-command.mjs

@@ -14,6 +14,7 @@ import { windowsSystemToolPath } from '../../shared/windows-system-tools.mjs';
 export function runHostSuspendToRam({
   platform = process.platform,
   spawnImpl = spawn,
+  systemToolPath = windowsSystemToolPath,
   dryRun = /^(1|true|yes|on)$/i.test(String(process.env.OAR_HOST_SUSPEND_DRY_RUN || '')),
   logger = console,
 } = {}) {
@@ -26,7 +27,7 @@ export function runHostSuspendToRam({
     return { ok: true, command, dryRun: true };
   }
   try {
-    const child = spawnImpl(windowsSystemToolPath('rundll32.exe'), ['powrprof.dll,SetSuspendState', '0,0,0'], {
+    const child = spawnImpl(systemToolPath('rundll32.exe'), ['powrprof.dll,SetSuspendState', '0,0,0'], {
       detached: true,
       stdio: 'ignore',
       windowsHide: true,

package/server/services/preview-proxy-server.mjs

@@ -261,6 +261,10 @@ export function createPreviewProxyServer({
   // open HMR connection would therefore hang shutdown forever unless the lane
   // tracks the pairs itself.
   const upgradedSockets = new Set();
+  // Upgrades still waiting on the dev server's answer, by their teardown: the
+  // client socket is detached from the http.Server already, so it would hold
+  // close() open just the same.
+  const pendingUpgrades = new Set();
 
   function trackUpgradedSocket(socket) {
     if (!socket) return;
@@ -411,14 +415,20 @@ export function createPreviewProxyServer({
     let upstreamReq = null;
     let upstreamSocket = null;
     const teardown = () => {
+      pendingUpgrades.delete(teardown);
       try { socket.destroy(); } catch {}
       try { upstreamSocket?.destroy(); } catch {}
       try { upstreamReq?.destroy(); } catch {}
     };
+    pendingUpgrades.add(teardown);
     socket.on('error', teardown);
     // A client that leaves before the dev server answers abandons the
     // handshake. Once both sides are piped, an orderly close travels through
-    // the pipes, so the pending writes still reach the other side.
+    // the pipes, so the pending writes still reach the other side. Leaving
+    // can arrive as a bare FIN: the server's sockets allow half-open
+    // connections, so 'end' alone never closes this one, and nothing reads
+    // it again to notice a reset that follows the FIN.
+    socket.once('end', teardown);
     socket.once('close', teardown);
     const reply = (text) => {
       if (socket.destroyed) return;
@@ -477,7 +487,9 @@ export function createPreviewProxyServer({
       reply(`${lines.join('\r\n')}\r\n\r\n`);
       if (upstreamHead?.length) reply(upstreamHead);
       if (head?.length) upstreamSocket.write(head);
+      socket.removeListener('end', teardown);
       socket.removeListener('close', teardown);
+      pendingUpgrades.delete(teardown);
       trackUpgradedSocket(socket);
       trackUpgradedSocket(upstreamSocket);
       upstreamSocket.pipe(socket);
@@ -527,6 +539,7 @@ export function createPreviewProxyServer({
       try { socket.destroy(); } catch {}
     }
     upgradedSockets.clear();
+    for (const teardown of [...pendingUpgrades]) teardown();
     return new Promise((resolve) => {
       if (!server) return resolve();
       const current = server;

package/server/services/process-list-service.mjs

@@ -67,10 +67,11 @@ export function createProcessLister({
   readdirSyncImpl = fs.readdirSync,
   readFileSyncImpl = fs.readFileSync,
   execFileImpl = execFile,
+  systemToolPath,
   inspector = null,
 } = {}) {
   if (platform === 'win32') {
-    const windows = inspector || createSessionWorkerProcessInspector({ platform, execFileImpl });
+    const windows = inspector || createSessionWorkerProcessInspector({ platform, execFileImpl, systemToolPath });
     return {
       // A child keeps the pid of its parent after the parent has ended.
       orphansKeepParent: true,