fix: stream messages properly (#416)

apps/open-swe/src/graphs/manager/nodes/classify-message/index.ts

@@ -233,6 +233,7 @@ export async function classifyMessage(
           command: {
             resume: plannerResume,
           },
+          streamMode: ["values", "messages-tuple", "custom"],
         },
       );
       newPlannerId = newPlannerRun.run_id;

apps/open-swe/src/graphs/manager/nodes/create-new-session.ts

@@ -92,7 +92,7 @@ ${ISSUE_CONTENT_CLOSE_TAG}`,
     },
     ifNotExists: "create",
     streamResumable: true,
-    streamMode: ["values", "messages", "custom"],
+    streamMode: ["values", "messages-tuple", "custom"],
   });
 
   return {

apps/open-swe/src/graphs/manager/nodes/start-planner.ts

@@ -49,7 +49,7 @@ export async function startPlanner(
         ifNotExists: "create",
         multitaskStrategy: "enqueue",
         streamResumable: true,
-        streamMode: ["values", "messages", "custom"],
+        streamMode: ["values", "messages-tuple", "custom"],
       },
     );
 

apps/open-swe/src/graphs/planner/nodes/generate-plan/index.ts

@@ -61,6 +61,7 @@ export async function generatePlan(
   if (isAIMessage(lastMessage) && lastMessage.tool_calls?.[0]) {
     const lastMessageToolCall = lastMessage.tool_calls?.[0];
     optionalToolMessage = new ToolMessage({
+      id: uuidv4(),
       tool_call_id: lastMessageToolCall.id ?? "",
       name: lastMessageToolCall.name,
       content: "Tool call not executed. Max actions reached.",

apps/open-swe/src/graphs/planner/nodes/proposed-plan.ts

@@ -106,7 +106,7 @@ async function startProgrammerRun(input: {
       ifNotExists: "create",
       streamResumable: true,
       streamSubgraphs: true,
-      streamMode: ["values", "messages", "custom", "events"],
+      streamMode: ["values", "messages-tuple", "custom"],
     },
   );
 

apps/open-swe/src/graphs/planner/nodes/take-action.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   isAIMessage,
   isToolMessage,
@@ -30,6 +31,7 @@ import { getSandboxWithErrorHandling } from "../../../utils/sandbox.js";
 import { shouldDiagnoseError } from "../../../utils/tool-message-error.js";
 import { Command } from "@langchain/langgraph";
 import { filterHiddenMessages } from "../../../utils/message/filter-hidden.js";
+import { DO_NOT_RENDER_ID_PREFIX } from "@open-swe/shared/constants";
 
 const logger = createLogger(LogLevel.INFO, "TakeAction");
 
@@ -79,6 +81,7 @@ export async function takeActions(
     if (!tool) {
       logger.error(`Unknown tool: ${toolCall.name}`);
       const toolMessage = new ToolMessage({
+        id: `${DO_NOT_RENDER_ID_PREFIX}${uuidv4()}`,
         tool_call_id: toolCall.id ?? "",
         content: `Unknown tool: ${toolCall.name}`,
         name: toolCall.name,
@@ -145,6 +148,7 @@ export async function takeActions(
         : truncateOutput(result);
 
     const toolMessage = new ToolMessage({
+      id: uuidv4(),
       tool_call_id: toolCall.id ?? "",
       content: truncatedOutput,
       name: toolCall.name,

apps/open-swe/src/graphs/programmer/nodes/diagnose-error.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   BaseMessage,
   isToolMessage,
@@ -136,6 +137,7 @@ export async function diagnoseError(
   });
 
   const toolMessage = new ToolMessage({
+    id: uuidv4(),
     tool_call_id: toolCall.id ?? "",
     content: `Successfully diagnosed error. Please use the diagnosis to continue with the next action.`,
     name: toolCall.name,

apps/open-swe/src/graphs/programmer/nodes/open-pr.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   GraphConfig,
   GraphState,
@@ -140,6 +141,7 @@ export async function openPullRequest(
       },
     }),
     new ToolMessage({
+      id: uuidv4(),
       tool_call_id: toolCall.id ?? "",
       content: pr
         ? `Created pull request: ${pr.html_url}`

apps/open-swe/src/graphs/programmer/nodes/progress-plan-step.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import { createLogger, LogLevel } from "../../../utils/logger.js";
 import {
   GraphConfig,
@@ -108,6 +109,7 @@ Once you've determined the status of the current task, call either the \`mark_ta
   const isCompleted = toolCall.name === markCompletedTool.name;
   const currentTask = getCurrentPlanItem(activePlanItems);
   const toolMessage = new ToolMessage({
+    id: uuidv4(),
     tool_call_id: toolCall.id ?? "",
     content: `Saved task status as ${isCompleted ? "completed" : "not completed"} for task ${currentTask?.plan || "unknown"}`,
     name: toolCall.name,

apps/open-swe/src/graphs/programmer/nodes/request-help.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import { isAIMessage, ToolMessage } from "@langchain/core/messages";
 import {
   GraphConfig,
@@ -71,6 +72,7 @@ export async function requestHelp(
       );
 
     const toolMessage = new ToolMessage({
+      id: uuidv4(),
       tool_call_id: toolCall.id ?? "",
       content: `Human response: ${interruptRes.args}`,
       status: "success",

apps/open-swe/src/graphs/programmer/nodes/take-action.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import { isAIMessage, ToolMessage } from "@langchain/core/messages";
 import { createLogger, LogLevel } from "../../../utils/logger.js";
 import {
@@ -78,6 +79,7 @@ export async function takeAction(
     if (!tool) {
       logger.error(`Unknown tool: ${toolCall.name}`);
       const toolMessage = new ToolMessage({
+        id: uuidv4(),
         tool_call_id: toolCall.id ?? "",
         content: `Unknown tool: ${toolCall.name}`,
         name: toolCall.name,
@@ -127,6 +129,7 @@ export async function takeAction(
     }
 
     const toolMessage = new ToolMessage({
+      id: uuidv4(),
       tool_call_id: toolCall.id ?? "",
       content: truncateOutput(result),
       name: toolCall.name,

apps/open-swe/src/graphs/programmer/nodes/update-plan.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   GraphState,
   GraphConfig,
@@ -174,6 +175,7 @@ export async function updatePlan(
     "agent",
   );
   const toolMessage = new ToolMessage({
+    id: uuidv4(),
     tool_call_id: updatePlanToolCallId,
     content:
       "Successfully updated the plan. The complete updated plan items are as follow:\n\n" +

apps/open-swe/src/graphs/reviewer/nodes/final-review.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   ReviewerGraphState,
   ReviewerGraphUpdate,
@@ -96,6 +97,7 @@ export async function finalReview(
   if (toolCall.name === completedTool.name) {
     // Marked as completed. No further actions necessary.
     const toolMessage = new ToolMessage({
+      id: uuidv4(),
       tool_call_id: toolCall.id ?? "",
       content: "Marked task as completed.",
     });
@@ -144,6 +146,7 @@ export async function finalReview(
   );
 
   const toolMessage = new ToolMessage({
+    id: uuidv4(),
     tool_call_id: toolCall.id ?? "",
     content: "Marked task as incomplete.",
   });

apps/open-swe/src/graphs/shared/diagnose-error.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 import {
   BaseMessage,
   isToolMessage,
@@ -115,6 +116,7 @@ export async function diagnoseError(
   });
 
   const toolMessage = new ToolMessage({
+    id: uuidv4(),
     tool_call_id: toolCall.id ?? "",
     content: `Successfully diagnosed error. Please use the diagnosis to continue with the next action.`,
     name: toolCall.name,

apps/open-swe/src/routes/github/issue-webhook.ts

@@ -166,7 +166,7 @@ webhooks.on("issues.labeled", async ({ payload }) => {
       },
       ifNotExists: "create",
       streamResumable: true,
-      streamMode: ["values", "messages", "custom"],
+      streamMode: ["values", "messages-tuple", "custom"],
     });
 
     logger.info("Created new run from GitHub issue.", {

apps/web/src/components/v2/actions-renderer.tsx

@@ -2,10 +2,7 @@ import { isAIMessageSDK, isHumanMessageSDK } from "@/lib/langchain-messages";
 import { UseStream, useStream } from "@langchain/langgraph-sdk/react";
 import { AssistantMessage } from "../thread/messages/ai";
 import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";
-import {
-  ManagerGraphState,
-  ManagerGraphUpdate,
-} from "@open-swe/shared/open-swe/manager/types";
+import { ManagerGraphState } from "@open-swe/shared/open-swe/manager/types";
 import { useCancelStream } from "@/hooks/useCancelStream";
 import {
   isCustomNodeEvent,
@@ -26,7 +23,6 @@ import { GraphState, PlanItem } from "@open-swe/shared/open-swe/types";
 import { HumanResponse } from "@langchain/langgraph/prebuilt";
 import { LoadingActionsCardContent } from "./thread-view-loading";
 import { Interrupt } from "../thread/messages/interrupt";
-import { debounce } from "lodash";
 
 interface AcceptedPlanEventData {
   planTitle: string;
@@ -99,71 +95,6 @@ const getCustomNodeEventsFromMessages = (
     .flat();
 };
 
-function addMessagesToState(
-  existingMessages: Message[],
-  newMessages: Message[],
-): Message[] {
-  const existingIds = new Set(existingMessages.map((message) => message.id));
-
-  // First deduplicate within newMessages array itself
-  const seenNewIds = new Set<string>();
-  const uniqueNewMessages = newMessages.filter((message) => {
-    // Skip messages without IDs or those already in existingMessages
-    if (message.id && existingIds.has(message.id)) return false;
-
-    // Handle duplicates within newMessages
-    if (message.id) {
-      if (seenNewIds.has(message.id)) return false;
-      seenNewIds.add(message.id);
-    }
-
-    return true;
-  });
-
-  return [...existingMessages, ...uniqueNewMessages];
-}
-
-function isNodeEndMessagesUpdate(
-  data: unknown,
-): data is { output: { messages: Message[] } } {
-  return !!(
-    typeof data === "object" &&
-    data !== null &&
-    "output" in data &&
-    data.output &&
-    typeof data.output === "object" &&
-    "messages" in data.output &&
-    data.output.messages &&
-    Array.isArray(data.output.messages)
-  );
-}
-
-function isNodeEndCommandUpdate(data: unknown): data is {
-  output: { lg_name: string; goto: string; update: ManagerGraphUpdate };
-} {
-  return !!(
-    typeof data === "object" &&
-    data !== null &&
-    "output" in data &&
-    data.output &&
-    typeof data.output === "object" &&
-    "lg_name" in data.output &&
-    "goto" in data.output &&
-    "update" in data.output &&
-    typeof data.output.lg_name === "string" &&
-    (typeof data.output.goto === "string" || Array.isArray(data.output.goto)) &&
-    typeof data.output.update === "object"
-  );
-}
-
-const REVIEWER_NODE_IDS = [
-  "initialize-state",
-  "generate-review-actions",
-  "take-review-actions",
-  "diagnose-reviewer-error",
-  "final-review",
-];
-
 export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
   graphId,
   threadId,
@@ -178,12 +109,6 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
   );
   const joinedRunId = useRef<string | undefined>(undefined);
   const [streamLoading, setStreamLoading] = useState(false);
-  const [mergedMessages, setMergedMessages] = useState<Message[]>([]);
-  const debouncedSetMessages = useRef(
-    debounce((messages: Message[]) => {
-      setMergedMessages((prev) => addMessagesToState(prev, messages));
-    }, 100),
-  ).current;
 
   const stream = useStream<State>({
     apiUrl: process.env.NEXT_PUBLIC_API_URL,
@@ -195,23 +120,6 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
         setCustomNodeEvents((prev) => [...prev, event]);
       }
     },
-    onLangChainEvent: (data) => {
-      if (
-        data.event === "on_chain_end" &&
-        data.metadata?.langgraph_node &&
-        REVIEWER_NODE_IDS.includes(data.metadata.langgraph_node as string) &&
-        data.data
-      ) {
-        if (isNodeEndCommandUpdate(data.data)) {
-          const outputMessages = data.data.output.update
-            .messages as unknown as Message[];
-          debouncedSetMessages(outputMessages);
-        } else if (isNodeEndMessagesUpdate(data.data)) {
-          const outputMessages = data.data.output.messages;
-          debouncedSetMessages(outputMessages);
-        }
-      }
-    },
     fetchStateHistory: false,
   });
 
@@ -240,7 +148,7 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
   }
 
   useEffect(() => {
-    const allCustomEvents = getCustomNodeEventsFromMessages(mergedMessages);
+    const allCustomEvents = getCustomNodeEventsFromMessages(stream.messages);
     if (!allCustomEvents?.length) {
       return;
     }
@@ -263,18 +171,18 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
 
       return prev;
     });
-  }, [mergedMessages]);
+  }, [stream.messages]);
 
   // Clear streamLoading as soon as we get any content (agent has started running)
   useEffect(() => {
     const hasContent =
-      (mergedMessages && mergedMessages.length > 0) ||
+      (stream.messages && stream.messages.length > 0) ||
       customNodeEvents.length > 0;
 
     if (hasContent && streamLoading) {
       setStreamLoading(false);
     }
-  }, [mergedMessages, customNodeEvents, streamLoading]);
+  }, [stream.messages, customNodeEvents, streamLoading]);
 
   // TODO: If the SDK changes go in, use this instead:
   // stream.joinStream(runId, undefined, { streamMode: ["values", "messages", "custom"]}).catch(console.error);
@@ -300,15 +208,15 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
   }, [onStreamReady, runId]); // Depend on runId instead of cancelRun to avoid infinite loops
 
   // Filter out human & do not render messages
-  const filteredMessages = mergedMessages?.filter(
+  const filteredMessages = stream.messages?.filter(
     (m) =>
       !isHumanMessageSDK(m) &&
       !(m.id && m.id.startsWith(DO_NOT_RENDER_ID_PREFIX)),
   );
   const isLastMessageHidden = !!(
-    mergedMessages?.length > 0 &&
-    mergedMessages[mergedMessages.length - 1].id &&
-    mergedMessages[mergedMessages.length - 1].id?.startsWith(
+    stream.messages?.length > 0 &&
+    stream.messages[stream.messages.length - 1].id &&
+    stream.messages[stream.messages.length - 1].id?.startsWith(
       DO_NOT_RENDER_ID_PREFIX,
     )
   );
@@ -335,13 +243,6 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
     }
   }, [stream.values, graphId]);
 
-  useEffect(() => {
-    debouncedSetMessages(stream.messages);
-    return () => {
-      debouncedSetMessages.cancel();
-    };
-  }, [stream.messages, debouncedSetMessages]);
-
   if (streamLoading) {
     return <LoadingActionsCardContent />;
   }
@@ -360,7 +261,7 @@ export function ActionsRenderer<State extends PlannerGraphState | GraphState>({
         <AssistantMessage
           key={m.id}
           thread={stream as UseStream<Record<string, unknown>>}
-          threadMessages={mergedMessages}
+          threadMessages={stream.messages}
           message={m}
           isLoading={false}
           handleRegenerate={() => {}}

apps/web/src/components/v2/terminal-input.tsx

@@ -101,7 +101,7 @@ export function TerminalInput({
             },
             ifNotExists: "create",
             streamResumable: true,
-            streamMode: ["values", "messages", "custom"],
+            streamMode: ["values", "messages-tuple", "custom"],
           },
         );