@itsaplan/runner 0.3.0 → 0.4.0

package/dist/cli.js

@@ -620,7 +620,7 @@ function stdinText(preset, task) {
     return "";
   return presetPrompt(preset, task.systemPrompt, task.prompt);
 }
-async function execute(config, task, onData) {
+async function execute(config, task, opts = {}) {
   const preset = presetOf(config);
   const [bin, args] = spawnArgs(config, preset, task);
   const child = spawn(bin, args, {
@@ -628,19 +628,23 @@ async function execute(config, task, onData) {
     env: childEnv(config, task),
     detached: true
   });
+  const kill = () => {
+    if (child.pid !== undefined)
+      killGroup(child.pid);
+  };
   let timedOut = false;
   const timer = setTimeout(() => {
     timedOut = true;
-    if (child.pid !== undefined)
-      killGroup(child.pid);
+    kill();
   }, config.timeoutMs);
+  opts.signal?.addEventListener("abort", kill, { once: true });
   let stdout = "";
   let stderr = "";
   child.stdout.setEncoding("utf8");
   child.stderr.setEncoding("utf8");
   child.stdout.on("data", (chunk) => {
     stdout = tail2(stdout + chunk, OUTPUT_LIMIT);
-    onData?.(chunk);
+    opts.onData?.(chunk);
   });
   child.stderr.on("data", (chunk) => {
     stderr = tail2(stderr + chunk, ERROR_LIMIT);
@@ -657,6 +661,7 @@ async function execute(config, task, onData) {
     ({ code, signal } = await exited);
   } finally {
     clearTimeout(timer);
+    opts.signal?.removeEventListener("abort", kill);
   }
   const output = stdout.trim();
   if (code === 0)
@@ -672,13 +677,14 @@ async function execute(config, task, onData) {
 
 // src/chat.ts
 var FLUSH_MS = 500;
-async function answer(config, client, message) {
+async function answer(config, client, message, stop) {
   let reported = message.sessionId !== null;
-  const stream = new AnswerStream(config.outputFormat, message.threadId, String(message.id), (events) => {
+  const stream = new AnswerStream(config.outputFormat, message.threadId, String(message.id), async (events) => {
     const started = reported ? undefined : stream.startedSession() ?? undefined;
     if (started)
       reported = true;
-    return client.chatEvents(message.id, events, started);
+    if (await client.chatEvents(message.id, events, started))
+      stop.abort();
   });
   const flushing = setInterval(() => {
     stream.flush().catch(() => {});
@@ -694,7 +700,9 @@ async function answer(config, client, message) {
       ITSAPLAN_MESSAGE_ID: String(message.id),
       ITSAPLAN_SESSION_ID: message.sessionId ?? ""
     }
-  }, (chunk) => stream.write(chunk)).finally(() => clearInterval(flushing));
+  }, { onData: (chunk) => stream.write(chunk), signal: stop.signal }).finally(() => clearInterval(flushing));
+  if (stop.signal.aborted)
+    return;
   if (outcome.status === "success") {
     await stream.finish(outcome.output);
     await client.chatResult(message.id, { status: "success" });
@@ -754,18 +762,23 @@ class Client {
     return body.message;
   }
   async chatEvents(messageId, events, sessionId) {
-    await this.post(`/agent-chats/${messageId}/events`, {
+    const res = await this.post(`/agent-chats/${messageId}/events`, {
       events,
       ...sessionId && { sessionId }
     });
+    return canceled(res);
   }
   async chatHeartbeat(messageId) {
-    await this.post(`/agent-chats/${messageId}/heartbeat`);
+    return canceled(await this.post(`/agent-chats/${messageId}/heartbeat`));
   }
   async chatResult(messageId, result) {
     await this.post(`/agent-chats/${messageId}/result`, result);
   }
 }
+async function canceled(res) {
+  const body = await res.json().catch(() => ({}));
+  return body.canceled === true;
+}
 
 // src/cli.ts
 var HEARTBEAT_MS = 60000;
@@ -814,14 +827,21 @@ async function handle(config, client, log2, run) {
 }
 async function handleChat(config, client, log2, message) {
   log2(`chat ${message.id}: answering`);
+  const stop = new AbortController;
   try {
-    await withHeartbeat(log2, () => client.chatHeartbeat(message.id), answer(config, client, message));
-    log2(`chat ${message.id}: answered`);
+    await withHeartbeat(log2, async () => {
+      if (await client.chatHeartbeat(message.id))
+        stop.abort();
+    }, answer(config, client, message, stop));
   } catch (err) {
-    const text = err instanceof Error ? err.message : String(err);
-    log2(`chat ${message.id}: runner error — ${text}`);
-    await client.chatResult(message.id, { status: "failed", error: text }).catch(() => {});
+    if (!stop.signal.aborted) {
+      const text = err instanceof Error ? err.message : String(err);
+      log2(`chat ${message.id}: runner error — ${text}`);
+      await client.chatResult(message.id, { status: "failed", error: text }).catch(() => {});
+      return;
+    }
   }
+  log2(`chat ${message.id}: ${stop.signal.aborted ? "stopped" : "answered"}`);
 }
 async function drain(state, log2, concurrency, take, run, onEmpty) {
   const active = new Set;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itsaplan/runner",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Runs an Itsaplan external agent's queued tasks and answers its chat on your own machine",
   "keywords": [
     "itsaplan",