@rynfar/meridian 1.69.0 → 1.71.0

package/dist/{cli-x1sv3bqf.js → cli-6c6dj69q.js}

@@ -3338,6 +3338,93 @@ var init_cherry = __esm(() => {
   };
 });
 
+// src/proxy/transforms/polytoken.ts
+var polytokenTransforms;
+var init_polytoken = __esm(() => {
+  polytokenTransforms = [
+    {
+      name: "polytoken-core",
+      adapters: ["polytoken"],
+      onRequest(ctx) {
+        return {
+          ...ctx,
+          blockedTools: [],
+          incompatibleTools: [],
+          allowedMcpTools: [],
+          coreToolNames: [],
+          passthrough: true,
+          sdkAgents: {},
+          sdkHooks: undefined,
+          systemContext: ctx.systemContext,
+          supportsThinking: true,
+          shouldTrackFileChanges: false,
+          extractFileChangesFromToolUse: undefined
+        };
+      }
+    }
+  ];
+});
+
+// src/proxy/adapters/polytoken.ts
+function normalizePolytokenSessionId(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+var POLYTOKEN_SESSION_HEADER = "x-polytoken-session", polytokenAdapter;
+var init_polytoken2 = __esm(() => {
+  init_messages();
+  init_polytoken();
+  polytokenAdapter = {
+    name: "polytoken",
+    clientEnvironmentMayDifferFromProxy: true,
+    getSessionId(c) {
+      return normalizePolytokenSessionId(c.req.header(POLYTOKEN_SESSION_HEADER));
+    },
+    extractWorkingDirectory(_body) {
+      return;
+    },
+    extractClientWorkingDirectory(_body) {
+      return;
+    },
+    normalizeContent(content) {
+      return normalizeContent(content);
+    },
+    getBlockedBuiltinTools() {
+      return [];
+    },
+    getAgentIncompatibleTools() {
+      return [];
+    },
+    getMcpServerName() {
+      return "polytoken";
+    },
+    getAllowedMcpTools() {
+      return [];
+    },
+    getCoreToolNames() {
+      return [];
+    },
+    usesPassthrough() {
+      return true;
+    },
+    supportsThinking() {
+      return true;
+    },
+    shouldTrackFileChanges() {
+      return false;
+    },
+    buildSdkAgents(_body, _mcpToolNames) {
+      return {};
+    },
+    buildSdkHooks(_body, _sdkAgents) {
+      return;
+    },
+    buildSystemContextAddendum(_body, _sdkAgents) {
+      return "";
+    }
+  };
+});
+
 // src/proxy/adapterInstances.ts
 import { existsSync as existsSync4, readFileSync as readFileSync4 } from "node:fs";
 import { join as join5 } from "node:path";
@@ -3429,6 +3516,10 @@ __export(exports_detect, {
 function listAdapterNames() {
   return [...new Set(Object.values(ADAPTER_MAP).map((a) => a.name))];
 }
+function resolveDefaultAdapter() {
+  const current = (process.env.MERIDIAN_DEFAULT_AGENT || "").toLowerCase();
+  return ADAPTER_MAP[current] ?? openCodeAdapter;
+}
 function isLiteLLMRequest(c) {
   if ((c.req.header("user-agent") || "").startsWith("litellm/"))
     return true;
@@ -3456,19 +3547,20 @@ function detectAdapter(c) {
   }
   const instances = loadAdapterInstances();
   const instanceNames = Object.keys(instances);
-  if (instanceNames.length > 0) {
-    if (agentOverride && instances[agentOverride]) {
-      const inst = makeInstanceAdapter(agentOverride, instances[agentOverride]);
+  if (instanceNames.length > 0 && agentOverride && instances[agentOverride]) {
+    const inst = makeInstanceAdapter(agentOverride, instances[agentOverride]);
+    if (inst)
+      return inst;
+  }
+  if (normalizePolytokenSessionId(c.req.header("x-polytoken-session"))) {
+    return polytokenAdapter;
+  }
+  for (const name of instanceNames) {
+    if (matchesInstance(instances[name], (h) => c.req.header(h))) {
+      const inst = makeInstanceAdapter(name, instances[name]);
       if (inst)
         return inst;
     }
-    for (const name of instanceNames) {
-      if (matchesInstance(instances[name], (h) => c.req.header(h))) {
-        const inst = makeInstanceAdapter(name, instances[name]);
-        if (inst)
-          return inst;
-      }
-    }
   }
   if (c.req.header("x-opencode-session")) {
     return openCodeAdapter;
@@ -3486,6 +3578,9 @@ function detectAdapter(c) {
   if (userAgent.startsWith("Charm-Crush/")) {
     return crushAdapter;
   }
+  if (/^Polytoken(?:[\s/]|$)/.test(userAgent)) {
+    return polytokenAdapter;
+  }
   if (c.req.header("x-session-affinity")) {
     return openCodeAdapter;
   }
@@ -3499,9 +3594,9 @@ function detectAdapter(c) {
   if (isLiteLLMRequest(c)) {
     return passthroughAdapter;
   }
-  return defaultAdapter;
+  return resolveDefaultAdapter();
 }
-var ADAPTER_MAP, envDefault, defaultAdapter;
+var ADAPTER_MAP, envDefault;
 var init_detect = __esm(() => {
   init_opencode2();
   init_droid2();
@@ -3515,6 +3610,7 @@ var init_detect = __esm(() => {
   init_jcode();
   init_codex();
   init_cherry();
+  init_polytoken2();
   init_adapterInstances();
   ADAPTER_MAP = {
     opencode: openCodeAdapter,
@@ -3529,6 +3625,7 @@ var init_detect = __esm(() => {
     claudecode: claudeCodeAdapter,
     cherry: cherryAdapter,
     cherrystudio: cherryAdapter,
+    polytoken: polytokenAdapter,
     openai: openAiAdapter,
     jcode: jcodeAdapter,
     codex: codexAdapter
@@ -3537,7 +3634,6 @@ var init_detect = __esm(() => {
   if (envDefault && !ADAPTER_MAP[envDefault]) {
     console.warn(`[meridian] Unknown MERIDIAN_DEFAULT_AGENT="${envDefault}". ` + `Valid values: ${Object.keys(ADAPTER_MAP).join(", ")}. Falling back to opencode.`);
   }
-  defaultAdapter = ADAPTER_MAP[envDefault] ?? openCodeAdapter;
 });
 
 // src/proxy/sdkFeatures.ts
@@ -3693,6 +3789,14 @@ var init_sdkFeatures = __esm(() => {
     },
     codex: {
       codeSystemPrompt: false
+    },
+    polytoken: {
+      codeSystemPrompt: false,
+      clientSystemPrompt: true,
+      claudeMd: "off",
+      memory: false,
+      dreaming: false,
+      sharedMemory: false
     }
   };
   VALID_CLAUDE_MD_VALUES = new Set(["off", "project", "full"]);
@@ -6766,6 +6870,13 @@ function ordinalSuffix(n) {
 function linkRequestAbort(signal) {
   const controller = new AbortController;
   let attached = false;
+  const linkedAt = Date.now();
+  let cause;
+  const classify = () => {
+    if (!controller.signal.aborted)
+      return "none";
+    return cause ?? "unknown_abort";
+  };
   const abort = (reason) => {
     if (!controller.signal.aborted)
       controller.abort(reason);
@@ -6785,6 +6896,19 @@ function linkRequestAbort(signal) {
         return;
       signal.removeEventListener("abort", forwardAbort);
       attached = false;
+    },
+    setCause: (labeled) => {
+      cause ??= labeled;
+    },
+    abortSnapshot: () => {
+      const snapshot = {
+        cause: classify(),
+        aborted: controller.signal.aborted
+      };
+      if (controller.signal.aborted) {
+        snapshot.elapsedMs = Math.max(0, Date.now() - linkedAt);
+      }
+      return snapshot;
     }
   };
 }
@@ -23563,6 +23687,7 @@ var BILLING_SIGNALS = [
   /^\s*(?:(?:error|api error|claude code returned an error result):\s*)*credit balance is too low[.!]?\s*$/m,
   /^\s*(?:(?:error|api error|claude code returned an error result|subprocess stderr):\s*)*your (?:group|organization|org)(?:'|’)s usage limit is set to \$\d/m
 ];
+var SUBSCRIPTION_ACCESS_DISABLED = /^\s*(?:(?:error|api error|claude code returned an error result|subprocess stderr):\s*|failed to authenticate\.\s*)*(?:\d{3} )?your (?:organization|org) has disabled claude subscription access/m;
 var HIT_YOUR_LIMIT = /hit your (?:[\w-]+ )?limit/;
 var HIT_YOUR_SPEND_LIMIT = /^\s*(?:(?:error|api error|claude code returned an error result|subprocess stderr):\s*)*you(?:'|’)ve hit your (?:[\w'’-]+ ){0,4}(?:spend|usage) limit/m;
 var REACHED_YOUR_TIER_LIMIT = /^[ \t]*(?:(?:error|api error|claude code returned an error result|subprocess stderr):[ \t]*)*(?:\d{3}[ \t]+)?you(?:'|’)ve reached your (?:claude )?(?:fable|mythos|opus|sonnet|haiku)(?: \d+(?:\.\d+)*)? limit(?:(?:[.!][ \t]+|[ \t]+)(?:(?:run[ \t]+)?\/usage-credits(?:[ \t]+to[ \t]+continue)?(?:[ \t]+or[ \t]+switch[ \t]+models[ \t]+with[ \t]+\/model)?|\/model[ \t]+to[ \t]+switch[ \t]+models|switch[ \t]+to[ \t]+another[ \t]+model(?:[ \t]+to[ \t]+continue)?)\.?|[.!]?)[ \t\r]*$/m;
@@ -23591,6 +23716,13 @@ function classifyError(errMsg, model) {
       message: "Claude OAuth token has expired and could not be refreshed automatically. Run 'claude login' in your terminal to re-authenticate."
     };
   }
+  if (SUBSCRIPTION_ACCESS_DISABLED.test(lower)) {
+    return {
+      status: 402,
+      type: "billing_error",
+      message: "This account's organization has disabled Claude subscription access for Claude Code. Ask the organization admin to re-enable it, or serve this request from an API-key profile — an identical retry on this account fails the same way."
+    };
+  }
   if (HTTP_401.test(lower) || lower.includes("authentication") || lower.includes("invalid auth") || lower.includes("credentials")) {
     return {
       status: 401,
@@ -23761,6 +23893,45 @@ function canRecoverCapturedToolUses(input) {
       return false;
   }
 }
+function isStreamedToolBlockComplete(record2) {
+  if (!record2.forwardedStart)
+    return false;
+  if (!record2.naturalStop)
+    return false;
+  if (record2.startedInputObject)
+    return true;
+  if (!record2.json.trim())
+    return false;
+  try {
+    const parsed = JSON.parse(record2.json);
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed);
+  } catch {
+    return false;
+  }
+}
+function canRecoverUncapturedToolUses(input) {
+  if (!input.uncapturedRecoveryEnabled)
+    return false;
+  if (!input.passthrough)
+    return false;
+  if (input.reason !== "max_turns")
+    return false;
+  if (input.attemptedMaxTurns !== 1)
+    return false;
+  if (input.capturedToolUses > 0)
+    return false;
+  if (input.streamedToolUses <= 0)
+    return false;
+  if (input.droppedToolUseIds > 0)
+    return false;
+  if (input.sawDuplicateToolUse)
+    return false;
+  if (input.forceSingleToolUse)
+    return false;
+  if (input.earlyStopFired)
+    return false;
+  return true;
+}
 function extractSdkTermination(errMsg) {
   const stderrTail = extractStderrTail(errMsg);
   const haystack = `${errMsg}
@@ -23825,6 +23996,9 @@ function formatSdkTermination(t, ctx) {
     parts.push(`deferred=${ctx.hasDeferredTools}`);
   if (ctx.sdkSessionId)
     parts.push(`session=${ctx.sdkSessionId.slice(0, 8)}`);
+  if (ctx.abort) {
+    parts.push(`abort=${ctx.abort.cause}`);
+  }
   if (t.rawTail)
     parts.push(`raw=${JSON.stringify(t.rawTail)}`);
   if (t.stderrTail)
@@ -31905,6 +32079,7 @@ var claudeCodeTransforms = [
 ];
 
 // src/proxy/transforms/registry.ts
+init_polytoken();
 var ADAPTER_TRANSFORMS = {
   opencode: openCodeTransforms,
   crush: crushTransforms,
@@ -31917,7 +32092,8 @@ var ADAPTER_TRANSFORMS = {
   "claude-code": claudeCodeTransforms,
   openai: openCodeTransforms,
   jcode: openCodeTransforms,
-  codex: [...openCodeTransforms, ...codexTransforms]
+  codex: [...openCodeTransforms, ...codexTransforms],
+  polytoken: polytokenTransforms
 };
 function getAdapterTransforms(adapterName) {
   return ADAPTER_TRANSFORMS[adapterName] ?? [];
@@ -36811,6 +36987,7 @@ function createProxyServer(config2 = {}) {
   let durableWritesRevoked = false;
   let inFlightRequests = 0;
   const activeRequestAborts = new Set;
+  const activeShutdownLabels = new Map;
   const internalHopToken = randomUUID6();
   const errorEnvelope = (shape, type, message) => shape === "anthropic" ? { type: "error", error: { type, message } } : { error: { type, message, code: null } };
   const DRAIN_MESSAGE = "Meridian is shutting down and is not accepting new requests. Retry against another instance.";
@@ -37102,6 +37279,7 @@ function createProxyServer(config2 = {}) {
         body: options.body,
         forcedProfileId: candidate,
         turnWatchdogSignal: options.turnWatchdogSignal,
+        requestAbortLink: options.requestAbortLink,
         forceFreshPriorityReplay: priorityPublication !== undefined && (options.durableRoute?.forceFreshReplay === true || options.currentProfileId !== undefined && candidate !== options.currentProfileId),
         priorityPublication,
         priorityAttemptExposure: exposure
@@ -37179,7 +37357,7 @@ data: ${JSON.stringify(lastError)}
   const handleMessages = async (c, requestMeta, options) => {
     const requestStartAt = requestMeta.queueEnteredAt;
     const requestSignal = options.turnWatchdogSignal ? AbortSignal.any([c.req.raw.signal, options.turnWatchdogSignal]) : c.req.raw.signal;
-    const requestAbort = linkRequestAbort(requestSignal);
+    const requestAbort = options.requestAbortLink ?? linkRequestAbort(requestSignal);
     let streamOwnsAbortLink = false;
     return withClaudeLogContext({ requestId: requestMeta.requestId, endpoint: requestMeta.endpoint }, async () => {
       const adapter = detectAdapter(c);
@@ -37514,6 +37692,7 @@ data: ${JSON.stringify(lastError)}
                 wantsStream: body.stream === true,
                 currentProfileId: assignedProfile,
                 turnWatchdogSignal: options.turnWatchdogSignal,
+                requestAbortLink: options.requestAbortLink,
                 publicationTurn,
                 claimTurn: trustedTurn,
                 durableRoute
@@ -37525,7 +37704,7 @@ data: ${JSON.stringify(lastError)}
         resolvedProfileId = profile.id;
         const authStatus = await getClaudeAuthStatusAsync(profile.id !== "default" ? profile.id : undefined, Object.keys(profile.env).length > 0 ? profile.env : undefined);
         const requestSource = c.req.header("x-meridian-source")?.slice(0, 64) || undefined;
-        const declaredAgentMode = adapter.getAgentMode?.(c, body) ?? c.req.header("x-opencode-agent-mode") ?? null;
+        const declaredAgentMode = adapter.getAgentMode?.(c, body) ?? (adapter.baseName === "polytoken" || adapter.name === "polytoken" ? undefined : c.req.header("x-opencode-agent-mode")) ?? null;
         const isSubagentRequest = declaredAgentMode === "subagent" || requestSource?.startsWith("subagent-") === true;
         const agentMode = isSubagentRequest ? "subagent" : declaredAgentMode;
         const requestedModel = typeof body.model === "string" ? body.model : "sonnet";
@@ -37576,9 +37755,10 @@ data: ${JSON.stringify(lastError)}
           workingDirectory
         }), adapterBase);
         const stream3 = pipelineCtx.prefersStreaming !== undefined ? pipelineCtx.prefersStreaming : body.stream ?? false;
-        const effortHeader = c.req.header("x-opencode-effort");
-        const thinkingHeader = c.req.header("x-opencode-thinking");
-        const taskBudgetHeader = c.req.header("x-opencode-task-budget");
+        const isPolytokenBase = adapterBase === "polytoken";
+        const effortHeader = isPolytokenBase ? undefined : c.req.header("x-opencode-effort");
+        const thinkingHeader = isPolytokenBase ? undefined : c.req.header("x-opencode-thinking");
+        const taskBudgetHeader = isPolytokenBase ? undefined : c.req.header("x-opencode-task-budget");
         const rawBetaHeader = c.req.header("anthropic-beta");
         const betaFilter = filterBetasForProfile(rawBetaHeader, profile.type, getBetaPolicyFromEnv());
         if (betaFilter.stripped.length > 0) {
@@ -37733,7 +37913,7 @@ data: ${JSON.stringify(lastError)}
         const trailingSystemReminderOptions = adapterBase === "claude-code" ? { allowTrailingSystemReminder: true } : undefined;
         const durableCheckpointContinuation = durableCheckpointIds?.length && durableMappingAtTurn.status === "found" && matchesStoredLineagePrefix(durableMappingAtTurn.session, lineageMessages) ? coalesceCompleteToolResultContinuation((body.messages || []).slice(durableMappingAtTurn.session.messageCount), durableCheckpointIds, trailingSystemReminderOptions) : undefined;
         const advancesDurableCheckpoint = Boolean(durableCheckpointContinuation);
-        const passthrough = adapter.instancePassthrough !== undefined ? adapter.instancePassthrough : pipelineCtx.passthrough !== undefined ? pipelineCtx.passthrough : envBool("PASSTHROUGH");
+        const passthrough = adapterBase === "polytoken" ? true : adapter.instancePassthrough !== undefined ? adapter.instancePassthrough : pipelineCtx.passthrough !== undefined ? pipelineCtx.passthrough : envBool("PASSTHROUGH");
         if (advancesDurableCheckpoint && lineageResult.type !== "continuation" && lineageResult.type !== "compaction" && durableMappingAtTurn.status === "found") {
           const checkpointSession = getSessionByClaudeId(durableMappingAtTurn.session.claudeSessionId);
           if (checkpointSession) {
@@ -38174,7 +38354,7 @@ data: ${JSON.stringify(lastError)}
               }
               const clientTool = requestTools.find((t) => t.name === toolName);
               let toolInput = normalizeToolInput(input.tool_input, clientTool?.input_schema);
-              if (toolName.toLowerCase() === "task" && toolInput?.subagent_type && typeof toolInput.subagent_type === "string") {
+              if (adapterBase !== "polytoken" && toolName.toLowerCase() === "task" && toolInput?.subagent_type && typeof toolInput.subagent_type === "string") {
                 toolInput = { ...toolInput, subagent_type: resolveAgentAlias(toolInput.subagent_type, validAgentNames) };
               }
               const signature = toolUseSignature(toolName, toolInput);
@@ -38195,6 +38375,7 @@ data: ${JSON.stringify(lastError)}
                   name: toolName,
                   reason: exceedsForcedSingle ? "forced_single" : "same_tool_repeat"
                 });
+                requestAbort.setCause("passthrough_single_step");
                 requestAbort.abort("passthrough single-step complete");
               } else {
                 capturedSignatures.add(signature);
@@ -38765,7 +38946,8 @@ Subprocess stderr: ${stderrOutput}`;
                 requestSource,
                 isResume,
                 hasDeferredTools,
-                sdkSessionId: currentSessionId || resumeSessionId
+                sdkSessionId: currentSessionId || resumeSessionId,
+                abort: requestAbort.abortSnapshot()
               })} captured=${capturedToolUses.length}`, requestMeta.requestId);
               claudeLog("passthrough.max_turns_recovered", {
                 mode: "non_stream",
@@ -39050,11 +39232,14 @@ Subprocess stderr: ${stderrOutput}`;
               let nextPassthroughToolCallAssistantUuid;
               let nextPassthroughToolCallIds;
               let sawCanonicalResult = false;
+              const uncapturedToolRecoveryEnabled = env("PASSTHROUGH_UNCAPTURED_TOOL_RECOVERY") === "1";
+              const streamedToolBlockRecords = new Map;
               const silentTurnRecoveryEnabled = env("SILENT_TURN_RECOVERY") !== "0";
               let silentTurnRecoveryAttempted = false;
               let silentTurnRecovered = false;
               const streamedToolUseIds = new Set;
               let pendingTerminalDelta = null;
+              let lastAttemptMaxTurns;
               let pendingStructuredFrames = [];
               let pendingStructuredTextLength = 0;
               let terminalDeltaSent = false;
@@ -39086,7 +39271,7 @@ data: ${JSON.stringify({
                 try {
                   const clientTool = requestTools.find((tool2) => tool2.name === buffered.name);
                   const parsed = normalizeToolInput(JSON.parse(buffered.json), clientTool?.input_schema);
-                  if (buffered.name.toLowerCase() === "task" && typeof parsed?.subagent_type === "string") {
+                  if (adapterBase !== "polytoken" && buffered.name.toLowerCase() === "task" && typeof parsed?.subagent_type === "string") {
                     parsed.subagent_type = resolveAgentAlias(parsed.subagent_type, validAgentNames);
                   }
                   fixed = JSON.stringify(parsed);
@@ -39198,6 +39383,7 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                         advisorModel
                       }, requestAbort.controller);
                       attemptMaxTurns = attemptQuery.options.maxTurns;
+                      lastAttemptMaxTurns = attemptMaxTurns;
                       for await (const event of runSdkQueryAttempt(attemptQuery, requestAbort.controller.signal, requestMeta, "stream", managedSdkAttemptLocators())) {
                         if (event.type === "rate_limit_event") {
                           rateLimitStore.record(profile.id, event.rate_limit_info);
@@ -39645,6 +39831,9 @@ data: ${JSON.stringify({ type: "content_block_stop", index: idx })}
                         if (eventType === "content_block_stop") {
                           flushToolArguments(clientIdx);
                           passthroughToolBlockNames.delete(eventIndex);
+                          const record3 = streamedToolBlockRecords.get(clientIdx);
+                          if (record3)
+                            record3.naturalStop = true;
                         }
                       }
                       if (eventType === "content_block_delta" && event.delta?.type === "text_delta" && shouldInjectSilentTurn({
@@ -39678,6 +39867,34 @@ data: ${JSON.stringify(event)}
                         if (typeof idx === "number")
                           openClientBlocks.delete(idx);
                       }
+                      if (passthrough && uncapturedToolRecoveryEnabled) {
+                        const clientIdx = eventIndex !== undefined ? sdkToClientIndex.get(eventIndex) ?? eventIndex : undefined;
+                        if (clientIdx !== undefined) {
+                          if (eventType === "content_block_start") {
+                            const block = event.content_block;
+                            if (block?.type === "tool_use" && typeof block?.id === "string" && block.id) {
+                              streamedToolBlockRecords.set(clientIdx, {
+                                id: block.id,
+                                name: block.name,
+                                json: "",
+                                startedInputObject: block.input !== undefined && block.input !== null,
+                                forwardedStart: true,
+                                naturalStop: false
+                              });
+                            }
+                          } else if (eventType === "content_block_delta") {
+                            const delta = event.delta;
+                            const record3 = streamedToolBlockRecords.get(clientIdx);
+                            if (record3 && delta?.type === "input_json_delta" && typeof delta.partial_json === "string") {
+                              record3.json += delta.partial_json;
+                            }
+                          } else if (eventType === "content_block_stop") {
+                            const record3 = streamedToolBlockRecords.get(clientIdx);
+                            if (record3)
+                              record3.naturalStop = true;
+                          }
+                        }
+                      }
                       if (passthrough && eventType === "message_delta" && event.delta?.stop_reason === "tool_use" && streamedToolUseIds.size > 0) {
                         flushOpenClientBlocks("drain_close");
                         if (earlyStopEnabled) {
@@ -40354,8 +40571,40 @@ Subprocess stderr: ${stderrOutput}`;
                   capturedToolUses: capturedToolUses.length,
                   abortIsOurs: sawDuplicateToolUse
                 }) && messageStartEmitted;
+                const uncapturedEligible = (() => {
+                  if (!canRecoverUncapturedToolUses({
+                    reason: sdkTerm.reason,
+                    passthrough,
+                    capturedToolUses: capturedToolUses.length,
+                    streamedToolUses: streamedToolUseIds.size,
+                    droppedToolUseIds: droppedToolUseIds.size,
+                    sawDuplicateToolUse,
+                    forceSingleToolUse,
+                    earlyStopFired,
+                    uncapturedRecoveryEnabled: uncapturedToolRecoveryEnabled,
+                    attemptedMaxTurns: lastAttemptMaxTurns
+                  }))
+                    return false;
+                  if (!messageStartEmitted || streamClosed || pendingTerminalDelta)
+                    return false;
+                  if (durableWritesRevoked)
+                    return false;
+                  if (requestAbort.abortSnapshot().aborted)
+                    return false;
+                  for (const record3 of streamedToolBlockRecords.values()) {
+                    if (!isStreamedToolBlockComplete(record3))
+                      return false;
+                    const declared = requestTools.some((t) => t.name === record3.name);
+                    if (!declared)
+                      return false;
+                  }
+                  if (streamedToolBlockRecords.size !== streamedToolUseIds.size)
+                    return false;
+                  return true;
+                })();
+                const uncapturedRecoveryActive = uncapturedEligible;
                 const recoverableCheckpoint = canRecoverAsToolUse && sdkTerm.reason === "max_turns" && Boolean(currentSessionId) && Boolean(nextPassthroughToolCallAssistantUuid) && Boolean(nextPassthroughToolCallIds?.length) && earlyStopFired && !isIndependentSession && !sawDuplicateToolUse;
-                const mustEvictBeforeRecoveredTerminal = !isIndependentSession && canRecoverAsToolUse && !recoverableCheckpoint;
+                const mustEvictBeforeRecoveredTerminal = !isIndependentSession && canRecoverAsToolUse && !recoverableCheckpoint || !isIndependentSession && uncapturedRecoveryActive && !recoverableCheckpoint;
                 if (mustEvictBeforeRecoveredTerminal || !isIndependentSession && passthrough && streamedToolUseIds.size > 0 && !sawCanonicalResult && !recoverableCheckpoint) {
                   const evicted = evictSession2(profileSessionId, profileScopedCwd, lineageMessages, mappingExpectedGeneration);
                   if (mustEvictBeforeRecoveredTerminal && !evicted) {
@@ -40363,15 +40612,16 @@ Subprocess stderr: ${stderrOutput}`;
                   }
                   claudeLog("passthrough.noncanonical_session_evicted", { mode: "stream", reason: "drain_error" });
                 }
-                if (canRecoverAsToolUse) {
+                if (canRecoverAsToolUse || uncapturedRecoveryActive) {
                   idleStalls.clear(idleStallSessionKey);
-                  diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered ${formatSdkTermination(sdkTerm, {
+                  diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered${uncapturedRecoveryActive ? "_uncaptured" : ""} ${formatSdkTermination(sdkTerm, {
                     model,
                     requestSource,
                     isResume,
                     hasDeferredTools,
-                    sdkSessionId: currentSessionId || resumeSessionId
-                  })} captured=${capturedToolUses.length}`, requestMeta.requestId);
+                    sdkSessionId: currentSessionId || resumeSessionId,
+                    abort: requestAbort.abortSnapshot()
+                  })} captured=${capturedToolUses.length}${uncapturedRecoveryActive ? ` completed=${streamedToolBlockRecords.size}` : ""}`, requestMeta.requestId);
                   flushOpenClientBlocks("recovery");
                   const unseenToolUses = capturedToolUses.filter((tu) => !streamedToolUseIds.has(tu.id));
                   for (let i = 0;i < unseenToolUses.length; i++) {
@@ -40512,7 +40762,8 @@ data: {"type":"message_stop"}
                     requestSource,
                     isResume,
                     hasDeferredTools,
-                    sdkSessionId: currentSessionId || resumeSessionId
+                    sdkSessionId: currentSessionId || resumeSessionId,
+                    abort: requestAbort.abortSnapshot()
                   })} blocks=${nextClientBlockIndex}`, requestMeta.requestId);
                   claudeLog("passthrough.capped_turn_truncated", {
                     mode: "stream",
@@ -40585,7 +40836,8 @@ data: {"type":"message_stop"}
                   requestSource,
                   isResume,
                   hasDeferredTools,
-                  sdkSessionId: currentSessionId || resumeSessionId
+                  sdkSessionId: currentSessionId || resumeSessionId,
+                  abort: requestAbort.abortSnapshot()
                 })} envelope=${messageStartEmitted ? "open" : "unopened"} blocks=${contentBlocksForwarded} ` + `text=${textEventsForwarded} tools=${capturedToolUses.length}/${streamedToolUseIds.size}`, requestMeta.requestId);
                 const streamErrTotalMs = Date.now() - requestStartAt;
                 const streamErrQueueWaitMs = totalQueueWaitMs(requestMeta);
@@ -40665,15 +40917,18 @@ data: ${JSON.stringify({
                 await abandonManagedFork("stream_complete_without_commit");
                 if (priorityRollbackRetirement)
                   await priorityRollbackRetirement;
-                requestAbort.detach();
+                if (!streamOwnsAbortLink)
+                  requestAbort.detach();
               }
             })().finally(() => {
               resolveStreamCompletion();
             });
           },
           cancel(reason) {
+            requestAbort.setCause("stream_cancel");
             requestAbort.abort(reason);
-            requestAbort.detach();
+            if (!streamOwnsAbortLink)
+              requestAbort.detach();
             requestMeta.cascadeSubtreeCancel?.("stream_cancel");
             if (!isIndependentSession && (!managedForkTarget || managedForkPublished || clientAssistantContentExposed)) {
               evictSession2(profileSessionId, profileScopedCwd, lineageMessages, mappingExpectedGeneration);
@@ -40706,7 +40961,8 @@ data: ${JSON.stringify({
         claudeLog("proxy.error", { error: errMsg, classified: classified.type });
         const sdkTerm = extractSdkTermination(errMsg);
         diagnosticLog2.error(`${requestMeta.requestId} ${formatSdkTermination(sdkTerm, {
-          requestSource: c.req.header("x-meridian-source")?.slice(0, 64) || undefined
+          requestSource: c.req.header("x-meridian-source")?.slice(0, 64) || undefined,
+          abort: requestAbort.abortSnapshot()
         })}`, requestMeta.requestId);
         const errorQueueWaitMs = totalQueueWaitMs(requestMeta);
         const errorTotalMs = Date.now() - requestStartAt;
@@ -40793,6 +41049,14 @@ data: ${JSON.stringify({
     };
     const turnWatchdogAbort = new AbortController;
     activeRequestAborts.add(turnWatchdogAbort);
+    const requestSignalForLink = AbortSignal.any([c.req.raw.signal, turnWatchdogAbort.signal]);
+    const labelClientAbort = () => {
+      if (!turnWatchdogAbort.signal.aborted)
+        requestAbortLink?.setCause("client_abort");
+    };
+    c.req.raw.signal.addEventListener("abort", labelClientAbort, { once: true });
+    const requestAbortLink = linkRequestAbort(requestSignalForLink);
+    activeShutdownLabels.set(turnWatchdogAbort, () => requestAbortLink.setCause("process_shutdown"));
     let finished = false;
     let leaseReleased = false;
     let retainSessionTurnFence = false;
@@ -40821,6 +41085,8 @@ data: ${JSON.stringify({
       if (finished)
         return;
       finished = true;
+      requestAbortLink.detach();
+      c.req.raw.signal.removeEventListener("abort", labelClientAbort);
       if (retainSessionTurnFence && (sessionTurnLease || crossProcessTurnLease)) {
         leaseReleased = true;
         if (leaseWatchdog)
@@ -40835,6 +41101,7 @@ data: ${JSON.stringify({
       sessionTreeRegistration?.release();
       sessionTreeRegistration = undefined;
       activeRequestAborts.delete(turnWatchdogAbort);
+      activeShutdownLabels.delete(turnWatchdogAbort);
       inFlightRequests--;
     };
     let body;
@@ -40866,7 +41133,10 @@ data: ${JSON.stringify({
             requestId,
             sessionKey: agentSessionId,
             parentKey: adapter.getParentSessionId?.(c, body),
-            abort: (reason) => turnWatchdogAbort.abort(reason)
+            abort: (reason) => {
+              requestAbortLink.setCause("subtree_cancel");
+              turnWatchdogAbort.abort(reason);
+            }
           });
           subtreeSessionKey = agentSessionId;
           const clientSignal = c.req.raw.signal;
@@ -40887,6 +41157,7 @@ data: ${JSON.stringify({
             leaseWatchdog = setTimeout(() => {
               claudeLog("session.turn_watchdog_abort", { requestId, heldMs: SESSION_TURN_MAX_HOLD_MS });
               plog(`[PROXY] ${requestId} session turn exceeded ${SESSION_TURN_MAX_HOLD_MS}ms — aborting without releasing its fencing lease`);
+              requestAbortLink.setCause("session_watchdog");
               turnWatchdogAbort.abort(new Error("Session turn exceeded its maximum hold time"));
             }, SESSION_TURN_MAX_HOLD_MS);
             leaseWatchdog.unref?.();
@@ -40961,7 +41232,8 @@ data: ${JSON.stringify({
       };
       const response = await handleMessages(c, requestMeta, {
         body,
-        turnWatchdogSignal: turnWatchdogAbort.signal
+        turnWatchdogSignal: turnWatchdogAbort.signal,
+        requestAbortLink
       });
       const completion = responseCompletions.get(response);
       if (completion) {
@@ -41786,6 +42058,8 @@ data: ${JSON.stringify({ response: { id: responseId, status: "failed", error: {
     },
     forceAbortInFlight: () => {
       durableWritesRevoked = true;
+      for (const label of activeShutdownLabels.values())
+        label();
       for (const controller of activeRequestAborts) {
         controller.abort(new Error("Proxy shutdown grace period elapsed"));
       }

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startProxyServer
-} from "./cli-x1sv3bqf.js";
+} from "./cli-6c6dj69q.js";
 import"./cli-5jxyma6z.js";
 import"./cli-sry5aqdj.js";
 import"./cli-8yp89fan.js";