mixdog 1.3.2 → 1.3.4

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) : [],

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

@@ -1,13 +1,17 @@
 // Message selector ("jump back to a previous message"): rewind the
 // conversation to just before a user prompt and hand its text back for
 // editing. Idle-only — a live turn must be interrupted first.
+import { restorableAttachmentsFromPrompt } from '../../../../runtime/attachments/prompt-restore.mjs';
 import { promptHistoryWithout } from '../../prompt-history.mjs';
+import { hydrateTolerantly } from './abort.mjs';
 
 export function createRewindAction(bag) {
   const { runtime, getState, set, flushEmitImmediate, replaceItems, syncContextStats } = bag;
 
   return {
-    rewindToItem: async (itemId) => {
+    // `restoreFiles: false` is a composer that cannot hold PDF/Office file
+    // parts (the terminal one): a prompt carrying any is refused untouched.
+    rewindToItem: async (itemId, { restoreFiles = true } = {}) => {
       const target = String(itemId ?? '').trim();
       if (!target) return null;
       if (getState().busy || getState().commandBusy) return null;
@@ -19,8 +23,31 @@ export function createRewindAction(bag) {
       if (!text) return null;
       set({ commandBusy: true });
       try {
-        const rewound = await runtime.rewindMessages?.({ text });
-        if (!rewound) return null;
+        // Matched by the row's stable message id (the stored prompt is the
+        // expanded text); rows without one fall back to the text.
+        const messageId = String(items[index]?.messageId || '');
+        const rewindOptions = { text, ...(messageId ? { messageId } : {}) };
+        // Resolve the prompt and build the whole restore payload BEFORE any
+        // history changes: a refusal or an attachment read error then leaves the
+        // model history and the transcript both untouched.
+        const preview = await runtime.rewindMessages?.({ ...rewindOptions, dryRun: true });
+        if (!preview) return null;
+        // The stored prompt's attachment references become the restore payload
+        // the abort/queue restores use (pastedTexts / pastedImages / file parts).
+        const content = preview.message?.content;
+        if (!restoreFiles && Array.isArray(content) && content.some((part) => part?.type === 'file')) {
+          throw new Error(
+            'this message has PDF/Office attachments the terminal composer cannot restore; edit it in the desktop app'
+          );
+        }
+        const refs = restorableAttachmentsFromPrompt(content, text);
+        const attachments = hydrateTolerantly(refs.pastedImages, refs.pastedTexts, content);
+        // Refused when the history changed since the preview.
+        const rewound = await runtime.rewindMessages?.({
+          ...rewindOptions,
+          ...(preview.historyMarker ? { expectedHistoryMarker: preview.historyMarker } : {}),
+        });
+        if (!rewound) throw new Error('the conversation changed; select the message again');
         set({
           items: replaceItems(items.slice(0, index), {
             preserveSpill: true,
@@ -36,7 +63,15 @@ export function createRewindAction(bag) {
         syncContextStats({ allowEstimated: true });
         set({ stats: { ...getState().stats } });
         flushEmitImmediate?.();
-        return { text, removed: items.length - index, messages: rewound.removed };
+        return {
+          text,
+          removed: items.length - index,
+          messages: rewound.removed,
+          ...(attachments.pastedImages ? { pastedImages: attachments.pastedImages } : {}),
+          ...(attachments.pastedTexts ? { pastedTexts: attachments.pastedTexts } : {}),
+          ...(attachments.content ? { content: attachments.content } : {}),
+          ...(attachments.notice ? { notice: attachments.notice } : {}),
+        };
       } finally {
         set({ commandBusy: false });
       }

package/src/tui/session/session-api/routes-agent-definitions.mjs

@@ -55,6 +55,7 @@ export function createAgentDefinitionApi(runtime) {
     saveLeadAgentBody: async (text) => runtime.saveLeadAgentBody?.(text) ?? '',
     getLeadStatus: () =>
       runtime.getLeadStatus?.() ?? { created: null, name: '', avatar: null, homeChatted: false, route: null },
+    getLeadHomeRoute: () => runtime.getLeadHomeRoute?.() ?? null,
     saveLeadIdentity: async (payload) => runtime.saveLeadIdentity?.(payload) ?? null,
     setLeadCreated: async (created, description) => runtime.setLeadCreated?.(created, description) ?? null,
     saveAgentDefinition: async (payload, options) => runtime.saveAgentDefinition?.(payload, options) ?? null,

package/src/tui/session/tool-approval.mjs

@@ -96,17 +96,14 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
   // Settle one entry: drop its timeout, then hand the waiter its answer. The
   // resolve stays guarded — a waiter whose caller already went away must never
   // take the rest of the queue down with it.
-  function settleToolApproval(entry, approved, reason, answers, reply, extra, device = '', forwarded = false) {
+  function settleToolApproval(entry, approved, reason, answers, reply, extra, device = '') {
     if (entry?.timer) clearTimeout(entry.timer);
     const result = { approved, reason };
     if (answers !== undefined) result.answers = answers;
     if (reply !== undefined) result.reply = reply;
-    // A human-kind request answers with its canonical response (never a value),
-    // judged against what the answering place offered: this queue's own view,
-    // or — answered on its copy — the full request the copy already narrowed.
-    const answered = forwarded ? entry?.full || entry?.request : entry?.request;
-    if (answered?.remember) {
-      Object.assign(result, normalizeHumanResponse(answered, approved, extra));
+    // A human-kind request answers with its canonical response (never a value).
+    if (entry?.request?.remember) {
+      Object.assign(result, normalizeHumanResponse(entry.request, approved, extra));
       if (device) result.device = device;
     }
     if (extra?.timedOut === true) result.timedOut = true;
@@ -120,28 +117,15 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
    *  owner had already settled it. */
   function forwardToOwner(entry, approved, reason, device, answers, reply, extra) {
     try {
-      return entry.mirror.answer(approved, reason, device, answers, reply, onlyOffered(entry.request, extra)) === true;
+      return entry.mirror.answer(approved, reason, device, answers, reply, extra) === true;
     } catch {
       return false;
     }
   }
-  /** `request` as this session shows it: a remembering scope is offered only
-   *  in the one session the request names for it (`rememberAt`, the bot's own
-   *  chat); everywhere else — and when it names none — it asks once. */
-  function viewFor(request) {
-    if (!Array.isArray(request?.remember) || request.remember.length <= 1) return request;
-    const here = ownSessionId();
-    return here && request.rememberAt === here ? request : { ...request, remember: ['once'] };
-  }
-  /** `extra` without a remember scope `view` did not offer. */
-  function onlyOffered(view, extra) {
-    if (!extra || extra.remember === undefined) return extra;
-    return (view?.remember || ['once']).includes(extra.remember) ? extra : { ...extra, remember: 'once' };
-  }
   function offerDelegatedApproval(delegated) {
     if (getDisposed() || delegated.sessionId !== ownSessionId()) return;
     if (activeToolApproval?.id === delegated.id || toolApprovalQueue.some((entry) => entry.id === delegated.id)) return;
-    toolApprovalQueue.push({ id: delegated.id, request: viewFor(delegated.request), mirror: delegated, timer: null });
+    toolApprovalQueue.push({ id: delegated.id, request: delegated.request, mirror: delegated, timer: null });
     presentNextToolApproval();
   }
   function withdrawDelegatedCopy(id, result) {
@@ -183,8 +167,7 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
     device = '',
     answers = undefined,
     reply = undefined,
-    extra = undefined,
-    { forwarded = false } = {}
+    extra = undefined
   ) {
     const targetId = String(id || '');
     if (activeToolApproval && activeToolApproval.id === targetId) {
@@ -200,16 +183,7 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
       if (entry.mirror) {
         accepted = forwardToOwner(entry, approved, reason, device, answers, reply, extra);
       } else {
-        settleToolApproval(
-          entry,
-          approved === true,
-          String(reason || ''),
-          answers,
-          reply,
-          extra,
-          String(device || ''),
-          forwarded
-        );
+        settleToolApproval(entry, approved === true, String(reason || ''), answers, reply, extra, String(device || ''));
       }
       presentNextToolApproval();
       return accepted;
@@ -218,16 +192,7 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
     if (index >= 0) {
       const [entry] = toolApprovalQueue.splice(index, 1);
       if (entry.mirror) return forwardToOwner(entry, approved, reason, device, answers, reply, extra);
-      settleToolApproval(
-        entry,
-        approved === true,
-        String(reason || ''),
-        answers,
-        reply,
-        extra,
-        String(device || ''),
-        forwarded
-      );
+      settleToolApproval(entry, approved === true, String(reason || ''), answers, reply, extra, String(device || ''));
       return true;
     }
     return false;
@@ -265,9 +230,7 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
         full.chain = surface.chain;
         full.surfaceSessionId = surface.sessionId;
       }
-      // `request` is what this session shows (and accepts answers against);
-      // `full` what the copy in the top-level chat is made from.
-      const entry = { id, request: viewFor(full), full, resolve, timer: null, delegated: Boolean(surface) };
+      const entry = { id, request: full, resolve, timer: null, delegated: Boolean(surface) };
       toolApprovalQueue.push(entry);
       armToolApprovalTimeout(entry);
       presentNextToolApproval();
@@ -277,7 +240,7 @@ export function createToolApproval({ getState, set, nextId, getDisposed, timeout
           sessionId: surface.sessionId,
           request: full,
           answer: (approved, reason, device, answers, reply, extra) =>
-            finishToolApproval(id, approved, reason, device, answers, reply, extra, { forwarded: true }),
+            finishToolApproval(id, approved, reason, device, answers, reply, extra),
         });
       }
     });

package/src/vendor/statusline/src/gateway/claude-current.mjs

@@ -5,7 +5,6 @@ import { getModelMetadataSync } from '../../../../runtime/shared/llm/model-catal
 import { providerCachedModelsSync } from '../../../../runtime/shared/llm/provider-catalog-cache.mjs';
 
 export const CLAUDE_CURRENT_MODE = 'claude-current';
-export const CLAUDE_CURRENT_CHOICE_ID = 'claude-current';
 
 const DEFAULT_FAMILY_MODEL = Object.freeze({
   opus: 'claude-opus-4-8',
@@ -20,7 +19,6 @@ const EFFORT_BUDGET = Object.freeze({
   xhigh: 32768,
   max: 32768,
 });
-const SNAPSHOT_REFRESH_MS = 30_000;
 
 function cleanString(v) {
   return typeof v === 'string' && v.trim() ? v.trim() : '';
@@ -33,15 +31,6 @@ export function isMixdogModelSelection(value) {
   return cleanString(raw).toLowerCase().startsWith('mixdog/');
 }
 
-export function isClaudeNativeModelSelection(route) {
-  return !!(
-    route &&
-    route.provider === 'anthropic-oauth' &&
-    cleanString(route.model) &&
-    !isMixdogModelSelection(route)
-  );
-}
-
 function num(v, fallback = null) {
   if (v === null || v === undefined || v === '') return fallback;
   const n = Number(v);
@@ -80,23 +69,6 @@ function readFreshJsonFile(file, maxAgeMs) {
   }
 }
 
-function snapshotEquivalent(a, b) {
-  if (!a || !b) return false;
-  const keys = [
-    'mode',
-    'source',
-    'provider',
-    'model',
-    'requestedModel',
-    'modelDisplay',
-    'effort',
-    'fast',
-    'thinkingBudgetTokens',
-    'contextWindow',
-  ];
-  return keys.every(k => (a[k] ?? null) === (b[k] ?? null));
-}
-
 // The newest roster model of a family, by the roster's own release stamps.
 function newestRosterModel(family) {
   const stamp = (row) => Date.parse(row.releaseDate) || (Number(row.created) > 0 ? Number(row.created) : 0);
@@ -298,33 +270,3 @@ export function readClaudeCodeCurrentRoute({ request = null, maxAgeMs = 10 * 60
   if (route.fast === null || route.fast === undefined) route.fast = false;
   return route;
 }
-
-export function writeClaudeCodeCurrentSnapshot(ccJsonInput) {
-  if (!ccJsonInput) return null;
-  let payload = null;
-  try { payload = JSON.parse(String(ccJsonInput)); } catch { return null; }
-  const route = routeFromPayload(payload, 'statusline');
-  if (!route || (!route.model && !route.requestedModel)) return null;
-  const file = path.join(pluginDataDir(), 'claude-current-model.json');
-  try {
-    fs.mkdirSync(path.dirname(file), { recursive: true });
-    const st = fs.existsSync(file) ? fs.statSync(file) : null;
-    const current = st ? readJsonFile(file) : null;
-    if (
-      st &&
-      Date.now() - st.mtimeMs < SNAPSHOT_REFRESH_MS &&
-      snapshotEquivalent(current, route)
-    ) {
-      return route;
-    }
-    fs.writeFileSync(file, JSON.stringify(route, null, 2) + '\n');
-  } catch { /* best-effort statusline cache */ }
-  return route;
-}
-
-export function formatClaudeCurrentChoiceLabel(route = readClaudeCodeCurrentRoute()) {
-  const parts = [`Current selection: ${route.modelDisplay || route.model || 'current model'}`];
-  if (route.effort) parts.push(String(route.effort).toUpperCase());
-  if (route.fast === true) parts.push('fast');
-  return parts.join(' · ');
-}