veryfront 0.1.198 → 0.1.200

package/esm/src/provider/runtime-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-loader.d.ts","sourceRoot":"","sources":["../../../src/src/provider/runtime-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AA0oDD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,CAkDd;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,YAAY,CA4Dd;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,CAkDd;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,gBAAgB,CA0ClB;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,gBAAgB,CAgDlB"}
+{"version":3,"file":"runtime-loader.d.ts","sourceRoot":"","sources":["../../../src/src/provider/runtime-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AA8pDD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,CAkDd;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,YAAY,CA4Dd;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,YAAY,CAkDd;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,gBAAgB,CA0ClB;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,gBAAgB,CAgDlB"}

package/esm/src/provider/runtime-loader.js

@@ -258,6 +258,20 @@ function toSnakeCaseRecord(record) {
         value,
     ]));
 }
+function pushAnthropicUserContent(messages, content) {
+    if (content.length === 0) {
+        return;
+    }
+    const lastMessage = messages.at(-1);
+    if (lastMessage?.role === "user") {
+        lastMessage.content.push(...content);
+        return;
+    }
+    messages.push({
+        role: "user",
+        content,
+    });
+}
 function toAnthropicMessages(prompt) {
     const systemParts = [];
     const messages = [];
@@ -269,10 +283,10 @@ function toAnthropicMessages(prompt) {
                 }
                 break;
             case "user":
-                messages.push({
-                    role: "user",
-                    content: [{ type: "text", text: readTextParts(message.content) }],
-                });
+                pushAnthropicUserContent(messages, [{
+                        type: "text",
+                        text: readTextParts(message.content),
+                    }]);
                 break;
             case "assistant":
                 messages.push({
@@ -286,14 +300,11 @@ function toAnthropicMessages(prompt) {
                 });
                 break;
             case "tool":
-                messages.push({
-                    role: "user",
-                    content: message.content.map((part) => ({
-                        type: "tool_result",
-                        tool_use_id: part.toolCallId,
-                        content: stringifyJsonValue(part.output.value),
-                    })),
-                });
+                pushAnthropicUserContent(messages, message.content.map((part) => ({
+                    type: "tool_result",
+                    tool_use_id: part.toolCallId,
+                    content: stringifyJsonValue(part.output.value),
+                })));
                 break;
         }
     }

package/esm/src/react/components/Head.d.ts

@@ -7,6 +7,5 @@
  * import { Head } from "veryfront/head";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { Head } from "../runtime/core.js";
 //# sourceMappingURL=Head.d.ts.map

package/esm/src/react/components/Head.js

@@ -7,5 +7,4 @@
  * import { Head } from "veryfront/head";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { Head } from "../runtime/core.js";

package/esm/src/react/components/chat/chat/components/code-block.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../../../_dnt.shims.js";
 import * as React from "react";
 import { cn } from "../../theme.js";
 import { CheckIcon, CopyIcon } from "../../icons/index.js";
