@lesscap/baton-cli 0.1.2 → 0.2.0

package/dist/baton.mjs

@@ -577,6 +577,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" }),
     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" }),
@@ -1018,6 +1019,38 @@ var requirement = defineCommand({
   }
 });
 
+// src/commands/session/shared.ts
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+var defaultWorktreeDir = (env = process.env) => env.BATON_WORKTREE_DIR ?? join2(env.XDG_DATA_HOME ?? join2(env.HOME ?? homedir(), ".local/share"), "baton", "worktrees");
+var slug = (s) => s.toLowerCase().replace(/[^a-z0-9_-]+/g, "-");
+var resolveSession = async (client, projectId, handle) => {
+  const asInt = Number(handle);
+  if (Number.isInteger(asInt) && asInt > 0) {
+    const byId = await client.sessions.get(asInt).catch(() => null);
+    if (byId) return { id: byId.id, name: byId.name };
+  }
+  const byName = await client.sessions.findByName(projectId, handle);
+  if (byName) return { id: byName.id, name: byName.name };
+  throw new Error(`session "${handle}" not found in project ${projectId}`);
+};
+
+// src/commands/session/clear.ts
+var sessionClearCommand = defineCommand({
+  meta: { name: "clear", description: "reset the conversation context (keeps the session + worktree)" },
+  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.clear(handle.id);
+    console.log(renderOne(s, fmtSession, Boolean(args.json)));
+  }
+});
+
 // src/commands/session/create.ts
 var sessionCreateCommand = defineCommand({
   meta: { name: "create", description: "create + start a session on a worker" },
@@ -1038,22 +1071,6 @@ var sessionCreateCommand = defineCommand({
   }
 });
 
-// src/commands/session/shared.ts
-import { homedir } from "node:os";
-import { join as join2 } from "node:path";
-var defaultWorktreeDir = (env = process.env) => env.BATON_WORKTREE_DIR ?? join2(env.XDG_DATA_HOME ?? join2(env.HOME ?? homedir(), ".local/share"), "baton", "worktrees");
-var slug = (s) => s.toLowerCase().replace(/[^a-z0-9_-]+/g, "-");
-var resolveSession = async (client, projectId, handle) => {
-  const asInt = Number(handle);
-  if (Number.isInteger(asInt) && asInt > 0) {
-    const byId = await client.sessions.get(asInt).catch(() => null);
-    if (byId) return { id: byId.id, name: byId.name };
-  }
-  const byName = await client.sessions.findByName(projectId, handle);
-  if (byName) return { id: byName.id, name: byName.name };
-  throw new Error(`session "${handle}" not found in project ${projectId}`);
-};
-
 // src/commands/session/get.ts
 var sessionGetCommand = defineCommand({
   meta: { name: "get", description: "get a session by int id or name" },
@@ -1620,34 +1637,15 @@ function getBaseURL() {
 }
 
 // src/session/runner.ts
-import { spawn, spawnSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
+import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
 // src/session/runner/log.ts
-var claudeBin = () => process.env.BATON_CLAUDE_BIN ?? "claude";
-var buildClaudeArgs = (claudeSessionId, text, resuming) => [
-  "--print",
-  resuming ? "--resume" : "--session-id",
-  claudeSessionId,
-  "--output-format",
-  "stream-json",
-  "--verbose",
-  "--dangerously-skip-permissions",
-  text
-];
-var STDERR_TAIL_BYTES = 2048;
-var tailBuffer = (cap = STDERR_TAIL_BYTES) => {
-  let buf = "";
-  return {
-    append(chunk) {
-      buf = (buf + chunk).slice(-cap);
-    },
-    toString() {
-      return buf;
-    }
-  };
-};
 var maskedEnvKeys = (env) => env ? Object.keys(env).sort().join(", ") : "(none)";
-var previewText = (text, max = 80) => text.length > max ? `${text.slice(0, max)}\u2026` : text;
+
+// src/session/runner/sdk-env.ts
+var buildSdkEnv = (overlay) => overlay ? { ...process.env, ...overlay } : void 0;
+var claudeExecutable = () => process.env.BATON_CLAUDE_BIN;
 
 // src/session/runner/transcript.ts
 import { readdirSync, readFileSync as readFileSync2, statSync } from "node:fs";
@@ -1709,6 +1707,17 @@ var readFirstExchange = (agentSessionId) => {
   }
 };
 
+// ../shared/src/domain/attachment.ts
+var isImageAttachment = (att) => att.contentType.startsWith("image/");
+var labelAttachments = (attachments) => {
+  const counters = { image: 0, file: 0 };
+  return attachments.map((att) => {
+    const kind = isImageAttachment(att) ? "image" : "file";
+    counters[kind] += 1;
+    return `${kind}-${counters[kind]}`;
+  });
+};
+
 // src/session/runner/attachments.ts
 import { createWriteStream } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
@@ -1749,96 +1758,84 @@ var materializeAttachments = async (opts) => {
   }
   return relPaths;
 };
-var augmentPrompt = (text, relPaths) => {
+var augmentPrompt = (text, relPaths, labels) => {
   if (relPaths.length === 0) return text;
   const header = [
-    "[Attached files \u2014 already saved in the working directory:]",
-    ...relPaths.map((p) => `- ${p}`)
+    "[Attached files \u2014 already saved in the working directory. Reference them by label:]",
+    ...relPaths.map((p, i) => `- {${labels[i]}} ${p}`)
   ].join("\n");
   return text.length > 0 ? `${header}
 
 ${text}` : header;
 };
 
-// src/session/runner/spawn.ts
-import { createInterface as createInterface2 } from "node:readline";
-var spawnClaude = async (config, worker2, text, resuming, spawnImpl, log, envOverlay) => {
-  const childEnv = envOverlay ? { ...process.env, ...envOverlay } : process.env;
-  const bin = claudeBin();
-  const args = buildClaudeArgs(config.agentSessionId, text, resuming);
-  log(`[spawn] ${bin} ${args.slice(0, -1).join(" ")} -- "${previewText(text)}"`);
-  log(`[spawn] cwd: ${config.worktreePath}`);
-  log(`[spawn] runtime env keys: ${maskedEnvKeys(envOverlay)}`);
-  let child;
-  try {
-    child = spawnImpl(bin, args, {
-      cwd: config.worktreePath,
-      stdio: ["ignore", "pipe", "pipe"],
-      env: childEnv
-    });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    log(`[spawn] failed: ${message}`);
-    await worker2.emitEvent("turn_error", { message: `spawn failed: ${message}` });
-    return null;
-  }
-  if (!child.stdout) {
-    log("[spawn] no stdout from claude \u2014 aborting turn");
-    await worker2.emitEvent("turn_error", { message: "no stdout from claude" });
-    return null;
-  }
-  const tail = tailBuffer();
-  if (child.stderr) {
-    const errLines = createInterface2({ input: child.stderr });
-    void (async () => {
-      for await (const line of errLines) {
-        tail.append(`${line}
-`);
-        log(`[claude] ${line}`);
-      }
-    })();
-  }
-  return { child, tail };
+// 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 options = {
+    cwd: config.worktreePath,
+    permissionMode: "bypassPermissions",
+    includePartialMessages: false,
+    abortController,
+    stderr: (line) => log(`[claude] ${line.trimEnd()}`),
+    ...resuming ? { resume: config.agentSessionId } : { sessionId: config.agentSessionId },
+    ...env ? { env } : {},
+    ...exe ? { pathToClaudeCodeExecutable: exe } : {}
+  };
+  return queryFn({ prompt: text, options });
 };
 
 // src/session/runner/stream.ts
-import { createInterface as createInterface3 } from "node:readline";
-var streamSdkEvents = async (stdout, worker2) => {
-  const rl = createInterface3({ input: stdout });
-  for await (const line of rl) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    let payload;
-    try {
-      payload = JSON.parse(trimmed);
-    } catch {
-      payload = { raw: trimmed };
-    }
-    await worker2.emitEvent("sdk_event", payload);
+var streamSdkEvents = async (messages, worker2) => {
+  let result = null;
+  for await (const message of messages) {
+    await worker2.emitEvent("sdk_event", message);
+    if (message.type === "result") result = toTurnResult(message);
   }
+  return result;
+};
+var toTurnResult = (message) => {
+  const rec = message;
+  const subtype = typeof rec.subtype === "string" ? rec.subtype : "unknown";
+  const isError = rec.is_error === true || subtype !== "success";
+  const resultText = typeof rec.result === "string" ? rec.result : "";
+  return { subtype, isError, resultText };
 };
 
 // src/session/runner/turn.ts
-var finalizeTurn = async (child, tail, worker2, log) => {
-  const exitCode = await new Promise(
-    (resolve) => child.once("exit", (code) => resolve(code ?? -1))
-  );
-  log(`[exit] code=${exitCode}`);
-  const stderrTail = tail.toString();
-  if (exitCode !== 0) {
+var turnTimeoutMs = () => Number(process.env.BATON_TURN_TIMEOUT_MS) || 30 * 6e4;
+var TIMEOUT = /* @__PURE__ */ Symbol("turn-timeout");
+var finalizeTurn = async (result, worker2, log) => {
+  if (!result) {
+    log("[exit] stream ended with no result");
+    await worker2.emitEvent("turn_error", { message: "claude produced no result" });
+    await worker2.emitEvent("turn_complete", {});
+    return -1;
+  }
+  log(`[exit] subtype=${result.subtype} isError=${result.isError}`);
+  if (result.isError) {
     await worker2.emitEvent("turn_error", {
-      message: `claude exited with code ${exitCode}`,
-      exitCode,
-      stderrTail
+      message: result.resultText || `claude result: ${result.subtype}`,
+      subtype: result.subtype
     });
   }
-  await worker2.emitEvent("turn_complete", {
-    exitCode,
-    ...stderrTail ? { stderrTail } : {}
+  await worker2.emitEvent("turn_complete", { subtype: result.subtype });
+  return result.isError ? 1 : 0;
+};
+var buildPrompt = async (config, rawText, attachments, log, fetchImpl) => {
+  if (attachments.length === 0) return rawText;
+  const relPaths = await materializeAttachments({
+    worktreePath: config.worktreePath,
+    serverBase: config.server,
+    attachments,
+    fetchImpl
   });
-  return exitCode;
+  log(`[attach] downloaded ${relPaths.length} file(s) \u2192 ${config.worktreePath}/attachments`);
+  return augmentPrompt(rawText, relPaths, labelAttachments(attachments));
 };
-var runTurn = async (config, worker2, msg, resuming, spawnImpl, log = (m) => console.log(m), envOverlay, fetchImpl) => {
+var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => console.log(m), envOverlay, fetchImpl) => {
   await worker2.emitEvent("turn_start", { messageId: msg.id });
   const payload = msg.payload;
   const rawText = typeof payload?.text === "string" ? payload.text : "";
@@ -1847,33 +1844,42 @@ var runTurn = async (config, worker2, msg, resuming, spawnImpl, log = (m) => con
     await worker2.emitEvent("turn_error", { message: "user_message missing text and attachments" });
     return -1;
   }
-  let text = rawText;
-  if (attachments.length > 0) {
-    try {
-      const relPaths = await materializeAttachments({
-        worktreePath: config.worktreePath,
-        serverBase: config.server,
-        attachments,
-        fetchImpl
-      });
-      log(`[attach] downloaded ${relPaths.length} file(s) \u2192 ${config.worktreePath}/attachments`);
-      text = augmentPrompt(rawText, relPaths);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      await worker2.emitEvent("turn_error", { message: `attachment download failed: ${message}` });
-      return -1;
-    }
+  let text;
+  try {
+    text = await buildPrompt(config, rawText, attachments, log, fetchImpl);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    await worker2.emitEvent("turn_error", { message: `attachment download failed: ${message}` });
+    return -1;
   }
-  const result = await spawnClaude(config, worker2, text, resuming, spawnImpl, log, envOverlay);
-  if (!result) return -1;
+  const abort = new AbortController();
+  const ceiling = turnTimeoutMs();
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(TIMEOUT), ceiling);
+  });
   try {
-    await streamSdkEvents(result.child.stdout, worker2);
-    return await finalizeTurn(result.child, result.tail, worker2, log);
+    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]);
+    if (outcome === TIMEOUT) {
+      log(`[watchdog] turn exceeded ${ceiling}ms \u2014 aborting claude`);
+      abort.abort();
+      await worker2.emitEvent("turn_error", { message: `turn exceeded ${ceiling}ms \u2014 claude aborted` });
+      await worker2.emitEvent("turn_complete", {});
+      return -1;
+    }
+    return await finalizeTurn(outcome, worker2, log);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     log(`[run] ${message}`);
-    await worker2.emitEvent("turn_error", { message, stderrTail: result.tail.toString() });
+    await worker2.emitEvent("turn_error", { message });
+    await worker2.emitEvent("turn_complete", {});
     return -1;
+  } finally {
+    clearTimeout(timer);
   }
 };
 
@@ -1908,9 +1914,9 @@ var restoreTty = () => {
 };
 var runDaemon = async (config, deps, signal) => {
   const log = deps.log ?? ((m) => console.log(`[#${config.sessionId} ${config.name}] ${m}`));
-  const sp = deps.spawnImpl ?? spawn;
+  const qf = deps.queryFn ?? query2;
   const ESCtor = deps.eventSourceImpl ?? EventSource;
-  log(`bin: ${claudeBin()}  cwd: ${config.worktreePath}`);
+  log(`bin: ${claudeExecutable() ?? "(sdk bundled)"}  cwd: ${config.worktreePath}`);
   log(`runtime env keys: ${maskedEnvKeys(deps.env)}`);
   const state = {
     firstSpawnDone: findTranscriptPath(config.agentSessionId) !== null,
@@ -1933,7 +1939,7 @@ var runDaemon = async (config, deps, signal) => {
           deps.worker,
           msg,
           resuming,
-          sp,
+          qf,
           log,
           deps.env,
           deps.fetchImpl
@@ -2137,6 +2143,7 @@ var session = defineCommand({
     create: sessionCreateCommand,
     resume: sessionResumeCommand,
     stop: sessionStopCommand,
+    clear: sessionClearCommand,
     rename: sessionRenameCommand,
     rm: sessionRmCommand,
     send: sessionSendCommand,
@@ -2288,11 +2295,12 @@ var task = defineCommand({
 import { hostname as osHostname } from "node:os";
 
 // src/worker/daemon.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync as existsSync4 } 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";
 
 // src/session/runner/title.ts
 var clip = (s, max) => s.length > max ? s.slice(0, max) : s;
@@ -2300,7 +2308,7 @@ var isDeclined = (title) => title.replace(/[^a-z]/gi, "").toUpperCase() === "NON
 var sanitizeTitle = (raw) => raw.replace(/[\r\n]+/g, " ").replace(/["'`]/g, "").replace(/^\s*(title|session)\s*[:-]\s*/i, "").replace(/\s+/g, " ").trim().slice(0, 40).trim();
 var TITLE_TIMEOUT_MS = 3e4;
 var generateTitle = async (input) => {
-  const { worktreePath, userText, assistantText, spawnImpl } = input;
+  const { worktreePath, userText, assistantText, queryFn } = input;
   if (`${userText}${assistantText}`.trim().length < 4) return null;
   const exchange = [
     `User: ${clip(userText, 800)}`,
@@ -2308,44 +2316,31 @@ var generateTitle = async (input) => {
   ].filter(Boolean).join("\n");
   const prompt = `Reply with ONLY a 2-5 word title (no quotes, no punctuation) summarizing this coding session. If it is too short or generic to title meaningfully, reply with exactly NONE:
 ${exchange}`;
-  const out = await new Promise((resolve) => {
-    let buf = "";
-    let done = false;
-    const finish = (s) => {
-      if (!done) {
-        done = true;
-        resolve(s);
-      }
-    };
-    let child;
-    try {
-      child = spawnImpl(claudeBin(), ["--print", "--dangerously-skip-permissions", prompt], {
+  const exe = claudeExecutable();
+  const abort = new AbortController();
+  const timer = setTimeout(() => abort.abort(), TITLE_TIMEOUT_MS);
+  let out = "";
+  try {
+    const messages = queryFn({
+      prompt,
+      options: {
         cwd: worktreePath,
-        stdio: ["ignore", "pipe", "pipe"],
-        env: process.env
-      });
-    } catch {
-      return finish("");
-    }
-    const timer = setTimeout(() => {
-      try {
-        child.kill();
-      } catch {
+        permissionMode: "bypassPermissions",
+        allowedTools: [],
+        includePartialMessages: false,
+        abortController: abort,
+        ...exe ? { pathToClaudeCodeExecutable: exe } : {}
       }
-      finish("");
-    }, TITLE_TIMEOUT_MS);
-    child.stdout?.on("data", (d) => {
-      buf += String(d);
-    });
-    child.on("exit", () => {
-      clearTimeout(timer);
-      finish(buf);
-    });
-    child.on("error", () => {
-      clearTimeout(timer);
-      finish("");
     });
-  });
+    for await (const m of messages) {
+      if (m.type === "result" && typeof m.result === "string")
+        out = m.result;
+    }
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
   const title = sanitizeTitle(out);
   return !title || isDeclined(title) ? null : title;
 };
@@ -2411,7 +2406,7 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   };
   const spawnChild = (sessionId, worktreePath) => {
     if (children.has(sessionId)) return;
-    const child = spawn2(process.execPath, [binPath(), "session", "run", String(sessionId)], {
+    const child = spawn(process.execPath, [binPath(), "session", "run", String(sessionId)], {
       detached: true,
       stdio: "inherit",
       env: {
@@ -2471,7 +2466,7 @@ var runWorkerDaemon = async (cfg, client, signal) => {
       worktreePath,
       userText: exchange.userText,
       assistantText: exchange.assistantText,
-      spawnImpl: spawn2
+      queryFn: query3
     });
     if (!title) return log(`title #${sessionId}: not enough to title yet, skipping`);
     await client.sessions.setName(sessionId, title, cfg.apiToken);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
   "bin": {
@@ -9,19 +9,23 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "baton": "tsx src/index.ts",
+    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --packages=bundle --external:@anthropic-ai/claude-agent-sdk --banner:js=\"#!/usr/bin/env node\" --outfile=dist/baton.mjs && chmod +x dist/baton.mjs",
+    "prepublishOnly": "pnpm build",
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "test": "tsx --test 'src/**/*.test.ts'"
+  },
   "devDependencies": {
+    "@baton/shared": "workspace:*",
     "@types/node": "^25.9.1",
     "citty": "^0.2.2",
     "esbuild": "^0.28.0",
     "eventsource": "^4.1.0",
     "tsx": "^4.22.4",
-    "typescript": "^6.0.3",
-    "@baton/shared": "0.0.0"
+    "typescript": "^6.0.3"
   },
-  "scripts": {
-    "baton": "tsx src/index.ts",
-    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --packages=bundle --banner:js=\"#!/usr/bin/env node\" --outfile=dist/baton.mjs && chmod +x dist/baton.mjs",
-    "typecheck": "tsc --noEmit -p tsconfig.json",
-    "test": "tsx --test 'src/**/*.test.ts'"
+  "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "^0.3.161"
   }
-}
+}