@lesscap/baton-cli 0.7.3 → 0.7.4

package/dist/baton.mjs

@@ -5024,6 +5024,7 @@ var sessionsClient = (baseUrl) => {
       const matches = all.filter((s) => s.name === name);
       return matches.length === 0 ? null : matches[matches.length - 1] ?? null;
     },
+    listEvents: (id) => request(u(`/sessions/${id}/events`), { method: "GET" }),
     sendMessage: (id, text, attachments, planMode) => request(u(`/sessions/${id}/messages`), {
       method: "POST",
       body: {
@@ -6462,6 +6463,7 @@ var findTranscriptPath = (agentSessionId) => {
 };
 var isRecord = (v) => typeof v === "object" && v !== null;
 var textOf = (rec) => {
+  if (typeof rec.text === "string") return rec.text.trim();
   const message = rec.message;
   const content = isRecord(message) ? message.content : rec.content;
   if (typeof content === "string") return content.trim();
@@ -6492,6 +6494,38 @@ var parseFirstExchange = (content) => {
   }
   return userText || assistantText ? { userText, assistantText } : null;
 };
+var canonicalAgentMessage = (payload) => {
+  if (!isRecord(payload) || !["item.started", "item.updated", "item.completed"].includes(String(payload.type)))
+    return null;
+  const item = payload.item;
+  if (!isRecord(item) || item.type !== "agent_message" || typeof item.id !== "string") return null;
+  const text = textOf(item);
+  return text ? { id: item.id, text } : null;
+};
+var parseFirstExchangeFromEvents = (events) => {
+  let userText = "";
+  const itemOrder = [];
+  const agentText = /* @__PURE__ */ new Map();
+  const legacyText = [];
+  for (const event of events) {
+    if (!userText && event.type === "user_message" && isRecord(event.payload)) {
+      if (typeof event.payload.text === "string") userText = event.payload.text.trim();
+      continue;
+    }
+    if (!userText) continue;
+    if (event.type === "turn_complete" || event.type === "turn_error") break;
+    const agent = event.type === "agent_event" ? canonicalAgentMessage(event.payload) : null;
+    if (agent) {
+      if (!agentText.has(agent.id)) itemOrder.push(agent.id);
+      agentText.set(agent.id, agent.text);
+    } else if (event.type === "sdk_event" && isRecord(event.payload)) {
+      const text = event.payload.type === "assistant" ? textOf(event.payload) : "";
+      if (text) legacyText.push(text);
+    }
+  }
+  const assistantText = itemOrder.map((id) => agentText.get(id) ?? "").filter(Boolean).join("\n") || legacyText.join("\n");
+  return userText || assistantText ? { userText, assistantText } : null;
+};
 var readFirstExchange = (agentSessionId) => {
   const path = findTranscriptPath(agentSessionId);
   if (!path) return null;
@@ -7785,16 +7819,26 @@ var createLiveness = (deps) => {
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync as existsSync5 } from "node:fs";
-import { dirname as dirname2, join as join7 } from "node:path";
+import { dirname as dirname2, join as join8 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
+// src/session/runner/title-codex.ts
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir as tmpdir3 } from "node:os";
+import { join as join7 } from "node:path";
+import { Codex as Codex2 } from "@openai/codex-sdk";
+
 // src/session/runner/title.ts
 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().replace(/(?:[。．！？，、；；]|[.!?;](?=\s|$)).*$/s, "").trim().slice(0, 30).replace(/[\s。．，,、；;：:!！?？.]+$/, "").trim();
+var titleOutcome = (raw) => {
+  const title = sanitizeTitle(raw);
+  return !title || isDeclined(title) ? { kind: "declined" } : { kind: "titled", title };
+};
 var TITLE_TIMEOUT_MS = 9e4;
-var buildPrompt2 = (userText, assistantText) => {
+var buildTitlePrompt = (userText, assistantText) => {
   const exchange = [
     `User: ${clip(userText, 800)}`,
     assistantText ? `Assistant: ${clip(assistantText, 800)}` : ""
@@ -7829,7 +7873,7 @@ var generateTitle = async (input) => {
   let failure = "";
   try {
     const messages = queryFn({
-      prompt: buildPrompt2(userText, assistantText),
+      prompt: buildTitlePrompt(userText, assistantText),
       options: {
         cwd: worktreePath,
         // A one-shot summarizer, not an agent: replace the ~18k-token Claude
@@ -7869,8 +7913,41 @@ var generateTitle = async (input) => {
     const tail = stderrTail.length > 0 ? ` | stderr: ${stderrTail.join(" / ")}` : "";
     return { kind: "error", reason: `${failure}${tail}` };
   }
-  const title = sanitizeTitle(out);
-  return !title || isDeclined(title) ? { kind: "declined" } : { kind: "titled", title };
+  return titleOutcome(out);
+};
+
+// src/session/runner/title-codex.ts
+var generateTitleWithCodex = async (input) => {
+  const { userText, assistantText } = input;
+  if (`${userText}${assistantText}`.trim().length < 4) return { kind: "declined" };
+  const abort = new AbortController();
+  const timer = setTimeout(() => abort.abort(), TITLE_TIMEOUT_MS);
+  let cwd = "";
+  try {
+    cwd = await mkdtemp(join7(tmpdir3(), "baton-title-"));
+    const client = input.client ?? new Codex2();
+    const thread = client.startThread({
+      workingDirectory: cwd,
+      skipGitRepoCheck: true,
+      sandboxMode: "read-only",
+      approvalPolicy: "never",
+      networkAccessEnabled: false,
+      webSearchMode: "disabled"
+    });
+    const result = await thread.run(buildTitlePrompt(userText, assistantText), {
+      signal: abort.signal
+    });
+    return titleOutcome(result.finalResponse);
+  } catch (error) {
+    return {
+      kind: "error",
+      reason: abort.signal.aborted ? `timeout after ${TITLE_TIMEOUT_MS / 1e3}s` : String(error).slice(0, 300)
+    };
+  } finally {
+    clearTimeout(timer);
+    if (cwd) await rm(cwd, { recursive: true, force: true }).catch(() => {
+    });
+  }
 };
 
 // src/worker/proc.ts
@@ -7885,7 +7962,7 @@ var killProcessGroup = (proc) => {
 // src/worker/session-supervisor.ts
 var binPath = () => {
   const here = dirname2(fileURLToPath(import.meta.url));
-  const devShim = join7(here, "..", "..", "bin", "baton.mjs");
+  const devShim = join8(here, "..", "..", "bin", "baton.mjs");
   return existsSync5(devShim) ? devShim : fileURLToPath(import.meta.url);
 };
 var createSessionSupervisor = (deps) => {
@@ -7939,7 +8016,7 @@ var createSessionSupervisor = (deps) => {
     if (!session2.agentSessionId || !worktreePath) {
       const sessionCode = randomUUID();
       const agentSessionId = session2.agentKind === "codex" ? `pending:${sessionCode}` : sessionCode;
-      worktreePath = join7(worktreeDir, slug(`${name}-${sessionCode.slice(0, 8)}`));
+      worktreePath = join8(worktreeDir, slug(`${name}-${sessionCode.slice(0, 8)}`));
       const base = await syncedBase();
       if (wasCanceled()) return log(`session #${sessionId} start canceled during git sync`);
       createWorktree({
@@ -7957,7 +8034,7 @@ var createSessionSupervisor = (deps) => {
       log(`recreated session #${sessionId} worktree (was missing) \u2192 ${worktreePath}`);
     }
     ensureExcluded(repo, PROJECT_CONFIG_NAME);
-    saveProjectConfig(join7(worktreePath, PROJECT_CONFIG_NAME), worktreeConfig(cfg));
+    saveProjectConfig(join8(worktreePath, PROJECT_CONFIG_NAME), worktreeConfig(cfg));
     if (hasTerminal(sessionId))
       return log(`session #${sessionId} terminal opened mid-start \u2014 skipping headless start`);
     spawnChild(sessionId, worktreePath);
@@ -8000,10 +8077,13 @@ var createSessionSupervisor = (deps) => {
   };
   const title = async (sessionId, agentSessionId, worktreePath) => {
     const session2 = await client.sessions.get(sessionId);
-    if (session2.agentKind !== "claude-code") return log(`title #${sessionId}: unsupported agent`);
-    const exchange = readFirstExchange(agentSessionId);
+    const events = await client.sessions.listEvents(sessionId).catch(() => []);
+    const exchange = parseFirstExchangeFromEvents(events) ?? (session2.agentKind === "claude-code" ? readFirstExchange(agentSessionId) : null);
     if (!exchange) return log(`title #${sessionId}: no transcript yet, skipping`);
-    const outcome = await generateTitle({
+    const outcome = session2.agentKind === "codex" ? await generateTitleWithCodex({
+      userText: exchange.userText,
+      assistantText: exchange.assistantText
+    }) : await generateTitle({
       worktreePath,
       userText: exchange.userText,
       assistantText: exchange.assistantText,
@@ -8058,14 +8138,14 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 // src/worker/pty.ts
 import { existsSync as existsSync6, readdirSync as readdirSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 var MAX_TERMINALS = 10;
 var ptyArgs = (agentSessionId, hasJsonl) => hasJsonl ? ["--resume", agentSessionId] : ["--session-id", agentSessionId];
 var hasSessionJsonl = (agentSessionId) => {
-  const root = join8(homedir3(), ".claude", "projects");
+  const root = join9(homedir3(), ".claude", "projects");
   if (!existsSync6(root)) return false;
   for (const dir of readdirSync2(root))
-    if (existsSync6(join8(root, dir, `${agentSessionId}.jsonl`))) return true;
+    if (existsSync6(join9(root, dir, `${agentSessionId}.jsonl`))) return true;
   return false;
 };
 var serverTerminalWsUrl = (server, sessionId) => `${server.replace(/^http/, "ws")}/workers/me/terminal/ws?sessionId=${sessionId}`;
@@ -8233,8 +8313,8 @@ var runWorkerDaemon = async (cfg, client, signal) => {
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { existsSync as existsSync8, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { dirname as dirname3, join as join9 } from "node:path";
-var machineIdPath = (env = process.env) => join9(env.XDG_DATA_HOME ?? join9(env.HOME ?? homedir4(), ".local/share"), "baton", "machine-id");
+import { dirname as dirname3, join as join10 } from "node:path";
+var machineIdPath = (env = process.env) => join10(env.XDG_DATA_HOME ?? join10(env.HOME ?? homedir4(), ".local/share"), "baton", "machine-id");
 var readOrCreateMachineId = (path = machineIdPath()) => {
   if (existsSync8(path)) {
     const s = readFileSync6(path, "utf8").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"