openmausbot 0.1.84 → 0.1.86

package/dist-server/server/steer-queue.js

@@ -72,6 +72,8 @@ export function queueSteeredMessage(botId, threadId, text, options = {}) {
         reason: options.reason,
         unattended: options.unattended,
         peerAsk: options.peerAsk,
+        sender: options.sender,
+        trigger: options.trigger,
     };
     saveChatFollowup({ id, kind: "bot", ownerId: botId, threadId, payload: item });
     entry.items.push(item);
@@ -94,6 +96,12 @@ export function queuedThreadPosition(botId, threadId) {
     }
     return null;
 }
+/** Any queued correction supersedes a tool-planned continuation, whether it
+ * waits for this thread's turn or for the bot's shared capacity. */
+export function hasQueuedSteeredMessages(botId, threadId) {
+    const entry = queues.get(threadId);
+    return entry?.botId === botId && entry.items.length > 0;
+}
 /** Drain every queue whose task is idle: append the held lines (leaf is now
  * the finished turn's last item), then one run per thread whose prompt is
  * the texts separated by a blank line. `userMessage` is the last appended line
@@ -134,6 +142,7 @@ export function drainSteeredMessages(store, run, isBlocked) {
                 sendId: item.sendId,
                 queueId: item.messageId,
                 peerAsk: item.peerAsk,
+                sender: item.sender,
             }));
         }
         const last = appended.at(-1);
@@ -147,7 +156,9 @@ export function drainSteeredMessages(store, run, isBlocked) {
         const running = run(entry.botId, threadId, prompt, last, appended.map((message) => message.id), 
         // one unattended line makes the whole drained turn unattended: a
         // person's words in the same queue cannot re-attend a bot's own
-        entry.items.some((item) => item.unattended === true));
+        entry.items.some((item) => item.unattended === true), 
+        // the first waiting line is the one that starts this turn
+        { trigger: entry.items[0].trigger, sender: entry.items[0].sender, peerAsk: entry.items[0].peerAsk });
         void Promise.resolve(running).then(() => settleChatFollowups(ids, null), () => settleChatFollowups(ids, "interrupted")).catch((error) => console.warn("steer-queue: could not settle durable follow-up", error));
     }
 }