@lesscap/baton-cli 0.7.10 → 0.7.11

package/dist/baton.mjs

@@ -6706,9 +6706,23 @@ var startedMessageIds = (events) => {
   }
   return ids;
 };
+var messageLoopId = (event) => {
+  if (event.type !== "user_message") return void 0;
+  const id = event.payload?.loopId;
+  return typeof id === "number" ? id : void 0;
+};
 var unstartedUserMessages = (events) => {
   const started = startedMessageIds(events);
-  return events.filter((e) => e.type === "user_message" && !started.has(e.id));
+  const latest = /* @__PURE__ */ new Map();
+  events.forEach((event) => {
+    const loopId = messageLoopId(event);
+    if (loopId !== void 0) latest.set(loopId, Math.max(latest.get(loopId) ?? -1, event.sequence));
+  });
+  return events.filter((event) => {
+    if (event.type !== "user_message" || started.has(event.id)) return false;
+    const loopId = messageLoopId(event);
+    return loopId === void 0 || event.sequence === latest.get(loopId);
+  });
 };
 var opensTurn = (e) => e.type === "user_message" || e.type === "turn_start";
 var closesTurn = (e) => e.type === "turn_complete" || e.type === "turn_error";
@@ -8628,16 +8642,27 @@ var runDaemon = async (config, deps, signal) => {
   log(`bin: ${claudeExecutable() ?? "(sdk bundled)"}  cwd: ${config.worktreePath}`);
   log(`runtime env keys: ${maskedEnvKeys(deps.env)}`);
   const state = { seen: /* @__PURE__ */ new Set() };
-  const pendingQueue = [];
+  let pendingQueue = [];
+  const latestLoops = /* @__PURE__ */ new Map();
   let busy = false;
   let reconciling = false;
   let lastActivity = Date.now();
   let currentTurn;
+  const trackLoopMessage = (event) => {
+    const loopId = messageLoopId(event);
+    if (loopId === void 0) return true;
+    if (event.sequence < (latestLoops.get(loopId) ?? -1)) return false;
+    latestLoops.set(loopId, event.sequence);
+    pendingQueue = pendingQueue.filter(
+      (queued) => messageLoopId(queued) !== loopId || queued.sequence >= event.sequence
+    );
+    return true;
+  };
   const drain = async () => {
-    if (busy) return;
+    if (busy || reconciling) return;
     busy = true;
     try {
-      while (pendingQueue.length > 0 && !signal.aborted) {
+      while (pendingQueue.length > 0 && !signal.aborted && !reconciling) {
         const msg = pendingQueue.shift();
         if (!msg) break;
         const resuming = isAgentConversationResumable(config);
@@ -8673,10 +8698,11 @@ var runDaemon = async (config, deps, signal) => {
     reconciling = true;
     try {
       const events = await deps.worker.listEvents();
+      events.forEach(trackLoopMessage);
       const pending = unstartedUserMessages(events);
       let added = 0;
       for (const ev of pending) {
-        if (state.seen.has(ev.sequence)) continue;
+        if (state.seen.has(ev.sequence) || !trackLoopMessage(ev)) continue;
         state.seen.add(ev.sequence);
         pendingQueue.push(ev);
         added++;
@@ -8684,7 +8710,6 @@ var runDaemon = async (config, deps, signal) => {
       if (added > 0) {
         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",
@@ -8696,6 +8721,7 @@ var runDaemon = async (config, deps, signal) => {
       log(`reconcile failed: ${String(e)}`);
     } finally {
       reconciling = false;
+      if (pendingQueue.length > 0) void drain();
     }
   };
   const es = subscribeStream(
@@ -8706,6 +8732,7 @@ var runDaemon = async (config, deps, signal) => {
     state.seen,
     log,
     (ev) => {
+      if (!trackLoopMessage(ev)) return;
       lastActivity = Date.now();
       pendingQueue.push(ev);
       void drain();

package/package.json

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