mixdog 1.3.2 → 1.3.3

package/src/standalone/session-service.mjs

@@ -23,6 +23,7 @@ import { createViewerRegistry } from './session-service/viewers.mjs';
 import { createSessionEntries } from './session-service/entries.mjs';
 import { createSessionCalls } from './session-service/session-calls.mjs';
 import { createQuotaResumeScheduler } from './session-service/quota-resume.mjs';
+import { createAgentRouteFollow } from './session-service/agent-route-follow.mjs';
 import { registerDelegatedApprovalOpener } from '../runtime/shared/delegated-approval-host.mjs';
 
 const EXTERNAL_SESSION_ACTIONS = new Set([
@@ -209,6 +210,14 @@ export function createSessionService({
   // A sub-agent's approval shows in its top-level chat; one not loaded is
   // brought up so the copy (and its notifications) appear there.
   const unregisterApprovalOpener = registerDelegatedApprovalOpener((sessionId) => calls.materializeSession(sessionId));
+  // A bot's saved route reaches its hosted home and room-member chats from their next turn.
+  const agentRouteFollow = createAgentRouteFollow({
+    sessionsById,
+    sessionOwner: projection.sessionOwner,
+    advance: projection.advance,
+    publishStep: projection.publishStep,
+    log,
+  });
   const quotaUsableReader = typeof readQuotaUsable === 'function' ? readQuotaUsable : async () => false;
   const quotaResume = quotaResumeStore
     ? createQuotaResumeScheduler({
@@ -224,6 +233,7 @@ export function createSessionService({
     if (stopPromise) return stopPromise;
     closed = true;
     unregisterApprovalOpener();
+    agentRouteFollow.unsubscribe();
     quotaResume?.stop();
     stopPromise = Promise.resolve().then(async () => {
       try {

package/src/standalone/session-tool-output.mjs

@@ -24,6 +24,7 @@ export function sessionListOutput(page, limit, { rich = true } = {}) {
         : {}),
       ...(row.status ? { status: row.status } : {}),
       ...(row.cwd ? { cwd: row.cwd } : {}),
+      ...(row.archived === true ? { archived: true } : {}),
     };
     if (!rich) return base;
     // The bot it belongs to: its chat, room seat or the task's creator.

package/src/standalone/staged-import.mjs

@@ -0,0 +1,47 @@
+// Staged dynamic import of a large module graph. Loading a graph (file reads,
+// compilation, evaluation) runs synchronously inside one import() call, so the
+// daemon's session-runtime warm-up held the event loop for ~0.5 s in one
+// piece right after `daemon-ready`. Importing the graph's top-level stages one
+// loop turn apart splits that block without changing what is loaded.
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+// A static `import … from './x'`, `export … from './x'` or bare `import './x'`
+// at the start of a line, in source order.
+const STATIC_RELATIVE_IMPORT =
+  /^(?:import|export)\b[^;]*?\bfrom\s*['"](\.{1,2}\/[^'"]+)['"]|^import\s*['"](\.{1,2}\/[^'"]+)['"]/gm;
+
+/** The relative static imports of the module at `url`, resolved, in source order. */
+export function staticRelativeImports(url) {
+  const source = readFileSync(fileURLToPath(url), 'utf8');
+  return [...source.matchAll(STATIC_RELATIVE_IMPORT)].map((match) => new URL(match[1] || match[2], url).href);
+}
+
+const nextTurn = () => new Promise((resolve) => setImmediate(resolve));
+
+/**
+ * import(url), after importing each static relative dependency of `stagesOf`
+ * (in its source order, one loop turn apart). Module evaluation order is the
+ * one a single import gives — dependencies depth-first in source order — as
+ * long as no module of a stage's graph imports `stagesOf` or an importer of it
+ * back. Staging stops at the first stage that fails, so no later stage
+ * evaluates; the final import then reports the failure as a single import
+ * would.
+ */
+export async function importInStages(url, stagesOf) {
+  let stages = [];
+  try {
+    stages = staticRelativeImports(stagesOf);
+  } catch {
+    // Unreadable source: one import, as before.
+  }
+  for (const stage of stages) {
+    try {
+      await import(stage);
+    } catch {
+      break;
+    }
+    await nextTurn();
+  }
+  return import(url);
+}

package/src/tui/App.jsx

@@ -516,6 +516,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     syncPromptLayoutRows,
     showPromptHint,
     clearPromptHint,
+    installPastedImages,
+    installPastedTexts,
   });
 
   // PROMPT HANDLER cluster extracted to app/use-prompt-handlers.mjs.

package/src/tui/app/message-selector.mjs

@@ -45,6 +45,8 @@ export function useMessageSelector({
   syncPromptLayoutRows,
   showPromptHint,
   clearPromptHint,
+  installPastedImages,
+  installPastedTexts,
 }) {
   // Cheap enough to recompute only when the transcript array identity changes;
   // the prompt asks for this on every Escape, never per keystroke.
@@ -64,11 +66,22 @@ export function useMessageSelector({
         return false;
       }
       clearPromptHint();
+      // The prompt's pasted blocks return with it, so its tokens still expand.
+      if (restored.pastedImages) installPastedImages?.(restored.pastedImages, { merge: true });
+      if (restored.pastedTexts) installPastedTexts?.(restored.pastedTexts, { merge: true });
       syncPromptLayoutRows(text);
       setPromptDraftOverride({ id: Date.now(), value: text });
+      if (restored.notice) showPromptHint(restored.notice, 'error');
       return true;
     },
-    [clearPromptHint, syncPromptLayoutRows, setPromptDraftOverride, showPromptHint]
+    [
+      clearPromptHint,
+      syncPromptLayoutRows,
+      setPromptDraftOverride,
+      showPromptHint,
+      installPastedImages,
+      installPastedTexts,
+    ]
   );
 
   const openMessageSelector = useCallback(() => {
@@ -89,7 +102,7 @@ export function useMessageSelector({
         own.close();
         let restored;
         try {
-          restored = store.rewindToItem?.(value);
+          restored = store.rewindToItem?.(value, { restoreFiles: false });
         } catch (error) {
           showPromptHint(`rewind failed: ${error?.message || error}`, 'error');
           return;

package/src/tui/app/model-options.mjs

@@ -221,6 +221,18 @@ export const loadProviderDisplayNames = async (store) => {
   return names;
 };
 
+/** Provider names for the picker: custom rows' own `providerName` first, then
+ *  setup names over them (setup wins). Works when setup is missing or failed. */
+export const catalogProviderDisplayNames = (models, setupNames = null) => {
+  const names = {};
+  for (const model of Array.isArray(models) ? models : []) {
+    const provider = String(model?.provider || '').trim();
+    const name = String(model?.providerName || '').trim();
+    if (provider.startsWith('custom-') && name) names[provider] = name;
+  }
+  return { ...names, ...setupNames };
+};
+
 /** `{ id, text }` for each provider whose model list failed, with the reason
  *  (the setup row's `catalogError`) and what to do about it. */
 export const loadProviderCatalogFailures = async (store) => {
@@ -368,9 +380,11 @@ const routeModelDetails = (route) =>
     .filter(Boolean)
     .join(' · ');
 
-export const routeLabel = (route) => {
+export const routeLabel = (route, providerNames = null) => {
   if (!route?.provider || !route?.model) return '(unset)';
-  return [providerDisplayName(route.provider), routeModelDetails(route)].filter(Boolean).join(' · ');
+  return [resolveProviderDisplayName(route.provider, providerNames), routeModelDetails(route)]
+    .filter(Boolean)
+    .join(' · ');
 };
 
 export const routeModelLabel = (route) => (route?.model ? routeModelDetails(route) : '(unset)');

package/src/tui/app/model-picker.mjs

@@ -14,6 +14,7 @@ import {
   normalizeModelOptions,
   buildCatalogFailureItems,
   buildModelProviderItems,
+  catalogProviderDisplayNames,
   loadProviderCatalogFailures,
   loadProviderDisplayNames,
 } from './model-options.mjs';
@@ -83,7 +84,7 @@ export function createModelPicker({
     }
 
     const models = normalizeModelOptions(providerModels);
-    const providerNames = await loadProviderDisplayNames(store);
+    const providerNames = catalogProviderDisplayNames(models, await loadProviderDisplayNames(store));
     const catalogFailures = await loadProviderCatalogFailures(store);
     const activeRoute = options.currentRoute || {
       provider: state.provider,

package/src/tui/app/route-pickers.mjs

@@ -7,6 +7,7 @@
  * openers (openModelPicker) thread as lazy getter wrappers so they resolve the
  * live binding at call time.
  */
+import { loadProviderDisplayNames } from './model-options.mjs';
 import { createAgentsPicker } from './route-pickers/agents-picker.mjs';
 import { createOutputStylePicker } from './route-pickers/output-style-picker.mjs';
 import { createWorkflowPicker } from './route-pickers/workflow-picker.mjs';
@@ -59,7 +60,8 @@ export function createRoutePickers({
           store.pushNotice('Web-search model save is already running.', 'warn');
           return;
         }
-        store.pushNotice(`Web-search model set to ${routeLabel(result)}`, 'info');
+        const providerNames = await loadProviderDisplayNames(store);
+        store.pushNotice(`Web-search model set to ${routeLabel(result, providerNames)}`, 'info');
         return result;
       },
       onAfterSelect: null,

package/src/tui/dist/index.mjs

@@ -41529,6 +41529,14 @@ function gitStageUnit(a) {
     effect: true
   });
 }
+function gitWorktreeUnit(a) {
+  return unitDescriptor("Git", {
+    active: "Managing",
+    done: "Managed",
+    noun: "worktree",
+    effect: String(a.worktree_action || "").toLowerCase() !== "list"
+  });
+}
 function cwdUnit(a) {
   const action = String(a.action || a.type || "").toLowerCase();
   if (action === "set" || action === "set-project" || !action && a.path) {
@@ -41559,14 +41567,6 @@ function cwdUnit(a) {
     const [active, done] = words;
     return unitDescriptor("Setup", { active, done, noun: "session", effect: true });
   }
-  if (action.endsWith("-worktree") || action.endsWith("-worktrees")) {
-    return unitDescriptor("Setup", {
-      active: "Managing",
-      done: "Managed",
-      noun: "worktree",
-      effect: !action.startsWith("list")
-    });
-  }
   if (action === "status") {
     return unitDescriptor("Setup", { active: "Checking", done: "Checked", noun: "session" });
   }
@@ -41661,7 +41661,7 @@ var TOOL_UNITS = /* @__PURE__ */ new Map([
   ["job_wait", shellUnit],
   [
     "git",
-    (a) => a.action === "stage" ? gitStageUnit(a) : unitDescriptor("Git", { count: queryCount(a, "command", "commands") || 1, noun: "Git command" })
+    (a) => a.action === "stage" ? gitStageUnit(a) : a.action === "worktree" ? gitWorktreeUnit(a) : unitDescriptor("Git", { count: queryCount(a, "command", "commands") || 1, noun: "Git command" })
   ],
   ["github", githubUnit],
   // Preserve the staging work unit when rendering historical transcripts.
@@ -47542,17 +47542,14 @@ async function resizeImageBuffer(buffer, ext, { maxTokens = DEFAULT_IMAGE_MAX_TO
 var TOOL_IMAGE_TARGET_BASE64_SIZE = 256 * 1024;
 
 // src/tui/paste-text-policy.mjs
-var PASTE_TOKEN_MIN_LINES = 10;
-var PASTE_TOKEN_MIN_CHARS = 200;
+var PASTE_TOKEN_MIN_CHARS = 1e3;
 function pastedTextLineCount(text) {
   const value = String(text ?? "").replace(/\r\n?/g, "\n").replace(/\n+$/, "");
   if (!value) return 0;
   return value.split("\n").length;
 }
 function shouldFoldPastedText(text) {
-  const value = String(text ?? "");
-  if (!value) return false;
-  return pastedTextLineCount(value) >= PASTE_TOKEN_MIN_LINES || value.length > PASTE_TOKEN_MIN_CHARS;
+  return String(text ?? "").length > PASTE_TOKEN_MIN_CHARS;
 }
 function formatPastedTextRef(id, text) {
   return `[Pasted text #${id} +${pastedTextLineCount(text)} lines]`;
@@ -59570,6 +59567,15 @@ var loadProviderDisplayNames = async (store) => {
   }
   return names;
 };
+var catalogProviderDisplayNames = (models, setupNames = null) => {
+  const names = {};
+  for (const model of Array.isArray(models) ? models : []) {
+    const provider = String(model?.provider || "").trim();
+    const name = String(model?.providerName || "").trim();
+    if (provider.startsWith("custom-") && name) names[provider] = name;
+  }
+  return { ...names, ...setupNames };
+};
 var loadProviderCatalogFailures = async (store) => {
   let setup = null;
   try {
@@ -59683,9 +59689,9 @@ var routeSpeedLabel = (route) => {
   return route.modelParameters?.serviceTier === "ultrafast" ? "Ultrafast" : "Fast";
 };
 var routeModelDetails = (route) => [routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : "", routeSpeedLabel(route)].filter(Boolean).join(" \xB7 ");
-var routeLabel = (route) => {
+var routeLabel = (route, providerNames = null) => {
   if (!route?.provider || !route?.model) return "(unset)";
-  return [providerDisplayName(route.provider), routeModelDetails(route)].filter(Boolean).join(" \xB7 ");
+  return [resolveProviderDisplayName(route.provider, providerNames), routeModelDetails(route)].filter(Boolean).join(" \xB7 ");
 };
 var routeModelLabel = (route) => route?.model ? routeModelDetails(route) : "(unset)";
 var agentModelProfile = (route) => route?.model ? routeModelDetails(route) : "";
@@ -61162,7 +61168,7 @@ function createModelPicker({
       return;
     }
     const models = normalizeModelOptions(providerModels);
-    const providerNames = await loadProviderDisplayNames(store);
+    const providerNames = catalogProviderDisplayNames(models, await loadProviderDisplayNames(store));
     const catalogFailures = await loadProviderCatalogFailures(store);
     const activeRoute = options.currentRoute || {
       provider: state.provider,
@@ -61590,7 +61596,8 @@ function createRoutePickers({
           store.pushNotice("Web-search model save is already running.", "warn");
           return;
         }
-        store.pushNotice(`Web-search model set to ${routeLabel2(result)}`, "info");
+        const providerNames = await loadProviderDisplayNames(store);
+        store.pushNotice(`Web-search model set to ${routeLabel2(result, providerNames)}`, "info");
         return result;
       },
       onAfterSelect: null
@@ -61950,8 +61957,16 @@ function copyTree(src, dst, copied) {
   writeFileAtomicSync(dst, readFileSync10(src), { mode: st.mode & 511 });
   copied.push(dst);
 }
+var manifestPath = (scopeDir, name) => join11(scopeDir, name, BACKUP_MANIFEST);
 function pruneBackups(scopeDir, names, own) {
-  for (const name of backupsToPrune(names, own)) {
+  const completed = names.filter((name) => {
+    try {
+      return statSync4(manifestPath(scopeDir, name)).isFile();
+    } catch {
+      return false;
+    }
+  });
+  for (const name of backupsToPrune(completed, own)) {
     try {
       rmSync(join11(scopeDir, name), { recursive: true, force: true });
     } catch {
@@ -62001,16 +62016,24 @@ function backupUserData(dataDir2, reason = "snapshot", { dirs = [] } = {}) {
   const scopeDir = scopeDirFor(dataDir2);
   const { backupDir, names } = reserveBackupDir(scopeDir, reason);
   const copied = [];
-  for (const rel of USER_DATA_FILES) {
-    const src = join11(dataDir2, rel);
-    if (existsSync9(src)) copyTree(src, join11(backupDir, rel), copied);
-  }
-  for (const rel of [...USER_DATA_DIRS, ...dirs]) {
-    const src = join11(dataDir2, rel);
-    if (existsSync9(src)) copyTree(src, join11(backupDir, rel), copied);
+  try {
+    for (const rel of USER_DATA_FILES) {
+      const src = join11(dataDir2, rel);
+      if (existsSync9(src)) copyTree(src, join11(backupDir, rel), copied);
+    }
+    for (const rel of [...USER_DATA_DIRS, ...dirs]) {
+      const src = join11(dataDir2, rel);
+      if (existsSync9(src)) copyTree(src, join11(backupDir, rel), copied);
+    }
+    if (copied.length > 0) finishBackup(dataDir2, backupDir, reason);
+  } catch (error) {
+    try {
+      rmSync(backupDir, { recursive: true, force: true });
+    } catch {
+    }
+    throw error;
   }
   if (copied.length > 0) {
-    finishBackup(dataDir2, backupDir, reason);
     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}
@@ -62034,7 +62057,14 @@ async function copyTreeAsync(src, dst, copied) {
   copied.push(dst);
 }
 async function pruneBackupsAsync(scopeDir, names, own) {
-  for (const name of backupsToPrune(names, own)) {
+  const completed = [];
+  for (const name of names) {
+    try {
+      if ((await statP(manifestPath(scopeDir, name))).isFile()) completed.push(name);
+    } catch {
+    }
+  }
+  for (const name of backupsToPrune(completed, own)) {
     try {
       await rmP(join11(scopeDir, name), { recursive: true, force: true });
     } catch {
@@ -62047,16 +62077,24 @@ async function backupUserDataAsync(dataDir2, reason = "snapshot") {
   const scopeDir = scopeDirFor(dataDir2);
   const { backupDir, names } = await reserveBackupDirAsync(scopeDir, reason);
   const copied = [];
-  for (const rel of USER_DATA_FILES) {
-    const src = join11(dataDir2, rel);
-    if (existsSync9(src)) await copyTreeAsync(src, join11(backupDir, rel), copied);
-  }
-  for (const rel of USER_DATA_DIRS) {
-    const src = join11(dataDir2, rel);
-    if (existsSync9(src)) await copyTreeAsync(src, join11(backupDir, rel), copied);
+  try {
+    for (const rel of USER_DATA_FILES) {
+      const src = join11(dataDir2, rel);
+      if (existsSync9(src)) await copyTreeAsync(src, join11(backupDir, rel), copied);
+    }
+    for (const rel of USER_DATA_DIRS) {
+      const src = join11(dataDir2, rel);
+      if (existsSync9(src)) await copyTreeAsync(src, join11(backupDir, rel), copied);
+    }
+    if (copied.length > 0) finishBackup(dataDir2, backupDir, reason);
+  } catch (error) {
+    try {
+      await rmP(backupDir, { recursive: true, force: true });
+    } catch {
+    }
+    throw error;
   }
   if (copied.length > 0) {
-    finishBackup(dataDir2, backupDir, reason);
     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}
@@ -63969,7 +64007,9 @@ function useMessageSelector({
   setPromptDraftOverride,
   syncPromptLayoutRows,
   showPromptHint,
-  clearPromptHint
+  clearPromptHint,
+  installPastedImages,
+  installPastedTexts
 }) {
   const hasUserMessages = useMemo7(
     () => (Array.isArray(state.items) ? state.items : []).some(
@@ -63985,11 +64025,21 @@ function useMessageSelector({
         return false;
       }
       clearPromptHint();
+      if (restored.pastedImages) installPastedImages?.(restored.pastedImages, { merge: true });
+      if (restored.pastedTexts) installPastedTexts?.(restored.pastedTexts, { merge: true });
       syncPromptLayoutRows(text);
       setPromptDraftOverride({ id: Date.now(), value: text });
+      if (restored.notice) showPromptHint(restored.notice, "error");
       return true;
     },
-    [clearPromptHint, syncPromptLayoutRows, setPromptDraftOverride, showPromptHint]
+    [
+      clearPromptHint,
+      syncPromptLayoutRows,
+      setPromptDraftOverride,
+      showPromptHint,
+      installPastedImages,
+      installPastedTexts
+    ]
   );
   const openMessageSelector = useCallback20(() => {
     const items = store.getState?.().items ?? state.items;
@@ -64009,7 +64059,7 @@ function useMessageSelector({
         own.close();
         let restored;
         try {
-          restored = store.rewindToItem?.(value);
+          restored = store.rewindToItem?.(value, { restoreFiles: false });
         } catch (error) {
           showPromptHint(`rewind failed: ${error?.message || error}`, "error");
           return;
@@ -65920,7 +65970,9 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     setPromptDraftOverride,
     syncPromptLayoutRows,
     showPromptHint,
-    clearPromptHint
+    clearPromptHint,
+    installPastedImages,
+    installPastedTexts
   });
   const { handlePromptPaste, handlePromptHistoryNavigate, handlePromptEscape, handlePromptInterrupt } = usePromptHandlers({
     store,

package/src/tui/paste-attachments.mjs

@@ -86,7 +86,6 @@ export {
   formatPastedTextRef,
   pastedTextLineCount,
   PASTE_TOKEN_MIN_CHARS,
-  PASTE_TOKEN_MIN_LINES,
   shouldFoldPastedText,
 } from './paste-text-policy.mjs';
 

package/src/tui/paste-text-policy.mjs

@@ -3,8 +3,9 @@
 // A big paste is replaced in the prompt by a compact token so the editor does
 // not choke on thousands of raw characters; the original text lives in the
 // surface's pasted-text map and is expanded back on submit.
-export const PASTE_TOKEN_MIN_LINES = 10;
-export const PASTE_TOKEN_MIN_CHARS = 200;
+// Same rule as Claude Code / Codex (LARGE_PASTE_CHAR_THRESHOLD): only a paste
+// longer than this many characters folds; the line count never matters.
+export const PASTE_TOKEN_MIN_CHARS = 1000;
 
 // VISIBLE lines: a copy that ends in a newline ("a\nb\n") is two lines, not
 // three. Counting the empty trailing chunk folded ordinary two-line copies
@@ -18,9 +19,7 @@ export function pastedTextLineCount(text) {
 }
 
 export function shouldFoldPastedText(text) {
-  const value = String(text ?? '');
-  if (!value) return false;
-  return pastedTextLineCount(value) >= PASTE_TOKEN_MIN_LINES || value.length > PASTE_TOKEN_MIN_CHARS;
+  return String(text ?? '').length > PASTE_TOKEN_MIN_CHARS;
 }
 
 export function formatPastedTextRef(id, text) {

package/src/tui/session/agent-job-feed/execution-delivery.mjs

@@ -86,10 +86,13 @@ export function createExecutionDelivery({
     // active loop can attach them after the next tool batch. The immediate
     // response card was already pushed above, so the queued twin stays
     // model-visible but suppresses its drain-time transcript card.
-    const { execution } = markCompletionEntry(resumeBody, { executionId, meta: event?.meta });
+    const { execution, hop } = markCompletionEntry(resumeBody, { executionId, meta: event?.meta });
     const enqueued = enqueue(resumeBody, {
       mode: 'task-notification',
       ...(execution ? { execution } : {}),
+      // The launching turn's bot-chain hop: the turn this wakes, or the running
+      // turn this joins, resumes at it (bot-hops.mjs).
+      ...(hop ? { transcriptMeta: { hop } } : {}),
       priority: 'next',
       key: notificationKey || undefined,
       abortDiscardOnAbort: true,

package/src/tui/session/notice-surface.mjs

@@ -1,6 +1,7 @@
 /**
  * src/tui/session/notice-surface.mjs - toasts, transcript notices, progress hint.
  */
+import { roomRowSender } from '../../runtime/agent/orchestrator/session/agent-room.mjs';
 import { polishNoticeText } from './notice-text.mjs';
 import { nextId } from './transcript-spill.mjs';
 
@@ -59,6 +60,8 @@ export function createNoticeSurface({ getState, set, isDisposed, pushItem, repla
       // A schedule result posted into a home thread (routine-result.mjs).
       ...(options.routine ? { routine: options.routine } : {}),
       ...(options.room ? { room: options.room } : {}),
+      // A room message another session sent shows its sender, as restored.
+      ...(userRow ? roomRowSender(options.room) : {}),
       // A room user row's files, in the fields a prompt row draws them from;
       // a task report's or member speech's returned files likewise.
       ...(Array.isArray(options.attachments) && options.attachments.length ? { attachments: options.attachments } : {}),

package/src/tui/session/session-api/intake/abort.mjs

@@ -8,7 +8,7 @@ import { promptHistoryWithout } from '../../prompt-history.mjs';
 import { isQueuedEntryEditable } from '../../queue-helpers.mjs';
 
 // An attachment whose blob is gone is dropped alone; the prompt is kept.
-function hydrateTolerantly(pastedImages, pastedTexts, content = null) {
+export function hydrateTolerantly(pastedImages, pastedTexts, content = null) {
   let unreadable = 0;
   const onUnreadable = () => {
     unreadable += 1;
@@ -57,9 +57,13 @@ export function createAbortAction(bag) {
 
   // Pull the interrupted prompt back out of the transcript and history and
   // put its unsent requeue entries at the front of the queue.
-  const reclaimInFlightPrompt = (restoreState, { restoreText, requeueEntries, handoff = false }) => {
-    restoreState.reclaimed = true;
-    const idSet = new Set((restoreState.submittedIds || []).filter((id) => id != null));
+  // `keepPrompt` only requeues: the submitted rows stay in the transcript.
+  const reclaimInFlightPrompt = (
+    restoreState,
+    { restoreText, requeueEntries, handoff = false, keepPrompt = false }
+  ) => {
+    if (!keepPrompt) restoreState.reclaimed = true;
+    const idSet = new Set((keepPrompt ? [] : restoreState.submittedIds || []).filter((id) => id != null));
     const patch = { spinner: null, thinking: null, lastTurn: null };
     // Another device cancelled this turn: the prompt travels to the device that
     // sent it through the state, never through the canceller's reply.
@@ -125,14 +129,26 @@ export function createAbortAction(bag) {
     const canceller = typeof options?.device === 'string' ? options.device : '';
     const crossDevice = Boolean(canceller && restoreState?.device && canceller !== restoreState.device);
     const hasAttachments = Boolean(restoreState?.pastedImages || restoreState?.pastedTexts || restoreState?.content);
-    const canRestore =
+    const wantsRestore =
       options?.restorePrompt !== false &&
       restoreState?.restorable &&
       !hasPendingSteering &&
       !(crossDevice && hasAttachments);
+    // Hydrate BEFORE the turn is aborted or the prompt reclaimed: an attachment
+    // read error then cannot strand a prompt that left the transcript with no
+    // draft to land in. On failure the prompt is kept (like a Stop that hands
+    // nothing back) and the error is surfaced as the notice.
+    let restored = null;
+    let hydrateFailure = '';
+    if (wantsRestore) {
+      try {
+        restored = hydrateTolerantly(restoreState?.pastedImages, restoreState?.pastedTexts, restoreState?.content);
+      } catch (error) {
+        hydrateFailure = `Could not restore the attachments (${error?.message || error}); the prompt was kept.`;
+      }
+    }
+    const canRestore = wantsRestore && !hydrateFailure;
     const restoreText = canRestore ? restoreState.text : '';
-    const restorePastedImages = canRestore && restoreState?.pastedImages ? restoreState.pastedImages : null;
-    const restorePastedTexts = canRestore && restoreState?.pastedTexts ? restoreState.pastedTexts : null;
     // When steering suppresses the restore, the interrupted prompt's pasted
     // images never get committed (onCommitted won't fire) nor re-installed into
     // the draft, so hand them back for cleanup to avoid a stale `[Image #id]`
@@ -170,28 +186,28 @@ export function createAbortAction(bag) {
         discardExecutionPendingResume?.(restoreState.discardExecutionPendingResumeKeys);
       }
       if ((restoreText || requeueEntries.length > 0) && aborted !== false) {
-        reclaimInFlightPrompt(restoreState, { restoreText, requeueEntries, handoff: crossDevice });
+        reclaimInFlightPrompt(restoreState, {
+          restoreText,
+          requeueEntries,
+          handoff: crossDevice,
+          keepPrompt: Boolean(hydrateFailure),
+        });
       }
       restoreState.restorable = false;
       restoreState.requeueEntries = [];
       restoreState.discardExecutionPendingResumeKeys = [];
     }
     kickDrainAfterAbort();
-    const restored = hydrateTolerantly(
-      restorePastedImages,
-      restorePastedTexts,
-      canRestore ? restoreState?.content : null
-    );
     // The canceller never receives another device's prompt.
     const handedOver = crossDevice && Boolean(restoreText) && aborted !== false;
     return {
       aborted,
       restoreText: handedOver ? '' : restoreText,
-      ...(restored.content ? { content: restored.content } : {}),
-      ...(restored.notice ? { notice: restored.notice } : {}),
-      pastedImages: restored.pastedImages,
+      ...(restored?.content ? { content: restored.content } : {}),
+      ...(restored?.notice || hydrateFailure ? { notice: restored?.notice || hydrateFailure } : {}),
+      pastedImages: restored?.pastedImages ?? null,
       discardPastedImages,
-      pastedTexts: restored.pastedTexts,
+      pastedTexts: restored?.pastedTexts ?? null,
       discardPastedTexts,
       restoredSubmissionIds:
         restoreText && !handedOver ? (restoreState?.submittedIds || []).map(String).filter(Boolean) : [],