mixdog 0.9.68 → 0.9.70

package/src/runtime/agent/orchestrator/session/loop/stored-tool-args.mjs

@@ -1,12 +1,16 @@
 // Stored tool-call argument compaction/restoration, extracted from loop.mjs.
 // Long body/command args are truncated with a sha256-tagged head/tail preview
-// when persisted into assistant history. Failed command/script calls may
-// restore their full text, but mutation bodies stay compacted so stale patches
-// cannot be replayed from history.
+// when persisted into assistant history. A FAILED call restores its full text
+// (command/script AND mutation bodies): the failed mutation rolled back, so its
+// patch text is the model's own draft, and leaving only the marker made models
+// copy `[mixdog compacted …]` back as literal patch input. Bodies of calls that
+// did NOT fail stay compacted so an already-applied patch cannot be replayed.
 import { createHash } from 'crypto';
 
 const STORED_TOOL_ARG_BODY_KEY_RE = /^(?:content|old_string|new_string|patch|rewrite)$/i;
 const STORED_TOOL_ARG_LONG_KEY_RE = /^(?:command|script)$/i;
+// Marker-alone value produced by compactStoredToolArgString for body keys.
+const STORED_TOOL_ARG_MARKER_RE = /^\[mixdog compacted\b[^\]\n]*\]$/;
 const STORED_TOOL_ARG_BODY_LIMIT = 2_000;
 const STORED_TOOL_ARG_LONG_LIMIT = 8_000;
 const STORED_TOOL_ARG_PREVIEW_HEAD = 360;
@@ -60,13 +64,15 @@ export function compactToolCallsForHistory(calls) {
 
 // Restore retry-safe long command/script text for ONE failed tool call inside a
 // history assistant message whose toolCalls were compacted at push time.
-// Mutation bodies (patch, old_string, new_string, content, rewrite) deliberately
-// remain compacted: replaying their stale pre-failure text can repeat partial
-// writes or overwrite newer state. Must run BEFORE the message is first
-// transmitted so it never mutates an already-cached prefix.
+// Mutation bodies (patch, old_string, new_string, content, rewrite) are restored
+// too: this call failed, so nothing it described is on disk (sections roll back)
+// and the body is the model's own draft to correct. Only a value that is still
+// the marker is replaced, so a body already carrying real text is never
+// overwritten. Must run BEFORE the message is first transmitted so it never
+// mutates an already-cached prefix.
 //
-// Only command/script keys are restored, at ANY depth. Every body key and every
-// other field is taken from the compacted snapshot captured at push time.
+// Restoration reaches command/script and body keys at ANY depth. Every other
+// field is taken from the compacted snapshot captured at push time.
 export function restoreToolCallBodyForId(assistantMsg, originalCalls, callId) {
     if (!assistantMsg || !Array.isArray(assistantMsg.toolCalls) || !callId) return;
     if (!Array.isArray(originalCalls)) return;
@@ -78,11 +84,17 @@ export function restoreToolCallBodyForId(assistantMsg, originalCalls, callId) {
     tc.arguments = _restoreCompactedBodies(tc.arguments, orig.arguments, '');
 }
 
-// Recursively rebuild a compacted args tree: replace ONLY retry-safe long
-// command/script fields with their full originals and keep mutation bodies plus
-// every other field from the compacted snapshot.
+// Recursively rebuild a compacted args tree: replace retry-safe long
+// command/script fields and still-compacted mutation bodies with their full
+// originals; every other field stays as captured in the compacted snapshot.
 function _restoreCompactedBodies(tcVal, origVal, key) {
-    if (STORED_TOOL_ARG_BODY_KEY_RE.test(key)) return tcVal;
+    if (STORED_TOOL_ARG_BODY_KEY_RE.test(key)) {
+        if (typeof tcVal === 'string' && typeof origVal === 'string'
+            && STORED_TOOL_ARG_MARKER_RE.test(tcVal.trim())) {
+            return origVal;
+        }
+        return tcVal;
+    }
     if (STORED_TOOL_ARG_LONG_KEY_RE.test(key) && typeof origVal === 'string') {
         return origVal;
     }

package/src/runtime/agent/orchestrator/session/manager.mjs

@@ -98,17 +98,6 @@ export {
     _buildAgentSpecific,
 } from './manager/rules-cache.mjs';
 
-// ── Test-only aliases for the legacy auto-compact-limit migration +
-//    buffer-config preservation (scripts/compact-trigger-migration-smoke.mjs). ─
-import {
-    resolveSessionContextMeta,
-    compactTriggerForSession,
-    preserveBufferConfigFields,
-} from './manager/context-meta.mjs';
-export const _resolveSessionContextMeta = resolveSessionContextMeta;
-export const _compactTriggerForSession = compactTriggerForSession;
-export const _preserveBufferConfigFields = preserveBufferConfigFields;
-
 // ── Session lifecycle / ask / crud / close / cleanup ──────────────────────
 export { SessionClosedError } from './manager/session-errors.mjs';
 export { setAgentRuntime } from './manager/agent-runtime-singleton.mjs';