@mindstudio-ai/remy 0.1.149 → 0.1.151

package/dist/headless.d.ts

@@ -90,6 +90,10 @@ declare class HeadlessSession {
     /**
      * Drain the queue in strict FIFO order. Caller must hold `running = true`.
      * User messages arriving during the drain will be enqueued behind current items.
+     *
+     * Consecutive background-source items are coalesced into a single turn so
+     * the LLM sees all the background results together and produces one
+     * acknowledgment, not N separate ones.
      */
     private drainQueueLoop;
     /**

package/dist/headless.js

@@ -537,6 +537,12 @@ async function* streamChat(params) {
       }
     }
   }
+  if (buffer.startsWith("data: ")) {
+    try {
+      yield JSON.parse(buffer.slice(6));
+    } catch {
+    }
+  }
   if (!receivedDone) {
     log2.warn("Stream ended without done event", {
       requestId,
@@ -544,12 +550,10 @@ async function* streamChat(params) {
       durationMs: Date.now() - startTime,
       remainingBuffer: buffer.slice(0, 200)
     });
-  }
-  if (buffer.startsWith("data: ")) {
-    try {
-      yield JSON.parse(buffer.slice(6));
-    } catch {
-    }
+    yield {
+      type: "error",
+      error: "Network error: stream ended before completion"
+    };
   }
 }
 var MAX_RETRIES = 5;
@@ -2778,12 +2782,23 @@ function buildBackgroundResultsMessage(results) {
 ${r.result}
 </tool_result>`
   ).join("\n\n");
-  const body = `This is an automated message containing the result of a tool call that has been working in the background. This is not a direct message from the user.
+  const plural = results.length > 1 ? "s" : "";
+  const body = `This is an automated message containing the result${plural} of ${results.length > 1 ? "tool calls" : "a tool call"} that ${results.length > 1 ? "have" : "has"} been working in the background. This is not a direct message from the user.
 <background_results>
 ${xml}
 </background_results>`;
   return automatedMessage("background_results", body);
 }
+function mergeBackgroundResultsMessages(messages) {
+  const results = [];
+  const toolRe = /<tool_result id="([^"]+)" name="([^"]+)">\n([\s\S]*?)\n<\/tool_result>/g;
+  for (const msg of messages) {
+    for (const m of msg.matchAll(toolRe)) {
+      results.push({ toolCallId: m[1], name: m[2], result: m[3] });
+    }
+  }
+  return buildBackgroundResultsMessage(results);
+}
 
 // src/subagents/common/cleanMessages.ts
 function findLastSummaryCheckpoint(messages, name) {
@@ -2807,9 +2822,9 @@ function fixOrphanedToolCalls(messages) {
       toolResultIds.add(msg.toolCallId);
     }
   }
-  const result = [...messages];
-  for (let i = result.length - 1; i >= 0; i--) {
-    const msg = result[i];
+  const result = [];
+  for (const msg of messages) {
+    result.push(msg);
     if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
       continue;
     }
@@ -2817,17 +2832,15 @@ function fixOrphanedToolCalls(messages) {
       (b) => b.type === "tool"
     );
     const orphans = toolBlocks.filter((tc) => !toolResultIds.has(tc.id));
-    if (orphans.length === 0) {
-      continue;
+    for (const tc of orphans) {
+      result.push({
+        role: "user",
+        content: "Error: tool result lost (session recovered)",
+        toolCallId: tc.id,
+        isToolError: true
+      });
+      toolResultIds.add(tc.id);
     }
-    const synthetics = orphans.map((tc) => ({
-      role: "user",
-      content: "Error: tool result lost (session recovered)",
-      toolCallId: tc.id,
-      isToolError: true
-    }));
-    result.splice(i + 1, 0, ...synthetics);
-    break;
   }
   return result;
 }
@@ -6246,6 +6259,10 @@ var MessageQueue = class {
   snapshot() {
     return [...this.items];
   }
+  /** Return the next item without removing it. */
+  peek() {
+    return this.items[0];
+  }
   get length() {
     return this.items.length;
   }
@@ -6810,6 +6827,10 @@ ${userMessage}` : header;
   /**
    * Drain the queue in strict FIFO order. Caller must hold `running = true`.
    * User messages arriving during the drain will be enqueued behind current items.
+   *
+   * Consecutive background-source items are coalesced into a single turn so
+   * the LLM sees all the background results together and produces one
+   * acknowledgment, not N separate ones.
    */
   async drainQueueLoop() {
     while (true) {
@@ -6817,6 +6838,26 @@ ${userMessage}` : header;
       if (!next) {
         break;
       }
+      if (next.source === "background") {
+        const batch = [next];
+        while (this.queue.peek()?.source === "background") {
+          const more = this.queue.shift();
+          if (more) {
+            batch.push(more);
+          }
+        }
+        const combinedCommand = {
+          action: "message",
+          text: mergeBackgroundResultsMessages(
+            batch.map((b) => b.command.text ?? "")
+          ),
+          ...this.currentOnboardingState && {
+            onboardingState: this.currentOnboardingState
+          }
+        };
+        await this.runSingleTurn(combinedCommand, `background-${Date.now()}`);
+        continue;
+      }
       const nextRid = next.command.requestId ?? `${next.source}-${Date.now()}`;
       await this.runSingleTurn(next.command, nextRid);
     }

