protoagent 0.1.12 → 0.1.14

package/dist/agentic-loop.js

@@ -235,6 +235,41 @@ function sanitizeMessagesForRetry(messages, validToolNames) {
     });
     return { messages: sanitizedMessages, changed };
 }
+/**
+ * Remove orphaned tool result messages that don't have a matching tool_call_id
+ * in any assistant message. This happens when messages are truncated and the
+ * assistant's tool_calls are removed but the tool results remain.
+ */
+function removeOrphanedToolResults(messages) {
+    // Collect all valid tool_call_ids from assistant messages
+    const validToolCallIds = new Set();
+    for (const message of messages) {
+        const msgAny = message;
+        if (message.role === 'assistant' && Array.isArray(msgAny.tool_calls)) {
+            for (const tc of msgAny.tool_calls) {
+                if (tc.id) {
+                    validToolCallIds.add(tc.id);
+                }
+            }
+        }
+    }
+    // Filter out tool messages with orphaned tool_call_ids
+    const filteredMessages = messages.filter((message) => {
+        const msgAny = message;
+        if (message.role === 'tool' && msgAny.tool_call_id) {
+            const isOrphaned = !validToolCallIds.has(msgAny.tool_call_id);
+            if (isOrphaned) {
+                logger.warn('Removing orphaned tool result', {
+                    tool_call_id: msgAny.tool_call_id,
+                    contentPreview: msgAny.content?.slice(0, 100),
+                });
+            }
+            return !isOrphaned;
+        }
+        return true;
+    });
+    return { messages: filteredMessages, changed: filteredMessages.length !== messages.length };
+}
 function getValidToolNames() {
     return new Set([...getAllTools(), subAgentTool]
         .map((tool) => tool.function?.name)
@@ -281,8 +316,10 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
     let contextRetryCount = 0;
     let retriggerCount = 0;
     let truncateRetryCount = 0;
+    let continueRetryCount = 0;
     const MAX_RETRIGGERS = 3;
     const MAX_TRUNCATE_RETRIES = 5;
+    const MAX_CONTINUE_RETRIES = 1;
     const validToolNames = getValidToolNames();
     while (iterationCount < maxIterations) {
         // Check if abort was requested
@@ -693,6 +730,15 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
                         continue;
                     }
                 }
+                // Try removing orphaned tool results
+                const orphanedRemoved = removeOrphanedToolResults(updatedMessages);
+                if (orphanedRemoved.changed) {
+                    updatedMessages.length = 0;
+                    updatedMessages.push(...orphanedRemoved.messages);
+                    logger.warn('400 response after orphaned tool results; retrying with cleaned messages');
+                    // Silently retry without showing error to user
+                    continue;
+                }
                 // If sanitization didn't help, try removing messages one at a time (up to 5)
                 if (truncateRetryCount < MAX_TRUNCATE_RETRIES) {
                     truncateRetryCount++;
@@ -714,6 +760,21 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
                         continue;
                     }
                 }
+                // After truncation retries exhausted, try adding a "continue" message
+                if (continueRetryCount < MAX_CONTINUE_RETRIES) {
+                    continueRetryCount++;
+                    updatedMessages.push({ role: 'user', content: 'continue' });
+                    logger.warn('400 error: adding "continue" message to retry', {
+                        continueRetryCount,
+                        messageCount: updatedMessages.length,
+                    });
+                    onEvent({
+                        type: 'error',
+                        error: 'Request failed. Retrying with "continue"...',
+                        transient: true,
+                    });
+                    continue;
+                }
             }
             // Handle context-window-exceeded (prompt too long) — attempt forced compaction
             // This fires when our token estimate was too low (e.g. base64 images from MCP tools)
@@ -778,7 +839,7 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
             if (apiError?.status === 400) {
                 onEvent({
                     type: 'error',
-                    error: 'The conversation history appears to be corrupted and could not be automatically repaired. Try /clear to start fresh.',
+                    error: `Request failed: ${errMsg}\n\nThe conversation history could not be automatically repaired. Try /clear to start fresh.`,
                     transient: false,
                 });
                 onEvent({ type: 'done' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protoagent",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "type": "module",
   "files": [
     "dist",