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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/chat-client",
-  "version": "0.1.3-alpha.40",
+  "version": "0.1.3-alpha.42",
   "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.54"
   },
   "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,
@@ -34,6 +34,12 @@ type ChatMessageMetadata = Record<string, unknown> & {
   completedAt?: number;
   error?: string;
   interruptedByUser?: boolean;
+  // AI SDK keeps one assistant UIMessage for the live stream. This local-only
+  // anchor lets presentation place later steps below the steer that caused them.
+  optimisticSteer?: {
+    assistantMessageId: string;
+    afterStep: number;
+  };
   requestedCapabilities?: readonly RequestedCapability[];
   turnId?: string;
   turnStatus?: string;
@@ -95,6 +101,7 @@ type ChatQueuedSubmission = {
 type ChatTurn = {
   activeSubmissionId?: string;
   activeRequestId?: string;
+  activeMessageId?: string;
   recoveryAttempt?: number;
   recoveryMax?: number;
   recoveryReason?: "no_meaningful_model_progress" | "transient_model_error";
@@ -368,7 +375,35 @@ export function mergeOptimisticMessages<T extends UIMessage>(
   if (optimistic.length === 0) return messages;
   const ids = new Set(messages.map(({ id }) => id));
   const pending = optimistic.filter(({ id }) => !ids.has(id));
-  return pending.length === 0 ? messages : [...messages, ...pending];
+  if (pending.length === 0) return messages;
+  const steer = pending.find((message) =>
+    (message.metadata as ChatMessageMetadata | undefined)?.optimisticSteer
+  );
+  const anchor = (steer?.metadata as ChatMessageMetadata | undefined)
+    ?.optimisticSteer;
+  const assistantIndex = anchor
+    ? messages.findIndex(({ id, role }) =>
+        id === anchor.assistantMessageId && role === "assistant"
+      )
+    : -1;
+  if (!steer || !anchor || assistantIndex < 0) return [...messages, ...pending];
+
+  const assistant = messages[assistantIndex]!;
+  let step = 0;
+  const splitAt = assistant.parts.findIndex((part) => {
+    if (part.type !== "step-start") return false;
+    step += 1;
+    return step > anchor.afterStep;
+  });
+  if (splitAt < 0) return [...messages, ...pending];
+
+  return [
+    ...messages.slice(0, assistantIndex),
+    { ...assistant, id: `${assistant.id}:before:${steer.id}`, parts: assistant.parts.slice(0, splitAt) },
+    ...pending,
+    { ...assistant, id: `${assistant.id}:after:${steer.id}`, parts: assistant.parts.slice(splitAt) },
+    ...messages.slice(assistantIndex + 1),
+  ];
 }
 
 function queuedPreview(message: ChatMessage): string {
@@ -382,10 +417,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 +486,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 +517,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 +543,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(() => {
@@ -721,6 +787,32 @@ export function useUniversalAgentChat(): ChatRuntime {
           rollback();
           return true;
         }
+        if (delivery === "steer" && receipt.kind === "accepted") {
+          const activeAssistant = messagesRef.current.findLast((candidate) =>
+            candidate.role === "assistant" &&
+            candidate.metadata?.turnId === submissionId
+          );
+          const assistantMessageId = activeAssistant?.id ??
+            (authoritativeTurn?.activeSubmissionId === submissionId
+              ? authoritativeTurn.activeMessageId
+              : undefined);
+          if (assistantMessageId) {
+            const afterStep = activeAssistant?.parts.filter(
+              ({ type }) => type === "step-start",
+            ).length ?? 0;
+            setOptimisticMessages((current) => current.map((optimistic) =>
+              optimistic.id === message.id
+                ? {
+                    ...optimistic,
+                    metadata: {
+                      ...optimistic.metadata,
+                      optimisticSteer: { assistantMessageId, afterStep },
+                    },
+                  }
+                : optimistic
+            ));
+          }
+        }
         if (turnTimingRef.current?.messageId === message.id) {
           turnTimingRef.current.submissionId = submissionId;
         }
@@ -753,7 +845,13 @@ export function useUniversalAgentChat(): ChatRuntime {
       );
       return false;
     }
-  }, [chatId, clearError, dispatchMessage]);
+  }, [
+    authoritativeTurn?.activeMessageId,
+    authoritativeTurn?.activeSubmissionId,
+    chatId,
+    clearError,
+    dispatchMessage,
+  ]);
 
   const sendText = useCallback(async (
     text: string,