@hasna/terminal 1.3.5 → 1.3.7

package/dist/ai.js

@@ -211,23 +211,27 @@ export async function translateToCommand(nl, perms, sessionEntries, onToken) {
     let cleaned = text.trim();
     // Remove ALL markdown code blocks and their content markers
     cleaned = cleaned.replace(/```(?:bash|sh|shell)?\n?/g, "").replace(/```/g, "");
-    // Split into lines and find the FIRST one that looks like a command
+    // Split into lines and find the FIRST one that looks like a SHELL COMMAND
     const lines = cleaned.split("\n");
     let command = "";
     for (const line of lines) {
         const t = line.trim();
         if (!t)
             continue;
-        // Skip reasoning lines
-        if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:|If |You |We |For )/.test(t))
+        // Skip lines that are clearly English prose, not commands
+        if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:|If |You |We |For |It |A |An |That )/.test(t))
             continue;
-        if (/^[A-Z][a-z].*[.;:!?]$/.test(t))
-            continue;
-        // Found a command line — take it and stop
-        command = t;
-        break;
+        if (/^[A-Z][a-z].*[.;:!?,]/.test(t))
+            continue; // English sentence with punctuation anywhere
+        if (t.split(" ").length > 15 && !/[|&;><$]/.test(t))
+            continue; // Long line without shell operators = prose
+        // Must start with a plausible command character (lowercase, /, ., $, or common tool)
+        if (/^[a-z./$~(]/.test(t) || /^[A-Z]+[_=]/.test(t)) {
+            command = t;
+            break;
+        }
     }
-    cleaned = command || cleaned.split("\n")[0].trim();
+    cleaned = command || lines[0]?.trim() || cleaned;
     cacheSet(nl, cleaned);
     return cleaned;
 }

package/dist/cli.js

@@ -421,6 +421,21 @@ else if (args.length > 0) {
         command = await translateToCommand(prompt, perms, []);
     }
     catch (e) {
+        // If BLOCKED, try fallback: read README or package.json for conceptual questions
+        if (e.message?.startsWith("BLOCKED:")) {
+            try {
+                const { existsSync, readFileSync } = await import("fs");
+                if (existsSync("README.md")) {
+                    const readme = readFileSync("README.md", "utf8").slice(0, 3000);
+                    const processed = await processOutput("cat README.md", readme, prompt);
+                    if (processed.aiProcessed) {
+                        console.log(processed.summary);
+                        process.exit(0);
+                    }
+                }
+            }
+            catch { }
+        }
         console.error(e.message);
         process.exit(1);
     }
@@ -457,11 +472,8 @@ else if (args.length > 0) {
         const rawTokens = estimateTokens(raw);
         recordUsage(rawTokens);
         // Test output detection
-        if (isTestOutput(clean, actualCmd)) {
-            const result = trackTests(process.cwd(), clean);
-            console.log(formatWatchResult(result));
-            process.exit(0);
-        }
+        // Test output: skip watchlist, let AI framing handle it
+        // The AI reads "42 pass, 0 fail" better than regex parsing bun's mixed output
         // 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("?");

package/package.json

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

package/src/ai.ts

@@ -253,20 +253,23 @@ export async function translateToCommand(
   let cleaned = text.trim();
   // Remove ALL markdown code blocks and their content markers
   cleaned = cleaned.replace(/```(?:bash|sh|shell)?\n?/g, "").replace(/```/g, "");
-  // Split into lines and find the FIRST one that looks like a command
+  // Split into lines and find the FIRST one that looks like a SHELL COMMAND
   const lines = cleaned.split("\n");
   let command = "";
   for (const line of lines) {
     const t = line.trim();
     if (!t) continue;
-    // Skip reasoning lines
-    if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:|If |You |We |For )/.test(t)) continue;
-    if (/^[A-Z][a-z].*[.;:!?]$/.test(t)) continue;
-    // Found a command line — take it and stop
-    command = t;
-    break;
+    // Skip lines that are clearly English prose, not commands
+    if (/^(Based on|I |This |The |Let me|Here|Note:|Since|Looking|To |However|BLOCKED:|If |You |We |For |It |A |An |That )/.test(t)) continue;
+    if (/^[A-Z][a-z].*[.;:!?,]/.test(t)) continue; // English sentence with punctuation anywhere
+    if (t.split(" ").length > 15 && !/[|&;><$]/.test(t)) continue; // Long line without shell operators = prose
+    // Must start with a plausible command character (lowercase, /, ., $, or common tool)
+    if (/^[a-z./$~(]/.test(t) || /^[A-Z]+[_=]/.test(t)) {
+      command = t;
+      break;
+    }
   }
-  cleaned = command || cleaned.split("\n")[0].trim();
+  cleaned = command || lines[0]?.trim() || cleaned;
 
   cacheSet(nl, cleaned);
   return cleaned;

package/src/cli.tsx

@@ -402,6 +402,20 @@ else if (args.length > 0) {
   try {
     command = await translateToCommand(prompt, perms, []);
   } catch (e: any) {
+    // If BLOCKED, try fallback: read README or package.json for conceptual questions
+    if (e.message?.startsWith("BLOCKED:")) {
+      try {
+        const { existsSync, readFileSync } = await import("fs");
+        if (existsSync("README.md")) {
+          const readme = readFileSync("README.md", "utf8").slice(0, 3000);
+          const processed = await processOutput("cat README.md", readme, prompt);
+          if (processed.aiProcessed) {
+            console.log(processed.summary);
+            process.exit(0);
+          }
+        }
+      } catch {}
+    }
     console.error(e.message);
     process.exit(1);
   }
@@ -440,11 +454,8 @@ else if (args.length > 0) {
     recordUsage(rawTokens);
 
     // Test output detection
-    if (isTestOutput(clean, actualCmd)) {
-      const result = trackTests(process.cwd(), clean);
-      console.log(formatWatchResult(result));
-      process.exit(0);
-    }
+    // Test output: skip watchlist, let AI framing handle it
+    // The AI reads "42 pass, 0 fail" better than regex parsing bun's mixed output
 
     // Frame-first pipeline: AI answers the question, lazy is fallback
     // For question-type prompts, answer framing runs BEFORE lazy mode