From 6daf5b30f07cc0b3db87766d22fdf433f8a1a7c9 Mon Sep 17 00:00:00 2001
From: wuli666 <421774554@qq.com>
Date: Thu, 24 Sep 2026 03:32:40 +0800
Subject: [PATCH] [Bugfix] Preserve cancellation in duplex session control
 queues (#7782)

Signed-off-by: wuli666 <421774554@qq.com>
---
 tests/engine/duplex/test_session_manager.py | 41 +++++++++++++++++++++
 vllm_omni/engine/duplex/session/manager.py  |  7 ++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/tests/engine/duplex/test_session_manager.py b/tests/engine/duplex/test_session_manager.py
index 3d36c9891..2f44a9713 100644
--- a/tests/engine/duplex/test_session_manager.py
+++ b/tests/engine/duplex/test_session_manager.py
@@ -1281,6 +1281,47 @@ async def test_control_dispatch_is_ordered_per_session_without_blocking_other_se
         assert manager.active_count() == 2
 
 
+@pytest.mark.parametrize("stop", ["shutdown", "predecessor", "tail", "failure"])
+async def test_control_queue_preserves_cancellation(stop: str) -> None:
+    async with Harness.create() as harness:
+        started = asyncio.Event()
+        release = asyncio.Event()
+        ran: list[str] = []
+
+        async def first() -> None:
+            started.set()
+            await release.wait()
+            raise ValueError("control failed")
+
+        async def next_operation() -> None:
+            ran.append("next")
+
+        manager = harness.manager
+        predecessor = manager._run_control("sid", "first", first)
+        await started.wait()
+        tail = manager._run_control("sid", "next", next_operation)
+        # Let the tail enter its await of the predecessor before cancelling.
+        await asyncio.sleep(0)
+        if stop == "shutdown":
+            await asyncio.wait_for(manager.shutdown(), timeout=1.0)
+        elif stop == "predecessor":
+            predecessor.cancel()
+        elif stop == "tail":
+            tail.cancel()
+        else:
+            release.set()
+        await asyncio.wait_for(asyncio.gather(predecessor, tail, return_exceptions=True), timeout=1.0)
+        if stop in {"failure", "predecessor"}:
+            assert ran == ["next"]
+            assert not tail.cancelled()
+            if stop == "predecessor":
+                assert predecessor.cancelled()
+        else:
+            assert predecessor.cancelled()
+            assert tail.cancelled()
+            assert ran == []
+
+
 async def test_shutdown_closes_every_runner_and_stops_dispatch_tasks() -> None:
     harness = Harness.create()
     await harness.open("sid-a")
diff --git a/vllm_omni/engine/duplex/session/manager.py b/vllm_omni/engine/duplex/session/manager.py
index 605ed8eba..1faea6e22 100644
--- a/vllm_omni/engine/duplex/session/manager.py
+++ b/vllm_omni/engine/duplex/session/manager.py
@@ -214,10 +214,9 @@ class DuplexSessionManager:
 
         async def run_ordered() -> None:
             if predecessor is not None:
-                try:
-                    await predecessor
-                except BaseException:
-                    pass
+                # A predecessor's failure/cancellation must not poison the queue.
+                # Cancelling this task still cancels the gather and propagates.
+                await asyncio.gather(predecessor, return_exceptions=True)
             await operation()
 
         task = asyncio.create_task(run_ordered(), name=name)