heyeric 1.1.0 → 1.3.0

package/dist/chunk-2CBZLAF5.js

@@ -0,0 +1,19 @@
+// src/sanitize.ts
+function sanitize(raw) {
+  let command = raw.trim();
+  for (const prefix of ["```bash", "```sh", "```"]) {
+    if (command.startsWith(prefix)) {
+      command = command.slice(prefix.length);
+      break;
+    }
+  }
+  command = command.trim();
+  command = command.split("\n")[0];
+  command = command.trim().replace(/```$/, "");
+  command = command.replace(/^`+|`+$/g, "");
+  return command.trim();
+}
+
+export {
+  sanitize
+};

package/dist/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  sanitize
+} from "./chunk-2CBZLAF5.js";
 
 // src/index.ts
 import { execSync, spawn } from "child_process";
@@ -6,8 +9,10 @@ import { createInterface } from "readline";
 import { readFileSync } from "fs";
 import { platform } from "os";
 import { basename } from "path";
+import cliSpinners from "cli-spinners";
 function die(msg) {
-  process.stderr.write(`eric: ${msg}
+  process.stderr.write(`
+eric: ${msg}
 `);
   process.exit(1);
 }
@@ -51,6 +56,7 @@ var lsOutput = getLs();
 var history = getHistory();
 var systemPrompt = `You are a bash command generator.
 Convert the user's natural-language description into a single bash command.
+Prefer simple, well-known commands over complex one-liners when possible.
 Return ONLY the command. No explanation. No markdown. No backticks. No newlines.
 
 OS: ${os}
@@ -74,67 +80,125 @@ Recent command history:
 }
 systemPrompt += `
 Description to convert:`;
-async function main() {
+function startSpinner() {
+  const spinner = cliSpinners.dots;
+  let i = 0;
+  process.stderr.write("\x1B[?25l");
+  const timer = setInterval(() => {
+    const frame = spinner.frames[i++ % spinner.frames.length];
+    process.stderr.write(`\r\x1B[2m${frame}\x1B[0m`);
+  }, spinner.interval);
+  return () => {
+    clearInterval(timer);
+    process.stderr.write("\r\x1B[K");
+    process.stderr.write("\x1B[?25h");
+  };
+}
+async function askLLM(messages, isRefinement = false) {
+  if (!isRefinement) {
+    const stopSpinner2 = startSpinner();
+    try {
+      return await streamLLM(messages, stopSpinner2);
+    } catch (e) {
+      stopSpinner2();
+      throw e;
+    }
+  }
+  const stopSpinner = startSpinner();
+  try {
+    return await streamLLM(messages, stopSpinner);
+  } catch (e) {
+    stopSpinner();
+    throw e;
+  }
+}
+async function streamLLM(messages, stopSpinner) {
   const resp = await fetch(apiUrl, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${apiKey}`
     },
-    body: JSON.stringify({
-      model,
-      messages: [
-        { role: "system", content: systemPrompt },
-        { role: "user", content: query }
-      ],
-      stream: false,
-      max_tokens: 200
-    })
+    body: JSON.stringify({ model, messages, stream: true, max_tokens: 200 })
   });
   if (!resp.ok) {
+    stopSpinner();
     const body = await resp.text();
     die(`API error ${resp.status}: ${body}`);
   }
-  const data = await resp.json();
-  if (!data.choices?.length || !data.choices[0].message?.content) {
-    die("No completion returned from API");
+  if (!resp.body) {
+    stopSpinner();
+    die("No response body");
   }
-  let command = data.choices[0].message.content.trim();
-  for (const prefix of ["```bash", "```sh", "```"]) {
-    if (command.startsWith(prefix)) {
-      command = command.slice(prefix.length);
-      break;
+  let raw = "";
+  let spinnerStopped = false;
+  const reader = resp.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() ?? "";
+    for (const line of lines) {
+      if (!line.startsWith("data: ")) continue;
+      const data = line.slice(6).trim();
+      if (data === "[DONE]") break;
+      try {
+        const chunk = JSON.parse(data);
+        const token = chunk.choices?.[0]?.delta?.content;
+        if (!token) continue;
+        if (!spinnerStopped) {
+          stopSpinner();
+          spinnerStopped = true;
+          process.stderr.write(`\x1B[1;32m\u276F\x1B[0m \x1B[1m`);
+        }
+        process.stderr.write(token);
+        raw += token;
+      } catch {
+      }
     }
   }
-  command = command.trim();
-  command = command.split("\n")[0];
-  command = command.trim().replace(/```$/, "");
-  command = command.replace(/^`+|`+$/g, "");
-  command = command.trim();
-  if (!command) die("API returned empty command");
-  process.stderr.write(`\x1B[1;32m\u276F\x1B[0m \x1B[1m${command}\x1B[0m
-`);
-  process.stderr.write(`\x1B[2mEnter to run \xB7 Type to refine \xB7 Ctrl+C to cancel\x1B[0m
+  if (spinnerStopped) {
+    process.stderr.write(`\x1B[0m
 `);
+  } else {
+    stopSpinner();
+  }
+  return sanitize(raw);
+}
+function prompt() {
   const rl = createInterface({ input: process.stdin, output: process.stderr });
-  const answer = await new Promise((resolve) => {
+  return new Promise((resolve) => {
     rl.question("\x1B[2m\u203A \x1B[0m", (input) => {
       rl.close();
       resolve(input.trim());
     });
   });
-  if (answer) {
-    const child2 = spawn(process.argv[0], [...process.argv.slice(1, 2), answer], {
-      stdio: "inherit",
-      env: process.env
-    });
-    child2.on("close", (code) => process.exit(code ?? 0));
-    return;
+}
+async function main() {
+  const messages = [
+    { role: "system", content: systemPrompt },
+    { role: "user", content: query }
+  ];
+  let command = await askLLM(messages);
+  if (!command) die("API returned empty command");
+  messages.push({ role: "assistant", content: command });
+  while (true) {
+    process.stderr.write(`\x1B[2mEnter to run \xB7 Type to refine \xB7 Ctrl+C to cancel\x1B[0m
+`);
+    const answer = await prompt();
+    if (!answer) {
+      const child = spawn(command, { shell: true, stdio: "inherit" });
+      child.on("close", (code) => process.exit(code ?? 0));
+      return;
+    }
+    messages.push({ role: "user", content: answer });
+    command = await askLLM(messages, true);
+    if (!command) die("API returned empty command");
+    messages.push({ role: "assistant", content: command });
   }
-  const child = spawn(command, { shell: true, stdio: "inherit" });
-  child.on("close", (code) => {
-    process.exit(code ?? 0);
-  });
 }
 main().catch((err) => {
   die(err.message);

package/dist/sanitize.js

@@ -0,0 +1,6 @@
+import {
+  sanitize
+} from "./chunk-2CBZLAF5.js";
+export {
+  sanitize
+};

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "heyeric",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Natural language to bash commands via LLM",
   "type": "module",
   "bin": {
     "eric": "./dist/index.js"
   },
   "scripts": {
-    "build": "tsup src/index.ts --format esm --clean",
-    "dev": "tsx src/index.ts"
+    "build": "tsup src/index.ts src/sanitize.ts --format esm --clean",
+    "dev": "tsx src/index.ts",
+    "test": "tsx --test src/index.test.ts"
   },
   "files": [
     "dist"
@@ -17,5 +18,8 @@
     "tsup": "^8",
     "tsx": "^4",
     "typescript": "^5"
+  },
+  "dependencies": {
+    "cli-spinners": "^3.4.0"
   }
 }