mixdog 0.9.13 → 0.9.15

package/src/tui/dist/index.mjs

@@ -3,7 +3,7 @@ import React21 from "react";
 import { render } from "../../../vendor/ink/build/index.js";
 import { closeSync as closeSync2, constants as fsConstants, createWriteStream, mkdirSync as mkdirSync6, openSync as openSync2, readSync } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { dirname as dirname6, join as join8 } from "node:path";
+import { dirname as dirname6, join as join9 } from "node:path";
 import { performance as performance3 } from "node:perf_hooks";
 
 // src/tui/App.jsx
@@ -21886,12 +21886,185 @@ function createAgentJobFeed({
   };
 }
 
+// src/tui/engine/tui-steering-persist.mjs
+import { randomBytes as randomBytes3 } from "crypto";
+import { join as join7 } from "path";
+var PENDING_MESSAGES_FILE = "session-pending-messages.json";
+var PENDING_MESSAGES_MODE = 384;
+function pendingMessagesPath() {
+  return join7(resolvePluginData(), PENDING_MESSAGES_FILE);
+}
+function tuiSteeringSessionKey(leadSessionId) {
+  if (typeof leadSessionId !== "string" || !/^[A-Za-z0-9_-]+$/.test(leadSessionId)) return null;
+  return `tui_${leadSessionId}`;
+}
+function newSteeringPersistId() {
+  return `ts_${Date.now().toString(36)}_${randomBytes3(4).toString("hex")}`;
+}
+function normalizeTuiSteeringQueueEntry(entry) {
+  if (typeof entry === "string") {
+    const text = entry.trim();
+    return text || null;
+  }
+  if (!entry || typeof entry !== "object") return null;
+  if (typeof entry.text === "string" && entry.text.trim()) {
+    const text = entry.text.trim();
+    const id = typeof entry.id === "string" && entry.id.trim() ? entry.id.trim() : null;
+    return id ? { id, text } : text;
+  }
+  return null;
+}
+function normalizePendingStore(raw) {
+  const sessions = raw && typeof raw === "object" && raw.sessions && typeof raw.sessions === "object" ? raw.sessions : {};
+  const storeUpdatedAt = Number(raw?.updatedAt) || Date.now();
+  const touchedRaw = raw && typeof raw === "object" && raw.sessionTouchedAt && typeof raw.sessionTouchedAt === "object" ? raw.sessionTouchedAt : {};
+  const out = { version: 1, updatedAt: storeUpdatedAt, sessions: {}, sessionTouchedAt: {} };
+  for (const [sid, value] of Object.entries(sessions)) {
+    if (!/^[A-Za-z0-9_-]+$/.test(sid) || !Array.isArray(value)) continue;
+    const q = sid.startsWith("tui_") ? value.map(normalizeTuiSteeringQueueEntry).filter(Boolean) : value.map((entry) => {
+      if (typeof entry === "string") return entry;
+      if (entry && typeof entry === "object" && typeof entry.message === "string") return entry.message;
+      return "";
+    }).filter(Boolean);
+    if (q.length > 0) {
+      out.sessions[sid] = q;
+      const touched = Number(touchedRaw[sid]);
+      out.sessionTouchedAt[sid] = Number.isFinite(touched) && touched > 0 ? touched : storeUpdatedAt;
+    }
+  }
+  return out;
+}
+function touchPendingSessionEntry(next, sessionId, now = Date.now()) {
+  if (!next.sessionTouchedAt || typeof next.sessionTouchedAt !== "object") next.sessionTouchedAt = {};
+  next.sessionTouchedAt[sessionId] = now;
+}
+function entryPersistText(entry) {
+  if (!entry) return "";
+  const text = typeof entry.text === "string" && entry.text.trim() ? entry.text.trim() : promptContentText(entry.content ?? entry.text ?? "").trim();
+  return text;
+}
+function rowMatchesEntry(row, entry) {
+  const persistId = entry?.steeringPersistId;
+  if (persistId) {
+    return Boolean(row && typeof row === "object" && row.id === persistId);
+  }
+  const text = entryPersistText(entry);
+  if (!text) return false;
+  return row === text;
+}
+function removePersistRow(q, entry) {
+  const idx = q.findIndex((row) => rowMatchesEntry(row, entry));
+  if (idx >= 0) q.splice(idx, 1);
+}
+function appendTuiSteeringPersist(leadSessionId, entry) {
+  const text = entryPersistText(entry);
+  if (!text) return;
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return;
+  if (!entry.steeringPersistId) entry.steeringPersistId = newSteeringPersistId();
+  const record = { id: entry.steeringPersistId, text };
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key] : [];
+      q.push(record);
+      next.sessions[key] = q;
+      const now = Date.now();
+      next.updatedAt = now;
+      touchPendingSessionEntry(next, key, now);
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try {
+      process.stderr.write(`[tui] steering-queue append failed sessionId=${leadSessionId}: ${err?.message || err}
+`);
+    } catch {
+    }
+  }
+}
+function dropTuiSteeringPersist(leadSessionId, entries) {
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return;
+  const batch = Array.isArray(entries) ? entries : [];
+  if (batch.length === 0) return;
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key].slice() : [];
+      if (q.length === 0) return void 0;
+      for (const entry of batch) {
+        removePersistRow(q, entry);
+      }
+      if (q.length === 0) {
+        delete next.sessions[key];
+        if (next.sessionTouchedAt) delete next.sessionTouchedAt[key];
+      } else {
+        next.sessions[key] = q;
+      }
+      next.updatedAt = Date.now();
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try {
+      process.stderr.write(`[tui] steering-queue drop failed sessionId=${leadSessionId}: ${err?.message || err}
+`);
+    } catch {
+    }
+  }
+}
+function drainedRowToRestore(row) {
+  if (typeof row === "string") {
+    return { text: row, steeringPersistId: null };
+  }
+  if (row && typeof row === "object" && typeof row.text === "string") {
+    return { text: row.text, steeringPersistId: typeof row.id === "string" ? row.id : null };
+  }
+  return null;
+}
+function drainTuiSteeringPersist(leadSessionId) {
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return [];
+  let drained = [];
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key] : [];
+      drained = q.map(drainedRowToRestore).filter(Boolean);
+      if (drained.length === 0) return void 0;
+      delete next.sessions[key];
+      if (next.sessionTouchedAt) delete next.sessionTouchedAt[key];
+      next.updatedAt = Date.now();
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try {
+      process.stderr.write(`[tui] steering-queue drain failed sessionId=${leadSessionId}: ${err?.message || err}
+`);
+    } catch {
+    }
+  }
+  return drained;
+}
+
 // src/tui/engine.mjs
 var SESSION_RUNTIME_MODULE = import.meta.url.replace(/\\/g, "/").includes("/tui/dist/") ? "../../mixdog-session-runtime.mjs" : "../mixdog-session-runtime.mjs";
 var TOOL_APPROVAL_TIMEOUT_MS = (() => {
   const value = Number(process.env.MIXDOG_TOOL_APPROVAL_TIMEOUT_MS);
   return Number.isFinite(value) && value > 0 ? Math.max(1e3, Math.round(value)) : 12e4;
 })();
