@lesscap/baton-cli 0.2.5 → 0.2.7

package/dist/baton.mjs

@@ -768,10 +768,17 @@ var common = {
   },
   json: { type: "boolean", description: "output JSON" }
 };
+var resolveAuth = (env, fileToken) => {
+  const envBearer = env.BATON_TOKEN ?? env.BATON_WORKER_TOKEN;
+  if (envBearer) return { bearer: envBearer };
+  if (env.BATON_USER && env.BATON_PASS) return "cookie";
+  return fileToken ? { bearer: fileToken } : void 0;
+};
 var clientFor = (args) => {
-  const envAuth = process.env.BATON_TOKEN ?? (process.env.BATON_USER && process.env.BATON_PASS);
-  const cfgToken = envAuth ? void 0 : loadProjectConfigOrNull(projectConfigPath())?.worker?.apiToken;
-  return createClient(resolveBaseUrl(args.url), cfgToken ? { bearer: cfgToken } : void 0);
+  const baseUrl = resolveBaseUrl(args.url);
+  const fileToken = loadProjectConfigOrNull(projectConfigPath())?.worker?.apiToken;
+  const auth = resolveAuth(process.env, fileToken);
+  return createClient(baseUrl, auth && auth !== "cookie" ? auth : void 0);
 };
 var resolveProjectId = (args) => {
   if (args.project !== void 0 && args.project !== "") return Number(args.project);
@@ -2514,26 +2521,36 @@ import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 var clip = (s, max) => s.length > max ? s.slice(0, max) : s;
 var isDeclined = (title) => title.replace(/[^a-z]/gi, "").toUpperCase() === "NONE";
 var sanitizeTitle = (raw) => raw.replace(/[\r\n]+/g, " ").replace(/[*_`~#>]/g, "").replace(/["']/g, "").replace(/^\s*(?:title|session|标题)\s*[:：-]\s*/i, "").replace(/^\s*(?:[-*•]|\d+[.)、])\s+/, "").replace(/\s+/g, " ").trim().slice(0, 30).replace(/[\s。．，,、；;：:!！?？.]+$/, "").trim();
-var TITLE_TIMEOUT_MS = 3e4;
-var generateTitle = async (input) => {
-  const { worktreePath, userText, assistantText, queryFn } = input;
-  if (`${userText}${assistantText}`.trim().length < 4) return null;
+var TITLE_TIMEOUT_MS = 9e4;
+var buildPrompt2 = (userText, assistantText) => {
   const exchange = [
     `User: ${clip(userText, 800)}`,
     assistantText ? `Assistant: ${clip(assistantText, 800)}` : ""
   ].filter(Boolean).join("\n");
-  const prompt = `Reply with ONLY a short title for this session: a noun phrase like a filename \u2014 at most 6 words or ~12 Chinese characters. It must NOT be a sentence, no punctuation, no markdown, no quotes, and never an opener like "\u597D\u7684"/"\u6536\u5230"/"I'll". If it is too thin or generic to title meaningfully, reply with exactly NONE.
+  return `Reply with ONLY a short title for this session: a noun phrase like a filename \u2014 at most 6 words or ~12 Chinese characters. It must NOT be a sentence, no punctuation, no markdown, no quotes, and never an opener like "\u597D\u7684"/"\u6536\u5230"/"I'll". Only if the exchange below has no real content at all (e.g. just a greeting or a test ping), reply with exactly NONE.
 
 ${exchange}`;
+};
+var generateTitle = async (input) => {
+  const { worktreePath, userText, assistantText, queryFn } = input;
+  if (`${userText}${assistantText}`.trim().length < 4) return { kind: "declined" };
   const exe = claudeExecutable();
   const abort = new AbortController();
   const timer = setTimeout(() => abort.abort(), TITLE_TIMEOUT_MS);
+  const stderrTail = [];
   let out = "";
+  let resultSeen = false;
+  let failure = "";
   try {
     const messages = queryFn({
-      prompt,
+      prompt: buildPrompt2(userText, assistantText),
       options: {
         cwd: worktreePath,
+        // A one-shot summarizer, not an agent: replace the ~18k-token Claude
+        // Code preset system prompt. Inside the agent harness the model
+        // routinely answers NONE to this ask (verified against reclaude);
+        // a plain summarizer persona titles reliably — and ~100× cheaper.
+        systemPrompt: "You title chat sessions.",
         // Don't load the worktree's CLAUDE.md / project settings — they steer the
         // model into verbose summaries instead of a terse title.
         settingSources: [],
@@ -2541,20 +2558,33 @@ ${exchange}`;
         allowedTools: [],
         includePartialMessages: false,
         abortController: abort,
+        stderr: (line) => {
+          if (line.trim()) stderrTail.push(line.trim().slice(0, 200));
+          if (stderrTail.length > 3) stderrTail.shift();
+        },
         ...exe ? { pathToClaudeCodeExecutable: exe } : {}
       }
     });
     for await (const m of messages) {
-      if (m.type === "result" && typeof m.result === "string")
-        out = m.result;
+      if (m.type !== "result") continue;
+      resultSeen = true;
+      const r = m;
+      if (r.subtype === "success" && typeof r.result === "string") out = r.result;
+      else
+        failure = `result ${r.subtype ?? "unknown"}${typeof r.result === "string" ? `: ${r.result.slice(0, 200)}` : ""}`;
     }
-  } catch {
-    return null;
+  } catch (e) {
+    failure = abort.signal.aborted ? `timeout after ${TITLE_TIMEOUT_MS / 1e3}s` : String(e).slice(0, 300);
   } finally {
     clearTimeout(timer);
   }
+  if (!failure && !resultSeen) failure = "stream ended without a result message";
+  if (failure) {
+    const tail = stderrTail.length > 0 ? ` | stderr: ${stderrTail.join(" / ")}` : "";
+    return { kind: "error", reason: `${failure}${tail}` };
+  }
   const title = sanitizeTitle(out);
-  return !title || isDeclined(title) ? null : title;
+  return !title || isDeclined(title) ? { kind: "declined" } : { kind: "titled", title };
 };
 
 // src/session/worktree.ts
@@ -2622,11 +2652,35 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   const worktreeDir = defaultWorktreeDir();
   const children = /* @__PURE__ */ new Map();
   const log = (m) => console.log(`[worker #${cfg.workerId} ${cfg.name}] ${m}`);
-  const ping = () => {
-    void client.workers.heartbeat(cfg.machineId).catch((e) => log(`heartbeat failed: ${String(e)}`));
+  const HEARTBEAT_MS = 3e4;
+  const HEARTBEAT_TIMEOUT_MS = 15e3;
+  const MAX_HEARTBEAT_FAILURES = 5;
+  let heartbeatFailures = 0;
+  let fatal = false;
+  let stop = () => {
+  };
+  const ping = async () => {
+    try {
+      await Promise.race([
+        client.workers.heartbeat(cfg.machineId),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error("heartbeat timeout")), HEARTBEAT_TIMEOUT_MS)
+        )
+      ]);
+      heartbeatFailures = 0;
+    } catch (e) {
+      heartbeatFailures += 1;
+      log(`heartbeat failed (${heartbeatFailures}/${MAX_HEARTBEAT_FAILURES}): ${String(e)}`);
+      if (heartbeatFailures >= MAX_HEARTBEAT_FAILURES) {
+        const downSec = MAX_HEARTBEAT_FAILURES * HEARTBEAT_MS / 1e3;
+        log(`heartbeat down ~${downSec}s \u2014 exiting so the supervisor restarts a clean worker`);
+        fatal = true;
+        stop();
+      }
+    }
   };
-  ping();
-  const hb = setInterval(ping, 3e4);
+  void ping();
+  const hb = setInterval(() => void ping(), HEARTBEAT_MS);
   const killChild = (child) => {
     if (child.pid === void 0) return;
     try {
@@ -2694,15 +2748,17 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   const onTitle = async (sessionId, agentSessionId, worktreePath) => {
     const exchange = readFirstExchange(agentSessionId);
     if (!exchange) return log(`title #${sessionId}: no transcript yet, skipping`);
-    const title = await generateTitle({
+    const outcome = await generateTitle({
       worktreePath,
       userText: exchange.userText,
       assistantText: exchange.assistantText,
       queryFn: query2
     });
-    if (!title) return log(`title #${sessionId}: not enough to title yet, skipping`);
-    await client.sessions.setName(sessionId, title, cfg.apiToken);
-    log(`\u270E titled session #${sessionId} \u2192 ${title}`);
+    if (outcome.kind === "error") return log(`title #${sessionId} failed: ${outcome.reason}`);
+    if (outcome.kind === "declined")
+      return log(`title #${sessionId}: not enough to title yet, skipping`);
+    await client.sessions.setName(sessionId, outcome.title, cfg.apiToken);
+    log(`\u270E titled session #${sessionId} \u2192 ${outcome.title}`);
   };
   const reconcile = async () => {
     const owned = (await client.sessions.listByProject(cfg.projectId)).filter(
@@ -2744,12 +2800,14 @@ 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((resolve2) => {
+    stop = resolve2;
     if (signal.aborted) return resolve2();
     signal.addEventListener("abort", () => resolve2(), { once: true });
   });
   es.close();
   clearInterval(hb);
   for (const { child } of children.values()) killChild(child);
+  if (fatal) process.exit(1);
 };
 
 // src/worker/machine-id.ts

package/package.json

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