heyeric 1.1.0 → 1.2.0

package/dist/index.js

@@ -74,22 +74,28 @@ Recent command history:
 }
 systemPrompt += `
 Description to convert:`;
-async function main() {
+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();
+}
+async function askLLM(messages) {
   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: false, max_tokens: 200 })
   });
   if (!resp.ok) {
     const body = await resp.text();
@@ -99,42 +105,41 @@ async function main() {
   if (!data.choices?.length || !data.choices[0].message?.content) {
     die("No completion returned from API");
   }
-  let command = data.choices[0].message.content.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, "");
-  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
-`);
+  return sanitize(data.choices[0].message.content);
+}
+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[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
+`);
+    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);
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heyeric",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Natural language to bash commands via LLM",
   "type": "module",
   "bin": {