create-merlin-brain 3.11.0 → 3.13.0

package/bin/runtime-adapters.cjs

@@ -0,0 +1,396 @@
+// MERLIN RUNTIME ADAPTERS
+// Detects and configures Merlin for non-Claude-Code runtimes.
+// Claude Code is always handled by the main installer (install.cjs).
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+// ---------------------------------------------------------------------------
+// Runtime definitions
+// ---------------------------------------------------------------------------
+
+const RUNTIMES = [
+  {
+    id: 'codex',
+    label: 'Codex CLI',
+    configDir: path.join(os.homedir(), '.codex'),
+    binary: 'codex',
+  },
+  {
+    id: 'opencode',
+    label: 'OpenCode',
+    configDir: path.join(os.homedir(), '.opencode'),
+    binary: 'opencode',
+  },
+  {
+    id: 'gemini',
+    label: 'Gemini CLI',
+    configDir: path.join(os.homedir(), '.gemini'),
+    binary: 'gemini',
+  },
+];
+
+// ---------------------------------------------------------------------------
+// Detection helpers
+// ---------------------------------------------------------------------------
+
+function inPath(binary) {
+  try {
+    execSync(`which ${binary} 2>/dev/null`, { stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function detectRuntimes() {
+  return RUNTIMES.map((rt) => ({
+    ...rt,
+    found: fs.existsSync(rt.configDir) || inPath(rt.binary),
+  }));
+}
+
+// ---------------------------------------------------------------------------
+// MCP server command helper (mirrors logic in install.cjs)
+// ---------------------------------------------------------------------------
+
+function buildMcpCommand(useGlobalBinary) {
+  if (useGlobalBinary) {
+    return { command: 'merlin-brain', args: undefined };
+  }
+  return { command: 'node', args: [path.join(__dirname, 'serve.js')] };
+}
+
+// ---------------------------------------------------------------------------
+// AGENTS.md content for instruction-file runtimes
+// ---------------------------------------------------------------------------
+
+function buildAgentsMd() {
+  return `# Merlin Brain — AI Development System
+
+> Installed by Merlin (https://merlin.build). Keep this file to preserve Merlin context.
+>
+> Note: Tool names in these instructions reflect Claude Code conventions (Read, Write, Edit,
+> Bash, Grep, Glob). Names may differ in your runtime — adapt as needed.
+
+## Boot Sequence (run at session start)
+
+1. Call \`merlin_get_selected_repo\` — connect Merlin Sights to this project.
+2. Call \`merlin_get_project_status\` — load current project state and active tasks.
+3. Show a brief status summary, then handle the user's request.
+
+Do NOT skip these steps. Do NOT start working without Merlin context.
+
+## Before Every File Edit
+
+Call \`merlin_get_context("your task")\` before writing or modifying any code.
+
+## Routing Specialist Work
+
+Route tasks to the right specialist agent:
+- Architecture decisions → system-architect
+- Implementation → implementation-dev
+- Testing → tests-qa
+- Security review → merlin-security
+- Documentation → docs-keeper
+
+## MCP Tools Available
+
+The Merlin MCP server exposes these tools:
+- \`merlin_get_selected_repo\` — identify current repository
+- \`merlin_get_project_status\` — load tasks and project state
+- \`merlin_get_context(task)\` — fetch relevant code context for a task
+- \`merlin_find_files(query)\` — locate files by description
+- \`merlin_search(query)\` — semantic code search
+
+## Core Principles
+
+- Always search before writing — reuse existing functions and patterns.
+- Keep files under 400 lines — split into sub-modules when approaching the limit.
+- Graceful failure — if Merlin Sights is unavailable, continue with file exploration.
+`;
+}
+
+// ---------------------------------------------------------------------------
+// Codex CLI adapter
+// Writes: ~/.codex/AGENTS.md + ~/.codex/config.toml (MCP section)
+// ---------------------------------------------------------------------------
+
+function configureCodex(rt, useGlobalBinary, apiKey) {
+  const results = [];
+
+  // Ensure config dir exists
+  if (!fs.existsSync(rt.configDir)) {
+    fs.mkdirSync(rt.configDir, { recursive: true });
+  }
+
+  // Write AGENTS.md
+  const agentsMdPath = path.join(rt.configDir, 'AGENTS.md');
+  const agentsMd = buildAgentsMd();
+  const existingAgentsMd = fs.existsSync(agentsMdPath)
+    ? fs.readFileSync(agentsMdPath, 'utf8')
+    : '';
+
+  if (existingAgentsMd.includes('Merlin Brain')) {
+    results.push('AGENTS.md already has Merlin (skipped)');
+  } else {
+    const combined = existingAgentsMd
+      ? existingAgentsMd.trimEnd() + '\n\n---\n\n' + agentsMd
+      : agentsMd;
+    fs.writeFileSync(agentsMdPath, combined);
+    results.push('Wrote ~/.codex/AGENTS.md');
+  }
+
+  // Write / update config.toml with MCP section
+  const configTomlPath = path.join(rt.configDir, 'config.toml');
+  const { command, args } = buildMcpCommand(useGlobalBinary);
+  const argsToml = args
+    ? `args = [${args.map((a) => `"${a}"`).join(', ')}]`
+    : '';
+  const envToml = apiKey ? `\n  MERLIN_API_KEY = "${apiKey}"` : '';
+  const mcpToml = `
+[mcp.merlin]
+command = "${command}"
+${argsToml ? argsToml + '\n' : ''}${apiKey ? `[mcp.merlin.env]${envToml}\n` : ''}`;
+
+  let tomlContent = fs.existsSync(configTomlPath)
+    ? fs.readFileSync(configTomlPath, 'utf8')
+    : '';
+
+  if (tomlContent.includes('[mcp.merlin]')) {
+    results.push('config.toml already has Merlin MCP (skipped)');
+  } else {
+    fs.appendFileSync(configTomlPath, mcpToml);
+    results.push('Added Merlin MCP to ~/.codex/config.toml');
+  }
+
+  return results;
+}
+
+// ---------------------------------------------------------------------------
+// OpenCode adapter
+// Writes: ~/.opencode/config.json (mcpServers section) + ~/.opencode/AGENTS.md
+// ---------------------------------------------------------------------------
+
+function configureOpenCode(rt, useGlobalBinary, apiKey) {
+  const results = [];
+
+  if (!fs.existsSync(rt.configDir)) {
+    fs.mkdirSync(rt.configDir, { recursive: true });
+  }
+
+  // MCP config JSON
+  const configJsonPath = path.join(rt.configDir, 'config.json');
+  let config = {};
+  if (fs.existsSync(configJsonPath)) {
+    try {
+      config = JSON.parse(fs.readFileSync(configJsonPath, 'utf8'));
+    } catch {
+      config = {};
+    }
+  }
+
+  config.mcpServers = config.mcpServers || {};
+  if (config.mcpServers.merlin) {
+    results.push('config.json already has Merlin MCP (skipped)');
+  } else {
+    const { command, args } = buildMcpCommand(useGlobalBinary);
+    const mcpEntry = { command, type: 'stdio' };
+    if (args) mcpEntry.args = args;
+    if (apiKey) mcpEntry.env = { MERLIN_API_KEY: apiKey };
+    config.mcpServers.merlin = mcpEntry;
+    fs.writeFileSync(configJsonPath, JSON.stringify(config, null, 2));
+    results.push('Added Merlin MCP to ~/.opencode/config.json');
+  }
+
+  // Instructions file
+  const agentsMdPath = path.join(rt.configDir, 'AGENTS.md');
+  const existingAgentsMd = fs.existsSync(agentsMdPath)
+    ? fs.readFileSync(agentsMdPath, 'utf8')
+    : '';
+  if (existingAgentsMd.includes('Merlin Brain')) {
+    results.push('AGENTS.md already has Merlin (skipped)');
+  } else {
+    const combined = existingAgentsMd
+      ? existingAgentsMd.trimEnd() + '\n\n---\n\n' + buildAgentsMd()
+      : buildAgentsMd();
+    fs.writeFileSync(agentsMdPath, combined);
+    results.push('Wrote ~/.opencode/AGENTS.md');
+  }
+
+  return results;
+}
+
+// ---------------------------------------------------------------------------
+// Gemini CLI adapter
+// Writes: ~/.gemini/GEMINI.md + ~/.gemini/settings.json (mcpServers section)
+// ---------------------------------------------------------------------------
+
+function configureGemini(rt, useGlobalBinary, apiKey) {
+  const results = [];
+
+  if (!fs.existsSync(rt.configDir)) {
+    fs.mkdirSync(rt.configDir, { recursive: true });
+  }
+
+  // GEMINI.md instructions file
+  const geminiMdPath = path.join(rt.configDir, 'GEMINI.md');
+  const existingGeminiMd = fs.existsSync(geminiMdPath)
+    ? fs.readFileSync(geminiMdPath, 'utf8')
+    : '';
+  if (existingGeminiMd.includes('Merlin Brain')) {
+    results.push('GEMINI.md already has Merlin (skipped)');
+  } else {
+    const combined = existingGeminiMd
+      ? existingGeminiMd.trimEnd() + '\n\n---\n\n' + buildAgentsMd()
+      : buildAgentsMd();
+    fs.writeFileSync(geminiMdPath, combined);
+    results.push('Wrote ~/.gemini/GEMINI.md');
+  }
+
+  // settings.json MCP config
+  const settingsPath = path.join(rt.configDir, 'settings.json');
+  let settings = {};
+  if (fs.existsSync(settingsPath)) {
+    try {
+      settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+    } catch {
+      settings = {};
+    }
+  }
+
+  settings.mcpServers = settings.mcpServers || {};
+  if (settings.mcpServers.merlin) {
+    results.push('settings.json already has Merlin MCP (skipped)');
+  } else {
+    const { command, args } = buildMcpCommand(useGlobalBinary);
+    const mcpEntry = { command };
+    if (args) mcpEntry.args = args;
+    if (apiKey) mcpEntry.env = { MERLIN_API_KEY: apiKey };
+    settings.mcpServers.merlin = mcpEntry;
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+    results.push('Added Merlin MCP to ~/.gemini/settings.json');
+  }
+
+  return results;
+}
+
+// ---------------------------------------------------------------------------
+// Per-project runtime files
+// Writes AGENTS.md alongside CLAUDE.md when initializing a project.
+// ---------------------------------------------------------------------------
+
+/**
+ * Generate per-project runtime instruction files next to a CLAUDE.md.
+ * Call this whenever Merlin creates or updates a project's CLAUDE.md.
+ *
+ * @param {string} projectDir  - Absolute path to the project directory
+ * @param {string[]} runtimeIds - Which runtime files to generate ('codex'|'opencode'|'gemini'|'all')
+ */
+function generateProjectRuntimeFiles(projectDir, runtimeIds = ['all']) {
+  const results = [];
+  const targets = runtimeIds.includes('all')
+    ? ['codex', 'opencode', 'gemini']
+    : runtimeIds;
+
+  const agentsMd = buildAgentsMd();
+
+  // AGENTS.md — used by Codex and OpenCode
+  if (targets.includes('codex') || targets.includes('opencode')) {
+    const agentsMdPath = path.join(projectDir, 'AGENTS.md');
+    if (!fs.existsSync(agentsMdPath)) {
+      fs.writeFileSync(agentsMdPath, agentsMd);
+      results.push(`Created ${agentsMdPath}`);
+    }
+  }
+
+  // GEMINI.md — used by Gemini CLI
+  if (targets.includes('gemini')) {
+    const geminiMdPath = path.join(projectDir, 'GEMINI.md');
+    if (!fs.existsSync(geminiMdPath)) {
+      fs.writeFileSync(geminiMdPath, agentsMd);
+      results.push(`Created ${geminiMdPath}`);
+    }
+  }
+
+  return results;
+}
+
+// ---------------------------------------------------------------------------
+// Main entry point called from install.cjs
+// ---------------------------------------------------------------------------
+
+/**
+ * Detect and configure all non-Claude-Code runtimes.
+ *
+ * @param {object} opts
+ * @param {string}   opts.runtimeFlag     - Value of --runtime flag ('all'|'claude'|runtime-id)
+ * @param {boolean}  opts.useGlobalBinary - Whether merlin-brain global binary is available
+ * @param {string}   opts.apiKey          - Merlin Sights API key (may be empty)
+ * @param {Function} opts.logSuccess      - Logging helper
+ * @param {Function} opts.logWarn         - Logging helper
+ * @param {Function} opts.logInfo         - Plain log helper (console.log compatible)
+ * @param {boolean}  [opts.quiet]         - If true, skip printing the detection summary
+ * @returns {{ detected: object[], configured: string[] }}
+ */
+function configureRuntimes({ runtimeFlag, useGlobalBinary, apiKey, logSuccess, logWarn, logInfo, quiet }) {
+  const detected = detectRuntimes();
+
+  // Print detection summary (skipped when caller already printed it)
+  if (!quiet) {
+    for (const rt of detected) {
+      const icon = rt.found ? '\u2705' : '\u2B1A';
+      const suffix = rt.found ? '' : ' (not found)';
+      logInfo(`  ${icon} ${rt.label}${suffix}`);
+    }
+  }
+
+  // Determine which runtimes to configure
+  const skip = runtimeFlag === 'claude'; // --runtime claude → Claude Code only
+  if (skip) {
+    if (!quiet) logInfo('  Skipping other runtimes (--runtime claude)');
+    return { detected, configured: [] };
+  }
+
+  const filterToOne = !['all', 'claude', undefined, ''].includes(runtimeFlag);
+  const targetRuntimes = filterToOne
+    ? detected.filter((rt) => rt.found && rt.id === runtimeFlag)
+    : detected.filter((rt) => rt.found);
+
+  const configured = [];
+
+  for (const rt of targetRuntimes) {
+    let results = [];
+    try {
+      if (rt.id === 'codex') {
+        results = configureCodex(rt, useGlobalBinary, apiKey);
+      } else if (rt.id === 'opencode') {
+        results = configureOpenCode(rt, useGlobalBinary, apiKey);
+      } else if (rt.id === 'gemini') {
+        results = configureGemini(rt, useGlobalBinary, apiKey);
+      } else {
+        logWarn(`  Unknown runtime "${rt.id}" — skipped`);
+        continue;
+      }
+      for (const msg of results) {
+        logSuccess(msg);
+        configured.push(msg);
+      }
+    } catch (err) {
+      logWarn(`  Failed to configure ${rt.label}: ${err.message}`);
+    }
+  }
+
+  return { detected, configured };
+}
+
+module.exports = {
+  detectRuntimes,
+  configureRuntimes,
+  generateProjectRuntimeFiles,
+  buildAgentsMd,
+};

package/dist/server/api/types.d.ts

@@ -196,6 +196,13 @@ export interface AgentIndexResult {
     rating: number;
     userThumbsUp: number;
 }
+/** Augmentation data injected into agent handoff from cloud catalog */
+export interface AugmentationResult {
+    slug: string;
+    grade: string;
+    description: string;
+    systemPrompt: string;
+}
 /** Agent index detail */
 export interface AgentIndexDetail extends AgentIndexResult {
     systemPrompt: string | null;

package/dist/server/api/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/server/api/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,sCAAsC;AACtC,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,gBAAgB,CAAC;IACvF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8BAA8B;AAC9B,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,+BAA+B;AAC/B,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,iCAAiC;AACjC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED,wBAAwB;AACxB,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,iCAAiC;AACjC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,gCAAgC;AAChC,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrF,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,+DAA+D;AAC/D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,6CAA6C;AAC7C,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,yEAAyE;AACzE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IACF,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,YAAY,EAAE;QACZ,aAAa,EAAE,KAAK,CAAC;YACnB,MAAM,EAAE,MAAM,CAAC;YACf,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,cAAc,CAAC,EAAE,MAAM,CAAC;SACzB,CAAC,CAAC;QACH,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC;QAC1B,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;QACxB,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KACzB,CAAC;IACF,UAAU,EAAE,KAAK,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;QAC3B,SAAS,EAAE,GAAG,EAAE,CAAC;QACjB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,UAAU,EAAE;QACV,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,mBAAmB,EAAE,MAAM,EAAE,CAAC;KAC/B,CAAC;IACF,sDAAsD;IACtD,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,wDAAwD;IACxD,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACtC,8CAA8C;IAC9C,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACzC,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACvC;AAED,oBAAoB;AACpB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,2BAA2B;AAC3B,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED,iCAAiC;AACjC,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,0CAA0C;AAC1C,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtD,WAAW,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxD;AAED,gCAAgC;AAChC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,yBAAyB;AACzB,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/server/api/types.ts"],"names":[],"mappings":"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"}

package/dist/server/cost/tracker.d.ts

@@ -3,11 +3,29 @@
  *
  * Tracks routing decisions and estimates cost savings vs always using Opus.
  * Resets on each MCP server restart (per session).
+ *
+ * v2: Adds per-agent breakdown, token counts, and token-based pricing.
  */
+export declare const MODEL_PRICING: Record<string, {
+    inputPerM: number;
+    outputPerM: number;
+}>;
 export interface ModelUsage {
     calls: number;
     estimatedCost: number;
 }
+export interface AgentUsage {
+    calls: number;
+    inputTokens: number;
+    outputTokens: number;
+    estimatedCost: number;
+}
+export interface TokenCounts {
+    totalInput: number;
+    totalOutput: number;
+    cacheRead: number;
+    cacheWrite: number;
+}
 export interface SessionCost {
     sessionId: string;
     totalCalls: number;
@@ -16,15 +34,33 @@ export interface SessionCost {
         sonnet: ModelUsage;
         opus: ModelUsage;
     };
+    byAgent: Record<string, AgentUsage>;
+    tokenCounts: TokenCounts;
     savedVsBaseline: number;
     totalEstimatedCost: number;
 }
+export interface RoutingRecord {
+    model: string;
+    taskComplexity: string;
+    agent?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    cacheReadTokens?: number;
+    cacheWriteTokens?: number;
+}
 /**
  * Record a routing decision. Call this each time a task is routed to an agent.
+ * Supports optional token counts for accurate pricing; falls back to flat-rate.
  */
-export declare function recordRouting(model: string, _taskComplexity: string): void;
+export declare function recordRouting(model: string, taskComplexity: string, opts?: {
+    agent?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    cacheReadTokens?: number;
+    cacheWriteTokens?: number;
+}): void;
 /**
- * Get a snapshot of current session costs.
+ * Get a snapshot of current session costs (deep copy).
  */
 export declare function getSessionCost(): SessionCost;
 /**

package/dist/server/cost/tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/server/cost/tracker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE;QACP,KAAK,EAAE,UAAU,CAAC;QAClB,MAAM,EAAE,UAAU,CAAC;QACnB,IAAI,EAAE,UAAU,CAAC;KAClB,CAAC;IACF,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAyBD;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAoB1E;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAY5C;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAOnC"}
+{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/server/cost/tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAInF,CAAC;AAeF,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE;QACP,KAAK,EAAE,UAAU,CAAC;QAClB,MAAM,EAAE,UAAU,CAAC;QACnB,IAAI,EAAE,UAAU,CAAC;KAClB,CAAC;IACF,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAoED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,IAAI,GAAE;IACJ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACtB,GACL,IAAI,CA2CN;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAgB5C;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CASnC"}

package/dist/server/cost/tracker.js

@@ -3,17 +3,29 @@
  *
  * Tracks routing decisions and estimates cost savings vs always using Opus.
  * Resets on each MCP server restart (per session).
+ *
+ * v2: Adds per-agent breakdown, token counts, and token-based pricing.
  */
 import { randomUUID } from 'crypto';
-// Estimated cost per routing call (rough approximation)
-// These are per-message estimates for a typical agentic task
-const COST_PER_CALL = {
+import { writeFileSync, mkdirSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+// Token-based pricing per million tokens (input / output)
+export const MODEL_PRICING = {
+    haiku: { inputPerM: 0.25, outputPerM: 1.25 },
+    sonnet: { inputPerM: 3.00, outputPerM: 15.00 },
+    opus: { inputPerM: 15.00, outputPerM: 75.00 },
+};
+// Fallback per-call estimate when token counts are not available.
+// These mirror the original values so existing behaviour is preserved.
+const COST_PER_CALL_FALLBACK = {
     haiku: 0.003,
     sonnet: 0.015,
     opus: 0.075,
 };
-// Baseline: cost if every routing call used Opus
-const OPUS_BASELINE_COST = COST_PER_CALL.opus;
+// Opus baseline for savings calculation (per call, no token data)
+const OPUS_BASELINE_PER_CALL = COST_PER_CALL_FALLBACK.opus;
+// ─── Helpers ──────────────────────────────────────────────────────────────────
 /** Normalize model string to haiku | sonnet | opus key */
 function normalizeModel(model) {
     const lower = model.toLowerCase();
@@ -23,7 +35,35 @@ function normalizeModel(model) {
         return 'sonnet';
     return 'opus';
 }
-// Singleton session state
+/**
+ * Estimate call cost.
+ * Uses token counts when available; falls back to per-call flat rate.
+ */
+function estimateCallCost(modelKey, inputTokens, outputTokens) {
+    if (inputTokens > 0 || outputTokens > 0) {
+        const pricing = MODEL_PRICING[modelKey];
+        return (inputTokens / 1_000_000) * pricing.inputPerM
+            + (outputTokens / 1_000_000) * pricing.outputPerM;
+    }
+    return COST_PER_CALL_FALLBACK[modelKey];
+}
+function round6(n) {
+    return parseFloat(n.toFixed(6));
+}
+// ─── Persistence ─────────────────────────────────────────────────────────────
+const COST_DIR = join(homedir(), '.claude', 'merlin');
+const COST_FILE = join(COST_DIR, 'session-cost.json');
+/** Write current state to disk so session-end.sh can read it. Fire-and-forget. */
+function persistCost() {
+    try {
+        mkdirSync(COST_DIR, { recursive: true });
+        writeFileSync(COST_FILE, JSON.stringify(state, null, 2), 'utf-8');
+    }
+    catch {
+        // Non-fatal — in-memory state is authoritative
+    }
+}
+// ─── Singleton state ──────────────────────────────────────────────────────────
 const SESSION_ID = randomUUID();
 const state = {
     sessionId: SESSION_ID,
@@ -33,26 +73,54 @@ const state = {
         sonnet: { calls: 0, estimatedCost: 0 },
         opus: { calls: 0, estimatedCost: 0 },
     },
+    byAgent: {},
+    tokenCounts: { totalInput: 0, totalOutput: 0, cacheRead: 0, cacheWrite: 0 },
     savedVsBaseline: 0,
     totalEstimatedCost: 0,
 };
 /**
  * Record a routing decision. Call this each time a task is routed to an agent.
+ * Supports optional token counts for accurate pricing; falls back to flat-rate.
  */
-export function recordRouting(model, _taskComplexity) {
+export function recordRouting(model, taskComplexity, opts = {}) {
     const key = normalizeModel(model);
-    const cost = COST_PER_CALL[key] ?? COST_PER_CALL.opus;
+    const inputTokens = opts.inputTokens ?? 0;
+    const outputTokens = opts.outputTokens ?? 0;
+    const cacheRead = opts.cacheReadTokens ?? 0;
+    const cacheWrite = opts.cacheWriteTokens ?? 0;
+    const cost = estimateCallCost(key, inputTokens, outputTokens);
+    // ── byModel ──────────────────────────────────────────────────────────────
     state.totalCalls += 1;
     state.byModel[key].calls += 1;
-    state.byModel[key].estimatedCost = parseFloat((state.byModel[key].estimatedCost + cost).toFixed(6));
-    state.totalEstimatedCost = parseFloat((state.totalEstimatedCost + cost).toFixed(6));
-    // Savings: how much cheaper vs always using Opus
-    const baselineCostForThisCall = OPUS_BASELINE_COST;
-    const saved = baselineCostForThisCall - cost;
-    state.savedVsBaseline = parseFloat((state.savedVsBaseline + saved).toFixed(6));
+    state.byModel[key].estimatedCost = round6(state.byModel[key].estimatedCost + cost);
+    // ── totals ────────────────────────────────────────────────────────────────
+    state.totalEstimatedCost = round6(state.totalEstimatedCost + cost);
+    // ── token counts ──────────────────────────────────────────────────────────
+    state.tokenCounts.totalInput += inputTokens;
+    state.tokenCounts.totalOutput += outputTokens;
+    state.tokenCounts.cacheRead += cacheRead;
+    state.tokenCounts.cacheWrite += cacheWrite;
+    // ── byAgent ───────────────────────────────────────────────────────────────
+    const agentKey = opts.agent ?? 'unknown';
+    if (!state.byAgent[agentKey]) {
+        state.byAgent[agentKey] = { calls: 0, inputTokens: 0, outputTokens: 0, estimatedCost: 0 };
+    }
+    const agentEntry = state.byAgent[agentKey];
+    agentEntry.calls += 1;
+    agentEntry.inputTokens += inputTokens;
+    agentEntry.outputTokens += outputTokens;
+    agentEntry.estimatedCost = round6(agentEntry.estimatedCost + cost);
+    // ── savings vs all-Opus baseline ─────────────────────────────────────────
+    // Baseline uses per-call flat rate (Opus) since we can't know what token
+    // counts would have been on Opus.
+    const baselineCost = OPUS_BASELINE_PER_CALL;
+    const saved = baselineCost - cost;
+    state.savedVsBaseline = round6(state.savedVsBaseline + saved);
+    // Persist so session-end.sh can read it without querying the MCP
+    persistCost();
 }
 /**
- * Get a snapshot of current session costs.
+ * Get a snapshot of current session costs (deep copy).
  */
 export function getSessionCost() {
     return {
@@ -63,6 +131,8 @@ export function getSessionCost() {
             sonnet: { ...state.byModel.sonnet },
             opus: { ...state.byModel.opus },
         },
+        byAgent: Object.fromEntries(Object.entries(state.byAgent).map(([k, v]) => [k, { ...v }])),
+        tokenCounts: { ...state.tokenCounts },
         savedVsBaseline: state.savedVsBaseline,
         totalEstimatedCost: state.totalEstimatedCost,
     };
@@ -75,6 +145,8 @@ export function resetSession() {
     state.byModel.haiku = { calls: 0, estimatedCost: 0 };
     state.byModel.sonnet = { calls: 0, estimatedCost: 0 };
     state.byModel.opus = { calls: 0, estimatedCost: 0 };
+    state.byAgent = {};
+    state.tokenCounts = { totalInput: 0, totalOutput: 0, cacheRead: 0, cacheWrite: 0 };
     state.savedVsBaseline = 0;
     state.totalEstimatedCost = 0;
 }