@hasna/terminal 1.5.0 → 1.6.0

package/dist/cli.js

@@ -467,9 +467,27 @@ else if (args.length > 0) {
             process.exit(1);
         }
     }
+    // Step 2: Validate command before executing
+    const { validateCommand } = await import("./command-validator.js");
+    const validation = validateCommand(command, process.cwd());
+    if (!validation.valid) {
+        // Auto-retry: re-translate with simpler constraints
+        console.error(`[open-terminal] invalid command detected: ${validation.issues.join(", ")}`);
+        try {
+            const retryCommand = await translateToCommand(`${prompt} (IMPORTANT: keep it simple. Use basic grep/find/cat/ls/wc commands. No complex awk/sed pipelines. No GNU flags. Verify file paths from the project context.)`, perms, []);
+            if (retryCommand && retryCommand !== command) {
+                const retryValidation = validateCommand(retryCommand, process.cwd());
+                if (retryValidation.valid || retryValidation.issues.length < validation.issues.length) {
+                    command = retryCommand;
+                    console.error(`[open-terminal] retried: $ ${command}`);
+                }
+            }
+        }
+        catch { }
+    }
     // Show what we're running
     console.error(`$ ${command}`);
-    // Step 2: Rewrite for optimization
+    // Step 3: Rewrite for optimization
     const rw = rewriteCommand(command);
     const actualCmd = rw.changed ? rw.rewritten : command;
     if (rw.changed)
@@ -529,6 +547,23 @@ else if (args.length > 0) {
             console.log(`No results found for: ${prompt}`);
             process.exit(0);
         }
+        // Auto-retry: if command failed (exit 2+), ask AI for a simpler alternative
+        if (e.status >= 2 && !actualCmd.includes("(retry)")) {
+            try {
+                const retryCmd = await translateToCommand(`${prompt} (The previous command failed with: ${errStderr.slice(0, 200)}. Try a SIMPLER approach. Use basic commands only.)`, perms, []);
+                if (retryCmd && !isIrreversible(retryCmd) && !checkPermissions(retryCmd, perms)) {
+                    console.error(`[open-terminal] retrying: $ ${retryCmd}`);
+                    const retryResult = execSync(retryCmd + " #(retry)", { encoding: "utf8", maxBuffer: 10 * 1024 * 1024, cwd: process.cwd() });
+                    const retryClean = stripNoise(stripAnsi(retryResult)).cleaned;
+                    if (retryClean.length > 5) {
+                        const processed = await processOutput(retryCmd, retryClean, prompt);
+                        console.log(processed.aiProcessed ? processed.summary : retryClean);
+                        process.exit(0);
+                    }
+                }
+            }
+            catch { /* retry also failed, fall through */ }
+        }
         // Combine stdout+stderr and try AI answer framing (for audit/lint/test commands)
         const combined = errStderr && errStdout.includes(errStderr.trim()) ? errStdout : errStdout + errStderr;
         const errorClean = stripNoise(stripAnsi(combined)).cleaned;

package/dist/command-validator.js

