@springbrand/chat-client 0.1.3-alpha.45 → 0.1.3-alpha.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/chat-client",
-  "version": "0.1.3-alpha.45",
+  "version": "0.1.3-alpha.47",
   "type": "module",
   "files": [
     "src",
@@ -27,7 +27,7 @@
     "@types/react-dom": "^19.2.5",
     "react-dom": "^19.2.8",
     "typescript": "^7.0.2",
-    "@springbrand/agent-runtime": "0.2.0-alpha.61"
+    "@springbrand/agent-runtime": "0.2.0-alpha.63"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"

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

@@ -26,6 +26,7 @@ import {
   type RuntimeConfigUpdateResult,
   type RuntimeQueuedSubmission,
   type RuntimeState,
+  type RuntimeTurnState,
 } from "@springbrand/agent-runtime/contracts";
 import { createSafeUIMessageAgentConnection } from "./ui-message-stream-guard";
 import { CURRENT_INBOX_AGENT_PATH } from "./chat-sessions";
@@ -90,26 +91,6 @@ type ChatApproval = {
   requestId: string;
 };
 
-type ChatQueuedSubmission = {
-  submissionId: string;
-  messageId: string;
-  preview: string;
-  position: number;
-  createdAt: number;
-};
-
-type ChatTurn = {
-  activeSubmissionId?: string;
-  activeRequestId?: string;
-  activeMessageId?: string;
-  recoveryAttempt?: number;
-  recoveryMax?: number;
-  recoveryReason?: "no_meaningful_model_progress" | "transient_model_error";
-  steerable: boolean;
-  hasPendingSteer: boolean;
-  queued: ChatQueuedSubmission[];
-};
-
 export interface ChatRuntime {
   messages: ChatMessage[];
   status: ChatStatus;
@@ -177,7 +158,7 @@ export interface ChatRuntime {
   isToolContinuation: boolean;
   approvals: ChatApproval[] | undefined;
   approvalsLoaded: boolean;
-  turn: ChatTurn | undefined;
+  turn: RuntimeTurnState | undefined;
   turnActive: boolean;
   canSteer: boolean;
 }
@@ -558,34 +539,46 @@ export function useUniversalAgentChat(): ChatRuntime {
       : authoritativeStatus;
   const messagesRef = useRef(messages);
   messagesRef.current = messages;
-  const replayFallbackMessageIdRef = useRef<string | undefined>(undefined);
+  // SDK callback identities can change without a new recovery request.
+  const replayActionsRef = useRef({ setMessages, clearError });
+  replayActionsRef.current = { setMessages, clearError };
   useEffect(() => {
     const activeMessageId = facetState?.turn?.activeMessageId;
     if (
       !activeMessageId ||
       sdkStatus !== "error" ||
       sdkIsRecovering ||
-      isServerStreaming ||
-      replayFallbackMessageIdRef.current === activeMessageId
+      isServerStreaming
     ) return;
     const url = chatAgent.getHttpUrl();
     if (!url) return;
-    replayFallbackMessageIdRef.current = activeMessageId;
+    const baseline = messagesRef.current;
+    let cancelled = false;
     void loadInitialMessages(url, connection.credentials, "full")
       .then((snapshot) => {
-        setMessages(snapshot);
-        clearError();
+        if (cancelled) return;
+        // The SDK protects its own snapshots while streaming. This HTTP
+        // fallback must also reject a response older than the current store.
+        const actions = replayActionsRef.current;
+        let applied = false;
+        actions.setMessages((current) => {
+          if (current !== baseline) return current;
+          applied = true;
+          return snapshot;
+        });
+        if (applied) actions.clearError();
       })
       .catch(() => undefined);
+    return () => {
+      cancelled = true;
+    };
   }, [
     chatAgent,
-    clearError,
     connection.credentials,
     facetState?.turn?.activeMessageId,
     isServerStreaming,
     sdkIsRecovering,
     sdkStatus,
-    setMessages,
   ]);
   const turnTimingRef = useRef<ChatTurnTiming | null>(null);
 
@@ -781,7 +774,7 @@ export function useUniversalAgentChat(): ChatRuntime {
         markChatTurnPhase(turnTimingRef.current, "rpcReceipt");
       }
       if (receipt.kind === "rejected") {
-        if (projection === "queue") rollback();
+        rollback();
         if (turnTimingRef.current?.messageId === message.id) {
           turnTimingRef.current = null;
         }
@@ -849,7 +842,7 @@ export function useUniversalAgentChat(): ChatRuntime {
       }
       return true;
     } catch (cause) {
-      if (projection === "queue") rollback();
+      rollback();
       if (turnTimingRef.current?.messageId === message.id) {
         turnTimingRef.current = null;
       }