tsunami-code 3.4.0 → 3.5.0

package/index.js

@@ -4,14 +4,14 @@ import chalk from 'chalk';
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import os from 'os';
-import { agentLoop, quickCompletion, setModel, getModel, tokenStats } from './lib/loop.js';
+import { agentLoop, quickCompletion, setModel, getModel, tokenStats, setTemperature, getTemperature } from './lib/loop.js';
 import { injectServerContext } from './lib/tools.js';
 import { loadSkills, getSkillCommand, createSkill, listSkills } from './lib/skills.js';
 import { isCoordinatorTask, stripCoordinatorPrefix, buildCoordinatorSystemPrompt } from './lib/coordinator.js';
 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, registerMcpTools, linesChanged } from './lib/tools.js';
+import { setSession, undo, undoStackSize, beginUndoTurn, registerMcpTools, linesChanged } from './lib/tools.js';
 import { connectMcpServers, getMcpToolObjects, getMcpStatus, getMcpConfigPath, disconnectAll as disconnectMcp } from './lib/mcp.js';
 import {
   initSession,
@@ -25,7 +25,7 @@ import {
   getSessionContext
 } from './lib/memory.js';
 
-const VERSION = '3.4.0';
+const VERSION = '3.5.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';
@@ -458,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','mcp','copy','btw','rewind','diff','stats','export'].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','effort'].includes(cmd)) {
         // Run the skill prompt as a user message
         const userContent = skillMatch.args
           ? `[Skill: ${skillMatch.skill.name}]\n${skillMatch.prompt}`
@@ -500,6 +500,7 @@ async function run() {
               ['/server <url>',    'Change model server URL'],
               ['/model [name]',    'Show or change active model (default: local)'],
               ['/mcp',             'Show MCP server status and tools'],
+              ['/effort <level>',  'Set reasoning effort: low/medium/high/max'],
               ['/copy',            'Copy last response to clipboard'],
               ['/btw <note>',      'Inject a note into conversation without a response'],
               ['/rewind',          'Remove last user+assistant exchange'],
@@ -526,8 +527,24 @@ async function run() {
           break;
         case 'undo': {
           const restored = undo();
-          if (restored) console.log(green(`  ✓ Restored: ${restored}\n`));
-          else console.log(dim('  Nothing to undo.\n'));
+          if (restored) {
+            if (restored.length === 1) console.log(green(`  ✓ Restored: ${restored[0]}\n`));
+            else console.log(green(`  ✓ Restored ${restored.length} files:\n`) + restored.map(f => dim(`    ${f}`)).join('\n') + '\n');
+          } else {
+            console.log(dim('  Nothing to undo.\n'));
+          }
+          break;
+        }
+        case 'effort': {
+          const level = rest[0]?.toLowerCase();
+          const levels = { low: 0.5, medium: 0.2, high: 0.05, max: 0.0 };
+          if (!level || !levels[level] && levels[level] !== 0) {
+            const cur = getTemperature();
+            console.log(dim(`  Current temperature: ${cur}\n  Usage: /effort <low|medium|high|max>\n`));
+            break;
+          }
+          setTemperature(levels[level]);
+          console.log(green(`  Effort: ${level} (temperature ${levels[level]})\n`));
           break;
         }
         case 'mcp': {
@@ -829,6 +846,9 @@ async function run() {
     isProcessing = true;
     process.stdout.write('\n');
 
+    // Open a new undo turn — all Write/Edit calls during this turn grouped together
+    beginUndoTurn();
+
     let firstToken = true;
     try {
       await agentLoop(
@@ -863,6 +883,11 @@ async function run() {
         console.log(dim('  ↯ Auto-compacted\n'));
       }
 
+      // getDynamicSkills — reload if model created/modified skill files this turn
+      // From CC's getDynamicSkills pattern in commands.ts
+      const newSkills = loadSkills(cwd);
+      if (newSkills.length !== skills.length) skills = newSkills;
+
       process.stdout.write('\n\n');
     } catch (e) {
       process.stdout.write('\n');
@@ -882,9 +907,18 @@ async function run() {
     if (!isProcessing) {
       gracefulExit(0);
     } else {
-      // If processing, mark pending and let the loop finish
+      // Remove interrupted command from history (from history.ts removeLastFromHistory)
+      try {
+        if (existsSync(HISTORY_FILE)) {
+          const lines = readFileSync(HISTORY_FILE, 'utf8').trimEnd().split('\n').filter(Boolean);
+          if (lines.length > 0) lines.pop();
+          import('fs').then(({ writeFileSync: wfs }) => {
+            try { wfs(HISTORY_FILE, lines.join('\n') + (lines.length ? '\n' : ''), 'utf8'); } catch {}
+          });
+        }
+      } catch {}
       pendingClose = true;
-      console.log(dim('\n  (finishing current operation...)\n'));
+      console.log(dim('\n  (interrupted)\n'));
     }
   });
 }

package/lib/loop.js

@@ -59,6 +59,11 @@ let _currentModel = 'local';
 export function setModel(model) { _currentModel = model; }
 export function getModel() { return _currentModel; }
 
+// Temperature — changeable via /effort command
+let _temperature = 0.1;
+export function setTemperature(t) { _temperature = Math.max(0, Math.min(1, t)); }
+export function getTemperature() { return _temperature; }
+
 // Parse tool calls from any format the model might produce
 function parseToolCalls(content) {
   const calls = [];
@@ -232,7 +237,7 @@ async function streamCompletion(serverUrl, messages, onToken, memoryContext = ''
       model: _currentModel,
       messages: finalMessages,
       stream: true,
-      temperature: 0.1,
+      temperature: _temperature,
       max_tokens: 4096,
       stop: ['</tool_call>\n\nContinue']
     })

package/lib/prompt.js

@@ -8,8 +8,20 @@ function getGitContext() {
     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}`);
+    // Main branch detection (from context.ts getDefaultBranch pattern)
+    let mainBranch = 'main';
+    try { mainBranch = execSync('git symbolic-ref refs/remotes/origin/HEAD', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim().replace('refs/remotes/origin/', ''); } catch {}
+    if (!mainBranch) try { mainBranch = execSync('git config init.defaultBranch', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim(); } catch {}
+    // Git user name (from context.ts)
+    let userName = '';
+    try { userName = execSync('git config user.name', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim(); } catch {}
+    // Truncate status at 2000 chars (from context.ts MAX_STATUS_CHARS)
+    const truncatedStatus = status.length > 2000
+      ? status.slice(0, 2000) + '\n... (truncated — run git status for full output)'
+      : status;
+    const parts = [`Branch: ${branch}`, `Main branch (for PRs): ${mainBranch}`];
+    if (userName) parts.push(`Git user: ${userName}`);
+    if (truncatedStatus) parts.push(`Changed files:\n${truncatedStatus}`);
     if (log) parts.push(`Recent commits:\n${log}`);
     return `\n\n<git>\n${parts.join('\n\n')}\n</git>`;
   } catch {

package/lib/tools.js

@@ -12,15 +12,55 @@ const execAsync = promisify(exec);
 // Mirrors cost-tracker.ts addToTotalLinesChanged pattern
 export const linesChanged = { added: 0, removed: 0 };
 
-// ── Undo Stack ───────────────────────────────────────────────────────────────
-const _undoStack = [];
-const MAX_UNDO = 20;
+// ── Undo Stack (per-turn batching) ───────────────────────────────────────────
+// Mirrors CC's multi-file undo: each turn's file changes grouped together.
+// /undo restores ALL files changed in the last turn at once.
+const _undoTurns = [];       // Array of turns: each is [{ filePath, content }]
+let _currentTurnFiles = [];  // Accumulates file snapshots for the active turn
+const MAX_UNDO_TURNS = 10;
+
+/** Call before each agent turn starts to open a new undo group. */
+export function beginUndoTurn() {
+  if (_currentTurnFiles.length > 0) {
+    _undoTurns.push([..._currentTurnFiles]);
+    if (_undoTurns.length > MAX_UNDO_TURNS) _undoTurns.shift();
+  }
+  _currentTurnFiles = [];
+}
+
+function _pushFileSnapshot(filePath) {
+  // Only snapshot once per file per turn (first state = what to restore to)
+  if (_currentTurnFiles.some(f => f.filePath === filePath)) return;
+  try {
+    const content = existsSync(filePath) ? readFileSync(filePath, 'utf8') : null;
+    _currentTurnFiles.push({ filePath, content });
+  } catch {}
+}
+
+/** Undo all file changes from the most recent turn. Returns list of restored paths. */
 export function undo() {
-  if (_undoStack.length === 0) return null;
-  const { filePath, content } = _undoStack.pop();
-  try { writeFileSync(filePath, content, 'utf8'); return filePath; } catch { return null; }
+  // Commit current turn if it has anything
+  if (_currentTurnFiles.length > 0) {
+    _undoTurns.push([..._currentTurnFiles]);
+    _currentTurnFiles = [];
+  }
+  if (_undoTurns.length === 0) return null;
+  const turn = _undoTurns.pop();
+  const restored = [];
+  for (const { filePath, content } of turn.reverse()) {
+    try {
+      if (content === null) {
+        // File was created this turn — remove it
+        import('fs').then(({ unlinkSync }) => { try { unlinkSync(filePath); } catch {} });
+      } else {
+        writeFileSync(filePath, content, 'utf8');
+      }
+      restored.push(filePath);
+    } catch {}
+  }
+  return restored.length ? restored : null;
 }
-export function undoStackSize() { return _undoStack.length; }
+export function undoStackSize() { return _undoTurns.length + (_currentTurnFiles.length > 0 ? 1 : 0); }
 
 // ── Session Context (set by index.js at startup) ──────────────────────────────
 let _sessionDir = null;
@@ -112,13 +152,7 @@ export const WriteTool = {
   },
   async run({ file_path, content }) {
     try {
-      // Undo stack: save previous content before overwriting
-      try {
-        if (existsSync(file_path)) {
-          _undoStack.push({ filePath: file_path, content: readFileSync(file_path, 'utf8') });
-          if (_undoStack.length > MAX_UNDO) _undoStack.shift();
-        }
-      } catch {}
+      _pushFileSnapshot(file_path);
       const newLineCount = content.split('\n').length;
       const oldLineCount = existsSync(file_path) ? readFileSync(file_path, 'utf8').split('\n').length : 0;
       writeFileSync(file_path, content, 'utf8');
@@ -153,11 +187,7 @@ export const EditTool = {
     if (!existsSync(file_path)) return `Error: File not found: ${file_path}`;
     try {
       let content = readFileSync(file_path, 'utf8');
-      // Undo stack: save current content before editing
-      try {
-        _undoStack.push({ filePath: file_path, content });
-        if (_undoStack.length > MAX_UNDO) _undoStack.shift();
-      } catch {}
+      _pushFileSnapshot(file_path);
       if (!content.includes(old_string)) return `Error: old_string not found in ${file_path}`;
       if (!replace_all) {
         const count = content.split(old_string).length - 1;

package/package.json

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