@rynfar/meridian 1.45.0 → 1.45.2

package/README.md

@@ -748,6 +748,36 @@ export default {
 - **Reload without restart:** `POST /plugins/reload`
 - **Full guide:** See [PLUGINS.md](PLUGINS.md)
 
+### Official plugins
+
+Content-scoped scrubbers maintained alongside Meridian. Core stays a clean
+proxy — anything that rewrites client prompt content ships as one of these
+opt-in plugins instead:
+
+| Plugin | What it does |
+|--------|--------------|
+| [`@rynfar/meridian-plugin-hermes-scrub`](https://github.com/rynfar/meridian-plugin-hermes-scrub) | Strips Hermes Agent's `# Finishing the job` harness block from the system prompt. Fixes empty-stream responses when proxying Hermes, and avoids its coding-harness fingerprint. |
+| [`@rynfar/meridian-plugin-pi-scrub`](https://github.com/rynfar/meridian-plugin-pi-scrub) | Strips Pi's coding-agent-harness prompt line that Anthropic meters as Extra Usage. |
+| [`@rynfar/meridian-plugin-opencode-scrub`](https://github.com/rynfar/meridian-plugin-opencode-scrub) | Strips OpenCode harness boilerplate from the system prompt before it reaches Claude. |
+
+Install into Meridian's config dir and register the built file in
+`~/.config/meridian/plugins.json`:
+
+```bash
+cd ~/.config/meridian
+npm install @rynfar/meridian-plugin-hermes-scrub
+```
+
+```json
+{
+  "plugins": [
+    { "path": "/Users/you/.config/meridian/node_modules/@rynfar/meridian-plugin-hermes-scrub/dist/index.js", "enabled": true }
+  ]
+}
+```
+
+Paths must be absolute — the loader does not expand `~`.
+
 ## CLI Commands
 
 | Command | Description |

package/dist/{cli-rakysex2.js → cli-kgrg9sq3.js}

@@ -3818,6 +3818,33 @@ async function* guardUpstreamIdle(source, idleMs, onStall, clock = realClock) {
   }
 }
 
+// src/proxy/requestAbort.ts
+function linkRequestAbort(signal) {
+  const controller = new AbortController;
+  let attached = false;
+  const abort = (reason) => {
+    if (!controller.signal.aborted)
+      controller.abort(reason);
+  };
+  const forwardAbort = () => abort(signal.reason);
+  if (signal.aborted) {
+    forwardAbort();
+  } else {
+    signal.addEventListener("abort", forwardAbort, { once: true });
+    attached = true;
+  }
+  return {
+    controller,
+    abort,
+    detach: () => {
+      if (!attached)
+        return;
+      signal.removeEventListener("abort", forwardAbort);
+      attached = false;
+    }
+  };
+}
+
 // src/proxy/oauthUsage.ts
 var OAUTH_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 var OAUTH_BETA_HEADER = "oauth-2025-04-20";
@@ -8111,6 +8138,9 @@ function stableStringify(value) {
   const parts = keys.map((k) => `${JSON.stringify(k)}:${stableStringify(value[k])}`);
   return `{${parts.join(",")}}`;
 }
+function toolUseSignature(name, input) {
+  return `${name}::${stableStringify(input ?? null)}`;
+}
 function stripMcpPrefix(toolName) {
   if (toolName.startsWith(PASSTHROUGH_MCP_PREFIX)) {
     return toolName.slice(PASSTHROUGH_MCP_PREFIX.length);
@@ -9583,12 +9613,35 @@ function translateAnthropicToOpenAi(response, completionId, model, created, opti
 }
 function createSseTranslator(ctx) {
   let toolCallIndex = -1;
-  return (event) => {
+  let lastUsage;
+  const translate = (event) => {
     if (event.type === "content_block_start" && event.content_block?.type === "tool_use" && typeof event.content_block.name === "string") {
       toolCallIndex++;
     }
+    if (event.type === "message_delta" && event.usage) {
+      lastUsage = event.usage;
+    }
     return translateAnthropicSseEvent(event, ctx.completionId, ctx.model, ctx.created, toolCallIndex, ctx.thinkingPassthrough);
   };
+  translate.buildUsageChunk = () => {
+    if (!ctx.includeUsage || !lastUsage)
+      return null;
+    const promptTokens = lastUsage.input_tokens ?? 0;
+    const completionTokens = lastUsage.output_tokens ?? 0;
+    return {
+      id: ctx.completionId,
+      object: "chat.completion.chunk",
+      created: ctx.created,
+      model: ctx.model,
+      choices: [],
+      usage: {
+        prompt_tokens: promptTokens,
+        completion_tokens: completionTokens,
+        total_tokens: promptTokens + completionTokens
+      }
+    };
+  };
+  return translate;
 }
 function translateAnthropicSseEvent(event, completionId, model, created, toolCallNum, thinkingPassthrough) {
   if (event.type === "message_start") {
@@ -9987,7 +10040,6 @@ var BLOCKED_BUILTIN_TOOLS = [
   "Read",
   "Write",
   "Edit",
-  "MultiEdit",
   "Bash",
   "Glob",
   "Grep",
@@ -16563,7 +16615,9 @@ function stripConfigDir(env2) {
 }
 function computePassthroughMaxTurns(resumeSessionId, hasDeferredTools, advisorModel) {
   const hasResume = !!resumeSessionId;
-  const base = hasResume && hasDeferredTools ? 4 : 3;
+  const defaultBase = hasResume && hasDeferredTools ? 4 : 3;
+  const configured = envInt("PASSTHROUGH_MAX_TURNS", defaultBase);
+  const base = configured > 0 ? configured : defaultBase;
   const advisorBump = advisorModel ? 3 : 0;
   return base + advisorBump;
 }
@@ -16594,7 +16648,7 @@ function resolveSystemPrompt(systemContext, passthrough, settingSources, codeSys
     return { systemPrompt: "" };
   return {};
 }
-function buildQueryOptions(ctx) {
+function buildQueryOptions(ctx, abortController) {
   const {
     prompt,
     model,
@@ -16620,6 +16674,7 @@ function buildQueryOptions(ctx) {
     effort,
     thinking,
     taskBudget,
+    outputFormat,
     betas,
     settingSources,
     codeSystemPrompt,
@@ -16642,6 +16697,7 @@ function buildQueryOptions(ctx) {
       cwd: workingDirectory,
       model,
       pathToClaudeCodeExecutable: claudeExecutable,
+      ...abortController ? { abortController } : {},
       ...stream2 ? { includePartialMessages: true } : {},
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
@@ -16682,6 +16738,7 @@ function buildQueryOptions(ctx) {
       ...effort ? { effort } : {},
       ...thinking ? { thinking } : {},
       ...taskBudget ? { taskBudget } : {},
+      ...outputFormat ? { outputFormat } : {},
       ...betas && betas.length > 0 ? { betas } : {},
       ...maxBudgetUsd && maxBudgetUsd > 0 ? { maxBudgetUsd } : {},
       ...fallbackModel ? { fallbackModel } : {},
@@ -16698,6 +16755,40 @@ function normalizeEffort(value) {
   return typeof value === "string" && VALID_EFFORTS.includes(value) ? value : undefined;
 }
 
+// src/proxy/structuredOutput.ts
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function parseOutputFormat(outputConfig, tools) {
+  if (outputConfig === undefined)
+    return { ok: true, value: undefined };
+  if (!isRecord(outputConfig)) {
+    return { ok: false, message: "output_config: Expected an object" };
+  }
+  const format = outputConfig.format;
+  if (format === undefined)
+    return { ok: true, value: undefined };
+  if (!isRecord(format)) {
+    return { ok: false, message: "output_config.format: Expected an object" };
+  }
+  if (format.type !== "json_schema") {
+    return { ok: false, message: "output_config.format.type: Only 'json_schema' is supported" };
+  }
+  if (!isRecord(format.schema)) {
+    return { ok: false, message: "output_config.format.schema: Expected a JSON Schema object" };
+  }
+  if (Array.isArray(tools) && tools.length > 0) {
+    return { ok: false, message: "output_config.format: Cannot be combined with tools" };
+  }
+  return {
+    ok: true,
+    value: { type: "json_schema", schema: format.schema }
+  };
+}
+function structuredOutputText(value) {
+  return JSON.stringify(value);
+}
+
 // src/proxy/transforms/registry.ts
 var ADAPTER_TRANSFORMS = {
   opencode: openCodeTransforms,
@@ -17829,6 +17920,8 @@ function createProxyServer(config = {}) {
   }
   const handleMessages = async (c, requestMeta) => {
     const requestStartAt = Date.now();
+    const requestAbort = linkRequestAbort(c.req.raw.signal);
+    let streamOwnsAbortLink = false;
     return withClaudeLogContext({ requestId: requestMeta.requestId, endpoint: requestMeta.endpoint }, async () => {
       const adapter = detectAdapter(c);
       try {
@@ -17849,13 +17942,18 @@ function createProxyServer(config = {}) {
         if (body.messages.length === 0) {
           return c.json({ type: "error", error: { type: "invalid_request_error", message: "messages: Cannot be empty — at least one message is required" } }, 400);
         }
+        const parsedOutputFormat = parseOutputFormat(body.output_config, body.tools);
+        if (!parsedOutputFormat.ok) {
+          return c.json({ type: "error", error: { type: "invalid_request_error", message: parsedOutputFormat.message } }, 400);
+        }
+        const outputFormat = parsedOutputFormat.value;
         const profile = resolveProfile(finalConfig.profiles, finalConfig.defaultProfile, c.req.header("x-meridian-profile") || undefined);
         const authStatus = await getClaudeAuthStatusAsync(profile.id !== "default" ? profile.id : undefined, Object.keys(profile.env).length > 0 ? profile.env : undefined);
         const agentMode = c.req.header("x-opencode-agent-mode") ?? null;
         const requestSource = c.req.header("x-meridian-source")?.slice(0, 64) || undefined;
         const requestedModel = typeof body.model === "string" ? body.model : "sonnet";
         let model = mapModelToClaudeModel(requestedModel, authStatus?.subscriptionType, agentMode);
-        const envOverrides = requestedModel.startsWith("claude-opus-") ? { ANTHROPIC_DEFAULT_OPUS_MODEL: requestedModel } : requestedModel.startsWith("claude-fable-") ? { ANTHROPIC_DEFAULT_FABLE_MODEL: requestedModel } : undefined;
+        const envOverrides = requestedModel.startsWith("claude-opus-") ? { ANTHROPIC_DEFAULT_OPUS_MODEL: requestedModel } : requestedModel.startsWith("claude-fable-") ? { ANTHROPIC_DEFAULT_FABLE_MODEL: requestedModel } : requestedModel.startsWith("claude-sonnet-") ? { ANTHROPIC_DEFAULT_SONNET_MODEL: requestedModel } : requestedModel.startsWith("claude-haiku-") ? { ANTHROPIC_DEFAULT_HAIKU_MODEL: requestedModel } : undefined;
         const cwdResolution = resolveSdkWorkingDirectory({
           envOverride: process.env.MERIDIAN_WORKDIR ?? process.env.CLAUDE_PROXY_WORKDIR,
           adapterCwd: adapter.extractWorkingDirectory(body),
@@ -17946,7 +18044,10 @@ function createProxyServer(config = {}) {
         const agentSessionId = adapter.getSessionId(c);
         const profileSessionId = profile.id !== "default" && agentSessionId ? `${profile.id}:${agentSessionId}` : agentSessionId;
         const profileScopedCwd = profile.id !== "default" ? `${clientWorkingDirectory}::profile=${profile.id}` : clientWorkingDirectory;
-        const isIndependentSession = requestSource?.startsWith("fork-") || requestSource?.startsWith("subagent-") || false;
+        const lastMessage = Array.isArray(body.messages) ? body.messages[body.messages.length - 1] : undefined;
+        const lastIsToolResult = Array.isArray(lastMessage?.content) && lastMessage.content.some((b) => b?.type === "tool_result");
+        const isClientDrivenLoop = !agentSessionId && lastIsToolResult;
+        const isIndependentSession = requestSource?.startsWith("fork-") || requestSource?.startsWith("subagent-") || isClientDrivenLoop || false;
         let lineageResult = isIndependentSession ? { type: "diverged" } : lookupSession(profileSessionId, body.messages || [], profileScopedCwd);
         if (lineageResult.type === "undo" && adapter.name === "opencode" && !agentSessionId) {
           lineageResult = { type: "diverged" };
@@ -18056,6 +18157,11 @@ function createProxyServer(config = {}) {
         const passthrough = pipelineCtx.passthrough !== undefined ? pipelineCtx.passthrough : envBool("PASSTHROUGH");
         const settingSources = envBool("LOAD_CONTEXT") || sdkFeatures.claudeMd === "full" ? ["user", "project"] : sdkFeatures.claudeMd === "project" ? ["project"] : pipelineCtx.settingSources ?? [];
         const capturedToolUses = [];
+        const capturedSignatures = new Set;
+        const capturedToolNames = new Set;
+        let sawDuplicateToolUse = false;
+        const toolChoice = body.tool_choice;
+        const forceSingleToolUse = !!toolChoice && (toolChoice.type === "tool" || toolChoice.disable_parallel_tool_use === true);
         const fileChanges = [];
         let passthroughMcp;
         let requestTools = Array.isArray(body.tools) ? body.tools : [];
@@ -18104,6 +18210,8 @@ function createProxyServer(config = {}) {
             hooks: [async (input) => {
               if (input.tool_name === "ToolSearch")
                 return {};
+              if (input.tool_name === "StructuredOutput")
+                return {};
               const toolName = stripMcpPrefix(input.tool_name);
               if (hasDeferredTools && coreSet && !coreSet.has(toolName.toLowerCase())) {
                 discoveredTools.add(toolName);
@@ -18113,11 +18221,40 @@ function createProxyServer(config = {}) {
               if (toolName.toLowerCase() === "task" && toolInput?.subagent_type && typeof toolInput.subagent_type === "string") {
                 toolInput = { ...toolInput, subagent_type: resolveAgentAlias(toolInput.subagent_type) };
               }
-              capturedToolUses.push({
-                id: input.tool_use_id,
-                name: toolName,
-                input: toolInput
-              });
+              const signature = toolUseSignature(toolName, toolInput);
+              const isExactDuplicate = capturedSignatures.has(signature);
+              const isSameToolRepeat = !isExactDuplicate && capturedToolNames.has(toolName);
+              const exceedsForcedSingle = forceSingleToolUse && capturedToolUses.length >= 1;
+              if (isExactDuplicate) {
+                claudeLog("passthrough.duplicate_tool_use_dropped", { name: toolName });
+              } else if (isSameToolRepeat || exceedsForcedSingle) {
+                sawDuplicateToolUse = true;
+                claudeLog("passthrough.extra_tool_use_dropped", {
+                  name: toolName,
+                  reason: exceedsForcedSingle ? "forced_single" : "same_tool_repeat"
+                });
+                requestAbort.abort("passthrough single-step complete");
+              } else {
+                capturedSignatures.add(signature);
+                capturedToolNames.add(toolName);
+                capturedToolUses.push({
+                  id: input.tool_use_id,
+                  name: toolName,
+                  input: toolInput
+                });
+              }
+              if (isExactDuplicate) {
+                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."
+                };
+              }
+              if (isSameToolRepeat || exceedsForcedSingle) {
+                return {
+                  decision: "block",
+                  reason: "This tool call was NOT executed and was not forwarded. Your earlier tool call(s) " + "are being returned to the client now; their results arrive next turn. Re-issue this " + "call after that if it is still needed. Do not call additional tools and do not " + "generate further text — end your turn now."
+                };
+              }
               return {
                 decision: "block",
                 reason: "This tool call has been forwarded to the client for execution. " + "The result will be delivered in a future turn. " + "Do not retry, do not call additional tools, and do not generate further text — end your turn now."
@@ -18136,6 +18273,8 @@ function createProxyServer(config = {}) {
         if (!stream2) {
           const contentBlocks = [];
           let assistantMessages = 0;
+          let hasStructuredOutput = false;
+          let structuredOutput;
           const upstreamStartAt = Date.now();
           let firstChunkAt;
           let currentSessionId;
@@ -18187,6 +18326,7 @@ function createProxyServer(config = {}) {
                     effort,
                     thinking,
                     taskBudget,
+                    outputFormat,
                     betas,
                     settingSources,
                     codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18199,7 +18339,7 @@ function createProxyServer(config = {}) {
                     sdkDebug: sdkFeatures.sdkDebug,
                     additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                     advisorModel
-                  }))) {
+                  }, requestAbort.controller))) {
                     if (event.type === "rate_limit_event") {
                       rateLimitStore.record(event.rate_limit_info);
                     }
@@ -18250,6 +18390,7 @@ function createProxyServer(config = {}) {
                       effort,
                       thinking,
                       taskBudget,
+                      outputFormat,
                       betas,
                       settingSources,
                       codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18262,7 +18403,7 @@ function createProxyServer(config = {}) {
                       sdkDebug: sdkFeatures.sdkDebug,
                       additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                       advisorModel
-                    }));
+                    }, requestAbort.controller));
                     return;
                   }
                   if (isExtraUsageRequiredError(errMsg) && hasExtendedContext(model)) {
@@ -18316,6 +18457,7 @@ function createProxyServer(config = {}) {
                       effort,
                       thinking,
                       taskBudget,
+                      outputFormat,
                       betas,
                       settingSources,
                       codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18328,7 +18470,7 @@ function createProxyServer(config = {}) {
                       sdkDebug: sdkFeatures.sdkDebug,
                       additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                       advisorModel
-                    }));
+                    }, requestAbort.controller));
                     return;
                   }
                   if (isExpiredTokenError(errMsg) && !tokenRefreshed) {
@@ -18376,6 +18518,10 @@ function createProxyServer(config = {}) {
               if (message.session_id) {
                 currentSessionId = message.session_id;
               }
+              if (passthrough && sawDuplicateToolUse) {
+                claudeLog("passthrough.loop_break", { mode: "non_stream", assistantMessages, captured: capturedToolUses.length });
+                break;
+              }
               if (message.type === "assistant") {
                 assistantMessages += 1;
                 if (message.uuid) {
@@ -18421,6 +18567,10 @@ function createProxyServer(config = {}) {
                 if (resultUsage) {
                   lastUsage = { ...lastUsage, ...resultUsage };
                 }
+                if (outputFormat && "structured_output" in message) {
+                  hasStructuredOutput = true;
+                  structuredOutput = message.structured_output;
+                }
               }
             }
             claudeLog("upstream.completed", {
@@ -18448,14 +18598,40 @@ function createProxyServer(config = {}) {
               error.message = `${error.message}
 Subprocess stderr: ${stderrOutput}`;
             }
-            claudeLog("upstream.failed", {
-              mode: "non_stream",
-              model,
-              durationMs: Date.now() - upstreamStartAt,
-              error: error instanceof Error ? error.message : String(error),
-              ...stderrOutput ? { stderr: stderrOutput } : {}
+            const sdkTerm = extractSdkTermination(error instanceof Error ? error.message : String(error));
+            const canRecoverAsToolUse = passthrough && capturedToolUses.length > 0 && (sdkTerm.reason === "max_turns" || sdkTerm.reason === "aborted");
+            if (canRecoverAsToolUse) {
+              diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered ${formatSdkTermination(sdkTerm, {
+                model,
+                requestSource,
+                isResume,
+                hasDeferredTools,
+                sdkSessionId: resumeSessionId
+              })} captured=${capturedToolUses.length}`, requestMeta.requestId);
+              claudeLog("passthrough.max_turns_recovered", {
+                mode: "non_stream",
+                reason: sdkTerm.reason,
+                captured: capturedToolUses.length
+              });
+            } else {
+              claudeLog("upstream.failed", {
+                mode: "non_stream",
+                model,
+                durationMs: Date.now() - upstreamStartAt,
+                error: error instanceof Error ? error.message : String(error),
+                ...stderrOutput ? { stderr: stderrOutput } : {}
+              });
+              throw error;
+            }
+          }
+          if (outputFormat) {
+            if (!hasStructuredOutput) {
+              throw new Error("Structured output was requested but the SDK returned no structured_output result");
+            }
+            contentBlocks.splice(0, contentBlocks.length, {
+              type: "text",
+              text: structuredOutputText(structuredOutput)
             });
-            throw error;
           }
           if (passthrough && capturedToolUses.length > 0) {
             const capturedById = new Map(capturedToolUses.map((tu) => [tu.id, tu]));
@@ -18545,7 +18721,7 @@ Subprocess stderr: ${stderrOutput}`;
             cacheCreationInputTokens: lastUsage?.cache_creation_input_tokens,
             cacheHitRate: computeCacheHitRate(lastUsage)
           });
-          if (currentSessionId && !isIndependentSession) {
+          if (currentSessionId && !isIndependentSession && !sawDuplicateToolUse) {
             storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage);
           }
           const responseSessionId = currentSessionId || resumeSessionId || `session_${Date.now()}`;
@@ -18606,6 +18782,8 @@ Subprocess stderr: ${stderrOutput}`;
               sdkUuidMap.push(null);
             let messageStartEmitted = false;
             let lastUsage;
+            let hasStructuredOutput = false;
+            let structuredOutput;
             const streamedToolUseIds = new Set;
             try {
               let currentSessionId;
@@ -18647,6 +18825,7 @@ Subprocess stderr: ${stderrOutput}`;
                       effort,
                       thinking,
                       taskBudget,
+                      outputFormat,
                       betas,
                       settingSources,
                       codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18659,7 +18838,7 @@ Subprocess stderr: ${stderrOutput}`;
                       sdkDebug: sdkFeatures.sdkDebug,
                       additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                       advisorModel
-                    }))) {
+                    }, requestAbort.controller))) {
                       if (event.type === "rate_limit_event") {
                         rateLimitStore.record(event.rate_limit_info);
                       }
@@ -18710,6 +18889,7 @@ Subprocess stderr: ${stderrOutput}`;
                         effort,
                         thinking,
                         taskBudget,
+                        outputFormat,
                         betas,
                         settingSources,
                         codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18722,7 +18902,7 @@ Subprocess stderr: ${stderrOutput}`;
                         sdkDebug: sdkFeatures.sdkDebug,
                         additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                         advisorModel
-                      }));
+                      }, requestAbort.controller));
                       return;
                     }
                     if (isExtraUsageRequiredError(errMsg) && hasExtendedContext(model)) {
@@ -18776,6 +18956,7 @@ Subprocess stderr: ${stderrOutput}`;
                         effort,
                         thinking,
                         taskBudget,
+                        outputFormat,
                         betas,
                         settingSources,
                         codeSystemPrompt: sdkFeatures.codeSystemPrompt,
@@ -18788,7 +18969,7 @@ Subprocess stderr: ${stderrOutput}`;
                         sdkDebug: sdkFeatures.sdkDebug,
                         additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
                         advisorModel
-                      }));
+                      }, requestAbort.controller));
                       return;
                     }
                     if (isExpiredTokenError(errMsg) && !tokenRefreshed) {
@@ -18876,6 +19057,15 @@ Subprocess stderr: ${stderrOutput}`;
                   if (message.type === "assistant" && message.uuid) {
                     sdkUuidMap.push(message.uuid);
                   }
+                  if (message.type === "result") {
+                    const resultUsage = message.usage;
+                    if (resultUsage)
+                      lastUsage = { ...lastUsage, ...resultUsage };
+                    if (outputFormat && "structured_output" in message) {
+                      hasStructuredOutput = true;
+                      structuredOutput = message.structured_output;
+                    }
+                  }
                   if (message.type === "stream_event") {
                     streamEventsSeen += 1;
                     if (!firstChunkAt) {
@@ -18889,6 +19079,18 @@ Subprocess stderr: ${stderrOutput}`;
                     const event = message.event;
                     const eventType = event.type;
                     const eventIndex = event.index;
+                    if (outputFormat) {
+                      if (eventType === "message_start") {
+                        const startUsage = event.message?.usage;
+                        if (startUsage)
+                          lastUsage = { ...lastUsage, ...startUsage };
+                      } else if (eventType === "message_delta") {
+                        const deltaUsage = event.usage;
+                        if (deltaUsage)
+                          lastUsage = { ...lastUsage, ...deltaUsage };
+                      }
+                      continue;
+                    }
                     if (eventType === "message_start") {
                       skipBlockIndices.clear();
                       sdkToClientIndex.clear();
@@ -19026,6 +19228,60 @@ data: ${JSON.stringify({ type: "message_stop" })}
               } finally {
                 clearInterval(heartbeat);
               }
+              if (outputFormat) {
+                if (!hasStructuredOutput) {
+                  throw new Error("Structured output was requested but the SDK returned no structured_output result");
+                }
+                const text = structuredOutputText(structuredOutput);
+                const messageId = `msg_${Date.now()}`;
+                safeEnqueue(encoder.encode(`event: message_start
+data: ${JSON.stringify({
+                  type: "message_start",
+                  message: {
+                    id: messageId,
+                    type: "message",
+                    role: "assistant",
+                    content: [],
+                    model: body.model,
+                    stop_reason: null,
+                    stop_sequence: null,
+                    usage: { input_tokens: lastUsage?.input_tokens ?? 0, output_tokens: 0 }
+                  }
+                })}
+
+`), "structured_message_start");
+                safeEnqueue(encoder.encode(`event: content_block_start
+data: ${JSON.stringify({
+                  type: "content_block_start",
+                  index: 0,
+                  content_block: { type: "text", text: "" }
+                })}
+
+`), "structured_block_start");
+                safeEnqueue(encoder.encode(`event: content_block_delta
+data: ${JSON.stringify({
+                  type: "content_block_delta",
+                  index: 0,
+                  delta: { type: "text_delta", text }
+                })}
+
+`), "structured_text_delta");
+                safeEnqueue(encoder.encode(`event: content_block_stop
+data: ${JSON.stringify({ type: "content_block_stop", index: 0 })}
+
+`), "structured_block_stop");
+                safeEnqueue(encoder.encode(`event: message_delta
+data: ${JSON.stringify({
+                  type: "message_delta",
+                  delta: { stop_reason: "end_turn", stop_sequence: null },
+                  usage: { output_tokens: lastUsage?.output_tokens ?? 0 }
+                })}
+
+`), "structured_message_delta");
+                messageStartEmitted = true;
+                eventsForwarded += 5;
+                textEventsForwarded += 1;
+              }
               claudeLog("upstream.completed", {
                 mode: "stream",
                 model,
@@ -19046,7 +19302,7 @@ data: ${JSON.stringify({ type: "message_stop" })}
                 const allNames = [...sessionDiscoveredTools.get(sessId)];
                 plog(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
               }
-              if (currentSessionId && !isIndependentSession) {
+              if (currentSessionId && !isIndependentSession && !sawDuplicateToolUse) {
                 storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage);
               }
               if (!streamClosed) {
@@ -19230,7 +19486,7 @@ Subprocess stderr: ${stderrOutput}`;
               } : classifyError(errMsg);
               claudeLog("proxy.anthropic.error", { error: errMsg, classified: streamErr.type });
               const sdkTerm = extractSdkTermination(errMsg);
-              const canRecoverAsToolUse = sdkTerm.reason === "max_turns" && passthrough && capturedToolUses.length > 0 && messageStartEmitted;
+              const canRecoverAsToolUse = (sdkTerm.reason === "max_turns" || sdkTerm.reason === "aborted" && sawDuplicateToolUse) && passthrough && capturedToolUses.length > 0 && messageStartEmitted;
               if (canRecoverAsToolUse) {
                 diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered ${formatSdkTermination(sdkTerm, {
                   model,
@@ -19377,10 +19633,17 @@ data: ${JSON.stringify({
                 } catch {}
                 streamClosed = true;
               }
+            } finally {
+              requestAbort.detach();
             }
+          },
+          cancel(reason) {
+            requestAbort.abort(reason);
+            requestAbort.detach();
           }
         });
         const streamSessionId = resumeSessionId || `session_${Date.now()}`;
+        streamOwnsAbortLink = true;
         return new Response(readable, {
           headers: {
             "Content-Type": "text/event-stream",
@@ -19428,6 +19691,9 @@ data: ${JSON.stringify({
           error: classified.type
         });
         return new Response(JSON.stringify({ type: "error", error: { type: classified.type, message: classified.message } }), { status: classified.status, headers: { "Content-Type": "application/json" } });
+      } finally {
+        if (!streamOwnsAbortLink)
+          requestAbort.detach();
       }
     });
   };
@@ -19667,7 +19933,9 @@ data: ${JSON.stringify({
         const decoder = new TextDecoder;
         let buffer = "";
         let streamError = null;
-        const translate = createSseTranslator({ completionId, model, created, thinkingPassthrough: sdkFeatures.thinkingPassthrough });
+        const streamOptions = rawBody.stream_options;
+        const includeUsage = streamOptions?.include_usage === true;
+        const translate = createSseTranslator({ completionId, model, created, thinkingPassthrough: sdkFeatures.thinkingPassthrough, includeUsage });
         try {
           while (true) {
             const { done, value } = await reader.read();
@@ -19701,10 +19969,17 @@ data: ${JSON.stringify({
         } catch (err) {
           streamError = err instanceof Error ? err : new Error(String(err));
         } finally {
-          if (!streamError)
+          if (!streamError) {
+            const usageChunk = translate.buildUsageChunk();
+            if (usageChunk) {
+              controller.enqueue(encoder.encode(`data: ${JSON.stringify(usageChunk)}
+
+`));
+            }
             controller.enqueue(encoder.encode(`data: [DONE]
 
 `));
+          }
           controller.close();
         }
       }

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startProxyServer
-} from "./cli-rakysex2.js";
+} from "./cli-kgrg9sq3.js";
 import"./cli-cx463q74.js";
 import"./cli-sry5aqdj.js";
 import"./cli-4rqtm83g.js";

package/dist/proxy/openai.d.ts

@@ -67,6 +67,9 @@ export interface OpenAiChatRequest {
     output_config?: {
         effort?: string;
     };
+    stream_options?: {
+        include_usage?: boolean;
+    };
 }
 export interface AnthropicTextBlock {
     type: "text";
@@ -169,6 +172,11 @@ export interface OpenAiStreamChunk {
         };
         finish_reason: "stop" | "length" | "tool_calls" | null;
     }>;
+    usage?: {
+        prompt_tokens: number;
+        completion_tokens: number;
+        total_tokens: number;
+    };
 }
 export interface OpenAiCompletionFunctionToolCall {
     type: "function";
@@ -262,9 +270,11 @@ export interface AnthropicSseEvent {
     message?: {
         id?: string;
     };
+    usage?: AnthropicUsage;
 }
 export interface SseTranslator {
     (event: AnthropicSseEvent): OpenAiStreamChunk | null;
+    buildUsageChunk(): OpenAiStreamChunk | null;
 }
 export interface SseTranslatorContext {
     completionId: string;
@@ -272,6 +282,7 @@ export interface SseTranslatorContext {
     created: number;
     /** When false, thinking blocks are stripped from the response */
     thinkingPassthrough?: boolean;
+    includeUsage?: boolean;
 }
 /**
  * A stateful translator for one OpenAI streaming response.

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

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/proxy/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAA;AAEjE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,WAAW,CAAA;IACjB,SAAS,CAAC,EAAE;QACV,GAAG,CAAC,EAAE,MAAM,CAAA;KACb,CAAA;CACF;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE;QACV,GAAG,CAAC,EAAE,MAAM,CAAA;KACb,CAAA;CACF;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,UAAU,CAAA;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAAA;IACrC,UAAU,CAAC,EAAE,wBAAwB,EAAE,CAAA;CACxC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,UAAU,EAAE,OAAO,CAAA;QACnB,MAAM,CAAC,EAAE,OAAO,CAAA;KACjB,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAA;CACf;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,oBAAoB,CAAA;AAE1E,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAA;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,cAAc,EAAE,CAAA;IACxB,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gDAAgD;IAChD,aAAa,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ,CAAA;QACd,UAAU,EAAE,MAAM,CAAA;QAClB,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;CACF;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAA;IAC1B,OAAO,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAAA;CAC1C;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,OAAO,CAAA;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,gBAAgB,EAAE,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,aAAa,EAAE,CAAA;IACvB;oFACgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,UAAU,CAAA;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,aAAa,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAAA;CAC1C;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,qBAAqB,GAC/B,kBAAkB,GAClB,mBAAmB,GACnB,sBAAsB,GACtB,wBAAwB,GACxB,qBAAqB,CAAA;AAEvB,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,qBAAqB,EAAE,CAAA;IACjC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,cAAc,CAAA;CACvB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,uBAAuB,CAAA;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,KAAK,CAAC;QACb,KAAK,EAAE,CAAC,CAAA;QACR,KAAK,EAAE;YACL,IAAI,CAAC,EAAE,WAAW,CAAA;YAClB,OAAO,CAAC,EAAE,MAAM,CAAA;YAChB,UAAU,CAAC,EAAE,4BAA4B,EAAE,CAAA;YAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAA;SAC3B,CAAA;QACD,aAAa,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,IAAI,CAAA;KACvD,CAAC,CAAA;CACH;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,QAAQ,CAAA;CACf;AAED,MAAM,MAAM,wBAAwB,GAClC,gCAAgC,GAChC,8BAA8B,CAAA;AAEhC,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,iBAAiB,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,KAAK,CAAC;QACb,KAAK,EAAE,CAAC,CAAA;QACR,OAAO,EAAE;YACP,IAAI,EAAE,WAAW,CAAA;YACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;YACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;YAC1B,UAAU,CAAC,EAAE,wBAAwB,EAAE,CAAA;SACxC,CAAA;QACD,aAAa,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAA;KAChD,CAAC,CAAA;IACF,KAAK,EAAE;QACL,aAAa,EAAE,MAAM,CAAA;QACrB,iBAAiB,EAAE,MAAM,CAAA;QACzB,YAAY,EAAE,MAAM,CAAA;KACrB,CAAA;CACF;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;CACvB;AAMD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,MAAM,CAUlF;AAwED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,GAAG,oBAAoB,GAAG,IAAI,CAqJ/F;AAeD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC1C,gBAAgB,CAmDlB;AAMD;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,aAAa,CAAC,EACV;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/B;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GACvC,qBAAqB,CAAA;IACzB,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,CAAC,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,IAAI,CAAA;CACrD;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,iEAAiE;IACjE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,oBAAoB,GAAG,aAAa,CAuB5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,OAAO,GAC5B,iBAAiB,GAAG,IAAI,CA2H1B;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,OAAO,EAAE,GAAG,SAAgC,GAAG,WAAW,EAAE,CAmD7G"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/proxy/openai.ts"],"names":[],"mappings":"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"}

package/dist/proxy/passthroughTools.d.ts

@@ -40,6 +40,18 @@ export declare function computeToolSetKey(tools: Array<{
     input_schema?: unknown;
     defer_loading?: boolean;
 }>): string;
+/**
+ * Stable semantic signature for a forwarded tool_use: tool name + a
+ * key-order-independent serialization of its input. Two tool calls with the
+ * same name and the same arguments share a signature even if the SDK assigns
+ * them different tool_use ids.
+ *
+ * Used by the passthrough capture path to tell apart genuine parallel calls
+ * (distinct signatures — e.g. get_weather vs get_time) from an SDK internal
+ * continuation turn re-emitting a blocked call (identical signature, new id).
+ * The former are all forwarded; the latter is a duplicate and dropped.
+ */
+export declare function toolUseSignature(name: string, input: unknown): string;
 /**
  * Strip the MCP prefix from a tool name to get the OpenCode tool name.
  * e.g., "mcp__oc__todowrite" → "todowrite"

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

@@ -1 +1 @@
-{"version":3,"file":"passthroughTools.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,eAAO,MAAM,oBAAoB,OAAO,CAAA;AACxC,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0CtE,wBAAgB,qBAAqB,IAAI,MAAM,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACjG,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE;;;;EA4DlC;AAqBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAC9E,MAAM,CASR;AAUD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvD;AAUD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,YAAY,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,GACtF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgCrC"}
+{"version":3,"file":"passthroughTools.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,eAAO,MAAM,oBAAoB,OAAO,CAAA;AACxC,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0CtE,wBAAgB,qBAAqB,IAAI,MAAM,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACjG,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE;;;;EA4DlC;AAqBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAC9E,MAAM,CASR;AAUD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAErE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvD;AAUD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,YAAY,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,GACtF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgCrC"}

package/dist/proxy/query.d.ts

@@ -4,7 +4,7 @@
  * Centralizes the construction of query() options, eliminating duplication
  * between the streaming and non-streaming paths in server.ts.
  */
-import type { Options, SettingSource } from "@anthropic-ai/claude-agent-sdk";
+import type { Options, OutputFormat, SettingSource } from "@anthropic-ai/claude-agent-sdk";
 import { createPassthroughMcpServer } from "./passthroughTools";
 import type { Effort } from "./effort";
 export interface QueryContext {
@@ -72,6 +72,8 @@ export interface QueryContext {
     taskBudget?: {
         total: number;
     };
+    /** Native JSON-schema output contract for the Claude Agent SDK */
+    outputFormat?: OutputFormat;
     /** Beta features to enable */
     betas?: string[];
     /** SDK setting sources — controls CLAUDE.md and user settings loading */
@@ -115,5 +117,5 @@ export interface BuildQueryResult {
  * reports that as its working directory.
  */
 export declare function buildCwdNote(sdkCwd: string, clientCwd?: string): string;
-export declare function buildQueryOptions(ctx: QueryContext): BuildQueryResult;
+export declare function buildQueryOptions(ctx: QueryContext, abortController?: AbortController): BuildQueryResult;
 //# sourceMappingURL=query.d.ts.map

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/requestAbort.d.ts

@@ -0,0 +1,8 @@
+export interface RequestAbortLink {
+    controller: AbortController;
+    abort: (reason?: unknown) => void;
+    detach: () => void;
+}
+/** Forward an HTTP request abort into the SDK query lifecycle. */
+export declare function linkRequestAbort(signal: AbortSignal): RequestAbortLink;
+//# sourceMappingURL=requestAbort.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"requestAbort.d.ts","sourceRoot":"","sources":["../../src/proxy/requestAbort.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,eAAe,CAAA;IAC3B,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACjC,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,gBAAgB,CAyBtE"}

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/proxy/server.ts"],"names":[],"mappings":"AAcA,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;AAiCnG,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EAEpB,KAAK,aAAa,EAGnB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAA+B,iBAAiB,EAAE,mBAAmB,EAAsC,MAAM,iBAAiB,CAAA;AAGzI,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACjD,YAAY,EAAE,aAAa,EAAE,CAAA;AAiQ7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CAgsFhF;AAWD,wBAAgB,gCAAgC,IAAI,IAAI,CAavD;AAED,wBAAsB,gBAAgB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAmGhG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/proxy/server.ts"],"names":[],"mappings":"AAeA,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;AAkCnG,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EAEpB,KAAK,aAAa,EAGnB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAA+B,iBAAiB,EAAE,mBAAmB,EAAsC,MAAM,iBAAiB,CAAA;AAGzI,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACjD,YAAY,EAAE,aAAa,EAAE,CAAA;AAiQ7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CA8+FhF;AAWD,wBAAgB,gCAAgC,IAAI,IAAI,CAavD;AAED,wBAAsB,gBAAgB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAmGhG"}

package/dist/proxy/structuredOutput.d.ts

@@ -0,0 +1,21 @@
+import type { OutputFormat } from "@anthropic-ai/claude-agent-sdk";
+export type OutputFormatParseResult = {
+    ok: true;
+    value: OutputFormat | undefined;
+} | {
+    ok: false;
+    message: string;
+};
+/**
+ * Parse Anthropic's `output_config.format` into the Claude Agent SDK's native
+ * structured-output option. Absence is a no-op; malformed or unsupported
+ * values are rejected at the HTTP boundary instead of failing in the SDK.
+ *
+ * Combining `tools` with `output_config.format` is rejected: structured-output
+ * mode buffers the SDK's wire events and replaces the response content with the
+ * validated result, so a tool_use turn would be swallowed and the client-driven
+ * tool loop would never see it.
+ */
+export declare function parseOutputFormat(outputConfig: unknown, tools?: unknown): OutputFormatParseResult;
+export declare function structuredOutputText(value: unknown): string;
+//# sourceMappingURL=structuredOutput.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"structuredOutput.d.ts","sourceRoot":"","sources":["../../src/proxy/structuredOutput.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAElE,MAAM,MAAM,uBAAuB,GAC/B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,GAC7C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAMlC;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAyBjG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE3D"}

package/dist/server.js

@@ -11,7 +11,7 @@ import {
   runObserveHook,
   runTransformHook,
   startProxyServer
-} from "./cli-rakysex2.js";
+} from "./cli-kgrg9sq3.js";
 import"./cli-cx463q74.js";
 import"./cli-sry5aqdj.js";
 import"./cli-4rqtm83g.js";

package/package.json

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