Update files

packages/app/src/contexts/session-context.tsx

@@ -1453,19 +1453,32 @@ export function SessionProvider({
       images?: Array<{ uri: string; mimeType?: string }>
     ) => {
       const messageId = generateMessageId();
+      const userMessage: StreamItem = {
+        kind: "user_message",
+        id: messageId,
+        text: message,
+        timestamp: new Date(),
+      };
 
-      setAgentStreamTail(serverId, (prev) => {
-        const currentStream = prev.get(agentId) || [];
-        const nextItem: any = {
-          kind: "user_message",
-          id: messageId,
-          text: message,
-          timestamp: new Date(),
-        };
-        const updated = new Map(prev);
-        updated.set(agentId, [...currentStream, nextItem]);
-        return updated;
-      });
+      // Append to head if streaming (keeps the user message with the current
+      // turn so late text_deltas still find the existing assistant_message).
+      // Otherwise append to tail.
+      const currentHead = useSessionStore.getState().sessions[serverId]?.agentStreamHead?.get(agentId);
+      if (currentHead && currentHead.length > 0) {
+        setAgentStreamHead(serverId, (prev) => {
+          const head = prev.get(agentId) || [];
+          const updated = new Map(prev);
+          updated.set(agentId, [...head, userMessage]);
+          return updated;
+        });
+      } else {
+        setAgentStreamTail(serverId, (prev) => {
+          const currentStream = prev.get(agentId) || [];
+          const updated = new Map(prev);
+          updated.set(agentId, [...currentStream, userMessage]);
+          return updated;
+        });
+      }
 
       const imagesData = await encodeImages(images);
       if (!client) {
@@ -1483,7 +1496,7 @@ export function SessionProvider({
           console.error("[Session] Failed to send agent message:", error);
         });
     },
-    [encodeImages, serverId, client, setAgentStreamTail]
+    [encodeImages, serverId, client, setAgentStreamTail, setAgentStreamHead]
   );
 
   // Keep the ref updated so the agent_update handler can call it