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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/chat-client",
-  "version": "0.1.3-alpha.41",
+  "version": "0.1.3-alpha.43",
   "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.53"
+    "@springbrand/agent-runtime": "0.2.0-alpha.56"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"

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

@@ -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;
@@ -369,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 {
@@ -460,7 +494,7 @@ export function useUniversalAgentChat(): ChatRuntime {
     () => mergeOptimisticMessages(messages, optimisticMessages),
     [messages, optimisticMessages],
   );
-  const authoritativeTurn = facetState?.turn;
+  const reportedTurn = facetState?.turn;
   const stoppedByUser = error?.message === USER_STOP_REASON;
   const latestMessage = visibleMessages.at(-1);
   const latestTurnStatus = latestMessage?.role === "assistant"
@@ -470,6 +504,18 @@ export function useUniversalAgentChat(): ChatRuntime {
     latestTurnStatus === "error" ||
     latestTurnStatus === "aborted" ||
     latestTurnStatus === "skipped";
+  // Messages and Agent state arrive in separate frames. A terminal message for
+  // the same Submission is newer than a still-active state projection; a
+  // different active ID belongs to the next Turn and must remain live.
+  const authoritativeTurn = reportedTurn &&
+      hasTerminalMessage &&
+      latestMessage?.metadata?.turnId === reportedTurn.activeSubmissionId
+    ? {
+        steerable: false,
+        hasPendingSteer: false,
+        queued: reportedTurn.queued,
+      }
+    : reportedTurn;
   const normalizedSdkStatus = sdkStatus === "error" &&
       (stoppedByUser || hasTerminalMessage)
     ? "ready"
@@ -753,6 +799,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;
         }
@@ -785,7 +857,13 @@ export function useUniversalAgentChat(): ChatRuntime {
       );
       return false;
     }
-  }, [chatId, clearError, dispatchMessage]);
+  }, [
+    authoritativeTurn?.activeMessageId,
+    authoritativeTurn?.activeSubmissionId,
+    chatId,
+    clearError,
+    dispatchMessage,
+  ]);
 
   const sendText = useCallback(async (
     text: string,