@agent-native/core 0.84.34 → 0.84.35

package/dist/agent/production-agent.js

@@ -1861,7 +1861,6 @@ export async function runAgentLoop(opts) {
             // means no hard-block this turn.
         }
     }
-    const bufferTextUntilFinalGuard = Boolean(opts.finalResponseGuard);
     let finalGuardRetries = 0;
     let iterations = 0;
     // Set when an in-loop processor aborts via `abort()` / throws a `TripWire`.
@@ -1889,7 +1888,7 @@ export async function runAgentLoop(opts) {
             iterations = 1;
         }
         let assistantContent;
-        let bufferedAssistantText = "";
+        let streamedAssistantText = "";
         let terminalStopReason;
         const toolCallErrors = new Map();
         let contextMessages = messages;
@@ -1940,7 +1939,7 @@ export async function runAgentLoop(opts) {
         }
         for (let retry = 0;; retry++) {
             assistantContent = undefined;
-            bufferedAssistantText = "";
+            streamedAssistantText = "";
             terminalStopReason = undefined;
             toolCallErrors.clear();
             try {
@@ -1994,12 +1993,8 @@ export async function runAgentLoop(opts) {
                         }
                     }
                     if (event.type === "text-delta") {
-                        if (bufferTextUntilFinalGuard) {
-                            bufferedAssistantText += event.text;
-                        }
-                        else {
-                            send({ type: "text", text: event.text });
-                        }
+                        streamedAssistantText += event.text;
+                        send({ type: "text", text: event.text });
                     }
                     else if (event.type === "thinking-delta") {
                         thinkingBuffer += event.text;
@@ -2158,47 +2153,56 @@ export async function runAgentLoop(opts) {
                 throw err;
             }
         }
-        const flushBufferedAssistantText = () => {
-            if (!bufferTextUntilFinalGuard)
+        const flushUnstreamedAssistantText = () => {
+            if (streamedAssistantText)
                 return;
-            const text = bufferedAssistantText || collectTextParts(assistantContentForHistory);
+            const text = collectTextParts(assistantContentForHistory);
             if (text)
                 send({ type: "text", text });
         };
         if (toolCallParts.length === 0) {
             if (terminalStopReason === "max_tokens") {
-                flushBufferedAssistantText();
+                flushUnstreamedAssistantText();
                 appendAgentLoopContinuation(messages, "max_tokens");
                 continue;
             }
-            const guard = opts.finalResponseGuard
-                ? await opts.finalResponseGuard({
-                    messages,
-                    assistantContent: assistantContentForHistory,
-                    text: collectTextParts(assistantContentForHistory),
-                    toolCalls: [...toolCallHistory],
-                    toolResults: [...toolResultHistory],
-                    retryCount: finalGuardRetries,
-                    executionMode: opts.executionMode ?? "act",
-                })
-                : null;
+            let guard = null;
+            if (opts.finalResponseGuard) {
+                try {
+                    guard = await opts.finalResponseGuard({
+                        messages,
+                        assistantContent: assistantContentForHistory,
+                        text: collectTextParts(assistantContentForHistory),
+                        toolCalls: [...toolCallHistory],
+                        toolResults: [...toolResultHistory],
+                        retryCount: finalGuardRetries,
+                        executionMode: opts.executionMode ?? "act",
+                    });
+                }
+                catch (err) {
+                    send({ type: "clear" });
+                    throw err;
+                }
+            }
             let guardEmittedFallback = false;
             if (guard) {
                 const retryMessage = typeof guard === "string" ? guard : guard.retryMessage;
                 const fallbackMessage = typeof guard === "string" ? guard : guard.fallbackMessage;
                 if (finalGuardRetries < 1) {
                     finalGuardRetries += 1;
+                    send({ type: "clear" });
                     messages.push({
                         role: "user",
                         content: [{ type: "text", text: retryMessage }],
                     });
                     continue;
                 }
+                send({ type: "clear" });
                 send({ type: "text", text: fallbackMessage ?? retryMessage });
                 guardEmittedFallback = true;
             }
             else {
-                flushBufferedAssistantText();
+                flushUnstreamedAssistantText();
             }
             // Some providers (notably OpenAI Responses for gpt-5+) can stream a
             // successful turn that contains only reasoning content and zero output
@@ -2208,7 +2212,7 @@ export async function runAgentLoop(opts) {
             // Surface a plain-language error so the user knows what happened.
             if (!guardEmittedFallback &&
                 collectTextParts(assistantContentForHistory).trim().length === 0 &&
-                bufferedAssistantText.trim().length === 0) {
+                streamedAssistantText.trim().length === 0) {
                 send({
                     type: "text",
                     text: "The model returned an empty response. This usually means reasoning used the full output-token budget. Try again, or pick a different model from the model menu.",
@@ -2222,7 +2226,7 @@ export async function runAgentLoop(opts) {
         // finalGuardRetries stays at 1 from a prior cycle and the guard is
         // permanently disabled for the rest of a long multi-step run.
         finalGuardRetries = 0;
-        flushBufferedAssistantText();
+        flushUnstreamedAssistantText();
         let requestedActionStop = null;
         // Human-in-the-loop approvals granted by the user for this turn (opt-in;
         // empty for the overwhelming majority of turns). Keyed by the stable