@lesscap/baton-cli 0.2.4 → 0.2.6

package/dist/baton.mjs

@@ -768,7 +768,11 @@ var common = {
   },
   json: { type: "boolean", description: "output JSON" }
 };
-var clientFor = (args) => createClient(resolveBaseUrl(args.url));
+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);
+};
 var resolveProjectId = (args) => {
   if (args.project !== void 0 && args.project !== "") return Number(args.project);
   const cfg = loadProjectConfigOrNull(projectConfigPath());
@@ -783,6 +787,10 @@ var resolveWorkspaceId = (args) => {
     "no workspace in scope. pass --workspace <id> or run `baton init` in this directory."
   );
 };
+var parseWorkerHandle = (handle) => {
+  const m = handle.trim().match(/^(?:[wW]-)?(\d+)$/);
+  return m ? Number(m[1]) : null;
+};
 var parseIssueUrl = (url) => {
   const m = url.match(/^https:\/\/github\.com\/[^/]+\/[^/]+\/issues\/(\d+)/);
   if (!m)
@@ -863,7 +871,7 @@ var fmtComment = (c) => `${c.workerId !== void 0 ? `worker#${c.workerId}` : "you
 var fmtSession = (s) => `${s.id}  ${s.name}  ${s.attached ? "[active]" : "[inactive]"}  ${s.worktreePath ?? "(pending)"}`;
 var fmtWorker = (w) => {
   const offline = w.alive === false ? "  [offline]" : "";
-  return `${w.id}  ${w.name}  ${w.hostname}${offline}`;
+  return `W-${w.id}  ${w.name}  ${w.hostname}${offline}`;
 };
 var renderOne = (item, fmt, json) => json ? toJson(item) : fmt(item);
 var renderList = (items, fmt, json) => {
@@ -1113,7 +1121,10 @@ var resolveSession = async (client, projectId, handle) => {
 
 // src/commands/session/abort.ts
 var sessionAbortCommand = defineCommand({
-  meta: { name: "abort", description: "interrupt the in-flight turn (like Esc); keeps the session" },
+  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)" },
@@ -1129,7 +1140,10 @@ var sessionAbortCommand = defineCommand({
 
 // src/commands/session/clear.ts
 var sessionClearCommand = defineCommand({
-  meta: { name: "clear", description: "reset the conversation context (keeps the session + worktree)" },
+  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)" },
@@ -1148,16 +1162,24 @@ var sessionCreateCommand = defineCommand({
   meta: { name: "create", description: "create + start a session on a worker" },
   args: {
     name: { type: "positional", required: true, description: "session name" },
-    worker: { type: "string", description: "worker id (default: this machine's worker)" },
-    project: { type: "string", description: "project id (overrides .baton.json)" },
+    worker: {
+      type: "string",
+      description: "worker handle: W-N or int id (default: this machine's worker)"
+    },
+    project: {
+      type: "string",
+      description: "project id (default: the worker's own project, else .baton.json)"
+    },
     ...common
   },
   run: async ({ args }) => {
     const c = clientFor(args);
-    const projectId = resolveProjectId(args);
-    const workerId = args.worker ? Number(args.worker) : loadProjectConfigOrNull(projectConfigPath())?.worker?.id;
-    if (!workerId)
-      throw new Error("no worker id \u2014 pass --worker or run `baton worker register` first");
+    const workerId = args.worker ? parseWorkerHandle(args.worker) : loadProjectConfigOrNull(projectConfigPath())?.worker?.id ?? null;
+    if (workerId === null)
+      throw new Error(
+        "no worker \u2014 pass --worker <W-N|id> or run `baton worker register` first (names need --project)"
+      );
+    const projectId = args.project !== void 0 && args.project !== "" ? Number(args.project) : args.worker ? (await c.workers.get(workerId)).projectId : resolveProjectId(args);
     const s = await c.sessions.create({ projectId, workerId, name: args.name });
     console.log(renderOne(s, fmtSession, Boolean(args.json)));
   }
@@ -2492,26 +2514,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: [],
@@ -2519,20 +2551,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
@@ -2672,15 +2717,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(
@@ -2750,9 +2797,9 @@ var readOrCreateMachineId = (path = machineIdPath()) => {
 
 // src/commands/worker.ts
 var resolveWorker = async (client, projectId, handle) => {
-  const asInt = Number(handle);
-  if (Number.isInteger(asInt) && asInt > 0) {
-    const byId = await client.workers.get(asInt).catch(() => null);
+  const asId = parseWorkerHandle(handle);
+  if (asId !== null) {
+    const byId = await client.workers.get(asId).catch(() => null);
     if (byId) return { id: byId.id, name: byId.name };
   }
   const byName = await client.workers.findByName(projectId, handle);

package/package.json

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