mixdog 0.9.145 → 0.9.146

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.145",
+  "version": "0.9.146",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/src/session-runtime/lifecycle-api.mjs

@@ -32,6 +32,32 @@ function resolveResumeCwd(session, currentCwd) {
   return session?.cwd || currentCwd;
 }
 
+function contextNumber(value) {
+  const number = Number(value);
+  return Number.isFinite(number) && number >= 0 ? number : null;
+}
+
+export function inheritanceContextFit(status) {
+  const context = status && typeof status === 'object' ? status : {};
+  const compaction = context.compaction && typeof context.compaction === 'object'
+    ? context.compaction
+    : {};
+  const used = contextNumber(
+    compaction.pressureTokens
+    ?? compaction.currentEstimatedTokens
+    ?? context.usedTokens
+    ?? context.currentEstimatedTokens,
+  );
+  const limit = contextNumber(compaction.triggerTokens ?? context.contextWindow);
+  const known = used !== null && limit !== null && limit > 0;
+  return {
+    known,
+    fits: !known || used < limit,
+    used: used ?? 0,
+    limit: limit ?? 0,
+  };
+}
+
 // Session lifecycle surface: teardown (close/abort), resume/new, and the
 // resumable-session listing. Extracted verbatim from the runtime API object;
 // stateless helpers are imported directly and the runtime injects live
