@hasna/terminal 1.3.0 → 1.3.2

package/dist/ai.js

@@ -198,8 +198,27 @@ export async function translateToCommand(nl, perms, sessionEntries, onToken) {
     }
     if (text.startsWith("BLOCKED:"))
         throw new Error(text);
-    cacheSet(nl, text);
-    return text;
+    // Strip AI reasoning — extract only the shell command
+    // AI sometimes prefixes with "Based on..." or wraps in backticks
+    let cleaned = text.trim();
+    // Remove markdown code blocks
+    cleaned = cleaned.replace(/^```(?:bash|sh|shell)?\n?/m, "").replace(/\n?```$/m, "");
+    // Remove lines that look like AI reasoning (start with capital letter, contain "I ", "Based on", etc.)
+    const lines = cleaned.split("\n");
+    const commandLines = lines.filter(l => {
+        const t = l.trim();
+        if (!t)
+            return false;
+        // Skip obvious reasoning lines
+        if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To )/.test(t))
+            return false;
+        if (/^[A-Z][a-z].*\.$/.test(t))
+            return false; // English sentence ending with period
+        return true;
+    });
+    cleaned = commandLines.join("\n").trim() || cleaned;
+    cacheSet(nl, cleaned);
+    return cleaned;
 }
 // ── prefetch ──────────────────────────────────────────────────────────────────
 export function prefetchNext(lastNl, perms, sessionEntries) {

package/dist/cli.js

@@ -462,18 +462,11 @@ else if (args.length > 0) {
             console.log(formatWatchResult(result));
             process.exit(0);
         }
-        // Lazy mode
-        if (shouldBeLazy(clean, actualCmd)) {
-            const lazy = toLazy(clean, actualCmd);
-            const saved = rawTokens - estimateTokens(JSON.stringify(lazy));
-            if (saved > 0)
-                recordSaving("compressed", saved);
-            console.log(JSON.stringify(lazy, null, 2));
-            process.exit(0);
-        }
-        // AI answer framing — ALWAYS use in NL mode (even for small output)
-        // The AI needs to ANSWER the question, not just pass through data
+        // Frame-first pipeline: AI answers the question, lazy is fallback
+        // For question-type prompts, answer framing runs BEFORE lazy mode
+        const isQuestion = /^(what|which|how|is|are|does|do|can|should|where|who|why|am|was|were|has|have|will)\b/i.test(prompt) || prompt.includes("?");
         if (clean.length > 10) {
+            // Try AI answer framing first (especially for questions)
             const processed = await processOutput(actualCmd, clean, prompt);
             if (processed.aiProcessed) {
                 if (processed.tokensSaved > 0)
@@ -484,6 +477,15 @@ else if (args.length > 0) {
                 process.exit(0);
             }
         }
+        // Lazy mode — fallback when AI framing didn't run or failed
+        if (shouldBeLazy(clean, actualCmd)) {
+            const lazy = toLazy(clean, actualCmd);
+            const saved = rawTokens - estimateTokens(JSON.stringify(lazy));
+            if (saved > 0)
+                recordSaving("compressed", saved);
+            console.log(JSON.stringify(lazy, null, 2));
+            process.exit(0);
+        }
         // Fallback: AI unavailable — pass through clean
         console.log(clean);
         const saved = rawTokens - estimateTokens(clean);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/terminal",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Smart terminal wrapper for AI agents and humans — structured output, token compression, MCP server, natural language",
   "type": "module",
   "bin": {

package/src/ai.ts

@@ -239,8 +239,26 @@ export async function translateToCommand(
   }
 
   if (text.startsWith("BLOCKED:")) throw new Error(text);
-  cacheSet(nl, text);
-  return text;
+
+  // Strip AI reasoning — extract only the shell command
+  // AI sometimes prefixes with "Based on..." or wraps in backticks
+  let cleaned = text.trim();
+  // Remove markdown code blocks
+  cleaned = cleaned.replace(/^```(?:bash|sh|shell)?\n?/m, "").replace(/\n?```$/m, "");
+  // Remove lines that look like AI reasoning (start with capital letter, contain "I ", "Based on", etc.)
+  const lines = cleaned.split("\n");
+  const commandLines = lines.filter(l => {
+    const t = l.trim();
+    if (!t) return false;
+    // Skip obvious reasoning lines
+    if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To )/.test(t)) return false;
+    if (/^[A-Z][a-z].*\.$/.test(t)) return false; // English sentence ending with period
+    return true;
+  });
+  cleaned = commandLines.join("\n").trim() || cleaned;
+
+  cacheSet(nl, cleaned);
+  return cleaned;
 }
 
 // ── prefetch ──────────────────────────────────────────────────────────────────

package/src/cli.tsx

@@ -446,18 +446,12 @@ else if (args.length > 0) {
       process.exit(0);
     }
 
-    // Lazy mode
-    if (shouldBeLazy(clean, actualCmd)) {
-      const lazy = toLazy(clean, actualCmd);
-      const saved = rawTokens - estimateTokens(JSON.stringify(lazy));
-      if (saved > 0) recordSaving("compressed", saved);
-      console.log(JSON.stringify(lazy, null, 2));
-      process.exit(0);
-    }
+    // Frame-first pipeline: AI answers the question, lazy is fallback
+    // For question-type prompts, answer framing runs BEFORE lazy mode
+    const isQuestion = /^(what|which|how|is|are|does|do|can|should|where|who|why|am|was|were|has|have|will)\b/i.test(prompt) || prompt.includes("?");
 
-    // AI answer framing — ALWAYS use in NL mode (even for small output)
-    // The AI needs to ANSWER the question, not just pass through data
     if (clean.length > 10) {
+      // Try AI answer framing first (especially for questions)
       const processed = await processOutput(actualCmd, clean, prompt);
       if (processed.aiProcessed) {
         if (processed.tokensSaved > 0) recordSaving("compressed", processed.tokensSaved);
@@ -467,6 +461,15 @@ else if (args.length > 0) {
       }
     }
 
+    // Lazy mode — fallback when AI framing didn't run or failed
+    if (shouldBeLazy(clean, actualCmd)) {
+      const lazy = toLazy(clean, actualCmd);
+      const saved = rawTokens - estimateTokens(JSON.stringify(lazy));
+      if (saved > 0) recordSaving("compressed", saved);
+      console.log(JSON.stringify(lazy, null, 2));
+      process.exit(0);
+    }
+
     // Fallback: AI unavailable — pass through clean
     console.log(clean);
     const saved = rawTokens - estimateTokens(clean);