@hasna/terminal 1.3.1 → 1.3.3

package/dist/ai.js

@@ -46,7 +46,15 @@ const IRREVERSIBLE_PATTERNS = [
     // File creation/modification (READ-ONLY terminal)
     /\btouch\b/, /\bmkdir\b/, /\becho\s.*>/, /\btee\b/, /\bcp\b/, /\bmv\b/,
 ];
+// Commands that are ALWAYS safe (read-only git, etc.)
+const SAFE_OVERRIDES = [
+    /^\s*git\s+(log|show|diff|branch|status|blame|tag|remote|stash\s+list)\b/,
+    /^\s*git\s+log\b/,
+];
 export function isIrreversible(command) {
+    // Safe overrides take priority
+    if (SAFE_OVERRIDES.some((r) => r.test(command)))
+        return false;
     return IRREVERSIBLE_PATTERNS.some((r) => r.test(command));
 }
 // ── permissions ───────────────────────────────────────────────────────────────
@@ -210,10 +218,10 @@ export async function translateToCommand(nl, perms, sessionEntries, onToken) {
         if (!t)
             return false;
         // Skip obvious reasoning lines
-        if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To )/.test(t))
+        if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:)/.test(t))
             return false;
-        if (/^[A-Z][a-z].*\.$/.test(t))
-            return false; // English sentence ending with period
+        if (/^[A-Z][a-z].*[.;:]$/.test(t))
+            return false; // English sentence ending with period/semicolon/colon
         return true;
     });
     cleaned = commandLines.join("\n").trim() || cleaned;

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.1",
+  "version": "1.3.3",
   "description": "Smart terminal wrapper for AI agents and humans — structured output, token compression, MCP server, natural language",
   "type": "module",
   "bin": {

package/src/ai.ts

@@ -55,7 +55,15 @@ const IRREVERSIBLE_PATTERNS = [
   /\btouch\b/, /\bmkdir\b/, /\becho\s.*>/, /\btee\b/, /\bcp\b/, /\bmv\b/,
 ];
 
+// Commands that are ALWAYS safe (read-only git, etc.)
+const SAFE_OVERRIDES = [
+  /^\s*git\s+(log|show|diff|branch|status|blame|tag|remote|stash\s+list)\b/,
+  /^\s*git\s+log\b/,
+];
+
 export function isIrreversible(command: string): boolean {
+  // Safe overrides take priority
+  if (SAFE_OVERRIDES.some((r) => r.test(command))) return false;
   return IRREVERSIBLE_PATTERNS.some((r) => r.test(command));
 }
 
@@ -251,8 +259,8 @@ export async function translateToCommand(
     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
+    if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:)/.test(t)) return false;
+    if (/^[A-Z][a-z].*[.;:]$/.test(t)) return false; // English sentence ending with period/semicolon/colon
     return true;
   });
   cleaned = commandLines.join("\n").trim() || cleaned;

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);