From 0cca5699cbc416b0cd4530643a30b4652c177670 Mon Sep 17 00:00:00 2001
From: Alishahryar1 <alishahryar2@gmail.com>
Date: Mon, 27 Apr 2026 16:24:31 -0700
Subject: [PATCH] fix(messaging): reuse parent CLI session for Telegram reply
 continuation (#233)

Pass parent_session_id into get_or_create_session so reply nodes align with
the fork/resume path instead of always allocating a fresh pending session.
Add unit coverage and update integration expectations.
---
 messaging/handler.py                        |  4 +-
 tests/messaging/test_handler.py             | 48 +++++++++++++++++++++
 tests/messaging/test_handler_integration.py |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/messaging/handler.py b/messaging/handler.py
index 7702e118..0a5e4e01 100644
--- a/messaging/handler.py
+++ b/messaging/handler.py
@@ -370,7 +370,9 @@ class ClaudeMessageHandler:
                     cli_session,
                     session_or_temp_id,
                     is_new,
-                ) = await self.cli_manager.get_or_create_session(session_id=None)
+                ) = await self.cli_manager.get_or_create_session(
+                    session_id=parent_session_id
+                )
                 if is_new:
                     temp_session_id = session_or_temp_id
                 else:
diff --git a/tests/messaging/test_handler.py b/tests/messaging/test_handler.py
index 013b096a..2c79bbbf 100644
--- a/tests/messaging/test_handler.py
+++ b/tests/messaging/test_handler.py
@@ -419,6 +419,54 @@ async def test_process_node_success_flow(handler, mock_cli_manager, mock_platfor
         assert "✅ *Complete*" in last_call[0][2]
         assert "Hello world" in last_call[0][2]
 
+    mock_cli_manager.get_or_create_session.assert_awaited_once_with(session_id=None)
+    mock_session.start_task.assert_called_once()
+    st_kw = mock_session.start_task.call_args
+    assert st_kw.kwargs.get("session_id") is None
+    assert st_kw.kwargs.get("fork_session") is False
+
+
+@pytest.mark.asyncio
+async def test_process_node_reply_uses_parent_session_for_manager_and_fork(
+    handler, mock_cli_manager, mock_platform
+):
+    """Telegram follow-ups must reuse parent Claude session (issue #233)."""
+    node_id = "child_1"
+    mock_node = MagicMock()
+    mock_node.incoming.chat_id = "chat_1"
+    mock_node.incoming.text = "follow up"
+    mock_node.status_message_id = "status_child"
+    mock_node.parent_id = "root_msg"
+
+    parent_claude_session = "claude_sess_parent"
+    mock_session = MagicMock()
+    mock_session.start_task.return_value = mock_async_gen([{"type": "exit", "code": 0}])
+    mock_cli_manager.get_or_create_session.return_value = (
+        mock_session,
+        parent_claude_session,
+        False,
+    )
+
+    mock_tree = MagicMock()
+    mock_tree.update_state = AsyncMock()
+    mock_tree.root_id = "root_msg"
+    mock_tree.to_dict.return_value = {}
+    mock_tree.get_parent_session_id = MagicMock(return_value=parent_claude_session)
+
+    with patch.object(
+        handler.tree_queue, "get_tree_for_node", MagicMock(return_value=mock_tree)
+    ):
+        await handler._process_node(node_id, mock_node)
+
+    mock_tree.get_parent_session_id.assert_called_once_with(node_id)
+    mock_cli_manager.get_or_create_session.assert_awaited_once_with(
+        session_id=parent_claude_session
+    )
+    mock_session.start_task.assert_called_once()
+    st_kw = mock_session.start_task.call_args
+    assert st_kw.kwargs.get("session_id") == parent_claude_session
+    assert st_kw.kwargs.get("fork_session") is True
+
 
 @pytest.mark.asyncio
 async def test_process_node_error_flow(handler, mock_cli_manager, mock_platform):
diff --git a/tests/messaging/test_handler_integration.py b/tests/messaging/test_handler_integration.py
index b98375d7..0b016a91 100644
--- a/tests/messaging/test_handler_integration.py
+++ b/tests/messaging/test_handler_integration.py
@@ -95,7 +95,7 @@ async def test_full_conversation_flow_single_user(
 
     assert tree.get_node("m2").state.value == MessageState.COMPLETED.value
     assert tree.get_node("m2").parent_id == "m1"
-    mock_cli_manager.get_or_create_session.assert_called_with(session_id=None)
+    mock_cli_manager.get_or_create_session.assert_called_with(session_id="sess1")
     mock_session2.start_task.assert_called_with(
         "message 2", session_id="sess1", fork_session=True
     )