@rynfar/meridian 1.37.8 → 1.39.0

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

@@ -1,9 +1,25 @@
+import {
+  getActiveProfileId,
+  getEffectiveProfiles,
+  listProfiles,
+  resolveProfile,
+  restoreActiveProfile,
+  setActiveProfile
+} from "./cli-vdp9s10c.js";
+import {
+  isTrackedPlugin,
+  recordError,
+  recordInvocation,
+  registerPluginStats,
+  resetAllPluginStats
+} from "./cli-sry5aqdj.js";
 import {
   init_profileBar,
   profileBarCss,
   profileBarHtml,
-  profileBarJs
-} from "./cli-pr79d7nw.js";
+  profileBarJs,
+  themeCss
+} from "./cli-4rqtm83g.js";
 import {
   checkPluginConfigured
 } from "./cli-rtab0qa6.js";
@@ -12,14 +28,6 @@ import {
   refreshOAuthToken,
   withClaudeLogContext
 } from "./cli-m9pfb7h9.js";
-import {
-  getActiveProfileId,
-  getEffectiveProfiles,
-  listProfiles,
-  resolveProfile,
-  restoreActiveProfile,
-  setActiveProfile
-} from "./cli-vdp9s10c.js";
 import {
   __commonJS,
   __esm,
@@ -849,6 +857,11 @@ function openDatabase(dbPath) {
   db.pragma("synchronous = NORMAL");
   db.exec(METRICS_SCHEMA);
   db.exec(LOGS_SCHEMA);
+  for (const sql of METRICS_MIGRATIONS) {
+    try {
+      db.exec(sql);
+    } catch {}
+  }
   return db;
 }
 
@@ -863,7 +876,7 @@ class SqliteTelemetryStore {
     this.retentionMs = retentionDays * 24 * 60 * 60 * 1000;
     this.insertStmt = db.prepare(`
       INSERT INTO metrics (
-        request_id, timestamp, adapter, model, request_model, mode,
+        request_id, timestamp, adapter, request_source, model, request_model, mode,
         is_resume, is_passthrough, lineage_type,
         has_deferred_tools, deferred_tool_count, tool_count, discovered_tools, session_discovered_count,
         message_count, sdk_session_id,
@@ -872,7 +885,7 @@ class SqliteTelemetryStore {
         input_tokens, output_tokens, cache_read_input_tokens,
         cache_creation_input_tokens, cache_hit_rate
       ) VALUES (
-        @requestId, @timestamp, @adapter, @model, @requestModel, @mode,
+        @requestId, @timestamp, @adapter, @requestSource, @model, @requestModel, @mode,
         @isResume, @isPassthrough, @lineageType,
         @hasDeferredTools, @deferredToolCount, @toolCount, @discoveredTools, @sessionDiscoveredCount,
         @messageCount, @sdkSessionId,
@@ -890,6 +903,7 @@ class SqliteTelemetryStore {
         requestId: metric.requestId,
         timestamp: metric.timestamp,
         adapter: metric.adapter ?? null,
+        requestSource: metric.requestSource ?? null,
         model: metric.model,
         requestModel: metric.requestModel ?? null,
         mode: metric.mode,
@@ -1054,6 +1068,7 @@ function rowToMetric(r) {
     requestId: r.request_id,
     timestamp: r.timestamp,
     adapter: r.adapter ?? undefined,
+    requestSource: r.request_source ?? undefined,
     model: r.model,
     requestModel: r.request_model ?? undefined,
     mode: r.mode,
@@ -1101,6 +1116,7 @@ CREATE TABLE IF NOT EXISTS metrics (
   request_id           TEXT    NOT NULL,
   timestamp            INTEGER NOT NULL,
   adapter              TEXT,
+  request_source       TEXT,
   model                TEXT    NOT NULL,
   request_model        TEXT,
   mode                 TEXT    NOT NULL,
@@ -1132,7 +1148,7 @@ CREATE TABLE IF NOT EXISTS metrics (
 CREATE INDEX IF NOT EXISTS idx_metrics_ts    ON metrics(timestamp);
 CREATE INDEX IF NOT EXISTS idx_metrics_model ON metrics(model);
 CREATE INDEX IF NOT EXISTS idx_metrics_session_success ON metrics(sdk_session_id, timestamp DESC, id DESC);
-`, LOGS_SCHEMA = `
+`, METRICS_MIGRATIONS, LOGS_SCHEMA = `
 CREATE TABLE IF NOT EXISTS diagnostic_logs (
   id         INTEGER PRIMARY KEY AUTOINCREMENT,
   timestamp  INTEGER NOT NULL,
@@ -1147,6 +1163,9 @@ CREATE INDEX IF NOT EXISTS idx_logs_cat ON diagnostic_logs(category);
 var init_sqlite = __esm(() => {
   init_percentiles();
   import_libsql = __toESM(require_libsql(), 1);
+  METRICS_MIGRATIONS = [
+    "ALTER TABLE metrics ADD COLUMN request_source TEXT"
+  ];
 });
 
 // src/proxy/sdkFeatures.ts
@@ -1158,14 +1177,14 @@ __export(exports_sdkFeatures, {
   getFeaturesForAdapter: () => getFeaturesForAdapter,
   getAllFeatureConfigs: () => getAllFeatureConfigs
 });
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2, renameSync as renameSync2 } from "node:fs";
-import { join as join5 } from "node:path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2, renameSync as renameSync2 } from "node:fs";
+import { join as join6 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function getConfigPath() {
-  const dir = join5(homedir4(), ".config", "meridian");
-  if (!existsSync4(dir))
+  const dir = join6(homedir4(), ".config", "meridian");
+  if (!existsSync5(dir))
     mkdirSync2(dir, { recursive: true });
-  return join5(dir, "sdk-features.json");
+  return join6(dir, "sdk-features.json");
 }
 function readConfig() {
   const now = Date.now();
@@ -1173,8 +1192,8 @@ function readConfig() {
     return cachedConfig;
   const path3 = getConfigPath();
   try {
-    if (existsSync4(path3)) {
-      cachedConfig = JSON.parse(readFileSync3(path3, "utf-8"));
+    if (existsSync5(path3)) {
+      cachedConfig = JSON.parse(readFileSync4(path3, "utf-8"));
     } else {
       cachedConfig = {};
     }
@@ -1297,12 +1316,7 @@ var init_settingsPage = __esm(() => {
 <title>Meridian — SDK Features</title>
 <link rel="icon" type="image/svg+xml" href="/telemetry/icon.svg">
 <style>
-  :root {
-    --bg: #0d1117; --surface: #161b22; --border: #30363d;
-    --text: #e6edf3; --muted: #8b949e; --accent: #58a6ff;
-    --green: #3fb950; --yellow: #d29922; --red: #f85149;
-    --purple: #bc8cff;
-  }
+  ${themeCss}
   * { box-sizing: border-box; margin: 0; padding: 0; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
          background: var(--bg); color: var(--text); padding: 0; line-height: 1.5; }
@@ -3688,6 +3702,8 @@ var serve = (options, listeningListener) => {
 };
 
 // src/proxy/server.ts
+import { homedir as homedir5 } from "node:os";
+import { join as join7 } from "node:path";
 import { query } from "@anthropic-ai/claude-agent-sdk";
 
 // src/proxy/types.ts
@@ -3718,6 +3734,73 @@ function envInt(suffix, defaultValue) {
   return Number.isFinite(parsed) ? parsed : defaultValue;
 }
 
+// src/proxy/transform.ts
+function runTransformHook(transforms, hook, ctx, adapterName) {
+  return transforms.reduce((acc, transform) => {
+    const fn = transform[hook];
+    if (!fn)
+      return acc;
+    if (transform.adapters && !transform.adapters.includes(adapterName))
+      return acc;
+    const tracked = isTrackedPlugin(transform.name);
+    const startAt = tracked ? performance.now() : 0;
+    try {
+      const result = fn.call(transform, acc);
+      if (tracked)
+        recordInvocation(transform.name, hook, performance.now() - startAt);
+      return result;
+    } catch (err) {
+      if (tracked)
+        recordError(transform.name, hook, err);
+      console.error(`[PLUGIN] Transform "${transform.name}" threw in ${hook}: ${err instanceof Error ? err.message : String(err)}`);
+      return acc;
+    }
+  }, ctx);
+}
+function runObserveHook(transforms, hook, ctx, adapterName) {
+  for (const transform of transforms) {
+    const fn = transform[hook];
+    if (!fn)
+      continue;
+    if (transform.adapters && !transform.adapters.includes(adapterName))
+      continue;
+    const tracked = isTrackedPlugin(transform.name);
+    const startAt = tracked ? performance.now() : 0;
+    try {
+      fn.call(transform, ctx);
+      if (tracked)
+        recordInvocation(transform.name, hook, performance.now() - startAt);
+    } catch (err) {
+      if (tracked)
+        recordError(transform.name, hook, err);
+      console.error(`[PLUGIN] Transform "${transform.name}" threw in ${hook}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+}
+function buildPipeline(adapterTransforms, pluginTransforms) {
+  return [...adapterTransforms, ...pluginTransforms];
+}
+function createRequestContext(params) {
+  return {
+    adapter: params.adapter,
+    body: params.body,
+    headers: params.headers,
+    model: params.model,
+    messages: params.messages,
+    systemContext: params.systemContext,
+    tools: params.tools,
+    stream: params.stream,
+    workingDirectory: params.workingDirectory,
+    blockedTools: [],
+    incompatibleTools: [],
+    allowedMcpTools: [],
+    sdkAgents: {},
+    supportsThinking: false,
+    shouldTrackFileChanges: true,
+    leaksCwdViaSystemReminder: false,
+    metadata: {}
+  };
+}
 // src/proxy/server.ts
 import { exec as execCallback2 } from "child_process";
 import { promisify as promisify3 } from "util";
@@ -7805,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 {
@@ -8010,13 +8271,8 @@ var dashboardHtml = `<!DOCTYPE html>
 <title>Meridian — Telemetry</title>
 <link rel="icon" type="image/svg+xml" href="/telemetry/icon.svg">
 <style>
-  :root {
-    --bg: #0d1117; --surface: #161b22; --border: #30363d;
-    --text: #e6edf3; --muted: #8b949e; --accent: #58a6ff;
-    --green: #3fb950; --yellow: #d29922; --red: #f85149;
-    --blue: #58a6ff; --purple: #bc8cff;
-    --queue: #d29922; --ttfb: #58a6ff; --upstream: #3fb950; --total: #bc8cff;
-  }
+  ${themeCss}
+  :root { --total: var(--accent); }
   * { box-sizing: border-box; margin: 0; padding: 0; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
          background: var(--bg); color: var(--text); padding: 0; line-height: 1.5; }
@@ -8272,9 +8528,11 @@ function render(s, reqs, logs) {
     const sessionShort = r.sdkSessionId ? r.sdkSessionId.slice(0, 8) : '—';
     const msgCount = r.messageCount != null ? r.messageCount : '?';
 
+    const sourceBadge = r.requestSource ? '<br><span class="mono" style="font-size:9px;color:var(--violet)">' + r.requestSource + '</span>' : '';
+
     html += '<tr>'
       + '<td class="mono">' + ago(r.timestamp) + '</td>'
-      + '<td>' + (r.adapter || '—') + '</td>'
+      + '<td>' + (r.adapter || '—') + sourceBadge + '</td>'
       + '<td>' + (r.requestModel || r.model) + '<br><span style="font-size:10px;color:var(--muted)">' + r.model + '</span></td>'
       + '<td>' + r.mode + (r.hasDeferredTools ? (function() { var sessDisc = r.sessionDiscoveredCount || 0; var loaded = ((r.toolCount || 0) - (r.deferredToolCount || 0)) + sessDisc; var deferred = Math.max(0, (r.deferredToolCount || 0) - sessDisc); var newDisc = r.discoveredTools || []; return '<br><span style="font-size:10px;color:var(--purple)">loaded=' + loaded + ' deferred=' + deferred + '</span>' + (newDisc.length > 0 ? '<br><span style="font-size:10px;color:var(--green)">+' + newDisc.join(', +') + '</span>' : ''); })() : '') + '</td>'
       + '<td class="mono">' + sessionShort + ' ' + lineageBadge + '<br><span style="font-size:10px;color:var(--muted)">' + msgCount + ' msgs</span></td>'
@@ -8407,12 +8665,7 @@ var landingHtml = `<!DOCTYPE html>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>Meridian</title>
 <style>
-  :root {
-    --bg: #0f0b1a; --surface: #1a1030; --surface2: #221840; --border: #2d2545;
-    --text: #e0e7ff; --muted: #8b8aa0; --accent: #8b5cf6; --accent2: #6366f1;
-    --green: #3fb950; --yellow: #d29922; --red: #f85149;
-    --violet: #a78bfa; --lavender: #c4b5fd;
-  }
+  ${themeCss}
   * { box-sizing: border-box; margin: 0; padding: 0; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
          background: var(--bg); color: var(--text); line-height: 1.6; min-height: 100vh; }
@@ -8722,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;
@@ -8858,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();
@@ -8876,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");
@@ -9089,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",
@@ -9129,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")
@@ -9365,103 +9655,84 @@ 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/transforms/opencode.ts
+var openCodeTransforms = [
+  {
+    name: "opencode-core",
+    adapters: ["opencode"],
+    onRequest(ctx) {
+      const body = ctx.body;
+      const blockedTools = BLOCKED_BUILTIN_TOOLS;
+      const incompatibleTools = CLAUDE_CODE_ONLY_TOOLS;
+      const allowedMcpTools = ALLOWED_MCP_TOOLS;
+      const coreToolNames = ["read", "write", "edit", "bash", "glob", "grep"];
+      const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
+      const passthrough = !(envVal === "0" || envVal === "false" || envVal === "no");
+      let sdkAgents = {};
+      if (Array.isArray(body.tools)) {
+        const taskTool = body.tools.find((t) => t.name === "task" || t.name === "Task");
+        if (taskTool?.description) {
+          sdkAgents = buildAgentDefinitions(taskTool.description, [...allowedMcpTools]);
+        }
+      }
+      let sdkHooks = undefined;
+      const validAgentNames = Object.keys(sdkAgents);
+      if (validAgentNames.length > 0) {
+        sdkHooks = {
+          PreToolUse: [{
+            matcher: "Task",
+            hooks: [async (input) => ({
+              hookSpecificOutput: {
+                hookEventName: "PreToolUse",
+                updatedInput: {
+                  ...input.tool_input,
+                  subagent_type: fuzzyMatchAgentName(String(input.tool_input?.subagent_type || ""), validAgentNames)
+                }
+              }
+            })]
+          }]
+        };
+      }
+      let systemContext = ctx.systemContext;
+      if (validAgentNames.length > 0 && systemContext !== undefined) {
+        systemContext += `
 
-// 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;
+IMPORTANT: When using the task/Task tool, the subagent_type parameter must be one of these exact values (case-sensitive, lowercase): ${validAgentNames.join(", ")}. Do NOT capitalize or modify these names.`;
+      } else if (validAgentNames.length > 0) {
+        systemContext = `IMPORTANT: When using the task/Task tool, the subagent_type parameter must be one of these exact values (case-sensitive, lowercase): ${validAgentNames.join(", ")}. Do NOT capitalize or modify these names.`;
+      }
+      const extractFileChangesFromToolUse = (toolName, toolInput) => {
+        const input = toolInput;
+        const filePath = input?.filePath ?? input?.file_path ?? 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 [];
+      };
+      return {
+        ...ctx,
+        blockedTools,
+        incompatibleTools,
+        allowedMcpTools,
+        coreToolNames,
+        passthrough,
+        sdkAgents,
+        sdkHooks,
+        systemContext,
+        supportsThinking: true,
+        shouldTrackFileChanges: false,
+        extractFileChangesFromToolUse
+      };
     }
   }
-  const reverseMatch = validAgents.find((a) => lowered.includes(a.toLowerCase()));
-  if (reverseMatch)
-    return reverseMatch;
-  return lowered;
-}
+];
 
 // src/proxy/adapters/opencode.ts
 var openCodeAdapter = {
@@ -9555,7 +9826,7 @@ IMPORTANT: When using the task/Task tool, the subagent_type parameter must be on
   }
 };
 
-// src/proxy/adapters/droid.ts
+// src/proxy/transforms/droid.ts
 var DROID_MCP_SERVER_NAME = "droid";
 var DROID_ALLOWED_MCP_TOOLS = [
   `mcp__${DROID_MCP_SERVER_NAME}__read`,
@@ -9565,6 +9836,34 @@ var DROID_ALLOWED_MCP_TOOLS = [
   `mcp__${DROID_MCP_SERVER_NAME}__glob`,
   `mcp__${DROID_MCP_SERVER_NAME}__grep`
 ];
+var droidTransforms = [
+  {
+    name: "droid-core",
+    adapters: ["droid"],
+    onRequest(ctx) {
+      return {
+        ...ctx,
+        blockedTools: BLOCKED_BUILTIN_TOOLS,
+        incompatibleTools: CLAUDE_CODE_ONLY_TOOLS,
+        allowedMcpTools: DROID_ALLOWED_MCP_TOOLS,
+        sdkAgents: {},
+        passthrough: false,
+        leaksCwdViaSystemReminder: true
+      };
+    }
+  }
+];
+
+// src/proxy/adapters/droid.ts
+var DROID_MCP_SERVER_NAME2 = "droid";
+var DROID_ALLOWED_MCP_TOOLS2 = [
+  `mcp__${DROID_MCP_SERVER_NAME2}__read`,
+  `mcp__${DROID_MCP_SERVER_NAME2}__write`,
+  `mcp__${DROID_MCP_SERVER_NAME2}__edit`,
+  `mcp__${DROID_MCP_SERVER_NAME2}__bash`,
+  `mcp__${DROID_MCP_SERVER_NAME2}__glob`,
+  `mcp__${DROID_MCP_SERVER_NAME2}__grep`
+];
 function extractDroidCwd(body) {
   const messages = body.messages;
   if (!Array.isArray(messages))
@@ -9604,10 +9903,10 @@ var droidAdapter = {
     return CLAUDE_CODE_ONLY_TOOLS;
   },
   getMcpServerName() {
-    return DROID_MCP_SERVER_NAME;
+    return DROID_MCP_SERVER_NAME2;
   },
   getAllowedMcpTools() {
-    return DROID_ALLOWED_MCP_TOOLS;
+    return DROID_ALLOWED_MCP_TOOLS2;
   },
   buildSdkAgents(_body, _mcpToolNames) {
     return {};
@@ -9623,7 +9922,7 @@ var droidAdapter = {
   }
 };
 
-// src/proxy/adapters/crush.ts
+// src/proxy/transforms/crush.ts
 var CRUSH_MCP_SERVER_NAME = "crush";
 var CRUSH_ALLOWED_MCP_TOOLS = [
   `mcp__${CRUSH_MCP_SERVER_NAME}__read`,
@@ -9633,6 +9932,45 @@ var CRUSH_ALLOWED_MCP_TOOLS = [
   `mcp__${CRUSH_MCP_SERVER_NAME}__glob`,
   `mcp__${CRUSH_MCP_SERVER_NAME}__grep`
 ];
+var crushTransforms = [
+  {
+    name: "crush-core",
+    adapters: ["crush"],
+    onRequest(ctx) {
+      const extractFileChangesFromToolUse = (toolName, toolInput) => {
+        const input = toolInput;
+        const filePath = input?.file_path ?? input?.path;
+        if (toolName === "write" && filePath)
+          return [{ operation: "wrote", path: String(filePath) }];
+        if ((toolName === "edit" || toolName === "patch") && filePath)
+          return [{ operation: "edited", path: String(filePath) }];
+        if (toolName === "bash" && input?.command)
+          return extractFileChangesFromBash(String(input.command));
+        return [];
+      };
+      return {
+        ...ctx,
+        blockedTools: BLOCKED_BUILTIN_TOOLS,
+        incompatibleTools: CLAUDE_CODE_ONLY_TOOLS,
+        allowedMcpTools: CRUSH_ALLOWED_MCP_TOOLS,
+        sdkAgents: {},
+        supportsThinking: true,
+        extractFileChangesFromToolUse
+      };
+    }
+  }
+];
+
+// src/proxy/adapters/crush.ts
+var CRUSH_MCP_SERVER_NAME2 = "crush";
+var CRUSH_ALLOWED_MCP_TOOLS2 = [
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__read`,
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__write`,
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__edit`,
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__bash`,
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__glob`,
+  `mcp__${CRUSH_MCP_SERVER_NAME2}__grep`
+];
 var crushAdapter = {
   name: "crush",
   getSessionId(_c) {
@@ -9651,10 +9989,10 @@ var crushAdapter = {
     return CLAUDE_CODE_ONLY_TOOLS;
   },
   getMcpServerName() {
-    return CRUSH_MCP_SERVER_NAME;
+    return CRUSH_MCP_SERVER_NAME2;
   },
   getAllowedMcpTools() {
-    return CRUSH_ALLOWED_MCP_TOOLS;
+    return CRUSH_ALLOWED_MCP_TOOLS2;
   },
   buildSdkAgents(_body, _mcpToolNames) {
     return {};
@@ -9684,7 +10022,7 @@ var crushAdapter = {
   }
 };
 
-// src/proxy/adapters/passthrough.ts
+// src/proxy/transforms/passthrough.ts
 var MCP_SERVER_NAME2 = "litellm";
 var ALLOWED_MCP_TOOLS2 = [
   `mcp__${MCP_SERVER_NAME2}__read`,
@@ -9694,6 +10032,34 @@ var ALLOWED_MCP_TOOLS2 = [
   `mcp__${MCP_SERVER_NAME2}__glob`,
   `mcp__${MCP_SERVER_NAME2}__grep`
 ];
+var passthroughTransforms = [
+  {
+    name: "passthrough-core",
+    adapters: ["passthrough"],
+    onRequest(ctx) {
+      return {
+        ...ctx,
+        blockedTools: [],
+        incompatibleTools: [],
+        allowedMcpTools: ALLOWED_MCP_TOOLS2,
+        sdkAgents: {},
+        passthrough: true,
+        prefersStreaming: ctx.body?.stream === true
+      };
+    }
+  }
+];
+
+// src/proxy/adapters/passthrough.ts
+var MCP_SERVER_NAME3 = "litellm";
+var ALLOWED_MCP_TOOLS3 = [
+  `mcp__${MCP_SERVER_NAME3}__read`,
+  `mcp__${MCP_SERVER_NAME3}__write`,
+  `mcp__${MCP_SERVER_NAME3}__edit`,
+  `mcp__${MCP_SERVER_NAME3}__bash`,
+  `mcp__${MCP_SERVER_NAME3}__glob`,
+  `mcp__${MCP_SERVER_NAME3}__grep`
+];
 function extractCwdFromBody(body) {
   if (!body)
     return;
@@ -9741,10 +10107,10 @@ var passthroughAdapter = {
     return [];
   },
   getMcpServerName() {
-    return MCP_SERVER_NAME2;
+    return MCP_SERVER_NAME3;
   },
   getAllowedMcpTools() {
-    return ALLOWED_MCP_TOOLS2;
+    return ALLOWED_MCP_TOOLS3;
   },
   buildSdkAgents(_body, _mcpToolNames) {
     return {};
@@ -9763,7 +10129,7 @@ var passthroughAdapter = {
   }
 };
 
-// src/proxy/adapters/pi.ts
+// src/proxy/transforms/pi.ts
 var PI_MCP_SERVER_NAME = "pi";
 var PI_ALLOWED_MCP_TOOLS = [
   `mcp__${PI_MCP_SERVER_NAME}__read`,
@@ -9773,6 +10139,45 @@ var PI_ALLOWED_MCP_TOOLS = [
   `mcp__${PI_MCP_SERVER_NAME}__glob`,
   `mcp__${PI_MCP_SERVER_NAME}__grep`
 ];
+var piTransforms = [
+  {
+    name: "pi-core",
+    adapters: ["pi"],
+    onRequest(ctx) {
+      const extractFileChangesFromToolUse = (toolName, toolInput) => {
+        const input = toolInput;
+        const filePath = input?.filePath ?? input?.file_path ?? input?.path;
+        if (toolName === "write" && filePath)
+          return [{ operation: "wrote", path: String(filePath) }];
+        if (toolName === "edit" && filePath)
+          return [{ operation: "edited", path: String(filePath) }];
+        if (toolName === "bash" && input?.command)
+          return extractFileChangesFromBash(String(input.command));
+        return [];
+      };
+      return {
+        ...ctx,
+        blockedTools: BLOCKED_BUILTIN_TOOLS,
+        incompatibleTools: CLAUDE_CODE_ONLY_TOOLS,
+        allowedMcpTools: PI_ALLOWED_MCP_TOOLS,
+        sdkAgents: {},
+        supportsThinking: true,
+        extractFileChangesFromToolUse
+      };
+    }
+  }
+];
+
+// src/proxy/adapters/pi.ts
+var PI_MCP_SERVER_NAME2 = "pi";
+var PI_ALLOWED_MCP_TOOLS2 = [
+  `mcp__${PI_MCP_SERVER_NAME2}__read`,
+  `mcp__${PI_MCP_SERVER_NAME2}__write`,
+  `mcp__${PI_MCP_SERVER_NAME2}__edit`,
+  `mcp__${PI_MCP_SERVER_NAME2}__bash`,
+  `mcp__${PI_MCP_SERVER_NAME2}__glob`,
+  `mcp__${PI_MCP_SERVER_NAME2}__grep`
+];
 function extractPiCwd(body) {
   let systemText = "";
   if (typeof body.system === "string") {
@@ -9794,6 +10199,9 @@ var piAdapter = {
   extractWorkingDirectory(body) {
     return extractPiCwd(body);
   },
+  extractClientWorkingDirectory(body) {
+    return extractPiCwd(body);
+  },
   normalizeContent(content) {
     return normalizeContent(content);
   },
@@ -9804,10 +10212,10 @@ var piAdapter = {
     return CLAUDE_CODE_ONLY_TOOLS;
   },
   getMcpServerName() {
-    return PI_MCP_SERVER_NAME;
+    return PI_MCP_SERVER_NAME2;
   },
   getAllowedMcpTools() {
-    return PI_ALLOWED_MCP_TOOLS;
+    return PI_ALLOWED_MCP_TOOLS2;
   },
   buildSdkAgents(_body, _mcpToolNames) {
     return {};
@@ -9837,7 +10245,7 @@ var piAdapter = {
   }
 };
 
-// src/proxy/adapters/forgecode.ts
+// src/proxy/transforms/forgecode.ts
 var FORGECODE_MCP_SERVER_NAME = "forgecode";
 var FORGECODE_ALLOWED_MCP_TOOLS = [
   `mcp__${FORGECODE_MCP_SERVER_NAME}__read`,
@@ -9847,6 +10255,44 @@ var FORGECODE_ALLOWED_MCP_TOOLS = [
   `mcp__${FORGECODE_MCP_SERVER_NAME}__glob`,
   `mcp__${FORGECODE_MCP_SERVER_NAME}__grep`
 ];
+var forgeCodeTransforms = [
+  {
+    name: "forgecode-core",
+    adapters: ["forgecode"],
+    onRequest(ctx) {
+      const extractFileChangesFromToolUse = (toolName, toolInput) => {
+        const input = toolInput;
+        const filePath = input?.file_path ?? input?.filePath ?? input?.path;
+        if (toolName === "write" && filePath)
+          return [{ operation: "wrote", path: String(filePath) }];
+        if ((toolName === "patch" || toolName === "multi_patch") && filePath)
+          return [{ operation: "edited", path: String(filePath) }];
+        if (toolName === "shell" && input?.command)
+          return extractFileChangesFromBash(String(input.command));
+        return [];
+      };
+      return {
+        ...ctx,
+        blockedTools: BLOCKED_BUILTIN_TOOLS,
+        incompatibleTools: CLAUDE_CODE_ONLY_TOOLS,
+        allowedMcpTools: FORGECODE_ALLOWED_MCP_TOOLS,
+        sdkAgents: {},
+        extractFileChangesFromToolUse
+      };
+    }
+  }
+];
+
+// src/proxy/adapters/forgecode.ts
+var FORGECODE_MCP_SERVER_NAME2 = "forgecode";
+var FORGECODE_ALLOWED_MCP_TOOLS2 = [
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__read`,
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__write`,
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__edit`,
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__bash`,
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__glob`,
+  `mcp__${FORGECODE_MCP_SERVER_NAME2}__grep`
+];
 function extractForgeCodeCwd(body) {
   let systemText = "";
   if (typeof body.system === "string") {
@@ -9878,10 +10324,10 @@ var forgeCodeAdapter = {
     return CLAUDE_CODE_ONLY_TOOLS;
   },
   getMcpServerName() {
-    return FORGECODE_MCP_SERVER_NAME;
+    return FORGECODE_MCP_SERVER_NAME2;
   },
   getAllowedMcpTools() {
-    return FORGECODE_ALLOWED_MCP_TOOLS;
+    return FORGECODE_ALLOWED_MCP_TOOLS2;
   },
   buildSdkAgents(_body, _mcpToolNames) {
     return {};
@@ -9908,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,
@@ -9915,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]) {
@@ -9946,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;
   }
@@ -15648,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) {
@@ -15665,6 +16208,7 @@ function buildQueryOptions(ctx) {
     prompt,
     model,
     workingDirectory,
+    clientWorkingDirectory,
     systemContext,
     claudeExecutable,
     passthrough,
@@ -15677,7 +16221,10 @@ function buildQueryOptions(ctx) {
     isUndo,
     undoRollbackUuid,
     sdkHooks,
-    adapter,
+    blockedTools,
+    incompatibleTools,
+    mcpServerName,
+    allowedMcpTools,
     onStderr,
     effort,
     thinking,
@@ -15694,30 +16241,29 @@ function buildQueryOptions(ctx) {
     sdkDebug,
     additionalDirectories
   } = ctx;
-  const blockedTools = [...adapter.getBlockedBuiltinTools(), ...adapter.getAgentIncompatibleTools()];
-  const mcpServerName = adapter.getMcpServerName();
-  const allowedMcpTools = [...adapter.getAllowedMcpTools()];
+  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: blockedTools,
+        disallowedTools: [...allBlockedTools],
         ...passthroughMcp ? {
-          allowedTools: passthroughMcp.toolNames,
+          allowedTools: [...passthroughMcp.toolNames],
           mcpServers: { [PASSTHROUGH_MCP_NAME]: passthroughMcp.server }
         } : {}
       } : {
-        disallowedTools: blockedTools,
-        allowedTools: allowedMcpTools,
+        disallowedTools: [...allBlockedTools],
+        allowedTools: [...allowedMcpTools],
         mcpServers: { [mcpServerName]: createOpencodeMcpServer() }
       },
       plugins: [],
@@ -15747,11 +16293,182 @@ 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 } : {}
+    }
+  };
+}
+
+// src/proxy/transforms/registry.ts
+var ADAPTER_TRANSFORMS = {
+  opencode: openCodeTransforms,
+  crush: crushTransforms,
+  droid: droidTransforms,
+  pi: piTransforms,
+  forgecode: forgeCodeTransforms,
+  passthrough: passthroughTransforms
+};
+function getAdapterTransforms(adapterName) {
+  return ADAPTER_TRANSFORMS[adapterName] ?? [];
+}
+
+// src/proxy/plugins/loader.ts
+import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync3 } from "fs";
+import { join as join4, isAbsolute as isAbsolute2, extname } from "path";
+
+// src/proxy/plugins/validation.ts
+var KNOWN_ADAPTERS = ["opencode", "crush", "droid", "pi", "forgecode", "passthrough"];
+var KNOWN_HOOKS = ["onRequest", "onResponse", "onTelemetry", "onSession", "onToolUse", "onToolResult", "onError"];
+function validateTransform(exported) {
+  if (exported == null || typeof exported !== "object") {
+    return { valid: false, hooks: [], error: "Plugin must export an object" };
+  }
+  const obj = exported;
+  if (typeof obj.name !== "string" || obj.name.length === 0) {
+    return { valid: false, hooks: [], error: "Plugin must have a name: string property" };
+  }
+  const hooks = [];
+  for (const hook of KNOWN_HOOKS) {
+    if (obj[hook] !== undefined) {
+      if (typeof obj[hook] !== "function") {
+        return { valid: false, hooks: [], error: `${hook} must be a function, got ${typeof obj[hook]}` };
+      }
+      hooks.push(hook);
+    }
+  }
+  const warnings = [];
+  if (Array.isArray(obj.adapters)) {
+    for (const adapter of obj.adapters) {
+      if (typeof adapter === "string" && !KNOWN_ADAPTERS.includes(adapter)) {
+        warnings.push(adapter);
+      }
     }
+  }
+  return {
+    valid: true,
+    hooks,
+    ...warnings.length > 0 ? { warnings } : {}
   };
 }
 
+// src/proxy/plugins/loader.ts
+var loadCounter = 0;
+function parsePluginConfig(configPath) {
+  if (!existsSync3(configPath))
+    return [];
+  try {
+    const raw2 = readFileSync2(configPath, "utf-8");
+    const parsed = JSON.parse(raw2);
+    return Array.isArray(parsed.plugins) ? parsed.plugins : [];
+  } catch {
+    return [];
+  }
+}
+async function loadPlugins(pluginDir, configPath) {
+  resetAllPluginStats();
+  const config = configPath ? parsePluginConfig(configPath) : [];
+  const pluginDirExists = existsSync3(pluginDir);
+  let filenames = [];
+  if (pluginDirExists) {
+    try {
+      filenames = readdirSync2(pluginDir).filter((f) => {
+        const ext2 = extname(f);
+        return ext2 === ".ts" || ext2 === ".js";
+      });
+    } catch {
+      filenames = [];
+    }
+  }
+  if (!pluginDirExists && config.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  for (const entry of config) {
+    const filename = isAbsolute2(entry.path) ? entry.path : entry.path;
+    if (filenames.includes(filename) || isAbsolute2(entry.path)) {
+      ordered.push({ filename, entry });
+      seen.add(filename);
+    }
+  }
+  for (const filename of filenames) {
+    if (!seen.has(filename)) {
+      ordered.push({ filename });
+    }
+  }
+  const loaded = [];
+  const seenNames = new Set;
+  for (const { filename, entry } of ordered) {
+    const filePath = isAbsolute2(filename) ? filename : join4(pluginDir, filename);
+    if (entry && !entry.enabled) {
+      loaded.push({
+        name: filename,
+        status: "disabled",
+        hooks: [],
+        path: filePath,
+        transform: { name: filename }
+      });
+      continue;
+    }
+    try {
+      const cacheBuster = `?t=${Date.now()}-${++loadCounter}`;
+      const mod = await import(filePath + cacheBuster);
+      const exported = mod.default ?? mod;
+      const transforms = Array.isArray(exported) ? exported : [exported];
+      for (const item of transforms) {
+        const validation = validateTransform(item);
+        if (!validation.valid) {
+          loaded.push({
+            name: filename,
+            status: "error",
+            error: validation.error,
+            hooks: [],
+            path: filePath,
+            transform: { name: filename }
+          });
+          continue;
+        }
+        const transform = item;
+        if (seenNames.has(transform.name)) {
+          loaded.push({
+            name: transform.name,
+            status: "error",
+            error: `Skipped: duplicate plugin name "${transform.name}"`,
+            hooks: validation.hooks,
+            path: filePath,
+            transform
+          });
+          continue;
+        }
+        seenNames.add(transform.name);
+        registerPluginStats(transform.name);
+        loaded.push({
+          name: transform.name,
+          description: transform.description,
+          version: transform.version,
+          adapters: transform.adapters,
+          hooks: validation.hooks,
+          status: "active",
+          path: filePath,
+          transform
+        });
+      }
+    } catch (err) {
+      loaded.push({
+        name: filename,
+        status: "error",
+        error: `Failed to load: ${err instanceof Error ? err.message : String(err)}`,
+        hooks: [],
+        path: filePath,
+        transform: { name: filename }
+      });
+    }
+  }
+  return loaded;
+}
+function getActiveTransforms(plugins) {
+  return plugins.filter((p) => p.status === "active").map((p) => p.transform);
+}
+
 // src/proxy/betas.ts
 var BILLABLE_BETA_PREFIXES_ON_MAX = [
   "extended-cache-ttl-"
@@ -15917,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)
@@ -16048,17 +16769,17 @@ function verifyLineage(cached, messages, cacheKey2, cache) {
 // src/proxy/sessionStore.ts
 import {
   closeSync,
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   mkdirSync,
   openSync,
-  readFileSync as readFileSync2,
+  readFileSync as readFileSync3,
   renameSync,
   statSync,
   unlinkSync,
   writeFileSync
 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 var DEFAULT_MAX_STORED_SESSIONS = 1e4;
 var STALE_LOCK_THRESHOLD_MS = 30000;
 function getMaxStoredSessions() {
@@ -16106,17 +16827,17 @@ var sessionDirOverride = null;
 var skipLocking = false;
 function getStorePath() {
   const dir = sessionDirOverride || process.env.MERIDIAN_SESSION_DIR || process.env.CLAUDE_PROXY_SESSION_DIR || getDefaultCacheDir();
-  if (!existsSync3(dir)) {
+  if (!existsSync4(dir)) {
     mkdirSync(dir, { recursive: true });
   }
-  return join4(dir, "sessions.json");
+  return join5(dir, "sessions.json");
 }
 function getDefaultCacheDir() {
-  const newDir = join4(homedir3(), ".cache", "meridian");
-  const oldDir = join4(homedir3(), ".cache", "opencode-claude-max-proxy");
-  if (existsSync3(newDir))
+  const newDir = join5(homedir3(), ".cache", "meridian");
+  const oldDir = join5(homedir3(), ".cache", "opencode-claude-max-proxy");
+  if (existsSync4(newDir))
     return newDir;
-  if (existsSync3(oldDir)) {
+  if (existsSync4(oldDir)) {
     try {
       const { symlinkSync } = __require("fs");
       symlinkSync(oldDir, newDir);
@@ -16129,10 +16850,10 @@ function getDefaultCacheDir() {
 }
 function readStore() {
   const path3 = getStorePath();
-  if (!existsSync3(path3))
+  if (!existsSync4(path3))
     return {};
   try {
-    const data = readFileSync2(path3, "utf-8");
+    const data = readFileSync3(path3, "utf-8");
     return JSON.parse(data);
   } catch (e) {
     console.error("[sessionStore] read failed:", e.message);
@@ -16631,6 +17352,10 @@ function createProxyServer(config = {}) {
   const sessionDiscoveredTools = new Map;
   const sessionToolCache = new Map;
   const sessionMcpCache = new LRUMap(getMaxSessionsLimit());
+  const pluginDir = finalConfig.pluginDir ?? join7(homedir5(), ".config", "meridian", "plugins");
+  const pluginConfigPath = finalConfig.pluginConfigPath ?? join7(homedir5(), ".config", "meridian", "plugins.json");
+  let loadedPlugins = [];
+  let pluginTransforms = [];
   const app = new Hono2;
   app.use("*", cors());
   app.use("/v1/*", requireAuth);
@@ -16640,6 +17365,8 @@ function createProxyServer(config = {}) {
   app.use("/metrics", requireAuth);
   app.use("/profiles/*", requireAuth);
   app.use("/profiles", requireAuth);
+  app.use("/plugins/*", requireAuth);
+  app.use("/plugins", requireAuth);
   app.use("/auth/*", requireAuth);
   app.get("/", (c) => {
     const accept = c.req.header("accept") || "";
@@ -16697,9 +17424,8 @@ function createProxyServer(config = {}) {
         const agentMode = c.req.header("x-opencode-agent-mode") ?? null;
         const requestSource = c.req.header("x-meridian-source")?.slice(0, 64) || undefined;
         let model = mapModelToClaudeModel(body.model || "sonnet", authStatus?.subscriptionType, agentMode);
-        const adapterStreamPref = adapter.prefersStreaming?.(body);
-        const stream2 = adapterStreamPref !== undefined ? adapterStreamPref : body.stream ?? false;
         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,
@@ -16707,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") {
@@ -16717,6 +17444,20 @@ function createProxyServer(config = {}) {
 `);
           }
         }
+        const adapterTransforms = getAdapterTransforms(adapter.name);
+        const pipeline = buildPipeline(adapterTransforms, pluginTransforms);
+        const pipelineCtx = runTransformHook(pipeline, "onRequest", createRequestContext({
+          adapter: adapter.name,
+          body,
+          headers: c.req.raw.headers,
+          model,
+          messages: body.messages || [],
+          systemContext,
+          tools: body.tools,
+          stream: body.stream ?? false,
+          workingDirectory
+        }), adapter.name);
+        const stream2 = pipelineCtx.prefersStreaming !== undefined ? pipelineCtx.prefersStreaming : body.stream ?? false;
         const effortHeader = c.req.header("x-opencode-effort");
         const thinkingHeader = c.req.header("x-opencode-thinking");
         const taskBudgetHeader = c.req.header("x-opencode-task-budget");
@@ -16754,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) {
@@ -16791,14 +17532,14 @@ function createProxyServer(config = {}) {
           messageCount: Array.isArray(body.messages) ? body.messages.length : 0,
           hasSystemPrompt: Boolean(body.system)
         });
-        const sdkAgents = adapter.buildSdkAgents?.(body, adapter.getAllowedMcpTools()) ?? {};
+        const sdkAgents = pipelineCtx.sdkAgents;
         const validAgentNames = Object.keys(sdkAgents);
         if ((process.env.MERIDIAN_DEBUG ?? process.env.CLAUDE_PROXY_DEBUG) && validAgentNames.length > 0) {
           claudeLog("debug.agents", { names: validAgentNames, count: validAgentNames.length });
         }
-        systemContext += adapter.buildSystemContextAddendum?.(body, sdkAgents) ?? "";
+        systemContext = pipelineCtx.systemContext ?? systemContext;
         const sanitizeOpts = {
-          stripSystemReminder: adapter.leaksCwdViaSystemReminder?.() ?? false
+          stripSystemReminder: pipelineCtx.leaksCwdViaSystemReminder
         };
         const allMessages = body.messages || [];
         let messagesToConvert;
@@ -16862,13 +17603,16 @@ function createProxyServer(config = {}) {
 
 `) || "";
         }
-        const adapterPassthrough = adapter.usesPassthrough?.();
-        const passthrough = adapterPassthrough !== undefined ? adapterPassthrough : envBool("PASSTHROUGH");
-        const settingSources = envBool("LOAD_CONTEXT") || sdkFeatures.claudeMd === "full" ? ["user", "project"] : sdkFeatures.claudeMd === "project" ? ["project"] : adapter.getSettingSources?.() ?? [];
+        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 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) {
@@ -16882,7 +17626,7 @@ function createProxyServer(config = {}) {
           if (cachedMcp && cachedMcp.key === toolSetKey) {
             passthroughMcp = cachedMcp.mcp;
           } else {
-            passthroughMcp = createPassthroughMcpServer(requestTools, adapter.getCoreToolNames?.());
+            passthroughMcp = createPassthroughMcpServer(requestTools, pipelineCtx.coreToolNames ? [...pipelineCtx.coreToolNames] : undefined);
             if (profileSessionId) {
               sessionMcpCache.set(profileSessionId, { key: toolSetKey, mcp: passthroughMcp });
               if (cachedMcp) {
@@ -16894,14 +17638,14 @@ function createProxyServer(config = {}) {
             sessionToolCache.set(profileSessionId, requestTools);
         }
         const hasDeferredTools = passthroughMcp?.hasDeferredTools ?? false;
-        const coreNames = adapter.getCoreToolNames?.();
+        const coreNames = pipelineCtx.coreToolNames ? [...pipelineCtx.coreToolNames] : undefined;
         const coreSet = coreNames ? new Set(coreNames.map((n) => n.toLowerCase())) : undefined;
         const deferredToolCount = hasDeferredTools && requestTools.length > 0 ? requestTools.filter((t) => t.defer_loading === true || coreSet && !coreSet.has(String(t.name).toLowerCase())).length : 0;
         if (hasDeferredTools) {
           console.error(`[PROXY] ${requestMeta.requestId} deferred=${deferredToolCount}/${toolCount} tools (core: ${coreNames?.join(",") ?? "none"})`);
         }
         const mcpPrefix = `mcp__${adapter.getMcpServerName()}__`;
-        const trackFileChanges = !(process.env.MERIDIAN_NO_FILE_CHANGES ?? process.env.CLAUDE_PROXY_NO_FILE_CHANGES) && adapter.shouldTrackFileChanges?.() !== false;
+        const trackFileChanges = !(process.env.MERIDIAN_NO_FILE_CHANGES ?? process.env.CLAUDE_PROXY_NO_FILE_CHANGES) && pipelineCtx.shouldTrackFileChanges;
         const fileChangeHook = trackFileChanges ? createFileChangeHook(fileChanges, mcpPrefix) : undefined;
         const discoveredTools = new Set;
         const sdkHooks = passthrough ? {
@@ -16914,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",
@@ -16926,7 +17675,7 @@ function createProxyServer(config = {}) {
             }]
           }]
         } : {
-          ...adapter.buildSdkHooks?.(body, sdkAgents) ?? {},
+          ...pipelineCtx.sdkHooks ?? {},
           ...fileChangeHook ? { PostToolUse: [fileChangeHook] } : {}
         };
         const stderrLines = [];
@@ -16945,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();
@@ -16961,6 +17711,7 @@ function createProxyServer(config = {}) {
                     prompt: makePrompt(),
                     model,
                     workingDirectory,
+                    clientWorkingDirectory,
                     systemContext,
                     claudeExecutable,
                     passthrough,
@@ -16973,7 +17724,10 @@ function createProxyServer(config = {}) {
                     isUndo,
                     undoRollbackUuid,
                     sdkHooks,
-                    adapter,
+                    blockedTools: pipelineCtx.blockedTools,
+                    incompatibleTools: pipelineCtx.incompatibleTools,
+                    mcpServerName: adapter.getMcpServerName(),
+                    allowedMcpTools: pipelineCtx.allowedMcpTools,
                     onStderr,
                     effort,
                     thinking,
@@ -16988,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;
@@ -17015,6 +17770,7 @@ function createProxyServer(config = {}) {
                       prompt: buildFreshPrompt(allMessages, sanitizeOpts),
                       model,
                       workingDirectory,
+                      clientWorkingDirectory,
                       systemContext,
                       claudeExecutable,
                       passthrough,
@@ -17027,7 +17783,10 @@ function createProxyServer(config = {}) {
                       isUndo: false,
                       undoRollbackUuid: undefined,
                       sdkHooks,
-                      adapter,
+                      blockedTools: pipelineCtx.blockedTools,
+                      incompatibleTools: pipelineCtx.incompatibleTools,
+                      mcpServerName: adapter.getMcpServerName(),
+                      allowedMcpTools: pipelineCtx.allowedMcpTools,
                       onStderr,
                       effort,
                       thinking,
@@ -17042,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;
                   }
@@ -17127,7 +17887,7 @@ function createProxyServer(config = {}) {
                       claudeLog("passthrough.toolsearch_filtered", { mode: "non_stream" });
                       continue;
                     }
-                    if (passthrough && !adapter.supportsThinking?.() && !sdkFeatures.thinkingPassthrough && (b.type === "thinking" || b.type === "redacted_thinking")) {
+                    if (passthrough && !pipelineCtx.supportsThinking && !sdkFeatures.thinkingPassthrough && (b.type === "thinking" || b.type === "redacted_thinking")) {
                       claudeLog("passthrough.thinking_stripped", { mode: "non_stream", type: b.type });
                       continue;
                     }
@@ -17140,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", {
@@ -17177,22 +17940,30 @@ 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" && adapter.extractFileChangesFromToolUse) {
-              const passthroughChanges = extractFileChangesFromMessages(body.messages || [], adapter.extractFileChangesFromToolUse.bind(adapter));
+            if (passthrough && stopReason === "end_turn" && pipelineCtx.extractFileChangesFromToolUse) {
+              const passthroughChanges = extractFileChangesFromMessages(body.messages || [], pipelineCtx.extractFileChangesFromToolUse);
               fileChanges.push(...passthroughChanges);
             }
             const fileChangeSummary = formatFileChangeSummary(fileChanges);
@@ -17227,6 +17998,7 @@ Subprocess stderr: ${stderrOutput}`;
             requestId: requestMeta.requestId,
             timestamp: Date.now(),
             adapter: adapter.name,
+            requestSource,
             model,
             requestModel: body.model || undefined,
             mode: "non-stream",
@@ -17330,6 +18102,7 @@ Subprocess stderr: ${stderrOutput}`;
                       prompt: makePrompt(),
                       model,
                       workingDirectory,
+                      clientWorkingDirectory,
                       systemContext,
                       claudeExecutable,
                       passthrough,
@@ -17342,7 +18115,10 @@ Subprocess stderr: ${stderrOutput}`;
                       isUndo,
                       undoRollbackUuid,
                       sdkHooks,
-                      adapter,
+                      blockedTools: pipelineCtx.blockedTools,
+                      incompatibleTools: pipelineCtx.incompatibleTools,
+                      mcpServerName: adapter.getMcpServerName(),
+                      allowedMcpTools: pipelineCtx.allowedMcpTools,
                       onStderr,
                       effort,
                       thinking,
@@ -17357,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;
@@ -17384,6 +18161,7 @@ Subprocess stderr: ${stderrOutput}`;
                         prompt: buildFreshPrompt(allMessages, sanitizeOpts),
                         model,
                         workingDirectory,
+                        clientWorkingDirectory,
                         systemContext,
                         claudeExecutable,
                         passthrough,
@@ -17396,7 +18174,10 @@ Subprocess stderr: ${stderrOutput}`;
                         isUndo: false,
                         undoRollbackUuid: undefined,
                         sdkHooks,
-                        adapter,
+                        blockedTools: pipelineCtx.blockedTools,
+                        incompatibleTools: pipelineCtx.incompatibleTools,
+                        mcpServerName: adapter.getMcpServerName(),
+                        allowedMcpTools: pipelineCtx.allowedMcpTools,
                         onStderr,
                         effort,
                         thinking,
@@ -17411,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;
                     }
@@ -17491,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;
@@ -17548,7 +18332,7 @@ data: ${JSON.stringify({ type: "message_stop" })}
                     }
                     if (eventType === "content_block_start") {
                       const block = event.content_block;
-                      if (passthrough && !adapter.supportsThinking?.() && !sdkFeatures.thinkingPassthrough && (block?.type === "thinking" || block?.type === "redacted_thinking")) {
+                      if (passthrough && !pipelineCtx.supportsThinking && !sdkFeatures.thinkingPassthrough && (block?.type === "thinking" || block?.type === "redacted_thinking")) {
                         if (eventIndex !== undefined)
                           skipBlockIndices.add(eventIndex);
                         claudeLog("passthrough.thinking_stripped", { mode: "stream", type: block.type, index: eventIndex });
@@ -17571,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++);
@@ -17591,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)}
 
@@ -17681,8 +18501,8 @@ data: ${JSON.stringify({
 
 `), "passthrough_message_delta");
                 }
-                if (trackFileChanges && passthrough && adapter.extractFileChangesFromToolUse) {
-                  const passthroughChanges = extractFileChangesFromMessages(body.messages || [], adapter.extractFileChangesFromToolUse.bind(adapter));
+                if (trackFileChanges && passthrough && pipelineCtx.extractFileChangesFromToolUse) {
+                  const passthroughChanges = extractFileChangesFromMessages(body.messages || [], pipelineCtx.extractFileChangesFromToolUse);
                   fileChanges.push(...passthroughChanges);
                 }
                 if (trackFileChanges) {
@@ -17750,6 +18570,7 @@ data: {"type":"message_stop"}
                   requestId: requestMeta.requestId,
                   timestamp: Date.now(),
                   adapter: adapter.name,
+                  requestSource,
                   model,
                   requestModel: body.model || undefined,
                   mode: "stream",
@@ -18005,7 +18826,7 @@ data: ${JSON.stringify({
     });
   });
   app.get("/profiles", async (c) => {
-    const { profilePageHtml } = await import("./profilePage-g5t5t6av.js");
+    const { profilePageHtml } = await import("./profilePage-77z05e0r.js");
     return c.html(profilePageHtml);
   });
   app.post("/profiles/active", async (c) => {
@@ -18030,6 +18851,45 @@ data: ${JSON.stringify({
     console.error(`[PROXY] Active profile switched to: ${body.profile} (session cache cleared)`);
     return c.json({ success: true, activeProfile: body.profile });
   });
+  app.get("/plugins/list", async (c) => {
+    const { getPluginStats } = await import("./stats-4c4ewmdh.js");
+    return c.json({
+      plugins: loadedPlugins.map((p) => ({
+        name: p.name,
+        description: p.description,
+        version: p.version,
+        adapters: p.adapters,
+        hooks: p.hooks,
+        status: p.status,
+        path: p.path,
+        ...p.error ? { error: p.error } : {},
+        ...p.status === "active" ? { stats: getPluginStats(p.name) } : {}
+      }))
+    });
+  });
+  app.post("/plugins/reload", async (c) => {
+    try {
+      loadedPlugins = await loadPlugins(pluginDir, pluginConfigPath);
+      pluginTransforms = getActiveTransforms(loadedPlugins);
+      const active = loadedPlugins.filter((p) => p.status === "active").length;
+      console.error(`[PROXY] Plugins reloaded: ${active} active`);
+      return c.json({
+        success: true,
+        plugins: loadedPlugins.map((p) => ({
+          name: p.name,
+          status: p.status,
+          hooks: p.hooks,
+          ...p.error ? { error: p.error } : {}
+        }))
+      });
+    } catch (err) {
+      return c.json({ success: false, error: String(err) }, 500);
+    }
+  });
+  app.get("/plugins", async (c) => {
+    const { pluginPageHtml } = await import("./pluginPage-85s6t6k8.js");
+    return c.html(pluginPageHtml);
+  });
   app.post("/auth/refresh", async (c) => {
     const success = await refreshOAuthToken();
     if (success) {
@@ -18134,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();
@@ -18180,11 +19040,27 @@ data: ${JSON.stringify({
     console.error(`[PROXY] UNHANDLED ${c.req.method} ${c.req.url}`);
     return c.json({ error: { type: "not_found", message: `Endpoint not supported: ${c.req.method} ${new URL(c.req.url).pathname}` } }, 404);
   });
-  return { app, config: finalConfig };
+  async function initPluginsAsync() {
+    try {
+      loadedPlugins = await loadPlugins(pluginDir, pluginConfigPath);
+      pluginTransforms = getActiveTransforms(loadedPlugins);
+      if (loadedPlugins.length > 0) {
+        const active = loadedPlugins.filter((p) => p.status === "active").length;
+        const disabled = loadedPlugins.filter((p) => p.status === "disabled").length;
+        const errored = loadedPlugins.filter((p) => p.status === "error").length;
+        console.error(`[PROXY] Plugins loaded: ${active} active, ${disabled} disabled, ${errored} errors`);
+      }
+    } catch (err) {
+      console.error(`[PROXY] Plugin loading failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  return { app, config: finalConfig, initPlugins: initPluginsAsync };
 }
 async function startProxyServer(config = {}) {
   claudeExecutable = await resolveClaudeExecutableAsync();
-  const { app, config: finalConfig } = createProxyServer(config);
+  const { app, config: finalConfig, initPlugins } = createProxyServer(config);
+  if (initPlugins)
+    await initPlugins();
   const server = serve({
     fetch: app.fetch,
     port: finalConfig.port,
@@ -18194,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}`);
@@ -18245,4 +19123,4 @@ Or use a different port:`);
   };
 }
 
-export { computeLineageHash, hashMessage, computeMessageHashes, getMaxSessionsLimit, clearSessionCache, createProxyServer, startProxyServer };
+export { runTransformHook, runObserveHook, buildPipeline, createRequestContext, computeLineageHash, hashMessage, computeMessageHashes, getMaxSessionsLimit, clearSessionCache, createProxyServer, startProxyServer };