@lesscap/baton-cli 0.2.0 → 0.2.2

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)" },
@@ -1638,14 +1655,22 @@ function getBaseURL() {
 
 // src/session/runner.ts
 import { spawnSync } from "node:child_process";
-import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
+import { query } from "@anthropic-ai/claude-agent-sdk";
 
 // src/session/runner/log.ts
 var maskedEnvKeys = (env) => env ? Object.keys(env).sort().join(", ") : "(none)";
 
 // src/session/runner/sdk-env.ts
+import { existsSync as existsSync3 } from "node:fs";
+import { isAbsolute } from "node:path";
 var buildSdkEnv = (overlay) => overlay ? { ...process.env, ...overlay } : void 0;
 var claudeExecutable = () => process.env.BATON_CLAUDE_BIN;
+var additionalDirs = () => {
+  const raw = process.env.BATON_ADD_DIRS;
+  if (!raw) return void 0;
+  const dirs = raw.split(":").map((s) => s.trim()).filter((s) => s !== "" && isAbsolute(s) && existsSync3(s));
+  return dirs.length > 0 ? dirs : void 0;
+};
 
 // src/session/runner/transcript.ts
 import { readdirSync, readFileSync as readFileSync2, statSync } from "node:fs";
@@ -1770,10 +1795,11 @@ ${text}` : header;
 };
 
 // src/session/runner/query.ts
-import "@anthropic-ai/claude-agent-sdk";
 var startQuery = (config, text, resuming, queryFn, abortController, log, envOverlay) => {
   const env = buildSdkEnv(envOverlay);
   const exe = claudeExecutable();
+  const addDirs = additionalDirs();
+  if (addDirs) log(`[add-dir] ${addDirs.join(", ")}`);
   const options = {
     cwd: config.worktreePath,
     permissionMode: "bypassPermissions",
@@ -1782,7 +1808,8 @@ var startQuery = (config, text, resuming, queryFn, abortController, log, envOver
     stderr: (line) => log(`[claude] ${line.trimEnd()}`),
     ...resuming ? { resume: config.agentSessionId } : { sessionId: config.agentSessionId },
     ...env ? { env } : {},
-    ...exe ? { pathToClaudeCodeExecutable: exe } : {}
+    ...exe ? { pathToClaudeCodeExecutable: exe } : {},
+    ...addDirs ? { additionalDirectories: addDirs } : {}
   };
   return queryFn({ prompt: text, options });
 };
@@ -1807,6 +1834,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 +1863,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 +1886,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 +1923,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 +1932,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 {
     }
   };
@@ -1914,7 +1955,7 @@ var restoreTty = () => {
 };
 var runDaemon = async (config, deps, signal) => {
   const log = deps.log ?? ((m) => console.log(`[#${config.sessionId} ${config.name}] ${m}`));
-  const qf = deps.queryFn ?? query2;
+  const qf = deps.queryFn ?? query;
   const ESCtor = deps.eventSourceImpl ?? EventSource;
   log(`bin: ${claudeExecutable() ?? "(sdk bundled)"}  cwd: ${config.worktreePath}`);
   log(`runtime env keys: ${maskedEnvKeys(deps.env)}`);
@@ -1925,6 +1966,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 +1976,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 +1986,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 +2010,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 +2197,7 @@ var session = defineCommand({
     resume: sessionResumeCommand,
     stop: sessionStopCommand,
     clear: sessionClearCommand,
+    abort: sessionAbortCommand,
     rename: sessionRenameCommand,
     rm: sessionRmCommand,
     send: sessionSendCommand,
@@ -2297,10 +2351,10 @@ import { hostname as osHostname } from "node:os";
 // src/worker/daemon.ts
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 import { dirname as dirname2, join as join5 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { query as query3 } from "@anthropic-ai/claude-agent-sdk";
+import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
 // src/session/runner/title.ts
 var clip = (s, max) => s.length > max ? s.slice(0, max) : s;
@@ -2347,10 +2401,10 @@ ${exchange}`;
 
 // src/session/worktree.ts
 import { execFileSync, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync3, mkdirSync } from "node:fs";
+import { existsSync as existsSync4, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 var createWorktree = (input) => {
-  if (existsSync3(input.worktreePath))
+  if (existsSync4(input.worktreePath))
     throw new Error(`worktree path already exists: ${input.worktreePath}`);
   mkdirSync(dirname(input.worktreePath), { recursive: true });
   const branch = `baton/${input.sessionCode}`;
@@ -2372,7 +2426,7 @@ var repoHeadBranch = (repo) => {
   return branch || "main";
 };
 var removeWorktree = (repo, worktreePath) => {
-  if (!existsSync3(worktreePath)) return;
+  if (!existsSync4(worktreePath)) return;
   try {
     execFileSync("git", ["-C", repo, "worktree", "remove", "--force", worktreePath], {
       stdio: "pipe"
@@ -2385,7 +2439,7 @@ var removeWorktree = (repo, worktreePath) => {
 var binPath = () => {
   const here = dirname2(fileURLToPath(import.meta.url));
   const devShim = join5(here, "..", "..", "bin", "baton.mjs");
-  return existsSync4(devShim) ? devShim : fileURLToPath(import.meta.url);
+  return existsSync5(devShim) ? devShim : fileURLToPath(import.meta.url);
 };
 var runWorkerDaemon = async (cfg, client, signal) => {
   const repo = process.cwd();
@@ -2466,7 +2520,7 @@ var runWorkerDaemon = async (cfg, client, signal) => {
       worktreePath,
       userText: exchange.userText,
       assistantText: exchange.assistantText,
-      queryFn: query3
+      queryFn: query2
     });
     if (!title) return log(`title #${sessionId}: not enough to title yet, skipping`);
     await client.sessions.setName(sessionId, title, cfg.apiToken);
@@ -2522,12 +2576,12 @@ var runWorkerDaemon = async (cfg, client, signal) => {
 
 // src/worker/machine-id.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { dirname as dirname3, join as join6 } from "node:path";
 var machineIdPath = (env = process.env) => join6(env.XDG_DATA_HOME ?? join6(env.HOME ?? homedir3(), ".local/share"), "baton", "machine-id");
 var readOrCreateMachineId = (path = machineIdPath()) => {
-  if (existsSync5(path)) {
+  if (existsSync6(path)) {
     const s = readFileSync3(path, "utf8").trim();
     if (s) return s;
   }

package/package.json

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