@lesscap/baton-cli 0.3.0 → 0.3.1

package/dist/baton.mjs

@@ -1015,6 +1015,25 @@ var channelClient = (baseUrl) => {
       if (!res.ok) throw new Error(`POST channel message \u2192 ${res.status}: ${await res.text()}`);
       return await res.json();
     },
+    uploadAttachment: async (channelId, token, input) => {
+      const res = await fetch(
+        u(`/channels/${channelId}/attachments?filename=${encodeURIComponent(input.filename)}`),
+        {
+          method: "POST",
+          headers: { "content-type": input.contentType, ...authed(token) },
+          body: input.body
+        }
+      );
+      if (!res.ok) throw new Error(`upload attachment \u2192 ${res.status}: ${await res.text()}`);
+      return await res.json();
+    },
+    downloadAttachment: async (channelId, token, attId) => {
+      const res = await fetch(u(`/channels/${channelId}/attachments/${attId}`), {
+        headers: authed(token)
+      });
+      if (!res.ok) throw new Error(`download attachment \u2192 ${res.status}: ${await res.text()}`);
+      return res;
+    },
     read: async (channelId, token, opts) => {
       const params = new URLSearchParams({ since: String(opts?.since ?? 0) });
       if (opts?.for) params.set("for", opts.for);
@@ -1221,6 +1240,25 @@ var requirementClient = (baseUrl) => {
   };
 };
 
