@rynfar/meridian 1.47.0 → 1.48.1

package/README.md

@@ -222,11 +222,14 @@ MERIDIAN_PASSTHROUGH=0 meridian   # force internal
 
 For large tool sets (>15 tools), non-core tools are automatically deferred via the SDK's ToolSearch mechanism. Core tools (read, write, edit, bash, glob, grep) are always loaded eagerly. The deferral threshold is configurable with `MERIDIAN_DEFER_TOOL_THRESHOLD`.
 
+**Digest-turn elimination** — after a tool call is captured, the SDK would normally invoke the model one more time to "digest" the denial before ending the turn. That extra invocation is discarded by the proxy but fully billed — measured at ~400+ wasted output tokens and 2–3× extra latency per tool step (and on always-thinking models like Fable, a full thinking pass each time). Meridian now aborts the SDK query the moment every tool call's denial is persisted, so the digest turn never generates. Sessions remain resumable and tool-result attribution is unaffected. Kill switch: `MERIDIAN_PASSTHROUGH_EARLY_STOP=0` restores the old behavior.
+
 ### Known limitations
 
 - **Single tool round-trip per request** — in passthrough mode, the SDK is configured with `maxTurns=2` (or 3 for deferred tools). Multi-step agentic loops where Claude needs several consecutive tool calls require the client to re-send after each round.
 - **Blocked tools** — 13 built-in SDK tools (Read, Write, Bash, etc.) are blocked to prevent conflicts with the client's own tools. 15 additional Claude Code-only tools (CronCreate, EnterWorktree, Agent, etc.) are blocked because they require capabilities that external clients don't support.
 - **Subagent extraction** — Meridian parses the client's Task tool description to extract subagent names and build SDK AgentDefinitions. If the client's agent framework uses a non-standard format, subagent routing may not work automatically.
