From b7e329cf0ad5342898f37b51e3b6edb2eedd7048 Mon Sep 17 00:00:00 2001
From: William FH <13333726+hinthornw@users.noreply.github.com>
Date: Mon, 24 Nov 2025 16:09:08 -0800
Subject: [PATCH] chore: pop thread ID from configurable fields in remote graph
 (#6497)

Otherwise, you cannot use `context` with stateful runs, because the
server throws if you provide both configurable and context in a single
call (due to ambiguous parameters)
---
 libs/langgraph/langgraph/pregel/remote.py |  6 ++--
 libs/langgraph/tests/test_remote_graph.py | 40 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/libs/langgraph/langgraph/pregel/remote.py b/libs/langgraph/langgraph/pregel/remote.py
index 5f0c57863..2535d966a 100644
--- a/libs/langgraph/langgraph/pregel/remote.py
+++ b/libs/langgraph/langgraph/pregel/remote.py
@@ -725,9 +725,10 @@ class RemoteGraph(PregelProtocol):
             input = None
         else:
             command = None
+        thread_id = sanitized_config.get("configurable", {}).pop("thread_id", None)
 
         for chunk in sync_client.runs.stream(
-            thread_id=sanitized_config["configurable"].get("thread_id"),
+            thread_id=thread_id,
             assistant_id=self.assistant_id,
             input=input,
             command=command,
@@ -834,9 +835,10 @@ class RemoteGraph(PregelProtocol):
             input = None
         else:
             command = None
+        thread_id = sanitized_config.get("configurable", {}).pop("thread_id", None)
 
         async for chunk in client.runs.stream(
-            thread_id=sanitized_config["configurable"].get("thread_id"),
+            thread_id=thread_id,
             assistant_id=self.assistant_id,
             input=input,
             command=command,
diff --git a/libs/langgraph/tests/test_remote_graph.py b/libs/langgraph/tests/test_remote_graph.py
index f67e898ba..8cfad709a 100644
--- a/libs/langgraph/tests/test_remote_graph.py
+++ b/libs/langgraph/tests/test_remote_graph.py
@@ -840,6 +840,46 @@ def test_invoke():
     assert result == {"messages": [{"type": "human", "content": "world"}]}
 
 
+def test_invoke_sanitizes_thread_id():
+    # Ensure that invoking with thread_id passes thread_id as a top-level arg
+    # and removes it from the config body.
+    mock_sync_client = MagicMock()
+    mock_sync_client.runs.stream.return_value = []
+    remote_pregel = RemoteGraph("test_graph_id", sync_client=mock_sync_client)
+
+    config = {"configurable": {"thread_id": "thread_1"}}
+    remote_pregel.invoke(
+        {"input": {"messages": [{"type": "human", "content": "hello"}]}}, config
+    )
+
+    assert mock_sync_client.runs.stream.called
+    _, kwargs = mock_sync_client.runs.stream.call_args
+    assert kwargs.get("thread_id") == "thread_1"
+    passed_config = kwargs.get("config") or {}
+    assert "configurable" in passed_config
+    assert "thread_id" not in passed_config["configurable"]
+    assert not passed_config["configurable"]
+
+
+def test_stream_sanitizes_thread_id():
+    # Ensure that streaming with thread_id passes thread_id as a top-level arg
+    # and removes it from the config body.
+    mock_sync_client = MagicMock()
+    mock_sync_client.runs.stream.return_value = []
+    remote_pregel = RemoteGraph("test_graph_id", sync_client=mock_sync_client)
+
+    config = {"configurable": {"thread_id": "thread_2"}}
+    list(remote_pregel.stream({"input": {"messages": []}}, config))
+
+    assert mock_sync_client.runs.stream.called
+    _, kwargs = mock_sync_client.runs.stream.call_args
+    assert kwargs.get("thread_id") == "thread_2"
+    passed_config = kwargs.get("config") or {}
+    assert "configurable" in passed_config
+    assert "thread_id" not in passed_config["configurable"]
+    assert not passed_config["configurable"]
+
+
 @pytest.mark.anyio
 async def test_ainvoke():
     # set up test