@rynfar/meridian 1.38.0 → 1.39.0

package/dist/{cli-bfgya0hb.js → cli-jbdchsr4.js}

@@ -7888,6 +7888,184 @@ function stripMcpPrefix(toolName) {
   }
   return toolName;
 }
+function toCamelCase(s) {
+  return s.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+}
+function toSnakeCase(s) {
+  return s.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+}
+function normalizeToolInput(input, clientSchema) {
+  if (!input || !clientSchema?.properties)
+    return input;
+  const schemaKeys = new Set(Object.keys(clientSchema.properties));
+  const required = new Set(clientSchema.required ?? []);
+  const missingRequired = [...required].filter((k) => input[k] === undefined);
+  if (missingRequired.length === 0)
+    return input;
+  const normalized = { ...input };
+  for (const key of Object.keys(normalized)) {
+    if (schemaKeys.has(key))
+      continue;
+    const camel = toCamelCase(key);
+    if (camel !== key && schemaKeys.has(camel) && normalized[camel] === undefined) {
+      normalized[camel] = normalized[key];
+      delete normalized[key];
+      continue;
+    }
+    const snake = toSnakeCase(key);
+    if (snake !== key && schemaKeys.has(snake) && normalized[snake] === undefined) {
+      normalized[snake] = normalized[key];
+      delete normalized[key];
+    }
+  }
+  return normalized;
+}
+
+// src/proxy/agentDefs.ts
+var FALLBACK_AGENT_NAME = "general";
+var DEFAULT_AGENT_TYPES = {
+  build: "The default agent. Executes tools based on configured permissions.",
+  plan: "Plan mode. Disallows all edit tools.",
+  explore: "Contextual grep for codebases. Answers 'Where is X?', 'Which file has Y?'.",
+  general: "General-purpose agent for researching complex questions and executing multi-step tasks."
+};
+function parseAgentDescriptions(taskDescription) {
+  const agents = new Map;
+  const agentSection = taskDescription.match(/Available agent types.*?:\n((?:- [\w][\w-]*:.*\n?)+)/s);
+  if (!agentSection)
+    return agents;
+  const entries = agentSection[1].matchAll(/^- ([\w][\w-]*):\s*(.+)/gm);
+  for (const match2 of entries) {
+    agents.set(match2[1], match2[2].trim());
+  }
+  return agents;
+}
+function buildAgentDefinitions(taskDescription, mcpToolNames) {
+  const descriptions = parseAgentDescriptions(taskDescription);
+  const agents = {};
+  for (const [name, description] of descriptions) {
+    agents[name] = {
+      description,
+      prompt: buildAgentPrompt(name, description),
+      model: "inherit",
+      ...mcpToolNames?.length ? { tools: [...mcpToolNames] } : {}
+    };
+  }
+  if (descriptions.size > 0) {
+    ensureDefaultAgents(agents, mcpToolNames);
+    addCaseVariants(agents);
+  }
+  return agents;
+}
+function ensureDefaultAgents(agents, mcpToolNames) {
+  for (const [name, description] of Object.entries(DEFAULT_AGENT_TYPES)) {
+    if (!agents[name]) {
+      agents[name] = {
+        description,
+        prompt: buildAgentPrompt(name, description),
+        model: "inherit",
+        ...mcpToolNames?.length ? { tools: [...mcpToolNames] } : {}
+      };
+    }
+  }
+}
+function addCaseVariants(agents) {
+  const baseNames = Object.keys(agents);
+  for (const name of baseNames) {
+    const def = agents[name];
+    const titleCase = name.replace(/(^|-)(\w)/g, (_m, sep, ch) => sep + ch.toUpperCase());
+    if (titleCase !== name && !agents[titleCase]) {
+      agents[titleCase] = def;
+    }
+  }
+  const ALIASES = {
+    "general-purpose": "general",
+    "General-Purpose": "general"
+  };
+  for (const [alias, target] of Object.entries(ALIASES)) {
+    if (!agents[alias] && agents[target]) {
+      agents[alias] = agents[target];
+    }
+  }
+}
+function buildAgentPrompt(name, description) {
+  return `You are the "${name}" agent. ${description}
+
+Focus on your specific role and complete the task thoroughly. Return a clear, concise result.`;
+}
+
+// src/proxy/agentMatch.ts
+var KNOWN_ALIASES = {
+  "general-purpose": "general",
+  default: "general",
+  "code-reviewer": "oracle",
+  reviewer: "oracle",
+  "code-review": "oracle",
+  review: "oracle",
+  consultation: "oracle",
+  analyzer: "oracle",
+  debugger: "oracle",
+  search: "explore",
+  grep: "explore",
+  find: "explore",
+  "codebase-search": "explore",
+  research: "librarian",
+  docs: "librarian",
+  documentation: "librarian",
+  lookup: "librarian",
+  reference: "librarian",
+  consult: "oracle",
+  architect: "oracle",
+  "image-analyzer": "multimodal-looker",
+  image: "multimodal-looker",
+  pdf: "multimodal-looker",
+  visual: "multimodal-looker",
+  planner: "plan",
+  planning: "plan",
+  builder: "build",
+  coder: "build",
+  developer: "build",
+  writer: "build",
+  executor: "build"
+};
+var STRIP_SUFFIXES = ["-agent", "-tool", "-worker", "-task", " agent", " tool"];
+function resolveAgentAlias(input) {
+  const lowered = input.toLowerCase();
+  return KNOWN_ALIASES[lowered] ?? lowered;
+}
+function fuzzyMatchAgentName(input, validAgents) {
+  if (!input)
+    return input;
+  if (validAgents.length === 0)
+    return input.toLowerCase();
+  const lowered = input.toLowerCase();
+  const exact = validAgents.find((a) => a.toLowerCase() === lowered);
+  if (exact)
+    return exact;
+  const alias = KNOWN_ALIASES[lowered];
+  if (alias && validAgents.includes(alias))
+    return alias;
+  const prefixMatch = validAgents.find((a) => a.toLowerCase().startsWith(lowered));
+  if (prefixMatch)
+    return prefixMatch;
+  const substringMatch = validAgents.find((a) => a.toLowerCase().includes(lowered));
+  if (substringMatch)
+    return substringMatch;
+  for (const suffix of STRIP_SUFFIXES) {
+    if (lowered.endsWith(suffix)) {
+      const stripped = lowered.slice(0, -suffix.length);
+      const strippedMatch = validAgents.find((a) => a.toLowerCase() === stripped);
+      if (strippedMatch)
+        return strippedMatch;
+    }
+  }
+  const reverseMatch = validAgents.find((a) => lowered.includes(a.toLowerCase()));
+  if (reverseMatch)
+    return reverseMatch;
+  if (validAgents.includes(FALLBACK_AGENT_NAME))
+    return FALLBACK_AGENT_NAME;
+  return lowered;
+}
 
 // src/utils/lruMap.ts
 class LRUMap {
@@ -8797,6 +8975,16 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 import { join as join2, dirname as dirname2 } from "path";
 import { promisify } from "util";
 var exec = promisify(execCallback);
+var CANONICAL_OPUS_MODEL = "claude-opus-4-7";
+var CANONICAL_SONNET_MODEL = "claude-sonnet-4-6";
+var CANONICAL_HAIKU_MODEL = "claude-haiku-4-5";
+function resolveSdkModelDefaults() {
+  return {
+    ANTHROPIC_DEFAULT_OPUS_MODEL: process.env.MERIDIAN_DEFAULT_OPUS_MODEL ?? CANONICAL_OPUS_MODEL,
+    ANTHROPIC_DEFAULT_SONNET_MODEL: process.env.MERIDIAN_DEFAULT_SONNET_MODEL ?? CANONICAL_SONNET_MODEL,
+    ANTHROPIC_DEFAULT_HAIKU_MODEL: process.env.MERIDIAN_DEFAULT_HAIKU_MODEL ?? CANONICAL_HAIKU_MODEL
+  };
+}
 var AUTH_STATUS_CACHE_TTL_MS = 60000;
 var AUTH_STATUS_FAILURE_TTL_MS = 5000;
 var cachedAuthStatus = null;
@@ -8933,16 +9121,14 @@ async function resolveClaudeExecutableAsync() {
     return cachedClaudePathPromise;
   cachedClaudePathPromise = (async () => {
     const runningUnderBun = typeof process.versions.bun !== "undefined";
-    if (runningUnderBun) {
-      try {
-        const sdkPath = fileURLToPath2(import.meta.resolve("@anthropic-ai/claude-agent-sdk"));
-        const sdkCliJs = join2(dirname2(sdkPath), "cli.js");
-        if (existsSync2(sdkCliJs)) {
-          cachedClaudePath = sdkCliJs;
-          return sdkCliJs;
-        }
-      } catch {}
-    }
+    try {
+      const pkgPath = fileURLToPath2(import.meta.resolve("@anthropic-ai/claude-code/package.json"));
+      const bundledBinary = join2(dirname2(pkgPath), "bin", "claude.exe");
+      if (existsSync2(bundledBinary)) {
+        cachedClaudePath = bundledBinary;
+        return bundledBinary;
+      }
+    } catch {}
     try {
       const { stdout } = await exec("which claude");
       const claudePath = stdout.trim();
@@ -8951,7 +9137,7 @@ async function resolveClaudeExecutableAsync() {
         return claudePath;
       }
     } catch {}
-    if (!runningUnderBun) {
+    if (runningUnderBun) {
       try {
         const sdkPath = fileURLToPath2(import.meta.resolve("@anthropic-ai/claude-agent-sdk"));
         const sdkCliJs = join2(dirname2(sdkPath), "cli.js");
@@ -9164,7 +9350,15 @@ function buildModelList(isMaxSubscription, now = Math.floor(Date.now() / 1000))
       context_window: isMaxSubscription ? 1e6 : 200000
     },
     {
-      id: "claude-haiku-4-5-20251001",
+      id: "claude-opus-4-7",
+      object: "model",
+      created: now,
+      owned_by: "anthropic",
+      display_name: "Claude Opus 4.7",
+      context_window: isMaxSubscription ? 1e6 : 200000
+    },
+    {
+      id: "claude-haiku-4-5",
       object: "model",
       created: now,
       owned_by: "anthropic",
@@ -9204,6 +9398,27 @@ function normalizeContent(content) {
   }
   return String(content);
 }
+function extractAdvisorModel(tools) {
+  if (!Array.isArray(tools))
+    return;
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object")
+      continue;
+    const candidate = tool;
+    if (typeof candidate.type === "string" && candidate.type.startsWith("advisor_") && typeof candidate.model === "string" && candidate.model.length > 0) {
+      return candidate.model;
+    }
+  }
+  return;
+}
+function stripAdvisorTools(tools) {
+  return tools.filter((tool) => {
+    if (!tool || typeof tool !== "object")
+      return true;
+    const candidate = tool;
+    return !(typeof candidate.type === "string" && candidate.type.startsWith("advisor_"));
+  });
+}
 function getLastUserMessage(messages) {
   for (let i = messages.length - 1;i >= 0; i--) {
     if (messages[i]?.role === "user")
@@ -9440,104 +9655,6 @@ var ALLOWED_MCP_TOOLS = [
   `mcp__${MCP_SERVER_NAME}__grep`
 ];
 
-// src/proxy/agentDefs.ts
-function parseAgentDescriptions(taskDescription) {
-  const agents = new Map;
-  const agentSection = taskDescription.match(/Available agent types.*?:\n((?:- [\w][\w-]*:.*\n?)+)/s);
-  if (!agentSection)
-    return agents;
-  const entries = agentSection[1].matchAll(/^- ([\w][\w-]*):\s*(.+)/gm);
-  for (const match2 of entries) {
-    agents.set(match2[1], match2[2].trim());
-  }
-  return agents;
-}
-function buildAgentDefinitions(taskDescription, mcpToolNames) {
-  const descriptions = parseAgentDescriptions(taskDescription);
-  const agents = {};
-  for (const [name, description] of descriptions) {
-    agents[name] = {
-      description,
-      prompt: buildAgentPrompt(name, description),
-      model: "inherit",
-      ...mcpToolNames?.length ? { tools: [...mcpToolNames] } : {}
-    };
-  }
-  return agents;
-}
-function buildAgentPrompt(name, description) {
-  return `You are the "${name}" agent. ${description}
-
-Focus on your specific role and complete the task thoroughly. Return a clear, concise result.`;
-}
-
-// src/proxy/agentMatch.ts
-var KNOWN_ALIASES = {
-  "general-purpose": "general",
-  default: "general",
-  "code-reviewer": "oracle",
-  reviewer: "oracle",
-  "code-review": "oracle",
-  review: "oracle",
-  consultation: "oracle",
-  analyzer: "oracle",
-  debugger: "oracle",
-  search: "explore",
-  grep: "explore",
-  find: "explore",
-  "codebase-search": "explore",
-  research: "librarian",
-  docs: "librarian",
-  documentation: "librarian",
-  lookup: "librarian",
-  reference: "librarian",
-  consult: "oracle",
-  architect: "oracle",
-  "image-analyzer": "multimodal-looker",
-  image: "multimodal-looker",
-  pdf: "multimodal-looker",
-  visual: "multimodal-looker",
-  planner: "plan",
-  planning: "plan",
-  builder: "build",
-  coder: "build",
-  developer: "build",
-  writer: "build",
-  executor: "build"
-};
-var STRIP_SUFFIXES = ["-agent", "-tool", "-worker", "-task", " agent", " tool"];
-function fuzzyMatchAgentName(input, validAgents) {
-  if (!input)
-    return input;
-  if (validAgents.length === 0)
-    return input.toLowerCase();
-  const lowered = input.toLowerCase();
-  const exact = validAgents.find((a) => a.toLowerCase() === lowered);
-  if (exact)
-    return exact;
-  const alias = KNOWN_ALIASES[lowered];
-  if (alias && validAgents.includes(alias))
-    return alias;
-  const prefixMatch = validAgents.find((a) => a.toLowerCase().startsWith(lowered));
-  if (prefixMatch)
-    return prefixMatch;
-  const substringMatch = validAgents.find((a) => a.toLowerCase().includes(lowered));
-  if (substringMatch)
-    return substringMatch;
-  for (const suffix of STRIP_SUFFIXES) {
-    if (lowered.endsWith(suffix)) {
-      const stripped = lowered.slice(0, -suffix.length);
-      const strippedMatch = validAgents.find((a) => a.toLowerCase() === stripped);
-      if (strippedMatch)
-        return strippedMatch;
-    }
-  }
-  const reverseMatch = validAgents.find((a) => lowered.includes(a.toLowerCase()));
-  if (reverseMatch)
-    return reverseMatch;
-  return lowered;
-}
-
 // src/proxy/transforms/opencode.ts
 var openCodeTransforms = [
   {
@@ -10082,6 +10199,9 @@ var piAdapter = {
   extractWorkingDirectory(body) {
     return extractPiCwd(body);
   },
+  extractClientWorkingDirectory(body) {
+    return extractPiCwd(body);
+  },
   normalizeContent(content) {
     return normalizeContent(content);
   },
@@ -10234,6 +10354,79 @@ var forgeCodeAdapter = {
   }
 };
 
+// src/proxy/adapters/claudecode.ts
+function extractClaudeCodeClientCwd(body) {
+  let systemText = "";
+  if (typeof body.system === "string") {
+    systemText = body.system;
+  } else if (Array.isArray(body.system)) {
+    systemText = body.system.filter((b) => b.type === "text" && b.text).map((b) => b.text).join(`
+`);
+  }
+  if (!systemText)
+    return;
+  const match2 = systemText.match(/Primary working directory:\s*([^\n<]+)/i);
+  return match2?.[1]?.trim() || undefined;
+}
+var claudeCodeAdapter = {
+  name: "claude-code",
+  getSessionId(_c) {
+    return;
+  },
+  extractWorkingDirectory(_body) {
+    return;
+  },
+  extractClientWorkingDirectory(body) {
+    return extractClaudeCodeClientCwd(body);
+  },
+  normalizeContent(content) {
+    return normalizeContent(content);
+  },
+  getBlockedBuiltinTools() {
+    return BLOCKED_BUILTIN_TOOLS;
+  },
+  getAgentIncompatibleTools() {
+    return CLAUDE_CODE_ONLY_TOOLS;
+  },
+  getMcpServerName() {
+    return MCP_SERVER_NAME;
+  },
+  getAllowedMcpTools() {
+    return ALLOWED_MCP_TOOLS;
+  },
+  getCoreToolNames() {
+    return ["Read", "Write", "Edit", "Bash", "Glob", "Grep"];
+  },
+  usesPassthrough() {
+    const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
+    if (envVal === "0" || envVal === "false" || envVal === "no") {
+      return false;
+    }
+    return true;
+  },
+  supportsThinking() {
+    return true;
+  },
+  shouldTrackFileChanges() {
+    return false;
+  },
+  extractFileChangesFromToolUse(toolName, toolInput) {
+    const input = toolInput;
+    const filePath = input?.file_path ?? input?.filePath ?? input?.path;
+    const lowerName = toolName.toLowerCase();
+    if (lowerName === "write" && filePath) {
+      return [{ operation: "wrote", path: String(filePath) }];
+    }
+    if ((lowerName === "edit" || lowerName === "multiedit") && filePath) {
+      return [{ operation: "edited", path: String(filePath) }];
+    }
+    if (lowerName === "bash" && input?.command) {
+      return extractFileChangesFromBash(String(input.command));
+    }
+    return [];
+  }
+};
+
 // src/proxy/adapters/detect.ts
 var ADAPTER_MAP = {
   opencode: openCodeAdapter,
@@ -10241,7 +10434,9 @@ var ADAPTER_MAP = {
   crush: crushAdapter,
   passthrough: passthroughAdapter,
   pi: piAdapter,
-  forgecode: forgeCodeAdapter
+  forgecode: forgeCodeAdapter,
+  "claude-code": claudeCodeAdapter,
+  claudecode: claudeCodeAdapter
 };
 var envDefault = process.env.MERIDIAN_DEFAULT_AGENT || "";
 if (envDefault && !ADAPTER_MAP[envDefault]) {
@@ -10272,6 +10467,9 @@ function detectAdapter(c) {
   if (userAgent.startsWith("Charm-Crush/")) {
     return crushAdapter;
   }
+  if (userAgent.startsWith("claude-cli/")) {
+    return claudeCodeAdapter;
+  }
   if (isLiteLLMRequest(c)) {
     return passthroughAdapter;
   }
@@ -15974,16 +16172,35 @@ function createOpencodeMcpServer() {
 }
 
 // src/proxy/query.ts
-function resolveSystemPrompt(systemContext, passthrough, settingSources, codeSystemPrompt, clientSystemPrompt) {
+function computePassthroughMaxTurns(resumeSessionId, hasDeferredTools, advisorModel) {
+  const hasResume = !!resumeSessionId;
+  const base = hasResume && hasDeferredTools ? 4 : hasResume || hasDeferredTools ? 3 : 2;
+  const advisorBump = advisorModel ? 3 : 0;
+  return base + advisorBump;
+}
+function buildCwdNote(sdkCwd, clientCwd) {
+  if (!clientCwd || clientCwd === sdkCwd)
+    return "";
+  return `
+
+<env>
+` + `Working directory: ${clientCwd}
+` + `</env>
+` + `<meridian-note>
+` + `You are reached through a proxy. The subprocess running you resides at ` + `"${sdkCwd}" on the proxy host, but that is not the user's working directory. ` + `Always treat "${clientCwd}" as the working directory when referring to files or paths.
+` + `</meridian-note>`;
+}
+function resolveSystemPrompt(systemContext, passthrough, settingSources, codeSystemPrompt, clientSystemPrompt, cwdNote) {
   const hasSettings = settingSources != null && settingSources.length > 0;
   const usePreset = codeSystemPrompt ?? (hasSettings || !passthrough && !!systemContext);
   const includeClient = clientSystemPrompt ?? true;
   const clientContext = includeClient ? systemContext : undefined;
+  const append = [clientContext, cwdNote].filter(Boolean).join("") || undefined;
   if (usePreset) {
-    return clientContext ? { systemPrompt: { type: "preset", preset: "claude_code", append: clientContext } } : { systemPrompt: { type: "preset", preset: "claude_code" } };
+    return append ? { systemPrompt: { type: "preset", preset: "claude_code", append } } : { systemPrompt: { type: "preset", preset: "claude_code" } };
   }
-  if (clientContext)
-    return { systemPrompt: clientContext };
+  if (append)
+    return { systemPrompt: append };
   return {};
 }
 function buildQueryOptions(ctx) {
@@ -15991,6 +16208,7 @@ function buildQueryOptions(ctx) {
     prompt,
     model,
     workingDirectory,
+    clientWorkingDirectory,
     systemContext,
     claudeExecutable,
     passthrough,
@@ -16023,19 +16241,20 @@ function buildQueryOptions(ctx) {
     sdkDebug,
     additionalDirectories
   } = ctx;
+  const cwdNote = buildCwdNote(workingDirectory, clientWorkingDirectory);
   const allBlockedTools = [...blockedTools, ...incompatibleTools];
   return {
     prompt,
     options: {
       executable: "node",
-      maxTurns: passthrough ? resumeSessionId || hasDeferredTools ? 3 : 2 : 200,
+      maxTurns: passthrough ? computePassthroughMaxTurns(resumeSessionId, hasDeferredTools, ctx.advisorModel) : 200,
       cwd: workingDirectory,
       model,
       pathToClaudeCodeExecutable: claudeExecutable,
       ...stream2 ? { includePartialMessages: true } : {},
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
-      ...resolveSystemPrompt(systemContext, passthrough, settingSources, codeSystemPrompt, clientSystemPrompt),
+      ...resolveSystemPrompt(systemContext, passthrough, settingSources, codeSystemPrompt, clientSystemPrompt, cwdNote),
       ...passthrough ? {
         disallowedTools: [...allBlockedTools],
         ...passthroughMcp ? {
@@ -16074,7 +16293,8 @@ function buildQueryOptions(ctx) {
       ...maxBudgetUsd && maxBudgetUsd > 0 ? { maxBudgetUsd } : {},
       ...fallbackModel ? { fallbackModel } : {},
       ...sdkDebug ? { debug: true } : {},
-      ...additionalDirectories && additionalDirectories.length > 0 ? { additionalDirectories } : {}
+      ...additionalDirectories && additionalDirectories.length > 0 ? { additionalDirectories } : {},
+      ...ctx.advisorModel ? { advisorModel: ctx.advisorModel } : {}
     }
   };
 }
@@ -16414,6 +16634,10 @@ function sanitizeTextContent(text, opts = {}) {
 
 // src/proxy/session/lineage.ts
 import { createHash as createHash2 } from "crypto";
+function normalizeContextUsage(usage) {
+  const lastIteration = usage.iterations?.at(-1);
+  return lastIteration ?? usage;
+}
 var MIN_SUFFIX_FOR_COMPACTION = 2;
 function computeLineageHash(messages) {
   if (!messages || messages.length === 0)
@@ -17201,6 +17425,7 @@ function createProxyServer(config = {}) {
         const requestSource = c.req.header("x-meridian-source")?.slice(0, 64) || undefined;
         let model = mapModelToClaudeModel(body.model || "sonnet", authStatus?.subscriptionType, agentMode);
         const workingDirectory = (process.env.MERIDIAN_WORKDIR ?? process.env.CLAUDE_PROXY_WORKDIR) || adapter.extractWorkingDirectory(body) || process.cwd();
+        const clientWorkingDirectory = adapter.extractClientWorkingDirectory?.(body) || workingDirectory;
         const {
           CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS,
           ANTHROPIC_API_KEY: _dropApiKey,
@@ -17208,7 +17433,8 @@ function createProxyServer(config = {}) {
           ANTHROPIC_AUTH_TOKEN: _dropAuthToken,
           ...cleanEnv
         } = process.env;
-        const profileEnv = { ...cleanEnv, ...profile.env };
+        const sdkModelDefaults = resolveSdkModelDefaults();
+        const profileEnv = { ...sdkModelDefaults, ...cleanEnv, ...profile.env };
         let systemContext = "";
         if (body.system) {
           if (typeof body.system === "string") {
@@ -17269,7 +17495,7 @@ function createProxyServer(config = {}) {
         const betas = betaFilter.forwarded;
         const agentSessionId = adapter.getSessionId(c);
         const profileSessionId = profile.id !== "default" && agentSessionId ? `${profile.id}:${agentSessionId}` : agentSessionId;
-        const profileScopedCwd = profile.id !== "default" ? `${workingDirectory}::profile=${profile.id}` : workingDirectory;
+        const profileScopedCwd = profile.id !== "default" ? `${clientWorkingDirectory}::profile=${profile.id}` : clientWorkingDirectory;
         const isIndependentSession = requestSource?.startsWith("fork-") || requestSource?.startsWith("subagent-") || false;
         let lineageResult = isIndependentSession ? { type: "diverged" } : lookupSession(profileSessionId, body.messages || [], profileScopedCwd);
         if (lineageResult.type === "undo" && adapter.name === "opencode" && !agentSessionId) {
@@ -17383,6 +17609,10 @@ function createProxyServer(config = {}) {
         const fileChanges = [];
         let passthroughMcp;
         let requestTools = Array.isArray(body.tools) ? body.tools : [];
+        const advisorModel = extractAdvisorModel(requestTools);
+        if (advisorModel) {
+          requestTools = stripAdvisorTools(requestTools);
+        }
         if (passthrough && requestTools.length === 0 && profileSessionId) {
           const cached = sessionToolCache.get(profileSessionId);
           if (cached && cached.length > 0) {
@@ -17428,10 +17658,15 @@ function createProxyServer(config = {}) {
               if (hasDeferredTools && coreSet && !coreSet.has(toolName.toLowerCase())) {
                 discoveredTools.add(toolName);
               }
+              const clientTool = requestTools.find((t) => t.name === toolName);
+              let toolInput = normalizeToolInput(input.tool_input, clientTool?.input_schema);
+              if (toolName.toLowerCase() === "task" && toolInput?.subagent_type && typeof toolInput.subagent_type === "string") {
+                toolInput = { ...toolInput, subagent_type: resolveAgentAlias(toolInput.subagent_type) };
+              }
               capturedToolUses.push({
                 id: input.tool_use_id,
                 name: toolName,
-                input: input.tool_input
+                input: toolInput
               });
               return {
                 decision: "block",
@@ -17459,6 +17694,7 @@ function createProxyServer(config = {}) {
             sdkUuidMap.push(null);
           claudeLog("upstream.start", { mode: "non_stream", model });
           let lastUsage;
+          let lastStopReason;
           try {
             if (!claudeExecutable) {
               claudeExecutable = await resolveClaudeExecutableAsync();
@@ -17475,6 +17711,7 @@ function createProxyServer(config = {}) {
                     prompt: makePrompt(),
                     model,
                     workingDirectory,
+                    clientWorkingDirectory,
                     systemContext,
                     claudeExecutable,
                     passthrough,
@@ -17505,7 +17742,8 @@ function createProxyServer(config = {}) {
                     maxBudgetUsd: sdkFeatures.maxBudgetUsd,
                     fallbackModel: sdkFeatures.fallbackModel,
                     sdkDebug: sdkFeatures.sdkDebug,
-                    additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined
+                    additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                    advisorModel
                   }))) {
                     if (event.type === "assistant" && !event.error) {
                       didYieldContent = true;
@@ -17532,6 +17770,7 @@ function createProxyServer(config = {}) {
                       prompt: buildFreshPrompt(allMessages, sanitizeOpts),
                       model,
                       workingDirectory,
+                      clientWorkingDirectory,
                       systemContext,
                       claudeExecutable,
                       passthrough,
@@ -17562,7 +17801,8 @@ function createProxyServer(config = {}) {
                       maxBudgetUsd: sdkFeatures.maxBudgetUsd,
                       fallbackModel: sdkFeatures.fallbackModel,
                       sdkDebug: sdkFeatures.sdkDebug,
-                      additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined
+                      additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                      advisorModel
                     }));
                     return;
                   }
@@ -17660,6 +17900,9 @@ function createProxyServer(config = {}) {
                 const msgUsage = message.message.usage;
                 if (msgUsage)
                   lastUsage = { ...lastUsage, ...msgUsage };
+                if (typeof message.message.stop_reason === "string") {
+                  lastStopReason = message.message.stop_reason;
+                }
               }
             }
             claudeLog("upstream.completed", {
@@ -17697,19 +17940,27 @@ Subprocess stderr: ${stderrOutput}`;
             throw error;
           }
           if (passthrough && capturedToolUses.length > 0) {
-            for (const tu of capturedToolUses) {
-              if (!contentBlocks.some((b) => b.type === "tool_use" && b.id === tu.id)) {
-                contentBlocks.push({
-                  type: "tool_use",
-                  id: tu.id,
-                  name: tu.name,
-                  input: tu.input
-                });
+            const capturedById = new Map(capturedToolUses.map((tu) => [tu.id, tu]));
+            for (const block of contentBlocks) {
+              if (block.type === "tool_use" && capturedById.has(block.id)) {
+                const captured = capturedById.get(block.id);
+                block.name = captured.name;
+                block.input = captured.input;
+                capturedById.delete(block.id);
               }
             }
+            for (const tu of capturedById.values()) {
+              contentBlocks.push({
+                type: "tool_use",
+                id: tu.id,
+                name: tu.name,
+                input: tu.input
+              });
+            }
           }
           const hasToolUse = contentBlocks.some((b) => b.type === "tool_use");
-          const stopReason = hasToolUse ? "tool_use" : "end_turn";
+          const heuristicStopReason = hasToolUse ? "tool_use" : "end_turn";
+          const stopReason = lastStopReason && lastStopReason !== "end_turn" && lastStopReason !== "tool_use" ? lastStopReason : heuristicStopReason;
           if (trackFileChanges) {
             if (passthrough && stopReason === "end_turn" && pipelineCtx.extractFileChangesFromToolUse) {
               const passthroughChanges = extractFileChangesFromMessages(body.messages || [], pipelineCtx.extractFileChangesFromToolUse);
@@ -17851,6 +18102,7 @@ Subprocess stderr: ${stderrOutput}`;
                       prompt: makePrompt(),
                       model,
                       workingDirectory,
+                      clientWorkingDirectory,
                       systemContext,
                       claudeExecutable,
                       passthrough,
@@ -17881,7 +18133,8 @@ Subprocess stderr: ${stderrOutput}`;
                       maxBudgetUsd: sdkFeatures.maxBudgetUsd,
                       fallbackModel: sdkFeatures.fallbackModel,
                       sdkDebug: sdkFeatures.sdkDebug,
-                      additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined
+                      additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                      advisorModel
                     }))) {
                       if (event.type === "stream_event") {
                         didYieldClientEvent = true;
@@ -17908,6 +18161,7 @@ Subprocess stderr: ${stderrOutput}`;
                         prompt: buildFreshPrompt(allMessages, sanitizeOpts),
                         model,
                         workingDirectory,
+                        clientWorkingDirectory,
                         systemContext,
                         claudeExecutable,
                         passthrough,
@@ -17938,7 +18192,8 @@ Subprocess stderr: ${stderrOutput}`;
                         maxBudgetUsd: sdkFeatures.maxBudgetUsd,
                         fallbackModel: sdkFeatures.fallbackModel,
                         sdkDebug: sdkFeatures.sdkDebug,
-                        additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined
+                        additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                        advisorModel
                       }));
                       return;
                     }
@@ -18018,6 +18273,8 @@ Subprocess stderr: ${stderrOutput}`;
                 }
               }, 15000);
               const skipBlockIndices = new Set;
+              const taskToolBlockIndices = new Set;
+              const taskToolJsonBuffer = new Map;
               const streamedToolUseIds = new Set;
               let nextClientBlockIndex = 0;
               const sdkToClientIndex = new Map;
@@ -18098,6 +18355,9 @@ data: ${JSON.stringify({ type: "message_stop" })}
                         } else if (passthrough && block.id) {
                           streamedToolUseIds.add(block.id);
                         }
+                        if (passthrough && eventIndex !== undefined && block.name.toLowerCase() === "task") {
+                          taskToolBlockIndices.add(eventIndex);
+                        }
                       }
                       if (eventIndex !== undefined) {
                         sdkToClientIndex.set(eventIndex, nextClientBlockIndex++);
@@ -18118,6 +18378,39 @@ data: ${JSON.stringify({ type: "message_stop" })}
                         continue;
                       }
                     }
+                    if (passthrough && eventIndex !== undefined && taskToolBlockIndices.has(eventIndex)) {
+                      if (eventType === "content_block_delta") {
+                        const delta = event.delta;
+                        if (delta?.type === "input_json_delta" && typeof delta.partial_json === "string") {
+                          const prev = taskToolJsonBuffer.get(eventIndex) ?? "";
+                          taskToolJsonBuffer.set(eventIndex, prev + delta.partial_json);
+                          continue;
+                        }
+                      }
+                      if (eventType === "content_block_stop") {
+                        const buffered = taskToolJsonBuffer.get(eventIndex);
+                        if (buffered) {
+                          let fixed = buffered;
+                          try {
+                            const parsed = JSON.parse(buffered);
+                            if (typeof parsed.subagent_type === "string") {
+                              parsed.subagent_type = resolveAgentAlias(parsed.subagent_type);
+                            }
+                            fixed = JSON.stringify(parsed);
+                          } catch {}
+                          const clientIdx = sdkToClientIndex.get(eventIndex) ?? eventIndex;
+                          safeEnqueue(encoder.encode(`event: content_block_delta
+data: ${JSON.stringify({
+                            type: "content_block_delta",
+                            index: clientIdx,
+                            delta: { type: "input_json_delta", partial_json: fixed }
+                          })}
+
+`), "task_tool_fixed_delta");
+                          taskToolJsonBuffer.delete(eventIndex);
+                        }
+                      }
+                    }
                     const payload = encoder.encode(`event: ${eventType}
 data: ${JSON.stringify(event)}
 
@@ -18701,7 +18994,7 @@ data: ${JSON.stringify({
     if (!session.contextUsage) {
       return c.json({ error: "No usage data available for this session" }, 404);
     }
-    return c.json({ session_id: claudeSessionId, context_usage: session.contextUsage });
+    return c.json({ session_id: claudeSessionId, context_usage: normalizeContextUsage(session.contextUsage) });
   });
   app.get("/v1/sessions/recover", (c) => {
     const sessions = listStoredSessions();
@@ -18777,6 +19070,8 @@ async function startProxyServer(config = {}) {
     if (!finalConfig.silent) {
       console.log(`Meridian running at http://${finalConfig.host}:${info.port}`);
       console.log(`Telemetry dashboard: http://${finalConfig.host}:${info.port}/telemetry`);
+      const pins = resolveSdkModelDefaults();
+      console.log(`Model pins: opus=${pins.ANTHROPIC_DEFAULT_OPUS_MODEL} sonnet=${pins.ANTHROPIC_DEFAULT_SONNET_MODEL} haiku=${pins.ANTHROPIC_DEFAULT_HAIKU_MODEL}`);
       console.log(`
 Point any Anthropic-compatible tool at this endpoint:`);
       console.log(`  ANTHROPIC_API_KEY=x ANTHROPIC_BASE_URL=http://${finalConfig.host}:${info.port}`);