+- **Anthropic server tools not supported** — native server-side tools (`web_search_*`, `web_fetch_*`) are a raw Anthropic API feature (billed to an API key) that emits `server_tool_use` / `web_search_tool_result` blocks the Claude Max / Agent SDK path cannot produce. A request carrying one is rejected with a `400` explaining the fix. If a plugin needs server-side web search (e.g. [`opencode-websearch`](https://github.com/emilsvennesson/opencode-websearch)), give it its **own** provider pointed at `https://api.anthropic.com` with your `ANTHROPIC_API_KEY` — don't route that call through Meridian.
 
 ## Multi-Profile Support
 
@@ -473,6 +476,20 @@ Point any OpenAI-compatible tool at `http://127.0.0.1:3456` with any API key val
 
 > **Note:** Multi-turn conversations work by packing prior turns into the system prompt. Each request is a fresh SDK session — OpenAI clients replay full history themselves and don't use Meridian's session resumption.
 
+### Cherry Studio
+
+[Cherry Studio](https://github.com/CherryHQ/cherry-studio) is a desktop chat client. Point it at Meridian by setting the Anthropic API base URL to `http://127.0.0.1:3456` (any API key value works).
+
+Because Cherry Studio is a chat client rather than a coding agent, select the `cherry` adapter so Claude's **built-in web search** is available (coding-agent adapters block it in favour of their own):
+
+```bash
+MERIDIAN_DEFAULT_AGENT=cherry meridian
+```
+
+The `cherry` adapter runs in internal mode: Claude executes `WebSearch`/`WebFetch` itself and Meridian returns the grounded answer — the internal tool calls are hidden from the client. This resolves the "no WebSearch/WebFetch tool exposed" error (#481).
+
+> Cherry Studio doesn't send a Meridian-specific header, so set `MERIDIAN_DEFAULT_AGENT=cherry` on a Meridian dedicated to it, or send `x-meridian-agent: cherry` if your setup allows custom headers.
+
 ### ForgeCode
 
 Add a custom provider to `~/forge/.forge.toml`:

package/dist/{cli-1v1narm9.js → cli-vhrprwj4.js}

@@ -1326,6 +1326,9 @@ var init_sdkFeatures = __esm(() => {
     },
     openai: {
       codeSystemPrompt: false
+    },
+    cherry: {
+      codeSystemPrompt: false
     }
   };
   VALID_CLAUDE_MD_VALUES = new Set(["off", "project", "full"]);
@@ -8181,6 +8184,119 @@ function normalizeToolInput(input, clientSchema) {
   return normalized;
 }
 
+// src/proxy/tools.ts
+var BLOCKED_BUILTIN_TOOLS = [
+  "Read",
+  "Write",
+  "Edit",
+  "Bash",
+  "Glob",
+  "Grep",
+  "NotebookEdit",
+  "WebFetch",
+  "WebSearch",
+  "TodoWrite"
+];
+var CLAUDE_CODE_ONLY_TOOLS = [
+  "CronCreate",
+  "CronDelete",
+  "CronList",
+  "EnterPlanMode",
+  "ExitPlanMode",
+  "EnterWorktree",
+  "ExitWorktree",
+  "Monitor",
+  "NotebookEdit",
+  "PushNotification",
+  "RemoteTrigger",
+  "ScheduleWakeup",
+  "TodoWrite",
+  "AskUserQuestion",
+  "Skill",
+  "Agent",
+  "TaskOutput",
+  "TaskStop",
+  "WebSearch"
+];
+var SERVER_TOOL_TYPE = /^web_(search|fetch)_\d+$/;
+function detectServerTools(tools) {
+  if (!Array.isArray(tools))
+    return [];
+  const found = [];
+  for (const tool of tools) {
+    const type = tool?.type;
+    if (typeof type === "string" && SERVER_TOOL_TYPE.test(type) && !found.includes(type)) {
+      found.push(type);
+    }
+  }
+  return found;
+}
+function serverToolErrorMessage(types2) {
+  const list = types2.join(", ");
+  return `Anthropic server tools (${list}) can't run through Meridian. ` + `Server-side web search/fetch is a raw Anthropic API feature (billed to an API key) ` + `that produces server_tool_use / web_search_tool_result blocks the Claude Max / Agent SDK path cannot emit. ` + `Point the plugin making this call at the real API instead — configure it with a separate provider using ` + `baseURL "https://api.anthropic.com" and your own ANTHROPIC_API_KEY, rather than routing it through Meridian.`;
+}
+var MCP_SERVER_NAME = "opencode";
+var ALLOWED_MCP_TOOLS = [
+  `mcp__${MCP_SERVER_NAME}__read`,
+  `mcp__${MCP_SERVER_NAME}__write`,
+  `mcp__${MCP_SERVER_NAME}__edit`,
+  `mcp__${MCP_SERVER_NAME}__bash`,
+  `mcp__${MCP_SERVER_NAME}__glob`,
+  `mcp__${MCP_SERVER_NAME}__grep`
+];
+
+// src/proxy/passthroughEarlyStop.ts
+var CLIENT_TOOL_PREFIX = "mcp__oc__";
+var INTERNAL_TOOLS = new Set(["ToolSearch"]);
+function createEarlyStopTracker() {
+  return { expected: new Set, resolved: new Set, fired: false };
+}
+function isClientForwardedToolUse(block) {
+  const b = block;
+  if (!b || b.type !== "tool_use")
+    return false;
+  if (typeof b.id !== "string" || b.id.length === 0)
+    return false;
+  if (typeof b.name !== "string")
+    return false;
+  if (INTERNAL_TOOLS.has(b.name))
+    return false;
+  if (b.name.startsWith("mcp__") && !b.name.startsWith(CLIENT_TOOL_PREFIX))
+    return false;
+  return true;
+}
+function noteAssistantContent(tracker, content) {
+  if (!Array.isArray(content))
+    return;
+  for (const block of content) {
+    if (isClientForwardedToolUse(block)) {
+      tracker.expected.add(block.id);
+    }
+  }
+}
+function noteUserContent(tracker, content) {
+  if (!Array.isArray(content))
+    return;
+  for (const block of content) {
+    const b = block;
+    if (b?.type === "tool_result" && typeof b.tool_use_id === "string" && tracker.expected.has(b.tool_use_id)) {
+      tracker.resolved.add(b.tool_use_id);
+    }
+  }
+}
+function shouldEarlyStop(tracker) {
+  if (tracker.fired)
+    return false;
+  if (tracker.expected.size === 0)
+    return false;
+  for (const id of tracker.expected) {
+    if (!tracker.resolved.has(id))
+      return false;
+  }
+  tracker.fired = true;
+  return true;
+}
+
 // src/proxy/agentDefs.ts
 var FALLBACK_AGENT_NAME = "general";
 var DEFAULT_AGENT_TYPES = {
@@ -10052,6 +10168,38 @@ function consolidateMultimodalOntoLastUser(structured) {
   return result;
 }
 var TOOL_TARGET_KEYS = ["filePath", "file_path", "path", "command", "pattern", "query", "url"];
+var CONTENT_SUMMARY_MAX = 120;
+function summarizeContent(value) {
+  if (typeof value !== "string" || value.length === 0)
+    return;
+  const collapsed = value.replace(/\s+/g, " ").trim();
+  if (!collapsed)
+    return;
+  return collapsed.length > CONTENT_SUMMARY_MAX ? collapsed.slice(0, CONTENT_SUMMARY_MAX) + "..." : collapsed;
+}
+function extractContentSummary(name, input) {
+  if (!input || typeof input !== "object")
+    return;
+  const rec = input;
+  switch (name.toLowerCase()) {
+    case "edit":
+      return summarizeContent(rec.newString ?? rec.new_string);
+    case "write":
+      return summarizeContent(rec.content);
+    case "multiedit": {
+      const edits = rec.edits;
+      if (!Array.isArray(edits) || edits.length === 0)
+        return;
+      const first = edits[0];
+      const firstSummary = summarizeContent(first?.newString ?? first?.new_string);
+      if (!firstSummary)
+        return;
+      return edits.length > 1 ? `${edits.length} edits; first: ${firstSummary}` : firstSummary;
+    }
+    default:
+      return;
+  }
+}
 function buildToolUseIndex(messages) {
   const index = new Map;
   for (const m of messages) {
@@ -10071,13 +10219,18 @@ function buildToolUseIndex(messages) {
           }
         }
       }
-      index.set(block.id, { name: block.name, target });
+      index.set(block.id, {
+        name: block.name,
+        target,
+        contentSummary: extractContentSummary(block.name, input)
+      });
     }
   }
   return index;
 }
 function describeToolCall(info) {
-  return info.target ? `[${info.name} ${info.target}]` : `[${info.name}]`;
+  const head = info.target ? `your ${info.name} ${info.target}` : `your ${info.name}`;
+  return info.contentSummary ? `[${head} → "${info.contentSummary}"]` : `[${head}]`;
 }
 
 // src/proxy/auth.ts
@@ -10269,50 +10422,6 @@ ${text.slice(0, 2000)}` : text.slice(0, 2000);
   return createHash("sha256").update(seed).digest("hex").slice(0, 16);
 }
 
-// src/proxy/tools.ts
-var BLOCKED_BUILTIN_TOOLS = [
-  "Read",
-  "Write",
-  "Edit",
-  "Bash",
-  "Glob",
-  "Grep",
-  "NotebookEdit",
-  "WebFetch",
-  "WebSearch",
-  "TodoWrite"
-];
-var CLAUDE_CODE_ONLY_TOOLS = [
-  "CronCreate",
-  "CronDelete",
-  "CronList",
-  "EnterPlanMode",
-  "ExitPlanMode",
-  "EnterWorktree",
-  "ExitWorktree",
-  "Monitor",
-  "NotebookEdit",
-  "PushNotification",
-  "RemoteTrigger",
-  "ScheduleWakeup",
-  "TodoWrite",
-  "AskUserQuestion",
-  "Skill",
-  "Agent",
-  "TaskOutput",
-  "TaskStop",
-  "WebSearch"
-];
-var MCP_SERVER_NAME = "opencode";
-var ALLOWED_MCP_TOOLS = [
-  `mcp__${MCP_SERVER_NAME}__read`,
-  `mcp__${MCP_SERVER_NAME}__write`,
-  `mcp__${MCP_SERVER_NAME}__edit`,
-  `mcp__${MCP_SERVER_NAME}__bash`,
-  `mcp__${MCP_SERVER_NAME}__glob`,
-  `mcp__${MCP_SERVER_NAME}__grep`
-];
-
 // src/proxy/transforms/opencode.ts
 var openCodeTransforms = [
   {
@@ -11112,6 +11221,34 @@ var openAiAdapter = {
   name: "openai"
 };
 
+// src/proxy/adapters/cherry.ts
+var CHERRY_WEB_TOOLS = ["WebSearch", "WebFetch"];
+var isWebTool = (t) => CHERRY_WEB_TOOLS.includes(t);
+var CHERRY_BLOCKED_BUILTIN_TOOLS = BLOCKED_BUILTIN_TOOLS.filter((t) => !isWebTool(t));
+var CHERRY_INCOMPATIBLE_TOOLS = CLAUDE_CODE_ONLY_TOOLS.filter((t) => !isWebTool(t));
+var cherryAdapter = {
+  ...openCodeAdapter,
+  name: "cherry",
+  usesPassthrough() {
+    return false;
+  },
+  supportsThinking() {
+    return false;
+  },
+  getBlockedBuiltinTools() {
+    return CHERRY_BLOCKED_BUILTIN_TOOLS;
+  },
+  getAgentIncompatibleTools() {
+    return CHERRY_INCOMPATIBLE_TOOLS;
+  },
+  getAllowedMcpTools() {
+    return [...CHERRY_WEB_TOOLS];
+  },
+  getCoreToolNames() {
+    return [];
+  }
+};
+
 // src/proxy/adapters/detect.ts
 var ADAPTER_MAP = {
   opencode: openCodeAdapter,
@@ -11122,6 +11259,8 @@ var ADAPTER_MAP = {
   forgecode: forgeCodeAdapter,
   "claude-code": claudeCodeAdapter,
   claudecode: claudeCodeAdapter,
+  cherry: cherryAdapter,
+  cherrystudio: cherryAdapter,
   openai: openAiAdapter
 };
 var envDefault = process.env.MERIDIAN_DEFAULT_AGENT || "";
@@ -17043,6 +17182,27 @@ function structuredOutputText(value) {
   return JSON.stringify(value);
 }
 
+// src/proxy/transforms/cherry.ts
+var cherryTransforms = [
+  {
+    name: "cherry-core",
+    adapters: ["cherry"],
+    onRequest(ctx) {
+      return {
+        ...ctx,
+        blockedTools: CHERRY_BLOCKED_BUILTIN_TOOLS,
+        incompatibleTools: CHERRY_INCOMPATIBLE_TOOLS,
+        allowedMcpTools: [...CHERRY_WEB_TOOLS],
+        coreToolNames: [],
+        passthrough: false,
+        hidesInternalTools: true,
+        supportsThinking: false,
+        shouldTrackFileChanges: false
+      };
+    }
+  }
+];
+
 // src/proxy/transforms/registry.ts
 var ADAPTER_TRANSFORMS = {
   opencode: openCodeTransforms,
@@ -17051,6 +17211,7 @@ var ADAPTER_TRANSFORMS = {
   pi: piTransforms,
   forgecode: forgeCodeTransforms,
   passthrough: passthroughTransforms,
+  cherry: cherryTransforms,
   openai: openCodeTransforms
 };
 function getAdapterTransforms(adapterName) {
@@ -18204,6 +18365,10 @@ 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 serverTools = detectServerTools(body.tools);
+        if (serverTools.length > 0) {
+          return c.json({ type: "error", error: { type: "invalid_request_error", message: serverToolErrorMessage(serverTools) } }, 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);
@@ -18426,6 +18591,9 @@ function createProxyServer(config = {}) {
         const capturedSignatures = new Set;
         const capturedToolNames = new Set;
         let sawDuplicateToolUse = false;
+        const earlyStopEnabled = passthrough && process.env.MERIDIAN_PASSTHROUGH_EARLY_STOP !== "0";
+        const earlyStop = createEarlyStopTracker();
+        let earlyStopFired = false;
         const toolChoice = body.tool_choice;
         const forceSingleToolUse = !!toolChoice && (toolChoice.type === "tool" || toolChoice.disable_parallel_tool_use === true);
         const fileChanges = [];
@@ -18788,6 +18956,19 @@ function createProxyServer(config = {}) {
                 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") {
+                  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;
+                  }
+                }
+              }
               if (message.type === "assistant") {
                 assistantMessages += 1;
                 if (message.uuid) {
@@ -18811,6 +18992,16 @@ function createProxyServer(config = {}) {
                       claudeLog("passthrough.toolsearch_filtered", { mode: "non_stream" });
                       continue;
                     }
+                    if (pipelineCtx.hidesInternalTools) {
+                      if (b.type === "tool_use") {
+                        claudeLog("internal_tool.hidden", { mode: "non_stream", name: b.name });
+                        continue;
+                      }
+                      if ((b.type === "thinking" || b.type === "redacted_thinking") && !sdkFeatures.thinkingPassthrough) {
+                        claudeLog("internal_tool.thinking_stripped", { mode: "non_stream", type: b.type });
+                        continue;
+                      }
+                    }
                     if (passthrough && !pipelineCtx.supportsThinking && !sdkFeatures.thinkingPassthrough && (b.type === "thinking" || b.type === "redacted_thinking")) {
                       claudeLog("passthrough.thinking_stripped", { mode: "non_stream", type: b.type });
                       continue;
@@ -19022,6 +19213,7 @@ Subprocess stderr: ${stderrOutput}`;
             let textEventsForwarded = 0;
             let bytesSent = 0;
             let streamClosed = false;
+            let awaitingEarlyStopDrain = false;
             claudeLog("upstream.start", { mode: "stream", model });
             const safeEnqueue = (payload, source) => {
               if (streamClosed)
@@ -19315,7 +19507,7 @@ Subprocess stderr: ${stderrOutput}`;
               }));
               try {
                 for await (const message of guardedResponse) {
-                  if (streamClosed) {
+                  if (streamClosed && !awaitingEarlyStopDrain) {
                     break;
                   }
                   if (message.session_id) {
@@ -19324,6 +19516,34 @@ Subprocess stderr: ${stderrOutput}`;
                   if (message.type === "assistant" && message.uuid) {
                     sdkUuidMap.push(message.uuid);
                   }
+                  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) {
+                        earlyStopFired = true;
+                        claudeLog("passthrough.early_stop", { mode: "stream", captured: capturedToolUses.length, drained: awaitingEarlyStopDrain });
+                        safeEnqueue(encoder.encode(`event: message_delta
+data: ${JSON.stringify({ type: "message_delta", delta: { stop_reason: "tool_use", stop_sequence: null }, usage: { output_tokens: lastUsage?.output_tokens ?? 0 } })}
+
+`), "early_stop");
+                        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 {}
+                        }
+                        break;
+                      }
+                    }
+                  }
                   if (message.type === "result") {
                     const resultUsage = message.usage;
                     if (resultUsage)
@@ -19388,6 +19608,12 @@ data: ${JSON.stringify({ type: "message_stop" })}
                     }
                     if (eventType === "content_block_start") {
                       const block = event.content_block;
+                      if (pipelineCtx.hidesInternalTools && (block?.type === "tool_use" || (block?.type === "thinking" || block?.type === "redacted_thinking") && !sdkFeatures.thinkingPassthrough)) {
+                        if (eventIndex !== undefined)
+                          skipBlockIndices.add(eventIndex);
+                        claudeLog("internal_tool.hidden", { mode: "stream", type: block?.type, name: block?.name, index: eventIndex });
+                        continue;
+                      }
                       if (passthrough && !pipelineCtx.supportsThinking && !sdkFeatures.thinkingPassthrough && (block?.type === "thinking" || block?.type === "redacted_thinking")) {
                         if (eventIndex !== undefined)
                           skipBlockIndices.add(eventIndex);
@@ -19492,6 +19718,10 @@ data: ${JSON.stringify({ type: "message_stop" })}
 `), "passthrough_tool_stream_stop");
                       streamClosed = true;
                       controller.close();
+                      if (earlyStopEnabled) {
+                        awaitingEarlyStopDrain = true;
+                        continue;
+                      }
                       break;
                     }
                     if (eventType === "content_block_delta") {
@@ -19763,7 +19993,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" || sdkTerm.reason === "aborted" && sawDuplicateToolUse) && passthrough && capturedToolUses.length > 0 && messageStartEmitted;
+              const canRecoverAsToolUse = (sdkTerm.reason === "max_turns" || sdkTerm.reason === "aborted" && (sawDuplicateToolUse || earlyStopFired)) && passthrough && capturedToolUses.length > 0 && messageStartEmitted;
               if (canRecoverAsToolUse) {
                 diagnosticLog2.session(`${requestMeta.requestId} sdk_termination_recovered ${formatSdkTermination(sdkTerm, {
                   model,

package/dist/cli.js

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

package/dist/proxy/adapters/cherry.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Cherry Studio adapter.
+ *
+ * Cherry Studio (https://github.com/CherryHQ/cherry-studio) is a desktop chat
+ * client — not a coding agent. Pointed at Meridian it works for plain chat,
+ * but its web search failed (#481): the model reported it had "no WebSearch or
+ * WebFetch tool exposed". That's because Meridian blocks the SDK's built-in
+ * WebSearch/WebFetch globally — those are blocked for coding agents like
+ * OpenCode, which ship their own web-search equivalents (`websearch_web_search_exa`).
+ *
+ * Unlike a coding agent, Cherry Studio does NOT execute tools itself; it relies
+ * on Claude's own built-in web search. So this adapter:
+ *   - unblocks the SDK's built-in WebSearch/WebFetch (verified to work on the
+ *     Max/OAuth path — the SDK runs the search server-side and returns grounded
+ *     results), and
+ *   - runs in internal (non-passthrough) mode so the SDK actually executes the
+ *     search instead of trying to hand it back to a client that can't run it.
+ *
+ * It exposes only the web tools — no filesystem MCP tools — since a chat client
+ * has no business reading or writing files on the proxy host.
+ *
+ * Detection: selected via `x-meridian-agent: cherry` (or `cherrystudio`) or the
+ * `MERIDIAN_DEFAULT_AGENT=cherry` env var. Cherry Studio doesn't send a
+ * Meridian-specific header, so a user running a dedicated Meridian for it should
+ * set the env default. (If a distinctive User-Agent is confirmed, add UA
+ * detection in detect.ts.)
+ *
+ * NOTE: agent-specific. See ARCHITECTURE.md "Agent-Specific Logic".
+ */
+import type { AgentAdapter } from "../adapter";
+/** The SDK built-in web tools Cherry Studio wants Claude to run itself. */
+export declare const CHERRY_WEB_TOOLS: readonly ["WebSearch", "WebFetch"];
+/** Built-ins blocked for Cherry — everything OpenCode blocks EXCEPT the web tools. */
+export declare const CHERRY_BLOCKED_BUILTIN_TOOLS: string[];
+/** Incompatible tools for Cherry — CLAUDE_CODE_ONLY_TOOLS minus the web tools. */
+export declare const CHERRY_INCOMPATIBLE_TOOLS: string[];
+export declare const cherryAdapter: AgentAdapter;
+//# sourceMappingURL=cherry.d.ts.map

package/dist/proxy/adapters/cherry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cherry.d.ts","sourceRoot":"","sources":["../../../src/proxy/adapters/cherry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAI9C,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,oCAAqC,CAAA;AAIlE,sFAAsF;AACtF,eAAO,MAAM,4BAA4B,UAAmD,CAAA;AAE5F,kFAAkF;AAClF,eAAO,MAAM,yBAAyB,UAAoD,CAAA;AAE1F,eAAO,MAAM,aAAa,EAAE,YAiC3B,CAAA"}

package/dist/proxy/adapters/detect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../../src/proxy/adapters/detect.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA8C9C;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CAgDtD"}
+{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../../src/proxy/adapters/detect.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAkD9C;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CAgDtD"}

package/dist/proxy/messages.d.ts

@@ -81,6 +81,15 @@ export interface ToolCallInfo {
     name: string;
     /** Compact human-readable target (file path, command, pattern...), if any. */
     target: string | undefined;
+    /**
+     * For mutating tools (edit/write/multiedit): a truncated summary of the
+     * content the call produced. On fresh replay the assistant's tool_use
+     * blocks are dropped, so without this the model knows THAT it edited a
+     * file but not WHAT it wrote — it then re-derives near-duplicate edits
+     * and confabulates a parallel editor when it doesn't recognize its own
+     * wording (#496 follow-up, stefanpartheym's transcript).
+     */
+    contentSummary: string | undefined;
 }
 /**
  * Index every assistant tool_use block in a conversation by id.
@@ -98,10 +107,12 @@ export declare function buildToolUseIndex(messages: Array<{
 }>): Map<string, ToolCallInfo>;
 /**
  * Render a compact attribution label for a replayed tool result, e.g.
- * `[write tmp/test2.txt]` or `[bash echo hi]`. Deliberately terse and
- * bracket-formatted differently from the banned `[Tool Use: ...]` /
- * `[Tool Result ...]` shapes (#111/#386) so the model reads it as context,
- * not as tool-call syntax to imitate.
+ * `[write tmp/test2.txt]`, `[bash echo hi]`, or — for mutating tools —
+ * `[edit a.yml → "# Ignore major bumps..."]` so the model can recognize its
+ * own prior work product on replay. Deliberately terse and bracket-formatted
+ * differently from the banned `[Tool Use: ...]` / `[Tool Result ...]` shapes
+ * (#111/#386) so the model reads it as context, not as tool-call syntax to
+ * imitate.
  */
 export declare function describeToolCall(info: ToolCallInfo): string;
 //# sourceMappingURL=messages.d.ts.map

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;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAiBrD;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;;;;;;;;;;;;;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;CAC3B;AAKD;;;;;;;;;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,CAqB3B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAE3D"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/proxy/messages.ts"],"names":[],"mappings":"AAAA;;GAEG;AAcH;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAiBrD;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;;;;;;;;;;;;;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;AAyCD;;;;;;;;;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"}

package/dist/proxy/passthroughEarlyStop.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Passthrough early-stop tracking.
+ *
+ * In passthrough mode the PreToolUse hook denies every client tool call
+ * ("forwarded to client — end your turn"), but the SDK then invokes the model
+ * one more time to digest the deny. That digest turn is discarded by the proxy
+ * yet fully billed — and on always-thinking models (Fable) it costs a whole
+ * 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).
+ *
+ * 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 */
+    expected: Set<string>;
+    /** subset of `expected` whose tool_result has been observed in the stream */
+    resolved: Set<string>;
+    /** true once shouldEarlyStop has returned true — it fires at most once */
+    fired: boolean;
+}
+export declare function createEarlyStopTracker(): EarlyStopTracker;
+/**
+ * Is this content block a tool call that the proxy forwards to the client
+ * (as opposed to an internal tool the SDK executes itself)?
+ *
+ * Client tools appear either with the passthrough MCP prefix (mcp__oc__read)
+ * or as bare names (read) — the SDK strips the prefix in some event paths.
+ * Internal MCP tools (mcp__opencode__*) and ToolSearch are excluded.
+ */
+export declare function isClientForwardedToolUse(block: unknown): boolean;
+/**
+ * Record the client-forwarded tool_use ids from an assistant message's content.
+ */
+export declare function noteAssistantContent(tracker: EarlyStopTracker, content: unknown): void;
+/**
+ * Record persisted tool_results from a user message's content. Only results
+ * matching an expected id count — unrelated results are ignored.
+ */
+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.
+ */
+export declare function shouldEarlyStop(tracker: EarlyStopTracker): boolean;
+//# sourceMappingURL=passthroughEarlyStop.d.ts.map

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

@@ -0,0 +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;;;GAGG;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"}

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

@@ -1 +1 @@
-{"version":3,"file":"sdkFeatures.d.ts","sourceRoot":"","sources":["../../src/proxy/sdkFeatures.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,MAAM,WAAW,eAAe;IAC9B,iFAAiF;IACjF,gBAAgB,EAAE,OAAO,CAAA;IACzB,kFAAkF;IAClF,kBAAkB,EAAE,OAAO,CAAA;IAC3B,4DAA4D;IAC5D,QAAQ,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;IACpC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAA;IACf,6CAA6C;IAC7C,QAAQ,EAAE,OAAO,CAAA;IACjB,0DAA0D;IAC1D,QAAQ,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAAA;IAC7C,4CAA4C;IAC5C,mBAAmB,EAAE,OAAO,CAAA;IAC5B,iFAAiF;IACjF,YAAY,EAAE,OAAO,CAAA;IACrB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAA;IACpB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAA;IACrB,+CAA+C;IAC/C,QAAQ,EAAE,OAAO,CAAA;IACjB,uEAAuE;IACvE,qBAAqB,EAAE,MAAM,CAAA;CAC9B;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;AAqFpE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAU1E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,SAAS,CAKhG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAOtE;AAKD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAgC5E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAInG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI9D"}
+{"version":3,"file":"sdkFeatures.d.ts","sourceRoot":"","sources":["../../src/proxy/sdkFeatures.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,MAAM,WAAW,eAAe;IAC9B,iFAAiF;IACjF,gBAAgB,EAAE,OAAO,CAAA;IACzB,kFAAkF;IAClF,kBAAkB,EAAE,OAAO,CAAA;IAC3B,4DAA4D;IAC5D,QAAQ,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;IACpC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAA;IACf,6CAA6C;IAC7C,QAAQ,EAAE,OAAO,CAAA;IACjB,0DAA0D;IAC1D,QAAQ,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAAA;IAC7C,4CAA4C;IAC5C,mBAAmB,EAAE,OAAO,CAAA;IAC5B,iFAAiF;IACjF,YAAY,EAAE,OAAO,CAAA;IACrB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAA;IACpB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAA;IACrB,+CAA+C;IAC/C,QAAQ,EAAE,OAAO,CAAA;IACjB,uEAAuE;IACvE,qBAAqB,EAAE,MAAM,CAAA;CAC9B;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;AA4FpE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAU1E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,SAAS,CAKhG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAOtE;AAKD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAgC5E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAInG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI9D"}

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

@@ -1 +1 @@
-{"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;AA2Q7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CAkiGhF;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;AAoCnG,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;AA2Q7B,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CA+pGhF;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/tools.d.ts

@@ -19,6 +19,20 @@ export declare const BLOCKED_BUILTIN_TOOLS: string[];
  * are blocked so Claude uses the agent's version instead of the SDK's.
  */
 export declare const CLAUDE_CODE_ONLY_TOOLS: string[];
+/**
+ * Return the distinct native-server-tool `type`s present in a request's `tools`
+ * array, in first-seen order. Empty when there are none (the common case) or
+ * when `tools` isn't an array. Pure — no I/O.
+ */
+export declare function detectServerTools(tools: unknown): string[];
+/**
+ * Build the actionable error returned when a request carries native server
+ * tools. It tells the user to route that specific call at the real Anthropic
+ * API (with their own key) rather than through Meridian — the plugin already
+ * supports a separate per-provider baseURL, so this is a config fix on their
+ * side, not something Meridian can execute on the Max subscription.
+ */
+export declare function serverToolErrorMessage(types: string[]): string;
 /** MCP server name used by the calling agent */
 export declare const MCP_SERVER_NAME = "opencode";
 /** MCP tools that are allowed through the proxy's tool filter */

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

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/proxy/tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,UAIjC,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,UAuBlC,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,eAAe,aAAa,CAAA;AAEzC,iEAAiE;AACjE,eAAO,MAAM,iBAAiB,UAO7B,CAAA"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/proxy/tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,UAIjC,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,UAuBlC,CAAA;AAeD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAU1D;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAS9D;AAED,gDAAgD;AAChD,eAAO,MAAM,eAAe,aAAa,CAAA;AAEzC,iEAAiE;AACjE,eAAO,MAAM,iBAAiB,UAO7B,CAAA"}

package/dist/proxy/transform.d.ts

@@ -56,6 +56,16 @@ export interface RequestContext {
     supportsThinking: boolean;
     shouldTrackFileChanges: boolean;
     leaksCwdViaSystemReminder: boolean;
+    /**
+     * The client is a pure chat client (no tool-execution loop) that runs the
+     * SDK in internal mode purely to reach Claude's own built-in tools (e.g.
+     * Cherry Studio using WebSearch). The SDK executes those tools itself, so the
+     * proxy must NOT surface the internal tool_use blocks — the client can't run
+     * them and would loop or choke — and should strip thinking blocks it can't
+     * render. Default false: normal internal-mode agents (Droid) keep current
+     * behaviour (their internal tools are mcp__-prefixed and already hidden).
+     */
+    hidesInternalTools?: boolean;
     prefersStreaming?: boolean;
     extractFileChangesFromToolUse?: (toolName: string, toolInput: unknown) => FileChange[];
     metadata: Record<string, unknown>;

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

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

package/dist/proxy/transforms/cherry.d.ts

@@ -0,0 +1,15 @@
+import type { Transform } from "../transform";
+/**
+ * Cherry Studio transform — supplies the SDK tool config at request time.
+ *
+ * The runtime tool policy lives here (server.ts reads `pipelineCtx.*`, not the
+ * adapter methods). Cherry is a chat client that wants Claude's own built-in
+ * web search, so we:
+ *   - allow only WebSearch/WebFetch (no filesystem MCP tools),
+ *   - keep those web tools OUT of the disallowed lists, and
+ *   - run non-passthrough so the SDK executes the search internally.
+ *
+ * See adapters/cherry.ts for the full rationale and #481.
+ */
+export declare const cherryTransforms: Transform[];
+//# sourceMappingURL=cherry.d.ts.map

package/dist/proxy/transforms/cherry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cherry.d.ts","sourceRoot":"","sources":["../../../src/proxy/transforms/cherry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,cAAc,CAAA;AAO7D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,EAwBvC,CAAA"}

package/dist/proxy/transforms/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/proxy/transforms/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAqB7C,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,SAAS,EAAE,CAE9E"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/proxy/transforms/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAuB7C,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,SAAS,EAAE,CAE9E"}

package/dist/server.js

@@ -11,7 +11,7 @@ import {
   runObserveHook,
   runTransformHook,
   startProxyServer
-} from "./cli-1v1narm9.js";
+} from "./cli-vhrprwj4.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.47.0",
+  "version": "1.48.1",
   "description": "Local Anthropic API powered by your Claude Max subscription. One subscription, every agent.",
   "type": "module",
   "main": "./dist/server.js",