@hasna/terminal 0.1.3 → 0.1.5

package/dist/ai.js

@@ -1,9 +1,23 @@
 import Anthropic from "@anthropic-ai/sdk";
+import { cacheGet, cacheSet } from "./cache.js";
 const client = new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY });
+// ── model routing ─────────────────────────────────────────────────────────────
+// Simple queries → haiku (fast). Complex/ambiguous → sonnet.
+const COMPLEX_SIGNALS = [
+    /\b(undo|revert|rollback|previous|last)\b/i,
+    /\b(all files?|recursively|bulk|batch)\b/i,
+    /\b(pipeline|chain|then|and then|after)\b/i,
+    /\b(if|when|unless|only if)\b/i,
+    /[|&;]{2}/, // pipes / &&  in NL (unusual = complex intent)
+];
+function pickModel(nl) {
+    const isComplex = COMPLEX_SIGNALS.some((r) => r.test(nl)) || nl.split(" ").length > 10;
+    return isComplex ? "claude-sonnet-4-6" : "claude-haiku-4-5-20251001";
+}
 // ── irreversibility ───────────────────────────────────────────────────────────
 const IRREVERSIBLE_PATTERNS = [
     /\brm\s/, /\brmdir\b/, /\btruncate\b/, /\bdrop\s+table\b/i,
-    /\bdelete\s+from\b/i, /\bmv\b.*\/dev\/null/, /\b>\s*[^>]/, // overwrite redirect
+    /\bdelete\s+from\b/i, /\bmv\b.*\/dev\/null/, /\b>\s*[^>]/,
     /\bdd\b/, /\bmkfs\b/, /\bformat\b/, /\bshred\b/,
 ];
 export function isIrreversible(command) {
@@ -32,35 +46,82 @@ export function checkPermissions(command, perms) {
 function buildSystemPrompt(perms, sessionCmds) {
     const restrictions = [];
     if (!perms.destructive)
-        restrictions.push("- NEVER generate commands that delete, remove, or overwrite files/data (rm, rmdir, truncate, DROP TABLE, etc.)");
+        restrictions.push("- NEVER generate commands that delete, remove, or overwrite files/data");
     if (!perms.network)
-        restrictions.push("- NEVER generate commands that make network requests (curl, wget, ssh, scp, ping, nc, etc.)");
+        restrictions.push("- NEVER generate commands that make network requests (curl, wget, ssh, etc.)");
     if (!perms.sudo)
-        restrictions.push("- NEVER generate commands that use sudo or require root privileges");
+        restrictions.push("- NEVER generate commands requiring sudo");
     if (!perms.write_outside_cwd)
-        restrictions.push("- NEVER generate commands that write to paths outside the current working directory");
+        restrictions.push("- NEVER write to paths outside the current working directory");
     if (!perms.install)
-        restrictions.push("- NEVER generate commands that install packages (brew install, npm install -g, pip install, apt install, etc.)");
+        restrictions.push("- NEVER install packages (brew, npm -g, pip, apt, etc.)");
     const restrictionBlock = restrictions.length > 0
-        ? `\n\nCURRENT RESTRICTIONS (respect absolutely):\n${restrictions.join("\n")}\nIf restricted, output exactly: BLOCKED: <reason>`
+        ? `\n\nRESTRICTIONS:\n${restrictions.join("\n")}\nIf restricted, output: BLOCKED: <reason>`
         : "";
     const contextBlock = sessionCmds.length > 0
-        ? `\n\nRECENT COMMANDS THIS SESSION (for context — e.g. "undo that", "do the same for X"):\n${sessionCmds.map((c) => `$ ${c}`).join("\n")}`
+        ? `\n\nSESSION HISTORY:\n${sessionCmds.map((c) => `$ ${c}`).join("\n")}`
         : "";
-    const cwd = process.cwd();
-    return `You are a terminal assistant. The user will describe what they want to do in plain English.
-Your job is to output ONLY the exact shell command(s) to accomplish this — nothing else.
-No explanation. No markdown. No backticks. Just the raw command.
-If multiple commands are needed, join them with && or use a newline.
-Assume macOS/Linux zsh environment.
-Current working directory: ${cwd}${restrictionBlock}${contextBlock}`;
+    return `You are a terminal assistant. Output ONLY the exact shell command — no explanation, no markdown, no backticks.
+cwd: ${process.cwd()}
+shell: zsh / macOS${restrictionBlock}${contextBlock}`;
+}
+// ── streaming translate ───────────────────────────────────────────────────────
+export async function translateToCommand(nl, perms, sessionCmds, onToken) {
+    // cache hit — instant
+    const cached = cacheGet(nl);
+    if (cached) {
+        onToken?.(cached);
+        return cached;
+    }
+    const model = pickModel(nl);
+    let result = "";
+    if (onToken) {
+        // streaming path
+        const stream = await client.messages.stream({
+            model,
+            max_tokens: 256,
+            system: buildSystemPrompt(perms, sessionCmds),
+            messages: [{ role: "user", content: nl }],
+        });
+        for await (const chunk of stream) {
+            if (chunk.type === "content_block_delta" && chunk.delta.type === "text_delta") {
+                result += chunk.delta.text;
+                onToken(result.trim());
+            }
+        }
+    }
+    else {
+        const message = await client.messages.create({
+            model,
+            max_tokens: 256,
+            system: buildSystemPrompt(perms, sessionCmds),
+            messages: [{ role: "user", content: nl }],
+        });
+        const block = message.content[0];
+        if (block.type !== "text")
+            throw new Error("Unexpected response type");
+        result = block.text;
+    }
+    const text = result.trim();
+    if (text.startsWith("BLOCKED:"))
+        throw new Error(text);
+    cacheSet(nl, text);
+    return text;
+}
+// ── prefetch ──────────────────────────────────────────────────────────────────
+// Silently warm the cache after a command runs — no await, fire and forget
+export function prefetchNext(lastNl, perms, sessionCmds) {
+    // Only prefetch if we don't have it cached already
+    if (cacheGet(lastNl))
+        return;
+    translateToCommand(lastNl, perms, sessionCmds).catch(() => { });
 }
 // ── explain ───────────────────────────────────────────────────────────────────
 export async function explainCommand(command) {
     const message = await client.messages.create({
         model: "claude-haiku-4-5-20251001",
         max_tokens: 128,
-        system: "Explain what this shell command does in one plain English sentence. No markdown. No code blocks. Just a sentence.",
+        system: "Explain what this shell command does in one plain English sentence. No markdown, no code blocks.",
         messages: [{ role: "user", content: command }],
     });
     const block = message.content[0];
@@ -71,31 +132,13 @@ export async function explainCommand(command) {
 // ── auto-fix ──────────────────────────────────────────────────────────────────
 export async function fixCommand(originalNl, failedCommand, errorOutput, perms, sessionCmds) {
     const message = await client.messages.create({
-        model: "claude-opus-4-6",
+        model: "claude-sonnet-4-6",
         max_tokens: 256,
         system: buildSystemPrompt(perms, sessionCmds),
-        messages: [
-            {
+        messages: [{
                 role: "user",
-                content: `I wanted to: ${originalNl}\nI ran: ${failedCommand}\nIt failed with:\n${errorOutput}\n\nGive me the corrected command.`,
-            },
-        ],
-    });
-    const block = message.content[0];
-    if (block.type !== "text")
-        throw new Error("Unexpected response type");
-    const text = block.text.trim();
-    if (text.startsWith("BLOCKED:"))
-        throw new Error(text);
-    return text;
-}
-// ── translate ─────────────────────────────────────────────────────────────────
-export async function translateToCommand(nl, perms, sessionCmds) {
-    const message = await client.messages.create({
-        model: "claude-opus-4-6",
-        max_tokens: 256,
-        system: buildSystemPrompt(perms, sessionCmds),
-        messages: [{ role: "user", content: nl }],
+                content: `I wanted to: ${originalNl}\nI ran: ${failedCommand}\nError:\n${errorOutput}\n\nGive me the corrected command only.`,
+            }],
     });
     const block = message.content[0];
     if (block.type !== "text")

package/dist/cache.js

@@ -0,0 +1,41 @@
+// In-memory LRU cache + disk persistence for command translations
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+const CACHE_FILE = join(homedir(), ".terminal", "cache.json");
+const MAX_ENTRIES = 500;
+let mem = {};
+export function loadCache() {
+    if (!existsSync(CACHE_FILE))
+        return;
+    try {
+        mem = JSON.parse(readFileSync(CACHE_FILE, "utf8"));
+    }
+    catch { }
+}
+function persistCache() {
+    try {
+        writeFileSync(CACHE_FILE, JSON.stringify(mem));
+    }
+    catch { }
+}
+/** Normalize a natural language query for cache lookup */
+export function normalizeNl(nl) {
+    return nl
+        .toLowerCase()
+        .trim()
+        .replace(/[^a-z0-9\s]/g, "") // strip punctuation
+        .replace(/\s+/g, " ");
+}
+export function cacheGet(nl) {
+    return mem[normalizeNl(nl)] ?? null;
+}
+export function cacheSet(nl, command) {
+    const key = normalizeNl(nl);
+    // evict oldest if full
+    const keys = Object.keys(mem);
+    if (keys.length >= MAX_ENTRIES)
+        delete mem[keys[0]];
+    mem[key] = command;
+    persistCache();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/terminal",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Natural language terminal — speak plain English, get shell commands",
   "type": "module",
   "bin": {