mixdog 1.2.4 → 1.2.6

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(resolve7) {
+              entangledListeners.push(resolve7);
             }
           };
         }
@@ -1849,8 +1849,8 @@ var require_react_reconciler_production = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve6) {
-            listeners.push(resolve6);
+          then: function(resolve7) {
+            listeners.push(resolve7);
           }
         };
         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(resolve7) {
+              entangledListeners.push(resolve7);
             }
           };
         }
@@ -11473,8 +11473,8 @@ var require_react_reconciler_development = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve6) {
-            listeners.push(resolve6);
+          then: function(resolve7) {
+            listeners.push(resolve7);
           }
         };
         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((resolve7) => setTimeout(resolve7, 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");
@@ -23765,8 +23978,8 @@ function _drainAdaptiveFileIo() {
   }
 }
 function _runAdaptiveFileIo(run) {
-  return new Promise((resolve6, reject) => {
-    _ioQueue.push({ run, resolve: resolve6, reject });
+  return new Promise((resolve7, reject) => {
+    _ioQueue.push({ run, resolve: resolve7, reject });
     _drainAdaptiveFileIo();
   });
 }
@@ -23777,21 +23990,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);
@@ -24160,7 +24374,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 +25095,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 +34090,8 @@ var App_default = App;
 var noop = () => {
 };
 var textEncoder = new TextEncoder();
-var yieldImmediate = async () => new Promise((resolve6) => {
-  setImmediate(resolve6);
+var yieldImmediate = async () => new Promise((resolve7) => {
+  setImmediate(resolve7);
 });
 var kittyQueryEscapeByte = 27;
 var kittyQueryOpenBracketByte = 91;
@@ -34132,8 +34346,8 @@ var Ink = class {
       };
     }
     this.initKittyKeyboard();
-    this.exitPromise = new Promise((resolve6, reject) => {
-      this.resolveExitPromise = resolve6;
+    this.exitPromise = new Promise((resolve7, reject) => {
+      this.resolveExitPromise = resolve7;
       this.rejectExitPromise = reject;
     });
     void this.exitPromise.catch(noop);
@@ -34573,9 +34787,9 @@ var Ink = class {
     settleThrottle(this.throttledOnRender, canWriteToStdout);
     settleThrottle(this.throttledLog, canWriteToStdout);
     if (canWriteToStdout && hasWritableState) {
-      await new Promise((resolve6) => {
+      await new Promise((resolve7) => {
         this.options.stdout.write("", () => {
-          resolve6();
+          resolve7();
         });
       });
       return;
@@ -34661,8 +34875,8 @@ var Ink = class {
   async awaitNextRender() {
     if (!this.nextRenderCommit) {
       let resolveRender;
-      const promise = new Promise((resolve6) => {
-        resolveRender = resolve6;
+      const promise = new Promise((resolve7) => {
+        resolveRender = resolve7;
       });
       this.nextRenderCommit = { promise, resolve: resolveRender };
     }
@@ -35133,12 +35347,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((resolve7) => {
     let child;
     try {
       child = spawn(cmd, args, { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     } catch (error) {
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve7({ ok: false, code: -1, stdout: "", error });
       return;
     }
     let stdout2 = "";
@@ -35150,7 +35364,7 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
         child.kill();
       } catch {
       }
-      resolve6({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
+      resolve7({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
     }, timeoutMs);
     timer2.unref?.();
     child.stdout.on("data", (chunk) => {
@@ -35160,13 +35374,13 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve7({ ok: false, code: -1, stdout: "", error });
     });
     child.on("close", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve6({ ok: code === 0, code, stdout: stdout2 });
+      resolve7({ ok: code === 0, code, stdout: stdout2 });
     });
   });
 }
@@ -35174,10 +35388,10 @@ function spawnFailed(result) {
   return !!result && result.code === -1;
 }
 function commandExists(cmd) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     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", () => resolve7(false));
+    probe.on("close", (code) => resolve7(code === 0));
   });
 }
 function psSingleQuoted(value) {
@@ -38488,19 +38702,34 @@ var HEALABLE_MARKDOWN_SYNTAX = /[`*_~[]/;
 function openFence(text) {
   let marker = "";
   let length = 0;
+  let start = 0;
+  let lineStart2 = 0;
   for (const rawLine of String(text ?? "").split("\n")) {
     const fence = FENCE_LINE.exec(rawLine.replace(/\r$/, ""));
-    if (!fence) continue;
-    const marks = fence[1];
-    if (!marker) {
-      marker = marks[0];
-      length = marks.length;
-    } else if (marks[0] === marker && marks.length >= length && !fence[2].trim()) {
-      marker = "";
-      length = 0;
+    if (fence) {
+      const marks = fence[1];
+      if (!marker) {
+        marker = marks[0];
+        length = marks.length;
+        start = lineStart2;
+      } else if (marks[0] === marker && marks.length >= length && !fence[2].trim()) {
+        marker = "";
+        length = 0;
+      }
     }
+    lineStart2 += rawLine.length + 1;
   }
-  return marker ? { marker, length } : null;
+  return marker ? { marker, length, start } : null;
+}
+function trimPartialOpeningFence(text, fence) {
+  const lineEnd2 = text.indexOf("\n", fence.start);
+  return lineEnd2 >= 0 && /\S/.test(text.slice(lineEnd2 + 1)) ? text : text.slice(0, fence.start);
+}
+var PENDING_BLOCK_MARKER_LINE = /(?:^|\n)[ \t]*(?:[-+*=_#>~`]+|\d{1,9}[.)]?)[ \t]*$/;
+function trimPendingBlockMarker(text) {
+  const pending = PENDING_BLOCK_MARKER_LINE.exec(text);
+  if (!pending) return text;
+  return text.slice(0, pending.index + (pending[0].startsWith("\n") ? 1 : 0));
 }
 function trimPartialClosingFence(text, fence) {
   const partial = /(?:^|\r?\n) {0,3}([`~]+)$/.exec(text);
@@ -38531,7 +38760,7 @@ function closeInlineCode(text, isPendingLocalPath) {
     } else if (run === open) open = 0;
     index = end;
   }
-  if (open && isPendingLocalPath?.(text.slice(openIndex + open))) {
+  if (open && (!text.slice(openIndex + open) || isPendingLocalPath?.(text.slice(openIndex + open)))) {
     return text.slice(0, openIndex);
   }
   return open > 0 ? `${text}${"`".repeat(open)}` : text;
@@ -38561,6 +38790,7 @@ function scanEmphasisRuns(masked) {
     let end = index + 1;
     while (masked[end] === marker) end += 1;
     const length = end - index;
+    const at = index;
     const before = index > 0 ? masked[index - 1] : "";
     const after = end < masked.length ? masked[end] : "";
     const beforeSpace = isMarkdownSpace(before);
@@ -38570,16 +38800,25 @@ function scanEmphasisRuns(masked) {
     const left = !afterSpace && (!afterPunctuation || beforeSpace || beforePunctuation);
     const right = !beforeSpace && (!beforePunctuation || afterSpace || afterPunctuation);
     if (marker === "~") {
-      if (length >= 2) runs.push({ marker, length: 2, canOpen: left, canClose: right });
+      runs.push({
+        marker,
+        length: Math.min(length, 2),
+        canOpen: left && length >= 2,
+        canClose: right && length >= 2,
+        at,
+        end
+      });
     } else if (marker === "_") {
       runs.push({
         marker,
         length,
         canOpen: left && (!right || beforePunctuation),
-        canClose: right && (!left || afterPunctuation)
+        canClose: right && (!left || afterPunctuation),
+        at,
+        end
       });
     } else {
-      runs.push({ marker, length, canOpen: left, canClose: right });
+      runs.push({ marker, length, canOpen: left, canClose: right, at, end });
     }
     index = end;
   }
@@ -38587,7 +38826,9 @@ function scanEmphasisRuns(masked) {
 }
 function closeEmphasis(text) {
   const open = [];
-  for (const run of scanEmphasisRuns(maskCode(text))) {
+  const runs = scanEmphasisRuns(maskCode(text));
+  const last = runs[runs.length - 1];
+  for (const run of runs) {
     let length = run.length;
     while (run.canClose && length > 0) {
       let match = -1;
@@ -38604,13 +38845,17 @@ function closeEmphasis(text) {
       length -= used;
       open.length = opener.length > 0 ? match + 1 : match;
     }
+    if (run === last && run.end === text.length && length === run.length) {
+      return closeEmphasis(text.slice(0, run.at));
+    }
     if (length > 0 && run.canOpen) open.push({ marker: run.marker, length });
   }
-  let healed = text;
+  const body = text.trimEnd();
+  let closers = "";
   for (let index = open.length - 1; index >= 0; index -= 1) {
-    healed += open[index].marker.repeat(Math.min(open[index].length, 3));
+    closers += open[index].marker.repeat(Math.min(open[index].length, 3));
   }
-  return healed;
+  return closers ? `${body}${closers}${text.slice(body.length)}` : text;
 }
 function linkDestinationEnd(text, start) {
   let depth = 1;
@@ -38683,19 +38928,29 @@ 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 ?? "");
   const fence = source.includes("`") || source.includes("~") ? openFence(source) : null;
-  if (fence) return trimPartialClosingFence(source, fence);
-  const value = source.includes("|") ? trimPendingTableHead(source) : source;
+  if (fence) return trimPartialOpeningFence(trimPartialClosingFence(source, fence), fence);
+  const unmarked = trimPendingBlockMarker(source);
+  const value = unmarked.includes("|") ? trimPendingTableHead(unmarked) : unmarked;
   const hasSyntax = HEALABLE_MARKDOWN_SYNTAX.test(value);
   if (!value || !hasSyntax && !isPendingLocalPath) return value;
   const healed = hasSyntax ? closeEmphasis(healIncompleteLink(closeInlineCode(value, isPendingLocalPath), isPendingLocalPath)) : value;
@@ -45942,8 +46197,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((resolve7) => setImmediate(resolve7));
+  return new Promise((resolve7) => {
     const minSeq = renderAckSeq;
     let remainingFrames = Math.max(1, Math.floor(Number(frames) || 1));
     let settled = false;
@@ -45958,7 +46213,7 @@ var yieldToRenderer = ({ frames = 1 } = {}) => {
       releaseClosedListener();
       const idx = pendingRenderAcks.indexOf(onFrame);
       if (idx !== -1) pendingRenderAcks.splice(idx, 1);
-      resolve6();
+      resolve7();
     };
     releaseClosedListener = onRenderFrameSourcesClosed(finish);
     const onTimeout = () => {
@@ -46758,13 +47013,13 @@ function nativeClipboardCommand(text) {
 function copyToClipboard(text) {
   const value = String(text ?? "");
   const wroteOsc52 = writeOsc52Clipboard(value);
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, 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) resolve7();
       else reject(clipboardHelperError(cmd, e));
       return;
     }
@@ -46773,7 +47028,7 @@ function copyToClipboard(text) {
     });
     if (!wroteOsc52) {
       child.on("close", (code) => {
-        if (code === 0) resolve6();
+        if (code === 0) resolve7();
         else reject(new Error(`${cmd} exited with code ${code}`));
       });
     }
@@ -46782,7 +47037,7 @@ function copyToClipboard(text) {
     child.stdin.end(input);
     if (wroteOsc52) {
       child.unref?.();
-      resolve6();
+      resolve7();
     }
   });
 }
@@ -47086,7 +47341,7 @@ function mimeForPath(path2) {
   return IMAGE_MIME[extname(String(path2 || "")).toLowerCase()] || null;
 }
 function execFileBuffer(cmd, args, options = {}) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     execFile(
       cmd,
       args,
@@ -47098,7 +47353,7 @@ function execFileBuffer(cmd, args, options = {}) {
         ...options
       },
       (error, stdout2, stderr) => {
-        resolve6({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
+        resolve7({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
       }
     );
   });
@@ -48494,7 +48749,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((resolve7) => resolve7(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;
@@ -49708,11 +49963,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;
@@ -50698,7 +50953,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({
@@ -51058,11 +51323,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 resolve5 } 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 isAbsolute2, join as join9, relative, resolve as resolve4, sep } from "node:path";
 
 // src/runtime/shared/statusline/statusline-segments.mjs
 var DEFAULT_MIXDOG_HOME = process.env.MIXDOG_HOME || join10(homedir2(), ".mixdog");
@@ -55607,7 +55872,7 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
       toolApproval.id
     );
   }
-  const resolve6 = (approved) => {
+  const resolve7 = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
       approved,
       reason: approved ? "approved by user" : "denied by user"
@@ -55632,12 +55897,12 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
           description: "run this tool call"
         }
       ],
-      onSelect: (value) => resolve6(value === "approve"),
-      onCancel: () => resolve6(false),
+      onSelect: (value) => resolve7(value === "approve"),
+      onCancel: () => resolve7(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") resolve7(true);
+        else if (value === "d" || value === "n") resolve7(false);
       },
       title: "Tool approval",
       description: toolApprovalDescription(toolApproval),
@@ -59017,7 +59282,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"]
@@ -59044,6 +59309,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,
@@ -59054,7 +59346,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,
@@ -59519,7 +59811,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";
@@ -59577,7 +59869,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);
     });
@@ -59981,7 +60273,7 @@ function createProviderSetupPicker({
       }
     });
     try {
-      await new Promise((resolve6) => setTimeout(resolve6, 0));
+      await new Promise((resolve7) => setTimeout(resolve7, 0));
       return await store.getProviderSetup(options.forceRefresh ? { force: true } : void 0);
     } catch (e) {
       store.pushNotice(`providers failed: ${e?.message || e}`, "error");
@@ -60103,7 +60395,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((resolve7) => setTimeout(resolve7, 0));
       try {
         if (options.refreshModels !== true && options.cacheRef !== "webSearch") {
           refreshModelsPromise = Promise.resolve(loadModels({ force: false }));
@@ -60610,6 +60902,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,
@@ -60647,7 +60940,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,
@@ -60664,6 +60960,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,
@@ -61137,7 +61437,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 resolve6 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 import { createHash as createHash4, randomUUID } from "node:crypto";
 function getBackupRoot() {
@@ -61149,15 +61449,28 @@ 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 = resolve6(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;
+function reserveBackupDir(scopeDir, reason) {
+  mkdirSync4(scopeDir, { recursive: true });
+  for (; ; ) {
+    lastBackupMs = Math.max(Date.now(), lastBackupMs);
+    const time = new Date(lastBackupMs).toISOString().replace(/[:.]/g, "-");
+    const backupDir = join11(scopeDir, `${time}-${String(backupSeq++).padStart(10, "0")}-${safeReason(reason)}`);
+    try {
+      mkdirSync4(backupDir);
+      return backupDir;
+    } catch (error) {
+      if (error?.code !== "EEXIST") throw error;
+    }
+  }
 }
 function safeReason(reason) {
   return String(reason || "snapshot").replace(/[^a-z0-9_.-]+/gi, "-").slice(0, 48) || "snapshot";
@@ -61189,7 +61502,7 @@ function manifestDataDirMatches(backupDir, dataDirKey) {
 }
 function legacyMarkersFor(root, dataDir2, dataDirKey) {
   const hashed = new Set(
-    [String(dataDir2), resolve5(String(dataDir2))].map(
+    [String(dataDir2), resolve6(String(dataDir2))].map(
       (value) => `.initialized-${createHash4("sha256").update(value).digest("hex").slice(0, 16)}.json`
     )
   );
@@ -61328,7 +61641,7 @@ function markUserDataInitialized(dataDir2) {
     writeFileSync4(
       join11(dataDir2, INIT_MARKER),
       `${JSON.stringify(
-        { instanceId: randomUUID(), dataDir: resolve5(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
+        { instanceId: randomUUID(), dataDir: resolve6(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
         null,
         2
       )}
@@ -61351,16 +61664,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: resolve6(dataDir2), instanceId, reason, createdAt: (/* @__PURE__ */ new Date()).toISOString() },
       null,
       2
     )}
@@ -61373,7 +61682,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 = reserveBackupDir(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61390,6 +61700,8 @@ function backupUserData(dataDir2, reason = "snapshot") {
       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 };
 }
@@ -61423,7 +61735,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 = reserveBackupDir(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61440,6 +61753,8 @@ async function backupUserDataAsync(dataDir2, reason = "snapshot") {
       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 };
 }
@@ -61454,7 +61769,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({
@@ -61796,8 +62110,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
@@ -63250,8 +63563,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((resolve7) => {
+          timer2 = setTimeout(resolve7, 350);
         })
       ]).finally(() => {
         if (timer2) clearTimeout(timer2);
@@ -63458,7 +63771,7 @@ import { useCallback as useCallback21, useEffect as useEffect27, useLayoutEffect
 // src/tui/session/transcript-spill.mjs
 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";
@@ -65838,8 +66151,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((resolve7) => {
+      timer2 = setTimeout(() => resolve7(false), ms);
     })
   ]).finally(() => {
     if (timer2) clearTimeout(timer2);