From 3e8954548ac7b51234b42f9182b856486c356bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= <kvtodev@outlook.com>
Date: Wed, 30 Sep 2026 11:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=BF=E8=BA=AB=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E5=AE=BF=E4=B8=BB=E7=9A=84=E6=8C=89=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=EF=BC=9AalreadyDispatched=20=E5=8F=AA?=
 =?UTF-8?q?=E8=AE=A4=E6=AD=A3=E5=9C=A8=E8=B7=91=E9=82=A3=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- hostQueue 记录被放行的 clientTurnId，cancel 只在身份一致时回 alreadyDispatched，其余回 notFound
- 与宿主 remove_pending_turn（按 active_turn.turn_id 比对）保持一致，避免复用该替身时掩盖 notFound 分支
---
 .../tests/appSurface/chat-composer.suite.ts            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts
index 132940ace..3e6545351 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts
@@ -244,11 +244,14 @@ function hostQueue(
 ) {
   const queued: Array<{ clientTurnId: string; userItem: unknown }> = [];
   let running = alreadyRunning;
+  /** 正在跑那一轮的回合身份：与宿主一致，`alreadyDispatched` 只认它（不是"随便哪一轮在跑"）。 */
+  let dispatchedClientTurnId: string | null = null;
   const dispatchHeadIfIdle = () => {
     if (running) return;
     const head = queued.shift();
     if (!head) return;
     running = true;
+    dispatchedClientTurnId = head.clientTurnId;
     harness.emitDirectThreadEvents(
       {
         type: 'queue.removed',
@@ -283,7 +286,11 @@ function hostQueue(
       const index = queued.findIndex(
         (item) => item.clientTurnId === clientTurnId,
       );
-      if (index < 0) return running ? 'alreadyDispatched' : 'notFound';
+      if (index < 0) {
+        return dispatchedClientTurnId === clientTurnId
+          ? 'alreadyDispatched'
+          : 'notFound';
+      }
       queued.splice(index, 1);
       harness.emitDirectThreadEvents({
         type: 'queue.removed',
@@ -296,6 +303,7 @@ function hostQueue(
     /** 回合收尾：宿主在占用释放那一刻踢一脚，队首接上。 */
     complete(status = 'completed') {
       running = false;
+      dispatchedClientTurnId = null;
       harness.emitDirectThreadEvents({ type: 'turn.completed', status, at: 4 });
       dispatchHeadIfIdle();
     },