tsunami-code 3.2.0 → 3.4.0

package/index.js

@@ -11,7 +11,8 @@ import { isCoordinatorTask, stripCoordinatorPrefix, buildCoordinatorSystemPrompt
 import { getDueTasks, markDone, cancelTask, listTasks, formatTaskList } from './lib/kairos.js';
 import { buildSystemPrompt } from './lib/prompt.js';
 import { runPreflight, checkServer } from './lib/preflight.js';
-import { setSession, undo, undoStackSize } from './lib/tools.js';
+import { setSession, undo, undoStackSize, registerMcpTools, linesChanged } from './lib/tools.js';
+import { connectMcpServers, getMcpToolObjects, getMcpStatus, getMcpConfigPath, disconnectAll as disconnectMcp } from './lib/mcp.js';
 import {
   initSession,
   initProjectMemory,
@@ -24,7 +25,7 @@ import {
   getSessionContext
 } from './lib/memory.js';
 
-const VERSION = '3.2.0';
+const VERSION = '3.4.0';
 const CONFIG_DIR = join(os.homedir(), '.tsunami-code');
 const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
 const DEFAULT_SERVER = 'https://radiometric-reita-amuck.ngrok-free.dev';
@@ -171,6 +172,8 @@ async function run() {
   const cwd = process.cwd();
   let planMode = argv.includes('--plan');
 
+  const sessionStartTime = Date.now();
+
   // Initialize memory systems
   const { sessionId, sessionDir } = initSession(cwd);
   initProjectMemory(cwd);
@@ -225,6 +228,22 @@ async function run() {
     dim(` · ${sessionId} · Type your task. /help for commands. Ctrl+C to exit.\n`)
   );
 
+  // MCP: connect servers from ~/.tsunami-code/mcp.json (non-blocking — warnings only)
+  {
+    const mcpResults = await connectMcpServers();
+    if (mcpResults.length > 0) {
+      const mcpTools = getMcpToolObjects();
+      registerMcpTools(mcpTools);
+      const ok = mcpResults.filter(r => !r.error);
+      const fail = mcpResults.filter(r => r.error);
+      if (ok.length) console.log(green(`  ✓ MCP`) + dim(` ${ok.map(r => `${r.name}(${r.toolCount})`).join(', ')}`));
+      if (fail.length) {
+        for (const f of fail) console.log(yellow(`  ⚠ MCP "${f.name}" failed: ${f.error}`));
+      }
+      if (ok.length || fail.length) console.log();
+    }
+  }
+
   // KAIROS: run due background tasks on startup
   const dueTasks = getDueTasks();
   if (dueTasks.length > 0) {
@@ -318,9 +337,8 @@ async function run() {
 
   // ── Exit handler ─────────────────────────────────────────────────────────────
   function gracefulExit(code = 0) {
-    try {
-      endSession(sessionDir);
-    } catch {}
+    try { endSession(sessionDir); } catch {}
+    try { disconnectMcp(); } catch {}
     console.log(dim('\n  Goodbye.\n'));
     process.exit(code);
   }
@@ -440,7 +458,7 @@ async function run() {
 
       // Skills: check if this is a skill command before built-ins
       const skillMatch = getSkillCommand(skills, line);
-      if (skillMatch && !['help','compact','plan','undo','doctor','cost','clear','status','server','model','memory','history','exit','quit','skill-create','skill-list','skills'].includes(cmd)) {
+      if (skillMatch && !['help','compact','plan','undo','doctor','cost','clear','status','server','model','memory','history','exit','quit','skill-create','skill-list','skills','mcp','copy','btw','rewind','diff','stats','export'].includes(cmd)) {
         // Run the skill prompt as a user message
         const userContent = skillMatch.args
           ? `[Skill: ${skillMatch.skill.name}]\n${skillMatch.prompt}`
@@ -481,6 +499,13 @@ async function run() {
               ['/status',          'Show context size and server'],
               ['/server <url>',    'Change model server URL'],
               ['/model [name]',    'Show or change active model (default: local)'],
+              ['/mcp',             'Show MCP server status and tools'],
+              ['/copy',            'Copy last response to clipboard'],
+              ['/btw <note>',      'Inject a note into conversation without a response'],
+              ['/rewind',          'Remove last user+assistant exchange'],
+              ['/diff',            'Show git diff of session file changes'],
+              ['/stats',           'Session stats: lines, tokens, duration'],
+              ['/export [file]',   'Export conversation to markdown file'],
               ['/history',         'Show recent command history'],
               ['/exit',            'Exit'],
             ];
@@ -505,6 +530,25 @@ async function run() {
           else console.log(dim('  Nothing to undo.\n'));
           break;
         }
+        case 'mcp': {
+          const mcpServers = getMcpStatus();
+          if (mcpServers.length === 0) {
+            console.log(dim(`\n  No MCP servers connected.`));
+            console.log(dim(`  Add servers to: ${getMcpConfigPath()}`));
+            console.log(dim('  Format: { "servers": { "name": { "command": "npx", "args": [...] } } }\n'));
+          } else {
+            console.log(blue(`\n  MCP Servers (${mcpServers.length})\n`));
+            for (const srv of mcpServers) {
+              console.log(`  ${cyan(srv.name)} ${dim(`— ${srv.toolCount} tool${srv.toolCount !== 1 ? 's' : ''}`)}`);
+              for (const tool of srv.tools) {
+                const desc = tool.description ? dim(` — ${tool.description}`) : '';
+                console.log(`    ${dim('•')} ${tool.name}${desc}`);
+              }
+            }
+            console.log();
+          }
+          break;
+        }
         case 'doctor': {
           const { getRgPath } = await import('./lib/preflight.js');
           const { getMemoryStats: _getMemoryStats } = await import('./lib/memory.js');
@@ -530,12 +574,20 @@ async function run() {
         }
         case 'cost': {
           const hasReal = tokenStats.requests > 0;
-          console.log(blue('\n  Session Token Usage'));
+          console.log(blue('\n  Session Token Usage\n'));
           if (hasReal) {
-            console.log(dim(`  Input  : ${tokenStats.input.toLocaleString()} tokens (actual)`));
-            console.log(dim(`  Output : ${tokenStats.output.toLocaleString()} tokens (actual)`));
-            console.log(dim(`  Total  : ${(tokenStats.input + tokenStats.output).toLocaleString()} tokens`));
-            console.log(dim(`  Requests: ${tokenStats.requests}`));
+            console.log(dim(`  Input    : ${tokenStats.input.toLocaleString()} tokens`));
+            console.log(dim(`  Output   : ${tokenStats.output.toLocaleString()} tokens`));
+            console.log(dim(`  Total    : ${(tokenStats.input + tokenStats.output).toLocaleString()} tokens`));
+            console.log(dim(`  Requests : ${tokenStats.requests}`));
+            // Per-model breakdown (mirrors cost-tracker.ts formatModelUsage)
+            const models = Object.entries(tokenStats.byModel);
+            if (models.length > 1) {
+              console.log(blue('\n  By model:\n'));
+              for (const [model, usage] of models) {
+                console.log(dim(`  ${model.padEnd(20)} ${usage.input.toLocaleString()} in  ${usage.output.toLocaleString()} out  (${usage.requests} req)`));
+              }
+            }
           } else {
             console.log(dim(`  Input  : ~${_inputTokens.toLocaleString()} (estimated)`));
             console.log(dim(`  Output : ~${_outputTokens.toLocaleString()} (estimated)`));
@@ -544,6 +596,137 @@ async function run() {
           console.log();
           break;
         }
+        case 'copy': {
+          // Copy last assistant response to clipboard — from commands.ts copy command
+          const lastAss = [...messages].reverse().find(m => m.role === 'assistant');
+          if (!lastAss) { console.log(dim('  Nothing to copy.\n')); break; }
+          const text = typeof lastAss.content === 'string' ? lastAss.content : JSON.stringify(lastAss.content);
+          try {
+            const { execSync } = await import('child_process');
+            if (process.platform === 'darwin') {
+              execSync('pbcopy', { input: text, stdio: ['pipe', 'ignore', 'ignore'] });
+            } else if (process.platform === 'win32') {
+              execSync('clip', { input: text, stdio: ['pipe', 'ignore', 'ignore'], shell: true });
+            } else {
+              execSync('xclip -selection clipboard 2>/dev/null || xsel --clipboard --input', { input: text, stdio: ['pipe', 'ignore', 'ignore'], shell: true });
+            }
+            console.log(green(`  ✓ Copied ${text.length.toLocaleString()} chars to clipboard\n`));
+          } catch (e) {
+            console.log(red(`  Copy failed: ${e.message}\n`));
+          }
+          break;
+        }
+        case 'btw': {
+          // Inject a sticky note into conversation without triggering a model turn
+          // From CC's btw command — useful for mid-task context injection
+          const note = rest.join(' ');
+          if (!note) { console.log(red('  Usage: /btw <note>\n')); break; }
+          messages.push({ role: 'user', content: `[btw: ${note}]` });
+          messages.push({ role: 'assistant', content: 'Noted.' });
+          console.log(green('  ✓ Noted.\n'));
+          break;
+        }
+        case 'rewind': {
+          // Remove last user+assistant exchange from context
+          // From CC's rewind command
+          if (messages.length < 2) { console.log(dim('  Nothing to rewind.\n')); break; }
+          // Find last assistant message
+          let lastAssIdx = -1;
+          for (let i = messages.length - 1; i >= 0; i--) {
+            if (messages[i].role === 'assistant') { lastAssIdx = i; break; }
+          }
+          if (lastAssIdx === -1) { console.log(dim('  Nothing to rewind.\n')); break; }
+          // Find the user message that preceded it
+          let lastUserIdx = lastAssIdx;
+          for (let i = lastAssIdx - 1; i >= 0; i--) {
+            if (messages[i].role === 'user') { lastUserIdx = i; break; }
+          }
+          const removed = messages.splice(lastUserIdx).length;
+          console.log(green(`  ✓ Rewound ${removed} message(s). Context: ${messages.length} messages.\n`));
+          break;
+        }
+        case 'diff': {
+          // Show git diff of file changes made this session
+          // From CC's diff command
+          try {
+            const { execSync: _exec } = await import('child_process');
+            const statArgs = rest.includes('--full') ? '' : '--stat';
+            let diffOut = '';
+            try {
+              diffOut = _exec(`git diff HEAD ${statArgs}`, { cwd, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
+            } catch {
+              diffOut = _exec(`git diff ${statArgs}`, { cwd, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
+            }
+            if (!diffOut.trim()) {
+              console.log(dim('  No changes detected. (Use git add to stage new files.)\n'));
+            } else {
+              console.log(blue('\n  Session diff:\n'));
+              console.log(dim(diffOut.trim().split('\n').map(l => '  ' + l).join('\n')));
+              if (statArgs === '--stat') console.log(dim('\n  Tip: /diff --full for full patch\n'));
+              else console.log();
+            }
+          } catch (e) {
+            console.log(dim(`  No git repository or no changes. (${e.message.slice(0, 60)})\n`));
+          }
+          break;
+        }
+        case 'stats': {
+          // Session statistics — mirrors cost-tracker.ts formatTotalCost pattern
+          const elapsed = Date.now() - sessionStartTime;
+          const mins = Math.floor(elapsed / 60000);
+          const secs = Math.floor((elapsed % 60000) / 1000);
+          const durationStr = mins > 0 ? `${mins}m ${secs}s` : `${secs}s`;
+          const totalTok = tokenStats.input + tokenStats.output;
+          console.log(blue('\n  Session Stats\n'));
+          console.log(dim(`  Duration         ${durationStr}`));
+          console.log(dim(`  Requests         ${tokenStats.requests}`));
+          console.log(dim(`  Input tokens     ${tokenStats.input.toLocaleString()}`));
+          console.log(dim(`  Output tokens    ${tokenStats.output.toLocaleString()}`));
+          console.log(dim(`  Total tokens     ${totalTok.toLocaleString()}`));
+          console.log(dim(`  Lines added      ${linesChanged.added}`));
+          console.log(dim(`  Lines removed    ${linesChanged.removed}`));
+          console.log(dim(`  Messages         ${messages.length}`));
+          const models = Object.entries(tokenStats.byModel);
+          if (models.length > 1) {
+            console.log(blue('\n  By model:\n'));
+            for (const [model, usage] of models) {
+              console.log(dim(`  ${model.padEnd(20)} ${usage.input.toLocaleString()} in  ${usage.output.toLocaleString()} out`));
+            }
+          }
+          console.log();
+          break;
+        }
+        case 'export': {
+          // Export full conversation to a markdown file
+          // From CC's export command
+          const filename = rest[0] || `tsunami-session-${new Date().toISOString().slice(0,19).replace(/:/g,'-')}.md`;
+          const exportPath = filename.startsWith('/') || filename.startsWith('D:') || filename.startsWith('C:') ? filename : join(cwd, filename);
+          const lines = [
+            `# Tsunami Code Session`,
+            ``,
+            `**Date:** ${new Date().toISOString()}`,
+            `**Directory:** ${cwd}`,
+            `**Messages:** ${messages.length}`,
+            `**Tokens:** ${(tokenStats.input + tokenStats.output).toLocaleString()}`,
+            ``,
+            `---`,
+            ``
+          ];
+          for (const msg of messages) {
+            if (msg.role === 'system') continue;
+            const roleLabel = msg.role === 'user' ? '### User' : '### Assistant';
+            const text = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content, null, 2);
+            lines.push(roleLabel, '', text, '', '---', '');
+          }
+          try {
+            const { writeFileSync: _wfs } = await import('fs');
+            _wfs(exportPath, lines.join('\n'), 'utf8');
+            console.log(green(`  ✓ Exported to: ${exportPath}\n`));
+          } catch (e) {
+            console.log(red(`  Export failed: ${e.message}\n`));
+          }
+          break;
+        }
         case 'clear':
           resetSession();
           console.log(green('  Session cleared.\n'));

package/lib/loop.js

@@ -7,6 +7,20 @@ import {
   appendDecision
 } from './memory.js';
 
+// ── Tool result summarization (generateToolUseSummary pattern) ───────────────
+const SUMMARY_THRESHOLD = 2000; // chars — results larger than this get compressed
+const SUMMARIZABLE_TOOLS = new Set(['Read', 'Bash', 'WebFetch', 'WebSearch', 'Grep']);
+
+async function generateToolUseSummary(serverUrl, toolName, result) {
+  const systemPrompt =
+    'You are a lossless summarizer for an AI agent\'s working memory. ' +
+    'Extract every key fact, file path, function name, error message, variable name, value, and data point from the tool result. ' +
+    'Preserve anything the agent might need to act on. ' +
+    'Be dense and specific. No preamble. Target: under 350 words.';
+  const userMessage = `Tool: ${toolName}\n\nResult:\n${result.slice(0, 12000)}`;
+  return await quickCompletion(serverUrl, systemPrompt, userMessage);
+}
+
 // ── Dangerous command detection ──────────────────────────────────────────────
 const DANGEROUS_PATTERNS = [
   /rm\s+-[rf]+\s+[^-]/,
@@ -30,7 +44,15 @@ function isDangerous(cmd) {
 let _serverVerified = false;
 
 // Real token tracking from API responses
-export const tokenStats = { input: 0, output: 0, requests: 0 };
+// byModel mirrors cost-tracker.ts per-model usage accumulation
+export const tokenStats = { input: 0, output: 0, requests: 0, byModel: {} };
+
+// Token warning thresholds from query.ts calculateTokenWarningState
+const TOKEN_WARN_LEVELS = [
+  { pct: 0.95, label: '⚠ Context critical — run /compact now', urgent: true },
+  { pct: 0.85, label: '⚠ Context high', urgent: true },
+  { pct: 0.70, label: '◦ Context at', urgent: false },
+];
 
 // Current model identifier — changeable at runtime via /model command
 let _currentModel = 'local';
@@ -216,7 +238,16 @@ async function streamCompletion(serverUrl, messages, onToken, memoryContext = ''
     })
   });
 
-  if (!res.ok) throw new Error(`Model server: ${res.status} ${await res.text()}`);
+  if (!res.ok) {
+    const errText = await res.text();
+    // PROMPT_TOO_LONG detection — mirrors query.ts isPromptTooLongMessage
+    if (res.status === 400 || errText.toLowerCase().includes('context') || errText.toLowerCase().includes('too long') || errText.toLowerCase().includes('tokens')) {
+      const e = new Error(`Model server: ${res.status} ${errText}`);
+      e.isPromptTooLong = true;
+      throw e;
+    }
+    throw new Error(`Model server: ${res.status} ${errText}`);
+  }
 
   let fullContent = '';
   let buffer = '';
@@ -239,10 +270,18 @@ async function streamCompletion(serverUrl, messages, onToken, memoryContext = ''
       }
       // Capture real token counts + finish reason
       if (parsed.usage) {
-        tokenStats.input += parsed.usage.prompt_tokens || 0;
-        tokenStats.output += parsed.usage.completion_tokens || 0;
+        const pt = parsed.usage.prompt_tokens || 0;
+        const ct = parsed.usage.completion_tokens || 0;
+        tokenStats.input += pt;
+        tokenStats.output += ct;
         tokenStats.requests++;
-        tokenStats.lastPromptTokens = parsed.usage.prompt_tokens || 0;
+        tokenStats.lastPromptTokens = pt;
+        // Per-model accumulation
+        const m = _currentModel;
+        if (!tokenStats.byModel[m]) tokenStats.byModel[m] = { input: 0, output: 0, requests: 0 };
+        tokenStats.byModel[m].input += pt;
+        tokenStats.byModel[m].output += ct;
+        tokenStats.byModel[m].requests++;
       }
       if (parsed.choices?.[0]?.finish_reason) {
         tokenStats.lastFinishReason = parsed.choices[0].finish_reason;
@@ -338,7 +377,34 @@ export async function agentLoop(serverUrl, messages, onToken, onToolCall, sessio
       tokenStats.lastPromptTokens = 0;
     }
 
-    const content = await streamCompletion(serverUrl, messages, onToken, memoryContext);
+    let content;
+    try {
+      content = await streamCompletion(serverUrl, messages, onToken, memoryContext);
+    } catch (e) {
+      // PROMPT_TOO_LONG recovery — compact and retry once
+      if (e.isPromptTooLong && messages.length > 4) {
+        onToken('\n[context too long — auto-compacting and retrying]\n');
+        const sys = messages[0];
+        const tail = messages.slice(-3);
+        messages.length = 0;
+        messages.push(sys, ...tail);
+        content = await streamCompletion(serverUrl, messages, onToken, memoryContext);
+      } else {
+        throw e;
+      }
+    }
+
+    // Token warning thresholds (from query.ts calculateTokenWarningState)
+    if (tokenStats.lastPromptTokens > 0) {
+      const pct = tokenStats.lastPromptTokens / CONTEXT_WINDOW;
+      for (const level of TOKEN_WARN_LEVELS) {
+        if (pct >= level.pct) {
+          onToken(`\n[${level.label}${level.urgent ? '' : ` ${Math.round(pct * 100)}%`}]\n`);
+          break;
+        }
+      }
+    }
+
     const toolCalls = parseToolCalls(content);
 
     messages.push({ role: 'assistant', content });
@@ -412,7 +478,17 @@ export async function agentLoop(serverUrl, messages, onToken, onToolCall, sessio
         } catch {}
       }
 
-      results.push(`[${tc.name} result]\n${resultStr.slice(0, 8000)}`);
+      // Compress large results before storing in context
+      let resultForContext = resultStr;
+      if (resultStr.length > SUMMARY_THRESHOLD && SUMMARIZABLE_TOOLS.has(tc.name)) {
+        try {
+          const summary = await generateToolUseSummary(serverUrl, tc.name, resultStr);
+          if (summary && summary.length < resultStr.length * 0.75) {
+            resultForContext = `[Summarized ${resultStr.length} → ${summary.length} chars]\n${summary}`;
+          }
+        } catch { /* keep raw result on failure */ }
+      }
+      results.push(`[${tc.name} result]\n${resultForContext.slice(0, 8000)}`);
     }
 
     messages.push({

package/lib/mcp.js

@@ -0,0 +1,258 @@
+/**
+ * MCP (Model Context Protocol) client for Tsunami Code.
+ *
+ * Reads ~/.tsunami-code/mcp.json, spawns server processes,
+ * speaks JSON-RPC 2.0 over stdio, discovers tools, and wraps
+ * them as Tsunami tool objects that plug into ALL_TOOLS.
+ *
+ * Config format (~/.tsunami-code/mcp.json):
+ * {
+ *   "servers": {
+ *     "filesystem": {
+ *       "command": "npx",
+ *       "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"],
+ *       "env": {}
+ *     }
+ *   }
+ * }
+ */
+
+import { spawn } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import os from 'os';
+
+const MCP_CONFIG_PATH = join(os.homedir(), '.tsunami-code', 'mcp.json');
+const MCP_PROTOCOL_VERSION = '2024-11-05';
+
+// Active connections: name → { process, pending: Map<id, {resolve, reject}>, tools: [], buffer: '' }
+const _servers = new Map();
+let _nextId = 1000;
+
+// ── Config ────────────────────────────────────────────────────────────────────
+function loadMcpConfig() {
+  if (!existsSync(MCP_CONFIG_PATH)) return { servers: {} };
+  try {
+    return JSON.parse(readFileSync(MCP_CONFIG_PATH, 'utf8'));
+  } catch {
+    return { servers: {} };
+  }
+}
+
+// ── JSON-RPC over stdio ───────────────────────────────────────────────────────
+function sendRequest(server, method, params = {}) {
+  return new Promise((resolve, reject) => {
+    const id = _nextId++;
+    server.pending.set(id, { resolve, reject });
+
+    const msg = JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n';
+    try {
+      server.process.stdin.write(msg);
+    } catch (e) {
+      server.pending.delete(id);
+      reject(new Error(`Failed to write to MCP server stdin: ${e.message}`));
+      return;
+    }
+
+    // Auto-reject after 10s to prevent hanging
+    const timer = setTimeout(() => {
+      if (server.pending.has(id)) {
+        server.pending.delete(id);
+        reject(new Error(`MCP request timed out (${method})`));
+      }
+    }, 10000);
+
+    // Clear timer when resolved
+    const orig = server.pending.get(id);
+    server.pending.set(id, {
+      resolve: (v) => { clearTimeout(timer); resolve(v); },
+      reject:  (e) => { clearTimeout(timer); reject(e); }
+    });
+  });
+}
+
+function sendNotification(server, method, params = {}) {
+  try {
+    const msg = JSON.stringify({ jsonrpc: '2.0', method, params }) + '\n';
+    server.process.stdin.write(msg);
+  } catch {}
+}
+
+function attachStdioHandler(serverName, server) {
+  server.process.stdout.on('data', (chunk) => {
+    server.buffer += chunk.toString();
+    // Process complete newline-delimited JSON messages
+    let nl;
+    while ((nl = server.buffer.indexOf('\n')) !== -1) {
+      const line = server.buffer.slice(0, nl).trim();
+      server.buffer = server.buffer.slice(nl + 1);
+      if (!line) continue;
+      try {
+        const msg = JSON.parse(line);
+        // Only handle responses (have id), not notifications
+        if (msg.id !== undefined && server.pending.has(msg.id)) {
+          const { resolve, reject } = server.pending.get(msg.id);
+          server.pending.delete(msg.id);
+          if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
+          else resolve(msg.result);
+        }
+      } catch { /* malformed JSON — skip */ }
+    }
+  });
+
+  server.process.stderr.on('data', () => {}); // absorb stderr silently
+
+  server.process.on('error', () => {
+    _servers.delete(serverName);
+    // Reject all pending requests
+    for (const { reject } of server.pending.values()) {
+      reject(new Error(`MCP server "${serverName}" crashed`));
+    }
+    server.pending.clear();
+  });
+
+  server.process.on('exit', () => {
+    _servers.delete(serverName);
+    for (const { reject } of server.pending.values()) {
+      reject(new Error(`MCP server "${serverName}" exited`));
+    }
+    server.pending.clear();
+  });
+}
+
+// ── Connect a single server ───────────────────────────────────────────────────
+async function connectServer(name, config) {
+  try {
+    const { command, args = [], env = {} } = config;
+
+    if (!command) throw new Error('Missing "command" in MCP server config');
+
+    const child = spawn(command, args, {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      env: { ...process.env, ...env },
+      shell: process.platform === 'win32'
+    });
+
+    const server = {
+      process: child,
+      pending: new Map(),
+      tools: [],
+      buffer: ''
+    };
+    _servers.set(name, server);
+    attachStdioHandler(name, server);
+
+    // 1. Initialize handshake
+    await sendRequest(server, 'initialize', {
+      protocolVersion: MCP_PROTOCOL_VERSION,
+      capabilities: { tools: {} },
+      clientInfo: { name: 'tsunami-code', version: '3.3.0' }
+    });
+
+    // 2. Send initialized notification (spec requires this, no response)
+    sendNotification(server, 'notifications/initialized');
+
+    // 3. Discover tools
+    const listResult = await sendRequest(server, 'tools/list', {});
+    server.tools = listResult?.tools || [];
+
+    return { name, toolCount: server.tools.length, tools: server.tools.map(t => t.name) };
+  } catch (e) {
+    _servers.delete(name);
+    return { name, toolCount: 0, error: e.message };
+  }
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+/**
+ * Connect all servers from mcp.json and return a status array.
+ * Safe to call even if mcp.json doesn't exist.
+ */
+export async function connectMcpServers() {
+  const config = loadMcpConfig();
+  const entries = Object.entries(config.servers || {});
+  if (entries.length === 0) return [];
+
+  const results = await Promise.allSettled(
+    entries.map(([name, cfg]) => connectServer(name, cfg))
+  );
+
+  return results.map(r =>
+    r.status === 'fulfilled' ? r.value : { error: r.reason?.message || 'unknown error' }
+  );
+}
+
+/**
+ * Returns Tsunami tool objects for all discovered MCP tools.
+ * Call this after connectMcpServers() and push the results into ALL_TOOLS.
+ */
+export function getMcpToolObjects() {
+  const toolObjects = [];
+
+  for (const [serverName, server] of _servers) {
+    for (const toolDef of server.tools) {
+      // Prefix with mcp__ to avoid name collisions with built-ins
+      const tsunamiName = `mcp__${serverName}__${toolDef.name}`;
+
+      toolObjects.push({
+        name: tsunamiName,
+        description: `[MCP:${serverName}] ${toolDef.description || toolDef.name}\n\nOriginal name: ${toolDef.name}`,
+        input_schema: toolDef.inputSchema || { type: 'object', properties: {} },
+        async run(args) {
+          const srv = _servers.get(serverName);
+          if (!srv) return `Error: MCP server "${serverName}" is not connected`;
+          try {
+            const result = await sendRequest(srv, 'tools/call', {
+              name: toolDef.name,
+              arguments: args
+            });
+            // MCP content blocks: [{ type: "text", text: "..." }, { type: "image", ... }]
+            const content = result?.content || [];
+            if (content.length === 0) return '(empty result)';
+            return content
+              .map(block => {
+                if (block.type === 'text') return block.text;
+                if (block.type === 'image') return `[image: ${block.mimeType || 'unknown'}]`;
+                return JSON.stringify(block);
+              })
+              .join('\n');
+          } catch (e) {
+            return `Error: ${e.message}`;
+          }
+        }
+      });
+    }
+  }
+
+  return toolObjects;
+}
+
+/**
+ * Returns status of all connected servers for /mcp command.
+ */
+export function getMcpStatus() {
+  if (_servers.size === 0) return [];
+  return Array.from(_servers.entries()).map(([name, server]) => ({
+    name,
+    toolCount: server.tools.length,
+    tools: server.tools.map(t => ({ name: t.name, description: (t.description || '').slice(0, 80) }))
+  }));
+}
+
+/**
+ * Returns config file path for user reference.
+ */
+export function getMcpConfigPath() {
+  return MCP_CONFIG_PATH;
+}
+
+/**
+ * Kill all child processes on exit.
+ */
+export function disconnectAll() {
+  for (const [, server] of _servers) {
+    try { server.process.kill('SIGTERM'); } catch {}
+  }
+  _servers.clear();
+}

package/lib/tools.js

@@ -8,6 +8,10 @@ import fetch from 'node-fetch';
 
 const execAsync = promisify(exec);
 
+// ── Lines Changed Tracking ────────────────────────────────────────────────────
+// Mirrors cost-tracker.ts addToTotalLinesChanged pattern
+export const linesChanged = { added: 0, removed: 0 };
+
 // ── Undo Stack ───────────────────────────────────────────────────────────────
 const _undoStack = [];
 const MAX_UNDO = 20;
@@ -115,8 +119,12 @@ export const WriteTool = {
           if (_undoStack.length > MAX_UNDO) _undoStack.shift();
         }
       } catch {}
+      const newLineCount = content.split('\n').length;
+      const oldLineCount = existsSync(file_path) ? readFileSync(file_path, 'utf8').split('\n').length : 0;
       writeFileSync(file_path, content, 'utf8');
-      return `Written ${content.split('\n').length} lines to ${file_path}`;
+      linesChanged.added += Math.max(0, newLineCount - oldLineCount);
+      linesChanged.removed += Math.max(0, oldLineCount - newLineCount);
+      return `Written ${newLineCount} lines to ${file_path}`;
     } catch (e) {
       return `Error writing file: ${e.message}`;
     }
@@ -159,6 +167,9 @@ export const EditTool = {
         ? content.split(old_string).join(new_string)
         : content.replace(old_string, new_string);
       writeFileSync(file_path, updated, 'utf8');
+      // Track lines changed: old_string lines removed, new_string lines added
+      linesChanged.added += new_string.split('\n').length;
+      linesChanged.removed += old_string.split('\n').length;
       return `Edited ${file_path}`;
     } catch (e) {
       return `Error editing file: ${e.message}`;
@@ -680,3 +691,16 @@ export const ALL_TOOLS = [
   AgentTool, SnipTool, BriefTool,
   KairosTool
 ];
+
+/**
+ * Register MCP tool objects into the live tool list.
+ * Called after MCP servers connect so the agent loop sees them immediately.
+ */
+export function registerMcpTools(mcpToolObjects) {
+  for (const tool of mcpToolObjects) {
+    // Don't double-register if reconnecting
+    if (!ALL_TOOLS.find(t => t.name === tool.name)) {
+      ALL_TOOLS.push(tool);
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsunami-code",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "Tsunami Code CLI — AI coding agent by Keystone World Management Navy Seal Unit XI3",
   "type": "module",
   "bin": {