@klaudworks/rmr 0.4.4 → 0.4.5

package/dist/index.js

@@ -10104,6 +10104,9 @@ function getHarnessAdapter(name) {
   return adapter;
 }
 
+// src/lib/process-runner.ts
+import { spawn } from "node:child_process";
+
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
 var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
@@ -10822,25 +10825,6 @@ var ui = {
 };
 
 // src/lib/process-runner.ts
-async function consumeStream(stream, onText) {
-  if (!stream) {
-    return "";
-  }
-  const reader = stream.getReader();
-  const decoder = new TextDecoder;
-  let fullText = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
-    }
-    const chunk = decoder.decode(value, { stream: true });
-    fullText += chunk;
-    onText(chunk);
-  }
-  fullText += decoder.decode();
-  return fullText;
-}
 function formatToolInput(toolInput) {
   try {
     const parsed = JSON.parse(toolInput);
@@ -10858,95 +10842,83 @@ function formatToolInput(toolInput) {
     return toolInput.length > 100 ? toolInput.slice(0, 97) + "..." : toolInput;
   }
 }
-async function consumeStreamParsed(stream, parser) {
-  if (!stream) {
-    return { rawOutput: "", displayText: "", sessionId: null };
-  }
-  const reader = stream.getReader();
-  const decoder = new TextDecoder;
-  let rawOutput = "";
-  let displayText = "";
-  let sessionId = null;
-  let lineBuf = "";
-  let lastTextWasContent = false;
-  function processLine(line) {
-    const parsed = parser(line);
-    if (!parsed) {
-      return;
-    }
-    if (parsed.toolName) {
-      if (lastTextWasContent) {
-        process.stderr.write(`
+async function runHarnessCommand(command, parseStreamLine) {
+  return new Promise((resolve5, reject) => {
+    const child = spawn(command.binary, command.args, {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    child.on("error", (err) => {
+      if (err.code === "ENOENT") {
+        reject(new StorageError(`Harness binary "${command.binary}" not found. ` + `Make sure it is installed and available on your PATH.`));
+      } else if (err.code === "EACCES") {
+        reject(new StorageError(`Permission denied when trying to run "${command.binary}". ` + `Check that the binary is executable.`));
+      } else {
+        reject(new StorageError(`Failed to launch harness binary "${command.binary}": ${err.message}`));
+      }
+    });
+    let interrupted = false;
+    const onSigint = () => {
+      interrupted = true;
+    };
+    process.on("SIGINT", onSigint);
+    let displayText = "";
+    let sessionId = null;
+    let stderrText = "";
+    let stdoutLineBuf = "";
+    let lastTextWasContent = false;
+    function processLine(line) {
+      const parsed = parseStreamLine(line);
+      if (!parsed) {
+        return;
+      }
+      if (parsed.toolName) {
+        if (lastTextWasContent) {
+          process.stderr.write(`
 `);
-        lastTextWasContent = false;
+          lastTextWasContent = false;
+        }
+        const inputDisplay = parsed.toolInput ? formatToolInput(parsed.toolInput) : "";
+        ui.printToolCall(parsed.toolName, inputDisplay);
+      }
+      if (parsed.text) {
+        displayText += parsed.text;
+        ui.content(parsed.text);
+        lastTextWasContent = true;
+      }
+      if (parsed.sessionId) {
+        sessionId = parsed.sessionId;
       }
-      const inputDisplay = parsed.toolInput ? formatToolInput(parsed.toolInput) : "";
-      ui.printToolCall(parsed.toolName, inputDisplay);
-    }
-    if (parsed.text) {
-      displayText += parsed.text;
-      ui.content(parsed.text);
-      lastTextWasContent = true;
-    }
-    if (parsed.sessionId) {
-      sessionId = parsed.sessionId;
-    }
-  }
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
     }
-    const chunk = decoder.decode(value, { stream: true });
-    rawOutput += chunk;
-    lineBuf += chunk;
-    const lines = lineBuf.split(`
+    child.stdout.on("data", (chunk) => {
+      const text = chunk.toString();
+      stdoutLineBuf += text;
+      const lines = stdoutLineBuf.split(`
 `);
-    lineBuf = lines.pop() ?? "";
-    for (const line of lines) {
-      processLine(line);
-    }
-  }
-  rawOutput += decoder.decode();
-  if (lineBuf.trim()) {
-    processLine(lineBuf);
-  }
-  return { rawOutput, displayText, sessionId };
-}
-async function runHarnessCommand(command, parseStreamLine) {
-  let processRef;
-  try {
-    processRef = Bun.spawn({
-      cmd: [command.binary, ...command.args],
-      stdin: "ignore",
-      stdout: "pipe",
-      stderr: "pipe"
+      stdoutLineBuf = lines.pop() ?? "";
+      for (const line of lines) {
+        processLine(line);
+      }
+    });
+    child.stderr.on("data", (chunk) => {
+      const text = chunk.toString();
+      stderrText += text;
+      process.stderr.write(text);
+    });
+    child.on("close", (code) => {
+      if (stdoutLineBuf.trim()) {
+        processLine(stdoutLineBuf);
+      }
+      process.removeListener("SIGINT", onSigint);
+      const exitCode = interrupted && code === 0 ? 130 : code ?? 1;
+      resolve5({
+        exitCode,
+        stdout: displayText,
+        stderr: stderrText,
+        combinedOutput: `${displayText}${stderrText}`,
+        sessionId
+      });
     });
-  } catch {
-    throw new StorageError(`Failed to launch harness binary "${command.binary}".`);
-  }
-  let interrupted = false;
-  const onSigint = () => {
-    interrupted = true;
-  };
-  process.on("SIGINT", onSigint);
-  const stdoutPromise = consumeStreamParsed(processRef.stdout, parseStreamLine);
-  const stderrPromise = consumeStream(processRef.stderr, (chunk) => {
-    process.stderr.write(chunk);
   });
-  const [exitCode, stdoutResult, stderr] = await Promise.all([
-    processRef.exited,
-    stdoutPromise,
-    stderrPromise
-  ]);
-  process.removeListener("SIGINT", onSigint);
-  return {
-    exitCode: interrupted && exitCode === 0 ? 130 : exitCode,
-    stdout: stdoutResult.displayText,
-    stderr,
-    combinedOutput: `${stdoutResult.displayText}${stderr}`,
-    sessionId: stdoutResult.sessionId
-  };
 }
 
 // src/lib/rmr-output-parser.ts

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@klaudworks/rex",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@klaudworks/rex",
-      "version": "0.4.4",
+      "version": "0.4.5",
       "dependencies": {
         "clipanion": "^4.0.0-rc.4",
         "yaml": "^2.8.2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klaudworks/rmr",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Define multi-step coding workflows for AI agents",
   "repository": {
     "type": "git",