@lesscap/baton-cli 0.2.0 → 0.2.1

package/dist/baton.mjs

@@ -578,6 +578,7 @@ var sessionsClient = (baseUrl) => {
     resume: (id) => request(u(`/sessions/${id}/resume`), { method: "POST" }),
     stop: (id) => request(u(`/sessions/${id}/stop`), { method: "POST" }),
     clear: (id) => request(u(`/sessions/${id}/clear`), { method: "POST" }),
+    abort: (id) => request(u(`/sessions/${id}/abort`), { method: "POST" }),
     rename: (id, name) => request(u(`/sessions/${id}/rename`), { method: "POST", body: { name } }),
     listByProject: (projectId) => request(u(`/projects/${projectId}/sessions`), { method: "GET" }),
     get: (id) => request(u(`/sessions/${id}`), { method: "GET" }),
@@ -1035,6 +1036,22 @@ var resolveSession = async (client, projectId, handle) => {
   throw new Error(`session "${handle}" not found in project ${projectId}`);
 };
 
+// src/commands/session/abort.ts
+var sessionAbortCommand = defineCommand({
+  meta: { name: "abort", description: "interrupt the in-flight turn (like Esc); keeps the session" },
+  args: {
+    session: { type: "positional", required: true, description: "session int id or name" },
+    project: { type: "string", description: "project id (overrides .baton.json)" },
+    ...common
+  },
+  run: async ({ args }) => {
+    const c = clientFor(args);
+    const handle = await resolveSession(c, resolveProjectId(args), args.session);
+    const s = await c.sessions.abort(handle.id);
+    console.log(renderOne(s, fmtSession, Boolean(args.json)));
+  }
+});
+
 // src/commands/session/clear.ts
 var sessionClearCommand = defineCommand({
   meta: { name: "clear", description: "reset the conversation context (keeps the session + worktree)" },
@@ -1807,6 +1824,7 @@ var toTurnResult = (message) => {
 // src/session/runner/turn.ts
 var turnTimeoutMs = () => Number(process.env.BATON_TURN_TIMEOUT_MS) || 30 * 6e4;
 var TIMEOUT = /* @__PURE__ */ Symbol("turn-timeout");
+var ABORTED = /* @__PURE__ */ Symbol("turn-aborted");
 var finalizeTurn = async (result, worker2, log) => {
   if (!result) {
     log("[exit] stream ended with no result");
@@ -1835,7 +1853,7 @@ var buildPrompt = async (config, rawText, attachments, log, fetchImpl) => {
   log(`[attach] downloaded ${relPaths.length} file(s) \u2192 ${config.worktreePath}/attachments`);
   return augmentPrompt(rawText, relPaths, labelAttachments(attachments));
 };
-var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => console.log(m), envOverlay, fetchImpl) => {
+var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => console.log(m), envOverlay, fetchImpl, externalSignal) => {
   await worker2.emitEvent("turn_start", { messageId: msg.id });
   const payload = msg.payload;
   const rawText = typeof payload?.text === "string" ? payload.text : "";
@@ -1858,12 +1876,23 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
   const timeout = new Promise((resolve) => {
     timer = setTimeout(() => resolve(TIMEOUT), ceiling);
   });
+  const interrupted = new Promise((resolve) => {
+    if (externalSignal?.aborted) resolve(ABORTED);
+    else externalSignal?.addEventListener("abort", () => resolve(ABORTED), { once: true });
+  });
   try {
     const messages = startQuery(config, text, resuming, queryFn, abort, log, envOverlay);
     const consume = streamSdkEvents(messages, worker2);
     void consume.catch(() => {
     });
-    const outcome = await Promise.race([consume, timeout]);
+    const outcome = await Promise.race([consume, timeout, interrupted]);
+    if (outcome === ABORTED) {
+      log("[abort] interrupted by user");
+      abort.abort();
+      await worker2.emitEvent("turn_error", { message: "interrupted by user" });
+      await worker2.emitEvent("turn_complete", {});
+      return -1;
+    }
     if (outcome === TIMEOUT) {
       log(`[watchdog] turn exceeded ${ceiling}ms \u2014 aborting claude`);
       abort.abort();
@@ -1884,7 +1913,7 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
 };
 
 // src/session/runner.ts
-var subscribeStream = (url, ESCtor, seen, log, onUserMessage, onReady) => {
+var subscribeStream = (url, ESCtor, seen, log, onUserMessage, onInterrupt, onReady) => {
   const es = new ESCtor(url);
   es.onopen = onReady;
   es.onmessage = (e) => {
@@ -1893,6 +1922,8 @@ var subscribeStream = (url, ESCtor, seen, log, onUserMessage, onReady) => {
       if (seen.has(ev.sequence)) return;
       seen.add(ev.sequence);
       if (ev.type === "user_message") onUserMessage(ev);
+      else if (ev.type === "system" && ev.payload?.action === "interrupt")
+        onInterrupt();
     } catch {
     }
   };
@@ -1925,6 +1956,7 @@ var runDaemon = async (config, deps, signal) => {
   const pendingQueue = [];
   let busy = false;
   let lastActivity = Date.now();
+  let currentTurn;
   const drain = async () => {
     if (busy) return;
     busy = true;
@@ -1934,6 +1966,8 @@ var runDaemon = async (config, deps, signal) => {
         if (!msg) break;
         const resuming = state.firstSpawnDone;
         log(`\u25B6 msg #${msg.sequence} (${resuming ? "resume" : "first"})`);
+        const turnAbort = new AbortController();
+        currentTurn = turnAbort;
         const code = await runTurn(
           config,
           deps.worker,
@@ -1942,8 +1976,10 @@ var runDaemon = async (config, deps, signal) => {
           qf,
           log,
           deps.env,
-          deps.fetchImpl
+          deps.fetchImpl,
+          turnAbort.signal
         );
+        currentTurn = void 0;
         state.firstSpawnDone = true;
         lastActivity = Date.now();
         log(`\u2714 msg #${msg.sequence}${code === 0 ? "" : ` (exit ${code})`}`);
@@ -1964,6 +2000,13 @@ var runDaemon = async (config, deps, signal) => {
       pendingQueue.push(ev);
       void drain();
     },
+    () => {
+      lastActivity = Date.now();
+      if (currentTurn) {
+        log("interrupt \u2014 aborting current turn");
+        currentTurn.abort();
+      }
+    },
     // Report active only now that we're subscribed — before this, a message
     // sent right after spawn would be missed (no replay on the live stream).
     () => {
@@ -2144,6 +2187,7 @@ var session = defineCommand({
     resume: sessionResumeCommand,
     stop: sessionStopCommand,
     clear: sessionClearCommand,
+    abort: sessionAbortCommand,
     rename: sessionRenameCommand,
     rm: sessionRmCommand,
     send: sessionSendCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
   "bin": {