@hienlh/ppm 0.11.3 → 0.11.5

package/src/web/hooks/use-chat.ts

@@ -88,6 +88,8 @@ export function useChat(sessionId: string | null, providerId = "claude", project
   const pendingMessageRef = useRef<string | null>(null);
   const sendRef = useRef<(data: string) => void>(() => {});
   const refetchRef = useRef<(() => void) | null>(null);
+  /** True while replaying turn_events — suppresses setPendingApproval */
+  const isReplayingRef = useRef(false);
   const sessionIdRef = useRef(sessionId);
   sessionIdRef.current = sessionId;
   const projectNameRef = useRef(projectName);
@@ -251,6 +253,9 @@ export function useChat(sessionId: string | null, providerId = "claude", project
 
       case "approval_request": {
         streamingEventsRef.current.push(ev as ChatEvent);
+        // During turn_events replay, session_state already set the correct
+        // pendingApproval — skip re-setting it for historical (already-answered) events
+        if (isReplayingRef.current) break;
         setPendingApproval({
           requestId: ev.requestId,
           tool: ev.tool,
@@ -361,6 +366,7 @@ export function useChat(sessionId: string | null, providerId = "claude", project
         // Finalize the streaming message — preserve SDK UUID for fork/rewind
         const finalContent = streamingContentRef.current;
         const finalEvents = [...streamingEventsRef.current];
+        const finalAccount = streamingAccountRef.current;
         const doneUuid = ev.lastMessageUuid as string | undefined;
         setMessages((prev) => {
           const last = prev[prev.length - 1];
@@ -373,6 +379,19 @@ export function useChat(sessionId: string | null, providerId = "claude", project
               ...(doneUuid && { sdkUuid: doneUuid }),
             }];
           }
+          // No assistant message flushed yet (rAF was still pending when cancelled).
+          // Create one from accumulated refs so the response isn't silently lost.
+          if (finalContent || finalEvents.length > 0) {
+            return [...prev, {
+              id: `final-${Date.now()}`,
+              role: "assistant" as const,
+              content: finalContent,
+              events: finalEvents,
+              timestamp: new Date().toISOString(),
+              ...(doneUuid && { sdkUuid: doneUuid }),
+              ...finalAccount,
+            }];
+          }
           return prev;
         });
         streamingContentRef.current = "";
@@ -457,12 +476,30 @@ export function useChat(sessionId: string | null, providerId = "claude", project
     // Handle turn_events (reconnect sync with rAF chunking)
     if ((data as any).type === "turn_events") {
       const events = (data as any).events as unknown[];
-      if (!events?.length) { setIsReconnecting(false); return; }
+      const userMessage = (data as any).userMessage as string | null;
+      if (!events?.length && !userMessage) { setIsReconnecting(false); return; }
 
-      // Truncate messages after last user message
+      // Remove stale streaming assistant message + inject current turn's user message
       setMessages(prev => {
-        const lastUserIdx = prev.findLastIndex(m => m.role === "user");
-        return lastUserIdx >= 0 ? prev.slice(0, lastUserIdx + 1) : prev;
+        let updated = prev;
+        // Only remove in-progress streaming assistant (not finalized or REST-loaded)
+        const last = updated[updated.length - 1];
+        if (last?.role === "assistant" && last.id.startsWith("streaming-")) {
+          updated = updated.slice(0, -1);
+        }
+        // Add the current turn's user message if not already present
+        if (userMessage) {
+          const lastAfter = updated[updated.length - 1];
+          if (lastAfter?.role !== "user" || lastAfter.content !== userMessage) {
+            updated = [...updated, {
+              id: `user-replay-${Date.now()}`,
+              role: "user" as const,
+              content: userMessage,
+              timestamp: new Date().toISOString(),
+            }];
+          }
+        }
+        return updated;
       });
 
       // Reset streaming refs
@@ -471,6 +508,7 @@ export function useChat(sessionId: string | null, providerId = "claude", project
       streamingAccountRef.current = null;
 
       // Process events in chunks via requestAnimationFrame to avoid blocking main thread
+      isReplayingRef.current = true;
       const CHUNK_SIZE = 100;
       let offset = 0;
       const processChunk = () => {
@@ -482,6 +520,7 @@ export function useChat(sessionId: string | null, providerId = "claude", project
         if (offset < events.length) {
           requestAnimationFrame(processChunk);
         } else {
+          isReplayingRef.current = false;
           setIsReconnecting(false);
         }
       };