@@ -0,0 +1,77 @@
+// Command validator — catch invalid commands BEFORE executing
+// Prevents shell errors from hallucinated flags, wrong paths, bad syntax
+import { existsSync } from "fs";
+import { join } from "path";
+/** Extract file paths referenced in a command */
+function extractPaths(command) {
+    const paths = [];
+    // Match quoted paths
+    const quoted = command.match(/["']([^"']+\.\w+)["']/g);
+    if (quoted)
+        paths.push(...quoted.map(q => q.replace(/["']/g, "")));
+    // Match unquoted paths with extensions or directory separators
+    const tokens = command.split(/\s+/);
+    for (const t of tokens) {
+        if (t.includes("/") && !t.startsWith("-") && !t.startsWith("|") && !t.startsWith("&")) {
+            // Clean shell operators from end
+            const clean = t.replace(/[;|&>]+$/, "");
+            if (clean && !clean.startsWith("-"))
+                paths.push(clean);
+        }
+    }
+    return [...new Set(paths)];
+}
+/** Check for obviously broken shell syntax */
+function checkSyntax(command) {
+    const issues = [];
+    // Unmatched quotes
+    const singleQuotes = (command.match(/'/g) || []).length;
+    const doubleQuotes = (command.match(/"/g) || []).length;
+    if (singleQuotes % 2 !== 0)
+        issues.push("unmatched single quote");
+    if (doubleQuotes % 2 !== 0)
+        issues.push("unmatched double quote");
+    // Unmatched parentheses
+    const openParens = (command.match(/\(/g) || []).length;
+    const closeParens = (command.match(/\)/g) || []).length;
+    if (openParens !== closeParens)
+        issues.push("unmatched parentheses");
+    // Empty pipe targets
+    if (/\|\s*$/.test(command))
+        issues.push("pipe with no target");
+    if (/^\s*\|/.test(command))
+        issues.push("pipe with no source");
+    return issues;
+}
+/** Validate a command before execution */
+export function validateCommand(command, cwd) {
+    const issues = [];
+    // Check syntax
+    issues.push(...checkSyntax(command));
+    // Check file paths exist
+    const paths = extractPaths(command);
+    for (const p of paths) {
+        const fullPath = p.startsWith("/") ? p : join(cwd, p);
+        if (p.includes("*") || p.includes("?"))
+            continue; // skip globs
+        if (p.startsWith("-"))
+            continue; // skip flags
+        if ([".", "..", "/", "~"].includes(p))
+            continue; // skip special
+        if (!existsSync(fullPath) && !existsSync(p)) {
+            // Only flag source file paths, not output paths
+            if (/\.(ts|tsx|js|jsx|json|md|yaml|yml|py|go|rs)$/.test(p)) {
+                issues.push(`file not found: ${p}`);
+            }
+        }
+    }
+    // Check for common GNU flags on macOS
+    const gnuFlags = command.match(/--max-depth|--color=|--sort=|--field-type|--no-deps/g);
+    if (gnuFlags) {
+        issues.push(`GNU flag on macOS: ${gnuFlags.join(", ")}`);
+    }
+    return {
+        valid: issues.length === 0,
+        issues,
+    };
+}

package/package.json

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

package/src/cli.tsx

@@ -448,10 +448,31 @@ else if (args.length > 0) {
     }
   }
 
+  // Step 2: Validate command before executing
+  const { validateCommand } = await import("./command-validator.js");
+  const validation = validateCommand(command, process.cwd());
+  if (!validation.valid) {
+    // Auto-retry: re-translate with simpler constraints
+    console.error(`[open-terminal] invalid command detected: ${validation.issues.join(", ")}`);
+    try {
+      const retryCommand = await translateToCommand(
+        `${prompt} (IMPORTANT: keep it simple. Use basic grep/find/cat/ls/wc commands. No complex awk/sed pipelines. No GNU flags. Verify file paths from the project context.)`,
+        perms, []
+      );
+      if (retryCommand && retryCommand !== command) {
+        const retryValidation = validateCommand(retryCommand, process.cwd());
+        if (retryValidation.valid || retryValidation.issues.length < validation.issues.length) {
+          command = retryCommand;
+          console.error(`[open-terminal] retried: $ ${command}`);
+        }
+      }
+    } catch {}
+  }
+
   // Show what we're running
   console.error(`$ ${command}`);
 
-  // Step 2: Rewrite for optimization
+  // Step 3: Rewrite for optimization
   const rw = rewriteCommand(command);
   const actualCmd = rw.changed ? rw.rewritten : command;
   if (rw.changed) console.error(`[open-terminal] optimized: ${actualCmd}`);
@@ -509,6 +530,27 @@ else if (args.length > 0) {
       console.log(`No results found for: ${prompt}`);
       process.exit(0);
     }
+
+    // Auto-retry: if command failed (exit 2+), ask AI for a simpler alternative
+    if (e.status >= 2 && !actualCmd.includes("(retry)")) {
+      try {
+        const retryCmd = await translateToCommand(
+          `${prompt} (The previous command failed with: ${errStderr.slice(0, 200)}. Try a SIMPLER approach. Use basic commands only.)`,
+          perms, []
+        );
+        if (retryCmd && !isIrreversible(retryCmd) && !checkPermissions(retryCmd, perms)) {
+          console.error(`[open-terminal] retrying: $ ${retryCmd}`);
+          const retryResult = execSync(retryCmd + " #(retry)", { encoding: "utf8", maxBuffer: 10 * 1024 * 1024, cwd: process.cwd() });
+          const retryClean = stripNoise(stripAnsi(retryResult)).cleaned;
+          if (retryClean.length > 5) {
+            const processed = await processOutput(retryCmd, retryClean, prompt);
+            console.log(processed.aiProcessed ? processed.summary : retryClean);
+            process.exit(0);
+          }
+        }
+      } catch { /* retry also failed, fall through */ }
+    }
+
     // Combine stdout+stderr and try AI answer framing (for audit/lint/test commands)
     const combined = errStderr && errStdout.includes(errStderr.trim()) ? errStdout : errStdout + errStderr;
     const errorClean = stripNoise(stripAnsi(combined)).cleaned;

package/src/command-validator.ts

@@ -0,0 +1,85 @@
+// Command validator — catch invalid commands BEFORE executing
+// Prevents shell errors from hallucinated flags, wrong paths, bad syntax
+
+import { existsSync } from "fs";
+import { join } from "path";
+
+export interface ValidationResult {
+  valid: boolean;
+  issues: string[];
+  fixedCommand?: string;
+}
+
+/** Extract file paths referenced in a command */
+function extractPaths(command: string): string[] {
+  const paths: string[] = [];
+  // Match quoted paths
+  const quoted = command.match(/["']([^"']+\.\w+)["']/g);
+  if (quoted) paths.push(...quoted.map(q => q.replace(/["']/g, "")));
+  // Match unquoted paths with extensions or directory separators
+  const tokens = command.split(/\s+/);
+  for (const t of tokens) {
+    if (t.includes("/") && !t.startsWith("-") && !t.startsWith("|") && !t.startsWith("&")) {
+      // Clean shell operators from end
+      const clean = t.replace(/[;|&>]+$/, "");
+      if (clean && !clean.startsWith("-")) paths.push(clean);
+    }
+  }
+  return [...new Set(paths)];
+}
+
+/** Check for obviously broken shell syntax */
+function checkSyntax(command: string): string[] {
+  const issues: string[] = [];
+
+  // Unmatched quotes
+  const singleQuotes = (command.match(/'/g) || []).length;
+  const doubleQuotes = (command.match(/"/g) || []).length;
+  if (singleQuotes % 2 !== 0) issues.push("unmatched single quote");
+  if (doubleQuotes % 2 !== 0) issues.push("unmatched double quote");
+
+  // Unmatched parentheses
+  const openParens = (command.match(/\(/g) || []).length;
+  const closeParens = (command.match(/\)/g) || []).length;
+  if (openParens !== closeParens) issues.push("unmatched parentheses");
+
+  // Empty pipe targets
+  if (/\|\s*$/.test(command)) issues.push("pipe with no target");
+  if (/^\s*\|/.test(command)) issues.push("pipe with no source");
+
+  return issues;
+}
+
+/** Validate a command before execution */
+export function validateCommand(command: string, cwd: string): ValidationResult {
+  const issues: string[] = [];
+
+  // Check syntax
+  issues.push(...checkSyntax(command));
+
+  // Check file paths exist
+  const paths = extractPaths(command);
+  for (const p of paths) {
+    const fullPath = p.startsWith("/") ? p : join(cwd, p);
+    if (p.includes("*") || p.includes("?")) continue; // skip globs
+    if (p.startsWith("-")) continue; // skip flags
+    if ([".", "..", "/", "~"].includes(p)) continue; // skip special
+    if (!existsSync(fullPath) && !existsSync(p)) {
+      // Only flag source file paths, not output paths
+      if (/\.(ts|tsx|js|jsx|json|md|yaml|yml|py|go|rs)$/.test(p)) {
+        issues.push(`file not found: ${p}`);
+      }
+    }
+  }
+
+  // Check for common GNU flags on macOS
+  const gnuFlags = command.match(/--max-depth|--color=|--sort=|--field-type|--no-deps/g);
+  if (gnuFlags) {
+    issues.push(`GNU flag on macOS: ${gnuFlags.join(", ")}`);
+  }
+
+  return {
+    valid: issues.length === 0,
+    issues,
+  };
+}