mixdog 1.2.5 → 1.3.0

package/src/tui/dist/index.mjs

@@ -1825,8 +1825,8 @@ var require_react_reconciler_production = __commonJS({
           currentEntangledActionThenable = {
             status: "pending",
             value: void 0,
-            then: function(resolve6) {
-              entangledListeners.push(resolve6);
+            then: function(resolve8) {
+              entangledListeners.push(resolve8);
             }
           };
         }
@@ -1849,8 +1849,8 @@ var require_react_reconciler_production = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve6) {
-            listeners.push(resolve6);
+          then: function(resolve8) {
+            listeners.push(resolve8);
           }
         };
         thenable.then(
@@ -11449,8 +11449,8 @@ var require_react_reconciler_development = __commonJS({
           currentEntangledActionThenable = {
             status: "pending",
             value: void 0,
-            then: function(resolve6) {
-              entangledListeners.push(resolve6);
+            then: function(resolve8) {
+              entangledListeners.push(resolve8);
             }
           };
         }
@@ -11473,8 +11473,8 @@ var require_react_reconciler_development = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve6) {
-            listeners.push(resolve6);
+          then: function(resolve8) {
+            listeners.push(resolve8);
           }
         };
         thenable.then(
@@ -23114,9 +23114,194 @@ var require_stack_utils = __commonJS({
 
 // src/runtime/shared/file-permissions.mjs
 import { existsSync as existsSync4 } from "node:fs";
-import { dirname as dirname3, join as join3 } from "node:path";
-import { execFile as execFile2, execFileSync as execFileSync2 } from "node:child_process";
-import { promisify } from "node:util";
+import { dirname as dirname3, join as join3, resolve as resolve3 } from "node:path";
+import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn3 } from "node:child_process";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { MessageChannel as MessageChannel2, receiveMessageOnPort, SHARE_ENV, Worker } from "node:worker_threads";
+function execFileAsync(file, args, options) {
+  return new Promise((done, fail) => {
+    execFile2(file, args, options, (error, stdout2, stderr) => {
+      if (error) fail(Object.assign(error, { stdout: stdout2, stderr }));
+      else done({ stdout: stdout2, stderr });
+    });
+  });
+}
+function aclHelperScript(sid) {
+  return [
+    "$ErrorActionPreference = 'Stop';",
+    `$sid = [System.Security.Principal.SecurityIdentifier]::new(${quoteForPowerShell(sid)});`,
+    "$full = [System.Security.AccessControl.FileSystemRights]::FullControl;",
+    "$utf8 = [System.Text.Encoding]::UTF8;",
+    "$out = [Console]::Out;",
+    "while ($null -ne ($line = [Console]::In.ReadLine())) {",
+    "$parts = $line.Split(@([char]32), 2);",
+    "if ($parts.Count -ne 2) { continue };",
+    "try {",
+    "$path = $utf8.GetString([Convert]::FromBase64String($parts[1]));",
+    "$directory = [System.IO.Directory]::Exists($path);",
+    "$current = if ($directory) { [System.IO.Directory]::GetAccessControl($path) }",
+    "else { [System.IO.File]::GetAccessControl($path) };",
+    "$rules = @($current.GetAccessRules($true, $true, [System.Security.Principal.SecurityIdentifier]));",
+    "$ownerOnly = $current.AreAccessRulesProtected -and $rules.Count -eq 1 -and",
+    "$rules[0].AccessControlType -eq 'Allow' -and $rules[0].IdentityReference -eq $sid -and",
+    "$rules[0].FileSystemRights -eq $full;",
+    "if ($ownerOnly) { $out.WriteLine($parts[0] + ' ok') } else {",
+    "$acl = if ($directory) { [System.Security.AccessControl.DirectorySecurity]::new() }",
+    "else { [System.Security.AccessControl.FileSecurity]::new() };",
+    "$acl.SetAccessRuleProtection($true, $false);",
+    "$acl.AddAccessRule([System.Security.AccessControl.FileSystemAccessRule]::new(",
+    "$sid, $full, [System.Security.AccessControl.AccessControlType]::Allow));",
+    "if ($directory) { [System.IO.Directory]::SetAccessControl($path, $acl) }",
+    "else { [System.IO.File]::SetAccessControl($path, $acl) };",
+    "$out.WriteLine($parts[0] + ' fixed') }",
+    "} catch {",
+    "$out.WriteLine($parts[0] + ' err ' + [Convert]::ToBase64String($utf8.GetBytes([string]$_.Exception.Message)))",
+    "};",
+    "$out.Flush() }"
+  ].join(" ");
+}
+function startAclHelper(icacls, sid) {
+  const now = Date.now();
+  aclHelperStartTimes = aclHelperStartTimes.filter((at) => now - at < ACL_HELPER_START_WINDOW_MS);
+  if (aclHelperStartTimes.length >= ACL_HELPER_MAX_STARTS) return null;
+  aclHelperStartTimes.push(now);
+  const command = powerShellCommand(icacls, aclHelperScript(sid));
+  let child;
+  try {
+    child = spawn3(command.executable, command.args, {
+      cwd: dirname3(icacls),
+      stdio: ["pipe", "pipe", "ignore"],
+      windowsHide: true
+    });
+  } catch {
+    return null;
+  }
+  const helper = { child, pending: /* @__PURE__ */ new Map(), buffer: "", dead: false };
+  helper.fail = (cause) => {
+    if (aclHelper === helper) aclHelper = null;
+    if (helper.dead) return;
+    helper.dead = true;
+    const lost = [...helper.pending.values()];
+    helper.pending.clear();
+    for (const request of lost) request.lost(cause);
+    try {
+      child.kill();
+    } catch {
+    }
+  };
+  child.on("error", helper.fail);
+  child.on("exit", () => helper.fail(new Error("Windows ACL helper exited")));
+  child.stdin.on("error", helper.fail);
+  child.stdout.on("error", helper.fail);
+  child.stdout.on("close", () => helper.fail(new Error("Windows ACL helper closed its output")));
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (chunk) => {
+    helper.buffer += chunk;
+    let newline = helper.buffer.indexOf("\n");
+    while (newline >= 0) {
+      const [id, status, detail = ""] = helper.buffer.slice(0, newline).trim().split(" ");
+      helper.buffer = helper.buffer.slice(newline + 1);
+      newline = helper.buffer.indexOf("\n");
+      const request = helper.pending.get(id);
+      if (!request) continue;
+      helper.pending.delete(id);
+      syncAclHelperRef(helper);
+      request.answer(status, Buffer.from(detail, "base64").toString("utf8"));
+    }
+  });
+  syncAclHelperRef(helper);
+  return helper;
+}
+function syncAclHelperRef(helper) {
+  const method = helper.pending.size > 0 ? "ref" : "unref";
+  helper.child[method]();
+  helper.child.stdin[method]?.();
+  helper.child.stdout[method]?.();
+}
+function askAclHelper(targetPath, icacls, sid) {
+  if (!aclHelper) aclHelper = startAclHelper(icacls, sid);
+  const helper = aclHelper;
+  if (!helper) return Promise.resolve({ lost: new Error("Windows ACL helper unavailable") });
+  return new Promise((done) => {
+    aclHelperSeq += 1;
+    const id = String(aclHelperSeq);
+    const timer2 = setTimeout(() => {
+      helper.pending.delete(id);
+      syncAclHelperRef(helper);
+      done({ lost: new Error("Windows ACL helper timed out") });
+      helper.fail(new Error("Windows ACL helper timed out"));
+    }, ACL_HELPER_REQUEST_TIMEOUT_MS);
+    helper.pending.set(id, {
+      answer(status, detail) {
+        clearTimeout(timer2);
+        done({ status, detail });
+      },
+      lost(cause) {
+        clearTimeout(timer2);
+        done({ lost: cause });
+      }
+    });
+    syncAclHelperRef(helper);
+    helper.child.stdin.write(`${id} ${Buffer.from(targetPath, "utf8").toString("base64")}
+`);
+  });
+}
+function syncBridge() {
+  if (aclSyncBridge || aclSyncBridgeBroken) return aclSyncBridge;
+  try {
+    const url = new URL("./file-permissions-worker.mjs", import.meta.url);
+    if (!existsSync4(fileURLToPath2(url))) throw new Error("Windows ACL bridge worker is not shipped here");
+    const { port1, port2 } = new MessageChannel2();
+    const signal = new Int32Array(new SharedArrayBuffer(12));
+    const worker = new Worker(url, {
+      env: SHARE_ENV,
+      execArgv: [],
+      workerData: { port: port2, signal },
+      transferList: [port2]
+    });
+    const bridge = { worker, port: port1, signal, seq: 0, startedAt: Date.now() };
+    const drop = () => {
+      if (aclSyncBridge === bridge) aclSyncBridge = null;
+    };
+    worker.on("error", drop);
+    worker.on("exit", drop);
+    worker.unref();
+    port1.unref?.();
+    aclSyncBridge = bridge;
+  } catch {
+    aclSyncBridgeBroken = true;
+  }
+  return aclSyncBridge;
+}
+function dropSyncBridge(bridge) {
+  if (aclSyncBridge !== bridge) return;
+  aclSyncBridge = null;
+  void bridge.worker.terminate();
+}
+function askSyncBridge(targetPath) {
+  const bridge = syncBridge();
+  if (!bridge) return { lost: new Error("Windows ACL bridge unavailable") };
+  bridge.seq += 1;
+  const id = bridge.seq;
+  let seen = Atomics.load(bridge.signal, 0);
+  bridge.port.postMessage({ id, path: targetPath });
+  const deadline = Date.now() + ACL_SYNC_BRIDGE_TIMEOUT_MS;
+  for (; ; ) {
+    for (let received = receiveMessageOnPort(bridge.port); received; received = receiveMessageOnPort(bridge.port)) {
+      if (received.message?.id === id) return received.message;
+    }
+    const now = Date.now();
+    const ready = Atomics.load(bridge.signal, 2) === 1;
+    if (Atomics.load(bridge.signal, 1) === 1 || !ready && now - bridge.startedAt >= ACL_SYNC_BRIDGE_READY_MS) {
+      dropSyncBridge(bridge);
+      return { lost: new Error("Windows ACL bridge exited") };
+    }
+    if (now >= deadline) return { timedOut: true };
+    const wait = ready ? deadline - now : Math.min(deadline - now, bridge.startedAt + ACL_SYNC_BRIDGE_READY_MS - now);
+    Atomics.wait(bridge.signal, 0, seen, Math.max(1, wait));
+    seen = Atomics.load(bridge.signal, 0);
+  }
+}
 function systemToolPath(name) {
   const systemRoot = process.env.SystemRoot || process.env.windir;
   return systemRoot ? join3(systemRoot, "System32", name) : null;
@@ -23216,6 +23401,14 @@ function aclFailure(targetPath, cause, label = "icacls") {
 function enforceOwnerOnlyAclWin32(targetPath, { fresh = false } = {}) {
   if (process.platform !== "win32") return;
   const icacls = icaclsPath();
+  if (fresh) {
+    const reply = askSyncBridge(resolve3(targetPath));
+    if (reply.ok === true) return;
+    if (reply.ok === false) throw Object.assign(new Error(reply.message), { code: reply.code || "EACLFAIL" });
+    if (reply.timedOut) {
+      throw aclFailure(targetPath, new Error("the Windows ACL bridge did not answer"), "Windows ACL helper");
+    }
+  }
   if (cachedUserSid === null) cachedUserSid = resolveCurrentUserPrincipal();
   const command = ownerOnlyAclCommand(targetPath, cachedUserSid, fresh, icacls);
   try {
@@ -23230,6 +23423,16 @@ function enforceOwnerOnlyAclWin32(targetPath, { fresh = false } = {}) {
 }
 async function enforceOwnerOnlyAclWin32Async(targetPath, { fresh = false } = {}) {
   if (process.platform !== "win32") return;
+  const icacls = icaclsPath();
+  if (cachedUserSid === null) cachedUserSid = await resolveCurrentUserPrincipalAsync();
+  const reply = await askAclHelper(resolve3(targetPath), icacls, cachedUserSid);
+  if (reply.status === "ok" || reply.status === "fixed") return;
+  if (reply.status === "err") {
+    throw aclFailure(targetPath, new Error(reply.detail || "unknown error"), "Windows ACL helper");
+  }
+  return applyOwnerOnlyAclAsync(targetPath, fresh);
+}
+async function applyOwnerOnlyAclAsync(targetPath, fresh) {
   const icacls = icaclsPath();
   if (cachedUserSid === null) cachedUserSid = await resolveCurrentUserPrincipalAsync();
   const command = ownerOnlyAclCommand(targetPath, cachedUserSid, fresh, icacls);
@@ -23239,11 +23442,20 @@ async function enforceOwnerOnlyAclWin32Async(targetPath, { fresh = false } = {})
     throw aclFailure(targetPath, error, command.label);
   }
 }
-var execFileAsync, cachedUserSid, quoteForPowerShell;
+var cachedUserSid, ACL_HELPER_REQUEST_TIMEOUT_MS, ACL_HELPER_MAX_STARTS, ACL_HELPER_START_WINDOW_MS, aclHelper, aclHelperStartTimes, aclHelperSeq, ACL_SYNC_BRIDGE_READY_MS, ACL_SYNC_BRIDGE_TIMEOUT_MS, aclSyncBridge, aclSyncBridgeBroken, quoteForPowerShell;
 var init_file_permissions = __esm({
   "src/runtime/shared/file-permissions.mjs"() {
-    execFileAsync = promisify(execFile2);
     cachedUserSid = null;
+    ACL_HELPER_REQUEST_TIMEOUT_MS = 15e3;
+    ACL_HELPER_MAX_STARTS = 3;
+    ACL_HELPER_START_WINDOW_MS = 10 * 6e4;
+    aclHelper = null;
+    aclHelperStartTimes = [];
+    aclHelperSeq = 0;
+    ACL_SYNC_BRIDGE_READY_MS = 1e4;
+    ACL_SYNC_BRIDGE_TIMEOUT_MS = 2 * ACL_HELPER_REQUEST_TIMEOUT_MS + 5e3;
+    aclSyncBridge = null;
+    aclSyncBridgeBroken = false;
     quoteForPowerShell = (value) => `'${String(value).replaceAll("'", "''")}'`;
   }
 });
@@ -23274,7 +23486,7 @@ var init_keyed_serial_queue = __esm({
 
 // src/runtime/shared/sleep.mjs
 function sleep(ms) {
-  return new Promise((resolve6) => setTimeout(resolve6, ms));
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
 }
 function sleepSync(ms) {
   const buffer = new SharedArrayBuffer(4);
@@ -23671,14 +23883,15 @@ async function withOsFileLock(lockPath, fn, opts = {}, queueWaitMs = 0) {
     }
   }
 }
-var LOCK_WAIT_CODES, DEFAULT_BACKOFFS_MS, configuredLockTimeoutMs, DEFAULT_LOCK_TIMEOUT_MS, OWNER_TOKEN, osHeldPaths, lockQueue, heldLockPaths, RECLAIM_GUARD_STALE_MS, LOCK_WAIT_WARN_MS, LOCK_WAIT_WARN_INTERVAL_MS, LOCK_HELD_WARN_MS, lockWaitWarnedAt, lockHeldWarnedAt, SYNC_IO, ASYNC_IO, STAGED_LOCK_FILE_STALE_MS, sweptLockPaths;
+var LOCK_WAIT_CODES, RETRY_MAX_MS, DEFAULT_BACKOFFS_MS, configuredLockTimeoutMs, DEFAULT_LOCK_TIMEOUT_MS, OWNER_TOKEN, osHeldPaths, lockQueue, heldLockPaths, RECLAIM_GUARD_STALE_MS, LOCK_WAIT_WARN_MS, LOCK_WAIT_WARN_INTERVAL_MS, LOCK_HELD_WARN_MS, lockWaitWarnedAt, lockHeldWarnedAt, SYNC_IO, ASYNC_IO, STAGED_LOCK_FILE_STALE_MS, sweptLockPaths;
 var init_file_lock = __esm({
   "src/runtime/shared/file-lock.mjs"() {
     init_file_permissions();
     init_keyed_serial_queue();
     init_sleep();
     LOCK_WAIT_CODES = /* @__PURE__ */ new Set(["EEXIST", "EPERM", "EACCES", "EBUSY"]);
-    DEFAULT_BACKOFFS_MS = Object.freeze([25, 50, 100, 200, 400, 800, 1200, 1600]);
+    RETRY_MAX_MS = 200;
+    DEFAULT_BACKOFFS_MS = Object.freeze([25, 50, 100, ...Array(20).fill(RETRY_MAX_MS)]);
     configuredLockTimeoutMs = Number(process.env.MIXDOG_LOCK_TIMEOUT_MS);
     DEFAULT_LOCK_TIMEOUT_MS = Number.isFinite(configuredLockTimeoutMs) && configuredLockTimeoutMs >= 0 ? configuredLockTimeoutMs : 2e3;
     OWNER_TOKEN = randomBytes2(12).toString("hex");
@@ -23738,7 +23951,8 @@ import {
   unlink as unlinkAsync2,
   writeFile as writeFileAsync2
 } from "node:fs/promises";
-import { dirname as dirname5, basename as basename3, join as join5 } from "node:path";
+import { tmpdir as tmpdir2 } from "node:os";
+import { dirname as dirname5, basename as basename3, join as join5, relative, isAbsolute as isAbsolute2, resolve as resolve4 } from "node:path";
 import { randomBytes as randomBytes3 } from "node:crypto";
 function _drainAdaptiveFileIo() {
   while (_ioActive < _ioLimit && _ioQueue.length > 0) {
@@ -23765,8 +23979,8 @@ function _drainAdaptiveFileIo() {
   }
 }
 function _runAdaptiveFileIo(run) {
-  return new Promise((resolve6, reject) => {
-    _ioQueue.push({ run, resolve: resolve6, reject });
+  return new Promise((resolve8, reject) => {
+    _ioQueue.push({ run, resolve: resolve8, reject });
     _drainAdaptiveFileIo();
   });
 }
@@ -23777,21 +23991,22 @@ function nextRenameDelayMs(err, attempt, backoffs) {
   if (!RETRY_CODES.has(err?.code) || attempt >= backoffs.length) return null;
   return backoffs[attempt] + Math.floor(Math.random() * Math.min(50, Math.max(1, backoffs[attempt])));
 }
+function renameAttempt(src, dst, attempt, opts = {}) {
+  try {
+    renameSync3(src, dst);
+    return null;
+  } catch (err) {
+    const delayMs = nextRenameDelayMs(err, attempt, renameBackoffs(opts));
+    if (delayMs === null) throw err;
+    return delayMs;
+  }
+}
 function renameWithRetrySync(src, dst, opts = {}) {
-  const backoffs = renameBackoffs(opts);
-  let lastErr = null;
-  for (let attempt = 0; attempt <= backoffs.length; attempt++) {
-    try {
-      renameSync3(src, dst);
-      return true;
-    } catch (err) {
-      lastErr = err;
-      const delayMs = nextRenameDelayMs(err, attempt, backoffs);
-      if (delayMs === null) break;
-      sleepSync(delayMs);
-    }
+  for (let attempt = 0; ; attempt++) {
+    const delayMs = renameAttempt(src, dst, attempt, opts);
+    if (delayMs === null) return true;
+    sleepSync(delayMs);
   }
-  throw lastErr;
 }
 async function renameWithRetry(src, dst, opts = {}) {
   const backoffs = renameBackoffs(opts);
@@ -23837,7 +24052,14 @@ async function fsyncPathAsync(path2, tolerated) {
     }
   }
 }
+function assertTestSecretWriteSafe(filePath, opts) {
+  if (opts.secret !== true || !process.env.NODE_TEST_CONTEXT) return;
+  const rel = relative(resolve4(tmpdir2()).toLowerCase(), resolve4(filePath).toLowerCase());
+  if (rel === "" || !rel.startsWith("..") && !isAbsolute2(rel)) return;
+  throw new Error(`refusing to write a secret outside the temp dir under node --test: ${filePath}`);
+}
 function writeFileAtomicSync(filePath, data, opts = {}) {
+  assertTestSecretWriteSafe(filePath, opts);
   const run = () => {
     const dir = dirname5(filePath);
     mkdirSync3(dir, { recursive: true });
@@ -23902,6 +24124,7 @@ function writeJsonAtomicSync(filePath, value, opts = {}) {
 `, opts);
 }
 async function writeFileAtomicAsync(filePath, data, opts = {}) {
+  assertTestSecretWriteSafe(filePath, opts);
   const run = async () => {
     const dir = dirname5(filePath);
     await mkdirAsync2(dir, { recursive: true });
@@ -24160,7 +24383,7 @@ import {
 } from "node:fs";
 import { setTimeout as sleep2 } from "node:timers/promises";
 import { join as join14, dirname as dirname11 } from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { pipeline as pipeline2 } from "node:stream/promises";
 import { spawnSync } from "node:child_process";
 import { createGunzip } from "node:zlib";
@@ -24881,7 +25104,7 @@ var init_voice_runtime_fetcher = __esm({
     init_bounded_download();
     init_native_asset();
     init_windows_roots();
-    BUNDLED_MANIFEST_PATH = fileURLToPath3(new URL("../data/voice-runtime-manifest.json", import.meta.url));
+    BUNDLED_MANIFEST_PATH = fileURLToPath4(new URL("../data/voice-runtime-manifest.json", import.meta.url));
     MANIFEST_URL = "https://raw.githubusercontent.com/tribgames/mixdog/main/src/runtime/channels/data/voice-runtime-manifest.json";
     LOCK_WAIT_CODES2 = /* @__PURE__ */ new Set(["EEXIST", "EPERM", "EACCES", "EBUSY"]);
     LOCK_MAX_AGE_MS = 30 * 60 * 1e3;
@@ -33876,8 +34099,8 @@ var App_default = App;
 var noop = () => {
 };
 var textEncoder = new TextEncoder();
-var yieldImmediate = async () => new Promise((resolve6) => {
-  setImmediate(resolve6);
+var yieldImmediate = async () => new Promise((resolve8) => {
+  setImmediate(resolve8);
 });
 var kittyQueryEscapeByte = 27;
 var kittyQueryOpenBracketByte = 91;
@@ -34132,8 +34355,8 @@ var Ink = class {
       };
     }
     this.initKittyKeyboard();
-    this.exitPromise = new Promise((resolve6, reject) => {
-      this.resolveExitPromise = resolve6;
+    this.exitPromise = new Promise((resolve8, reject) => {
+      this.resolveExitPromise = resolve8;
       this.rejectExitPromise = reject;
     });
     void this.exitPromise.catch(noop);
@@ -34573,9 +34796,9 @@ var Ink = class {
     settleThrottle(this.throttledOnRender, canWriteToStdout);
     settleThrottle(this.throttledLog, canWriteToStdout);
     if (canWriteToStdout && hasWritableState) {
-      await new Promise((resolve6) => {
+      await new Promise((resolve8) => {
         this.options.stdout.write("", () => {
-          resolve6();
+          resolve8();
         });
       });
       return;
@@ -34661,8 +34884,8 @@ var Ink = class {
   async awaitNextRender() {
     if (!this.nextRenderCommit) {
       let resolveRender;
-      const promise = new Promise((resolve6) => {
-        resolveRender = resolve6;
+      const promise = new Promise((resolve8) => {
+        resolveRender = resolve8;
       });
       this.nextRenderCommit = { promise, resolve: resolveRender };
     }
@@ -35114,7 +35337,7 @@ import { useState as useState5, useEffect as useEffect6, useCallback as useCallb
 
 // src/tui/index.jsx
 import { closeSync as closeSync3, constants as fsConstants, createWriteStream as createWriteStream3, mkdirSync as mkdirSync8, openSync as openSync3, readSync } from "node:fs";
-import { tmpdir as tmpdir3 } from "node:os";
+import { tmpdir as tmpdir4 } from "node:os";
 import { dirname as dirname12, join as join17 } from "node:path";
 import { performance as performance2 } from "node:perf_hooks";
 import { format } from "node:util";
@@ -35133,12 +35356,12 @@ import { spawn } from "node:child_process";
 import path from "node:path";
 var DIALOG_TIMEOUT_MS = 5 * 60 * 1e3;
 function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve8) => {
     let child;
     try {
       child = spawn(cmd, args, { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     } catch (error) {
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve8({ ok: false, code: -1, stdout: "", error });
       return;
     }
     let stdout2 = "";
@@ -35150,7 +35373,7 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
         child.kill();
       } catch {
       }
-      resolve6({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
+      resolve8({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
     }, timeoutMs);
     timer2.unref?.();
     child.stdout.on("data", (chunk) => {
@@ -35160,13 +35383,13 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve8({ ok: false, code: -1, stdout: "", error });
     });
     child.on("close", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve6({ ok: code === 0, code, stdout: stdout2 });
+      resolve8({ ok: code === 0, code, stdout: stdout2 });
     });
   });
 }
@@ -35174,10 +35397,10 @@ function spawnFailed(result) {
   return !!result && result.code === -1;
 }
 function commandExists(cmd) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve8) => {
     const probe = process.platform === "win32" ? spawn("where", [cmd], { stdio: "ignore", windowsHide: true }) : spawn("which", [cmd], { stdio: "ignore" });
-    probe.on("error", () => resolve6(false));
-    probe.on("close", (code) => resolve6(code === 0));
+    probe.on("error", () => resolve8(false));
+    probe.on("close", (code) => resolve8(code === 0));
   });
 }
 function psSingleQuoted(value) {
@@ -38714,13 +38937,22 @@ function trimPendingTableHead(text) {
   for (const blank of text.matchAll(/\n[ \t]*\r?\n/g)) offset = blank.index + blank[0].length;
   const block = text.slice(offset);
   const lines = block.split("\n").map((line) => line.replace(/\r$/, ""));
-  if (lines.length === 0 || lines.length > 2 || !PIPE_ROW.test(lines[0])) return text;
-  if (lines.length === 2) {
-    const delimiter2 = lines[1];
-    if (!PARTIAL_DELIMITER_ROW.test(delimiter2)) return text;
-    if (DELIMITER_ROW.test(delimiter2) && tableCells(delimiter2) === tableCells(lines[0])) return text;
-  }
-  return text.slice(0, offset);
+  let last = lines.length - 1;
+  if (last >= 1 && !lines[last].trim()) last -= 1;
+  let head = last;
+  if (last >= 1 && PARTIAL_DELIMITER_ROW.test(lines[last]) && hasCellPipe(lines[last - 1])) {
+    const delimiter2 = lines[last];
+    if (DELIMITER_ROW.test(delimiter2) && tableCells(delimiter2) === tableCells(lines[last - 1])) return text;
+    head = last - 1;
+  }
+  if (!(PIPE_ROW.test(lines[head]) || hasCellPipe(lines[head]))) return text;
+  if (lines.slice(0, head).some((line) => DELIMITER_ROW.test(line))) return text;
+  let start = offset;
+  for (let index = 0; index < head; index += 1) start += lines[index].length + 1;
+  return text.slice(0, start);
+}
+function hasCellPipe(line) {
+  return /(?<!\\)\|/.test(line.replace(INLINE_CODE_SPAN, ""));
 }
 function healStreamingMarkdownTail(text, isPendingLocalPath) {
   const source = String(text ?? "");
@@ -45974,8 +46206,8 @@ var notifyRenderFrame = (seq) => {
   for (const ack of acks) ack(seq);
 };
 var yieldToRenderer = ({ frames = 1 } = {}) => {
-  if (!hasRenderFrameSource()) return new Promise((resolve6) => setImmediate(resolve6));
-  return new Promise((resolve6) => {
+  if (!hasRenderFrameSource()) return new Promise((resolve8) => setImmediate(resolve8));
+  return new Promise((resolve8) => {
     const minSeq = renderAckSeq;
     let remainingFrames = Math.max(1, Math.floor(Number(frames) || 1));
     let settled = false;
@@ -45990,7 +46222,7 @@ var yieldToRenderer = ({ frames = 1 } = {}) => {
       releaseClosedListener();
       const idx = pendingRenderAcks.indexOf(onFrame);
       if (idx !== -1) pendingRenderAcks.splice(idx, 1);
-      resolve6();
+      resolve8();
     };
     releaseClosedListener = onRenderFrameSourcesClosed(finish);
     const onTimeout = () => {
@@ -46790,13 +47022,13 @@ function nativeClipboardCommand(text) {
 function copyToClipboard(text) {
   const value = String(text ?? "");
   const wroteOsc52 = writeOsc52Clipboard(value);
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve8, reject) => {
     const { cmd, args, input } = nativeClipboardCommand(value);
     let child;
     try {
       child = spawn2(cmd, args, { stdio: ["pipe", "ignore", "ignore"], windowsHide: true });
     } catch (e) {
-      if (wroteOsc52) resolve6();
+      if (wroteOsc52) resolve8();
       else reject(clipboardHelperError(cmd, e));
       return;
     }
@@ -46805,7 +47037,7 @@ function copyToClipboard(text) {
     });
     if (!wroteOsc52) {
       child.on("close", (code) => {
-        if (code === 0) resolve6();
+        if (code === 0) resolve8();
         else reject(new Error(`${cmd} exited with code ${code}`));
       });
     }
@@ -46814,7 +47046,7 @@ function copyToClipboard(text) {
     child.stdin.end(input);
     if (wroteOsc52) {
       child.unref?.();
-      resolve6();
+      resolve8();
     }
   });
 }
@@ -47118,7 +47350,7 @@ function mimeForPath(path2) {
   return IMAGE_MIME[extname(String(path2 || "")).toLowerCase()] || null;
 }
 function execFileBuffer(cmd, args, options = {}) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve8) => {
     execFile(
       cmd,
       args,
@@ -47130,7 +47362,7 @@ function execFileBuffer(cmd, args, options = {}) {
         ...options
       },
       (error, stdout2, stderr) => {
-        resolve6({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
+        resolve8({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
       }
     );
   });
@@ -48526,7 +48758,7 @@ function completeOAuthCode(ctx, target, commandText) {
   }
   oauthSubmitRef.current = true;
   setProviderPrompt((prompt) => prompt === target ? { ...prompt, submitting: true } : prompt);
-  const completion = typeof target.login?.completeCode === "function" ? new Promise((resolve6) => resolve6(target.login.completeCode(commandText))) : Promise.reject(new Error("OAuth login is no longer active"));
+  const completion = typeof target.login?.completeCode === "function" ? new Promise((resolve8) => resolve8(target.login.completeCode(commandText))) : Promise.reject(new Error("OAuth login is no longer active"));
   void completion.then(() => {
     const successReturn = target.successReturn;
     const afterSave = target.afterSave;
@@ -49740,11 +49972,11 @@ init_atomic_file();
 init_json_file();
 import { existsSync as existsSync6, readFileSync as readFileSync6, realpathSync } from "node:fs";
 import { basename as basename4, delimiter, dirname as dirname6, join as join6 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 var PACKAGE_NAME = "mixdog";
 var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
-var _MODULE_DIR = dirname6(fileURLToPath2(import.meta.url));
+var _MODULE_DIR = dirname6(fileURLToPath3(import.meta.url));
 var _PACKAGE_JSON_PATH = join6(_MODULE_DIR, "..", "..", "..", "package.json");
 var _PACKAGE_ROOT = dirname6(_PACKAGE_JSON_PATH);
 var _localVersionCache = null;
@@ -50730,7 +50962,17 @@ var PROVIDER_CATALOGS = Object.freeze({
   },
   "cursor-oauth": { relay: true },
   "cursor-api": { relay: true },
-  "opencode-go": { relay: true }
+  // The models.dev listing id of the Go gateway: a relay catalog, not a
+  // selectable provider (the model lookup needs it flagged as a relay).
+  "opencode-go": { relay: true },
+  // The Go gateway through an OpenCode Console login; the organization
+  // config's catalog is the live roster.
+  "opencode-go-oauth": {
+    modelsDev: "opencode-go",
+    relay: true,
+    rosterFiles: ["opencode-go-oauth-models.json"],
+    rosterLimitsAuthoritative: true
+  }
 });
 var VERIFIED_CORRECTIONS = Object.freeze({
   "muse-code-oauth": Object.freeze({
@@ -51090,11 +51332,11 @@ function isPidAlive(value) {
 
 // src/runtime/shared/worktrees/git-head.mjs
 import { readFileSync as readFileSync9, statSync as statSync2, watch } from "node:fs";
-import { dirname as dirname8, resolve as resolve4 } from "node:path";
+import { dirname as dirname8, resolve as resolve6 } from "node:path";
 
 // src/runtime/shared/worktrees/paths.mjs
 import { existsSync as existsSync9, realpathSync as realpathSync2 } from "node:fs";
-import { dirname as dirname7, isAbsolute as isAbsolute2, join as join9, relative, resolve as resolve3, sep } from "node:path";
+import { dirname as dirname7, isAbsolute as isAbsolute3, join as join9, relative as relative2, resolve as resolve5, sep } from "node:path";
 
 // src/runtime/shared/statusline/statusline-segments.mjs
 var DEFAULT_MIXDOG_HOME = process.env.MIXDOG_HOME || join10(homedir2(), ".mixdog");
@@ -51182,7 +51424,8 @@ async function refreshShellJobsStatus(ownerPid) {
         continue;
       }
       const unconfirmed = detail?.terminationUnconfirmed === true;
-      if (unconfirmed ? !isPidAlive(ownerByJob.get(id) || 0) : !await isShellJobAlive(detail, p, dir, id)) continue;
+      if (unconfirmed ? !isHeldShellJobAlive(detail, ownerByJob.get(id)) : !await isShellJobAlive(detail, p, dir, id))
+        continue;
       if (detail?.foreground === true && !unconfirmed) continue;
       const ownedByThisHost = ownerByJob.get(id) === ownerPid;
       if (ownedByThisHost) count++;
@@ -51271,6 +51514,12 @@ function summarizeShellJobs({ count, oldestMs, jobs, bySession }) {
   }
   return { count, elapsedLabel, jobs, sessions };
 }
+function isHeldShellJobAlive(detail, ownerPid) {
+  if (!isPidAlive(ownerPid || 0)) return false;
+  if (detail?.ownerSessionClosed !== true) return true;
+  const survivors = Array.isArray(detail?.survivorPids) ? detail.survivorPids : [];
+  return [detail?.pid, ...survivors].some((pid) => isPidAlive(positiveInt(pid)));
+}
 async function isShellJobAlive(detail, detailPath, dir, id) {
   const pid = positiveInt(detail?.pid);
   if (!pid) return false;
@@ -55639,7 +55888,7 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
       toolApproval.id
     );
   }
-  const resolve6 = (approved) => {
+  const resolve8 = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
       approved,
       reason: approved ? "approved by user" : "denied by user"
@@ -55664,12 +55913,12 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
           description: "run this tool call"
         }
       ],
-      onSelect: (value) => resolve6(value === "approve"),
-      onCancel: () => resolve6(false),
+      onSelect: (value) => resolve8(value === "approve"),
+      onCancel: () => resolve8(false),
       onKey: (input) => {
         const value = String(input || "").trim().toLowerCase();
-        if (value === "a" || value === "y") resolve6(true);
-        else if (value === "d" || value === "n") resolve6(false);
+        if (value === "a" || value === "y") resolve8(true);
+        else if (value === "d" || value === "n") resolve8(false);
       },
       title: "Tool approval",
       description: toolApprovalDescription(toolApproval),
@@ -59049,7 +59298,7 @@ var PROVIDER_DISPLAY_NAMES = /* @__PURE__ */ new Map([
   ["xai-api", "xAI API"],
   ["deepseek", "DeepSeek API"],
   ["deepseek-api", "DeepSeek API"],
-  ["opencode-go", "OpenCode Go API"],
+  ["opencode-go-oauth", "OpenCode Go OAuth"],
   ["openrouter", "OpenRouter"],
   ["mixdog-local", "Local Provider"],
   ["default", "Default"]
@@ -59076,6 +59325,33 @@ var loadProviderDisplayNames = async (store) => {
   }
   return names;
 };
+var loadProviderCatalogFailures = async (store) => {
+  let setup = null;
+  try {
+    setup = await store?.getProviderSetup?.();
+  } catch {
+    return [];
+  }
+  const failures = [];
+  for (const group of ["api", "oauth", "local"]) {
+    for (const entry of Array.isArray(setup?.[group]) ? setup[group] : []) {
+      const failure = entry?.catalogError;
+      if (!failure?.message) continue;
+      const { summary, recovery } = describeError({ message: failure.message, errorKind: failure.errorKind });
+      failures.push({ id: String(entry.id || "").trim(), text: [summary, recovery].filter(Boolean).join(" ") });
+    }
+  }
+  return failures;
+};
+var buildCatalogFailureItems = (failures, models, providerNames = null) => failures.filter(({ id }) => id && !models.some((model) => model.provider === id)).map(({ id, text }) => ({
+  value: `provider-failed:${id}`,
+  label: resolveProviderDisplayName(id, providerNames),
+  marker: "!",
+  markerColor: theme.error,
+  description: text,
+  _action: "catalog-failed",
+  _failure: text
+}));
 var PROVIDER_DISPLAY_RANKS = {
   default: 0,
   "openai-oauth": 10,
@@ -59086,7 +59362,7 @@ var PROVIDER_DISPLAY_RANKS = {
   "mimo-oauth": 34,
   "antigravity-oauth": 31,
   "cursor-oauth": 32,
-  "opencode-go": 35,
+  "opencode-go-oauth": 34.5,
   openai: 40,
   "openai-api": 40,
   anthropic: 50,
@@ -59551,7 +59827,7 @@ function createOnboardingSteps({
 }
 
 // src/runtime/shared/open-url.mjs
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 
 // src/runtime/shared/wsl.mjs
 import { readFileSync as readFileSync10 } from "node:fs";
@@ -59609,7 +59885,7 @@ function tryOpenCandidates(candidates, index) {
   if (index >= candidates.length) return;
   const [cmd, args] = candidates[index];
   try {
-    const child = spawn3(cmd, args, { stdio: "ignore", ...detachedSpawnOpts });
+    const child = spawn4(cmd, args, { stdio: "ignore", ...detachedSpawnOpts });
     child.on("error", () => {
       tryOpenCandidates(candidates, index + 1);
     });
@@ -60013,7 +60289,7 @@ function createProviderSetupPicker({
       }
     });
     try {
-      await new Promise((resolve6) => setTimeout(resolve6, 0));
+      await new Promise((resolve8) => setTimeout(resolve8, 0));
       return await store.getProviderSetup(options.forceRefresh ? { force: true } : void 0);
     } catch (e) {
       store.pushNotice(`providers failed: ${e?.message || e}`, "error");
@@ -60135,7 +60411,7 @@ function createModelCatalog({ store, providerModelsCacheRef, webSearchModelsCach
     let renderedQuickModels = false;
     if (!providerModels.length || options.refreshModels === true) {
       paintLoading();
-      await new Promise((resolve6) => setTimeout(resolve6, 0));
+      await new Promise((resolve8) => setTimeout(resolve8, 0));
       try {
         if (options.refreshModels !== true && options.cacheRef !== "webSearch") {
           refreshModelsPromise = Promise.resolve(loadModels({ force: false }));
@@ -60642,6 +60918,7 @@ function createModelPicker({
     }
     const models = normalizeModelOptions(providerModels);
     const providerNames = await loadProviderDisplayNames(store);
+    const catalogFailures = await loadProviderCatalogFailures(store);
     const activeRoute = options.currentRoute || {
       provider: state.provider,
       model: state.model,
@@ -60679,7 +60956,10 @@ function createModelPicker({
         providerListHighlightProvider = renderOptions.highlightProvider;
       }
       const highlightProvider = renderOptions.highlightProvider || providerListHighlightProvider || null;
-      const providerItems = buildModelProviderItems(models, activeRoute, providerNames);
+      const providerItems = [
+        ...buildModelProviderItems(models, activeRoute, providerNames),
+        ...buildCatalogFailureItems(catalogFailures, models, providerNames)
+      ];
       const providerHighlight = highlightProvider || activeRoute?.provider || null;
       const providerInitialIndex = Math.max(
         0,
@@ -60696,6 +60976,10 @@ function createModelPicker({
         pickerKey: `model-picker:providers:${providerHighlight || "default"}`,
         items: providerItems,
         onSelect: (_value, item) => {
+          if (item?._failure) {
+            store.pushNotice(`${item.label}: ${item._failure}`, "warn");
+            return;
+          }
           if (!item?._provider) return;
           openProviderModelsPicker({
             view,
@@ -61169,7 +61453,7 @@ import {
   rm as rmP,
   stat as statP
 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname9, join as join11, resolve as resolve5 } from "node:path";
+import { basename as basename5, dirname as dirname9, join as join11, resolve as resolve7 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 import { createHash as createHash4, randomUUID } from "node:crypto";
 function getBackupRoot() {
@@ -61181,15 +61465,75 @@ var BACKUP_MANIFEST = "backup.json";
 var INIT_MARKER = ".mixdog-user-data.json";
 var SCOPE_PREFIX = "scope-";
 function normalizeDataDir(dataDir2) {
-  const full = resolve5(String(dataDir2));
+  const full = resolve7(String(dataDir2));
   return process.platform === "win32" ? full.toLowerCase() : full;
 }
 function scopeDirFor(dataDir2) {
   const id = createHash4("sha256").update(normalizeDataDir(dataDir2)).digest("hex").slice(0, 16);
   return join11(getBackupRoot(), `${SCOPE_PREFIX}${id}`);
 }
-function stamp() {
-  return (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+var lastBackupMs = 0;
+var backupSeq = 0;
+var BACKUP_NAME_RE = /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z-(?:(\d{10})-)?/;
+function newestBackupOrder(names) {
+  let ms = 0;
+  let seq = -1;
+  for (const name of names) {
+    const match = BACKUP_NAME_RE.exec(name);
+    if (!match) continue;
+    const time = Date.parse(`${match[1]}T${match[2]}:${match[3]}:${match[4]}.${match[5]}Z`);
+    if (!Number.isFinite(time)) continue;
+    const order = match[6] === void 0 ? Number.POSITIVE_INFINITY : Number(match[6]);
+    if (time > ms || time === ms && order > seq) {
+      ms = time;
+      seq = order;
+    }
+  }
+  return { ms, seq };
+}
+function nextBackupName(names, reason) {
+  const newest = newestBackupOrder(names);
+  lastBackupMs = Math.max(Date.now(), lastBackupMs, newest.ms);
+  if (lastBackupMs === newest.ms) {
+    if (newest.seq === Number.POSITIVE_INFINITY) lastBackupMs += 1;
+    else backupSeq = Math.max(backupSeq, newest.seq + 1);
+  }
+  const time = new Date(lastBackupMs).toISOString().replace(/[:.]/g, "-");
+  return `${time}-${String(backupSeq++).padStart(10, "0")}-${safeReason(reason)}`;
+}
+function scopeBackupNames(entries) {
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+}
+function reserveBackupDir(scopeDir, reason) {
+  mkdirSync4(scopeDir, { recursive: true });
+  const names = scopeBackupNames(readdirSync2(scopeDir, { withFileTypes: true }));
+  for (; ; ) {
+    const name = nextBackupName(names, reason);
+    names.push(name);
+    try {
+      mkdirSync4(join11(scopeDir, name));
+      return { backupDir: join11(scopeDir, name), names };
+    } catch (error) {
+      if (error?.code !== "EEXIST") throw error;
+    }
+  }
+}
+async function reserveBackupDirAsync(scopeDir, reason) {
+  await mkdirP(scopeDir, { recursive: true });
+  const names = scopeBackupNames(await readdirP(scopeDir, { withFileTypes: true }));
+  for (; ; ) {
+    const name = nextBackupName(names, reason);
+    names.push(name);
+    try {
+      await mkdirP(join11(scopeDir, name));
+      return { backupDir: join11(scopeDir, name), names };
+    } catch (error) {
+      if (error?.code !== "EEXIST") throw error;
+    }
+  }
+}
+function backupsToPrune(names, own, keep = 40) {
+  return [...names].sort().reverse().slice(keep).filter((name) => name !== own);
 }
 function safeReason(reason) {
   return String(reason || "snapshot").replace(/[^a-z0-9_.-]+/gi, "-").slice(0, 48) || "snapshot";
@@ -61221,7 +61565,7 @@ function manifestDataDirMatches(backupDir, dataDirKey) {
 }
 function legacyMarkersFor(root, dataDir2, dataDirKey) {
   const hashed = new Set(
-    [String(dataDir2), resolve5(String(dataDir2))].map(
+    [String(dataDir2), resolve7(String(dataDir2))].map(
       (value) => `.initialized-${createHash4("sha256").update(value).digest("hex").slice(0, 16)}.json`
     )
   );
@@ -61275,9 +61619,20 @@ function isStructurallyCompleteMixdogConfigBackup(parsed) {
   if (!parsed.agent && !parsed.channels) return false;
   return true;
 }
-function backupDirsNewestFirst(dir) {
+function isAbsentBackupError(error) {
+  return error instanceof SyntaxError || error?.code === "ENOENT" || error?.code === "ENOTDIR";
+}
+function listBackupDirsNewestFirst(dir) {
   try {
     return readdirSync2(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort().reverse();
+  } catch (error) {
+    if (isAbsentBackupError(error)) return [];
+    throw error;
+  }
+}
+function backupDirsNewestFirst(dir) {
+  try {
+    return listBackupDirsNewestFirst(dir);
   } catch {
     return [];
   }
@@ -61289,19 +61644,20 @@ function readRestorableConfig(backupDir, dataDirKey, instanceId) {
     if (manifest.instanceId !== instanceId) return null;
     const parsed = JSON.parse(readFileSync11(join11(backupDir, "mixdog-config.json"), "utf8"));
     return isStructurallyCompleteMixdogConfigBackup(parsed) ? parsed : null;
-  } catch {
-    return null;
+  } catch (error) {
+    if (isAbsentBackupError(error)) return null;
+    throw error;
   }
 }
 function findRestorableConfig(dataDir2, instanceId) {
   const key = normalizeDataDir(dataDir2);
   const scopeDir = scopeDirFor(dataDir2);
-  for (const name of backupDirsNewestFirst(scopeDir)) {
+  for (const name of listBackupDirsNewestFirst(scopeDir)) {
     const parsed = readRestorableConfig(join11(scopeDir, name), key, instanceId);
     if (parsed) return parsed;
   }
   const root = getBackupRoot();
-  for (const name of backupDirsNewestFirst(root)) {
+  for (const name of listBackupDirsNewestFirst(root)) {
     if (name.startsWith(SCOPE_PREFIX)) continue;
     const parsed = readRestorableConfig(join11(root, name), key, instanceId);
     if (parsed) return parsed;
@@ -61315,7 +61671,8 @@ function loadLatestMixdogConfigFromBackup(dataDir2, options) {
   const key = normalizeDataDir(dataDir2);
   const root = getBackupRoot();
   let hit = restoreLookupCache.get(key);
-  if (!hit || hit.root !== root || hit.instanceId !== instanceId) {
+  if (options?.fresh || !hit || hit.root !== root || hit.instanceId !== instanceId) {
+    restoreLookupCache.delete(key);
     hit = { root, instanceId, config: findRestorableConfig(dataDir2, instanceId) };
     restoreLookupCache.set(key, hit);
   }
@@ -61345,8 +61702,8 @@ function copyTree(src, dst, copied) {
   copyFileSync(src, dst);
   copied.push(dst);
 }
-function pruneBackups(scopeDir, keep = 40) {
-  for (const name of backupDirsNewestFirst(scopeDir).slice(keep)) {
+function pruneBackups(scopeDir, names, own) {
+  for (const name of backupsToPrune(names, own)) {
     try {
       rmSync(join11(scopeDir, name), { recursive: true, force: true });
     } catch {
@@ -61360,7 +61717,7 @@ function markUserDataInitialized(dataDir2) {
     writeFileSync4(
       join11(dataDir2, INIT_MARKER),
       `${JSON.stringify(
-        { instanceId: randomUUID(), dataDir: resolve5(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
+        { instanceId: randomUUID(), dataDir: resolve7(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
         null,
         2
       )}
@@ -61383,16 +61740,12 @@ function ensureUserDataInitialized(dataDir2) {
 function skipBackups() {
   return process.env.MIXDOG_SKIP_USER_DATA_BACKUP === "1" || process.env.MIXDOG_SKIP_USER_DATA_BACKUP === "true";
 }
-function backupTarget(dataDir2, reason) {
-  const scopeDir = scopeDirFor(dataDir2);
-  return { scopeDir, backupDir: join11(scopeDir, `${stamp()}-${safeReason(reason)}`) };
-}
 function finishBackup(dataDir2, backupDir, reason) {
   const instanceId = markUserDataInitialized(dataDir2);
   writeFileSync4(
     join11(backupDir, BACKUP_MANIFEST),
     `${JSON.stringify(
-      { dataDir: resolve5(dataDir2), instanceId, reason, createdAt: (/* @__PURE__ */ new Date()).toISOString() },
+      { dataDir: resolve7(dataDir2), instanceId, reason, createdAt: (/* @__PURE__ */ new Date()).toISOString() },
       null,
       2
     )}
@@ -61405,7 +61758,8 @@ function finishBackup(dataDir2, backupDir, reason) {
 function backupUserData(dataDir2, reason = "snapshot") {
   if (skipBackups()) return { dir: null, copied: [] };
   if (!dataDir2 || !existsSync10(dataDir2)) return { dir: null, copied: [] };
-  const { scopeDir, backupDir } = backupTarget(dataDir2, reason);
+  const scopeDir = scopeDirFor(dataDir2);
+  const { backupDir, names } = reserveBackupDir(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61417,11 +61771,13 @@ function backupUserData(dataDir2, reason = "snapshot") {
   }
   if (copied.length > 0) {
     finishBackup(dataDir2, backupDir, reason);
-    pruneBackups(scopeDir);
+    pruneBackups(scopeDir, names, basename5(backupDir));
     if (process.env.MIXDOG_SETUP_QUIET !== "1") {
       process.stderr.write(`[user-data-backup] ${reason}: copied ${copied.length} file(s) to ${backupDir}
 `);
     }
+  } else {
+    rmSync(backupDir, { recursive: true, force: true });
   }
   return { dir: copied.length > 0 ? backupDir : null, copied };
 }
@@ -61438,14 +61794,8 @@ async function copyTreeAsync(src, dst, copied) {
   await copyFileP(src, dst);
   copied.push(dst);
 }
-async function pruneBackupsAsync(scopeDir, keep = 40) {
-  let entries = [];
-  try {
-    entries = (await readdirP(scopeDir, { withFileTypes: true })).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort().reverse();
-  } catch {
-    return;
-  }
-  for (const name of entries.slice(keep)) {
+async function pruneBackupsAsync(scopeDir, names, own) {
+  for (const name of backupsToPrune(names, own)) {
     try {
       await rmP(join11(scopeDir, name), { recursive: true, force: true });
     } catch {
@@ -61455,7 +61805,8 @@ async function pruneBackupsAsync(scopeDir, keep = 40) {
 async function backupUserDataAsync(dataDir2, reason = "snapshot") {
   if (skipBackups()) return { dir: null, copied: [] };
   if (!dataDir2 || !existsSync10(dataDir2)) return { dir: null, copied: [] };
-  const { scopeDir, backupDir } = backupTarget(dataDir2, reason);
+  const scopeDir = scopeDirFor(dataDir2);
+  const { backupDir, names } = await reserveBackupDirAsync(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61467,11 +61818,13 @@ async function backupUserDataAsync(dataDir2, reason = "snapshot") {
   }
   if (copied.length > 0) {
     finishBackup(dataDir2, backupDir, reason);
-    await pruneBackupsAsync(scopeDir);
+    await pruneBackupsAsync(scopeDir, names, basename5(backupDir));
     if (process.env.MIXDOG_SETUP_QUIET !== "1") {
       process.stderr.write(`[user-data-backup] ${reason}: copied ${copied.length} file(s) to ${backupDir}
 `);
     }
+  } else {
+    rmSync(backupDir, { recursive: true, force: true });
   }
   return { dir: copied.length > 0 ? backupDir : null, copied };
 }
@@ -61486,7 +61839,6 @@ var AGENT_PROVIDER_ENV = Object.freeze({
   gemini: "GEMINI_API_KEY",
   deepseek: "DEEPSEEK_API_KEY",
   xai: "XAI_API_KEY",
-  "opencode-go": "OPENCODE_API_KEY",
   openrouter: "OPENROUTER_API_KEY"
 });
 var AGENT_PROVIDER_ENV_ALIASES = Object.freeze({
@@ -61688,7 +62040,13 @@ function readAll() {
     return canonicalizeUnifiedConfig(parsed);
   }
   if (isUserDataRecoveryExpected(resolvePluginData())) {
-    const restored = loadLatestMixdogConfigFromBackup(resolvePluginData());
+    let restored = null;
+    try {
+      restored = loadLatestMixdogConfigFromBackup(resolvePluginData());
+    } catch (err) {
+      process.stderr.write(`[config] backup restore lookup failed: ${err.message}
+`);
+    }
     if (restored && isPlainObject(restored)) {
       const config = canonicalizeUnifiedConfig(restored);
       persistRestoredConfig(config);
@@ -61828,8 +62186,7 @@ function updateSectionAsync(section, updater) {
 }
 var SECRET_ACCOUNTS = Object.freeze({
   agentApiKey: (provider) => `agent.${provider}.apiKey`,
-  openaiUsageSessionKey: "agent.openai.usageSessionKey",
-  opencodeGoConsoleKey: "agent.opencode-go.consoleKey"
+  openaiUsageSessionKey: "agent.openai.usageSessionKey"
 });
 
 // src/runtime/channels/lib/voice-setup.mjs
@@ -63282,8 +63639,8 @@ function usePromptQueueHistory({
       let timer2 = null;
       Promise.race([
         Promise.resolve(store.dispose?.("cli-react-exit", { detach: true })),
-        new Promise((resolve6) => {
-          timer2 = setTimeout(resolve6, 350);
+        new Promise((resolve8) => {
+          timer2 = setTimeout(resolve8, 350);
         })
       ]).finally(() => {
         if (timer2) clearTimeout(timer2);
@@ -63488,14 +63845,15 @@ function useTerminalChrome({ stdout: stdout2, isRawModeSupported, setResizeState
 import { useCallback as useCallback21, useEffect as useEffect27, useLayoutEffect as useLayoutEffect8 } from "react";
 
 // src/tui/session/transcript-spill.mjs
+import { randomBytes as randomBytes4 } from "node:crypto";
 import { readFileSync as readFileSync16 } from "node:fs";
 import { join as join16 } from "node:path";
-import { Worker } from "node:worker_threads";
+import { Worker as Worker2 } from "node:worker_threads";
 
 // src/tui/session/transcript-spill/spill-dir.mjs
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { mkdtempSync, readdirSync as readdirSync5, readFileSync as readFileSync15, rmSync as rmSync5, statSync as statSync6, writeFileSync as writeFileSync6 } from "node:fs";
-import { tmpdir as tmpdir2 } from "node:os";
+import { tmpdir as tmpdir3 } from "node:os";
 import { join as join15 } from "node:path";
 var STALE_MS = 24 * 60 * 60 * 1e3;
 var PROCESS_NONCE = randomUUID2();
@@ -63505,6 +63863,7 @@ import { randomUUID as randomUUID3 } from "node:crypto";
 
 // src/tui/session/transcript-spill.mjs
 var TUI_DEBUG = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_TUI_DEBUG || ""));
+var ID_PREFIX = `it_${randomBytes4(4).toString("hex")}_`;
 
 // src/tui/app/transcript-measure.mjs
 var HARVEST_BUMP_STREAK_LIMIT = 10;
@@ -65870,8 +66229,8 @@ function waitWithTimeout(promise, ms) {
   let timer2 = null;
   return Promise.race([
     Promise.resolve(promise).then(() => true),
-    new Promise((resolve6) => {
-      timer2 = setTimeout(() => resolve6(false), ms);
+    new Promise((resolve8) => {
+      timer2 = setTimeout(() => resolve8(false), ms);
     })
   ]).finally(() => {
     if (timer2) clearTimeout(timer2);
@@ -65890,7 +66249,7 @@ function scheduleHardExit(code = 0) {
   timer2.unref?.();
 }
 function resolveTuiStderrLogPath() {
-  return process.env.MIXDOG_TUI_STDERR_LOG || join17(process.env.MIXDOG_RUNTIME_ROOT || join17(tmpdir3(), "mixdog"), "mixdog-tui.stderr.log");
+  return process.env.MIXDOG_TUI_STDERR_LOG || join17(process.env.MIXDOG_RUNTIME_ROOT || join17(tmpdir4(), "mixdog"), "mixdog-tui.stderr.log");
 }
 function ansiFg(rgb2) {
   const m = /rgb\((\d+),\s*(\d+),\s*(\d+)\)/.exec(String(rgb2 || ""));