@lesscap/baton-cli 0.2.1 → 0.2.3

package/dist/baton.mjs

@@ -587,9 +587,13 @@ var sessionsClient = (baseUrl) => {
       const matches = all.filter((s) => s.name === name);
       return matches.length === 0 ? null : matches[matches.length - 1] ?? null;
     },
-    sendMessage: (id, text, attachments) => request(u(`/sessions/${id}/messages`), {
+    sendMessage: (id, text, attachments, planMode) => request(u(`/sessions/${id}/messages`), {
       method: "POST",
-      body: attachments && attachments.length > 0 ? { text, attachments } : { text }
+      body: {
+        text,
+        ...attachments && attachments.length > 0 ? { attachments } : {},
+        ...planMode ? { planMode: true } : {}
+      }
     }),
     // Raw-body upload: the file streams as the request body (no multipart), so
     // a Blob backed by a file on disk uploads without buffering. filename rides
@@ -734,6 +738,11 @@ var viewWorker = (cfg) => {
     apiToken: worker2.apiToken
   };
 };
+var worktreeConfig = (cfg) => ({
+  server: cfg.server,
+  project: cfg.projectId,
+  worker: { id: cfg.workerId, name: cfg.name, machineId: cfg.machineId, apiToken: cfg.apiToken }
+});
 
 // src/config.ts
 var resolveBaseUrl = (urlArg, env = process.env) => {
@@ -1655,14 +1664,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";
@@ -1787,19 +1804,22 @@ ${text}` : header;
 };
 
 // src/session/runner/query.ts
-import "@anthropic-ai/claude-agent-sdk";
-var startQuery = (config, text, resuming, queryFn, abortController, log, envOverlay) => {
+var startQuery = (config, text, resuming, queryFn, abortController, log, envOverlay, planMode = false) => {
   const env = buildSdkEnv(envOverlay);
   const exe = claudeExecutable();
+  const addDirs = additionalDirs();
+  if (addDirs) log(`[add-dir] ${addDirs.join(", ")}`);
+  if (planMode) log("[plan] read-only planning turn");
   const options = {
     cwd: config.worktreePath,
-    permissionMode: "bypassPermissions",
+    permissionMode: planMode ? "plan" : "bypassPermissions",
     includePartialMessages: false,
     abortController,
     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 });
 };
@@ -1858,6 +1878,7 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
   const payload = msg.payload;
   const rawText = typeof payload?.text === "string" ? payload.text : "";
   const attachments = Array.isArray(payload?.attachments) ? payload.attachments : [];
+  const planMode = payload?.planMode === true;
   if (rawText.length === 0 && attachments.length === 0) {
     await worker2.emitEvent("turn_error", { message: "user_message missing text and attachments" });
     return -1;
@@ -1873,15 +1894,15 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
   const abort = new AbortController();
   const ceiling = turnTimeoutMs();
   let timer;
-  const timeout = new Promise((resolve) => {
-    timer = setTimeout(() => resolve(TIMEOUT), ceiling);
+  const timeout = new Promise((resolve2) => {
+    timer = setTimeout(() => resolve2(TIMEOUT), ceiling);
   });
-  const interrupted = new Promise((resolve) => {
-    if (externalSignal?.aborted) resolve(ABORTED);
-    else externalSignal?.addEventListener("abort", () => resolve(ABORTED), { once: true });
+  const interrupted = new Promise((resolve2) => {
+    if (externalSignal?.aborted) resolve2(ABORTED);
+    else externalSignal?.addEventListener("abort", () => resolve2(ABORTED), { once: true });
   });
   try {
-    const messages = startQuery(config, text, resuming, queryFn, abort, log, envOverlay);
+    const messages = startQuery(config, text, resuming, queryFn, abort, log, envOverlay, planMode);
     const consume = streamSdkEvents(messages, worker2);
     void consume.catch(() => {
     });
@@ -1896,7 +1917,9 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
     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_error", {
+        message: `turn exceeded ${ceiling}ms \u2014 claude aborted`
+      });
       await worker2.emitEvent("turn_complete", {});
       return -1;
     }
@@ -1930,9 +1953,9 @@ var subscribeStream = (url, ESCtor, seen, log, onUserMessage, onInterrupt, onRea
   es.onerror = () => log("sse error (eventsource will retry)");
   return es;
 };
-var waitForAbort = (signal) => new Promise((resolve) => {
-  if (signal.aborted) return resolve();
-  signal.addEventListener("abort", () => resolve(), { once: true });
+var waitForAbort = (signal) => new Promise((resolve2) => {
+  if (signal.aborted) return resolve2();
+  signal.addEventListener("abort", () => resolve2(), { once: true });
 });
 var shouldReap = (lastActivity, now, busy, queueLen, idleMs) => !busy && queueLen === 0 && now - lastActivity >= idleMs;
 var idleMsFromEnv = () => Number(process.env.BATON_SESSION_IDLE_MS) || 30 * 6e4;
@@ -1945,7 +1968,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)}`);
@@ -2015,12 +2038,12 @@ var runDaemon = async (config, deps, signal) => {
   );
   const idleMs = idleMsFromEnv();
   let idleTimer;
-  const reaped = new Promise((resolve) => {
+  const reaped = new Promise((resolve2) => {
     idleTimer = setInterval(
       () => {
         if (shouldReap(lastActivity, Date.now(), busy, pendingQueue.length, idleMs)) {
           log("idle \u2014 shutting down (resumes on next message)");
-          resolve();
+          resolve2();
         }
       },
       Math.min(idleMs, 3e4)
@@ -2341,10 +2364,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;
@@ -2391,10 +2414,10 @@ ${exchange}`;
 
 // src/session/worktree.ts
 import { execFileSync, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync3, mkdirSync } from "node:fs";
-import { dirname } from "node:path";
+import { appendFileSync, existsSync as existsSync4, mkdirSync, readFileSync as readFileSync3 } from "node:fs";
+import { dirname, isAbsolute as isAbsolute2, resolve } 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}`;
@@ -2415,8 +2438,26 @@ var repoHeadBranch = (repo) => {
   const branch = r.status === 0 ? r.stdout.trim() : "";
   return branch || "main";
 };
+var ensureExcluded = (repo, pattern) => {
+  try {
+    const r = spawnSync2("git", ["-C", repo, "rev-parse", "--git-path", "info/exclude"], {
+      stdio: "pipe",
+      encoding: "utf8"
+    });
+    if (r.status !== 0) return;
+    const rel = r.stdout.trim();
+    const path = isAbsolute2(rel) ? rel : resolve(repo, rel);
+    const current = existsSync4(path) ? readFileSync3(path, "utf8") : "";
+    if (current.split("\n").includes(pattern)) return;
+    mkdirSync(dirname(path), { recursive: true });
+    const sep = current === "" || current.endsWith("\n") ? "" : "\n";
+    appendFileSync(path, `${sep}${pattern}
+`, "utf8");
+  } catch {
+  }
+};
 var removeWorktree = (repo, worktreePath) => {
-  if (!existsSync3(worktreePath)) return;
+  if (!existsSync4(worktreePath)) return;
   try {
     execFileSync("git", ["-C", repo, "worktree", "remove", "--force", worktreePath], {
       stdio: "pipe"
@@ -2429,7 +2470,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();
@@ -2484,6 +2525,8 @@ var runWorkerDaemon = async (cfg, client, signal) => {
       await client.sessions.materialize(sessionId, { agentSessionId, worktreePath }, cfg.apiToken);
       log(`materialized session #${sessionId} \u2192 ${worktreePath}`);
     }
+    ensureExcluded(repo, PROJECT_CONFIG_NAME);
+    saveProjectConfig(join5(worktreePath, PROJECT_CONFIG_NAME), worktreeConfig(cfg));
     spawnChild(sessionId, worktreePath);
   };
   const onStop = (sessionId) => {
@@ -2510,7 +2553,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);
@@ -2555,9 +2598,9 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   };
   es.onerror = () => log("command stream error (eventsource will retry)");
   log(`listening for commands (server ${cfg.server}, repo ${repo})`);
-  await new Promise((resolve) => {
-    if (signal.aborted) return resolve();
-    signal.addEventListener("abort", () => resolve(), { once: true });
+  await new Promise((resolve2) => {
+    if (signal.aborted) return resolve2();
+    signal.addEventListener("abort", () => resolve2(), { once: true });
   });
   es.close();
   clearInterval(hb);
@@ -2566,13 +2609,13 @@ 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 readFileSync4, 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)) {
-    const s = readFileSync3(path, "utf8").trim();
+  if (existsSync6(path)) {
+    const s = readFileSync4(path, "utf8").trim();
     if (s) return s;
   }
   const id = randomUUID2();

package/package.json

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