@meetopenbot/openbot 1.2.1 → 1.2.2

package/dist/history.js

@@ -71,51 +71,75 @@ function appendAssistantOutput(message, text, reasoningParts) {
             insertBeforeToolCalls(parts, [{ type: 'text', text }]);
     }
 }
-/**
- * Ensures every tool-call has a matching tool-result before calling the LLM.
- * Orphaned calls (interrupted run, missing :result event, etc.) get an empty
- * result so the conversation can resume instead of failing validation.
- */
-function fillMissingToolResults(messages) {
-    const filled = [];
-    const pending = new Map();
-    const flushPending = () => {
-        if (pending.size === 0)
-            return;
-        filled.push({
-            role: 'tool',
-            content: [...pending.entries()].map(([toolCallId, toolName]) => ({
+function isToolResultPart(part) {
+    return Boolean(part && typeof part === 'object' && part.type === 'tool-result');
+}
+function assistantToolCalls(message) {
+    if (message.role !== 'assistant' || !Array.isArray(message.content))
+        return [];
+    const calls = [];
+    for (const part of message.content) {
+        if (part.type !== 'tool-call')
+            continue;
+        const toolCall = part;
+        if (typeof toolCall.toolCallId !== 'string')
+            continue;
+        calls.push({
+            toolCallId: toolCall.toolCallId,
+            toolName: typeof toolCall.toolName === 'string' ? toolCall.toolName : 'tool',
+        });
+    }
+    return calls;
+}
+function collectToolResults(messages) {
+    const results = new Map();
+    for (const message of messages) {
+        if (message.role !== 'tool' || !Array.isArray(message.content))
+            continue;
+        for (const part of message.content) {
+            if (!isToolResultPart(part) || results.has(part.toolCallId))
+                continue;
+            results.set(part.toolCallId, part);
+        }
+    }
+    return results;
+}
+function toolMessageForCalls(calls, results) {
+    return {
+        role: 'tool',
+        content: calls.map(({ toolCallId, toolName }) => {
+            const existing = results.get(toolCallId);
+            if (existing) {
+                results.delete(toolCallId);
+                return existing;
+            }
+            return {
                 type: 'tool-result',
                 toolCallId,
                 toolName,
                 output: { type: 'text', value: '' },
-            })),
-        });
-        pending.clear();
+            };
+        }),
     };
+}
+/**
+ * Rebuild tool messages so every `tool-call` is followed immediately by matching
+ * results. Late results (user invoke between call and `:result`) are moved next
+ * to their call; unmatched results are dropped; interrupted calls get an empty
+ * result so the next LLM turn does not fail provider validation.
+ */
+function sanitizeToolPairing(messages) {
+    const results = collectToolResults(messages);
+    const sanitized = [];
     for (const message of messages) {
-        if (message.role === 'tool' && Array.isArray(message.content)) {
-            filled.push(message);
-            for (const part of message.content) {
-                if (part.type === 'tool-result') {
-                    pending.delete(part.toolCallId);
-                }
-            }
+        if (message.role === 'tool')
             continue;
-        }
-        flushPending();
-        filled.push(message);
-        if (message.role === 'assistant' && Array.isArray(message.content)) {
-            for (const part of message.content) {
-                if (part.type === 'tool-call') {
-                    const toolCall = part;
-                    pending.set(toolCall.toolCallId, toolCall.toolName);
-                }
-            }
-        }
+        sanitized.push(message);
+        const calls = assistantToolCalls(message);
+        if (calls.length > 0)
+            sanitized.push(toolMessageForCalls(calls, results));
     }
-    flushPending();
-    return filled;
+    return sanitized;
 }
 function toolResultText(data) {
     if (data && typeof data === 'object') {
@@ -235,5 +259,5 @@ export function eventsToModelMessages(events, options) {
                 break;
         }
     }
-    return fillMissingToolResults(messages);
+    return sanitizeToolPairing(messages);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meetopenbot/openbot",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "OpenBot coordinator runtime: ask specialists, route work into Spaces, and track todos.",
   "type": "module",
   "main": "./dist/index.js",
@@ -25,7 +25,7 @@
     "@ai-sdk/openai": "^4.0.46",
     "ai": "^7.0.77",
     "zod": "^4.3.5",
-    "@meetopenbot/plugin-sdk": "^1.1.2"
+    "@meetopenbot/plugin-sdk": "^1.1.3"
   },
   "devDependencies": {
     "@types/node": "^20.10.1",