tsunami-code 2.7.0 → 2.9.0

package/index.js

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import os from 'os';
-import { agentLoop, quickCompletion } from './lib/loop.js';
+import { agentLoop, quickCompletion, setModel, getModel } from './lib/loop.js';
 import { buildSystemPrompt } from './lib/prompt.js';
 import { runPreflight, checkServer } from './lib/preflight.js';
 import { setSession, undo, undoStackSize } from './lib/tools.js';
@@ -20,7 +20,7 @@ import {
   getSessionContext
 } from './lib/memory.js';
 
-const VERSION = '2.7.0';
+const VERSION = '2.9.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';
@@ -131,7 +131,7 @@ if (setServerIdx !== -1 && argv[setServerIdx + 1]) {
 
 // ── Confirm Callback (dangerous command prompt) ─────────────────────────────
 function makeConfirmCallback(rl) {
-  return async (cmd) => {
+  const cb = async (cmd) => {
     return new Promise((resolve) => {
       rl.pause();
       process.stdout.write(`\n  ${yellow('⚠  Dangerous:')} ${dim(cmd.slice(0, 120))}\n`);
@@ -145,6 +145,20 @@ function makeConfirmCallback(rl) {
       process.stdin.once('data', handler);
     });
   };
+
+  cb._askUser = (question, resolve) => {
+    rl.pause();
+    process.stdout.write(`\n  ${cyan('?')} ${question}\n  ${dim('> ')}`);
+    const handler = (data) => {
+      process.stdin.removeListener('data', handler);
+      rl.resume();
+      process.stdout.write('\n');
+      resolve(data.toString().trim());
+    };
+    process.stdin.once('data', handler);
+  };
+
+  return cb;
 }
 
 // ── Main ──────────────────────────────────────────────────────────────────────
@@ -369,6 +383,7 @@ async function run() {
               ['/clear',           'Start new conversation'],
               ['/status',          'Show context size and server'],
               ['/server <url>',    'Change model server URL'],
+              ['/model [name]',    'Show or change active model (default: local)'],
               ['/exit',            'Exit'],
             ];
             for (const [c, desc] of cmds) {
@@ -437,6 +452,14 @@ async function run() {
             console.log(dim(`  Current server: ${currentServerUrl}\n`));
           }
           break;
+        case 'model':
+          if (rest[0]) {
+            setModel(rest[0]);
+            console.log(green(`  Model changed to: ${rest[0]}\n`));
+          } else {
+            console.log(dim(`  Current model: ${getModel()}\n`));
+          }
+          break;
         case 'memory':
           await handleMemoryCommand(rest);
           break;

package/lib/loop.js

@@ -29,6 +29,11 @@ function isDangerous(cmd) {
 // Skip waitForServer after first successful connection
 let _serverVerified = false;
 
+// Current model identifier — changeable at runtime via /model command
+let _currentModel = 'local';
+export function setModel(model) { _currentModel = model; }
+export function getModel() { return _currentModel; }
+
 // Parse tool calls from any format the model might produce
 function parseToolCalls(content) {
   const calls = [];
@@ -199,7 +204,7 @@ async function streamCompletion(serverUrl, messages, onToken, memoryContext = ''
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
-      model: 'local',
+      model: _currentModel,
       messages: finalMessages,
       stream: true,
       temperature: 0.1,
@@ -254,7 +259,7 @@ export async function quickCompletion(serverUrl, systemPrompt, userMessage) {
       signal: controller.signal,
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        model: 'local',
+        model: _currentModel,
         messages: [
           { role: 'system', content: systemPrompt },
           { role: 'user', content: userMessage }
@@ -312,6 +317,20 @@ export async function agentLoop(serverUrl, messages, onToken, onToolCall, sessio
         continue;
       }
 
+      // AskUser: intercept and surface the question to the user
+      if (tc.name === 'AskUser' && confirmCallback) {
+        const parsed = typeof tc.arguments === 'string' ? JSON.parse(tc.arguments) : tc.arguments;
+        const normalized = normalizeArgs(parsed);
+        onToolCall(tc.name, typeof tc.arguments === 'string' ? tc.arguments : JSON.stringify(tc.arguments));
+        // Reuse confirmCallback channel but pass question back as answer
+        const answer = await new Promise(resolve => confirmCallback._askUser
+          ? confirmCallback._askUser(normalized.question, resolve)
+          : resolve('[No answer provided]')
+        );
+        results.push(`[AskUser result]\nUser answered: ${answer}`);
+        continue;
+      }
+
       // Dangerous command confirmation
       if (tc.name === 'Bash' && confirmCallback) {
         const parsed = typeof tc.arguments === 'string' ? JSON.parse(tc.arguments) : tc.arguments;

package/lib/prompt.js

@@ -1,6 +1,21 @@
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import os from 'os';
+import { execSync } from 'child_process';
+
+function getGitContext() {
+  try {
+    const branch = execSync('git rev-parse --abbrev-ref HEAD', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+    const status = execSync('git status --short', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+    const log = execSync('git log --oneline -5', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+    const parts = [`Branch: ${branch}`];
+    if (status) parts.push(`Changed files:\n${status}`);
+    if (log) parts.push(`Recent commits:\n${log}`);
+    return `\n\n<git>\n${parts.join('\n\n')}\n</git>`;
+  } catch {
+    return '';
+  }
+}
 
 function loadContextFile() {
   const locations = [
@@ -23,6 +38,8 @@ export function buildSystemPrompt(memoryContext = '') {
   const cwd = process.cwd();
   const context = loadContextFile();
 
+  const gitContext = getGitContext();
+
   return `You are an expert software engineer and technical assistant operating as a CLI agent. You think deeply before acting, trace data flow before changing code, and verify your work.
 
 To use a tool, output ONLY this format — nothing else before or after the tool call block:
@@ -38,7 +55,7 @@ Available tools: Bash, Read, Write, Edit, Glob, Grep, Note, Checkpoint. Use them
 - Platform: ${process.platform}
 - Shell: ${process.platform === 'win32' ? 'cmd/powershell' : 'bash'}
 - Date: ${new Date().toISOString().split('T')[0]}
-</environment>
+</environment>${gitContext}
 
 <tools>
 - **Bash**: Run shell commands. Never use for grep/find/cat — use dedicated tools.
@@ -49,6 +66,9 @@ Available tools: Bash, Read, Write, Edit, Glob, Grep, Note, Checkpoint. Use them
 - **Grep**: Search file contents by regex. Always use instead of grep in Bash.
 - **Note**: Save a permanent discovery to project memory (.tsunami/). Use liberally for traps, patterns, architectural decisions.
 - **Checkpoint**: Save current task progress to session memory so work is resumable if the session ends.
+- **WebFetch**: Fetch any URL and get the page content as text. Use for docs, GitHub files, APIs.
+- **TodoWrite**: Manage a persistent task list (add/complete/delete/list). Use for any multi-step task.
+- **AskUser**: Ask the user a clarifying question when genuinely blocked. Use sparingly.
 </tools>
 
 <reasoning_protocol>

package/lib/tools.js

@@ -4,6 +4,7 @@ import { glob } from 'glob';
 import { promisify } from 'util';
 import { getRgPath } from './preflight.js';
 import { addFileNote, updateContext, appendDecision } from './memory.js';
+import fetch from 'node-fetch';
 
 const execAsync = promisify(exec);
 
@@ -324,4 +325,132 @@ EXAMPLE:
   }
 };
 
-export const ALL_TOOLS = [BashTool, ReadTool, WriteTool, EditTool, GlobTool, GrepTool, NoteTool, CheckpointTool];
+// ── WEB FETCH ─────────────────────────────────────────────────────────────────
+export const WebFetchTool = {
+  name: 'WebFetch',
+  description: `Fetches content from a URL and returns it as text. Use for reading documentation, API references, GitHub files, or any web resource needed to complete a task.
+
+- Returns page content as plain text (HTML stripped)
+- Max ~50KB returned; large pages are truncated
+- Do not use for downloading binaries`,
+  input_schema: {
+    type: 'object',
+    properties: {
+      url: { type: 'string', description: 'The URL to fetch' },
+      prompt: { type: 'string', description: 'What to extract or summarize from the page (optional — returns raw text if omitted)' }
+    },
+    required: ['url']
+  },
+  async run({ url, prompt: _prompt }) {
+    try {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), 15000);
+      const res = await fetch(url, {
+        signal: controller.signal,
+        headers: { 'User-Agent': 'Mozilla/5.0 (compatible; TsunamiCode/2.9)' }
+      });
+      clearTimeout(timer);
+      if (!res.ok) return `Error: HTTP ${res.status} ${res.statusText}`;
+      const raw = await res.text();
+      // Strip HTML tags, collapse whitespace
+      const text = raw
+        .replace(/<script[\s\S]*?<\/script>/gi, '')
+        .replace(/<style[\s\S]*?<\/style>/gi, '')
+        .replace(/<[^>]+>/g, ' ')
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&amp;/g, '&')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/\s{3,}/g, '\n\n')
+        .trim();
+      return text.slice(0, 50000) + (text.length > 50000 ? '\n\n[truncated]' : '');
+    } catch (e) {
+      if (e.name === 'AbortError') return 'Error: Request timed out after 15s';
+      return `Error fetching URL: ${e.message}`;
+    }
+  }
+};
+
+// ── TODO WRITE ────────────────────────────────────────────────────────────────
+// In-memory todo list — persists for the session, visible to the model
+const _todos = [];
+let _todoId = 0;
+
+export const TodoWriteTool = {
+  name: 'TodoWrite',
+  description: `Manage a persistent task list for the current session. Use this to track multi-step work so nothing gets lost.
+
+Operations:
+- add: Add a new todo item
+- complete: Mark a todo as done (by id)
+- delete: Remove a todo (by id)
+- list: Show all todos (also happens automatically)
+
+WHEN TO USE:
+- Any task with 3+ steps — create the list upfront
+- After completing a step — mark it done immediately
+- When starting work on a step — mark it in_progress
+
+The list is shown to the user after every update.`,
+  input_schema: {
+    type: 'object',
+    properties: {
+      op: { type: 'string', enum: ['add', 'complete', 'delete', 'list'], description: 'Operation to perform' },
+      text: { type: 'string', description: 'Todo text (for add)' },
+      id: { type: 'number', description: 'Todo ID (for complete/delete)' },
+      status: { type: 'string', enum: ['pending', 'in_progress', 'done'], description: 'Status for complete op (default: done)' }
+    },
+    required: ['op']
+  },
+  async run({ op, text, id, status = 'done' }) {
+    if (op === 'add') {
+      if (!text) return 'Error: text required for add';
+      _todoId++;
+      _todos.push({ id: _todoId, text, status: 'pending' });
+    } else if (op === 'complete') {
+      const todo = _todos.find(t => t.id === id);
+      if (!todo) return `Error: todo #${id} not found`;
+      todo.status = status;
+    } else if (op === 'delete') {
+      const idx = _todos.findIndex(t => t.id === id);
+      if (idx === -1) return `Error: todo #${id} not found`;
+      _todos.splice(idx, 1);
+    }
+    // Always return current list
+    if (_todos.length === 0) return 'Todo list is empty.';
+    const icons = { pending: '○', in_progress: '◉', done: '✓' };
+    return _todos.map(t => `${icons[t.status] || '○'} [${t.id}] ${t.text}`).join('\n');
+  }
+};
+
+// ── ASK USER ──────────────────────────────────────────────────────────────────
+// This tool is a signal — the agent loop in index.js intercepts it and prompts the user
+export const AskUserTool = {
+  name: 'AskUser',
+  description: `Ask the user a clarifying question and wait for their answer. Use this when you are genuinely blocked and need input that cannot be inferred.
+
+Only use when:
+- Multiple valid approaches exist with meaningfully different outcomes
+- Required information cannot be found in the codebase, env, or context
+- A destructive or irreversible action needs explicit confirmation
+
+Do NOT use for:
+- Things you can infer from context
+- Choices that don't materially affect the outcome
+- Asking if you should proceed (just proceed)`,
+  input_schema: {
+    type: 'object',
+    properties: {
+      question: { type: 'string', description: 'The question to ask the user' }
+    },
+    required: ['question']
+  },
+  async run({ question }) {
+    // The agent loop intercepts this and handles the actual prompt.
+    // Return value here is fallback only.
+    return `[AskUser] ${question}`;
+  }
+};
+
+export const ALL_TOOLS = [BashTool, ReadTool, WriteTool, EditTool, GlobTool, GrepTool, NoteTool, CheckpointTool, WebFetchTool, TodoWriteTool, AskUserTool];

package/package.json

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