mixdog 0.9.97 → 0.9.99

package/src/tui/session/live-share.mjs

@@ -299,14 +299,20 @@ export function createLiveShare({
         try { socket.destroy(); } catch { /* already gone */ }
       });
       attachLineReader(socket, (frame) => {
-        if (frame.t === 'submit' && typeof frame.text === 'string' && frame.text.trim()) {
+        if (frame.t === 'submit' && (
+          (typeof frame.text === 'string' && frame.text.trim())
+          || typeof frame.prompt === 'string'
+          || Array.isArray(frame.prompt)
+        )) {
           // Optional submission metadata (additive, old viewers omit it): the
           // originating surface's submission id must survive the pipe so its
           // optimistic user row releases when the SAME id settles in the
           // owner's transcript (user: 방금 친 메세지가 2개 남는다).
           const id = typeof frame.id === 'string' && frame.id.trim() ? frame.id : undefined;
           const submittedAt = Number(frame.submittedAt);
-          const delivered = onRemoteSubmit(frame.text, {
+          const prompt = frame.prompt ?? frame.text;
+          const delivered = onRemoteSubmit(prompt, {
+            ...(frame.options && typeof frame.options === 'object' ? frame.options : {}),
             ...(id ? { id } : {}),
             ...(Number.isFinite(submittedAt) && submittedAt > 0
               ? { submittedAt: Math.round(submittedAt) }
@@ -660,16 +666,21 @@ export function createLiveShare({
     ensure: ensureShare,
     viewerConnected: () => clientUp,
     waitForViewerSync,
-    sendSubmit(text, meta = null) {
+    sendSubmit(prompt, meta = null) {
       if (!clientUp || !client) return false;
       const ackId = `ack-${process.pid}-${Date.now()}-${(submitAckSeq += 1)}`;
       const onUndelivered = typeof meta?.onUndelivered === 'function' ? meta.onUndelivered : null;
       try {
         const id = meta && meta.id != null && String(meta.id).trim() ? String(meta.id) : undefined;
         const submittedAt = Number(meta?.submittedAt);
+        const displayText = String(meta?.displayText
+          ?? meta?.options?.displayText
+          ?? (typeof prompt === 'string' ? prompt : ''));
         client.write(frameLine({
           t: 'submit',
-          text: String(text),
+          text: displayText,
+          prompt,
+          ...(meta?.options && typeof meta.options === 'object' ? { options: meta.options } : {}),
           ack: ackId,
           ...(id ? { id } : {}),
           ...(Number.isFinite(submittedAt) && submittedAt > 0
@@ -723,9 +734,10 @@ export function createLiveShare({
  * the SAME identity and the owner reuses it for the settled user row — which is
  * what releases the submitting surface's optimistic bubble.
  */
-export function forwardViewerSubmit({ text, options = {}, share, spool, pid = process.pid }) {
+export function forwardViewerSubmit({ prompt = null, text, options = {}, share, spool, pid = process.pid }) {
   const value = String(text || '').trim();
-  if (!value) return false;
+  const content = prompt ?? value;
+  if (!value && !(Array.isArray(content) && content.length > 0)) return false;
   // Reconcile first so a session that became attachable this event-loop turn
   // takes the instant pipe path instead of the durable detour.
   try { share.ensure?.(); } catch { /* durable fallback below */ }
@@ -736,9 +748,11 @@ export function forwardViewerSubmit({ text, options = {}, share, spool, pid = pr
   // A pipe WRITE is not a delivery: the owner may refuse the prompt and the
   // socket may die between write and read, so an unacknowledged submit is
   // re-delivered through the spool — late, never lost.
-  if (share.sendSubmit(value, {
+  if (share.sendSubmit(content, {
     id: submissionId,
     submittedAt: options.submittedAt,
+    displayText: value,
+    options,
     onUndelivered: deliverDurably,
   })) return true;
   return deliverDurably();

package/src/tui/session/queue-helpers.mjs

@@ -9,6 +9,7 @@ import {
   parseAgentJob,
   parseSyntheticAgentMessage,
 } from './agent-envelope.mjs';
+import { attachmentTextForPart, isAttachmentReference } from '../../runtime/attachments/store.mjs';
 
 const QUEUE_PRIORITY = { now: 0, next: 1, later: 2 };
 
@@ -79,7 +80,7 @@ export function promptContentText(content) {
   if (Array.isArray(content)) {
     return content.map((part) => {
       if (typeof part === 'string') return part;
-      if (part?.type === 'text') return part.text || '';
+      if (part?.type === 'text') return isAttachmentReference(part) ? attachmentTextForPart(part) : (part.text || '');
       if (part?.type === 'image') return '[Image]';
       if (part?.type === 'file') return '[File]';
       return part?.text || '';
@@ -151,10 +152,9 @@ export function mergePastedImages(entries) {
   return Object.keys(out).length > 0 ? out : null;
 }
 
-// Byte-free image metadata for the user transcript item. The prompt content
-// keeps the full base64 payload for the provider send; transcript items (and
-// therefore desktop snapshots published on every update) carry only
-// name/mime/size so previews can render without bloating state.
+// Byte-free image metadata for the user transcript item. Prompt content carries
+// only a content-addressed attachment ref after daemon intake; transcript items
+// and desktop snapshots carry just name/mime/size.
 export function promptContentImageMeta(content, pastedImages) {
   const parts = Array.isArray(content) ? content.filter((part) => part?.type === 'image') : [];
   if (parts.length === 0) return null;
@@ -168,7 +168,7 @@ export function promptContentImageMeta(content, pastedImages) {
       id: meta?.id ?? null,
       name: String(meta?.filename || `Image ${index + 1}`),
       mimeType: String(part.mimeType || part.mediaType || meta?.mediaType || 'image/png'),
-      bytes: data.length,
+      bytes: Number(part.sizeBytes) || data.length,
     };
   });
 }

package/src/tui/session/session-api-ext.mjs

@@ -584,9 +584,8 @@ export function createSessionApiB(bag) {
       }
     },
     // Desktop composer image attach: run the SAME optional-sharp resize
-    // pipeline the TUI paste path uses (<=2000x2000, 5MB-base64 token budget,
-    // identical no-sharp size errors) so both clients send identical image
-    // payloads to the provider.
+    // pipeline the TUI paste path uses. The current provider selects the
+    // Anthropic 2000px/5MB profile or OpenAI 2048px/1536-patch profile.
     resizeImage: async ({ data, mimeType = 'image/png', filename = '' } = {}) => {
       const base64 = String(data || '');
       if (!base64) throw new Error('resizeImage: image payload is required');
@@ -595,7 +594,10 @@ export function createSessionApiB(bag) {
       const attachment = await imageAttachmentFromBuffer(
         Buffer.from(base64, 'base64'),
         String(mimeType || 'image/png'),
-        { filename: String(filename || 'Pasted image') },
+        {
+          filename: String(filename || 'Pasted image'),
+          provider: routeState().provider || '',
+        },
       );
       return {
         data: attachment.content,
@@ -647,6 +649,12 @@ export function createSessionApiB(bag) {
     getTurnReviewDiff: async (options = {}) => {
       return (await runtime.getTurnReviewDiff?.(options)) ?? { supported: false, files: [], patch: '' };
     },
+    revertTurnReview: async () => {
+      if (typeof runtime.revertTurnReview !== 'function') {
+        throw new Error('Turn review revert is unavailable');
+      }
+      return await runtime.revertTurnReview();
+    },
     revertTurnReviewFile: async (file) => {
       if (typeof runtime.revertTurnReviewFile !== 'function') {
         throw new Error('Turn review revert is unavailable');

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

@@ -8,6 +8,7 @@ import { createSessionApiB } from './session-api-ext.mjs';
 import { buildDoctorReport } from '../app/doctor.mjs';
 import { recomputePromptHistory } from './prompt-history.mjs';
 import { appendPromptHistory, buildMergedPromptHistory, loadPromptHistory, promptHistoryKey } from '../prompt-history-store.mjs';
+import { hydratePastedAttachments } from '../../runtime/attachments/store.mjs';
 
 export function createSessionApi(bag) {
   const api = { ...createSessionApiA(bag), ...createSessionApiB(bag) };
@@ -736,7 +737,15 @@ export function createSessionApiA(bag) {
         } catch { /* best-effort */ }
       }, 150);
       pendingAfterAbortKick.unref?.();
-      return { aborted, restoreText, pastedImages: restorePastedImages, discardPastedImages, pastedTexts: restorePastedTexts, discardPastedTexts };
+      const restored = hydratePastedAttachments(restorePastedImages, restorePastedTexts);
+      return {
+        aborted,
+        restoreText,
+        pastedImages: restored.pastedImages,
+        discardPastedImages,
+        pastedTexts: restored.pastedTexts,
+        discardPastedTexts,
+      };
     },
   };
 }

package/src/tui/session/session-flow.mjs

@@ -6,6 +6,7 @@ import { resetAllStreamingMarkdownStablePrefixes } from '../markdown/streaming-m
 import { createSessionStats } from './session-stats.mjs';
   import { queuePriorityValue, defaultQueuePriority, isQueuedEntryEditable, isQueuedEntryVisible, isSlashQueuedEntry, notificationDisplayText, sessionActivityTimestamp, promptDisplayText, promptContentImageMeta, mergePromptContents, mergePastedImages, mergePastedTexts, callCommitCallbacks, STEERING_SUPPRESSED_DISPLAY } from './queue-helpers.mjs';
 import { appendTuiSteeringPersist, dropTuiSteeringPersist, drainTuiSteeringPersist } from './tui-steering-persist.mjs';
+import { hydratePastedAttachments } from '../../runtime/attachments/store.mjs';
 
 export function createSessionFlow(bag) {
   const {
@@ -560,12 +561,13 @@ export function createSessionFlow(bag) {
     removeQueuedEntries(queued);
     const queuedText = queued.map((item) => item.text).filter((text) => String(text || '').trim()).join('\n');
     const combinedText = [queuedText, String(currentText || '')].filter((text) => text.trim()).join('\n');
+    const hydrated = hydratePastedAttachments(mergePastedImages(queued), mergePastedTexts(queued));
     return {
       count: queued.length,
       ids: queued.map((item) => String(item.id || '')).filter(Boolean),
       text: combinedText,
-      pastedImages: mergePastedImages(queued),
-      pastedTexts: mergePastedTexts(queued),
+      pastedImages: hydrated.pastedImages,
+      pastedTexts: hydrated.pastedTexts,
     };
   }
 

package/src/tui/session-local.mjs

@@ -111,8 +111,12 @@ import { createSessionApi } from './session/session-api.mjs';
 import { createFrameBatchedStorePublisher } from './session/frame-batched-store.mjs';
 import { createLiveShare, forwardViewerSubmit, liveSharePipePath } from './session/live-share.mjs';
 import { displayModelName } from '../ui/model-display.mjs';
+import { prewarmImageResizer } from '../runtime/agent/orchestrator/tools/builtin/read-image-resize.mjs';
 
 const SESSION_RUNTIME_MODULE = '../mixdog-session-runtime.mjs';
+// Start the native binding load with daemon startup rather than making the
+// user's first image attachment pay the cold dynamic-import cost.
+void prewarmImageResizer();
 
 // The runtime graph is imported lazily, but that import (measured ~250ms) used
 // to land inside the FIRST session runtime creation, which desktop performs while it
@@ -869,9 +873,13 @@ export async function createLocalSessionRuntime({
       if (injected.length === 0) return;
       for (const item of injected) {
         if (!item || typeof item !== 'object' || (item.text == null && item.content == null)) continue;
-        const text = item.text ?? item.content;
+        const content = item.content ?? item.text;
         const id = typeof item.id === 'string' && item.id.trim() ? item.id.trim() : undefined;
-        bag.enqueue(text, id ? { id } : {});
+        bag.enqueue(content, {
+          ...(item.options && typeof item.options === 'object' ? item.options : {}),
+          ...(item.text ? { displayText: item.text } : {}),
+          ...(id ? { id } : {}),
+        });
       }
       void bag.drain();
     })().catch(() => { /* the watch/tick pair retries */ });
@@ -889,7 +897,7 @@ export async function createLocalSessionRuntime({
     socketPathFor: (id) => liveSharePipePath(id, sessionPath(id)),
     getPublishedState: () => publishedState,
     listeners,
-    onRemoteSubmit: (text, meta) => {
+    onRemoteSubmit: (prompt, meta) => {
       // A refusal must be REPORTED, never silent. This session runtime can be unable to
       // take a foreign prompt (disposed, or it became an attached viewer
       // itself); swallowing it here is what made a submitted message vanish
@@ -900,8 +908,8 @@ export async function createLocalSessionRuntime({
       // the settled user item then carry the id the submitting surface used
       // for its optimistic row, so that row releases instead of duplicating.
       const queued = bag.enqueue(
-        text,
-        meta && meta.id ? { id: meta.id, submittedAt: meta.submittedAt } : {},
+        prompt,
+        meta && typeof meta === 'object' ? meta : {},
       ) !== false;
       void bag.drain();
       return queued;
@@ -951,6 +959,7 @@ export async function createLocalSessionRuntime({
     if (!text) return { accepted: false };
     return {
       accepted: forwardViewerSubmit({
+        prompt,
         text,
         options,
         share: liveShare,
@@ -960,6 +969,7 @@ export async function createLocalSessionRuntime({
           content: prompt,
           text,
           id: submissionId,
+          options,
         }) === true,
       }),
     };