tsunami-code 3.0.0 → 3.1.0

package/index.js

@@ -6,6 +6,7 @@ import { join } from 'path';
 import os from 'os';
 import { agentLoop, quickCompletion, setModel, getModel, tokenStats } from './lib/loop.js';
 import { injectServerContext } from './lib/tools.js';
+import { loadSkills, getSkillCommand, createSkill, listSkills } from './lib/skills.js';
 import { buildSystemPrompt } from './lib/prompt.js';
 import { runPreflight, checkServer } from './lib/preflight.js';
 import { setSession, undo, undoStackSize } from './lib/tools.js';
@@ -21,7 +22,7 @@ import {
   getSessionContext
 } from './lib/memory.js';
 
-const VERSION = '3.0.0';
+const VERSION = '3.1.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';
@@ -173,6 +174,9 @@ async function run() {
   initProjectMemory(cwd);
   setSession({ sessionDir, cwd });
 
+  // Load skills
+  let skills = loadSkills(cwd);
+
   // Inject server context into AgentTool
   injectServerContext(serverUrl, buildSystemPrompt());
 
@@ -407,6 +411,30 @@ async function run() {
       const cmd = parts[0].toLowerCase();
       const rest = parts.slice(1);
 
+      // 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)) {
+        // Run the skill prompt as a user message
+        const userContent = skillMatch.args
+          ? `[Skill: ${skillMatch.skill.name}]\n${skillMatch.prompt}`
+          : skillMatch.prompt;
+        messages.push({ role: 'user', content: userContent });
+        const fullMessages = [{ role: 'system', content: systemPrompt }, ...messages];
+        rl.pause(); isProcessing = true;
+        process.stdout.write('\n' + dim(`  ◈ Running skill: ${skillMatch.skill.name}\n\n`));
+        let firstToken = true;
+        try {
+          await agentLoop(currentServerUrl, fullMessages, (token) => {
+            if (firstToken) { process.stdout.write('  '); firstToken = false; }
+            process.stdout.write(token);
+          }, (name, args) => { printToolCall(name, args); firstToken = true; },
+          { sessionDir, cwd, planMode }, makeConfirmCallback(rl));
+          process.stdout.write('\n\n');
+        } catch(e) { console.error(red(`  Error: ${e.message}\n`)); }
+        isProcessing = false; rl.resume(); rl.prompt();
+        return;
+      }
+
       switch (cmd) {
         case 'help':
           console.log(blue('\n  Tsunami Code CLI — Commands\n'));
@@ -515,6 +543,19 @@ async function run() {
         case 'memory':
           await handleMemoryCommand(rest);
           break;
+        case 'skills':
+        case 'skill-list':
+          console.log(dim('\n' + listSkills(skills) + '\n'));
+          break;
+        case 'skill-create': {
+          const [skillName, ...skillBody] = rest;
+          if (!skillName) { console.log(red('  Usage: /skill-create <name> <prompt...>\n')); break; }
+          const body = skillBody.join(' ') || 'Do the following: {{ARGS}}';
+          const { slug } = createSkill(cwd, skillName, body, 'project');
+          skills = loadSkills(cwd);
+          console.log(green(`  Skill created: /${slug}\n`));
+          break;
+        }
         case 'history': {
           const recent = historyEntries.slice(0, 20);
           if (recent.length === 0) { console.log(dim('  No history yet.\n')); break; }

package/lib/loop.js

@@ -237,11 +237,15 @@ async function streamCompletion(serverUrl, messages, onToken, memoryContext = ''
         fullContent += token;
         onToken(token);
       }
-      // Capture real token counts from usage field (sent on final chunk by llama.cpp)
+      // Capture real token counts + finish reason
       if (parsed.usage) {
         tokenStats.input += parsed.usage.prompt_tokens || 0;
         tokenStats.output += parsed.usage.completion_tokens || 0;
         tokenStats.requests++;
+        tokenStats.lastPromptTokens = parsed.usage.prompt_tokens || 0;
+      }
+      if (parsed.choices?.[0]?.finish_reason) {
+        tokenStats.lastFinishReason = parsed.choices[0].finish_reason;
       }
     }
   }
@@ -315,12 +319,39 @@ export async function agentLoop(serverUrl, messages, onToken, onToolCall, sessio
 
   let memoryContext = buildMemoryContext();
 
+  // Max tokens recovery — mirrors Claude Code's MAX_OUTPUT_TOKENS_RECOVERY_LIMIT=3
+  let maxTokensRecoveryCount = 0;
+  const MAX_TOKENS_RECOVERY = 3;
+
+  // Token-aware auto-compact — compact at 80% of context window (4096 default)
+  const CONTEXT_WINDOW = 4096;
+  const COMPACT_THRESHOLD = Math.floor(CONTEXT_WINDOW * 0.80);
+
   for (let i = 0; i < maxIterations; i++) {
+    // Pre-flight: if last prompt consumed >80% of context, auto-compact before next call
+    if (tokenStats.lastPromptTokens > COMPACT_THRESHOLD && messages.length > 4) {
+      onToken('\n[auto-compact: context at ' + Math.round(tokenStats.lastPromptTokens / CONTEXT_WINDOW * 100) + '%]\n');
+      // Keep system + last 4 messages only
+      const sys = messages[0];
+      messages.length = 0;
+      messages.push(sys, ...messages.slice(-4));
+      tokenStats.lastPromptTokens = 0;
+    }
+
     const content = await streamCompletion(serverUrl, messages, onToken, memoryContext);
     const toolCalls = parseToolCalls(content);
 
     messages.push({ role: 'assistant', content });
 
+    // Max tokens recovery: if model hit length limit and produced no tool calls, continue
+    if (toolCalls.length === 0 && tokenStats.lastFinishReason === 'length' && maxTokensRecoveryCount < MAX_TOKENS_RECOVERY) {
+      maxTokensRecoveryCount++;
+      tokenStats.lastFinishReason = null;
+      messages.push({ role: 'user', content: 'Continue from exactly where you left off. Do not repeat anything.' });
+      continue;
+    }
+    maxTokensRecoveryCount = 0;
+
     if (toolCalls.length === 0) break;
 
     const results = [];

package/lib/skills.js

@@ -0,0 +1,103 @@
+/**
+ * Skills system — user-defined slash commands stored as markdown files.
+ * Mirrors Claude Code's SkillTool / commands system.
+ *
+ * Skills live in:
+ *   ~/.tsunami-code/skills/*.md        (global)
+ *   <project>/.tsunami/skills/*.md     (project-local, higher priority)
+ *
+ * File format:
+ *   # Skill Name
+ *   Optional description line
+ *
+ *   Prompt content here. Can reference {{ARGS}} for user-supplied arguments.
+ */
+
+import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { join, basename } from 'path';
+import os from 'os';
+
+const GLOBAL_SKILLS_DIR = join(os.homedir(), '.tsunami-code', 'skills');
+
+function ensureSkillsDir(dir) {
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+}
+
+function slugify(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+}
+
+function parseSkillFile(filePath, content) {
+  const lines = content.split('\n');
+  const titleLine = lines.find(l => l.startsWith('# '));
+  const name = titleLine ? titleLine.slice(2).trim() : basename(filePath, '.md');
+  const slug = slugify(name);
+
+  // Description: first non-empty line after the title that starts with lowercase
+  const titleIdx = lines.indexOf(titleLine);
+  const descLine = lines.slice(titleIdx + 1).find(l => l.trim() && !l.startsWith('#'));
+  const description = descLine?.trim() || `Run ${name} skill`;
+
+  // Prompt: everything after the first blank line after title
+  const bodyStart = lines.findIndex((l, i) => i > titleIdx && l.trim() === '') + 1;
+  const prompt = bodyStart > 0 ? lines.slice(bodyStart).join('\n').trim() : content;
+
+  return { name, slug, description, prompt, filePath };
+}
+
+export function loadSkills(cwd) {
+  const skills = new Map(); // slug → skill
+
+  // Load global skills first
+  ensureSkillsDir(GLOBAL_SKILLS_DIR);
+  for (const dir of [GLOBAL_SKILLS_DIR, join(cwd, '.tsunami', 'skills')]) {
+    if (!existsSync(dir)) continue;
+    try {
+      for (const file of readdirSync(dir).filter(f => f.endsWith('.md'))) {
+        const filePath = join(dir, file);
+        const content = readFileSync(filePath, 'utf8');
+        const skill = parseSkillFile(filePath, content);
+        skills.set(skill.slug, skill); // project skills override global
+      }
+    } catch {}
+  }
+
+  return skills;
+}
+
+export function getSkillCommand(skills, input) {
+  // Match /skill-slug [args...]
+  const parts = input.slice(1).split(' ');
+  const slug = parts[0].toLowerCase();
+  const args = parts.slice(1).join(' ');
+
+  const skill = skills.get(slug);
+  if (!skill) return null;
+
+  const prompt = args
+    ? skill.prompt.replace(/\{\{ARGS\}\}/g, args).replace(/\{\{args\}\}/g, args)
+    : skill.prompt;
+
+  return { skill, prompt, args };
+}
+
+export function createSkill(cwd, name, content, scope = 'project') {
+  const dir = scope === 'global'
+    ? GLOBAL_SKILLS_DIR
+    : join(cwd, '.tsunami', 'skills');
+  ensureSkillsDir(dir);
+  const slug = slugify(name);
+  const filePath = join(dir, `${slug}.md`);
+  const fileContent = `# ${name}\n\n${content}\n`;
+  writeFileSync(filePath, fileContent, 'utf8');
+  return { slug, filePath };
+}
+
+export function listSkills(skills) {
+  if (skills.size === 0) return 'No skills defined. Create one with /skill-create <name>.';
+  const lines = ['Available skills:'];
+  for (const s of skills.values()) {
+    lines.push(`  /${s.slug.padEnd(20)} ${s.description}`);
+  }
+  return lines.join('\n');
+}

package/package.json

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