@alpaca-editor/core 1.0.4145 → 1.0.4146

package/dist/editor/ai/AgentTerminal.js

@@ -1000,18 +1000,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
             messagesRef.current = updated;
             return updated;
         });
-        // Dispatch a local event so the UI can attempt reconnect when approvals get resolved while paused
-        try {
-            const ev = new CustomEvent("agent:toolApprovalResolved", {
-                detail: {
-                    messageId: resultMessageId,
-                    toolCallId: resultToolCallId,
-                    approved: !(message.data?.functionError || message.data?.error),
-                },
-            });
-            window.dispatchEvent(ev);
-        }
-        catch { }
         // Tool result activity; reset idle timer
         resetDotsTimer();
     }, [resetDotsTimer]);
@@ -1047,6 +1035,11 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                     case "statusUpdate":
                         try {
                             const kind = message?.data?.kind;
+                            if (kind === "streamOpen") {
+                                setIsConnecting(false);
+                                setIsWaitingForResponse(false);
+                                break;
+                            }
                             // Live token usage totals update from backend
                             if (kind === "tokenUsage") {
                                 const totals = message?.data?.totals;
@@ -1106,10 +1099,8 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                                         return updated;
                                     });
                                 }
-                                // Proactively stop the current stream so that the page can be reloaded safely or stay idle until approval
+                                // Keep the stream open; just clear waiting flags so UI reflects pause state
                                 try {
-                                    abortControllerRef.current?.abort();
-                                    abortControllerRef.current = null;
                                     setIsConnecting(false);
                                     setIsWaitingForResponse(false);
                                 }
@@ -1196,7 +1187,11 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                                                 const suffix = kind === "toolApprovalGranted"
                                                     ? " (approved)"
                                                     : " (rejected)";
-                                                const newFunctionName = (tc.functionName || "") + suffix;
+                                                // Remove "(pending approval)" suffix before adding new suffix
+                                                const baseFunctionName = (tc.functionName || "")
+                                                    .replace(" (pending approval)", "")
+                                                    .trim();
+                                                const newFunctionName = baseFunctionName + suffix;
                                                 // Update function name with approval suffix
                                                 return {
                                                     ...tc,
@@ -1398,27 +1393,7 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
             setIsWaitingForResponse(false);
         }
     }, [agent?.id, handleContentChunk, handleToolCall, handleToolResult]);
-    // Attempt to reconnect stream when all pending approvals are resolved
-    const attemptReconnectIfNoPending = useCallback(async () => {
-        try {
-            const currentAgent = agent;
-            if (!currentAgent)
-                return;
-            // Check if we're already connected
-            if (abortControllerRef.current) {
-                return;
-            }
-            const msgs = messagesRef.current || [];
-            const hasPending = msgs.some((m) => (m.toolCalls || []).some((tc) => (tc.functionName || "").includes("(pending approval)")));
-            if (!hasPending) {
-                await connectToStream(currentAgent);
-            }
-        }
-        catch (err) {
-            console.error("❌ Error attempting reconnect:", err);
-        }
-    }, [agent, connectToStream]);
-    // Listen for local approval resolution (when stream is paused) to update UI and reconnect
+    // Listen for local approval resolution to update UI
     useEffect(() => {
         const onApprovalResolved = (ev) => {
             try {
@@ -1428,7 +1403,7 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                 const approved = !!detail.approved;
                 if (!messageId || !toolCallId)
                     return;
-                // Approval resolved; update local state
+                // Update local state to reflect approval status
                 setMessages((prev) => {
                     const updated = prev.map((m) => {
                         if (m.id !== messageId)
@@ -1450,10 +1425,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                     messagesRef.current = updated;
                     return updated;
                 });
-                // Try to reconnect if no more pending approvals remain
-                setTimeout(() => {
-                    attemptReconnectIfNoPending();
-                }, 100);
             }
             catch (err) {
                 console.error("❌ Error handling approval resolution:", err);
@@ -1461,7 +1432,7 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
         };
         window.addEventListener("agent:toolApprovalResolved", onApprovalResolved);
         return () => window.removeEventListener("agent:toolApprovalResolved", onApprovalResolved);
-    }, [attemptReconnectIfNoPending]);
+    }, []);
     // Load agent data and messages
     const loadAgent = useCallback(async () => {
         try {
@@ -1627,7 +1598,42 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
             setError(null);
             const agentData = await getAgent(agentStub.id);
             setAgent(agentData);
-            setMessages(agentData.messages || []);
+            // Merge database messages with any existing streaming messages
+            // to prevent losing responses that are currently being streamed
+            setMessages((prevMessages) => {
+                const dbMessages = agentData.messages || [];
+                // Find any streaming (incomplete) messages that exist locally but not in DB
+                const streamingMessages = prevMessages.filter((msg) => !msg.isCompleted && msg.role === "assistant");
+                // If we have streaming messages, preserve them
+                if (streamingMessages.length > 0) {
+                    // Get all completed messages from DB
+                    const completedDbMessages = dbMessages.filter((msg) => {
+                        // Check if this message is one of our streaming messages
+                        const isStreamingMessage = streamingMessages.some((sm) => sm.id === msg.id);
+                        return !isStreamingMessage;
+                    });
+                    // Merge: use DB messages but keep streaming ones
+                    const merged = [...completedDbMessages];
+                    // Add back the streaming messages at the end
+                    for (const streamingMsg of streamingMessages) {
+                        // Check if this message ID exists in DB messages
+                        const dbVersion = dbMessages.find((m) => m.id === streamingMsg.id);
+                        if (dbVersion &&
+                            dbVersion.content &&
+                            dbVersion.content.length > streamingMsg.content.length) {
+                            // DB has more content, skip the streaming version
+                            merged.push(dbVersion);
+                        }
+                        else {
+                            // Keep the streaming version
+                            merged.push(streamingMsg);
+                        }
+                    }
+                    return merged;
+                }
+                // No streaming messages, just use DB messages
+                return dbMessages;
+            });
             // Set agent ID for existing agents too
             window.currentAgentId = agentData.id;
             // Check if cost limit was exceeded (detect from existing messages)
@@ -1686,8 +1692,9 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
             const isRunning = agentData.status === "running" || agentData.status === 1;
             const isWaitingForApproval = agentData.status === "waitingForApproval" ||
                 agentData.status === 2;
-            if (isRunning) {
-                // Only auto-reconnect for running agents, not waiting for approval
+            if (isRunning || isWaitingForApproval) {
+                // Auto-connect for running agents AND agents waiting for approval
+                // (stream stays open during approval now)
                 setTimeout(async () => {
                     if (abortControllerRef.current) {
                         return;
@@ -1710,11 +1717,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, }) {
                     await connectToStream(agentData);
                 }, 100);
             }
-            else if (isWaitingForApproval) {
-                // For agents waiting for approval, just show the UI
-                // The approval button handler will restart the agent if needed
-                console.log("Agent is waiting for approval - showing approval UI without auto-reconnect");
-            }
         }
         catch (err) {
             console.error("❌ Failed to load agent:", err);