+var LEAD_TURN_TIMEOUT_MS = (() => {
+  const value = Number(process.env.MIXDOG_LEAD_TURN_TIMEOUT_MS);
+  return Number.isFinite(value) && value > 0 ? Math.max(1e4, Math.round(value)) : 30 * 6e4;
+})();
+var TUI_DEBUG = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_TUI_DEBUG || ""));
+var tuiDebug = (msg) => {
+  if (!TUI_DEBUG) return;
+  try {
+    process.stderr.write(`[tui] ${msg}
+`);
+  } catch {
+  }
+};
 var _idSeq = 0;
 var nextId = () => `it_${++_idSeq}`;
 async function createEngineSession({
@@ -22327,6 +22500,7 @@ async function createEngineSession({
   async function runTurn(userText, options = {}) {
     const turnIndex = state.stats.turns || 0;
     const startedAt2 = Date.now();
+    const turnEpoch = ++leadTurnEpoch;
     const inputBaseline = state.stats.inputTokens;
     const outputBaseline = state.stats.outputTokens;
     const submittedIds = Array.isArray(options.submittedIds) ? options.submittedIds : [];
@@ -22346,6 +22520,44 @@ async function createEngineSession({
     set({ busy: true, lastTurn: null, spinner: { active: true, verb: pickVerb(turnIndex), startedAt: startedAt2, responseLength: 0, inputTokens: 0, outputTokens: 0, mode: "requesting" } });
     let assistantText = "";
     let currentAssistantId = null;
+    tuiDebug(`runTurn start turn=${turnIndex} pending=${pending.length} timeoutMs=${LEAD_TURN_TIMEOUT_MS}`);
+    let watchdogTripped = false;
+    let watchdogTimer = null;
+    let watchdogGraceTimer = null;
+    const clearWatchdog = () => {
+      if (watchdogTimer) {
+        clearTimeout(watchdogTimer);
+        watchdogTimer = null;
+      }
+      if (watchdogGraceTimer) {
+        clearTimeout(watchdogGraceTimer);
+        watchdogGraceTimer = null;
+      }
+    };
+    watchdogTimer = setTimeout(() => {
+      if (disposed) return;
+      watchdogTripped = true;
+      const elapsed = Date.now() - startedAt2;
+      tuiDebug(`runTurn WATCHDOG TRIP turn=${turnIndex} elapsedMs=${elapsed} \u2014 aborting stuck turn`);
+      pushNotice(`Turn timed out after ${Math.round(elapsed / 1e3)}s \u2014 aborting stuck request. Input is available again.`, "warn", { transcript: true });
+      try {
+        runtime.abort("cli-react-abort-watchdog");
+      } catch {
+      }
+      watchdogGraceTimer = setTimeout(() => {
+        if (disposed) return;
+        if (!state.busy) return;
+        if (leadTurnEpoch !== turnEpoch) return;
+        tuiDebug(`runTurn WATCHDOG FORCE-RELEASE turn=${turnIndex} \u2014 abort unwind starved`);
+        leadTurnEpoch++;
+        set({ busy: false, spinner: null, thinking: null, lastTurn: null });
+        activePromptRestore = null;
+        if (draining) draining = false;
+        if (pending.length > 0) void drain();
+      }, 5e3);
+      watchdogGraceTimer.unref?.();
+    }, LEAD_TURN_TIMEOUT_MS);
+    watchdogTimer.unref?.();
     let currentAssistantText = "";
     let thinkingText = "";
     let thinkingStartedAt = 0;
@@ -22948,6 +23160,8 @@ async function createEngineSession({
       }
     } finally {
       denyAllToolApprovals(cancelled ? "turn cancelled" : "turn finished");
+      clearWatchdog();
+      const isStaleUnwind = leadTurnEpoch !== turnEpoch;
       if (deferredEntries.length) {
         const last = deferredEntries[deferredEntries.length - 1];
         if (last) flushDeferredUpTo(last);
@@ -22956,7 +23170,7 @@ async function createEngineSession({
       flushDeferredBeforeImmediatePush = null;
       const producedTranscriptItem = state.items.length > itemsAtTurnStart;
       const reclaimed = cancelled && activePromptRestore?.reclaimed === true;
-      activePromptRestore = null;
+      if (!isStaleUnwind) activePromptRestore = null;
       closeThinkingSegment();
       const elapsedMs = Date.now() - startedAt2;
       const thinkingElapsedMs = thinkingStartedAt ? accumulatedThinkingMs : 0;
@@ -22967,31 +23181,48 @@ async function createEngineSession({
       const resultContent = askResult?.content != null ? String(askResult.content).trim() : "";
       const assistantOutput = (currentAssistantText || assistantText || "").trim();
       const isNoOpTurn = turnFinishedNormally && !cancelled && toolCards.length === 0 && !resultContent && !assistantOutput && !producedTranscriptItem;
-      if (!isNoOpTurn) {
-        state.stats.turns = (state.stats.turns || 0) + 1;
-      }
-      if (!reclaimed && !isNoOpTurn) {
-        pushItem({ kind: "turndone", id: nextId(), elapsedMs, status: turnStatus, outputTokens: finalOutputTokens, thinkingElapsedMs, verb: pickDoneVerb(turnIndex) });
+      if (isStaleUnwind) {
+        tuiDebug(`runTurn STALE UNWIND turn=${turnIndex} \u2014 force-released; skipping shared-state writes`);
+      } else {
+        if (!isNoOpTurn) {
+          state.stats.turns = (state.stats.turns || 0) + 1;
+        }
+        if (!reclaimed && !isNoOpTurn) {
+          pushItem({ kind: "turndone", id: nextId(), elapsedMs, status: turnStatus, outputTokens: finalOutputTokens, thinkingElapsedMs, verb: pickDoneVerb(turnIndex) });
+        }
+        set({
+          busy: false,
+          spinner: null,
+          thinking: null,
+          lastTurn: null,
+          stats: { ...state.stats },
+          ...routeState(),
+          toolMode: runtime.toolMode,
+          ...agentStatusState({ force: true })
+        });
+        flushDeferredExecutionPendingResumeKick();
       }
-      set({
-        busy: false,
-        spinner: null,
-        thinking: null,
-        lastTurn: null,
-        stats: { ...state.stats },
-        ...routeState(),
-        toolMode: runtime.toolMode,
-        ...agentStatusState({ force: true })
-      });
-      flushDeferredExecutionPendingResumeKick();
     }
-    clearActiveToolSummary();
+    if (leadTurnEpoch === turnEpoch) clearActiveToolSummary();
     _publishedThinkingActive = false;
+    tuiDebug(`runTurn end turn=${turnIndex} status=${cancelled ? "cancelled" : "done"} elapsedMs=${Date.now() - startedAt2}${watchdogTripped ? " watchdogTripped=1" : ""} pending=${pending.length}`);
     return cancelled ? "cancelled" : "done";
   }
   const pending = [];
   let draining = false;
   let activePromptRestore = null;
+  let leadTurnEpoch = 0;
+  const leadSessionId = () => runtime.id;
+  function shouldMirrorSteeringEntry(entry) {
+    return isQueuedEntryEditable(entry) && !isSlashQueuedEntry(entry);
+  }
+  function commitSteeringQueueEntries(entries) {
+    callCommitCallbacks(entries);
+    const mirrored = (Array.isArray(entries) ? entries : []).filter(
+      (entry) => shouldMirrorSteeringEntry(entry) && !entry.steeringPersistRestored
+    );
+    if (mirrored.length > 0) dropTuiSteeringPersist(leadSessionId(), mirrored);
+  }
   function makeQueueEntry(text, options = {}) {
     const mode = options.mode || "prompt";
     const priority = options.priority || defaultQueuePriority(mode);
@@ -23007,7 +23238,9 @@ async function createEngineSession({
       priority,
       key: options.key || null,
       skipSlashCommands: options.skipSlashCommands === true,
-      displayText: mode === "task-notification" ? notificationDisplayText(displayText) : String(displayText || "")
+      displayText: mode === "task-notification" ? notificationDisplayText(displayText) : String(displayText || ""),
+      steeringPersistId: options.steeringPersistId || null,
+      steeringPersistRestored: options.steeringPersistRestored === true
     };
   }
   function removeQueuedEntries(entries) {
@@ -23079,6 +23312,7 @@ async function createEngineSession({
         const batch = dequeueQueueBatch("later", { limit: firstBatch ? 1 : Infinity });
         firstBatch = false;
         if (batch.length === 0) break;
+        tuiDebug(`busy-queue drain batch=${batch.length} remaining=${pending.length}`);
         const ids = new Set(batch.map((e) => e.id));
         const merged = mergePromptContents(batch);
         for (const entry of batch) {
@@ -23092,7 +23326,7 @@ async function createEngineSession({
           displayText: batch.map((entry) => entry.text).filter((text) => String(text || "").trim()).join("\n"),
           pastedImages: batchPastedImages,
           pastedTexts: batchPastedTexts,
-          onCommitted: () => callCommitCallbacks(batch),
+          onCommitted: () => commitSteeringQueueEntries(batch),
           submittedIds: [...ids],
           restorable: nonEditable.length === 0,
           requeueOnAbort: nonEditable
@@ -23122,7 +23356,11 @@ async function createEngineSession({
       pendingNotificationKeys.add(entry.key);
     }
     pending.push(entry);
+    if (state.busy && shouldMirrorSteeringEntry(entry)) {
+      appendTuiSteeringPersist(leadSessionId(), entry);
+    }
     if (isQueuedEntryVisible(entry)) set({ queued: [...state.queued, entry] });
+    if (state.busy) tuiDebug(`busy-queue enqueue mode=${entry.mode} pending=${pending.length}`);
     void drain();
     return true;
   }
@@ -23138,9 +23376,24 @@ async function createEngineSession({
       if (Array.isArray(entry?.content)) return entry.content.length > 0;
       return String(entry?.content ?? "").trim().length > 0;
     });
-    callCommitCallbacks(batch);
+    commitSteeringQueueEntries(batch);
     return out;
   }
+  function restoreLeadSteeringFromDisk() {
+    const rows = drainTuiSteeringPersist(leadSessionId());
+    if (!rows.length) return;
+    const restored = [];
+    for (const row of rows) {
+      const entry = makeQueueEntry(row.text, {
+        steeringPersistRestored: true,
+        steeringPersistId: row.steeringPersistId || void 0
+      });
+      pending.push(entry);
+      if (isQueuedEntryVisible(entry)) restored.push(entry);
+    }
+    if (restored.length > 0) set({ queued: [...state.queued, ...restored] });
+    void drain();
+  }
   async function autoClearBeforeSubmit() {
     const cfg = autoClearState();
     const now = Date.now();
@@ -23291,6 +23544,7 @@ async function createEngineSession({
     syncContextStats({ allowEstimated: true });
     return state.stats;
   };
+  restoreLeadSteeringFromDisk();
   return {
     getState: () => state,
     patchItem,
@@ -24213,6 +24467,7 @@ async function createEngineSession({
           ...routeState(),
           stats: { ...state.stats }
         });
+        restoreLeadSteeringFromDisk();
         return true;
       } finally {
         set({ commandBusy: false, commandStatus: null });
@@ -24392,7 +24647,7 @@ function installProcessSignalCleanup({
 
 // src/runtime/channels/lib/runtime-paths.mjs
 import { tmpdir as tmpdir3 } from "os";
-import { basename as basename4, join as join7, resolve as resolve4 } from "path";
+import { basename as basename4, join as join8, resolve as resolve4 } from "path";
 
 // src/runtime/channels/lib/state-file.mjs
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync6, unlinkSync as unlinkSync4, writeFileSync as writeFileSync4 } from "fs";
@@ -24401,9 +24656,9 @@ function ensureDir2(dirPath) {
 }
 
 // src/runtime/channels/lib/runtime-paths.mjs
-var RUNTIME_ROOT = process.env.MIXDOG_RUNTIME_ROOT ? resolve4(process.env.MIXDOG_RUNTIME_ROOT) : join7(tmpdir3(), "mixdog");
-var OWNER_DIR = join7(RUNTIME_ROOT, "owners");
-var ACTIVE_INSTANCE_FILE = join7(RUNTIME_ROOT, "active-instance.json");
+var RUNTIME_ROOT = process.env.MIXDOG_RUNTIME_ROOT ? resolve4(process.env.MIXDOG_RUNTIME_ROOT) : join8(tmpdir3(), "mixdog");
+var OWNER_DIR = join8(RUNTIME_ROOT, "owners");
+var ACTIVE_INSTANCE_FILE = join8(RUNTIME_ROOT, "active-instance.json");
 var RUNTIME_STALE_TTL = 24 * 60 * 60 * 1e3;
 var STATUS_FILE_TTL = 6 * 60 * 60 * 1e3;
 var TMP_FILE_TTL = 60 * 60 * 1e3;
@@ -24426,7 +24681,7 @@ function touchUiHeartbeat(instanceId) {
   } catch {
   }
 }
-var SERVER_PID_FILE = join7(
+var SERVER_PID_FILE = join8(
   RUNTIME_ROOT,
   `server-${sanitize(resolvePluginData() ?? "default")}.pid`
 );
@@ -24552,7 +24807,7 @@ function scheduleHardExit(code = 0) {
   timer.unref?.();
 }
 function resolveTuiStderrLogPath() {
-  return process.env.MIXDOG_TUI_STDERR_LOG || join8(process.env.MIXDOG_RUNTIME_ROOT || join8(tmpdir4(), "mixdog"), "mixdog-tui.stderr.log");
+  return process.env.MIXDOG_TUI_STDERR_LOG || join9(process.env.MIXDOG_RUNTIME_ROOT || join9(tmpdir4(), "mixdog"), "mixdog-tui.stderr.log");
 }
 function ansiFg(rgb) {
   const m = /rgb\((\d+),\s*(\d+),\s*(\d+)\)/.exec(String(rgb || ""));

package/src/tui/engine/tui-steering-persist.mjs

@@ -0,0 +1,175 @@
+// Lead TUI busy-input steering queue — disk mirror of in-memory `pending`
+// (same store as manager pending-messages, lead-scoped session key).
+import { randomBytes } from 'crypto';
+import { join } from 'path';
+import { resolvePluginData } from '../../runtime/shared/plugin-paths.mjs';
+import { updateJsonAtomicSync } from '../../runtime/shared/atomic-file.mjs';
+import { promptContentText } from './queue-helpers.mjs';
+
+const PENDING_MESSAGES_FILE = 'session-pending-messages.json';
+const PENDING_MESSAGES_MODE = 0o600;
+
+function pendingMessagesPath() {
+  return join(resolvePluginData(), PENDING_MESSAGES_FILE);
+}
+
+function tuiSteeringSessionKey(leadSessionId) {
+  if (typeof leadSessionId !== 'string' || !/^[A-Za-z0-9_-]+$/.test(leadSessionId)) return null;
+  return `tui_${leadSessionId}`;
+}
+
+function newSteeringPersistId() {
+  return `ts_${Date.now().toString(36)}_${randomBytes(4).toString('hex')}`;
+}
+
+function normalizeTuiSteeringQueueEntry(entry) {
+  if (typeof entry === 'string') {
+    const text = entry.trim();
+    return text || null;
+  }
+  if (!entry || typeof entry !== 'object') return null;
+  if (typeof entry.text === 'string' && entry.text.trim()) {
+    const text = entry.text.trim();
+    const id = typeof entry.id === 'string' && entry.id.trim() ? entry.id.trim() : null;
+    return id ? { id, text } : text;
+  }
+  return null;
+}
+
+function normalizePendingStore(raw) {
+  const sessions = raw && typeof raw === 'object' && raw.sessions && typeof raw.sessions === 'object'
+    ? raw.sessions
+    : {};
+  const storeUpdatedAt = Number(raw?.updatedAt) || Date.now();
+  const touchedRaw = raw && typeof raw === 'object' && raw.sessionTouchedAt && typeof raw.sessionTouchedAt === 'object'
+    ? raw.sessionTouchedAt
+    : {};
+  const out = { version: 1, updatedAt: storeUpdatedAt, sessions: {}, sessionTouchedAt: {} };
+  for (const [sid, value] of Object.entries(sessions)) {
+    if (!/^[A-Za-z0-9_-]+$/.test(sid) || !Array.isArray(value)) continue;
+    const q = sid.startsWith('tui_')
+      ? value.map(normalizeTuiSteeringQueueEntry).filter(Boolean)
+      : value
+        .map((entry) => {
+          if (typeof entry === 'string') return entry;
+          if (entry && typeof entry === 'object' && typeof entry.message === 'string') return entry.message;
+          return '';
+        })
+        .filter(Boolean);
+    if (q.length > 0) {
+      out.sessions[sid] = q;
+      const touched = Number(touchedRaw[sid]);
+      out.sessionTouchedAt[sid] = Number.isFinite(touched) && touched > 0 ? touched : storeUpdatedAt;
+    }
+  }
+  return out;
+}
+
+function touchPendingSessionEntry(next, sessionId, now = Date.now()) {
+  if (!next.sessionTouchedAt || typeof next.sessionTouchedAt !== 'object') next.sessionTouchedAt = {};
+  next.sessionTouchedAt[sessionId] = now;
+}
+
+export function entryPersistText(entry) {
+  if (!entry) return '';
+  const text = typeof entry.text === 'string' && entry.text.trim()
+    ? entry.text.trim()
+    : promptContentText(entry.content ?? entry.text ?? '').trim();
+  return text;
+}
+
+function rowMatchesEntry(row, entry) {
+  const persistId = entry?.steeringPersistId;
+  if (persistId) {
+    return Boolean(row && typeof row === 'object' && row.id === persistId);
+  }
+  const text = entryPersistText(entry);
+  if (!text) return false;
+  return row === text;
+}
+
+function removePersistRow(q, entry) {
+  const idx = q.findIndex((row) => rowMatchesEntry(row, entry));
+  if (idx >= 0) q.splice(idx, 1);
+}
+
+export function appendTuiSteeringPersist(leadSessionId, entry) {
+  const text = entryPersistText(entry);
+  if (!text) return;
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return;
+  if (!entry.steeringPersistId) entry.steeringPersistId = newSteeringPersistId();
+  const record = { id: entry.steeringPersistId, text };
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key] : [];
+      q.push(record);
+      next.sessions[key] = q;
+      const now = Date.now();
+      next.updatedAt = now;
+      touchPendingSessionEntry(next, key, now);
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try { process.stderr.write(`[tui] steering-queue append failed sessionId=${leadSessionId}: ${err?.message || err}\n`); } catch {}
+  }
+}
+
+export function dropTuiSteeringPersist(leadSessionId, entries) {
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return;
+  const batch = Array.isArray(entries) ? entries : [];
+  if (batch.length === 0) return;
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key].slice() : [];
+      if (q.length === 0) return undefined;
+      for (const entry of batch) {
+        removePersistRow(q, entry);
+      }
+      if (q.length === 0) {
+        delete next.sessions[key];
+        if (next.sessionTouchedAt) delete next.sessionTouchedAt[key];
+      } else {
+        next.sessions[key] = q;
+      }
+      next.updatedAt = Date.now();
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try { process.stderr.write(`[tui] steering-queue drop failed sessionId=${leadSessionId}: ${err?.message || err}\n`); } catch {}
+  }
+}
+
+function drainedRowToRestore(row) {
+  if (typeof row === 'string') {
+    return { text: row, steeringPersistId: null };
+  }
+  if (row && typeof row === 'object' && typeof row.text === 'string') {
+    return { text: row.text, steeringPersistId: typeof row.id === 'string' ? row.id : null };
+  }
+  return null;
+}
+
+export function drainTuiSteeringPersist(leadSessionId) {
+  const key = tuiSteeringSessionKey(leadSessionId);
+  if (!key) return [];
+  let drained = [];
+  try {
+    updateJsonAtomicSync(pendingMessagesPath(), (raw) => {
+      const next = normalizePendingStore(raw);
+      const q = Array.isArray(next.sessions[key]) ? next.sessions[key] : [];
+      drained = q.map(drainedRowToRestore).filter(Boolean);
+      if (drained.length === 0) return undefined;
+      delete next.sessions[key];
+      if (next.sessionTouchedAt) delete next.sessionTouchedAt[key];
+      next.updatedAt = Date.now();
+      return next;
+    }, { compact: true, lock: true, mode: PENDING_MESSAGES_MODE, fsync: false });
+  } catch (err) {
+    try { process.stderr.write(`[tui] steering-queue drain failed sessionId=${leadSessionId}: ${err?.message || err}\n`); } catch {}
+  }
+  return drained;
+}