package/dist/index.js

@@ -222,6 +222,12 @@ async function* streamChat(params) {
       }
     }
   }
+  if (buffer.startsWith("data: ")) {
+    try {
+      yield JSON.parse(buffer.slice(6));
+    } catch {
+    }
+  }
   if (!receivedDone) {
     log.warn("Stream ended without done event", {
       requestId,
@@ -229,12 +235,10 @@ async function* streamChat(params) {
       durationMs: Date.now() - startTime,
       remainingBuffer: buffer.slice(0, 200)
     });
-  }
-  if (buffer.startsWith("data: ")) {
-    try {
-      yield JSON.parse(buffer.slice(6));
-    } catch {
-    }
+    yield {
+      type: "error",
+      error: "Network error: stream ended before completion"
+    };
   }
 }
 function isRetryableError(error) {
@@ -3069,12 +3073,23 @@ function buildBackgroundResultsMessage(results) {
 ${r.result}
 </tool_result>`
   ).join("\n\n");
-  const body = `This is an automated message containing the result of a tool call that has been working in the background. This is not a direct message from the user.
+  const plural = results.length > 1 ? "s" : "";
+  const body = `This is an automated message containing the result${plural} of ${results.length > 1 ? "tool calls" : "a tool call"} that ${results.length > 1 ? "have" : "has"} been working in the background. This is not a direct message from the user.
 <background_results>
 ${xml}
 </background_results>`;
   return automatedMessage("background_results", body);
 }
+function mergeBackgroundResultsMessages(messages) {
+  const results = [];
+  const toolRe = /<tool_result id="([^"]+)" name="([^"]+)">\n([\s\S]*?)\n<\/tool_result>/g;
+  for (const msg of messages) {
+    for (const m of msg.matchAll(toolRe)) {
+      results.push({ toolCallId: m[1], name: m[2], result: m[3] });
+    }
+  }
+  return buildBackgroundResultsMessage(results);
+}
 var init_sentinel = __esm({
   "src/automatedActions/sentinel.ts"() {
     "use strict";
@@ -3103,9 +3118,9 @@ function fixOrphanedToolCalls(messages) {
       toolResultIds.add(msg.toolCallId);
     }
   }
-  const result = [...messages];
-  for (let i = result.length - 1; i >= 0; i--) {
-    const msg = result[i];
+  const result = [];
+  for (const msg of messages) {
+    result.push(msg);
     if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
       continue;
     }
@@ -3113,17 +3128,15 @@ function fixOrphanedToolCalls(messages) {
       (b) => b.type === "tool"
     );
     const orphans = toolBlocks.filter((tc) => !toolResultIds.has(tc.id));
-    if (orphans.length === 0) {
-      continue;
+    for (const tc of orphans) {
+      result.push({
+        role: "user",
+        content: "Error: tool result lost (session recovered)",
+        toolCallId: tc.id,
+        isToolError: true
+      });
+      toolResultIds.add(tc.id);
     }
-    const synthetics = orphans.map((tc) => ({
-      role: "user",
-      content: "Error: tool result lost (session recovered)",
-      toolCallId: tc.id,
-      isToolError: true
-    }));
-    result.splice(i + 1, 0, ...synthetics);
-    break;
   }
   return result;
 }
@@ -6948,6 +6961,10 @@ var init_messageQueue = __esm({
       snapshot() {
         return [...this.items];
       }
+      /** Return the next item without removing it. */
+      peek() {
+        return this.items[0];
+      }
       get length() {
         return this.items.length;
       }
@@ -7546,6 +7563,10 @@ ${userMessage}` : header;
       /**
        * Drain the queue in strict FIFO order. Caller must hold `running = true`.
        * User messages arriving during the drain will be enqueued behind current items.
+       *
+       * Consecutive background-source items are coalesced into a single turn so
+       * the LLM sees all the background results together and produces one
+       * acknowledgment, not N separate ones.
        */
       async drainQueueLoop() {
         while (true) {
@@ -7553,6 +7574,26 @@ ${userMessage}` : header;
           if (!next) {
             break;
           }
+          if (next.source === "background") {
+            const batch = [next];
+            while (this.queue.peek()?.source === "background") {
+              const more = this.queue.shift();
+              if (more) {
+                batch.push(more);
+              }
+            }
+            const combinedCommand = {
+              action: "message",
+              text: mergeBackgroundResultsMessages(
+                batch.map((b) => b.command.text ?? "")
+              ),
+              ...this.currentOnboardingState && {
+                onboardingState: this.currentOnboardingState
+              }
+            };
+            await this.runSingleTurn(combinedCommand, `background-${Date.now()}`);
+            continue;
+          }
           const nextRid = next.command.requestId ?? `${next.source}-${Date.now()}`;
           await this.runSingleTurn(next.command, nextRid);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindstudio-ai/remy",
-  "version": "0.1.149",
+  "version": "0.1.151",
   "description": "MindStudio coding agent",
   "repository": {
     "type": "git",