@rynfar/meridian 1.62.3 → 1.62.4

package/dist/{cli-3ysfatce.js → cli-n1jsth00.js}

@@ -1974,13 +1974,6 @@ ${history}
 
 ` + last.text;
 }
-function framePassthroughContinuation(delta) {
-  if (!delta)
-    return delta;
-  return `${PASSTHROUGH_CONTINUATION_LEAD_IN}
-
-${delta}`;
-}
 function stripNonStandardStreamFields(event) {
   if (event && typeof event === "object") {
     const e = event;
@@ -2119,7 +2112,7 @@ function extractSystemText(system) {
   return system.filter((b) => b?.type === "text" && typeof b.text === "string" && b.text).map((b) => b.text).filter((text) => !TRANSPORT_HEADER_BLOCK.test(text)).join(`
 `);
 }
-var HASH_IGNORED_BLOCK_TYPES, HASH_HANDLED_BLOCK_TYPES, HASH_SERIALIZED_BLOCK_TYPES, PASSTHROUGH_CONTINUATION_LEAD_IN, MULTIMODAL_TYPES, TOOL_TARGET_KEYS, TOOL_TARGET_MAX = 80, CONTENT_SUMMARY_MAX = 120, TRANSPORT_HEADER_BLOCK;
+var HASH_IGNORED_BLOCK_TYPES, HASH_HANDLED_BLOCK_TYPES, HASH_SERIALIZED_BLOCK_TYPES, MULTIMODAL_TYPES, TOOL_TARGET_KEYS, TOOL_TARGET_MAX = 80, CONTENT_SUMMARY_MAX = 120, TRANSPORT_HEADER_BLOCK;
 var init_messages = __esm(() => {
   HASH_IGNORED_BLOCK_TYPES = new Set(["thinking", "redacted_thinking"]);
   HASH_HANDLED_BLOCK_TYPES = new Set(["text", "tool_use", "tool_result"]);
@@ -2136,7 +2129,6 @@ var init_messages = __esm(() => {
     "tool_search_tool_result",
     "container_upload"
   ]);
-  PASSTHROUGH_CONTINUATION_LEAD_IN = "The tool calls from your previous turn were forwarded to the client, which has now executed them — " + "their results follow. The instruction to end that turn without further text applied to it alone and " + "is now discharged: continue the work and respond.";
   MULTIMODAL_TYPES = new Set(["image", "document", "file"]);
   TOOL_TARGET_KEYS = ["filePath", "file_path", "path", "command", "code", "pattern", "query", "url"];
   TRANSPORT_HEADER_BLOCK = /^\s*x-anthropic-[a-z0-9-]*header\s*:/i;
@@ -11111,6 +11103,17 @@ function noteAssistantContent(tracker, content) {
     }
   }
 }
+function noteAssistantMessage(tracker, message) {
+  const m = message;
+  if (m?.type !== "assistant")
+    return;
+  const content = m.message?.content;
+  const before = tracker.expected.size;
+  noteAssistantContent(tracker, content);
+  if (tracker.expected.size > before) {
+    tracker.toolCallAssistantUuid = typeof m.uuid === "string" && m.uuid.length > 0 ? m.uuid : undefined;
+  }
+}
 function noteUserContent(tracker, content) {
   if (!Array.isArray(content))
     return;
@@ -11121,43 +11124,69 @@ function noteUserContent(tracker, content) {
     }
   }
 }
-function shouldEarlyStop(tracker) {
-  if (tracker.fired)
-    return false;
+function allForwardedCallsResolved(tracker) {
   if (tracker.expected.size === 0)
     return false;
   for (const id of tracker.expected) {
     if (!tracker.resolved.has(id))
       return false;
   }
+  return true;
+}
+function isCompleteToolResultContinuation(messages, expectedIds) {
+  if (expectedIds.length === 0 || messages.length === 0)
+    return false;
+  const expected = new Set(expectedIds);
+  const actual = new Set;
+  const echoedCalls = new Set;
+  let sawUser = false;
+  let sawNonToolResult = false;
+  for (const message of messages) {
+    if (message.role === "assistant" && !sawUser) {
+      if (Array.isArray(message.content)) {
+        for (const rawBlock of message.content) {
+          const block = rawBlock;
+          if (block?.type !== "tool_use")
+            continue;
+          if (typeof block.id !== "string" || !expected.has(block.id) || echoedCalls.has(block.id))
+            return false;
+          echoedCalls.add(block.id);
+        }
+      }
+      continue;
+    }
+    if (message.role !== "user" || !Array.isArray(message.content) || sawUser)
+      return false;
+    sawUser = true;
+    for (const rawBlock of message.content) {
+      const block = rawBlock;
+      if (block?.type === "tool_result") {
+        if (sawNonToolResult || typeof block.tool_use_id !== "string")
+          return false;
+        if (!expected.has(block.tool_use_id) || actual.has(block.tool_use_id))
+          return false;
+        actual.add(block.tool_use_id);
+      } else {
+        sawNonToolResult = true;
+      }
+    }
+  }
+  return actual.size === expected.size && (echoedCalls.size === 0 || echoedCalls.size === expected.size);
+}
+function settledToolCallAssistantUuid(tracker) {
+  return allForwardedCallsResolved(tracker) ? tracker.toolCallAssistantUuid : undefined;
+}
+function shouldEarlyStop(tracker) {
+  if (tracker.fired || !settledToolCallAssistantUuid(tracker))
+    return false;
   tracker.fired = true;
   return true;
 }
 function clientAbortDisposition(input) {
   if (input.isIndependentSession || !input.profileSessionId)
     return { action: "none" };
-  if (!input.passthrough)
-    return { action: "evict" };
-  if (input.currentSessionId && !input.sawDuplicateToolUse && input.resumeBoundaryUuid) {
-    return { action: "store", resumeUuid: input.resumeBoundaryUuid };
-  }
   return { action: "evict" };
 }
-function resumeBoundaryUuid(message) {
-  const m = message;
-  if (m?.type !== "user")
-    return;
-  if (typeof m.uuid !== "string" || m.uuid.length === 0)
-    return;
-  const content = m.message?.content;
-  if (!Array.isArray(content))
-    return;
-  const hasResult = content.some((block) => {
-    const b = block;
-    return b?.type === "tool_result";
-  });
-  return hasResult ? m.uuid : undefined;
-}
 
 // src/proxy/envelopeIntegrity.ts
 function checkEmptyToolInputs(contentBlocks, tools) {
@@ -20032,6 +20061,13 @@ function normalizeContextUsage(usage) {
   return lastIteration ?? usage;
 }
 var MIN_SUFFIX_FOR_COMPACTION = 2;
+function withClientAssistantUuid(existing, clientMessageCount, uuid) {
+  const next = existing.slice(0, clientMessageCount + 1);
+  while (next.length < clientMessageCount)
+    next.push(null);
+  next[clientMessageCount] = typeof uuid === "string" && uuid.length > 0 ? uuid : null;
+  return next;
+}
 function computeLineageHash(messages) {
   if (!messages || messages.length === 0)
     return "";
@@ -20347,15 +20383,20 @@ function writeStore(store) {
     }
   }
 }
+function hasLegacyUserDenialBoundary(session) {
+  const legacy = session.passthroughResumeUuid;
+  return typeof legacy === "string" && legacy.length > 0 && !session.passthroughToolCallAssistantUuid;
+}
 function lookupSharedSession(key) {
   const store = readStore();
-  return store[key];
+  const session = store[key];
+  return session && !hasLegacyUserDenialBoundary(session) ? session : undefined;
 }
 function lookupSharedSessionByClaudeId(claudeSessionId) {
   const sessions = Object.values(readStore());
   let newest;
   for (const session of sessions) {
-    if (session.claudeSessionId !== claudeSessionId)
+    if (session.claudeSessionId !== claudeSessionId || hasLegacyUserDenialBoundary(session))
       continue;
     if (!newest || session.lastUsedAt > newest.lastUsedAt) {
       newest = session;
@@ -20363,7 +20404,7 @@ function lookupSharedSessionByClaudeId(claudeSessionId) {
   }
   return newest;
 }
-function storeSharedSession(key, claudeSessionId, messageCount, lineageHash, messageHashes, sdkMessageUuids, contextUsage, messageBlockHashes, passthroughResumeUuid) {
+function storeSharedSession(key, claudeSessionId, messageCount, lineageHash, messageHashes, sdkMessageUuids, contextUsage, messageBlockHashes, passthroughToolCallAssistantUuid, passthroughToolCallIds) {
   const path3 = getStorePath();
   const lockPath = `${path3}.lock`;
   const hasLock = skipLocking ? false : acquireLock(lockPath);
@@ -20383,7 +20424,8 @@ function storeSharedSession(key, claudeSessionId, messageCount, lineageHash, mes
       messageHashes: messageHashes ?? existing?.messageHashes,
       messageBlockHashes: messageBlockHashes ?? existing?.messageBlockHashes,
       sdkMessageUuids: sdkMessageUuids ?? existing?.sdkMessageUuids,
-      passthroughResumeUuid: passthroughResumeUuid === undefined ? existing?.passthroughResumeUuid : passthroughResumeUuid ?? undefined,
+      passthroughToolCallAssistantUuid: passthroughToolCallAssistantUuid === undefined ? existing?.passthroughToolCallAssistantUuid : passthroughToolCallAssistantUuid ?? undefined,
+      passthroughToolCallIds: passthroughToolCallIds === undefined ? existing?.passthroughToolCallIds : passthroughToolCallIds ?? undefined,
       contextUsage: contextUsage ?? existing?.contextUsage,
       ...previousClaudeSessionId ? { previousClaudeSessionId } : {}
     };
@@ -20581,7 +20623,8 @@ function lookupSession(sessionId, messages, workingDirectory) {
         messageHashes: shared.messageHashes,
         messageBlockHashes: shared.messageBlockHashes,
         sdkMessageUuids: shared.sdkMessageUuids,
-        passthroughResumeUuid: shared.passthroughResumeUuid,
+        passthroughToolCallAssistantUuid: shared.passthroughToolCallAssistantUuid,
+        passthroughToolCallIds: shared.passthroughToolCallIds,
         contextUsage: shared.contextUsage
       };
       const result = classifyLineage(state, messages, sessionId);
@@ -20611,7 +20654,8 @@ function lookupSession(sessionId, messages, workingDirectory) {
         messageHashes: shared.messageHashes,
         messageBlockHashes: shared.messageBlockHashes,
         sdkMessageUuids: shared.sdkMessageUuids,
-        passthroughResumeUuid: shared.passthroughResumeUuid,
+        passthroughToolCallAssistantUuid: shared.passthroughToolCallAssistantUuid,
+        passthroughToolCallIds: shared.passthroughToolCallIds,
         contextUsage: shared.contextUsage
       };
       const result = classifyLineage(state, messages, fp);
@@ -20646,13 +20690,14 @@ function getSessionByClaudeId(claudeSessionId) {
       messageHashes: shared.messageHashes,
       messageBlockHashes: shared.messageBlockHashes,
       sdkMessageUuids: shared.sdkMessageUuids,
-      passthroughResumeUuid: shared.passthroughResumeUuid,
+      passthroughToolCallAssistantUuid: shared.passthroughToolCallAssistantUuid,
+      passthroughToolCallIds: shared.passthroughToolCallIds,
       contextUsage: shared.contextUsage
     });
   }
   return newest;
 }
-function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sdkMessageUuids, contextUsage, passthroughResumeUuid) {
+function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sdkMessageUuids, contextUsage, passthroughToolCallAssistantUuid, passthroughToolCallIds) {
   if (!claudeSessionId)
     return;
   const lineageHash = computeLineageHash(messages);
@@ -20666,7 +20711,8 @@ function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sd
     messageHashes,
     messageBlockHashes,
     sdkMessageUuids,
-    ...passthroughResumeUuid ? { passthroughResumeUuid } : {},
+    ...passthroughToolCallAssistantUuid ? { passthroughToolCallAssistantUuid } : {},
+    ...passthroughToolCallIds ? { passthroughToolCallIds } : {},
     ...contextUsage ? { contextUsage } : {}
   };
   if (sessionId)
@@ -20676,7 +20722,7 @@ function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sd
     fingerprintCache.set(fp, state);
   const key = sessionId || fp;
   if (key) {
-    storeSharedSession(key, claudeSessionId, state.messageCount, lineageHash, messageHashes, sdkMessageUuids, contextUsage, messageBlockHashes, passthroughResumeUuid ?? null);
+    storeSharedSession(key, claudeSessionId, state.messageCount, lineageHash, messageHashes, sdkMessageUuids, contextUsage, messageBlockHashes, passthroughToolCallAssistantUuid ?? null, passthroughToolCallIds ?? null);
   }
 }
 
@@ -20836,21 +20882,21 @@ function stripCacheControlDeep(content) {
     return rest;
   });
 }
-function normalizeStructuredUserContent(content) {
+function normalizeStructuredUserContent(content, preserveToolResultWrapper = false) {
   if (!Array.isArray(content))
     return content;
   const normalized = [];
   for (const block of content) {
     if (!block || typeof block !== "object")
       continue;
-    if (block.type === "tool_result" && Array.isArray(block.content) && hasMultimodalContent(block.content)) {
+    if (!preserveToolResultWrapper && block.type === "tool_result" && Array.isArray(block.content) && hasMultimodalContent(block.content)) {
       normalized.push(...normalizeStructuredUserContent(block.content));
       continue;
     }
     if (block.type === "tool_result" && Array.isArray(block.content)) {
       normalized.push({
         ...block,
-        content: normalizeStructuredUserContent(block.content)
+        content: normalizeStructuredUserContent(block.content, preserveToolResultWrapper)
       });
       continue;
     }
@@ -21457,15 +21503,16 @@ data: ${JSON.stringify(lastError)}
             } : undefined
           }, adapterBase);
         }
-        const isResume = lineageResult.type === "continuation" || lineageResult.type === "compaction";
+        let isResume = lineageResult.type === "continuation" || lineageResult.type === "compaction";
         const isUndo = lineageResult.type === "undo";
         const cachedSession = lineageResult.type !== "diverged" ? lineageResult.session : undefined;
-        const resumeSessionId = cachedSession?.claudeSessionId;
+        let resumeSessionId = cachedSession?.claudeSessionId;
         const passthrough = adapter.instancePassthrough !== undefined ? adapter.instancePassthrough : pipelineCtx.passthrough !== undefined ? pipelineCtx.passthrough : envBool("PASSTHROUGH");
         const resumeFrom = lineageResult.type === "continuation" || lineageResult.type === "compaction" ? lineageResult.resumeFrom : undefined;
         const resumeContentFrom = lineageResult.type === "continuation" ? lineageResult.resumeContentFrom : undefined;
         const undoRollbackUuid = isUndo && lineageResult.type === "undo" ? lineageResult.rollbackUuid : undefined;
-        const passthroughResumeUuid = passthrough && isResume ? cachedSession?.passthroughResumeUuid : undefined;
+        let passthroughToolCallAssistantUuid = passthrough && isResume ? cachedSession?.passthroughToolCallAssistantUuid : undefined;
+        const passthroughToolCallIds = passthrough && isResume ? cachedSession?.passthroughToolCallIds : undefined;
         const msgSummary = body.messages?.map((m) => {
           const contentTypes = Array.isArray(m.content) ? m.content.map((b) => b.type).join(",") : "string";
           return `${m.role}[${contentTypes}]`;
@@ -21531,17 +21578,28 @@ data: ${JSON.stringify(lastError)}
         } else {
           messagesToConvert = allMessages;
         }
+        if (passthroughToolCallAssistantUuid && !isCompleteToolResultContinuation(messagesToConvert, passthroughToolCallIds ?? [])) {
+          claudeLog("passthrough.checkpoint_replay", {
+            expectedToolIds: passthroughToolCallIds?.length ?? 0,
+            reason: "incomplete_or_mismatched_results"
+          });
+          isResume = false;
+          resumeSessionId = undefined;
+          passthroughToolCallAssistantUuid = undefined;
+          messagesToConvert = allMessages;
+        }
         const hasMultimodal = messagesToConvert?.some((m) => hasMultimodalContent(m.content));
+        const hasPassthroughToolResults = Boolean(passthroughToolCallAssistantUuid) && messagesToConvert?.some((m) => m.role === "user" && Array.isArray(m.content) && m.content.some((block) => block?.type === "tool_result"));
         let structuredMessages;
         let textPrompt;
-        if (hasMultimodal) {
+        if (hasMultimodal || hasPassthroughToolResults) {
           structuredMessages = [];
           if (isResume) {
             for (const m of messagesToConvert) {
               if (m.role === "user") {
                 structuredMessages.push({
                   type: "user",
-                  message: { role: "user", content: normalizeStructuredUserContent(stripCacheControlDeep(m.content)) },
+                  message: { role: "user", content: normalizeStructuredUserContent(stripCacheControlDeep(m.content), Boolean(passthroughToolCallAssistantUuid)) },
                   parent_tool_use_id: null
                 });
               }
@@ -21551,7 +21609,7 @@ data: ${JSON.stringify(lastError)}
               if (m.role === "user") {
                 structuredMessages.push({
                   type: "user",
-                  message: { role: "user", content: normalizeStructuredUserContent(stripCacheControlDeep(m.content)) },
+                  message: { role: "user", content: normalizeStructuredUserContent(stripCacheControlDeep(m.content), Boolean(passthroughToolCallAssistantUuid)) },
                   parent_tool_use_id: null
                 });
               } else {
@@ -21569,13 +21627,6 @@ data: ${JSON.stringify(lastError)}
           if (structuredMessages.length > 1) {
             structuredMessages = consolidateMultimodalOntoLastUser(structuredMessages);
           }
-          if (passthroughResumeUuid && structuredMessages.length > 0) {
-            structuredMessages.unshift({
-              type: "user",
-              message: { role: "user", content: PASSTHROUGH_CONTINUATION_LEAD_IN },
-              parent_tool_use_id: null
-            });
-          }
         } else {
           const toolIndex = buildToolUseIndex(allMessages ?? messagesToConvert ?? []);
           const promptTurns = (messagesToConvert ?? []).map((m) => {
@@ -21590,7 +21641,7 @@ data: ${JSON.stringify(lastError)}
           const resumeDelta = promptTurns.map((t) => t.text).filter(Boolean).join(`
 
 `) || "";
-          textPrompt = isResume ? passthroughResumeUuid ? framePassthroughContinuation(resumeDelta) : resumeDelta : frameReplayTurns(promptTurns);
+          textPrompt = isResume ? resumeDelta : frameReplayTurns(promptTurns);
         }
         const settingSources = envBool("LOAD_CONTEXT") || sdkFeatures.claudeMd === "full" ? ["user", "project"] : sdkFeatures.claudeMd === "project" ? ["project"] : pipelineCtx.settingSources ?? [];
         const capturedToolUses = [];
@@ -21693,11 +21744,15 @@ data: ${JSON.stringify(lastError)}
               }
               const signature = toolUseSignature(toolName, toolInput);
               const isExactDuplicate = capturedSignatures.has(signature);
+              const isPostCheckpointCall = earlyStopFired;
               const isSameToolRepeat = !earlyStopEnabled && !isExactDuplicate && capturedToolNames.has(toolName);
               const exceedsForcedSingle = forceSingleToolUse && capturedToolUses.length >= 1;
-              if (isExactDuplicate) {
+              if (isExactDuplicate || isPostCheckpointCall) {
                 droppedToolUseIds.add(input.tool_use_id);
-                claudeLog("passthrough.duplicate_tool_use_dropped", { name: toolName });
+                claudeLog("passthrough.duplicate_tool_use_dropped", {
+                  name: toolName,
+                  reason: isPostCheckpointCall ? "hidden_digest" : "exact_duplicate"
+                });
               } else if (isSameToolRepeat || exceedsForcedSingle) {
                 droppedToolUseIds.add(input.tool_use_id);
                 sawDuplicateToolUse = true;
@@ -21718,10 +21773,10 @@ data: ${JSON.stringify(lastError)}
               if (earlyStopEnabled && turnGenerating && !requestAbort.controller.signal.aborted) {
                 await holdDenyUntilTurnEnd();
               }
-              if (isExactDuplicate) {
+              if (isExactDuplicate || isPostCheckpointCall) {
                 return {
                   decision: "block",
-                  reason: "This exact tool call has already been forwarded to the client — do not repeat it. " + "Do not call additional tools and do not generate further text — end your turn now."
+                  reason: "This tool call has already been handled by the client-facing turn — do not repeat it. " + "Do not call additional tools and do not generate further text — end your turn now."
                 };
               }
               if (isSameToolRepeat || exceedsForcedSingle) {
@@ -21753,13 +21808,15 @@ data: ${JSON.stringify(lastError)}
           const upstreamStartAt = Date.now();
           let firstChunkAt;
           let currentSessionId;
-          const sdkUuidMap = cachedSession?.sdkMessageUuids ? [...cachedSession.sdkMessageUuids] : [];
+          let sdkUuidMap = (isResume || isUndo) && cachedSession?.sdkMessageUuids ? [...cachedSession.sdkMessageUuids] : [];
           while (sdkUuidMap.length < allMessages.length)
             sdkUuidMap.push(null);
           claudeLog("upstream.start", { mode: "non_stream", model });
           let lastUsage;
           let lastStopReason;
-          let nextPassthroughResumeUuid;
+          let nextPassthroughToolCallAssistantUuid;
+          let nextPassthroughToolCallIds;
+          let sawCanonicalResult = false;
           try {
             if (!claudeExecutable) {
               claudeExecutable = await resolveClaudeExecutableAsync();
@@ -21797,8 +21854,8 @@ data: ${JSON.stringify(lastError)}
                     hasDeferredTools,
                     resumeSessionId,
                     isUndo,
-                    resumeSessionAtUuid: undoRollbackUuid ?? passthroughResumeUuid,
-                    forkSession: busySessionFork || Boolean(passthroughResumeUuid) || undefined,
+                    resumeSessionAtUuid: undoRollbackUuid ?? passthroughToolCallAssistantUuid,
+                    forkSession: busySessionFork || undefined,
                     sdkHooks,
                     blockedTools: pipelineCtx.blockedTools,
                     incompatibleTools: pipelineCtx.incompatibleTools,
@@ -22031,25 +22088,33 @@ data: ${JSON.stringify(lastError)}
                 claudeLog("passthrough.loop_break", { mode: "non_stream", assistantMessages, captured: capturedToolUses.length });
                 break;
               }
-              if (earlyStopEnabled) {
-                if (message.type === "assistant") {
-                  noteAssistantContent(earlyStop, message.message?.content);
-                } else if (message.type === "user") {
-                  nextPassthroughResumeUuid = resumeBoundaryUuid(message) ?? nextPassthroughResumeUuid;
-                  noteUserContent(earlyStop, message.message?.content);
-                  if (shouldEarlyStop(earlyStop)) {
-                    earlyStopFired = true;
-                    claudeLog("passthrough.early_stop", { mode: "non_stream", captured: capturedToolUses.length });
-                    requestAbort.abort("passthrough turn complete");
-                    break;
+              let assistantAddedForwardedCall = false;
+              if (passthrough && message.type === "assistant" && !earlyStopFired && earlyStop.resolved.size === 0) {
+                const expectedBefore = earlyStop.expected.size;
+                noteAssistantMessage(earlyStop, message);
+                assistantAddedForwardedCall = earlyStop.expected.size > expectedBefore;
+              } else if (passthrough && message.type === "user" && !earlyStopFired) {
+                noteUserContent(earlyStop, message.message?.content);
+                if (earlyStopEnabled && shouldEarlyStop(earlyStop)) {
+                  nextPassthroughToolCallAssistantUuid = settledToolCallAssistantUuid(earlyStop);
+                  nextPassthroughToolCallIds = [...earlyStop.expected];
+                  earlyStopFired = true;
+                  for (let i = capturedToolUses.length - 1;i >= 0; i--) {
+                    if (!earlyStop.expected.has(capturedToolUses[i].id))
+                      capturedToolUses.splice(i, 1);
                   }
+                  claudeLog("passthrough.checkpoint_ready", {
+                    mode: "non_stream",
+                    captured: capturedToolUses.length,
+                    toolCallAssistantUuid: nextPassthroughToolCallAssistantUuid
+                  });
                 }
               }
               if (message.type === "assistant") {
                 releaseHeldDenies("assistant_message");
                 assistantMessages += 1;
-                if (message.uuid) {
-                  sdkUuidMap.push(message.uuid);
+                if (!passthrough || earlyStop.expected.size === 0 || assistantAddedForwardedCall) {
+                  sdkUuidMap = withClientAssistantUuid(sdkUuidMap, allMessages.length, message.uuid);
                 }
                 if (!firstChunkAt) {
                   firstChunkAt = Date.now();
@@ -22093,11 +22158,12 @@ data: ${JSON.stringify(lastError)}
                 const msgUsage = message.message.usage;
                 if (msgUsage)
                   lastUsage = { ...lastUsage, ...msgUsage };
-                if (typeof message.message.stop_reason === "string") {
+                if (!isPassthroughTurn2 && typeof message.message.stop_reason === "string") {
                   lastStopReason = message.message.stop_reason;
                 }
               }
               if (message.type === "result") {
+                sawCanonicalResult = true;
                 const resultUsage = message.usage;
                 if (resultUsage) {
                   lastUsage = { ...lastUsage, ...resultUsage };
@@ -22129,6 +22195,10 @@ data: ${JSON.stringify(lastError)}
             }
           } catch (error) {
             releaseHeldDenies("non_stream_error");
+            if (passthrough && capturedToolUses.length > 0 && !sawCanonicalResult) {
+              evictSession(profileSessionId, profileScopedCwd, body.messages || []);
+              claudeLog("passthrough.noncanonical_session_evicted", { mode: "non_stream", reason: "drain_error" });
+            }
             const stderrOutput = stderrLines.join(`
 `).trim();
             if (stderrOutput && error instanceof Error && !error.message.includes(stderrOutput)) {
@@ -22283,8 +22353,14 @@ Subprocess stderr: ${stderrOutput}`;
             ]);
           }
           if (currentSessionId && !isIndependentSession && !sawDuplicateToolUse) {
-            storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage, earlyStopFired ? nextPassthroughResumeUuid : null);
-            commitSessionTurn();
+            const checkpointTurn = passthrough && contentBlocks.some((b) => b.type === "tool_use");
+            if (checkpointTurn && (!earlyStopFired || !sawCanonicalResult)) {
+              evictSession(profileSessionId, profileScopedCwd, body.messages || []);
+              claudeLog("passthrough.noncanonical_session_evicted", { mode: "non_stream" });
+            } else {
+              storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage, earlyStopFired ? nextPassthroughToolCallAssistantUuid : null, earlyStopFired ? nextPassthroughToolCallIds : null);
+              commitSessionTurn();
+            }
           }
           const responseSessionId = currentSessionId || resumeSessionId || `session_${Date.now()}`;
           return new Response(JSON.stringify({
@@ -22325,6 +22401,7 @@ Subprocess stderr: ${stderrOutput}`;
               let bytesSent = 0;
               let streamClosed = false;
               let awaitingEarlyStopDrain = false;
+              let exitedBeforeCanonicalTerminal = false;
               claudeLog("upstream.start", { mode: "stream", model });
               const safeEnqueue = (payload, source) => {
                 if (streamClosed)
@@ -22346,14 +22423,16 @@ Subprocess stderr: ${stderrOutput}`;
                   throw error;
                 }
               };
-              const sdkUuidMap = cachedSession?.sdkMessageUuids ? [...cachedSession.sdkMessageUuids] : [];
+              let sdkUuidMap = (isResume || isUndo) && cachedSession?.sdkMessageUuids ? [...cachedSession.sdkMessageUuids] : [];
               while (sdkUuidMap.length < allMessages.length)
                 sdkUuidMap.push(null);
               let messageStartEmitted = false;
               let lastUsage;
               let hasStructuredOutput = false;
               let structuredOutput;
-              let nextPassthroughResumeUuid;
+              let nextPassthroughToolCallAssistantUuid;
+              let nextPassthroughToolCallIds;
+              let sawCanonicalResult = false;
               const silentTurnRecoveryEnabled = env("SILENT_TURN_RECOVERY") !== "0";
               let silentTurnRecoveryAttempted = false;
               let silentTurnRecovered = false;
@@ -22378,33 +22457,6 @@ data: ${JSON.stringify({
                   eventsForwarded += 1;
               };
               const openClientBlocks = new Set;
-              let pendingEarlyStop = false;
-              let pendingEarlyStopAt = 0;
-              const fireEarlyStop = (reason) => {
-                earlyStopFired = true;
-                claudeLog("passthrough.early_stop", {
-                  mode: "stream",
-                  captured: capturedToolUses.length,
-                  drained: awaitingEarlyStopDrain,
-                  reason,
-                  deferredMs: pendingEarlyStopAt ? Date.now() - pendingEarlyStopAt : 0
-                });
-                pendingEarlyStop = false;
-                flushOpenClientBlocks("early_stop");
-                sendTerminalDelta("tool_use");
-                safeEnqueue(encoder.encode(`event: message_stop
-data: ${JSON.stringify({ type: "message_stop" })}
-
-`), "early_stop");
-                requestAbort.abort("passthrough turn complete");
-                awaitingEarlyStopDrain = false;
-                if (!streamClosed) {
-                  streamClosed = true;
-                  try {
-                    controller.close();
-                  } catch {}
-                }
-              };
               const flushOpenClientBlocks = (source) => {
                 if (openClientBlocks.size === 0)
                   return;
@@ -22455,8 +22507,8 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                         hasDeferredTools,
                         resumeSessionId,
                         isUndo,
-                        resumeSessionAtUuid: undoRollbackUuid ?? passthroughResumeUuid,
-                        forkSession: busySessionFork || Boolean(passthroughResumeUuid) || undefined,
+                        resumeSessionAtUuid: undoRollbackUuid ?? passthroughToolCallAssistantUuid,
+                        forkSession: busySessionFork || undefined,
                         sdkHooks,
                         blockedTools: pipelineCtx.blockedTools,
                         incompatibleTools: pipelineCtx.incompatibleTools,
@@ -22716,38 +22768,42 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                 try {
                   for await (const message of guardedResponse) {
                     if (streamClosed && !awaitingEarlyStopDrain) {
+                      exitedBeforeCanonicalTerminal = true;
                       break;
                     }
                     if (message.session_id) {
                       currentSessionId = message.session_id;
                     }
-                    if (message.type === "assistant" && message.uuid) {
-                      sdkUuidMap.push(message.uuid);
+                    let assistantAddedForwardedCall = false;
+                    if (earlyStopEnabled && message.type === "assistant" && !earlyStopFired) {
+                      const expectedBefore = earlyStop.expected.size;
+                      noteAssistantMessage(earlyStop, message);
+                      assistantAddedForwardedCall = earlyStop.expected.size > expectedBefore;
+                    } else if (earlyStopEnabled && message.type === "user" && !earlyStopFired) {
+                      noteUserContent(earlyStop, message.message?.content);
                     }
-                    nextPassthroughResumeUuid = resumeBoundaryUuid(message) ?? nextPassthroughResumeUuid;
-                    if (earlyStopEnabled) {
-                      if (message.type === "assistant") {
-                        noteAssistantContent(earlyStop, message.message?.content);
-                      } else if (message.type === "user") {
-                        noteUserContent(earlyStop, message.message?.content);
-                        if (shouldEarlyStop(earlyStop) && streamedToolUseIds.size > 0) {
-                          if (openClientBlocks.size > 0) {
-                            if (!pendingEarlyStop) {
-                              pendingEarlyStop = true;
-                              pendingEarlyStopAt = Date.now();
-                              claudeLog("passthrough.early_stop_deferred", {
-                                openBlocks: openClientBlocks.size,
-                                captured: capturedToolUses.length
-                              });
-                            }
-                          } else {
-                            fireEarlyStop("immediate");
-                            break;
-                          }
+                    if (earlyStopEnabled && !earlyStopFired) {
+                      const hasCompleteStreamedSet = streamedToolUseIds.size > 0 && earlyStop.expected.size === streamedToolUseIds.size && [...streamedToolUseIds].every((id) => earlyStop.expected.has(id));
+                      if (!turnGenerating && openClientBlocks.size === 0 && hasCompleteStreamedSet && shouldEarlyStop(earlyStop)) {
+                        nextPassthroughToolCallAssistantUuid = settledToolCallAssistantUuid(earlyStop);
+                        nextPassthroughToolCallIds = [...earlyStop.expected];
+                        earlyStopFired = true;
+                        for (let i = capturedToolUses.length - 1;i >= 0; i--) {
+                          if (!earlyStop.expected.has(capturedToolUses[i].id))
+                            capturedToolUses.splice(i, 1);
                         }
+                        claudeLog("passthrough.checkpoint_ready", {
+                          mode: "stream",
+                          captured: capturedToolUses.length,
+                          toolCallAssistantUuid: nextPassthroughToolCallAssistantUuid
+                        });
                       }
                     }
+                    if (message.type === "assistant" && (!passthrough || earlyStop.expected.size === 0 || assistantAddedForwardedCall)) {
+                      sdkUuidMap = withClientAssistantUuid(sdkUuidMap, allMessages.length, message.uuid);
+                    }
                     if (message.type === "result") {
+                      sawCanonicalResult = true;
                       const resultUsage = message.usage;
                       if (resultUsage)
                         lastUsage = { ...lastUsage, ...resultUsage };
@@ -22757,6 +22813,8 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                       }
                     }
                     if (message.type === "stream_event") {
+                      if (streamClosed && awaitingEarlyStopDrain)
+                        continue;
                       streamEventsSeen += 1;
                       if (!firstChunkAt) {
                         firstChunkAt = Date.now();
@@ -22796,16 +22854,19 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                           lastUsage = { ...lastUsage, ...startUsage };
                         if (messageStartEmitted) {
                           if (passthrough && streamedToolUseIds.size > 0) {
-                            flushOpenClientBlocks("turn2_suppression");
-                            sendTerminalDelta("tool_use");
-                            safeEnqueue(encoder.encode(`event: message_stop
+                            if (!streamClosed) {
+                              flushOpenClientBlocks("turn2_suppression");
+                              sendTerminalDelta("tool_use");
+                              safeEnqueue(encoder.encode(`event: message_stop
 data: ${JSON.stringify({ type: "message_stop" })}
 
 `), "passthrough_turn2_stop");
+                              streamClosed = true;
+                              controller.close();
+                            }
+                            awaitingEarlyStopDrain = true;
                             claudeLog("passthrough.turn2_suppressed", { mode: "stream", toolUses: streamedToolUseIds.size });
-                            streamClosed = true;
-                            controller.close();
-                            break;
+                            continue;
                           }
                           continue;
                         }
@@ -22929,10 +22990,6 @@ data: ${JSON.stringify(event)}
                         const idx = event.index;
                         if (typeof idx === "number")
                           openClientBlocks.delete(idx);
-                        if (pendingEarlyStop && openClientBlocks.size === 0) {
-                          fireEarlyStop("blocks_closed");
-                          break;
-                        }
                       }
                       if (passthrough && eventType === "message_delta" && event.delta?.stop_reason === "tool_use" && streamedToolUseIds.size > 0) {
                         flushOpenClientBlocks("drain_close");
@@ -22947,6 +23004,7 @@ data: ${JSON.stringify({ type: "message_stop" })}
                           awaitingEarlyStopDrain = true;
                           continue;
                         }
+                        exitedBeforeCanonicalTerminal = true;
                         break;
                       }
                       if (eventType === "content_block_delta") {
@@ -23042,8 +23100,14 @@ data: ${JSON.stringify({
                   plog(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
                 }
                 if (currentSessionId && !isIndependentSession && !sawDuplicateToolUse) {
-                  storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage, earlyStopFired ? nextPassthroughResumeUuid : null);
-                  commitSessionTurn();
+                  const checkpointTurn = passthrough && streamedToolUseIds.size > 0;
+                  if (exitedBeforeCanonicalTerminal || checkpointTurn && (!earlyStopFired || !sawCanonicalResult)) {
+                    evictSession(profileSessionId, profileScopedCwd, body.messages || []);
+                    claudeLog("passthrough.noncanonical_session_evicted", { mode: "stream" });
+                  } else {
+                    storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage, earlyStopFired ? nextPassthroughToolCallAssistantUuid : null, earlyStopFired ? nextPassthroughToolCallIds : null);
+                    commitSessionTurn();
+                  }
                 }
                 const classifyNow = () => classifyTurnOutcome({
                   textEvents: textEventsForwarded,
@@ -23068,7 +23132,8 @@ data: ${JSON.stringify({
                   });
                   const recoveryLifter = createRecoveryLifter(() => nextClientBlockIndex++);
                   let recoverySessionId;
-                  let recoveryBoundaryUuid;
+                  let recoveryToolCallAssistantUuid;
+                  const recoveryEarlyStop = createEarlyStopTracker();
                   try {
                     for await (const event of runSdkQueryAttempt(buildQueryOptions({
                       prompt: SILENT_TURN_NUDGE,
@@ -23086,7 +23151,7 @@ data: ${JSON.stringify({
                       hasDeferredTools,
                       resumeSessionId: currentSessionId || resumeSessionId,
                       isUndo: false,
-                      resumeSessionAtUuid: nextPassthroughResumeUuid,
+                      resumeSessionAtUuid: nextPassthroughToolCallAssistantUuid,
                       forkSession: true,
                       sdkHooks,
                       blockedTools: pipelineCtx.blockedTools,
@@ -23116,7 +23181,12 @@ data: ${JSON.stringify({
                       const recoveryMessage = event;
                       if (recoveryMessage.session_id)
                         recoverySessionId = recoveryMessage.session_id;
-                      recoveryBoundaryUuid = resumeBoundaryUuid(recoveryMessage) ?? recoveryBoundaryUuid;
+                      if (recoveryMessage.type === "assistant") {
+                        noteAssistantMessage(recoveryEarlyStop, recoveryMessage);
+                      } else if (recoveryMessage.type === "user") {
+                        noteUserContent(recoveryEarlyStop, recoveryMessage.message?.content);
+                        recoveryToolCallAssistantUuid = settledToolCallAssistantUuid(recoveryEarlyStop);
+                      }
                       if (recoveryMessage.type !== "stream_event")
                         continue;
                       const lifted = recoveryLifter.lift(event.event);
@@ -23145,11 +23215,12 @@ data: ${JSON.stringify(lifted.frame)}
                   }
                   if (silentTurnRecovered && recoverySessionId && !isIndependentSession && !sawDuplicateToolUse) {
                     currentSessionId = recoverySessionId;
-                    nextPassthroughResumeUuid = recoveryBoundaryUuid;
+                    nextPassthroughToolCallAssistantUuid = recoveryToolCallAssistantUuid;
+                    nextPassthroughToolCallIds = recoveryToolCallAssistantUuid ? [...recoveryEarlyStop.expected] : undefined;
                     sdkUuidMap.length = 0;
                     for (let i = 0;i < allMessages.length; i++)
                       sdkUuidMap.push(null);
-                    storeSession(profileSessionId, body.messages || [], recoverySessionId, profileScopedCwd, sdkUuidMap, lastUsage, recoveryBoundaryUuid ?? null);
+                    storeSession(profileSessionId, body.messages || [], recoverySessionId, profileScopedCwd, sdkUuidMap, lastUsage, recoveryToolCallAssistantUuid ?? null, recoveryToolCallAssistantUuid ? [...recoveryEarlyStop.expected] : null);
                     commitSessionTurn();
                   }
                   claudeLog("response.silent_turn_recovery_result", {
@@ -23327,18 +23398,19 @@ data: {"type":"message_stop"}
                     profileSessionId,
                     currentSessionId,
                     sawDuplicateToolUse,
-                    resumeBoundaryUuid: nextPassthroughResumeUuid,
+                    toolCallAssistantUuid: nextPassthroughToolCallAssistantUuid,
                     passthrough
                   });
-                  if (disposition.action === "store" && currentSessionId) {
-                    storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage, disposition.resumeUuid);
-                    commitSessionTurn();
-                  } else if (disposition.action === "evict") {
+                  if (disposition.action === "evict") {
                     evictSession(profileSessionId, profileScopedCwd, body.messages || []);
                   }
                   claudeLog("passthrough.client_abort_settled", { action: disposition.action });
                   return;
                 }
+                if (passthrough && streamedToolUseIds.size > 0 && !sawCanonicalResult) {
+                  evictSession(profileSessionId, profileScopedCwd, body.messages || []);
+                  claudeLog("passthrough.noncanonical_session_evicted", { mode: "stream", reason: "drain_error" });
+                }
                 const stderrOutput = stderrLines.join(`
 `).trim();
                 if (stderrOutput && error instanceof Error && !error.message.includes(stderrOutput)) {
@@ -23366,7 +23438,7 @@ Subprocess stderr: ${stderrOutput}`;
                   reason: sdkTerm.reason,
                   passthrough,
                   capturedToolUses: capturedToolUses.length,
-                  abortIsOurs: sawDuplicateToolUse || earlyStopFired
+                  abortIsOurs: sawDuplicateToolUse
                 }) && messageStartEmitted;
                 if (canRecoverAsToolUse) {
                   diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered ${formatSdkTermination(sdkTerm, {
@@ -23549,6 +23621,10 @@ data: ${JSON.stringify({
           cancel(reason) {
             requestAbort.abort(reason);
             requestAbort.detach();
+            if (!isIndependentSession) {
+              evictSession(profileSessionId, profileScopedCwd, body.messages || []);
+              claudeLog("passthrough.client_abort_settled", { action: "evict", source: "stream_cancel" });
+            }
           }
         });
         const streamSessionId = resumeSessionId || `session_${Date.now()}`;

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startProxyServer
-} from "./cli-3ysfatce.js";
+} from "./cli-n1jsth00.js";
 import"./cli-m0p2bc8v.js";
 import"./cli-sry5aqdj.js";
 import"./cli-xmweegb1.js";

package/dist/proxy/messages.d.ts

@@ -100,34 +100,6 @@ export declare function frameReplayTurns(turns: Array<{
     role: string;
     text: string;
 }>): string;
-/**
- * Lead-in for a passthrough continuation that forks from a deny boundary.
- *
- * Every forwarded tool call is denied with "do not generate further text —
- * end your turn now" (the nudge that stops the model fabricating results for
- * calls the client will execute). That deny is persisted as the tool_result,
- * and the deny boundary fork puts it IMMEDIATELY before the continuation's
- * user turn. So the last instruction in the model's context tells it to emit
- * no text — and the next thing it must do is answer. Observed live: the model
- * obeys the nearer instruction and returns thinking plus an EMPTY text block
- * with stop_reason "end_turn"; the CLI's own "previous response had no visible
- * output" nudge does not help, because the deny is still there. The proxy
- * forwards zero text deltas, reports 200, and the client's run goes quiet with
- * the tool results unanswered (three occurrences in 500 requests, all on a
- * session's second turn — where the deny is the largest thing in context).
- *
- * The deny cannot be rewritten after the fact: it lives in the CLI's session
- * file. So the continuation says plainly that the instruction is spent. Framing
- * only — no transcript markers, nothing for the model to imitate (#496/#619).
- */
-export declare const PASSTHROUGH_CONTINUATION_LEAD_IN: string;
-/**
- * Prefix a passthrough continuation delta with the lead-in above.
- *
- * An empty delta is returned unchanged — there is nothing to answer, so the
- * lead-in would be the only content and would read as the user's own turn.
- */
-export declare function framePassthroughContinuation(delta: string): string;
 /**
  * Remove fields the Claude Agent SDK attaches to streamed events that are not
  * part of the public Anthropic streaming schema.

package/dist/proxy/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/proxy/messages.ts"],"names":[],"mappings":"AAAA;;GAEG;AAcH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,wBAAwB,aAA6C,CAAA;AAElF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,aAA+C,CAAA;AAEpF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,2BAA2B,aAYtC,CAAA;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAmBrD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUtE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAM7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,CAKzH;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CAerF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,gCAAgC,QAGQ,CAAA;AAErD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGlE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAU3D;AAED,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,aAAyC,CAAA;AAEtE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,SAAS;IAAE,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,EAC3C,UAAU,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAyCtB;AAED,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,8EAA8E;IAC9E,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AA4FD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAC9C,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAyB3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAO3D;AA6BD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQzD"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/proxy/messages.ts"],"names":[],"mappings":"AAAA;;GAEG;AAcH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,wBAAwB,aAA6C,CAAA;AAElF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,aAA+C,CAAA;AAEpF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,2BAA2B,aAYtC,CAAA;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAmBrD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUtE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAM7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,CAKzH;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CAerF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAU3D;AAED,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,aAAyC,CAAA;AAEtE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,SAAS;IAAE,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,EAC3C,UAAU,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAyCtB;AAED,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,8EAA8E;IAC9E,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AA4FD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAC9C,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAyB3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAO3D;AA6BD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQzD"}

package/dist/proxy/passthroughEarlyStop.d.ts

@@ -8,22 +8,25 @@
  * thinking pass per tool step, roughly doubling per-step output spend and
  * adding a full model round-trip of latency.
  *
- * The fix: the SDK emits each denied call's tool_result as a `user` message in
- * the stream (verified against the real SDK) BEFORE it fires the digest turn's
- * API request. So the proxy can watch the stream, and the moment every
- * client-forwarded tool_use from the assistant turn has its deny persisted,
- * abort the query — the digest turn never generates. Because the denies are
- * already recorded in the SDK session history at that point, the session stays
- * coherent and can be stored + resumed (unlike the #580 duplicate-abort case,
- * which fires mid-hook before persistence).
+ * The SDK emits each denied call's tool_result as a `user` message before it
+ * fires the hidden digest turn. Those messages identify a stable assistant
+ * checkpoint, but they are NOT a durability acknowledgement: a live PTY E2E
+ * observed the assistant and deny in the iterator while neither existed in the
+ * session JSONL after an immediate abort. The proxy therefore freezes the
+ * assistant UUID/tool IDs at deny settlement, drains the hidden digest without
+ * forwarding it, and stores the checkpoint only after the SDK's canonical
+ * terminal result commits the transcript.
  *
  * Pure module — no I/O, no imports from server.ts or session/.
  */
 export interface EarlyStopTracker {
-    /** tool_use ids of client-forwarded calls awaiting a persisted deny result */
+    /** tool_use ids of client-forwarded calls awaiting an iterator-observed deny */
     expected: Set<string>;
     /** subset of `expected` whose tool_result has been observed in the stream */
     resolved: Set<string>;
+    /** Last assistant message containing a forwarded tool_use.
+     *  The SDK's resumeSessionAt option only accepts assistant UUIDs. */
+    toolCallAssistantUuid?: string;
     /** true once shouldEarlyStop has returned true — it fires at most once */
     fired: boolean;
 }
@@ -42,7 +45,17 @@ export declare function isClientForwardedToolUse(block: unknown): boolean;
  */
 export declare function noteAssistantContent(tracker: EarlyStopTracker, content: unknown): void;
 /**
- * Record persisted tool_results from a user message's content.
+ * Record one SDK assistant message and remember the only boundary type the
+ * Agent SDK supports for resumeSessionAt: an SDKAssistantMessage UUID.
+ *
+ * The SDK may surface parallel tool calls as multiple assistant messages. The
+ * final such message is an ancestor containing the complete tool-use turn, so
+ * updating the boundary for every forwarded call leaves the correct stable
+ * checkpoint.
+ */
+export declare function noteAssistantMessage(tracker: EarlyStopTracker, message: unknown): void;
+/**
+ * Record iterator-observed tool_results from a user message's content.
  *
  * Records EVERY tool_result id, not just already-expected ones: the CLI
  * dispatches hooks per-block while later blocks are still streaming, and it
@@ -54,15 +67,25 @@ export declare function noteAssistantContent(tracker: EarlyStopTracker, content:
 export declare function noteUserContent(tracker: EarlyStopTracker, content: unknown): void;
 /**
  * True exactly once: when at least one client tool call was forwarded and
- * every forwarded call's deny has been observed in the stream. At that point
- * the digest turn hasn't generated yet — the caller should abort the query.
+ * every forwarded call's deny has been observed in the stream. The caller may
+ * freeze the checkpoint then, but must drain to a canonical SDK result before
+ * treating the UUID as durably resumable.
  */
+export declare function allForwardedCallsResolved(tracker: EarlyStopTracker): boolean;
+/**
+ * Verify that a resumed tool-result delta settles exactly the tool calls at the
+ * stored assistant checkpoint. Tool results must precede any ordinary user
+ * content, matching the Anthropic Messages protocol.
+ */
+export declare function isCompleteToolResultContinuation(messages: Array<{
+    role?: unknown;
+    content?: unknown;
+}>, expectedIds: readonly string[]): boolean;
+/** The cache-stable assistant boundary after every forwarded call settled. */
+export declare function settledToolCallAssistantUuid(tracker: EarlyStopTracker): string | undefined;
 export declare function shouldEarlyStop(tracker: EarlyStopTracker): boolean;
 /** What a client-aborted stream must do with its session mapping. */
 export type ClientAbortDisposition = {
-    action: "store";
-    resumeUuid: string;
-} | {
     action: "evict";
 } | {
     action: "none";
@@ -71,39 +94,19 @@ export type ClientAbortDisposition = {
  * Decide the fate of a session whose stream the CLIENT aborted (the user hit
  * stop, or the connection dropped).
  *
- * A client abort leaves the SDK session ending in an interrupted tail — the
- * same state the deny-boundary fix addresses for early stop. Resuming from
- * that tail makes the SDK synthesize a "Continue from where you left off."
- * turn, which the model answers with meta text ("No response requested.") or
- * an empty turn. Each empty turn then becomes the next tail, so the session
- * never recovers on its own: every following turn comes back empty until the
- * lineage is discarded.
- *
- * An early stop is meridian's own doing and always has a persisted deny to
- * fork from; a user interrupt is not an early stop and may have none. So:
- *
- * - a boundary was persisted → store it, and the next continuation forks
- *   there (lineage and prompt cache survive);
- * - no boundary → nothing is safe to resume from, so drop the mapping and let
- *   the next request replay into a fresh SDK session. A cache-miss replay is
- *   the cost of not wedging the conversation.
- *
- * `sawDuplicateToolUse` keeps the #552 rule: such a history holds a dangling
- * dropped call that diverges from the client's view and is never resumable.
+ * A client abort leaves the SDK session ending in an interrupted tail. Even an
+ * assistant UUID already seen in the iterator is not known durable until the
+ * canonical result: the live PTY regression yielded that UUID but never wrote
+ * it to JSONL after abort. Therefore every owned mapping is evicted; a replay
+ * costs one cache miss but cannot wedge on a missing or interrupted boundary.
  */
 export declare function clientAbortDisposition(input: {
     isIndependentSession: boolean;
     profileSessionId?: string;
     currentSessionId?: string;
     sawDuplicateToolUse: boolean;
-    resumeBoundaryUuid?: string;
-    /** Only passthrough turns have deny boundaries. */
+    toolCallAssistantUuid?: string;
+    /** Only passthrough turns create synthetic denial side branches. */
     passthrough: boolean;
 }): ClientAbortDisposition;
-/**
- * Resume boundary of an early-stopped session: the uuid of a persisted `user`
- * message carrying tool_results. The last one before the abort is the final
- * deny — continuations fork there instead of resuming the interrupted tail.
- */
-export declare function resumeBoundaryUuid(message: unknown): string | undefined;
 //# sourceMappingURL=passthroughEarlyStop.d.ts.map

package/dist/proxy/passthroughEarlyStop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"passthroughEarlyStop.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughEarlyStop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAUH,MAAM,WAAW,gBAAgB;IAC/B,8EAA8E;IAC9E,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrB,6EAA6E;IAC7E,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrB,0EAA0E;IAC1E,KAAK,EAAE,OAAO,CAAA;CACf;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAEzD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQhE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAOtF;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAQjF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAQlE;AAED,qEAAqE;AACrE,MAAM,MAAM,sBAAsB,GAC9B;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GACnB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtB;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,oBAAoB,EAAE,OAAO,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mDAAmD;IACnD,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,sBAAsB,CAazB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAWvE"}
+{"version":3,"file":"passthroughEarlyStop.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughEarlyStop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAUH,MAAM,WAAW,gBAAgB;IAC/B,gFAAgF;IAChF,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrB,6EAA6E;IAC7E,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrB;yEACqE;IACrE,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,0EAA0E;IAC1E,KAAK,EAAE,OAAO,CAAA;CACf;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAEzD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQhE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAOtF;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAatF;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAQjF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAM5E;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACtD,WAAW,EAAE,SAAS,MAAM,EAAE,GAC7B,OAAO,CAuCT;AAED,8EAA8E;AAC9E,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAE1F;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAMlE;AAED,qEAAqE;AACrE,MAAM,MAAM,sBAAsB,GAC9B;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GACnB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtB;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,oBAAoB,EAAE,OAAO,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,oEAAoE;IACpE,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,sBAAsB,CAMzB"}

package/dist/proxy/query.d.ts

@@ -43,8 +43,9 @@ export interface QueryContext {
     resumeSessionId?: string;
     /** Whether this is an undo operation */
     isUndo: boolean;
-    /** Fork the resumed session at this SDK message UUID (undo rollback point
-     *  or passthrough deny boundary). Maps to the SDK's resumeSessionAt. */
+    /** Resume at this SDK assistant-message UUID (undo rollback point or
+     *  passthrough tool-use boundary). Maps to resumeSessionAt, which accepts
+     *  SDKAssistantMessage UUIDs only; forkSession separately chooses a new ID. */
     resumeSessionAtUuid?: string;
     /** Fork the resumed session instead of attaching to it (#630 busy-session
      *  fallback — the original stays registered as a bg agent; the fork gets a

package/dist/proxy/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/proxy/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/proxy/query.ts"],"names":[],"mappings":"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"}

package/dist/proxy/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/proxy/server.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACtE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,CAAA;AAGvD,YAAY,EACV,SAAS,EACT,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,WAAW,GACZ,MAAM,aAAa,CAAA;AAKpB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAoDnG,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EAEpB,KAAK,aAAa,EAGnB,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAA+B,iBAAiB,EAAE,mBAAmB,EAAsC,MAAM,iBAAiB,CAAA;AAIzI,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACjD,YAAY,EAAE,aAAa,EAAE,CAAA;AAkW7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CAy4JhF;AAWD,wBAAgB,gCAAgC,IAAI,IAAI,CAavD;AAED,wBAAsB,gBAAgB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAqHhG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/proxy/server.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACtE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,CAAA;AAGvD,YAAY,EACV,SAAS,EACT,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,WAAW,GACZ,MAAM,aAAa,CAAA;AAKpB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAoDnG,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EAGpB,KAAK,aAAa,EAGnB,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAA+B,iBAAiB,EAAE,mBAAmB,EAAsC,MAAM,iBAAiB,CAAA;AAIzI,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACjD,YAAY,EAAE,aAAa,EAAE,CAAA;AA0W7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CA28JhF;AAWD,wBAAgB,gCAAgC,IAAI,IAAI,CAavD;AAED,wBAAsB,gBAAgB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAqHhG"}

package/dist/proxy/session/cache.d.ts

@@ -33,5 +33,5 @@ export declare function getSessionByClaudeId(claudeSessionId: string): SessionSt
 export declare function storeSession(sessionId: string | undefined, messages: Array<{
     role: string;
     content: unknown;
-}>, claudeSessionId: string, workingDirectory?: string, sdkMessageUuids?: Array<string | null>, contextUsage?: TokenUsage, passthroughResumeUuid?: string | null): void;
+}>, claudeSessionId: string, workingDirectory?: string, sdkMessageUuids?: Array<string | null>, contextUsage?: TokenUsage, passthroughToolCallAssistantUuid?: string | null, passthroughToolCallIds?: string[] | null): void;
 //# sourceMappingURL=cache.d.ts.map

package/dist/proxy/session/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/proxy/session/cache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,WAAW,CAAA;AAMlB,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAqCD;kGACkG;AAClG,wBAAgB,iBAAiB,SAYhC;AAED;iFACiF;AACjF,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAC/C,IAAI,CAoBN;AA0CD;;uDAEuD;AACvD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,EAC/C,gBAAgB,CAAC,EAAE,MAAM,GACxB,aAAa,CA2Df;AAED;;uFAEuF;AACvF,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CA6BtF;AAED;;;yFAGyF;AACzF,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,EACnD,eAAe,EAAE,MAAM,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACtC,YAAY,CAAC,EAAE,UAAU,EACzB,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,QA0CtC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/proxy/session/cache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,WAAW,CAAA;AAMlB,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAqCD;kGACkG;AAClG,wBAAgB,iBAAiB,SAYhC;AAED;iFACiF;AACjF,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,GAC/C,IAAI,CAoBN;AA0CD;;uDAEuD;AACvD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,EAC/C,gBAAgB,CAAC,EAAE,MAAM,GACxB,aAAa,CA6Df;AAED;;uFAEuF;AACvF,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CA8BtF;AAED;;;yFAGyF;AACzF,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,EACnD,eAAe,EAAE,MAAM,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACtC,YAAY,CAAC,EAAE,UAAU,EACzB,gCAAgC,CAAC,EAAE,MAAM,GAAG,IAAI,EAChD,sBAAsB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,QA4CzC"}

package/dist/proxy/session/lineage.d.ts

@@ -43,11 +43,21 @@ export interface SessionState {
      *  Only assistant messages have UUIDs (user messages are null).
      *  Used to find the rollback point for undo. */
     sdkMessageUuids?: Array<string | null>;
-    /** Last persisted passthrough deny — continuations of an early-stopped session fork here. */
-    passthroughResumeUuid?: string;
+    /** SDK assistant UUID immediately before synthetic passthrough denials.
+     *  Must be an assistant UUID: the Agent SDK rejects other resumeSessionAt boundaries. */
+    passthroughToolCallAssistantUuid?: string;
+    /** Forwarded tool IDs that must be settled together at the checkpoint. */
+    passthroughToolCallIds?: string[];
     /** Last observed token usage for this session (from SDK message_start / message_delta events) */
     contextUsage?: TokenUsage;
 }
+/**
+ * Associate SDK assistant events from the current upstream run with the single
+ * assistant message the Anthropic client will append after this request.
+ * Multiple SDK fragments overwrite the same future slot, leaving the final
+ * assistant UUID as the undo checkpoint for the consolidated client turn.
+ */
+export declare function withClientAssistantUuid(existing: Array<string | null>, clientMessageCount: number, uuid: unknown): Array<string | null>;
 /**
  * Result of lineage verification — classifies the mutation and provides
  * the information needed to take the correct SDK action.

package/dist/proxy/session/lineage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lineage.d.ts","sourceRoot":"","sources":["../../../src/proxy/session/lineage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lineage.d.ts","sourceRoot":"","sources":["../../../src/proxy/session/lineage.ts"],"names":[],"mappings":"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"}

package/dist/proxy/sessionStore.d.ts

@@ -23,8 +23,11 @@ export interface StoredSession {
     messageBlockHashes?: string[][];
     /** Per-message SDK assistant UUIDs for undo rollback (null for user messages) */
     sdkMessageUuids?: Array<string | null>;
-    /** Uuid of the last persisted passthrough deny — resume boundary after an early stop. */
-    passthroughResumeUuid?: string;
+    /** SDK assistant UUID immediately before synthetic passthrough denials.
+     *  Continuations resume the same session here, preserving the stable prefix. */
+    passthroughToolCallAssistantUuid?: string;
+    /** Forwarded tool IDs pending at the stored assistant checkpoint. */
+    passthroughToolCallIds?: string[];
     /** Last observed token usage for this Claude session */
     contextUsage?: TokenUsage;
     /** Previous Claude session ID preserved when the session mapping is replaced.
@@ -40,7 +43,7 @@ export declare function setSessionStoreDir(dir: string | null, opts?: {
 }): void;
 export declare function lookupSharedSession(key: string): StoredSession | undefined;
 export declare function lookupSharedSessionByClaudeId(claudeSessionId: string): StoredSession | undefined;
-export declare function storeSharedSession(key: string, claudeSessionId: string, messageCount?: number, lineageHash?: string, messageHashes?: string[], sdkMessageUuids?: Array<string | null>, contextUsage?: TokenUsage, messageBlockHashes?: string[][], passthroughResumeUuid?: string | null): void;
+export declare function storeSharedSession(key: string, claudeSessionId: string, messageCount?: number, lineageHash?: string, messageHashes?: string[], sdkMessageUuids?: Array<string | null>, contextUsage?: TokenUsage, messageBlockHashes?: string[][], passthroughToolCallAssistantUuid?: string | null, passthroughToolCallIds?: string[] | null): void;
 /** Remove a single session from the shared file store.
  *  Used when a session is detected as stale (e.g. expired upstream). */
 export declare function evictSharedSession(key: string): void;

package/dist/proxy/sessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionStore.d.ts","sourceRoot":"","sources":["../../src/proxy/sessionStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAeH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;IAC/B,iFAAiF;IACjF,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACtC,yFAAyF;IACzF,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,wDAAwD;IACxD,YAAY,CAAC,EAAE,UAAU,CAAA;IACzB;;kEAE8D;IAC9D,uBAAuB,CAAC,EAAE,MAAM,CAAA;CACjC;AA0DD;;oFAEoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAG7F;AAsED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAG1E;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAYhG;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACtC,YAAY,CAAC,EAAE,UAAU,EACzB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,EAC/B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,GACpC,IAAI,CAkDN;AAED;wEACwE;AACxE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAkBpD;AAED;;6DAE6D;AAC7D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG;IAClD,eAAe,EAAE,MAAM,CAAA;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,SAAS,CAWZ;AAED;uEACuE;AACvE,wBAAgB,kBAAkB,IAAI,KAAK,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAC,CAUD;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAO1C"}
+{"version":3,"file":"sessionStore.d.ts","sourceRoot":"","sources":["../../src/proxy/sessionStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAeH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;IAC/B,iFAAiF;IACjF,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACtC;oFACgF;IAChF,gCAAgC,CAAC,EAAE,MAAM,CAAA;IACzC,qEAAqE;IACrE,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAA;IACjC,wDAAwD;IACxD,YAAY,CAAC,EAAE,UAAU,CAAA;IACzB;;kEAE8D;IAC9D,uBAAuB,CAAC,EAAE,MAAM,CAAA;CACjC;AA0DD;;oFAEoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAG7F;AA2ED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAO1E;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAYhG;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,eAAe,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACtC,YAAY,CAAC,EAAE,UAAU,EACzB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,EAC/B,gCAAgC,CAAC,EAAE,MAAM,GAAG,IAAI,EAChD,sBAAsB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GACvC,IAAI,CAqDN;AAED;wEACwE;AACxE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAkBpD;AAED;;6DAE6D;AAC7D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG;IAClD,eAAe,EAAE,MAAM,CAAA;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,SAAS,CAWZ;AAED;uEACuE;AACvE,wBAAgB,kBAAkB,IAAI,KAAK,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAC,CAUD;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAO1C"}

package/dist/server.js

@@ -11,7 +11,7 @@ import {
   runObserveHook,
   runTransformHook,
   startProxyServer
-} from "./cli-3ysfatce.js";
+} from "./cli-n1jsth00.js";
 import"./cli-m0p2bc8v.js";
 import"./cli-sry5aqdj.js";
 import"./cli-xmweegb1.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynfar/meridian",
-  "version": "1.62.3",
+  "version": "1.62.4",
   "description": "Local Anthropic API powered by your Claude Max subscription. One subscription, every agent.",
   "type": "module",
   "main": "./dist/server.js",