@springbrand/chat-client 0.1.3-alpha.40 → 0.1.3-alpha.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/chat-client",
-  "version": "0.1.3-alpha.40",
+  "version": "0.1.3-alpha.41",
   "type": "module",
   "files": [
     "src",
@@ -13,6 +13,7 @@
     ".": "./src/index.ts"
   },
   "peerDependencies": {
+    "@cloudflare/ai-chat": "^0.11.0",
     "agents": "^0.22.0",
     "ai": "^7.0.0",
     "react": "^19.0.0"
@@ -21,11 +22,12 @@
     "nanoid": "^5.1.16"
   },
   "devDependencies": {
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
-    "react-dom": "^19.2.7",
+    "@cloudflare/ai-chat": "0.11.0",
+    "@types/react": "^19.2.18",
+    "@types/react-dom": "^19.2.5",
+    "react-dom": "^19.2.8",
     "typescript": "^7.0.2",
-    "@springbrand/agent-runtime": "0.2.0-alpha.51"
+    "@springbrand/agent-runtime": "0.2.0-alpha.53"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"

package/src/use-universal-agent-chat.ts

@@ -15,7 +15,7 @@ import type { ChatStatus, FileUIPart, UIMessage } from "ai";
 import type { AgentToolRunState } from "agents";
 import type { AgentConnectionError } from "agents/client";
 import { MessageType } from "agents/chat";
-import { getAgentMessages, useAgentChat } from "agents/chat/react";
+import { getAgentMessages, useAgentChat } from "@cloudflare/ai-chat/react";
 import { useAgent, useAgentToolEvents } from "agents/react";
 import {
   type ApprovalDecision,
@@ -95,6 +95,7 @@ type ChatQueuedSubmission = {
 type ChatTurn = {
   activeSubmissionId?: string;
   activeRequestId?: string;
+  activeMessageId?: string;
   recoveryAttempt?: number;
   recoveryMax?: number;
   recoveryReason?: "no_meaningful_model_progress" | "transient_model_error";
@@ -382,10 +383,12 @@ function queuedPreview(message: ChatMessage): string {
 function loadInitialMessages(
   url: string | undefined,
   credentials: RequestCredentials | undefined,
+  view: "hydration" | "full" = "hydration",
 ): Promise<ChatMessage[]> {
   if (!url) return Promise.resolve([]);
   const messagesUrl = new URL(url);
   messagesUrl.pathname = `${messagesUrl.pathname.replace(/\/$/, "")}/get-messages`;
+  if (view === "hydration") messagesUrl.searchParams.set("view", "hydration");
   return getAgentMessages({
     url: messagesUrl.toString(),
     ...(credentials === undefined ? {} : { credentials }),
@@ -449,7 +452,6 @@ export function useUniversalAgentChat(): ChatRuntime {
       ? {}
       : { credentials: connection.credentials }),
     syncMessagesToServer: false,
-    throttle: 16,
   });
   // The SDK keeps its advisory recovery flag until terminal settlement; a
   // live server stream proves the recovered Turn is executing again.
@@ -481,14 +483,15 @@ export function useUniversalAgentChat(): ChatRuntime {
   const runtimeErrorMessage = runtimeError instanceof Error
     ? runtimeError.message
     : runtimeError;
-  const presentationError = latestTurnStatus === "error" &&
-      latestMessage?.metadata?.error === runtimeErrorMessage
+  const presentationError = isServerStreaming || isRecovering ||
+      (latestTurnStatus === "error" && latestMessage?.metadata?.error === runtimeErrorMessage)
     ? undefined
     : runtimeError;
   // RPC admissions bypass useChat's request lifecycle. Project the durable
   // Turn here so presentation stays correct without a second send path.
-  const authoritativeStatus =
-    normalizedSdkStatus === "ready" &&
+  const authoritativeStatus = isServerStreaming
+    ? "streaming"
+    : normalizedSdkStatus === "ready" &&
     !isRecovering &&
     approvals?.length === 0 &&
     authoritativeTurn?.activeSubmissionId
@@ -506,6 +509,35 @@ export function useUniversalAgentChat(): ChatRuntime {
       : authoritativeStatus;
   const messagesRef = useRef(messages);
   messagesRef.current = messages;
+  const replayFallbackMessageIdRef = useRef<string | undefined>(undefined);
+  useEffect(() => {
+    const activeMessageId = facetState?.turn?.activeMessageId;
+    if (
+      !activeMessageId ||
+      sdkStatus !== "error" ||
+      sdkIsRecovering ||
+      isServerStreaming ||
+      replayFallbackMessageIdRef.current === activeMessageId
+    ) return;
+    const url = chatAgent.getHttpUrl();
+    if (!url) return;
+    replayFallbackMessageIdRef.current = activeMessageId;
+    void loadInitialMessages(url, connection.credentials, "full")
+      .then((snapshot) => {
+        setMessages(snapshot);
+        clearError();
+      })
+      .catch(() => undefined);
+  }, [
+    chatAgent,
+    clearError,
+    connection.credentials,
+    facetState?.turn?.activeMessageId,
+    isServerStreaming,
+    sdkIsRecovering,
+    sdkStatus,
+    setMessages,
+  ]);
   const turnTimingRef = useRef<ChatTurnTiming | null>(null);
 
   useEffect(() => {