@@ -51,7 +77,7 @@ export function createLifecycleApi(deps) {
     withTeardownDeadline, closePatchRuntimeIfLoaded, closeNativeToolTransports,
     stopSelfUpdateBootCheck,
     createCurrentSession, refreshRouteEffort,
-    invalidateContextStatusCache, invalidatePreSessionToolSurface,
+    computeContextStatus, invalidateContextStatusCache, invalidatePreSessionToolSurface,
     applyResolvedCwd, resolveRoute, applyDeferredToolSurface, getStandaloneTools,
     beginRoutePreparation, clearRoutePreparation,
     notificationListeners, clearRuntimeNotifications,
@@ -606,7 +632,24 @@ export function createLifecycleApi(deps) {
       if (!hasUserConversationMessage(carried)) {
         throw new Error('inheritFrom: the source session has no conversation to carry');
       }
+      const messageStart = target.messages.length;
       target.messages.push(...structuredClone(carried));
+      invalidateContextStatusCache();
+      try {
+        const fit = inheritanceContextFit(
+          typeof computeContextStatus === 'function' ? computeContextStatus() : null,
+        );
+        if (fit.known && !fit.fits) {
+          throw new Error(
+            `inheritFrom: the full conversation needs ${Math.ceil(fit.used)} tokens `
+            + `but the selected model allows ${Math.floor(fit.limit)} before compaction`,
+          );
+        }
+      } catch (error) {
+        target.messages.splice(messageStart);
+        invalidateContextStatusCache();
+        throw error;
+      }
       target.inheritedFromSessionId = source.id;
       target.updatedAt = Date.now();
       if (!clean(target.title) && clean(source.title)) target.title = source.title;

package/src/session-runtime/runtime-core.mjs

@@ -1458,6 +1458,7 @@ export async function createMixdogSessionRuntime({
     stopSelfUpdateBootCheck: () => selfUpdate.stopBootCheck(),
     createCurrentSession,
     refreshRouteEffort,
+    computeContextStatus,
     invalidateContextStatusCache,
     invalidatePreSessionToolSurface,
     applyResolvedCwd,

package/src/session-runtime/session-lifecycle.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { makeResolveRoute } from './config-helpers.mjs';
 import { resolveRouteContextState, resolveRouteEffortState } from './session-lifecycle.mjs';
+import { inheritanceContextFit } from './lifecycle-api.mjs';
 
 test('cold route metadata preserves persisted effort and enabled Fast mode', () => {
   assert.deepEqual(resolveRouteEffortState({
@@ -100,3 +101,25 @@ test('route config treats a cleared context percentage as model-default intent',
     model: 'gpt-5.4',
   }).contextPercent, undefined);
 });
+
+test('session inheritance uses the selected model compaction boundary as its fit guard', () => {
+  assert.deepEqual(inheritanceContextFit({
+    usedTokens: 80_000,
+    contextWindow: 200_000,
+    compaction: {
+      pressureTokens: 95_000,
+      triggerTokens: 100_000,
+    },
+  }), {
+    known: true,
+    fits: true,
+    used: 95_000,
+    limit: 100_000,
+  });
+  assert.equal(inheritanceContextFit({
+    compaction: {
+      pressureTokens: 100_000,
+      triggerTokens: 100_000,
+    },
+  }).fits, false);
+});

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

@@ -9,7 +9,7 @@ import { flushTuiSteeringPersist } from './tui-steering-persist.mjs';
 import { getVoiceStatus, toggleVoice } from '../lib/voice-setup.mjs';
 import { createSessionOAuthFlowRegistry } from './oauth-flows.mjs';
 import { aggregateToolCategoryEntries, aggregateDoneCategories, classifyToolCategory, formatAggregateDetail, summarizeToolResult, toolLoadingTargets } from '../../runtime/shared/tool-surface.mjs';
-import { aggregateBucketForCategory, aggregateRawResult, failureDetailText, toolCallOutcome } from './tool-result-status.mjs';
+import { aggregateBucketForCategory, aggregateRawResult, aggregateToolMembers, failureDetailText, toolCallOutcome } from './tool-result-status.mjs';
 import {
   isInternalTranscriptDisplayText,
   isTranscriptCancelledStatusText,
@@ -142,6 +142,7 @@ function buildRestoredAggregateItem(members) {
       toolName: item.name,
     }, resultText);
     calls.push({
+      callId: item.id,
       name: item.name,
       args: item.args,
       category,
@@ -150,7 +151,10 @@ function buildRestoredAggregateItem(members) {
       isExitError,
       exitCode,
       resultText,
+      rawResultText: String(item.rawResult ?? item.result ?? ''),
       resolved: true,
+      startedAt: item.startedAt,
+      completedAt: item.completedAt,
       summary: !isCallError && resultText.trim()
         ? summarizeToolResult(item.name, item.args, resultText, false)
         : null,
@@ -194,6 +198,7 @@ function buildRestoredAggregateItem(members) {
     result: displayDetail,
     text: displayDetail,
     rawResult: rawResult || null,
+    toolMembers: aggregateToolMembers(calls),
     ...(latestUiDiff ? { uiDiff: latestUiDiff.uiDiff } : {}),
     expanded: false,
     headerFinalized: true,

package/src/tui/session/tool-card-results.mjs

@@ -19,6 +19,7 @@ import {
   groupedToolResultText,
   aggregateRawResult,
   aggregateSummaries,
+  aggregateToolMembers,
   assignAggregateSummaryOrder,
   failureDetailText,
   toolCallOutcome,
@@ -104,7 +105,9 @@ export function createToolCardResults({
       callRec.isExitError = isExitError;
       callRec.exitCode = exitCode;
       callRec.resultText = text;
+      callRec.rawResultText = rawText;
       callRec.resolved = true;
+      callRec.completedAt = callRec.completedAt || Date.now();
       const allCalls = [...aggregate.calls.values()];
       const completed = allCalls.filter((r) => r.resolved).length;
       const errors = allCalls.filter((r) => r.isError).length;
@@ -138,6 +141,7 @@ export function createToolCardResults({
         count: allCalls.length,
         completedCount: visualCompleted,
         doneCategories: aggregateDoneCategories(allCalls),
+        toolMembers: aggregateToolMembers(allCalls),
         completedAt: Number(currentItem?.completedAt) || Date.now(),
       });
       card.done = true;
@@ -247,9 +251,11 @@ export function createToolCardResults({
         for (const rec of allCalls) {
           if (rec.resolved) continue;
           rec.resolved = true;
+          rec.completedAt = rec.completedAt || Date.now();
           if (!rec.completedEarly) {
             rec.isError = false;
             rec.resultText = rec.resultText || '';
+            rec.rawResultText = rec.rawResultText ?? rec.resultText;
           }
         }
         const completed = allCalls.filter((r) => r.resolved).length;
@@ -283,6 +289,7 @@ export function createToolCardResults({
           count: allCalls.length,
           completedCount: totalCompleted,
           doneCategories: aggregateDoneCategories(allCalls),
+          toolMembers: aggregateToolMembers(allCalls),
           completedAt: Date.now(),
         });
         for (const sibling of toolCards || []) {

package/src/tui/session/tool-result-status.mjs

@@ -152,7 +152,7 @@ export function aggregateRawResult(calls) {
   const chunks = [];
   for (const rec of calls || []) {
     if (rec?.resolved !== true) continue;
-    let text = String(rec?.resultText || '').replace(/\s+$/, '');
+    let text = String(rec?.rawResultText ?? rec?.resultText ?? '').replace(/\s+$/, '');
     if (!text.trim()) continue;
     const label = String(rec?.name || rec?.category || 'tool').trim() || 'tool';
     chunks.push(`${chunks.length + 1}. ${label}\n${text}`);
@@ -160,6 +160,36 @@ export function aggregateRawResult(calls) {
   return chunks.join('\n\n');
 }
 
+/** Preserve the atomic calls behind a visual aggregate. Renderers can keep the
+ * aggregate as one quiet summary row while revealing the original tool names,
+ * arguments, and outputs in provider order. */
+export function aggregateToolMembers(calls) {
+  const source = calls?.values?.() || calls || [];
+  const members = [];
+  for (const rec of source) {
+    if (!rec || typeof rec !== 'object') continue;
+    const completed = rec.resolved === true || rec.completedEarly === true;
+    members.push({
+      kind: 'tool',
+      ...(rec.callId != null ? { id: rec.callId } : {}),
+      name: String(rec.name || 'tool'),
+      args: rec.args ?? {},
+      result: rec.resultText ?? null,
+      rawResult: rec.rawResultText ?? rec.resultText ?? null,
+      isError: rec.isError === true,
+      errorCount: rec.isError === true ? 1 : 0,
+      callErrorCount: rec.isCallError === true ? 1 : 0,
+      exitErrorCount: rec.isExitError === true ? 1 : 0,
+      count: 1,
+      completedCount: completed ? 1 : 0,
+      headerFinalized: completed,
+      ...(Number(rec.startedAt) > 0 ? { startedAt: Number(rec.startedAt) } : {}),
+      ...(Number(rec.completedAt) > 0 ? { completedAt: Number(rec.completedAt) } : {}),
+    });
+  }
+  return members;
+}
+
 export function aggregateBucketForCategory(category, { agentBatch = '' } = {}) {
   // Merge consecutive tool calls of the SAME category into one aggregate card;
   // a different category opens a fresh card (no cross-category merge). The

package/src/tui/session/tool-result-status.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 
 import {
+  aggregateToolMembers,
   failureDetailText,
   shellCommandExitCode,
   toolCallOutcome,
@@ -99,3 +100,32 @@ test('shared TUI/desktop tone keeps command failures warning and tool failures r
   assert.equal(deriveToolOutcomeTone({ terminalStatus: 'exit', exitFailedCount: 1 }), 'warning');
   assert.equal(deriveToolOutcomeTone({ terminalStatus: 'failed', callFailedCount: 1 }), 'error');
 });
+
+test('aggregate members preserve atomic tool identity, inputs, outputs, and order', () => {
+  const members = aggregateToolMembers([
+    {
+      callId: 'call-read',
+      name: 'read',
+      args: { file_path: 'a.ts' },
+      resultText: 'source',
+      resolved: true,
+      isError: false,
+    },
+    {
+      callId: 'call-shell',
+      name: 'shell',
+      args: { command: 'exit 2' },
+      resultText: 'boom',
+      rawResultText: '[exit code: 2]\nboom',
+      resolved: true,
+      isError: false,
+      isExitError: true,
+    },
+  ]);
+  assert.deepEqual(members.map(({ id, name, args, result, rawResult, exitErrorCount }) => ({
+    id, name, args, result, rawResult, exitErrorCount,
+  })), [
+    { id: 'call-read', name: 'read', args: { file_path: 'a.ts' }, result: 'source', rawResult: 'source', exitErrorCount: 0 },
+    { id: 'call-shell', name: 'shell', args: { command: 'exit 2' }, result: 'boom', rawResult: '[exit code: 2]\nboom', exitErrorCount: 1 },
+  ]);
+});

package/src/tui/session/turn.mjs

@@ -9,7 +9,7 @@ import { isCancelLikeError } from '../../runtime/shared/err-text.mjs';
 import { toolCallId, toolResultCallId, toolCallName, toolCallArgs } from './tool-call-fields.mjs';
 import { promptDisplayText, STEERING_SUPPRESSED_DISPLAY } from './queue-helpers.mjs';
 import { TUI_FRAME_MS, yieldToRenderer } from './render-timing.mjs';
-import { aggregateRawResult, aggregateBucketForCategory, aggregateSummaries, assignAggregateSummaryOrder, failureDetailText, toolCallOutcome } from './tool-result-status.mjs';
+import { aggregateRawResult, aggregateBucketForCategory, aggregateSummaries, aggregateToolMembers, assignAggregateSummaryOrder, failureDetailText, toolCallOutcome } from './tool-result-status.mjs';
 
 export const STREAM_BATCH_INTERVAL_MS = TUI_FRAME_MS;
 
@@ -327,6 +327,7 @@ export function createRunTurn(bag) {
           result: displayDetail,
           text: displayDetail,
           rawResult: rawResult || null,
+          toolMembers: aggregateToolMembers(allCalls),
           isError: errors > 0,
           errorCount: errors,
           callErrorCount: callErrors,
@@ -403,6 +404,7 @@ export function createRunTurn(bag) {
         count: aggregate.calls.size,
         completedCount: [...aggregate.calls.values()].filter((r) => r.resolved || r.completedEarly).length,
         categories: Object.fromEntries(aggregate.categories),
+        toolMembers: aggregateToolMembers(aggregate.calls),
       };
       if (aggregate.pushed) {
         patchItem(aggregate.itemId, patch);
@@ -678,7 +680,9 @@ export function createRunTurn(bag) {
         callRec.isExitError = isExitError;
         callRec.exitCode = exitCode;
         callRec.resultText = text;
+        callRec.rawResultText = rawText;
         callRec.completedEarly = true;
+        callRec.completedAt = callRec.completedAt || Date.now();
         const allCalls = [...aggregate.calls.values()];
         const completedCount = allCalls.filter((r) => r.resolved || r.completedEarly).length;
         const errors = allCalls.filter((r) => r.isError).length;
@@ -710,6 +714,7 @@ export function createRunTurn(bag) {
           exitErrorCount: exitErrors,
           count: allCalls.length,
           completedCount: visualCompleted,
+          toolMembers: aggregateToolMembers(allCalls),
         };
         if (visualCompleted >= allCalls.length) {
           patch.completedAt = Number(currentItem?.completedAt) || Date.now();
@@ -889,7 +894,7 @@ export function createRunTurn(bag) {
                 count: Number(prevCategory?.count || 0) + Number(categoryEntry.count || 1),
               });
             }
-            aggregateCard.calls.set(callKey, { name, args, category, summary: null, summarySeq: null, isError: false, isCallError: false, isExitError: false, exitCode: null, resultText: null, resolved: false, completedEarly: false });
+            aggregateCard.calls.set(callKey, { callId: callKey, name, args, category, summary: null, summarySeq: null, isError: false, isCallError: false, isExitError: false, exitCode: null, resultText: null, rawResultText: null, resolved: false, completedEarly: false, startedAt: Date.now(), completedAt: null });
             touchedAggregates.add(aggregateCard);
             const card = { itemId: aggregateCard.itemId, callId: callKey, done: false, aggregate: aggregateCard };
             if (callId) {