From 869abad879685f48fc3c6f99f514e28edbfa4834 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, 16 Sep 2026 21:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E9=98=9F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=20chip=20=E7=9A=84=20@=20=E5=BC=95=E7=94=A8=E9=9C=B2?=
 =?UTF-8?q?=E5=87=BA=E5=86=85=E9=83=A8=20resourceId=EF=BC=88review=20?=
 =?UTF-8?q?=E7=AC=AC=202=20=E6=9D=A1=EF=BC=89=20-=20queuedChatTurnLabel=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20assets=20=E5=85=A5=E5=8F=82=E5=B9=B6?=
 =?UTF-8?q?=E9=80=8F=E4=BC=A0=E7=BB=99=20directCodexContentToPromptText?=
 =?UTF-8?q?=EF=BC=8C@=20=E5=BC=95=E7=94=A8=E6=8C=89=20manifest=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8D=E5=B1=95=E5=BC=80=EF=BC=8C=E4=B8=8E=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E8=BE=93=E5=85=A5=E5=8C=BA=E6=96=87=E6=A1=88=E5=8F=A3?=
 =?UTF-8?q?=E5=BE=84=E4=B8=80=E8=87=B4=20-=20ComposerTurnQueue=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20assets=20=E5=B1=9E=E6=80=A7=EF=BC=8CProjectSupervis?=
 =?UTF-8?q?orView=20=E6=8A=8A=20chatProjectAssets=20=E4=BC=A0=E4=B8=8B?=
 =?UTF-8?q?=E5=8E=BB=20-=20chat-composer=20=E7=94=A8=E4=BE=8B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=8C=E9=98=9F=E5=88=97=20chip=20=E7=9A=84=20@=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=8C=89=20manifest=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E5=B1=95=E5=BC=80=E3=80=8D=EF=BC=8C=E9=92=89=E4=BD=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E6=96=87=E6=A1=88=E4=B8=8E=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=A0=E6=B8=85=E5=8D=95=E6=97=B6=E7=9A=84=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=20id=20=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-workspace/ComposerControls.tsx    |  8 +++--
 .../ProjectSupervisorView.tsx                 |  1 +
 .../project-workspace/chatComposerQueue.ts    | 15 +++++++--
 .../tests/appSurface/chat-composer.suite.ts   | 31 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx
index 0aa574dbc..410ee2da7 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx
@@ -19,6 +19,7 @@ import {
 import type { RefObject } from 'react';
 import { useEffect, useRef, useState } from 'react';
 
+import type { GameCreationAppAssetManifestEntry } from '../../../../../packages/shared/src/contracts/gameCreationApp';
 import { resolveTauriInvoke } from '../../app/tauri';
 import type {
   GameCreatorAppConfigView,
@@ -192,9 +193,12 @@ export function ComposerPendingAttachments({
 /** 队列 chip：回合运行中入队的消息，按 FIFO 顺序展示，可单条取消。 */
 export function ComposerTurnQueue({
   turns,
+  assets,
   onCancel,
 }: {
   turns: readonly QueuedChatTurn[];
+  /** 与聊天输入区同源的素材清单：chip 文案里的 `@` 引用按它展开成显示名。 */
+  assets?: readonly GameCreationAppAssetManifestEntry[];
   onCancel: (id: string) => void;
 }) {
   if (turns.length === 0) {
@@ -211,11 +215,11 @@ export function ComposerTurnQueue({
             {index + 1}
           </span>
           <span className="project-supervisor-composer-queue-text">
-            {queuedChatTurnLabel(turn)}
+            {queuedChatTurnLabel(turn, assets)}
           </span>
           <button
             type="button"
-            aria-label={`取消排队消息 ${queuedChatTurnLabel(turn)}`}
+            aria-label={`取消排队消息 ${queuedChatTurnLabel(turn, assets)}`}
             title="取消这条排队消息"
             onClick={() => onCancel(turn.id)}
           >
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
index 9f2c97e1d..38ed62d7c 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
@@ -889,6 +889,7 @@ export function ProjectSupervisorView({
         >
           <ComposerTurnQueue
             turns={directCodex ? queuedTurns : []}
+            assets={chatProjectAssets}
             onCancel={(id) => onCancelQueuedTurn?.(id)}
           />
           <ComposerPendingAttachments
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts b/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts
index 11ac62f89..2d88fa4ec 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts
@@ -4,6 +4,7 @@
  * 回合运行中用户再次发送时，消息进入 FIFO 队列而不是被丢弃；当前回合结束后按入队顺序
  * 依次发出。队列项能在输入盒上方单独取消。这里只放与 React 无关的纯逻辑，便于单测。
  */
+import type { GameCreationAppAssetManifestEntry } from '../../../../../packages/shared/src/contracts/gameCreationApp';
 import type { DirectCodexUserItem } from './generated';
 import { directCodexContentToPromptText } from './resourceReferences';
 
@@ -73,9 +74,17 @@ export function chatQueueFullNotice(): string {
   return `队列已满（最多 ${MAX_QUEUED_CHAT_TURNS} 条），请等当前回合结束后再发送`;
 }
 
-/** 队列 chip 上显示的文字：单行、有长度上限。 */
-export function queuedChatTurnLabel(turn: QueuedChatTurn): string {
-  const text = directCodexContentToPromptText(turn.userItem.content)
+/**
+ * 队列 chip 上显示的文字：单行、有长度上限。
+ *
+ * `assets` 必须与聊天输入区同源（`manifest.assets`）：`@` 引用要按显示名展开，否则
+ * chip 上会露出 `@asset:…` 这样的内部 id，与用户输入时看到的 `@显示名` 对不上。
+ */
+export function queuedChatTurnLabel(
+  turn: QueuedChatTurn,
+  assets: readonly GameCreationAppAssetManifestEntry[] = [],
+): string {
+  const text = directCodexContentToPromptText(turn.userItem.content, assets)
     .trim()
     .replace(/\s+/gu, ' ');
   if (text) {
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 ed9c30264..53f8df2bd 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
@@ -196,6 +196,37 @@ function queuedTurn(
 }
 
 export function registerChatComposerControlTests() {
+  it('队列 chip 的 @ 引用按 manifest 显示名展开，不露出内部 resourceId', () => {
+    const turn = createQueuedChatTurn({
+      id: 'turn-ref',
+      clientTurnId: 'client-ref',
+      userItem: directCodexUserItemFromContent(
+        [
+          { type: 'input_text', text: '用这张图改一下' },
+          { type: 'agc_resource_reference', resourceId: 'asset:hero' },
+        ],
+        'client-ref:user',
+      ),
+      createdAt: 1,
+    });
+    const manifestAssets = [
+      {
+        id: 'asset:hero',
+        kind: 'character',
+        mediaType: 'image/png',
+        localPath: 'assets/hero.png',
+        source: { kind: 'uploaded' as const },
+      },
+    ];
+
+    // chip 文案与聊天输入区同口径：用户看到的是 `@显示名`，不是 `@内部 id`。
+    expect(queuedChatTurnLabel(turn, manifestAssets)).toBe(
+      '用这张图改一下@hero',
+    );
+    // 素材清单不传（老调用方）时退回稳定 id，不抛错。
+    expect(queuedChatTurnLabel(turn)).toBe('用这张图改一下@asset:hero');
+  });
+
   it('keeps queued chat turns in FIFO order and drops only the cancelled one', () => {
     const first = queuedTurn('turn-1', 'client-1', '第一条', 1);
     const second = queuedTurn('turn-2', 'client-2', '第二条', 2);