+// src/client/retry.ts
+var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+var withRetry = async (fn, opts = {}) => {
+  const tries = Math.max(1, opts.tries ?? 4);
+  const baseMs = opts.baseMs ?? 300;
+  let lastErr;
+  for (let i = 0; i < tries; i++) {
+    try {
+      return await fn();
+    } catch (err) {
+      lastErr = err;
+      if (i === tries - 1) break;
+      const backoff = baseMs * 2 ** i;
+      await sleep(backoff + Math.random() * baseMs);
+    }
+  }
+  throw lastErr;
+};
+
 // src/client/sessions.ts
 var sessionsClient = (baseUrl) => {
   const u = (p) => `${baseUrl}${p}`;
@@ -1343,15 +1381,24 @@ var clientFromBase = (baseUrl) => ({
   sessions: sessionsClient(baseUrl),
   workers: workersClient(baseUrl)
 });
+var BOUNDARY_EVENTS = /* @__PURE__ */ new Set([
+  "turn_start",
+  "turn_complete",
+  "turn_error"
+]);
+var emitRetries = () => Number(process.env.BATON_EMIT_RETRIES) || 4;
 var createWorkerClient = (baseUrl, workerToken, sessionId) => {
   const u = (p) => `${baseUrl}${p}`;
   const auth = { authorization: `Bearer ${workerToken}` };
   return {
-    emitEvent: (type, payload) => request(u(`/sessions/${sessionId}/events`), {
-      method: "POST",
-      body: { type, payload },
-      headers: auth
-    }),
+    emitEvent: (type, payload) => {
+      const post = () => request(u(`/sessions/${sessionId}/events`), {
+        method: "POST",
+        body: { type, payload },
+        headers: auth
+      });
+      return BOUNDARY_EVENTS.has(type) ? withRetry(post, { tries: emitRetries() }) : post();
+    },
     setActive: (active) => request(u(`/sessions/${sessionId}/status`), {
       method: "POST",
       body: { active },
@@ -1422,16 +1469,23 @@ var readStdin = async () => {
   return Buffer.concat(chunks).toString("utf8");
 };
 var renderRoster = (members) => members.length ? members.map((m) => `  ${m.name} (${m.kind})`).join("\n") : "  (nobody online)";
-var inviteBlock = (url, channelId, token) => [
-  "\u2500\u2500 Share this to invite anyone into the room \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-  "You're invited to a baton channel. Three steps to get going:",
-  `  1) see the room:  curl -sS -H "authorization: Bearer ${token}" "${url}/channels/${channelId}"`,
-  `  2) read protocol: curl -sS "${url}/channels/help"`,
-  "  3) follow it to join / listen / send (pick your own NAME).",
-  "",
-  `connection: url=${url} channel=${channelId} token=${token}`,
-  "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
-].join("\n");
+var webLink = (url, channelId, token) => {
+  const origin = url.replace(/\/api\/?$/, "");
+  return origin === url ? null : `${origin}/channel/${channelId}#token=${token}`;
+};
+var inviteBlock = (url, channelId, token) => {
+  const web = webLink(url, channelId, token);
+  return [
+    "\u2500\u2500 Share this to invite anyone into the room \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+    ...web ? [`Humans \u2014 open in a browser:  ${web}`, ""] : [],
+    "Agents \u2014 two curl steps:",
+    `  1) see the room:  curl -sS -H "authorization: Bearer ${token}" "${url}/channels/${channelId}"`,
+    `  2) read protocol: curl -sS "${url}/channels/help"  (then join / listen / send, pick your own NAME)`,
+    "",
+    `connection: url=${url} channel=${channelId} token=${token}`,
+    "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+  ].join("\n");
+};
 
 // src/commands/channel/create.ts
 var createCommand = defineCommand({
@@ -1454,6 +1508,26 @@ var createCommand = defineCommand({
   }
 });
 
+// src/commands/channel/download.ts
+import { writeFileSync as writeFileSync2 } from "node:fs";
+var downloadCommand = defineCommand({
+  meta: { name: "download", description: "download a channel attachment to a file" },
+  args: {
+    channel: { type: "positional", required: true, description: "channel id" },
+    att: { type: "positional", required: true, description: "attachment id (from a message ref)" },
+    token: { type: "string", required: true, description: "channel token" },
+    out: { type: "string", alias: "o", description: "output file path (default: ./<attId>)" },
+    ...common
+  },
+  run: async ({ args }) => {
+    const url = resolveBaseUrl(args.url);
+    const res = await channelClient(url).downloadAttachment(args.channel, args.token, args.att);
+    const out = args.out ?? args.att;
+    writeFileSync2(out, Buffer.from(await res.arrayBuffer()));
+    console.log(`saved \u2192 ${out}`);
+  }
+});
+
 // src/commands/channel/info.ts
 var aboutCommand = defineCommand({
   meta: { name: "about", description: "show a channel's manifest (description + online roster)" },
@@ -1520,7 +1594,7 @@ var updateCommand = defineCommand({
 });
 
 // src/commands/channel/listen.ts
-import { mkdirSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { mkdirSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
@@ -1552,6 +1626,12 @@ var unstartedUserMessages = (events) => {
   const started = startedMessageIds(events);
   return events.filter((e) => e.type === "user_message" && !started.has(e.id));
 };
+var opensTurn = (e) => e.type === "user_message" || e.type === "turn_start";
+var closesTurn = (e) => e.type === "turn_complete" || e.type === "turn_error";
+var isAgentWorking = (events) => {
+  const last = events.findLast((e) => opensTurn(e) || closesTurn(e));
+  return last ? opensTurn(last) : false;
+};
 
 // src/commands/channel/listen.ts
 var PREVIEW = 280;
@@ -1569,7 +1649,7 @@ var runListen = async (o) => {
   const surface = (m) => {
     const text = typeof m.text === "string" ? m.text : "";
     const file = join2(spillDir, `${m.seq}.txt`);
-    writeFileSync2(file, text);
+    writeFileSync3(file, text);
     const truncated = text.length > PREVIEW;
     emit({
       type: "channel.message",
@@ -1582,6 +1662,13 @@ var runListen = async (o) => {
       chars: text.length,
       truncated,
       preview: truncated ? `${text.slice(0, PREVIEW)} \u2026` : text,
+      // BASE-prefixed urls so the subscribing agent can fetch directly.
+      attachments: m.attachments?.length ? m.attachments.map((a) => ({
+        filename: a.filename,
+        contentType: a.contentType,
+        size: a.size,
+        url: `${o.url}${a.url}`
+      })) : void 0,
       file
     });
   };
@@ -1663,6 +1750,12 @@ ${renderRoster(members)}`);
 });
 
 // src/commands/channel/read.ts
+var fmtMessage = (m, base) => {
+  const head = `${m.seq}  ${m.from}  ${m.text}`;
+  const atts = (m.attachments ?? []).map((a) => `
+    \u{1F4CE} ${a.filename} \u2192 ${base}${a.url}`).join("");
+  return head + atts;
+};
 var readCommand = defineCommand({
   meta: { name: "read", description: "poll channel messages once (curl-style, since a cursor)" },
   args: {
@@ -1681,12 +1774,51 @@ var readCommand = defineCommand({
     });
     const out = args.from ? msgs.filter((m) => m.from !== args.from) : msgs;
     if (args.json) console.log(toJson(out));
-    else console.log(out.length ? out.map((m) => `${m.seq}  ${m.from}  ${m.text}`).join("\n") : "(none)");
+    else console.log(out.length ? out.map((m) => fmtMessage(m, url)).join("\n") : "(none)");
   }
 });
 
 // src/commands/channel/send.ts
-import { readFileSync as readFileSync2 } from "node:fs";
+import { openAsBlob as openAsBlob2, readFileSync as readFileSync2 } from "node:fs";
+import { basename as basename2 } from "node:path";
+
+// src/mime.ts
+import { extname } from "node:path";
+var BY_EXT = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml",
+  ".pdf": "application/pdf",
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".json": "application/json",
+  ".csv": "text/csv"
+};
+var contentTypeForPath = (path) => BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
+
+// src/commands/attach.ts
+import { openAsBlob } from "node:fs";
+import { basename } from "node:path";
+var attachPaths = (raw) => (raw === void 0 ? [] : Array.isArray(raw) ? raw : [raw]).flatMap((p) => p.split(",")).map((p) => p.trim()).filter(Boolean);
+var uploadAttachments = async (client, sessionId, paths) => {
+  const out = [];
+  for (const path of paths) {
+    const body = await openAsBlob(path, { type: contentTypeForPath(path) });
+    out.push(
+      await client.sessions.uploadAttachment(sessionId, {
+        filename: basename(path),
+        contentType: contentTypeForPath(path),
+        body
+      })
+    );
+  }
+  return out;
+};
+
+// src/commands/channel/send.ts
 var sendCommand = defineCommand({
   meta: { name: "send", description: "post one message to a channel" },
   args: {
@@ -1696,19 +1828,32 @@ var sendCommand = defineCommand({
     from: { type: "string", description: "your participant name (default: peer)" },
     to: { type: "string", description: "direct it at these names (comma-separated); omit = broadcast" },
     file: { type: "string", description: "read message body from this file (for large content)" },
+    attach: { type: "string", description: "attach file(s) (comma-separated paths); uploaded + carried on the message" },
     ...common
   },
   run: async ({ args }) => {
     const url = resolveBaseUrl(args.url);
+    const client = channelClient(url);
     let text = args.text;
     if (text === void 0 && args.file) text = readFileSync2(args.file, "utf8");
     if (text === void 0 && !process.stdin.isTTY) text = await readStdin();
-    if (text === void 0 || text === "")
-      throw new Error("nothing to send: provide text, --file <path>, or pipe stdin");
-    const msg = await channelClient(url).send(args.channel, args.token, {
+    const attachments = [];
+    for (const path of attachPaths(args.attach)) {
+      attachments.push(
+        await client.uploadAttachment(args.channel, args.token, {
+          filename: basename2(path),
+          contentType: contentTypeForPath(path),
+          body: await openAsBlob2(path, { type: contentTypeForPath(path) })
+        })
+      );
+    }
+    if (!text && attachments.length === 0)
+      throw new Error("nothing to send: provide text, --file <path>, --attach <file>, or pipe stdin");
+    const msg = await client.send(args.channel, args.token, {
       from: args.from ?? "peer",
-      text,
-      to: splitCsv(args.to)
+      text: text ?? "",
+      to: splitCsv(args.to),
+      attachments: attachments.length ? attachments : void 0
     });
     if (args.json) console.log(toJson(msg));
     else console.log(`sent (seq ${msg.seq})`);
@@ -1719,7 +1864,7 @@ var sendCommand = defineCommand({
 var channel = defineCommand({
   meta: {
     name: "channel",
-    description: "multi-agent chat room: create / about / update / help / join / members / send / read / listen / close"
+    description: "multi-agent chat room: create / about / update / help / join / members / send / read / listen / download / close"
   },
   subCommands: {
     create: createCommand,
@@ -1731,6 +1876,7 @@ var channel = defineCommand({
     send: sendCommand,
     read: readCommand,
     listen: listenCommand,
+    download: downloadCommand,
     close: closeCommand
   }
 });
@@ -1874,7 +2020,7 @@ var project = defineCommand({
 });
 
 // src/commands/relay.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join3 } from "node:path";
 
@@ -2009,7 +2155,7 @@ var listenCommand2 = defineCommand({
     const surface = (m) => {
       const text = typeof m.text === "string" ? m.text : "";
       const file = join3(spillDir, `${m.seq}.txt`);
-      writeFileSync3(file, text);
+      writeFileSync4(file, text);
       const truncated = text.length > PREVIEW2;
       emit({
         type: "relay.message",
@@ -2506,6 +2652,7 @@ var toTurnResult = (message) => {
 
 // src/session/runner/turn.ts
 var turnTimeoutMs = () => Number(process.env.BATON_TURN_TIMEOUT_MS) || 30 * 6e4;
+var heartbeatMs = () => Number(process.env.BATON_TURN_HEARTBEAT_MS) || 3e4;
 var TIMEOUT = /* @__PURE__ */ Symbol("turn-timeout");
 var ABORTED = /* @__PURE__ */ Symbol("turn-aborted");
 var finalizeTurn = async (result, worker2, log) => {
@@ -2558,6 +2705,7 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
   const abort = new AbortController();
   const ceiling = turnTimeoutMs();
   let timer;
+  let heartbeat;
   const timeout = new Promise((resolve2) => {
     timer = setTimeout(() => resolve2(TIMEOUT), ceiling);
   });
@@ -2566,6 +2714,9 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
     else externalSignal?.addEventListener("abort", () => resolve2(ABORTED), { once: true });
   });
   try {
+    heartbeat = setInterval(() => {
+      void worker2.emitEvent("turn_heartbeat", {}).catch((e) => log(`[heartbeat] ${String(e)}`));
+    }, heartbeatMs());
     const messages = startQuery(config, text, resuming, queryFn, abort, log, {
       envOverlay,
       planMode,
@@ -2600,6 +2751,7 @@ var runTurn = async (config, worker2, msg, resuming, queryFn, log = (m) => conso
     return -1;
   } finally {
     clearTimeout(timer);
+    clearInterval(heartbeat);
   }
 };
 
@@ -2680,10 +2832,17 @@ var runDaemon = async (config, deps, signal) => {
       busy = false;
     }
   };
+  const closeOrphanedTurn = async (reason) => {
+    const events = await deps.worker.listEvents();
+    if (!isAgentWorking(events)) return;
+    await deps.worker.emitEvent("turn_error", { message: reason, synthetic: true });
+    log(`closed orphaned open turn (${reason})`);
+  };
   const reconcile = async () => {
     reconciling = true;
     try {
-      const pending = unstartedUserMessages(await deps.worker.listEvents());
+      const events = await deps.worker.listEvents();
+      const pending = unstartedUserMessages(events);
       let added = 0;
       for (const ev of pending) {
         if (state.seen.has(ev.sequence)) continue;
@@ -2695,6 +2854,12 @@ var runDaemon = async (config, deps, signal) => {
         log(`reconciled ${added} queued message(s) from transcript`);
         lastActivity = Date.now();
         void drain();
+      } else if (pendingQueue.length === 0 && !busy && !currentTurn && isAgentWorking(events)) {
+        await deps.worker.emitEvent("turn_error", {
+          message: "turn abandoned \u2014 runner restarted",
+          synthetic: true
+        });
+        log("reconcile: closed orphaned open turn from a prior child");
       }
     } catch (e) {
       log(`reconcile failed: ${String(e)}`);
@@ -2719,6 +2884,11 @@ var runDaemon = async (config, deps, signal) => {
       if (currentTurn) {
         log("interrupt \u2014 aborting current turn");
         currentTurn.abort();
+      } else {
+        log("interrupt \u2014 no live turn; closing any orphaned open turn");
+        void closeOrphanedTurn("interrupted by user").catch(
+          (e) => log(`orphan close failed: ${String(e)}`)
+        );
       }
     },
     // Report active only now that we're subscribed — before this, a message
@@ -2811,44 +2981,6 @@ var sessionRunCommand = defineCommand({
   }
 });
 
-// src/commands/attach.ts
-import { openAsBlob } from "node:fs";
-import { basename } from "node:path";
-
-// src/mime.ts
-import { extname } from "node:path";
-var BY_EXT = {
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".gif": "image/gif",
-  ".webp": "image/webp",
-  ".svg": "image/svg+xml",
-  ".pdf": "application/pdf",
-  ".txt": "text/plain",
-  ".md": "text/markdown",
-  ".json": "application/json",
-  ".csv": "text/csv"
-};
-var contentTypeForPath = (path) => BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
-
-// src/commands/attach.ts
-var attachPaths = (raw) => (raw === void 0 ? [] : Array.isArray(raw) ? raw : [raw]).flatMap((p) => p.split(",")).map((p) => p.trim()).filter(Boolean);
-var uploadAttachments = async (client, sessionId, paths) => {
-  const out = [];
-  for (const path of paths) {
-    const body = await openAsBlob(path, { type: contentTypeForPath(path) });
-    out.push(
-      await client.sessions.uploadAttachment(sessionId, {
-        filename: basename(path),
-        contentType: contentTypeForPath(path),
-        body
-      })
-    );
-  }
-  return out;
-};
-
 // src/commands/session/send.ts
 var sessionSendCommand = defineCommand({
   meta: { name: "send", description: "post a chat message into a session (no streaming reply)" },
@@ -3421,7 +3553,7 @@ var runWorkerDaemon = async (cfg, client, signal) => {
 
 // src/worker/machine-id.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { dirname as dirname3, join as join8 } from "node:path";
 var machineIdPath = (env = process.env) => join8(env.XDG_DATA_HOME ?? join8(env.HOME ?? homedir3(), ".local/share"), "baton", "machine-id");
@@ -3432,7 +3564,7 @@ var readOrCreateMachineId = (path = machineIdPath()) => {
   }
   const id = randomUUID2();
   mkdirSync4(dirname3(path), { recursive: true });
-  writeFileSync4(path, `${id}
+  writeFileSync5(path, `${id}
 `, "utf8");
   return id;
 };

package/package.json

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