nexrall-code 0.5.159 → 0.5.161

package/dist/index.js

@@ -10369,9 +10369,18 @@ var require_client = __commonJS({
         const haveCompleteMessage = () => completedMessage !== null;
         const partialInputs = {};
         let heartbeatWatchdog;
+        let onControllerAbort;
         try {
           await new Promise((resolve11, reject) => {
             const stream = response.body;
+            onControllerAbort = () => {
+              stream.destroy?.();
+              resolve11();
+            };
+            if (controller.signal.aborted)
+              onControllerAbort();
+            else
+              controller.signal.addEventListener("abort", onControllerAbort, { once: true });
             const HEARTBEAT_TIMEOUT_MS = 9e4;
             const FIRST_EVENT_TIMEOUT_MS = Number(process.env.NEXRALL_FIRST_EVENT_TIMEOUT_MS) || 3e5;
             const PROGRESS_TIMEOUT_MS = Number(process.env.NEXRALL_PROGRESS_TIMEOUT_MS) || 15e4;
@@ -10646,6 +10655,8 @@ var require_client = __commonJS({
         } finally {
           if (heartbeatWatchdog !== void 0)
             clearInterval(heartbeatWatchdog);
+          if (onControllerAbort)
+            controller.signal.removeEventListener("abort", onControllerAbort);
         }
         if (completedMessage) {
           return completedMessage;
@@ -172524,6 +172535,8 @@ function jobState(dir, m2) {
     if (Number.isFinite(n))
       return { state: n === 0 ? "done" : "failed", exitCode: n };
   }
+  if (fs25.existsSync(path25.join(dir, `${m2.id}.killed`)))
+    return { state: alive(m2.pid) ? "running" : "killed" };
   return { state: alive(m2.pid) ? "running" : "lost" };
 }
 function listJobs(dir = bgDir()) {
@@ -172574,9 +172587,13 @@ function startJob(o) {
   fs25.writeFileSync(path25.join(dir, `${id}.json`), JSON.stringify(meta));
   return meta;
 }
-function killJob(job) {
+function killJob(job, dir = bgDir()) {
   if (job.state !== "running")
     return false;
+  try {
+    fs25.writeFileSync(path25.join(dir, `${job.id}.killed`), "");
+  } catch {
+  }
   try {
     process.kill(-job.pid, "SIGTERM");
     return true;
@@ -172601,9 +172618,67 @@ function formatJobs(jobs) {
     return `${j.id}  ${st.padEnd(11)} ${ago(j.startedAt).padStart(4)} ago  ${j.prompt.replace(/\s+/g, " ").slice(0, 60)}`;
   }).join("\n");
 }
-async function followLog(job, follow, write = (s2) => process.stdout.write(s2), dir = bgDir()) {
+function renderJobLine(line) {
+  const t2 = line.trim();
+  if (!t2)
+    return "";
+  let o;
+  try {
+    o = JSON.parse(t2);
+  } catch {
+    return line + "\n";
+  }
+  switch (o.type) {
+    case "start":
+      return `\u2500\u2500 started (${o.model ?? "model"})
+`;
+    case "text":
+      return o.text ?? "";
+    case "tool_use": {
+      const inp = o.input && typeof o.input === "object" ? Object.values(o.input).find((v) => typeof v === "string") : void 0;
+      return `
+\u25B8 ${o.tool}${inp ? " " + inp.replace(/\s+/g, " ").slice(0, 80) : ""}
+`;
+    }
+    case "tool_result":
+      return o.ok === false ? `  \u2717 ${o.tool}: ${o.error ?? "failed"}
+` : `  \u2713 ${o.tool}
+`;
+    case "permission_denied":
+      return `  \u2717 denied: ${o.tool ?? ""} ${o.reason ?? ""}
+`;
+    case "error":
+      return `
+\u2717 error: ${o.error ?? ""}
+`;
+    case "budget_exceeded":
+      return "\n\u2717 budget exceeded\n";
+    case "result":
+      return `
+\u2500\u2500 done
+`;
+    default:
+      return "";
+  }
+}
+async function followLog(job, follow, write = (s2) => process.stdout.write(s2), dir = bgDir(), pretty = false) {
   const log = path25.join(dir, `${job.id}.log`);
   let pos = 0;
+  let carry = "";
+  const emit = (chunk) => {
+    if (!pretty) {
+      write(chunk);
+      return;
+    }
+    carry += chunk;
+    const lines = carry.split("\n");
+    carry = lines.pop() ?? "";
+    for (const l2 of lines) {
+      const r2 = renderJobLine(l2);
+      if (r2)
+        write(r2);
+    }
+  };
   const drain = () => {
     let size = 0;
     try {
@@ -172617,7 +172692,7 @@ async function followLog(job, follow, write = (s2) => process.stdout.write(s2),
     try {
       const buf = Buffer.alloc(size - pos);
       fs25.readSync(fd, buf, 0, buf.length, pos);
-      write(buf.toString("utf8"));
+      emit(buf.toString("utf8"));
       pos = size;
     } finally {
       fs25.closeSync(fd);
@@ -172631,7 +172706,12 @@ async function followLog(job, follow, write = (s2) => process.stdout.write(s2),
     drain();
     if (st.state !== "running") {
       drain();
-      return st.exitCode ?? (st.state === "lost" ? 1 : 0);
+      if (carry) {
+        const r2 = pretty ? renderJobLine(carry) : carry;
+        if (r2)
+          write(r2);
+      }
+      return st.exitCode ?? (st.state === "done" ? 0 : 1);
     }
     await new Promise((r2) => setTimeout(r2, 300));
   }
@@ -172883,13 +172963,13 @@ program2.command("logs <id>").description("Print a background job's output").opt
   }
   process.exit(await followLog(r2.job, !!opts.follow));
 });
-program2.command("attach <id>").description("Follow a background job live (Ctrl+C detaches; the job keeps running)").action(async (id) => {
+program2.command("attach <id>").description("Watch a background job live, readable (tool calls, text, result). Ctrl+C detaches; the job keeps running").action(async (id) => {
   const r2 = resolveJob(id);
   if (!r2.ok) {
     console.error(r2.error);
     process.exit(1);
   }
-  process.exit(await followLog(r2.job, true));
+  process.exit(await followLog(r2.job, true, void 0, void 0, true));
 });
 program2.command("kill <id>").description("Stop a background job").action((id) => {
   const r2 = resolveJob(id);
@@ -173100,24 +173180,6 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
     console.error("--strict-mcp-config needs --mcp-config.");
     process.exit(1);
   }
-  if (options.bg) {
-    if (!promptParts.length) {
-      console.error('--bg needs a prompt: nex --bg "your task"');
-      process.exit(1);
-    }
-    if (process.env.NEXRALL_BG_JOB) {
-      console.error("--bg cannot be nested inside a background job.");
-      process.exit(1);
-    }
-    const args = stripBgFlag(process.argv.slice(2));
-    if (!options.outputFormat)
-      args.push("--output-format", "stream-json");
-    const job = startJob({ script: process.argv[1], args, cwd: process.cwd(), prompt: promptParts.join(" ") });
-    console.log(`Started background job ${job.id}`);
-    console.log(`  nex logs ${job.id} -f   follow its output`);
-    console.log(`  nex jobs                list jobs   \xB7   nex kill ${job.id}   stop it`);
-    process.exit(0);
-  }
   const addDirs = parseAddDirs(options.addDir, process.cwd());
   if (!addDirs.ok) {
     console.error(addDirs.error);
@@ -173142,6 +173204,28 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
     console.error(`Invalid --input-format "${options.inputFormat}". Use: text | stream-json`);
     process.exit(1);
   }
+  if (options.bg) {
+    if (!promptParts.length) {
+      console.error('--bg needs a prompt: nex --bg "your task"');
+      process.exit(1);
+    }
+    if (inFmt === "stream-json") {
+      console.error("--bg cannot read stream-json from stdin (a background job has no stdin). Pass the prompt as an argument.");
+      process.exit(1);
+    }
+    if (process.env.NEXRALL_BG_JOB) {
+      console.error("--bg cannot be nested inside a background job.");
+      process.exit(1);
+    }
+    const args = stripBgFlag(process.argv.slice(2));
+    if (!options.outputFormat)
+      args.push("--output-format", "stream-json");
+    const job = startJob({ script: process.argv[1], args, cwd: process.cwd(), prompt: promptParts.join(" ") });
+    console.log(`Started background job ${job.id}`);
+    console.log(`  nex logs ${job.id} -f   follow its output`);
+    console.log(`  nex jobs                list jobs   \xB7   nex kill ${job.id}   stop it`);
+    process.exit(0);
+  }
   const resume = options.resume === true ? "last" : typeof options.resume === "string" ? options.resume : void 0;
   const worktree = options.worktree === true ? true : typeof options.worktree === "string" ? options.worktree : void 0;
   let stdinText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.159",
+  "version": "0.5.161",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",