mixdog 0.9.83 → 0.9.85

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

@@ -43,8 +43,12 @@ export function createSessionFlow(bag) {
     const mode = options.mode || 'prompt';
     const priority = options.priority || defaultQueuePriority(mode);
     const displayText = promptDisplayText(text, options);
+    const submittedAt = Number(options.submittedAt);
     return {
       id: options.id || nextId(),
+      submittedAt: Number.isFinite(submittedAt) && submittedAt > 0
+        ? Math.round(submittedAt)
+        : Date.now(),
       text: displayText,
       content: text,
       pastedImages: options.pastedImages && typeof options.pastedImages === 'object' ? options.pastedImages : null,
@@ -283,6 +287,8 @@ export function createSessionFlow(bag) {
       set({ queued: [...getState().queued, entry] });
       if (isQueuedEntryEditable(entry)) flushEmitImmediate?.();
     }
+    const queueAgeMs = Math.max(0, Date.now() - Number(entry.submittedAt || Date.now()));
+    tuiDebug(`prompt-queued id=${String(entry.id)} busy=${getState().busy ? 1 : 0} ageMs=${queueAgeMs}`);
     if (getState().busy) tuiDebug(`busy-queue enqueue mode=${entry.mode} pending=${pending.length}`);
     void drain();
     return true;
@@ -309,24 +315,28 @@ export function createSessionFlow(bag) {
       if (batch.length === 0) break;
       for (const entry of batch) {
         const content = entry.content;
+        const steeringMeta = {
+          id: entry.id,
+          submittedAt: entry.submittedAt,
+          ...(Array.isArray(entry.images) && entry.images.length ? { images: entry.images } : {}),
+        };
         if (entry.suppressDisplay) {
           // Model-visible twin of an already-rendered live completion: deliver
           // content to the model but flag onSteerMessage to skip the duplicate
           // transcript card (no fall-back to content-derived display text).
           if (Array.isArray(content) ? content.length > 0 : String(content ?? '').trim().length > 0) {
-            out.push({ text: STEERING_SUPPRESSED_DISPLAY, content });
+            out.push({ ...steeringMeta, text: STEERING_SUPPRESSED_DISPLAY, content });
           }
           continue;
         }
-        const value = typeof content === 'string'
-          ? content.trim()
-          : { text: String(entry.text || '').trim(), content };
-        if (typeof value === 'string') {
-          if (value.length > 0) out.push(value);
-        } else if (Array.isArray(value.content)) {
-          if (value.content.length > 0) out.push(value);
-        } else if (String(value.content ?? '').trim().length > 0) {
-          out.push(value);
+        const displayText = String(entry.text || '').trim();
+        if (typeof content === 'string') {
+          const value = content.trim();
+          if (value.length > 0) out.push({ ...steeringMeta, text: displayText || value, content: value });
+        } else if (Array.isArray(content)) {
+          if (content.length > 0) out.push({ ...steeringMeta, text: displayText, content });
+        } else if (String(content ?? '').trim().length > 0) {
+          out.push({ ...steeringMeta, text: displayText, content });
         }
       }
       commitSteeringQueueEntries(batch);

package/src/tui/engine/turn.mjs

@@ -17,8 +17,11 @@ export function createRunTurn(bag) {
   } = bag;
   // Small fallbacks keep isolated createRunTurn harnesses source-compatible;
   // the real engine supplies atomic implementations that also maintain revision.
-  const updateStreamingTail = updateStreamingTailFromStore || ((id, patch = {}) => {
-    set({ streamingTail: { ...(getState().streamingTail || {}), ...patch, kind: 'assistant', id, streaming: true } });
+  const updateStreamingTail = updateStreamingTailFromStore || ((id, patch = {}, extra = {}) => {
+    set({
+      streamingTail: { ...(getState().streamingTail || {}), ...patch, kind: 'assistant', id, streaming: true },
+      ...extra,
+    });
     return true;
   });
   const settleStreamingTail = settleStreamingTailFromStore || ((id, patch = {}) => {
@@ -671,7 +674,12 @@ export function createRunTurn(bag) {
           patch.spinner = { ...getState().spinner, responseLength: responseLengthVal, thinking: false, thinkingLastEndedAt: _pendingThinkingLastEndedAt || getState().spinner.thinkingLastEndedAt, mode: compactingActive ? 'compacting' : 'responding' };
           _publishedThinkingActive = false;
         }
-        if (Object.keys(patch).length > 0) set(patch);
+        if (patch.streamingTail) {
+          const { streamingTail, ...extra } = patch;
+          updateStreamingTail(streamingTail.id, streamingTail, extra);
+        } else if (Object.keys(patch).length > 0) {
+          set(patch);
+        }
         _pendingThinkingLastEndedAt = 0;
       }
       if (_pendingThinkFlush) {
@@ -800,7 +808,7 @@ export function createRunTurn(bag) {
         onStreamDelta: () => {
           markTurnProgress('stream-delta');
         },
-        onSteerMessage: (text) => {
+        onSteerMessage: (text, steeringMeta = {}) => {
           if (!markTurnProgress('steer-message')) return;
           // A suppressed live-completion twin is model-visible only; its
           // Response card was already pushed at delivery time. Skip the
@@ -826,7 +834,17 @@ export function createRunTurn(bag) {
             // same-category tool call opens a fresh card instead of reusing
             // one whose count would then change ABOVE this steered user item.
             clearAggregateContinuation();
-            pushUserOrSyntheticItem(value, undefined, 'injected');
+            const steeringIds = Array.isArray(steeringMeta?.ids)
+              ? steeringMeta.ids.filter((id) => id !== undefined && id !== null)
+              : [];
+            pushUserOrSyntheticItem(
+              value,
+              steeringIds[0],
+              'injected',
+              Array.isArray(steeringMeta?.images) && steeringMeta.images.length
+                ? { images: steeringMeta.images }
+                : null,
+            );
           }
         },
         onToolCall: async (_iter, calls) => {
@@ -1091,17 +1109,11 @@ export function createRunTurn(bag) {
           _emittedVisibleText = '';
           if (currentAssistantId) {
             if (currentAssistantText) {
-              set({
-                streamingTail: {
-                  ...(getState().streamingTail || {}),
-                  kind: 'assistant',
-                  id: currentAssistantId,
-                  text: currentAssistantText,
-                  streaming: true,
-                  at: getState().streamingTail?.at || Date.now(),
-                  ...turnRouteMeta,
-                },
-              });
+              updateStreamingTail(currentAssistantId, {
+                text: currentAssistantText,
+                at: getState().streamingTail?.at || Date.now(),
+                ...turnRouteMeta,
+              }, {}, { resetText: true });
             } else {
               clearStreamingTail(currentAssistantId);
               currentAssistantId = null;

package/src/tui/engine.mjs

@@ -537,12 +537,28 @@ export async function createEngineSession({
       ...extra,
     });
   };
-  const updateStreamingTail = (id, patch = {}, extra = {}) => {
+  // Non-enumerable so the marker never enters persisted transcript items,
+  // live-share JSON, or renderer snapshots. The desktop host reads the shared
+  // Symbol.for key before cloning and uses it to prove that a growing text is
+  // an append, avoiding an O(total text) startsWith check on every frame.
+  const streamingTailTextEpochKey = Symbol.for('mixdog.streaming-tail-text-epoch');
+  let streamingTailTextEpoch = 0;
+  const updateStreamingTail = (id, patch = {}, extra = {}, { resetText = false } = {}) => {
     if (id == null) return false;
     const current = state.streamingTail?.id === id
       ? state.streamingTail
       : { kind: 'assistant', id, text: '', streaming: true };
     const next = { ...current, ...patch, kind: 'assistant', id, streaming: true };
+    const currentTextEpoch = current[streamingTailTextEpochKey];
+    const textEpoch = !resetText && Number.isSafeInteger(currentTextEpoch)
+      ? currentTextEpoch
+      : ++streamingTailTextEpoch;
+    Object.defineProperty(next, streamingTailTextEpochKey, {
+      value: textEpoch,
+      enumerable: false,
+      configurable: false,
+      writable: false,
+    });
     let changed = state.streamingTail !== current;
     if (!changed) {
       for (const [key, value] of Object.entries(next)) {