@lesscap/baton-cli 0.1.1 → 0.1.3

package/dist/baton.mjs

@@ -498,6 +498,11 @@ var primed = false;
 var primeLogin = (baseUrl) => {
   if (primed) return;
   primed = true;
+  const token = process.env.BATON_TOKEN;
+  if (token) {
+    setAuthHeaders({ authorization: `Bearer ${token}` });
+    return;
+  }
   const username = process.env.BATON_USER;
   const password = process.env.BATON_PASS;
   if (!username || !password) return;
@@ -508,7 +513,7 @@ var primeLogin = (baseUrl) => {
         headers: { "content-type": "application/json" },
         body: JSON.stringify({ username, password })
       });
-      const cookie = (res.headers.get("set-cookie") ?? "").split(";")[0];
+      const cookie = (res.headers.getSetCookie()[0] ?? "").split(";")[0];
       if (res.ok && cookie) setAuthHeaders({ cookie });
     })().catch(() => {
     })
@@ -572,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" }),
@@ -735,6 +741,12 @@ var resolveBaseUrl = (urlArg, env = process.env) => {
   if (cfg?.server) return cfg.server;
   return env.BATON_URL ?? "http://localhost:3280";
 };
+var resolveBaseUrlOrNull = (urlArg, env = process.env) => {
+  if (urlArg) return urlArg;
+  const cfg = loadProjectConfigOrNull(projectConfigPath());
+  if (cfg?.server) return cfg.server;
+  return env.BATON_URL ?? null;
+};
 
 // src/util.ts
 var common = {
@@ -1007,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" },
@@ -1027,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" },
@@ -1698,6 +1726,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";
@@ -1738,11 +1777,11 @@ 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}
 
@@ -1808,10 +1847,15 @@ var streamSdkEvents = async (stdout, worker2) => {
 };
 
 // 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))
-  );
+var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var turnTimeoutMs = () => Number(process.env.BATON_TURN_TIMEOUT_MS) || 30 * 6e4;
+var DRAIN_GRACE_MS = 3e3;
+var waitExit = (child) => {
+  if (typeof child.exitCode === "number") return Promise.resolve(child.exitCode);
+  if (typeof child.signalCode === "string") return Promise.resolve(-1);
+  return new Promise((resolve) => child.once("exit", (code) => resolve(code ?? -1)));
+};
+var finalizeTurn = async (exitCode, tail, worker2, log) => {
   log(`[exit] code=${exitCode}`);
   const stderrTail = tail.toString();
   if (exitCode !== 0) {
@@ -1846,7 +1890,7 @@ var runTurn = async (config, worker2, msg, resuming, spawnImpl, log = (m) => con
         fetchImpl
       });
       log(`[attach] downloaded ${relPaths.length} file(s) \u2192 ${config.worktreePath}/attachments`);
-      text = augmentPrompt(rawText, relPaths);
+      text = augmentPrompt(rawText, relPaths, labelAttachments(attachments));
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       await worker2.emitEvent("turn_error", { message: `attachment download failed: ${message}` });
@@ -1855,14 +1899,37 @@ var runTurn = async (config, worker2, msg, resuming, spawnImpl, log = (m) => con
   }
   const result = await spawnClaude(config, worker2, text, resuming, spawnImpl, log, envOverlay);
   if (!result) return -1;
+  const { child, tail } = result;
+  const stdout = child.stdout;
+  const exited = waitExit(child);
+  let timedOut = false;
+  const ceiling = turnTimeoutMs();
+  const watchdog = setTimeout(() => {
+    timedOut = true;
+    log(`[watchdog] turn exceeded ${ceiling}ms \u2014 killing claude`);
+    child.kill("SIGKILL");
+  }, ceiling);
   try {
-    await streamSdkEvents(result.child.stdout, worker2);
-    return await finalizeTurn(result.child, result.tail, worker2, log);
+    const streaming = streamSdkEvents(stdout, worker2);
+    void streaming.catch(() => {
+    });
+    await Promise.race([streaming, exited.then(() => delay(DRAIN_GRACE_MS))]);
+    stdout.destroy();
+    const exitCode = await exited;
+    if (timedOut) {
+      await worker2.emitEvent("turn_error", {
+        message: `turn exceeded ${ceiling}ms \u2014 claude killed`,
+        stderrTail: tail.toString()
+      });
+    }
+    return await finalizeTurn(exitCode, tail, 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, stderrTail: tail.toString() });
     return -1;
+  } finally {
+    clearTimeout(watchdog);
   }
 };
 
@@ -2126,6 +2193,7 @@ var session = defineCommand({
     create: sessionCreateCommand,
     resume: sessionResumeCommand,
     stop: sessionStopCommand,
+    clear: sessionClearCommand,
     rename: sessionRenameCommand,
     rm: sessionRmCommand,
     send: sessionSendCommand,
@@ -2577,8 +2645,13 @@ var worker = defineCommand({
         ...common
       },
       run: async ({ args }) => {
-        const server = resolveBaseUrl(args.url);
-        const c = clientFor(args);
+        const server = resolveBaseUrlOrNull(args.url);
+        if (!server)
+          throw new Error(
+            "no baton server \u2014 pass --url <url> (e.g. https://baton.fmap.dev/api), set BATON_URL, or run `baton init`"
+          );
+        if (!args.json) console.log(`registering against ${server}`);
+        const c = createClient(server);
         const hostname = osHostname();
         const machineId = readOrCreateMachineId();
         const name = args.name ?? hostname;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
   "bin": {
@@ -9,19 +9,20 @@
   "files": [
     "dist"
   ],
+  "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",
+    "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"
-  },
-  "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'"
+    "typescript": "^6.0.3"
   }
-}
+}