@hasna/terminal 1.0.1 → 1.1.0

package/dist/cli.js

@@ -545,7 +545,107 @@ else if (args[0] === "project" && args[1] === "init") {
     initProject(process.cwd());
     console.log("✓ Initialized .terminal/recipes.json");
 }
-// ── TUI mode (default) ──────────────────────────────────────────────────────
+// ── NL mode: terminal "natural language prompt" ─────────────────────────────
+else if (args.length > 0) {
+    // Everything that doesn't match a subcommand is treated as natural language
+    const prompt = args.join(" ");
+    if (!process.env.ANTHROPIC_API_KEY && !process.env.CEREBRAS_API_KEY) {
+        console.error("terminal: No API key found.");
+        console.error("Set one of:");
+        console.error("  export CEREBRAS_API_KEY=your_key  (free, open-source)");
+        console.error("  export ANTHROPIC_API_KEY=your_key  (Claude)");
+        process.exit(1);
+    }
+    const { translateToCommand, checkPermissions, isIrreversible } = await import("./ai.js");
+    const { execSync } = await import("child_process");
+    const { compress, stripAnsi } = await import("./compression.js");
+    const { stripNoise } = await import("./noise-filter.js");
+    const { processOutput, shouldProcess } = await import("./output-processor.js");
+    const { rewriteCommand } = await import("./command-rewriter.js");
+    const { shouldBeLazy, toLazy } = await import("./lazy-executor.js");
+    const { parseOutput, estimateTokens } = await import("./parsers/index.js");
+    const { recordSaving, recordUsage } = await import("./economy.js");
+    const { isTestOutput, trackTests, formatWatchResult } = await import("./test-watchlist.js");
+    const { detectLoop } = await import("./loop-detector.js");
+    const { loadConfig } = await import("./history.js");
+    const config = loadConfig();
+    const perms = config.permissions;
+    // Step 1: AI translates NL → shell command
+    let command;
+    try {
+        command = await translateToCommand(prompt, perms, []);
+    }
+    catch (e) {
+        console.error(e.message);
+        process.exit(1);
+    }
+    // Check permissions
+    const blocked = checkPermissions(command, perms);
+    if (blocked) {
+        console.error(`blocked: ${blocked}`);
+        process.exit(1);
+    }
+    // Show what we're running
+    console.error(`$ ${command}`);
+    // Step 2: Rewrite for optimization
+    const rw = rewriteCommand(command);
+    const actualCmd = rw.changed ? rw.rewritten : command;
+    if (rw.changed)
+        console.error(`[open-terminal] optimized: ${actualCmd}`);
+    // Loop detection
+    const loop = detectLoop(actualCmd);
+    if (loop.detected)
+        console.error(`[open-terminal] loop #${loop.iteration}${loop.suggestedNarrow ? ` — try: ${loop.suggestedNarrow}` : ""}`);
+    // Step 3: Execute
+    try {
+        const start = Date.now();
+        const raw = execSync(actualCmd, { encoding: "utf8", maxBuffer: 10 * 1024 * 1024, cwd: process.cwd() });
+        const duration = Date.now() - start;
+        const clean = stripNoise(stripAnsi(raw)).cleaned;
+        const rawTokens = estimateTokens(raw);
+        recordUsage(rawTokens);
+        // Test output detection
+        if (isTestOutput(clean)) {
+            const result = trackTests(process.cwd(), clean);
+            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 summary for medium-large output
+        if (shouldProcess(clean)) {
+            const processed = await processOutput(actualCmd, clean);
+            if (processed.aiProcessed && processed.tokensSaved > 30) {
+                recordSaving("compressed", processed.tokensSaved);
+                console.log(processed.summary);
+                console.error(`[open-terminal] ${rawTokens} → ${rawTokens - processed.tokensSaved} tokens (saved ${processed.tokensSaved})`);
+                process.exit(0);
+            }
+        }
+        // Small output — pass through clean
+        console.log(clean);
+        const saved = rawTokens - estimateTokens(clean);
+        if (saved > 10) {
+            recordSaving("compressed", saved);
+            console.error(`[open-terminal] saved ${saved} tokens`);
+        }
+    }
+    catch (e) {
+        const stderr = e.stderr?.toString() ?? "";
+        const stdout = e.stdout?.toString() ?? "";
+        const combined = stderr && stdout.includes(stderr.trim()) ? stdout : stdout + stderr;
+        console.log(stripNoise(stripAnsi(combined)).cleaned);
+        process.exit(e.status ?? 1);
+    }
+}
+// ── TUI mode (no args) ──────────────────────────────────────────────────────
 else {
     if (!process.env.ANTHROPIC_API_KEY && !process.env.CEREBRAS_API_KEY) {
         console.error("terminal: No API key found.");

package/dist/test-watchlist.js

@@ -38,9 +38,10 @@ function extractTests(output) {
 }
 /** Detect if output looks like test runner output */
 export function isTestOutput(output) {
-    const markers = /(?:Tests?:|PASS|FAIL|✓|✗|passed|failed|\d+\s+pass|\d+\s+fail)/i;
-    const lines = output.split("\n");
-    return lines.filter(l => markers.test(l)).length >= 2;
+    // Must have a summary line with counts (not just words "pass"/"fail" in prose)
+    const summaryLine = /(?:\d+\s+pass|\d+\s+fail|Tests?:\s+\d+|Ran\s+\d+\s+tests?)/i;
+    const testMarkers = /(?:✓|✗|✔|✕|PASS\s+\S+\.test|FAIL\s+\S+\.test|bun test|jest|vitest|pytest)/;
+    return summaryLine.test(output) && testMarkers.test(output);
 }
 /** Track test results and return only changes */
 export function trackTests(cwd, output) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/terminal",
-  "version": "1.0.1",
+  "version": "1.1.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

@@ -518,7 +518,111 @@ else if (args[0] === "project" && args[1] === "init") {
   console.log("✓ Initialized .terminal/recipes.json");
 }
 
-// ── TUI mode (default) ──────────────────────────────────────────────────────
+// ── NL mode: terminal "natural language prompt" ─────────────────────────────
+
+else if (args.length > 0) {
+  // Everything that doesn't match a subcommand is treated as natural language
+  const prompt = args.join(" ");
+
+  if (!process.env.ANTHROPIC_API_KEY && !process.env.CEREBRAS_API_KEY) {
+    console.error("terminal: No API key found.");
+    console.error("Set one of:");
+    console.error("  export CEREBRAS_API_KEY=your_key  (free, open-source)");
+    console.error("  export ANTHROPIC_API_KEY=your_key  (Claude)");
+    process.exit(1);
+  }
+
+  const { translateToCommand, checkPermissions, isIrreversible } = await import("./ai.js");
+  const { execSync } = await import("child_process");
+  const { compress, stripAnsi } = await import("./compression.js");
+  const { stripNoise } = await import("./noise-filter.js");
+  const { processOutput, shouldProcess } = await import("./output-processor.js");
+  const { rewriteCommand } = await import("./command-rewriter.js");
+  const { shouldBeLazy, toLazy } = await import("./lazy-executor.js");
+  const { parseOutput, estimateTokens } = await import("./parsers/index.js");
+  const { recordSaving, recordUsage } = await import("./economy.js");
+  const { isTestOutput, trackTests, formatWatchResult } = await import("./test-watchlist.js");
+  const { detectLoop } = await import("./loop-detector.js");
+  const { loadConfig } = await import("./history.js");
+
+  const config = loadConfig();
+  const perms = config.permissions;
+
+  // Step 1: AI translates NL → shell command
+  let command: string;
+  try {
+    command = await translateToCommand(prompt, perms, []);
+  } catch (e: any) {
+    console.error(e.message);
+    process.exit(1);
+  }
+
+  // Check permissions
+  const blocked = checkPermissions(command, perms);
+  if (blocked) { console.error(`blocked: ${blocked}`); process.exit(1); }
+
+  // Show what we're running
+  console.error(`$ ${command}`);
+
+  // Step 2: Rewrite for optimization
+  const rw = rewriteCommand(command);
+  const actualCmd = rw.changed ? rw.rewritten : command;
+  if (rw.changed) console.error(`[open-terminal] optimized: ${actualCmd}`);
+
+  // Loop detection
+  const loop = detectLoop(actualCmd);
+  if (loop.detected) console.error(`[open-terminal] loop #${loop.iteration}${loop.suggestedNarrow ? ` — try: ${loop.suggestedNarrow}` : ""}`);
+
+  // Step 3: Execute
+  try {
+    const start = Date.now();
+    const raw = execSync(actualCmd, { encoding: "utf8", maxBuffer: 10 * 1024 * 1024, cwd: process.cwd() });
+    const duration = Date.now() - start;
+    const clean = stripNoise(stripAnsi(raw)).cleaned;
+    const rawTokens = estimateTokens(raw);
+    recordUsage(rawTokens);
+
+    // Test output detection
+    if (isTestOutput(clean)) {
+      const result = trackTests(process.cwd(), clean);
+      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 summary for medium-large output
+    if (shouldProcess(clean)) {
+      const processed = await processOutput(actualCmd, clean);
+      if (processed.aiProcessed && processed.tokensSaved > 30) {
+        recordSaving("compressed", processed.tokensSaved);
+        console.log(processed.summary);
+        console.error(`[open-terminal] ${rawTokens} → ${rawTokens - processed.tokensSaved} tokens (saved ${processed.tokensSaved})`);
+        process.exit(0);
+      }
+    }
+
+    // Small output — pass through clean
+    console.log(clean);
+    const saved = rawTokens - estimateTokens(clean);
+    if (saved > 10) { recordSaving("compressed", saved); console.error(`[open-terminal] saved ${saved} tokens`); }
+  } catch (e: any) {
+    const stderr = e.stderr?.toString() ?? "";
+    const stdout = e.stdout?.toString() ?? "";
+    const combined = stderr && stdout.includes(stderr.trim()) ? stdout : stdout + stderr;
+    console.log(stripNoise(stripAnsi(combined)).cleaned);
+    process.exit(e.status ?? 1);
+  }
+}
+
+// ── TUI mode (no args) ──────────────────────────────────────────────────────
 
 else {
   if (!process.env.ANTHROPIC_API_KEY && !process.env.CEREBRAS_API_KEY) {

package/src/test-watchlist.ts

@@ -64,9 +64,10 @@ function extractTests(output: string): TestStatus[] {
 
 /** Detect if output looks like test runner output */
 export function isTestOutput(output: string): boolean {
-  const markers = /(?:Tests?:|PASS|FAIL|✓|✗|passed|failed|\d+\s+pass|\d+\s+fail)/i;
-  const lines = output.split("\n");
-  return lines.filter(l => markers.test(l)).length >= 2;
+  // Must have a summary line with counts (not just words "pass"/"fail" in prose)
+  const summaryLine = /(?:\d+\s+pass|\d+\s+fail|Tests?:\s+\d+|Ran\s+\d+\s+tests?)/i;
+  const testMarkers = /(?:✓|✗|✔|✕|PASS\s+\S+\.test|FAIL\s+\S+\.test|bun test|jest|vitest|pytest)/;
+  return summaryLine.test(output) && testMarkers.test(output);
 }
 
 /** Track test results and return only changes */