mixdog 1.2.6 → 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(resolve7) {
-              entangledListeners.push(resolve7);
+            then: function(resolve8) {
+              entangledListeners.push(resolve8);
             }
           };
         }
@@ -1849,8 +1849,8 @@ var require_react_reconciler_production = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve7) {
-            listeners.push(resolve7);
+          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(resolve7) {
-              entangledListeners.push(resolve7);
+            then: function(resolve8) {
+              entangledListeners.push(resolve8);
             }
           };
         }
@@ -11473,8 +11473,8 @@ var require_react_reconciler_development = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve7) {
-            listeners.push(resolve7);
+          then: function(resolve8) {
+            listeners.push(resolve8);
           }
         };
         thenable.then(
@@ -23486,7 +23486,7 @@ var init_keyed_serial_queue = __esm({
 
 // src/runtime/shared/sleep.mjs
 function sleep(ms) {
-  return new Promise((resolve7) => setTimeout(resolve7, ms));
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
 }
 function sleepSync(ms) {
   const buffer = new SharedArrayBuffer(4);
@@ -23951,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) {
@@ -23978,8 +23979,8 @@ function _drainAdaptiveFileIo() {
   }
 }
 function _runAdaptiveFileIo(run) {
-  return new Promise((resolve7, reject) => {
-    _ioQueue.push({ run, resolve: resolve7, reject });
+  return new Promise((resolve8, reject) => {
+    _ioQueue.push({ run, resolve: resolve8, reject });
     _drainAdaptiveFileIo();
   });
 }
@@ -24051,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 });
@@ -24116,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 });
@@ -34090,8 +34099,8 @@ var App_default = App;
 var noop = () => {
 };
 var textEncoder = new TextEncoder();
-var yieldImmediate = async () => new Promise((resolve7) => {
-  setImmediate(resolve7);
+var yieldImmediate = async () => new Promise((resolve8) => {
+  setImmediate(resolve8);
 });
 var kittyQueryEscapeByte = 27;
 var kittyQueryOpenBracketByte = 91;
@@ -34346,8 +34355,8 @@ var Ink = class {
       };
     }
     this.initKittyKeyboard();
-    this.exitPromise = new Promise((resolve7, reject) => {
-      this.resolveExitPromise = resolve7;
+    this.exitPromise = new Promise((resolve8, reject) => {
+      this.resolveExitPromise = resolve8;
       this.rejectExitPromise = reject;
     });
     void this.exitPromise.catch(noop);
@@ -34787,9 +34796,9 @@ var Ink = class {
     settleThrottle(this.throttledOnRender, canWriteToStdout);
     settleThrottle(this.throttledLog, canWriteToStdout);
     if (canWriteToStdout && hasWritableState) {
-      await new Promise((resolve7) => {
+      await new Promise((resolve8) => {
         this.options.stdout.write("", () => {
-          resolve7();
+          resolve8();
         });
       });
       return;
@@ -34875,8 +34884,8 @@ var Ink = class {
   async awaitNextRender() {
     if (!this.nextRenderCommit) {
       let resolveRender;
-      const promise = new Promise((resolve7) => {
-        resolveRender = resolve7;
+      const promise = new Promise((resolve8) => {
+        resolveRender = resolve8;
       });
       this.nextRenderCommit = { promise, resolve: resolveRender };
     }
@@ -35328,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";
@@ -35347,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((resolve7) => {
+  return new Promise((resolve8) => {
     let child;
     try {
       child = spawn(cmd, args, { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     } catch (error) {
-      resolve7({ ok: false, code: -1, stdout: "", error });
+      resolve8({ ok: false, code: -1, stdout: "", error });
       return;
     }
     let stdout2 = "";
@@ -35364,7 +35373,7 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
         child.kill();
       } catch {
       }
-      resolve7({ 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) => {
@@ -35374,13 +35383,13 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve7({ ok: false, code: -1, stdout: "", error });
+      resolve8({ ok: false, code: -1, stdout: "", error });
     });
     child.on("close", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer2);
-      resolve7({ ok: code === 0, code, stdout: stdout2 });
+      resolve8({ ok: code === 0, code, stdout: stdout2 });
     });
   });
 }
@@ -35388,10 +35397,10 @@ function spawnFailed(result) {
   return !!result && result.code === -1;
 }
 function commandExists(cmd) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const probe = process.platform === "win32" ? spawn("where", [cmd], { stdio: "ignore", windowsHide: true }) : spawn("which", [cmd], { stdio: "ignore" });
-    probe.on("error", () => resolve7(false));
-    probe.on("close", (code) => resolve7(code === 0));
+    probe.on("error", () => resolve8(false));
+    probe.on("close", (code) => resolve8(code === 0));
   });
 }
 function psSingleQuoted(value) {
@@ -46197,8 +46206,8 @@ var notifyRenderFrame = (seq) => {
   for (const ack of acks) ack(seq);
 };
 var yieldToRenderer = ({ frames = 1 } = {}) => {
-  if (!hasRenderFrameSource()) return new Promise((resolve7) => setImmediate(resolve7));
-  return new Promise((resolve7) => {
+  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;
@@ -46213,7 +46222,7 @@ var yieldToRenderer = ({ frames = 1 } = {}) => {
       releaseClosedListener();
       const idx = pendingRenderAcks.indexOf(onFrame);
       if (idx !== -1) pendingRenderAcks.splice(idx, 1);
-      resolve7();
+      resolve8();
     };
     releaseClosedListener = onRenderFrameSourcesClosed(finish);
     const onTimeout = () => {
@@ -47013,13 +47022,13 @@ function nativeClipboardCommand(text) {
 function copyToClipboard(text) {
   const value = String(text ?? "");
   const wroteOsc52 = writeOsc52Clipboard(value);
-  return new Promise((resolve7, 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) resolve7();
+      if (wroteOsc52) resolve8();
       else reject(clipboardHelperError(cmd, e));
       return;
     }
@@ -47028,7 +47037,7 @@ function copyToClipboard(text) {
     });
     if (!wroteOsc52) {
       child.on("close", (code) => {
-        if (code === 0) resolve7();
+        if (code === 0) resolve8();
         else reject(new Error(`${cmd} exited with code ${code}`));
       });
     }
@@ -47037,7 +47046,7 @@ function copyToClipboard(text) {
     child.stdin.end(input);
     if (wroteOsc52) {
       child.unref?.();
-      resolve7();
+      resolve8();
     }
   });
 }
@@ -47341,7 +47350,7 @@ function mimeForPath(path2) {
   return IMAGE_MIME[extname(String(path2 || "")).toLowerCase()] || null;
 }
 function execFileBuffer(cmd, args, options = {}) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     execFile(
       cmd,
       args,
@@ -47353,7 +47362,7 @@ function execFileBuffer(cmd, args, options = {}) {
         ...options
       },
       (error, stdout2, stderr) => {
-        resolve7({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
+        resolve8({ ok: !error, code: error?.code ?? 0, stdout: stdout2, stderr, error });
       }
     );
   });
@@ -48749,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((resolve7) => resolve7(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;
@@ -51323,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 resolve5 } 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 resolve4, 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");
@@ -51415,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++;
@@ -51504,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;
@@ -55872,7 +55888,7 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
       toolApproval.id
     );
   }
-  const resolve7 = (approved) => {
+  const resolve8 = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
       approved,
       reason: approved ? "approved by user" : "denied by user"
@@ -55897,12 +55913,12 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
           description: "run this tool call"
         }
       ],
-      onSelect: (value) => resolve7(value === "approve"),
-      onCancel: () => resolve7(false),
+      onSelect: (value) => resolve8(value === "approve"),
+      onCancel: () => resolve8(false),
       onKey: (input) => {
         const value = String(input || "").trim().toLowerCase();
-        if (value === "a" || value === "y") resolve7(true);
-        else if (value === "d" || value === "n") resolve7(false);
+        if (value === "a" || value === "y") resolve8(true);
+        else if (value === "d" || value === "n") resolve8(false);
       },
       title: "Tool approval",
       description: toolApprovalDescription(toolApproval),
@@ -60273,7 +60289,7 @@ function createProviderSetupPicker({
       }
     });
     try {
-      await new Promise((resolve7) => setTimeout(resolve7, 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");
@@ -60395,7 +60411,7 @@ function createModelCatalog({ store, providerModelsCacheRef, webSearchModelsCach
     let renderedQuickModels = false;
     if (!providerModels.length || options.refreshModels === true) {
       paintLoading();
-      await new Promise((resolve7) => setTimeout(resolve7, 0));
+      await new Promise((resolve8) => setTimeout(resolve8, 0));
       try {
         if (options.refreshModels !== true && options.cacheRef !== "webSearch") {
           refreshModelsPromise = Promise.resolve(loadModels({ force: false }));
@@ -61437,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 resolve6 } 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() {
@@ -61449,7 +61465,7 @@ var BACKUP_MANIFEST = "backup.json";
 var INIT_MARKER = ".mixdog-user-data.json";
 var SCOPE_PREFIX = "scope-";
 function normalizeDataDir(dataDir2) {
-  const full = resolve6(String(dataDir2));
+  const full = resolve7(String(dataDir2));
   return process.platform === "win32" ? full.toLowerCase() : full;
 }
 function scopeDirFor(dataDir2) {
@@ -61458,20 +61474,67 @@ function scopeDirFor(dataDir2) {
 }
 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 (; ; ) {
-    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)}`);
+    const name = nextBackupName(names, reason);
+    names.push(name);
     try {
-      mkdirSync4(backupDir);
-      return backupDir;
+      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";
 }
@@ -61502,7 +61565,7 @@ function manifestDataDirMatches(backupDir, dataDirKey) {
 }
 function legacyMarkersFor(root, dataDir2, dataDirKey) {
   const hashed = new Set(
-    [String(dataDir2), resolve6(String(dataDir2))].map(
+    [String(dataDir2), resolve7(String(dataDir2))].map(
       (value) => `.initialized-${createHash4("sha256").update(value).digest("hex").slice(0, 16)}.json`
     )
   );
@@ -61556,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 [];
   }
@@ -61570,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;
@@ -61596,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);
   }
@@ -61626,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 {
@@ -61641,7 +61717,7 @@ function markUserDataInitialized(dataDir2) {
     writeFileSync4(
       join11(dataDir2, INIT_MARKER),
       `${JSON.stringify(
-        { instanceId: randomUUID(), dataDir: resolve6(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
+        { instanceId: randomUUID(), dataDir: resolve7(dataDir2), createdAt: (/* @__PURE__ */ new Date()).toISOString() },
         null,
         2
       )}
@@ -61669,7 +61745,7 @@ function finishBackup(dataDir2, backupDir, reason) {
   writeFileSync4(
     join11(backupDir, BACKUP_MANIFEST),
     `${JSON.stringify(
-      { dataDir: resolve6(dataDir2), instanceId, reason, createdAt: (/* @__PURE__ */ new Date()).toISOString() },
+      { dataDir: resolve7(dataDir2), instanceId, reason, createdAt: (/* @__PURE__ */ new Date()).toISOString() },
       null,
       2
     )}
@@ -61683,7 +61759,7 @@ function backupUserData(dataDir2, reason = "snapshot") {
   if (skipBackups()) return { dir: null, copied: [] };
   if (!dataDir2 || !existsSync10(dataDir2)) return { dir: null, copied: [] };
   const scopeDir = scopeDirFor(dataDir2);
-  const backupDir = reserveBackupDir(scopeDir, reason);
+  const { backupDir, names } = reserveBackupDir(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61695,7 +61771,7 @@ 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}
 `);
@@ -61718,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 {
@@ -61736,7 +61806,7 @@ async function backupUserDataAsync(dataDir2, reason = "snapshot") {
   if (skipBackups()) return { dir: null, copied: [] };
   if (!dataDir2 || !existsSync10(dataDir2)) return { dir: null, copied: [] };
   const scopeDir = scopeDirFor(dataDir2);
-  const backupDir = reserveBackupDir(scopeDir, reason);
+  const { backupDir, names } = await reserveBackupDirAsync(scopeDir, reason);
   const copied = [];
   for (const rel of USER_DATA_FILES) {
     const src = join11(dataDir2, rel);
@@ -61748,7 +61818,7 @@ 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}
 `);
@@ -61970,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);
@@ -63563,8 +63639,8 @@ function usePromptQueueHistory({
       let timer2 = null;
       Promise.race([
         Promise.resolve(store.dispose?.("cli-react-exit", { detach: true })),
-        new Promise((resolve7) => {
-          timer2 = setTimeout(resolve7, 350);
+        new Promise((resolve8) => {
+          timer2 = setTimeout(resolve8, 350);
         })
       ]).finally(() => {
         if (timer2) clearTimeout(timer2);
@@ -63769,6 +63845,7 @@ 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 as Worker2 } from "node:worker_threads";
@@ -63776,7 +63853,7 @@ 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();
@@ -63786,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;
@@ -66151,8 +66229,8 @@ function waitWithTimeout(promise, ms) {
   let timer2 = null;
   return Promise.race([
     Promise.resolve(promise).then(() => true),
-    new Promise((resolve7) => {
-      timer2 = setTimeout(() => resolve7(false), ms);
+    new Promise((resolve8) => {
+      timer2 = setTimeout(() => resolve8(false), ms);
     })
   ]).finally(() => {
     if (timer2) clearTimeout(timer2);
@@ -66171,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 || ""));

package/src/tui/session/context-state.mjs

@@ -135,7 +135,12 @@ export function createContextState({
     const ctx = runtime.contextStatus?.() || null;
     if (!ctx) return null;
     syncContextDisplayFields(ctx);
-    const stats = { ...getState().stats, ...contextMeasurementStats(ctx) };
+    const stats = {
+      ...getState().stats,
+      ...contextMeasurementStats(ctx),
+      // The persisted session totals behind the composer's usage readout.
+      usageReadout: ctx.usage?.usageReadout ?? null,
+    };
     updateState({ stats });
     return ctx;
   };