@botbuddy/cli 1.32.3 → 1.32.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.32.3",
+  "version": "1.32.4",
   "description": "BotBuddy — Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/wait.mjs

@@ -55,7 +55,13 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
   timer:duration=<seconds>            wake after N seconds (DB-clocked server-side)
   timer:deadline=<ISO-8601>           wake at an absolute time
   chat:channel=<id>|*                 new Direct Chat message (or * = any channel you are in;
-                                      you are never woken by your own messages)
+                                      you are never woken by your own messages). Level-
+                                      triggered at arm: an unread reply from another
+                                      participant that already exists when you arm wakes
+                                      the wait immediately (payload.reason=unread_at_arm),
+                                      so send-then-arm never misses a fast reply. Respects
+                                      your read marker (mark_direct_chat_read) and your own
+                                      last message; a sibling session's reply still wakes.
   lock:subtype=<t>,host=<h>[,slot=<s>][,claim=true]
                                       a resource lock becomes available
                                       subtype ∈ playwright_lane|vite_port|backend_port|supabase_local
@@ -273,6 +279,12 @@ async function registerWait(opts, conditions, deadlineIso) {
     conditions,
     deadline: deadlineIso,
     mode: opts.mode,
+    // BOT-1753: always sent so the relay knows this client reports its replay
+    // boundary (a pre-1.32.3 client omits the key and the relay then skips the chat
+    // arm snapshot to avoid a chained-resume duplicate). "-1" = a fresh arm; a
+    // resume sends its `--since` cursor. The relay only arm-grants messages this
+    // wait will NOT replay itself.
+    since: String(opts.since ?? -1),
     ...(opts.localWaitId ? { local_wait_id: opts.localWaitId } : {}),
     ...(opts.expectedAgentId ? {
       expected_agent_id: opts.expectedAgentId,
@@ -422,6 +434,7 @@ async function registerWait(opts, conditions, deadlineIso) {
   return {
     waitSessionId: body.wait_session_id ?? null,
     cursorStart: body.cursor_start ?? null,
+    chatReplayFloor: body.chat_replay_floor ?? null,
     // BOT-1184: the server canonicalizes lock-condition hosts on register and
     // echoes them here so the client matches the canonical subject_key.
     conditions: Array.isArray(body.conditions) ? body.conditions : null,
@@ -1059,6 +1072,7 @@ async function resolveRecoveryWaitSession(checkpoint, { reserveMissing = false }
     registration: {
       waitSessionId: body.wait_session_id,
       cursorStart: body.cursor_start ?? null,
+    chatReplayFloor: body.chat_replay_floor ?? null,
       sessionTenant: checkpoint.tenant_id ?? null,
       agentId: checkpoint.agent_id ?? null,
       sessionId: checkpoint.arming_session_id ?? null,
@@ -1749,6 +1763,15 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       // Arm from the registration high-water mark unless the caller pinned an
       // explicit --since (resume). cursor_start replays the register→connect gap.
       if (opts.since == null && reg.cursorStart != null) effectiveSince = String(reg.cursorStart);
+      // BOT-1753 (Codex R7 F2): a still-unread chat arm grant a dead/sibling wait left
+      // below our replay boundary. Replay from just before it so it isn't stranded —
+      // for a fresh arm AND a --since resume. The relay only reports a floor for a
+      // message that is genuinely still unread, so this never re-delivers a read reply.
+      if (reg.chatReplayFloor != null && /^\d+$/.test(String(reg.chatReplayFloor))) {
+        if (effectiveSince == null || BigInt(reg.chatReplayFloor) < BigInt(effectiveSince)) {
+          effectiveSince = String(reg.chatReplayFloor);
+        }
+      }
       checkpoint = await store.update(checkpoint.local_wait_id, {
         status: "armed",
         cloud_wait_session_id: waitSessionId,