@@ -18,7 +17,7 @@ export const RichCodeBlock = React.forwardRef(function RichCodeBlock({ language,
             document.body.removeChild(textarea);
         }
         setCopied(true);
-        dntShim.setTimeout(() => setCopied(false), 2000);
+        globalThis.setTimeout(() => setCopied(false), 2000);
     }, [code]);
     if (inline) {
         return (React.createElement("code", { className: cn("bg-[var(--accent)] px-1.5 py-0.5 rounded text-sm font-mono", className) }, code));

package/esm/src/react/components/chat/chat/components/inline-citation.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../../../_dnt.shims.js";
 import * as React from "react";
 import { cn } from "../../theme.js";
 export function InlineCitation({ index, source, className, onClick, }) {
@@ -8,7 +7,7 @@ export function InlineCitation({ index, source, className, onClick, }) {
     const [cardStyle, setCardStyle] = React.useState({});
     const show = React.useCallback(() => {
         clearTimeout(timerRef.current);
-        timerRef.current = dntShim.setTimeout(() => {
+        timerRef.current = globalThis.setTimeout(() => {
             // Position the card using fixed positioning to prevent overflow clipping
             const el = buttonRef.current;
             if (el) {
@@ -25,7 +24,7 @@ export function InlineCitation({ index, source, className, onClick, }) {
     }, []);
     const hide = React.useCallback(() => {
         clearTimeout(timerRef.current);
-        timerRef.current = dntShim.setTimeout(() => setShowCard(false), 100);
+        timerRef.current = globalThis.setTimeout(() => setShowCard(false), 100);
     }, []);
     React.useEffect(() => () => clearTimeout(timerRef.current), []);
     return (React.createElement(React.Fragment, null,

package/esm/src/react/components/chat/chat/components/message-actions.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../../../_dnt.shims.js";
 import * as React from "react";
 import { cn } from "../../theme.js";
 import { CheckIcon, CopyIcon } from "../../icons/index.js";
@@ -7,7 +6,7 @@ export const MessageActions = React.forwardRef(function MessageActions({ content
     const [copied, setCopied] = React.useState(false);
     const setCopiedWithTimeout = React.useCallback(() => {
         setCopied(true);
-        dntShim.setTimeout(() => setCopied(false), 2000);
+        globalThis.setTimeout(() => setCopied(false), 2000);
     }, []);
     const fallbackCopy = React.useCallback(() => {
         const textarea = document.createElement("textarea");

package/esm/src/react/components/chat/chat/components/reasoning.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../../../_dnt.shims.js";
 import * as React from "react";
 import { cn } from "../../theme.js";
 import { Markdown } from "../../markdown.js";
@@ -10,7 +9,7 @@ export const ReasoningCard = React.forwardRef(function ReasoningCard({ text, isS
     React.useEffect(() => {
         if (isStreaming || !isOpen || userToggledRef.current)
             return;
-        const timer = dntShim.setTimeout(() => setIsOpen(false), 1000);
+        const timer = globalThis.setTimeout(() => setIsOpen(false), 1000);
         return () => clearTimeout(timer);
     }, [isStreaming, isOpen]);
     const label = isStreaming ? React.createElement(Shimmer, null, "Thinking...") : React.createElement("span", null, "Thought process");

package/esm/src/react/components/chat/chat/hooks/use-threads.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../../../_dnt.shims.js";
 import * as React from "react";
 import { isBrowserEnvironment } from "../../../../../platform/compat/runtime.js";
 function generateId() {
@@ -85,7 +84,7 @@ export function useThreads(options) {
     React.useEffect(() => () => clearTimeout(saveTimerRef.current), []);
     const persistThreads = React.useCallback((updated) => {
         clearTimeout(saveTimerRef.current);
-        saveTimerRef.current = dntShim.setTimeout(() => {
+        saveTimerRef.current = globalThis.setTimeout(() => {
             saveIndex(storageKey, { ids: updated.map((t) => t.id) });
             for (const thread of updated) {
                 saveThread(storageKey, thread);

package/esm/src/react/components/chat/markdown.js

@@ -3,12 +3,12 @@ import { cn } from "./theme.js";
 import { isBrowserEnvironment } from "../../../platform/compat/runtime.js";
 import { validateTrustedHtml } from "../../../security/client/html-sanitizer.js";
 import { RichCodeBlock } from "./chat/components/code-block.js";
-const ESM_REACT_MARKDOWN = "https://esm.sh/react-markdown@9.0.3?external=react&target=es2022&pin=v135";
+const ESM_REACT_MARKDOWN = "https://esm.sh/react-markdown@9.0.3?target=es2022&pin=v135&deps=react@19.2.4";
 const ESM_REMARK_GFM = "https://esm.sh/remark-gfm@4.0.1?target=es2022&pin=v135";
 const ESM_REHYPE_HIGHLIGHT = "https://esm.sh/rehype-highlight@7.0.2?target=es2022&pin=v135";
 const ESM_MERMAID = "https://esm.sh/mermaid@11.4.1?pin=v135";
 async function importFromUrl(url) {
-    return await import(url);
+    return await import(/* @vite-ignore */ url);
 }
 // deno-lint-ignore no-explicit-any
 let ReactMarkdown = null;

package/esm/src/react/context/index.d.ts

@@ -7,7 +7,6 @@
  * import { PageContextProvider, usePageContext } from "veryfront/context";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { PageContextProvider, usePageContext } from "../runtime/core.js";
 export type { MdxHeading, PageContextProviderProps, PageContextValue } from "../runtime/core.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/src/react/context/index.js

@@ -7,5 +7,4 @@
  * import { PageContextProvider, usePageContext } from "veryfront/context";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { PageContextProvider, usePageContext } from "../runtime/core.js";

package/esm/src/react/fonts/index.d.ts

@@ -15,7 +15,6 @@
  * />
  * ```
  */
-import "../../../_dnt.polyfills.js";
 import React from "react";
 export interface Font {
     name: string;

package/esm/src/react/fonts/index.js

@@ -15,7 +15,6 @@
  * />
  * ```
  */
-import "../../../_dnt.polyfills.js";
 import React from "react";
 import { Head } from "../components/Head.js";
 function sortMixedArray(arr) {

package/esm/src/react/router/index.d.ts

@@ -7,7 +7,6 @@
  * import { Link, RouterProvider, useRouter } from "veryfront/router";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { Link, Router, RouterProvider, useRouter } from "../runtime/core.js";
 export type { LinkProps, RouterProviderProps, RouterValue } from "../runtime/core.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/src/react/router/index.js

@@ -7,5 +7,4 @@
  * import { Link, RouterProvider, useRouter } from "veryfront/router";
  * ```
  */
-import "../../../_dnt.polyfills.js";
 export { Link, Router, RouterProvider, useRouter } from "../runtime/core.js";

package/esm/src/security/client/html-sanitizer.js

@@ -6,7 +6,6 @@
  * - Error messages and debug info are untrusted and must be escaped
  * - validateTrustedHtml() provides defense-in-depth for server HTML
  */
-import * as dntShim from "../../../_dnt.shims.js";
 import { escapeHtml } from "../../html/html-escape.js";
 import { SECURITY_VIOLATION } from "../../errors/error-registry.js";
 export { escapeHtml };
@@ -21,7 +20,7 @@ const SUSPICIOUS_PATTERNS = [
     { pattern: /data:\s*text\/html/gi, name: "data: HTML URL" },
 ];
 function isDevMode() {
-    const g = dntShim.dntGlobalThis;
+    const g = globalThis;
     return g.__VERYFRONT_DEV__ === true || g.Deno?.env?.get?.("VERYFRONT_ENV") === "development";
 }
 /**

package/esm/src/server/handlers/dev/framework-candidates.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framework-candidates.generated.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/dev/framework-candidates.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAixKjD,CAAC"}
+{"version":3,"file":"framework-candidates.generated.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/dev/framework-candidates.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAmxKjD,CAAC"}

package/esm/src/server/handlers/dev/framework-candidates.generated.js

@@ -528,6 +528,7 @@ export const FRAMEWORK_CANDIDATES = [
     "@internal",
     "@media(prefers-color-scheme:dark){[data-vf-chat]:not([data-vf-theme]){${dark}}}",
     "@module",
+    "@vite-ignore",
     "A",
     "ACTION_BUTTON",
     "AI",
@@ -2601,6 +2602,7 @@ export const FRAMEWORK_CANDIDATES = [
     "deno-lint-ignore",
     "dependency)",
     "deprecated,",
+    "deps=react@19.2.4",
     "desc",
     "descendant",
     "describe(",
@@ -3142,7 +3144,7 @@ export const FRAMEWORK_CANDIDATES = [
     "html><html><head><style",
     "https://ai-sdk.dev/elements)",
     "https://esm.sh/mermaid@11.4.1?pin=v135",
-    "https://esm.sh/react-markdown@9.0.3?external=react",
+    "https://esm.sh/react-markdown@9.0.3?target=es2022",
     "https://esm.sh/rehype-highlight@7.0.2?target=es2022",
     "https://esm.sh/remark-gfm@4.0.1?target=es2022",
     "https://example.com/",
@@ -3189,7 +3191,7 @@ export const FRAMEWORK_CANDIDATES = [
     "if",
     "ignores",
     "import",
-    "import(url)",
+    "import(/*",
     "importFromUrl<DefaultModule<unknown>>(ESM_REACT_MARKDOWN),",
     "importFromUrl<DefaultModule<unknown>>(ESM_REHYPE_HIGHLIGHT),",
     "importFromUrl<DefaultModule<unknown>>(ESM_REMARK_GFM),",
@@ -4882,7 +4884,6 @@ export const FRAMEWORK_CANDIDATES = [
     "take",
     "target",
     "target=",
-    "target=es2022",
     "tbody>",
     "tc1",
     "td",
@@ -5205,6 +5206,7 @@ export const FRAMEWORK_CANDIDATES = [
     "upward",
     "url",
     "url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600",
+    "url)",
     "url:",
     "url;",
     "url?:",

package/esm/src/utils/version-constant.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.198";
+export declare const VERSION = "0.1.200";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.198";
+export const VERSION = "0.1.200";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.198",
+  "version": "0.1.200",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.198",
+  "version": "0.1.200",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "exclude": [

package/src/src/agent/ag-ui-browser-encoder.ts

@@ -234,6 +234,28 @@ function createTextEvent(
   };
 }
 
+function closeOpenTextEvent(state: AgUiBrowserEncoderState): AgUiBrowserEncodedEvent[] {
+  if (!state.textOpen) {
+    return [];
+  }
+
+  state.textOpen = false;
+  return [createTextEvent(getMessageId(state, { type: "text-end" }), "TextMessageEnd")];
+}
+
+function closeOpenReasoningEvent(state: AgUiBrowserEncoderState): AgUiBrowserEncodedEvent[] {
+  if (state.reasoningMessageId === null) {
+    return [];
+  }
+
+  const messageId = state.reasoningMessageId;
+  state.reasoningMessageId = null;
+  return [{
+    event: "ReasoningMessageEnd",
+    payload: { messageId },
+  }];
+}
+
 export function mapRuntimeStreamEventToAgUiBrowserEvents(
   state: AgUiBrowserEncoderState,
   event: AgUiRuntimeStreamEvent,
@@ -254,33 +276,38 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
       return [];
 
     case "text-start": {
+      const events = closeOpenReasoningEvent(state);
       if (state.textOpen) return [];
       const messageId = getMessageId(state, event);
       state.textOpen = true;
       state.sawVisibleOutput = true;
-      return [createTextEvent(messageId, "TextMessageStart")];
+      events.push(createTextEvent(messageId, "TextMessageStart"));
+      return events;
     }
 
     case "text-delta": {
+      const events = closeOpenReasoningEvent(state);
       const messageId = getMessageId(state, event);
       state.sawVisibleOutput = true;
       if (!state.textOpen) {
         state.textOpen = true;
-        return [
+        events.push(
           createTextEvent(messageId, "TextMessageStart"),
           createTextEvent(
             messageId,
             "TextMessageContent",
             typeof event.delta === "string" ? event.delta : "",
           ),
-        ];
+        );
+        return events;
       }
 
-      return [createTextEvent(
+      events.push(createTextEvent(
         messageId,
         "TextMessageContent",
         typeof event.delta === "string" ? event.delta : "",
-      )];
+      ));
+      return events;
     }
 
     case "text-end": {
@@ -289,13 +316,23 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
       return [createTextEvent(getMessageId(state, event), "TextMessageEnd")];
     }
 
-    case "reasoning-start":
+    case "reasoning-start": {
+      const events = closeOpenTextEvent(state);
+      events.push(...closeOpenReasoningEvent(state));
       state.sawVisibleOutput = true;
-      return [createReasoningEvent(state, event, "ReasoningMessageStart")];
+      events.push(createReasoningEvent(state, event, "ReasoningMessageStart"));
+      return events;
+    }
 
-    case "reasoning-delta":
+    case "reasoning-delta": {
+      const events = closeOpenTextEvent(state);
       state.sawVisibleOutput = true;
-      return [createReasoningEvent(state, event, "ReasoningMessageContent")];
+      if (state.reasoningMessageId === null) {
+        events.push(createReasoningEvent(state, event, "ReasoningMessageStart"));
+      }
+      events.push(createReasoningEvent(state, event, "ReasoningMessageContent"));
+      return events;
+    }
 
     case "reasoning-end": {
       const reasoningEvent = createReasoningEvent(state, event, "ReasoningMessageEnd");
@@ -303,15 +340,21 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
       return [reasoningEvent];
     }
 
-    case "tool-input-start":
+    case "tool-input-start": {
+      const events = [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+      ];
       state.sawVisibleOutput = true;
-      return [{
+      events.push({
         event: "ToolCallStart",
         payload: {
           toolCallId: event.toolCallId,
           toolCallName: event.toolName,
         },
-      }];
+      });
+      return events;
+    }
 
     case "tool-input-delta":
       state.sawVisibleOutput = true;
@@ -328,12 +371,20 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
 
     case "tool-input-available": {
       state.sawVisibleOutput = true;
-      return completeToolInput(state, event);
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        ...completeToolInput(state, event),
+      ];
     }
 
     case "tool-input-error": {
       state.sawVisibleOutput = true;
-      const events = completeToolInput(state, event);
+      const events = [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        ...completeToolInput(state, event),
+      ];
       events.push({
         event: "ToolCallResult",
         payload: {
@@ -349,25 +400,45 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
 
     case "tool-output-available":
       state.sawVisibleOutput = true;
-      return [createToolResultEvent(event.toolCallId, event.output)];
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        createToolResultEvent(event.toolCallId, event.output),
+      ];
 
     case "tool-output-error":
       state.sawVisibleOutput = true;
-      return [createToolResultEvent(event.toolCallId, { error: event.errorText }, true)];
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        createToolResultEvent(event.toolCallId, { error: event.errorText }, true),
+      ];
 
     case "tool-output-denied":
       state.sawVisibleOutput = true;
-      return [createToolResultEvent(event.toolCallId, { error: "Tool output denied" }, true)];
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        createToolResultEvent(event.toolCallId, { error: "Tool output denied" }, true),
+      ];
 
     case "step-start":
     case "start-step":
       state.sawVisibleOutput = true;
-      return [createStepEvent(state, "StepStarted")];
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        createStepEvent(state, "StepStarted"),
+      ];
 
     case "step-end":
     case "finish-step":
       state.sawVisibleOutput = true;
-      return [createStepEvent(state, "StepFinished")];
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        createStepEvent(state, "StepFinished"),
+      ];
 
     case "data":
       applyDataMetadata(state, event);
@@ -375,12 +446,16 @@ export function mapRuntimeStreamEventToAgUiBrowserEvents(
 
     case "error":
       state.sawTerminalError = true;
-      return [{
-        event: "RunError",
-        payload: {
-          message: typeof event.error === "string" ? event.error : "Agent run failed",
+      return [
+        ...closeOpenTextEvent(state),
+        ...closeOpenReasoningEvent(state),
+        {
+          event: "RunError",
+          payload: {
+            message: typeof event.error === "string" ? event.error : "Agent run failed",
+          },
         },
-      }];
+      ];
 
     default:
       return [];
@@ -409,13 +484,8 @@ export function finalizeAgUiBrowserEvents(
   }
 
   const events: AgUiBrowserEncodedEvent[] = [];
-  if (state.textOpen) {
-    state.textOpen = false;
-    events.push({
-      event: "TextMessageEnd",
-      payload: { messageId: getMessageId(state, { type: "text-end" }) },
-    });
-  }
+  events.push(...closeOpenTextEvent(state));
+  events.push(...closeOpenReasoningEvent(state));
 
   events.push({
     event: "RunFinished",