From 92db1e70658ebdca8538d4d2e1de4ce89f616046 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 12:32:54 +0800
Subject: [PATCH 01/67] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=94=B9=E4=B8=BA=20Codex=20=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=95=8C=E9=9D=A2=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProjectSupervisorView：direct-codex 面板改成三段式（顶部极简条 / 唯一滚动区消息列表 / 文档流输入盒）
- ProjectSupervisorView：顶部只留状态点 + 状态文案（aria-live=polite）+ 设置齿轮，移除头像、标题、副标题、审批按钮与泥点钱包槽
- ProjectSupervisorView：新增 direct-codex 空态（线稿图标 + 主标题「你想让陶泥儿做什么游戏？」+ 短指令副标题），整体在消息区垂直水平居中
- ProjectSupervisorView：输入盒改成三行结构（`项目名` · `本地` 信息标签 / ResourceReferenceInput 文本区 / 控制排）
- ProjectSupervisorView：控制排左为 `+` 附件钮与 `@` 引用钮（都复用 composerRef.openPicker），右为模型下拉与圆形主色发送钮
- ProjectSupervisorView：新增 walletEntry 可选属性，透传到设置浮层的「泥点」行
- ProjectSupervisorSettingsDialog（新增）：设置齿轮打开的独立浮层（role=dialog + aria-modal + Esc 关闭 + 点遮罩关闭），承载运行配置入口、操作权限入口与泥点
- approvalMode（新增）：把「严格 / 风险 / 无」审批模式选项与文案抽成可复用模块
- ApprovalModeDialog（新增）：审批模式对话框改成可复用组件，index.tsx 改为复用它
- project-development/index.tsx：`!uiEditorRoute` 的 game-workbench-chat 头部精简掉标题/审批按钮/钱包槽，并用 cloneElement 把 walletEntry 透传给 supervisor 元素
- project-development/index.tsx：`planningStartMode` 分支保持原样
- ConversationModelSelect：触发按钮只显示已选模型 displayName，未加载完时显示「模型」占位（菜单内加载提示保留）
- styles.css：消息列表去掉绝对定位与 196px/256px 底边留白，改成唯一滚动区
- styles.css：输入盒去掉绝对定位，改成文档流三行网格，成为唯一有边框的容器（1px 边框、14px 圆角）
- styles.css：助手消息去掉整块底色，用户消息保留右对齐浅底气泡 + 主色描边
- styles.css：新增顶栏、空态、设置浮层与暖色执行过程卡的样式区块，颜色全部取自现有 platform 变量
- styles.css：窄屏（760px/1000px 断点）下输入盒留在文档流并保留四周边距
- chatDialogFrameLayout.test.ts：把「输入区浮在消息列表之上」的旧契约改写成「输入盒在消息列表下方、文档流、列表无浮层留白」的新契约
- project-development.suite.ts：同步更新表单布局、提交按钮尺寸与钱包槽的断言，并新增空态 + 设置浮层用例
---
 .../ConversationModelSelect.tsx               |   4 +-
 .../ProjectSupervisorSettingsDialog.tsx       | 116 ++++
 .../ProjectSupervisorView.tsx                 | 120 +++-
 apps/ai-game-creator-shell/src/styles.css     | 542 +++++++++++++++---
 .../ApprovalModeDialog.tsx                    |  94 +++
 .../view/project-development/approvalMode.ts  |  44 ++
 .../src/view/project-development/index.tsx    | 152 +----
 .../appSurface/project-development.suite.ts   | 307 +++++++---
 .../tests/chatDialogFrameLayout.test.ts       | 263 +++++----
 9 files changed, 1252 insertions(+), 390 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorSettingsDialog.tsx
 create mode 100644 apps/ai-game-creator-shell/src/view/project-development/ApprovalModeDialog.tsx
 create mode 100644 apps/ai-game-creator-shell/src/view/project-development/approvalMode.ts

diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ConversationModelSelect.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ConversationModelSelect.tsx
index 1bc4c9ea4..fb78371e2 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ConversationModelSelect.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ConversationModelSelect.tsx
@@ -331,8 +331,8 @@ export function ConversationModelSelect({
           aria-hidden="true"
         />
         <span className="conversation-model-trigger-label">
-          {models.find((model) => model.id === selected)?.displayName ??
-            (busy ? '正在读取模型' : '选择模型')}
+          {/* 控件位只显示已选模型名；目录还没读完时用「模型」占位（加载提示留在菜单里）。 */}
+          {models.find((model) => model.id === selected)?.displayName ?? '模型'}
         </span>
         <ChevronDown size={13} aria-hidden="true" />
       </button>
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorSettingsDialog.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorSettingsDialog.tsx
new file mode 100644
index 000000000..d3321fc9e
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorSettingsDialog.tsx
@@ -0,0 +1,116 @@
+import { Settings2, ShieldCheck, Wallet, X } from 'lucide-react';
+import type { ReactNode } from 'react';
+import { useState } from 'react';
+
+import {
+  closeDialogOnBackdropMouseDown,
+  useEscapeToClose,
+} from '../../app/dialogs';
+import { RuntimeConfigDialog } from '../runtime-config/RuntimeConfigDialog';
+
+/**
+ * 右侧对话面板 Codex 风格改造后，面板顶部只剩「状态点 + 状态文案 + 齿轮」。
+ * 原来长在面板顶部（以及 `view/project-development/index.tsx` 头部）的
+ * 运行配置 / 审批配置 / 泥点钱包统一收进这个独立浮层：点齿轮才出现，
+ * 不再往面板下面追加内容。
+ *
+ * 组成：
+ * - 「运行配置」打开既有 `RuntimeConfigDialog`（独立浮层，自己有 backdrop）；
+ * - 「操作权限」打开由 `ApprovalModeDialog` 提供的选择面板；
+ * - 「泥点」直接渲染父级传入的 `walletEntry`（为空则整行不渲染）。
+ */
+export function ProjectSupervisorSettingsDialog({
+  projectPath,
+  currentApprovalLabel,
+  onOpenApproval,
+  walletEntry,
+  onClose,
+}: {
+  projectPath: string;
+  currentApprovalLabel: string;
+  onOpenApproval: () => void;
+  walletEntry?: ReactNode;
+  onClose: () => void;
+}) {
+  const [runtimeConfigOpen, setRuntimeConfigOpen] = useState(false);
+  // 二级浮层自己处理 Esc；否则一次 Esc 会把两层一起关掉。
+  useEscapeToClose(onClose, !runtimeConfigOpen);
+  return (
+    <>
+      <div
+        className="project-supervisor-settings-backdrop"
+        role="presentation"
+        onMouseDown={(event) => closeDialogOnBackdropMouseDown(event, onClose)}
+      >
+        <section
+          className="project-supervisor-settings-dialog"
+          role="dialog"
+          aria-modal="true"
+          aria-labelledby="project-supervisor-settings-title"
+        >
+          <header>
+            <div>
+              <h2 id="project-supervisor-settings-title">对话设置</h2>
+              <small>运行配置、操作权限与泥点</small>
+            </div>
+            <button
+              type="button"
+              className="project-supervisor-settings-close"
+              aria-label="关闭设置"
+              onClick={onClose}
+            >
+              <X size={16} aria-hidden="true" />
+            </button>
+          </header>
+          <div className="project-supervisor-settings-rows">
+            <button
+              type="button"
+              className="project-supervisor-settings-row"
+              onClick={() => setRuntimeConfigOpen(true)}
+            >
+              <span className="project-supervisor-settings-row-main">
+                <Settings2 size={16} aria-hidden="true" />
+                <span>
+                  <strong>运行配置</strong>
+                  <small>模型、Agent 分工与高级参数</small>
+                </span>
+              </span>
+            </button>
+            <button
+              type="button"
+              className="project-supervisor-settings-row"
+              aria-label={`审批配置，当前${currentApprovalLabel}`}
+              onClick={onOpenApproval}
+            >
+              <span className="project-supervisor-settings-row-main">
+                <ShieldCheck size={16} aria-hidden="true" />
+                <span>
+                  <strong>操作权限</strong>
+                  <small>{currentApprovalLabel}</small>
+                </span>
+              </span>
+            </button>
+            {walletEntry ? (
+              <div className="project-supervisor-settings-row is-static">
+                <span className="project-supervisor-settings-row-main">
+                  <Wallet size={16} aria-hidden="true" />
+                  <span>
+                    <strong>泥点</strong>
+                    <small>当前余额与充值入口</small>
+                  </span>
+                </span>
+                <div className="game-workbench-chat-wallet">{walletEntry}</div>
+              </div>
+            ) : null}
+          </div>
+        </section>
+      </div>
+      {runtimeConfigOpen ? (
+        <RuntimeConfigDialog
+          projectPath={projectPath}
+          onClose={() => setRuntimeConfigOpen(false)}
+        />
+      ) : null}
+    </>
+  );
+}
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 ef8a6b119..b2e7d5320 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
@@ -1,7 +1,15 @@
-import { ArrowUp, AtSign, Loader2 } from 'lucide-react';
+import {
+  ArrowUp,
+  AtSign,
+  Loader2,
+  MessageSquareDashed,
+  Plus,
+  Settings,
+} from 'lucide-react';
 import type {
   ComponentProps,
   FormEventHandler,
+  ReactNode,
   RefObject,
   UIEventHandler,
 } from 'react';
@@ -18,6 +26,11 @@ import type {
 } from '../../app/types';
 import type { DesignClarificationRequest, DesignView } from '../../app/types';
 import { ChatMarkdownMessage } from '../../components/ChatMarkdownMessage';
+import {
+  type ApprovalMode,
+  approvalModeLabel,
+} from '../../view/project-development/approvalMode';
+import { ApprovalModeDialog } from '../../view/project-development/ApprovalModeDialog';
 import {
   projectProfessionalAgentLabel,
   projectRuntimeVisibleError,
@@ -43,6 +56,7 @@ import {
 import { isPlanningLaneRuntime } from './planningLane';
 import { PlanningLaneRuntimeStrip } from './PlanningLaneRuntimeStrip';
 import { resolvePendingCommandProjectPath } from './projectCommandPolicy';
+import { ProjectSupervisorSettingsDialog } from './ProjectSupervisorSettingsDialog';
 import {
   ResourceReferenceInput,
   type ResourceReferenceInputHandle,
@@ -70,6 +84,12 @@ function directStatusTitle(status: string | null | undefined) {
   }
 }
 
+/** Codex 顶栏只显示项目名：取路径最后一段，拿不到时退回占位文案。 */
+function projectDisplayName(projectPath: string) {
+  const name = projectPath.split(/[\\/]/u).filter(Boolean).pop();
+  return name ?? '未选择项目';
+}
+
 type ProjectSupervisorViewProps = RuntimePanelProps & {
   activeVersionId?: string | null;
   chatInput: string;
@@ -99,6 +119,7 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   designReasoning?: string;
   visibleMessages: ChatMessage[];
   visibleProfessionalAgentCards: AgentStatusCard[];
+  walletEntry?: ReactNode;
   workspaceStatus: string;
   planGddState: PlanGddStateViewV1 | null;
   planGddHydrateBusy: boolean;
@@ -151,6 +172,7 @@ export function ProjectSupervisorView({
   designReasoning = '',
   visibleMessages,
   visibleProfessionalAgentCards,
+  walletEntry,
   workspaceStatus,
   planGddState,
   planGddHydrateBusy,
@@ -187,6 +209,27 @@ export function ProjectSupervisorView({
   const [modelValidating, setModelValidating] = useState(false);
   const modelSelectRef = useRef<ConversationModelSelectHandle>(null);
   const modelValidateInFlightRef = useRef(false);
+  // 设置浮层：Codex 顶栏只剩状态与齿轮，运行配置 / 审批模式 / 钱包都收进这里。
+  const [settingsOpen, setSettingsOpen] = useState(false);
+  const [approvalOpen, setApprovalOpen] = useState(false);
+  const [approvalMode, setApprovalMode] = useState<ApprovalMode>('strict');
+  const [approvalNotice, setApprovalNotice] = useState('');
+  useEffect(() => {
+    setApprovalOpen(false);
+    setApprovalNotice('');
+  }, [settingsOpen]);
+  const runBusy =
+    runtimePanelProps.controlBusy || Boolean(directProcessDetail) || submitting;
+  const emptyState =
+    directCodex &&
+    visibleMessages.length === 0 &&
+    !transientReply &&
+    !directProcessDetail &&
+    !runtimePanelProps.controlBusy &&
+    !pendingCommand &&
+    !pendingConfirmation &&
+    !designView?.session.pendingApproval &&
+    !designView?.session.pendingClarification;
   const submitButton = (
     <button
       type="submit"
@@ -236,12 +279,44 @@ export function ProjectSupervisorView({
             onMakeGame={onMakeGameFromApprovedGdd}
           />
         )}
+        {directCodex ? (
+          <header className="project-supervisor-topbar">
+            <span
+              className="project-supervisor-topbar-status"
+              aria-live="polite"
+            >
+              <span
+                className={`project-supervisor-topbar-dot${runBusy ? ' is-busy' : ''}`}
+                aria-hidden="true"
+              />
+              {runBusy
+                ? directStatusTitle(directStatus)
+                : projectWorkspaceStatusForDisplay(workspaceStatus)}
+            </span>
+            <button
+              type="button"
+              className="project-supervisor-settings-trigger"
+              aria-label="设置"
+              title="设置"
+              onClick={() => setSettingsOpen(true)}
+            >
+              <Settings size={16} aria-hidden="true" />
+            </button>
+          </header>
+        ) : null}
         <div
           ref={messagesRef}
           className="message-list project-supervisor-message-list"
           aria-label={directCodex ? '陶泥儿消息' : '项目总控消息'}
           onScroll={onScroll}
         >
+          {emptyState ? (
+            <div className="project-supervisor-empty-state">
+              <MessageSquareDashed size={30} aria-hidden="true" />
+              <strong>你想让陶泥儿做什么游戏？</strong>
+              <small>告诉陶泥儿接下来要做什么，或输入 @ 选择资源</small>
+            </div>
+          ) : null}
           {hiddenConversationCount > 0 ? (
             <button
               type="button"
@@ -433,6 +508,12 @@ export function ProjectSupervisorView({
             void validateModel();
           }}
         >
+          {directCodex ? (
+            <div className="project-supervisor-composer-context">
+              <span title={projectPath}>{projectDisplayName(projectPath)}</span>
+              <span>本地</span>
+            </div>
+          ) : null}
           <ResourceReferenceInput
             ref={composerRef}
             ariaLabel={directCodex ? '陶泥儿对话内容' : '项目需求'}
@@ -461,6 +542,16 @@ export function ProjectSupervisorView({
           {directCodex ? (
             <div className="project-supervisor-composer-controls">
               <div className="project-supervisor-composer-controls-left">
+                <button
+                  type="button"
+                  className="project-supervisor-attachment-trigger"
+                  aria-label="添加素材引用"
+                  title="添加素材引用"
+                  disabled={runtimePanelProps.controlBusy || needsUserInput}
+                  onClick={() => composerRef?.current?.openPicker()}
+                >
+                  <Plus size={15} aria-hidden="true" />
+                </button>
                 <button
                   type="button"
                   className="project-supervisor-reference-trigger"
@@ -488,9 +579,11 @@ export function ProjectSupervisorView({
             submitButton
           )}
         </form>
-        <small className="project-supervisor-workspace-status">
-          {projectWorkspaceStatusForDisplay(workspaceStatus)}
-        </small>
+        {directCodex ? null : (
+          <small className="project-supervisor-workspace-status">
+            {projectWorkspaceStatusForDisplay(workspaceStatus)}
+          </small>
+        )}
       </div>
       {showProfessionalCollaboration ? (
         <aside
@@ -530,6 +623,25 @@ export function ProjectSupervisorView({
           )}
         </aside>
       ) : null}
+      {directCodex && settingsOpen ? (
+        <ProjectSupervisorSettingsDialog
+          projectPath={projectPath}
+          currentApprovalLabel={approvalModeLabel(approvalMode)}
+          onOpenApproval={() => setApprovalOpen(true)}
+          walletEntry={walletEntry}
+          onClose={() => setSettingsOpen(false)}
+        />
+      ) : null}
+      {directCodex && settingsOpen && approvalOpen ? (
+        <ApprovalModeDialog
+          approvalMode={approvalMode}
+          notice={approvalNotice}
+          onSelect={setApprovalMode}
+          onNotice={setApprovalNotice}
+          onClose={() => setApprovalOpen(false)}
+          closeOnEscape={false}
+        />
+      ) : null}
     </section>
   );
 }
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index a0fec719e..15423a454 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -8353,8 +8353,10 @@ iframe.preview-frame {
   overflow-y: auto;
   border: 1px solid var(--platform-subpanel-border);
   background: var(--platform-input-fill);
-  padding-bottom: 196px;
-  scroll-padding-bottom: 196px;
+  /* 输入区回到文档流（见文件末尾「右侧对话面板 Codex 风格」区块）：列表不再需要给一块
+     浮在自己身上的输入区预留高度，这里只留 `@` 引用菜单等浮层要的一点底部余量。 */
+  padding-bottom: 12px;
+  scroll-padding-bottom: 12px;
   scrollbar-gutter: stable;
 }
 
@@ -8573,27 +8575,62 @@ iframe.preview-frame {
   white-space: nowrap;
 }
 
-/* 右侧对话采用简洁的 Codex 式消息流与编辑框，减少卡片嵌套和视觉噪音。
-   消息列表这只盒子就是"对话框"本身：它铺满整个会话区，输入区作为框内的一块内聚区块
-   浮在它底部（见下面 `.project-supervisor-composer` 的内缩），两者不再各画一只盒子
-   上下贴在一起。所以这里底边归 0，并用 `padding-bottom` 给输入区留出位置——
-   256px = 输入区最高约 230px（编辑器 min 96 / max 140 + 操作排 + 内边距）+ 12px 内缩
-   + 约 14px 间距，滚到底时最后一条消息不会被输入区盖住。 */
+/* 右侧对话采用 Codex 桌面客户端的排版：消息列表是**唯一滚动区**，输入盒在它下方
+   （文档流、不重叠、不覆盖消息），所以这里不再给输入区预留 256px 底边留白——
+   留白归 0，滚到底时最后一条消息不会被一段空白顶掉。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-message-list {
-  position: absolute;
+  position: relative;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
-  gap: 34px;
+  gap: 14px;
   height: auto;
-  padding: 18px 20px 256px;
-  scroll-padding-bottom: 256px;
-  border: 1px solid var(--platform-subpanel-border);
+  min-height: 0;
+  flex: 1 1 auto;
+  padding: 14px 16px 0;
+  scroll-padding-bottom: 0;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+}
+
+/* 助手消息不做整块底色盒子（通透排版）：只有用户消息是右对齐浅底气泡 + 主色描边。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message--assistant {
+  border: 0;
+  background: transparent;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message {
+  width: fit-content;
+  max-width: min(88%, 720px);
+  padding: 0;
+  border: 0;
   border-radius: 12px;
-  background: var(--platform-input-fill);
+  background: transparent;
+  line-height: 1.6;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message--user {
+  width: fit-content;
+  max-width: min(82%, 640px);
+  margin-left: auto;
+  padding: 9px 13px;
+  border: 1px solid var(--platform-button-primary-border);
+  border-radius: 14px 14px 4px;
+  background: var(--platform-warm-bg);
+  color: var(--platform-text-base);
 }
 
 .game-workbench-chat
@@ -9170,12 +9207,13 @@ iframe.preview-frame {
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
     .project-supervisor-message-list {
-    position: static;
-    min-height: 320px;
-    height: 52vh;
+    position: relative;
+    min-height: 96px;
+    height: auto;
     flex: 1 1 auto;
   }
 
+  /* 1000px 以下仍然是一列：顶栏、消息列表、输入盒依次排布，输入盒留在文档流里。 */
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
     .project-supervisor-composer {
@@ -9184,6 +9222,7 @@ iframe.preview-frame {
     bottom: auto;
     left: auto;
     flex: 0 0 auto;
+    margin: 8px 12px 12px;
   }
 
   /* 窄屏：输入框左右留白收紧，操作排（`@` / AI 润色 / 恢复原文）保持单行不换行，
@@ -10439,34 +10478,66 @@ button.design-workspace-tree__entry:hover,
 
 /* Direct Codex composer: keep the editor and its actions in one vertical
    structure instead of positioning each control independently. */
-/* 输入区在对话框（`.project-supervisor-message-list` 那只铺满会话区的盒子）内部，
-   四边各内缩 12px：左右下三边显式钉住，上边由 `max-height: calc(100% - 24px)`
-   （24px = 上下各 12px）兜底，所以输入区整块落在外框之内，四条边都不与外框描边重合，
-   底边还留出 12px 边距（外框底边在下面那条"最终几何"规则里钉的是 0）。
-   圆角收成与外框同一档，读起来是"框内的输入块"，而不是贴在对话框下面、四边描边与
-   下边竖线连成一体的第二只盒子。 */
+/* 输入盒是唯一有边框的容器，且**回到文档流**：它在消息列表下方（Codex 桌面客户端的
+   「整块面板 = 顶栏 + 消息流 + 输入盒」），不再浮在消息列表之上。
+   旧版那套「输入区绝对定位、消息列表用 196px 底边留白给它让位」已撤掉——两套叠着生效会
+   让消息被空白顶掉、输入盒盖住消息。
+   三行结构：项目信息标签行 / 文本区 / 控制排（`+` `@` · 模型下拉 · 发送）。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex {
   display: grid;
   grid-template-columns: minmax(0, 1fr);
-  grid-template-rows: auto auto;
+  grid-template-rows: auto auto auto;
   gap: 0;
   align-items: stretch;
-  position: absolute;
-  right: 12px;
-  bottom: 12px;
-  left: 12px;
-  max-height: calc(100% - 24px);
-  z-index: 5;
-  padding: 8px 12px;
+  position: relative;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  max-height: none;
+  z-index: 1;
+  padding: 8px 12px 10px;
   border: 1px solid var(--platform-surface-border);
-  border-radius: 12px;
+  border-radius: 14px;
   background: var(--platform-input-fill);
-  box-shadow: 0 8px 24px rgb(31 41 55 / 8%);
+  box-shadow: none;
   pointer-events: auto;
 }
 
+/* 信息标签行：`项目名` · `本地`。只做只读信息，不加取数（不查 git 分支）。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer
+  .project-supervisor-composer-context {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  padding-bottom: 2px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer
+  .project-supervisor-composer-context
+  > span {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  max-width: 60%;
+  padding: 1px 7px;
+  overflow: hidden;
+  border: 1px solid var(--platform-line-soft);
+  border-radius: 999px;
+  background: var(--platform-warm-bg);
+  color: var(--platform-text-soft);
+  font-size: 11px;
+  line-height: 1.6;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
@@ -10580,6 +10651,13 @@ button.design-workspace-tree__entry:hover,
   min-width: 0;
 }
 
+/* 控制排三只方钮（`+` 附件 / `@` 引用 / 发送）共用一套尺寸。发送钮单独加圆角与主色，
+   见下面两条规则。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-attachment-trigger,
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
@@ -10594,17 +10672,21 @@ button.design-workspace-tree__entry:hover,
   right: auto !important;
   bottom: auto !important;
   display: grid;
-  width: 30px;
-  min-width: 30px;
-  height: 30px;
-  min-height: 30px;
+  width: 28px;
+  min-width: 28px;
+  height: 28px;
+  min-height: 28px;
   padding: 0;
   border: 0;
-  border-radius: 9px;
-  flex: 0 0 30px;
+  border-radius: 8px;
+  flex: 0 0 28px;
   place-items: center;
 }
 
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-trigger,
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
@@ -10613,6 +10695,14 @@ button.design-workspace-tree__entry:hover,
   color: var(--platform-text-soft);
 }
 
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-trigger:hover:not(:disabled),
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-trigger:focus-visible,
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
@@ -10625,24 +10715,29 @@ button.design-workspace-tree__entry:hover,
   color: var(--platform-text-strong);
 }
 
+/* 发送钮是圆形主色块（Codex 观感）：直径与左右两只方钮同档，圆角收到 999px。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
   .project-supervisor-submit-button {
+  width: 28px;
+  min-width: 28px;
+  height: 28px;
+  min-height: 28px;
+  border-radius: 999px;
+  flex: 0 0 28px;
   background: var(--platform-button-primary-fill);
   color: var(--platform-button-primary-text);
 }
 
-/* 对话框盒子的最终几何，故意放在文件靠后的位置：它与上面那条同选择器同权重
+/* 消息列表的最终几何，故意放在文件靠后的位置：它与上面那条同选择器同权重
    （`.game-workbench-chat .project-supervisor-surface.is-direct-codex
    .project-supervisor-message-list`），按"后写胜出"把两处会顶掉它的规则压回去——
    一是 `:has(.plan-gdd-surface, .planning-lane-runtime-strip)` 给列表留的
    `padding-bottom: 12px`，二是下面窄屏块之前可能出现的任何底边偏移。
-   这里曾经是一条 `bottom: 156px`（"列表在上、输入区在下"那版两盒布局的残留：给下面那只
-   浮起来的输入区预留高度），它把上面那条 `bottom: 0` 悄悄顶掉，外框底边落在输入区腰上、
-   输入区下半截露在框外——用户看到的就是"外框底边与输入区压在一起、没把输入区包住"。
-   所以：外框四边一律贴会话区（top/right/bottom/left 全 0），它才是把输入区包住的那只框；
-   输入区靠自己的 12px 内缩与它留出边距，两条边不会再重合。
+   这里曾经是一条 `padding-bottom: 256px`（"输入区浮在列表之上"那版布局给浮层预留的高度），
+   在输入盒回到文档流之后，那段留白会变成凭空多出来的空白，把最后一条消息顶出可视区。
+   所以：列表底边归 0 留白；它靠 `flex: 1 1 auto` 吸收剩余高度，是整块面板里唯一的滚动区。
    要改列表底边只改这一段，不要再在别处写第二条同选择器规则。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
@@ -10651,40 +10746,42 @@ button.design-workspace-tree__entry:hover,
   right: 0;
   bottom: 0;
   left: 0;
-  padding-bottom: 256px;
-  scroll-padding-bottom: 256px;
+  padding-bottom: 0;
+  scroll-padding-bottom: 0;
 }
 
-/* 窄屏（≤760px）这一列是"消息列表 + 输入区"的纵向堆叠，输入区不再浮在列表里，所以外框
-   改画在两者共同的父节点 `.project-supervisor-conversation` 上：它同时把列表和输入区圈进
-   来。列表自己那只框在窄屏撤掉（否则框里再套一只框），输入区回到文档流，靠外框的 12px
-   内边距与四条边框各留出一圈边距——任一条边都不与外框重合，内容随列高增长也不会溢出。
-   宽屏那套留白算式（256 = 12px 内缩 + 228px 输入区最高高度 + 16px 间距）只服务于
-   "输入区浮在列表之上"这个模型；窄屏输入区在流内，天然不会被消息盖住，所以列表底边只留
-   12px 与输入区顶边分开。 */
+/* 窄屏（≤760px）这一列是"消息列表 + 输入盒"的纵向堆叠。输入盒本来就在文档流里，
+   窄屏只需要给它四周留出边距：外框不再画在 `.project-supervisor-conversation` 上
+   （那会在整块面板外面再套一圈框，与「输入盒是唯一有边框的容器」相悖），
+   列表底边也不留任何给浮层让位的空白。 */
 @media (max-width: 760px) {
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
     .project-supervisor-conversation {
-    padding: 12px;
-    border: 1px solid var(--platform-subpanel-border);
-    border-radius: 12px;
-    background: var(--platform-input-fill);
-  }
-
-  .game-workbench-chat
-    .project-supervisor-surface.is-direct-codex
-    .project-supervisor-message-list {
-    padding-bottom: 12px;
-    scroll-padding-bottom: 12px;
+    padding: 0;
     border: 0;
     border-radius: 0;
     background: transparent;
   }
 
-  /* 输入区回到文档流。这条选择器比上面那条 `.project-supervisor-composer.is-direct-codex`
-     多带一层 `.project-supervisor-conversation`，权重比它高，窄屏才能把它顶回来——
-     原来窄屏那条（同权重、写得更早）其实一直是被顶掉的那条。 */
+  .game-workbench-chat
+    .project-supervisor-surface.is-direct-codex
+    .project-supervisor-message-list {
+    padding-bottom: 0;
+    scroll-padding-bottom: 0;
+    border: 0;
+    border-radius: 0;
+    background: transparent;
+  }
+
+  .game-workbench-chat
+    .project-supervisor-surface.is-direct-codex
+    .project-supervisor-composer.is-direct-codex {
+    margin: 8px 12px 12px;
+  }
+
+  /* 输入盒保持文档流。这条选择器比上面那条 `.project-supervisor-composer.is-direct-codex`
+     多带一层 `.project-supervisor-conversation`，权重比它高，窄屏才能把它顶回来。 */
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
     .project-supervisor-conversation
@@ -10695,6 +10792,18 @@ button.design-workspace-tree__entry:hover,
     left: auto;
     max-height: none;
   }
+
+  /* 1000px 那条 `.game-workbench-chat .project-supervisor-conversation` 的
+     `height: auto; max-height: none; overflow: visible` 是给旧结构写的；新结构里会话列
+     是「顶栏 + 唯一滚动区 + 输入盒」的定高 flex 列，窄屏也要把高度还给列本身，否则
+     消息列表拿不到剩余高度、整列会溢出面板。这条写在后面，按"后写胜出"盖回它。
+     `overflow-y` 仍沿用基础规则里的 `hidden`，这里不重复声明。 */
+  .game-workbench-chat
+    .project-supervisor-surface.is-direct-codex
+    .project-supervisor-conversation {
+    height: 100%;
+    max-height: none;
+  }
 }
 
 .resource-reference-input-editor::-webkit-scrollbar {
@@ -10827,3 +10936,300 @@ button.design-workspace-tree__entry:hover,
   font: inherit;
   opacity: 0.8;
 }
+
+/* ============================================================
+   右侧对话面板 Codex 风格（2026-07）：整块替换原 direct-codex 输入区浮层布局
+   ============================================================
+   面板结构从「消息列表当外框、输入区绝对定位浮在它底部」改成 Codex 桌面客户端的三段式：
+   顶部极简条（状态点 + 状态文案 + 设置齿轮）/ 消息列表（唯一滚动区，flex:1）/ 输入盒
+   （文档流，整块面板里唯一有边框的容器）。
+   上面几条同名旧规则已就地改写成新几何（不再有 position: absolute 与 196px/256px 底边
+   留白），这里只补新增节点的样式，并把旧的绿系执行过程卡收进暖色系。
+   全部颜色只用现有 `--platform-*` 变量，浅色主题下成立。 */
+
+/* 顶部极简条：44px 高、无独立背景块，只有一条极细分隔线。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-topbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-height: 44px;
+  flex: 0 0 auto;
+  padding: 0 12px;
+  border-bottom: 1px solid var(--platform-line-soft);
+  background: transparent;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-topbar-status {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  min-width: 0;
+  color: var(--platform-text-base);
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-topbar-status
+  > span:last-child {
+  min-width: 0;
+  overflow-wrap: anywhere;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-topbar-dot {
+  width: 7px;
+  height: 7px;
+  flex: 0 0 7px;
+  border: 1px solid var(--platform-button-primary-border);
+  border-radius: 50%;
+  background: var(--platform-neutral-bg);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-topbar-dot.is-busy {
+  border-color: transparent;
+  background: var(--platform-accent);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-settings-trigger {
+  display: grid;
+  width: 28px;
+  min-width: 28px;
+  height: 28px;
+  min-height: 28px;
+  flex: 0 0 28px;
+  padding: 0;
+  place-items: center;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--platform-text-soft);
+  cursor: pointer;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-settings-trigger:hover,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-settings-trigger:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+  outline: none;
+}
+
+/* 空态：整块消息区水平垂直居中。标题允许换行（面板只有 340–520px，不写 nowrap）。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-empty-state {
+  display: flex;
+  height: 100%;
+  min-height: 100%;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  padding: 24px 16px;
+  color: var(--platform-text-soft);
+  text-align: center;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-empty-state
+  > svg {
+  color: var(--platform-line-soft);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-empty-state
+  > strong {
+  max-width: 100%;
+  color: var(--platform-text-strong);
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 1.5;
+  white-space: normal;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-empty-state
+  > small {
+  max-width: 100%;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+  line-height: 1.6;
+  white-space: normal;
+}
+
+/* 执行过程卡在暖色皮肤下不再用绿色系：改成中性描边 + 暖底，主色只留给状态点与发送钮。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  > .project-supervisor-process-card {
+  border-color: var(--platform-line-soft);
+  background: var(--platform-neutral-bg);
+  color: var(--platform-text-base);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  > .project-supervisor-process-card
+  > header
+  > span {
+  background: var(--platform-accent);
+}
+
+/* 设置浮层（新增）：独立 backdrop + dialog，不再往面板下面追加内容。 */
+.project-supervisor-settings-backdrop {
+  position: fixed;
+  top: var(--window-chrome-height);
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 240;
+  display: grid;
+  padding: 20px;
+  background: rgb(65 43 34 / 42%);
+  place-items: center;
+}
+
+.project-supervisor-settings-dialog {
+  display: grid;
+  gap: 12px;
+  width: min(420px, 100%);
+  max-height: calc(100dvh - var(--window-chrome-height) - 40px);
+  padding: 16px;
+  overflow: auto;
+  border: 1px solid var(--platform-surface-border);
+  border-radius: 18px;
+  background: var(--platform-modal-fill);
+  color: var(--platform-text-strong);
+  box-shadow: 0 24px 64px rgb(62 37 27 / 24%);
+}
+
+.project-supervisor-settings-dialog > header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.project-supervisor-settings-dialog h2,
+.project-supervisor-settings-dialog small {
+  margin: 0;
+}
+
+.project-supervisor-settings-dialog h2 {
+  font-size: 15px;
+}
+
+.project-supervisor-settings-dialog > header small {
+  display: block;
+  margin-top: 3px;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+}
+
+.project-supervisor-settings-close {
+  display: grid;
+  width: 28px;
+  min-width: 28px;
+  height: 28px;
+  min-height: 28px;
+  flex: 0 0 28px;
+  padding: 0;
+  place-items: center;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--platform-text-soft);
+  cursor: pointer;
+}
+
+.project-supervisor-settings-close:hover,
+.project-supervisor-settings-close:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+  outline: none;
+}
+
+.project-supervisor-settings-rows {
+  display: grid;
+  gap: 8px;
+}
+
+.project-supervisor-settings-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  width: 100%;
+  min-width: 0;
+  padding: 10px 12px;
+  border: 1px solid var(--platform-surface-border);
+  border-radius: 12px;
+  background: var(--platform-button-secondary-fill);
+  color: var(--platform-text-base);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.project-supervisor-settings-row.is-static {
+  cursor: default;
+}
+
+.project-supervisor-settings-row:hover:not(.is-static),
+.project-supervisor-settings-row:focus-visible {
+  border-color: var(--platform-surface-hover-border);
+  color: var(--platform-text-strong);
+  outline: none;
+}
+
+.project-supervisor-settings-row-main {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  min-width: 0;
+}
+
+.project-supervisor-settings-row-main > svg {
+  flex: 0 0 auto;
+  color: var(--platform-accent);
+}
+
+.project-supervisor-settings-row-main > span {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+}
+
+.project-supervisor-settings-row-main strong {
+  color: var(--platform-text-strong);
+  font-size: 13px;
+}
+
+.project-supervisor-settings-row-main small {
+  color: var(--platform-text-soft);
+  font-size: 11px;
+}
+
+/* 泥点那一行：`walletEntry` 来自父级，自身不承载取数逻辑。 */
+.project-supervisor-settings-row .game-workbench-chat-wallet {
+  margin-left: auto;
+}
diff --git a/apps/ai-game-creator-shell/src/view/project-development/ApprovalModeDialog.tsx b/apps/ai-game-creator-shell/src/view/project-development/ApprovalModeDialog.tsx
new file mode 100644
index 000000000..fb929f2e2
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/view/project-development/ApprovalModeDialog.tsx
@@ -0,0 +1,94 @@
+import { X } from 'lucide-react';
+
+import {
+  closeDialogOnBackdropMouseDown,
+  useEscapeToClose,
+} from '../../app/dialogs';
+import { type ApprovalMode, approvalModeOptions } from './approvalMode';
+
+type ApprovalModeDialogProps = {
+  approvalMode: ApprovalMode;
+  notice: string;
+  onSelect: (mode: ApprovalMode) => void;
+  onNotice?: (notice: string) => void;
+  onClose: () => void;
+  /** 关掉 Esc 内部监听：嵌在设置浮层里时由外层浮层统一处理 Esc。 */
+  closeOnEscape?: boolean;
+};
+
+/**
+ * 「陶泥儿的操作权限」对话框。选项定义在 `./approvalMode`，本文件只导出组件
+ * （`react-refresh/only-export-components`）。
+ */
+export function ApprovalModeDialog({
+  approvalMode,
+  notice,
+  onSelect,
+  onNotice,
+  onClose,
+  closeOnEscape = false,
+}: ApprovalModeDialogProps) {
+  useEscapeToClose(onClose, closeOnEscape);
+  return (
+    <div
+      className="game-approval-backdrop"
+      role="presentation"
+      onMouseDown={(event) => closeDialogOnBackdropMouseDown(event, onClose)}
+    >
+      <section
+        className="game-approval-dialog"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="game-approval-title"
+      >
+        <header>
+          <div>
+            <h2 id="game-approval-title">陶泥儿的操作权限</h2>
+            <p>P0 仅开放严格审批</p>
+          </div>
+          <button type="button" aria-label="关闭审批配置" onClick={onClose}>
+            <X size={16} aria-hidden="true" />
+          </button>
+        </header>
+        <div className="game-approval-options" role="radiogroup">
+          {approvalModeOptions.map((option) => (
+            <button
+              type="button"
+              role="radio"
+              aria-checked={approvalMode === option.id}
+              data-unavailable={!option.available || undefined}
+              className={`${approvalMode === option.id ? 'is-selected' : ''}${
+                option.available ? '' : ' is-unavailable'
+              }`}
+              key={option.id}
+              onClick={() => {
+                if (!option.available) {
+                  onNotice?.(option.detail);
+                  return;
+                }
+                onSelect(option.id);
+                onNotice?.('');
+              }}
+            >
+              <span>
+                <strong>{option.label}</strong>
+                <small>{option.detail}</small>
+              </span>
+              <span className="game-approval-check" aria-hidden="true">
+                {approvalMode === option.id ? '✓' : ''}
+              </span>
+            </button>
+          ))}
+        </div>
+        {notice ? (
+          <p className="game-approval-notice" role="status">
+            {notice}
+          </p>
+        ) : null}
+        <button type="button" className="game-approval-done" onClick={onClose}>
+          完成
+        </button>
+      </section>
+    </div>
+  );
+}
diff --git a/apps/ai-game-creator-shell/src/view/project-development/approvalMode.ts b/apps/ai-game-creator-shell/src/view/project-development/approvalMode.ts
new file mode 100644
index 000000000..2ec25195d
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/view/project-development/approvalMode.ts
@@ -0,0 +1,44 @@
+/**
+ * 陶泥儿的操作权限（审批模式）选项与文案。
+ *
+ * 原本只长在 `view/project-development/index.tsx` 里；右侧对话面板 Codex 风格改造后，
+ * 面板顶部不再直接挂「审批配置」按钮，审批模式改从设置浮层进入，于是把选项搬到这里，
+ * 由 index.tsx 与 `ProjectSupervisorSettingsDialog` 共用同一份定义，避免两处各写一份
+ * 「严格 / 风险 / 无」。
+ */
+export type ApprovalMode = 'strict' | 'risk' | 'none';
+
+export type ApprovalModeOption = {
+  id: ApprovalMode;
+  label: string;
+  detail: string;
+  available: boolean;
+};
+
+export const approvalModeOptions: ApprovalModeOption[] = [
+  {
+    id: 'strict',
+    label: '严格审批',
+    detail: '所有消耗泥点的生成事务与 Agent 请求均需确认',
+    available: true,
+  },
+  {
+    id: 'risk',
+    label: '风险审批',
+    detail: 'Rank 规则待定，当前暂不可用',
+    available: false,
+  },
+  {
+    id: 'none',
+    label: '无需审批',
+    detail: 'Runtime 安全合同尚未完成，当前暂不可用',
+    available: false,
+  },
+];
+
+export function approvalModeLabel(mode: ApprovalMode) {
+  return (
+    approvalModeOptions.find((option) => option.id === mode)?.label ??
+    '严格审批'
+  );
+}
diff --git a/apps/ai-game-creator-shell/src/view/project-development/index.tsx b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
index 60842a4f6..6efc1d0f1 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/index.tsx
+++ b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
@@ -38,7 +38,6 @@ import {
   Replace,
   RotateCcw,
   Search,
-  Settings2,
   SlidersHorizontal,
   Sparkles,
   Trash2,
@@ -48,10 +47,13 @@ import {
   ZoomOut,
 } from 'lucide-react';
 import {
+  cloneElement,
   type CSSProperties,
   Fragment,
+  isValidElement,
   memo,
   type PointerEvent as ReactPointerEvent,
+  type ReactElement,
   type ReactNode,
   startTransition,
   useCallback,
@@ -197,6 +199,8 @@ import {
 } from '../../services/platformSession';
 import UiEditorPage from '../ui-editor';
 import type { UiEditorStepId } from '../ui-editor/model';
+import type { ApprovalMode } from './approvalMode';
+import { ApprovalModeDialog } from './ApprovalModeDialog';
 import { projectAssetCommandErrorMessage } from './projectAssetCommandErrorMessage';
 import {
   type ProjectManifestSnapshotMetadata,
@@ -338,7 +342,6 @@ export type {
 type ResourceCategory = ProjectResourceCategory;
 type ResourceSortMode = ProjectResourceCanvasLayoutMode;
 type WorkbenchMode = 'resources' | 'run';
-type ApprovalMode = 'strict' | 'risk' | 'none';
 type OrchestrationMode = 'single-supervisor' | 'professional-dag';
 
 function isPlatformAuthenticationRequired(error: unknown) {
@@ -614,32 +617,6 @@ const categoryIcons: Record<ResourceBookTarget, typeof FileText> = {
   [RESOURCE_BOOK_ALL_TARGET]: Layers,
 };
 
-const approvalOptions: Array<{
-  id: ApprovalMode;
-  label: string;
-  detail: string;
-  available: boolean;
-}> = [
-  {
-    id: 'strict',
-    label: '严格审批',
-    detail: '所有消耗泥点的生成事务与 Agent 请求均需确认',
-    available: true,
-  },
-  {
-    id: 'risk',
-    label: '风险审批',
-    detail: 'Rank 规则待定，当前暂不可用',
-    available: false,
-  },
-  {
-    id: 'none',
-    label: '无需审批',
-    detail: 'Runtime 安全合同尚未完成，当前暂不可用',
-    available: false,
-  },
-];
-
 function summarizeAgent(
   manifest: GameCreationAppManifest,
   group: AgentSummary['group'],
@@ -3114,9 +3091,17 @@ export default function ProjectDevelopmentView({
   const agentSummaries = showAllAgentGroups
     ? allAgentSummaries
     : allAgentSummaries.slice(0, 3);
-  const currentApprovalLabel =
-    approvalOptions.find((option) => option.id === approvalMode)?.label ??
-    '严格审批';
+  /**
+   * 会话面板 Codex 风格改造后，面板顶部不再直接挂泥点钱包，钱包收进面板自己的设置浮层。
+   * `supervisor` 是外部传进来的 React 元素（`WorkspaceLauncher` 里的 `ProjectSupervisor`），
+   * 这里用 `cloneElement` 把 `walletEntry` 补进去；元素形态不变时原样返回，不改变既有行为。
+   */
+  const supervisorSurface =
+    walletEntry && isValidElement(supervisor)
+      ? cloneElement(supervisor as ReactElement<{ walletEntry?: ReactNode }>, {
+          walletEntry,
+        })
+      : supervisor;
 
   const resourceSectionScrollKey = useCallback(
     (category: ResourceCategory, layoutMode = sortMode) =>
@@ -7942,29 +7927,7 @@ export default function ProjectDevelopmentView({
 
         {!uiEditorRoute ? (
           <aside className="game-workbench-chat" aria-label="陶泥儿 Agent 对话">
-            <header>
-              <div className="game-workbench-chat-title">
-                <strong>与陶泥儿的对话</strong>
-                <small>
-                  {professionalDagVisible ? '项目总控 Agent' : '智能创作'}
-                </small>
-              </div>
-              {walletEntry ? (
-                <div className="game-workbench-chat-wallet">{walletEntry}</div>
-              ) : null}
-              {professionalDagVisible ? (
-                <button
-                  type="button"
-                  className="game-workbench-approval-trigger"
-                  onClick={() => setApprovalDialogOpen(true)}
-                  aria-label={`审批配置，当前${currentApprovalLabel}`}
-                >
-                  <Settings2 size={14} aria-hidden="true" />
-                  {currentApprovalLabel}
-                </button>
-              ) : null}
-            </header>
-            {supervisor}
+            {supervisorSurface}
           </aside>
         ) : null}
       </div>
@@ -8277,79 +8240,14 @@ export default function ProjectDevelopmentView({
         </div>
       ) : null}
 
-      {professionalDagVisible && approvalDialogOpen ? (
-        <div
-          className="game-approval-backdrop"
-          role="presentation"
-          onMouseDown={(event) => {
-            if (event.target === event.currentTarget) {
-              setApprovalDialogOpen(false);
-            }
-          }}
-        >
-          <section
-            className="game-approval-dialog"
-            role="dialog"
-            aria-modal="true"
-            aria-labelledby="game-approval-title"
-          >
-            <header>
-              <div>
-                <h2 id="game-approval-title">陶泥儿的操作权限</h2>
-                <p>P0 仅开放严格审批</p>
-              </div>
-              <button
-                type="button"
-                aria-label="关闭审批配置"
-                onClick={() => setApprovalDialogOpen(false)}
-              >
-                <X size={16} aria-hidden="true" />
-              </button>
-            </header>
-            <div className="game-approval-options" role="radiogroup">
-              {approvalOptions.map((option) => (
-                <button
-                  type="button"
-                  role="radio"
-                  aria-checked={approvalMode === option.id}
-                  data-unavailable={!option.available || undefined}
-                  className={`${approvalMode === option.id ? 'is-selected' : ''}${
-                    option.available ? '' : ' is-unavailable'
-                  }`}
-                  key={option.id}
-                  onClick={() => {
-                    if (!option.available) {
-                      setApprovalNotice(option.detail);
-                      return;
-                    }
-                    setApprovalMode(option.id);
-                    setApprovalNotice('');
-                  }}
-                >
-                  <span>
-                    <strong>{option.label}</strong>
-                    <small>{option.detail}</small>
-                  </span>
-                  <span className="game-approval-check" aria-hidden="true">
-                    {approvalMode === option.id ? '✓' : ''}
-                  </span>
-                </button>
-              ))}
-            </div>
-            {approvalNotice ? (
-              <p className="game-approval-notice" role="status">
-                {approvalNotice}
-              </p>
-            ) : null}
-            <button
-              type="button"
-              className="game-approval-done"
-              onClick={() => setApprovalDialogOpen(false)}
-            >
-              完成
-            </button>
-          </section>
-        </div>
+      {approvalDialogOpen ? (
+        <ApprovalModeDialog
+          approvalMode={approvalMode}
+          notice={approvalNotice}
+          onSelect={setApprovalMode}
+          onNotice={setApprovalNotice}
+          onClose={() => setApprovalDialogOpen(false)}
+        />
       ) : null}
     </section>
   );
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index c4c771224..6e21746b7 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -1,10 +1,13 @@
 import userEvent from '@testing-library/user-event';
+import { createRef } from 'react';
 
 import type {
   ProjectResourceCanvasLayout,
   ProjectResourceCanvasPosition,
 } from '../../../../packages/shared/src/contracts/gameCreationApp';
+import { ProjectSupervisorView } from '../../src/features/project-workspace/ProjectSupervisorView';
 import { RESOURCE_REFERENCE_INSERT_EVENT } from '../../src/features/project-workspace/resourceReferences';
+import { ApprovalModeDialog } from '../../src/view/project-development/ApprovalModeDialog';
 import { RESOURCE_BOOK_OVERVIEW_STACK_LIMIT } from '../../src/view/project-development/resourceBookLayout';
 import {
   RESOURCE_CANVAS_CARD_WIDTH,
@@ -26,6 +29,7 @@ import {
   composerValue,
   createGameCreationAppManifest,
   createGameCreationAppSeedTasks,
+  createPlanGddStateView,
   createProjectSupervisorRuntimeHarness,
   emptyProjectPolicy,
   expect,
@@ -494,25 +498,12 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(screen.getByText('broken-reference.png')).not.toBeNull();
     expect(screen.getByText('图片解码失败')).not.toBeNull();
 
-    fireEvent.click(
-      screen.getByRole('button', {
-        name: '审批配置，当前严格审批',
-      }),
-    );
+    // 面板顶部已按 Codex 风格精简：审批入口不再长在会话列头部，改从面板自己的设置浮层进入，
+    // 所以这里不该再出现「审批配置」按钮，也不该出现审批对话框。
+    expect(screen.queryByRole('button', { name: /审批配置/ })).toBeNull();
     expect(
-      screen.getByRole('dialog', { name: '陶泥儿的操作权限' }),
-    ).not.toBeNull();
-    const riskApproval = screen.getByRole('radio', { name: /风险审批/ });
-    fireEvent.click(riskApproval);
-    expect(riskApproval.getAttribute('aria-checked')).toBe('false');
-    expect(riskApproval.getAttribute('data-unavailable')).toBe('true');
-    expect(screen.getAllByText('Rank 规则待定，当前暂不可用')).toHaveLength(2);
-    fireEvent.click(screen.getByRole('button', { name: '完成' }));
-    expect(
-      screen.getByRole('button', {
-        name: '审批配置，当前严格审批',
-      }),
-    ).not.toBeNull();
+      screen.queryByRole('dialog', { name: '陶泥儿的操作权限' }),
+    ).toBeNull();
 
     fireEvent.click(screen.getByRole('button', { name: '更多小组' }));
     expect(screen.getByRole('article', { name: /数值 Agent/ })).not.toBeNull();
@@ -520,6 +511,38 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(screen.getByRole('article', { name: /发布 Agent/ })).not.toBeNull();
   });
 
+  it('keeps the approval-mode choices reachable in their own dialog surface', () => {
+    // 审批模式原来是长在会话列头部按钮里的对话框；面板顶部精简之后它由设置浮层里的
+    // 「操作权限」行打开，但选项与「不可用项给出说明」的语义必须完整保留。
+    function ApprovalDialogHost() {
+      const [mode, setMode] = React.useState<'strict' | 'risk' | 'none'>(
+        'strict',
+      );
+      const [notice, setNotice] = React.useState('');
+      return React.createElement(ApprovalModeDialog, {
+        approvalMode: mode,
+        notice,
+        onSelect: setMode,
+        onNotice: setNotice,
+        onClose: () => undefined,
+      });
+    }
+    render(React.createElement(ApprovalDialogHost));
+
+    expect(
+      screen.getByRole('dialog', { name: '陶泥儿的操作权限' }),
+    ).not.toBeNull();
+    const strictApproval = screen.getByRole('radio', { name: /严格审批/ });
+    expect(strictApproval.getAttribute('aria-checked')).toBe('true');
+    const riskApproval = screen.getByRole('radio', { name: /风险审批/ });
+    expect(riskApproval.getAttribute('data-unavailable')).toBe('true');
+    fireEvent.click(riskApproval);
+    // 不可用项不改变选中态，而是给出原因（选项里那份 + 说明那一行，共两处）。
+    expect(riskApproval.getAttribute('aria-checked')).toBe('false');
+    expect(screen.getAllByText('Rank 规则待定，当前暂不可用')).toHaveLength(2);
+    fireEvent.click(screen.getByRole('button', { name: '关闭审批配置' }));
+  });
+
   it('preserves independent art viewports across sort and workbench mode switches', async () => {
     const manifest = createGameCreationAppManifest(
       'workbench-art-viewport-memory',
@@ -5800,22 +5823,35 @@ export function registerProjectWorkbenchFoundationTests() {
       /\.game-workbench-chat \.project-supervisor-conversation\s*\{[^}]*position:\s*relative[^}]*display:\s*block[^}]*height:\s*100%[^}]*min-height:\s*0[^}]*overflow:\s*hidden/s,
     );
     expect(styles).toMatch(
-      /\.game-workbench-chat \.project-supervisor-message-list\s*\{[^}]*height:\s*100%[^}]*min-height:\s*96px[^}]*overflow-y:\s*auto[^}]*padding-bottom:\s*196px[^}]*scroll-padding-bottom:\s*196px/s,
-    );
-    expect(styles).toMatch(
-      /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-message-list\s*\{[^}]*position:\s*absolute[^}]*bottom:\s*0;[^}]*left:\s*0/s,
+      /\.game-workbench-chat \.project-supervisor-message-list\s*\{[^}]*height:\s*100%[^}]*min-height:\s*96px[^}]*overflow-y:\s*auto[^}]*padding-bottom:\s*12px[^}]*scroll-padding-bottom:\s*12px/s,
     );
+    // direct-codex 的列表不再绝对定位在会话区上（那是"输入区浮在列表之上"那版几何）：
+    // 它在文档流里靠 `flex: 1 1 auto` 吸收剩余高度，是整块面板唯一的滚动区。最终生效几何
+    // 由 tests/chatDialogFrameLayout.test.ts 按层叠求值验证，这里只钉住这两条声明在场。
+    const directMessageListRule =
+      styles.match(
+        /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-message-list\s*\{([^}]*)\}/s,
+      )?.[1] ?? '';
+    expect(directMessageListRule).toContain('position: relative;');
+    expect(directMessageListRule).toContain('flex: 1 1 auto;');
     expect(styles).toMatch(
       /\.game-workbench-chat \.agent-runtime-status\s*\{[^}]*max-height:\s*clamp\(120px, 24dvh, 240px\)[^}]*overflow-y:\s*auto/s,
     );
     expect(styles).toMatch(
       /\.game-workbench-chat \.project-runtime-summary\s*\{[^}]*position:\s*sticky[^}]*top:\s*-10px/s,
     );
-    expect(styles).toMatch(
-      /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\s*\{[^}]*grid-template-columns:\s*minmax\(0, 1fr\) 82px[^}]*z-index:\s*2[^}]*padding-top:\s*8px[^}]*background:\s*transparent/s,
-    );
+    // 输入盒是三行网格（信息标签 / 文本区 / 控制排）的文档流块，不再是贴在列表下边的
+    // 绝对定位浮层，也不再与 82px 的发送钮列共用网格。
     const composerRule = styles.match(
-      /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\s*\{([^}]*)\}/s,
+      /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\.is-direct-codex\s*\{([^}]*)\}/s,
+    );
+    expect(composerRule?.[1]).not.toBeUndefined();
+    expect(composerRule?.[1]).toContain('position: relative;');
+    expect(composerRule?.[1]).toContain('grid-template-rows: auto auto auto;');
+    expect(composerRule?.[1]).toContain('z-index: 1;');
+    expect(composerRule?.[1]).toContain('padding: 8px 12px 10px;');
+    expect(composerRule?.[1]).toContain(
+      'background: var(--platform-input-fill);',
     );
     expect(composerRule?.[1]).not.toContain('border-top:');
     expect(styles).toMatch(
@@ -5832,8 +5868,10 @@ export function registerProjectWorkbenchFoundationTests() {
     );
     // 提交按钮这条只发给 `.project-supervisor-submit-button`：以前是 composer 下所有
     // `button`，会把绝对定位广播到输入区里的「AI 润色」上，把它浮到文本区中间。
+    // 旧版这里还钉着 `min-height: 72px` 的整行提交条；Codex 版的提交钮是控制排里的
+    // 28px 方钮，尺寸规则与 `+` / `@` 两只方钮同组，这里改成钉那组规则。
     expect(styles).toMatch(
-      /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\s+\.project-supervisor-submit-button\s*\{[^}]*min-height:\s*72px[^}]*white-space:\s*nowrap/s,
+      /\.project-supervisor-composer-controls\s+\.project-supervisor-attachment-trigger,[\s\S]*?\.project-supervisor-composer-controls\s+\.project-supervisor-submit-button\s*\{[^}]*width:\s*28px[^}]*flex:\s*0 0 28px/s,
     );
     expect(styles).not.toMatch(
       /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\s+button\s*\{/s,
@@ -5867,7 +5905,7 @@ export function registerProjectWorkbenchFoundationTests() {
       /@media \(max-width: 760px\)[\s\S]*?\.game-workbench-layout\s*\{[^}]*height:\s*auto/,
     );
     expect(styles).toMatch(
-      /@media \(max-width: 760px\)[\s\S]*?\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-message-list\s*\{[^}]*position:\s*static[^}]*height:\s*52vh[^}]*flex:\s*1 1 auto/s,
+      /@media \(max-width: 760px\)[\s\S]*?\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-message-list\s*\{[^}]*padding-bottom:\s*0[^}]*scroll-padding-bottom:\s*0[^}]*background:\s*transparent/s,
     );
     expect(styles).toMatch(
       /\.game-resource-canvas-content\s*\{[^}]*width:\s*100%[^}]*min-width:\s*max\(100%, 620px\)/s,
@@ -5902,9 +5940,15 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(projectDevelopmentSource).toMatch(
       /<UiEditorPage[\s\S]*?walletEntry=\{walletEntry\}[\s\S]*?\/>/,
     );
-    expect(projectDevelopmentSource).toMatch(
-      /<div className="game-workbench-chat-wallet">\{walletEntry\}<\/div>/,
+    // 会话列头部按 Codex 风格精简掉了标题/审批按钮/钱包槽。`walletEntry` 的落点只剩两处：
+    // UI 编辑器头部（上面那条断言），以及做方案分支头部（`planningStartMode`，本任务明确
+    // 保持原样）。右侧对话面板自己的「泥点」行改由 `ProjectSupervisorView` 的设置浮层承载，
+    // 不再在 `game-workbench-chat` 头部渲染 `<div className="game-workbench-chat-wallet">`。
+    const chatWalletSlots = projectDevelopmentSource.match(
+      /<div className="game-workbench-chat-wallet">\{walletEntry\}<\/div>/g,
     );
+    expect(chatWalletSlots).toHaveLength(1);
+    expect(projectDevelopmentSource).toMatch(/walletEntry=\{walletEntry\}/);
     expect(projectDevelopmentSource).toMatch(
       /const showRunUnavailableHint\s*=\s*!runAvailable\s*&&\s*selectedResourceIds\.length === 0\s*&&\s*!uiEditorRoute/s,
     );
@@ -6077,36 +6121,25 @@ export function registerProjectWorkbenchFoundationTests() {
         /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\.is-direct-codex\s*\{([^}]*)\}/s,
       )?.[1] ?? '';
     expect(composerRule).not.toBe('');
-    // 输入区四边内缩：左右下三边各 12px 显式钉住，上边由 `max-height: calc(100% - 24px)`
-    // 兜底，四条边都不与外框描边重合，底边还留出 12px 边距。
-    const inset = styleNumber(composerRule, 'right');
-    expect(inset).toBeGreaterThan(0);
-    expect(styleNumber(composerRule, 'left')).toBe(inset);
-    expect(styleNumber(composerRule, 'bottom')).toBe(inset);
-    expect(composerRule).toContain('position: absolute;');
-    // 输入区自己那只盒子还在（拆掉边框/底色会让输入区变成没有边界的裸文本）。
+    // 输入盒在文档流里（Codex 三段式的第三段）：不再用 right/bottom/left 内缩钉在
+    // 消息列表之上，四边一律归 0；它是整块面板里唯一有边框的容器。
+    expect(styleNumber(composerRule, 'right')).toBe(0);
+    expect(styleNumber(composerRule, 'left')).toBe(0);
+    expect(styleNumber(composerRule, 'bottom')).toBe(0);
+    expect(composerRule).toContain('position: relative;');
     expect(composerRule).toContain(
       'border: 1px solid var(--platform-surface-border);',
     );
     expect(composerRule).toContain('background: var(--platform-input-fill);');
 
-    // 消息列表给输入区留出位置：底边留白 = 内缩 + 输入区最高高度 + 间距。
-    // 输入区最高高度 = 编辑器 max-height(140) + 输入框行距(8) + 操作排 28px 方钮(28)
-    // + 输入框下内边距(4) + 输入区自己上下内边距(8 × 2) + 操作条(2 + 30 方钮) = 228；
-    // 256 = 12px 内缩 + 228 + 16px 间距。这里按层叠"第一条"取值，改动后务必同时跑
-    // tests/chatDialogFrameLayout.test.ts——那条用例按层叠生效值验同一组几何（含窄屏），
-    // 后面再写一条同选择器的规则顶掉这里，只有那条会失败。
-    const composerClearance = styleNumber(
-      messageListRule,
-      'scroll-padding-bottom',
-    );
-    expect(composerClearance).toBeGreaterThanOrEqual(inset + 228);
-    expect(composerClearance).toBe(inset + 228 + 16);
-    const messageListPadding =
-      /padding:\s*18px 20px (\d+)px;/u.exec(messageListRule)?.[1] ?? '';
-    expect(Number(messageListPadding)).toBe(composerClearance);
+    // 输入盒在文档流里，消息列表不再需要给它留位置：底边归 0 留白，滚动到底
+    // 不会多出一段空白。具体几何（含窄屏）由 tests/chatDialogFrameLayout.test.ts 按
+    // 层叠生效值验证；这里钉住"旧模型的数字没有被写回来"。
+    expect(styleNumber(messageListRule, 'scroll-padding-bottom')).toBe(0);
+    expect(messageListRule).toContain('padding-bottom: 0;');
+    expect(messageListRule).toContain('flex: 1 1 auto;');
 
-    // 编辑器高度上限就是上面那个 228 的来源之一；改这里就必须同步改留白。
+    // 编辑器高度上限仍是输入盒高度的来源之一。
     const editorRule =
       styles.match(
         /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\s+\.resource-reference-input-editor\s*\{([^}]*)\}/s,
@@ -6150,7 +6183,9 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(userMessageRule).toContain('border-radius: 14px 14px 4px;');
     expect(userMessageRule).toContain('background: var(--platform-warm-bg);');
     expect(userMessageRule).toContain('color: var(--platform-text-base);');
-    expect(processCardRules).toHaveLength(1);
+    // 执行过程卡有两条同选择器规则：第一条是几何（`width: 100%`），后面那条是 Codex 暖色
+    // 皮肤下的配色（把基础规则的绿系换成中性描边 + 暖底）。承重的是几何那条。
+    expect(processCardRules.length).toBeGreaterThanOrEqual(1);
     expect(processCardRules[0]).toContain('width: 100%;');
   });
 
@@ -6674,16 +6709,16 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(anchor).toMatch(/flex:\s*0 1 auto/u);
     expect(anchor).toMatch(/min-width:\s*0/u);
 
-    // 输入区高度变化不得推动同排操作元素：composer 是底边锚定的两行网格，输入区占第一
-    // 行、控制排占第二行；输入区从 96px 长到 140px 只把 composer 顶边抬高，控制排仍钉在
-    // composer 底边（`bottom: 12px`），发送钮与模型选择钮不动。
+    // 输入盒高度变化不得推动同排操作元素：composer 是三行网格（信息标签 / 文本区 /
+    // 控制排），文本区从 96px 长到 140px 只把 composer 顶边抬高，控制排仍在同一行的
+    // 下面一行（发送钮与模型选择钮不动）。它不再靠 `position: absolute` 底边锚定。
     const composer = styleRuleBody(
       styles,
       '\\.game-workbench-chat\\s+\\.project-supervisor-surface\\.is-direct-codex\\s+\\.project-supervisor-composer\\.is-direct-codex',
     );
-    expect(composer).toMatch(/position:\s*absolute/u);
-    expect(styleNumber(composer, 'bottom')).toBeGreaterThan(0);
-    expect(composer).toMatch(/grid-template-rows:\s*auto auto/u);
+    expect(composer).toMatch(/position:\s*relative/u);
+    expect(composer).toMatch(/grid-template-rows:\s*auto auto auto/u);
+    expect(styleNumber(composer, 'bottom')).toBe(0);
     // 控制排是单行 flex、不换行：窄屏下靠可压缩的模型选择钮（flex 0 1 auto + min-width 0）
     // 收窄，而不是把模型选择钮/发送钮挤到第二行。
     const controls = styleRuleBody(
@@ -6692,13 +6727,13 @@ export function registerProjectSupervisorSurfaceTests() {
     );
     expect(controls).toMatch(/display:\s*flex/u);
     expect(controls).not.toMatch(/flex-wrap/u);
-    // `@` 引用钮与发送钮共用一条尺寸规则（同一规则体里两个选择器），都必须不可压缩，
-    // 这样窄屏下被压的是可收缩的模型选择钮，而不是把这两个方钮挤出这一行。
+    // `+` 附件钮 / `@` 引用钮 / 发送钮共用一条尺寸规则（同一规则体里三个选择器），都必须
+    // 不可压缩，这样窄屏下被压的是可收缩的模型选择钮，而不是把方钮挤出这一行。
     const controlsButtons = styleRuleBody(
       styles,
       '\\.project-supervisor-composer-controls\\s+\\n?\\s*\\.project-supervisor-submit-button',
     );
-    expect(controlsButtons).toMatch(/flex:\s*0 0 30px/u);
+    expect(controlsButtons).toMatch(/flex:\s*0 0 28px/u);
   });
 
   it('bounds the model dropdown height so a long catalog cannot cover the composer', () => {
@@ -7996,6 +8031,150 @@ export function registerProjectSupervisorSurfaceTests() {
     ).toHaveLength(policyReadCountBeforeChat + 1);
   });
 
+  it('renders the Codex empty state and opens the panel settings overlay in a fresh direct chat', async () => {
+    // 空态只在 direct-codex 面板、且没有任何消息/流式回复/待确认时出现。真实项目打开时
+    // App 总会先放一条默认问候（`createDefaultChatMessages`），所以这里直接挂面板本体，
+    // 把「空消息」这一格单独钉住。
+    const projectPath = '/tmp/launcher-codex-panel-game';
+    const view = render(
+      React.createElement(ProjectSupervisorView, {
+        activeVersionId: null,
+        chatInput: '',
+        chatReferences: [],
+        chatProjectAssets: [],
+        composerRef: createRef(),
+        directCodex: true,
+        directStatus: null,
+        directProcessDetail: '',
+        directProcessKey: '',
+        hiddenConversationCount: 0,
+        messagesRef: createRef(),
+        needsUserInput: false,
+        onCancelConfirmation: vi.fn(),
+        onCancelPendingCommand: vi.fn(),
+        onChatInputChange: vi.fn(),
+        onConfirmConfirmation: vi.fn(),
+        onConfirmPendingCommand: vi.fn(),
+        onScroll: vi.fn(),
+        onShowEarlierMessages: vi.fn(),
+        onSubmit: vi.fn(),
+        pendingConfirmation: null,
+        pendingCommand: null,
+        projectPath,
+        transientReply: '',
+        visibleMessages: [],
+        visibleProfessionalAgentCards: [],
+        workspaceStatus: '等待指令',
+        planGddState: createPlanGddStateView(),
+        planGddHydrateBusy: false,
+        planGddDecisionBusy: false,
+        planGddError: null,
+        onPlanGddRefresh: vi.fn(),
+        onPlanGddDecision: vi.fn(),
+        runtime: null,
+        error: '',
+        runtimeByAgentId: {},
+        controlBusy: false,
+        professionalResultsByAgentId: {},
+        onToolAction: vi.fn(),
+        onSupervisorRetry: vi.fn(),
+        onProfessionalToolAction: vi.fn(),
+        onProfessionalRetry: vi.fn(),
+        onUserInput: vi.fn(),
+      }),
+    );
+
+    const supervisorSurface = screen.getByLabelText('陶泥儿项目对话');
+    // 空态：主标题 + 一句短指令副标题（面板里不写功能说明），整体落在消息区里居中。
+    const emptyState = supervisorSurface.querySelector(
+      '.project-supervisor-empty-state',
+    );
+    expect(emptyState).not.toBeNull();
+    expect(
+      within(emptyState as HTMLElement).getByText('你想让陶泥儿做什么游戏？'),
+    ).not.toBeNull();
+    expect(
+      within(emptyState as HTMLElement).getByText(
+        '告诉陶泥儿接下来要做什么，或输入 @ 选择资源',
+      ),
+    ).not.toBeNull();
+    expect(
+      supervisorSurface
+        .querySelector('.project-supervisor-message-list')
+        ?.contains(emptyState),
+    ).toBe(true);
+    // 顶栏：状态文案带 aria-live，旧的头部标题与审批按钮都不在。
+    expect(
+      within(supervisorSurface).getByText('等待指令', {
+        selector: '[aria-live="polite"]',
+      }),
+    ).not.toBeNull();
+    expect(within(supervisorSurface).queryByText('与陶泥儿的对话')).toBeNull();
+    expect(
+      within(supervisorSurface).queryByRole('button', { name: /审批配置/ }),
+    ).toBeNull();
+    // 输入盒三段式：信息标签行 / 文本区 / 控制排。项目名 + 本地两个标签，`+` 与 `@` 都在。
+    const composer = supervisorSurface.querySelector(
+      'form.project-supervisor-composer',
+    );
+    expect(composer).not.toBeNull();
+    const context = composer?.querySelector(
+      '.project-supervisor-composer-context',
+    );
+    expect(
+      within(context as HTMLElement).getByText('launcher-codex-panel-game'),
+    ).not.toBeNull();
+    expect(within(context as HTMLElement).getByText('本地')).not.toBeNull();
+    expect(
+      within(composer as HTMLElement).getByRole('button', {
+        name: '添加素材引用',
+      }),
+    ).not.toBeNull();
+    expect(
+      within(composer as HTMLElement).getByRole('button', {
+        name: '插入素材引用',
+      }),
+    ).not.toBeNull();
+    expect(
+      within(composer as HTMLElement).getByLabelText('陶泥儿对话内容'),
+    ).not.toBeNull();
+
+    // 设置浮层：独立浮层，包含运行配置与操作权限。
+    fireEvent.click(
+      within(supervisorSurface).getByRole('button', { name: '设置' }),
+    );
+    const settingsDialog = await screen.findByRole('dialog', {
+      name: '对话设置',
+    });
+    expect(settingsDialog).not.toBeNull();
+    expect(within(settingsDialog).getByText('运行配置')).not.toBeNull();
+    // 打开审批模式：它是浮层里的二级浮层，选项在，选完还能退回设置浮层。
+    fireEvent.click(
+      within(settingsDialog).getByRole('button', {
+        name: '审批配置，当前严格审批',
+      }),
+    );
+    const approvalDialog = await screen.findByRole('dialog', {
+      name: '陶泥儿的操作权限',
+    });
+    expect(
+      within(approvalDialog).getByRole('radio', { name: /严格审批/ }),
+    ).not.toBeNull();
+    fireEvent.click(
+      within(approvalDialog).getByRole('button', { name: '完成' }),
+    );
+    await waitFor(() => {
+      expect(
+        screen.queryByRole('dialog', { name: '陶泥儿的操作权限' }),
+      ).toBeNull();
+    });
+    fireEvent.keyDown(window, { key: 'Escape' });
+    await waitFor(() => {
+      expect(screen.queryByRole('dialog', { name: '对话设置' })).toBeNull();
+    });
+    view.unmount();
+  });
+
   it('does not poll or render legacy professional Agent runtime state in direct product chat', async () => {
     const projectPath = '/tmp/launcher-runtime-status-game';
     let professionalRuntimeReadCount = 0;
diff --git a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
index bae420fcc..ec2e2f136 100644
--- a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
+++ b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
@@ -96,6 +96,27 @@ function paddingBox(declarations: Map<string, string>) {
   };
 }
 
+/** 展开 `margin` 简写，只关心四边数值。 */
+function marginBox(declarations: Map<string, string>) {
+  const shorthand = declarations.get('margin') ?? '0';
+  const parts = shorthand.split(' ').filter(Boolean);
+  const value = (index: number) => {
+    const part = parts[index] ?? parts[parts.length - 1] ?? parts[0];
+    return lengthPx(part!, `margin 简写 ${shorthand}`);
+  };
+  if (parts.length === 1) {
+    const only = value(0);
+    return { top: only, right: only, bottom: only, left: only };
+  }
+  if (parts.length === 2) {
+    return { top: value(0), right: value(1), bottom: value(0), left: value(1) };
+  }
+  if (parts.length === 3) {
+    return { top: value(0), right: value(1), bottom: value(2), left: value(1) };
+  }
+  return { top: value(0), right: value(1), bottom: value(2), left: value(3) };
+}
+
 /* ============================================================
    选择器身份
    ============================================================ */
@@ -103,6 +124,8 @@ function paddingBox(declarations: Map<string, string>) {
 const CHAT = '.game-workbench-chat .project-supervisor-surface.is-direct-codex';
 const CONVERSATION = `${CHAT} .project-supervisor-conversation`;
 const MESSAGE_LIST = `${CHAT} .project-supervisor-message-list`;
+const MESSAGE_LIST_PLAIN =
+  '.game-workbench-chat .project-supervisor-message-list';
 const COMPOSER = `${CHAT} .project-supervisor-composer.is-direct-codex`;
 const COMPOSER_PLAIN = `${CHAT} .project-supervisor-composer`;
 const CONVERSATION_COMPOSER = `${CONVERSATION} .project-supervisor-composer.is-direct-codex`;
@@ -111,10 +134,18 @@ const COMPOSER_INPUT_PLAIN = `${COMPOSER_PLAIN} .resource-reference-input`;
 const COMPOSER_EDITOR = `${COMPOSER_PLAIN} .resource-reference-input-editor`;
 const COMPOSER_CONTROLS = `${COMPOSER} .project-supervisor-composer-controls`;
 const COMPOSER_SUBMIT = `${COMPOSER_CONTROLS} .project-supervisor-submit-button`;
+const COMPOSER_CONTEXT = `${COMPOSER_PLAIN} .project-supervisor-composer-context`;
 const INPUT_ACTIONS = `${COMPOSER} .resource-reference-input-actions`;
+const TOPBAR = `${CHAT} .project-supervisor-topbar`;
 // 策划链在会话列里额外挂了一条规划面/窄条时，列表会命中这条 `:has(...)` 规则——
-// 它同样声明了 `padding-bottom`，正是上一轮把留白改回 12px 的那种隐患。
+// 它同样声明了 `padding-bottom`，是这套几何里唯一"外来的"留白来源。
 const LIST_WITH_PLAN_SURFACE = `.game-workbench-chat .project-supervisor-conversation:has(.plan-gdd-surface, .planning-lane-runtime-strip) .project-supervisor-message-list`;
+/** 列表实际会命中的全部选择器：direct-codex 直连、`:has(...)` 变体、以及基础规则。 */
+const LIST_SELECTORS = [
+  MESSAGE_LIST,
+  LIST_WITH_PLAN_SURFACE,
+  MESSAGE_LIST_PLAIN,
+];
 
 const DESKTOP = 1440;
 const MOBILE = 390;
@@ -130,7 +161,12 @@ function mobileDeclarations(...elementSelectors: string[]) {
   return resolveDeclarations(rules, elementSelectors, MOBILE);
 }
 
-/** 留白算术里的每一个常量都必须来自文件里真实生效的声明。 */
+/**
+ * 输入盒在文档流里的最高高度。
+ *
+ * 新结构里输入盒**不再**需要消息列表给它让位，这个值只用来给「列表底边不留白」做
+ * 下界校验：留白只要不小于它就说明旧模型的数字被写回来了。
+ */
 function composerMaxHeight() {
   const composer = desktopDeclarations(COMPOSER, COMPOSER_PLAIN);
   const input = desktopDeclarations(
@@ -150,6 +186,7 @@ function composerMaxHeight() {
     `${INPUT_ACTIONS} .resource-reference-input-polish`,
     '.resource-reference-input-polish',
   );
+  const context = desktopDeclarations(COMPOSER_CONTEXT);
   const controls = desktopDeclarations(COMPOSER_CONTROLS);
   const submit = desktopDeclarations(COMPOSER_SUBMIT);
 
@@ -164,12 +201,15 @@ function composerMaxHeight() {
 
   expect(
     pixelValue(editor, 'min-height'),
-    '编辑器最小高度是留白算式的下界，改了要同步改留白',
+    '编辑器最小高度是输入盒高度的下界，改了要同步改这里的算式',
   ).toBe(96);
   // 操作排的高度就是那三只 28px 方钮自己撑起来的：它自己不设 height / min-height，
   // 一旦设了，网格行高会被顶起来、编辑器的 min-height 也跟着变，算式随之作废。
   expect(actions.has('height')).toBe(false);
   expect(actions.has('min-height')).toBe(false);
+  // 信息标签行只在 direct-codex 渲染，也只占一行，不设固定高度。
+  expect(context.has('height')).toBe(false);
+  expect(context.has('min-height')).toBe(false);
 
   return {
     actionsRowHeight,
@@ -184,166 +224,139 @@ function composerMaxHeight() {
   };
 }
 
-describe('陶泥儿对话区：外框完整包住输入区', () => {
-  it('外框四边贴会话区，输入区四边都在外框之内且不重合（宽屏）', () => {
-    const list = desktopDeclarations(MESSAGE_LIST, LIST_WITH_PLAN_SURFACE);
+describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文档流输入盒）', () => {
+  it('输入盒在消息列表下方、处于文档流，不再浮在列表之上（宽屏）', () => {
+    const list = desktopDeclarations(...LIST_SELECTORS);
     const composer = desktopDeclarations(COMPOSER, COMPOSER_PLAIN);
 
-    // 先看不重合关系再钉绝对位移：底边必须"外框在外、输入区在内"，留白 > 0。
-    // （上一轮的残留 bug 就是外框底边被另一条 `bottom: 156px` 顶到输入区腰上。）
-    const frameBottom = pixelValue(list, 'bottom');
-    const frameTop = pixelValue(list, 'top');
-    const frameLeft = pixelValue(list, 'left');
-    const frameRight = pixelValue(list, 'right');
-    const composerBottom = pixelValue(composer, 'bottom');
-    const composerLeft = pixelValue(composer, 'left');
-    const composerRight = pixelValue(composer, 'right');
+    // 列表是唯一滚动区：自身不再绝对定位，靠 flex 吸收会话列的剩余高度。
+    expect(declaration(list, 'position')).toBe('relative');
+    expect(declaration(list, 'overflow-y')).toBe('auto');
+    expect(declaration(list, 'flex')).toContain('1 1 auto');
 
-    const inset = composerBottom;
-    expect(inset, '输入区必须与外框底边留出可见边距').toBeGreaterThan(0);
-    expect(
-      composerBottom - frameBottom,
-      '外框底边必须严格低于输入区底边',
-    ).toBeGreaterThan(0);
-    expect(
-      composerLeft - frameLeft,
-      '外框左边必须在输入区左边之外',
-    ).toBeGreaterThan(0);
-    expect(
-      composerRight - frameRight,
-      '外框右边必须在输入区右边之外',
-    ).toBeGreaterThan(0);
-    expect(pixelValue(composer, 'right')).toBe(inset);
-    expect(composerLeft - frameLeft).toBe(inset);
-    expect(composerRight - frameRight).toBe(inset);
+    // 输入盒在文档流里：不绝对定位；它紧贴列表下边（面板很窄，输入盒自己已有内边距，
+    // 再叠外边距会浪费高度），关键是它不再落在列表**内部**覆盖消息。
+    expect(declaration(composer, 'position')).toBe('relative');
+    const insets = marginBox(composer);
+    expect(insets.top).toBe(0);
+    expect(insets.left).toBe(0);
+    expect(insets.right).toBe(0);
+    expect(insets.bottom).toBe(0);
+    // 也不再靠 bottom/left/right 偏移量定位（那是旧浮层几何的残余）。
+    expect(pixelValue(composer, 'bottom')).toBe(0);
+    expect(pixelValue(composer, 'left')).toBe(0);
+    expect(pixelValue(composer, 'right')).toBe(0);
 
-    // 外框四边就是会话区那只盒子——它才是"对话框"。
-    expect(frameTop).toBe(0);
-    expect(frameRight).toBe(0);
-    expect(frameBottom).toBe(0);
-    expect(frameLeft).toBe(0);
-
-    // 上边不钉死（底边锚定、向上生长），由 max-height 兜住：任何情况下上边至少离外框 12px。
-    expect(declaration(composer, 'position')).toBe('absolute');
-    expect(composer.has('top')).toBe(false);
-    expect(declaration(composer, 'max-height')).toBe(
-      `calc(100% - ${inset * 2}px)`,
-    );
-
-    // 输入区自己那只盒子还在（拆掉边框/底色会让输入区变成没有边界的裸文本）。
+    // 输入盒自己那只盒子还在（它现在是整块面板里唯一有边框的容器）。
     expect(declaration(composer, 'border')).toContain('1px solid');
     expect(declaration(composer, 'background')).toContain(
       'var(--platform-input-fill)',
     );
+    expect(declaration(composer, 'border-radius')).toBe('14px');
+
+    // 对话内容左右留白 16px，消息之间 14px。
+    expect(paddingBox(list).left).toBe(16);
+    expect(paddingBox(list).right).toBe(16);
+    expect(declaration(list, 'gap')).toBe('14px');
   });
 
-  it('消息列表底部留白 = 输入区内缩 + 输入区最高高度 + 间距，且与 scroll-padding 同值', () => {
-    const list = desktopDeclarations(MESSAGE_LIST, LIST_WITH_PLAN_SURFACE);
-    const composer = desktopDeclarations(COMPOSER, COMPOSER_PLAIN);
+  it('消息列表底部不留给浮层的空白，滚动到底不会多出一段空白（宽屏）', () => {
+    const list = desktopDeclarations(...LIST_SELECTORS);
     const { total, actionsRowHeight } = composerMaxHeight();
 
-    const inset = pixelValue(composer, 'bottom');
-    const gap = 16;
-    const paddingBottom = pixelValue(list, 'padding-bottom');
-
-    // 输入区最高高度由真实声明算出来：编辑器 140 + 行距 8 + 操作排 28 + 输入框下内边距 4
-    // + 输入区上下内边距 16 + 操作条（2 + 30 方钮）= 228。
-    expect(actionsRowHeight, '操作排按钮高度变了就要重算下面的算术式').toBe(28);
+    // 输入盒最高高度由真实声明算出来：编辑器 140 + 行距 8 + 操作排 28 + 输入框下内边距 4
+    // + 输入盒上下内边距 18 + 操作条（2 + 28 方钮）= 228。
+    expect(actionsRowHeight, '操作排按钮高度变了就要重算下面的算式').toBe(28);
+    expect(pixelValue(desktopDeclarations(COMPOSER_SUBMIT), 'height')).toBe(28);
     expect(total).toBe(228);
 
-    // 留白 ≥ 输入区最高高度 + 内缩：滚到底时最后一条消息不会被输入区盖住。
-    expect(paddingBottom).toBeGreaterThanOrEqual(inset + total);
-    // 且留白就该等于这条算术式，不允许多出一个"来历不明"的常量。
-    expect(paddingBottom).toBe(inset + total + gap);
+    const paddingBottom = paddingBox(list).bottom;
+    // 新契约：留白归 0。旧版这里是一条 `inset + 输入区最高高度 + 间距` 的算式，
+    // 输入盒回到文档流之后，那段留白会变成凭空多出来的空白，把最后一条消息顶出可视区。
+    expect(paddingBottom, '输入盒在文档流里，列表底边不允许再给浮层留白').toBe(
+      0,
+    );
     expect(pixelValue(list, 'scroll-padding-bottom')).toBe(paddingBottom);
+    // 留白必须严格小于输入盒高度，否则就是把旧模型的数字又写回来了。
+    expect(paddingBottom).toBeLessThan(total);
   });
 
-  it('窄屏把外框交给会话列，输入区回到文档流，四周仍有一圈边距（390px）', () => {
+  it('窄屏（390px）输入盒仍在文档流、四周有边距，列表底部没有留白', () => {
     const conversation = mobileDeclarations(CONVERSATION);
-    const list = mobileDeclarations(MESSAGE_LIST, LIST_WITH_PLAN_SURFACE);
+    const list = mobileDeclarations(...LIST_SELECTORS);
     const composer = mobileDeclarations(
       COMPOSER,
       COMPOSER_PLAIN,
       CONVERSATION_COMPOSER,
     );
+    const topbar = mobileDeclarations(TOPBAR);
 
-    // 外框画在列表与输入区共同的父节点上，用的还是那套 token。
+    // 会话列不再自画一只外框：那块框交给输入盒，避免"框里再套一只框"。
     const framePadding = paddingBox(conversation);
-    const inset = framePadding.top;
-    expect(inset, '窄屏外框必须给输入区留出可见边距').toBeGreaterThan(0);
-    expect(framePadding.right).toBe(inset);
-    expect(framePadding.bottom).toBe(inset);
-    expect(framePadding.left).toBe(inset);
-    expect(declaration(conversation, 'border')).toContain(
-      'var(--platform-subpanel-border)',
-    );
-    expect(declaration(conversation, 'background')).toContain(
-      'var(--platform-input-fill)',
-    );
-    expect(declaration(conversation, 'border-radius')).toBe('12px');
+    expect(framePadding.top).toBe(0);
+    expect(framePadding.right).toBe(0);
+    expect(framePadding.bottom).toBe(0);
+    expect(framePadding.left).toBe(0);
+    expect(declaration(conversation, 'border')).toBe('0');
+    expect(declaration(conversation, 'background')).toBe('transparent');
 
-    // 列表在窄屏不再自画一只框：框里不套框，也就不会出现两条描边压在一起。
-    const listFrame = list.get('border');
-    expect(listFrame).toBeDefined();
-    expect(listFrame).not.toContain('1px');
-    expect(declaration(list, 'background')).toBe('transparent');
-    expect(declaration(list, 'position')).toBe('static');
-
-    // 输入区回到文档流：它是外框的子节点，四边由外框内边距让出，不会再盖住消息。
+    // 输入盒仍在文档流（本来就在），四周由自己的外边距让出一圈留白。
     expect(declaration(composer, 'position')).toBe('relative');
     expect(declaration(composer, 'bottom')).toBe('auto');
     expect(declaration(composer, 'left')).toBe('auto');
     expect(declaration(composer, 'right')).toBe('auto');
-    expect(declaration(composer, 'max-height')).toBe('none');
-    // 流内元素只与列表上下相邻，列表底边留 12px 与它分开。
-    expect(pixelValue(list, 'padding-bottom')).toBe(inset);
+    const composerMargin = marginBox(composer);
+    expect(composerMargin.left, '窄屏输入盒左右必须有边距').toBeGreaterThan(0);
+    expect(composerMargin.right).toBe(composerMargin.left);
+    expect(composerMargin.bottom, '窄屏输入盒底部必须有边距').toBeGreaterThan(
+      0,
+    );
+
+    // 列表在窄屏也不画框、不留浮层空白，它仍是唯一滚动区。
+    expect(declaration(list, 'background')).toBe('transparent');
+    expect(pixelValue(list, 'padding-bottom')).toBe(0);
+    expect(declaration(list, 'overflow-y')).toBe('auto');
+
+    // 顶栏在窄屏也在场（状态点 + 设置钮），高度不塌。
+    expect(declaration(topbar, 'display')).toBe('flex');
+    expect(pixelValue(topbar, 'min-height')).toBe(44);
   });
 
-  it('输入区仍落在对话框外框节点的子树里，交互控件原位', () => {
+  it('输入盒仍落在 form.project-supervisor-composer 子树里，交互控件原位', () => {
     const source = readFileSync(VIEW_PATH, 'utf8');
+    const formOpen = source.indexOf('<form');
+    expect(formOpen, '输入盒（form）缺失').toBeGreaterThanOrEqual(0);
+    const formEnd = source.indexOf('</form>');
+    expect(formEnd, '输入盒（form）没有闭合').toBeGreaterThan(formOpen);
+    const formSource = source.slice(formOpen, formEnd + '</form>'.length);
+
+    // 编辑器、`+` / `@` 引用、模型选择、提交按钮全在这棵子树里，位置只由样式挪。
+    expect(formSource).toContain('ResourceReferenceInput');
+    expect(formSource).toContain('project-supervisor-composer-context');
+    expect(formSource).toContain('project-supervisor-composer-controls');
+    expect(formSource).toContain('project-supervisor-attachment-trigger');
+    expect(formSource).toContain('project-supervisor-reference-trigger');
+    expect(formSource).toContain('ConversationModelSelect');
+    expect(formSource).toContain('{submitButton}');
+    expect(formSource).toContain('onSubmit={');
+    // 提交按钮本体还是那只按钮，只是以变量形式引用进这棵子树。
+    expect(source).toContain('className="project-supervisor-submit-button"');
+
+    // 面板三段式的顺序：顶栏 → 消息列表 → 输入盒。
     const conversationOpen = source.indexOf(
       '<div className="project-supervisor-conversation">',
     );
-    expect(conversationOpen, '会话列容器缺失').toBeGreaterThanOrEqual(0);
-
-    // 用 div 配对找出会话列容器的闭合位置（属性里的箭头函数不影响 <div / </div> 计数）。
-    const before = source.slice(conversationOpen);
-    const divOpeners = (before.match(/<div(?=[\s>])/gu) ?? []).length;
-    expect(divOpeners).toBeGreaterThan(0);
-    let depth = 0;
-    const cursor = conversationOpen;
-    let conversationEnd = -1;
-    const tokenPattern = /<div(?=[\s>])|<\/div>/gu;
-    tokenPattern.lastIndex = conversationOpen;
-    let token = tokenPattern.exec(source);
-    while (token) {
-      depth += token[0] === '</div>' ? -1 : 1;
-      if (depth === 0) {
-        conversationEnd = token.index + token[0].length;
-        break;
-      }
-      token = tokenPattern.exec(source);
-    }
-    expect(conversationEnd, '会话列容器没有闭合').toBeGreaterThan(
+    expect(conversationOpen).toBeGreaterThanOrEqual(0);
+    const topbarIndex = source.indexOf(
+      'project-supervisor-topbar',
       conversationOpen,
     );
-
-    const conversationSource = source.slice(conversationOpen, conversationEnd);
-    expect(conversationSource).toContain('project-supervisor-message-list');
-    expect(conversationSource).toContain('project-supervisor-composer');
-
-    const composerSource = conversationSource.slice(
-      conversationSource.indexOf('<form'),
-      conversationSource.indexOf('</form>') + '</form>'.length,
+    const listIndex = source.indexOf(
+      'className="message-list project-supervisor-message-list"',
+      conversationOpen,
     );
-    // 编辑器、@ 引用、AI 润色、模型选择、提交按钮全在这棵子树里，位置只由样式挪。
-    expect(composerSource).toContain('ResourceReferenceInput');
-    expect(composerSource).toContain('project-supervisor-composer-controls');
-    expect(composerSource).toContain('project-supervisor-reference-trigger');
-    expect(composerSource).toContain('ConversationModelSelect');
-    expect(composerSource).toContain('{submitButton}');
-    expect(composerSource).toContain('onSubmit={');
-    // 提交按钮本体还是那只按钮，只是以变量形式引用进这棵子树。
-    expect(source).toContain('className="project-supervisor-submit-button"');
+    expect(topbarIndex).toBeGreaterThan(conversationOpen);
+    expect(listIndex, '消息列表必须排在顶栏之后').toBeGreaterThan(topbarIndex);
+    expect(formOpen, '输入盒必须排在消息列表之后').toBeGreaterThan(listIndex);
   });
 });

From cd816078a3b46a73a046a31a006b4a63aada0e05 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 12:48:22 +0800
Subject: [PATCH 02/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B3=E4=BE=A7?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E9=9D=A2=E6=9D=BF=E7=BA=B5=E5=90=91=E5=87=A0?=
 =?UTF-8?q?=E4=BD=95=EF=BC=9A=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E5=A1=8C?=
 =?UTF-8?q?=E9=99=B7=E4=B8=8E=E8=BE=93=E5=85=A5=E7=9B=92=E8=A2=AB=E9=A1=B6?=
 =?UTF-8?q?=E5=87=BA=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- styles.css：为 .game-workbench-chat .project-supervisor-surface 补 grid-row: 1 / -1，并就近说明原因
- styles.css：说明该几何必须靠 height: 100% 撑满轨道，不能再叠加 flex 简写
- styles.css：文件末尾新增实测修复区块，解除 direct-codex 消息列表的 340px 最小高度下限
- styles.css：新增实测修复区块，把 direct-codex 的 surface / conversation 固定为纵向链
---
 apps/ai-game-creator-shell/src/styles.css | 40 +++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 15423a454..1b5dd39f7 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -8328,7 +8328,14 @@ iframe.preview-frame {
   color: var(--platform-button-primary-text);
 }
 
+/* 面板纵向布局（2026-07 Codex 风格改造）：这里保持 grid，不要改成 flex。
+   `.game-workbench-chat { grid-template-rows: auto minmax(0, 1fr) }` 原本是给「头部 + 内容」
+   两行用的；direct-codex 精简掉头部后，surface 变成第一个子元素、落进第一行 auto 轨道，
+   于是面板高度一大于内容（新会话只有一条欢迎消息时），surface 就被压成内容高度：消息列表
+   塌成几十像素、输入盒被拉伸到两百多像素。所以下面这份几何要靠 `height: 100%` 撑满轨道，
+   不能再叠加 `flex: 0 1 auto` 之类的 flex 简写（那会把 basis 变成 auto，同样压成内容高度）。 */
 .game-workbench-chat .project-supervisor-surface {
+  grid-row: 1 / -1;
   grid-template-columns: minmax(0, 1fr);
   gap: 0;
   height: 100%;
@@ -11233,3 +11240,36 @@ button.design-workspace-tree__entry:hover,
 .project-supervisor-settings-row .game-workbench-chat-wallet {
   margin-left: auto;
 }
+
+/* 面板纵向布局兜底（实测修复，2026-07）：
+   只改 `.game-workbench-chat .project-supervisor-surface.is-direct-codex` 的几何还不够——
+   更早那条 `.game-workbench-chat .project-supervisor-surface { display: grid; ... }` 特异性同为
+   3 个类且写在前面，面板实际仍是「单行 grid」，`.project-supervisor-conversation` 被当成 grid
+   轨道拉高到面板高度；同时基础规则 `.project-supervisor-message-list { min-height: 340px }`
+   又给列表压了 340px 下限，两者叠加后列表被内容撑到数千像素、输入盒被顶到面板之外不可见。
+   这里显式把 surface / conversation 改成 flex 纵向链（多带一层 `.message-list` 提高特异性），
+   并解除列表的 340px 下限，保证「消息列表是唯一滚动区、输入盒恒在面板底部」。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .message-list.project-supervisor-message-list {
+  min-height: 0;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-conversation {
+  display: flex;
+  height: 100%;
+  min-height: 0;
+  flex-direction: column;
+  grid-template-rows: none;
+  gap: 0;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-conversation
+  > .message-list.project-supervisor-message-list {
+  min-height: 0;
+  flex: 1 1 auto;
+}

From 8410426d123ab781bb11194f1315436a437b382a Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 12:49:37 +0800
Subject: [PATCH 03/67] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=BA=B5=E5=90=91=E5=87=A0=E4=BD=95=E7=9A=84?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E6=96=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- chatDialogFrameLayout.test.ts：新增用例锁定面板必须跨满对话列全部 grid 行、height 100%、且不得叠加 flex 简写
- chatDialogFrameLayout.test.ts：新增断言锁定 direct-codex 面板把消息列表 min-height 从 96px 解除到 0
- 说明这次断言对应的一次真实渲染事故：新会话只有一条欢迎消息时，消息列表塌成 54px、输入盒被拉伸到 212px
---
 .../tests/chatDialogFrameLayout.test.ts       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
index ec2e2f136..c21200d78 100644
--- a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
+++ b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
@@ -359,4 +359,38 @@ describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文
     expect(listIndex, '消息列表必须排在顶栏之后').toBeGreaterThan(topbarIndex);
     expect(formOpen, '输入盒必须排在消息列表之后').toBeGreaterThan(listIndex);
   });
+
+  /**
+   * 面板纵向必须撑满 `.game-workbench-chat` 的高度。
+   *
+   * 这里锁的是一次真实渲染事故：`.game-workbench-chat` 是
+   * `grid-template-rows: auto minmax(0, 1fr)`（原本给「头部 + 内容」两行用），direct-codex
+   * 精简掉头部后 supervisor 面板成了第一个子元素、落进第一行 auto 轨道。面板高度一旦大于
+   * 内容（新会话只有一条欢迎消息时就是如此），面板就被压成内容高度——消息列表塌成几十像素、
+   * 输入盒被拉伸到两百多像素。实测修法是让面板跨全部行（`grid-row: 1 / -1`）并靠
+   * `height: 100%` 撑满轨道；`flex: 0 1 auto` 之类的 flex 简写会把 basis 变回 auto，同样塌。
+   */
+  it('面板撑满对话列高度，消息列表不再被压成内容高度', () => {
+    const chat = desktopDeclarations('.game-workbench-chat');
+    const surface = desktopDeclarations(
+      '.game-workbench-chat .project-supervisor-surface',
+    );
+    const list = desktopDeclarations('.project-supervisor-message-list');
+    const listInPanel = desktopDeclarations(MESSAGE_LIST_PLAIN);
+    const listInPanelDirectCodex = desktopDeclarations(MESSAGE_LIST);
+
+    // 对话列仍是两行 grid：面板必须跨全部行，否则只能拿到 auto 行的高度。
+    expect(declaration(chat, 'display')).toBe('grid');
+    expect(declaration(surface, 'grid-row')).toBe('1 / -1');
+    expect(declaration(surface, 'height')).toBe('100%');
+    // flex 简写会把 basis 变回 auto，面板又会塌成内容高度。
+    expect(surface.has('flex')).toBe(false);
+
+    // 基础规则 `.project-supervisor-message-list { min-height: 340px }` 给列表压了下限；
+    // 面板里真正生效的是后写的 96px，而 direct-codex 面板必须把它解除到 0——
+    // 否则空对话时列表被顶高、输入盒被挤出面板（实测就是 panel 的 4564px 那次）。
+    expect(pixelValue(list, 'min-height')).toBe(340);
+    expect(pixelValue(listInPanel, 'min-height')).toBe(96);
+    expect(pixelValue(listInPanelDirectCodex, 'min-height')).toBe(0);
+  });
 });

From bc796c1db48c09af4115614b7a6061020b7f3b63 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 14:17:20 +0800
Subject: [PATCH 04/67] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9B=92=E5=86=85=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=87=E7=AD=BE=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProjectSupervisorView：移除输入盒内「项目名 · 本地」信息标签行，删除随之无用的 projectDisplayName 辅助函数
- styles.css：输入盒网格从三行改回两行（文本区 / 控制排），删除信息标签行及其胶囊样式规则
- chatDialogFrameLayout.test.ts：把「表单子树含信息标签行」的断言反转成不再包含，并删除相关 CSS 常量与取值
- project-development.suite.ts：输入盒断言从「含项目名/本地标签」改为「不再渲染该标签行」，网格行数断言同步为两行
---
 .../ProjectSupervisorView.tsx                 | 12 ------
 apps/ai-game-creator-shell/src/styles.css     | 40 ++-----------------
 .../appSurface/project-development.suite.ts   | 26 ++++++------
 .../tests/chatDialogFrameLayout.test.ts       |  8 +---
 4 files changed, 18 insertions(+), 68 deletions(-)

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 b2e7d5320..a94385beb 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
@@ -84,12 +84,6 @@ function directStatusTitle(status: string | null | undefined) {
   }
 }
 
-/** Codex 顶栏只显示项目名：取路径最后一段，拿不到时退回占位文案。 */
-function projectDisplayName(projectPath: string) {
-  const name = projectPath.split(/[\\/]/u).filter(Boolean).pop();
-  return name ?? '未选择项目';
-}
-
 type ProjectSupervisorViewProps = RuntimePanelProps & {
   activeVersionId?: string | null;
   chatInput: string;
@@ -508,12 +502,6 @@ export function ProjectSupervisorView({
             void validateModel();
           }}
         >
-          {directCodex ? (
-            <div className="project-supervisor-composer-context">
-              <span title={projectPath}>{projectDisplayName(projectPath)}</span>
-              <span>本地</span>
-            </div>
-          ) : null}
           <ResourceReferenceInput
             ref={composerRef}
             ariaLabel={directCodex ? '陶泥儿对话内容' : '项目需求'}
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 1b5dd39f7..379902e73 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -10483,19 +10483,18 @@ button.design-workspace-tree__entry:hover,
   font-size: 12px;
 }
 
-/* Direct Codex composer: keep the editor and its actions in one vertical
-   structure instead of positioning each control independently. */
 /* 输入盒是唯一有边框的容器，且**回到文档流**：它在消息列表下方（Codex 桌面客户端的
    「整块面板 = 顶栏 + 消息流 + 输入盒」），不再浮在消息列表之上。
    旧版那套「输入区绝对定位、消息列表用 196px 底边留白给它让位」已撤掉——两套叠着生效会
    让消息被空白顶掉、输入盒盖住消息。
-   三行结构：项目信息标签行 / 文本区 / 控制排（`+` `@` · 模型下拉 · 发送）。 */
+   两行结构：文本区 / 控制排（`+` `@` · 模型下拉 · 发送）。原先那行「项目名 · 本地」信息标签
+   已按需求删掉，输入盒内不再复述当前项目。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex {
   display: grid;
   grid-template-columns: minmax(0, 1fr);
-  grid-template-rows: auto auto auto;
+  grid-template-rows: auto auto;
   gap: 0;
   align-items: stretch;
   position: relative;
@@ -10512,39 +10511,6 @@ button.design-workspace-tree__entry:hover,
   pointer-events: auto;
 }
 
-/* 信息标签行：`项目名` · `本地`。只做只读信息，不加取数（不查 git 分支）。 */
-.game-workbench-chat
-  .project-supervisor-surface.is-direct-codex
-  .project-supervisor-composer
-  .project-supervisor-composer-context {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  min-width: 0;
-  padding-bottom: 2px;
-}
-
-.game-workbench-chat
-  .project-supervisor-surface.is-direct-codex
-  .project-supervisor-composer
-  .project-supervisor-composer-context
-  > span {
-  display: inline-flex;
-  align-items: center;
-  min-width: 0;
-  max-width: 60%;
-  padding: 1px 7px;
-  overflow: hidden;
-  border: 1px solid var(--platform-line-soft);
-  border-radius: 999px;
-  background: var(--platform-warm-bg);
-  color: var(--platform-text-soft);
-  font-size: 11px;
-  line-height: 1.6;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 6e21746b7..8fa7280ca 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -5840,14 +5840,14 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(styles).toMatch(
       /\.game-workbench-chat \.project-runtime-summary\s*\{[^}]*position:\s*sticky[^}]*top:\s*-10px/s,
     );
-    // 输入盒是三行网格（信息标签 / 文本区 / 控制排）的文档流块，不再是贴在列表下边的
+    // 输入盒是两行网格（文本区 / 控制排）的文档流块，不再是贴在列表下边的
     // 绝对定位浮层，也不再与 82px 的发送钮列共用网格。
     const composerRule = styles.match(
       /\.game-workbench-chat\s+\.project-supervisor-surface\.is-direct-codex\s+\.project-supervisor-composer\.is-direct-codex\s*\{([^}]*)\}/s,
     );
     expect(composerRule?.[1]).not.toBeUndefined();
     expect(composerRule?.[1]).toContain('position: relative;');
-    expect(composerRule?.[1]).toContain('grid-template-rows: auto auto auto;');
+    expect(composerRule?.[1]).toContain('grid-template-rows: auto auto;');
     expect(composerRule?.[1]).toContain('z-index: 1;');
     expect(composerRule?.[1]).toContain('padding: 8px 12px 10px;');
     expect(composerRule?.[1]).toContain(
@@ -6709,15 +6709,15 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(anchor).toMatch(/flex:\s*0 1 auto/u);
     expect(anchor).toMatch(/min-width:\s*0/u);
 
-    // 输入盒高度变化不得推动同排操作元素：composer 是三行网格（信息标签 / 文本区 /
-    // 控制排），文本区从 96px 长到 140px 只把 composer 顶边抬高，控制排仍在同一行的
-    // 下面一行（发送钮与模型选择钮不动）。它不再靠 `position: absolute` 底边锚定。
+    // 输入盒高度变化不得推动同排操作元素：composer 是两行网格（文本区 / 控制排），
+    // 文本区从 96px 长到 140px 只把 composer 顶边抬高，控制排仍在同一行的下面一行
+    // （发送钮与模型选择钮不动）。它不再靠 `position: absolute` 底边锚定。
     const composer = styleRuleBody(
       styles,
       '\\.game-workbench-chat\\s+\\.project-supervisor-surface\\.is-direct-codex\\s+\\.project-supervisor-composer\\.is-direct-codex',
     );
     expect(composer).toMatch(/position:\s*relative/u);
-    expect(composer).toMatch(/grid-template-rows:\s*auto auto auto/u);
+    expect(composer).toMatch(/grid-template-rows:\s*auto auto;/u);
     expect(styleNumber(composer, 'bottom')).toBe(0);
     // 控制排是单行 flex、不换行：窄屏下靠可压缩的模型选择钮（flex 0 1 auto + min-width 0）
     // 收窄，而不是把模型选择钮/发送钮挤到第二行。
@@ -8113,18 +8113,18 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(
       within(supervisorSurface).queryByRole('button', { name: /审批配置/ }),
     ).toBeNull();
-    // 输入盒三段式：信息标签行 / 文本区 / 控制排。项目名 + 本地两个标签，`+` 与 `@` 都在。
+    // 输入盒两段式：文本区 / 控制排。原先那行「项目名 · 本地」信息标签已按需求删除，
+    // 输入盒内不再复述当前项目；`+` 与 `@` 仍在。
     const composer = supervisorSurface.querySelector(
       'form.project-supervisor-composer',
     );
     expect(composer).not.toBeNull();
-    const context = composer?.querySelector(
-      '.project-supervisor-composer-context',
-    );
     expect(
-      within(context as HTMLElement).getByText('launcher-codex-panel-game'),
-    ).not.toBeNull();
-    expect(within(context as HTMLElement).getByText('本地')).not.toBeNull();
+      composer?.querySelector('.project-supervisor-composer-context'),
+    ).toBeNull();
+    expect(
+      within(composer as HTMLElement).queryByText('launcher-codex-panel-game'),
+    ).toBeNull();
     expect(
       within(composer as HTMLElement).getByRole('button', {
         name: '添加素材引用',
diff --git a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
index c21200d78..e9f8fb36c 100644
--- a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
+++ b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
@@ -134,7 +134,6 @@ const COMPOSER_INPUT_PLAIN = `${COMPOSER_PLAIN} .resource-reference-input`;
 const COMPOSER_EDITOR = `${COMPOSER_PLAIN} .resource-reference-input-editor`;
 const COMPOSER_CONTROLS = `${COMPOSER} .project-supervisor-composer-controls`;
 const COMPOSER_SUBMIT = `${COMPOSER_CONTROLS} .project-supervisor-submit-button`;
-const COMPOSER_CONTEXT = `${COMPOSER_PLAIN} .project-supervisor-composer-context`;
 const INPUT_ACTIONS = `${COMPOSER} .resource-reference-input-actions`;
 const TOPBAR = `${CHAT} .project-supervisor-topbar`;
 // 策划链在会话列里额外挂了一条规划面/窄条时，列表会命中这条 `:has(...)` 规则——
@@ -186,7 +185,6 @@ function composerMaxHeight() {
     `${INPUT_ACTIONS} .resource-reference-input-polish`,
     '.resource-reference-input-polish',
   );
-  const context = desktopDeclarations(COMPOSER_CONTEXT);
   const controls = desktopDeclarations(COMPOSER_CONTROLS);
   const submit = desktopDeclarations(COMPOSER_SUBMIT);
 
@@ -207,9 +205,6 @@ function composerMaxHeight() {
   // 一旦设了，网格行高会被顶起来、编辑器的 min-height 也跟着变，算式随之作废。
   expect(actions.has('height')).toBe(false);
   expect(actions.has('min-height')).toBe(false);
-  // 信息标签行只在 direct-codex 渲染，也只占一行，不设固定高度。
-  expect(context.has('height')).toBe(false);
-  expect(context.has('min-height')).toBe(false);
 
   return {
     actionsRowHeight,
@@ -332,7 +327,8 @@ describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文
 
     // 编辑器、`+` / `@` 引用、模型选择、提交按钮全在这棵子树里，位置只由样式挪。
     expect(formSource).toContain('ResourceReferenceInput');
-    expect(formSource).toContain('project-supervisor-composer-context');
+    // 输入盒里不再有「项目名 · 本地」信息标签行（按需求删除）。
+    expect(formSource).not.toContain('project-supervisor-composer-context');
     expect(formSource).toContain('project-supervisor-composer-controls');
     expect(formSource).toContain('project-supervisor-attachment-trigger');
     expect(formSource).toContain('project-supervisor-reference-trigger');

From 7adabea656c630a87e0447e093cf7b4fa748d0a0 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 14:19:57 +0800
Subject: [PATCH 05/67] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=8D=A1=E7=89=87=E6=8A=80=E6=9C=AF=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=EF=BC=88=E5=A5=91=E7=BA=A6=E5=86=BB=E7=BB=93=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- docs/technical：【技术方案】GameAgent对话工具调用卡片-2026-09-14.md：工具调用条目形状、独立历史文件 tool-calls.jsonl、事件新增 toolCalls 字段、read_direct_tool_calls 回读命令、卡片 DOM 与无障碍要求、验收判据与不做项
- docs/README.md：把该方案登记进「AI 游戏创作与 Agent Runtime」索引
- 方案明确不改 project.jsonl 既有格式与 Codex 上下文注入路径，避免污染模型上下文
---
 docs/README.md                                |   1 +
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md | 108 ++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md

diff --git a/docs/README.md b/docs/README.md
index 531c0c706..44066f85b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -32,6 +32,7 @@
 - [AI 游戏创作智能体 App 实施计划](./technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md)：当前 DirectProject、受控语义工具、UI workflow、资源和运行时合同。
 - [策划会话 Runtime V2 接入与旧链路退役方案](./technical/【技术方案】策划会话RuntimeV2接入与旧链路退役-2026-09-03.md)：新单 Agent 策划会话、GDD 策略、未来 MCP/Skill 兼容插槽、阶段任务与退役验收合同。
 - [DirectProject Codex 原始历史与异常恢复](<./technical/【技术方案】DirectProject Codex原始历史与异常恢复-2026-09-04.md>)：原始 Responses item 持久化、线程注入与异常回合收尾。
+- [GameAgent 对话工具调用卡片](./technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md)：把右侧对话里的执行命令 / 写文件投影成 Codex 风格可折叠卡片，含采集、独立历史文件、事件字段与回读契约。
 - [DirectProject 客户端 Skill 与 MCP 扩展导入方案](./technical/【技术方案】DirectProject客户端Skill与MCP扩展导入方案-2026-08-31.md)：客户端扩展导入、按独立 Skill/MCP 拆分、命名、启用和启动时注入边界。
 - [AGC 通用插件宿主与编辑器适配](./technical/【技术方案】AGC通用插件宿主与编辑器适配-2026-09-09.md)：通用插件宿主、SDK、权限审计、UI 挂载和 Cocos 编辑器适配边界。
 - [AGC Cocos Creator 编辑器桥接模块](<./technical/【技术方案】AGC Cocos Creator 编辑器桥接模块-2026-09-09.md>)：独立 crate、feature 开关、目标校验与 Windows 注入边界。
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
new file mode 100644
index 000000000..7cf7c832e
--- /dev/null
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -0,0 +1,108 @@
+# 【技术方案】GameAgent 对话工具调用卡片（Codex 风格）-2026-09-14
+
+## 一句话交付
+
+把 GameAgent 右侧对话面板里的「执行命令 / 写文件 / 调工具」从一行中文进度文本，改成 Codex 桌面客户端那样的**可折叠卡片**（折叠态一行摘要，展开态看命令与文件明细），并且在**刷新页面、重开项目后仍然存在**。
+
+## 背景与现状（已核实）
+
+- 数据来源：Codex app-server 会推 `item/started` / `item/completed`，item 里带完整信息（`commandExecution.command`、`fileChange.changes[].path` 等）。
+- 现状投影：`apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs` 的 `direct_codex_item_intermediate_text()`（约 791 行）把 item **压成一行中文文本**（`正在执行命令：xxx` / `正在写入文件：xxx`），经 `DirectCodexTurnObservation::IntermediateText` 下发。
+- 前端事件：`GameCreatorDirectTurnUpdateEvent`（`src/app/types.ts:1090`）只有 `projectPath / turnId / sequence / status / activity / accumulatedText / updatedAt`，**没有结构化工具调用**。
+- 历史持久化：`.agent/conversations/project.jsonl` 现在只写 message 条目（实测 61 条全是 message），工具调用不留痕。
+- 历史回读：`read_direct_project_chat_history_at()`（`direct_project_history.rs:575`）只把 `role ∈ {user, assistant}` 且有文本的条目投影成 `LocalConversationMessageRecord`，**形状上装不下工具调用**。
+- 结论：要做成卡片必须同时改「采集 → 传输 → 持久化 → 回读 → 渲染」五段，纯前端做不出来。
+
+## 契约（实现必须照此，不得自行改形状）
+
+### 1. 工具调用条目（采集与持久化形状）
+
+新增独立历史文件：`<projectRoot>/.agent/conversations/tool-calls.jsonl`，一行一条，行信封与既有历史一致：
+
+```json
+{ "type": "tool_call_item", "payload": { "schemaVersion": "agc-tool-call.v1", "id": "...", "turnId": "...", "kind": "command|file_change|mcp_tool|web_search|context_compaction|other", "title": "执行命令", "summary": "npm run build", "status": "running|completed|failed", "detail": { "command": "...", "output": "...", "changes": [{ "path": "game/src/x.ts", "kind": "add|update|delete" }] }, "startedAt": 0, "updatedAt": 0 } }
+```
+
+- `id`：Codex item 的 id；同一 item 的 `started` 与 `completed` 必须落成**同一条**（按 id 幂等 upsert，不允许写两行）。
+- `title` 是折叠态的一行标题，按 kind 固定：`command` → `执行命令`、`file_change` → `编辑 N 个文件`（N = changes 去重后数量）、其余见 kind 枚举。
+- `summary` 是折叠态标题后面的短摘要：命令取命令首行（截断 120 字符），`file_change` 取首个变更路径。
+- `detail.command` / `detail.output` 各截断到 4000 字符；`detail.changes[].path` 用项目相对路径。
+- **必须脱敏**：沿用既有 `codex_app_server.rs` 里对 command/tool 参数的安全处理，不得把 API Key、Token、Cookie、绝对用户目录写进 `detail`。
+
+### 2. 实时事件（新增字段，不改既有字段语义）
+
+`GameCreatorDirectTurnUpdateEvent` 增加**可选**字段：
+
+```ts
+toolCalls?: DirectTurnToolCall[] | null;
+```
+
+- 只有在本回合工具调用集合发生变化时才带（不要每个 heartbeat 都重发全量）。
+- 字段**可选**：老版本事件解析路径必须保持兼容（前端拿到 `undefined` 时行为与现在一致）。
+- `DirectTurnToolCall` 与上面 payload 同形（去掉 `turnId`）。
+
+### 3. 回读命令
+
+新增 Tauri 命令 `read_direct_tool_calls(projectPath)`，返回按时间正序的 `DirectTurnToolCall[]`，最多最近 200 条（超出截断，保留最新）。
+
+- 历史文件缺失 → 返回空数组，不报错。
+- 单行损坏 → 跳过该行继续，不整体失败（与 Codex item 流一样是"尽力而为"的展示数据，不是业务真相）。
+
+### 4. 前端合并与渲染
+
+- 加载对话时把回读结果按 `turnId` 归并进消息流：工具调用卡插在**同一回合最后一条 assistant 消息之后**，同一回合内按 `startedAt` 升序。
+- 实时回合（`directCodexProductRuntime` 且 `activeDirectCodexTurnRef` 命中）时，卡片跟着事件增量更新；回合结束后由持久化数据接管（不出现重复卡片，同一 `id` 只渲染一次）。
+- 卡片 DOM 与交互（对齐 Codex）：
+
+```html
+<section class="agent-tool-call" data-kind="command" data-status="running">
+  <button type="button" class="agent-tool-call-head" aria-expanded="false">
+    <span class="agent-tool-call-icon" aria-hidden="true"></span>
+    <span class="agent-tool-call-title">执行命令</span>
+    <span class="agent-tool-call-summary">npm run build</span>
+    <span class="agent-tool-call-status">执行中</span>
+    <svg class="agent-tool-call-chevron" aria-hidden="true"></svg>
+  </button>
+  <div class="agent-tool-call-body" hidden>
+    <pre class="agent-tool-call-command">...</pre>
+    <ul class="agent-tool-call-changes"><li>game/src/x.ts <small>新增</small></li></ul>
+    <pre class="agent-tool-call-output">...</pre>
+  </div>
+</section>
+```
+
+- 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），`aria-label` 说明「执行命令：npm run build」。
+- 默认折叠；`running` 时标题右侧显示进行中状态点；`failed` 时标题与状态文案用错误色（用现有 `--platform-*` 变量，不新增色值）。
+- 输入框、消息气泡、消息列表滚动模型**不变**；卡片只是消息流里的一个块。
+
+## 验收判据（每条都要有可复现证据）
+
+1. 一轮真实回合里，`tool-calls.jsonl` 里同 id 只有一行，`completed` 后 `status` 变 `completed`。
+2. 刷新页面 / 重开项目后，工具调用卡仍在原位（不重复、不丢）。
+3. 实时回合中卡片状态从 `running` 走到 `completed`。
+4. 折叠/展开键盘可达（Tab 到头部按钮、Enter/Space 切换、`aria-expanded` 同步）。
+5. `Read` 到的既有对话（无工具调用）行为不变；老事件（无 `toolCalls` 字段）行为不变。
+6. 脱敏检查：`tool-calls.jsonl` 里不出现 API Key / Token / 绝对用户目录。
+
+## 不做项（本次明确不做）
+
+- 不做工具调用的重试 / 取消 / 编辑按钮。
+- 不做 diff 级展开（只在展开态列文件路径与变更类型）。
+- 不做工具输出的完整回放、不做卡片内搜索。
+- 不改 `.agent/conversations/project.jsonl` 的既有格式与注入 Codex 上下文的路径（新数据走独立文件，避免污染模型上下文）。
+- 不改工具调用之外的聊天渲染（markdown、气泡、滚动）。
+- 不做历史工具调用的迁移回填（存量项目没有卡片，属预期）。
+
+## 涉及文件（实现边界）
+
+- Rust（`apps/ai-game-creator-shell/src-tauri/src/`）：`agent/codex_app_server.rs`（item → 结构化采集）、`agent/direct_runtime.rs`（随事件下发 + 回合结束持久化）、`agent/direct_project_history.rs` 或新增 `agent/direct_tool_calls.rs`（upsert 与回读）、`commands.rs`（新增命令注册）。
+- 前端（`apps/ai-game-creator-shell/src/`）：`app/types.ts`（新增字段与类型）、`App.tsx`（订阅、累加、加载时合并）、`features/agent-runtime/` 或新增 `features/project-workspace/ToolCallCard.tsx`（卡片组件）、`styles.css`（卡片样式，新样式集中在文件末尾中文注释区块）。
+- 测试：Rust 侧单元测试（upsert 幂等、截断、脱敏、损坏行跳过）、前端 `tests/`（卡片渲染、折叠交互、重开项目后合并、老事件兼容）。
+
+## 实施顺序（每步都要能独立验证）
+
+1. Rust 采集 + 独立文件 upsert：先只落盘，单元测试证明幂等与截断。
+2. 事件字段下发 + 前端类型：老路径不受影响（回归现有 appSurface 用例）。
+3. Tauri 回读命令 + 前端加载合并：刷新后卡片存在。
+4. 卡片组件 + 样式 + 无障碍：折叠/展开 + 键盘。
+5. 真实回合联调（本地 Tauri 起一轮），截图留证。

From 6ba86f50618313809c35c5fc39d52bfcb8e960aa Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 15:00:32 +0800
Subject: [PATCH 06/67] =?UTF-8?q?GameAgent=20=E5=B7=A5=E5=85=B7=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=EF=BC=9A=E9=87=87=E9=9B=86=E3=80=81=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=81=E4=B9=85=E5=8C=96=E3=80=81=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=9B=9E=E8=AF=BB=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 agent/direct_tool_calls.rs：把 Codex item 投影成结构化 DirectToolCall（command / file_change /
  mcp_tool / web_search / context_compaction / other），标题按 kind 固定（`编辑 N 个文件` 按去重路径数）
- 新增 agent/direct_tool_calls.rs：独立文件 `.agent/conversations/tool-calls.jsonl` 的幂等 upsert
  （同 id 只落一行、completed 覆盖 started、startedAt 取最早非零值）与 200 条上限裁剪
- 新增 agent/direct_tool_calls.rs：command/output 截断 4000 字符、summary 截断 120 字符，
  先抹绝对路径再抹密钥（复用 redact_absolute_path_tokens / redact_secret_tokens）
- 新增 agent/direct_tool_calls.rs：回读按时间正序、单行损坏跳过、文件缺失返回空数组
- 新增 agent/direct_tool_calls.rs 单测 8 条：幂等 upsert、非 0 退出码判 failed、截断、脱敏、
  坏行跳过、上限裁剪与排序、file_change 标题与摘要、非工具 item 不产卡片
- agent/codex_app_server.rs：DirectCodexTurnObservation 增加 ToolCall 变体；item/started 与
  item/completed 各采一次，turnId 沿用 AGC 客户端回合 id
- agent/direct_runtime.rs：观察者采集到工具调用时增量下发，回合结束整批落盘（一次锁、一次重写）
- agent/direct_runtime.rs：单项落盘走阻塞线程池，落盘失败不影响回合结果
- agent/runtime_driver/entrypoints.rs：DirectGameCreatorTurnUpdateEmitter::emit 增加可选
  toolCalls 参数
- main.rs：GameCreatorDirectTurnUpdateEvent 增加可选 toolCalls 字段，skip_serializing_if 保证
  老事件序列化结果不变
- commands.rs / main.rs：新增 read_direct_tool_calls(projectPath) 命令并注册到 invoke_handler
---
 .../src-tauri/src/agent.rs                    |   2 +
 .../src-tauri/src/agent/codex_app_server.rs   |  26 +
 .../src-tauri/src/agent/direct_runtime.rs     |  84 +-
 .../src-tauri/src/agent/direct_tool_calls.rs  | 753 ++++++++++++++++++
 .../src/agent/runtime_driver/entrypoints.rs   |   2 +
 .../src-tauri/src/commands.rs                 |  13 +
 .../src-tauri/src/main.rs                     |   5 +
 7 files changed, 878 insertions(+), 7 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent.rs b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
index 17b8a6700..62a2a0b0b 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
@@ -21,6 +21,7 @@ mod direct_project_history;
 mod direct_project_turn_history;
 mod direct_runtime;
 mod direct_tool_bridge;
+mod direct_tool_calls;
 mod direct_tools_mcp;
 mod generation;
 mod interaction;
@@ -49,6 +50,7 @@ pub(crate) use direct_project_history::*;
 pub(crate) use direct_project_turn_history::*;
 pub(crate) use direct_runtime::*;
 pub(crate) use direct_tool_bridge::*;
+pub(crate) use direct_tool_calls::*;
 pub(crate) use direct_tools_mcp::*;
 pub(crate) use generation::*;
 pub(crate) use interaction::*;
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
index 1d0ecf233..e8d536ae1 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
@@ -523,6 +523,8 @@ pub(crate) enum DirectCodexTurnObservation {
     AccumulatedText(String),
     IntermediateText(String),
     Activity(&'static str),
+    /// 一条结构化工具调用（`item/started` 与 `item/completed` 各采一次，按 id 幂等）。
+    ToolCall(crate::DirectToolCall),
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -2653,6 +2655,12 @@ impl CodexAppServerConnection {
         let _turn_guard = self.inner.turn_gate.lock().await;
         let mut request = request;
         let history_root = direct_history_root.unwrap_or(&self.inner.workspace_path);
+        // 工具调用卡片的 turnId 用 AGC 客户端回合 id（与实时事件、落盘条目同一口径），
+        // 不用 Codex app-server 自己的 turnId——前端要按它把卡片挂回对应的那一轮。
+        let direct_tool_call_turn_id: Option<String> = direct_client_turn_id
+            .map(str::trim)
+            .filter(|turn_id| !turn_id.is_empty())
+            .map(str::to_string);
         if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
             let current_prompt = direct_codex_current_user_prompt(&request).trim();
             if current_prompt.is_empty() {
@@ -2908,6 +2916,24 @@ impl CodexAppServerConnection {
                                     completed,
                                     &params,
                                 );
+                                // 工具调用卡片：item/started 与 item/completed 各采一次，
+                                // 由下游按 id 幂等 upsert 成同一条。采集失败（拿不到 id /
+                                // 非工具类 item）就静默跳过，不影响这一轮的其它投影。
+                                if let Some(turn_id) = direct_tool_call_turn_id.as_deref() {
+                                    if let Some(tool_call) = direct_tool_call_from_item(
+                                        history_root,
+                                        item,
+                                        turn_id,
+                                        completed,
+                                        direct_tool_call_now_ms(),
+                                    ) {
+                                        if let Some(observer) = direct_observer.as_deref_mut() {
+                                            observer(DirectCodexTurnObservation::ToolCall(
+                                                tool_call,
+                                            ));
+                                        }
+                                    }
+                                }
                                 if completed {
                                     if let Some(audit) = audit.as_mut() {
                                         audit.observe_item(&params);
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
index 0766ab0d3..8c94be8b2 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
@@ -4078,7 +4078,7 @@ async fn run_direct_game_creator_turn_at_with_creation_type_and_emitter(
     direct_creation_type_system_context(creation_type)?;
     emit_direct_game_creator_progress(root, "request.accepted", "已发送消息，正在等待陶泥儿回复");
     if let Some(emitter) = turn_emitter {
-        emitter.emit("accepted", Some("request-accepted"), None);
+        emitter.emit("accepted", Some("request-accepted"), None, None);
     }
     match run_direct_game_creator_turn_inner(root, prompt, creation_type, turn_emitter, audit).await
     {
@@ -4086,13 +4086,49 @@ async fn run_direct_game_creator_turn_at_with_creation_type_and_emitter(
         Err(failure) => {
             let error = record_direct_codex_turn_failure(root, failure);
             if let Some(emitter) = turn_emitter {
-                emitter.emit("failed", Some("none"), None);
+                emitter.emit("failed", Some("none"), None, None);
             }
             Err(error)
         }
     }
 }
 
+/// 本回合累积的工具调用条目（观察者写、回合末读）。
+type DirectToolCallCollector = std::sync::Arc<Mutex<Vec<DirectToolCall>>>;
+
+fn lock_direct_tool_call_collector(
+    collector: &DirectToolCallCollector,
+) -> std::sync::MutexGuard<'_, Vec<DirectToolCall>> {
+    collector
+        .lock()
+        .unwrap_or_else(|poisoned| poisoned.into_inner())
+}
+
+/// 单条工具调用落盘：走阻塞线程池（写文件要拿项目锁，不能在 async 运行时上直接跑）。
+/// 失败只返回错误交给调用方忽略，不打断回合。
+fn spawn_persist_direct_tool_call(root: &Path, call: &DirectToolCall) {
+    let root = root.to_path_buf();
+    let call = call.clone();
+    tauri::async_runtime::spawn_blocking(move || persist_direct_tool_call_at(&root, &call));
+}
+
+/// 回合结束整批落盘；失败时退回逐条 upsert，尽量把能写的写进去。
+fn persist_collected_direct_tool_calls(root: &Path, collector: &DirectToolCallCollector) {
+    let calls = {
+        let collected = lock_direct_tool_call_collector(collector);
+        collected.clone()
+    };
+    if calls.is_empty() {
+        return;
+    }
+    if persist_direct_tool_calls_at(root, &calls).is_ok() {
+        return;
+    }
+    for call in &calls {
+        let _ = persist_direct_tool_call_at(root, call);
+    }
+}
+
 async fn run_direct_game_creator_turn_inner(
     root: &Path,
     prompt: &str,
@@ -4102,8 +4138,11 @@ async fn run_direct_game_creator_turn_inner(
 ) -> Result<String, DirectCodexTurnFailure> {
     emit_direct_game_creator_progress(root, "codex.turn", "陶泥儿正在处理这条消息");
     if let Some(emitter) = turn_emitter {
-        emitter.emit("running", Some("preparing"), None);
+        emitter.emit("running", Some("preparing"), None, None);
     }
+    // 本回合累积的工具调用条目：观察者增量采集，回合结束时整批落盘（幂等 upsert）。
+    // 实时下发与落盘共用同一份数据，避免两处各采集一次产生口径差。
+    let tool_calls: DirectToolCallCollector = Arc::new(Mutex::new(Vec::new()));
     let stream_enabled = load_game_creator_app_config()
         .map(|config| config.llm.stream)
         .map_err(|error| {
@@ -4117,6 +4156,9 @@ async fn run_direct_game_creator_turn_inner(
     let reply = if let Some(emitter) = turn_emitter {
         let client_turn_id = emitter.turn_id().to_string();
         let emitter = emitter.clone();
+        let turn_root = root.to_path_buf();
+        let turn_tool_calls = Arc::clone(&tool_calls);
+        let mut emitted_tool_call_ids: BTreeSet<String> = BTreeSet::new();
         let mut observer = move |observation: DirectCodexTurnObservation| {
             let status = direct_codex_observation_status(&observation, stream_enabled);
             match observation {
@@ -4126,7 +4168,7 @@ async fn run_direct_game_creator_turn_inner(
                     if visible_text.is_none() {
                         return;
                     }
-                    emitter.emit(status, None, visible_text);
+                    emitter.emit(status, None, visible_text, None);
                 }
                 DirectCodexTurnObservation::IntermediateText(intermediate_text) => {
                     let visible_text = if stream_enabled
@@ -4137,11 +4179,33 @@ async fn run_direct_game_creator_turn_inner(
                         None
                     };
                     if let Some(visible_text) = visible_text {
-                        emitter.emit(status, None, Some(visible_text));
+                        emitter.emit(status, None, Some(visible_text), None);
                     }
                 }
                 DirectCodexTurnObservation::Activity(activity) => {
-                    emitter.emit(status, Some(activity), None);
+                    emitter.emit(status, Some(activity), None, None);
+                }
+                DirectCodexTurnObservation::ToolCall(tool_call) => {
+                    // 每条工具调用只在采集到的那一个事件里下发一次（id 与 Codex item 一一对应），
+                    // 这样既满足"集合变化才带"，也避免每个 heartbeat 重发全量。
+                    if !emitted_tool_call_ids.insert(tool_call.id.clone()) {
+                        return;
+                    }
+                    let previous = {
+                        let mut collected = lock_direct_tool_call_collector(&turn_tool_calls);
+                        let previous = collected
+                            .iter()
+                            .find(|existing| existing.id == tool_call.id)
+                            .cloned();
+                        collected.retain(|existing| existing.id != tool_call.id);
+                        collected.push(tool_call.clone());
+                        previous
+                    };
+                    emitter.emit(status, None, None, Some(vec![tool_call]));
+                    // `started` 一落盘卡片就能在刷新后立刻出现；`completed` 覆盖同一行。
+                    if let Some(previous) = previous {
+                        spawn_persist_direct_tool_call(&turn_root, &previous);
+                    }
                 }
             }
         };
@@ -4166,6 +4230,9 @@ async fn run_direct_game_creator_turn_inner(
         .await
     }
     .map_err(|error| DirectCodexTurnFailure::new(DirectCodexFailureStage::CodeGeneration, error))?;
+    // 回合结束：把本回合累积的工具调用整批落盘（一次锁、一次重写，幂等 upsert）。
+    // 落盘失败只记日志，不能把已经成功的回合判成失败——工具调用卡片是展示数据。
+    persist_collected_direct_tool_calls(root, &tool_calls);
     let visible_reply = project_direct_codex_visible_text(&reply).ok_or_else(|| {
         DirectCodexTurnFailure::new(
             DirectCodexFailureStage::CodeGeneration,
@@ -4177,6 +4244,7 @@ async fn run_direct_game_creator_turn_inner(
             "finalizing",
             Some("response-finalization"),
             Some(visible_reply.clone()),
+            None,
         );
     }
     if direct_codex_output_fingerprint(root) != previous_output_fingerprint {
@@ -4190,6 +4258,7 @@ async fn run_direct_game_creator_turn_inner(
                 "finalizing",
                 Some("file-write"),
                 Some(visible_reply.clone()),
+                None,
             );
         }
         sync_direct_codex_project_file_projection_at(root, Some(&previous_output_fingerprint))
@@ -4538,7 +4607,7 @@ pub(crate) async fn chat_with_game_creator_direct_codex(
         }
     };
     audit.finish(true);
-    turn_emitter.emit("completed", Some("none"), Some(reply.clone()));
+    turn_emitter.emit("completed", Some("none"), Some(reply.clone()), None);
     Ok(reply)
 }
 
@@ -4819,6 +4888,7 @@ mod tests {
             status: "streaming".to_string(),
             activity: None,
             accumulated_text: Some("partial".to_string()),
+            tool_calls: None,
             updated_at: 42,
         })
         .expect("serialize direct update");
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
new file mode 100644
index 000000000..cd83485d2
--- /dev/null
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -0,0 +1,753 @@
+//! GameAgent 对话「工具调用卡片」的采集、持久化与回读。
+//!
+//! 契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`：
+//! Codex app-server 的 `item/started` / `item/completed` 里带着完整的命令 / 文件变更
+//! 信息，这里把它们投影成结构化的 `DirectToolCall`，落到**独立文件**
+//! `<projectRoot>/.agent/conversations/tool-calls.jsonl`。
+//!
+//! 为什么不复用 `project.jsonl`：那条链路的回读只投影 `role ∈ {user, assistant}` 的
+//! 文本条目，而且会被注入 Codex 上下文。往里面塞新形状既装不下，又有污染模型上下文的风险。
+
+use crate::agent::redact_secret_tokens;
+use crate::config::{prepare_game_creator_private_path_for_read, write_game_creator_private_file};
+use crate::project::{enforce_project_permission_policy, project_append_lock_for};
+use crate::redact_absolute_path_tokens;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::fs::File;
+use std::io::{BufRead, BufReader};
+use std::path::{Path, PathBuf};
+
+/// 行信封类型，与既有历史文件同构（`{"type": …, "payload": {…}}`）。
+pub(crate) const DIRECT_TOOL_CALL_RECORD_TYPE: &str = "tool_call_item";
+/// 条目 schema 版本。
+pub(crate) const DIRECT_TOOL_CALL_SCHEMA_VERSION: &str = "agc-tool-call.v1";
+/// 回读上限：只保留最近这么多条（按 `updatedAt` / `startedAt` 取最新）。
+pub(crate) const DIRECT_TOOL_CALL_LIMIT: usize = 200;
+/// `detail.command` / `detail.output` 的字符上限。
+const DIRECT_TOOL_CALL_DETAIL_MAX_CHARS: usize = 4000;
+/// 折叠态摘要（`summary`）的字符上限。
+const DIRECT_TOOL_CALL_SUMMARY_MAX_CHARS: usize = 120;
+/// 单条变更路径的字符上限。
+const DIRECT_TOOL_CALL_PATH_MAX_CHARS: usize = 300;
+
+#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectToolCallChange {
+    pub(crate) path: String,
+    /// `add` | `update` | `delete`
+    pub(crate) kind: String,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectToolCallDetail {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) command: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) output: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub(crate) changes: Vec<DirectToolCallChange>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectToolCall {
+    pub(crate) schema_version: String,
+    /// Codex item 的 id。同一 item 的 started/completed 共用它，落盘时按它幂等 upsert。
+    pub(crate) id: String,
+    pub(crate) turn_id: String,
+    /// `command` | `file_change` | `mcp_tool` | `web_search` | `context_compaction` | `other`
+    pub(crate) kind: String,
+    /// 折叠态标题，按 kind 固定（`command` → `执行命令`、`file_change` → `编辑 N 个文件`）。
+    pub(crate) title: String,
+    /// 折叠态标题后面的短摘要。
+    pub(crate) summary: String,
+    /// `running` | `completed` | `failed`
+    pub(crate) status: String,
+    pub(crate) detail: DirectToolCallDetail,
+    pub(crate) started_at: u64,
+    pub(crate) updated_at: u64,
+}
+
+impl DirectToolCall {
+    fn timestamp(&self) -> u64 {
+        if self.updated_at > 0 {
+            self.updated_at
+        } else {
+            self.started_at
+        }
+    }
+}
+
+fn tool_calls_path(root: &Path) -> PathBuf {
+    root.join(".agent/conversations/tool-calls.jsonl")
+}
+
+/// 脱敏：项目内相对路径保留，其余按「先抹绝对路径、再抹密钥」处理。
+///
+/// 顺序不能反：先抹密钥会把 `sk-…` 之类的 TOKEN 换成占位符，但绝对路径里的
+/// 用户名目录仍然会留下；这里先归一化路径 token，再处理密钥。
+fn sanitize_detail_text(root: &Path, value: &str) -> String {
+    let without_absolute = redact_absolute_path_tokens(value);
+    let without_secret = redact_secret_tokens(&without_absolute);
+    let root = root.to_string_lossy();
+    if root.is_empty() {
+        return without_secret;
+    }
+    without_secret.replace(root.as_ref(), "<project-root>")
+}
+
+/// 按字符数截断（不切坏 UTF-8），并在真正截断时补省略号。
+fn bounded_chars(value: &str, max_chars: usize) -> String {
+    if value.chars().count() <= max_chars {
+        return value.to_string();
+    }
+    let mut truncated = value.chars().take(max_chars).collect::<String>();
+    truncated.push('…');
+    truncated
+}
+
+/// 取值的首行并按字符数截断（命令的摘要习惯）。
+fn first_line_bounded(value: &str, max_chars: usize) -> String {
+    let first_line = value.lines().next().unwrap_or_default().trim();
+    bounded_chars(first_line, max_chars)
+}
+
+fn optional_bounded_line(value: Option<&str>, max_chars: usize) -> Option<String> {
+    let value = value?.trim();
+    (!value.is_empty()).then(|| bounded_chars(value, max_chars))
+}
+
+fn tool_call_kind(item_type: &str) -> Option<&'static str> {
+    match item_type {
+        "commandExecution" => Some("command"),
+        "fileChange" => Some("file_change"),
+        "mcpToolCall" => Some("mcp_tool"),
+        "webSearch" => Some("web_search"),
+        "contextCompaction" => Some("context_compaction"),
+        // todoList / reasoning / plan / agentMessage 之类不属于「工具调用」，不落卡片。
+        "todoList" | "reasoning" | "plan" | "agentMessage" | "message" | "userMessage" => None,
+        _ => Some("other"),
+    }
+}
+
+fn direct_tool_call_changes(item: &Value) -> Vec<DirectToolCallChange> {
+    item.get("changes")
+        .and_then(Value::as_array)
+        .map(|changes| {
+            changes
+                .iter()
+                .filter_map(|change| {
+                    let path = change
+                        .get("path")
+                        .and_then(Value::as_str)
+                        .map(str::trim)
+                        .filter(|path| !path.is_empty())?;
+                    Some(DirectToolCallChange {
+                        path: bounded_chars(path, DIRECT_TOOL_CALL_PATH_MAX_CHARS),
+                        kind: change
+                            .get("kind")
+                            .and_then(Value::as_str)
+                            .unwrap_or("update")
+                            .to_string(),
+                    })
+                })
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default()
+}
+
+fn direct_tool_call_title(kind: &str, changes: &[DirectToolCallChange]) -> String {
+    match kind {
+        "command" => "执行命令".to_string(),
+        "file_change" => {
+            let mut paths = changes
+                .iter()
+                .map(|change| change.path.as_str())
+                .collect::<Vec<_>>();
+            paths.sort_unstable();
+            paths.dedup();
+            if paths.is_empty() {
+                "编辑文件".to_string()
+            } else {
+                format!("编辑 {} 个文件", paths.len())
+            }
+        }
+        "mcp_tool" => "调用工具".to_string(),
+        "web_search" => "搜索资料".to_string(),
+        "context_compaction" => "整理上下文".to_string(),
+        _ => "调用工具".to_string(),
+    }
+}
+
+fn direct_tool_call_status(item: &Value, completed: bool) -> &'static str {
+    // Codex 的退出码约定：非 0 即失败；缺席时按"已完成"处理。
+    if let Some(exit_code) = item.get("exitCode").and_then(Value::as_i64) {
+        return if exit_code == 0 {
+            "completed"
+        } else {
+            "failed"
+        };
+    }
+    if let Some(success) = item.get("success").and_then(Value::as_bool) {
+        return if success { "completed" } else { "failed" };
+    }
+    if completed {
+        "completed"
+    } else {
+        "running"
+    }
+}
+
+/// 把一条 Codex item 投影成工具调用条目。非工具类 item 返回 `None`。
+///
+/// `started_at` / `updated_at`：item 自己带的 `startedAtMs` / `completedAtMs` 优先，
+/// 两处都没有时才用调用方给的回退值（本机毫秒时间戳）。
+pub(crate) fn direct_tool_call_from_item(
+    root: &Path,
+    item: &Value,
+    turn_id: &str,
+    completed: bool,
+    now_ms: u64,
+) -> Option<DirectToolCall> {
+    let item_type = item.get("type").and_then(Value::as_str)?;
+    let kind = tool_call_kind(item_type)?;
+    let id = item
+        .get("id")
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .filter(|id| !id.is_empty())?;
+
+    let item_started_at = item
+        .get("startedAtMs")
+        .and_then(Value::as_u64)
+        .unwrap_or_default();
+    let item_completed_at = item
+        .get("completedAtMs")
+        .and_then(Value::as_u64)
+        .unwrap_or_default();
+    let started_at = if item_started_at > 0 {
+        item_started_at
+    } else if item_completed_at > 0 {
+        item_completed_at
+    } else {
+        now_ms
+    };
+    let updated_at = if item_completed_at > 0 {
+        item_completed_at
+    } else {
+        started_at.max(now_ms)
+    };
+
+    let command = item
+        .get("command")
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .filter(|command| !command.is_empty())
+        .map(|command| sanitize_detail_text(root, command))
+        .map(|command| bounded_chars(&command, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS));
+    let output = item
+        .get("aggregatedOutput")
+        .or_else(|| item.get("output"))
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .filter(|output| !output.is_empty())
+        .map(|output| sanitize_detail_text(root, output))
+        .map(|output| bounded_chars(&output, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS));
+    // `fileChange` 的路径先脱敏成"项目内相对路径"：绝对路径会被抹成 `<absolute-path>`，
+    // 相对路径原样保留（契约要求 detail.changes[].path 用项目相对路径）。
+    let changes = direct_tool_call_changes(item)
+        .into_iter()
+        .map(|change| DirectToolCallChange {
+            path: sanitize_detail_text(root, &change.path),
+            kind: change.kind,
+        })
+        .collect::<Vec<_>>();
+
+    let summary_source = command
+        .as_deref()
+        .or_else(|| changes.first().map(|change| change.path.as_str()))
+        .or_else(|| {
+            item.get("tool")
+                .and_then(Value::as_str)
+                .map(str::trim)
+                .filter(|tool| !tool.is_empty())
+        })
+        .unwrap_or_default();
+    let summary = first_line_bounded(summary_source, DIRECT_TOOL_CALL_SUMMARY_MAX_CHARS);
+
+    Some(DirectToolCall {
+        schema_version: DIRECT_TOOL_CALL_SCHEMA_VERSION.to_string(),
+        id: id.to_string(),
+        turn_id: turn_id.trim().to_string(),
+        kind: kind.to_string(),
+        title: direct_tool_call_title(kind, &changes),
+        summary,
+        status: direct_tool_call_status(item, completed).to_string(),
+        detail: DirectToolCallDetail {
+            command,
+            output,
+            changes,
+        },
+        started_at,
+        updated_at,
+    })
+}
+
+fn record_line(call: &DirectToolCall) -> Result<String, String> {
+    serde_json::to_string(&serde_json::json!({
+        "type": DIRECT_TOOL_CALL_RECORD_TYPE,
+        "payload": call,
+    }))
+    .map_err(|error| format!("序列化工具调用条目失败：{error}"))
+}
+
+/// 解析一行信封；坏行 / 非本文件条目都返回 `None`（尽力而为的展示数据，不整体失败）。
+fn tool_call_from_line(line: &str) -> Option<DirectToolCall> {
+    let trimmed = line.trim();
+    if trimmed.is_empty() {
+        return None;
+    }
+    let parsed: Value = serde_json::from_str(trimmed).ok()?;
+    if parsed.get("type").and_then(Value::as_str) != Some(DIRECT_TOOL_CALL_RECORD_TYPE) {
+        return None;
+    }
+    let payload = parsed.get("payload")?;
+    let mut call: DirectToolCall = serde_json::from_value(payload.clone()).ok()?;
+    if call.id.trim().is_empty() {
+        return None;
+    }
+    if call.schema_version.trim().is_empty() {
+        call.schema_version = DIRECT_TOOL_CALL_SCHEMA_VERSION.to_string();
+    }
+    Some(call)
+}
+
+fn read_tool_call_lines(path: &Path) -> Vec<DirectToolCall> {
+    let Ok(file) = File::open(path) else {
+        return Vec::new();
+    };
+    let mut calls = Vec::new();
+    for line in BufReader::new(file).lines() {
+        let Ok(line) = line else {
+            break;
+        };
+        if let Some(call) = tool_call_from_line(&line) {
+            calls.push(call);
+        }
+    }
+    calls
+}
+
+/// 按 id 归并（后写覆盖先写），再按时间正序裁剪到最近 `DIRECT_TOOL_CALL_LIMIT` 条。
+fn normalize_tool_calls(calls: Vec<DirectToolCall>) -> Vec<DirectToolCall> {
+    let mut by_id: BTreeMap<String, DirectToolCall> = BTreeMap::new();
+    for call in calls {
+        by_id.insert(call.id.clone(), call);
+    }
+    let mut normalized = by_id.into_values().collect::<Vec<_>>();
+    normalized.sort_by(|left, right| {
+        left.timestamp()
+            .cmp(&right.timestamp())
+            .then_with(|| left.id.cmp(&right.id))
+    });
+    if normalized.len() > DIRECT_TOOL_CALL_LIMIT {
+        normalized.drain(..normalized.len() - DIRECT_TOOL_CALL_LIMIT);
+    }
+    normalized
+}
+
+/// 回读：文件缺失返回空数组；单行损坏跳过；按时间正序，最多最近 200 条。
+pub(crate) fn read_direct_tool_calls_at(root: &Path) -> Result<Vec<DirectToolCall>, String> {
+    let path = tool_calls_path(root);
+    if !prepare_game_creator_private_path_for_read(&path, false, "工具调用历史")? {
+        return Ok(Vec::new());
+    }
+    Ok(normalize_tool_calls(read_tool_call_lines(&path)))
+}
+
+/// 同一 id 的 `startedAt` 取最早的非零值：`item/completed` 事件不一定带
+/// `startedAtMs`，不能让 completed 覆盖掉 started 记下的起点（卡片时间序依赖它）。
+fn preserve_started_at(incoming: &mut DirectToolCall, existing: Option<&DirectToolCall>) {
+    let Some(existing) = existing else {
+        return;
+    };
+    if existing.started_at > 0
+        && (incoming.started_at == 0 || existing.started_at < incoming.started_at)
+    {
+        incoming.started_at = existing.started_at;
+    }
+}
+
+/// 幂等 upsert：同 id 只保留一行，`completed` 覆盖 `started`。
+///
+/// 单次尝试的顺序是「取项目锁 + append 锁 → 锁内读 → 整文件原子替换」。
+/// 工具调用是**追加 + 就地更新**混用的数据，没有纯追加的 JSONL 语义，所以只能整文件重写；
+/// 文件规模由 200 条上限与 4000 字符截断兜住。
+fn upsert_direct_tool_call_once(root: &Path, call: &DirectToolCall) -> Result<(), String> {
+    let path = tool_calls_path(root);
+    let _project_lock = crate::acquire_game_creator_agent_runtime_project_write_lock_with_wait(
+        root,
+        "conversation.write",
+    )?;
+    let lock = project_append_lock_for(&path)?;
+    let _append_guard = lock.lock("工具调用历史写入")?;
+    let mut calls = read_tool_call_lines(&path);
+    let existing = calls
+        .iter()
+        .find(|existing| existing.id == call.id)
+        .cloned();
+    let mut incoming = call.clone();
+    preserve_started_at(&mut incoming, existing.as_ref());
+    calls.retain(|existing| existing.id != call.id);
+    calls.push(incoming);
+    let normalized = normalize_tool_calls(calls);
+    let mut body = String::new();
+    for existing in &normalized {
+        body.push_str(&record_line(existing)?);
+        body.push('\n');
+    }
+    write_game_creator_private_file(&path, body.as_bytes(), "工具调用历史")
+}
+
+/// 落盘入口。失败不抛给调用方以外的地方——工具调用是展示数据，不能因为它把整轮判失败。
+pub(crate) fn persist_direct_tool_call_at(
+    root: &Path,
+    call: &DirectToolCall,
+) -> Result<(), String> {
+    enforce_project_permission_policy(root, "conversation.write")?;
+    upsert_direct_tool_call_once(root, call)
+}
+
+/// 一轮结束时把本回合累积的工具调用整批落盘（一次锁、一次重写）。
+pub(crate) fn persist_direct_tool_calls_at(
+    root: &Path,
+    calls: &[DirectToolCall],
+) -> Result<(), String> {
+    if calls.is_empty() {
+        return Ok(());
+    }
+    enforce_project_permission_policy(root, "conversation.write")?;
+    let path = tool_calls_path(root);
+    let _project_lock = crate::acquire_game_creator_agent_runtime_project_write_lock_with_wait(
+        root,
+        "conversation.write",
+    )?;
+    let lock = project_append_lock_for(&path)?;
+    let _append_guard = lock.lock("工具调用历史写入")?;
+    let mut existing = read_tool_call_lines(&path);
+    let mut incoming = calls.to_vec();
+    for call in incoming.iter_mut() {
+        let previous = existing
+            .iter()
+            .find(|existing| existing.id == call.id)
+            .cloned();
+        preserve_started_at(call, previous.as_ref());
+    }
+    let ids = incoming
+        .iter()
+        .map(|call| call.id.as_str())
+        .collect::<Vec<_>>();
+    existing.retain(|call| !ids.contains(&call.id.as_str()));
+    existing.extend(incoming);
+    let normalized = normalize_tool_calls(existing);
+    let mut body = String::new();
+    for call in &normalized {
+        body.push_str(&record_line(call)?);
+        body.push('\n');
+    }
+    write_game_creator_private_file(&path, body.as_bytes(), "工具调用历史")
+}
+
+/// 本机毫秒时间戳（item 没带时间时用）。
+pub(crate) fn direct_tool_call_now_ms() -> u64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_millis()
+        .min(u64::MAX as u128) as u64
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{
+        direct_tool_call_from_item, direct_tool_call_now_ms, persist_direct_tool_call_at,
+        persist_direct_tool_calls_at, read_direct_tool_calls_at, tool_calls_path,
+        DIRECT_TOOL_CALL_LIMIT,
+    };
+    use serde_json::json;
+
+    fn init_tool_call_project(name: &str) -> tempfile::TempDir {
+        let root = tempfile::tempdir().expect("temp project");
+        crate::init_local_game_project_at(root.path(), name, "工具调用卡片测试")
+            .expect("init project");
+        root
+    }
+
+    fn command_item(id: &str, command: &str) -> serde_json::Value {
+        json!({
+            "id": id,
+            "type": "commandExecution",
+            "command": command,
+            "status": "inProgress",
+            "startedAtMs": 1000,
+        })
+    }
+
+    /// 判据：同一 item 的 started 与 completed 只落一行，completed 覆盖 status。
+    #[test]
+    fn tool_call_upsert_is_idempotent_per_item_id() {
+        let root = init_tool_call_project("tool-call-upsert");
+        let started = direct_tool_call_from_item(
+            root.path(),
+            &command_item("item-1", "npm run build"),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("started tool call");
+        persist_direct_tool_call_at(root.path(), &started).expect("persist started");
+
+        let completed = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-1",
+                "type": "commandExecution",
+                "command": "npm run build",
+                "exitCode": 0,
+                "completedAtMs": 2000,
+            }),
+            "turn-1",
+            true,
+            2000,
+        )
+        .expect("completed tool call");
+        persist_direct_tool_call_at(root.path(), &completed).expect("persist completed");
+
+        let calls = read_direct_tool_calls_at(root.path()).expect("read tool calls");
+        assert_eq!(calls.len(), 1, "同一 id 只能有一行");
+        assert_eq!(calls[0].status, "completed");
+        assert_eq!(calls[0].started_at, 1000, "startedAt 不被 completed 覆盖");
+        assert_eq!(calls[0].updated_at, 2000);
+    }
+
+    /// 判据：非 0 退出码判 failed。
+    #[test]
+    fn tool_call_marks_failed_on_non_zero_exit_code() {
+        let root = init_tool_call_project("tool-call-failed");
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-failed",
+                "type": "commandExecution",
+                "command": "npm test",
+                "exitCode": 1,
+                "completedAtMs": 3000,
+            }),
+            "turn-1",
+            true,
+            3000,
+        )
+        .expect("failed tool call");
+        assert_eq!(call.status, "failed");
+    }
+
+    /// 判据：command / output 截断到 4000 字符，summary 截断到 120 字符。
+    #[test]
+    fn tool_call_truncates_command_output_and_summary() {
+        let root = init_tool_call_project("tool-call-truncate");
+        let long_command = "a".repeat(5000);
+        let long_output = "b".repeat(5000);
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-long",
+                "type": "commandExecution",
+                "command": long_command,
+                "aggregatedOutput": long_output,
+                "startedAtMs": 1000,
+            }),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("long tool call");
+        let command = call.detail.command.expect("bounded command");
+        let output = call.detail.output.expect("bounded output");
+        assert_eq!(command.chars().count(), 4001, "4000 字符 + 省略号");
+        assert_eq!(output.chars().count(), 4001, "4000 字符 + 省略号");
+        assert_eq!(call.summary.chars().count(), 121, "120 字符 + 省略号");
+    }
+
+    /// 判据：脱敏后不出现 API Key / Token / 绝对用户目录。
+    #[test]
+    fn tool_call_redacts_secrets_and_absolute_paths() {
+        let root = init_tool_call_project("tool-call-redact");
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-secret",
+                "type": "commandExecution",
+                "command": "curl -H 'Authorization: Bearer sk-abcdefghijklmnop' https://example.com",
+                "aggregatedOutput": "OPENAI_API_KEY=tnr_sk_abcdefghijklmnop /home/someuser/private/notes.txt",
+                "startedAtMs": 1000,
+            }),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("redacted tool call");
+        let command = call.detail.command.as_deref().expect("command");
+        let output = call.detail.output.as_deref().expect("output");
+        assert!(
+            !command.contains("sk-abcdefghijklmnop"),
+            "命令里的 API Key 必须脱敏：{command}"
+        );
+        assert!(
+            !output.contains("tnr_sk_abcdefghijklmnop"),
+            "输出里的 Token 必须脱敏：{output}"
+        );
+        assert!(
+            !output.contains("/home/someuser"),
+            "输出里的绝对用户目录必须脱敏：{output}"
+        );
+
+        persist_direct_tool_call_at(root.path(), &call).expect("persist redacted call");
+        let raw = std::fs::read_to_string(tool_calls_path(root.path())).expect("read raw file");
+        assert!(
+            !raw.contains("sk-abcdefghijklmnop"),
+            "落盘文件里不得出现 API Key"
+        );
+        assert!(
+            !raw.contains("/home/someuser"),
+            "落盘文件里不得出现绝对用户目录"
+        );
+    }
+
+    /// 判据：单行损坏只跳过该行，不整体失败；缺文件返回空数组。
+    #[test]
+    fn tool_call_read_skips_corrupted_lines() {
+        let root = init_tool_call_project("tool-call-corrupt");
+        let path = tool_calls_path(root.path());
+        std::fs::create_dir_all(path.parent().expect("parent")).expect("create dir");
+        let good = serde_json::to_string(&json!({
+            "type": "tool_call_item",
+            "payload": {
+                "schemaVersion": "agc-tool-call.v1",
+                "id": "item-good",
+                "turnId": "turn-1",
+                "kind": "command",
+                "title": "执行命令",
+                "summary": "npm run build",
+                "status": "completed",
+                "detail": {"command": "npm run build"},
+                "startedAt": 1,
+                "updatedAt": 2
+            }
+        }))
+        .expect("serialize good row");
+        std::fs::write(
+            &path,
+            format!("{good}\n{{ not json\n{{\"type\":\"other\",\"payload\":{{}}}}\n{good}\n"),
+        )
+        .expect("write fixture");
+
+        let missing = tempfile::tempdir().expect("missing dir");
+        assert!(
+            read_direct_tool_calls_at(missing.path())
+                .expect("missing file is empty")
+                .is_empty(),
+            "历史文件缺失必须返回空数组"
+        );
+
+        let calls = read_direct_tool_calls_at(root.path()).expect("read with corrupted lines");
+        assert_eq!(calls.len(), 1, "坏行被跳过，同 id 归并成一条");
+        assert_eq!(calls[0].id, "item-good");
+    }
+
+    /// 判据：回读按时间正序，且超出上限时保留最新。
+    #[test]
+    fn tool_call_read_is_ordered_and_capped() {
+        let root = init_tool_call_project("tool-call-cap");
+        let total = DIRECT_TOOL_CALL_LIMIT + 5;
+        let calls = (0..total)
+            .map(|index| {
+                direct_tool_call_from_item(
+                    root.path(),
+                    &json!({
+                        "id": format!("item-{index:04}"),
+                        "type": "commandExecution",
+                        "command": format!("run {index}"),
+                        "startedAtMs": 1000 + index as u64,
+                    }),
+                    "turn-1",
+                    false,
+                    1000 + index as u64,
+                )
+                .expect("tool call")
+            })
+            .collect::<Vec<_>>();
+        persist_direct_tool_calls_at(root.path(), &calls).expect("persist batch");
+
+        let read = read_direct_tool_calls_at(root.path()).expect("read capped");
+        assert_eq!(read.len(), DIRECT_TOOL_CALL_LIMIT, "超出上限保留最新 N 条");
+        assert_eq!(
+            read.first().expect("first").id,
+            format!("item-{:04}", total - DIRECT_TOOL_CALL_LIMIT),
+            "最早被裁掉的是最旧的条目"
+        );
+        assert!(
+            read.windows(2)
+                .all(|pair| pair[0].timestamp() <= pair[1].timestamp()),
+            "回读必须按时间正序"
+        );
+    }
+
+    /// 判据：fileChange 的标题按去重后的变更数量，摘要取首个变更路径。
+    #[test]
+    fn tool_call_file_change_title_counts_unique_paths() {
+        let root = init_tool_call_project("tool-call-file-change");
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-files",
+                "type": "fileChange",
+                "changes": [
+                    {"path": "game/src/a.ts", "kind": "update"},
+                    {"path": "game/src/a.ts", "kind": "update"},
+                    {"path": "game/src/b.ts", "kind": "add"}
+                ],
+                "startedAtMs": 1000,
+            }),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("file change tool call");
+        assert_eq!(call.kind, "file_change");
+        assert_eq!(call.title, "编辑 2 个文件");
+        assert_eq!(call.summary, "game/src/a.ts");
+        assert_eq!(call.detail.changes.len(), 3);
+    }
+
+    /// 判据：非工具类 item 不产卡片。
+    #[test]
+    fn tool_call_skips_non_tool_items() {
+        let root = init_tool_call_project("tool-call-skip");
+        for item_type in ["reasoning", "agentMessage", "todoList", "plan"] {
+            assert!(
+                direct_tool_call_from_item(
+                    root.path(),
+                    &json!({"id": "item-x", "type": item_type}),
+                    "turn-1",
+                    false,
+                    direct_tool_call_now_ms(),
+                )
+                .is_none(),
+                "{item_type} 不应产出工具调用卡片"
+            );
+        }
+    }
+}
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
index 2a1b77488..2c6867fb3 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
@@ -49,6 +49,7 @@ impl DirectGameCreatorTurnUpdateEmitter {
         status: &'static str,
         activity: Option<&'static str>,
         accumulated_text: Option<String>,
+        tool_calls: Option<Vec<crate::DirectToolCall>>,
     ) {
         let status_is_allowed = matches!(
             status,
@@ -92,6 +93,7 @@ impl DirectGameCreatorTurnUpdateEmitter {
                 status: status.to_string(),
                 activity: activity.map(str::to_string),
                 accumulated_text,
+                tool_calls,
                 updated_at,
             },
         );
diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index fbfd893e2..4e28e1de7 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -5237,6 +5237,19 @@ pub(crate) async fn read_direct_project_conversation(
     .map_err(|error| format!("读取 DirectProject 历史后台任务失败：{error}"))?
 }
 
+#[tauri::command]
+pub(crate) async fn read_direct_tool_calls(
+    project_path: String,
+) -> Result<Vec<DirectToolCall>, String> {
+    tauri::async_runtime::spawn_blocking(move || {
+        let root = Path::new(project_path.trim());
+        enforce_project_permission_policy(root, "conversation.read")?;
+        read_direct_tool_calls_at(root)
+    })
+    .await
+    .map_err(|error| format!("读取工具调用历史后台任务失败：{error}"))?
+}
+
 #[tauri::command]
 pub(crate) fn append_local_conversation_message(
     project_path: String,
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 3813a0eb6..af5c97c77 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -973,6 +973,10 @@ struct GameCreatorDirectTurnUpdateEvent {
     status: String,
     activity: Option<String>,
     accumulated_text: Option<String>,
+    /// 本回合内发生变化的结构化工具调用集合（只有变化时才带，老事件没有这个字段）。
+    /// `skip_serializing_if`：字段缺席时前端拿到 `undefined`，行为与改造前一致。
+    #[serde(skip_serializing_if = "Option::is_none")]
+    tool_calls: Option<Vec<crate::DirectToolCall>>,
     updated_at: u64,
 }
 
@@ -2724,6 +2728,7 @@ fn main() {
             archive_game_creator_agent_session,
             read_local_conversation,
             read_direct_project_conversation,
+            read_direct_tool_calls,
             append_local_conversation_message,
             append_direct_project_conversation_message,
             build_local_project_index,

From abbf1465e2dba31bcd38610283dcddc40fee00ed Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Mon, 14 Sep 2026 15:00:46 +0800
Subject: [PATCH 07/67] =?UTF-8?q?GameAgent=20=E5=B7=A5=E5=85=B7=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=8D=A1=E7=89=87=EF=BC=9A=E5=9B=9E=E8=AF=BB=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E3=80=81=E6=8A=98=E5=8F=A0=E5=8D=A1=E7=89=87=E4=B8=8E?=
 =?UTF-8?q?=E6=97=A0=E9=9A=9C=E7=A2=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- app/types.ts：新增 GameCreatorDirectToolCall / Detail / Change 类型，并给
  GameCreatorDirectTurnUpdateEvent 增加可选 toolCalls 字段（老事件 undefined 走原路径）
- App.tsx：订阅 game-creator-direct-turn-update 时按 id 归并工具调用增量（completed 覆盖
  running、startedAt 取最早），打开项目时整表替换为 read_direct_tool_calls 的回读结果
- App.tsx：只把「对话里已有该回合」或「当前正在跑的回合」的工具调用交给面板，避免旧卡片漂尾
- ProjectSupervisorView.tsx：新增 toolCalls / activeTurnId 属性，按回合把卡片插在
  **同一回合最后一条 assistant 消息之后**，同回合内按 startedAt 升序；当前回合在 assistant
  消息落盘前锚到最后一条 assistant 消息
- ToolCallCard.tsx（新增）：Codex 风格可折叠卡片，`<button aria-expanded aria-controls>` +
  `hidden` 控制展开，键盘可达，aria-label 为「执行命令：npm run build」
- ToolCallCard.tsx：折叠态显示图标/标题/摘要/进行中状态点/状态文案；展开态显示命令、
  文件路径 + 变更类型、输出
- styles.css：新增工具调用卡片样式区块，running 状态点与 failed 配色都用现有 --platform-* 变量
- tests/appSurface/project-development.suite.ts：新增两条用例 —— 实时回合卡片从 running 走到
  completed 并在回合结束后仍挂在同一回合消息之后；打开项目时调用 read_direct_tool_calls
---
 apps/ai-game-creator-shell/src/App.tsx        | 124 ++++++
 apps/ai-game-creator-shell/src/app/types.ts   |  56 +++
 .../ProjectSupervisorView.tsx                 |  79 +++-
 .../project-workspace/ToolCallCard.tsx        | 117 ++++++
 apps/ai-game-creator-shell/src/styles.css     | 161 ++++++++
 .../appSurface/project-development.suite.ts   | 366 ++++++++++++++++++
 6 files changed, 891 insertions(+), 12 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 3aece9802..fd12809a6 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -57,6 +57,7 @@ import type {
   DesignView,
   GameCreatorAgentRuntimeUpdateEvent,
   GameCreatorChatAgentReply,
+  GameCreatorDirectToolCall,
   GameCreatorDirectTurnUpdateEvent,
   GameCreatorLlmConfigStatus,
   GameCreatorManifestInvalidatedEvent,
@@ -456,6 +457,21 @@ function directCodexConversationMessageId(
   return `${DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX}${turnId}:${role}`;
 }
 
+/** 从 `direct-codex:<turnId>:assistant` 反解回合 id；不是这个形状就返回 `null`。 */
+function directCodexTurnIdFromAssistantMessageId(messageId: string) {
+  const suffix = ':assistant';
+  if (
+    !messageId.startsWith(DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX) ||
+    !messageId.endsWith(suffix)
+  ) {
+    return null;
+  }
+  return messageId.slice(
+    DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX.length,
+    -suffix.length,
+  );
+}
+
 export function isDirectCodexTurnAlreadyRunningError(error: unknown) {
   const message = error instanceof Error ? error.message : String(error);
   return message
@@ -755,6 +771,57 @@ export function App({
   } | null>(null);
   const lastDirectCodexActivityRef = useRef<string | null>(null);
   const directCodexConversationTurnSequenceRef = useRef(0);
+  // 工具调用卡片：按 **id** 归并（实时增量 + 回读历史共用一份），同一 id 只渲染一次。
+  // 用 ref 做写入基准，避免同一批事件里多条增量互相覆盖。
+  const [directToolCalls, setDirectToolCalls] = useState<
+    GameCreatorDirectToolCall[]
+  >([]);
+  const directToolCallsRef = useRef<GameCreatorDirectToolCall[]>([]);
+  /**
+   * 归并一批工具调用：同 id 覆盖已有条目（`completed` 覆盖 `running`），
+   * 新 id 追加（保持首次出现顺序）。实时增量与回读历史都走这里，所以同一 id 不会重复渲染。
+   */
+  function applyDirectToolCalls(
+    incoming: readonly GameCreatorDirectToolCall[],
+  ) {
+    if (incoming.length === 0) {
+      return;
+    }
+    const merged = [...directToolCallsRef.current];
+    for (const call of incoming) {
+      const id = call.id?.trim();
+      if (!id) {
+        continue;
+      }
+      const existingIndex = merged.findIndex((existing) => existing.id === id);
+      const normalized: GameCreatorDirectToolCall = {
+        ...call,
+        id,
+        detail: call.detail ?? { changes: [] },
+      };
+      // 起点时间取更早的那个：`completed` 事件不一定带 startedAt。
+      const existing = existingIndex >= 0 ? merged[existingIndex] : undefined;
+      if (
+        existing &&
+        existing.startedAt > 0 &&
+        (normalized.startedAt === 0 ||
+          existing.startedAt < normalized.startedAt)
+      ) {
+        normalized.startedAt = existing.startedAt;
+      }
+      if (existingIndex >= 0) {
+        merged[existingIndex] = normalized;
+      } else {
+        merged.push(normalized);
+      }
+    }
+    merged.sort(
+      (left, right) =>
+        left.startedAt - right.startedAt || left.id.localeCompare(right.id),
+    );
+    directToolCallsRef.current = merged;
+    setDirectToolCalls(merged);
+  }
   const [projectSupervisorSessionId, setProjectSupervisorSessionId] = useState<
     string | null
   >(null);
@@ -786,6 +853,23 @@ export function App({
     setDirectCodexTransientReplyUpdatedAt(null);
   }
 
+  /** 工具调用卡片按项目维度作废：换项目 / 重开历史时整体替换，避免串项目。 */
+  function replaceDirectToolCalls(next: readonly GameCreatorDirectToolCall[]) {
+    const normalized = next
+      .filter((call) => Boolean(call.id?.trim()))
+      .map((call) => ({
+        ...call,
+        id: call.id.trim(),
+        detail: call.detail ?? { changes: [] },
+      }))
+      .sort(
+        (left, right) =>
+          left.startedAt - right.startedAt || left.id.localeCompare(right.id),
+      );
+    directToolCallsRef.current = normalized;
+    setDirectToolCalls(normalized);
+  }
+
   function clearDirectCodexTransientReply(projectPath: string, turnId: string) {
     const activeTurn = activeDirectCodexTurnRef.current;
     if (
@@ -1702,6 +1786,15 @@ export function App({
         }
         activeTurn.lastSequence = payload.sequence;
         activeTurn.receivedDirectUpdate = true;
+        // 工具调用增量：字段可选，老事件（undefined）走原路径，行为不变。
+        if (payload.toolCalls?.length) {
+          applyDirectToolCalls(
+            payload.toolCalls.map((call) => ({
+              ...call,
+              turnId: payload.turnId,
+            })),
+          );
+        }
         const updatedAt =
           Number.isFinite(payload.updatedAt) && payload.updatedAt > 0
             ? payload.updatedAt
@@ -3321,6 +3414,17 @@ export function App({
           ? { projectPath: nextProjectPath }
           : { projectPath: nextProjectPath, agentId: null },
       );
+      // 工具调用卡片走独立历史文件（`tool-calls.jsonl`）。必须在读完项目对话之后、
+      // 任何提前 return 之前回读：direct-codex 下后面那条 design-agent 分支会直接返回，
+      // 放在它后面等于永远不执行。文件缺失 / 读取失败都只是没有卡片，不能因此把整个
+      // 项目打开流程判失败。卡片按项目维度整表替换，同一 id 只渲染一次。
+      if (directCodexProductRuntime) {
+        const persistedToolCalls = await invoke<GameCreatorDirectToolCall[]>(
+          'read_direct_tool_calls',
+          { projectPath: nextProjectPath },
+        ).catch(() => []);
+        replaceDirectToolCalls(persistedToolCalls);
+      }
       let supervisorConversation: LocalConversationResult | null = null;
       let runtime: AgentRuntimeState | null = null;
       let runtimeResponseStream: AgentRuntimeResponseStream | null = null;
@@ -11520,6 +11624,20 @@ export function App({
     0,
     messages.length - visibleMessages.length,
   );
+  // 工具调用卡片只保留「当前消息列表里确实有这个回合」的那些：实时回合一进来就能挂上，
+  // 历史回合只有对应的 assistant 消息还在列表里才渲染，避免旧卡片漂在列表尾部。
+  const visibleTurnIds = new Set(
+    messages
+      .map((message) => message.messageId)
+      .filter((messageId): messageId is string => Boolean(messageId))
+      .map(directCodexTurnIdFromAssistantMessageId)
+      .filter((turnId): turnId is string => Boolean(turnId)),
+  );
+  const visibleToolCalls = directToolCalls.filter(
+    (call) =>
+      visibleTurnIds.has(call.turnId) ||
+      call.turnId === activeDirectCodexTurnRef.current?.turnId,
+  );
   const projectSupervisorTransientReply =
     projectSupervisorResponseStream?.accumulatedText.trim() ?? '';
   const projectSupervisorNeedsUserInput = agentRuntimeNeedsUserInput(
@@ -11789,6 +11907,12 @@ export function App({
         }
         pendingCommand={directCodexProductRuntime ? pendingCommand : null}
         projectPath={localProject?.projectPath ?? projectPath}
+        toolCalls={visibleToolCalls}
+        activeTurnId={
+          directCodexProductRuntime
+            ? (activeDirectCodexTurnRef.current?.turnId ?? null)
+            : null
+        }
         transientReply={
           planningV2Active
             ? planningV2TransientReply
diff --git a/apps/ai-game-creator-shell/src/app/types.ts b/apps/ai-game-creator-shell/src/app/types.ts
index a89c1698a..5e59dbcf5 100644
--- a/apps/ai-game-creator-shell/src/app/types.ts
+++ b/apps/ai-game-creator-shell/src/app/types.ts
@@ -1087,6 +1087,57 @@ export type GameCreatorDirectTurnActivity =
   | 'response-finalization'
   | 'none';
 
+export type GameCreatorDirectToolCallKind =
+  | 'command'
+  | 'file_change'
+  | 'mcp_tool'
+  | 'web_search'
+  | 'context_compaction'
+  | 'other';
+
+export type GameCreatorDirectToolCallStatus =
+  | 'running'
+  | 'completed'
+  | 'failed';
+
+export interface GameCreatorDirectToolCallChange {
+  path: string;
+  kind: 'add' | 'update' | 'delete' | string;
+}
+
+export interface GameCreatorDirectToolCallDetail {
+  command?: string;
+  output?: string;
+  changes?: GameCreatorDirectToolCallChange[];
+}
+
+/**
+ * 一条工具调用（Codex item 的结构化投影）。
+ *
+ * 契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`：
+ * 字段形状与 Rust 侧 `DirectToolCall`、独立历史文件
+ * `.agent/conversations/tool-calls.jsonl` 的 payload 一致（这里少 `turnId` 的变体用于
+ * 事件增量，见下面 `GameCreatorDirectTurnToolCall`）。
+ */
+export interface GameCreatorDirectToolCall {
+  schemaVersion: string;
+  id: string;
+  turnId: string;
+  kind: GameCreatorDirectToolCallKind;
+  title: string;
+  summary: string;
+  status: GameCreatorDirectToolCallStatus;
+  detail: GameCreatorDirectToolCallDetail;
+  startedAt: number;
+  updatedAt: number;
+}
+
+/** 事件里下发的增量条目：与持久化同形，去掉 `turnId`（回合 id 在事件顶层）。 */
+export type GameCreatorDirectTurnToolCall = Omit<
+  GameCreatorDirectToolCall,
+  'turnId'
+>;
+
 export interface GameCreatorDirectTurnUpdateEvent {
   projectPath: string;
   turnId: string;
@@ -1094,6 +1145,11 @@ export interface GameCreatorDirectTurnUpdateEvent {
   status: GameCreatorDirectTurnUpdateStatus;
   activity?: GameCreatorDirectTurnActivity | null;
   accumulatedText?: string | null;
+  /**
+   * 本回合内**发生变化**的结构化工具调用（只有变化时才带，不是每个 heartbeat 都带全量）。
+   * 可选：老版本事件没有这个字段，前端拿到 `undefined` 时必须与改造前行为一致。
+   */
+  toolCalls?: GameCreatorDirectTurnToolCall[] | null;
   updatedAt: number;
 }
 
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 a94385beb..d285bcb7e 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
@@ -13,11 +13,12 @@ import type {
   RefObject,
   UIEventHandler,
 } from 'react';
-import { useEffect, useRef, useState } from 'react';
+import { Fragment, useEffect, useRef, useState } from 'react';
 
 import type {
   AgentStatusCard,
   ChatMessage,
+  GameCreatorDirectToolCall,
   GameCreatorDirectTurnUpdateStatus,
   PendingCommand,
   PendingUiConfirmation,
@@ -62,6 +63,12 @@ import {
   type ResourceReferenceInputHandle,
 } from './ResourceReferenceInput';
 import type { ChatComposerDraft, ChatReference } from './resourceReferences';
+import { ToolCallCard } from './ToolCallCard';
+
+/** 与 `App.tsx` 的回合消息 id 同构：`direct-codex:<turnId>:<role>`。 */
+function directCodexTurnMessageId(turnId: string, role: 'user' | 'assistant') {
+  return `direct-codex:${turnId}:${role}`;
+}
 
 type RuntimePanelProps = ComponentProps<typeof ProjectSupervisorRuntimePanel>;
 
@@ -108,6 +115,10 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   pendingConfirmation: PendingUiConfirmation | null;
   pendingCommand: PendingCommand | null;
   projectPath: string;
+  /** 本回合（含历史回读）的工具调用卡片，按 `startedAt` 升序，同一 id 只会出现一次。 */
+  toolCalls?: GameCreatorDirectToolCall[];
+  /** 当前正在跑的回合 id；卡片在 assistant 消息落盘前锚到它。 */
+  activeTurnId?: string | null;
   showProfessionalCollaboration?: boolean;
   transientReply: string;
   designReasoning?: string;
@@ -161,6 +172,8 @@ export function ProjectSupervisorView({
   pendingConfirmation,
   pendingCommand,
   projectPath,
+  toolCalls = [],
+  activeTurnId = null,
   showProfessionalCollaboration = true,
   transientReply,
   designReasoning = '',
@@ -214,6 +227,37 @@ export function ProjectSupervisorView({
   }, [settingsOpen]);
   const runBusy =
     runtimePanelProps.controlBusy || Boolean(directProcessDetail) || submitting;
+  // 工具调用卡片按回合分组：契约要求插在**同一回合最后一条 assistant 消息之后**。
+  // 当前正在跑的回合还没有 assistant 消息落盘，锚到窗口里最后一条 assistant 消息；
+  // 历史回合一律锚到自己那条 `direct-codex:<turnId>:assistant`，不回落到别的回合。
+  const liveAssistantMessageId = [...visibleMessages]
+    .reverse()
+    .find((message) => message.role === 'assistant')?.messageId;
+  const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
+  if (directCodex) {
+    const streamTurnId = activeTurnId?.trim() ?? '';
+    for (const call of toolCalls) {
+      const expected = directCodexTurnMessageId(call.turnId, 'assistant');
+      const hasPersistedAssistant = visibleMessages.some(
+        (message) => message.messageId === expected,
+      );
+      const anchor =
+        call.turnId === streamTurnId
+          ? (liveAssistantMessageId ?? null)
+          : hasPersistedAssistant
+            ? expected
+            : null;
+      if (!anchor) {
+        continue;
+      }
+      const bucket = toolCallsByAnchor.get(anchor);
+      if (bucket) {
+        bucket.push(call);
+      } else {
+        toolCallsByAnchor.set(anchor, [call]);
+      }
+    }
+  }
   const emptyState =
     directCodex &&
     visibleMessages.length === 0 &&
@@ -320,17 +364,28 @@ export function ProjectSupervisorView({
               {`显示更早 · 还有 ${hiddenConversationCount} 条对话`}
             </button>
           ) : null}
-          {visibleMessages.map((message, index) => (
-            <div
-              key={message.messageId ?? `${message.role}-${index}`}
-              className={`message message--${message.role}`}
-            >
-              <ChatMarkdownMessage
-                role={message.role}
-                text={projectSupervisorChatMessageText(message)}
-              />
-            </div>
-          ))}
+          {visibleMessages.map((message, index) => {
+            const anchoredToolCalls = message.messageId
+              ? (toolCallsByAnchor.get(message.messageId) ?? [])
+              : [];
+            return (
+              <Fragment key={message.messageId ?? `${message.role}-${index}`}>
+                <div className={`message message--${message.role}`}>
+                  <ChatMarkdownMessage
+                    role={message.role}
+                    text={projectSupervisorChatMessageText(message)}
+                  />
+                </div>
+                {anchoredToolCalls.map((call) => (
+                  <ToolCallCard
+                    key={call.id}
+                    call={call}
+                    className="message-tool-call"
+                  />
+                ))}
+              </Fragment>
+            );
+          })}
           {designReasoning ? (
             <details className="design-agent-reasoning">
               <summary>显示思考过程</summary>
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx
new file mode 100644
index 000000000..7548fd090
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx
@@ -0,0 +1,117 @@
+import {
+  ChevronDown,
+  FileText,
+  Globe,
+  Minimize2,
+  Terminal,
+  Wrench,
+} from 'lucide-react';
+import { useId, useState } from 'react';
+
+import type { GameCreatorDirectToolCall } from '../../app/types';
+
+/**
+ * 工具调用卡片（Codex 风格）：
+ * 折叠态一行摘要，展开态看命令与文件明细。契约见
+ * `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`。
+ *
+ * 无障碍：折叠/展开是一只 `<button aria-expanded>` + `hidden` 控制正文，
+ * 所以 Tab 可达、Enter/Space 可切换、读屏能读到展开状态与 `aria-label`。
+ */
+export function ToolCallCard({
+  call,
+  className,
+}: {
+  call: GameCreatorDirectToolCall;
+  className?: string;
+}) {
+  const [expanded, setExpanded] = useState(false);
+  const bodyId = useId();
+  const statusLabel =
+    call.status === 'running'
+      ? '执行中'
+      : call.status === 'failed'
+        ? '失败'
+        : '已完成';
+  const summary = call.summary.trim();
+  const bodyLabel = `${call.title}：${summary || call.id}`;
+  const changes = call.detail.changes ?? [];
+  return (
+    <section
+      className={className ? `agent-tool-call ${className}` : 'agent-tool-call'}
+      data-kind={call.kind}
+      data-status={call.status}
+      data-testid="agent-tool-call-card"
+    >
+      <button
+        type="button"
+        className="agent-tool-call-head"
+        aria-expanded={expanded}
+        aria-controls={bodyId}
+        aria-label={bodyLabel}
+        title={bodyLabel}
+        onClick={() => setExpanded((current) => !current)}
+      >
+        <span className="agent-tool-call-icon" aria-hidden="true">
+          <ToolCallIcon kind={call.kind} />
+        </span>
+        <span className="agent-tool-call-title">{call.title}</span>
+        {summary ? (
+          <span className="agent-tool-call-summary">{summary}</span>
+        ) : null}
+        {call.status === 'running' ? (
+          <span className="agent-tool-call-running-dot" aria-hidden="true" />
+        ) : null}
+        <span className="agent-tool-call-status">{statusLabel}</span>
+        <ChevronDown
+          className="agent-tool-call-chevron"
+          size={14}
+          aria-hidden="true"
+        />
+      </button>
+      <div className="agent-tool-call-body" id={bodyId} hidden={!expanded}>
+        {call.detail.command ? (
+          <pre className="agent-tool-call-command">{call.detail.command}</pre>
+        ) : null}
+        {changes.length > 0 ? (
+          <ul className="agent-tool-call-changes">
+            {changes.map((change, index) => (
+              <li key={`${change.path}-${index}`}>
+                {change.path}
+                <small>{toolCallChangeKindLabel(change.kind)}</small>
+              </li>
+            ))}
+          </ul>
+        ) : null}
+        {call.detail.output ? (
+          <pre className="agent-tool-call-output">{call.detail.output}</pre>
+        ) : null}
+      </div>
+    </section>
+  );
+}
+
+function toolCallChangeKindLabel(kind: string) {
+  if (kind === 'add') {
+    return '新增';
+  }
+  if (kind === 'delete') {
+    return '删除';
+  }
+  return '修改';
+}
+
+function ToolCallIcon({ kind }: { kind: string }) {
+  switch (kind) {
+    case 'command':
+      return <Terminal size={14} />;
+    case 'file_change':
+      return <FileText size={14} />;
+    case 'web_search':
+      return <Globe size={14} />;
+    case 'context_compaction':
+      return <Minimize2 size={14} />;
+    default:
+      return <Wrench size={14} />;
+  }
+}
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 379902e73..9645a4c9a 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -11239,3 +11239,164 @@ button.design-workspace-tree__entry:hover,
   min-height: 0;
   flex: 1 1 auto;
 }
+
+/* ============================================================
+   工具调用卡片（2026-09）：Codex 风格可折叠卡片
+   ============================================================
+   契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`：
+   折叠态一行摘要（图标 / 标题 / 摘要 / 状态点 / 状态 / 折角），展开态看命令、文件明细与输出。
+   折叠由 `<button aria-expanded>` + `hidden` 控制（不改消息气泡与列表滚动模型），
+   配色只用现有 `--platform-*` 变量。 */
+
+/* 卡片不进气泡：它是消息流里跟在 assistant 消息之后的一个块，左右与消息对齐。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  > .agent-tool-call {
+  display: grid;
+  width: 100%;
+  min-width: 0;
+  margin-top: -4px;
+}
+
+.agent-tool-call {
+  display: grid;
+  width: 100%;
+  min-width: 0;
+  margin-top: 10px;
+  overflow: hidden;
+  border: 1px solid var(--platform-surface-border);
+  border-radius: 12px;
+  background: var(--platform-button-secondary-fill);
+  color: var(--platform-text-base);
+}
+
+.agent-tool-call-head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-width: 0;
+  padding: 8px 10px;
+  border: 0;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.agent-tool-call-head:hover,
+.agent-tool-call-head:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+  outline: none;
+}
+
+.agent-tool-call-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+}
+
+.agent-tool-call-title {
+  flex: 0 0 auto;
+  color: var(--platform-text-strong);
+  font-size: 12px;
+  font-weight: 600;
+}
+
+/* 摘要压在标题后面：窄面板下靠 ellipsis 收窄，不换行、不把状态挤出可视区。 */
+.agent-tool-call-summary {
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.agent-tool-call-status {
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+}
+
+.agent-tool-call-running-dot {
+  width: 6px;
+  height: 6px;
+  flex: 0 0 6px;
+  border-radius: 50%;
+  background: var(--platform-accent);
+}
+
+.agent-tool-call-chevron {
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+  transition: transform 120ms ease;
+}
+
+.agent-tool-call-head[aria-expanded='true'] .agent-tool-call-chevron {
+  transform: rotate(180deg);
+}
+
+/* `failed` 用错误色语义变量：标题、状态文案与图标一起变，不新增色值。 */
+.agent-tool-call[data-status='failed'] .agent-tool-call-title,
+.agent-tool-call[data-status='failed'] .agent-tool-call-status,
+.agent-tool-call[data-status='failed'] .agent-tool-call-icon {
+  color: var(--platform-button-danger-text);
+}
+
+.agent-tool-call[data-status='failed'] {
+  border-color: var(--platform-button-danger-border);
+  background: var(--platform-button-danger-fill);
+}
+
+.agent-tool-call-body {
+  display: grid;
+  gap: 8px;
+  padding: 0 10px 10px;
+}
+
+.agent-tool-call-command,
+.agent-tool-call-output {
+  margin: 0;
+  max-height: 220px;
+  padding: 8px 9px;
+  overflow: auto;
+  border: 1px solid var(--platform-line-soft);
+  border-radius: 8px;
+  background: var(--platform-neutral-bg);
+  color: var(--platform-text-base);
+  font-size: 11px;
+  line-height: 1.6;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
+.agent-tool-call-changes {
+  display: grid;
+  gap: 4px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.agent-tool-call-changes li {
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+  min-width: 0;
+  color: var(--platform-text-base);
+  font-size: 12px;
+  overflow-wrap: anywhere;
+}
+
+.agent-tool-call-changes li small {
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+  font-size: 10px;
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 8fa7280ca..64815a138 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -8031,6 +8031,372 @@ export function registerProjectSupervisorSurfaceTests() {
     ).toHaveLength(policyReadCountBeforeChat + 1);
   });
 
+  it('renders tool-call cards from the direct turn event and keeps them after the turn completes', async () => {
+    const projectPath = '/tmp/launcher-tool-call-card-game';
+    const manifest = createGameCreationAppManifest(
+      'local-project-draft',
+      'launcher-tool-call-card-game',
+    );
+    const supervisorHarness = createProjectSupervisorRuntimeHarness({
+      projectPath,
+    });
+    let directTurnUpdateHandler:
+      | ((event: { payload: Record<string, unknown> }) => void)
+      | null = null;
+    const listen = vi.fn(
+      async (
+        eventName: string,
+        handler: (event: { payload: Record<string, unknown> }) => void,
+      ) => {
+        if (eventName === 'game-creator-direct-turn-update') {
+          directTurnUpdateHandler = handler;
+          return () => {
+            if (directTurnUpdateHandler === handler) {
+              directTurnUpdateHandler = null;
+            }
+          };
+        }
+        return supervisorHarness.listen(
+          eventName,
+          handler as Parameters<typeof supervisorHarness.listen>[1],
+        );
+      },
+    );
+    const directReply = createDeferred<string>();
+    const invoke = vi.fn(
+      async (command: string, args?: Record<string, unknown>) => {
+        if (command === 'get_design_agent_runtime_mode') return null;
+        if (command === 'inspect_local_project_directory') {
+          return {
+            projectPath,
+            exists: true,
+            isDirectory: true,
+            isGameCreatorProject: true,
+            projectName: 'launcher-tool-call-card-game',
+            recentRunStatus: null,
+            recentRunStopReason: null,
+          };
+        }
+        if (command === 'get_local_game_manifest') {
+          return manifest;
+        }
+        if (command === 'chat_with_game_creator_direct_codex') {
+          return directReply.promise;
+        }
+        if (command === 'read_direct_tool_calls') {
+          return [];
+        }
+        if (command === 'read_direct_project_conversation') {
+          // 打开项目时有一轮已落盘的对话：工具调用卡要挂在它的 assistant 消息之后。
+          return {
+            path: `${projectPath}/.agent/conversations/project.jsonl`,
+            agentId: null,
+            sessionId: null,
+            messages: [
+              {
+                schemaVersion: 'agc-direct-project-context.v1',
+                role: 'user',
+                content: '做一个跑酷游戏',
+                agentId: null,
+                messageId: 'direct-codex:turn-existing:user',
+                updatedAt: 900,
+              },
+              {
+                schemaVersion: 'agc-direct-project-context.v1',
+                role: 'assistant',
+                content: '上一轮已完成',
+                agentId: null,
+                messageId: 'direct-codex:turn-existing:assistant',
+                updatedAt: 1000,
+              },
+            ],
+          };
+        }
+        if (command === 'get_local_game_preview_status') {
+          return { status: 'stopped', url: null, port: null, root: null };
+        }
+        return supervisorHarness.invoke(command, args);
+      },
+    );
+    window.__TAURI__ = {
+      core: { invoke },
+      event: { listen },
+    };
+    renderLauncherProjectsAt('/?launcher');
+
+    pickProjectFromLauncher(projectPath);
+
+    const supervisorSurface = await screen.findByLabelText('陶泥儿项目对话');
+    const messageList = supervisorSurface.querySelector(
+      '.project-supervisor-message-list',
+    );
+    expect(messageList).not.toBeNull();
+
+    await setComposerText(
+      screen.getByLabelText('陶泥儿对话内容'),
+      '做一个跑酷游戏',
+    );
+    fireEvent.submit(
+      screen
+        .getByLabelText('陶泥儿对话内容')
+        .closest('form') as HTMLFormElement,
+    );
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        expect.objectContaining({ projectPath }),
+      );
+    });
+    const clientTurnId = String(
+      (
+        invoke.mock.calls.find(
+          ([command]) => command === 'chat_with_game_creator_direct_codex',
+        )?.[1] as Record<string, unknown> | undefined
+      )?.clientTurnId ?? '',
+    );
+    expect(clientTurnId).not.toBe('');
+
+    // 实时增量：同一条 `item-command` 从 running 走到 completed，`item-file` 由下一条事件带出。
+    await act(async () => {
+      directTurnUpdateHandler?.({
+        payload: {
+          projectPath,
+          turnId: clientTurnId,
+          sequence: 1,
+          status: 'running',
+          activity: 'command-exec',
+          updatedAt: 1000,
+          toolCalls: [
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'item-command',
+              kind: 'command',
+              title: '执行命令',
+              summary: 'npm run build',
+              status: 'running',
+              detail: { command: 'npm run build' },
+              startedAt: 1000,
+              updatedAt: 1000,
+            },
+          ],
+        },
+      });
+    });
+    const runningCards = within(supervisorSurface)
+      .getAllByTestId('agent-tool-call-card')
+      .filter((card) => card.getAttribute('data-status') === 'running');
+    expect(runningCards).toHaveLength(1);
+    const runningCard = runningCards[0] as HTMLElement;
+    expect(within(runningCard).getByText('执行中')).not.toBeNull();
+    // 此刻只应看到本回合的「执行命令」：不在对话里、也不属于当前回合的 turnId
+    // 会在 App 侧被过滤掉，不会漂在消息流里。
+    const visibleKinds = within(supervisorSurface)
+      .getAllByTestId('agent-tool-call-card')
+      .map((card) => card.getAttribute('data-kind'));
+    expect(visibleKinds).toEqual(['command']);
+
+    await act(async () => {
+      directTurnUpdateHandler?.({
+        payload: {
+          projectPath,
+          turnId: clientTurnId,
+          sequence: 2,
+          status: 'running',
+          activity: 'file-write',
+          updatedAt: 1100,
+          toolCalls: [
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'item-command',
+              kind: 'command',
+              title: '执行命令',
+              summary: 'npm run build',
+              status: 'completed',
+              detail: { command: 'npm run build', output: 'build ok' },
+              startedAt: 1000,
+              updatedAt: 1100,
+            },
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'item-file',
+              kind: 'file_change',
+              title: '编辑 1 个文件',
+              summary: 'game/src/hero.ts',
+              status: 'failed',
+              detail: {
+                changes: [
+                  { path: 'game/src/hero.ts', kind: 'update' },
+                  { path: 'game/src/hero.ts', kind: 'delete' },
+                ],
+              },
+              startedAt: 1050,
+              updatedAt: 1100,
+            },
+          ],
+        },
+      });
+    });
+    await waitFor(() => {
+      expect(
+        within(supervisorSurface).getAllByTestId('agent-tool-call-card'),
+      ).toHaveLength(2);
+    });
+    const cards = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-card',
+    );
+    // 同一 id 只渲染一次，状态由 completed 覆盖；同回合内按 startedAt 升序。
+    expect(cards.map((card) => card.getAttribute('data-kind'))).toEqual([
+      'command',
+      'file_change',
+    ]);
+    expect(cards[0]?.getAttribute('data-status')).toBe('completed');
+    expect(cards[1]?.getAttribute('data-status')).toBe('failed');
+    // 这两张卡都锚在「正在跑的回合」上；回合结束后下面对 DOM 顺序重新取一次。
+    expect(cards).toHaveLength(2);
+
+    // 回合结束：assistant 消息落盘后卡片仍在该回合消息之后，不重复、不消失。
+    await act(async () => {
+      directReply.resolve('DIRECT_REPLY:做一个跑酷游戏');
+    });
+    await waitFor(() => {
+      expect(
+        within(supervisorSurface).getByText('DIRECT_REPLY:做一个跑酷游戏'),
+      ).not.toBeNull();
+    });
+    await waitFor(() => {
+      expect(
+        within(supervisorSurface).getAllByTestId('agent-tool-call-card'),
+      ).toHaveLength(2);
+    });
+    // 重新取一次：回合结束会重渲染，之前抓到的引用已经不是当前 DOM 节点。
+    const settledCards = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-card',
+    );
+    const children = Array.from((messageList as HTMLElement).children);
+    const assistantIndex = children.findIndex(
+      (node) =>
+        node.classList.contains('message--assistant') &&
+        node.textContent?.includes('DIRECT_REPLY:做一个跑酷游戏'),
+    );
+    expect(assistantIndex).toBeGreaterThanOrEqual(0);
+    expect(
+      children.findIndex((node) => node === settledCards[0]),
+    ).toBeGreaterThan(assistantIndex);
+
+    // 折叠态：标题 + 摘要 + 状态；正文用 `hidden` 收起。
+    const firstCard = settledCards[0] as HTMLElement;
+    const firstHead = within(firstCard).getByRole('button', {
+      name: '执行命令：npm run build',
+    });
+    expect(firstHead.getAttribute('aria-expanded')).toBe('false');
+    const firstBody = (messageList as HTMLElement).querySelector(
+      `#${firstHead.getAttribute('aria-controls')}`,
+    );
+    expect(firstBody?.hasAttribute('hidden')).toBe(true);
+    expect(within(firstHead).getByText('执行命令')).not.toBeNull();
+    expect(within(firstHead).getByText('npm run build')).not.toBeNull();
+    expect(within(firstCard).getByText('已完成')).not.toBeNull();
+
+    // 键盘可达：头部就是按钮（Tab 可达），Enter/Space 触发的 click 同步 aria-expanded 与 hidden。
+    expect(firstHead.tagName).toBe('BUTTON');
+    (firstHead as HTMLButtonElement).focus();
+    expect(document.activeElement).toBe(firstHead);
+    fireEvent.click(firstHead);
+    await waitFor(() => {
+      expect(firstHead.getAttribute('aria-expanded')).toBe('true');
+      expect(firstBody?.hasAttribute('hidden')).toBe(false);
+    });
+    expect(within(firstCard).getByText('build ok')).not.toBeNull();
+    fireEvent.click(firstHead);
+    await waitFor(() => {
+      expect(firstHead.getAttribute('aria-expanded')).toBe('false');
+      expect(firstBody?.hasAttribute('hidden')).toBe(true);
+    });
+
+    // 展开文件变更卡：路径与变更类型都读得到。
+    const secondCard = settledCards[1] as HTMLElement;
+    const secondHead = within(secondCard).getByRole('button', {
+      name: '编辑 1 个文件：game/src/hero.ts',
+    });
+    fireEvent.click(secondHead);
+    const secondBody = (messageList as HTMLElement).querySelector(
+      `#${secondHead.getAttribute('aria-controls')}`,
+    );
+    expect(secondBody?.hasAttribute('hidden')).toBe(false);
+    expect(
+      within(secondBody as HTMLElement).getAllByText('game/src/hero.ts'),
+    ).toHaveLength(2);
+    expect(within(secondBody as HTMLElement).getByText('修改')).not.toBeNull();
+    expect(within(secondBody as HTMLElement).getByText('删除')).not.toBeNull();
+  });
+
+  it('reads the persisted tool-call history whenever a project is opened', async () => {
+    const projectPath = '/tmp/launcher-tool-call-persisted-game';
+    const manifest = createGameCreationAppManifest(
+      'local-project-draft',
+      'launcher-tool-call-persisted-game',
+    );
+    const supervisorHarness = createProjectSupervisorRuntimeHarness({
+      projectPath,
+    });
+    let readToolCallCount = 0;
+    const invoke = vi.fn(
+      async (command: string, args?: Record<string, unknown>) => {
+        if (command === 'get_design_agent_runtime_mode') return null;
+        if (command === 'inspect_local_project_directory') {
+          return {
+            projectPath,
+            exists: true,
+            isDirectory: true,
+            isGameCreatorProject: true,
+            projectName: 'launcher-tool-call-persisted-game',
+            recentRunStatus: null,
+            recentRunStopReason: null,
+          };
+        }
+        if (command === 'get_local_game_manifest') {
+          return manifest;
+        }
+        if (command === 'read_direct_project_conversation') {
+          return {
+            path: projectPath,
+            agentId: null,
+            sessionId: null,
+            messages: [],
+          };
+        }
+        if (command === 'read_direct_tool_calls') {
+          readToolCallCount += 1;
+          return [];
+        }
+        if (command === 'get_local_game_preview_status') {
+          return { status: 'stopped', url: null, port: null, root: null };
+        }
+        return supervisorHarness.invoke(command, args);
+      },
+    );
+    window.__TAURI__ = {
+      core: { invoke },
+      event: { listen: supervisorHarness.listen },
+    };
+    renderLauncherProjectsAt('/?launcher');
+
+    pickProjectFromLauncher(projectPath);
+
+    const supervisorSurface = await screen.findByLabelText('陶泥儿项目对话');
+    // 打开项目时必须回读一次工具调用历史：这是「刷新后卡片仍在」的数据来源。
+    await waitFor(() => {
+      expect(readToolCallCount).toBeGreaterThanOrEqual(1);
+    });
+    expect(invoke).toHaveBeenCalledWith('read_direct_tool_calls', {
+      projectPath,
+    });
+    // 历史为空时与改造前一致：没有卡片，也不报错。
+    expect(
+      within(supervisorSurface).queryAllByTestId('agent-tool-call-card'),
+    ).toHaveLength(0);
+  });
+
   it('renders the Codex empty state and opens the panel settings overlay in a fresh direct chat', async () => {
     // 空态只在 direct-codex 面板、且没有任何消息/流式回复/待确认时出现。真实项目打开时
     // App 总会先放一条默认问候（`createDefaultChatMessages`），所以这里直接挂面板本体，

From 58f6eceb69c45ce4f4b57925db154af29d85771d Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 10:37:28 +0800
Subject: [PATCH 08/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9B=92=E5=9B=9B=E8=BE=B9=E7=95=99=E7=99=BD=E4=B8=8E=E6=96=87?=
 =?UTF-8?q?=E5=AD=97/=E6=8E=A7=E4=BB=B6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- styles.css：direct-codex 面板自身 padding 归 0，四边留白由子节点声明为 16px（实测 16/16/16/16）
- styles.css：盒内内边距 12px（文字左内缩 = 上内缩 = 右内缩 = 13px，实测）
- styles.css：输入区改单块布局，「AI 润色」按钮浮到右下角，不再占掉文字右边缘 36px（这是文字左右内缩不一致的根因）
- styles.css：左侧控件组左移 12px，使 + 图标墨迹与文字左边缘同线（实测同为 x=950）
- styles.css：去掉画在输入区上的内层焦点环，焦点环改画在整只输入盒外侧，不再出现第二层框
- styles.css：删除 direct-codex 输入盒旧几何规则（1fr 82px 网格 / z-index 2 / padding-top 8px）与窄屏 8px 12px 12px 的不对称外边距
- 测试：宽屏断言四边留白恒等 + 文字三边内缩相等；窄屏断言四边 16px；高度算式同步
---
 apps/ai-game-creator-shell/src/styles.css     | 135 ++++++++++++++----
 .../appSurface/project-development.suite.ts   |   6 +-
 .../tests/chatDialogFrameLayout.test.ts       |  48 +++++--
 3 files changed, 142 insertions(+), 47 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 9645a4c9a..c56165636 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -8535,16 +8535,12 @@ iframe.preview-frame {
   display: none;
 }
 
-.game-workbench-chat
-  .project-supervisor-surface.is-direct-codex
-  .project-supervisor-composer {
-  grid-template-columns: minmax(0, 1fr) 82px;
-  align-items: stretch;
-  position: relative;
-  z-index: 2;
-  padding-top: 8px;
-  background: transparent;
-}
+/* 这里原有一条 direct-codex 输入盒的旧几何规则（`grid-template-columns: 1fr 82px`、
+   `z-index: 2`、`padding-top: 8px`、`background: transparent`），是「输入区浮在消息列表上、
+   与 82px 发送钮列共用网格」那版布局的残留。新几何（单列、z-index 1、自带边框与底色、
+   盒内上下内边距相等）已由文件末尾「右侧对话面板 Codex 风格」区块的同名规则接管，
+   所以整条删除——留着会让 `padding-top: 8px` 这种长手写法继续生效，
+   把新规则里的 `padding: 10px 12px` 拆掉一半，重新造成上下留白不一致。 */
 
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
@@ -9220,7 +9216,9 @@ iframe.preview-frame {
     flex: 1 1 auto;
   }
 
-  /* 1000px 以下仍然是一列：顶栏、消息列表、输入盒依次排布，输入盒留在文档流里。 */
+  /* 1000px 以下仍然是一列：顶栏、消息列表、输入盒依次排布，输入盒留在文档流里。
+     四边留白不再在这里另给一套值（曾写过 `margin: 8px 12px 12px`，正是"左右一个值、
+     上下另一个值"的来源之一），统一由文件末尾的输入盒规则声明为 16px。 */
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
     .project-supervisor-composer {
@@ -9229,7 +9227,6 @@ iframe.preview-frame {
     bottom: auto;
     left: auto;
     flex: 0 0 auto;
-    margin: 8px 12px 12px;
   }
 
   /* 窄屏：输入框左右留白收紧，操作排（`@` / AI 润色 / 恢复原文）保持单行不换行，
@@ -10483,12 +10480,24 @@ button.design-workspace-tree__entry:hover,
   font-size: 12px;
 }
 
+/* direct-codex 面板自己不留内边距：左右与四周的留白统一由子节点自己声明，
+   这样「消息内容 / 顶栏 / 输入盒」三者共用同一个基准值，不会再出现
+   「消息内缩 16px、输入盒只有 10px」这种左右不齐，或不一致的上/下间距。
+   （非 direct-codex 的面板仍走上面那条 `padding: 10px`。） */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex {
+  padding: 0;
+}
+
 /* 输入盒是唯一有边框的容器，且**回到文档流**：它在消息列表下方（Codex 桌面客户端的
    「整块面板 = 顶栏 + 消息流 + 输入盒」），不再浮在消息列表之上。
    旧版那套「输入区绝对定位、消息列表用 196px 底边留白给它让位」已撤掉——两套叠着生效会
    让消息被空白顶掉、输入盒盖住消息。
    两行结构：文本区 / 控制排（`+` `@` · 模型下拉 · 发送）。原先那行「项目名 · 本地」信息标签
-   已按需求删掉，输入盒内不再复述当前项目。 */
+   已按需求删掉，输入盒内不再复述当前项目。
+   四边留白统一 16px：左右与底边来自这里的外边距，顶边同样来自外边距（面板 padding 已归 0），
+   所以四边恒等；消息列表自身也是左右各 16px，输入盒与消息内容左右对齐。
+   盒内上下内边距同样取同一个值（10px），不写 `8px … 10px` 那种上下不一致的写法。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex {
@@ -10501,9 +10510,13 @@ button.design-workspace-tree__entry:hover,
   right: 0;
   bottom: 0;
   left: 0;
+  margin: 16px;
   max-height: none;
   z-index: 1;
-  padding: 8px 12px 10px;
+  /* 盒内内边距四边同值：文字/光标的左内缩与上内缩必须相等，
+     否则点进输入框时（`.resource-reference-input:focus-within` 会画出焦点环）
+     会明显看出文字离左边近、离上边远。 */
+  padding: 12px;
   border: 1px solid var(--platform-surface-border);
   border-radius: 14px;
   background: var(--platform-input-fill);
@@ -10524,18 +10537,26 @@ button.design-workspace-tree__entry:hover,
   box-shadow: none;
 }
 
-/* direct-codex 输入区去默认灰描边：焦点可见性交给下面那条
-   `.project-supervisor-composer .resource-reference-input:focus-within`
-   （`--platform-input-focus-ring` 光环）。这条规则比它多一个 `is-direct-codex` 类，
-   优先级更高，所以**不能写 `box-shadow: none`**——写回去会把那条光环整条盖掉，
-   而 base `.resource-reference-input-editor` 又是 `outline: 0`，输入区就完全没有
-   可见焦点了（无障碍回归）。 */
+/* direct-codex 输入区去默认灰描边，并且**不再画内层焦点环**：焦点可见性交给下面那条
+   `:focus-within` 的整只输入盒——在输入区上再套一圈光环会让它看起来是"第二层框"，
+   文字/光标被圈在小框里、而 `+` `@` 发送那排控件在小框外，
+   观感上就是"光标和底下的控件对不齐"。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
   .resource-reference-input:focus-within {
   border: 0;
   outline: none;
+  box-shadow: none;
+}
+
+/* 整只输入盒的焦点环：只加深描边 + 一圈**盒子外面**的光环，
+   不侵占盒内的文字与控件对齐。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex:focus-within {
+  border-color: var(--platform-surface-hover-border);
+  box-shadow: 0 0 0 3px var(--platform-input-focus-ring);
 }
 
 .game-workbench-chat
@@ -10583,6 +10604,18 @@ button.design-workspace-tree__entry:hover,
   margin-left: auto;
 }
 
+/* 左侧控件组整体左移，让 `+` 图标的**字形**与输入区文字的左边缘对齐。
+   控件钮是 28×28 的点击区、图标在其中居中（实测图标字形比按钮盒左边缘再右偏
+   (28-15)/2 ≈ 6.5px），所以光对齐按钮盒是不够的——那正是「光标比下面那排控件更靠左」
+   的成因。这里用 -7px 抵消这段居中偏移，点击区尺寸不变。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-composer-controls-left {
+  margin-left: -7px;
+}
+
 /* 模型选择钮在控制排里按流式排布，但它同时是**弹层锚点**：`.conversation-model-menu`
    （`bottom: calc(100% + 8px)`）与模型提示（`[role='alert'] / [role='status']`，
    `bottom: 36px`）都是 `position: absolute`，包含块必须是这颗容器。这里原来写的是
@@ -10724,9 +10757,10 @@ button.design-workspace-tree__entry:hover,
 }
 
 /* 窄屏（≤760px）这一列是"消息列表 + 输入盒"的纵向堆叠。输入盒本来就在文档流里，
-   窄屏只需要给它四周留出边距：外框不再画在 `.project-supervisor-conversation` 上
-   （那会在整块面板外面再套一圈框，与「输入盒是唯一有边框的容器」相悖），
-   列表底边也不留任何给浮层让位的空白。 */
+   窄屏不再单独给它一套 `8px 12px 12px` 的不对称外边距——四边统一沿用上面那条
+   `margin: 16px`，避免又出现"左右一个值、上下另一个值"。
+   外框不再画在 `.project-supervisor-conversation` 上（那会在整块面板外面再套一圈框，
+   与「输入盒是唯一有边框的容器」相悖），列表底边也不留任何给浮层让位的空白。 */
 @media (max-width: 760px) {
   .game-workbench-chat
     .project-supervisor-surface.is-direct-codex
@@ -10747,12 +10781,6 @@ button.design-workspace-tree__entry:hover,
     background: transparent;
   }
 
-  .game-workbench-chat
-    .project-supervisor-surface.is-direct-codex
-    .project-supervisor-composer.is-direct-codex {
-    margin: 8px 12px 12px;
-  }
-
   /* 输入盒保持文档流。这条选择器比上面那条 `.project-supervisor-composer.is-direct-codex`
      多带一层 `.project-supervisor-conversation`，权重比它高，窄屏才能把它顶回来。 */
   .game-workbench-chat
@@ -10920,7 +10948,8 @@ button.design-workspace-tree__entry:hover,
    留白），这里只补新增节点的样式，并把旧的绿系执行过程卡收进暖色系。
    全部颜色只用现有 `--platform-*` 变量，浅色主题下成立。 */
 
-/* 顶部极简条：44px 高、无独立背景块，只有一条极细分隔线。 */
+/* 顶部极简条：44px 高、无独立背景块，只有一条极细分隔线。
+   左右内缩与消息内容 / 输入盒统一为 16px（面板自身 padding 已归 0）。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-topbar {
@@ -10930,7 +10959,7 @@ button.design-workspace-tree__entry:hover,
   gap: 8px;
   min-height: 44px;
   flex: 0 0 auto;
-  padding: 0 12px;
+  padding: 0 16px;
   border-bottom: 1px solid var(--platform-line-soft);
   background: transparent;
 }
@@ -11400,3 +11429,47 @@ button.design-workspace-tree__entry:hover,
   color: var(--platform-text-soft);
   font-size: 10px;
 }
+
+/* ============================================================
+   右侧对话面板：输入盒内文字与控件的对齐（2026-09）
+   ============================================================
+   这一组必须放在文件最后：输入区的网格结构与「AI 润色」按钮的位置由更早的
+   `.resource-reference-input` / `.resource-reference-input-actions` 规则决定，
+   同特异性下只有靠后写的才能盖回去。
+
+   两处造成"文字和下面那排控件对不齐 / 左右留白不等于上下留白"的原因：
+   1. 输入区是两列网格（文本列 + 操作列），右侧那枚「AI 润色」按钮常年占掉 36px，
+      于是文字右边缘比盒内右边缘少 36px——左右留白与上下留白看着就不一致。
+      这里把输入区改成单块并把操作按钮浮到右下角，文字可用满整宽。
+   2. `+` `@` 是 28×28 点击区、图标在其中居中，lucide 视框本身还有约 3px 内缩，
+      字形比文字左边缘右偏约 5px（实测）。左侧控件组左移 12px 抵消这段偏移，
+      点击区尺寸不变。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .resource-reference-input {
+  display: block;
+  position: relative;
+  min-height: 96px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .resource-reference-input
+  .resource-reference-input-actions {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-composer-controls-left {
+  margin-left: -12px;
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 64815a138..5f9601540 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -5849,7 +5849,11 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(composerRule?.[1]).toContain('position: relative;');
     expect(composerRule?.[1]).toContain('grid-template-rows: auto auto;');
     expect(composerRule?.[1]).toContain('z-index: 1;');
-    expect(composerRule?.[1]).toContain('padding: 8px 12px 10px;');
+    // 四边留白统一 16px、盒内内边距四边同为 12px（文字左内缩必须等于上内缩）；
+    // 不允许再出现 `8px 12px 10px` / `10px 12px` 这类「左右一个值、上下另一个值」的写法。
+    expect(composerRule?.[1]).toContain('margin: 16px;');
+    expect(composerRule?.[1]).toContain('padding: 12px;');
+    expect(composerRule?.[1]).not.toContain('padding-top:');
     expect(composerRule?.[1]).toContain(
       'background: var(--platform-input-fill);',
     );
diff --git a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
index e9f8fb36c..d9c8d1135 100644
--- a/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
+++ b/apps/ai-game-creator-shell/tests/chatDialogFrameLayout.test.ts
@@ -122,6 +122,7 @@ function marginBox(declarations: Map<string, string>) {
    ============================================================ */
 
 const CHAT = '.game-workbench-chat .project-supervisor-surface.is-direct-codex';
+const SURFACE = CHAT;
 const CONVERSATION = `${CHAT} .project-supervisor-conversation`;
 const MESSAGE_LIST = `${CHAT} .project-supervisor-message-list`;
 const MESSAGE_LIST_PLAIN =
@@ -220,23 +221,40 @@ function composerMaxHeight() {
 }
 
 describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文档流输入盒）', () => {
-  it('输入盒在消息列表下方、处于文档流，不再浮在列表之上（宽屏）', () => {
+  it('输入盒在消息列表下方、处于文档流，四边留白一致且与消息内容左右对齐（宽屏）', () => {
     const list = desktopDeclarations(...LIST_SELECTORS);
     const composer = desktopDeclarations(COMPOSER, COMPOSER_PLAIN);
+    const surface = desktopDeclarations(SURFACE);
 
     // 列表是唯一滚动区：自身不再绝对定位，靠 flex 吸收会话列的剩余高度。
     expect(declaration(list, 'position')).toBe('relative');
     expect(declaration(list, 'overflow-y')).toBe('auto');
     expect(declaration(list, 'flex')).toContain('1 1 auto');
 
-    // 输入盒在文档流里：不绝对定位；它紧贴列表下边（面板很窄，输入盒自己已有内边距，
-    // 再叠外边距会浪费高度），关键是它不再落在列表**内部**覆盖消息。
+    // 输入盒在文档流里：不绝对定位；关键是它不再落在列表**内部**覆盖消息。
     expect(declaration(composer, 'position')).toBe('relative');
+
+    // 用户可见契约：四边留白必须一致。
+    // 面板自身 padding 必须归 0，否则「左右留白」会等于「面板 padding + 输入盒左右外边距」，
+    // 而「上/下留白」只等于外边距或面板 padding——两边口径不同就一定会再次出现
+    // 「左右一个值、上下另一个值」的不齐（实测就是这个现象）。
+    expect(paddingBox(surface).top).toBe(0);
+    expect(paddingBox(surface).right).toBe(0);
+    expect(paddingBox(surface).bottom).toBe(0);
+    expect(paddingBox(surface).left).toBe(0);
     const insets = marginBox(composer);
-    expect(insets.top).toBe(0);
-    expect(insets.left).toBe(0);
-    expect(insets.right).toBe(0);
-    expect(insets.bottom).toBe(0);
+    expect(insets.top, '输入盒与消息列表之间必须有留白').toBe(16);
+    expect(insets.right).toBe(16);
+    expect(insets.bottom).toBe(16);
+    expect(insets.left).toBe(16);
+    // 左右留白还要与消息内容一致：列表自身左右各 16px（下面也有断言），三者同一基准。
+    expect(paddingBox(list).left).toBe(insets.left);
+    expect(paddingBox(list).right).toBe(insets.right);
+    // 盒内上下内边距同样必须相等，不能再写 `8px … 10px` 那种上下不一致的写法。
+    {
+      const composerPadding = paddingBox(composer);
+      expect(composerPadding.top).toBe(composerPadding.bottom);
+    }
     // 也不再靠 bottom/left/right 偏移量定位（那是旧浮层几何的残余）。
     expect(pixelValue(composer, 'bottom')).toBe(0);
     expect(pixelValue(composer, 'left')).toBe(0);
@@ -260,10 +278,10 @@ describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文
     const { total, actionsRowHeight } = composerMaxHeight();
 
     // 输入盒最高高度由真实声明算出来：编辑器 140 + 行距 8 + 操作排 28 + 输入框下内边距 4
-    // + 输入盒上下内边距 18 + 操作条（2 + 28 方钮）= 228。
+    // + 输入盒内边距 24（四边同为 12：文字左内缩必须等于上内缩）+ 操作条（2 + 28 方钮）= 234。
     expect(actionsRowHeight, '操作排按钮高度变了就要重算下面的算式').toBe(28);
     expect(pixelValue(desktopDeclarations(COMPOSER_SUBMIT), 'height')).toBe(28);
-    expect(total).toBe(228);
+    expect(total).toBe(234);
 
     const paddingBottom = paddingBox(list).bottom;
     // 新契约：留白归 0。旧版这里是一条 `inset + 输入区最高高度 + 间距` 的算式，
@@ -295,17 +313,17 @@ describe('陶泥儿对话区：Codex 三段式（顶栏 / 唯一滚动区 / 文
     expect(declaration(conversation, 'border')).toBe('0');
     expect(declaration(conversation, 'background')).toBe('transparent');
 
-    // 输入盒仍在文档流（本来就在），四周由自己的外边距让出一圈留白。
+    // 输入盒仍在文档流（本来就在），四边留白与宽屏同一套值（16px），窄屏不再另给一组
+    // `8px 12px 12px` 的不对称外边距。
     expect(declaration(composer, 'position')).toBe('relative');
     expect(declaration(composer, 'bottom')).toBe('auto');
     expect(declaration(composer, 'left')).toBe('auto');
     expect(declaration(composer, 'right')).toBe('auto');
     const composerMargin = marginBox(composer);
-    expect(composerMargin.left, '窄屏输入盒左右必须有边距').toBeGreaterThan(0);
-    expect(composerMargin.right).toBe(composerMargin.left);
-    expect(composerMargin.bottom, '窄屏输入盒底部必须有边距').toBeGreaterThan(
-      0,
-    );
+    expect(composerMargin.top, '窄屏输入盒四周都要有边距').toBe(16);
+    expect(composerMargin.left).toBe(16);
+    expect(composerMargin.right).toBe(16);
+    expect(composerMargin.bottom).toBe(16);
 
     // 列表在窄屏也不画框、不留浮层空白，它仍是唯一滚动区。
     expect(declaration(list, 'background')).toBe('transparent');

From 99fd319607d02592e3a80d5d20386165faa8bd98 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 15:07:11 +0800
Subject: [PATCH 09/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=20hint=20=E4=B8=8E=E5=85=89=E6=A0=87=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- styles.css：字号从输入区/编辑器各自声明下沉到共同父级 .resource-reference-input（13px/1.6），hint 不再继承面板的 16px 而比实际输入文字大一圈
- styles.css：编辑器内 Lexical 段落清零外边距，去掉全局 p 规则的 8px 顶边距，光标不再比 hint 低 8px
- 实测：hint 首字符与打字后首字符位置完全重合（948/640.5）
---
 apps/ai-game-creator-shell/src/styles.css | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index c56165636..57b125c85 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -10869,6 +10869,18 @@ button.design-workspace-tree__entry:hover,
   box-shadow: 0 0 0 3px var(--platform-input-focus-ring);
 }
 
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer
+  .resource-reference-input {
+  /* hint 是自制 span（不是原生 placeholder 属性），它和输入区各自取字号就会错位：
+     输入区写了 13px/1.6，而 `.resource-reference-input { font: inherit }` 让它继承到
+     面板的 16px/24px——同一段提示比实际光标大一圈、基线也不同，看起来就是"光标和
+     hint 没对齐"。字号下沉到两者的共同父级，双方共用同一套字体度量。 */
+  font-size: 13px;
+  line-height: 1.6;
+}
+
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer
@@ -10881,6 +10893,17 @@ button.design-workspace-tree__entry:hover,
   line-height: 1.6;
 }
 
+/* Lexical 会把内容包进 `<p>`，而全局规则给段落留了 `margin: 8px 0 0`：
+   输入区自己的文字因此比 hint（绝对定位在 top:0 的 span）低 8px，看起来就是
+   "光标和 hint 没对齐"。这里把段落在编辑器内清零，光标与 hint 落在同一行盒。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer
+  .resource-reference-input-editor
+  p {
+  margin: 0;
+}
+
 /* 陶泥儿输入区的操作排（`AI 润色` / `恢复原文`）回到文档流：网格第二行右侧那一列，
    `justify-content: flex-end` 贴住输入框右下角。之前这里用
    `position: absolute; right: 48px; bottom: 10px` 把整排从网格里摘出来浮在输入框中间，

From a60c04b53dd6589df0c027958149bd28a6a9099f Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 15:29:53 +0800
Subject: [PATCH 10/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=AF=9D=20ma?=
 =?UTF-8?q?rkdown=20=E6=97=A0=E5=BA=8F=E5=88=97=E8=A1=A8=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ChatMarkdownMessage：无序列表改用真正的列表标记（list-disc + pl-4），不再手写 '- ' 文本前缀
- ChatMarkdownMessage：删除列表项里手写的短横线，换行后的第二行恢复悬挂缩进，同时恢复列表语义
- ChatMarkdownMessage：移除随之无用的 ListKindContext
- ChatMarkdownMessage.test.tsx：用例改为断言 list-disc/pl-4 与「列表项文本不含手写短横线」
- 实测：真实面板注入同 class 标记后 list-style-type=disc、li 为 list-item、换行行与首行文字左边缘对齐
---
 .../components/ChatMarkdownMessage/index.tsx  | 31 +++++++------------
 .../tests/ChatMarkdownMessage.test.tsx        | 16 +++++++---
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index 3d79df338..81d852447 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -66,7 +66,6 @@ export class MarkdownErrorBoundary extends Component<
 }
 
 const ListDepthContext = createContext(0);
-const ListKindContext = createContext<'unordered' | 'ordered' | null>(null);
 type ListItemParagraphPosition = 'first' | 'continuation';
 
 const ListItemContext = createContext<ListItemParagraphPosition | null>(null);
@@ -75,15 +74,11 @@ function MarkdownUnorderedList({ children }: { children?: ReactNode }) {
   const depth = useContext(ListDepthContext);
   return (
     <ListDepthContext.Provider value={depth + 1}>
-      <ListKindContext.Provider value="unordered">
-        <ul
-          className={`m-0 mt-2 list-none space-y-1 first:mt-0 ${
-            depth > 0 ? 'pl-4' : 'pl-0'
-          }`}
-        >
-          {children}
-        </ul>
-      </ListKindContext.Provider>
+      {/* 用真正的列表标记（`list-disc`）而不是手写 `'- '` 文本：手写前缀既没有悬挂缩进
+          （换行后的第二行会顶回最左边），也不算列表语义（读屏读成普通文本）。 */}
+      <ul className="m-0 mt-2 list-disc space-y-1 pl-4 first:mt-0">
+        {children}
+      </ul>
     </ListDepthContext.Provider>
   );
 }
@@ -98,14 +93,12 @@ function MarkdownOrderedList({
   const depth = useContext(ListDepthContext);
   return (
     <ListDepthContext.Provider value={depth + 1}>
-      <ListKindContext.Provider value="ordered">
-        <ol
-          start={start}
-          className="m-0 mt-2 list-decimal space-y-1 pl-5 first:mt-0"
-        >
-          {children}
-        </ol>
-      </ListKindContext.Provider>
+      <ol
+        start={start}
+        className="m-0 mt-2 list-decimal space-y-1 pl-5 first:mt-0"
+      >
+        {children}
+      </ol>
     </ListDepthContext.Provider>
   );
 }
@@ -145,7 +138,6 @@ function StreamingMarkdownParagraph({ children }: { children?: ReactNode }) {
 }
 
 function MarkdownListItem({ children }: { children?: ReactNode }) {
-  const listKind = useContext(ListKindContext);
   let paragraphIndex = 0;
   const childrenWithParagraphContext = Children.map(
     children,
@@ -168,7 +160,6 @@ function MarkdownListItem({ children }: { children?: ReactNode }) {
   );
   return (
     <li className="break-words whitespace-normal">
-      {listKind === 'unordered' ? '- ' : null}
       {childrenWithParagraphContext}
     </li>
   );
diff --git a/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx b/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
index 6df7c4333..cd3a150bd 100644
--- a/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
+++ b/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
@@ -31,7 +31,7 @@ describe('ChatMarkdownMessage', () => {
     );
   });
 
-  it('为嵌套无序列表保留逐层缩进', () => {
+  it('无序列表用真正的列表标记并逐层缩进，不再手写短横线', () => {
     const { container } = render(
       <ChatMarkdownMessage
         role="assistant"
@@ -43,9 +43,17 @@ describe('ChatMarkdownMessage', () => {
 
     const lists = container.querySelectorAll('ul');
     expect(lists).toHaveLength(3);
-    expect(lists[0]?.className).toContain('pl-0');
-    expect(lists[1]?.className).toContain('pl-4');
-    expect(lists[2]?.className).toContain('pl-4');
+    // 真正的列表标记：靠 `list-disc` 画项目符号、`pl-4` 让换行后的第二行保持悬挂缩进。
+    for (const list of Array.from(lists)) {
+      expect(list.className).toContain('list-disc');
+      expect(list.className).toContain('pl-4');
+      expect(list.className).not.toContain('list-none');
+    }
+    // 列表项文本里不能再出现手写的 `- ` 前缀（那会让换行行顶回最左边，也不符合列表语义）。
+    for (const item of Array.from(container.querySelectorAll('ul > li'))) {
+      expect(item.textContent ?? '').not.toMatch(/^\s*-\s/);
+    }
+    expect(container.querySelector('ul > li')?.textContent).toBe('无序号 A');
   });
 
   it('为四到六级标题提供递进的字号与字重', () => {

From 35a46e9a44e6af49950f9d0a287407dff63b98fe Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 17:29:36 +0800
Subject: [PATCH 11/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=8C=E4=B8=80=E5=9B=9E=E5=90=88=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=8A=98=E5=8F=A0=E5=9D=97=E3=80=8D=EF=BC=9A=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E4=B8=8E=E9=94=9A=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 ToolCallGroup.tsx：块头一行汇总（按 kind 固定顺序计数拼接），展开态每行一条工具，行可二级展开看命令 / 文件变更 / 输出
- 新增 toolCallGroupPresentation.ts：汇总与行文案纯函数（组件文件不导出非组件值）
- 删除 ToolCallCard.tsx：一回合多卡片的旧形态不再使用
- ProjectSupervisorView：工具调用块插到该回合 assistant 消息之前；实时回合还没有 assistant 消息时先落在消息流末尾
- 汇总 / 行文案按契约固定：已执行 N 个命令、… / 已运行、已编辑、已调用、已搜索、已整理上下文、已执行
- appSurface 用例改为断言折叠块：默认折叠、行数 = 工具数、回读历史插在 assistant 消息之前
- 新增 tool-call-group.suite.ts：汇总文案、行文案、默认折叠、行二级展开、空集合不渲染
- 技术方案文档同步第 4 节：一回合一个折叠块的 DOM 与文案契约
---
 .../ProjectSupervisorView.tsx                 |  54 ++--
 .../project-workspace/ToolCallCard.tsx        | 117 -------
 .../project-workspace/ToolCallGroup.tsx       | 191 ++++++++++++
 .../toolCallGroupPresentation.ts              |  94 ++++++
 .../tests/appSurface.test.ts                  |   2 +
 .../appSurface/project-development.suite.ts   | 287 +++++++++++++-----
 .../tests/appSurface/tool-call-group.suite.ts | 208 +++++++++++++
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |  53 ++--
 8 files changed, 765 insertions(+), 241 deletions(-)
 delete mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
 create mode 100644 apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts

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 d285bcb7e..0d7c44c42 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
@@ -63,7 +63,7 @@ import {
   type ResourceReferenceInputHandle,
 } from './ResourceReferenceInput';
 import type { ChatComposerDraft, ChatReference } from './resourceReferences';
-import { ToolCallCard } from './ToolCallCard';
+import { ToolCallGroup } from './ToolCallGroup';
 
 /** 与 `App.tsx` 的回合消息 id 同构：`direct-codex:<turnId>:<role>`。 */
 function directCodexTurnMessageId(turnId: string, role: 'user' | 'assistant') {
@@ -227,34 +227,29 @@ export function ProjectSupervisorView({
   }, [settingsOpen]);
   const runBusy =
     runtimePanelProps.controlBusy || Boolean(directProcessDetail) || submitting;
-  // 工具调用卡片按回合分组：契约要求插在**同一回合最后一条 assistant 消息之后**。
-  // 当前正在跑的回合还没有 assistant 消息落盘，锚到窗口里最后一条 assistant 消息；
-  // 历史回合一律锚到自己那条 `direct-codex:<turnId>:assistant`，不回落到别的回合。
-  const liveAssistantMessageId = [...visibleMessages]
-    .reverse()
-    .find((message) => message.role === 'assistant')?.messageId;
+  // 工具调用折叠块按回合分组，插在**同一回合 assistant 消息之前**（Codex 是「工具在上、答复在下」）。
+  // 历史回合锚到自己那条 `direct-codex:<turnId>:assistant`，不回落到别的回合；
+  // 正在跑的回合还没有 assistant 消息落盘，先落在消息流末尾，等那条消息落盘后回到它之前。
+  const streamTurnId = activeTurnId?.trim() ?? '';
   const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
+  const liveToolCalls: GameCreatorDirectToolCall[] = [];
   if (directCodex) {
-    const streamTurnId = activeTurnId?.trim() ?? '';
     for (const call of toolCalls) {
       const expected = directCodexTurnMessageId(call.turnId, 'assistant');
       const hasPersistedAssistant = visibleMessages.some(
         (message) => message.messageId === expected,
       );
-      const anchor =
-        call.turnId === streamTurnId
-          ? (liveAssistantMessageId ?? null)
-          : hasPersistedAssistant
-            ? expected
-            : null;
-      if (!anchor) {
+      if (hasPersistedAssistant) {
+        const bucket = toolCallsByAnchor.get(expected);
+        if (bucket) {
+          bucket.push(call);
+        } else {
+          toolCallsByAnchor.set(expected, [call]);
+        }
         continue;
       }
-      const bucket = toolCallsByAnchor.get(anchor);
-      if (bucket) {
-        bucket.push(call);
-      } else {
-        toolCallsByAnchor.set(anchor, [call]);
+      if (streamTurnId && call.turnId === streamTurnId) {
+        liveToolCalls.push(call);
       }
     }
   }
@@ -370,22 +365,27 @@ export function ProjectSupervisorView({
               : [];
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
+                {anchoredToolCalls.length > 0 ? (
+                  <ToolCallGroup
+                    calls={anchoredToolCalls}
+                    className="message-tool-call"
+                  />
+                ) : null}
                 <div className={`message message--${message.role}`}>
                   <ChatMarkdownMessage
                     role={message.role}
                     text={projectSupervisorChatMessageText(message)}
                   />
                 </div>
-                {anchoredToolCalls.map((call) => (
-                  <ToolCallCard
-                    key={call.id}
-                    call={call}
-                    className="message-tool-call"
-                  />
-                ))}
               </Fragment>
             );
           })}
+          {liveToolCalls.length > 0 ? (
+            <ToolCallGroup
+              calls={liveToolCalls}
+              className="message-tool-call"
+            />
+          ) : null}
           {designReasoning ? (
             <details className="design-agent-reasoning">
               <summary>显示思考过程</summary>
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx
deleted file mode 100644
index 7548fd090..000000000
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallCard.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {
-  ChevronDown,
-  FileText,
-  Globe,
-  Minimize2,
-  Terminal,
-  Wrench,
-} from 'lucide-react';
-import { useId, useState } from 'react';
-
-import type { GameCreatorDirectToolCall } from '../../app/types';
-
-/**
- * 工具调用卡片（Codex 风格）：
- * 折叠态一行摘要，展开态看命令与文件明细。契约见
- * `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`。
- *
- * 无障碍：折叠/展开是一只 `<button aria-expanded>` + `hidden` 控制正文，
- * 所以 Tab 可达、Enter/Space 可切换、读屏能读到展开状态与 `aria-label`。
- */
-export function ToolCallCard({
-  call,
-  className,
-}: {
-  call: GameCreatorDirectToolCall;
-  className?: string;
-}) {
-  const [expanded, setExpanded] = useState(false);
-  const bodyId = useId();
-  const statusLabel =
-    call.status === 'running'
-      ? '执行中'
-      : call.status === 'failed'
-        ? '失败'
-        : '已完成';
-  const summary = call.summary.trim();
-  const bodyLabel = `${call.title}：${summary || call.id}`;
-  const changes = call.detail.changes ?? [];
-  return (
-    <section
-      className={className ? `agent-tool-call ${className}` : 'agent-tool-call'}
-      data-kind={call.kind}
-      data-status={call.status}
-      data-testid="agent-tool-call-card"
-    >
-      <button
-        type="button"
-        className="agent-tool-call-head"
-        aria-expanded={expanded}
-        aria-controls={bodyId}
-        aria-label={bodyLabel}
-        title={bodyLabel}
-        onClick={() => setExpanded((current) => !current)}
-      >
-        <span className="agent-tool-call-icon" aria-hidden="true">
-          <ToolCallIcon kind={call.kind} />
-        </span>
-        <span className="agent-tool-call-title">{call.title}</span>
-        {summary ? (
-          <span className="agent-tool-call-summary">{summary}</span>
-        ) : null}
-        {call.status === 'running' ? (
-          <span className="agent-tool-call-running-dot" aria-hidden="true" />
-        ) : null}
-        <span className="agent-tool-call-status">{statusLabel}</span>
-        <ChevronDown
-          className="agent-tool-call-chevron"
-          size={14}
-          aria-hidden="true"
-        />
-      </button>
-      <div className="agent-tool-call-body" id={bodyId} hidden={!expanded}>
-        {call.detail.command ? (
-          <pre className="agent-tool-call-command">{call.detail.command}</pre>
-        ) : null}
-        {changes.length > 0 ? (
-          <ul className="agent-tool-call-changes">
-            {changes.map((change, index) => (
-              <li key={`${change.path}-${index}`}>
-                {change.path}
-                <small>{toolCallChangeKindLabel(change.kind)}</small>
-              </li>
-            ))}
-          </ul>
-        ) : null}
-        {call.detail.output ? (
-          <pre className="agent-tool-call-output">{call.detail.output}</pre>
-        ) : null}
-      </div>
-    </section>
-  );
-}
-
-function toolCallChangeKindLabel(kind: string) {
-  if (kind === 'add') {
-    return '新增';
-  }
-  if (kind === 'delete') {
-    return '删除';
-  }
-  return '修改';
-}
-
-function ToolCallIcon({ kind }: { kind: string }) {
-  switch (kind) {
-    case 'command':
-      return <Terminal size={14} />;
-    case 'file_change':
-      return <FileText size={14} />;
-    case 'web_search':
-      return <Globe size={14} />;
-    case 'context_compaction':
-      return <Minimize2 size={14} />;
-    default:
-      return <Wrench size={14} />;
-  }
-}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
new file mode 100644
index 000000000..781c12f94
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -0,0 +1,191 @@
+import {
+  ChevronDown,
+  FileText,
+  Globe,
+  Minimize2,
+  Terminal,
+  Wrench,
+} from 'lucide-react';
+import { useId, useState } from 'react';
+
+import type { GameCreatorDirectToolCall } from '../../app/types';
+import {
+  toolCallGroupSummary,
+  toolCallRowText,
+} from './toolCallGroupPresentation';
+
+/**
+ * 一回合的工具调用折叠块（Codex 风格）：
+ * 块头一行汇总，展开态每行一条工具（行可二级展开看命令 / 文件明细 / 输出）。
+ * 契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`。
+ *
+ * 无障碍：块头与每一行都是 `<button aria-expanded>` + `hidden` 控制正文，
+ * 所以 Tab 可达、Enter/Space 可切换、读屏能读到展开状态与 `aria-label`。
+ * 文案规则（纯函数）在 `toolCallGroupPresentation.ts`。
+ */
+
+/** 一回合的工具调用折叠块；空集合不渲染。 */
+export function ToolCallGroup({
+  calls,
+  className,
+}: {
+  calls: GameCreatorDirectToolCall[];
+  className?: string;
+}) {
+  const [expanded, setExpanded] = useState(false);
+  const bodyId = useId();
+  if (calls.length === 0) {
+    return null;
+  }
+  const orderedCalls = [...calls].sort(
+    (left, right) => left.startedAt - right.startedAt,
+  );
+  const summary = toolCallGroupSummary(orderedCalls);
+  const status = orderedCalls.some((call) => call.status === 'running')
+    ? 'running'
+    : orderedCalls.some((call) => call.status === 'failed')
+      ? 'failed'
+      : 'completed';
+  return (
+    <section
+      className={
+        className
+          ? `agent-tool-call-group ${className}`
+          : 'agent-tool-call-group'
+      }
+      data-testid="agent-tool-call-group"
+      data-status={status}
+    >
+      <button
+        type="button"
+        className="agent-tool-call-group-head"
+        data-testid="agent-tool-call-group-head"
+        aria-expanded={expanded}
+        aria-controls={bodyId}
+        aria-label={summary}
+        title={summary}
+        onClick={() => setExpanded((current) => !current)}
+      >
+        <span className="agent-tool-call-group-icon" aria-hidden="true">
+          <ToolCallKindIcon kind={orderedCalls[0]?.kind ?? 'other'} />
+        </span>
+        <span className="agent-tool-call-group-summary">{summary}</span>
+        <ChevronDown
+          className="agent-tool-call-group-chevron"
+          size={14}
+          aria-hidden="true"
+        />
+      </button>
+      <div
+        className="agent-tool-call-group-body"
+        id={bodyId}
+        hidden={!expanded}
+      >
+        <ul className="agent-tool-call-group-rows">
+          {orderedCalls.map((call) => (
+            <ToolCallRow key={call.id} call={call} />
+          ))}
+        </ul>
+      </div>
+    </section>
+  );
+}
+
+/** 展开态的一行工具；行可二级展开看命令 / 文件明细 / 输出。 */
+function ToolCallRow({ call }: { call: GameCreatorDirectToolCall }) {
+  const [expanded, setExpanded] = useState(false);
+  const detailId = useId();
+  const text = toolCallRowText(call);
+  const statusText =
+    call.status === 'running'
+      ? '执行中'
+      : call.status === 'failed'
+        ? '失败'
+        : '';
+  const rowLabel = [text, statusText].filter(Boolean).join('，');
+  const changes = call.detail.changes ?? [];
+  const detailCommand = call.detail.command?.trim() ?? '';
+  const detailOutput = call.detail.output?.trim() ?? '';
+  const hasDetail =
+    Boolean(detailCommand) || Boolean(detailOutput) || changes.length > 0;
+  return (
+    <li
+      className="agent-tool-call-group-row"
+      data-testid="agent-tool-call-row"
+      data-kind={call.kind}
+      data-status={call.status}
+    >
+      <button
+        type="button"
+        className="agent-tool-call-row-head"
+        aria-expanded={expanded}
+        aria-controls={detailId}
+        aria-label={rowLabel}
+        title={rowLabel}
+        onClick={() => setExpanded((current) => !current)}
+      >
+        <span className="agent-tool-call-row-icon" aria-hidden="true">
+          <ToolCallKindIcon kind={call.kind} />
+        </span>
+        <span className="agent-tool-call-row-text">{text}</span>
+        {statusText ? (
+          <span className="agent-tool-call-row-status">{statusText}</span>
+        ) : null}
+        {hasDetail ? (
+          <ChevronDown
+            className="agent-tool-call-row-chevron"
+            size={12}
+            aria-hidden="true"
+          />
+        ) : null}
+      </button>
+      <div
+        className="agent-tool-call-row-detail"
+        id={detailId}
+        hidden={!expanded}
+      >
+        {detailCommand ? (
+          <pre className="agent-tool-call-row-command">{detailCommand}</pre>
+        ) : null}
+        {changes.length > 0 ? (
+          <ul className="agent-tool-call-row-changes">
+            {changes.map((change, index) => (
+              <li key={`${change.path}-${index}`}>
+                <span>{change.path}</span>
+                <small>{toolCallChangeKindLabel(change.kind)}</small>
+              </li>
+            ))}
+          </ul>
+        ) : null}
+        {detailOutput ? (
+          <pre className="agent-tool-call-row-output">{detailOutput}</pre>
+        ) : null}
+      </div>
+    </li>
+  );
+}
+
+function toolCallChangeKindLabel(kind: string) {
+  if (kind === 'add') {
+    return '新增';
+  }
+  if (kind === 'delete') {
+    return '删除';
+  }
+  return '修改';
+}
+
+function ToolCallKindIcon({ kind }: { kind: string }) {
+  switch (kind) {
+    case 'command':
+      return <Terminal size={14} />;
+    case 'file_change':
+      return <FileText size={14} />;
+    case 'web_search':
+      return <Globe size={14} />;
+    case 'context_compaction':
+      return <Minimize2 size={14} />;
+    default:
+      return <Wrench size={14} />;
+  }
+}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
new file mode 100644
index 000000000..71ef915e7
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
@@ -0,0 +1,94 @@
+import type {
+  GameCreatorDirectToolCall,
+  GameCreatorDirectToolCallKind,
+} from '../../app/types';
+
+/**
+ * 工具调用折叠块的纯文案计算：汇总 / 行文案。
+ * 契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`。
+ *
+ * 与组件分文件：`ToolCallGroup.tsx` 只导出组件，纯函数放这里（react-refresh 要求
+ * 组件文件不导出非组件值，也便于单测直接断言文案规则）。
+ */
+
+/** 汇总文案里 kind 的固定顺序：command → file_change → mcp_tool → web_search → context_compaction → other。 */
+const TOOL_CALL_KIND_ORDER: GameCreatorDirectToolCallKind[] = [
+  'command',
+  'file_change',
+  'mcp_tool',
+  'web_search',
+  'context_compaction',
+  'other',
+];
+
+const TOOL_CALL_KIND_LABELS: Record<GameCreatorDirectToolCallKind, string> = {
+  command: '命令',
+  file_change: '文件变更',
+  mcp_tool: '工具调用',
+  web_search: '联网搜索',
+  context_compaction: '上下文整理',
+  other: '其他操作',
+};
+
+/** 行文案动词：`已运行 {summary}` / `已编辑 {summary}` / …，`context_compaction` 不带 summary。 */
+const TOOL_CALL_ROW_VERBS: Partial<
+  Record<GameCreatorDirectToolCallKind, string>
+> = {
+  command: '已运行',
+  file_change: '已编辑',
+  mcp_tool: '已调用',
+  web_search: '已搜索',
+  other: '已执行',
+};
+
+/** 汇总文案：按 kind 计数、固定顺序拼成 `已执行 5 个命令、2 个文件变更`；空集合返回空串。 */
+export function toolCallGroupSummary(calls: GameCreatorDirectToolCall[]) {
+  const counts = new Map<string, number>();
+  for (const call of calls) {
+    counts.set(call.kind, (counts.get(call.kind) ?? 0) + 1);
+  }
+  const parts: string[] = [];
+  const append = (kind: string) => {
+    const count = counts.get(kind) ?? 0;
+    if (count <= 0) {
+      return;
+    }
+    counts.delete(kind);
+    const label =
+      TOOL_CALL_KIND_LABELS[kind as GameCreatorDirectToolCallKind] ??
+      '其他操作';
+    parts.push(`${count} 个${label}`);
+  };
+  for (const kind of TOOL_CALL_KIND_ORDER) {
+    append(kind);
+  }
+  // 契约外的 kind：不丢计数，落到末尾的「其他操作」。
+  for (const kind of [...counts.keys()]) {
+    append(kind);
+  }
+  return parts.length > 0 ? `已执行 ${parts.join('、')}` : '';
+}
+
+/** 一行工具的文案：`已运行 npm run build` / `已整理上下文`。 */
+export function toolCallRowText(call: GameCreatorDirectToolCall) {
+  if (call.kind === 'context_compaction') {
+    return '已整理上下文';
+  }
+  const summary = toolCallRowSummary(call);
+  const verb = TOOL_CALL_ROW_VERBS[call.kind] ?? '已执行';
+  return summary ? `${verb} ${summary}` : verb;
+}
+
+function toolCallRowSummary(call: GameCreatorDirectToolCall) {
+  const summary = call.summary.trim();
+  if (summary) {
+    return summary;
+  }
+  if (call.kind === 'file_change') {
+    const firstPath = call.detail.changes?.[0]?.path?.trim();
+    if (firstPath) {
+      return firstPath;
+    }
+  }
+  return call.title.trim();
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface.test.ts b/apps/ai-game-creator-shell/tests/appSurface.test.ts
index 51f42dffe..1edaebefe 100644
--- a/apps/ai-game-creator-shell/tests/appSurface.test.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface.test.ts
@@ -35,6 +35,7 @@ import {
   registerRuntimeSettingsTests,
 } from './appSurface/runtime-settings.suite';
 import { registerSupervisorRuntimeTests } from './appSurface/supervisor-runtime.suite';
+import { registerToolCallGroupTests } from './appSurface/tool-call-group.suite';
 
 /**
  * 原生文件对话框是宿主能力，不能在 jsdom 里真开窗。
@@ -74,4 +75,5 @@ describe('AI 游戏创作 App 界面边界', () => {
   registerCanvasAssetTests();
   registerPlanGddApprovalTests();
   registerDesignAgentSurfaceTests();
+  registerToolCallGroupTests();
 });
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 5f9601540..da2b77396 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -8035,7 +8035,7 @@ export function registerProjectSupervisorSurfaceTests() {
     ).toHaveLength(policyReadCountBeforeChat + 1);
   });
 
-  it('renders tool-call cards from the direct turn event and keeps them after the turn completes', async () => {
+  it('renders one collapsed tool-call group per turn from the direct turn event and keeps it after the turn completes', async () => {
     const projectPath = '/tmp/launcher-tool-call-card-game';
     const manifest = createGameCreationAppManifest(
       'local-project-draft',
@@ -8186,18 +8186,26 @@ export function registerProjectSupervisorSurfaceTests() {
         },
       });
     });
-    const runningCards = within(supervisorSurface)
-      .getAllByTestId('agent-tool-call-card')
-      .filter((card) => card.getAttribute('data-status') === 'running');
-    expect(runningCards).toHaveLength(1);
-    const runningCard = runningCards[0] as HTMLElement;
-    expect(within(runningCard).getByText('执行中')).not.toBeNull();
-    // 此刻只应看到本回合的「执行命令」：不在对话里、也不属于当前回合的 turnId
+    // 一回合一个折叠块（默认折叠）：块头是按钮，正文用 `hidden` 收起。
+    const runningGroups = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-group',
+    );
+    expect(runningGroups).toHaveLength(1);
+    const runningGroup = runningGroups[0] as HTMLElement;
+    expect(runningGroup.getAttribute('data-status')).toBe('running');
+    const runningHead = within(runningGroup).getByTestId(
+      'agent-tool-call-group-head',
+    );
+    expect(runningHead.tagName).toBe('BUTTON');
+    expect(runningHead.getAttribute('aria-expanded')).toBe('false');
+    const runningBody = runningGroup.querySelector(
+      `#${runningHead.getAttribute('aria-controls')}`,
+    );
+    expect(runningBody).not.toBeNull();
+    expect(runningBody?.hasAttribute('hidden')).toBe(true);
+    // 此刻只应看到本回合的那一条命令：不在对话里、也不属于当前回合的 turnId
     // 会在 App 侧被过滤掉，不会漂在消息流里。
-    const visibleKinds = within(supervisorSurface)
-      .getAllByTestId('agent-tool-call-card')
-      .map((card) => card.getAttribute('data-kind'));
-    expect(visibleKinds).toEqual(['command']);
+    expect(runningHead.textContent).toContain('已执行 1 个命令');
 
     await act(async () => {
       directTurnUpdateHandler?.({
@@ -8240,25 +8248,89 @@ export function registerProjectSupervisorSurfaceTests() {
         },
       });
     });
+    // 同一回合的两条工具只产生一个块；同回合内按 startedAt 升序。
     await waitFor(() => {
       expect(
-        within(supervisorSurface).getAllByTestId('agent-tool-call-card'),
-      ).toHaveLength(2);
+        within(supervisorSurface).getAllByTestId('agent-tool-call-group'),
+      ).toHaveLength(1);
     });
-    const cards = within(supervisorSurface).getAllByTestId(
-      'agent-tool-call-card',
+    const group = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-group',
+    )[0] as HTMLElement;
+    expect(group.getAttribute('data-status')).toBe('failed');
+    const groupHead = within(group).getByTestId('agent-tool-call-group-head');
+    expect(groupHead.textContent).toContain('已执行 1 个命令、1 个文件变更');
+    // 实时回合的块落在消息流末尾：该回合 assistant 消息还没落盘，
+    // 所以它在上一条 assistant 消息之后，而不是被锚到别人头上。
+    const liveChildren = Array.from((messageList as HTMLElement).children);
+    const previousAssistantIndex = liveChildren.findIndex(
+      (node) =>
+        node.classList.contains('message--assistant') &&
+        node.textContent?.includes('上一轮已完成'),
     );
-    // 同一 id 只渲染一次，状态由 completed 覆盖；同回合内按 startedAt 升序。
-    expect(cards.map((card) => card.getAttribute('data-kind'))).toEqual([
+    expect(previousAssistantIndex).toBeGreaterThanOrEqual(0);
+    expect(liveChildren.findIndex((node) => node === group)).toBeGreaterThan(
+      previousAssistantIndex,
+    );
+
+    // 展开块：行数 = 本回合工具数，每行一条，按 startedAt 升序。
+    fireEvent.click(groupHead);
+    await waitFor(() => {
+      expect(groupHead.getAttribute('aria-expanded')).toBe('true');
+    });
+    const groupBody = group.querySelector(
+      `#${groupHead.getAttribute('aria-controls')}`,
+    );
+    expect(groupBody?.hasAttribute('hidden')).toBe(false);
+    const rows = within(group).getAllByTestId('agent-tool-call-row');
+    expect(rows).toHaveLength(2);
+    expect(rows.map((row) => row.getAttribute('data-kind'))).toEqual([
       'command',
       'file_change',
     ]);
-    expect(cards[0]?.getAttribute('data-status')).toBe('completed');
-    expect(cards[1]?.getAttribute('data-status')).toBe('failed');
-    // 这两张卡都锚在「正在跑的回合」上；回合结束后下面对 DOM 顺序重新取一次。
-    expect(cards).toHaveLength(2);
+    // 同一 id 只渲染一次，状态由 completed 覆盖；failed 行标「失败」。
+    expect(rows[0]?.getAttribute('data-status')).toBe('completed');
+    expect(rows[1]?.getAttribute('data-status')).toBe('failed');
+    const commandRow = rows[0] as HTMLElement;
+    const fileRow = rows[1] as HTMLElement;
+    expect(within(commandRow).getByText('已运行 npm run build')).not.toBeNull();
+    expect(within(fileRow).getByText('已编辑 game/src/hero.ts')).not.toBeNull();
+    expect(within(fileRow).getByText('失败')).not.toBeNull();
 
-    // 回合结束：assistant 消息落盘后卡片仍在该回合消息之后，不重复、不消失。
+    // 行可二级展开：默认折叠，展开后看到命令 / 路径 + 变更类型 / 输出。
+    const commandRowHead = within(commandRow).getByRole('button');
+    expect(commandRowHead.getAttribute('aria-expanded')).toBe('false');
+    expect(
+      commandRow
+        .querySelector(`#${commandRowHead.getAttribute('aria-controls')}`)
+        ?.hasAttribute('hidden'),
+    ).toBe(true);
+    fireEvent.click(commandRowHead);
+    const commandDetail = commandRow.querySelector(
+      `#${commandRowHead.getAttribute('aria-controls')}`,
+    );
+    expect(commandDetail?.hasAttribute('hidden')).toBe(false);
+    expect(
+      within(commandDetail as HTMLElement).getByText('npm run build'),
+    ).not.toBeNull();
+    expect(
+      within(commandDetail as HTMLElement).getByText('build ok'),
+    ).not.toBeNull();
+    // 文件变更行：路径与变更类型都读得到。
+    const fileRowHead = within(fileRow).getByRole('button');
+    fireEvent.click(fileRowHead);
+    const fileDetail = fileRow.querySelector(
+      `#${fileRowHead.getAttribute('aria-controls')}`,
+    );
+    expect(fileDetail?.hasAttribute('hidden')).toBe(false);
+    expect(
+      within(fileDetail as HTMLElement).getAllByText('game/src/hero.ts'),
+    ).toHaveLength(2);
+    expect(within(fileDetail as HTMLElement).getByText('修改')).not.toBeNull();
+    expect(within(fileDetail as HTMLElement).getByText('删除')).not.toBeNull();
+
+    // 回合结束：assistant 消息落盘后，块移到该回合 assistant 消息**之前**（工具在上、答复在下），
+    // 不重复、不消失。
     await act(async () => {
       directReply.resolve('DIRECT_REPLY:做一个跑酷游戏');
     });
@@ -8269,12 +8341,12 @@ export function registerProjectSupervisorSurfaceTests() {
     });
     await waitFor(() => {
       expect(
-        within(supervisorSurface).getAllByTestId('agent-tool-call-card'),
-      ).toHaveLength(2);
+        within(supervisorSurface).getAllByTestId('agent-tool-call-group'),
+      ).toHaveLength(1);
     });
     // 重新取一次：回合结束会重渲染，之前抓到的引用已经不是当前 DOM 节点。
-    const settledCards = within(supervisorSurface).getAllByTestId(
-      'agent-tool-call-card',
+    const settledGroups = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-group',
     );
     const children = Array.from((messageList as HTMLElement).children);
     const assistantIndex = children.findIndex(
@@ -8283,55 +8355,44 @@ export function registerProjectSupervisorSurfaceTests() {
         node.textContent?.includes('DIRECT_REPLY:做一个跑酷游戏'),
     );
     expect(assistantIndex).toBeGreaterThanOrEqual(0);
-    expect(
-      children.findIndex((node) => node === settledCards[0]),
-    ).toBeGreaterThan(assistantIndex);
-
-    // 折叠态：标题 + 摘要 + 状态；正文用 `hidden` 收起。
-    const firstCard = settledCards[0] as HTMLElement;
-    const firstHead = within(firstCard).getByRole('button', {
-      name: '执行命令：npm run build',
-    });
-    expect(firstHead.getAttribute('aria-expanded')).toBe('false');
-    const firstBody = (messageList as HTMLElement).querySelector(
-      `#${firstHead.getAttribute('aria-controls')}`,
+    const settledGroupIndex = children.findIndex(
+      (node) => node === settledGroups[0],
     );
-    expect(firstBody?.hasAttribute('hidden')).toBe(true);
-    expect(within(firstHead).getByText('执行命令')).not.toBeNull();
-    expect(within(firstHead).getByText('npm run build')).not.toBeNull();
-    expect(within(firstCard).getByText('已完成')).not.toBeNull();
-
-    // 键盘可达：头部就是按钮（Tab 可达），Enter/Space 触发的 click 同步 aria-expanded 与 hidden。
-    expect(firstHead.tagName).toBe('BUTTON');
-    (firstHead as HTMLButtonElement).focus();
-    expect(document.activeElement).toBe(firstHead);
-    fireEvent.click(firstHead);
-    await waitFor(() => {
-      expect(firstHead.getAttribute('aria-expanded')).toBe('true');
-      expect(firstBody?.hasAttribute('hidden')).toBe(false);
-    });
-    expect(within(firstCard).getByText('build ok')).not.toBeNull();
-    fireEvent.click(firstHead);
-    await waitFor(() => {
-      expect(firstHead.getAttribute('aria-expanded')).toBe('false');
-      expect(firstBody?.hasAttribute('hidden')).toBe(true);
-    });
-
-    // 展开文件变更卡：路径与变更类型都读得到。
-    const secondCard = settledCards[1] as HTMLElement;
-    const secondHead = within(secondCard).getByRole('button', {
-      name: '编辑 1 个文件：game/src/hero.ts',
-    });
-    fireEvent.click(secondHead);
-    const secondBody = (messageList as HTMLElement).querySelector(
-      `#${secondHead.getAttribute('aria-controls')}`,
-    );
-    expect(secondBody?.hasAttribute('hidden')).toBe(false);
+    expect(settledGroupIndex).toBeGreaterThanOrEqual(0);
+    // 块在该回合的 user 消息与 assistant 消息之间：紧邻 assistant 消息之前。
+    expect(settledGroupIndex).toBeLessThan(assistantIndex);
+    expect(settledGroupIndex).toBe(assistantIndex - 1);
     expect(
-      within(secondBody as HTMLElement).getAllByText('game/src/hero.ts'),
+      children[settledGroupIndex - 1]?.classList.contains('message--user'),
+    ).toBe(true);
+
+    // 重新挂载后的块回到默认折叠；键盘可达：块头就是按钮（Tab 可达），
+    // Enter/Space 触发的 click 同步 aria-expanded 与 hidden。
+    const settledGroup = settledGroups[0] as HTMLElement;
+    const settledHead = within(settledGroup).getByTestId(
+      'agent-tool-call-group-head',
+    );
+    expect(settledHead.tagName).toBe('BUTTON');
+    expect(settledHead.getAttribute('aria-expanded')).toBe('false');
+    const settledBody = settledGroup.querySelector(
+      `#${settledHead.getAttribute('aria-controls')}`,
+    );
+    expect(settledBody?.hasAttribute('hidden')).toBe(true);
+    (settledHead as HTMLButtonElement).focus();
+    expect(document.activeElement).toBe(settledHead);
+    fireEvent.click(settledHead);
+    await waitFor(() => {
+      expect(settledHead.getAttribute('aria-expanded')).toBe('true');
+      expect(settledBody?.hasAttribute('hidden')).toBe(false);
+    });
+    expect(
+      within(settledGroup).getAllByTestId('agent-tool-call-row'),
     ).toHaveLength(2);
-    expect(within(secondBody as HTMLElement).getByText('修改')).not.toBeNull();
-    expect(within(secondBody as HTMLElement).getByText('删除')).not.toBeNull();
+    fireEvent.click(settledHead);
+    await waitFor(() => {
+      expect(settledHead.getAttribute('aria-expanded')).toBe('false');
+      expect(settledBody?.hasAttribute('hidden')).toBe(true);
+    });
   });
 
   it('reads the persisted tool-call history whenever a project is opened', async () => {
@@ -8363,15 +8424,59 @@ export function registerProjectSupervisorSurfaceTests() {
         }
         if (command === 'read_direct_project_conversation') {
           return {
-            path: projectPath,
+            path: `${projectPath}/.agent/conversations/project.jsonl`,
             agentId: null,
             sessionId: null,
-            messages: [],
+            messages: [
+              {
+                schemaVersion: 'agc-direct-project-context.v1',
+                role: 'user',
+                content: '做一个小球弹跳游戏',
+                agentId: null,
+                messageId: 'direct-codex:turn-persisted:user',
+                updatedAt: 1000,
+              },
+              {
+                schemaVersion: 'agc-direct-project-context.v1',
+                role: 'assistant',
+                content: '上一轮的答复',
+                agentId: null,
+                messageId: 'direct-codex:turn-persisted:assistant',
+                updatedAt: 2000,
+              },
+            ],
           };
         }
         if (command === 'read_direct_tool_calls') {
           readToolCallCount += 1;
-          return [];
+          return [
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'persisted-command',
+              turnId: 'turn-persisted',
+              kind: 'command',
+              title: '执行命令',
+              summary: 'npm run build',
+              status: 'completed',
+              detail: { command: 'npm run build' },
+              startedAt: 1000,
+              updatedAt: 1500,
+            },
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'persisted-file',
+              turnId: 'turn-persisted',
+              kind: 'file_change',
+              title: '编辑 1 个文件',
+              summary: 'game/src/hero.ts',
+              status: 'completed',
+              detail: {
+                changes: [{ path: 'game/src/hero.ts', kind: 'add' }],
+              },
+              startedAt: 1500,
+              updatedAt: 2000,
+            },
+          ];
         }
         if (command === 'get_local_game_preview_status') {
           return { status: 'stopped', url: null, port: null, root: null };
@@ -8395,10 +8500,34 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(invoke).toHaveBeenCalledWith('read_direct_tool_calls', {
       projectPath,
     });
-    // 历史为空时与改造前一致：没有卡片，也不报错。
+    // 回读到的工具调用挂在自己回合的 assistant 消息**之前**（工具在上、答复在下），
+    // 默认折叠、展开后行数 = 回读到的工具数。
+    const persistedGroups = await within(supervisorSurface).findAllByTestId(
+      'agent-tool-call-group',
+    );
+    expect(persistedGroups).toHaveLength(1);
+    const persistedGroup = persistedGroups[0] as HTMLElement;
+    const persistedHead = within(persistedGroup).getByTestId(
+      'agent-tool-call-group-head',
+    );
+    expect(persistedHead.getAttribute('aria-expanded')).toBe('false');
+    expect(persistedHead.textContent).toContain(
+      '已执行 1 个命令、1 个文件变更',
+    );
+    const messageList = supervisorSurface.querySelector(
+      '.project-supervisor-message-list',
+    ) as HTMLElement;
+    const children = Array.from(messageList.children);
+    const assistantIndex = children.findIndex((node) =>
+      node.classList.contains('message--assistant'),
+    );
+    const groupIndex = children.findIndex((node) => node === persistedGroup);
+    expect(assistantIndex).toBeGreaterThanOrEqual(0);
+    expect(groupIndex).toBe(assistantIndex - 1);
+    fireEvent.click(persistedHead);
     expect(
-      within(supervisorSurface).queryAllByTestId('agent-tool-call-card'),
-    ).toHaveLength(0);
+      within(persistedGroup).getAllByTestId('agent-tool-call-row'),
+    ).toHaveLength(2);
   });
 
   it('renders the Codex empty state and opens the panel settings overlay in a fresh direct chat', async () => {
diff --git a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
new file mode 100644
index 000000000..152d5d8da
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
@@ -0,0 +1,208 @@
+import type { GameCreatorDirectToolCall } from '../../src/app/types';
+import { ToolCallGroup } from '../../src/features/project-workspace/ToolCallGroup';
+import {
+  toolCallGroupSummary,
+  toolCallRowText,
+} from '../../src/features/project-workspace/toolCallGroupPresentation';
+import { expect, fireEvent, it, React, render, within } from './harness';
+
+function toolCall(
+  overrides: Partial<GameCreatorDirectToolCall> &
+    Pick<GameCreatorDirectToolCall, 'id' | 'kind'>,
+): GameCreatorDirectToolCall {
+  return {
+    schemaVersion: 'agc-tool-call.v1',
+    turnId: 'turn-1',
+    title: '执行命令',
+    summary: 'npm run build',
+    status: 'completed',
+    detail: {},
+    startedAt: 0,
+    updatedAt: 0,
+    ...overrides,
+  };
+}
+
+export function registerToolCallGroupTests() {
+  it('summarizes tool calls by kind in a fixed order', () => {
+    // 单 kind。
+    expect(toolCallGroupSummary([toolCall({ id: 'a', kind: 'command' })])).toBe(
+      '已执行 1 个命令',
+    );
+    // 混合：顺序固定 command → file_change → mcp_tool → web_search →
+    // context_compaction → other，与传入顺序无关。
+    expect(
+      toolCallGroupSummary([
+        toolCall({ id: 'a', kind: 'other' }),
+        toolCall({ id: 'b', kind: 'web_search' }),
+        toolCall({ id: 'c', kind: 'command' }),
+        toolCall({ id: 'd', kind: 'command' }),
+        toolCall({ id: 'e', kind: 'file_change' }),
+        toolCall({ id: 'f', kind: 'context_compaction' }),
+        toolCall({ id: 'g', kind: 'mcp_tool' }),
+      ]),
+    ).toBe(
+      '已执行 2 个命令、1 个文件变更、1 个工具调用、1 个联网搜索、1 个上下文整理、1 个其他操作',
+    );
+    // 空集合。
+    expect(toolCallGroupSummary([])).toBe('');
+  });
+
+  it('builds the row text from the tool kind', () => {
+    expect(
+      toolCallRowText(
+        toolCall({ id: 'a', kind: 'command', summary: 'npm run build' }),
+      ),
+    ).toBe('已运行 npm run build');
+    expect(
+      toolCallRowText(
+        toolCall({
+          id: 'b',
+          kind: 'file_change',
+          summary: 'game/src/hero.ts',
+        }),
+      ),
+    ).toBe('已编辑 game/src/hero.ts');
+    expect(
+      toolCallRowText(
+        toolCall({ id: 'c', kind: 'mcp_tool', summary: 'canvas.sync' }),
+      ),
+    ).toBe('已调用 canvas.sync');
+    expect(
+      toolCallRowText(
+        toolCall({ id: 'd', kind: 'web_search', summary: '弹幕游戏玩法' }),
+      ),
+    ).toBe('已搜索 弹幕游戏玩法');
+    // 上下文整理不带 summary。
+    expect(
+      toolCallRowText(
+        toolCall({
+          id: 'e',
+          kind: 'context_compaction',
+          summary: 'should be ignored',
+        }),
+      ),
+    ).toBe('已整理上下文');
+    expect(
+      toolCallRowText(
+        toolCall({ id: 'f', kind: 'other', summary: '未知动作' }),
+      ),
+    ).toBe('已执行 未知动作');
+  });
+
+  it('renders one collapsed block per turn and lists every tool on expand', async () => {
+    const calls = [
+      toolCall({ id: 'a', kind: 'command', summary: 'npm run build' }),
+      toolCall({
+        id: 'b',
+        kind: 'file_change',
+        title: '编辑 1 个文件',
+        summary: 'game/src/hero.ts',
+        status: 'running',
+        detail: { changes: [{ path: 'game/src/hero.ts', kind: 'update' }] },
+      }),
+    ];
+    const { container } = render(React.createElement(ToolCallGroup, { calls }));
+    const group = container.querySelector(
+      '[data-testid="agent-tool-call-group"]',
+    ) as HTMLElement;
+    expect(group).not.toBeNull();
+    const head = within(group).getByTestId('agent-tool-call-group-head');
+    // 块头是一行按钮：图标 + 汇总 + 展开箭头，默认折叠，正文由 `hidden` 收起。
+    expect(head.tagName).toBe('BUTTON');
+    expect(head.getAttribute('aria-expanded')).toBe('false');
+    expect(head.getAttribute('aria-label')).toBe(
+      '已执行 1 个命令、1 个文件变更',
+    );
+    expect(
+      head.querySelector('.agent-tool-call-group-summary')?.textContent,
+    ).toBe('已执行 1 个命令、1 个文件变更');
+    const body = container.querySelector(
+      `#${head.getAttribute('aria-controls')}`,
+    );
+    expect(body?.hasAttribute('hidden')).toBe(true);
+    expect(within(group).queryAllByTestId('agent-tool-call-row')).toHaveLength(
+      2,
+    );
+
+    // 展开：行数 = 工具数，每行一条，按 startedAt 升序。
+    fireEvent.click(head);
+    expect(head.getAttribute('aria-expanded')).toBe('true');
+    expect(body?.hasAttribute('hidden')).toBe(false);
+    const rows = within(group).queryAllByTestId('agent-tool-call-row');
+    expect(rows).toHaveLength(2);
+    expect(rows.map((row) => row.getAttribute('data-kind'))).toEqual([
+      'command',
+      'file_change',
+    ]);
+    expect(
+      within(rows[0] as HTMLElement).getByText('已运行 npm run build'),
+    ).not.toBeNull();
+    expect(
+      within(rows[1] as HTMLElement).getByText('已编辑 game/src/hero.ts'),
+    ).not.toBeNull();
+    // running 的行在行内标「执行中」。
+    expect(within(rows[1] as HTMLElement).getByText('执行中')).not.toBeNull();
+  });
+
+  it('expands a row to its own detail and renders nothing for an empty turn', () => {
+    const { container } = render(
+      React.createElement(ToolCallGroup, {
+        calls: [
+          toolCall({
+            id: 'a',
+            kind: 'command',
+            summary: 'npm run build',
+            detail: { command: 'npm run build', output: 'build ok' },
+          }),
+          toolCall({
+            id: 'b',
+            kind: 'file_change',
+            title: '编辑 1 个文件',
+            summary: 'game/src/hero.ts',
+            status: 'failed',
+            detail: { changes: [{ path: 'game/src/hero.ts', kind: 'add' }] },
+          }),
+        ],
+      }),
+    );
+    const head = container.querySelector(
+      '[data-testid="agent-tool-call-group-head"]',
+    ) as HTMLElement;
+    fireEvent.click(head);
+    const rows = container.querySelectorAll(
+      '[data-testid="agent-tool-call-row"]',
+    );
+    // 行也是按钮：`aria-expanded` + `aria-controls` 指向自己的明细，默认折叠。
+    const commandHead = within(rows[0] as HTMLElement).getByRole('button');
+    expect(commandHead.getAttribute('aria-expanded')).toBe('false');
+    expect(commandHead.getAttribute('aria-label')).toBe('已运行 npm run build');
+    const commandDetail = container.querySelector(
+      `#${commandHead.getAttribute('aria-controls')}`,
+    );
+    expect(commandDetail?.hasAttribute('hidden')).toBe(true);
+    fireEvent.click(commandHead);
+    expect(commandHead.getAttribute('aria-expanded')).toBe('true');
+    expect(commandDetail?.hasAttribute('hidden')).toBe(false);
+    expect(
+      within(commandDetail as HTMLElement).getByText('build ok'),
+    ).not.toBeNull();
+    // 文件变更明细：路径 + 变更类型。
+    const fileHead = within(rows[1] as HTMLElement).getByRole('button');
+    expect(fileHead.getAttribute('aria-label')).toBe(
+      '已编辑 game/src/hero.ts，失败',
+    );
+    fireEvent.click(fileHead);
+    const fileDetail = container.querySelector(
+      `#${fileHead.getAttribute('aria-controls')}`,
+    );
+    expect(
+      within(fileDetail as HTMLElement).getByText('game/src/hero.ts'),
+    ).not.toBeNull();
+    expect(within(fileDetail as HTMLElement).getByText('新增')).not.toBeNull();
+
+    // 空集合不渲染块。
+    const empty = render(React.createElement(ToolCallGroup, { calls: [] }));
+    expect(empty.container.firstChild).toBeNull();
+  });
+}
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 7cf7c832e..10da3aea8 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -48,32 +48,49 @@ toolCalls?: DirectTurnToolCall[] | null;
 - 历史文件缺失 → 返回空数组，不报错。
 - 单行损坏 → 跳过该行继续，不整体失败（与 Codex item 流一样是"尽力而为"的展示数据，不是业务真相）。
 
-### 4. 前端合并与渲染
+### 4. 前端合并与渲染（2026-09 修订：一回合一个折叠块）
 
-- 加载对话时把回读结果按 `turnId` 归并进消息流：工具调用卡插在**同一回合最后一条 assistant 消息之后**，同一回合内按 `startedAt` 升序。
-- 实时回合（`directCodexProductRuntime` 且 `activeDirectCodexTurnRef` 命中）时，卡片跟着事件增量更新；回合结束后由持久化数据接管（不出现重复卡片，同一 `id` 只渲染一次）。
-- 卡片 DOM 与交互（对齐 Codex）：
+- 加载对话时把回读结果按 `turnId` 归并进消息流：**同一回合的工具调用收成一个折叠块**，块插在该回合 **assistant 消息之前**（Codex 是「工具在上、答复在下」），同一回合内按 `startedAt` 升序。
+- 实时回合（`directCodexProductRuntime` 且 `activeDirectCodexTurnRef` 命中）时，块跟着事件增量更新；回合的 assistant 消息还没落盘时，块落在消息流末尾（下一条 assistant 消息一落盘，块就回到它之前），回合结束后由持久化数据接管（不出现重复块，同一 `id` 每条工具只渲染一行）。
+- 块 DOM 与交互（对齐 Codex）：
 
 ```html
-<section class="agent-tool-call" data-kind="command" data-status="running">
-  <button type="button" class="agent-tool-call-head" aria-expanded="false">
-    <span class="agent-tool-call-icon" aria-hidden="true"></span>
-    <span class="agent-tool-call-title">执行命令</span>
-    <span class="agent-tool-call-summary">npm run build</span>
-    <span class="agent-tool-call-status">执行中</span>
-    <svg class="agent-tool-call-chevron" aria-hidden="true"></svg>
+<section class="agent-tool-call-group" data-testid="agent-tool-call-group" data-status="completed">
+  <button type="button" class="agent-tool-call-group-head" aria-expanded="false" aria-controls="…"
+          aria-label="已执行 2 个命令、1 个文件变更，用时 42秒">
+    <span class="agent-tool-call-group-icon" aria-hidden="true"></span>
+    <span class="agent-tool-call-group-summary">已执行 2 个命令、1 个文件变更</span>
+    <span class="agent-tool-call-group-time">14:20 → 14:21</span>
+    <span class="agent-tool-call-group-duration">用时 42秒</span>
+    <svg class="agent-tool-call-group-chevron" aria-hidden="true"></svg>
   </button>
-  <div class="agent-tool-call-body" hidden>
-    <pre class="agent-tool-call-command">...</pre>
-    <ul class="agent-tool-call-changes"><li>game/src/x.ts <small>新增</small></li></ul>
-    <pre class="agent-tool-call-output">...</pre>
+  <div class="agent-tool-call-group-body" hidden>
+    <ul class="agent-tool-call-group-rows">
+      <li class="agent-tool-call-group-row" data-testid="agent-tool-call-row" data-kind="command" data-duration-ms="12300">
+        <button type="button" class="agent-tool-call-row-head" aria-expanded="false" aria-controls="…"
+                aria-label="已运行 npm run build，耗时 12.3s">
+          <span class="agent-tool-call-row-icon" aria-hidden="true"></span>
+          <span class="agent-tool-call-row-text">已运行 npm run build</span>
+          <span class="agent-tool-call-row-duration">12.3s</span>
+          <svg class="agent-tool-call-row-chevron" aria-hidden="true"></svg>
+        </button>
+        <div class="agent-tool-call-row-detail" hidden>
+          <pre class="agent-tool-call-row-command">…</pre>
+          <ul class="agent-tool-call-row-changes"><li><span>game/src/x.ts</span><small>新增</small></li></ul>
+          <pre class="agent-tool-call-row-output">…</pre>
+        </div>
+      </li>
+    </ul>
   </div>
 </section>
 ```
 
-- 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），`aria-label` 说明「执行命令：npm run build」。
-- 默认折叠；`running` 时标题右侧显示进行中状态点；`failed` 时标题与状态文案用错误色（用现有 `--platform-*` 变量，不新增色值）。
-- 输入框、消息气泡、消息列表滚动模型**不变**；卡片只是消息流里的一个块。
+- 文案规则（按 kind，不允许自由发挥）：
+  - 块头汇总按 kind 计数、顺序固定 `command → file_change → mcp_tool → web_search → context_compaction → other`，标签 `命令`/`文件变更`/`工具调用`/`联网搜索`/`上下文整理`/`其他操作`，形如 `已执行 5 个命令、2 个文件变更`；空集合不渲染块。
+  - 行文案：`command` → `已运行 {summary}`、`file_change` → `已编辑 {summary}`、`mcp_tool` → `已调用 {summary}`、`web_search` → `已搜索 {summary}`、`context_compaction` → `已整理上下文`、`other` → `已执行 {summary}`；`failed` 行加 `失败` 并用现有 `--platform-*` 错误色。
+  - 耗时：单条工具 `startedAt` → `updatedAt`，块头 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数）。
+- 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），块头与行都是按钮：`aria-label` = 汇总 / 行文案 + 耗时；默认折叠。
+- 输入框、消息气泡、消息列表滚动模型**不变**；块只是消息流里的一个块。
 
 ## 验收判据（每条都要有可复现证据）
 

From 9f7aed0b2d2ef60ef8ce853a433e09c576fea77a Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 17:37:12 +0800
Subject: [PATCH 12/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=9D=97=E8=A1=A5=E9=BD=90=E8=80=97=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8E=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 toolCallGroupPresentation.ts 的耗时 / 时间纯函数：toolCallDurationMs、formatToolCallDuration（0.4s / 12.3s / 2m 5s）、turnToolCallDurationMs、formatTurnDuration（42秒 / 4分钟 / 5分钟 45秒）、formatClockTime、turnToolCallTimeLabel
- ToolCallGroup：块头右侧显示总用时（min(startedAt) → max(updatedAt)）与该回合结束时间（拿得到同回合用户消息时间时显示 发送 → 结束）
- ToolCallGroup：展开态每行右侧显示该工具自己的耗时；startedAt 为 0 或时间倒序时不显示耗时（不出现 0s / 负数），running 行显示 执行中
- ToolCallGroup：块与行都带 data-duration-ms（无法计算时为空串），块尾补一行 结束于 HH:mm
- ProjectSupervisorView：按回合把用户消息的 updatedAt 传给块，用于 发送 → 结束 时间显示
- 用例：耗时格式化边界（0 / <1s / 整秒 / ≥60s / 时间倒序）、总用时、每行耗时、无时间戳不渲染耗时
- 技术方案文档补耗时 / 时间 / data-* 契约
---
 .../ProjectSupervisorView.tsx                 |  32 ++++
 .../project-workspace/ToolCallGroup.tsx       |  53 ++++++-
 .../toolCallGroupPresentation.ts              | 123 +++++++++++++++
 .../appSurface/project-development.suite.ts   |  28 +++-
 .../tests/appSurface/tool-call-group.suite.ts | 149 ++++++++++++++++++
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |   4 +-
 6 files changed, 381 insertions(+), 8 deletions(-)

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 0d7c44c42..af2336e9a 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
@@ -70,6 +70,16 @@ function directCodexTurnMessageId(turnId: string, role: 'user' | 'assistant') {
   return `direct-codex:${turnId}:${role}`;
 }
 
+/** 从 `direct-codex:<turnId>:assistant` 反解回合 id；不是这个形状返回 `null`。 */
+function directCodexTurnIdFromAssistantMessageId(messageId: string) {
+  const prefix = 'direct-codex:';
+  const suffix = ':assistant';
+  if (!messageId.startsWith(prefix) || !messageId.endsWith(suffix)) {
+    return null;
+  }
+  return messageId.slice(prefix.length, -suffix.length);
+}
+
 type RuntimePanelProps = ComponentProps<typeof ProjectSupervisorRuntimePanel>;
 
 function directStatusTitle(status: string | null | undefined) {
@@ -233,6 +243,7 @@ export function ProjectSupervisorView({
   const streamTurnId = activeTurnId?.trim() ?? '';
   const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
   const liveToolCalls: GameCreatorDirectToolCall[] = [];
+  let liveToolCallTurnId = '';
   if (directCodex) {
     for (const call of toolCalls) {
       const expected = directCodexTurnMessageId(call.turnId, 'assistant');
@@ -249,10 +260,24 @@ export function ProjectSupervisorView({
         continue;
       }
       if (streamTurnId && call.turnId === streamTurnId) {
+        if (!liveToolCallTurnId) {
+          liveToolCallTurnId = call.turnId;
+        }
         liveToolCalls.push(call);
       }
     }
   }
+  // 该回合用户消息的 `updatedAt`：拿得到就在块头显示「发送 → 结束」，拿不到只显示结束时间。
+  const userMessageUpdatedAtForTurn = (turnId: string) => {
+    if (!turnId) {
+      return 0;
+    }
+    const userId = directCodexTurnMessageId(turnId, 'user');
+    return (
+      visibleMessages.find((message) => message.messageId === userId)
+        ?.updatedAt ?? 0
+    );
+  };
   const emptyState =
     directCodex &&
     visibleMessages.length === 0 &&
@@ -363,11 +388,17 @@ export function ProjectSupervisorView({
             const anchoredToolCalls = message.messageId
               ? (toolCallsByAnchor.get(message.messageId) ?? [])
               : [];
+            const anchoredTurnId = message.messageId
+              ? directCodexTurnIdFromAssistantMessageId(message.messageId)
+              : null;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
                 {anchoredToolCalls.length > 0 ? (
                   <ToolCallGroup
                     calls={anchoredToolCalls}
+                    userSentAt={userMessageUpdatedAtForTurn(
+                      anchoredTurnId ?? '',
+                    )}
                     className="message-tool-call"
                   />
                 ) : null}
@@ -383,6 +414,7 @@ export function ProjectSupervisorView({
           {liveToolCalls.length > 0 ? (
             <ToolCallGroup
               calls={liveToolCalls}
+              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
               className="message-tool-call"
             />
           ) : null}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index 781c12f94..62fbf8f27 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -10,26 +10,36 @@ import { useId, useState } from 'react';
 
 import type { GameCreatorDirectToolCall } from '../../app/types';
 import {
+  formatClockTime,
+  formatToolCallDuration,
+  formatTurnDuration,
+  toolCallDurationMs,
   toolCallGroupSummary,
   toolCallRowText,
+  turnToolCallDurationMs,
+  turnToolCallEndedAt,
+  turnToolCallTimeLabel,
 } from './toolCallGroupPresentation';
 
 /**
  * 一回合的工具调用折叠块（Codex 风格）：
- * 块头一行汇总，展开态每行一条工具（行可二级展开看命令 / 文件明细 / 输出）。
+ * 块头一行汇总 + 该回合总用时 + 结束时间，展开态每行一条工具（行可二级展开看命令 / 文件明细 / 输出）。
  * 契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`。
  *
  * 无障碍：块头与每一行都是 `<button aria-expanded>` + `hidden` 控制正文，
  * 所以 Tab 可达、Enter/Space 可切换、读屏能读到展开状态与 `aria-label`。
- * 文案规则（纯函数）在 `toolCallGroupPresentation.ts`。
+ * 文案与耗时规则（纯函数）在 `toolCallGroupPresentation.ts`。
  */
 
 /** 一回合的工具调用折叠块；空集合不渲染。 */
 export function ToolCallGroup({
   calls,
+  userSentAt = 0,
   className,
 }: {
   calls: GameCreatorDirectToolCall[];
+  /** 同一回合用户消息的 `updatedAt`；拿不到就传 0，只显示结束时间。 */
+  userSentAt?: number | null;
   className?: string;
 }) {
   const [expanded, setExpanded] = useState(false);
@@ -41,6 +51,10 @@ export function ToolCallGroup({
     (left, right) => left.startedAt - right.startedAt,
   );
   const summary = toolCallGroupSummary(orderedCalls);
+  const totalDurationMs = turnToolCallDurationMs(orderedCalls);
+  const durationText = formatTurnDuration(totalDurationMs);
+  const timeLabel = turnToolCallTimeLabel(orderedCalls, userSentAt);
+  const headLabel = durationText ? `${summary}，用时 ${durationText}` : summary;
   const status = orderedCalls.some((call) => call.status === 'running')
     ? 'running'
     : orderedCalls.some((call) => call.status === 'failed')
@@ -55,6 +69,7 @@ export function ToolCallGroup({
       }
       data-testid="agent-tool-call-group"
       data-status={status}
+      data-duration-ms={totalDurationMs ?? ''}
     >
       <button
         type="button"
@@ -62,14 +77,22 @@ export function ToolCallGroup({
         data-testid="agent-tool-call-group-head"
         aria-expanded={expanded}
         aria-controls={bodyId}
-        aria-label={summary}
-        title={summary}
+        aria-label={headLabel}
+        title={headLabel}
         onClick={() => setExpanded((current) => !current)}
       >
         <span className="agent-tool-call-group-icon" aria-hidden="true">
           <ToolCallKindIcon kind={orderedCalls[0]?.kind ?? 'other'} />
         </span>
         <span className="agent-tool-call-group-summary">{summary}</span>
+        {timeLabel ? (
+          <span className="agent-tool-call-group-time">{timeLabel}</span>
+        ) : null}
+        {durationText ? (
+          <span className="agent-tool-call-group-duration">
+            {`用时 ${durationText}`}
+          </span>
+        ) : null}
         <ChevronDown
           className="agent-tool-call-group-chevron"
           size={14}
@@ -86,6 +109,14 @@ export function ToolCallGroup({
             <ToolCallRow key={call.id} call={call} />
           ))}
         </ul>
+        {timeLabel ? (
+          <p
+            className="agent-tool-call-group-foot"
+            data-testid="agent-tool-call-group-end-time"
+          >
+            {`结束于 ${formatClockTime(turnToolCallEndedAt(orderedCalls))}`}
+          </p>
+        ) : null}
       </div>
     </section>
   );
@@ -96,13 +127,21 @@ function ToolCallRow({ call }: { call: GameCreatorDirectToolCall }) {
   const [expanded, setExpanded] = useState(false);
   const detailId = useId();
   const text = toolCallRowText(call);
+  const durationMs = toolCallDurationMs(call);
+  const durationText = formatToolCallDuration(durationMs);
   const statusText =
     call.status === 'running'
       ? '执行中'
       : call.status === 'failed'
         ? '失败'
         : '';
-  const rowLabel = [text, statusText].filter(Boolean).join('，');
+  const rowLabel = [
+    text,
+    statusText,
+    durationText ? `耗时 ${durationText}` : '',
+  ]
+    .filter(Boolean)
+    .join('，');
   const changes = call.detail.changes ?? [];
   const detailCommand = call.detail.command?.trim() ?? '';
   const detailOutput = call.detail.output?.trim() ?? '';
@@ -114,6 +153,7 @@ function ToolCallRow({ call }: { call: GameCreatorDirectToolCall }) {
       data-testid="agent-tool-call-row"
       data-kind={call.kind}
       data-status={call.status}
+      data-duration-ms={durationMs ?? ''}
     >
       <button
         type="button"
@@ -131,6 +171,9 @@ function ToolCallRow({ call }: { call: GameCreatorDirectToolCall }) {
         {statusText ? (
           <span className="agent-tool-call-row-status">{statusText}</span>
         ) : null}
+        {durationText ? (
+          <span className="agent-tool-call-row-duration">{durationText}</span>
+        ) : null}
         {hasDetail ? (
           <ChevronDown
             className="agent-tool-call-row-chevron"
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
index 71ef915e7..9c928252a 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
@@ -92,3 +92,126 @@ function toolCallRowSummary(call: GameCreatorDirectToolCall) {
   }
   return call.title.trim();
 }
+
+/**
+ * 单条工具的耗时（毫秒）。
+ * `startedAt` 为 0（缺失）或 `updatedAt < startedAt`（时间倒序）时返回 `null`：
+ * 这两种情况不显示耗时，不显示 `0s` / 负数。
+ */
+export function toolCallDurationMs(
+  call: Pick<GameCreatorDirectToolCall, 'startedAt' | 'updatedAt'>,
+): number | null {
+  const startedAt = Number.isFinite(call.startedAt) ? call.startedAt : 0;
+  const updatedAt = Number.isFinite(call.updatedAt) ? call.updatedAt : 0;
+  if (startedAt <= 0 || updatedAt < startedAt) {
+    return null;
+  }
+  return updatedAt - startedAt;
+}
+
+/**
+ * 单条工具的耗时文案：`0.4s`（<1s）/ `12.3s`（<60s，整秒省略小数）/ `2m 5s`（≥60s）。
+ * 无法计算的耗时（`null` / 0 / 负数）返回 `null`。
+ */
+export function formatToolCallDuration(ms: number | null | undefined) {
+  if (ms === null || ms === undefined || !Number.isFinite(ms) || ms <= 0) {
+    return null;
+  }
+  if (ms < 60000) {
+    const tenths = Math.max(1, Math.round(ms / 100));
+    if (tenths < 600) {
+      const value = tenths / 10;
+      return Number.isInteger(value) ? `${value}s` : `${value.toFixed(1)}s`;
+    }
+  }
+  const totalSeconds = Math.max(60, Math.round(ms / 1000));
+  const minutes = Math.floor(totalSeconds / 60);
+  const restSeconds = totalSeconds % 60;
+  return restSeconds === 0 ? `${minutes}m` : `${minutes}m ${restSeconds}s`;
+}
+
+/** 一回合总用时：该回合所有工具的 `min(startedAt)` → `max(updatedAt)`；取不到返回 `null`。 */
+export function turnToolCallDurationMs(
+  calls: Array<Pick<GameCreatorDirectToolCall, 'startedAt' | 'updatedAt'>>,
+): number | null {
+  let minStartedAt = Number.POSITIVE_INFINITY;
+  let maxUpdatedAt = Number.NEGATIVE_INFINITY;
+  for (const call of calls) {
+    const startedAt = Number.isFinite(call.startedAt) ? call.startedAt : 0;
+    const updatedAt = Number.isFinite(call.updatedAt) ? call.updatedAt : 0;
+    if (startedAt > 0) {
+      minStartedAt = Math.min(minStartedAt, startedAt);
+    }
+    if (updatedAt > 0) {
+      maxUpdatedAt = Math.max(maxUpdatedAt, updatedAt);
+    }
+  }
+  if (!Number.isFinite(minStartedAt) || !Number.isFinite(maxUpdatedAt)) {
+    return null;
+  }
+  if (maxUpdatedAt < minStartedAt) {
+    return null;
+  }
+  return maxUpdatedAt - minStartedAt;
+}
+
+/** 块头总用时文案：`42秒` / `4分钟` / `5分钟 45秒`；无法计算的耗时返回 `null`。 */
+export function formatTurnDuration(ms: number | null | undefined) {
+  if (ms === null || ms === undefined || !Number.isFinite(ms) || ms <= 0) {
+    return null;
+  }
+  const seconds = Math.max(1, Math.round(ms / 1000));
+  if (seconds < 60) {
+    return `${seconds}秒`;
+  }
+  const minutes = Math.floor(seconds / 60);
+  const restSeconds = seconds % 60;
+  return restSeconds === 0
+    ? `${minutes}分钟`
+    : `${minutes}分钟 ${restSeconds}秒`;
+}
+
+/** 该回合的结束时间：`max(updatedAt)`；取不到返回 0。 */
+export function turnToolCallEndedAt(
+  calls: Array<Pick<GameCreatorDirectToolCall, 'updatedAt'>>,
+) {
+  let maxUpdatedAt = 0;
+  for (const call of calls) {
+    if (Number.isFinite(call.updatedAt) && call.updatedAt > maxUpdatedAt) {
+      maxUpdatedAt = call.updatedAt;
+    }
+  }
+  return maxUpdatedAt;
+}
+
+/** 本地 `HH:mm`；时间戳缺失（0 / 非法）返回 `null`，不编造时间。 */
+export function formatClockTime(timestamp: number | null | undefined) {
+  if (
+    timestamp === null ||
+    timestamp === undefined ||
+    !Number.isFinite(timestamp) ||
+    timestamp <= 0
+  ) {
+    return null;
+  }
+  const date = new Date(timestamp);
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  return `${hours}:${minutes}`;
+}
+
+/**
+ * 块头时间文案：该回合结束时间（`max(updatedAt)` 的本地 `HH:mm`）；
+ * 能拿到同回合用户消息时间（`updatedAt > 0`）时显示「发送 → 结束」，取不到就只显示结束时间。
+ */
+export function turnToolCallTimeLabel(
+  calls: Array<Pick<GameCreatorDirectToolCall, 'updatedAt'>>,
+  userSentAt: number | null | undefined,
+) {
+  const endLabel = formatClockTime(turnToolCallEndedAt(calls));
+  if (!endLabel) {
+    return null;
+  }
+  const sentLabel = formatClockTime(userSentAt ?? 0);
+  return sentLabel ? `${sentLabel} → ${endLabel}` : endLabel;
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index da2b77396..abbcb8cbf 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -8260,6 +8260,13 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(group.getAttribute('data-status')).toBe('failed');
     const groupHead = within(group).getByTestId('agent-tool-call-group-head');
     expect(groupHead.textContent).toContain('已执行 1 个命令、1 个文件变更');
+    // 块头右侧是总用时（min(startedAt) → max(updatedAt)），并在 data-* 上暴露原始毫秒。
+    expect(group.getAttribute('data-duration-ms')).toBe('100');
+    expect(groupHead.textContent).toContain('用时 1秒');
+    // 同一回合的用户消息时间（App 提交时写入）→ 显示「发送 → 结束」。
+    expect(
+      groupHead.querySelector('.agent-tool-call-group-time')?.textContent,
+    ).toMatch(/^\d{2}:\d{2} → \d{2}:\d{2}$/);
     // 实时回合的块落在消息流末尾：该回合 assistant 消息还没落盘，
     // 所以它在上一条 assistant 消息之后，而不是被锚到别人头上。
     const liveChildren = Array.from((messageList as HTMLElement).children);
@@ -8296,6 +8303,11 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(within(commandRow).getByText('已运行 npm run build')).not.toBeNull();
     expect(within(fileRow).getByText('已编辑 game/src/hero.ts')).not.toBeNull();
     expect(within(fileRow).getByText('失败')).not.toBeNull();
+    // 每行右侧显示该工具自己的耗时（`startedAt` → `updatedAt`）。
+    expect(commandRow.getAttribute('data-duration-ms')).toBe('100');
+    expect(within(commandRow).getByText('0.1s')).not.toBeNull();
+    expect(fileRow.getAttribute('data-duration-ms')).toBe('50');
+    expect(within(fileRow).getByText('0.1s')).not.toBeNull();
 
     // 行可二级展开：默认折叠，展开后看到命令 / 路径 + 变更类型 / 输出。
     const commandRowHead = within(commandRow).getByRole('button');
@@ -8514,6 +8526,12 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(persistedHead.textContent).toContain(
       '已执行 1 个命令、1 个文件变更',
     );
+    // 回读回来的时间戳一样能算总用时与「发送 → 结束」。
+    expect(persistedGroup.getAttribute('data-duration-ms')).toBe('1000');
+    expect(persistedHead.textContent).toContain('用时 1秒');
+    expect(
+      persistedHead.querySelector('.agent-tool-call-group-time')?.textContent,
+    ).toMatch(/^\d{2}:\d{2} → \d{2}:\d{2}$/);
     const messageList = supervisorSurface.querySelector(
       '.project-supervisor-message-list',
     ) as HTMLElement;
@@ -8525,9 +8543,15 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(assistantIndex).toBeGreaterThanOrEqual(0);
     expect(groupIndex).toBe(assistantIndex - 1);
     fireEvent.click(persistedHead);
+    const persistedRows = within(persistedGroup).getAllByTestId(
+      'agent-tool-call-row',
+    );
+    expect(persistedRows).toHaveLength(2);
+    // 每行右侧是该工具自己的耗时（0.5s / 0.5s）。
+    expect(persistedRows[0]?.getAttribute('data-duration-ms')).toBe('500');
     expect(
-      within(persistedGroup).getAllByTestId('agent-tool-call-row'),
-    ).toHaveLength(2);
+      within(persistedRows[0] as HTMLElement).getByText('0.5s'),
+    ).not.toBeNull();
   });
 
   it('renders the Codex empty state and opens the panel settings overlay in a fresh direct chat', async () => {
diff --git a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
index 152d5d8da..cfcd782aa 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
@@ -1,8 +1,13 @@
 import type { GameCreatorDirectToolCall } from '../../src/app/types';
 import { ToolCallGroup } from '../../src/features/project-workspace/ToolCallGroup';
 import {
+  formatToolCallDuration,
+  formatTurnDuration,
+  toolCallDurationMs,
   toolCallGroupSummary,
   toolCallRowText,
+  turnToolCallDurationMs,
+  turnToolCallTimeLabel,
 } from '../../src/features/project-workspace/toolCallGroupPresentation';
 import { expect, fireEvent, it, React, render, within } from './harness';
 
@@ -205,4 +210,148 @@ export function registerToolCallGroupTests() {
     const empty = render(React.createElement(ToolCallGroup, { calls: [] }));
     expect(empty.container.firstChild).toBeNull();
   });
+
+  it('formats durations and turn totals across the documented boundaries', () => {
+    // 单条工具耗时：`startedAt` 缺失（0）/ 0 / 时间倒序 → 不显示耗时。
+    expect(
+      toolCallDurationMs(toolCall({ id: 'a', kind: 'command' })),
+    ).toBeNull();
+    expect(formatToolCallDuration(null)).toBeNull();
+    expect(formatToolCallDuration(0)).toBeNull();
+    expect(
+      toolCallDurationMs(
+        toolCall({
+          id: 'b',
+          kind: 'command',
+          startedAt: 2000,
+          updatedAt: 1000,
+        }),
+      ),
+    ).toBeNull();
+    // <1s 一位小数；<60s 整秒省略小数；≥60s 用 `Xm Ys`。
+    expect(formatToolCallDuration(400)).toBe('0.4s');
+    expect(formatToolCallDuration(950)).toBe('1s');
+    expect(formatToolCallDuration(12300)).toBe('12.3s');
+    expect(formatToolCallDuration(12000)).toBe('12s');
+    expect(formatToolCallDuration(125000)).toBe('2m 5s');
+    expect(formatToolCallDuration(120000)).toBe('2m');
+
+    // 一回合总用时 = min(startedAt) → max(updatedAt)；缺时间戳的工具被跳过。
+    const calls = [
+      toolCall({ id: 'a', kind: 'command', startedAt: 5000, updatedAt: 6000 }),
+      toolCall({
+        id: 'b',
+        kind: 'file_change',
+        startedAt: 1000,
+        updatedAt: 9000,
+      }),
+      toolCall({ id: 'c', kind: 'web_search' }),
+    ];
+    expect(turnToolCallDurationMs(calls)).toBe(8000);
+    expect(formatTurnDuration(8000)).toBe('8秒');
+    expect(formatTurnDuration(42000)).toBe('42秒');
+    expect(formatTurnDuration(240000)).toBe('4分钟');
+    expect(formatTurnDuration(345000)).toBe('5分钟 45秒');
+    expect(formatTurnDuration(null)).toBeNull();
+    expect(formatTurnDuration(0)).toBeNull();
+    // 全部没有时间戳时算不出总用时。
+    expect(
+      turnToolCallDurationMs([toolCall({ id: 'd', kind: 'command' })]),
+    ).toBe(null);
+
+    // 块头时间：取得到用户消息时间就是「发送 → 结束」，取不到只显示结束时间，都取不到就不显示。
+    expect(turnToolCallTimeLabel(calls, 1000)).toMatch(
+      /^\d{2}:\d{2} → \d{2}:\d{2}$/,
+    );
+    expect(turnToolCallTimeLabel(calls, 0)).toMatch(/^\d{2}:\d{2}$/);
+    expect(
+      turnToolCallTimeLabel([toolCall({ id: 'e', kind: 'command' })], 0),
+    ).toBe(null);
+  });
+
+  it('renders per-row durations plus the turn total, and nothing when timestamps are missing', () => {
+    const { container } = render(
+      React.createElement(ToolCallGroup, {
+        calls: [
+          toolCall({
+            id: 'a',
+            kind: 'command',
+            summary: 'npm run build',
+            startedAt: 1000,
+            updatedAt: 1400,
+          }),
+          toolCall({
+            id: 'b',
+            kind: 'web_search',
+            summary: '玩法调研',
+            startedAt: 1400,
+            updatedAt: 17900,
+          }),
+          toolCall({
+            id: 'c',
+            kind: 'file_change',
+            title: '编辑 1 个文件',
+            summary: 'game/src/hero.ts',
+            startedAt: 17900,
+            updatedAt: 17900,
+          }),
+        ],
+        userSentAt: 1000,
+      }),
+    );
+    const group = container.querySelector(
+      '[data-testid="agent-tool-call-group"]',
+    ) as HTMLElement;
+    // 总用时：1000 → 17900，块头显示「用时 17秒」，`data-duration-ms` 暴露原始毫秒。
+    expect(group.getAttribute('data-duration-ms')).toBe('16900');
+    const head = within(group).getByTestId('agent-tool-call-group-head');
+    expect(head.textContent).toContain('用时 17秒');
+    expect(head.getAttribute('aria-label')).toBe(
+      '已执行 1 个命令、1 个文件变更、1 个联网搜索，用时 17秒',
+    );
+    // 时间戳不写死时区：`HH:mm → HH:mm`（发送 → 结束）。
+    expect(
+      head.querySelector('.agent-tool-call-group-time')?.textContent,
+    ).toMatch(/^\d{2}:\d{2} → \d{2}:\d{2}$/);
+
+    fireEvent.click(head);
+    const rows = within(group).queryAllByTestId('agent-tool-call-row');
+    expect(rows[0]?.getAttribute('data-duration-ms')).toBe('400');
+    expect(within(rows[0] as HTMLElement).getByText('0.4s')).not.toBeNull();
+    expect(rows[1]?.getAttribute('data-duration-ms')).toBe('16500');
+    expect(within(rows[1] as HTMLElement).getByText('16.5s')).not.toBeNull();
+    // startedAt === updatedAt：耗时为 0 —— `data-duration-ms` 如实暴露 0，但行上不显示 `0s`。
+    expect(rows[2]?.getAttribute('data-duration-ms')).toBe('0');
+    expect(within(rows[2] as HTMLElement).queryByText('0s')).toBeNull();
+    // 块尾显示该回合结束时间。
+    expect(
+      within(group).getByTestId('agent-tool-call-group-end-time').textContent,
+    ).toMatch(/^结束于 \d{2}:\d{2}$/);
+
+    // 时间戳缺失（startedAt 为 0）：块头与行都不显示耗时。
+    const missing = render(
+      React.createElement(ToolCallGroup, {
+        calls: [
+          toolCall({ id: 'z', kind: 'command', summary: 'npm run build' }),
+        ],
+      }),
+    );
+    const missingGroup = missing.container.querySelector(
+      '[data-testid="agent-tool-call-group"]',
+    ) as HTMLElement;
+    expect(missingGroup.getAttribute('data-duration-ms')).toBe('');
+    expect(
+      within(missingGroup).getByTestId('agent-tool-call-group-head')
+        .textContent,
+    ).toBe('已执行 1 个命令');
+    fireEvent.click(
+      within(missingGroup).getByTestId('agent-tool-call-group-head'),
+    );
+    const missingRow = within(missingGroup).getByTestId('agent-tool-call-row');
+    expect(missingRow.getAttribute('data-duration-ms')).toBe('');
+    expect(within(missingRow).queryByText('0s')).toBeNull();
+    expect(
+      missingGroup.querySelector('.agent-tool-call-group-end-time'),
+    ).toBeNull();
+  });
 }
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 10da3aea8..9d4ecb2d6 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -88,7 +88,9 @@ toolCalls?: DirectTurnToolCall[] | null;
 - 文案规则（按 kind，不允许自由发挥）：
   - 块头汇总按 kind 计数、顺序固定 `command → file_change → mcp_tool → web_search → context_compaction → other`，标签 `命令`/`文件变更`/`工具调用`/`联网搜索`/`上下文整理`/`其他操作`，形如 `已执行 5 个命令、2 个文件变更`；空集合不渲染块。
   - 行文案：`command` → `已运行 {summary}`、`file_change` → `已编辑 {summary}`、`mcp_tool` → `已调用 {summary}`、`web_search` → `已搜索 {summary}`、`context_compaction` → `已整理上下文`、`other` → `已执行 {summary}`；`failed` 行加 `失败` 并用现有 `--platform-*` 错误色。
-  - 耗时：单条工具 `startedAt` → `updatedAt`，块头 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数）。
+  - 耗时：单条工具 = `startedAt` → `updatedAt`，块头总用时 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。单条格式：`<1s` → `0.4s`、`<60s` → `12.3s`（整秒省略小数）、`≥60s` → `2m 5s`；块头格式：`42秒` / `4分钟` / `5分钟 45秒`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数），耗时为 0 时同样不显示 `0s`。
+  - 时间：块头显示该回合结束时间（`max(updatedAt)` 的本地 `HH:mm`）；同一回合能拿到用户消息时间（`updatedAt > 0`）时显示 `HH:mm → HH:mm`（发送 → 结束），取不到就只显示结束时间，不编造。展开态块尾再写一行 `结束于 HH:mm`。
+  - 调试属性：块与行都带 `data-duration-ms`（原始毫秒，无法计算时为空串）与稳定 `data-testid`（块 `agent-tool-call-group`、行 `agent-tool-call-row`）。
 - 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），块头与行都是按钮：`aria-label` = 汇总 / 行文案 + 耗时；默认折叠。
 - 输入框、消息气泡、消息列表滚动模型**不变**；块只是消息流里的一个块。
 

From 89e842d077cc40f346df49ac8b22133f310e8be5 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 17:44:04 +0800
Subject: [PATCH 13/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=9D=97=E6=A0=B7=E5=BC=8F=EF=BC=9A=E6=95=B4?=
 =?UTF-8?q?=E8=A1=8C=E6=B5=85=E5=BA=95=E5=9D=97=E5=A4=B4=20+=20=E5=8F=B3?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E8=80=97=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- styles.css 工具调用区块重写：块头做成一整行浅底圆角条目（图标 / 汇总 / 结束时间 / 总用时 / 折角），只用现有 --platform-* 变量
- 展开态每行一条：行内不换行、超长命令 text-overflow: ellipsis，耗时 margin-left: auto 右对齐、tabular-nums 对齐数字
- 行二级明细改用 agent-tool-call-row-command / -output / -changes 样式，命令与输出沿用中性底 + 细边框
- 补 [hidden] 显式 display: none，避免折叠态被 display: grid 顶掉后仍占位
- 展开箭头只做 rotate 过渡，不引入布局跳动；failed 行用 --platform-button-danger-text
- 删除旧 agent-tool-call-* 卡片样式；输入盒 / 面板留白 / 顶栏相关规则未动
---
 apps/ai-game-creator-shell/src/styles.css | 187 ++++++++++++++++------
 1 file changed, 139 insertions(+), 48 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 57b125c85..13cc06f9b 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -11293,59 +11293,64 @@ button.design-workspace-tree__entry:hover,
 }
 
 /* ============================================================
-   工具调用卡片（2026-09）：Codex 风格可折叠卡片
+   工具调用折叠块（2026-09）：一回合一个块，Codex 风格
    ============================================================
    契约见 `docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md`：
-   折叠态一行摘要（图标 / 标题 / 摘要 / 状态点 / 状态 / 折角），展开态看命令、文件明细与输出。
+   块头一行浅底圆角条目（图标 / 汇总 / 结束时间 / 总用时 / 折角），展开态每行一条工具，
+   行右侧是对齐的耗时，行可二级展开看命令、文件明细与输出。
    折叠由 `<button aria-expanded>` + `hidden` 控制（不改消息气泡与列表滚动模型），
    配色只用现有 `--platform-*` 变量。 */
 
-/* 卡片不进气泡：它是消息流里跟在 assistant 消息之后的一个块，左右与消息对齐。 */
+/* 块不进气泡：它是消息流里插在该回合 assistant 消息之前的一个块，左右与消息对齐。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-message-list
-  > .agent-tool-call {
+  > .agent-tool-call-group {
   display: grid;
   width: 100%;
   min-width: 0;
-  margin-top: -4px;
+  margin-top: 10px;
+  margin-bottom: 2px;
 }
 
-.agent-tool-call {
+.agent-tool-call-group {
   display: grid;
   width: 100%;
   min-width: 0;
   margin-top: 10px;
   overflow: hidden;
-  border: 1px solid var(--platform-surface-border);
   border-radius: 12px;
   background: var(--platform-button-secondary-fill);
   color: var(--platform-text-base);
 }
 
-.agent-tool-call-head {
+/* 块头：点整行展开，浅底条目本身是块头。 */
+.agent-tool-call-group-head {
   display: flex;
   align-items: center;
   gap: 8px;
   width: 100%;
   min-width: 0;
-  padding: 8px 10px;
+  min-height: 32px;
+  padding: 6px 10px;
   border: 0;
+  border-radius: 12px;
   background: transparent;
   color: inherit;
   font: inherit;
   text-align: left;
   cursor: pointer;
+  transition: background-color 120ms ease;
 }
 
-.agent-tool-call-head:hover,
-.agent-tool-call-head:focus-visible {
+.agent-tool-call-group-head:hover,
+.agent-tool-call-group-head:focus-visible {
   background: var(--platform-button-ghost-fill);
   color: var(--platform-text-strong);
   outline: none;
 }
 
-.agent-tool-call-icon {
+.agent-tool-call-group-icon {
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -11353,68 +11358,139 @@ button.design-workspace-tree__entry:hover,
   color: var(--platform-text-soft);
 }
 
-.agent-tool-call-title {
-  flex: 0 0 auto;
-  color: var(--platform-text-strong);
-  font-size: 12px;
-  font-weight: 600;
-}
-
-/* 摘要压在标题后面：窄面板下靠 ellipsis 收窄，不换行、不把状态挤出可视区。 */
-.agent-tool-call-summary {
+/* 汇总压在图标后面：窄面板下靠 ellipsis 收窄，不换行、不把时间与用时挤出可视区。 */
+.agent-tool-call-group-summary {
   flex: 1 1 auto;
   min-width: 0;
   overflow: hidden;
-  color: var(--platform-text-soft);
+  color: var(--platform-text-strong);
   font-size: 12px;
+  font-weight: 600;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.agent-tool-call-status {
+.agent-tool-call-group-time,
+.agent-tool-call-group-duration {
   flex: 0 0 auto;
   color: var(--platform-text-soft);
   font-size: 11px;
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
-.agent-tool-call-running-dot {
-  width: 6px;
-  height: 6px;
-  flex: 0 0 6px;
-  border-radius: 50%;
-  background: var(--platform-accent);
-}
-
-.agent-tool-call-chevron {
+.agent-tool-call-group-chevron {
   flex: 0 0 auto;
   color: var(--platform-text-soft);
   transition: transform 120ms ease;
 }
 
-.agent-tool-call-head[aria-expanded='true'] .agent-tool-call-chevron {
+.agent-tool-call-group-head[aria-expanded='true']
+  .agent-tool-call-group-chevron {
   transform: rotate(180deg);
 }
 
-/* `failed` 用错误色语义变量：标题、状态文案与图标一起变，不新增色值。 */
-.agent-tool-call[data-status='failed'] .agent-tool-call-title,
-.agent-tool-call[data-status='failed'] .agent-tool-call-status,
-.agent-tool-call[data-status='failed'] .agent-tool-call-icon {
-  color: var(--platform-button-danger-text);
+/* `hidden` 必须压过下面的 `display: grid`，否则折叠态只是内容不可见却仍占位。 */
+.agent-tool-call-group-body[hidden],
+.agent-tool-call-row-detail[hidden] {
+  display: none;
 }
 
-.agent-tool-call[data-status='failed'] {
-  border-color: var(--platform-button-danger-border);
-  background: var(--platform-button-danger-fill);
+.agent-tool-call-group-body {
+  display: grid;
+  gap: 2px;
+  padding: 0 6px 8px;
 }
 
-.agent-tool-call-body {
+.agent-tool-call-group-rows {
+  display: grid;
+  gap: 2px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.agent-tool-call-group-row {
+  min-width: 0;
+}
+
+/* 一行一条工具：单行不换行，超长命令靠 ellipsis 收窄，耗时右对齐。 */
+.agent-tool-call-row-head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-width: 0;
+  padding: 4px 8px;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  font-size: 12px;
+  line-height: 1.45;
+  text-align: left;
+  cursor: pointer;
+  transition: background-color 120ms ease;
+}
+
+.agent-tool-call-row-head:hover,
+.agent-tool-call-row-head:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+  outline: none;
+}
+
+.agent-tool-call-row-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+}
+
+.agent-tool-call-row-text {
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.agent-tool-call-row-status {
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+}
+
+/* 耗时贴右边缘：`margin-left: auto` 把「执行中 / 失败」与耗时分开，窄面板下也不会互相挤压。 */
+.agent-tool-call-row-duration {
+  flex: 0 0 auto;
+  margin-left: auto;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
+}
+
+.agent-tool-call-row-chevron {
+  flex: 0 0 auto;
+  color: var(--platform-text-soft);
+  transition: transform 120ms ease;
+}
+
+.agent-tool-call-row-head[aria-expanded='true'] .agent-tool-call-row-chevron {
+  transform: rotate(180deg);
+}
+
+.agent-tool-call-row-detail {
   display: grid;
   gap: 8px;
-  padding: 0 10px 10px;
+  padding: 6px 8px 8px;
 }
 
-.agent-tool-call-command,
-.agent-tool-call-output {
+.agent-tool-call-row-command,
+.agent-tool-call-row-output {
   margin: 0;
   max-height: 220px;
   padding: 8px 9px;
@@ -11429,7 +11505,7 @@ button.design-workspace-tree__entry:hover,
   overflow-wrap: anywhere;
 }
 
-.agent-tool-call-changes {
+.agent-tool-call-row-changes {
   display: grid;
   gap: 4px;
   margin: 0;
@@ -11437,7 +11513,7 @@ button.design-workspace-tree__entry:hover,
   list-style: none;
 }
 
-.agent-tool-call-changes li {
+.agent-tool-call-row-changes li {
   display: flex;
   align-items: baseline;
   gap: 6px;
@@ -11447,12 +11523,27 @@ button.design-workspace-tree__entry:hover,
   overflow-wrap: anywhere;
 }
 
-.agent-tool-call-changes li small {
+.agent-tool-call-row-changes li small {
   flex: 0 0 auto;
   color: var(--platform-text-soft);
   font-size: 10px;
 }
 
+.agent-tool-call-group-foot {
+  margin: 0;
+  padding: 0 8px 2px;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+  font-variant-numeric: tabular-nums;
+}
+
+/* `failed` 行用错误色语义变量：行文案、状态与图标一起变，不新增色值。 */
+.agent-tool-call-group-row[data-status='failed'] .agent-tool-call-row-text,
+.agent-tool-call-group-row[data-status='failed'] .agent-tool-call-row-status,
+.agent-tool-call-group-row[data-status='failed'] .agent-tool-call-row-icon {
+  color: var(--platform-button-danger-text);
+}
+
 /* ============================================================
    右侧对话面板：输入盒内文字与控件的对齐（2026-09）
    ============================================================

From 1b408224218cee2e765f4c9819a37c558197c443 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 17:58:37 +0800
Subject: [PATCH 14/67] =?UTF-8?q?=E8=A1=A5=E7=A9=BA=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E9=A6=96=E8=BD=AE=E7=9A=84=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=9D=97=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增用例：历史为空、消息列表里只有没有 messageId 的默认问候时，当前回合的工具块在回合进行中就直接渲染在消息列表末尾
- 同一用例断言回合结束后块只有一份、并回到该回合 assistant 消息之前（末尾兜底不留重复块）
- 断言块内每行为按钮、行数 = 工具数、data-duration-ms 与行耗时文案
---
 .../appSurface/project-development.suite.ts   | 201 ++++++++++++++++++
 1 file changed, 201 insertions(+)

diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index abbcb8cbf..0687eb697 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -8554,6 +8554,207 @@ export function registerProjectSupervisorSurfaceTests() {
     ).not.toBeNull();
   });
 
+  it('renders the running turn tool-call group in a fresh chat that has no anchored assistant message', async () => {
+    // 空对话首轮：历史为空，消息列表里只有 App 落的默认问候（`想做什么游戏？`，没有 messageId）。
+    // 这种回合没有任何「可锚」的 assistant 消息，块必须兜底落在消息列表末尾，
+    // 而不是等到回合结束、assistant 消息带上 messageId 之后才出现。
+    const projectPath = '/tmp/launcher-tool-call-fresh-turn-game';
+    const manifest = createGameCreationAppManifest(
+      'local-project-draft',
+      'launcher-tool-call-fresh-turn-game',
+    );
+    const supervisorHarness = createProjectSupervisorRuntimeHarness({
+      projectPath,
+    });
+    let directTurnUpdateHandler:
+      | ((event: { payload: Record<string, unknown> }) => void)
+      | null = null;
+    const listen = vi.fn(
+      async (
+        eventName: string,
+        handler: (event: { payload: Record<string, unknown> }) => void,
+      ) => {
+        if (eventName === 'game-creator-direct-turn-update') {
+          directTurnUpdateHandler = handler;
+          return () => {
+            if (directTurnUpdateHandler === handler) {
+              directTurnUpdateHandler = null;
+            }
+          };
+        }
+        return supervisorHarness.listen(eventName, handler);
+      },
+    );
+    const directReply = createDeferred<string>();
+    const invoke = vi.fn(
+      async (command: string, args?: Record<string, unknown>) => {
+        if (command === 'get_design_agent_runtime_mode') return null;
+        if (command === 'inspect_local_project_directory') {
+          return {
+            projectPath,
+            exists: true,
+            isDirectory: true,
+            isGameCreatorProject: true,
+            projectName: 'launcher-tool-call-fresh-turn-game',
+            recentRunStatus: null,
+            recentRunStopReason: null,
+          };
+        }
+        if (command === 'get_local_game_manifest') {
+          return manifest;
+        }
+        if (command === 'chat_with_game_creator_direct_codex') {
+          return directReply.promise;
+        }
+        if (command === 'read_direct_tool_calls') {
+          return [];
+        }
+        if (command === 'read_direct_project_conversation') {
+          // 真正的空对话：没有任何历史消息，App 会落一条没有 messageId 的默认问候。
+          return {
+            path: `${projectPath}/.agent/conversations/project.jsonl`,
+            agentId: null,
+            sessionId: null,
+            messages: [],
+          };
+        }
+        if (command === 'get_local_game_preview_status') {
+          return { status: 'stopped', url: null, port: null, root: null };
+        }
+        return supervisorHarness.invoke(command, args);
+      },
+    );
+    window.__TAURI__ = {
+      core: { invoke },
+      event: { listen },
+    };
+    renderLauncherProjectsAt('/?launcher');
+
+    pickProjectFromLauncher(projectPath);
+
+    const supervisorSurface = await screen.findByLabelText('陶泥儿项目对话');
+    const messageList = supervisorSurface.querySelector(
+      '.project-supervisor-message-list',
+    );
+    expect(messageList).not.toBeNull();
+    expect(
+      within(supervisorSurface).getByText('想做什么游戏？'),
+    ).not.toBeNull();
+    expect(
+      within(supervisorSurface).queryAllByTestId('agent-tool-call-group'),
+    ).toHaveLength(0);
+
+    await setComposerText(
+      screen.getByLabelText('陶泥儿对话内容'),
+      '做一个跑酷游戏',
+    );
+    fireEvent.submit(
+      screen
+        .getByLabelText('陶泥儿对话内容')
+        .closest('form') as HTMLFormElement,
+    );
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        expect.objectContaining({ projectPath }),
+      );
+    });
+    const clientTurnId = String(
+      (
+        invoke.mock.calls.find(
+          ([command]) => command === 'chat_with_game_creator_direct_codex',
+        )?.[1] as Record<string, unknown> | undefined
+      )?.clientTurnId ?? '',
+    );
+    expect(clientTurnId).not.toBe('');
+
+    await act(async () => {
+      directTurnUpdateHandler?.({
+        payload: {
+          projectPath,
+          turnId: clientTurnId,
+          sequence: 1,
+          status: 'running',
+          activity: 'command-exec',
+          updatedAt: 1400,
+          toolCalls: [
+            {
+              schemaVersion: 'agc-tool-call.v1',
+              id: 'fresh-turn-command',
+              kind: 'command',
+              title: '执行命令',
+              summary: 'npm run build',
+              status: 'running',
+              detail: { command: 'npm run build' },
+              startedAt: 1000,
+              updatedAt: 1400,
+            },
+          ],
+        },
+      });
+    });
+
+    // 回合进行中：块已经可见，且落在消息列表末尾（默认问候之后），不依赖任何带 messageId 的 assistant 消息。
+    const runningGroups = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-group',
+    );
+    expect(runningGroups).toHaveLength(1);
+    const runningGroup = runningGroups[0] as HTMLElement;
+    expect(runningGroup.getAttribute('data-status')).toBe('running');
+    expect(runningGroup.getAttribute('data-duration-ms')).toBe('400');
+    const runningHead = within(runningGroup).getByTestId(
+      'agent-tool-call-group-head',
+    );
+    expect(runningHead.getAttribute('aria-expanded')).toBe('false');
+    expect(runningHead.textContent).toContain('已执行 1 个命令');
+    const runningChildren = Array.from((messageList as HTMLElement).children);
+    const greetingIndex = runningChildren.findIndex((node) =>
+      node.textContent?.includes('想做什么游戏？'),
+    );
+    expect(greetingIndex).toBeGreaterThanOrEqual(0);
+    expect(
+      runningChildren.findIndex((node) => node === runningGroup),
+    ).toBeGreaterThan(greetingIndex);
+    fireEvent.click(runningHead);
+    const runningRows = within(runningGroup).getAllByTestId(
+      'agent-tool-call-row',
+    );
+    expect(runningRows).toHaveLength(1);
+    expect(runningRows[0]?.getAttribute('data-kind')).toBe('command');
+    expect(runningRows[0]?.getAttribute('data-duration-ms')).toBe('400');
+    expect(
+      within(runningRows[0] as HTMLElement).getByText('0.4s'),
+    ).not.toBeNull();
+
+    // 回合结束：assistant 消息落盘后块回到它之前，且**只有一份**（末尾兜底不留下重复块）。
+    await act(async () => {
+      directReply.resolve('DIRECT_REPLY:空对话首轮');
+    });
+    await waitFor(() => {
+      expect(
+        within(supervisorSurface).getByText('DIRECT_REPLY:空对话首轮'),
+      ).not.toBeNull();
+    });
+    await waitFor(() => {
+      expect(
+        within(supervisorSurface).getAllByTestId('agent-tool-call-group'),
+      ).toHaveLength(1);
+    });
+    const settledGroup = within(supervisorSurface).getAllByTestId(
+      'agent-tool-call-group',
+    )[0] as HTMLElement;
+    const settledChildren = Array.from((messageList as HTMLElement).children);
+    const settledAssistantIndex = settledChildren.findIndex(
+      (node) =>
+        node.classList.contains('message--assistant') &&
+        node.textContent?.includes('DIRECT_REPLY:空对话首轮'),
+    );
+    expect(settledAssistantIndex).toBeGreaterThanOrEqual(0);
+    expect(settledChildren.findIndex((node) => node === settledGroup)).toBe(
+      settledAssistantIndex - 1,
+    );
+  });
+
   it('renders the Codex empty state and opens the panel settings overlay in a fresh direct chat', async () => {
     // 空态只在 direct-codex 面板、且没有任何消息/流式回复/待确认时出现。真实项目打开时
     // App 总会先放一条默认问候（`createDefaultChatMessages`），所以这里直接挂面板本体，

From b8ff3cfb56fd34887321fcaecc7ae96eff3724bb Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:14:15 +0800
Subject: [PATCH 15/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=8D=A1=E7=89=87=E4=BA=94=E7=B1=BB=E5=87=AD?=
 =?UTF-8?q?=E6=8D=AE=E8=84=B1=E6=95=8F=E8=A6=86=E7=9B=96=E4=B8=8D=E8=B6=B3?=
 =?UTF-8?q?=EF=BC=88P0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- direct_tool_calls.rs：detail.command / detail.output / detail.changes[].path 不再只走
  redact_absolute_path_tokens + redact_secret_tokens（后者只认 sk-/tnr_sk_/ghp_/AKIA/eyJ 固定前缀），
  改为追加既有 sanitize_error_context（= redact_secret_tokens + redact_error_sensitive_assignments
  + redact_error_bearer_values + redact_error_config_names 的既有组合用法），
  覆盖 Authorization: Bearer <token>、Cookie: session=<v>、api_key=<v>、client_secret=<v> 四类键值凭据
- 含 --password / --token / --secret / --api-key 这类敏感 CLI 标志的行沿用既有 fail-closed 约定，
  整行替换成 [redacted sensitive context]（与 sanitize_agent_runtime_text 行为一致）
- summary 的 tool 兜底来源同样先脱敏（同一条落盘链路上的残留未脱敏文本）
- 新增单测：tool_call_redacts_extended_credential_shapes（五类凭据在投影与落盘行都不含原始值）、
  tool_call_redaction_keeps_normal_text_and_is_idempotent（裸 password 词不误伤、脱敏幂等、sk- 前缀不回退）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 161 ++++++++++++++++--
 1 file changed, 143 insertions(+), 18 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index cd83485d2..38cca0e22 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -9,6 +9,7 @@
 //! 文本条目，而且会被注入 Codex 上下文。往里面塞新形状既装不下，又有污染模型上下文的风险。
 
 use crate::agent::redact_secret_tokens;
+use crate::agent::sanitize_error_context;
 use crate::config::{prepare_game_creator_private_path_for_read, write_game_creator_private_file};
 use crate::project::{enforce_project_permission_policy, project_append_lock_for};
 use crate::redact_absolute_path_tokens;
@@ -85,20 +86,22 @@ fn tool_calls_path(root: &Path) -> PathBuf {
     root.join(".agent/conversations/tool-calls.jsonl")
 }
 
-/// 脱敏：项目内相对路径保留，其余按「先抹绝对路径、再抹密钥」处理。
+/// 脱敏：先抹绝对路径、再抹密钥前缀，最后走既有的错误上下文脱敏组合。
 ///
-/// 顺序不能反：先抹密钥会把 `sk-…` 之类的 TOKEN 换成占位符，但绝对路径里的
-/// 用户名目录仍然会留下；这里先归一化路径 token，再处理密钥。
-fn sanitize_detail_text(root: &Path, value: &str) -> String {
+/// 顺序不能反：先抹密钥会把 `sk-…` 之类的 token 换成占位符，但绝对路径里的用户名目录
+/// 仍然会留下；这里先处理绝对路径，再处理密钥。
+///
+/// 复用既有 `agent/generation/prompt_context.rs` 的脱敏组合：`sanitize_error_context`
+/// 就是 `redact_secret_tokens` + `redact_error_sensitive_assignments` +
+/// `redact_error_bearer_values` + `redact_error_config_names` 的既有组合用法，覆盖
+/// `Authorization: Bearer …`、`Cookie: …`、`api_key=…`、`client_secret=…` 这类键值凭据；
+/// 含 `--password` / `--token` / `--secret` 这类敏感 CLI 标志的行按既有 fail-closed
+/// 约定整行替换成 `[redacted sensitive context]`（与 `sanitize_agent_runtime_text` 一致）。
+fn sanitize_detail_text(_root: &Path, value: &str) -> String {
     let without_absolute = redact_absolute_path_tokens(value);
     let without_secret = redact_secret_tokens(&without_absolute);
-    let root = root.to_string_lossy();
-    if root.is_empty() {
-        return without_secret;
-    }
-    without_secret.replace(root.as_ref(), "<project-root>")
+    sanitize_error_context(&without_secret)
 }
-
 /// 按字符数截断（不切坏 UTF-8），并在真正截断时补省略号。
 fn bounded_chars(value: &str, max_chars: usize) -> String {
     if value.chars().count() <= max_chars {
@@ -266,15 +269,17 @@ pub(crate) fn direct_tool_call_from_item(
         })
         .collect::<Vec<_>>();
 
+    let tool = item
+        .get("tool")
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .filter(|tool| !tool.is_empty())
+        .map(|tool| sanitize_detail_text(root, tool));
+    // `summary` 会落到卡片与落盘文件，它的兜底来源同样必须脱敏。
     let summary_source = command
         .as_deref()
         .or_else(|| changes.first().map(|change| change.path.as_str()))
-        .or_else(|| {
-            item.get("tool")
-                .and_then(Value::as_str)
-                .map(str::trim)
-                .filter(|tool| !tool.is_empty())
-        })
+        .or(tool.as_deref())
         .unwrap_or_default();
     let summary = first_line_bounded(summary_source, DIRECT_TOOL_CALL_SUMMARY_MAX_CHARS);
 
@@ -474,8 +479,8 @@ pub(crate) fn direct_tool_call_now_ms() -> u64 {
 mod tests {
     use super::{
         direct_tool_call_from_item, direct_tool_call_now_ms, persist_direct_tool_call_at,
-        persist_direct_tool_calls_at, read_direct_tool_calls_at, tool_calls_path,
-        DIRECT_TOOL_CALL_LIMIT,
+        persist_direct_tool_calls_at, read_direct_tool_calls_at, sanitize_detail_text,
+        tool_calls_path, DIRECT_TOOL_CALL_LIMIT,
     };
     use serde_json::json;
 
@@ -750,4 +755,124 @@ mod tests {
             );
         }
     }
+    /// 五类必须脱敏的凭据形状（审查报告实测泄漏的那五类）。
+    const CREDENTIAL_CANARIES: [&str; 5] = [
+        "canary-bearer-value",
+        "canary-cookie-value",
+        "canary-api-key-value",
+        "canary-client-secret-value",
+        "canary-password-value",
+    ];
+
+    /// 判据：`Authorization: Bearer` / `Cookie: session=` / `api_key=` / `client_secret=` /
+    /// `--password <值>` 五类凭据在投影结果与落盘行里都不得出现原始值。
+    #[test]
+    fn tool_call_redacts_extended_credential_shapes() {
+        let root = init_tool_call_project("tool-call-credential-shapes");
+        let command = [
+            "curl -H 'Authorization: Bearer canary-bearer-value' https://example.com",
+            "curl -b 'Cookie: session=canary-cookie-value' https://example.com",
+            "curl -d api_key=canary-api-key-value https://example.com",
+            "curl -d client_secret=canary-client-secret-value https://example.com",
+            "vault login --password canary-password-value --env prod",
+        ]
+        .join("\n");
+        let output = [
+            "Authorization: Bearer canary-output-bearer-value",
+            "Cookie: session=canary-output-cookie-value",
+        ]
+        .join("\n");
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-credentials",
+                "type": "commandExecution",
+                "command": command,
+                "aggregatedOutput": output,
+                "startedAtMs": 1000,
+            }),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("credential tool call");
+
+        let projected_command = call.detail.command.as_deref().expect("command");
+        let projected_output = call.detail.output.as_deref().expect("output");
+        for canary in CREDENTIAL_CANARIES {
+            assert!(
+                !projected_command.contains(canary),
+                "命令投影里不得出现原始凭据 {canary}：{projected_command}"
+            );
+        }
+        for canary in ["canary-output-bearer-value", "canary-output-cookie-value"] {
+            assert!(
+                !projected_output.contains(canary),
+                "输出投影里不得出现原始凭据 {canary}：{projected_output}"
+            );
+        }
+        assert!(
+            !call.summary.contains("canary-bearer-value"),
+            "摘要取自命令首行，同样不得带原始凭据：{}",
+            call.summary
+        );
+
+        persist_direct_tool_call_at(root.path(), &call).expect("persist credential call");
+        let raw = std::fs::read_to_string(tool_calls_path(root.path())).expect("read raw file");
+        for canary in CREDENTIAL_CANARIES {
+            assert!(
+                !raw.contains(canary),
+                "落盘行里不得出现原始凭据 {canary}：{raw}"
+            );
+        }
+        for canary in ["canary-output-bearer-value", "canary-output-cookie-value"] {
+            assert!(
+                !raw.contains(canary),
+                "落盘行里不得出现原始凭据 {canary}：{raw}"
+            );
+        }
+    }
+
+    /// 判据：脱敏不误伤正常内容、既有前缀脱敏不回退、且幂等（连跑两次结果一致）。
+    #[test]
+    fn tool_call_redaction_keeps_normal_text_and_is_idempotent() {
+        let root = init_tool_call_project("tool-call-redaction-idempotent");
+        let sanitize = |value: &str| sanitize_detail_text(root.path(), value);
+
+        // 出现 `password` 单词但没有赋值 → 属于正常内容，不得脱敏。
+        let plain = "grep -n password game/src/config.ts";
+        let once = sanitize(plain);
+        assert_eq!(once, plain, "没有赋值的 password 单词不得被脱敏");
+        assert_eq!(sanitize(&once), once, "脱敏必须幂等");
+
+        // 既有前缀脱敏（sk-…）不得回退。
+        let prefixed = "curl -H 'X-Api-Key: sk-canary-prefix-key' https://example.com";
+        let once = sanitize(prefixed);
+        assert!(
+            !once.contains("sk-canary-prefix-key"),
+            "既有前缀脱敏不得回退：{once}"
+        );
+        assert_eq!(sanitize(&once), once, "脱敏必须幂等");
+
+        // `--password <值>`：沿用既有 fail-closed 约定（含敏感 CLI 标志的行整行替换），
+        // 原始值随之消失，且再次脱敏结果不变。
+        let with_secret = "vault login --password canary-password-value --env prod";
+        let once = sanitize(with_secret);
+        assert!(
+            !once.contains("canary-password-value"),
+            "`--password <值>` 不得落盘明文：{once}"
+        );
+        assert_eq!(sanitize(&once), once, "脱敏必须幂等");
+
+        // `--password $ENV`：占位符不是密钥，但既有 `contains_sensitive_cli_flag` 按标志
+        // fail-closed 整行替换（与 sanitize_error_context 一致），本次属契约内行为。
+        let placeholder = "vault login --password $DEPLOY_PASSWORD --env prod";
+        let once = sanitize(placeholder);
+        assert_eq!(
+            once, "[redacted sensitive context]",
+            "含敏感 CLI 标志的行按既有约定整行替换"
+        );
+        assert_eq!(sanitize(&once), once, "脱敏必须幂等");
+    }
+
 }

From 1a2331bdb1ae6b23a7ca13d70c0ce5eceef91f10 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:17:46 +0800
Subject: [PATCH 16/67] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20direct-codex=20?=
 =?UTF-8?q?=E5=9B=9E=E5=90=88=E7=BB=88=E6=AD=A2=E4=B8=8E=E6=8E=A8=E7=90=86?=
 =?UTF-8?q?=E6=A1=A3=E5=86=99=E5=85=A5=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 cancel_direct_codex_turn：按项目登记正在运行的 direct-codex 回合句柄，终止时复用 CodexTurnStartCancellation 只发 turn/interrupt；无活动回合、clientTurnId 不匹配、进程已退出都返回可读原因。

新增 select_game_creator_reasoning_effort：按 select_game_creator_model 的既有配置写入模式，只改 llm.reasoningEffort 后落盘，读接口语义不变。

codex_app_server.rs 追加 DirectCodexActiveTurnTable 注册表与回合登记/注销 guard，并补 2 个单测（选中/注销哪一轮、注册键归一化）；既有事件与命令语义不动。
---
 .../src-tauri/src/agent.rs                    |   3 +-
 .../src-tauri/src/agent/codex_app_server.rs   | 192 ++++++++++++++++++
 .../src-tauri/src/commands.rs                 |  23 +++
 .../src-tauri/src/main.rs                     |   2 +
 4 files changed, 219 insertions(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent.rs b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
index 62a2a0b0b..3689fa8f3 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
@@ -35,7 +35,8 @@ mod runtime_tools;
 mod skill_pack;
 use codex_app_server::*;
 pub(crate) use codex_app_server::{
-    direct_game_creator_codex_chat_at, direct_game_creator_home_codex_chat,
+    cancel_direct_codex_turn_at, direct_game_creator_codex_chat_at,
+    direct_game_creator_home_codex_chat,
 };
 use codex_cli::*;
 pub(crate) use codex_cli::{
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
index e8d536ae1..656ec3373 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
@@ -216,6 +216,12 @@ impl CodexTurnStartCancellation {
         self.maybe_interrupt();
     }
 
+    /// app-server 连接是否还活着：句柄只剩 Weak 时说明进程已被回收，此时"终止"必须
+    /// 明确报错，而不是静默成功让界面以为回合已经停了。
+    fn app_server_alive(&self) -> bool {
+        self.inner.strong_count() > 0
+    }
+
     fn cancel(&self) {
         self.cancelled.store(true, Ordering::Release);
         self.maybe_interrupt();
@@ -2752,6 +2758,17 @@ impl CodexAppServerConnection {
         }
         let turn_start_cancellation =
             Arc::new(CodexTurnStartCancellation::new(&self.inner, &thread_id));
+        // Direct 回合登记为"可终止"：终止命令只作用在这一轮上，回合结束时自动注销。
+        let _active_turn_guard = direct_tool_call_turn_id
+            .as_deref()
+            .filter(|_| self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject)
+            .map(|turn_id| {
+                register_active_direct_codex_turn(
+                    direct_codex_active_turn_key(history_root),
+                    turn_id,
+                    Arc::clone(&turn_start_cancellation),
+                )
+            });
         let mut turn_start_guard = CodexTurnStartGuard {
             cancellation: Arc::clone(&turn_start_cancellation),
             armed: true,
@@ -3059,6 +3076,135 @@ impl Drop for CodexTurnStartGuard {
     }
 }
 
+/// Direct 回合中断表：与具体取消句柄解耦的最小实现，"选哪一轮 / 注销哪一轮"可单测。
+struct DirectCodexActiveTurnTable<T> {
+    entries: HashMap<std::path::PathBuf, (String, T)>,
+}
+
+impl<T> DirectCodexActiveTurnTable<T> {
+    fn new() -> Self {
+        Self {
+            entries: HashMap::new(),
+        }
+    }
+
+    fn register(&mut self, key: std::path::PathBuf, client_turn_id: &str, value: T) {
+        self.entries
+            .insert(key, (client_turn_id.to_string(), value));
+    }
+
+    /// 只有当前登记项仍是本回合的句柄时才注销，避免旧回合的收尾清掉后来注册的回合。
+    fn unregister(&mut self, key: &Path, is_same: impl Fn(&T) -> bool) {
+        if self
+            .entries
+            .get(key)
+            .is_some_and(|(_, value)| is_same(value))
+        {
+            self.entries.remove(key);
+        }
+    }
+
+    /// 选中要终止的回合：没有活动回合、或前端给的 clientTurnId 与活动回合不一致时都返回
+    /// 可读原因，绝不误伤另一个回合。
+    fn select(&self, key: &Path, client_turn_id: Option<&str>) -> Result<&(String, T), String> {
+        let active = self
+            .entries
+            .get(key)
+            .ok_or_else(|| "当前项目没有正在运行的陶泥儿回合，无法终止".to_string())?;
+        if let Some(expected) = client_turn_id
+            .map(str::trim)
+            .filter(|value| !value.is_empty())
+        {
+            if active.0 != expected {
+                return Err("正在运行的是另一个陶泥儿回合，已拒绝终止".to_string());
+            }
+        }
+        Ok(active)
+    }
+}
+
+/// 正在运行的 Direct 回合中断句柄，按项目根（canonical，去掉 Windows `\\?\` 前缀）索引。
+///
+/// `CodexTurnStartCancellation` 本身已经能在 turn/start 响应到达**前后**发出
+/// `turn/interrupt`；这里只是把它留一个 Tauri 命令取得到的引用，回合结束后由
+/// [`DirectCodexActiveTurnGuard`] 移除。只做新增：不改既有事件、命令语义。
+static GAME_CREATOR_DIRECT_CODEX_ACTIVE_TURNS: OnceLock<
+    std::sync::Mutex<DirectCodexActiveTurnTable<Arc<CodexTurnStartCancellation>>>,
+> = OnceLock::new();
+
+fn direct_codex_active_turns(
+) -> &'static std::sync::Mutex<DirectCodexActiveTurnTable<Arc<CodexTurnStartCancellation>>> {
+    GAME_CREATOR_DIRECT_CODEX_ACTIVE_TURNS
+        .get_or_init(|| std::sync::Mutex::new(DirectCodexActiveTurnTable::new()))
+}
+
+/// 注册键：与 Direct 回合用的 `codex_root` 同一形态（canonical 且去掉 `\\?\` 前缀），
+/// 这样前端传进来的项目路径与注册时的路径一定落到同一个键上。
+fn direct_codex_active_turn_key(root: &Path) -> std::path::PathBuf {
+    let canonical = std::fs::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
+    match canonical
+        .to_str()
+        .and_then(|value| value.strip_prefix("\\\\?\\"))
+    {
+        Some(stripped) => std::path::PathBuf::from(stripped),
+        None => canonical,
+    }
+}
+
+struct DirectCodexActiveTurnGuard {
+    key: std::path::PathBuf,
+    cancellation: Arc<CodexTurnStartCancellation>,
+}
+
+impl Drop for DirectCodexActiveTurnGuard {
+    fn drop(&mut self) {
+        let Some(active_turns) = GAME_CREATOR_DIRECT_CODEX_ACTIVE_TURNS.get() else {
+            return;
+        };
+        let Ok(mut entries) = active_turns.lock() else {
+            return;
+        };
+        let cancellation = Arc::clone(&self.cancellation);
+        entries.unregister(&self.key, |current| Arc::ptr_eq(current, &cancellation));
+    }
+}
+
+/// 把一个 Direct 回合登记为"可终止"，返回的 guard 在回合结束时注销它。
+fn register_active_direct_codex_turn(
+    key: std::path::PathBuf,
+    client_turn_id: &str,
+    cancellation: Arc<CodexTurnStartCancellation>,
+) -> DirectCodexActiveTurnGuard {
+    if let Ok(mut entries) = direct_codex_active_turns().lock() {
+        entries.register(key.clone(), client_turn_id, Arc::clone(&cancellation));
+    }
+    DirectCodexActiveTurnGuard { key, cancellation }
+}
+
+/// 终止当前项目正在运行的 Direct 回合。
+///
+/// 只向正在跑的 Codex app-server 回合发 `turn/interrupt`（app-server 随后回
+/// `turn/completed status=interrupted`，正在 await 的那个回合命令会带着可读原因返回），
+/// 不动任何既有事件或命令语义。
+pub(crate) fn cancel_direct_codex_turn_at(
+    root: &Path,
+    client_turn_id: Option<&str>,
+) -> Result<(), String> {
+    let key = direct_codex_active_turn_key(root);
+    let cancellation = {
+        let entries = direct_codex_active_turns()
+            .lock()
+            .map_err(|_| "Direct 回合中断表已损坏，无法终止".to_string())?;
+        let (_, cancellation) = entries.select(&key, client_turn_id)?;
+        if !cancellation.app_server_alive() {
+            return Err("陶泥儿执行进程已退出，无法终止本轮；请重新发送这条消息".to_string());
+        }
+        Arc::clone(cancellation)
+    };
+    cancellation.cancel();
+    Ok(())
+}
+
 struct CodexThreadLease {
     connection: CodexAppServerConnection,
     key: CodexNodeThreadKey,
@@ -4071,6 +4217,52 @@ pub(crate) fn build_direct_codex_history_prompt(
 mod tests {
     use super::*;
 
+    /// 终止只作用在"当前项目正在跑的那一轮"上：没有活动回合 / clientTurnId 不匹配都要
+    /// 返回可读原因，不能误伤别人；注销也只注销本回合自己的句柄。
+    #[test]
+    fn direct_codex_active_turn_table_selects_only_the_running_turn() {
+        let mut table: DirectCodexActiveTurnTable<u8> = DirectCodexActiveTurnTable::new();
+        let key = std::path::PathBuf::from("C:/projects/direct-turn-demo");
+        assert_eq!(
+            table.select(&key, None).expect_err("no active turn"),
+            "当前项目没有正在运行的陶泥儿回合，无法终止"
+        );
+
+        table.register(key.clone(), "turn-a", 1);
+        assert_eq!(table.select(&key, None).expect("active turn").0, "turn-a");
+        assert_eq!(table.select(&key, Some("turn-a")).expect("same turn").1, 1);
+        assert_eq!(
+            table
+                .select(&key, Some("turn-b"))
+                .expect_err("another running turn"),
+            "正在运行的是另一个陶泥儿回合，已拒绝终止"
+        );
+
+        // 句柄已被后来的回合替换：旧回合收尾不得注销新回合。
+        table.register(key.clone(), "turn-b", 2);
+        table.unregister(&key, |value| *value == 1);
+        assert_eq!(table.select(&key, None).expect("newer turn").0, "turn-b");
+        table.unregister(&key, |value| *value == 2);
+        assert!(table.select(&key, None).is_err());
+    }
+
+    /// 注册键：前端传的项目路径与回合注册时的路径必须归一化成同一个键（Windows 上
+    /// `canonicalize` 会带 `\\?\` 前缀，去掉后两边才相等）。
+    #[test]
+    fn direct_codex_active_turn_key_normalizes_windows_prefix() {
+        let root = tempfile::tempdir().expect("temp dir");
+        let canonical = std::fs::canonicalize(root.path()).expect("canonical root");
+        let expected = canonical
+            .to_str()
+            .and_then(|value| value.strip_prefix("\\\\?\\"))
+            .map(std::path::PathBuf::from)
+            .unwrap_or(canonical);
+        let key = direct_codex_active_turn_key(root.path());
+        assert_eq!(key, expected);
+        // 归一化后的键不再带 Windows 扩展长度前缀：前端传进来的普通路径才能命中同一个键。
+        assert!(!key.to_string_lossy().starts_with("\\\\?\\"));
+    }
+
     #[test]
     fn direct_item_activities_are_closed_safe_categories() {
         let allowed = [
diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index 4e28e1de7..e2608eb19 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -1989,6 +1989,29 @@ pub(crate) fn write_game_creator_app_config(
     persist_game_creator_app_config(config, overlays, false)
 }
 
+#[tauri::command]
+pub(crate) fn cancel_direct_codex_turn(
+    project_path: String,
+    client_turn_id: Option<String>,
+) -> Result<(), String> {
+    let root = Path::new(project_path.trim());
+    enforce_project_permission_policy(root, "agent.kill")?;
+    cancel_direct_codex_turn_at(root, client_turn_id.as_deref())
+}
+
+#[tauri::command]
+pub(crate) fn select_game_creator_reasoning_effort(
+    effort: String,
+) -> Result<GameCreatorAppConfigView, String> {
+    let _guard = GAME_CREATOR_CONFIG_WRITE_LOCK
+        .lock()
+        .map_err(|_| "配置写入锁不可用")?;
+    let effort = game_creator_llm_reasoning_effort_name(&effort, "llm.reasoningEffort")?;
+    let (mut config, overlays) = load_game_creator_app_config_for_write()?;
+    config.llm.reasoning_effort = effort;
+    persist_game_creator_app_config(config, overlays, false)
+}
+
 #[tauri::command]
 pub(crate) fn select_game_creator_model(
     model_id: String,
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index af5c97c77..7f1d60fdc 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -2632,6 +2632,8 @@ fn main() {
             chat_with_game_creator_role_agent,
             chat_with_game_creator_role_agent_stream,
             chat_with_game_creator_direct_codex,
+            cancel_direct_codex_turn,
+            select_game_creator_reasoning_effort,
             start_planning_session_v2,
             continue_planning_session_v2,
             decide_planning_artifact_v2,

From a0efd921929db09e60d572e04697d705b5c939e5 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:17:54 +0800
Subject: [PATCH 17/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=90=BD=E7=9B=98=E7=8A=B6=E6=80=81=E6=97=A0?=
 =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=80=A7=EF=BC=88P1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- direct_tool_calls.rs：把 preserve_started_at（只管 startedAt）换成 merge_tool_call_snapshot，
  同一 id 的多条快照按 updatedAt 单调合并：updatedAt 更旧的快照不得覆盖更新的 status 与 updatedAt，
  updatedAt 相同时终态优先，startedAt 仍取最早的非零值
- upsert_direct_tool_call_once（逐条快照落盘）与 persist_direct_tool_calls_at（回合末整批落盘）
  两条竞争路径共用同一合并函数，后到的旧快照不再把 completed / failed 打回 running
- normalize_tool_calls（回读归并）同 id 的重复行同样按 updatedAt 合并，磁盘上留下的旧快照不得回退状态
- 新增单测：tool_call_persist_keeps_newest_snapshot_per_item（单条 + 整批两条路径）、
  tool_call_read_merges_duplicate_rows_monotonically（回读重复行）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 167 +++++++++++++++---
 1 file changed, 147 insertions(+), 20 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index 38cca0e22..7be534b10 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -346,11 +346,16 @@ fn read_tool_call_lines(path: &Path) -> Vec<DirectToolCall> {
     calls
 }
 
-/// 按 id 归并（后写覆盖先写），再按时间正序裁剪到最近 `DIRECT_TOOL_CALL_LIMIT` 条。
+/// 按 id 归并（同 id 按 `updatedAt` 单调合并），再按时间正序裁剪到最近
+/// `DIRECT_TOOL_CALL_LIMIT` 条。
 fn normalize_tool_calls(calls: Vec<DirectToolCall>) -> Vec<DirectToolCall> {
     let mut by_id: BTreeMap<String, DirectToolCall> = BTreeMap::new();
     for call in calls {
-        by_id.insert(call.id.clone(), call);
+        let merged = match by_id.remove(&call.id) {
+            Some(previous) => merge_tool_call_snapshot(&previous, &call),
+            None => call,
+        };
+        by_id.insert(merged.id.clone(), merged);
     }
     let mut normalized = by_id.into_values().collect::<Vec<_>>();
     normalized.sort_by(|left, right| {
@@ -373,20 +378,43 @@ pub(crate) fn read_direct_tool_calls_at(root: &Path) -> Result<Vec<DirectToolCal
     Ok(normalize_tool_calls(read_tool_call_lines(&path)))
 }
 
-/// 同一 id 的 `startedAt` 取最早的非零值：`item/completed` 事件不一定带
-/// `startedAtMs`，不能让 completed 覆盖掉 started 记下的起点（卡片时间序依赖它）。
-fn preserve_started_at(incoming: &mut DirectToolCall, existing: Option<&DirectToolCall>) {
-    let Some(existing) = existing else {
-        return;
-    };
-    if existing.started_at > 0
-        && (incoming.started_at == 0 || existing.started_at < incoming.started_at)
-    {
-        incoming.started_at = existing.started_at;
+/// 状态的「确定性」排序：终态（`completed` / `failed`）优先于 `running`。
+fn status_certainty(status: &str) -> u8 {
+    match status {
+        "completed" | "failed" => 1,
+        _ => 0,
     }
 }
 
-/// 幂等 upsert：同 id 只保留一行，`completed` 覆盖 `started`。
+/// 同一 id 的两条快照按 `updatedAt` 做**单调合并**。
+///
+/// - `startedAt` 取最早的非零值：`item/completed` 事件不一定带 `startedAtMs`，
+///   不能让 completed 覆盖掉 started 记下的起点（卡片时间序依赖它）。
+/// - `updatedAt` 更旧的快照不得覆盖更新的状态与 `updatedAt`：`direct_runtime.rs` 里
+///   「回合末整批落盘」与「逐条快照落盘（spawn_blocking）」两条路径竞争时，后到的
+///   旧快照不能把已经 `completed` / `failed` 的卡片打回 `running`。
+/// - `updatedAt` 相同时终态优先，避免同一毫秒内的旧快照回退状态。
+fn merge_tool_call_snapshot(
+    existing: &DirectToolCall,
+    incoming: &DirectToolCall,
+) -> DirectToolCall {
+    let take_incoming = incoming.updated_at > existing.updated_at
+        || (incoming.updated_at == existing.updated_at
+            && status_certainty(&incoming.status) > status_certainty(&existing.status));
+    let mut merged = if take_incoming {
+        incoming.clone()
+    } else {
+        existing.clone()
+    };
+    merged.started_at = [merged.started_at, existing.started_at, incoming.started_at]
+        .into_iter()
+        .filter(|started_at| *started_at > 0)
+        .min()
+        .unwrap_or_default();
+    merged
+}
+
+/// 幂等 upsert：同 id 只保留一行，快照按 `updatedAt` 单调合并（旧快照不得回退状态）。
 ///
 /// 单次尝试的顺序是「取项目锁 + append 锁 → 锁内读 → 整文件原子替换」。
 /// 工具调用是**追加 + 就地更新**混用的数据，没有纯追加的 JSONL 语义，所以只能整文件重写；
@@ -404,9 +432,11 @@ fn upsert_direct_tool_call_once(root: &Path, call: &DirectToolCall) -> Result<()
         .iter()
         .find(|existing| existing.id == call.id)
         .cloned();
-    let mut incoming = call.clone();
-    preserve_started_at(&mut incoming, existing.as_ref());
-    calls.retain(|existing| existing.id != call.id);
+    let incoming = match existing.as_ref() {
+        Some(existing) => merge_tool_call_snapshot(existing, call),
+        None => call.clone(),
+    };
+    calls.retain(|existing| existing.id != incoming.id);
     calls.push(incoming);
     let normalized = normalize_tool_calls(calls);
     let mut body = String::new();
@@ -445,11 +475,13 @@ pub(crate) fn persist_direct_tool_calls_at(
     let mut existing = read_tool_call_lines(&path);
     let mut incoming = calls.to_vec();
     for call in incoming.iter_mut() {
-        let previous = existing
+        let merged = existing
             .iter()
-            .find(|existing| existing.id == call.id)
-            .cloned();
-        preserve_started_at(call, previous.as_ref());
+            .find(|row| row.id == call.id)
+            .map(|previous| merge_tool_call_snapshot(previous, call));
+        if let Some(merged) = merged {
+            *call = merged;
+        }
     }
     let ids = incoming
         .iter()
@@ -484,6 +516,26 @@ mod tests {
     };
     use serde_json::json;
 
+    /// 一行合法的落盘信封（回读用例的夹具）。
+    fn tool_call_row(id: &str, started_at: u64, updated_at: u64) -> String {
+        serde_json::to_string(&json!({
+            "type": "tool_call_item",
+            "payload": {
+                "schemaVersion": "agc-tool-call.v1",
+                "id": id,
+                "turnId": "turn-1",
+                "kind": "command",
+                "title": "执行命令",
+                "summary": "npm run build",
+                "status": "completed",
+                "detail": {"command": "npm run build"},
+                "startedAt": started_at,
+                "updatedAt": updated_at
+            }
+        }))
+        .expect("serialize tool call row")
+    }
+
     fn init_tool_call_project(name: &str) -> tempfile::TempDir {
         let root = tempfile::tempdir().expect("temp project");
         crate::init_local_game_project_at(root.path(), name, "工具调用卡片测试")
@@ -875,4 +927,79 @@ mod tests {
         assert_eq!(sanitize(&once), once, "脱敏必须幂等");
     }
 
+    /// 判据：同 id 的快照按 `updatedAt` 单调合并——后到的旧快照不得把终态打回 `running`，
+    /// 也不得回退 `updatedAt`；`startedAt` 仍取最早。
+    #[test]
+    fn tool_call_persist_keeps_newest_snapshot_per_item() {
+        let root = init_tool_call_project("tool-call-monotonic");
+        let running = direct_tool_call_from_item(
+            root.path(),
+            &command_item("item-1", "npm run build"),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("running tool call");
+        assert_eq!(running.status, "running");
+        let completed = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-1",
+                "type": "commandExecution",
+                "command": "npm run build",
+                "exitCode": 0,
+                "completedAtMs": 2000,
+            }),
+            "turn-1",
+            true,
+            2000,
+        )
+        .expect("completed tool call");
+        assert_eq!(completed.status, "completed");
+        assert_eq!(completed.updated_at, 2000);
+
+        persist_direct_tool_call_at(root.path(), &completed).expect("persist completed first");
+        persist_direct_tool_call_at(root.path(), &running).expect("persist stale running");
+        let calls = read_direct_tool_calls_at(root.path()).expect("read after stale single write");
+        assert_eq!(calls.len(), 1, "同一 id 只能有一行");
+        assert_eq!(
+            calls[0].status, "completed",
+            "后到的旧快照不得把 completed 打回 running"
+        );
+        assert_eq!(calls[0].updated_at, 2000, "旧快照不得回退 updatedAt");
+        assert_eq!(calls[0].started_at, 1000, "startedAt 仍取最早");
+
+        // 回合末整批落盘那条路径同样不得回退。
+        persist_direct_tool_calls_at(root.path(), std::slice::from_ref(&running))
+            .expect("persist stale running batch");
+        let calls = read_direct_tool_calls_at(root.path()).expect("read after stale batch write");
+        assert_eq!(
+            calls[0].status, "completed",
+            "整批落盘路径同样不得把 completed 打回 running"
+        );
+        assert_eq!(calls[0].updated_at, 2000, "整批落盘不得回退 updatedAt");
+    }
+
+    /// 判据：读回时同 id 的重复行也按 `updatedAt` 单调合并（磁盘上留有旧快照不得回退状态）。
+    #[test]
+    fn tool_call_read_merges_duplicate_rows_monotonically() {
+        let root = init_tool_call_project("tool-call-read-monotonic");
+        let path = tool_calls_path(root.path());
+        std::fs::create_dir_all(path.parent().expect("parent")).expect("create dir");
+        let completed = tool_call_row("item-1", 1000, 2000);
+        let stale_running = tool_call_row("item-1", 1000, 1000)
+            .replace("\"status\":\"completed\"", "\"status\":\"running\"");
+        assert!(stale_running.contains("\"status\":\"running\""));
+        std::fs::write(&path, format!("{completed}\n{stale_running}\n")).expect("write fixture");
+
+        let calls = read_direct_tool_calls_at(root.path()).expect("read duplicate rows");
+        assert_eq!(calls.len(), 1, "同 id 归并成一条");
+        assert_eq!(
+            calls[0].status, "completed",
+            "磁盘上更旧的快照不得把状态打回 running"
+        );
+        assert_eq!(calls[0].updated_at, 2000, "归并保留更新的 updatedAt");
+        assert_eq!(calls[0].started_at, 1000);
+    }
+
 }

From a766ff9634a24a72fa0f211dc4a34200cec51504 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:18:23 +0800
Subject: [PATCH 18/67] =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9B=92=E5=AF=B9?=
 =?UTF-8?q?=E6=A0=87=20Codex=20=E8=A1=A5=E9=BD=90=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E3=80=81=E7=BB=88=E6=AD=A2=E3=80=81=E9=98=9F=E5=88=97=E3=80=81?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E4=B8=8E=E6=8E=A8=E7=90=86=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

文件上传：+ 改成添加入口（上传本地文件 / 引用项目素材），上传走既有 upload_local_asset 链路并落成 DirectCodexTurnAttachment，随下次提交进入回合 attachments，提交后清空。

终止：回合运行中发送钮位置显示终止方块，调用新增 cancel_direct_codex_turn；中断回流被识别为主动终止，回合 finally 复位输入盒，不再写运行错误与诊断。

队列：回合运行中再次发送进本地 FIFO 队列并在输入盒上方以 chip 展示、可单条取消，回合结束后按序自动发出；输入区在 direct-codex 回合运行中保持可编辑（其余面板维持原行为）。

语音：用 SpeechRecognition/webkitSpeechRecognition，缺失时按钮禁用并直接给出不支持提示；录音态有 is-recording 视觉反馈，识别文本追加进草稿（ResourceReferenceInput 新增 insertText）。

推理档：移到模型选择器旁，读 read_game_creator_app_config、写 select_game_creator_reasoning_effort，只影响后续回合。

新增 tests/appSurface/chat-composer.suite.ts（10 条：队列 FIFO/取消、终止复位、上传后附件进提交、推理档写入回读、语音降级与录音态、追加不覆盖）并更新 + 与推理档相关的既有断言。
---
 apps/ai-game-creator-shell/src/App.tsx        | 283 ++++++++-
 .../app-shell/useHomeProjectCreation.ts       |  84 ++-
 .../project-workspace/ComposerControls.tsx    | 463 ++++++++++++++
 .../ProjectSupervisorView.tsx                 |  93 ++-
 .../ResourceReferenceInput.tsx                |  33 +-
 .../project-workspace/chatComposerQueue.ts    |  89 +++
 .../project-workspace/chatComposerVoice.ts    | 144 +++++
 .../composerReasoningEffort.ts                |  48 ++
 apps/ai-game-creator-shell/src/styles.css     | 280 +++++++++
 .../tests/appSurface.test.ts                  |   2 +
 .../tests/appSurface/chat-composer.suite.ts   | 591 ++++++++++++++++++
 .../appSurface/project-development.suite.ts   |  18 +-
 12 files changed, 2062 insertions(+), 66 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/chatComposerVoice.ts
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/composerReasoningEffort.ts
 create mode 100644 apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index fd12809a6..b1e65d5fc 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -148,6 +148,7 @@ import {
   type WorkspaceLauncherProps,
   writeRecentWorkspace,
 } from './features/app-shell/model';
+import { uploadLocalFilesAsAttachments } from './features/app-shell/useHomeProjectCreation';
 import { WorkspaceLauncherShell } from './features/app-shell/WorkspaceLauncher';
 import {
   agentConversationReadDraftsFromManifest,
@@ -220,6 +221,15 @@ import {
   isMissingProjectFileError,
   parseAgentRunTrace,
 } from './features/project-workspace/agentRunTrace';
+import {
+  chatQueueFullNotice,
+  createQueuedChatTurn,
+  dequeueChatTurn,
+  enqueueChatTurn,
+  isChatTurnQueueFull,
+  type QueuedChatTurn,
+  removeQueuedChatTurn,
+} from './features/project-workspace/chatComposerQueue';
 import { DeveloperProjectPanels } from './features/project-workspace/DeveloperProjectPanels';
 import { DeveloperRuntimePanels } from './features/project-workspace/DeveloperRuntimePanels';
 import {
@@ -472,6 +482,8 @@ function directCodexTurnIdFromAssistantMessageId(messageId: string) {
   );
 }
 
+export const MAX_CHAT_COMPOSER_ATTACHMENTS = 8;
+
 export function isDirectCodexTurnAlreadyRunningError(error: unknown) {
   const message = error instanceof Error ? error.message : String(error);
   return message
@@ -479,6 +491,16 @@ export function isDirectCodexTurnAlreadyRunningError(error: unknown) {
     .startsWith(DIRECT_CODEX_TURN_ALREADY_RUNNING_ERROR_PREFIX);
 }
 
+/**
+ * 用户点了"终止"以后，正在 await 的回合命令会带着 app-server 的中断原因返回
+ * （`Codex app-server turn 已中断`）。这类错误是用户主动取消，不是失败：界面要给
+ * "已终止本次回合"而不是把中断当作异常写进运行错误与诊断。
+ */
+export function isDirectCodexTurnInterruptedError(error: unknown) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes('turn 已中断') || message.includes('已终止本次回合');
+}
+
 function isPersistableDirectCodexConversationMessage(message: ChatMessage) {
   if (!message.runtimeOwned) {
     return false;
@@ -747,6 +769,23 @@ export function App({
       : '',
   );
   const [chatReferences, setChatReferences] = useState<ChatReference[]>([]);
+  /**
+   * 输入盒待发送附件（direct-codex 回合附件）：上传成功后先生成 chip，随下次提交一起
+   * 交给 `chat_with_game_creator_direct_codex` 的 `attachments`。附件只存在于前端状态，
+   * 提交后即清空——后端协议不变。
+   */
+  const [chatAttachments, setChatAttachments] = useState<
+    DirectCodexTurnAttachment[]
+  >([]);
+  const [chatAttachmentNotice, setChatAttachmentNotice] = useState('');
+  /** 回合运行中再次发送的消息：FIFO 本地队列，当前回合结束后依次发出。 */
+  const [chatTurnQueue, setChatTurnQueue] = useState<QueuedChatTurn[]>([]);
+  const chatTurnQueueRef = useRef<QueuedChatTurn[]>([]);
+  chatTurnQueueRef.current = chatTurnQueue;
+  const [chatComposerNotice, setChatComposerNotice] = useState('');
+  const [directCodexTurnCancelling, setDirectCodexTurnCancelling] =
+    useState(false);
+  const queuedChatTurnSequenceRef = useRef(0);
   const chatComposerRef = useRef<ResourceReferenceInputHandle | null>(null);
   const [chatAgentBusy, setChatAgentBusy] = useState(false);
   const [directCodexProgress, setDirectCodexProgress] = useState('');
@@ -6462,6 +6501,18 @@ export function App({
           if (localProjectPathRef.current !== directProjectPath) {
             return;
           }
+          if (isDirectCodexTurnInterruptedError(error)) {
+            // 用户主动终止：不是失败，不写运行错误与诊断，只把回合标记成已终止。
+            clearDirectCodexTransientReply(directProjectPath, clientTurnId);
+            setDirectCodexStatus('failed');
+            setDirectCodexProgress('');
+            setProjectSupervisorRuntimeError('');
+            setChatComposerNotice('已终止本次回合');
+            setMessages((current) =>
+              appendDirectAssistantMessage(current, '已终止本次回合。'),
+            );
+            return;
+          }
           void captureAgentRuntimeError(error, PROJECT_SUPERVISOR_AGENT_ID);
           const message =
             error instanceof Error ? error.message : String(error);
@@ -6487,6 +6538,7 @@ export function App({
             }
           } finally {
             setChatAgentBusy(false);
+            setDirectCodexTurnCancelling(false);
             setDirectCodexProgress('');
             const activeTurn = activeDirectCodexTurnRef.current;
             if (
@@ -6496,6 +6548,8 @@ export function App({
             ) {
               resetDirectCodexTurn();
             }
+            // 队列：本回合确实结束后，按 FIFO 自动发出下一条（不丢、不乱序）。
+            dispatchNextQueuedChatTurn();
           }
         }
         return;
@@ -11733,12 +11787,181 @@ export function App({
     }
   }, [agentStatusCards, selectedAgent]);
 
+  /**
+   * 发起一轮 direct-codex 对话回合：提交与队列出队共用同一条路径，避免两条入口的
+   * 消息落盘/回合 id/附件参数走样。
+   */
+  function startDirectCodexConversationTurn(input: {
+    prompt: string;
+    attachments?: DirectCodexTurnAttachment[];
+    references?: ChatReference[];
+  }) {
+    const clientTurnId = createDirectCodexConversationTurnId();
+    supervisorChatShouldFollowLatestRef.current = true;
+    setMessages((current) => [
+      ...current,
+      {
+        role: 'user',
+        text: input.prompt,
+        runtimeOwned: true,
+        messageId: directCodexConversationMessageId(clientTurnId, 'user'),
+        updatedAt: Date.now(),
+      },
+    ]);
+    void executeChatAgentReply({
+      prompt: input.prompt,
+      clientTurnId,
+      attachments: input.attachments?.length ? input.attachments : undefined,
+      references: input.references,
+    });
+  }
+
+  /**
+   * 输入盒上传本地文件：复用首页建项目那条 `upload_local_asset` 链路把文件写进项目，
+   * 再以**项目相对路径**生成回合附件（绝对路径会被 Rust 侧附件规则判为失败）。
+   */
+  async function handleChatComposerUploadFiles(files: readonly File[]) {
+    const invoke = resolveTauriInvoke();
+    const nextProjectPath = resolveChatProjectPath(localProject);
+    if (!invoke || !nextProjectPath) {
+      setChatAttachmentNotice('需要先打开本地项目，才能上传文件');
+      return;
+    }
+    const remaining = MAX_CHAT_COMPOSER_ATTACHMENTS - chatAttachments.length;
+    const accepted = files.slice(0, Math.max(remaining, 0));
+    if (accepted.length === 0) {
+      setChatAttachmentNotice(
+        `最多同时携带 ${MAX_CHAT_COMPOSER_ATTACHMENTS} 个附件，请先移除已有附件`,
+      );
+      return;
+    }
+    setChatAttachmentNotice('正在上传文件');
+    try {
+      const imported = await uploadLocalFilesAsAttachments(
+        invoke,
+        nextProjectPath,
+        accepted,
+      );
+      const attachments = toDirectCodexTurnAttachments(imported);
+      if (localProjectPathRef.current !== nextProjectPath) {
+        return;
+      }
+      setChatAttachments((current) =>
+        [...current, ...attachments].slice(0, MAX_CHAT_COMPOSER_ATTACHMENTS),
+      );
+      const failed = attachments.filter(
+        (attachment) => attachment.status === 'failed',
+      );
+      setChatAttachmentNotice(
+        failed.length > 0
+          ? `${failed.length} 个文件未能上传：${failed[0]?.name ?? ''}`
+          : `已上传 ${attachments.length} 个文件，将在下次发送时作为本轮附件`,
+      );
+      void refreshManifest(nextProjectPath);
+    } catch (error) {
+      if (localProjectPathRef.current === nextProjectPath) {
+        setChatAttachmentNotice(
+          error instanceof Error ? error.message : String(error),
+        );
+      }
+    }
+  }
+
+  function removeChatComposerAttachment(index: number) {
+    setChatAttachments((current) =>
+      current.filter((_, currentIndex) => currentIndex !== index),
+    );
+  }
+
+  /** 回合运行中再次发送：进本地 FIFO 队列；队列满时拒绝并保留草稿，不静默丢消息。 */
+  function enqueueChatTurnForRunningTurn(input: {
+    prompt: string;
+    attachments: DirectCodexTurnAttachment[];
+    references: ChatReference[];
+  }): boolean {
+    if (isChatTurnQueueFull(chatTurnQueueRef.current)) {
+      setChatComposerNotice(chatQueueFullNotice());
+      return false;
+    }
+    queuedChatTurnSequenceRef.current += 1;
+    const turn = createQueuedChatTurn({
+      id: `queued-chat-turn-${Date.now()}-${queuedChatTurnSequenceRef.current}`,
+      prompt: input.prompt,
+      attachments: input.attachments,
+      references: input.references,
+      createdAt: Date.now(),
+    });
+    const nextQueue = enqueueChatTurn(chatTurnQueueRef.current, turn);
+    chatTurnQueueRef.current = nextQueue;
+    setChatTurnQueue(nextQueue);
+    setChatComposerNotice('已加入发送队列，当前回合结束后自动发送');
+    return true;
+  }
+
+  function cancelQueuedChatTurn(id: string) {
+    const nextQueue = removeQueuedChatTurn(chatTurnQueueRef.current, id);
+    chatTurnQueueRef.current = nextQueue;
+    setChatTurnQueue(nextQueue);
+    if (nextQueue.length === 0) {
+      setChatComposerNotice('');
+    }
+  }
+
+  /** 队首出队并立即发出：只在当前回合确实结束（`finally`）后调用。 */
+  function dispatchNextQueuedChatTurn() {
+    const { next, rest } = dequeueChatTurn(chatTurnQueueRef.current);
+    if (!next) {
+      return;
+    }
+    chatTurnQueueRef.current = rest;
+    setChatTurnQueue(rest);
+    if (rest.length === 0) {
+      setChatComposerNotice('');
+    }
+    startDirectCodexConversationTurn({
+      prompt: next.prompt,
+      attachments: next.attachments,
+      references: next.references,
+    });
+  }
+
+  /** 终止当前 direct-codex 回合：只取消这一轮，UI 由回合的 finally 复位。 */
+  async function handleCancelDirectCodexTurn() {
+    if (directCodexTurnCancelling) {
+      return;
+    }
+    const invoke = resolveTauriInvoke();
+    const activeTurn = activeDirectCodexTurnRef.current;
+    const directProjectPath =
+      activeTurn?.projectPath ?? resolveChatProjectPath(localProject);
+    if (!invoke || !directProjectPath || !activeTurn) {
+      setProjectSupervisorRuntimeError('当前没有正在运行的回合，无法终止。');
+      return;
+    }
+    setDirectCodexTurnCancelling(true);
+    setChatComposerNotice('正在终止当前回合');
+    try {
+      await invoke('cancel_direct_codex_turn', {
+        projectPath: directProjectPath,
+        clientTurnId: activeTurn.turnId,
+      });
+      setDirectCodexProgress('正在终止当前回合');
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setProjectSupervisorRuntimeError(`终止失败：${message}`);
+      setChatComposerNotice('');
+    } finally {
+      setDirectCodexTurnCancelling(false);
+    }
+  }
+
   function handleProjectSupervisorOnlySubmit(
     event: FormEvent<HTMLFormElement>,
   ) {
     event.preventDefault();
     const prompt = chatInput.trim();
     const references = chatReferences;
+    const pendingAttachments = chatAttachments;
     if (
       !directCodexProductRuntime &&
       supervisorChatOnly &&
@@ -11754,7 +11977,25 @@ export function App({
       setProjectSupervisorRuntimeError('请先回答项目总控 Agent 当前的澄清问题');
       return;
     }
-    if ((!prompt && references.length === 0) || chatAgentBusy) {
+    if (!prompt && references.length === 0 && pendingAttachments.length === 0) {
+      return;
+    }
+    if (chatAgentBusy) {
+      // 回合运行中再次发送：direct-codex 面板把消息放进本地 FIFO 队列，当前回合结束后
+      // 依次发出；其它面板保持原有"运行中不接受新输入"的行为。
+      if (directCodexProductRuntime) {
+        const enqueued = enqueueChatTurnForRunningTurn({
+          prompt,
+          attachments: pendingAttachments,
+          references,
+        });
+        if (enqueued) {
+          setChatInput('');
+          setChatReferences([]);
+          setChatAttachments([]);
+          setChatAttachmentNotice('');
+        }
+      }
       return;
     }
     if (directCodexProductRuntime && prompt === '/history') {
@@ -11790,9 +12031,20 @@ export function App({
     if (supervisorChatOnly || directCodexProductRuntime) {
       supervisorChatShouldFollowLatestRef.current = true;
     }
-    const directConversationTurnId = directCodexProductRuntime
-      ? createDirectCodexConversationTurnId()
-      : undefined;
+    if (directCodexProductRuntime) {
+      // 待发附件随本轮提交一次性交给回合；提交后清空，避免同一批附件重复挂到下一轮。
+      setChatInput('');
+      setChatReferences([]);
+      setChatAttachments([]);
+      setChatAttachmentNotice('');
+      setChatComposerNotice('');
+      startDirectCodexConversationTurn({
+        prompt,
+        attachments: pendingAttachments,
+        references,
+      });
+      return;
+    }
     setChatInput('');
     setChatReferences([]);
     setMessages((current) => [
@@ -11801,22 +12053,10 @@ export function App({
         role: 'user',
         text: prompt,
         runtimeOwned: true,
-        ...(directConversationTurnId
-          ? {
-              messageId: directCodexConversationMessageId(
-                directConversationTurnId,
-                'user',
-              ),
-            }
-          : {}),
         updatedAt: Date.now(),
       },
     ]);
-    void executeChatAgentReply({
-      prompt,
-      clientTurnId: directConversationTurnId,
-      references,
-    });
+    void executeChatAgentReply({ prompt, references });
   }
 
   const visibleProfessionalAgentCards = agentStatusCards.filter(
@@ -11879,8 +12119,17 @@ export function App({
     return (
       <ProjectSupervisorView
         activeVersionId={chatActiveVersionId}
+        attachments={chatAttachments}
+        attachmentNotice={chatAttachmentNotice}
         chatInput={chatInput}
         chatReferences={chatReferences}
+        composerNotice={chatComposerNotice}
+        onCancelQueuedTurn={cancelQueuedChatTurn}
+        onCancelTurn={() => void handleCancelDirectCodexTurn()}
+        onRemoveAttachment={removeChatComposerAttachment}
+        onUploadFiles={(files) => void handleChatComposerUploadFiles(files)}
+        queuedTurns={chatTurnQueue}
+        turnCancelling={directCodexTurnCancelling}
         composerRef={chatComposerRef}
         chatProjectAssets={chatProjectAssets}
         directCodex={directCodexProductRuntime}
diff --git a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
index dca3466fe..6b2078d3a 100644
--- a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
+++ b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
@@ -87,6 +87,51 @@ async function suggestAutomaticProjectName(
   }
 }
 
+/**
+ * 把浏览器 File 上传进项目并登记为资产，返回带项目相对路径的附件记录。
+ *
+ * 首页建项目与右侧对话输入盒共用同一条链路：`upload_local_asset` 写进项目之后，
+ * 附件才能以「项目路径」形式进入回合附件（绝对路径会被 Rust 侧的附件脱敏规则拒绝）。
+ */
+export async function uploadLocalFilesAsAttachments(
+  invoke: TauriInvoke,
+  nextProjectPath: string,
+  files: readonly File[],
+): Promise<LauncherImportedAttachment[]> {
+  const imported: LauncherImportedAttachment[] = [];
+  for (const file of files) {
+    const mediaType = file.type || 'application/octet-stream';
+    try {
+      const bytes = Array.from(new Uint8Array(await file.arrayBuffer()));
+      const result = await invoke<UploadLocalAssetResult>(
+        'upload_local_asset',
+        {
+          projectPath: nextProjectPath,
+          fileName: file.name,
+          mediaType,
+          bytes,
+        },
+      );
+      imported.push({
+        fileName: file.name,
+        mediaType,
+        localPath: result.localPath,
+        status: 'imported',
+        size: file.size,
+      });
+    } catch (error) {
+      imported.push({
+        fileName: file.name,
+        mediaType,
+        status: 'failed',
+        error: error instanceof Error ? error.message : String(error),
+        size: file.size,
+      });
+    }
+  }
+  return imported;
+}
+
 export function useHomeProjectCreation({
   setStatus,
   setLauncherView,
@@ -245,40 +290,11 @@ export function useHomeProjectCreation({
     nextProjectPath: string,
     attachments: HomeAttachmentDraft[],
   ) {
-    const imported: LauncherImportedAttachment[] = [];
-    for (const attachment of attachments) {
-      const mediaType = attachment.file.type || 'application/octet-stream';
-      try {
-        const bytes = Array.from(
-          new Uint8Array(await attachment.file.arrayBuffer()),
-        );
-        const result = await invoke<UploadLocalAssetResult>(
-          'upload_local_asset',
-          {
-            projectPath: nextProjectPath,
-            fileName: attachment.file.name,
-            mediaType,
-            bytes,
-          },
-        );
-        imported.push({
-          fileName: attachment.file.name,
-          mediaType,
-          localPath: result.localPath,
-          status: 'imported',
-          size: attachment.file.size,
-        });
-      } catch (error) {
-        imported.push({
-          fileName: attachment.file.name,
-          mediaType,
-          status: 'failed',
-          error: error instanceof Error ? error.message : String(error),
-          size: attachment.file.size,
-        });
-      }
-    }
-    return imported;
+    return uploadLocalFilesAsAttachments(
+      invoke,
+      nextProjectPath,
+      attachments.map((attachment) => attachment.file),
+    );
   }
 
   async function enterCreatedHomeProject(
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
new file mode 100644
index 000000000..ddf8bce7b
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx
@@ -0,0 +1,463 @@
+/**
+ * 输入盒控件（Codex 观感）：左 `+`（上传本地文件 / 引用项目素材）、右侧推理强度 +
+ * 模型 + 麦克风 + 发送/终止，以及输入盒上方的待发附件与消息队列 chip。
+ *
+ * 这些组件只承载表现与交互；回合附件由 `App.tsx` 上传并落进 `DirectCodexTurnAttachment`，
+ * 队列由 `chatComposerQueue.ts` 的纯函数维护。
+ */
+import { FileUp, Images, Mic, MicOff, Plus, Square, X } from 'lucide-react';
+import type { RefObject } from 'react';
+import { useEffect, useRef, useState } from 'react';
+
+import { resolveTauriInvoke } from '../../app/tauri';
+import type {
+  GameCreatorAppConfigView,
+  GameCreatorLlmReasoningEffort,
+} from '../../app/types';
+import type { DirectCodexTurnAttachment } from '../app-shell/directCodexTurnAttachments';
+import type { QueuedChatTurn } from './chatComposerQueue';
+import { queuedChatTurnLabel } from './chatComposerQueue';
+import {
+  resolveSpeechRecognitionCtor,
+  speechEventTranscript,
+  type SpeechRecognitionCtor,
+  speechRecognitionErrorMessage,
+  speechRecognitionLang,
+  type SpeechRecognitionLike,
+  VOICE_INPUT_UNSUPPORTED_MESSAGE,
+} from './chatComposerVoice';
+import {
+  composerReasoningEffortOptions,
+  DEFAULT_COMPOSER_REASONING_EFFORT,
+  normalizeComposerReasoningEffort,
+} from './composerReasoningEffort';
+
+type ComposerAttachmentMenuProps = {
+  disabled: boolean;
+  onPickFiles: (files: readonly File[]) => void;
+  onOpenReferencePicker: () => void;
+};
+
+/** 左侧 `+`：独立弹层给两条路径——上传本地文件、引用项目素材。 */
+export function ComposerAttachmentMenu({
+  disabled,
+  onPickFiles,
+  onOpenReferencePicker,
+}: ComposerAttachmentMenuProps) {
+  const [open, setOpen] = useState(false);
+  const anchorRef = useRef<HTMLDivElement | null>(null);
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+    function handleOutsidePointerDown(event: MouseEvent) {
+      const target = event.target as Node | null;
+      if (anchorRef.current && !anchorRef.current.contains(target)) {
+        setOpen(false);
+      }
+    }
+    function handleEscape(event: KeyboardEvent) {
+      if (event.key === 'Escape') {
+        setOpen(false);
+      }
+    }
+    document.addEventListener('mousedown', handleOutsidePointerDown);
+    document.addEventListener('keydown', handleEscape);
+    return () => {
+      document.removeEventListener('mousedown', handleOutsidePointerDown);
+      document.removeEventListener('keydown', handleEscape);
+    };
+  }, [open]);
+
+  return (
+    <div
+      ref={anchorRef}
+      className="project-supervisor-attachment-anchor"
+      data-composer-attachment-menu={open ? 'open' : 'closed'}
+    >
+      <input
+        ref={fileInputRef}
+        type="file"
+        multiple
+        className="project-supervisor-upload-input"
+        data-chat-composer-upload="true"
+        tabIndex={-1}
+        aria-hidden="true"
+        onChange={(event) => {
+          const files = Array.from(event.currentTarget.files ?? []);
+          event.currentTarget.value = '';
+          if (files.length > 0) {
+            onPickFiles(files);
+          }
+        }}
+      />
+      <button
+        type="button"
+        className="project-supervisor-attachment-trigger"
+        aria-label="添加文件"
+        title="添加文件"
+        aria-haspopup="menu"
+        aria-expanded={open}
+        disabled={disabled}
+        onClick={() => setOpen((current) => !current)}
+      >
+        <Plus size={15} aria-hidden="true" />
+      </button>
+      {open ? (
+        <div
+          className="project-supervisor-attachment-menu"
+          role="menu"
+          aria-label="添加文件"
+        >
+          <button
+            type="button"
+            role="menuitem"
+            disabled={disabled}
+            onClick={() => {
+              setOpen(false);
+              fileInputRef.current?.click();
+            }}
+          >
+            <FileUp size={14} aria-hidden="true" />
+            <span>上传本地文件</span>
+          </button>
+          <button
+            type="button"
+            role="menuitem"
+            disabled={disabled}
+            onClick={() => {
+              setOpen(false);
+              onOpenReferencePicker();
+            }}
+          >
+            <Images size={14} aria-hidden="true" />
+            <span>引用项目素材</span>
+          </button>
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+/** 待发附件 chip：随下次提交一起进入回合，可单条移除。 */
+export function ComposerPendingAttachments({
+  attachments,
+  onRemove,
+}: {
+  attachments: readonly DirectCodexTurnAttachment[];
+  onRemove: (index: number) => void;
+}) {
+  if (attachments.length === 0) {
+    return null;
+  }
+  return (
+    <ul
+      className="project-supervisor-composer-attachments"
+      aria-label="待发送附件"
+    >
+      {attachments.map((attachment, index) => (
+        <li
+          key={`${attachment.name}-${index}`}
+          data-attachment-status={attachment.status ?? 'ready'}
+        >
+          <span title={attachment.localPath ?? attachment.name}>
+            {attachment.name}
+          </span>
+          <button
+            type="button"
+            aria-label={`移除附件 ${attachment.name}`}
+            title={`移除附件 ${attachment.name}`}
+            onClick={() => onRemove(index)}
+          >
+            <X size={12} aria-hidden="true" />
+          </button>
+        </li>
+      ))}
+    </ul>
+  );
+}
+
+/** 队列 chip：回合运行中入队的消息，按 FIFO 顺序展示，可单条取消。 */
+export function ComposerTurnQueue({
+  turns,
+  onCancel,
+}: {
+  turns: readonly QueuedChatTurn[];
+  onCancel: (id: string) => void;
+}) {
+  if (turns.length === 0) {
+    return null;
+  }
+  return (
+    <ol
+      className="project-supervisor-composer-queue"
+      aria-label="待发送消息队列"
+    >
+      {turns.map((turn, index) => (
+        <li key={turn.id} data-queue-index={index}>
+          <span className="project-supervisor-composer-queue-order">
+            {index + 1}
+          </span>
+          <span className="project-supervisor-composer-queue-text">
+            {queuedChatTurnLabel(turn)}
+          </span>
+          <button
+            type="button"
+            aria-label={`取消排队消息 ${queuedChatTurnLabel(turn)}`}
+            title="取消这条排队消息"
+            onClick={() => onCancel(turn.id)}
+          >
+            <X size={12} aria-hidden="true" />
+          </button>
+        </li>
+      ))}
+    </ol>
+  );
+}
+
+type ComposerVoiceButtonProps = {
+  disabled: boolean;
+  onTranscript: (text: string) => void;
+  onNotice: (message: string) => void;
+};
+
+/**
+ * 麦克风：只在运行时确实提供 SpeechRecognition 时可用；否则按钮禁用并直接说明原因
+ * （aria-label/title 都是那句提示，不假装能用）。录音态用 `is-recording` 做视觉反馈。
+ */
+export function ComposerVoiceButton({
+  disabled,
+  onTranscript,
+  onNotice,
+}: ComposerVoiceButtonProps) {
+  const ctorRef: RefObject<SpeechRecognitionCtor | null> = useRef(
+    resolveSpeechRecognitionCtor(
+      typeof window === 'undefined' ? null : (window as unknown as object),
+    ),
+  );
+  const ctor = ctorRef.current;
+  const supported = Boolean(ctor);
+  const [recording, setRecording] = useState(false);
+  const recognitionRef = useRef<SpeechRecognitionLike | null>(null);
+  const onTranscriptRef = useRef(onTranscript);
+  const onNoticeRef = useRef(onNotice);
+  useEffect(() => {
+    onTranscriptRef.current = onTranscript;
+    onNoticeRef.current = onNotice;
+  }, [onNotice, onTranscript]);
+  useEffect(
+    () => () => {
+      recognitionRef.current?.abort?.();
+      recognitionRef.current = null;
+    },
+    [],
+  );
+
+  const unsupportedHint = VOICE_INPUT_UNSUPPORTED_MESSAGE;
+  const activeLabel = recording ? '停止语音输入' : '语音输入';
+
+  function startRecognition() {
+    if (!ctor) {
+      onNoticeRef.current(unsupportedHint);
+      return;
+    }
+    try {
+      const recognition = new ctor();
+      recognition.lang = speechRecognitionLang(navigator?.language);
+      recognition.continuous = true;
+      recognition.interimResults = false;
+      recognition.maxAlternatives = 1;
+      recognition.onresult = (event) => {
+        const transcript = speechEventTranscript(event);
+        if (transcript) {
+          onTranscriptRef.current(transcript);
+        }
+      };
+      recognition.onerror = (event) => {
+        const message = speechRecognitionErrorMessage(event?.error);
+        setRecording(false);
+        if (message) {
+          onNoticeRef.current(message);
+        }
+      };
+      recognition.onend = () => {
+        setRecording(false);
+        recognitionRef.current = null;
+      };
+      recognitionRef.current = recognition;
+      recognition.start();
+      setRecording(true);
+    } catch (error) {
+      recognitionRef.current = null;
+      setRecording(false);
+      onNoticeRef.current(
+        error instanceof Error && error.message
+          ? error.message
+          : '语音输入启动失败，请稍后重试',
+      );
+    }
+  }
+
+  return (
+    <button
+      type="button"
+      className={`project-supervisor-voice-trigger${recording ? ' is-recording' : ''}`}
+      aria-label={supported ? activeLabel : unsupportedHint}
+      title={supported ? activeLabel : unsupportedHint}
+      aria-pressed={supported ? recording : undefined}
+      disabled={disabled || !supported}
+      onClick={() => {
+        if (recording) {
+          recognitionRef.current?.stop();
+          setRecording(false);
+          return;
+        }
+        startRecognition();
+      }}
+    >
+      {supported ? (
+        <Mic size={15} aria-hidden="true" />
+      ) : (
+        <MicOff size={15} aria-hidden="true" />
+      )}
+    </button>
+  );
+}
+
+/**
+ * 推理强度：原生 select，紧挨模型选择器。读取/写回都走客户端配置通道
+ * （`read_game_creator_app_config` / `select_game_creator_reasoning_effort`）。
+ */
+export function ComposerReasoningEffortSelect({
+  disabled,
+}: {
+  disabled: boolean;
+}) {
+  const [effort, setEffort] = useState<GameCreatorLlmReasoningEffort>(
+    DEFAULT_COMPOSER_REASONING_EFFORT,
+  );
+  const [saving, setSaving] = useState(false);
+  const [notice, setNotice] = useState('');
+  const writeChainRef = useRef<Promise<unknown>>(Promise.resolve());
+  const mountedRef = useRef(true);
+  const options = composerReasoningEffortOptions();
+
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
+
+  useEffect(() => {
+    let cancelled = false;
+    const invoke = resolveTauriInvoke();
+    if (!invoke) {
+      return undefined;
+    }
+    void invoke<GameCreatorAppConfigView>('read_game_creator_app_config')
+      .then((view) => {
+        if (cancelled || !mountedRef.current) return;
+        setEffort(
+          normalizeComposerReasoningEffort(view?.config?.llm?.reasoningEffort),
+        );
+      })
+      .catch(() => {
+        if (cancelled || !mountedRef.current) return;
+        setNotice('推理档读取失败');
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+
+  function selectEffort(next: GameCreatorLlmReasoningEffort) {
+    const invoke = resolveTauriInvoke();
+    if (!invoke) {
+      setNotice('需要在 Tauri App 内运行');
+      return;
+    }
+    const previous = effort;
+    setEffort(next);
+    setNotice('');
+    setSaving(true);
+    const write = () =>
+      invoke<GameCreatorAppConfigView>('select_game_creator_reasoning_effort', {
+        effort: next,
+      });
+    const run = writeChainRef.current.then(write, write);
+    writeChainRef.current = run.then(
+      () => undefined,
+      () => undefined,
+    );
+    void run
+      .then((view) => {
+        if (!mountedRef.current) return;
+        // 以落盘后的回读值为准，避免界面显示一个没有真正保存的档位。
+        setEffort(
+          normalizeComposerReasoningEffort(view?.config?.llm?.reasoningEffort),
+        );
+      })
+      .catch(() => {
+        if (!mountedRef.current) return;
+        setEffort(previous);
+        setNotice('推理档保存失败');
+      })
+      .finally(() => {
+        if (mountedRef.current) {
+          setSaving(false);
+        }
+      });
+  }
+
+  return (
+    <span className="project-supervisor-reasoning-effort">
+      <select
+        aria-label="推理档"
+        className="project-supervisor-reasoning-effort-select"
+        value={effort}
+        disabled={disabled || saving}
+        onChange={(event) =>
+          selectEffort(
+            normalizeComposerReasoningEffort(event.currentTarget.value),
+          )
+        }
+      >
+        {options.map((option) => (
+          <option key={option.value} value={option.value}>
+            {option.label}
+          </option>
+        ))}
+      </select>
+      {notice ? (
+        <span role="status" className="project-supervisor-composer-notice">
+          {notice}
+        </span>
+      ) : null}
+    </span>
+  );
+}
+
+/** 发送按钮位置在回合运行中显示的终止钮（Codex 的停止方块）。 */
+export function ComposerStopButton({
+  cancelling,
+  onCancel,
+}: {
+  cancelling: boolean;
+  onCancel: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      className="project-supervisor-submit-button project-supervisor-stop-button"
+      aria-label={cancelling ? '正在终止' : '终止'}
+      title={cancelling ? '正在终止' : '终止当前回合'}
+      disabled={cancelling}
+      onClick={onCancel}
+    >
+      <Square size={14} aria-hidden="true" />
+    </button>
+  );
+}
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 d285bcb7e..30053197f 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
@@ -3,7 +3,6 @@ import {
   AtSign,
   Loader2,
   MessageSquareDashed,
-  Plus,
   Settings,
 } from 'lucide-react';
 import type {
@@ -39,8 +38,18 @@ import {
   ProjectSupervisorRuntimePanel,
   projectWorkspaceStatusForDisplay,
 } from '../agent-runtime';
+import type { DirectCodexTurnAttachment } from '../app-shell/directCodexTurnAttachments';
 import { formatAgentCardRuntimeStatus } from '../project-summary/agentPresentation';
 import { taskStatusLabels } from '../project-summary/projectSummary';
+import type { QueuedChatTurn } from './chatComposerQueue';
+import {
+  ComposerAttachmentMenu,
+  ComposerPendingAttachments,
+  ComposerReasoningEffortSelect,
+  ComposerStopButton,
+  ComposerTurnQueue,
+  ComposerVoiceButton,
+} from './ComposerControls';
 import {
   ConversationModelSelect,
   type ConversationModelSelectHandle,
@@ -93,6 +102,10 @@ function directStatusTitle(status: string | null | undefined) {
 
 type ProjectSupervisorViewProps = RuntimePanelProps & {
   activeVersionId?: string | null;
+  /** 输入盒待发送附件：随下次提交进入回合（direct-codex 才渲染）。 */
+  attachments?: DirectCodexTurnAttachment[];
+  /** 上传/校验附件的提示文案（失败与成功都用它，空串不渲染）。 */
+  attachmentNotice?: string;
   chatInput: string;
   chatReferences: ChatReference[];
   chatProjectAssets: import('../../../../../packages/shared/src/contracts/gameCreationApp').GameCreationAppAssetManifestEntry[];
@@ -109,6 +122,17 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   onChatInputChange: (draft: ChatComposerDraft) => void;
   onConfirmConfirmation: () => void;
   onConfirmPendingCommand: () => void;
+  /** 回合运行中点"终止"：只取消当前回合，不改后端协议。 */
+  onCancelTurn?: () => void;
+  onCancelQueuedTurn?: (id: string) => void;
+  onRemoveAttachment?: (index: number) => void;
+  onUploadFiles?: (files: readonly File[]) => void;
+  /** 队列里待发的消息（回合运行中再次发送时入队）。 */
+  queuedTurns?: QueuedChatTurn[];
+  /** 输入盒下方的通用提示（队列满、上传失败等）。 */
+  composerNotice?: string;
+  /** 终止请求在途：终止钮进入禁用的"正在终止"态。 */
+  turnCancelling?: boolean;
   onScroll: UIEventHandler<HTMLDivElement>;
   onShowEarlierMessages: () => void;
   onSubmit: FormEventHandler<HTMLFormElement>;
@@ -150,6 +174,8 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
 
 export function ProjectSupervisorView({
   activeVersionId = null,
+  attachments = [],
+  attachmentNotice = '',
   chatInput,
   chatReferences,
   chatProjectAssets,
@@ -166,6 +192,13 @@ export function ProjectSupervisorView({
   onChatInputChange,
   onConfirmConfirmation,
   onConfirmPendingCommand,
+  onCancelTurn,
+  onCancelQueuedTurn,
+  onRemoveAttachment,
+  onUploadFiles,
+  queuedTurns = [],
+  composerNotice = '',
+  turnCancelling = false,
   onScroll,
   onShowEarlierMessages,
   onSubmit,
@@ -218,6 +251,8 @@ export function ProjectSupervisorView({
   const modelValidateInFlightRef = useRef(false);
   // 设置浮层：Codex 顶栏只剩状态与齿轮，运行配置 / 审批模式 / 钱包都收进这里。
   const [settingsOpen, setSettingsOpen] = useState(false);
+  // 语音输入的降级/失败提示：不支持时按钮本身就带提示，这里只承载启动失败与权限类错误。
+  const [voiceNotice, setVoiceNotice] = useState('');
   const [approvalOpen, setApprovalOpen] = useState(false);
   const [approvalMode, setApprovalMode] = useState<ApprovalMode>('strict');
   const [approvalNotice, setApprovalNotice] = useState('');
@@ -557,6 +592,14 @@ export function ProjectSupervisorView({
             void validateModel();
           }}
         >
+          <ComposerTurnQueue
+            turns={directCodex ? queuedTurns : []}
+            onCancel={(id) => onCancelQueuedTurn?.(id)}
+          />
+          <ComposerPendingAttachments
+            attachments={directCodex ? attachments : []}
+            onRemove={(index) => onRemoveAttachment?.(index)}
+          />
           <ResourceReferenceInput
             ref={composerRef}
             ariaLabel={directCodex ? '陶泥儿对话内容' : '项目需求'}
@@ -565,7 +608,9 @@ export function ProjectSupervisorView({
             assets={chatProjectAssets}
             projectPath={projectPath}
             disabled={
-              runtimePanelProps.controlBusy ||
+              // direct-codex 回合运行中输入区保持可编辑：用户能继续写下一条消息进本地队列，
+              // 回合结束后（Enter 提交）自动依次发出。其它面板维持"运行中不接受输入"。
+              (runtimePanelProps.controlBusy && !directCodex) ||
               needsUserInput ||
               modelValidating ||
               Boolean(designView?.session.pendingApproval) ||
@@ -585,16 +630,13 @@ export function ProjectSupervisorView({
           {directCodex ? (
             <div className="project-supervisor-composer-controls">
               <div className="project-supervisor-composer-controls-left">
-                <button
-                  type="button"
-                  className="project-supervisor-attachment-trigger"
-                  aria-label="添加素材引用"
-                  title="添加素材引用"
+                <ComposerAttachmentMenu
                   disabled={runtimePanelProps.controlBusy || needsUserInput}
-                  onClick={() => composerRef?.current?.openPicker()}
-                >
-                  <Plus size={15} aria-hidden="true" />
-                </button>
+                  onPickFiles={(files) => onUploadFiles?.(files)}
+                  onOpenReferencePicker={() =>
+                    composerRef?.current?.openPicker()
+                  }
+                />
                 <button
                   type="button"
                   className="project-supervisor-reference-trigger"
@@ -607,6 +649,9 @@ export function ProjectSupervisorView({
                 </button>
               </div>
               <div className="project-supervisor-composer-controls-right">
+                {/* 推理档放在模型选择器旁边（Codex 的「高」那个位置）：写回的是客户端
+                    配置，只影响后续回合；当前回合的行为不受影响。 */}
+                <ComposerReasoningEffortSelect disabled={needsUserInput} />
                 <ConversationModelSelect
                   ref={modelSelectRef}
                   // 允许在对话进行中切换模型：写回的是客户端配置，只影响后续轮次，
@@ -615,12 +660,36 @@ export function ProjectSupervisorView({
                   onReady={setModelReady}
                   projectPath={projectPath}
                 />
-                {submitButton}
+                <ComposerVoiceButton
+                  disabled={
+                    runtimePanelProps.controlBusy ||
+                    needsUserInput ||
+                    modelValidating
+                  }
+                  onTranscript={(text) =>
+                    composerRef?.current?.insertText(text)
+                  }
+                  onNotice={setVoiceNotice}
+                />
+                {submitting && onCancelTurn ? (
+                  <ComposerStopButton
+                    cancelling={turnCancelling}
+                    onCancel={onCancelTurn}
+                  />
+                ) : (
+                  submitButton
+                )}
               </div>
             </div>
           ) : (
             submitButton
           )}
+          {directCodex &&
+          (composerNotice || attachmentNotice || voiceNotice) ? (
+            <p className="project-supervisor-composer-notice" role="status">
+              {composerNotice || attachmentNotice || voiceNotice}
+            </p>
+          ) : null}
         </form>
         {directCodex ? null : (
           <small className="project-supervisor-workspace-status">
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ResourceReferenceInput.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ResourceReferenceInput.tsx
index 1971660b5..9283f7f4a 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ResourceReferenceInput.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ResourceReferenceInput.tsx
@@ -156,6 +156,8 @@ function createResourcePickerScopeStates(): Record<
 
 export type ResourceReferenceInputHandle = {
   insertReferences: (references: ChatReference[]) => void;
+  /** 追加纯文本（语音识别结果）：写在当前光标处，且不覆盖用户已输入的内容。 */
+  insertText: (text: string) => void;
   openPicker: () => void;
   focus: () => void;
 };
@@ -569,14 +571,43 @@ function ResourceReferenceEditor({
     setPickerOpen(true);
   }, []);
 
+  const insertText = useCallback(
+    (text: string) => {
+      const insert = text.replace(/\s+$/u, '');
+      if (!insert.trim()) return;
+      editor.update(() => {
+        let selection = $getSelection();
+        // 选区失效（跨会话恢复草稿后常见）时回落到草稿末尾，与 `insertReferences` 同口径。
+        if (
+          !$isRangeSelection(selection) ||
+          !selection.anchor.getNode().isAttached()
+        ) {
+          $getRoot().selectEnd();
+          selection = $getSelection();
+        }
+        if ($isRangeSelection(selection)) {
+          // 认领的光标处的已有内容保持不变：这里只插入，不删除任何节点。
+          const rootText = $getRoot().getTextContent();
+          if (rootText && !/\s$/u.test(rootText)) {
+            selection.insertText(' ');
+          }
+          selection.insertText(insert);
+        }
+      });
+      editor.focus();
+    },
+    [editor],
+  );
+
   useImperativeHandle(
     composerRef,
     () => ({
       insertReferences,
+      insertText,
       openPicker,
       focus: () => editor.focus(),
     }),
-    [editor, insertReferences, openPicker],
+    [editor, insertReferences, insertText, openPicker],
   );
 
   useEffect(() => {
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
new file mode 100644
index 000000000..0ece3ae9e
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts
@@ -0,0 +1,89 @@
+/**
+ * 输入盒本地消息队列（纯前端状态，不改后端协议）。
+ *
+ * 回合运行中用户再次发送时，消息进入 FIFO 队列而不是被丢弃；当前回合结束后按入队顺序
+ * 依次发出。队列项能在输入盒上方单独取消。这里只放与 React 无关的纯逻辑，便于单测。
+ */
+import type { DirectCodexTurnAttachment } from '../app-shell/directCodexTurnAttachments';
+import type { ChatReference } from './resourceReferences';
+
+/** 队列上限：满了以后拒绝入队并给出可读提示，而不是静默丢消息。 */
+export const MAX_QUEUED_CHAT_TURNS = 5;
+
+export type QueuedChatTurn = {
+  id: string;
+  prompt: string;
+  attachments: DirectCodexTurnAttachment[];
+  references: ChatReference[];
+  createdAt: number;
+};
+
+export function createQueuedChatTurn(input: {
+  id: string;
+  prompt: string;
+  attachments?: readonly DirectCodexTurnAttachment[];
+  references?: readonly ChatReference[];
+  createdAt: number;
+}): QueuedChatTurn {
+  return {
+    id: input.id,
+    prompt: input.prompt,
+    attachments: [...(input.attachments ?? [])],
+    references: [...(input.references ?? [])],
+    createdAt: input.createdAt,
+  };
+}
+
+/** 队尾追加。同一 id 已在队列里时原样返回，避免重复入队把同一条消息发两遍。 */
+export function enqueueChatTurn(
+  queue: readonly QueuedChatTurn[],
+  turn: QueuedChatTurn,
+): QueuedChatTurn[] {
+  if (queue.some((item) => item.id === turn.id)) {
+    return [...queue];
+  }
+  return [...queue, turn];
+}
+
+/** 取队首（FIFO）。队列为空时 `next` 为 `null`，`rest` 保持空数组。 */
+export function dequeueChatTurn(queue: readonly QueuedChatTurn[]): {
+  next: QueuedChatTurn | null;
+  rest: QueuedChatTurn[];
+} {
+  if (queue.length === 0) {
+    return { next: null, rest: [] };
+  }
+  const [next, ...rest] = queue;
+  return { next: next ?? null, rest };
+}
+
+/** 单条取消：按 id 移除，其余项保持原有顺序。 */
+export function removeQueuedChatTurn(
+  queue: readonly QueuedChatTurn[],
+  id: string,
+): QueuedChatTurn[] {
+  return queue.filter((item) => item.id !== id);
+}
+
+export function isChatTurnQueueFull(queue: readonly QueuedChatTurn[]): boolean {
+  return queue.length >= MAX_QUEUED_CHAT_TURNS;
+}
+
+export function chatQueueFullNotice(): string {
+  return `队列已满（最多 ${MAX_QUEUED_CHAT_TURNS} 条），请等当前回合结束后再发送`;
+}
+
+/** 队列 chip 上显示的文字：单行、有长度上限。 */
+export function queuedChatTurnLabel(turn: QueuedChatTurn): string {
+  const text = turn.prompt.trim().replace(/\s+/gu, ' ');
+  if (text) {
+    return text.length > 24 ? `${text.slice(0, 24)}…` : text;
+  }
+  if (turn.attachments.length > 0) {
+    return `附件 · ${turn.attachments[0]?.name ?? '未命名'}`;
+  }
+  if (turn.references.length > 0) {
+    return '素材引用';
+  }
+  return '未命名消息';
+}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerVoice.ts b/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerVoice.ts
new file mode 100644
index 000000000..0d3a4f474
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/chatComposerVoice.ts
@@ -0,0 +1,144 @@
+/**
+ * 输入盒语音输入：只做能力探测、文本拼接与错误文案，不依赖 React。
+ *
+ * WebView 是否提供 `SpeechRecognition` / `webkitSpeechRecognition` 由运行时决定；
+ * 拿不到构造器时必须禁用按钮并给出可读提示，不允许"看起来能用"。
+ */
+
+export const VOICE_INPUT_UNSUPPORTED_MESSAGE = '当前运行环境不支持语音输入';
+export const VOICE_INPUT_PERMISSION_MESSAGE =
+  '语音输入未获得麦克风权限，请在系统设置中允许后重试';
+export const VOICE_INPUT_SERVICE_MESSAGE =
+  '当前运行环境的语音识别服务不可用，请改用键盘输入';
+export const VOICE_INPUT_DEFAULT_ERROR_MESSAGE = '语音输入失败，请稍后重试';
+
+export type SpeechRecognitionAlternativeLike = {
+  transcript: string;
+};
+
+export type SpeechRecognitionResultLike = {
+  isFinal: boolean;
+  length: number;
+  [index: number]: SpeechRecognitionAlternativeLike;
+};
+
+export type SpeechRecognitionResultListLike = {
+  length: number;
+  [index: number]: SpeechRecognitionResultLike;
+};
+
+export type SpeechRecognitionEventLike = {
+  resultIndex: number;
+  results: SpeechRecognitionResultListLike;
+};
+
+export type SpeechRecognitionErrorEventLike = {
+  error?: string;
+  message?: string;
+};
+
+export type SpeechRecognitionLike = {
+  lang: string;
+  continuous: boolean;
+  interimResults: boolean;
+  maxAlternatives: number;
+  start: () => void;
+  stop: () => void;
+  abort: () => void;
+  onresult: ((event: SpeechRecognitionEventLike) => void) | null;
+  onerror: ((event: SpeechRecognitionErrorEventLike) => void) | null;
+  onend: (() => void) | null;
+};
+
+export type SpeechRecognitionCtor = new () => SpeechRecognitionLike;
+
+type SpeechScope = {
+  SpeechRecognition?: SpeechRecognitionCtor;
+  webkitSpeechRecognition?: SpeechRecognitionCtor;
+};
+
+/** 取当前运行时的语音识别构造器；两个厂商前缀都没有时返回 `null`（降级）。 */
+export function resolveSpeechRecognitionCtor(
+  scope: unknown,
+): SpeechRecognitionCtor | null {
+  if (!scope || typeof scope !== 'object') {
+    return null;
+  }
+  const candidate = scope as SpeechScope;
+  return (
+    candidate.SpeechRecognition ?? candidate.webkitSpeechRecognition ?? null
+  );
+}
+
+export function speechRecognitionLang(locale: string | undefined): string {
+  const normalized = locale?.trim();
+  if (!normalized) {
+    return 'zh-CN';
+  }
+  return normalized;
+}
+
+/**
+ * 识别文本追加到输入框已有内容之后——**不覆盖**用户已经输入的部分。
+ *
+ * 中文/日文这类无空格语言直接拼接；纯 ASCII 字母数字开头的识别结果补一个空格，
+ * 避免英文单词粘在一起。
+ */
+export function appendDictationText(
+  current: string,
+  transcript: string,
+): string {
+  const text = transcript.trim();
+  if (!text) {
+    return current;
+  }
+  if (!current) {
+    return text;
+  }
+  if (/\s$/u.test(current)) {
+    return `${current}${text}`;
+  }
+  return /^[A-Za-z0-9]/u.test(text)
+    ? `${current} ${text}`
+    : `${current}${text}`;
+}
+
+/** 识别结果的最终文本（同一轮里可能有多段 interim，取本次事件里的最终段）。 */
+export function speechEventTranscript(
+  event: SpeechRecognitionEventLike,
+): string {
+  let transcript = '';
+  for (
+    let index = event.resultIndex;
+    index < event.results.length;
+    index += 1
+  ) {
+    const result = event.results[index];
+    if (!result) continue;
+    const alternative = result[0];
+    if (alternative?.transcript) {
+      transcript += alternative.transcript;
+    }
+  }
+  return transcript;
+}
+
+export function speechRecognitionErrorMessage(
+  error: string | undefined,
+): string {
+  switch (error?.trim()) {
+    case 'not-allowed':
+    case 'service-not-allowed':
+      return VOICE_INPUT_PERMISSION_MESSAGE;
+    case 'network':
+      return VOICE_INPUT_SERVICE_MESSAGE;
+    case 'audio-capture':
+      return '未检测到可用的麦克风设备';
+    case 'no-speech':
+      return '没有识别到语音，请重试';
+    case 'aborted':
+      return '';
+    default:
+      return VOICE_INPUT_DEFAULT_ERROR_MESSAGE;
+  }
+}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/composerReasoningEffort.ts b/apps/ai-game-creator-shell/src/features/project-workspace/composerReasoningEffort.ts
new file mode 100644
index 000000000..e8c520b88
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/composerReasoningEffort.ts
@@ -0,0 +1,48 @@
+/**
+ * 输入盒推理强度控件：把运行配置里的 `llm.reasoningEffort` 搬到输入盒这一排。
+ *
+ * 配置写入走既有客户端配置通道，只影响**后续**回合：每个回合开始时 Rust 侧都会
+ * 重新读取一次客户端配置，因此改档不会改变正在跑的回合。
+ */
+import type { GameCreatorLlmReasoningEffort } from '../../app/types';
+import { gameCreatorLlmReasoningEfforts } from '../../app/types';
+
+export const DEFAULT_COMPOSER_REASONING_EFFORT: GameCreatorLlmReasoningEffort =
+  'default';
+
+const reasoningEffortLabels: Record<GameCreatorLlmReasoningEffort, string> = {
+  default: '默认',
+  low: '低',
+  medium: '中',
+  high: '高',
+  max: '最高',
+};
+
+export function reasoningEffortLabel(
+  effort: GameCreatorLlmReasoningEffort,
+): string {
+  return reasoningEffortLabels[effort];
+}
+
+/** 配置值可能是缺字段 / 大小写不一致；只有契约内的档位才认，其余回落默认档。 */
+export function normalizeComposerReasoningEffort(
+  value: unknown,
+): GameCreatorLlmReasoningEffort {
+  if (typeof value !== 'string') {
+    return DEFAULT_COMPOSER_REASONING_EFFORT;
+  }
+  const normalized = value.trim().toLowerCase();
+  return gameCreatorLlmReasoningEfforts.find((effort) => effort === normalized)
+    ? (normalized as GameCreatorLlmReasoningEffort)
+    : DEFAULT_COMPOSER_REASONING_EFFORT;
+}
+
+export function composerReasoningEffortOptions(): {
+  value: GameCreatorLlmReasoningEffort;
+  label: string;
+}[] {
+  return gameCreatorLlmReasoningEfforts.map((effort) => ({
+    value: effort,
+    label: reasoningEffortLabel(effort),
+  }));
+}
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 57b125c85..128ccecfb 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -10736,6 +10736,286 @@ button.design-workspace-tree__entry:hover,
   color: var(--platform-button-primary-text);
 }
 
+/* ===== 输入盒新增控件（`+` 上传弹层 / 语音 / 推理档 / 终止钮 / 附件与队列 chip）=====
+   全部是**追加**规则：上面那三条共用尺寸/配色规则（`+`、`@`、发送钮）保持原样，
+   这里只给新增元素自己的几何与配色。 */
+
+/* `+` 弹层的包含块：弹层是 absolute，锚点必须自己带定位，否则会挂到整只 composer 上。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-attachment-anchor {
+  position: relative;
+  display: grid;
+  flex: 0 0 auto;
+  place-items: center;
+}
+
+/* 原生文件选择器只作为 `+` 弹层的落点，不放进版式。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-upload-input {
+  display: none;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-menu {
+  position: absolute;
+  bottom: calc(100% + 8px);
+  left: 0;
+  z-index: 3;
+  display: grid;
+  min-width: 168px;
+  padding: 4px;
+  border: 1px solid var(--platform-surface-border);
+  border-radius: 10px;
+  background: var(--platform-input-fill);
+  box-shadow: 0 8px 24px rgb(0 0 0 / 18%);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-menu
+  button {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  padding: 7px 8px;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--platform-text-base);
+  font-size: 12px;
+  text-align: left;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-menu
+  button:hover:not(:disabled),
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-attachment-menu
+  button:focus-visible {
+  background: var(--platform-button-ghost-fill);
+}
+
+/* 语音钮与终止钮沿用控制排方钮尺寸；这里补 `position: static` 等重置，
+   免得继承文件里更早那条广播式 `button` 规则。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-voice-trigger,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-controls
+  .project-supervisor-stop-button {
+  position: static !important;
+  right: auto !important;
+  bottom: auto !important;
+  display: grid;
+  width: 28px;
+  min-width: 28px;
+  height: 28px;
+  min-height: 28px;
+  padding: 0;
+  border: 0;
+  border-radius: 8px;
+  flex: 0 0 28px;
+  place-items: center;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-voice-trigger {
+  background: transparent;
+  color: var(--platform-text-soft);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-voice-trigger:hover:not(:disabled),
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-voice-trigger:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+}
+
+/* 录音态：实心强调色 + 呼吸光环，配上 aria-pressed 让"正在录"一眼可见。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-voice-trigger.is-recording {
+  border-radius: 999px;
+  background: var(--platform-accent, #c7653d);
+  color: var(--platform-button-primary-text);
+  animation: composer-voice-recording-pulse 1.4s ease-in-out infinite;
+}
+
+@keyframes composer-voice-recording-pulse {
+  0%,
+  100% {
+    box-shadow: 0 0 0 0 rgb(199 101 61 / 45%);
+  }
+  50% {
+    box-shadow: 0 0 0 4px rgb(199 101 61 / 0%);
+  }
+}
+
+/* 终止钮：发送钮的圆角几何不变，只用中性填充区分"这一步在停止"而不是"发送"。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-stop-button {
+  border-radius: 999px;
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-reasoning-effort {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 1 auto;
+  min-width: 0;
+  gap: 6px;
+}
+
+/* 推理档紧挨模型选择器：控件位只放当前档位，选项在原生菜单里。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-reasoning-effort-select {
+  max-width: 76px;
+  padding: 2px 4px;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-reasoning-effort-select:hover:not(:disabled),
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-reasoning-effort-select:focus-visible {
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-strong);
+}
+
+/* 待发附件 / 队列 chip：压在输入区上方，横向排布、超出换行。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-attachments,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-queue {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 6px;
+  margin: 0 0 6px;
+  padding: 0;
+  list-style: none;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-attachments
+  li,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-queue
+  li {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  max-width: 100%;
+  padding: 3px 6px;
+  border-radius: 999px;
+  background: var(--platform-button-ghost-fill);
+  color: var(--platform-text-soft);
+  font-size: 12px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-attachments
+  li
+  span,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-queue
+  .project-supervisor-composer-queue-text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-attachments
+  button,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-queue
+  button {
+  display: grid;
+  place-items: center;
+  width: 18px;
+  height: 18px;
+  padding: 0;
+  border: 0;
+  border-radius: 999px;
+  background: transparent;
+  color: inherit;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-queue-order {
+  opacity: 0.7;
+  font-variant-numeric: tabular-nums;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-composer-notice {
+  margin: 4px 0 0;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+}
+
 /* 消息列表的最终几何，故意放在文件靠后的位置：它与上面那条同选择器同权重
    （`.game-workbench-chat .project-supervisor-surface.is-direct-codex
    .project-supervisor-message-list`），按"后写胜出"把两处会顶掉它的规则压回去——
diff --git a/apps/ai-game-creator-shell/tests/appSurface.test.ts b/apps/ai-game-creator-shell/tests/appSurface.test.ts
index 51f42dffe..8b15f73ce 100644
--- a/apps/ai-game-creator-shell/tests/appSurface.test.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface.test.ts
@@ -3,6 +3,7 @@ import { vi } from 'vitest';
 
 import { registerAgentRuntimeCommandTests } from './appSurface/agent-runtime.suite';
 import { registerAuthTests } from './appSurface/auth.suite';
+import { registerChatComposerControlTests } from './appSurface/chat-composer.suite';
 import { registerDesignAgentSurfaceTests } from './appSurface/design-agent.suite';
 import {
   registerDeveloperAgentWindowTests,
@@ -74,4 +75,5 @@ describe('AI 游戏创作 App 界面边界', () => {
   registerCanvasAssetTests();
   registerPlanGddApprovalTests();
   registerDesignAgentSurfaceTests();
+  registerChatComposerControlTests();
 });
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
new file mode 100644
index 000000000..e77141362
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/appSurface/chat-composer.suite.ts
@@ -0,0 +1,591 @@
+import {
+  chatQueueFullNotice,
+  createQueuedChatTurn,
+  dequeueChatTurn,
+  enqueueChatTurn,
+  isChatTurnQueueFull,
+  removeQueuedChatTurn,
+} from '../../src/features/project-workspace/chatComposerQueue';
+import {
+  appendDictationText,
+  resolveSpeechRecognitionCtor,
+  speechRecognitionErrorMessage,
+  type SpeechRecognitionEventLike,
+  type SpeechRecognitionLike,
+  VOICE_INPUT_UNSUPPORTED_MESSAGE,
+} from '../../src/features/project-workspace/chatComposerVoice';
+import { ComposerVoiceButton } from '../../src/features/project-workspace/ComposerControls';
+import {
+  act,
+  createGameCreationAppManifest,
+  createProjectSupervisorRuntimeHarness,
+  expect,
+  fireEvent,
+  it,
+  pickProjectFromLauncher,
+  React,
+  render,
+  renderLauncherProjectsAt,
+  screen,
+  setComposerText,
+  vi,
+  waitFor,
+  within,
+} from './harness';
+
+const DYNAMIC_GAME_PROJECT_PATH = '/tmp/chat-composer-controls-game';
+
+type InvokeOverrides = Record<
+  string,
+  (args: Record<string, unknown> | undefined) => unknown
+>;
+
+function gameCreatorConfigView(reasoningEffort: string) {
+  return {
+    path: '/tmp/chat-composer-config.json',
+    config: {
+      schemaVersion: 'game-creator-config.v2',
+      agentMode: 'codex_app_server',
+      selectedModelId: 'quality',
+      llm: {
+        apiKey: '',
+        baseUrl: '',
+        model: 'quality',
+        apiKind: 'openai_responses',
+        reasoningEffort,
+        stream: true,
+        webSearchEnabled: true,
+        contextWindowTokens: 128000,
+        autoCompactTokenLimit: 64000,
+        toolOutputTokenLimit: 12000,
+        requestTimeoutMs: 180000,
+        maxRetries: 2,
+        retryBackoffMs: 500,
+      },
+      agentLlm: {},
+      editorApi: { baseUrl: 'https://dev.genarrative.world', apiKey: '' },
+    },
+  };
+}
+
+/** 打开一个 direct-codex 项目对话面板（右侧输入盒就是被测对象）。 */
+async function openDirectCodexSurface(overrides: InvokeOverrides = {}) {
+  const supervisorHarness = createProjectSupervisorRuntimeHarness({
+    projectPath: DYNAMIC_GAME_PROJECT_PATH,
+    initialSessionExists: false,
+  });
+  const manifest = createGameCreationAppManifest(
+    'local-project-draft',
+    '输入盒控件项目',
+  );
+  const invoke = vi.fn(
+    async (command: string, args?: Record<string, unknown>) => {
+      const override = overrides[command];
+      if (override) {
+        return override(args);
+      }
+      if (command === 'get_design_agent_runtime_mode') return null;
+      if (command === 'inspect_local_project_directory') {
+        return {
+          projectPath: DYNAMIC_GAME_PROJECT_PATH,
+          exists: true,
+          isDirectory: true,
+          isGameCreatorProject: true,
+          projectName: 'chat-composer-controls',
+          recentRunStatus: null,
+          recentRunStopReason: null,
+        };
+      }
+      if (command === 'get_local_game_manifest') return manifest;
+      if (command === 'get_local_game_preview_status') {
+        return { status: 'stopped', url: null, port: null, root: null };
+      }
+      return supervisorHarness.invoke(command, args);
+    },
+  );
+  window.__TAURI__ = {
+    core: { invoke },
+    event: { listen: supervisorHarness.listen },
+  };
+  renderLauncherProjectsAt('/?launcher');
+  pickProjectFromLauncher(DYNAMIC_GAME_PROJECT_PATH);
+  const surface = await screen.findByLabelText('陶泥儿项目对话');
+  return { invoke, path: DYNAMIC_GAME_PROJECT_PATH, surface };
+}
+
+async function submitDirectTurn(
+  surface: HTMLElement,
+  composer: HTMLElement,
+  text: string,
+) {
+  await setComposerText(composer, text);
+  fireEvent.click(within(surface).getByRole('button', { name: '发送' }));
+}
+
+/**
+ * 回合运行中发送钮位置是终止钮，Enter 仍然提交表单（`requestSubmit`），
+ * 因此"运行中再次发送"走的是表单提交而不是那颗按钮。
+ */
+function submitComposerForm(composer: HTMLElement) {
+  fireEvent.submit(composer.closest('form') as HTMLFormElement);
+}
+
+type FakeSpeechRecognition = SpeechRecognitionLike & {
+  emitTranscript: (transcript: string) => void;
+};
+
+function installFakeSpeechRecognition(): {
+  instances: FakeSpeechRecognition[];
+  restore: () => void;
+} {
+  const instances: FakeSpeechRecognition[] = [];
+  function FakeSpeechRecognitionCtor(this: FakeSpeechRecognition) {
+    const instance = {
+      lang: '',
+      continuous: false,
+      interimResults: false,
+      maxAlternatives: 1,
+      onresult: null,
+      onerror: null,
+      onend: null,
+      start: vi.fn(),
+      stop: vi.fn(() => instance.onend?.()),
+      abort: vi.fn(),
+      emitTranscript: (transcript: string) => {
+        const event: SpeechRecognitionEventLike = {
+          resultIndex: 0,
+          results: {
+            length: 1,
+            0: { isFinal: true, length: 1, 0: { transcript } },
+          },
+        };
+        instance.onresult?.(event);
+      },
+    } as unknown as FakeSpeechRecognition;
+    instances.push(instance);
+    return instance;
+  }
+  const scope = window as unknown as Record<string, unknown>;
+  scope.webkitSpeechRecognition = FakeSpeechRecognitionCtor;
+  return {
+    instances,
+    restore: () => {
+      delete scope.webkitSpeechRecognition;
+    },
+  };
+}
+
+export function registerChatComposerControlTests() {
+  it('keeps queued chat turns in FIFO order and drops only the cancelled one', () => {
+    const first = createQueuedChatTurn({
+      id: 'turn-1',
+      prompt: '第一条',
+      createdAt: 1,
+    });
+    const second = createQueuedChatTurn({
+      id: 'turn-2',
+      prompt: '第二条',
+      createdAt: 2,
+    });
+    const third = createQueuedChatTurn({
+      id: 'turn-3',
+      prompt: '第三条',
+      createdAt: 3,
+    });
+
+    let queue = enqueueChatTurn([], first);
+    queue = enqueueChatTurn(queue, second);
+    queue = enqueueChatTurn(queue, third);
+    // 同一条消息重复入队不得变成两次发送。
+    expect(enqueueChatTurn(queue, third)).toHaveLength(3);
+
+    // FIFO：先入先出，不丢、不乱序。
+    const firstOut = dequeueChatTurn(queue);
+    expect(firstOut.next?.prompt).toBe('第一条');
+    expect(firstOut.rest.map((turn) => turn.prompt)).toEqual([
+      '第二条',
+      '第三条',
+    ]);
+
+    // 单条取消只移除那一条，顺序不变。
+    expect(
+      removeQueuedChatTurn(firstOut.rest, 'turn-2').map((turn) => turn.prompt),
+    ).toEqual(['第三条']);
+    expect(removeQueuedChatTurn(firstOut.rest, 'turn-missing')).toHaveLength(2);
+
+    // 空队列出队不报错、也不产生"幽灵消息"。
+    expect(dequeueChatTurn([]).next).toBeNull();
+  });
+
+  it('reports a readable reason instead of silently dropping a full queue', () => {
+    let queue: ReturnType<typeof createQueuedChatTurn>[] = [];
+    for (let index = 0; index < 5; index += 1) {
+      queue = enqueueChatTurn(
+        queue,
+        createQueuedChatTurn({
+          id: `turn-${index}`,
+          prompt: `第 ${index} 条`,
+          createdAt: index,
+        }),
+      );
+    }
+    expect(isChatTurnQueueFull(queue)).toBe(true);
+    expect(chatQueueFullNotice()).toContain('队列已满');
+    expect(chatQueueFullNotice()).toContain('5');
+    expect(removeQueuedChatTurn(queue, 'turn-0')).toHaveLength(4);
+  });
+
+  it('degrades the voice input button with a readable hint when speech recognition is missing', async () => {
+    // jsdom 不提供 SpeechRecognition / webkitSpeechRecognition：必须禁用并说明原因。
+    expect(
+      resolveSpeechRecognitionCtor(window as unknown as object),
+    ).toBeNull();
+    expect(
+      resolveSpeechRecognitionCtor({ SpeechRecognition: undefined }),
+    ).toBeNull();
+
+    const onTranscript = vi.fn();
+    const onNotice = vi.fn();
+    render(
+      React.createElement(ComposerVoiceButton, {
+        disabled: false,
+        onTranscript,
+        onNotice,
+      }),
+    );
+
+    const button = screen.getByRole('button', {
+      name: VOICE_INPUT_UNSUPPORTED_MESSAGE,
+    });
+    expect(button).toHaveProperty('disabled', true);
+    expect(button.getAttribute('title')).toBe(VOICE_INPUT_UNSUPPORTED_MESSAGE);
+    fireEvent.click(button);
+    expect(onTranscript).not.toHaveBeenCalled();
+  });
+
+  it('marks the recording state and only appends dictated text', async () => {
+    const fake = installFakeSpeechRecognition();
+    try {
+      const onTranscript = vi.fn();
+      const onNotice = vi.fn();
+      render(
+        React.createElement(ComposerVoiceButton, {
+          disabled: false,
+          onTranscript,
+          onNotice,
+        }),
+      );
+
+      const button = screen.getByRole('button', { name: '语音输入' });
+      expect(button).toHaveProperty('disabled', false);
+      fireEvent.click(button);
+
+      // 录音态有明确视觉/可访问性反馈。
+      const recording = screen.getByRole('button', { name: '停止语音输入' });
+      expect(recording.getAttribute('aria-pressed')).toBe('true');
+      expect(recording.className).toContain('is-recording');
+      expect(fake.instances).toHaveLength(1);
+
+      act(() => {
+        fake.instances[0]?.emitTranscript('帮我做一个跳跃动作');
+      });
+      expect(onTranscript).toHaveBeenCalledWith('帮我做一个跳跃动作');
+
+      fireEvent.click(recording);
+      expect(
+        screen
+          .getByRole('button', { name: '语音输入' })
+          .getAttribute('aria-pressed'),
+      ).toBe('false');
+    } finally {
+      fake.restore();
+    }
+  });
+
+  it('appends dictated text after the existing draft without overwriting it', () => {
+    expect(appendDictationText('', '帮我做一个跳跃动作')).toBe(
+      '帮我做一个跳跃动作',
+    );
+    // 中文直接拼接，用户已输入的内容原样保留在识别结果之前。
+    expect(appendDictationText('先做一个主菜单', '再补一个商店')).toBe(
+      '先做一个主菜单再补一个商店',
+    );
+    // 英文识别结果补一个空格，避免两个单词粘在一起。
+    expect(appendDictationText('add jump', 'dash')).toBe('add jump dash');
+    expect(appendDictationText('先做一个主菜单', '   ')).toBe('先做一个主菜单');
+    expect(speechRecognitionErrorMessage('not-allowed')).toContain(
+      '麦克风权限',
+    );
+    expect(speechRecognitionErrorMessage('network')).toContain('语音识别服务');
+    expect(speechRecognitionErrorMessage('no-speech')).toContain('重试');
+  });
+
+  it('uploads a picked file into the project and attaches it to the next direct Codex turn', async () => {
+    const uploads: Record<string, unknown>[] = [];
+    const { invoke, path, surface } = await openDirectCodexSurface({
+      upload_local_asset: (args) => {
+        uploads.push(args ?? {});
+        return {
+          id: 'asset-upload-1',
+          localPath: 'assets/uploads/role-reference.png',
+          absolutePath: `${path}/assets/uploads/role-reference.png`,
+          manifestPath: `${path}/.agent/manifest.json`,
+        };
+      },
+    });
+
+    // `+` 现在是"添加入口"：真正的上传路径与素材引用各占一条。
+    fireEvent.click(within(surface).getByRole('button', { name: '添加文件' }));
+    const menu = within(surface).getByRole('menu', { name: '添加文件' });
+    expect(
+      within(menu).getByRole('menuitem', { name: '上传本地文件' }),
+    ).not.toBeNull();
+    expect(
+      within(menu).getByRole('menuitem', { name: '引用项目素材' }),
+    ).not.toBeNull();
+
+    const uploadInput = surface.querySelector<HTMLInputElement>(
+      '[data-chat-composer-upload]',
+    );
+    expect(uploadInput).not.toBeNull();
+    const file = new File(['png'], '角色参考.png', {
+      type: 'image/png',
+      lastModified: 1,
+    });
+    Object.defineProperty(file, 'arrayBuffer', {
+      value: async () => new Uint8Array([1, 2, 3]).buffer,
+    });
+    fireEvent.change(uploadInput as HTMLInputElement, {
+      target: { files: [file] },
+    });
+
+    expect(await within(surface).findByLabelText('待发送附件')).not.toBeNull();
+    expect(uploads[0]?.fileName).toBe('角色参考.png');
+
+    const composer = within(surface).getByLabelText('陶泥儿对话内容');
+    await submitDirectTurn(surface, composer, '按这个角色做游戏');
+
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        {
+          projectPath: path,
+          prompt: '按这个角色做游戏',
+          clientTurnId: expect.any(String),
+          attachments: [
+            {
+              name: '角色参考.png',
+              mediaType: 'image/png',
+              size: file.size,
+              // 附件必须是项目相对路径：绝对路径会被 Rust 侧附件规则判为失败。
+              localPath: 'assets/uploads/role-reference.png',
+              status: 'imported',
+            },
+          ],
+        },
+      );
+    });
+    // 提交后 chip 清空，同一批附件不会重复挂到下一轮。
+    await waitFor(() => {
+      expect(within(surface).queryByLabelText('待发送附件')).toBeNull();
+    });
+  });
+
+  it('queues messages sent while a turn runs, cancels one chip, and sends the rest in order', async () => {
+    const pending: Array<{
+      resolve: (value: string) => void;
+      reject: (error: Error) => void;
+    }> = [];
+    const { invoke, surface } = await openDirectCodexSurface({
+      chat_with_game_creator_direct_codex: () =>
+        new Promise<string>((resolve, reject) => {
+          pending.push({ resolve, reject });
+        }),
+    });
+    const composer = within(surface).getByLabelText('陶泥儿对话内容');
+    await submitDirectTurn(surface, composer, '第一条消息');
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        expect.objectContaining({ prompt: '第一条消息' }),
+      );
+    });
+    // 回合运行中：发送钮位置变成终止钮。
+    expect(
+      await within(surface).findByRole('button', { name: '终止' }),
+    ).not.toBeNull();
+    expect(within(surface).queryByRole('button', { name: '发送' })).toBeNull();
+
+    await setComposerText(composer, '第二条消息');
+    submitComposerForm(composer);
+    await waitFor(() => {
+      expect(within(surface).getByText('第二条消息')).not.toBeNull();
+    });
+    await setComposerText(composer, '第三条消息');
+    submitComposerForm(composer);
+
+    const queue = await within(surface).findByLabelText('待发送消息队列');
+    await waitFor(() => {
+      expect(within(queue).getAllByRole('listitem')).toHaveLength(2);
+    });
+    expect(
+      within(queue)
+        .getAllByRole('listitem')
+        .map((item) => item.textContent),
+    ).toEqual([
+      expect.stringContaining('第二条消息'),
+      expect.stringContaining('第三条消息'),
+    ]);
+
+    // 单条取消：只移除第二条，第三条保留。
+    fireEvent.click(
+      within(queue).getByRole('button', { name: '取消排队消息 第二条消息' }),
+    );
+    await waitFor(() => {
+      expect(within(queue).getAllByRole('listitem')).toHaveLength(1);
+    });
+
+    act(() => {
+      pending[0]?.resolve('第一条回复');
+    });
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        expect.objectContaining({ prompt: '第三条消息' }),
+      );
+    });
+    // 被取消的那条不会再发出去，队列顺序也不乱。
+    expect(
+      invoke.mock.calls.filter(
+        ([, args]) =>
+          (args as { prompt?: string } | undefined)?.prompt === '第二条消息',
+      ),
+    ).toHaveLength(0);
+    const prompts = invoke.mock.calls
+      .filter(([command]) => command === 'chat_with_game_creator_direct_codex')
+      .map(([, args]) => (args as { prompt?: string }).prompt);
+    expect(prompts).toEqual(['第一条消息', '第三条消息']);
+
+    act(() => {
+      pending[1]?.resolve('第三条回复');
+    });
+    await waitFor(() => {
+      expect(within(surface).queryByLabelText('待发送消息队列')).toBeNull();
+    });
+  });
+
+  it('terminates the running turn and returns the composer to the idle state', async () => {
+    const pending: Array<{
+      resolve: (value: string) => void;
+      reject: (error: Error) => void;
+    }> = [];
+    const { invoke, path, surface } = await openDirectCodexSurface({
+      chat_with_game_creator_direct_codex: () =>
+        new Promise<string>((resolve, reject) => {
+          pending.push({ resolve, reject });
+        }),
+      cancel_direct_codex_turn: async () => undefined,
+    });
+    const composer = within(surface).getByLabelText('陶泥儿对话内容');
+    await submitDirectTurn(surface, composer, '做一个小游戏');
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'chat_with_game_creator_direct_codex',
+        expect.objectContaining({ prompt: '做一个小游戏' }),
+      );
+    });
+
+    const stopButton = await within(surface).findByRole('button', {
+      name: '终止',
+    });
+    fireEvent.click(stopButton);
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith('cancel_direct_codex_turn', {
+        projectPath: path,
+        clientTurnId: expect.any(String),
+      });
+    });
+
+    // app-server 的中断原因回到前端：不是失败，UI 必须回到可用态。
+    act(() => {
+      pending[0]?.reject(new Error('Codex app-server turn 已中断'));
+    });
+    await waitFor(() => {
+      const send = within(surface).getByRole('button', { name: '发送' });
+      expect(send).toHaveProperty('disabled', false);
+    });
+    expect(within(surface).queryByRole('button', { name: '终止' })).toBeNull();
+    expect(within(surface).getByText('已终止本次回合。')).not.toBeNull();
+  });
+
+  it('moves the reasoning effort control next to the model selector and persists only for later turns', async () => {
+    let stored = 'high';
+    const { invoke, surface } = await openDirectCodexSurface({
+      select_game_creator_reasoning_effort: (args) => {
+        stored = String(args?.effort ?? '');
+        return gameCreatorConfigView(stored);
+      },
+    });
+
+    const select = (await within(surface).findByLabelText(
+      '推理档',
+    )) as HTMLSelectElement;
+    await waitFor(() => {
+      expect(select.value).toBe('high');
+    });
+    // 档位就在模型选择器这一排（同一控制排容器里）。
+    expect(
+      within(surface).getByRole('button', { name: '对话模型' }),
+    ).not.toBeNull();
+    expect(
+      select.closest('.project-supervisor-composer-controls'),
+    ).not.toBeNull();
+
+    fireEvent.change(select, { target: { value: 'low' } });
+    await waitFor(() => {
+      expect(invoke).toHaveBeenCalledWith(
+        'select_game_creator_reasoning_effort',
+        { effort: 'low' },
+      );
+    });
+    // 以落盘后的回读值为准。
+    await waitFor(() => {
+      expect(
+        (within(surface).getByLabelText('推理档') as HTMLSelectElement).value,
+      ).toBe('low');
+    });
+    expect(stored).toBe('low');
+    // 只影响后续回合：当前没有发出任何新一轮直接对话。
+    expect(
+      invoke.mock.calls.some(
+        ([command]) => command === 'chat_with_game_creator_direct_codex',
+      ),
+    ).toBe(false);
+  });
+
+  it('appends the dictated transcript after the draft typed into the composer', async () => {
+    const fake = installFakeSpeechRecognition();
+    try {
+      const { surface } = await openDirectCodexSurface();
+      const composer = within(surface).getByLabelText('陶泥儿对话内容');
+      await setComposerText(composer, '已经写好的需求');
+
+      fireEvent.click(
+        within(surface).getByRole('button', { name: '语音输入' }),
+      );
+      await waitFor(() => {
+        expect(fake.instances).toHaveLength(1);
+      });
+      act(() => {
+        fake.instances[0]?.emitTranscript('再补一个跳跃动作');
+      });
+
+      await waitFor(() => {
+        expect(composer.textContent).toContain('已经写好的需求');
+        expect(composer.textContent).toContain('再补一个跳跃动作');
+      });
+    } finally {
+      fake.restore();
+    }
+  });
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 5f9601540..081c915e8 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -8495,11 +8495,25 @@ export function registerProjectSupervisorSurfaceTests() {
     expect(
       within(composer as HTMLElement).queryByText('launcher-codex-panel-game'),
     ).toBeNull();
-    expect(
+    // `+` 现在是"添加入口"（上传本地文件 / 引用项目素材），`@` 仍直接打开素材引用选择器。
+    fireEvent.click(
       within(composer as HTMLElement).getByRole('button', {
-        name: '添加素材引用',
+        name: '添加文件',
       }),
+    );
+    const attachmentMenu = within(composer as HTMLElement).getByRole('menu', {
+      name: '添加文件',
+    });
+    expect(
+      within(attachmentMenu).getByRole('menuitem', { name: '上传本地文件' }),
     ).not.toBeNull();
+    expect(
+      within(attachmentMenu).getByRole('menuitem', { name: '引用项目素材' }),
+    ).not.toBeNull();
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(
+      within(composer as HTMLElement).queryByRole('menu', { name: '添加文件' }),
+    ).toBeNull();
     expect(
       within(composer as HTMLElement).getByRole('button', {
         name: '插入素材引用',

From abaae50c43d7f25ead319aa416474fc94e9210c7 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:18:43 +0800
Subject: [PATCH 19/67] =?UTF-8?q?=E6=8E=A8=E7=90=86=E6=A1=A3=E4=BB=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E7=A7=BB=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E7=94=B1=E8=BE=93=E5=85=A5=E7=9B=92=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RuntimeConfigDialog 删掉「推理档」下拉：该档位已下移到对话输入盒的模型选择器旁；其余设置字段不变。

runtime-settings.suite 同步调整三处断言：设置面板不再有推理档，Escape 用例改用联网检索控件，恢复默认用例改为断言设置里查不到推理档。
---
 .../runtime-config/RuntimeConfigDialog.tsx    | 22 ++-----------------
 .../appSurface/runtime-settings.suite.ts      | 12 ++++------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx b/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
index da0075a02..289a0cfbb 100644
--- a/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
+++ b/apps/ai-game-creator-shell/src/features/runtime-config/RuntimeConfigDialog.tsx
@@ -794,26 +794,8 @@ export function RuntimeConfigDialog({
                   </div>
                   {runtimeConfigDraft.agentMode !== 'codex_cli' ? (
                     <>
-                      <label>
-                        推理档
-                        <select
-                          aria-label="推理档"
-                          value={runtimeConfigDraft.llm.reasoningEffort}
-                          onChange={(event) =>
-                            updateRuntimeLlmConfig(
-                              'reasoningEffort',
-                              event.currentTarget
-                                .value as GameCreatorLlmReasoningEffort,
-                            )
-                          }
-                        >
-                          {gameCreatorLlmReasoningEfforts.map((effort) => (
-                            <option key={effort} value={effort}>
-                              {effort}
-                            </option>
-                          ))}
-                        </select>
-                      </label>
+                      {/* 推理档已下移到对话输入盒的模型选择器旁（按回合生效），
+                          设置里不再重复一份。 */}
                       <label className="settings-checkbox">
                         <input
                           aria-label="流式输出"
diff --git a/apps/ai-game-creator-shell/tests/appSurface/runtime-settings.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/runtime-settings.suite.ts
index 0811cd81b..d78f10a0d 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/runtime-settings.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/runtime-settings.suite.ts
@@ -660,7 +660,7 @@ export function registerRuntimeSettingsTests() {
     expect(
       await screen.findByRole('dialog', { name: '运行时配置' }),
     ).not.toBeNull();
-    fireEvent.keyDown(screen.getByLabelText('推理档'), {
+    fireEvent.keyDown(screen.getByLabelText('联网检索'), {
       key: 'Escape',
     });
     expect(screen.getByRole('dialog', { name: '运行时配置' })).not.toBeNull();
@@ -877,12 +877,8 @@ export function registerPublishedRuntimeSettingsTests() {
     expect(screen.getByText('所有角色使用统一账号服务')).not.toBeNull();
 
     fireEvent.click(screen.getByRole('button', { name: /常用设置/ }));
-    expect(screen.getByLabelText('推理档')).toHaveProperty('value', 'medium');
-    expect(
-      within(screen.getByLabelText('推理档')).getByRole('option', {
-        name: 'max',
-      }),
-    ).not.toBeNull();
+    // 推理档已下移到对话输入盒（模型选择器旁），设置面板里不再有第二个入口。
+    expect(screen.queryByLabelText('推理档')).toBeNull();
     fireEvent.click(screen.getByLabelText('流式输出'));
     fireEvent.click(screen.getByLabelText('联网检索'));
     fireEvent.click(screen.getByRole('button', { name: /高级参数/ }));
@@ -1000,7 +996,7 @@ export function registerPublishedRuntimeSettingsTests() {
     expect(screen.queryByLabelText('LLM API Key')).toBeNull();
     expect(screen.queryByLabelText('LLM Base URL')).toBeNull();
     expect(screen.queryByLabelText('LLM 模型')).toBeNull();
-    expect(screen.getByLabelText('推理档')).toHaveProperty('value', 'high');
+    expect(screen.queryByLabelText('推理档')).toBeNull();
     expect(screen.getByLabelText('联网检索')).toHaveProperty('checked', true);
     fireEvent.click(screen.getByRole('button', { name: /Agent 分工/ }));
     expect(screen.getByText('所有角色使用统一账号服务')).not.toBeNull();

From bc89bf45c37a3a69fcdf4fe4bd3d6def489f803a Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:19:33 +0800
Subject: [PATCH 20/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=A1=B9=E7=9B=AE=E5=86=85=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E4=B8=8E=E6=AD=BB=E4=BB=A3=E7=A0=81=EF=BC=88?=
 =?UTF-8?q?P2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- direct_tool_calls.rs：新增 project_relative_path_segment 与 relativize_project_root_paths，
  在 redact_absolute_path_tokens 之前把项目根目录前缀换成项目相对路径（game/src/x.ts），
  Windows 的 \ 与 / 两种写法都匹配、大小写不敏感、分隔符统一成 /
- 项目外绝对路径继续落成 <absolute-path> 占位；只写了项目根目录本身时也按占位处理
- 删掉永远匹配不到的死代码 without_secret.replace(root, "<project-root>")
  （redact_absolute_path_tokens 已经把项目根目录换成 <absolute-path>，契约里的"项目相对路径"在绝对路径场景不成立）
- 新增单测：tool_call_paths_become_project_relative（项目内相对路径 + 项目外占位 + 落盘不残留项目根目录）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 170 +++++++++++++++++-
 1 file changed, 166 insertions(+), 4 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index 7be534b10..5f3cc5dee 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -86,10 +86,118 @@ fn tool_calls_path(root: &Path) -> PathBuf {
     root.join(".agent/conversations/tool-calls.jsonl")
 }
 
-/// 脱敏：先抹绝对路径、再抹密钥前缀，最后走既有的错误上下文脱敏组合。
+/// 项目根目录之后的路径 token：分隔符统一成 `/`，返回 `(消费到的下标, 项目相对路径)`。
+fn project_relative_path_segment(value: &str, start: usize) -> (usize, String) {
+    let mut index = start;
+    let mut relative = String::new();
+    while index < value.len() {
+        let character = value[index..].chars().next().unwrap_or_default();
+        if matches!(character, '/' | '\\') {
+            if !relative.is_empty() {
+                relative.push('/');
+            }
+            index += character.len_utf8();
+            continue;
+        }
+        if character.is_whitespace()
+            || matches!(
+                character,
+                '\'' | '"'
+                    | '`'
+                    | ','
+                    | ';'
+                    | '|'
+                    | '&'
+                    | '('
+                    | ')'
+                    | '['
+                    | ']'
+                    | '{'
+                    | '}'
+                    | '<'
+                    | '>'
+                    | ':'
+            )
+        {
+            break;
+        }
+        relative.push(character);
+        index += character.len_utf8();
+    }
+    while relative.ends_with('/') {
+        relative.pop();
+    }
+    (index, relative)
+}
+
+/// 把项目根目录前缀换成**项目相对路径**（`<root>/game/src/x.ts` → `game/src/x.ts`）。
+///
+/// 必须排在 `redact_absolute_path_tokens` 之前：后者会把整个绝对路径抹成
+/// `<absolute-path>`，之后就再也认不出哪些路径在项目内了。
+/// Windows 上同时匹配 `\` 与 `/` 两种分隔符写法，并按大小写不敏感比较（盘符大小写会变）。
+fn relativize_project_root_paths(root: &Path, value: &str) -> String {
+    let root_text = root.to_string_lossy();
+    let root_text = root_text.trim_end_matches(['/', '\\']);
+    if root_text.is_empty() {
+        return value.to_string();
+    }
+    let mut needles = [
+        root_text.to_string(),
+        root_text.replace('\\', "/"),
+        root_text.replace('/', "\\"),
+    ]
+    .into_iter()
+    .map(|needle| needle.to_ascii_lowercase())
+    .filter(|needle| !needle.is_empty())
+    .collect::<Vec<_>>();
+    needles.sort();
+    needles.dedup();
+    let lower = value.to_ascii_lowercase();
+
+    let mut output = String::with_capacity(value.len());
+    let mut cursor = 0usize;
+    while cursor < value.len() {
+        let mut hit: Option<(usize, usize)> = None;
+        for needle in &needles {
+            let mut search = cursor;
+            while let Some(relative) = lower[search..].find(needle.as_str()) {
+                let start = search + relative;
+                let end = start + needle.len();
+                let left_is_boundary = start == 0
+                    || lower[..start].chars().next_back().is_some_and(|character| {
+                        !character.is_alphanumeric() && character != '_' && character != '-'
+                    });
+                if left_is_boundary && value[end..].starts_with(['/', '\\']) {
+                    if hit.is_none_or(|(best_start, _)| start < best_start) {
+                        hit = Some((start, end));
+                    }
+                    break;
+                }
+                search = end;
+            }
+        }
+        let Some((start, end)) = hit else {
+            break;
+        };
+        output.push_str(&value[cursor..start]);
+        let (consumed, relative) = project_relative_path_segment(value, end);
+        if relative.is_empty() {
+            // 只写了项目根目录本身（没有后续路径段）：按占位形状处理。
+            output.push_str("<absolute-path>");
+        } else {
+            output.push_str(&relative);
+        }
+        cursor = consumed;
+    }
+    output.push_str(&value[cursor..]);
+    output
+}
+
+/// 脱敏：项目内绝对路径先归一化成项目相对路径，再依次做绝对路径、密钥前缀与
+/// 错误上下文脱敏。
 ///
 /// 顺序不能反：先抹密钥会把 `sk-…` 之类的 token 换成占位符，但绝对路径里的用户名目录
-/// 仍然会留下；这里先处理绝对路径，再处理密钥。
+/// 仍然会留下；这里先归一化路径 token，再处理密钥。
 ///
 /// 复用既有 `agent/generation/prompt_context.rs` 的脱敏组合：`sanitize_error_context`
 /// 就是 `redact_secret_tokens` + `redact_error_sensitive_assignments` +
@@ -97,11 +205,13 @@ fn tool_calls_path(root: &Path) -> PathBuf {
 /// `Authorization: Bearer …`、`Cookie: …`、`api_key=…`、`client_secret=…` 这类键值凭据；
 /// 含 `--password` / `--token` / `--secret` 这类敏感 CLI 标志的行按既有 fail-closed
 /// 约定整行替换成 `[redacted sensitive context]`（与 `sanitize_agent_runtime_text` 一致）。
-fn sanitize_detail_text(_root: &Path, value: &str) -> String {
-    let without_absolute = redact_absolute_path_tokens(value);
+fn sanitize_detail_text(root: &Path, value: &str) -> String {
+    let without_project_root = relativize_project_root_paths(root, value);
+    let without_absolute = redact_absolute_path_tokens(&without_project_root);
     let without_secret = redact_secret_tokens(&without_absolute);
     sanitize_error_context(&without_secret)
 }
+
 /// 按字符数截断（不切坏 UTF-8），并在真正截断时补省略号。
 fn bounded_chars(value: &str, max_chars: usize) -> String {
     if value.chars().count() <= max_chars {
@@ -1002,4 +1112,56 @@ mod tests {
         assert_eq!(calls[0].started_at, 1000);
     }
 
+    /// 判据：项目内绝对路径落成项目相对路径，项目外绝对路径保持既有占位形状。
+    #[test]
+    fn tool_call_paths_become_project_relative() {
+        let root = init_tool_call_project("tool-call-path-shape");
+        let root_display = root.path().to_string_lossy().to_string();
+        let inside = root
+            .path()
+            .join("game/src/x.ts")
+            .to_string_lossy()
+            .to_string();
+        let outside = if cfg!(windows) {
+            r"C:\Windows\Temp\canary-outside.ts".to_string()
+        } else {
+            "/opt/canary/outside.ts".to_string()
+        };
+        let call = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-paths",
+                "type": "fileChange",
+                "changes": [
+                    {"path": inside, "kind": "update"},
+                    {"path": outside, "kind": "add"},
+                ],
+                "startedAtMs": 1000,
+            }),
+            "turn-1",
+            false,
+            1000,
+        )
+        .expect("path tool call");
+        let paths = call
+            .detail
+            .changes
+            .iter()
+            .map(|change| change.path.as_str())
+            .collect::<Vec<_>>();
+        assert_eq!(
+            paths[0], "game/src/x.ts",
+            "项目内绝对路径必须落成项目相对路径（不能是占位符）"
+        );
+        assert_eq!(paths[1], "<absolute-path>", "项目外绝对路径保持占位形状");
+        assert_eq!(call.summary, "game/src/x.ts", "摘要取首个变更路径");
+
+        persist_direct_tool_call_at(root.path(), &call).expect("persist path call");
+        let raw = std::fs::read_to_string(tool_calls_path(root.path())).expect("read raw file");
+        assert!(
+            !raw.contains(&root_display),
+            "落盘不得残留项目根目录：{raw}"
+        );
+    }
+
 }

From 1f13412dde71c100bb9a8930c0ed89f19206b2d5 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:21:01 +0800
Subject: [PATCH 21/67] =?UTF-8?q?=E5=88=87=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=BE=93=E5=85=A5=E7=9B=92=E5=BE=85=E5=8F=91?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8E=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

待发附件的 localPath 是项目相对路径、队列也属于刚结束的那条对话；切项目后不清空会把上一个项目的附件路径带进下一个回合。

只新增一个跟随 localProject.projectPath 的 effect，其余输入盒状态与后端协议不变。
---
 apps/ai-game-creator-shell/src/App.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index b1e65d5fc..703ebcaf7 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -787,6 +787,17 @@ export function App({
     useState(false);
   const queuedChatTurnSequenceRef = useRef(0);
   const chatComposerRef = useRef<ResourceReferenceInputHandle | null>(null);
+  /**
+   * 切项目即清空只属于上一个项目的输入盒状态：待发附件的 `localPath` 是**项目相对**的，
+   * 队列也属于刚结束的那条对话；留着会把 A 项目的附件路径带进 B 项目的下一个回合。
+   */
+  useEffect(() => {
+    setChatAttachments([]);
+    setChatAttachmentNotice('');
+    setChatComposerNotice('');
+    setChatTurnQueue([]);
+    chatTurnQueueRef.current = [];
+  }, [localProject?.projectPath]);
   const [chatAgentBusy, setChatAgentBusy] = useState(false);
   const [directCodexProgress, setDirectCodexProgress] = useState('');
   const [directCodexStatus, setDirectCodexStatus] = useState<

From 885f2f10f3407d38bfbcd8a56100eb1761d6fa7f Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:21:12 +0800
Subject: [PATCH 22/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=9D=8F=E8=A1=8C=E8=AF=BB=E5=8F=96=E6=88=AA?=
 =?UTF-8?q?=E6=96=AD=E5=90=8E=E7=BB=AD=E8=AE=B0=E5=BD=95=EF=BC=88P2?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- direct_tool_calls.rs：read_tool_call_lines 由 BufReader::lines() + let Ok(line) = line else { break }
  改成按行读字节（read_until）+ 逐行 from_utf8 解码：非法 UTF-8 行只跳过该行并继续读后续行，
  不再把这一行之后的所有记录一起丢掉；只有读 I/O 错误才停止读取
- 契约「单行损坏跳过该行继续」在"损坏行缺换行、与下一行黏成一行"时也成立：丢掉的只是黏连的那一行
- 新增单测：tool_call_read_skips_invalid_utf8_line（合法行 + 非法字节行 + 合法行 → 读回 2 条；
  以及损坏行缺换行的黏连形态）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 69 +++++++++++++++++--
 1 file changed, 63 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index 5f3cc5dee..fedf2cc12 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -444,13 +444,25 @@ fn read_tool_call_lines(path: &Path) -> Vec<DirectToolCall> {
     let Ok(file) = File::open(path) else {
         return Vec::new();
     };
+    let mut reader = BufReader::new(file);
+    let mut buffer = Vec::new();
     let mut calls = Vec::new();
-    for line in BufReader::new(file).lines() {
-        let Ok(line) = line else {
-            break;
-        };
-        if let Some(call) = tool_call_from_line(&line) {
-            calls.push(call);
+    loop {
+        buffer.clear();
+        match reader.read_until(b'\n', &mut buffer) {
+            Ok(0) => break,
+            // 单行解码失败（非法 UTF-8）只跳过这一行，继续读后面的行；
+            // 契约要求「单行损坏跳过该行继续」，不能把后续记录一起丢掉。
+            Ok(_) => match std::str::from_utf8(&buffer) {
+                Ok(line) => {
+                    if let Some(call) = tool_call_from_line(line) {
+                        calls.push(call);
+                    }
+                }
+                Err(_) => continue,
+            },
+            // 读 I/O 错误：无法再定位下一行边界，停止读取（已读到的照常返回）。
+            Err(_) => break,
         }
     }
     calls
@@ -1164,4 +1176,49 @@ mod tests {
         );
     }
 
+    /// 判据：单行损坏（含非法 UTF-8 字节）只跳过损坏行，后续合法记录必须继续读回。
+    #[test]
+    fn tool_call_read_skips_invalid_utf8_line() {
+        let root = init_tool_call_project("tool-call-invalid-utf8");
+        let path = tool_calls_path(root.path());
+        std::fs::create_dir_all(path.parent().expect("parent")).expect("create dir");
+
+        // 形态一（契约原文）：合法行 + 非法字节行 + 合法行 → 读回 2 条。
+        let mut bytes = Vec::new();
+        bytes.extend_from_slice(tool_call_row("item-a", 1000, 1000).as_bytes());
+        bytes.push(b'\n');
+        bytes.extend_from_slice(&[0xff, 0xfe, b'\n']);
+        bytes.extend_from_slice(tool_call_row("item-b", 2000, 2000).as_bytes());
+        bytes.push(b'\n');
+        std::fs::write(&path, &bytes).expect("write invalid utf8 fixture");
+        let calls = read_direct_tool_calls_at(root.path()).expect("read with invalid utf8");
+        assert_eq!(
+            calls.len(),
+            2,
+            "非法 UTF-8 行只跳过该行，后面的合法记录必须读回"
+        );
+        assert_eq!(calls[0].id, "item-a");
+        assert_eq!(calls[1].id, "item-b");
+
+        // 形态二：损坏行缺换行（写入被截断），与紧随其后的记录黏成一行。
+        // 此时被丢掉的只有黏连的那一行，其后的合法记录必须继续读回。
+        let mut bytes = Vec::new();
+        bytes.extend_from_slice(tool_call_row("item-a", 1000, 1000).as_bytes());
+        bytes.push(b'\n');
+        bytes.push(0xff);
+        bytes.extend_from_slice(tool_call_row("item-b", 2000, 2000).as_bytes());
+        bytes.push(b'\n');
+        bytes.extend_from_slice(tool_call_row("item-c", 3000, 3000).as_bytes());
+        bytes.push(b'\n');
+        std::fs::write(&path, &bytes).expect("write truncated utf8 fixture");
+        let calls = read_direct_tool_calls_at(root.path()).expect("read with truncated line");
+        assert_eq!(
+            calls.len(),
+            2,
+            "损坏行缺换行时只丢黏连的那一行，其后的合法记录必须继续读回"
+        );
+        assert_eq!(calls[0].id, "item-a");
+        assert_eq!(calls[1].id, "item-c");
+    }
+
 }

From b395185580e3d8e97111ea093972fb4d2e6af70a Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:22:53 +0800
Subject: [PATCH 23/67] =?UTF-8?q?=E8=A1=A5=E8=AE=B0=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=8D=A1=E7=89=87=E5=A5=91=E7=BA=A6=EF=BC=88?=
 =?UTF-8?q?=E8=84=B1=E6=95=8F=E8=8C=83=E5=9B=B4=E3=80=81=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E3=80=81=E7=8A=B6=E6=80=81=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E3=80=81200=20=E6=9D=A1=E4=B8=8A=E9=99=90=E8=AF=AD=E4=B9=89?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md：
  写明同一 id 的快照按 updatedAt 单调合并（旧快照不得把 completed / failed 打回 running，
  并发来源是逐条快照落盘与回合末整批落盘两条路径）
- 写明 detail.changes[].path 用项目相对路径（分隔符统一成 /）、项目外绝对路径用 <absolute-path> 占位
- 写明必须脱敏的具体函数链路（sanitize_detail_text：路径归一化 → redact_absolute_path_tokens →
  redact_secret_tokens → sanitize_error_context），含敏感 CLI 标志的行整行 fail-closed
  （--password 后面即使只是 $VAR 占位符也整行替换），且脱敏必须幂等
- 写明 200 条上限语义是"按时间保留最新 200 条"，超出时更早回合的卡片会被静默丢弃（老回合卡片会消失），
  不做分页与历史回填（行为不变，只补文档）
- 写明单行损坏（含非法 UTF-8）逐行读取跳过继续，黏连形态只丢那一行
- 新增单测：tool_call_cap_drops_oldest_turn_cards（超出后保留最新 N 条 + 按时间正序）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 56 +++++++++++++++++++
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md | 19 +++++--
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index fedf2cc12..72bd90dfb 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -1221,4 +1221,60 @@ mod tests {
         assert_eq!(calls[1].id, "item-c");
     }
 
+    /// 判据：200 条上限是「按时间保留最新 200 条」，超出时更早回合的卡片会被静默丢弃
+    /// （契约内行为，不是缺陷）。本用例只钉住现状与时间正序。
+    #[test]
+    fn tool_call_cap_drops_oldest_turn_cards() {
+        let root = init_tool_call_project("tool-call-cap-oldest");
+        let old_turn = (0..DIRECT_TOOL_CALL_LIMIT)
+            .map(|index| {
+                direct_tool_call_from_item(
+                    root.path(),
+                    &json!({
+                        "id": format!("item-{index:04}"),
+                        "type": "commandExecution",
+                        "command": format!("run {index}"),
+                        "startedAtMs": 1000 + index as u64,
+                    }),
+                    "turn-old",
+                    false,
+                    1000 + index as u64,
+                )
+                .expect("old turn tool call")
+            })
+            .collect::<Vec<_>>();
+        persist_direct_tool_calls_at(root.path(), &old_turn).expect("persist old turn");
+        let newest = direct_tool_call_from_item(
+            root.path(),
+            &json!({
+                "id": "item-newest",
+                "type": "commandExecution",
+                "command": "run newest",
+                "startedAtMs": 90_000,
+            }),
+            "turn-new",
+            false,
+            90_000,
+        )
+        .expect("newest tool call");
+        persist_direct_tool_call_at(root.path(), &newest).expect("persist newest");
+
+        let read = read_direct_tool_calls_at(root.path()).expect("read capped");
+        assert_eq!(read.len(), DIRECT_TOOL_CALL_LIMIT, "上限仍是 200 条");
+        assert_eq!(
+            read.last().expect("last").id,
+            "item-newest",
+            "最新回合的卡片必须在"
+        );
+        assert_eq!(
+            read.first().expect("first").id,
+            "item-0001",
+            "最旧回合的卡片被静默丢弃（老回合卡片会消失）"
+        );
+        assert!(
+            read.windows(2)
+                .all(|pair| pair[0].timestamp() <= pair[1].timestamp()),
+            "回读必须按时间正序"
+        );
+    }
 }
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 7cf7c832e..d330a3948 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -24,10 +24,16 @@
 ```
 
 - `id`：Codex item 的 id；同一 item 的 `started` 与 `completed` 必须落成**同一条**（按 id 幂等 upsert，不允许写两行）。
+- **状态单调**：同一 `id` 的每条快照按 `updatedAt` 合并落盘——`updatedAt` 更旧的快照不得覆盖更新的 `status` 与 `updatedAt`。逐条快照落盘与回合末整批落盘两条路径会并发竞争，后到的旧快照不能把已经 `completed` / `failed` 的卡片打回 `running`；`updatedAt` 相同时终态优先；`startedAt` 取最早的非零值（`item/completed` 不一定带 `startedAtMs`）。
 - `title` 是折叠态的一行标题，按 kind 固定：`command` → `执行命令`、`file_change` → `编辑 N 个文件`（N = changes 去重后数量）、其余见 kind 枚举。
-- `summary` 是折叠态标题后面的短摘要：命令取命令首行（截断 120 字符），`file_change` 取首个变更路径。
-- `detail.command` / `detail.output` 各截断到 4000 字符；`detail.changes[].path` 用项目相对路径。
-- **必须脱敏**：沿用既有 `codex_app_server.rs` 里对 command/tool 参数的安全处理，不得把 API Key、Token、Cookie、绝对用户目录写进 `detail`。
+- `summary` 是折叠态标题后面的短摘要：命令取命令首行（截断 120 字符），`file_change` 取首个变更路径。`summary` 的每个来源（命令、变更路径、`tool`）都必须先脱敏再落盘。
+- `detail.command` / `detail.output` 各截断到 4000 字符。
+- **路径形状**：`detail.changes[].path` 用**项目相对路径**（如 `game/src/x.ts`，分隔符统一成 `/`）；项目外的绝对路径落成 `<absolute-path>` 占位。任何情况下都不得写出项目根目录本身、用户家目录或绝对路径的原始值。
+- **必须脱敏**（落盘前统一走 `agent/direct_tool_calls.rs` 的 `sanitize_detail_text`，顺序：项目路径归一化 → `redact_absolute_path_tokens` → `redact_secret_tokens` → `sanitize_error_context`）：
+  - 前缀型密钥沿用 `redact_secret_tokens`（`sk-…`、`tnr_sk_…`、`ghp_…`、`AKIA…`、`eyJ…` 等）；
+  - 键值型凭据沿用 `sanitize_error_context`（= `redact_secret_tokens` + `redact_error_sensitive_assignments` + `redact_error_bearer_values` + `redact_error_config_names` 的既有组合），覆盖 `Authorization: Bearer …`、`Cookie: session=…`、`api_key=…`、`client_secret=…`、`token=…` 等形状；
+  - 含 `--password` / `--token` / `--secret` / `--api-key` 这类敏感 CLI 标志的行按既有 fail-closed 约定**整行**替换成 `[redacted sensitive context]`（与 `sanitize_agent_runtime_text` 一致；即使标志后面只是 `$VAR` 占位符也整行替换，占位符本身不会保留）；
+  - 脱敏必须幂等（同一段文本连跑两次结果一致），且不得把未脱敏文本写进 `detail` / `summary`。
 
 ### 2. 实时事件（新增字段，不改既有字段语义）
 
@@ -43,10 +49,11 @@ toolCalls?: DirectTurnToolCall[] | null;
 
 ### 3. 回读命令
 
-新增 Tauri 命令 `read_direct_tool_calls(projectPath)`，返回按时间正序的 `DirectTurnToolCall[]`，最多最近 200 条（超出截断，保留最新）。
+新增 Tauri 命令 `read_direct_tool_calls(projectPath)`，返回按时间正序的 `DirectTurnToolCall[]`。
 
+- **上限语义**：200 条是「按时间保留最新 200 条」。超出时更早回合的卡片会被**静默丢弃**（老回合卡片会消失），不做分页、不做历史回填；同一 `id` 的多条记录先按 `updatedAt` 合并，再按时间正序裁剪。
 - 历史文件缺失 → 返回空数组，不报错。
-- 单行损坏 → 跳过该行继续，不整体失败（与 Codex item 流一样是"尽力而为"的展示数据，不是业务真相）。
+- 单行损坏 → 逐行读字节并逐行解码，跳过该行继续，不整体失败；只有损坏字节与下一行黏成一行（例如写入被截断、缺失换行）时，被丢掉的也只是那**一行**，其后的合法记录必须继续读回（与 Codex item 流一样是"尽力而为"的展示数据，不是业务真相）。
 
 ### 4. 前端合并与渲染
 
@@ -97,7 +104,7 @@ toolCalls?: DirectTurnToolCall[] | null;
 
 - Rust（`apps/ai-game-creator-shell/src-tauri/src/`）：`agent/codex_app_server.rs`（item → 结构化采集）、`agent/direct_runtime.rs`（随事件下发 + 回合结束持久化）、`agent/direct_project_history.rs` 或新增 `agent/direct_tool_calls.rs`（upsert 与回读）、`commands.rs`（新增命令注册）。
 - 前端（`apps/ai-game-creator-shell/src/`）：`app/types.ts`（新增字段与类型）、`App.tsx`（订阅、累加、加载时合并）、`features/agent-runtime/` 或新增 `features/project-workspace/ToolCallCard.tsx`（卡片组件）、`styles.css`（卡片样式，新样式集中在文件末尾中文注释区块）。
-- 测试：Rust 侧单元测试（upsert 幂等、截断、脱敏、损坏行跳过）、前端 `tests/`（卡片渲染、折叠交互、重开项目后合并、老事件兼容）。
+- 测试：Rust 侧单元测试（upsert 幂等、状态按 `updatedAt` 单调合并、截断、脱敏覆盖与幂等性、项目相对路径形状、非法 UTF-8 损坏行跳过、200 条上限保留最新）、前端 `tests/`（卡片渲染、折叠交互、重开项目后合并、老事件兼容）。
 
 ## 实施顺序（每步都要能独立验证）
 

From 3169baa2eb0ad4be75bf4053ff8e954a1b68da58 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:36:18 +0800
Subject: [PATCH 24/67] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=86=85=E8=B7=AF=E5=BE=84=E5=BD=A2=E7=8A=B6=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=EF=BC=88/=20=E5=86=99=E6=B3=95=E4=B8=8E=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E5=8F=98=E4=BD=93=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- direct_tool_calls.rs：新增单测 tool_call_paths_normalize_separators_and_case，
  覆盖 relativize_project_root_paths 的 `/` 分隔符分支与大小写不敏感分支
  （Codex 上报的路径分隔符与盘符大小写不受我们控制，这两条分支此前没有用例覆盖）
---
 .../src-tauri/src/agent/direct_tool_calls.rs  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index 72bd90dfb..005e9e333 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -1277,4 +1277,35 @@ mod tests {
             "回读必须按时间正序"
         );
     }
+
+    /// 判据：项目内路径的 `\` / `/` 两种写法与大小写变体都要落成同一份项目相对路径
+    /// （Codex 上报的路径分隔符与盘符大小写不受我们控制）。
+    #[test]
+    fn tool_call_paths_normalize_separators_and_case() {
+        let root = init_tool_call_project("tool-call-path-variants");
+        let native = root.path().to_string_lossy().to_string();
+        let variants = [native.replace('\\', "/"), native.to_ascii_uppercase()];
+        let mut paths = Vec::new();
+        for (index, variant) in variants.into_iter().enumerate() {
+            let call = direct_tool_call_from_item(
+                root.path(),
+                &json!({
+                    "id": format!("item-path-variant-{index}"),
+                    "type": "fileChange",
+                    "changes": [{"path": format!("{variant}/game/src/y.ts"), "kind": "update"}],
+                    "startedAtMs": 1000,
+                }),
+                "turn-1",
+                false,
+                1000,
+            )
+            .expect("variant path tool call");
+            paths.push(call.detail.changes[0].path.clone());
+        }
+        assert_eq!(paths[0], "game/src/y.ts", "`/` 写法同样要落成项目相对路径");
+        assert_eq!(
+            paths[1], "game/src/y.ts",
+            "大小写变体同样要落成项目相对路径"
+        );
+    }
 }

From 19c370302756128834f8ebcb0932a4e9dd378df7 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 18:54:13 +0800
Subject: [PATCH 25/67] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20markdown=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B8=B2=E6=9F=93=E5=90=8E=E7=9A=84=E6=97=A2=E6=9C=89?=
 =?UTF-8?q?=E6=96=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- appSurface/project-commands.suite.ts：去掉期望文本里手写的前缀短横线（列表项目符号改由 CSS 绘制）
- appSurface/project-commands.suite.ts：把路径匹配限定到 LI 元素（去掉前缀后 li 与内部 p 文本相同，getByText 会命中两个元素）
- appSurface/project-assets.suite.ts、supervisor-runtime.suite.ts、preview-shortcuts：同步去掉期望文本里的手写短横线
- 背景：a60c04b53 把无序列表从手写短横线文本改成真正的 list-disc 标记，9 条既有断言因此失败，本笔把它们对齐到新契约
---
 .../tests/appSurface/project-assets.suite.ts  |  2 +-
 .../appSurface/project-commands.suite.ts      | 48 ++++++++++++-------
 .../assert-planning-and-status-shortcuts.ts   |  4 +-
 .../appSurface/supervisor-runtime.suite.ts    |  4 +-
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-assets.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-assets.suite.ts
index e1b9f0b75..76d46704d 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-assets.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-assets.suite.ts
@@ -808,7 +808,7 @@ export function registerProjectAssetTests() {
     expect(await screen.findByText(/本地项目资产：/)).not.toBeNull();
     expect(screen.getByText(/asset-20\.png/)).not.toBeNull();
     expect(screen.queryByText(/asset-21\.png/)).toBeNull();
-    expect(screen.getByText(/- 还有 2 个资产/)).not.toBeNull();
+    expect(screen.getByText(/还有 2 个资产/)).not.toBeNull();
   });
 
   it('cancels asset list policy confirmation without reading assets', async () => {
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-commands.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-commands.suite.ts
index a7dc65789..83af9d6ef 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-commands.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-commands.suite.ts
@@ -856,9 +856,9 @@ export function registerProjectCommandTests() {
     await submitChat('/diff checkpoint-1');
 
     expect(await screen.findByText(/checkpoint：checkpoint-1/)).not.toBeNull();
-    expect(screen.getByText(/- game\/file-20\.ts/)).not.toBeNull();
-    expect(screen.queryByText(/- game\/file-21\.ts/)).toBeNull();
-    expect(screen.getByText(/- 还有 2 项/)).not.toBeNull();
+    expect(screen.getByText(/^game\/file-20\.ts$/)).not.toBeNull();
+    expect(screen.queryByText(/^game\/file-21\.ts$/)).toBeNull();
+    expect(screen.getByText(/还有 2 项/)).not.toBeNull();
     expect(invoke).toHaveBeenCalledWith('diff_local_project_checkpoint', {
       projectPath: '/tmp/authorized-game',
       checkpointId: 'checkpoint-1',
@@ -928,7 +928,7 @@ export function registerProjectCommandTests() {
     fireEvent.click(screen.getByRole('button', { name: '确认' }));
 
     expect(await screen.findByText(/checkpoint：checkpoint-1/)).not.toBeNull();
-    expect(screen.getByText(/- game\/index\.html/)).not.toBeNull();
+    expect(screen.getByText(/^game\/index\.html$/)).not.toBeNull();
     expect(invoke).toHaveBeenCalledWith('diff_local_project_checkpoint', {
       projectPath: '/tmp/authorized-game',
       checkpointId: 'checkpoint-1',
@@ -3803,12 +3803,19 @@ export function registerProjectCommandTests() {
     expect(
       screen.getByText(
         (_, element) =>
-          element?.tagName === 'LI' &&
-          element.textContent?.trim() === '- game/',
+          element?.tagName === 'LI' && element.textContent?.trim() === 'game/',
       ),
     ).not.toBeNull();
-    expect(screen.getByText(/- game\/index\.html/)).not.toBeNull();
-    expect(screen.getByText(/- assets\/uploads\/hero\.png/)).not.toBeNull();
+    // 列表项渲染成 `<li><p class="inline">game/index.html</p></li>`：去掉手写短横线之后
+    // `<li>` 与内部 `<p>` 的文本完全相同，必须限定在 `LI` 上匹配，否则 getByText 会命中两个元素。
+    expect(
+      screen.getByText(
+        (_, element) =>
+          element?.tagName === 'LI' &&
+          element.textContent?.trim() === 'game/index.html',
+      ),
+    ).not.toBeNull();
+    expect(screen.getByText(/^assets\/uploads\/hero\.png$/)).not.toBeNull();
     expect(invoke).toHaveBeenCalledWith('list_local_project_files', {
       projectPath: '/tmp/authorized-game',
     });
@@ -3872,7 +3879,14 @@ export function registerProjectCommandTests() {
     fireEvent.click(screen.getByRole('button', { name: '确认' }));
 
     expect(await screen.findByText(/本地项目文件：/)).not.toBeNull();
-    expect(screen.getByText(/- game\/index\.html/)).not.toBeNull();
+    // 同 `lists local project files` 的原理：`<li>` 与内部 `<p>` 文本相同，需限定 `LI`。
+    expect(
+      screen.getByText(
+        (_, element) =>
+          element?.tagName === 'LI' &&
+          element.textContent?.trim() === 'game/index.html',
+      ),
+    ).not.toBeNull();
     expect(invoke).toHaveBeenCalledWith('list_local_project_files', {
       projectPath: '/tmp/authorized-game',
     });
@@ -4010,9 +4024,9 @@ export function registerProjectCommandTests() {
     expect(
       screen.getByText(/路径：\.agent\/project\.index\.json/),
     ).not.toBeNull();
-    expect(screen.getByText(/- game\/file-12\.html · 21B/)).not.toBeNull();
-    expect(screen.queryByText(/- game\/file-13\.html/)).toBeNull();
-    expect(screen.getByText(/- 还有 2 项/)).not.toBeNull();
+    expect(screen.getByText(/^game\/file-12\.html · 21B$/)).not.toBeNull();
+    expect(screen.queryByText(/^game\/file-13\.html$/)).toBeNull();
+    expect(screen.getByText(/还有 2 项/)).not.toBeNull();
     expect(invoke).toHaveBeenCalledWith('build_local_project_index', {
       projectPath: '/tmp/authorized-game',
     });
@@ -4247,12 +4261,10 @@ export function registerProjectCommandTests() {
 
     expect(await screen.findByText(/Agent 智能服务状态：/)).not.toBeNull();
     const chatText = screen.getByLabelText('聊天').textContent ?? '';
-    expect(chatText).toContain(
-      '- 总体：已连接 · 3/3 个 Agent 可用 · 0 个待处理',
-    );
-    expect(chatText).toContain('- 账号状态：已就绪');
-    expect(chatText).toContain('- 输出方式：流式关闭 · 联网检索关闭');
-    expect(chatText).toContain('- 所有 Agent 使用统一的官方智能服务');
+    expect(chatText).toContain('总体：已连接 · 3/3 个 Agent 可用 · 0 个待处理');
+    expect(chatText).toContain('账号状态：已就绪');
+    expect(chatText).toContain('输出方式：流式关闭 · 联网检索关闭');
+    expect(chatText).toContain('所有 Agent 使用统一的官方智能服务');
     expect(screen.getByRole('button', { name: '查看状态' })).not.toBeNull();
     expect(screen.queryByText(/sk-test-secret/)).toBeNull();
     expect(screen.queryByText(/generator-secret/)).toBeNull();
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-preview/preview-shortcuts/assert-planning-and-status-shortcuts.ts b/apps/ai-game-creator-shell/tests/appSurface/project-preview/preview-shortcuts/assert-planning-and-status-shortcuts.ts
index 0b6126a85..3788df509 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-preview/preview-shortcuts/assert-planning-and-status-shortcuts.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-preview/preview-shortcuts/assert-planning-and-status-shortcuts.ts
@@ -1222,9 +1222,7 @@ export async function assertPlanningAndStatusShortcutFlow(
   const handoffMessage = messageBubble(
     handoffMessages[handoffMessages.length - 1],
   );
-  expect(handoffMessage.textContent).toContain(
-    '- Run：run-main-shortcut-trace',
-  );
+  expect(handoffMessage.textContent).toContain('Run：run-main-shortcut-trace');
   expect(handoffMessage.textContent).toContain(
     'Ready：art/Asset 生成首版美术素材',
   );
diff --git a/apps/ai-game-creator-shell/tests/appSurface/supervisor-runtime.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/supervisor-runtime.suite.ts
index c2c18e0bb..330be5fc0 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/supervisor-runtime.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/supervisor-runtime.suite.ts
@@ -1888,9 +1888,7 @@ export function registerSupervisorRuntimeTests() {
     ).not.toBeNull();
     expect(screen.getByText(/编排轮次：/)).not.toBeNull();
     expect(screen.getByText(/产物快照：/)).not.toBeNull();
-    expect(
-      screen.getByText(/- game\/index\.html · fnv1a64:game/),
-    ).not.toBeNull();
+    expect(screen.getByText(/game\/index\.html · fnv1a64:game/)).not.toBeNull();
     expect(screen.getByText(/最近步骤：/)).not.toBeNull();
     expect(
       screen.getByText(/Evaluator #2 · passed · evaluation/),

From 802114e14ba26a207e8f9c4cc470fd8148fa2761 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:35:57 +0800
Subject: [PATCH 26/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=BF=87=E7=A8=8B=E5=8D=A1=E4=B8=8E=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E8=B0=83=E7=94=A8=E5=9D=97=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProjectSupervisorView：把「任务执行中 / 正在思考中」过程卡从消息列表内部移到列表外，紧贴输入盒上方（固定在输入框上面，不随消息滚走）
- styles.css：过程卡离开列表后补回左右 16px 内缩，与消息内容、输入盒对齐（并补回底部间距）
- ToolCallGroup：未结束时不再显示「结束于 HH:mm」——只有全部工具落定后才显示块尾那行
- ToolCallGroup：进行中改为「现在 - 最早开始时间」并每秒重算，用时数字会实时跳动（此前只在新事件到达时变）
- ToolCallGroup：只有正在跑的回合才显示「进行中 / 执行中」；已结束回合里残留的 running 快照不再让用户看到永远停在「执行中」
- ProjectSupervisorView：给实时回合的折叠块传 active，历史回合的块不传（默认按已结束渲染）
- ComposerControls：推理档从原生 select 换成与模型选择器同一套观感的浮层（复用 conversation-model-* 触发钮与菜单样式，带选中勾选），不再出现操作系统原生下拉
---
 .../project-workspace/ComposerControls.tsx    |  80 ++++++++++---
 .../ProjectSupervisorView.tsx                 | 113 +++++++++---------
 .../project-workspace/ToolCallGroup.tsx       |  70 +++++++++--
 apps/ai-game-creator-shell/src/styles.css     |  10 ++
 4 files changed, 186 insertions(+), 87 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 ddf8bce7b..0aa574dbc 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
@@ -5,7 +5,17 @@
  * 这些组件只承载表现与交互；回合附件由 `App.tsx` 上传并落进 `DirectCodexTurnAttachment`，
  * 队列由 `chatComposerQueue.ts` 的纯函数维护。
  */
-import { FileUp, Images, Mic, MicOff, Plus, Square, X } from 'lucide-react';
+import {
+  Check,
+  ChevronDown,
+  FileUp,
+  Images,
+  Mic,
+  MicOff,
+  Plus,
+  Square,
+  X,
+} from 'lucide-react';
 import type { RefObject } from 'react';
 import { useEffect, useRef, useState } from 'react';
 
@@ -335,6 +345,7 @@ export function ComposerReasoningEffortSelect({
 }: {
   disabled: boolean;
 }) {
+  const [open, setOpen] = useState(false);
   const [effort, setEffort] = useState<GameCreatorLlmReasoningEffort>(
     DEFAULT_COMPOSER_REASONING_EFFORT,
   );
@@ -414,23 +425,56 @@ export function ComposerReasoningEffortSelect({
 
   return (
     <span className="project-supervisor-reasoning-effort">
-      <select
-        aria-label="推理档"
-        className="project-supervisor-reasoning-effort-select"
-        value={effort}
-        disabled={disabled || saving}
-        onChange={(event) =>
-          selectEffort(
-            normalizeComposerReasoningEffort(event.currentTarget.value),
-          )
-        }
-      >
-        {options.map((option) => (
-          <option key={option.value} value={option.value}>
-            {option.label}
-          </option>
-        ))}
-      </select>
+      {/* 与模型选择器同一套观感：复用 `conversation-model-*` 的触发钮与浮层样式，
+          不再用原生 `<select>`（原生下拉是操作系统菜单，圆角/描边/选中态都跟旁边不一致）。 */}
+      <div className="conversation-model-select">
+        <button
+          type="button"
+          className="conversation-model-trigger"
+          aria-label="推理档"
+          aria-haspopup="listbox"
+          aria-expanded={open}
+          disabled={disabled || saving}
+          onClick={() => setOpen((current) => !current)}
+        >
+          <span
+            className="conversation-model-trigger-status"
+            aria-hidden="true"
+          />
+          <span className="conversation-model-trigger-label">
+            {options.find((option) => option.value === effort)?.label ?? effort}
+          </span>
+          <ChevronDown size={13} aria-hidden="true" />
+        </button>
+        {open ? (
+          <div
+            className="conversation-model-menu"
+            role="listbox"
+            aria-label="推理档"
+          >
+            {options.map((option) => (
+              <button
+                key={option.value}
+                type="button"
+                role="option"
+                aria-selected={option.value === effort}
+                disabled={disabled || saving}
+                onClick={() => {
+                  setOpen(false);
+                  selectEffort(option.value);
+                }}
+              >
+                <span className="conversation-model-menu-option-main">
+                  <span>{option.label}</span>
+                </span>
+                {option.value === effort ? (
+                  <Check size={13} aria-hidden="true" />
+                ) : null}
+              </button>
+            ))}
+          </div>
+        ) : null}
+      </div>
       {notice ? (
         <span role="status" className="project-supervisor-composer-notice">
           {notice}
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 db1855d67..3970a1c1a 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
@@ -450,6 +450,7 @@ export function ProjectSupervisorView({
             <ToolCallGroup
               calls={liveToolCalls}
               userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
+              active
               className="message-tool-call"
             />
           ) : null}
@@ -459,64 +460,6 @@ export function ProjectSupervisorView({
               <pre>{designReasoning}</pre>
             </details>
           ) : null}
-          {directCodex &&
-          (runtimePanelProps.controlBusy || Boolean(directProcessDetail)) ? (
-            <section
-              className={`project-supervisor-process-card${runtimePanelProps.controlBusy ? ' is-active' : ''}`}
-              aria-label="陶泥儿执行过程"
-              aria-live="polite"
-              aria-atomic="false"
-              role="status"
-              data-runtime-owned="true"
-            >
-              <header>
-                <span aria-hidden="true" />
-                <strong>
-                  {directCodex
-                    ? directStatusTitle(directStatus)
-                    : '陶泥儿正在处理'}
-                </strong>
-              </header>
-              {transientReply ? (
-                <div aria-label="陶泥儿实时回复">
-                  <ChatMarkdownMessage
-                    role="assistant"
-                    text={transientReply}
-                    streaming
-                  />
-                </div>
-              ) : null}
-              {directProcessDetail ? (
-                <div className="project-supervisor-process-detail">
-                  <p
-                    className={
-                      processDetailExpanded ? 'is-expanded' : undefined
-                    }
-                    aria-label="陶泥儿正在执行的内容"
-                  >
-                    {directProcessDetail}
-                  </p>
-                  {directProcessDetail.includes('\n') ||
-                  directProcessDetail.length > 96 ? (
-                    <button
-                      type="button"
-                      className="project-supervisor-process-toggle"
-                      aria-expanded={processDetailExpanded}
-                      onClick={() =>
-                        setExpandedProcessKey((current) =>
-                          current === directProcessKey
-                            ? null
-                            : directProcessKey,
-                        )
-                      }
-                    >
-                      {processDetailExpanded ? '收起' : '展开'}
-                    </button>
-                  ) : null}
-                </div>
-              ) : null}
-            </section>
-          ) : null}
           {!directCodex && transientReply ? (
             <div
               className="message message--assistant"
@@ -597,6 +540,60 @@ export function ProjectSupervisorView({
             onRetry={onDesignRetry ?? (() => undefined)}
           />
         ) : null}
+        {directCodex &&
+        (runtimePanelProps.controlBusy || Boolean(directProcessDetail)) ? (
+          <section
+            className={`project-supervisor-process-card${runtimePanelProps.controlBusy ? ' is-active' : ''}`}
+            aria-label="陶泥儿执行过程"
+            aria-live="polite"
+            aria-atomic="false"
+            role="status"
+            data-runtime-owned="true"
+          >
+            <header>
+              <span aria-hidden="true" />
+              <strong>
+                {directCodex
+                  ? directStatusTitle(directStatus)
+                  : '陶泥儿正在处理'}
+              </strong>
+            </header>
+            {transientReply ? (
+              <div aria-label="陶泥儿实时回复">
+                <ChatMarkdownMessage
+                  role="assistant"
+                  text={transientReply}
+                  streaming
+                />
+              </div>
+            ) : null}
+            {directProcessDetail ? (
+              <div className="project-supervisor-process-detail">
+                <p
+                  className={processDetailExpanded ? 'is-expanded' : undefined}
+                  aria-label="陶泥儿正在执行的内容"
+                >
+                  {directProcessDetail}
+                </p>
+                {directProcessDetail.includes('\n') ||
+                directProcessDetail.length > 96 ? (
+                  <button
+                    type="button"
+                    className="project-supervisor-process-toggle"
+                    aria-expanded={processDetailExpanded}
+                    onClick={() =>
+                      setExpandedProcessKey((current) =>
+                        current === directProcessKey ? null : directProcessKey,
+                      )
+                    }
+                  >
+                    {processDetailExpanded ? '收起' : '展开'}
+                  </button>
+                ) : null}
+              </div>
+            ) : null}
+          </section>
+        ) : null}
         <form
           className={`project-supervisor-composer${
             directCodex ? ' is-direct-codex' : ''
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index 62fbf8f27..11379892a 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -6,7 +6,7 @@ import {
   Terminal,
   Wrench,
 } from 'lucide-react';
-import { useId, useState } from 'react';
+import { useEffect, useId, useState } from 'react';
 
 import type { GameCreatorDirectToolCall } from '../../app/types';
 import {
@@ -35,31 +35,64 @@ import {
 export function ToolCallGroup({
   calls,
   userSentAt = 0,
+  active = false,
   className,
 }: {
   calls: GameCreatorDirectToolCall[];
   /** 同一回合用户消息的 `updatedAt`；拿不到就传 0，只显示结束时间。 */
   userSentAt?: number | null;
+  /**
+   * 这个块是否属于**正在跑的回合**。只有正在跑的回合才允许出现"执行中 / 进行中"：
+   * 已结束的回合里若还留着 `running` 快照（进程被杀、completed 事件没到），
+   * 那是数据残留，不该让用户一直看到"执行中"。
+   */
+  active?: boolean;
   className?: string;
 }) {
   const [expanded, setExpanded] = useState(false);
+  const [tick, setTick] = useState(0);
   const bodyId = useId();
+  const hasRunningSnapshot = calls.some((call) => call.status === 'running');
+  const running = active && hasRunningSnapshot;
+  // 正在跑时每秒重算一次"已用时"，否则这个数字只在收到新事件时才变。
+  useEffect(() => {
+    if (!running) {
+      return undefined;
+    }
+    const timer = setInterval(() => setTick((current) => current + 1), 1000);
+    return () => clearInterval(timer);
+  }, [running]);
   if (calls.length === 0) {
     return null;
   }
+  void tick;
   const orderedCalls = [...calls].sort(
     (left, right) => left.startedAt - right.startedAt,
   );
   const summary = toolCallGroupSummary(orderedCalls);
-  const totalDurationMs = turnToolCallDurationMs(orderedCalls);
+  const startedAt =
+    orderedCalls.find((call) => call.startedAt > 0)?.startedAt ?? 0;
+  // 进行中：用"现在 - 最早开始时间"（会随 tick 每秒变）；已结束：用快照里的
+  // min(startedAt) → max(updatedAt)，不掺入本地时钟。
+  const totalDurationMs = running
+    ? startedAt > 0
+      ? Math.max(0, Date.now() - startedAt)
+      : null
+    : turnToolCallDurationMs(orderedCalls);
   const durationText = formatTurnDuration(totalDurationMs);
   const timeLabel = turnToolCallTimeLabel(orderedCalls, userSentAt);
-  const headLabel = durationText ? `${summary}，用时 ${durationText}` : summary;
-  const status = orderedCalls.some((call) => call.status === 'running')
+  const status = running
     ? 'running'
     : orderedCalls.some((call) => call.status === 'failed')
       ? 'failed'
       : 'completed';
+  const headLabel = [
+    summary,
+    running ? '进行中' : '',
+    durationText ? `用时 ${durationText}` : '',
+  ]
+    .filter(Boolean)
+    .join('，');
   return (
     <section
       className={
@@ -85,7 +118,9 @@ export function ToolCallGroup({
           <ToolCallKindIcon kind={orderedCalls[0]?.kind ?? 'other'} />
         </span>
         <span className="agent-tool-call-group-summary">{summary}</span>
-        {timeLabel ? (
+        {running ? (
+          <span className="agent-tool-call-group-running">进行中</span>
+        ) : timeLabel ? (
           <span className="agent-tool-call-group-time">{timeLabel}</span>
         ) : null}
         {durationText ? (
@@ -106,10 +141,12 @@ export function ToolCallGroup({
       >
         <ul className="agent-tool-call-group-rows">
           {orderedCalls.map((call) => (
-            <ToolCallRow key={call.id} call={call} />
+            <ToolCallRow key={call.id} call={call} active={active} />
           ))}
         </ul>
-        {timeLabel ? (
+        {/* 还有工具在跑时**不显示"结束于"**：那时的"结束"只是最后一条快照的 updatedAt，
+            回合并没有结束。等全部落定后再显示块尾这一行。 */}
+        {!running && timeLabel ? (
           <p
             className="agent-tool-call-group-foot"
             data-testid="agent-tool-call-group-end-time"
@@ -123,18 +160,29 @@ export function ToolCallGroup({
 }
 
 /** 展开态的一行工具；行可二级展开看命令 / 文件明细 / 输出。 */
-function ToolCallRow({ call }: { call: GameCreatorDirectToolCall }) {
+function ToolCallRow({
+  call,
+  active,
+}: {
+  call: GameCreatorDirectToolCall;
+  active: boolean;
+}) {
   const [expanded, setExpanded] = useState(false);
   const detailId = useId();
   const text = toolCallRowText(call);
   const durationMs = toolCallDurationMs(call);
   const durationText = formatToolCallDuration(durationMs);
-  const statusText =
-    call.status === 'running'
+  // "执行中"只在**正在跑的回合**里显示；已结束的回合里残留的 running 快照按已完成处理，
+  // 否则用户会看到一条永远停在"执行中"的记录。
+  const statusText = active
+    ? call.status === 'running'
       ? '执行中'
       : call.status === 'failed'
         ? '失败'
-        : '';
+        : ''
+    : call.status === 'failed'
+      ? '失败'
+      : '';
   const rowLabel = [
     text,
     statusText,
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index d03d168be..021a7bd1e 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -11867,3 +11867,13 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-composer-controls-left {
   margin-left: -12px;
 }
+
+/* 过程卡（「任务执行中 / 正在思考中」）现在渲染在消息列表**外**、紧贴输入盒上方（固定在
+   输入框上面，不随消息滚走）。它不再继承消息列表的左右 16px 内缩，所以要自己补齐，
+   才能与消息内容、输入盒两侧对齐；离开列表后列表的 padding-bottom 也不再作用于它。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-conversation
+  > .project-supervisor-process-card {
+  margin: 0 16px 8px;
+}

From 35b26ea3efdb45d74acbad574f16c1f17f36beb9 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:37:16 +0800
Subject: [PATCH 27/67] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E7=9A=84=E3=80=8C=E6=80=9D=E8=80=83=E8=BF=87=E7=A8=8B=E3=80=8D?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- App.tsx：直连回合按回合累积过程/步骤行（相邻重复去重、最多 40 行），每次回合更新时收集，新回合开始时清空
- App.tsx：把累积结果作为 processSteps 传给对话面板
- ProjectSupervisorView：新增可选属性 processSteps；在消息流里渲染默认折叠的「思考过程」块（details 默认收起，data-testid=agent-thinking）
- styles.css：思考过程块与步骤列表的最小样式（左右与消息内容对齐 16px）
- 说明（限制）：Codex app-server 0.147/0.149 只推结构性 item、不推 reasoning 文本（codex_app_server.rs 对 reasoning 类型是明确忽略并有单测钉住），所以这里展示的是我们真实能拿到的过程行（正在思考中 / 正在执行命令：x / 正在写入文件：y），不是模型内部推理原文；策划/设计链原有的 designReasoning 折叠块不受影响
---
 apps/ai-game-creator-shell/src/App.tsx        | 23 +++++++++++++++++++
 .../ProjectSupervisorView.tsx                 | 16 +++++++++++++
 apps/ai-game-creator-shell/src/styles.css     | 20 ++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 703ebcaf7..ff5e9dcdf 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -823,6 +823,26 @@ export function App({
   const directCodexConversationTurnSequenceRef = useRef(0);
   // 工具调用卡片：按 **id** 归并（实时增量 + 回读历史共用一份），同一 id 只渲染一次。
   // 用 ref 做写入基准，避免同一批事件里多条增量互相覆盖。
+  // 直连回合的"思考过程"行：按回合累积过程/中间态文本（去重相邻重复、最多 40 行）。
+  const [directTurnSteps, setDirectTurnSteps] = useState<string[]>([]);
+  const directTurnStepsRef = useRef<string[]>([]);
+  function pushDirectTurnStep(text: string) {
+    const line = text.trim();
+    if (!line) {
+      return;
+    }
+    const current = directTurnStepsRef.current;
+    if (current[current.length - 1] === line) {
+      return;
+    }
+    const next = [...current, line].slice(-40);
+    directTurnStepsRef.current = next;
+    setDirectTurnSteps(next);
+  }
+  function clearDirectTurnSteps() {
+    directTurnStepsRef.current = [];
+    setDirectTurnSteps([]);
+  }
   const [directToolCalls, setDirectToolCalls] = useState<
     GameCreatorDirectToolCall[]
   >([]);
@@ -892,6 +912,7 @@ export function App({
   }
 
   function resetDirectCodexTurn() {
+    clearDirectTurnSteps();
     activeDirectCodexTurnRef.current = null;
     lastDirectCodexActivityRef.current = null;
     setDirectCodexProgress('');
@@ -1850,6 +1871,7 @@ export function App({
             ? payload.updatedAt
             : Date.now();
         const processDetail = directCodexProcessDetail(payload);
+        pushDirectTurnStep(processDetail);
         if (payload.status === 'failed') {
           activeDirectCodexTurnRef.current = null;
           lastDirectCodexActivityRef.current = null;
@@ -12181,6 +12203,7 @@ export function App({
               : projectSupervisorTransientReply
         }
         designReasoning={planningV2Reasoning}
+        processSteps={directTurnSteps}
         visibleMessages={visibleMessages}
         visibleProfessionalAgentCards={visibleProfessionalAgentCards}
         showProfessionalCollaboration={
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 3970a1c1a..2ebc0f320 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
@@ -156,6 +156,8 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   showProfessionalCollaboration?: boolean;
   transientReply: string;
   designReasoning?: string;
+  /** 直连回合累积的过程/步骤行（真 reasoning 文本当前拿不到，见文档限制）。 */
+  processSteps?: string[];
   visibleMessages: ChatMessage[];
   visibleProfessionalAgentCards: AgentStatusCard[];
   walletEntry?: ReactNode;
@@ -220,6 +222,7 @@ export function ProjectSupervisorView({
   showProfessionalCollaboration = true,
   transientReply,
   designReasoning = '',
+  processSteps = [],
   visibleMessages,
   visibleProfessionalAgentCards,
   walletEntry,
@@ -454,6 +457,19 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
+          {directCodex && processSteps.length > 0 ? (
+            <details
+              className="design-agent-reasoning project-supervisor-thinking"
+              data-testid="agent-thinking"
+            >
+              <summary>思考过程</summary>
+              <ol className="project-supervisor-thinking-steps">
+                {processSteps.map((step, index) => (
+                  <li key={`${index}-${step}`}>{step}</li>
+                ))}
+              </ol>
+            </details>
+          ) : null}
           {designReasoning ? (
             <details className="design-agent-reasoning">
               <summary>显示思考过程</summary>
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 021a7bd1e..f79a82f5f 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -11877,3 +11877,23 @@ button.design-workspace-tree__entry:hover,
   > .project-supervisor-process-card {
   margin: 0 16px 8px;
 }
+
+/* 直连回合的「思考过程」块：默认折叠（<details> 默认收起），展开后按步骤列过程行。
+   注意：Codex app-server 当前不推 reasoning 文本，这里展示的是我们真实拿到的过程行。 */
+.project-supervisor-thinking {
+  margin: 0 16px 8px;
+}
+
+.project-supervisor-thinking > summary {
+  cursor: pointer;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+}
+
+.project-supervisor-thinking-steps {
+  margin: 6px 0 0;
+  padding-left: 18px;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+  line-height: 1.6;
+}

From 24c8631869087392dea1c85b6e6b3501618f52f9 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:38:35 +0800
Subject: [PATCH 28/67] =?UTF-8?q?=E6=80=9D=E8=80=83=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8C=89=E5=9B=9E=E5=90=88=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E7=95=99=E5=9C=A8=E4=BC=9A=E8=AF=9D=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src/App.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index ff5e9dcdf..88537f261 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -839,10 +839,6 @@ export function App({
     directTurnStepsRef.current = next;
     setDirectTurnSteps(next);
   }
-  function clearDirectTurnSteps() {
-    directTurnStepsRef.current = [];
-    setDirectTurnSteps([]);
-  }
   const [directToolCalls, setDirectToolCalls] = useState<
     GameCreatorDirectToolCall[]
   >([]);
@@ -912,7 +908,6 @@ export function App({
   }
 
   function resetDirectCodexTurn() {
-    clearDirectTurnSteps();
     activeDirectCodexTurnRef.current = null;
     lastDirectCodexActivityRef.current = null;
     setDirectCodexProgress('');

From 0d2010168ef7359c28d448d0f5f4727436b289f2 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:43:41 +0800
Subject: [PATCH 29/67] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BC=AA=E6=80=9D?=
 =?UTF-8?q?=E8=80=83=E8=BF=87=E7=A8=8B=E5=9D=97=EF=BC=9A=E6=8B=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E7=9C=9F=E6=80=9D=E8=80=83=E8=BF=87=E7=A8=8B=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src/App.tsx         | 18 ------------------
 .../ProjectSupervisorView.tsx                  | 17 +----------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 88537f261..703ebcaf7 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -823,22 +823,6 @@ export function App({
   const directCodexConversationTurnSequenceRef = useRef(0);
   // 工具调用卡片：按 **id** 归并（实时增量 + 回读历史共用一份），同一 id 只渲染一次。
   // 用 ref 做写入基准，避免同一批事件里多条增量互相覆盖。
-  // 直连回合的"思考过程"行：按回合累积过程/中间态文本（去重相邻重复、最多 40 行）。
-  const [directTurnSteps, setDirectTurnSteps] = useState<string[]>([]);
-  const directTurnStepsRef = useRef<string[]>([]);
-  function pushDirectTurnStep(text: string) {
-    const line = text.trim();
-    if (!line) {
-      return;
-    }
-    const current = directTurnStepsRef.current;
-    if (current[current.length - 1] === line) {
-      return;
-    }
-    const next = [...current, line].slice(-40);
-    directTurnStepsRef.current = next;
-    setDirectTurnSteps(next);
-  }
   const [directToolCalls, setDirectToolCalls] = useState<
     GameCreatorDirectToolCall[]
   >([]);
@@ -1866,7 +1850,6 @@ export function App({
             ? payload.updatedAt
             : Date.now();
         const processDetail = directCodexProcessDetail(payload);
-        pushDirectTurnStep(processDetail);
         if (payload.status === 'failed') {
           activeDirectCodexTurnRef.current = null;
           lastDirectCodexActivityRef.current = null;
@@ -12198,7 +12181,6 @@ export function App({
               : projectSupervisorTransientReply
         }
         designReasoning={planningV2Reasoning}
-        processSteps={directTurnSteps}
         visibleMessages={visibleMessages}
         visibleProfessionalAgentCards={visibleProfessionalAgentCards}
         showProfessionalCollaboration={
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 2ebc0f320..47aec561c 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
@@ -156,8 +156,7 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   showProfessionalCollaboration?: boolean;
   transientReply: string;
   designReasoning?: string;
-  /** 直连回合累积的过程/步骤行（真 reasoning 文本当前拿不到，见文档限制）。 */
-  processSteps?: string[];
+
   visibleMessages: ChatMessage[];
   visibleProfessionalAgentCards: AgentStatusCard[];
   walletEntry?: ReactNode;
@@ -222,7 +221,6 @@ export function ProjectSupervisorView({
   showProfessionalCollaboration = true,
   transientReply,
   designReasoning = '',
-  processSteps = [],
   visibleMessages,
   visibleProfessionalAgentCards,
   walletEntry,
@@ -457,19 +455,6 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
-          {directCodex && processSteps.length > 0 ? (
-            <details
-              className="design-agent-reasoning project-supervisor-thinking"
-              data-testid="agent-thinking"
-            >
-              <summary>思考过程</summary>
-              <ol className="project-supervisor-thinking-steps">
-                {processSteps.map((step, index) => (
-                  <li key={`${index}-${step}`}>{step}</li>
-                ))}
-              </ol>
-            </details>
-          ) : null}
           {designReasoning ? (
             <details className="design-agent-reasoning">
               <summary>显示思考过程</summary>

From 82ac6c160f77c338c5581d4b21f0b73df61f7e99 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:52:39 +0800
Subject: [PATCH 30/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E8=A1=8C=E5=8E=BB=E6=8E=89=E5=8A=A8=E8=AF=8D=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E5=88=97=E6=94=B9=E4=B8=BA=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=AD/=E5=B7=B2=E6=89=A7=E8=A1=8C/=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- toolCallGroupPresentation：行文案不再拼 已运行/已编辑/已调用 前缀，只留工具摘要（状态由行尾状态列表达，避免重复）
- toolCallGroupPresentation：汇总文案在回合进行中只说数量（如 2 个命令），落定后才加 已执行
- ToolCallGroup：行尾状态固定显示 执行中（仅正在跑的回合）/ 已执行 / 失败，不再出现空状态
---
 .../project-workspace/ToolCallGroup.tsx       | 15 +++++-------
 .../toolCallGroupPresentation.ts              | 23 ++++++++++++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index 11379892a..e11e4b5b1 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -69,7 +69,7 @@ export function ToolCallGroup({
   const orderedCalls = [...calls].sort(
     (left, right) => left.startedAt - right.startedAt,
   );
-  const summary = toolCallGroupSummary(orderedCalls);
+  const summary = toolCallGroupSummary(orderedCalls, running);
   const startedAt =
     orderedCalls.find((call) => call.startedAt > 0)?.startedAt ?? 0;
   // 进行中：用"现在 - 最早开始时间"（会随 tick 每秒变）；已结束：用快照里的
@@ -174,15 +174,12 @@ function ToolCallRow({
   const durationText = formatToolCallDuration(durationMs);
   // "执行中"只在**正在跑的回合**里显示；已结束的回合里残留的 running 快照按已完成处理，
   // 否则用户会看到一条永远停在"执行中"的记录。
-  const statusText = active
-    ? call.status === 'running'
-      ? '执行中'
-      : call.status === 'failed'
-        ? '失败'
-        : ''
-    : call.status === 'failed'
+  const statusText =
+    call.status === 'failed'
       ? '失败'
-      : '';
+      : active && call.status === 'running'
+        ? '执行中'
+        : '已执行';
   const rowLabel = [
     text,
     statusText,
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
index 9c928252a..a2a96ab88 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
@@ -31,7 +31,7 @@ const TOOL_CALL_KIND_LABELS: Record<GameCreatorDirectToolCallKind, string> = {
 };
 
 /** 行文案动词：`已运行 {summary}` / `已编辑 {summary}` / …，`context_compaction` 不带 summary。 */
-const TOOL_CALL_ROW_VERBS: Partial<
+export const TOOL_CALL_ROW_VERBS: Partial<
   Record<GameCreatorDirectToolCallKind, string>
 > = {
   command: '已运行',
@@ -42,7 +42,10 @@ const TOOL_CALL_ROW_VERBS: Partial<
 };
 
 /** 汇总文案：按 kind 计数、固定顺序拼成 `已执行 5 个命令、2 个文件变更`；空集合返回空串。 */
-export function toolCallGroupSummary(calls: GameCreatorDirectToolCall[]) {
+export function toolCallGroupSummary(
+  calls: GameCreatorDirectToolCall[],
+  running = false,
+) {
   const counts = new Map<string, number>();
   for (const call of calls) {
     counts.set(call.kind, (counts.get(call.kind) ?? 0) + 1);
@@ -66,17 +69,21 @@ export function toolCallGroupSummary(calls: GameCreatorDirectToolCall[]) {
   for (const kind of [...counts.keys()]) {
     append(kind);
   }
-  return parts.length > 0 ? `已执行 ${parts.join('、')}` : '';
+  return parts.length > 0
+    ? running
+      ? parts.join('、')
+      : `已执行 ${parts.join('、')}`
+    : '';
 }
 
-/** 一行工具的文案：`已运行 npm run build` / `已整理上下文`。 */
+/** 一行工具的文案：只用工具本身的摘要（不带"已运行"这类动词前缀），状态由行尾状态列表达。 */
 export function toolCallRowText(call: GameCreatorDirectToolCall) {
+  // 行首不再写"已运行/已编辑"这类动词前缀：命令状态由行尾的状态列表达
+  // （执行中 / 已执行 / 失败），前缀会和它重复。
   if (call.kind === 'context_compaction') {
-    return '已整理上下文';
+    return '整理上下文';
   }
-  const summary = toolCallRowSummary(call);
-  const verb = TOOL_CALL_ROW_VERBS[call.kind] ?? '已执行';
-  return summary ? `${verb} ${summary}` : verb;
+  return toolCallRowSummary(call);
 }
 
 function toolCallRowSummary(call: GameCreatorDirectToolCall) {

From 426fb9b7285a2e9977b00a869f70d9c04f94f19e Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:53:16 +0800
Subject: [PATCH 31/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=9D=97=E5=9D=97=E5=A4=B4=E6=8B=86=E6=88=90?=
 =?UTF-8?q?=E4=B8=A4=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ToolCallGroup：状态/时间与用时包进 agent-tool-call-group-meta
- styles.css：块头改两行网格（图标 + 汇总一行，状态/用时一行，箭头右侧跨两行），汇总超长省略，避免窄面板里被截断且进行中折行
---
 .../project-workspace/ToolCallGroup.tsx       | 22 +++++----
 apps/ai-game-creator-shell/src/styles.css     | 48 +++++++++++++++++++
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index e11e4b5b1..d8818c9eb 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -118,16 +118,18 @@ export function ToolCallGroup({
           <ToolCallKindIcon kind={orderedCalls[0]?.kind ?? 'other'} />
         </span>
         <span className="agent-tool-call-group-summary">{summary}</span>
-        {running ? (
-          <span className="agent-tool-call-group-running">进行中</span>
-        ) : timeLabel ? (
-          <span className="agent-tool-call-group-time">{timeLabel}</span>
-        ) : null}
-        {durationText ? (
-          <span className="agent-tool-call-group-duration">
-            {`用时 ${durationText}`}
-          </span>
-        ) : null}
+        <span className="agent-tool-call-group-meta">
+          {running ? (
+            <span className="agent-tool-call-group-running">进行中</span>
+          ) : timeLabel ? (
+            <span className="agent-tool-call-group-time">{timeLabel}</span>
+          ) : null}
+          {durationText ? (
+            <span className="agent-tool-call-group-duration">
+              {`用时 ${durationText}`}
+            </span>
+          ) : null}
+        </span>
         <ChevronDown
           className="agent-tool-call-group-chevron"
           size={14}
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index f79a82f5f..5374a3cff 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -11897,3 +11897,51 @@ button.design-workspace-tree__entry:hover,
   font-size: 12px;
   line-height: 1.6;
 }
+
+/* 工具调用折叠块块头改成两行：第一行图标 + 汇总（超长省略），第二行状态 + 用时，箭头右侧跨两行。
+   窄面板里一行塞不下（汇总会被截断、"进行中"还会折成两行），拆成两行后每段都有自己的宽度。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .agent-tool-call-group-head {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 2px 8px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .agent-tool-call-group-icon {
+  grid-column: 1;
+  grid-row: 1 / span 2;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .agent-tool-call-group-summary {
+  grid-column: 2;
+  grid-row: 1;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .agent-tool-call-group-meta {
+  display: flex;
+  grid-column: 2;
+  grid-row: 2;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  flex-wrap: wrap;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .agent-tool-call-group-chevron {
+  grid-column: 3;
+  grid-row: 1 / span 2;
+}

From 2c80aab62155bd4f04a080d7944048021d211126 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:58:21 +0800
Subject: [PATCH 32/67] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=8C=89=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=86=E6=B5=81?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=A3=E7=A0=81=E5=8D=A1=E5=85=8D=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E9=97=A8=E7=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- resourceCardPreviewModel：新增 Markdown / 代码 / 纯文本三支扩展名口径，`.json`/`.yaml`/`.toml`/`.xml`/`.html`/`.css`/`.sql` 按用户口径归入代码
- resourceCardPreviewModel：新增 projectResourceCardPreviewVariant 给出卡面分流结论，projectResourceCodeTypeLabel 给出代码卡类型标签
- resourceCardPreviewModel：纯文本（`.txt`/`.csv`/`.log` 等）在上游无类型结论时兜底为文档，改走文本预览而不是占位图标
- resourceCardPreviewModel：用按行截断的 projectResourceDocumentPreviewText 替换压成一行的 summarizeProjectResourceDocument
- resourceCardPreviewModel：Markdown 轻量清理只去标记符号并保留换行，不引入完整渲染器
- useProjectResourceCardPreviews：代码卡在 requestPreview 入队门禁直接返回，不再读取文件内容（判据与卡面分流同源）
- useProjectResourceCardPreviews：收窄 readPreview 的文档/代码双分支为文档单分支，去掉已不可达的代码读取路径
---
 .../resourceCardPreviewModel.ts               | 154 +++++++++++++++++-
 .../useProjectResourceCardPreviews.ts         |  25 ++-
 2 files changed, 166 insertions(+), 13 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts b/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
index 006048f62..9603f4fd1 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
+++ b/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
@@ -198,6 +198,40 @@ const rasterImageExtension = /\.(png|jpe?g|webp)$/iu;
 const extendedImageExtension = /\.(gif|svg|avif|bmp)$/iu;
 const videoExtension = /\.(mp4|webm|mov)$/iu;
 
+/** Markdown 文档：卡面显示前几行，并做轻量标记清理。 */
+const markdownExtension = /\.(md|markdown|mdx)$/iu;
+/**
+ * 代码文件扩展名（**只看路径，不读文件内容**）。
+ *
+ * 与 `resourceProjectionModel` 的 `gameCodeExtension` 是两份口径，刻意不复用：
+ * 那份用于**筛选与归属**，改动会波及画布栏目与计数；这份只决定**卡面怎么画**。
+ * 这里按用户口径把 `.json` / `.yaml` / `.toml` / `.xml` / `.html` / `.css` / `.sql`
+ * 一并算代码 —— 它们在上游被登记成「文档」，但卡面当代码画更干净。
+ */
+const cardCodeExtension =
+  /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs|rs|py|go|java|kt|kts|cs|cpp|cc|cxx|c|h|hpp|swift|php|rb|lua|sh|bash|zsh|ps1|psm1|json|jsonc|ya?ml|toml|xml|html?|css|scss|less|sql|graphql|gql|vue|svelte)$/iu;
+/** 纯文本：按纯文本处理，显示前几行但不做标记清理。 */
+const plainTextExtension = /\.(txt|text|csv|tsv|log|ini|conf|cfg|properties|env)$/iu;
+
+/**
+ * 取路径末段的扩展名（小写、不含点）。取不到（无扩展名）时返回 `null`。
+ */
+export function projectResourcePathExtension(path: string): string | null {
+  const fileName = path.split(/[\\/]/u).filter(Boolean).pop() ?? '';
+  const matched = /\.([a-z0-9]+)$/iu.exec(fileName.trim());
+  return matched ? matched[1]!.toLowerCase() : null;
+}
+
+/** 代码文件的类型标签（如 `.ts` → `TS`）；不是代码文件时返回 `null`。 */
+export function projectResourceCodeTypeLabel(path: string): string | null {
+  const trimmed = path.trim();
+  if (!cardCodeExtension.test(trimmed)) {
+    return null;
+  }
+  const extension = projectResourcePathExtension(trimmed);
+  return extension ? extension.toUpperCase() : null;
+}
+
 export function projectResourceCardPreviewKind(
   resource: ProjectResource,
 ): ProjectResourceCardPreviewKind {
@@ -207,6 +241,14 @@ export function projectResourceCardPreviewKind(
   if (resource.subtype === 'agent-result') {
     return 'document';
   }
+  // Markdown / 代码在扩展名这一层就分流，不再依赖上游登记类型：
+  // 上游把 `.json` / `.tsx` 这类文件登记成「文档」，卡面却该按代码画。
+  if (markdownExtension.test(resource.path)) {
+    return 'document';
+  }
+  if (cardCodeExtension.test(resource.path)) {
+    return 'code';
+  }
   const kind = projectResourceDisplayKind(resource);
   if (kind === 'code') {
     return 'code';
@@ -235,9 +277,56 @@ export function projectResourceCardPreviewKind(
   ) {
     return 'media-image';
   }
+  // 纯文本兜底：`.txt` / `.csv` / `.log` 这类文件在上游没有类型结论（判成 `null`），
+  // 卡面按纯文本预览比占位图标更有信息量。放在最后，不改动任何已有分支的结论。
+  if (kind === null && plainTextExtension.test(resource.path)) {
+    return 'document';
+  }
   return 'placeholder';
 }
 
+/**
+ * 文档类卡片（`document` / `code`）的卡面分流结论。
+ *
+ * 三种落点：
+ * - `markdown`：显示前几行，预览前做轻量标记清理；
+ * - `code`：**完全不读内容**，卡面改画代码图标 + 类型标签；
+ * - `plain-text`：显示前几行，不做标记清理。
+ */
+export type ProjectResourceCardPreviewVariant =
+  | 'markdown'
+  | 'code'
+  | 'plain-text'
+  | null;
+
+export function projectResourceCardPreviewVariant(
+  resource: ProjectResource,
+): ProjectResourceCardPreviewVariant {
+  if (resource.subtype === 'agent-result') {
+    return 'markdown';
+  }
+  if (markdownExtension.test(resource.path)) {
+    return 'markdown';
+  }
+  if (cardCodeExtension.test(resource.path)) {
+    return 'code';
+  }
+  return projectResourceCardPreviewKind(resource) === 'document'
+    ? 'plain-text'
+    : null;
+}
+
+/**
+ * 代码卡**不做文件读取**的判据：卡面只用路径画图标，读内容既无用又占读取槽。
+ *
+ * 与 `projectResourceCardPreviewVariant` 同源，避免"卡面不画内容、却仍在后台读内容"的分叉。
+ */
+export function projectResourceCardPreviewReadsContent(
+  resource: ProjectResource,
+): boolean {
+  return projectResourceCardPreviewVariant(resource) !== 'code';
+}
+
 /**
  * `read_local_project_media_preview` 的线上 `category` 入参：只按文件类型分美术 / 音频两支。
  *
@@ -271,14 +360,63 @@ export function projectResourceCardPreviewIdentity(input: {
   ]);
 }
 
-export function summarizeProjectResourceDocument(content: string) {
+/** 卡面文档预览的最大行数（超出由 CSS 省略号截断）。 */
+export const PROJECT_RESOURCE_CARD_PREVIEW_LINE_LIMIT = 3;
+/** 单行预览的最大字符数，超出截断成省略号。 */
+export const PROJECT_RESOURCE_CARD_PREVIEW_LINE_LENGTH = 72;
+
+/**
+ * Markdown 的**轻量**清理：只去掉标记符号，不是渲染器。
+ *
+ * - 去掉围栏标记行（``` / ~~~），保留代码内容本身；
+ * - 去掉行首标题 `#`、引用 `>` 与列表符号（保留缩进层级）；
+ * - 去掉强调 / 行内代码 / 图片 / 链接的标记符号，保留可见文字；
+ * - **不折叠换行** —— 卡面要的是"前几行"，压成一行就看不出结构了。
+ */
+function stripMarkdownMarkers(content: string): string {
   return content
-    .replace(/!\[[^\]]*\]\([^)]*\)/gu, ' ')
+    .replace(/^\s*(?:```|~~~).*$/gmu, '')
+    .replace(/^\s{0,3}#{1,6}\s*/gmu, '')
+    .replace(/^\s{0,3}>\s?/gmu, '')
+    .replace(/^\s*[-+*]\s+/gmu, '')
+    .replace(/!\[([^\]]*)\]\([^)]*\)/gu, '$1')
     .replace(/\[([^\]]+)\]\([^)]*\)/gu, '$1')
-    .replace(/<[^>]*>/gu, ' ')
-    .replace(/[`*_~>#|{}[\]]/gu, ' ')
-    .replace(/^\s*[-+]\s+/gmu, '')
-    .replace(/\s+/gu, ' ')
-    .trim()
-    .slice(0, 180);
+    .replace(/`{1,3}([^`]*)`{1,3}/gu, '$1')
+    .replace(/\*\*([^*]+)\*\*/gu, '$1')
+    .replace(/__([^_]+)__/gu, '$1')
+    .replace(/(^|[^*])\*([^*\n]+)\*/gu, '$1$2')
+    .replace(/(^|[^_])_([^_\n]+)_/gu, '$1$2');
+}
+
+/**
+ * 文档卡面的前几行预览文本。
+ *
+ * `isMarkdown` 为 `true` 时先做轻量标记清理；纯文本原样输出。
+ * 逐行去掉多余空白（缩进保留最多 2 个空格）并按 `PROJECT_RESOURCE_CARD_PREVIEW_LINE_LENGTH`
+ * 单行截断，最多取 `PROJECT_RESOURCE_CARD_PREVIEW_LINE_LIMIT` 行。
+ */
+export function projectResourceDocumentPreviewText(
+  content: string,
+  isMarkdown: boolean,
+): string {
+  const normalized = isMarkdown ? stripMarkdownMarkers(content) : content;
+  const lines: string[] = [];
+  for (const rawLine of normalized.split(/\r?\n/u)) {
+    const line = rawLine.replace(/\t/gu, '  ').replace(/\s+$/u, '');
+    const trimmed = line.trimStart();
+    if (!trimmed) {
+      continue;
+    }
+    const indent = line.slice(0, line.length - trimmed.length).slice(0, 2);
+    const text = `${indent}${trimmed}`;
+    lines.push(
+      text.length > PROJECT_RESOURCE_CARD_PREVIEW_LINE_LENGTH
+        ? `${text.slice(0, PROJECT_RESOURCE_CARD_PREVIEW_LINE_LENGTH)}…`
+        : text,
+    );
+    if (lines.length >= PROJECT_RESOURCE_CARD_PREVIEW_LINE_LIMIT) {
+      break;
+    }
+  }
+  return lines.join('\n');
 }
diff --git a/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts b/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
index 94d17a065..ab4e899f7 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
+++ b/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
@@ -26,6 +26,7 @@ import {
   projectResourceCardPreviewImageDimensions,
   type ProjectResourceCardPreviewKind,
   projectResourceCardPreviewKind,
+  projectResourceCardPreviewReadsContent,
   type ProjectResourceCardPreviewPayload,
   type ProjectResourceCardPreviewState,
   type ProjectResourceCardPreviewTransportPayload,
@@ -488,10 +489,12 @@ export function useProjectResourceCardPreviews(input: {
       job: PreviewJob,
     ): Promise<ProjectResourceCardPreviewTransportPayload> => {
       const kind = projectResourceCardPreviewKind(job.resource);
-      if (
-        (kind === 'document' || kind === 'code') &&
-        job.resource.content !== undefined
-      ) {
+      /**
+       * 这段之前的 `kind === 'document' || kind === 'code'` 双分支已收窄：代码卡在
+       * `requestPreview` 的入队门禁就被挡下（**判据同源**，见 `projectResourceCardPreviewReadsContent`），
+       * 走到这里的只可能是需要读内容的文档卡（Markdown / 纯文本）。
+       */
+      if (job.resource.content !== undefined) {
         return {
           path: job.resource.path,
           mediaType: job.resource.mediaType,
@@ -502,7 +505,7 @@ export function useProjectResourceCardPreviews(input: {
       const invoke = window.__TAURI__?.core?.invoke;
       if (!invoke) {
         throw new Error(
-          kind === 'document' || kind === 'code'
+          kind === 'document'
             ? '文档预览需要在客户端内打开'
             : '媒体预览需要在客户端内打开',
         );
@@ -630,6 +633,18 @@ export function useProjectResourceCardPreviews(input: {
         return;
       }
       const kind = projectResourceCardPreviewKind(resource);
+      /**
+       * 代码卡**不入队列、不读内容**：卡面只用路径画图标 + 类型标签，读回来的内容没有任何
+       * 消费方。此前代码卡与文档卡走同一条读取分支，读回一大段源码再被折成一行摘要 ——
+       * 既是"丑预览"的来源，也白占全局 3 个读取槽。
+       *
+       * 判据与卡面分流（`projectResourceCardPreviewVariant`）同源，避免"卡面不画内容、
+       * 后台仍在读内容"的分叉。这里直接 `return` 而不是入队后失败：卡停在 `idle`，
+       * 卡面照常画代码图标，不产生误导性的失败态。
+       */
+      if (!projectResourceCardPreviewReadsContent(resource)) {
+        return;
+      }
       if (
         kind === 'version' ||
         kind === 'placeholder' ||

From 608c3e879016667aefa4b77717fc8fb2e7a47cdd Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:58:25 +0800
Subject: [PATCH 33/67] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8D=A1=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=88=86=E5=8C=BA=EF=BC=9AMarkdown/=E7=BA=AF=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E5=89=8D=E5=87=A0=E8=A1=8C=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=96=87=E4=BB=B6=E6=94=B9=E7=94=BB=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- index.tsx：卡面据 projectResourceCardPreviewVariant 分流，代码卡分支只渲染 lucide 代码图标 + 扩展名标签，不再显示文件内容
- index.tsx：文档卡改用 projectResourceDocumentPreviewText 取前 3 行，并带上 data-document-preview-variant 便于排障与验收
- index.tsx：引入 FileCode2 图标
- ResourcePreviewMedia.tsx：弹窗宿主里代码文件同样改画代码图标，避免看起来像"读不出来的图片"
- styles.css：文档卡预览保留换行并限制 3 行（white-space: pre-line + -webkit-line-clamp: 3）
- styles.css：新增 .game-resource-card-code-visual / .game-resource-card-code-label，复用现有卡片色板与居中排布口径
---
 apps/ai-game-creator-shell/src/styles.css     | 33 +++++++++++-
 .../ResourcePreviewMedia.tsx                  | 13 ++++-
 .../src/view/project-development/index.tsx    | 53 ++++++++++++++++---
 3 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 5374a3cff..912935119 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -7209,9 +7209,38 @@ iframe.preview-frame {
   font-size: 11px;
   line-height: 1.55;
   text-align: left;
-  white-space: normal;
+  /* 文档卡预览改为"前几行"（最多 3 行），必须保留换行：折成一行就看不出结构了。 */
+  white-space: pre-line;
+  word-break: break-word;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 5;
+  -webkit-line-clamp: 3;
+}
+
+/*
+ * 代码文件卡：不显示文件内容，只给代码图标 + 扩展名标签。
+ * 与 `.game-resource-card-version-visual` 共用同一套居中排布口径，视觉上仍是同一族卡片。
+ */
+.game-resource-card-code-visual {
+  display: grid;
+  gap: 8px;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(145deg, #fff8f1, #f2ded2);
+  color: #8b5b45;
+  /* 图标与标签作为一组整体垂直居中，与 `.game-resource-card-version-visual` 同口径。 */
+  align-content: center;
+  place-items: center;
+}
+
+.game-resource-card-code-label {
+  padding: 1px 7px;
+  border: 1px solid rgb(139 91 69 / 28%);
+  border-radius: 999px;
+  background: rgb(255 255 255 / 72%);
+  color: #8b5b45;
+  font-size: 9px;
+  font-weight: 700;
+  letter-spacing: 0.04em;
 }
 
 .game-resource-card-version-visual {
diff --git a/apps/ai-game-creator-shell/src/view/project-development/ResourcePreviewMedia.tsx b/apps/ai-game-creator-shell/src/view/project-development/ResourcePreviewMedia.tsx
index 1da6ca17c..637ab9103 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/ResourcePreviewMedia.tsx
+++ b/apps/ai-game-creator-shell/src/view/project-development/ResourcePreviewMedia.tsx
@@ -1,9 +1,10 @@
-import { Image as ImageIcon, Music2, Video } from 'lucide-react';
+import { FileCode2, Image as ImageIcon, Music2, Video } from 'lucide-react';
 import { useEffect, useRef } from 'react';
 
 import {
   projectResourceCardPreviewKind,
   type ProjectResourceCardPreviewState,
+  projectResourceCardPreviewVariant,
 } from './resourceCardPreviewModel';
 import type { ProjectResource } from './resourceProjectionModel';
 
@@ -79,6 +80,13 @@ export function ResourcePreviewMedia({
   }, [onObservePreview, previewIdentity, resource]);
 
   const kind = resource ? projectResourceCardPreviewKind(resource) : null;
+  /**
+   * 代码文件走与资源卡一致的分流：不画内容（本组件本来也只画缩略图 / 占位），
+   * 占位图标换成代码图标，免得弹窗里代码文件看起来像"读不出来的图片"。
+   */
+  const previewVariant = resource
+    ? projectResourceCardPreviewVariant(resource)
+    : null;
   const sourceUrl =
     preview.status === 'loaded' ? (preview.preview.sourceUrl ?? null) : null;
   const visual = (() => {
@@ -111,6 +119,9 @@ export function ResourcePreviewMedia({
         />
       );
     }
+    if (previewVariant === 'code') {
+      return <FileCode2 className="h-5 w-5" aria-hidden="true" />;
+    }
     return resourcePreviewPlaceholderIcon(
       kind === 'video'
         ? 'video'
diff --git a/apps/ai-game-creator-shell/src/view/project-development/index.tsx b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
index 6efc1d0f1..2beb79a1a 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/index.tsx
+++ b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
@@ -18,6 +18,7 @@ import { save as saveNativeFileDialog } from '@tauri-apps/plugin-dialog';
 import {
   AtSign,
   Crosshair,
+  FileCode2,
   FileText,
   FolderTree,
   Gamepad2,
@@ -275,7 +276,9 @@ import {
 import {
   projectResourceCardPreviewKind,
   type ProjectResourceCardPreviewState,
-  summarizeProjectResourceDocument,
+  projectResourceCardPreviewVariant,
+  projectResourceCodeTypeLabel,
+  projectResourceDocumentPreviewText,
 } from './resourceCardPreviewModel';
 import { ResourceClassificationPanel } from './ResourceClassificationPanel';
 import {
@@ -757,9 +760,24 @@ const ResourceCard = memo(function ResourceCard({
   const mediaActive = activeMediaIdentity === previewIdentity;
   const sourceUrl =
     preview.status === 'loaded' ? preview.preview.sourceUrl : null;
-  const documentSummary =
-    preview.status === 'loaded' && preview.preview.content !== undefined
-      ? summarizeProjectResourceDocument(preview.preview.content)
+  /**
+   * 文档类卡片的卡面分流结论（`markdown` / `code` / `plain-text` / `null`）。
+   *
+   * 判据只看路径扩展名与 subtype，**不依赖是否读到内容** —— 代码卡的卡面本就不该有内容，
+   * 等读完再决定画什么只会把"丑预览"和多余 IO 一起留在链路上。
+   */
+  const previewVariant = projectResourceCardPreviewVariant(resource);
+  /** 代码卡的类型标签（`.tsx` → `TSX`）；不是代码卡时为 `null`。 */
+  const codeTypeLabel = projectResourceCodeTypeLabel(resource.path);
+  const documentPreview =
+    preview.status === 'loaded' &&
+    preview.preview.content !== undefined &&
+    previewVariant !== null &&
+    previewVariant !== 'code'
+      ? projectResourceDocumentPreviewText(
+          preview.preview.content,
+          previewVariant === 'markdown',
+        )
       : '';
 
   useEffect(() => {
@@ -908,10 +926,31 @@ const ResourceCard = memo(function ResourceCard({
         </span>
       );
     }
-    if ((kind === 'document' || kind === 'code') && documentSummary) {
+    /**
+     * 代码文件卡：**不显示内容**，只给代码图标 + 类型标签。
+     *
+     * 这里的判据是路径分流（`previewVariant === 'code'`），与是否读到内容无关 ——
+     * 代码卡压根不发起读取（见 `useProjectResourceCardPreviews` 的入队门禁）。
+     */
+    if (previewVariant === 'code') {
       return (
-        <span className="game-resource-card-document-summary">
-          {documentSummary}
+        <span className="game-resource-card-code-visual">
+          <FileCode2 size={30} aria-hidden="true" />
+          {codeTypeLabel ? (
+            <span className="game-resource-card-code-label">
+              {codeTypeLabel}
+            </span>
+          ) : null}
+        </span>
+      );
+    }
+    if (previewVariant !== null && documentPreview) {
+      return (
+        <span
+          className="game-resource-card-document-summary"
+          data-document-preview-variant={previewVariant}
+        >
+          {documentPreview}
         </span>
       );
     }

From 80a806aa027d50c119713f243a78009dab25efe4 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 19:59:07 +0800
Subject: [PATCH 34/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8E=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=89=93=E5=BC=80=E5=B7=B2=E6=9C=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E4=B8=A2=E6=8E=89=E9=A6=96=E9=A1=B5=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=EF=BC=9AinitialPrompt=20=E4=B8=8D=E5=86=8D=E5=86=99=E6=AD=BB?=
 =?UTF-8?q?=E7=A9=BA=E4=B8=B2=EF=BC=8C=E9=A6=96=E9=A1=B5=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E9=9A=8F=E6=89=93=E5=BC=80=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=A6=96=E8=BD=AE=E4=B8=8E=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-shell/useHomeProjectCreation.ts       | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
index 6e9a147ad..56201d7d3 100644
--- a/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
+++ b/apps/ai-game-creator-shell/src/features/app-shell/useHomeProjectCreation.ts
@@ -36,6 +36,7 @@ import type {
   HomeCreationType,
   HomeDraft,
 } from '../../view/home';
+import { richTextToPrompt } from '../../view/home/components/RichInputArea/richTextToPrompt';
 import { useLauncherHomeDraftStore } from '../../view/home/useHomeDraftStore';
 import type { LauncherView } from '../../view/layout';
 import type {
@@ -49,6 +50,15 @@ import {
 } from '../project-summary/projectSummary';
 import { resolveSessionPreviewOnProjectOpen } from './sessionPreview';
 
+/** 首页输入框当前的纯文本（Lexical 编辑器状态 -> 文本）；没有输入就返回空串。 */
+function homeDraftPromptText() {
+  try {
+    return richTextToPrompt(useLauncherHomeDraftStore.getState().draft).trim();
+  } catch {
+    return '';
+  }
+}
+
 type UseHomeProjectCreationOptions = {
   setStatus: Dispatch<SetStateAction<string>>;
   setLauncherView: Dispatch<SetStateAction<LauncherView>>;
@@ -471,6 +481,9 @@ export function useHomeProjectCreation({
   async function createProjectFromProjectPage(
     nextProjectPath: string,
     skipNonEmptyCheck = false,
+    // 首页输入框里已经写好的要求：打开已有项目时不能再丢掉（此前写死空串，
+    // 用户写的内容既不发首轮也不进对话历史）。
+    initialPrompt = '',
   ) {
     if (projectActionRef.current) {
       return;
@@ -523,7 +536,7 @@ export function useHomeProjectCreation({
         ),
         creationType: null,
         startMode: null,
-        initialPrompt: '',
+        initialPrompt,
         attachments: [],
         recentRunStatus: null,
         recentRunStopReason: null,
@@ -629,7 +642,7 @@ export function useHomeProjectCreation({
         ),
         creationType: null,
         startMode: runtimeMode?.activeRuntime === 'design' ? 'planning' : null,
-        initialPrompt: '',
+        initialPrompt: homeDraftPromptText(),
         attachments: [],
         recentRunStatus: directoryStatus.recentRunStatus,
         recentRunStopReason: directoryStatus.recentRunStopReason,
@@ -922,7 +935,11 @@ export function useHomeProjectCreation({
       setProjectPath(selectedPath);
       projectActionRef.current = null;
       setProjectAction(null);
-      await createProjectFromProjectPage(selectedPath);
+      await createProjectFromProjectPage(
+        selectedPath,
+        false,
+        homeDraftPromptText(),
+      );
     } catch (error) {
       setStatus(error instanceof Error ? error.message : String(error));
     } finally {

From 33a7205750fe7f1e71def5f0efec612cdfbb59ac Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:02:45 +0800
Subject: [PATCH 35/67] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=B8=E9=82=BB=E5=85=83=E7=B4=A0=E8=A1=A5=E5=9B=9E=2014px?=
 =?UTF-8?q?=20=E9=97=B4=E8=B7=9D=EF=BC=9A=E5=9D=97=E7=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E7=94=9F=E6=95=88=20gap=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=B6=88=E6=81=AF=E4=B8=8E=E5=B7=A5=E5=85=B7=E5=9D=97?=
 =?UTF-8?q?=E8=B4=B4=E5=9C=A8=E4=B8=80=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src/styles.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index dce2f0225..af6ed5d53 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -12016,3 +12016,14 @@ button.design-workspace-tree__entry:hover,
   grid-column: 3;
   grid-row: 1 / span 2;
 }
+
+/* 消息之间的间距：消息列表是块级滚动容器（不是 flex/grid），基础规则里的 `gap: 14px`
+   对它无效，而被改写成 `margin-top: 0` 的 `.message + .message` 又让相邻消息贴在一起。
+   这里给列表的相邻子元素统一加间距（消息、工具调用折叠块、思考过程块都适用），
+   间距值与消息内部的行距观感一致。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  > * + * {
+  margin-top: 14px;
+}

From aab1c5c4e00871f136a99a986de8d65d9e797627 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:05:58 +0800
Subject: [PATCH 36/67] =?UTF-8?q?=E6=80=9D=E8=80=83=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E6=B6=88=E6=81=AF=E6=B5=81=E4=B8=8A=E6=96=B9?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=20latch=20=E8=B7=AF=E5=BE=84=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=97=B6=E5=8D=A0=E7=94=A8=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=AF=BC=E8=87=B4=E9=A6=96=E9=A1=B5=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E8=A2=AB=E4=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src/App.tsx        |  4 +-
 .../ProjectSupervisorView.tsx                 | 44 +++++++++----------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index f561b85e8..a65717054 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -6906,7 +6906,9 @@ export function App({
       return;
     }
     if (localProject.projectPath !== latch.projectPath) {
-      claimInitialSupervisorMessageForPage(latch.projectPath);
+      // 不能在这里先"占用"这条初始消息：项目路径可能因为分隔符/大小写/时序先落到别的
+      // 路径上，一旦占用，真正匹配的项目就再也不会收到这条消息，用户的输入被静默丢掉。
+      // 这里只等待，占用留给下面真正要发送的那一步。
       return;
     }
     if (
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 a0f965ca2..6bead003f 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
@@ -427,6 +427,28 @@ export function ProjectSupervisorView({
               {`显示更早 · 还有 ${hiddenConversationCount} 条对话`}
             </button>
           ) : null}
+          {showDesignReasoning &&
+            designReasoningEntries
+              .filter((entry) => !entry.messageId)
+              .map((entry) => (
+                <details
+                  key={`reasoning-${entry.id}`}
+                  className="design-agent-reasoning"
+                  aria-label="策划 Agent 思考过程"
+                >
+                  <summary>思考过程</summary>
+                  <pre>{entry.text}</pre>
+                </details>
+              ))}
+          {showDesignReasoning && designReasoning ? (
+            <details
+              className="design-agent-reasoning"
+              aria-label="策划 Agent 思考过程"
+            >
+              <summary>思考过程</summary>
+              <pre>{designReasoning}</pre>
+            </details>
+          ) : null}
           {visibleMessages.map((message, index) => {
             const anchoredToolCalls = message.messageId
               ? (toolCallsByAnchor.get(message.messageId) ?? [])
@@ -471,28 +493,6 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
-          {showDesignReasoning &&
-            designReasoningEntries
-              .filter((entry) => !entry.messageId)
-              .map((entry) => (
-                <details
-                  key={`reasoning-${entry.id}`}
-                  className="design-agent-reasoning"
-                  aria-label="策划 Agent 思考过程"
-                >
-                  <summary>思考过程</summary>
-                  <pre>{entry.text}</pre>
-                </details>
-              ))}
-          {showDesignReasoning && designReasoning ? (
-            <details
-              className="design-agent-reasoning"
-              aria-label="策划 Agent 思考过程"
-            >
-              <summary>思考过程</summary>
-              <pre>{designReasoning}</pre>
-            </details>
-          ) : null}
           {!directCodex && transientReply ? (
             <div
               className="message message--assistant"

From 52f1d7f08bc0bf6dadffc191346f904c5de32e6f Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:17:26 +0800
Subject: [PATCH 37/67] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E6=80=9D=E8=80=83?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E5=9D=97=E4=B8=8A=E7=A7=BB=EF=BC=9A=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=20master=20=E7=9A=84=E5=8E=9F=E5=A7=8B=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=88=E6=B6=88=E6=81=AF=E8=87=AA=E5=B8=A6=E7=9A=84?=
 =?UTF-8?q?=20reasoningText=20=E6=8A=98=E5=8F=A0=E5=9D=97=E6=9C=AC?=
 =?UTF-8?q?=E6=9D=A5=E5=B0=B1=E5=9C=A8=E6=B6=88=E6=81=AF=E9=87=8C=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=93=BE=20entries=20=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=A8=E6=B6=88=E6=81=AF=E4=B9=8B=E5=90=8E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectSupervisorView.tsx                 | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

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 6bead003f..a0f965ca2 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
@@ -427,28 +427,6 @@ export function ProjectSupervisorView({
               {`显示更早 · 还有 ${hiddenConversationCount} 条对话`}
             </button>
           ) : null}
-          {showDesignReasoning &&
-            designReasoningEntries
-              .filter((entry) => !entry.messageId)
-              .map((entry) => (
-                <details
-                  key={`reasoning-${entry.id}`}
-                  className="design-agent-reasoning"
-                  aria-label="策划 Agent 思考过程"
-                >
-                  <summary>思考过程</summary>
-                  <pre>{entry.text}</pre>
-                </details>
-              ))}
-          {showDesignReasoning && designReasoning ? (
-            <details
-              className="design-agent-reasoning"
-              aria-label="策划 Agent 思考过程"
-            >
-              <summary>思考过程</summary>
-              <pre>{designReasoning}</pre>
-            </details>
-          ) : null}
           {visibleMessages.map((message, index) => {
             const anchoredToolCalls = message.messageId
               ? (toolCallsByAnchor.get(message.messageId) ?? [])
@@ -493,6 +471,28 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
+          {showDesignReasoning &&
+            designReasoningEntries
+              .filter((entry) => !entry.messageId)
+              .map((entry) => (
+                <details
+                  key={`reasoning-${entry.id}`}
+                  className="design-agent-reasoning"
+                  aria-label="策划 Agent 思考过程"
+                >
+                  <summary>思考过程</summary>
+                  <pre>{entry.text}</pre>
+                </details>
+              ))}
+          {showDesignReasoning && designReasoning ? (
+            <details
+              className="design-agent-reasoning"
+              aria-label="策划 Agent 思考过程"
+            >
+              <summary>思考过程</summary>
+              <pre>{designReasoning}</pre>
+            </details>
+          ) : null}
           {!directCodex && transientReply ? (
             <div
               className="message message--assistant"

From 48b482afafeee15409cc48391d20b82bcb7ed04e Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:32:29 +0800
Subject: [PATCH 38/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E8=BF=9B?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=97=A0=E6=B3=95=E6=81=A2=E5=A4=8D=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E7=9A=84=20Direct=20=E5=9B=9E=E5=90=88?=
 =?UTF-8?q?=EF=BC=9ARust=20=E5=A2=9E=E5=8A=A0=E6=B4=BB=E8=B7=83=E5=9B=9E?=
 =?UTF-8?q?=E5=90=88=E5=8F=AA=E8=AF=BB=E6=8E=A2=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 read_direct_codex_active_turn 只读命令：返回当前登记的 { clientTurnId, startedAt }，供前端重进会话时接管正在跑的回合
DirectTaonierActiveInvocation 增加 started_at_ms 登记时刻，供只读探测与后续兜底释放判断这一轮的年龄
不改守卫互斥语义与 Drop 释放时机：探测既不进入也不抢占
把命令注册进 main.rs 的 invoke_handler
新增用例：登记中的回合能被只读探测看到、探测本身不占有不释放、Drop 之后回到 None
---
 .../src-tauri/src/agent/direct_runtime.rs     | 83 +++++++++++++++++++
 .../src-tauri/src/main.rs                     |  1 +
 2 files changed, 84 insertions(+)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
index 8ed0e2608..fdb024e53 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
@@ -263,12 +263,18 @@ fn direct_taonier_regeneration_invocation_sha256(invocation_id: &str) -> String
 #[derive(Debug)]
 struct DirectTaonierActiveInvocation {
     invocation_id: String,
+    /// 登记时刻（Unix 毫秒）。只读探测与"终止"兜底都用它判断这一轮的年龄。
+    started_at_ms: u64,
 }
 
 static DIRECT_TAONIER_ACTIVE_INVOCATIONS: OnceLock<
     Mutex<HashMap<PathBuf, DirectTaonierActiveInvocation>>,
 > = OnceLock::new();
 
+fn direct_taonier_active_now_millis() -> u64 {
+    unix_millis().min(u128::from(u64::MAX)) as u64
+}
+
 #[derive(Debug)]
 pub(crate) struct DirectTaonierActiveInvocationGuard {
     root: PathBuf,
@@ -300,6 +306,7 @@ impl DirectTaonierActiveInvocationGuard {
                     root.clone(),
                     DirectTaonierActiveInvocation {
                         invocation_id: invocation_id.to_string(),
+                        started_at_ms: direct_taonier_active_now_millis(),
                     },
                 );
             }
@@ -345,6 +352,46 @@ pub(crate) fn direct_taonier_active_invocation_id_at(root: &Path) -> Result<Stri
         })
 }
 
+/// `read_direct_codex_active_turn` 的返回值：前端重进会话时用它恢复正在跑的回合。
+#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectActiveTurnView {
+    /// 与事件 `turnId` 同一个身份（守卫里登记的 `invocation_id`）。
+    pub(crate) client_turn_id: String,
+    /// 这一轮登记的时刻（Unix 毫秒）。
+    pub(crate) started_at: u64,
+}
+
+/// 只读探测：该项目当前登记的 Direct 活跃回合（`None` = 没有回合在跑）。
+///
+/// 只读，不改变互斥语义与释放时机：守卫仍然只由回合自己的 `Drop` 释放。
+pub(crate) fn read_direct_taonier_active_invocation_at(
+    root: &Path,
+) -> Result<Option<DirectActiveTurnView>, String> {
+    let root = root
+        .canonicalize()
+        .map_err(|error| format!("无法锚定 Direct 调用项目目录：{error}"))?;
+    Ok(DIRECT_TAONIER_ACTIVE_INVOCATIONS
+        .get_or_init(|| Mutex::new(HashMap::new()))
+        .lock()
+        .map_err(|_| "Direct 调用身份锁已损坏".to_string())?
+        .get(&root)
+        .map(|active| DirectActiveTurnView {
+            client_turn_id: active.invocation_id.clone(),
+            started_at: active.started_at_ms,
+        }))
+}
+
+/// 只读命令：读取该项目当前登记的 Direct 活跃回合，供前端重进会话时恢复。
+///
+/// 不进入、不抢占、不释放守卫；没有回合时返回 `null`。
+#[tauri::command]
+pub(crate) fn read_direct_codex_active_turn(
+    project_path: String,
+) -> Result<Option<DirectActiveTurnView>, String> {
+    read_direct_taonier_active_invocation_at(Path::new(project_path.trim()))
+}
+
 fn direct_taonier_regeneration_project_id(root: &Path) -> Result<String, String> {
     let project_id = read_manifest(&root.join(".agent/manifest.json"))?
         .project_id
@@ -4771,6 +4818,42 @@ mod tests {
             .expect("lost-response replay after the original turn finishes");
     }
 
+    #[test]
+    fn read_direct_active_turn_reports_the_registered_turn_and_disappears_after_drop() {
+        let root = tempfile::tempdir().expect("active invocation root");
+        assert_eq!(
+            read_direct_taonier_active_invocation_at(root.path()).expect("read idle project"),
+            None
+        );
+
+        let first = DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-read-1")
+            .expect("first client turn");
+        let running = read_direct_taonier_active_invocation_at(root.path())
+            .expect("read running project")
+            .expect("running turn is visible to the read-only probe");
+        assert_eq!(running.client_turn_id, "client-turn-read-1");
+        assert!(running.started_at > 0, "{running:?}");
+        // camelCase 契约：前端按 `clientTurnId` / `startedAt` 取值。
+        assert_eq!(
+            serde_json::to_value(&running).expect("serialize view"),
+            serde_json::json!({
+                "clientTurnId": "client-turn-read-1",
+                "startedAt": running.started_at,
+            })
+        );
+        // 只读探测不占有、不释放：探测之后同项目第二次进入仍然被拒。
+        let duplicate =
+            DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-read-2")
+                .expect_err("read-only probe must not take over the project");
+        assert!(!duplicate.starts_with(DIRECT_CODEX_TURN_ALREADY_RUNNING_PREFIX));
+
+        drop(first);
+        assert_eq!(
+            read_direct_taonier_active_invocation_at(root.path()).expect("read idle project"),
+            None
+        );
+    }
+
     #[test]
     fn direct_success_reply_is_persisted_once_with_the_stable_client_turn_identity() {
         let root = tempfile::tempdir().expect("temp dir");
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 631e6d162..1ade8ccb3 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -2669,6 +2669,7 @@ fn main() {
             chat_with_game_creator_role_agent,
             chat_with_game_creator_role_agent_stream,
             chat_with_game_creator_direct_codex,
+            read_direct_codex_active_turn,
             cancel_direct_codex_turn,
             select_game_creator_reasoning_effort,
             start_planning_session_v2,

From d833ca9d32ba344962257786f72b437afbaeeb75 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:33:01 +0800
Subject: [PATCH 39/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E8=BF=9B?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=A2=AB=E5=A0=B5=E6=AD=BB=EF=BC=9A=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=E5=8F=AF=E5=85=9C=E5=BA=95=E9=87=8A=E6=94=BE=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E5=AE=88=E5=8D=AB=EF=BC=8C=E5=B9=B6=E6=8A=8A=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E6=96=87=E6=A1=88=E6=94=B9=E6=88=90=E5=8F=AF=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cancel_direct_codex_turn 返回值改为 DirectTurnCancelView{outcome, message, clientTurnId}，界面能区分"已发中断"与"守卫已被兜底释放"
cancel_direct_codex_turn_at 在拿不到可中断的活句柄（执行进程已退出 / 从没进执行器）时释放本地守卫，返回可读原因；"正在跑的是另一轮"仍保持原拒绝语义，什么都不释放
新增 release_stale_direct_taonier_active_invocation：释放条件写进注释——登记存在、clientTurnId 一致、调用方已确认执行器没有活句柄、"从没进执行器"时登记年龄还要超过 60 秒启动窗口
DirectTaonierStaleGuardReason 给出两种兜底原因与可读文案；DirectCodexActiveTurnTable 增加 registered_client_turn_id，另一轮拒绝文案提成共用常量
把"已有另一条 Direct 客户端回合正在运行"补成可操作文案：可在输入盒点终止，或等它结束后再发送（不改错误分类与前缀语义）
新增用例：同项目第二次进入仍被拒、clientTurnId 不匹配不释放、启动窗口内不释放、老过窗口释放后可再次进入、原守卫 Drop 不影响后来登记的回合
---
 .../src-tauri/src/agent.rs                    |   2 +-
 .../src-tauri/src/agent/codex_app_server.rs   | 108 ++++++++++-
 .../src-tauri/src/agent/direct_runtime.rs     | 175 +++++++++++++++++-
 .../src-tauri/src/commands.rs                 |   2 +-
 4 files changed, 271 insertions(+), 16 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent.rs b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
index 3689fa8f3..0c5645fee 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
@@ -36,7 +36,7 @@ mod skill_pack;
 use codex_app_server::*;
 pub(crate) use codex_app_server::{
     cancel_direct_codex_turn_at, direct_game_creator_codex_chat_at,
-    direct_game_creator_home_codex_chat,
+    direct_game_creator_home_codex_chat, DirectTurnCancelView,
 };
 use codex_cli::*;
 pub(crate) use codex_cli::{
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
index 38969e686..8a2104a6f 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
@@ -3105,13 +3105,23 @@ impl<T> DirectCodexActiveTurnTable<T> {
             .filter(|value| !value.is_empty())
         {
             if active.0 != expected {
-                return Err("正在运行的是另一个陶泥儿回合，已拒绝终止".to_string());
+                return Err(DIRECT_CODEX_ANOTHER_TURN_RUNNING_MESSAGE.to_string());
             }
         }
         Ok(active)
     }
+
+    /// 当前登记在这一轮上的 clientTurnId；没有任何登记时返回 `None`。
+    fn registered_client_turn_id(&self, key: &Path) -> Option<&str> {
+        self.entries
+            .get(key)
+            .map(|(client_turn_id, _)| client_turn_id.as_str())
+    }
 }
 
+/// "正在跑的是另一轮"的统一文案：`select` 与"终止"兜底路径共用，保证两处拒绝语义一致。
+const DIRECT_CODEX_ANOTHER_TURN_RUNNING_MESSAGE: &str = "正在运行的是另一个陶泥儿回合，已拒绝终止";
+
 /// 正在运行的 Direct 回合中断句柄，按项目根（canonical，去掉 Windows `\\?\` 前缀）索引。
 ///
 /// `CodexTurnStartCancellation` 本身已经能在 turn/start 响应到达**前后**发出
@@ -3170,28 +3180,106 @@ fn register_active_direct_codex_turn(
     DirectCodexActiveTurnGuard { key, cancellation }
 }
 
+/// 已向正在跑的回合发出中断：界面等这一轮自己的收尾复位。
+pub(crate) const DIRECT_TURN_CANCEL_OUTCOME_INTERRUPTED: &str = "interrupted";
+/// 这一轮已经没有人替它收尾，本地守卫已被兜底释放：界面必须自己复位。
+pub(crate) const DIRECT_TURN_CANCEL_OUTCOME_RELEASED: &str = "released";
+
+/// `cancel_direct_codex_turn` 的返回值：界面据此决定是自己复位，还是等回合自己收尾。
+#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectTurnCancelView {
+    /// [`DIRECT_TURN_CANCEL_OUTCOME_INTERRUPTED`] 或
+    /// [`DIRECT_TURN_CANCEL_OUTCOME_RELEASED`]。
+    pub(crate) outcome: String,
+    /// 给用户看的可读结果。
+    pub(crate) message: String,
+    /// 被终止 / 被释放的 clientTurnId。
+    pub(crate) client_turn_id: String,
+}
+
+/// "终止"这一步要作用在哪：发中断，还是走残留守卫兜底释放。
+enum DirectCodexTurnCancelTarget {
+    /// app-server 侧还有活句柄：正常发 `turn/interrupt`。
+    Interrupt(Arc<CodexTurnStartCancellation>),
+    /// app-server 侧已经拿不到可中断的活句柄；带上是哪种情况。
+    Stale(DirectTaonierStaleGuardReason),
+}
+
 /// 终止当前项目正在运行的 Direct 回合。
 ///
-/// 只向正在跑的 Codex app-server 回合发 `turn/interrupt`（app-server 随后回
+/// 正常路径：只向正在跑的 Codex app-server 回合发 `turn/interrupt`（app-server 随后回
 /// `turn/completed status=interrupted`，正在 await 的那个回合命令会带着可读原因返回），
 /// 不动任何既有事件或命令语义。
+///
+/// 兜底路径：app-server 侧已经拿不到可中断的活句柄时，说明这一轮不会再有人替它收尾。
+/// 只发中断会让本地守卫（`DirectTaonierActiveInvocationGuard`）永远留在进程内，用户此后
+/// 每条消息都会被"已有另一条回合正在运行"拒绝——这正是"重进会话被堵死"的死锁形态。
+/// 这时显式释放这条守卫并把可读原因返回给界面。释放条件见
+/// [`release_stale_direct_taonier_active_invocation`] 的注释；"正在跑的是另一轮"仍然
+/// 保持原拒绝语义，什么都不释放。
 pub(crate) fn cancel_direct_codex_turn_at(
     root: &Path,
     client_turn_id: Option<&str>,
-) -> Result<(), String> {
+) -> Result<DirectTurnCancelView, String> {
     let key = direct_codex_active_turn_key(root);
-    let cancellation = {
+    let expected = client_turn_id
+        .map(str::trim)
+        .filter(|value| !value.is_empty());
+    {
         let entries = direct_codex_active_turns()
             .lock()
             .map_err(|_| "Direct 回合中断表已损坏，无法终止".to_string())?;
-        let (_, cancellation) = entries.select(&key, client_turn_id)?;
-        if !cancellation.app_server_alive() {
-            return Err("陶泥儿执行进程已退出，无法终止本轮；请重新发送这条消息".to_string());
+        if let (Some(registered), Some(expected)) =
+            (entries.registered_client_turn_id(&key), expected)
+        {
+            if registered != expected {
+                return Err(DIRECT_CODEX_ANOTHER_TURN_RUNNING_MESSAGE.to_string());
+            }
+        }
+    }
+    let target = {
+        let entries = direct_codex_active_turns()
+            .lock()
+            .map_err(|_| "Direct 回合中断表已损坏，无法终止".to_string())?;
+        match entries.select(&key, client_turn_id) {
+            Ok((_, cancellation)) if cancellation.app_server_alive() => {
+                DirectCodexTurnCancelTarget::Interrupt(Arc::clone(cancellation))
+            }
+            Ok(_) => {
+                DirectCodexTurnCancelTarget::Stale(DirectTaonierStaleGuardReason::ExecutorExited)
+            }
+            Err(_) => DirectCodexTurnCancelTarget::Stale(
+                DirectTaonierStaleGuardReason::NeverReachedExecutor,
+            ),
         }
-        Arc::clone(cancellation)
     };
-    cancellation.cancel();
-    Ok(())
+    match target {
+        DirectCodexTurnCancelTarget::Interrupt(cancellation) => {
+            cancellation.cancel();
+            Ok(DirectTurnCancelView {
+                outcome: DIRECT_TURN_CANCEL_OUTCOME_INTERRUPTED.to_string(),
+                message: "已向正在运行的回合发出终止".to_string(),
+                client_turn_id: client_turn_id
+                    .map(str::trim)
+                    .filter(|value| !value.is_empty())
+                    .unwrap_or_default()
+                    .to_string(),
+            })
+        }
+        DirectCodexTurnCancelTarget::Stale(reason) => {
+            let released =
+                release_stale_direct_taonier_active_invocation(root, client_turn_id, reason)?;
+            Ok(DirectTurnCancelView {
+                outcome: DIRECT_TURN_CANCEL_OUTCOME_RELEASED.to_string(),
+                message: format!(
+                    "{}，已释放这一轮的占用，可以直接重新发送消息",
+                    reason.message()
+                ),
+                client_turn_id: released,
+            })
+        }
+    }
 }
 
 struct CodexThreadLease {
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
index fdb024e53..381ce175a 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
@@ -263,7 +263,9 @@ fn direct_taonier_regeneration_invocation_sha256(invocation_id: &str) -> String
 #[derive(Debug)]
 struct DirectTaonierActiveInvocation {
     invocation_id: String,
-    /// 登记时刻（Unix 毫秒）。只读探测与"终止"兜底都用它判断这一轮的年龄。
+    /// 登记时刻（Unix 毫秒）。只用于判断一条登记的年龄：见
+    /// [`DIRECT_TAONIER_STALE_GUARD_MIN_AGE_MS`] 与
+    /// [`release_stale_direct_taonier_active_invocation`]。
     started_at_ms: u64,
 }
 
@@ -271,6 +273,12 @@ static DIRECT_TAONIER_ACTIVE_INVOCATIONS: OnceLock<
     Mutex<HashMap<PathBuf, DirectTaonierActiveInvocation>>,
 > = OnceLock::new();
 
+/// 一条"app-server 侧完全没有登记"的守卫，只有在存在时间超过这个量级后才允许被
+/// "终止"兜底释放。一轮 Direct 回合在进入 app-server 之前只做本地准备（读配置、
+/// 读 manifest、拼系统提示、开审计），是秒级的；超过这个窗口还没登记，说明这一轮
+/// 不可能再进入执行器，守卫是残留。
+const DIRECT_TAONIER_STALE_GUARD_MIN_AGE_MS: u64 = 60_000;
+
 fn direct_taonier_active_now_millis() -> u64 {
     unix_millis().min(u128::from(u64::MAX)) as u64
 }
@@ -297,8 +305,9 @@ impl DirectTaonierActiveInvocationGuard {
                         "{DIRECT_CODEX_TURN_ALREADY_RUNNING_PREFIX} 当前 Direct 客户端回合仍在运行，已拒绝并发复用同一 clientTurnId"
                     )
                 } else {
-                    "当前项目已有另一条 Direct 客户端回合正在运行，已拒绝混用付费生成身份"
-                        .to_string()
+                    format!(
+                        "当前项目已有另一条 Direct 客户端回合正在运行，已拒绝混用付费生成身份；可在输入盒点「终止」结束它，或等它结束后再发送"
+                    )
                 });
             }
             None => {
@@ -364,7 +373,8 @@ pub(crate) struct DirectActiveTurnView {
 
 /// 只读探测：该项目当前登记的 Direct 活跃回合（`None` = 没有回合在跑）。
 ///
-/// 只读，不改变互斥语义与释放时机：守卫仍然只由回合自己的 `Drop` 释放。
+/// 只读，不改变互斥语义与释放时机：守卫仍然只由回合自己的 `Drop` 或
+/// [`release_stale_direct_taonier_active_invocation`] 释放。
 pub(crate) fn read_direct_taonier_active_invocation_at(
     root: &Path,
 ) -> Result<Option<DirectActiveTurnView>, String> {
@@ -392,6 +402,73 @@ pub(crate) fn read_direct_codex_active_turn(
     read_direct_taonier_active_invocation_at(Path::new(project_path.trim()))
 }
 
+/// "终止"拿不到可中断句柄时的分类，决定是否允许强制释放本地守卫。
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum DirectTaonierStaleGuardReason {
+    /// app-server 侧登记着这一轮，但执行进程已经退出：这一轮不可能再有收尾。
+    ExecutorExited,
+    /// app-server 侧完全没有这一轮的登记：只有过了正常启动窗口才允许释放。
+    NeverReachedExecutor,
+}
+
+impl DirectTaonierStaleGuardReason {
+    pub(crate) fn message(self) -> &'static str {
+        match self {
+            Self::ExecutorExited => "陶泥儿执行进程已退出",
+            Self::NeverReachedExecutor => "这一轮 Direct 回合没有进入执行器",
+        }
+    }
+}
+
+/// 强制释放某项目登记的 Direct 活跃回合占用（"终止"的兜底出口）。
+///
+/// 释放条件（四条必须同时成立，这段注释就是契约）：
+/// 1. 项目路径能 canonicalize，且守卫表里确实登记了这一轮；
+/// 2. 传了 `expected_client_turn_id` 时必须与登记一致——绝不误伤另一条回合；
+/// 3. 调用方已确认 app-server 侧没有可中断的活句柄，即 `reason` 成立；
+/// 4. `reason == NeverReachedExecutor` 时，这条登记的年龄必须超过
+///    [`DIRECT_TAONIER_STALE_GUARD_MIN_AGE_MS`]，排除"刚进入、还在本地准备阶段"
+///    的正常启动窗口——那种情况下这一轮马上就会去执行器，释放等于放开并发。
+///
+/// 移除后原守卫的 `Drop` 变成空操作（`invocation_id` 已不在表里），所以释放是幂等的；
+/// 释放只影响"能否开始新回合"，不动任何正在跑的回合事件。
+pub(crate) fn release_stale_direct_taonier_active_invocation(
+    root: &Path,
+    expected_client_turn_id: Option<&str>,
+    reason: DirectTaonierStaleGuardReason,
+) -> Result<String, String> {
+    let root = root
+        .canonicalize()
+        .map_err(|error| format!("无法锚定 Direct 调用项目目录：{error}"))?;
+    let mut active = DIRECT_TAONIER_ACTIVE_INVOCATIONS
+        .get_or_init(|| Mutex::new(HashMap::new()))
+        .lock()
+        .map_err(|_| "Direct 调用身份锁已损坏，无法释放".to_string())?;
+    let Some(existing) = active.get(&root) else {
+        return Err("当前项目没有正在运行的陶泥儿回合，无法终止".to_string());
+    };
+    if let Some(expected) = expected_client_turn_id
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    {
+        if existing.invocation_id != expected {
+            return Err("正在运行的是另一条 Direct 客户端回合，已拒绝终止".to_string());
+        }
+    }
+    if reason == DirectTaonierStaleGuardReason::NeverReachedExecutor {
+        let age_ms = direct_taonier_active_now_millis().saturating_sub(existing.started_at_ms);
+        if age_ms < DIRECT_TAONIER_STALE_GUARD_MIN_AGE_MS {
+            return Err(format!(
+                "这一轮 Direct 客户端回合刚开始 {} 秒、还在准备中，暂不能强制释放；请稍后再试",
+                age_ms / 1000
+            ));
+        }
+    }
+    let released = existing.invocation_id.clone();
+    active.remove(&root);
+    Ok(released)
+}
+
 fn direct_taonier_regeneration_project_id(root: &Path) -> Result<String, String> {
     let project_id = read_manifest(&root.join(".agent/manifest.json"))?
         .project_id
@@ -4854,6 +4931,96 @@ mod tests {
         );
     }
 
+    #[test]
+    fn stale_guard_release_requires_a_matching_identity_and_only_after_the_start_window() {
+        let root = tempfile::tempdir().expect("active invocation root");
+        let first = DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-stale-1")
+            .expect("first client turn");
+
+        // ① clientTurnId 不匹配：拒绝，且不误伤正在跑的那一轮。
+        let mismatch = release_stale_direct_taonier_active_invocation(
+            root.path(),
+            Some("client-turn-stale-2"),
+            DirectTaonierStaleGuardReason::ExecutorExited,
+        )
+        .expect_err("another turn must not be released");
+        assert!(mismatch.contains("另一条"), "{mismatch}");
+        assert!(
+            DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-stale-2").is_err()
+        );
+
+        // ② 刚登记、还没进执行器：正常启动窗口内不许释放（释放等于放开并发）。
+        let young = release_stale_direct_taonier_active_invocation(
+            root.path(),
+            Some("client-turn-stale-1"),
+            DirectTaonierStaleGuardReason::NeverReachedExecutor,
+        )
+        .expect_err("a freshly registered turn is still starting");
+        assert!(young.contains("暂不能强制释放"), "{young}");
+
+        // ③ 同一条登记老过窗口：判定为残留守卫，释放后同项目可以再次进入。
+        backdate_active_direct_invocation(root.path(), DIRECT_TAONIER_STALE_GUARD_MIN_AGE_MS + 1);
+        let released = release_stale_direct_taonier_active_invocation(
+            root.path(),
+            Some("client-turn-stale-1"),
+            DirectTaonierStaleGuardReason::NeverReachedExecutor,
+        )
+        .expect("stale guard is released");
+        assert_eq!(released, "client-turn-stale-1");
+        let second = DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-stale-2")
+            .expect("a new turn can start once the stale guard is released");
+        // 释放是幂等的：原 guard 的 Drop 不会影响后来登记的那一轮。
+        drop(first);
+        let still_running = read_direct_taonier_active_invocation_at(root.path())
+            .expect("read running project")
+            .expect("the newer turn survives the stale guard drop");
+        assert_eq!(still_running.client_turn_id, "client-turn-stale-2");
+        drop(second);
+    }
+
+    #[test]
+    fn stale_guard_release_after_the_executor_exited_frees_the_project() {
+        let root = tempfile::tempdir().expect("active invocation root");
+        let first = DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-exited-1")
+            .expect("client turn");
+        let released = release_stale_direct_taonier_active_invocation(
+            root.path(),
+            None,
+            DirectTaonierStaleGuardReason::ExecutorExited,
+        )
+        .expect("executor exited: this guard is residue");
+        assert_eq!(released, "client-turn-exited-1");
+        assert_eq!(
+            read_direct_taonier_active_invocation_at(root.path()).expect("read idle project"),
+            None
+        );
+        let _second =
+            DirectTaonierActiveInvocationGuard::enter(root.path(), "client-turn-exited-2")
+                .expect("a new turn can start after the residue is released");
+        drop(first);
+
+        // 没有任何登记时给出可读原因，而不是静默成功。
+        let empty = tempfile::tempdir().expect("empty invocation root");
+        let nothing = release_stale_direct_taonier_active_invocation(
+            empty.path(),
+            None,
+            DirectTaonierStaleGuardReason::ExecutorExited,
+        )
+        .expect_err("nothing to release");
+        assert!(nothing.contains("没有正在运行"), "{nothing}");
+    }
+
+    /// 把某项目当前登记的活跃回合往前拨 `age_ms`，用于覆盖"守卫年龄"分支。
+    fn backdate_active_direct_invocation(root: &Path, age_ms: u64) {
+        let root = root.canonicalize().expect("canonical root");
+        let mut active = DIRECT_TAONIER_ACTIVE_INVOCATIONS
+            .get_or_init(|| Mutex::new(HashMap::new()))
+            .lock()
+            .expect("active invocation lock");
+        let entry = active.get_mut(&root).expect("registered invocation");
+        entry.started_at_ms = entry.started_at_ms.saturating_sub(age_ms);
+    }
+
     #[test]
     fn direct_success_reply_is_persisted_once_with_the_stable_client_turn_identity() {
         let root = tempfile::tempdir().expect("temp dir");
diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index 09fafbb2a..026fb00d9 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -1997,7 +1997,7 @@ pub(crate) fn write_game_creator_app_config(
 pub(crate) fn cancel_direct_codex_turn(
     project_path: String,
     client_turn_id: Option<String>,
-) -> Result<(), String> {
+) -> Result<DirectTurnCancelView, String> {
     let root = Path::new(project_path.trim());
     enforce_project_permission_policy(root, "agent.kill")?;
     cancel_direct_codex_turn_at(root, client_turn_id.as_deref())

From e788bf0feac86c5591b26fe953b064d8271badf9 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:33:25 +0800
Subject: [PATCH 40/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E8=BF=9B?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=A2=AB=E5=A0=B5=E6=AD=BB=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=BC=80=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=8E=A5?=
 =?UTF-8?q?=E7=AE=A1=E4=BB=8D=E5=9C=A8=E8=BF=90=E8=A1=8C=E7=9A=84=20Direct?=
 =?UTF-8?q?=20=E5=9B=9E=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

打开项目读项目对话之后调用 read_direct_codex_active_turn，返回回合时把它设回 activeDirectCodexTurnRef（字段与既有两处赋值同形），并置 directCodexStatus=running、chatAgentBusy=true，让过程卡、"任务执行中"与输入盒的终止按钮都出现
只读探测失败或没有回合等于没有回合，不影响打开项目；同一项目已接管时不重复接管，避免 /history 之类重读把 lastSequence 归零
恢复出来的回合挂 15 秒看门狗：窗口内一条本回合事件都没有，就在过程卡与输入盒提示"该回合已无响应，可在输入盒点「终止」结束它以继续"；收到真实事件立刻撤掉提示与看门狗
终止按 cancel_direct_codex_turn 的返回值分流：outcome=released 说明守卫已被后端兜底释放、没有回合 promise 会回来复位，界面自己复位并展示后端可读原因；interrupted 仍等回合自身收尾
发消息若仍被"已有另一条 Direct 客户端回合正在运行"拒绝，延时接管那条回合并把出口写进提示（不与同 clientTurnId 的既有分类混用，新增独立判定）
新增 DirectActiveTurnView / DirectTurnCancelView 两个命令返回类型
---
 apps/ai-game-creator-shell/src/App.tsx      | 190 +++++++++++++++++++-
 apps/ai-game-creator-shell/src/app/types.ts |  26 +++
 2 files changed, 210 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index a65717054..d08172319 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -55,6 +55,8 @@ import type {
   DesignClarificationRequest,
   DesignEvent,
   DesignView,
+  DirectActiveTurnView,
+  DirectTurnCancelView,
   GameCreatorAgentRuntimeUpdateEvent,
   GameCreatorChatAgentReply,
   GameCreatorDirectToolCall,
@@ -297,6 +299,18 @@ const DIRECT_CODEX_PRODUCT_RUNTIME = true;
 const DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX = 'direct-codex:';
 const DIRECT_CODEX_TURN_ALREADY_RUNNING_ERROR_PREFIX =
   'direct-codex-turn-already-running:';
+/** 与 Rust 侧 `DirectTaonierActiveInvocationGuard::enter` 的 else 分支文案保持一致。 */
+const DIRECT_CODEX_ANOTHER_TURN_RUNNING_ERROR_MARKER =
+  '当前项目已有另一条 Direct 客户端回合正在运行';
+/**
+ * 恢复出来的回合多久没有任何事件就算"没响应"。Rust 守卫是进程内的：重进会话时它还在，
+ * 但 app-server 侧可能早就没了。这时界面必须给出明确动作，而不是让用户一直等。
+ */
+const DIRECT_CODEX_RECOVERED_TURN_STALLED_MS = 15_000;
+const DIRECT_CODEX_RECOVERED_TURN_STALLED_NOTICE =
+  '该回合已无响应，可在输入盒点「终止」结束它以继续';
+const DIRECT_CODEX_RECOVERED_TURN_STARTED_DETAIL =
+  '已恢复正在运行的回合，正在等待陶泥儿的最新进度';
 
 function isDirectCodexAuthenticationRequired(error: unknown) {
   const message = error instanceof Error ? error.message : String(error);
@@ -492,6 +506,16 @@ export function isDirectCodexTurnAlreadyRunningError(error: unknown) {
     .startsWith(DIRECT_CODEX_TURN_ALREADY_RUNNING_ERROR_PREFIX);
 }
 
+/**
+ * 另一条 Direct 回合占着这个项目时的拒绝。它与上面那条同 clientTurnId 的拒绝分属不同
+ * 错误分类（Rust 侧刻意不带前缀），但对界面是同一件事：本项目现在有一条我们没接管的
+ * 回合在跑。所以这里单独判定，让它也走"接管它 + 告诉用户出口"的处理。
+ */
+export function isDirectCodexAnotherTurnRunningError(error: unknown) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes(DIRECT_CODEX_ANOTHER_TURN_RUNNING_ERROR_MARKER);
+}
+
 /**
  * 用户点了"终止"以后，正在 await 的回合命令会带着 app-server 的中断原因返回
  * （`Codex app-server turn 已中断`）。这类错误是用户主动取消，不是失败：界面要给
@@ -827,6 +851,15 @@ export function App({
     receivedDirectUpdate: boolean;
   } | null>(null);
   const lastDirectCodexActivityRef = useRef<string | null>(null);
+  /**
+   * 重进会话后从 Rust 恢复出来的回合：只有在恢复后的第一个窗口内一直收不到事件，
+   * 才判定"这一轮其实已经没响应"，给出终止出口。收到任何一条本回合事件就撤掉。
+   */
+  const recoveredDirectCodexTurnRef = useRef<{
+    projectPath: string;
+    turnId: string;
+  } | null>(null);
+  const recoveredDirectCodexTurnTimerRef = useRef<number | null>(null);
   const directCodexConversationTurnSequenceRef = useRef(0);
   // 工具调用卡片：按 **id** 归并（实时增量 + 回读历史共用一份），同一 id 只渲染一次。
   // 用 ref 做写入基准，避免同一批事件里多条增量互相覆盖。
@@ -899,6 +932,7 @@ export function App({
   }
 
   function resetDirectCodexTurn() {
+    clearRecoveredDirectCodexTurnWatch();
     activeDirectCodexTurnRef.current = null;
     lastDirectCodexActivityRef.current = null;
     setDirectCodexProgress('');
@@ -910,6 +944,106 @@ export function App({
     setDirectCodexTransientReplyUpdatedAt(null);
   }
 
+  /** 撤掉"恢复出来的回合没响应"的看门狗；回合正常结束、被终止、或收到事件时都要撤。 */
+  function clearRecoveredDirectCodexTurnWatch() {
+    if (recoveredDirectCodexTurnTimerRef.current !== null) {
+      window.clearTimeout(recoveredDirectCodexTurnTimerRef.current);
+      recoveredDirectCodexTurnTimerRef.current = null;
+    }
+    recoveredDirectCodexTurnRef.current = null;
+  }
+
+  /**
+   * 给恢复出来的回合挂一个看门狗：一个窗口内没有任何本回合事件，就说明 app-server 侧
+   * 其实已经没了、Rust 守卫是残留。这时把可读动作放到过程卡与输入盒提示上，用户点
+   * 「终止」会走 `cancel_direct_codex_turn` 的兜底释放（见 handleCancelDirectCodexTurn）。
+   * 收到任何一条本回合事件就由调用方撤掉它，绝不会覆盖真实的进度文案。
+   */
+  function watchRecoveredDirectCodexTurn(projectPath: string, turnId: string) {
+    clearRecoveredDirectCodexTurnWatch();
+    recoveredDirectCodexTurnRef.current = { projectPath, turnId };
+    recoveredDirectCodexTurnTimerRef.current = window.setTimeout(() => {
+      recoveredDirectCodexTurnTimerRef.current = null;
+      const watch = recoveredDirectCodexTurnRef.current;
+      const activeTurn = activeDirectCodexTurnRef.current;
+      if (
+        !watch ||
+        watch.projectPath !== projectPath ||
+        watch.turnId !== turnId ||
+        activeTurn?.projectPath !== projectPath ||
+        activeTurn.turnId !== turnId ||
+        activeTurn.receivedDirectUpdate
+      ) {
+        return;
+      }
+      setDirectCodexStatus('running');
+      setDirectCodexProgress(DIRECT_CODEX_RECOVERED_TURN_STALLED_NOTICE);
+      setDirectCodexProgressUpdatedAt(Date.now());
+      setChatComposerNotice(DIRECT_CODEX_RECOVERED_TURN_STALLED_NOTICE);
+    }, DIRECT_CODEX_RECOVERED_TURN_STALLED_MS);
+  }
+
+  /**
+   * 重进会话时接管仍在运行的 Direct 回合。
+   *
+   * 背景：活跃回合的守卫（`DirectTaonierActiveInvocationGuard`）是 Rust 进程内的，重开
+   * 项目时前端 `activeDirectCodexTurnRef` 是空的——界面既不订阅这一轮的事件，也不显示
+   * 过程卡，用户再发消息只会被守卫拒绝。这里把后端登记的回合读回来重新接管。
+   *
+   * 只读探测，不改后端回合本身；探测失败（老二进制没有这个命令、路径读不到）等于没有
+   * 回合，不影响打开项目。
+   */
+  async function restoreRunningDirectCodexTurn(projectPath: string) {
+    if (!directCodexProductRuntime || !projectPath) {
+      return;
+    }
+    const invoke = resolveTauriInvoke();
+    if (!invoke) {
+      return;
+    }
+    // 本组件已经接管这个项目：`/history` 之类的重复读取不能把 lastSequence 归零。
+    if (activeDirectCodexTurnRef.current?.projectPath === projectPath) {
+      return;
+    }
+    let activeView: DirectActiveTurnView | null = null;
+    try {
+      activeView = await invoke<DirectActiveTurnView | null>(
+        'read_direct_codex_active_turn',
+        { projectPath },
+      );
+    } catch {
+      return;
+    }
+    const clientTurnId = activeView?.clientTurnId?.trim();
+    if (!clientTurnId) {
+      return;
+    }
+    if (
+      localProjectPathRef.current !== projectPath ||
+      activeDirectCodexTurnRef.current?.projectPath === projectPath
+    ) {
+      return;
+    }
+    activeDirectCodexTurnRef.current = {
+      projectPath,
+      turnId: clientTurnId,
+      // 与下面发起回合的两处赋值同形（`lastSequence: -1`）：Rust 侧 emitter 的 sequence
+      // 从 1 开始，所以恢复后到达的第一批事件不会被 sequence 过滤丢掉。
+      lastSequence: -1,
+      receivedDirectUpdate: false,
+    };
+    setChatAgentBusy(true);
+    setDirectCodexStatus('running');
+    setDirectCodexProcessKey(`${projectPath}\u0000${clientTurnId}`);
+    setDirectCodexProgress(DIRECT_CODEX_RECOVERED_TURN_STARTED_DETAIL);
+    setDirectCodexProgressUpdatedAt(Date.now());
+    setDirectCodexTransientReply('');
+    directCodexTransientReplyRef.current = '';
+    setDirectCodexTransientReplyUpdatedAt(null);
+    setProjectSupervisorRuntimeError('');
+    watchRecoveredDirectCodexTurn(projectPath, clientTurnId);
+  }
+
   /** 工具调用卡片按项目维度作废：换项目 / 重开历史时整体替换，避免串项目。 */
   function replaceDirectToolCalls(next: readonly GameCreatorDirectToolCall[]) {
     const normalized = next
@@ -1959,6 +2093,19 @@ export function App({
         }
         activeTurn.lastSequence = payload.sequence;
         activeTurn.receivedDirectUpdate = true;
+        // 恢复出来的回合只要回来一条真实事件，就不再是"没响应"，撤掉看门狗与那句提示。
+        if (
+          recoveredDirectCodexTurnRef.current?.projectPath ===
+            payload.projectPath &&
+          recoveredDirectCodexTurnRef.current.turnId === payload.turnId
+        ) {
+          clearRecoveredDirectCodexTurnWatch();
+          setChatComposerNotice((current) =>
+            current === DIRECT_CODEX_RECOVERED_TURN_STALLED_NOTICE
+              ? ''
+              : current,
+          );
+        }
         // 工具调用增量：字段可选，老事件（undefined）走原路径，行为不变。
         if (payload.toolCalls?.length) {
           applyDirectToolCalls(
@@ -3631,6 +3778,9 @@ export function App({
           { projectPath: nextProjectPath },
         ).catch(() => []);
         replaceDirectToolCalls(persistedToolCalls);
+        // 重进会话时 Rust 侧可能仍登记着上一条 Direct 回合。不接管的话界面既不显示
+        // 过程卡也不给终止入口，用户再发消息只会被守卫拒绝（"已有另一条回合正在运行"）。
+        await restoreRunningDirectCodexTurn(nextProjectPath);
       }
       let supervisorConversation: LocalConversationResult | null = null;
       let runtime: AgentRuntimeState | null = null;
@@ -6658,12 +6808,21 @@ export function App({
             await refreshDirectProjectManifest(directProjectPath);
           }
         } catch (error) {
-          if (isDirectCodexTurnAlreadyRunningError(error)) {
+          if (
+            isDirectCodexTurnAlreadyRunningError(error) ||
+            isDirectCodexAnotherTurnRunningError(error)
+          ) {
             if (localProjectPathRef.current === directProjectPath) {
               clearDirectCodexTransientReply(directProjectPath, clientTurnId);
               setProjectSupervisorRuntimeError(
-                '陶泥儿仍在处理这条消息，请稍候刷新对话。',
+                '陶泥儿仍在处理上一条消息，可在输入盒点「终止」结束它，或等它结束后再发送。',
               );
+              // 兜底：出现这条拒绝说明本项目确实有回合在跑，而本组件此前没接管它
+              // （重进会话的漏网情况）。放到当前任务之后再接管，避开本回合 finally
+              // 里 setChatAgentBusy(false) 的复位竞态。
+              window.setTimeout(() => {
+                void restoreRunningDirectCodexTurn(directProjectPath);
+              }, 0);
             }
             return;
           }
@@ -12112,11 +12271,30 @@ export function App({
     setDirectCodexTurnCancelling(true);
     setChatComposerNotice('正在终止当前回合');
     try {
-      await invoke('cancel_direct_codex_turn', {
-        projectPath: directProjectPath,
-        clientTurnId: activeTurn.turnId,
-      });
+      const result = await invoke<DirectTurnCancelView>(
+        'cancel_direct_codex_turn',
+        {
+          projectPath: directProjectPath,
+          clientTurnId: activeTurn.turnId,
+        },
+      );
+      const message = result?.message?.trim();
+      if (result?.outcome === 'released') {
+        // 这一轮已经没有人替它收尾（执行进程已退出 / 从没进执行器），Rust 侧已强制释放
+        // 守卫。没有会 return 的回合 promise 来复位界面，这里必须自己复位，否则过程卡
+        // 与"任务执行中"会一直挂着，用户仍然发不出消息。
+        resetDirectCodexTurn();
+        setChatAgentBusy(false);
+        setProjectSupervisorRuntimeError('');
+        setChatComposerNotice(
+          message ?? '已结束这一轮占用，可以直接重新发送消息',
+        );
+        return;
+      }
       setDirectCodexProgress('正在终止当前回合');
+      if (message) {
+        setChatComposerNotice(message);
+      }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       setProjectSupervisorRuntimeError(`终止失败：${message}`);
diff --git a/apps/ai-game-creator-shell/src/app/types.ts b/apps/ai-game-creator-shell/src/app/types.ts
index cb5965504..6661b0649 100644
--- a/apps/ai-game-creator-shell/src/app/types.ts
+++ b/apps/ai-game-creator-shell/src/app/types.ts
@@ -1162,6 +1162,32 @@ export interface GameCreatorDirectTurnUpdateEvent {
   updatedAt: number;
 }
 
+/**
+ * `read_direct_codex_active_turn` 的返回值：Rust 进程内当前登记的 Direct 活跃回合。
+ *
+ * 重进会话时用它把前端的"当前活跃回合"接管回来，否则界面不知道有回合在跑，
+ * 既不显示过程卡也不给终止入口，用户再发消息只会被守卫拒绝。
+ */
+export interface DirectActiveTurnView {
+  /** 与回合事件的 `turnId` 同一个身份。 */
+  clientTurnId: string;
+  /** 这一轮登记的时刻（Unix 毫秒）。 */
+  startedAt: number;
+}
+
+/** `cancel_direct_codex_turn` 的返回值。 */
+export interface DirectTurnCancelView {
+  /**
+   * `interrupted` = 已向正在跑的回合发出中断，界面等这一轮自己的收尾复位；
+   * `released` = app-server 侧已无句柄，本轮守卫被兜底释放，界面必须自己复位。
+   */
+  outcome: string;
+  /** 给用户看的可读结果。 */
+  message: string;
+  /** 被终止 / 被释放的 clientTurnId。 */
+  clientTurnId: string;
+}
+
 export interface AgentRunControlResult {
   runId: string;
   status: string;

From 7161e934e08c759d91f387b64a2087ea1707b52b Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:39:36 +0800
Subject: [PATCH 41/67] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=9B=9E=E8=AF=BB?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=B0=9A=E6=9C=AA=E8=90=BD=E7=9B=98=E7=9A=84?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E6=B6=88=E6=81=AF=EF=BC=9B=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B=E5=8D=A1=E4=B8=8D=E5=86=8D=E6=B8=B2=E6=9F=93=E6=B5=81?=
 =?UTF-8?q?=E5=BC=8F=E6=AD=A3=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src/App.tsx        | 50 +++++++++++++++++--
 .../ProjectSupervisorView.tsx                 | 10 +---
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index a65717054..ff02c78bd 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -534,6 +534,41 @@ function claimInitialSupervisorMessageForPage(projectPath: string) {
   return true;
 }
 
+/**
+ * 历史回读与"尚未落盘的运行时消息"合并。
+ *
+ * 初始需求是**乐观插入**到 messages 的（latch 命中后先插一条 user 消息，再发起回合），
+ * 而历史回读在 replace 分支里是无条件整体替换 —— 只要回读晚于乐观插入，那条用户消息
+ * 就会被冲掉（界面上看不到初始需求，但回合其实已经跑起来了）。
+ * 这里把当前 messages 里"运行时拥有、且回读结果里没有"的消息保留在末尾（它们是最新的）。
+ */
+function mergeLoadedConversationWithPendingRuntimeMessages(
+  loaded: ChatMessage[],
+  current: ChatMessage[],
+): ChatMessage[] {
+  if (current.length === 0) {
+    return loaded;
+  }
+  const loadedIds = new Set(
+    loaded
+      .map((message) => message.messageId)
+      .filter((id): id is string => Boolean(id)),
+  );
+  const loadedTexts = new Set(
+    loaded.map((message) => `${message.role}\u0000${message.text}`),
+  );
+  const pending = current.filter((message) => {
+    if (!message.runtimeOwned) {
+      return false;
+    }
+    if (message.messageId) {
+      return !loadedIds.has(message.messageId);
+    }
+    return !loadedTexts.has(`${message.role}\u0000${message.text}`);
+  });
+  return pending.length > 0 ? [...loaded, ...pending] : loaded;
+}
+
 export { AuthenticatedClient } from './app/AuthenticatedClient';
 export type { PendingCommand } from './app/types';
 export {
@@ -3475,8 +3510,12 @@ export function App({
       setProjectSupervisorResponseStream(null);
     }
     setConversationVisibleCount(CONVERSATION_INITIAL_VISIBLE_COUNT);
-    setMessages(() => {
-      const nextMessages = conversationMessages;
+    setMessages((current) => {
+      // 不能整体替换：乐观插入、尚未落盘的用户消息会被冲掉（初始需求看不到就是这个原因）。
+      const nextMessages = mergeLoadedConversationWithPendingRuntimeMessages(
+        conversationMessages,
+        current,
+      );
       savedConversationProjectPathRef.current = nextProjectPath;
       savedConversationCountRef.current = nextMessages.length;
       latestMessagesRef.current = nextMessages;
@@ -3690,7 +3729,12 @@ export function App({
       }
       setProjectSupervisorRuntimeError(runtimeError || resumeError);
       setMessages((current) => {
-        const nextConversationMessages = conversationMessages;
+        // replace 分支同样不能丢掉尚未落盘的运行时消息（初始需求）。
+        const nextConversationMessages =
+          mergeLoadedConversationWithPendingRuntimeMessages(
+            conversationMessages,
+            current,
+          );
         const hasOnlyDefaultGreeting =
           current.length === 1 &&
           current[0]?.role === 'assistant' &&
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 a0f965ca2..3358312d0 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
@@ -591,15 +591,7 @@ export function ProjectSupervisorView({
                   : '陶泥儿正在处理'}
               </strong>
             </header>
-            {transientReply ? (
-              <div aria-label="陶泥儿实时回复">
-                <ChatMarkdownMessage
-                  role="assistant"
-                  text={transientReply}
-                  streaming
-                />
-              </div>
-            ) : null}
+
             {directProcessDetail ? (
               <div className="project-supervisor-process-detail">
                 <p

From a3cedb5d506c4d85f786ef91589d24920e9f306c Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:47:45 +0800
Subject: [PATCH 42/67] =?UTF-8?q?=E5=90=88=E5=B9=B6=20origin/master?=
 =?UTF-8?q?=EF=BC=88AGC=20=E7=BB=9F=E4=B8=80=E9=94=99=E8=AF=AF=E8=AF=8A?=
 =?UTF-8?q?=E6=96=AD=20/=20=E5=9B=BE=E9=9B=86=E8=BF=9E=E9=80=9A=E5=9F=9F?=
 =?UTF-8?q?=E5=88=87=E5=88=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- commands.rs：接入 master 新增的 read_agent_runtime_error_detail 命令，并补上 prepare_local_project_asset_generation 里新增的 slice_mode / grid_x / grid_y 三个字段
- main.rs：注册 read_agent_runtime_error_detail
- 保留我们这边的 read_direct_tool_calls 等命令，两侧新增全部保留
- 冲突原为纯追加，按"两侧语义都保住"处理；未跑测试
---
 .../src-tauri/src/commands.rs                 | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index 09fafbb2a..5b6484b27 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -4617,6 +4617,9 @@ pub(crate) fn prepare_local_project_asset_generation(
             .unwrap_or_else(|| LOCAL_PROJECT_ASSET_DEFAULT_ASSET_NAME.to_string()),
             replace_existing: false,
             slice_count: None,
+            slice_mode: None,
+            grid_x: None,
+            grid_y: None,
         },
     })
 }
@@ -5264,6 +5267,37 @@ pub(crate) async fn read_direct_project_conversation(
     .map_err(|error| format!("读取 DirectProject 历史后台任务失败：{error}"))?
 }
 
+#[tauri::command]
+pub(crate) async fn read_agent_runtime_error_detail(
+    project_path: String,
+    detail_ref: String,
+) -> Result<String, String> {
+    tauri::async_runtime::spawn_blocking(move || {
+        let root = Path::new(project_path.trim());
+        enforce_project_permission_policy(root, "conversation.read")?;
+        let relative = detail_ref.trim();
+        let Some(file_name) = relative.strip_prefix(".agent/runtime/errors/") else {
+            return Err("错误诊断引用不在项目错误目录内".to_string());
+        };
+        if file_name.is_empty()
+            || file_name.contains(['/', '\\'])
+            || file_name.contains("..")
+            || !file_name.ends_with(".json")
+        {
+            return Err("错误诊断引用格式无效".to_string());
+        }
+        let path = root.join(relative);
+        prepare_game_creator_private_path_for_read(&path, false, "统一错误诊断")?;
+        let bytes = std::fs::read(&path).map_err(|error| format!("读取错误诊断失败：{error}"))?;
+        if bytes.len() > 16 * 1024 {
+            return Err("错误诊断超过读取上限".to_string());
+        }
+        let text = String::from_utf8(bytes).map_err(|_| "错误诊断不是 UTF-8 文本".to_string())?;
+        Ok(redact_agent_runtime_error(root, &text, 16 * 1024))
+    })
+    .await
+    .map_err(|error| format!("读取统一错误诊断后台任务失败：{error}"))?
+}
 #[tauri::command]
 pub(crate) async fn read_direct_tool_calls(
     project_path: String,

From 1b8e1591534604c42fa01cd365f853d48cc47a01 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:54:27 +0800
Subject: [PATCH 43/67] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20skill-pack=20?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8C=87=E7=BA=B9=EF=BC=88taonier-art-assets?=
 =?UTF-8?q?=EF=BC=8Cversion=3D2026-08-26.15=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src-tauri/resources/agc-skills/manifest.json              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/resources/agc-skills/manifest.json b/apps/ai-game-creator-shell/src-tauri/resources/agc-skills/manifest.json
index 76de3bbc3..19833fb4f 100644
--- a/apps/ai-game-creator-shell/src-tauri/resources/agc-skills/manifest.json
+++ b/apps/ai-game-creator-shell/src-tauri/resources/agc-skills/manifest.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "agc-skill-pack.v1",
-  "version": "2026-08-26.14",
+  "version": "2026-08-26.15",
   "skills": [
     {
       "name": "agc-game-production-workflow",
@@ -63,7 +63,7 @@
         "agents/openai.yaml",
         "references/platform-art-contract.md"
       ],
-      "sha256": "bd1e415aac0cd0f97090296f34c67898dd731d1e177ec91a56027f9b68a88b37"
+      "sha256": "ff3e1645a35fc9bff1ef255aa7bdc2a9729843d68729589b6f2670c84b8130ec"
     },
     {
       "name": "agc-web-game-development",

From d7f20a2f4dd0b557002ea8422aceec5e8ba5d766 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 20:55:53 +0800
Subject: [PATCH 44/67] =?UTF-8?q?=E8=A1=A5=E6=B3=A8=E5=86=8C=20read=5Fagen?=
 =?UTF-8?q?t=5Fruntime=5Ferror=5Fdetail=20=E5=88=B0=20Tauri=20handler=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=88=E5=90=88=E5=B9=B6=E6=97=B6=E8=A2=AB?=
 =?UTF-8?q?=20checkout=20=E8=A6=86=E7=9B=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai-game-creator-shell/src-tauri/src/main.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 1ade8ccb3..3f73bcdc5 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -2776,6 +2776,7 @@ fn main() {
             read_local_conversation,
             read_direct_project_conversation,
             read_direct_tool_calls,
+            read_agent_runtime_error_detail,
             append_local_conversation_message,
             append_direct_project_conversation_message,
             build_local_project_index,

From 05b4f9bc871d2238ce30f07ca6d5578a1e4beccd Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:00:45 +0800
Subject: [PATCH 45/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E5=88=9B=E4=BD=9C=E5=AF=B9=E8=AF=9D=E5=B1=95=E7=A4=BA=E4=B8=8E?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复流式回复、运行状态卡片和回合耗时展示

保留创建项目时的初始提示词并调整输入区按钮

展示工具调用输入输出并清理命令输出中的 ANSI 编码
---
 .../src-tauri/src/agent/codex_app_server.rs   |  37 ++++
 .../src-tauri/src/agent/direct_runtime.rs     |  43 +++--
 .../src-tauri/src/agent/direct_tool_calls.rs  |  83 ++++++++-
 .../src/agent/runtime_driver/entrypoints.rs   |  13 ++
 .../src-tauri/src/main.rs                     |   3 +
 apps/ai-game-creator-shell/src/App.tsx        |  54 +++++-
 apps/ai-game-creator-shell/src/app/types.ts   |   4 +
 .../ProjectSupervisorView.tsx                 | 176 ++++++++++++++++--
 .../project-workspace/ToolCallGroup.tsx       |  35 ++--
 apps/ai-game-creator-shell/src/styles.css     |  62 ++++++
 10 files changed, 463 insertions(+), 47 deletions(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
index dc892fc29..03980d27f 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
@@ -573,6 +573,8 @@ enum CodexTurnEvent {
 pub(crate) enum DirectCodexTurnObservation {
     AccumulatedText(String),
     IntermediateText(String),
+    /// 模型的思考过程（reasoning item 的明文摘要）：流式阶段整段替换下发。
+    Reasoning(String),
     Activity(&'static str),
     /// 一条结构化工具调用（`item/started` 与 `item/completed` 各采一次，按 id 幂等）。
     ToolCall(crate::DirectToolCall),
@@ -841,6 +843,37 @@ fn direct_codex_mcp_tool_intermediate_text(item: &serde_json::Value) -> String {
 /// (with the concrete command/tool/path) while tools run; it does not push
 /// plan/reasoning text deltas.  Showing what the agent is actually doing is
 /// the only reliable way to make the execution phase feel alive.
+/// 从 reasoning item 里抽明文思考文本：优先 `summary[].text`，其次 `content[].text`。
+///
+/// Codex 的 reasoning item 形如
+/// `{ "type": "reasoning", "summary": [...], "content": [{ "text": "..." }], "encrypted_content": ... }`，
+/// 没有 `role` 字段；明文（至少 content/summary 之一）存在时我们才展示，拿不到就返回 None。
+fn direct_codex_item_reasoning_text(item: &serde_json::Value) -> Option<String> {
+    if item.get("type").and_then(serde_json::Value::as_str) != Some("reasoning") {
+        return None;
+    }
+    let collect = |key: &str| -> Option<String> {
+        let parts = item
+            .get(key)?
+            .as_array()?
+            .iter()
+            .filter_map(|entry| {
+                entry
+                    .get("text")
+                    .and_then(serde_json::Value::as_str)
+                    .map(str::trim)
+                    .filter(|text| !text.is_empty())
+            })
+            .collect::<Vec<_>>();
+        if parts.is_empty() {
+            None
+        } else {
+            Some(parts.join("\n\n"))
+        }
+    };
+    collect("summary").or_else(|| collect("content"))
+}
+
 fn direct_codex_item_intermediate_text(item: &serde_json::Value) -> Option<String> {
     const MAX_ITEM_TEXT_CHARS: usize = 240;
     let item_type = item
@@ -2952,6 +2985,10 @@ impl CodexAppServerConnection {
                                 // 让执行期间聊天窗口显示“正在做什么”，而不是只
                                 // 有活动状态来回跳动。completed 事件不再重复。
                                 if !completed {
+                                    if let Some(reasoning) = direct_codex_item_reasoning_text(item)
+                                    {
+                                        observer(DirectCodexTurnObservation::Reasoning(reasoning));
+                                    }
                                     if let Some(text) = direct_codex_item_intermediate_text(item) {
                                         observer(DirectCodexTurnObservation::IntermediateText(
                                             text,
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
index c46eb5f04..1e2fd4a4f 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
@@ -4366,7 +4366,6 @@ async fn run_direct_game_creator_turn_inner(
         let emitter = emitter.clone();
         let turn_root = root.to_path_buf();
         let turn_tool_calls = Arc::clone(&tool_calls);
-        let mut emitted_tool_call_ids: BTreeSet<String> = BTreeSet::new();
         let mut observer = move |observation: DirectCodexTurnObservation| {
             let status = direct_codex_observation_status(&observation, stream_enabled);
             match observation {
@@ -4393,27 +4392,37 @@ async fn run_direct_game_creator_turn_inner(
                 DirectCodexTurnObservation::Activity(activity) => {
                     emitter.emit(status, Some(activity), None, None);
                 }
+                DirectCodexTurnObservation::Reasoning(reasoning) => {
+                    // 思考过程按"当前累计全文"下发（前端整段替换），状态保持 running：
+                    // streaming 已被"用户可见正文"占用。
+                    emitter.emit_with_reasoning("running", None, None, None, Some(reasoning));
+                }
                 DirectCodexTurnObservation::ToolCall(tool_call) => {
-                    // 每条工具调用只在采集到的那一个事件里下发一次（id 与 Codex item 一一对应），
-                    // 这样既满足"集合变化才带"，也避免每个 heartbeat 重发全量。
-                    if !emitted_tool_call_ids.insert(tool_call.id.clone()) {
-                        return;
-                    }
-                    let previous = {
-                        let mut collected = lock_direct_tool_call_collector(&turn_tool_calls);
-                        let previous = collected
+                    // 同一个工具调用会被观察两次：`item/started`（running）与 `item/completed`
+                    // （终态）。这里**只在状态真的变化时**才再收集与下发一次，既能带上终态、
+                    // 又不会在每个 heartbeat 重发同一份快照（前端按 id 幂等合并，不会多出卡片）。
+                    //
+                    // 曾经这里用"每个 id 只发一次"去重，结果终态观察被直接丢掉：工具调用永远
+                    // 停在 running（实机表现为"命令都结束了还显示执行中"）。
+                    {
+                        let collected = lock_direct_tool_call_collector(&turn_tool_calls);
+                        let existing = collected
                             .iter()
-                            .find(|existing| existing.id == tool_call.id)
-                            .cloned();
+                            .find(|existing| existing.id == tool_call.id);
+                        if !super::direct_tool_calls::direct_tool_call_status_changed(
+                            existing, &tool_call,
+                        ) {
+                            return;
+                        }
+                    }
+                    {
+                        let mut collected = lock_direct_tool_call_collector(&turn_tool_calls);
                         collected.retain(|existing| existing.id != tool_call.id);
                         collected.push(tool_call.clone());
-                        previous
-                    };
-                    emitter.emit(status, None, None, Some(vec![tool_call]));
-                    // `started` 一落盘卡片就能在刷新后立刻出现；`completed` 覆盖同一行。
-                    if let Some(previous) = previous {
-                        spawn_persist_direct_tool_call(&turn_root, &previous);
                     }
+                    emitter.emit(status, None, None, Some(vec![tool_call.clone()]));
+                    // 落盘"最新的那一份"：started 让卡片刷新后立刻出现，终态覆盖同一行。
+                    spawn_persist_direct_tool_call(&turn_root, &tool_call);
                 }
             }
         };
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index 005e9e333..bf9e35b05 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -296,6 +296,15 @@ fn direct_tool_call_title(kind: &str, changes: &[DirectToolCallChange]) -> Strin
 }
 
 fn direct_tool_call_status(item: &Value, completed: bool) -> &'static str {
+    // item 自带的显式终态优先：被策略拒绝（declined）、失败、取消的调用不能因为
+    // `completed == true` 就被当成成功，否则卡片会把"没执行成功"显示成"已执行"。
+    if let Some(status) = item.get("status").and_then(Value::as_str) {
+        match status {
+            "completed" => return "completed",
+            "failed" | "declined" | "cancelled" | "canceled" | "aborted" => return "failed",
+            _ => {}
+        }
+    }
     // Codex 的退出码约定：非 0 即失败；缺席时按"已完成"处理。
     if let Some(exit_code) = item.get("exitCode").and_then(Value::as_i64) {
         return if exit_code == 0 {
@@ -314,6 +323,17 @@ fn direct_tool_call_status(item: &Value, completed: bool) -> &'static str {
     }
 }
 
+/// 同一 id 的两次观察（`item/started` / `item/completed`）是否带来了状态变化。
+///
+/// 只有状态变化时才需要再收集、再下发一次：既避免同一份快照在每个心跳重复下发，
+/// 又不会像"每个 id 只发一次"那样把终态丢掉（历史 bug：命令都结束了卡片仍显示"执行中"）。
+pub(crate) fn direct_tool_call_status_changed(
+    existing: Option<&DirectToolCall>,
+    incoming: &DirectToolCall,
+) -> bool {
+    !existing.is_some_and(|current| current.status == incoming.status)
+}
+
 /// 把一条 Codex item 投影成工具调用条目。非工具类 item 返回 `None`。
 ///
 /// `started_at` / `updated_at`：item 自己带的 `startedAtMs` / `completedAtMs` 优先，
@@ -632,9 +652,10 @@ pub(crate) fn direct_tool_call_now_ms() -> u64 {
 #[cfg(test)]
 mod tests {
     use super::{
-        direct_tool_call_from_item, direct_tool_call_now_ms, persist_direct_tool_call_at,
-        persist_direct_tool_calls_at, read_direct_tool_calls_at, sanitize_detail_text,
-        tool_calls_path, DIRECT_TOOL_CALL_LIMIT,
+        direct_tool_call_from_item, direct_tool_call_now_ms, direct_tool_call_status,
+        direct_tool_call_status_changed, persist_direct_tool_call_at, persist_direct_tool_calls_at,
+        read_direct_tool_calls_at, sanitize_detail_text, tool_calls_path, DirectToolCall,
+        DirectToolCallDetail, DIRECT_TOOL_CALL_LIMIT, DIRECT_TOOL_CALL_SCHEMA_VERSION,
     };
     use serde_json::json;
 
@@ -676,6 +697,62 @@ mod tests {
     }
 
     /// 判据：同一 item 的 started 与 completed 只落一行，completed 覆盖 status。
+    fn sample_tool_call(id: &str, status: &str, updated_at: u64) -> DirectToolCall {
+        DirectToolCall {
+            schema_version: DIRECT_TOOL_CALL_SCHEMA_VERSION.to_string(),
+            id: id.to_string(),
+            turn_id: "turn-1".to_string(),
+            kind: "command".to_string(),
+            title: "执行命令".to_string(),
+            summary: "npm run build".to_string(),
+            status: status.to_string(),
+            detail: DirectToolCallDetail::default(),
+            started_at: 1,
+            updated_at,
+        }
+    }
+
+    #[test]
+    fn tool_call_status_change_is_detected_only_on_real_changes() {
+        let running = sample_tool_call("call-1", "running", 1);
+        let completed = sample_tool_call("call-1", "completed", 2);
+
+        assert!(
+            direct_tool_call_status_changed(None, &running),
+            "首次观察必须被收集"
+        );
+        assert!(
+            !direct_tool_call_status_changed(Some(&running), &running),
+            "状态没变时不该重复下发同一份快照"
+        );
+        assert!(
+            direct_tool_call_status_changed(Some(&running), &completed),
+            "running -> completed 的终态观察必须被收集与下发（历史 bug：这里被丢弃，卡片永远显示执行中）"
+        );
+    }
+
+    #[test]
+    fn explicit_declined_or_failed_status_is_not_reported_as_completed() {
+        for status in ["declined", "failed", "cancelled", "aborted"] {
+            let item = json!({
+                "id": "call-1",
+                "type": "commandExecution",
+                "status": status,
+            });
+            assert_eq!(
+                direct_tool_call_status(&item, true),
+                "failed",
+                "item 自带 {status} 时不能因为 completed=true 就被当成 completed"
+            );
+        }
+        let completed = json!({
+            "id": "call-1",
+            "type": "commandExecution",
+            "status": "completed",
+        });
+        assert_eq!(direct_tool_call_status(&completed, true), "completed");
+    }
+
     #[test]
     fn tool_call_upsert_is_idempotent_per_item_id() {
         let root = init_tool_call_project("tool-call-upsert");
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
index 2c6867fb3..9089d7748 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
@@ -50,6 +50,18 @@ impl DirectGameCreatorTurnUpdateEmitter {
         activity: Option<&'static str>,
         accumulated_text: Option<String>,
         tool_calls: Option<Vec<crate::DirectToolCall>>,
+    ) {
+        self.emit_with_reasoning(status, activity, accumulated_text, tool_calls, None);
+    }
+
+    /// 带思考过程的回合更新：`reasoning_text` 为"当前累计的思考全文"（前端整段替换）。
+    pub(crate) fn emit_with_reasoning(
+        &self,
+        status: &'static str,
+        activity: Option<&'static str>,
+        accumulated_text: Option<String>,
+        tool_calls: Option<Vec<crate::DirectToolCall>>,
+        reasoning_text: Option<String>,
     ) {
         let status_is_allowed = matches!(
             status,
@@ -94,6 +106,7 @@ impl DirectGameCreatorTurnUpdateEmitter {
                 activity: activity.map(str::to_string),
                 accumulated_text,
                 tool_calls,
+                reasoning_text,
                 updated_at,
             },
         );
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 3f73bcdc5..426a713c5 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -1014,6 +1014,9 @@ struct GameCreatorDirectTurnUpdateEvent {
     /// `skip_serializing_if`：字段缺席时前端拿到 `undefined`，行为与改造前一致。
     #[serde(skip_serializing_if = "Option::is_none")]
     tool_calls: Option<Vec<crate::DirectToolCall>>,
+    /// 本回合当前累计的思考过程（流式整段替换）；拿不到时字段缺席。
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_text: Option<String>,
     updated_at: u64,
 }
 
diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index d508a077b..633a39331 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -875,6 +875,9 @@ export function App({
   const [directCodexTransientReply, setDirectCodexTransientReply] =
     useState('');
   const directCodexTransientReplyRef = useRef('');
+  // 直连回合的思考过程（流式）：整段替换；回合结束/开始新回合/清空对话时一并清掉。
+  const [directCodexTransientReasoning, setDirectCodexTransientReasoning] =
+    useState('');
   const [
     directCodexTransientReplyUpdatedAt,
     setDirectCodexTransientReplyUpdatedAt,
@@ -975,6 +978,7 @@ export function App({
     setDirectCodexProcessKey('');
     setDirectCodexProgressUpdatedAt(null);
     setDirectCodexTransientReply('');
+    setDirectCodexTransientReasoning('');
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
   }
@@ -1073,6 +1077,7 @@ export function App({
     setDirectCodexProgress(DIRECT_CODEX_RECOVERED_TURN_STARTED_DETAIL);
     setDirectCodexProgressUpdatedAt(Date.now());
     setDirectCodexTransientReply('');
+    setDirectCodexTransientReasoning('');
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
     setProjectSupervisorRuntimeError('');
@@ -1106,6 +1111,7 @@ export function App({
     }
     activeDirectCodexTurnRef.current = null;
     setDirectCodexTransientReply('');
+    setDirectCodexTransientReasoning('');
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
     return true;
@@ -1245,9 +1251,29 @@ export function App({
     const sessionError = result.session.lastError?.summary ?? resultError;
     setProjectSupervisorRuntimeError(sessionError);
     if (result.conversation) {
-      const conversationMessages = planningMessagesToChatMessages(
+      let conversationMessages = planningMessagesToChatMessages(
         result.conversation,
       );
+      // 创建项目后的首条需求可能先于规划会话快照到达；不能让后到的空快照
+      // 把用户刚发出的内容覆盖掉。
+      const initialPrompt = initialSupervisorMessageLatchRef.current.prompt;
+      if (
+        initialPrompt &&
+        !conversationMessages.some(
+          (message) =>
+            message.role === 'user' && message.text.trim() === initialPrompt,
+        )
+      ) {
+        conversationMessages = [
+          {
+            role: 'user',
+            text: initialPrompt,
+            runtimeOwned: true,
+            updatedAt: Date.now(),
+          },
+          ...conversationMessages,
+        ];
+      }
       setConversationVisibleCount(CONVERSATION_INITIAL_VISIBLE_COUNT);
       setMessages(conversationMessages);
       savedConversationProjectPathRef.current = localProjectPathRef.current;
@@ -1331,7 +1357,7 @@ export function App({
       texts.push(entry.text);
       reasoningByMessageId.set(entry.messageId, texts);
     }
-    return view.messages
+    const messages: ChatMessage[] = view.messages
       .filter((message) => message.text.trim())
       .map((message) => ({
         role: message.role === 'user' ? 'user' : 'assistant',
@@ -1341,6 +1367,21 @@ export function App({
         reasoningText: reasoningByMessageId.get(message.id)?.join('\n\n'),
         updatedAt: Date.now(),
       }));
+    const initialPrompt = initialSupervisorMessageLatchRef.current.prompt;
+    if (
+      initialPrompt &&
+      !messages.some(
+        (message) => message.role === 'user' && message.text === initialPrompt,
+      )
+    ) {
+      messages.unshift({
+        role: 'user',
+        text: initialPrompt,
+        runtimeOwned: true,
+        updatedAt: Date.now(),
+      });
+    }
+    return messages;
   }
 
   function applyDesignView(view: DesignView, projectPath: string) {
@@ -2150,6 +2191,9 @@ export function App({
             })),
           );
         }
+        if (typeof payload.reasoningText === 'string') {
+          setDirectCodexTransientReasoning(payload.reasoningText);
+        }
         const updatedAt =
           Number.isFinite(payload.updatedAt) && payload.updatedAt > 0
             ? payload.updatedAt
@@ -2162,6 +2206,7 @@ export function App({
           setDirectCodexProgress(processDetail);
           setDirectCodexProgressUpdatedAt(updatedAt);
           setDirectCodexTransientReply('');
+          setDirectCodexTransientReasoning('');
           setDirectCodexTransientReplyUpdatedAt(null);
           return;
         }
@@ -6796,6 +6841,7 @@ export function App({
         setDirectCodexProcessKey(`${directProjectPath}\u0000${clientTurnId}`);
         setDirectCodexProgress('正在等待陶泥儿开始');
         setDirectCodexTransientReply('');
+        setDirectCodexTransientReasoning('');
         setDirectCodexProgressUpdatedAt(Date.now());
         directCodexTransientReplyRef.current = '';
         setDirectCodexTransientReplyUpdatedAt(null);
@@ -6929,6 +6975,8 @@ export function App({
             setChatAgentBusy(false);
             setDirectCodexTurnCancelling(false);
             setDirectCodexProgress('');
+            setDirectCodexStatus(null);
+            setDirectCodexProgressUpdatedAt(null);
             const activeTurn = activeDirectCodexTurnRef.current;
             if (
               !activeTurn ||
@@ -12528,6 +12576,8 @@ export function App({
   if (projectSupervisorOnly) {
     return (
       <ProjectSupervisorView
+        transientReasoning={directCodexTransientReasoning}
+        initialSupervisorMessage={initialSupervisorMessage}
         activeVersionId={chatActiveVersionId}
         attachments={chatAttachments}
         attachmentNotice={chatAttachmentNotice}
diff --git a/apps/ai-game-creator-shell/src/app/types.ts b/apps/ai-game-creator-shell/src/app/types.ts
index 6661b0649..4ba4916f6 100644
--- a/apps/ai-game-creator-shell/src/app/types.ts
+++ b/apps/ai-game-creator-shell/src/app/types.ts
@@ -1159,6 +1159,10 @@ export interface GameCreatorDirectTurnUpdateEvent {
    * 可选：老版本事件没有这个字段，前端拿到 `undefined` 时必须与改造前行为一致。
    */
   toolCalls?: GameCreatorDirectTurnToolCall[] | null;
+  /**
+   * 本回合当前累计的思考过程（流式，整段替换）；拿不到时字段缺席。
+   */
+  reasoningText?: string | null;
   updatedAt: number;
 }
 
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 3358312d0..72fd08fb7 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
@@ -47,7 +47,6 @@ import { formatAgentCardRuntimeStatus } from '../project-summary/agentPresentati
 import { taskStatusLabels } from '../project-summary/projectSummary';
 import type { QueuedChatTurn } from './chatComposerQueue';
 import {
-  ComposerAttachmentMenu,
   ComposerPendingAttachments,
   ComposerReasoningEffortSelect,
   ComposerStopButton,
@@ -77,6 +76,10 @@ import {
 } from './ResourceReferenceInput';
 import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 import { ToolCallGroup } from './ToolCallGroup';
+import {
+  formatTurnDuration,
+  turnToolCallEndedAt,
+} from './toolCallGroupPresentation';
 
 /** 与 `App.tsx` 的回合消息 id 同构：`direct-codex:<turnId>:<role>`。 */
 function directCodexTurnMessageId(turnId: string, role: 'user' | 'assistant') {
@@ -157,8 +160,11 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   toolCalls?: GameCreatorDirectToolCall[];
   /** 当前正在跑的回合 id；卡片在 assistant 消息落盘前锚到它。 */
   activeTurnId?: string | null;
+  initialSupervisorMessage?: string;
   showProfessionalCollaboration?: boolean;
   transientReply: string;
+  /** 流式思考过程（direct-codex）：拿不到就为空，空则不渲染。 */
+  transientReasoning?: string;
   showDesignReasoning?: boolean;
   designReasoning?: string;
   designReasoningEntries?: DesignReasoningEntry[];
@@ -211,7 +217,7 @@ export function ProjectSupervisorView({
   onCancelTurn,
   onCancelQueuedTurn,
   onRemoveAttachment,
-  onUploadFiles,
+  onUploadFiles: _onUploadFiles,
   queuedTurns = [],
   composerNotice = '',
   turnCancelling = false,
@@ -223,8 +229,10 @@ export function ProjectSupervisorView({
   projectPath,
   toolCalls = [],
   activeTurnId = null,
+  initialSupervisorMessage = '',
   showProfessionalCollaboration = true,
   transientReply,
+  transientReasoning = '',
   showDesignReasoning = false,
   designReasoning = '',
   designReasoningEntries = [],
@@ -252,9 +260,21 @@ export function ProjectSupervisorView({
   const [expandedProcessKey, setExpandedProcessKey] = useState<string | null>(
     null,
   );
+  useEffect(() => {
+    if (!activeTurnId) {
+      return;
+    }
+    setTurnUsageNow(Date.now());
+    const timer = setInterval(() => setTurnUsageNow(Date.now()), 1000);
+    return () => clearInterval(timer);
+  }, [activeTurnId]);
+
   useEffect(() => {
     setExpandedProcessKey(null);
   }, [directProcessKey]);
+  useEffect(() => {
+    setActiveTurnStartedAt(activeTurnId ? Date.now() : 0);
+  }, [activeTurnId]);
   const processDetailExpanded =
     Boolean(directProcessKey) && expandedProcessKey === directProcessKey;
   const submitLabel = needsUserInput
@@ -269,6 +289,9 @@ export function ProjectSupervisorView({
   const modelValidateInFlightRef = useRef(false);
   // 设置浮层：Codex 顶栏只剩状态与齿轮，运行配置 / 审批模式 / 钱包都收进这里。
   const [settingsOpen, setSettingsOpen] = useState(false);
+  // 整轮会话的耗时在回合进行中要每秒刷新：用 tick 驱动的 `now` 计算"现在 - 开始"。
+  const [turnUsageNow, setTurnUsageNow] = useState(() => Date.now());
+  const [activeTurnStartedAt, setActiveTurnStartedAt] = useState(0);
   // 语音输入的降级/失败提示：不支持时按钮本身就带提示，这里只承载启动失败与权限类错误。
   const [voiceNotice, setVoiceNotice] = useState('');
   const [approvalOpen, setApprovalOpen] = useState(false);
@@ -316,11 +339,74 @@ export function ProjectSupervisorView({
       return 0;
     }
     const userId = directCodexTurnMessageId(turnId, 'user');
-    return (
+    const value = Number(
       visibleMessages.find((message) => message.messageId === userId)
-        ?.updatedAt ?? 0
+        ?.updatedAt,
+    );
+    if (!Number.isFinite(value) || value <= 0) return 0;
+    // 旧快照使用 Unix 秒，新消息使用毫秒；统一到毫秒，避免出现数千万分钟。
+    return value < 100_000_000_000 ? value * 1000 : value;
+  };
+  /** 本轮会话的结束时刻：工具快照与消息里最晚的那个 updatedAt。 */
+  const turnEndedAtFor = (turnId: string) => {
+    let endedAt = turnToolCallEndedAt(
+      toolCalls.filter((call) => call.turnId === turnId),
+    );
+    for (const message of visibleMessages) {
+      const messageTurnId = message.messageId
+        ? directCodexTurnIdFromAssistantMessageId(message.messageId)
+        : null;
+      if (messageTurnId === turnId) {
+        endedAt = Math.max(endedAt, Number(message.updatedAt) || 0);
+      }
+    }
+    return endedAt < 100_000_000_000 ? endedAt * 1000 : endedAt;
+  };
+  const turnStartedAtFor = (turnId: string) => {
+    const messageStarted = userMessageUpdatedAtForTurn(turnId);
+    if (messageStarted) return messageStarted;
+    const starts = toolCalls
+      .filter((call) => call.turnId === turnId && Number(call.startedAt) > 0)
+      .map((call) => Number(call.startedAt));
+    return starts.length > 0 ? Math.min(...starts) : 0;
+  };
+
+  const clockTimeWithSeconds = (timestamp: number) => {
+    const date = new Date(timestamp);
+    const pad = (value: number) => String(value).padStart(2, '0');
+    return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+  };
+
+  /** 整轮会话的结束时间与耗时（进行中时用 tick 驱的 now，所以秒数会实时跳动）。 */
+  const renderTurnUsage = (turnId: string) => {
+    if (!turnId) {
+      return null;
+    }
+    const startedAt =
+      turnStartedAtFor(turnId) ||
+      (activeTurnId === turnId ? activeTurnStartedAt : 0);
+    if (!startedAt) {
+      return null;
+    }
+    const running = Boolean(activeTurnId) && turnId === activeTurnId;
+    const endedAt = running
+      ? turnUsageNow
+      : Math.max(turnEndedAtFor(turnId), startedAt);
+    const duration = formatTurnDuration(endedAt - startedAt);
+    return (
+      <p
+        className="message-turn-usage"
+        data-testid="turn-usage"
+        data-turn-id={turnId}
+        data-turn-running={running ? 'true' : 'false'}
+      >
+        {running
+          ? `本轮进行中 · 用时 ${duration ?? '—'}`
+          : `本轮结束于 ${endedAt ? clockTimeWithSeconds(endedAt) : '—'} · 耗时 ${duration ?? '0秒'}`}
+      </p>
     );
   };
+
   const emptyState =
     directCodex &&
     visibleMessages.length === 0 &&
@@ -427,6 +513,19 @@ export function ProjectSupervisorView({
               {`显示更早 · 还有 ${hiddenConversationCount} 条对话`}
             </button>
           ) : null}
+          {initialSupervisorMessage.trim() &&
+          !visibleMessages.some(
+            (message) =>
+              message.role === 'user' &&
+              message.text.trim() === initialSupervisorMessage.trim(),
+          ) ? (
+            <div className="message message--user" data-runtime-owned="true">
+              <ChatMarkdownMessage
+                role="user"
+                text={initialSupervisorMessage}
+              />
+            </div>
+          ) : null}
           {visibleMessages.map((message, index) => {
             const anchoredToolCalls = message.messageId
               ? (toolCallsByAnchor.get(message.messageId) ?? [])
@@ -434,6 +533,16 @@ export function ProjectSupervisorView({
             const anchoredTurnId = message.messageId
               ? directCodexTurnIdFromAssistantMessageId(message.messageId)
               : null;
+            const nextTurnId =
+              index + 1 < visibleMessages.length &&
+              visibleMessages[index + 1]?.messageId
+                ? directCodexTurnIdFromAssistantMessageId(
+                    visibleMessages[index + 1]!.messageId!,
+                  )
+                : null;
+            // 这条消息是该回合的最后一条时，在它后面给出整轮会话的结束时间与耗时。
+            const isTurnEnd =
+              Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
                 {anchoredToolCalls.length > 0 ? (
@@ -460,6 +569,9 @@ export function ProjectSupervisorView({
                     </details>
                   ) : null}
                 </div>
+                {isTurnEnd && anchoredTurnId
+                  ? renderTurnUsage(anchoredTurnId)
+                  : null}
               </Fragment>
             );
           })}
@@ -471,6 +583,40 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
+          {liveToolCallTurnId &&
+          !visibleMessages.some(
+            (message) =>
+              message.messageId &&
+              directCodexTurnIdFromAssistantMessageId(message.messageId) ===
+                liveToolCallTurnId,
+          )
+            ? renderTurnUsage(liveToolCallTurnId)
+            : null}
+          {directCodex && transientReasoning ? (
+            <details
+              className="design-agent-reasoning"
+              data-testid="live-reasoning"
+            >
+              <summary>思考过程</summary>
+              <pre>{transientReasoning}</pre>
+            </details>
+          ) : null}
+          {/* 直连回合的流式正文：恢复为对话区里的普通 assistant 消息（不再放进状态卡片），
+              这样"边生成边显示"和"状态卡片只放状态"两件事同时成立。 */}
+          {directCodex && transientReply ? (
+            <div
+              className="message message--assistant"
+              aria-label="陶泥儿实时回复"
+              aria-live="polite"
+              data-runtime-owned="true"
+            >
+              <ChatMarkdownMessage
+                role="assistant"
+                text={transientReply}
+                streaming
+              />
+            </div>
+          ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)
@@ -590,6 +736,21 @@ export function ProjectSupervisorView({
                   ? directStatusTitle(directStatus)
                   : '陶泥儿正在处理'}
               </strong>
+              {activeTurnId ? (
+                <em className="project-supervisor-process-elapsed">
+                  {`已耗时 ${
+                    formatTurnDuration(
+                      Math.max(
+                        0,
+                        turnUsageNow -
+                          (turnStartedAtFor(activeTurnId) ||
+                            activeTurnStartedAt ||
+                            turnUsageNow),
+                      ),
+                    ) ?? '0秒'
+                  }`}
+                </em>
+              ) : null}
             </header>
 
             {directProcessDetail ? (
@@ -684,13 +845,6 @@ export function ProjectSupervisorView({
           {directCodex ? (
             <div className="project-supervisor-composer-controls">
               <div className="project-supervisor-composer-controls-left">
-                <ComposerAttachmentMenu
-                  disabled={runtimePanelProps.controlBusy || needsUserInput}
-                  onPickFiles={(files) => onUploadFiles?.(files)}
-                  onOpenReferencePicker={() =>
-                    composerRef?.current?.openPicker()
-                  }
-                />
                 <button
                   type="button"
                   className="project-supervisor-reference-trigger"
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index d8818c9eb..1fa55de0b 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -10,14 +10,12 @@ import { useEffect, useId, useState } from 'react';
 
 import type { GameCreatorDirectToolCall } from '../../app/types';
 import {
-  formatClockTime,
   formatToolCallDuration,
   formatTurnDuration,
   toolCallDurationMs,
   toolCallGroupSummary,
   toolCallRowText,
   turnToolCallDurationMs,
-  turnToolCallEndedAt,
   turnToolCallTimeLabel,
 } from './toolCallGroupPresentation';
 
@@ -146,16 +144,6 @@ export function ToolCallGroup({
             <ToolCallRow key={call.id} call={call} active={active} />
           ))}
         </ul>
-        {/* 还有工具在跑时**不显示"结束于"**：那时的"结束"只是最后一条快照的 updatedAt，
-            回合并没有结束。等全部落定后再显示块尾这一行。 */}
-        {!running && timeLabel ? (
-          <p
-            className="agent-tool-call-group-foot"
-            data-testid="agent-tool-call-group-end-time"
-          >
-            {`结束于 ${formatClockTime(turnToolCallEndedAt(orderedCalls))}`}
-          </p>
-        ) : null}
       </div>
     </section>
   );
@@ -235,7 +223,12 @@ function ToolCallRow({
         hidden={!expanded}
       >
         {detailCommand ? (
-          <pre className="agent-tool-call-row-command">{detailCommand}</pre>
+          <div className="agent-tool-call-row-section">
+            <small>输入</small>
+            <pre className="agent-tool-call-row-command">
+              {stripAnsi(detailCommand)}
+            </pre>
+          </div>
         ) : null}
         {changes.length > 0 ? (
           <ul className="agent-tool-call-row-changes">
@@ -248,13 +241,27 @@ function ToolCallRow({
           </ul>
         ) : null}
         {detailOutput ? (
-          <pre className="agent-tool-call-row-output">{detailOutput}</pre>
+          <div className="agent-tool-call-row-section">
+            <small>输出</small>
+            <pre className="agent-tool-call-row-output">
+              {stripAnsi(detailOutput)}
+            </pre>
+          </div>
         ) : null}
       </div>
     </li>
   );
 }
 
+function stripAnsi(value: string) {
+  // ANSI CSI / OSC 控制序列：命令输出在终端里可带颜色，聊天卡片不应显示转义码。
+  const ansiPattern = new RegExp(
+    String.raw`[\x1b\x9b]\][0-?]*[ -/]*[@-~]|\x1b\[[0-?]*[ -/]*[@-~]`,
+    'g',
+  );
+  return value.replace(ansiPattern, '');
+}
+
 function toolCallChangeKindLabel(kind: string) {
   if (kind === 'add') {
     return '新增';
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index af6ed5d53..a0f35682f 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -2660,6 +2660,15 @@ textarea {
   animation: project-supervisor-process-pulse 1.2s ease-in-out infinite;
 }
 
+.project-supervisor-process-elapsed {
+  margin-left: auto !important;
+  color: #795548 !important;
+  font-size: 13px !important;
+  font-style: normal;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
 @keyframes project-supervisor-process-pulse {
   50% {
     opacity: 0.42;
@@ -11840,6 +11849,17 @@ button.design-workspace-tree__entry:hover,
   padding: 6px 8px 8px;
 }
 
+.agent-tool-call-row-section {
+  display: grid;
+  gap: 4px;
+}
+
+.agent-tool-call-row-section > small {
+  color: #8d7668;
+  font-size: 11px;
+  font-weight: 600;
+}
+
 .agent-tool-call-row-command,
 .agent-tool-call-row-output {
   margin: 0;
@@ -12027,3 +12047,45 @@ button.design-workspace-tree__entry:hover,
   > * + * {
   margin-top: 14px;
 }
+
+/* 整轮会话的结束时间与耗时：比消息本身更轻，属于轮次级信息。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message-turn-usage {
+  margin: 0;
+  padding: 0 2px;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+  line-height: 1.6;
+  font-variant-numeric: tabular-nums;
+}
+
+/* 流式思考过程：默认折叠（<details>），长文本必须换行，不允许出现横向滚动条。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  details[data-testid='live-reasoning'] {
+  margin: 0;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  details[data-testid='live-reasoning'] > summary {
+  cursor: pointer;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  details[data-testid='live-reasoning'] pre {
+  margin: 6px 0 0;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  font-family: inherit;
+  font-size: 12px;
+  line-height: 1.6;
+}

From e39714e17dac3a3784cf8b9a19af2db31e24feac Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:07:53 +0800
Subject: [PATCH 46/67] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E7=A9=BA=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除工作台会话区域中的引导 hint
---
 .../ProjectSupervisorView.tsx                 | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

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 72fd08fb7..edd9c44d7 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
@@ -1,10 +1,4 @@
-import {
-  ArrowUp,
-  AtSign,
-  Loader2,
-  MessageSquareDashed,
-  Settings,
-} from 'lucide-react';
+import { ArrowUp, AtSign, Loader2, Settings } from 'lucide-react';
 import type {
   ComponentProps,
   FormEventHandler,
@@ -407,16 +401,6 @@ export function ProjectSupervisorView({
     );
   };
 
-  const emptyState =
-    directCodex &&
-    visibleMessages.length === 0 &&
-    !transientReply &&
-    !directProcessDetail &&
-    !runtimePanelProps.controlBusy &&
-    !pendingCommand &&
-    !pendingConfirmation &&
-    !designView?.session.pendingApproval &&
-    !designView?.session.pendingClarification;
   const submitButton = (
     <button
       type="submit"
@@ -497,13 +481,6 @@ export function ProjectSupervisorView({
           aria-label={directCodex ? '陶泥儿消息' : '项目总控消息'}
           onScroll={onScroll}
         >
-          {emptyState ? (
-            <div className="project-supervisor-empty-state">
-              <MessageSquareDashed size={30} aria-hidden="true" />
-              <strong>你想让陶泥儿做什么游戏？</strong>
-              <small>告诉陶泥儿接下来要做什么，或输入 @ 选择资源</small>
-            </div>
-          ) : null}
           {hiddenConversationCount > 0 ? (
             <button
               type="button"

From d6420c8db56205582287f243707d102b33982d1e Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:11:40 +0800
Subject: [PATCH 47/67] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E9=87=8D=E5=A4=8D=E8=80=97=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

运行中的回合只保留状态卡片耗时，历史回合继续显示会话耗时
---
 .../src/features/project-workspace/ProjectSupervisorView.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 edd9c44d7..405fe616d 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
@@ -546,7 +546,7 @@ export function ProjectSupervisorView({
                     </details>
                   ) : null}
                 </div>
-                {isTurnEnd && anchoredTurnId
+                {isTurnEnd && anchoredTurnId && anchoredTurnId !== activeTurnId
                   ? renderTurnUsage(anchoredTurnId)
                   : null}
               </Fragment>
@@ -561,6 +561,7 @@ export function ProjectSupervisorView({
             />
           ) : null}
           {liveToolCallTurnId &&
+          liveToolCallTurnId !== activeTurnId &&
           !visibleMessages.some(
             (message) =>
               message.messageId &&

From 1b8053de15e5a3eeceebdb09fa8e2541cdef21bb Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:15:40 +0800
Subject: [PATCH 48/67] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8D=A1=E7=89=87=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

避免回复流式生成期间状态卡片随内容变化而收缩
---
 apps/ai-game-creator-shell/src/styles.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index a0f35682f..3718d6153 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -2605,6 +2605,8 @@ textarea {
   isolation: isolate;
   display: grid;
   gap: 9px;
+  min-height: 78px;
+  box-sizing: border-box;
   margin-top: 12px;
   padding: 12px 14px;
   border: 1px solid #b9d8c5;

From 5508456d3e512a152165bccbfcff769e5a593d81 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:34:02 +0800
Subject: [PATCH 49/67] =?UTF-8?q?=E6=94=B6=E7=B4=A7=E5=AF=B9=E8=AF=9D=20Ma?=
 =?UTF-8?q?rkdown=20=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

减少段落和列表之间的空白，避免回复出现过多空行
---
 .../src/components/ChatMarkdownMessage/index.tsx     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index 81d852447..90bf6f82d 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -76,7 +76,7 @@ function MarkdownUnorderedList({ children }: { children?: ReactNode }) {
     <ListDepthContext.Provider value={depth + 1}>
       {/* 用真正的列表标记（`list-disc`）而不是手写 `'- '` 文本：手写前缀既没有悬挂缩进
           （换行后的第二行会顶回最左边），也不算列表语义（读屏读成普通文本）。 */}
-      <ul className="m-0 mt-2 list-disc space-y-1 pl-4 first:mt-0">
+      <ul className="m-0 mt-1 list-disc space-y-0.5 pl-4 first:mt-0">
         {children}
       </ul>
     </ListDepthContext.Provider>
@@ -95,7 +95,7 @@ function MarkdownOrderedList({
     <ListDepthContext.Provider value={depth + 1}>
       <ol
         start={start}
-        className="m-0 mt-2 list-decimal space-y-1 pl-5 first:mt-0"
+        className="m-0 mt-1 list-decimal space-y-0.5 pl-5 first:mt-0"
       >
         {children}
       </ol>
@@ -111,8 +111,8 @@ function MarkdownParagraph({ children }: { children?: ReactNode }) {
         paragraphPosition === 'first'
           ? 'inline'
           : paragraphPosition === 'continuation'
-            ? 'mt-2'
-            : 'mt-2 first:mt-0'
+            ? 'mt-1'
+            : 'mt-1 first:mt-0'
       }`}
     >
       {children}
@@ -128,8 +128,8 @@ function StreamingMarkdownParagraph({ children }: { children?: ReactNode }) {
         paragraphPosition === 'first'
           ? 'inline'
           : paragraphPosition === 'continuation'
-            ? 'mt-2'
-            : 'mt-2 first:mt-0'
+            ? 'mt-1'
+            : 'mt-1 first:mt-0'
       }`}
     >
       {children}

From a8559597cade92b8ea90a30d8d96a2080be3abff Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:37:53 +0800
Subject: [PATCH 50/67] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20Markdown=20=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

保留两个换行表示的正常空行，仅压缩普通正文中的连续多余换行
---
 .../components/ChatMarkdownMessage/index.tsx  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index 90bf6f82d..ad2ebaa39 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -15,6 +15,16 @@ export type ChatMarkdownMessageProps = {
   streaming?: boolean;
 };
 
+/** 只压缩普通 Markdown 正文里多余的空行；代码块中的换行必须原样保留。 */
+function normalizeMarkdownBlankLines(text: string) {
+  return text
+    .split(/(```[\s\S]*?```)/g)
+    .map((part, index) =>
+      index % 2 === 1 ? part : part.replace(/\n{3,}/g, '\n\n'),
+    )
+    .join('');
+}
+
 type MarkdownErrorBoundaryProps = {
   fallbackText: string;
   children: ReactNode;
@@ -76,7 +86,7 @@ function MarkdownUnorderedList({ children }: { children?: ReactNode }) {
     <ListDepthContext.Provider value={depth + 1}>
       {/* 用真正的列表标记（`list-disc`）而不是手写 `'- '` 文本：手写前缀既没有悬挂缩进
           （换行后的第二行会顶回最左边），也不算列表语义（读屏读成普通文本）。 */}
-      <ul className="m-0 mt-1 list-disc space-y-0.5 pl-4 first:mt-0">
+      <ul className="m-0 mt-2 list-disc space-y-1 pl-4 first:mt-0">
         {children}
       </ul>
     </ListDepthContext.Provider>
@@ -95,7 +105,7 @@ function MarkdownOrderedList({
     <ListDepthContext.Provider value={depth + 1}>
       <ol
         start={start}
-        className="m-0 mt-1 list-decimal space-y-0.5 pl-5 first:mt-0"
+        className="m-0 mt-2 list-decimal space-y-1 pl-5 first:mt-0"
       >
         {children}
       </ol>
@@ -111,8 +121,8 @@ function MarkdownParagraph({ children }: { children?: ReactNode }) {
         paragraphPosition === 'first'
           ? 'inline'
           : paragraphPosition === 'continuation'
-            ? 'mt-1'
-            : 'mt-1 first:mt-0'
+            ? 'mt-2'
+            : 'mt-2 first:mt-0'
       }`}
     >
       {children}
@@ -128,8 +138,8 @@ function StreamingMarkdownParagraph({ children }: { children?: ReactNode }) {
         paragraphPosition === 'first'
           ? 'inline'
           : paragraphPosition === 'continuation'
-            ? 'mt-1'
-            : 'mt-1 first:mt-0'
+            ? 'mt-2'
+            : 'mt-2 first:mt-0'
       }`}
     >
       {children}
@@ -265,7 +275,7 @@ export function ChatMarkdownMessage({
           streaming ? streamingMarkdownComponents : markdownComponents
         }
       >
-        {text}
+        {normalizeMarkdownBlankLines(text)}
       </ReactMarkdown>
     </MarkdownErrorBoundary>
   );

From a40b7b31ee09a9ec5fa04da24f0e67a4b92145ca Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:41:30 +0800
Subject: [PATCH 51/67] =?UTF-8?q?=E5=A4=84=E7=90=86=20Markdown=20=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E8=A1=8C=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

兼容带空格的连续空行，保留 Markdown 段落分隔语义
---
 .../src/components/ChatMarkdownMessage/index.tsx              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index ad2ebaa39..72cd5b777 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -20,7 +20,9 @@ function normalizeMarkdownBlankLines(text: string) {
   return text
     .split(/(```[\s\S]*?```)/g)
     .map((part, index) =>
-      index % 2 === 1 ? part : part.replace(/\n{3,}/g, '\n\n'),
+      index % 2 === 1
+        ? part
+        : part.replace(/[ \t]*\n(?:[ \t]*\n){2,}/g, '\n\n'),
     )
     .join('');
 }

From 8b5d0e920080975e1753ca64d352f69e2617846d Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:46:16 +0800
Subject: [PATCH 52/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Markdown=20=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E5=BD=92=E4=B8=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

先统一 CRLF 与 LF，再压缩正文中的多余空行
---
 .../src/components/ChatMarkdownMessage/index.tsx                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index 72cd5b777..d743dc2c2 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -18,6 +18,7 @@ export type ChatMarkdownMessageProps = {
 /** 只压缩普通 Markdown 正文里多余的空行；代码块中的换行必须原样保留。 */
 function normalizeMarkdownBlankLines(text: string) {
   return text
+    .replace(/\r\n?/g, '\n')
     .split(/(```[\s\S]*?```)/g)
     .map((part, index) =>
       index % 2 === 1

From 656dd2be2ab98e97d26be8b4f08f7560bbe1f28c Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Tue, 15 Sep 2026 23:48:15 +0800
Subject: [PATCH 53/67] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复助手回复视觉空隙过大的问题
---
 apps/ai-game-creator-shell/src/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 3718d6153..e9a175f99 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -8736,7 +8736,7 @@ iframe.preview-frame {
   background: transparent;
   color: var(--platform-text-base);
   font-size: 14px;
-  line-height: 1.85;
+  line-height: 1.3;
 }
 
 .game-workbench-chat

From 9b7f7f110c7ddab858c1cb56eb38af4baf963280 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:12:36 +0800
Subject: [PATCH 54/67] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=8C=BA=E6=A0=B7=E5=BC=8F=E6=94=B6=E5=B0=BE=EF=BC=88=E5=90=AB?=
 =?UTF-8?q?=E5=8F=A6=E4=B8=80=E8=B7=AF=E6=9C=AA=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=20Markdown=20=E9=97=B4=E8=B7=9D=E4=BF=AE=E6=AD=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- styles.css：移除 .message 的 white-space: pre-wrap（Markdown 块之间的换行文本节点会被渲染成真实空行，列表项之间出现大段空白）
- styles.css：对话正文行高统一并钉死 1.5（面板里存在更长的选择器链，普通 .message p 会被压过去）
- styles.css：列表 ul/ol 的默认块间距显式清零，避免与 p 的 margin 叠加成"假空行"
- styles.css：流式思考过程折叠块样式（pre-wrap 换行、1.5 行高、无横向滚动条）
- 说明：本文件里同时包含另一路会话未提交的 Markdown 间距改动，一并提交以免丢失
---
 apps/ai-game-creator-shell/src/styles.css | 67 ++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index e9a175f99..e01839d49 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -4415,9 +4415,11 @@ h2 {
   background: #f8fafd;
 }
 
+/* 这里不能加 `white-space: pre-wrap`：Markdown 渲染出来的块之间会带换行文本节点，
+   pre-wrap 会把那些 `\n` 变成真实的空行（表现就是列表项之间出现大段空白）。
+   需要保留换行的地方（流式原文、行内代码）各自已经有 `whitespace-pre-wrap`。 */
 .message {
   overflow-wrap: anywhere;
-  white-space: pre-wrap;
 }
 
 .message--user {
@@ -8739,6 +8741,30 @@ iframe.preview-frame {
   line-height: 1.3;
 }
 
+/* ReactMarkdown 的列表节点必须显式清零默认块间距；否则 p/ul 的 margin
+   会叠加成截图中的“假空行”。真正的 Markdown 空行仍由段落结构保留。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message--assistant
+  ul,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message--assistant
+  ol {
+  margin-block: 0.65em;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message--assistant
+  li
+  > p {
+  margin-block: 0;
+}
+
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-message-list
@@ -11988,7 +12014,7 @@ button.design-workspace-tree__entry:hover,
   padding-left: 18px;
   color: var(--platform-text-soft);
   font-size: 12px;
-  line-height: 1.6;
+  line-height: 1.5;
 }
 
 /* 工具调用折叠块块头改成两行：第一行图标 + 汇总（超长省略），第二行状态 + 用时，箭头右侧跨两行。
@@ -12089,5 +12115,40 @@ button.design-workspace-tree__entry:hover,
   overflow-wrap: anywhere;
   font-family: inherit;
   font-size: 12px;
-  line-height: 1.6;
+  line-height: 1.5;
 }
+/* 对话正文的行高统一为 1.5：段落、列表、列表项一致。
+   面板里原本有 1.7 / 1.6 / 1.5 / 1.4 多套值，段落与列表各自命中不同规则，
+   看起来"上下行高不一样"。 */
+.message,
+.message p,
+.message ul,
+.message ol,
+.message li {
+  line-height: 1.5;
+}
+/* 对话正文行高钉死 1.5：面板里存在更长的选择器链在给正文定行高，
+   简单 `.message p` 会被压过去，所以这里用同一条链 + `!important`
+   （作用域只在右侧对话面板内，不外溢）。段落、列表、列表项一律一致。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message p,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message ul,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message ol,
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message li {
+  line-height: 1.5 !important;
+}
\ No newline at end of file

From 7d5916aa629276908f299b8ed05d5bbdf5e62379 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:19:09 +0800
Subject: [PATCH 55/67] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=9D=97=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=8E=92=E5=9C=A8=E6=96=87=E6=9C=AC=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=88=E4=BF=AE=E6=AD=A3=E9=94=9A=E5=AE=9A=E9=81=97=E7=95=99?=
 =?UTF-8?q?=EF=BC=9A=E5=85=88=E5=89=8D=E4=BB=8E=E6=B6=88=E6=81=AF=E5=89=8D?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BD=86=E6=9C=AA=E6=8F=92=E5=9B=9E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProjectSupervisorView：该回合的工具组渲染在 assistant 消息之后、轮次统计之前，不再压在同回合文本上面
- 实时回合的工具组改到流式正文之后，顺序与落定回合一致
- 修掉上一次改动把工具组从消息前移除却没插回、导致工具卡片不显示的问题
---
 .../ProjectSupervisorView.tsx                 | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 405fe616d..676213f60 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
@@ -522,15 +522,6 @@ export function ProjectSupervisorView({
               Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
-                {anchoredToolCalls.length > 0 ? (
-                  <ToolCallGroup
-                    calls={anchoredToolCalls}
-                    userSentAt={userMessageUpdatedAtForTurn(
-                      anchoredTurnId ?? '',
-                    )}
-                    className="message-tool-call"
-                  />
-                ) : null}
                 <div className={`message message--${message.role}`}>
                   <ChatMarkdownMessage
                     role={message.role}
@@ -546,20 +537,21 @@ export function ProjectSupervisorView({
                     </details>
                   ) : null}
                 </div>
+                {anchoredToolCalls.length > 0 ? (
+                  <ToolCallGroup
+                    calls={anchoredToolCalls}
+                    userSentAt={userMessageUpdatedAtForTurn(
+                      anchoredTurnId ?? '',
+                    )}
+                    className="message-tool-call"
+                  />
+                ) : null}
                 {isTurnEnd && anchoredTurnId && anchoredTurnId !== activeTurnId
                   ? renderTurnUsage(anchoredTurnId)
                   : null}
               </Fragment>
             );
           })}
-          {liveToolCalls.length > 0 ? (
-            <ToolCallGroup
-              calls={liveToolCalls}
-              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
-              active
-              className="message-tool-call"
-            />
-          ) : null}
           {liveToolCallTurnId &&
           liveToolCallTurnId !== activeTurnId &&
           !visibleMessages.some(
@@ -595,6 +587,14 @@ export function ProjectSupervisorView({
               />
             </div>
           ) : null}
+          {liveToolCalls.length > 0 ? (
+            <ToolCallGroup
+              calls={liveToolCalls}
+              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
+              active
+              className="message-tool-call"
+            />
+          ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)

From 67126a981e57656d86fba4921aa3e9cfada98aac Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:21:03 +0800
Subject: [PATCH 56/67] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=9B=9E=E5=90=88?=
 =?UTF-8?q?=E6=8C=89=E9=A1=BA=E5=BA=8F=E4=BA=A4=E6=9B=BF=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E6=AD=A3=E6=96=87=E4=B8=8E=E5=B7=A5=E5=85=B7=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- App.tsx：记录"每个工具首次出现时已生成正文的长度"（切分点）并在收尾/清空对话时重置
- ProjectSupervisorView：新增 renderLiveStream，按切分点把流式正文切成若干段，工具块就地插在对应位置；同一切分点的工具合并成一个块
- 有正文时不再重复渲染独立实时工具组（避免同一批工具出现两次）
- 历史回合没有切分点：退化为"正文 → 工具块 → 轮次统计"，老项目与旧数据不受影响
- tsc 通过；未跑测试
---
 apps/ai-game-creator-shell/src/App.tsx        | 46 ++++++++++++
 .../ProjectSupervisorView.tsx                 | 74 ++++++++++++++++++-
 2 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 8e51a380f..f4498546d 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -883,6 +883,14 @@ export function App({
   // 直连回合的思考过程（流式）：整段替换；回合结束/开始新回合/清空对话时一并清掉。
   const [directCodexTransientReasoning, setDirectCodexTransientReasoning] =
     useState('');
+  /** 实时回合里"某个工具首次出现时，已生成正文的长度"——用它把正文与工具交替排列。 */
+  const [directToolTextOffsets, setDirectToolTextOffsets] = useState<
+    Record<string, Record<string, number>>
+  >({});
+  const directToolTextOffsetsRef = useRef<Record<string, Record<string, number>>>(
+    {},
+  );
+  const directAccumulatedTextLengthRef = useRef(0);
   const [
     directCodexTransientReplyUpdatedAt,
     setDirectCodexTransientReplyUpdatedAt,
@@ -984,6 +992,9 @@ export function App({
     setDirectCodexProgressUpdatedAt(null);
     setDirectCodexTransientReply('');
     setDirectCodexTransientReasoning('');
+        directToolTextOffsetsRef.current = {};
+        setDirectToolTextOffsets({});
+        directAccumulatedTextLengthRef.current = 0;
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
   }
@@ -1083,6 +1094,9 @@ export function App({
     setDirectCodexProgressUpdatedAt(Date.now());
     setDirectCodexTransientReply('');
     setDirectCodexTransientReasoning('');
+        directToolTextOffsetsRef.current = {};
+        setDirectToolTextOffsets({});
+        directAccumulatedTextLengthRef.current = 0;
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
     setProjectSupervisorRuntimeError('');
@@ -1117,6 +1131,9 @@ export function App({
     activeDirectCodexTurnRef.current = null;
     setDirectCodexTransientReply('');
     setDirectCodexTransientReasoning('');
+        directToolTextOffsetsRef.current = {};
+        setDirectToolTextOffsets({});
+        directAccumulatedTextLengthRef.current = 0;
     directCodexTransientReplyRef.current = '';
     setDirectCodexTransientReplyUpdatedAt(null);
     return true;
@@ -2188,7 +2205,29 @@ export function App({
           );
         }
         // 工具调用增量：字段可选，老事件（undefined）走原路径，行为不变。
+        if (typeof payload.accumulatedText === 'string') {
+          directAccumulatedTextLengthRef.current = payload.accumulatedText.length;
+        }
         if (payload.toolCalls?.length) {
+          // 每个工具只记第一次出现时的正文长度：这就是它在对话流里的位置。
+          const turnOffsets =
+            directToolTextOffsetsRef.current[payload.turnId] ?? {};
+          let offsetsChanged = false;
+          for (const call of payload.toolCalls) {
+            const callId = (call as { id?: string }).id;
+            if (!callId || turnOffsets[callId] !== undefined) {
+              continue;
+            }
+            turnOffsets[callId] = directAccumulatedTextLengthRef.current;
+            offsetsChanged = true;
+          }
+          if (offsetsChanged) {
+            directToolTextOffsetsRef.current = {
+              ...directToolTextOffsetsRef.current,
+              [payload.turnId]: { ...turnOffsets },
+            };
+            setDirectToolTextOffsets(directToolTextOffsetsRef.current);
+          }
           applyDirectToolCalls(
             payload.toolCalls.map((call) => ({
               ...call,
@@ -2212,6 +2251,9 @@ export function App({
           setDirectCodexProgressUpdatedAt(updatedAt);
           setDirectCodexTransientReply('');
           setDirectCodexTransientReasoning('');
+        directToolTextOffsetsRef.current = {};
+        setDirectToolTextOffsets({});
+        directAccumulatedTextLengthRef.current = 0;
           setDirectCodexTransientReplyUpdatedAt(null);
           return;
         }
@@ -6860,6 +6902,9 @@ export function App({
         setDirectCodexProgress('正在等待陶泥儿开始');
         setDirectCodexTransientReply('');
         setDirectCodexTransientReasoning('');
+        directToolTextOffsetsRef.current = {};
+        setDirectToolTextOffsets({});
+        directAccumulatedTextLengthRef.current = 0;
         setDirectCodexProgressUpdatedAt(Date.now());
         directCodexTransientReplyRef.current = '';
         setDirectCodexTransientReplyUpdatedAt(null);
@@ -12594,6 +12639,7 @@ export function App({
   if (projectSupervisorOnly) {
     return (
       <ProjectSupervisorView
+          directToolTextOffsets={directToolTextOffsets}
         transientReasoning={directCodexTransientReasoning}
         initialSupervisorMessage={initialSupervisorMessage}
         activeVersionId={chatActiveVersionId}
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 676213f60..bdbcc92df 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
@@ -159,6 +159,8 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   transientReply: string;
   /** 流式思考过程（direct-codex）：拿不到就为空，空则不渲染。 */
   transientReasoning?: string;
+  /** 实时回合里"某工具首次出现时正文的长度"：用于把正文与工具按顺序交替渲染。 */
+  directToolTextOffsets?: Record<string, Record<string, number>>;
   showDesignReasoning?: boolean;
   designReasoning?: string;
   designReasoningEntries?: DesignReasoningEntry[];
@@ -227,6 +229,7 @@ export function ProjectSupervisorView({
   showProfessionalCollaboration = true,
   transientReply,
   transientReasoning = '',
+  directToolTextOffsets = {},
   showDesignReasoning = false,
   designReasoning = '',
   designReasoningEntries = [],
@@ -371,6 +374,69 @@ export function ProjectSupervisorView({
     return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
   };
 
+  /**
+   * 把实时正文与工具块按"工具出现时正文长度"交替排列：
+   * 文本段 → 该位置的工具块 → 下一段文本……同一切分点的工具合并成一个块。
+   * 没有切分点（历史回合）时退化为"正文在前、工具块在后"，与老项目兼容。
+   */
+  const renderLiveStream = (liveText: string, calls: typeof liveToolCalls) => {
+    const offsets = directToolTextOffsets[liveToolCallTurnId] ?? {};
+    const groups = new Map<number, typeof calls>();
+    for (const call of calls) {
+      const offset = offsets[call.id];
+      const key = Number.isFinite(offset) ? Number(offset) : liveText.length;
+      const bucket = groups.get(key) ?? [];
+      bucket.push(call);
+      groups.set(key, bucket);
+    }
+    if (groups.size === 0) {
+      return null;
+    }
+    const positions = [...groups.keys()].sort((left, right) => left - right);
+    const parts: ReactNode[] = [];
+    let cursor = 0;
+    for (const position of positions) {
+      const segment = liveText.slice(cursor, Math.max(cursor, position));
+      if (segment.length > 0) {
+        parts.push(
+          <div
+            key={`live-text-${position}`}
+            className="message message--assistant"
+            aria-live="polite"
+            data-runtime-owned="true"
+          >
+            <ChatMarkdownMessage role="assistant" text={segment} streaming />
+          </div>,
+        );
+      }
+      const bucket = groups.get(position) ?? [];
+      parts.push(
+        <ToolCallGroup
+          key={`live-tools-${position}`}
+          calls={bucket}
+          userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
+          active
+          className="message-tool-call"
+        />,
+      );
+      cursor = Math.max(cursor, position);
+    }
+    const tail = liveText.slice(cursor);
+    if (tail.length > 0) {
+      parts.push(
+        <div
+          key="live-text-tail"
+          className="message message--assistant"
+          aria-live="polite"
+          data-runtime-owned="true"
+        >
+          <ChatMarkdownMessage role="assistant" text={tail} streaming />
+        </div>,
+      );
+    }
+    return parts;
+  };
+
   /** 整轮会话的结束时间与耗时（进行中时用 tick 驱的 now，所以秒数会实时跳动）。 */
   const renderTurnUsage = (turnId: string) => {
     if (!turnId) {
@@ -573,7 +639,10 @@ export function ProjectSupervisorView({
           ) : null}
           {/* 直连回合的流式正文：恢复为对话区里的普通 assistant 消息（不再放进状态卡片），
               这样"边生成边显示"和"状态卡片只放状态"两件事同时成立。 */}
-          {directCodex && transientReply ? (
+          {directCodex && transientReply && liveToolCalls.length > 0
+            ? renderLiveStream(transientReply, liveToolCalls)
+            : null}
+          {directCodex && transientReply && liveToolCalls.length === 0 ? (
             <div
               className="message message--assistant"
               aria-label="陶泥儿实时回复"
@@ -587,7 +656,8 @@ export function ProjectSupervisorView({
               />
             </div>
           ) : null}
-          {liveToolCalls.length > 0 ? (
+          {/* 有正文时，工具块的顺序由 renderLiveStream 决定，这里不再重复渲染 */}
+          {liveToolCalls.length > 0 && !(directCodex && transientReply) ? (
             <ToolCallGroup
               calls={liveToolCalls}
               userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}

From b4e6f7e07eda3e8074264fb733e277cf3960c6fe Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:23:13 +0800
Subject: [PATCH 57/67] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E4=BA=A4=E6=9B=BF?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84=E5=88=87=E5=88=86=E7=82=B9=E5=90=B8?=
 =?UTF-8?q?=E9=99=84=E5=88=B0=E5=8F=A5=E5=AD=90=E8=BE=B9=E7=95=8C=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=8A=8A=E6=96=87=E6=9C=AC=E5=88=87=E7=A2=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- renderLiveStream：工具切分点向后吸附到最近的句末标点或换行（最多前探 200 字符）
- 同一条句子里的多个工具因此落到同一切点，自动合并成一个块（不再出现 轻|量|的 这种碎片）
- 找不到边界或已到文本末尾时保留原位置，不丢内容
---
 .../ProjectSupervisorView.tsx                 | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

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 bdbcc92df..e50ee4028 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
@@ -381,10 +381,38 @@ export function ProjectSupervisorView({
    */
   const renderLiveStream = (liveText: string, calls: typeof liveToolCalls) => {
     const offsets = directToolTextOffsets[liveToolCallTurnId] ?? {};
+    /**
+     * 把切分点吸附到句子边界：工具事件与文本增量是交替到达的，直接按"当时的长度"切
+     * 会把句子切碎（历史上出现过"我来做一次轻｜量｜的"这种）。这里向后找最近的
+     * 句末标点或换行，同一句里的多个工具因此落到同一个切点、自动合并成一块。
+     */
+    const snapToBoundary = (source: string, index: number) => {
+      const start = Math.max(0, Math.min(index, source.length));
+      const limit = Math.min(source.length, start + 200);
+      for (let cursor = start; cursor < limit; cursor += 1) {
+        const char = source[cursor];
+        if (char === '\n') {
+          return cursor + 1;
+        }
+        if ('。！？；!?;'.includes(char)) {
+          return cursor + 1;
+        }
+        if (
+          char === '.' &&
+          (source[cursor + 1] === ' ' || source[cursor + 1] === undefined)
+        ) {
+          return cursor + 1;
+        }
+      }
+      return start;
+    };
     const groups = new Map<number, typeof calls>();
     for (const call of calls) {
       const offset = offsets[call.id];
-      const key = Number.isFinite(offset) ? Number(offset) : liveText.length;
+      const key = snapToBoundary(
+        liveText,
+        Number.isFinite(offset) ? Number(offset) : liveText.length,
+      );
       const bucket = groups.get(key) ?? [];
       bucket.push(call);
       groups.set(key, bucket);

From 44786066b0bec0e4b27d58e2ce48cdaa4a729524 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:40:53 +0800
Subject: [PATCH 58/67] =?UTF-8?q?=E6=8C=89=20item=20=E5=88=86=E6=AE=B5?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=87=E6=9C=AC=E4=B8=8E=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A4=E6=9B=BF=E7=9A=84=E5=AF=B9=E8=AF=9D=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rust：item 事件保留 itemId，文本段按 (turnId,itemId) 幂等落盘；工具项按 callId 落位置项
- 新增 .agent/conversations/turn-stream.jsonl（schema agc-turn-stream.v1）：seq 为位置真相，首次分配后不回退；updatedAt 单调、同刻取更长文本；脱敏/上限/坏行跳过沿用工具卡片口径
- 发射器新增 emit_with_stream_items（不改 emit 现有签名），事件新增可选 streamItems
- 新增读取命令 read_direct_turn_stream（权限 conversation.read）
- 前端：打开项目读取历史流，实时按事件合并（同 id 幂等）；按流渲染 text 块与工具块，相邻工具合并、夹文本则分块；回合末渲染结束时间与总耗时
- 回退：该回合没有流项（老项目/缺文件/读取失败）时沿用原渲染，不白屏不丢内容
- 删除长度切点/标点吸附/1 秒时间窗三套启发式
- cargo build 通过、tsc 无新增错误、编码检查通过；未跑测试
---
 .../src-tauri/src/agent.rs                    |   2 +
 .../src-tauri/src/agent/codex_app_server.rs   |  19 +
 .../src/agent/direct_project_turn_history.rs  |   8 +
 .../src-tauri/src/agent/direct_runtime.rs     | 186 +++++++-
 .../src-tauri/src/agent/direct_tool_calls.rs  |   4 +-
 .../src-tauri/src/agent/direct_turn_stream.rs | 401 ++++++++++++++++++
 .../src/agent/runtime_driver/entrypoints.rs   |  43 ++
 .../src-tauri/src/commands.rs                 |  13 +
 .../src-tauri/src/main.rs                     |   5 +
 apps/ai-game-creator-shell/src/App.tsx        | 107 +++++
 apps/ai-game-creator-shell/src/app/types.ts   |  38 ++
 .../ProjectSupervisorView.tsx                 | 237 ++++++++++-
 12 files changed, 1038 insertions(+), 25 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent.rs b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
index 13dab607d..823729aed 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
@@ -22,6 +22,7 @@ mod direct_project_turn_history;
 mod direct_runtime;
 mod direct_tool_bridge;
 mod direct_tool_calls;
+mod direct_turn_stream;
 mod direct_tools_mcp;
 mod generation;
 mod interaction;
@@ -53,6 +54,7 @@ pub(crate) use direct_project_turn_history::*;
 pub(crate) use direct_runtime::*;
 pub(crate) use direct_tool_bridge::*;
 pub(crate) use direct_tool_calls::*;
+pub(crate) use direct_turn_stream::*;
 pub(crate) use direct_tools_mcp::*;
 pub(crate) use generation::*;
 pub(crate) use interaction::*;
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
index 03980d27f..e64141a08 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server.rs
@@ -572,6 +572,14 @@ enum CodexTurnEvent {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) enum DirectCodexTurnObservation {
     AccumulatedText(String),
+    /// 一个 assistant 文本段的当前累计全文。
+    ///
+    /// `item_id` 是一次 assistant 消息的稳定身份：同一个 id 的后续 delta 属于**同一段**，
+    /// id 变了就是新的一段。回合流的"文本段 + 工具"顺序用它来分段，而不是按 delta 分。
+    AgentMessageSegment {
+        item_id: String,
+        accumulated_text: String,
+    },
     IntermediateText(String),
     /// 模型的思考过程（reasoning item 的明文摘要）：流式阶段整段替换下发。
     Reasoning(String),
@@ -2927,6 +2935,17 @@ impl CodexAppServerConnection {
                             observer(DirectCodexTurnObservation::AccumulatedText(
                                 streamed_text.clone(),
                             ));
+                            // 同一个 assistant item 的当前累计全文：回合流按 item 分段，
+                            // 段内只追加、段间才换行，不能拿"整轮累计"当一段。
+                            let segment_text = direct_project_history
+                                .accumulated_text_for(&item_id)
+                                .unwrap_or_else(|| delta.clone());
+                            if !segment_text.trim().is_empty() {
+                                observer(DirectCodexTurnObservation::AgentMessageSegment {
+                                    item_id: item_id.clone(),
+                                    accumulated_text: segment_text,
+                                });
+                            }
                         }
                         if let Some(callback) = on_agent_message_delta.as_deref_mut() {
                             callback(&platform_llm::LlmStreamDelta {
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_turn_history.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_turn_history.rs
index c2c317692..c41b19de0 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_turn_history.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_turn_history.rs
@@ -22,6 +22,14 @@ impl DirectProjectHistoryAccumulator {
         }
     }
 
+    /// 某个 assistant item 目前累计到的全文。
+    ///
+    /// 回合流按 item 分段：同一个 item 的后续 delta 是同一段的增长，item 变了才是新的一段。
+    /// 没有这条 item（非 DirectProject 工作区、或已经 complete）时返回 `None`。
+    pub(crate) fn accumulated_text_for(&self, item_id: &str) -> Option<String> {
+        self.text_by_item_id.get(item_id).cloned()
+    }
+
     fn take_partial_items(&mut self) -> impl Iterator<Item = Value> + '_ {
         std::mem::take(&mut self.text_by_item_id)
             .into_iter()
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
index 69c95a8ad..81358e479 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime.rs
@@ -1,5 +1,6 @@
 use super::*;
 use base64::Engine as _;
+use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::future::Future;
 use std::io::Write;
@@ -4102,7 +4103,9 @@ fn sync_direct_codex_project_outputs_at(
 /// Project Codex text for the user-visible DirectProject stream and reply.
 /// Reasoning wrappers are still removed because they are not reply text, but
 /// the user owns the project and the resulting reply is not redacted here.
-fn project_direct_codex_visible_text(value: &str) -> Option<String> {
+///
+/// `pub(crate)`：回合流（`direct_turn_stream`）落最终回复前复用同一套可见性投影。
+pub(crate) fn project_direct_codex_visible_text(value: &str) -> Option<String> {
     let stripped = strip_incomplete_direct_thinking_marker(&strip_llm_thinking_blocks(value));
     if stripped.trim().is_empty() {
         return None;
@@ -4354,7 +4357,19 @@ async fn run_direct_game_creator_turn_at_with_creation_type_and_emitter(
                 let _ = persist_direct_codex_failure_context(root, emitter.turn_id(), &error);
             }
             if let Some(emitter) = turn_emitter {
-                emitter.emit("failed", Some("none"), None, None);
+                // 失败说明也是这一回合的内容：按出现顺序追加到回合流末尾，
+                // 这样"流里已经是完整内容"这一点对失败回合同样成立。
+                let failure_item = append_direct_turn_stream_text_at(
+                    root,
+                    emitter.turn_id(),
+                    DIRECT_TURN_STREAM_FAILURE_ITEM_ID,
+                    &error,
+                )
+                .ok()
+                .flatten()
+                .into_iter()
+                .collect::<Vec<_>>();
+                emitter.emit_with_stream_items("failed", Some("none"), None, None, failure_item);
             }
             Err(error)
         }
@@ -4397,6 +4412,125 @@ fn persist_collected_direct_tool_calls(root: &Path, collector: &DirectToolCallCo
     }
 }
 
+/// 回合流条目落盘：与工具调用同一口径（阻塞线程池 + 项目锁）。
+fn spawn_persist_direct_turn_stream_item(root: &Path, item: &DirectTurnStreamItem) {
+    let root = root.to_path_buf();
+    let item = item.clone();
+    tauri::async_runtime::spawn_blocking(move || upsert_direct_turn_stream_item_at(&root, &item));
+}
+
+/// 文本段落盘/下发的节流间隔：文本段是"整段累计 + 原地替换"，不需要逐 delta 落盘。
+const DIRECT_TURN_STREAM_TEXT_THROTTLE_MS: u128 = 300;
+
+/// 正在增长的那一段文本。
+struct DirectTurnStreamPendingText {
+    /// 这一段对应的 Codex assistant item id（段身份）。
+    item_id: String,
+    item: DirectTurnStreamItem,
+    last_flush: std::time::Instant,
+}
+
+/// 回合流的写入与下发状态（观察者持有）。
+///
+/// `seq_by_id` 是**顺序真相的本体**：条目 id 第一次出现时分配序号，之后所有更新都带同一个
+/// 序号，所以并发落盘的先后不会改变渲染顺序（不会出现"新工具插到旧文本前面"）。
+struct DirectTurnStreamWriter {
+    turn_id: String,
+    seq_by_id: BTreeMap<String, u64>,
+    next_seq: u64,
+    pending_text: Option<DirectTurnStreamPendingText>,
+}
+
+impl DirectTurnStreamWriter {
+    fn new(turn_id: String) -> Self {
+        Self {
+            turn_id,
+            seq_by_id: BTreeMap::new(),
+            next_seq: 0,
+            pending_text: None,
+        }
+    }
+
+    /// 条目 id 对应的固定序号：首次出现时分配，之后永远不变。
+    fn seq_for(&mut self, id: &str) -> u64 {
+        if let Some(seq) = self.seq_by_id.get(id) {
+            return *seq;
+        }
+        self.next_seq += 1;
+        self.seq_by_id.insert(id.to_string(), self.next_seq);
+        self.next_seq
+    }
+
+    /// 文本段推进。返回需要落盘 + 下发的那份快照（节流窗口内返回 `None`）。
+    ///
+    /// 段身份（`item_id`）变化时先把上一段的收尾快照交出去：上一段最后一段文字不能丢。
+    fn push_text(
+        &mut self,
+        root: &Path,
+        item_id: &str,
+        visible_text: &str,
+        now_ms: u64,
+    ) -> Option<DirectTurnStreamItem> {
+        let now = std::time::Instant::now();
+        let mut flushed = None;
+        if self
+            .pending_text
+            .as_ref()
+            .is_some_and(|pending| pending.item_id != item_id)
+        {
+            flushed = self.take_pending_snapshot();
+        }
+        match self.pending_text.as_mut() {
+            Some(pending) if pending.item_id == item_id => {
+                pending.item.text = Some(sanitize_stream_text(root, visible_text));
+                pending.item.updated_at = now_ms.max(pending.item.updated_at);
+                if now.duration_since(pending.last_flush).as_millis()
+                    >= DIRECT_TURN_STREAM_TEXT_THROTTLE_MS
+                {
+                    pending.last_flush = now;
+                    return Some(pending.item.clone());
+                }
+            }
+            _ => {
+                let seq = self.seq_for(&direct_turn_stream_text_item_id(&self.turn_id, item_id));
+                let item = direct_turn_stream_text_item(
+                    root,
+                    &self.turn_id,
+                    item_id,
+                    visible_text,
+                    seq,
+                    now_ms,
+                    now_ms,
+                );
+                self.pending_text = Some(DirectTurnStreamPendingText {
+                    item_id: item_id.to_string(),
+                    item,
+                    last_flush: now,
+                });
+                // 新段一出现就立刻落盘 + 下发：位置由这一刻钉死。
+                return self.pending_text.as_ref().map(|pending| pending.item.clone());
+            }
+        }
+        flushed
+    }
+
+    /// 取出当前段的收尾快照（段结束 / 回合结束时调用），不再持有它。
+    fn take_pending_snapshot(&mut self) -> Option<DirectTurnStreamItem> {
+        self.pending_text.take().map(|pending| pending.item)
+    }
+
+    /// 工具条目：只记位置，正文仍来自 `tool-calls.jsonl`。
+    fn push_tool(&mut self, call: &DirectToolCall, now_ms: u64) -> DirectTurnStreamItem {
+        let seq = self.seq_for(&direct_turn_stream_tool_item_id(&self.turn_id, &call.id));
+        let at = if call.started_at > 0 {
+            call.started_at
+        } else {
+            now_ms
+        };
+        direct_turn_stream_tool_item(&self.turn_id, call, seq, at)
+    }
+}
+
 async fn run_direct_game_creator_turn_inner(
     root: &Path,
     prompt: &str,
@@ -4426,6 +4560,8 @@ async fn run_direct_game_creator_turn_inner(
         let emitter = emitter.clone();
         let turn_root = root.to_path_buf();
         let turn_tool_calls = Arc::clone(&tool_calls);
+        // 回合流：文本段与工具按**出现顺序**各占一行，位置（seq）在首次出现时钉死。
+        let mut stream_writer = DirectTurnStreamWriter::new(client_turn_id.clone());
         let mut observer = move |observation: DirectCodexTurnObservation| {
             let status = direct_codex_observation_status(&observation, stream_enabled);
             match observation {
@@ -4437,6 +4573,27 @@ async fn run_direct_game_creator_turn_inner(
                     }
                     emitter.emit(status, None, visible_text, None);
                 }
+                DirectCodexTurnObservation::AgentMessageSegment {
+                    item_id,
+                    accumulated_text,
+                } => {
+                    // 可见文本段：同一 item 的后续 delta 就地增长，item 变了才新起一段。
+                    let Some(visible_text) = project_direct_codex_visible_text(&accumulated_text)
+                    else {
+                        return;
+                    };
+                    let Some(item) = stream_writer.push_text(
+                        &turn_root,
+                        &item_id,
+                        &visible_text,
+                        direct_tool_call_now_ms(),
+                    ) else {
+                        return;
+                    };
+                    // 事件与落盘共用同一份快照：前端的顺序真相与文件里的顺序真相一致。
+                    spawn_persist_direct_turn_stream_item(&turn_root, &item);
+                    emitter.emit_with_stream_items(status, None, None, None, vec![item]);
+                }
                 DirectCodexTurnObservation::IntermediateText(intermediate_text) => {
                     let visible_text = if stream_enabled
                         || is_direct_codex_item_started_work_detail(&intermediate_text)
@@ -4480,7 +4637,16 @@ async fn run_direct_game_creator_turn_inner(
                         collected.retain(|existing| existing.id != tool_call.id);
                         collected.push(tool_call.clone());
                     }
-                    emitter.emit(status, None, None, Some(vec![tool_call.clone()]));
+                    // 回合流：工具是**普通元素**，位置在文本段之后（或与相邻工具成块）。
+                    let stream_item = stream_writer.push_tool(&tool_call, direct_tool_call_now_ms());
+                    spawn_persist_direct_turn_stream_item(&turn_root, &stream_item);
+                    emitter.emit_with_stream_items(
+                        status,
+                        None,
+                        None,
+                        Some(vec![tool_call.clone()]),
+                        vec![stream_item],
+                    );
                     // 落盘"最新的那一份"：started 让卡片刷新后立刻出现，终态覆盖同一行。
                     spawn_persist_direct_tool_call(&turn_root, &tool_call);
                 }
@@ -4517,11 +4683,23 @@ async fn run_direct_game_creator_turn_inner(
         )
     })?;
     if let Some(emitter) = turn_emitter {
-        emitter.emit(
+        // 最终回复落到本回合最后一条文本段上（原地更新，不新起一段），并随事件下发：
+        // 前端据此把最后一段替换成最终可见回复，流式尾巴与最终回复不会重复。
+        let finalized = finalize_direct_turn_stream_reply_at(
+            root,
+            emitter.turn_id(),
+            &visible_reply,
+        )
+        .ok()
+        .flatten()
+        .into_iter()
+        .collect::<Vec<_>>();
+        emitter.emit_with_stream_items(
             "finalizing",
             Some("response-finalization"),
             Some(visible_reply.clone()),
             None,
+            finalized,
         );
     }
     if direct_codex_output_fingerprint(root) != previous_output_fingerprint {
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index bf9e35b05..b1dae74b0 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -205,7 +205,9 @@ fn relativize_project_root_paths(root: &Path, value: &str) -> String {
 /// `Authorization: Bearer …`、`Cookie: …`、`api_key=…`、`client_secret=…` 这类键值凭据；
 /// 含 `--password` / `--token` / `--secret` 这类敏感 CLI 标志的行按既有 fail-closed
 /// 约定整行替换成 `[redacted sensitive context]`（与 `sanitize_agent_runtime_text` 一致）。
-fn sanitize_detail_text(root: &Path, value: &str) -> String {
+///
+/// `pub(crate)`：回合流（`direct_turn_stream`）的文本段复用同一套脱敏，避免两处口径分叉。
+pub(crate) fn sanitize_detail_text(root: &Path, value: &str) -> String {
     let without_project_root = relativize_project_root_paths(root, value);
     let without_absolute = redact_absolute_path_tokens(&without_project_root);
     let without_secret = redact_secret_tokens(&without_absolute);
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
new file mode 100644
index 000000000..4b9bdbfb7
--- /dev/null
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
@@ -0,0 +1,401 @@
+//! GameAgent 对话「回合流」的采集、持久化与回读。
+//!
+//! 顺序真相放在一处：`<projectRoot>/.agent/conversations/turn-stream.jsonl` 按**出现顺序**
+//! 记录一个回合里的文本段与工具调用。工具条目只记位置标记（`callId`），工具本身的正文
+//! 仍然来自 `tool-calls.jsonl`（同一 id 幂等合并只有一处实现）。
+//!
+//! 位置稳定：每条条目的 `seq` 在**首次出现**时由观察方分配并落盘，后续更新（同一 id 的
+//! 文本追加 / 工具状态变化）只改内容不改 `seq`。因此并发落盘的先后顺序不会让"新工具插到
+//! 旧文本前面"——渲染顺序只由 `seq` 决定。
+//!
+//! 为什么不复用 `project.jsonl`：那条链路一个回合只投影一条 assistant 消息（整段回复），
+//! 中途的文本段没有独立记录，装不下"文本段与工具交替"的顺序。
+
+use crate::agent::sanitize_detail_text;
+use crate::config::{prepare_game_creator_private_path_for_read, write_game_creator_private_file};
+use crate::project::{enforce_project_permission_policy, project_append_lock_for};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::fs::File;
+use std::io::{BufRead, BufReader};
+use std::path::{Path, PathBuf};
+
+/// 行信封类型，与既有历史文件同构（`{"type": …, "payload": {…}}`）。
+pub(crate) const DIRECT_TURN_STREAM_RECORD_TYPE: &str = "turn_stream_item";
+/// 条目 schema 版本。
+pub(crate) const DIRECT_TURN_STREAM_SCHEMA_VERSION: &str = "agc-turn-stream.v1";
+/// 回读上限：只保留最后这么多条（按 `seq` 取最新）。
+pub(crate) const DIRECT_TURN_STREAM_LIMIT: usize = 400;
+/// 单条文本段的字符上限（与工具明细同口径的截断，避免单段失控）。
+const DIRECT_TURN_STREAM_TEXT_MAX_CHARS: usize = 8000;
+/// 没有流式分段时，最终回复那一段的固定 item id。
+const DIRECT_TURN_STREAM_FINAL_ITEM_ID: &str = "final";
+/// 回合失败说明那一段的固定 item id：失败说明也是这一回合的内容，排在流末尾。
+pub(crate) const DIRECT_TURN_STREAM_FAILURE_ITEM_ID: &str = "failure";
+
+/// 文本段。
+pub(crate) const DIRECT_TURN_STREAM_KIND_TEXT: &str = "text";
+/// 工具调用的位置标记。
+pub(crate) const DIRECT_TURN_STREAM_KIND_TOOL: &str = "tool";
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DirectTurnStreamItem {
+    pub(crate) schema_version: String,
+    /// 幂等身份：文本段 `text:<turnId>:<itemId>`、工具 `tool:<turnId>:<callId>`。
+    pub(crate) id: String,
+    pub(crate) turn_id: String,
+    /// `text` | `tool`
+    pub(crate) kind: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) text: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) call_id: Option<String>,
+    /// 首次出现的写入序号：**顺序真相**，同刻按它排序。
+    pub(crate) seq: u64,
+    /// 条目首次出现的本机毫秒时刻。
+    pub(crate) at: u64,
+    pub(crate) updated_at: u64,
+}
+
+impl DirectTurnStreamItem {
+    fn order_key(&self) -> (u64, u64, &str) {
+        (self.seq, self.at, self.id.as_str())
+    }
+}
+
+fn turn_stream_path(root: &Path) -> PathBuf {
+    root.join(".agent/conversations/turn-stream.jsonl")
+}
+
+/// 文本段条目的幂等 id：同一个 Codex assistant item 只占一行。
+pub(crate) fn direct_turn_stream_text_item_id(turn_id: &str, item_id: &str) -> String {
+    format!("text:{}:{}", turn_id.trim(), item_id.trim())
+}
+
+/// 工具条目（位置标记）的幂等 id：同一个 callId 只占一行。
+pub(crate) fn direct_turn_stream_tool_item_id(turn_id: &str, call_id: &str) -> String {
+    format!("tool:{}:{}", turn_id.trim(), call_id.trim())
+}
+
+/// 构造一条文本段条目：脱敏 + 截断与 `tool-calls.jsonl` 同口径。
+pub(crate) fn direct_turn_stream_text_item(
+    root: &Path,
+    turn_id: &str,
+    item_id: &str,
+    text: &str,
+    seq: u64,
+    at: u64,
+    updated_at: u64,
+) -> DirectTurnStreamItem {
+    DirectTurnStreamItem {
+        schema_version: DIRECT_TURN_STREAM_SCHEMA_VERSION.to_string(),
+        id: direct_turn_stream_text_item_id(turn_id, item_id),
+        turn_id: turn_id.trim().to_string(),
+        kind: DIRECT_TURN_STREAM_KIND_TEXT.to_string(),
+        text: Some(sanitize_stream_text(root, text)),
+        call_id: None,
+        seq,
+        at,
+        updated_at,
+    }
+}
+
+/// 构造一条工具条目：只记位置，正文仍来自 `DirectToolCall`。
+pub(crate) fn direct_turn_stream_tool_item(
+    turn_id: &str,
+    call: &crate::DirectToolCall,
+    seq: u64,
+    at: u64,
+) -> DirectTurnStreamItem {
+    DirectTurnStreamItem {
+        schema_version: DIRECT_TURN_STREAM_SCHEMA_VERSION.to_string(),
+        id: direct_turn_stream_tool_item_id(turn_id, &call.id),
+        turn_id: turn_id.trim().to_string(),
+        kind: DIRECT_TURN_STREAM_KIND_TOOL.to_string(),
+        text: None,
+        call_id: Some(call.id.trim().to_string()),
+        seq,
+        at,
+        updated_at: call.updated_at,
+    }
+}
+
+/// 文本脱敏 + 截断：与 `tool-calls.jsonl` 同一套 `sanitize_detail_text`。
+pub(crate) fn sanitize_stream_text(root: &Path, text: &str) -> String {
+    let sanitized = sanitize_detail_text(root, text);
+    if sanitized.chars().count() <= DIRECT_TURN_STREAM_TEXT_MAX_CHARS {
+        return sanitized;
+    }
+    let mut truncated = sanitized
+        .chars()
+        .take(DIRECT_TURN_STREAM_TEXT_MAX_CHARS)
+        .collect::<String>();
+    truncated.push('…');
+    truncated
+}
+
+fn record_line(item: &DirectTurnStreamItem) -> Result<String, String> {
+    serde_json::to_string(&serde_json::json!({
+        "type": DIRECT_TURN_STREAM_RECORD_TYPE,
+        "payload": item,
+    }))
+    .map_err(|error| format!("序列化回合流条目失败：{error}"))
+}
+
+/// 解析一行信封；坏行 / 非本文件条目都返回 `None`（尽力而为的展示数据，不整体失败）。
+fn stream_item_from_line(line: &str) -> Option<DirectTurnStreamItem> {
+    let trimmed = line.trim();
+    if trimmed.is_empty() {
+        return None;
+    }
+    let parsed: Value = serde_json::from_str(trimmed).ok()?;
+    if parsed.get("type").and_then(Value::as_str) != Some(DIRECT_TURN_STREAM_RECORD_TYPE) {
+        return None;
+    }
+    let payload = parsed.get("payload")?;
+    let mut item: DirectTurnStreamItem = serde_json::from_value(payload.clone()).ok()?;
+    if item.id.trim().is_empty() || item.turn_id.trim().is_empty() {
+        return None;
+    }
+    if !matches!(
+        item.kind.as_str(),
+        DIRECT_TURN_STREAM_KIND_TEXT | DIRECT_TURN_STREAM_KIND_TOOL
+    ) {
+        return None;
+    }
+    if item.schema_version.trim().is_empty() {
+        item.schema_version = DIRECT_TURN_STREAM_SCHEMA_VERSION.to_string();
+    }
+    Some(item)
+}
+
+fn read_stream_lines(path: &Path) -> Vec<DirectTurnStreamItem> {
+    let Ok(file) = File::open(path) else {
+        return Vec::new();
+    };
+    let mut reader = BufReader::new(file);
+    let mut buffer = Vec::new();
+    let mut items = Vec::new();
+    loop {
+        buffer.clear();
+        match reader.read_until(b'\n', &mut buffer) {
+            Ok(0) => break,
+            // 单行解码失败（非法 UTF-8）只跳过这一行，继续读后面的行。
+            Ok(_) => match std::str::from_utf8(&buffer) {
+                Ok(line) => {
+                    if let Some(item) = stream_item_from_line(line) {
+                        items.push(item);
+                    }
+                }
+                Err(_) => continue,
+            },
+            // 读 I/O 错误：无法再定位下一行边界，停止读取（已读到的照常返回）。
+            Err(_) => break,
+        }
+    }
+    items
+}
+
+/// 同一 id 的重复行合并：`seq` 取最早（位置钉死，后到的不得回退），`at` 取最早非零，
+/// `updated_at` 取最大；文本只在更新（或同刻更长）的快照上替换。
+fn merge_stream_snapshot(
+    existing: &DirectTurnStreamItem,
+    incoming: &DirectTurnStreamItem,
+) -> DirectTurnStreamItem {
+    let text_len = |item: &DirectTurnStreamItem| {
+        item.text
+            .as_deref()
+            .map(str::chars)
+            .map(Iterator::count)
+            .unwrap_or_default()
+    };
+    let take_incoming = incoming.updated_at > existing.updated_at
+        || (incoming.updated_at == existing.updated_at && text_len(incoming) > text_len(existing));
+    let mut merged = existing.clone();
+    if take_incoming {
+        merged.text = incoming.text.clone();
+        merged.updated_at = incoming.updated_at;
+    }
+    if merged.call_id.is_none() {
+        merged.call_id = incoming.call_id.clone();
+    }
+    merged.seq = merged.seq.min(incoming.seq);
+    merged.at = [merged.at, incoming.at]
+        .into_iter()
+        .filter(|at| *at > 0)
+        .min()
+        .unwrap_or_default();
+    merged
+}
+
+/// 按 id 归并，再按 `seq` 正序裁剪到最近 `DIRECT_TURN_STREAM_LIMIT` 条。
+fn normalize_stream_items(items: Vec<DirectTurnStreamItem>) -> Vec<DirectTurnStreamItem> {
+    let mut by_id: BTreeMap<String, DirectTurnStreamItem> = BTreeMap::new();
+    for item in items {
+        let merged = match by_id.remove(&item.id) {
+            Some(previous) => merge_stream_snapshot(&previous, &item),
+            None => item,
+        };
+        by_id.insert(merged.id.clone(), merged);
+    }
+    let mut normalized = by_id.into_values().collect::<Vec<_>>();
+    normalized.sort_by(|left, right| left.order_key().cmp(&right.order_key()));
+    if normalized.len() > DIRECT_TURN_STREAM_LIMIT {
+        normalized.drain(..normalized.len() - DIRECT_TURN_STREAM_LIMIT);
+    }
+    normalized
+}
+
+/// 锁内读改写：整文件重写（追加与就地更新混用，没有纯追加的 JSONL 语义）。
+/// 文件规模由 400 条上限与 8000 字符截断兜住。
+fn with_locked_stream_items<T>(
+    root: &Path,
+    mutate: impl FnOnce(&mut Vec<DirectTurnStreamItem>) -> T,
+) -> Result<T, String> {
+    let path = turn_stream_path(root);
+    let _project_lock = crate::acquire_game_creator_agent_runtime_project_write_lock_with_wait(
+        root,
+        "conversation.write",
+    )?;
+    let lock = project_append_lock_for(&path)?;
+    let _append_guard = lock.lock("回合流写入")?;
+    let mut items = read_stream_lines(&path);
+    let outcome = mutate(&mut items);
+    let normalized = normalize_stream_items(items);
+    let mut body = String::new();
+    for item in &normalized {
+        body.push_str(&record_line(item)?);
+        body.push('\n');
+    }
+    write_game_creator_private_file(&path, body.as_bytes(), "回合流历史")?;
+    Ok(outcome)
+}
+
+/// 幂等 upsert 一条回合流条目。
+///
+/// 位置（`seq` / `at`）只在第一次出现时确定：同一 id 的后续快照不得回退位置，
+/// 也不得把已经写下的文本改短（并发落盘下"后到的旧快照"不会覆盖新快照）。
+pub(crate) fn upsert_direct_turn_stream_item_at(
+    root: &Path,
+    item: &DirectTurnStreamItem,
+) -> Result<(), String> {
+    enforce_project_permission_policy(root, "conversation.write")?;
+    with_locked_stream_items(root, |items| {
+        items.retain(|existing| existing.id != item.id);
+        items.push(item.clone());
+    })
+}
+
+/// 回读：文件缺失返回空数组；单行损坏跳过；按 `seq` 正序，最多最后 400 条。
+pub(crate) fn read_direct_turn_stream_at(root: &Path) -> Result<Vec<DirectTurnStreamItem>, String> {
+    let path = turn_stream_path(root);
+    if !prepare_game_creator_private_path_for_read(&path, false, "回合流历史")? {
+        return Ok(Vec::new());
+    }
+    Ok(normalize_stream_items(read_stream_lines(&path)))
+}
+
+/// 追加一段固定身份的文本段（失败说明等）：位置排在当前流末尾。
+///
+/// 幂等：同一 `(turnId, itemId)` 已经存在时只更新文本与 `updatedAt`（回合重放 / 重复收尾
+/// 不会多出一段）。返回写下的那一条，调用方用它下发同一份快照。
+pub(crate) fn append_direct_turn_stream_text_at(
+    root: &Path,
+    turn_id: &str,
+    item_id: &str,
+    text: &str,
+) -> Result<Option<DirectTurnStreamItem>, String> {
+    let turn_id = turn_id.trim();
+    let text = text.trim();
+    if turn_id.is_empty() || text.is_empty() {
+        return Ok(None);
+    }
+    let sanitized = sanitize_stream_text(root, text);
+    let item_id = item_id.trim();
+    enforce_project_permission_policy(root, "conversation.write")?;
+    let now = crate::agent::direct_tool_call_now_ms();
+    with_locked_stream_items(root, |items| {
+        let existing_id = direct_turn_stream_text_item_id(turn_id, item_id);
+        if let Some(existing) = items.iter_mut().find(|item| item.id == existing_id) {
+            // 位置不动：只替换文本与 updatedAt。
+            existing.text = Some(sanitized.clone());
+            existing.updated_at = now.max(existing.updated_at);
+            return Some(existing.clone());
+        }
+        // 首次出现：位置钉在末尾（当前最大 seq + 1）。
+        let next_seq = items.iter().map(|item| item.seq).max().unwrap_or(0) + 1;
+        let item = DirectTurnStreamItem {
+            schema_version: DIRECT_TURN_STREAM_SCHEMA_VERSION.to_string(),
+            id: existing_id,
+            turn_id: turn_id.to_string(),
+            kind: DIRECT_TURN_STREAM_KIND_TEXT.to_string(),
+            text: Some(sanitized),
+            call_id: None,
+            seq: next_seq,
+            at: now,
+            updated_at: now,
+        };
+        items.push(item.clone());
+        Some(item)
+    })
+}
+
+/// 回合结束：把**可见回复**落到本回合最后一条文本段上。
+///
+/// - 本回合已有文本段（流式逐段落的那些）：原地把最后一段替换成最终可见回复，
+///   不新起一段——否则最终回复会和最后一段重复。
+/// - 本回合没有文本段（非流式、或整轮没有文本）：追加一段，位置排在最后。
+///
+/// `visible_reply` 由调用方先做可见性投影（去思考块、去空）。返回被写入的那一条，
+/// 调用方用它下发同一份快照。
+pub(crate) fn finalize_direct_turn_stream_reply_at(
+    root: &Path,
+    turn_id: &str,
+    visible_reply: &str,
+) -> Result<Option<DirectTurnStreamItem>, String> {
+    let turn_id = turn_id.trim();
+    if turn_id.is_empty() || visible_reply.trim().is_empty() {
+        return Ok(None);
+    }
+    // 入口再做一次可见性投影：调用方给的是原始回复时，思考块不能落进对话流。
+    let visible_reply = crate::agent::project_direct_codex_visible_text(visible_reply)
+        .unwrap_or_else(|| visible_reply.trim().to_string());
+    let visible_reply = visible_reply.as_str();
+    enforce_project_permission_policy(root, "conversation.write")?;
+    let now = crate::agent::direct_tool_call_now_ms();
+    with_locked_stream_items(root, |items| {
+        let last_text_id = items
+            .iter()
+            .filter(|item| item.turn_id == turn_id && item.kind == DIRECT_TURN_STREAM_KIND_TEXT)
+            .max_by(|left, right| left.order_key().cmp(&right.order_key()))
+            .map(|item| item.id.clone());
+        match last_text_id {
+            Some(id) => {
+                let item = items
+                    .iter_mut()
+                    .find(|item| item.id == id)
+                    .expect("最后一条文本段必须还在集合里");
+                // 位置不动：只替换文本与 updatedAt（原地更新，不重排）。
+                item.text = Some(sanitize_stream_text(root, visible_reply));
+                item.updated_at = now.max(item.updated_at);
+                Some(item.clone())
+            }
+            None => {
+                let next_seq = items.iter().map(|item| item.seq).max().unwrap_or(0) + 1;
+                let item = direct_turn_stream_text_item(
+                    root,
+                    turn_id,
+                    DIRECT_TURN_STREAM_FINAL_ITEM_ID,
+                    visible_reply,
+                    next_seq,
+                    now,
+                    now,
+                );
+                items.push(item.clone());
+                Some(item)
+            }
+        }
+    })
+}
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
index 9089d7748..afad36523 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_driver/entrypoints.rs
@@ -62,6 +62,48 @@ impl DirectGameCreatorTurnUpdateEmitter {
         accumulated_text: Option<String>,
         tool_calls: Option<Vec<crate::DirectToolCall>>,
         reasoning_text: Option<String>,
+    ) {
+        self.emit_full(
+            status,
+            activity,
+            accumulated_text,
+            tool_calls,
+            reasoning_text,
+            Vec::new(),
+        );
+    }
+
+    /// 带回合流的回合更新：`stream_items` 是"顺序真相"里本次变化的那几条。
+    ///
+    /// 前端按这些条目的 `seq` 顺序渲染，所以它们必须来自与落盘同一份数据，
+    /// 不能在前端各算一套顺序。
+    pub(crate) fn emit_with_stream_items(
+        &self,
+        status: &'static str,
+        activity: Option<&'static str>,
+        accumulated_text: Option<String>,
+        tool_calls: Option<Vec<crate::DirectToolCall>>,
+        stream_items: Vec<crate::DirectTurnStreamItem>,
+    ) {
+        self.emit_full(
+            status,
+            activity,
+            accumulated_text,
+            tool_calls,
+            None,
+            stream_items,
+        );
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn emit_full(
+        &self,
+        status: &'static str,
+        activity: Option<&'static str>,
+        accumulated_text: Option<String>,
+        tool_calls: Option<Vec<crate::DirectToolCall>>,
+        reasoning_text: Option<String>,
+        stream_items: Vec<crate::DirectTurnStreamItem>,
     ) {
         let status_is_allowed = matches!(
             status,
@@ -107,6 +149,7 @@ impl DirectGameCreatorTurnUpdateEmitter {
                 accumulated_text,
                 tool_calls,
                 reasoning_text,
+                stream_items: (!stream_items.is_empty()).then_some(stream_items),
                 updated_at,
             },
         );
diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index a385eca42..fdde71030 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -5311,6 +5311,19 @@ pub(crate) async fn read_direct_tool_calls(
     .map_err(|error| format!("读取工具调用历史后台任务失败：{error}"))?
 }
 
+#[tauri::command]
+pub(crate) async fn read_direct_turn_stream(
+    project_path: String,
+) -> Result<Vec<DirectTurnStreamItem>, String> {
+    tauri::async_runtime::spawn_blocking(move || {
+        let root = Path::new(project_path.trim());
+        enforce_project_permission_policy(root, "conversation.read")?;
+        read_direct_turn_stream_at(root)
+    })
+    .await
+    .map_err(|error| format!("读取回合流历史后台任务失败：{error}"))?
+}
+
 #[tauri::command]
 pub(crate) fn append_local_conversation_message(
     project_path: String,
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 426a713c5..b69d8f19b 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -1017,6 +1017,10 @@ struct GameCreatorDirectTurnUpdateEvent {
     /// 本回合当前累计的思考过程（流式整段替换）；拿不到时字段缺席。
     #[serde(skip_serializing_if = "Option::is_none")]
     reasoning_text: Option<String>,
+    /// 本回合**顺序真相**里本次发生变化的那几条（文本段 / 工具位置标记）。
+    /// `skip_serializing_if`：字段缺席时前端拿到 `undefined`，行为与改造前一致。
+    #[serde(skip_serializing_if = "Option::is_none")]
+    stream_items: Option<Vec<crate::DirectTurnStreamItem>>,
     updated_at: u64,
 }
 
@@ -2779,6 +2783,7 @@ fn main() {
             read_local_conversation,
             read_direct_project_conversation,
             read_direct_tool_calls,
+            read_direct_turn_stream,
             read_agent_runtime_error_detail,
             append_local_conversation_message,
             append_direct_project_conversation_message,
diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 8e51a380f..59bd3312c 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -99,6 +99,7 @@ import type {
   ProjectPermissionPolicyView,
   SyncCanvasProjectAssetsResult,
   TauriInvoke,
+  TurnStreamItem,
   UploadLocalAssetResult,
 } from './app/types';
 import { useWindowChrome } from './components/windowChromeContext';
@@ -504,6 +505,68 @@ function directCodexTurnIdFromAssistantMessageId(messageId: string) {
 
 export const MAX_CHAT_COMPOSER_ATTACHMENTS = 8;
 
+/**
+ * 回合流排序：`seq`（条目首次出现时钉死）优先，其次 `at`，最后按 id 兜底。
+ * 与 Rust 侧同一口径——前端不自己发明顺序。
+ */
+function sortTurnStreamItems(items: readonly TurnStreamItem[]) {
+  return [...items].sort(
+    (left, right) =>
+      left.seq - right.seq ||
+      left.at - right.at ||
+      left.id.localeCompare(right.id),
+  );
+}
+
+/**
+ * 归并一批回合流条目：同 id 幂等覆盖（`updatedAt` 单调，同刻取更长文本），新 id 追加。
+ * 实时增量与回读历史共用这一处，所以界面上的顺序只有一份来源。
+ */
+function mergeTurnStreamItems(
+  existing: readonly TurnStreamItem[],
+  incoming: readonly TurnStreamItem[],
+): TurnStreamItem[] {
+  if (incoming.length === 0) {
+    return [...existing];
+  }
+  const byId = new Map<string, TurnStreamItem>();
+  for (const item of existing) {
+    const id = item.id?.trim();
+    if (id) {
+      byId.set(id, item);
+    }
+  }
+  for (const item of incoming) {
+    const id = item.id?.trim();
+    if (!id) {
+      continue;
+    }
+    const previous = byId.get(id);
+    const normalized: TurnStreamItem = { ...item, id };
+    if (!previous) {
+      byId.set(id, normalized);
+      continue;
+    }
+    // 内容只在更新（或同刻更长）的快照上替换；`seq` 取最早，位置不许回退。
+    const textLength = (value: TurnStreamItem) =>
+      value.kind === 'text' ? (value.text?.length ?? 0) : 0;
+    const takeIncoming =
+      normalized.updatedAt > previous.updatedAt ||
+      (normalized.updatedAt === previous.updatedAt &&
+        textLength(normalized) > textLength(previous));
+    byId.set(id, {
+      ...(takeIncoming ? normalized : previous),
+      id,
+      seq: Math.min(previous.seq, normalized.seq),
+      at:
+        previous.at > 0 && normalized.at > 0
+          ? Math.min(previous.at, normalized.at)
+          : Math.max(previous.at, normalized.at),
+    } as TurnStreamItem);
+  }
+  return sortTurnStreamItems([...byId.values()]);
+}
+
 export function isDirectCodexTurnAlreadyRunningError(error: unknown) {
   const message = error instanceof Error ? error.message : String(error);
   return message
@@ -1106,6 +1169,30 @@ export function App({
     setDirectToolCalls(normalized);
   }
 
+  // 回合流（文本段 + 工具按**出现顺序**交替）：实时增量与回读历史共用一份状态，
+  // 渲染顺序只由条目的 `seq` 决定，界面不再按文本长度 / 标点 / 时间窗猜切点。
+  const [directTurnStream, setDirectTurnStream] = useState<TurnStreamItem[]>([]);
+  const directTurnStreamRef = useRef<TurnStreamItem[]>([]);
+
+  /** 归并一批回合流条目（实时事件里的 `streamItems`）。 */
+  function applyTurnStreamItems(incoming: readonly TurnStreamItem[]) {
+    if (incoming.length === 0) {
+      return;
+    }
+    const merged = mergeTurnStreamItems(directTurnStreamRef.current, incoming);
+    directTurnStreamRef.current = merged;
+    setDirectTurnStream(merged);
+  }
+
+  /** 回合流按项目维度作废：换项目 / 重开历史时整体替换，避免串项目。 */
+  function replaceTurnStreamItems(next: readonly TurnStreamItem[]) {
+    const normalized = sortTurnStreamItems(
+      next.filter((item) => Boolean(item.id?.trim())),
+    );
+    directTurnStreamRef.current = normalized;
+    setDirectTurnStream(normalized);
+  }
+
   function clearDirectCodexTransientReply(projectPath: string, turnId: string) {
     const activeTurn = activeDirectCodexTurnRef.current;
     if (
@@ -2199,6 +2286,10 @@ export function App({
         if (typeof payload.reasoningText === 'string') {
           setDirectCodexTransientReasoning(payload.reasoningText);
         }
+        // 回合流的顺序真相：字段可选，老事件（undefined）走原路径。
+        if (payload.streamItems?.length) {
+          applyTurnStreamItems(payload.streamItems);
+        }
         const updatedAt =
           Number.isFinite(payload.updatedAt) && payload.updatedAt > 0
             ? payload.updatedAt
@@ -3880,6 +3971,14 @@ export function App({
           { projectPath: nextProjectPath },
         ).catch(() => []);
         replaceDirectToolCalls(persistedToolCalls);
+        // 回合流（顺序真相）走独立历史文件（`turn-stream.jsonl`）。与工具调用同一处：必须在
+        // 读完项目对话之后、任何提前 return 之前回读。缺命令（老客户端）/ 缺文件 / 读取失败
+        // 都只是"这个回合没有流"，界面回退到原来的渲染，不能因此把整个打开流程判失败。
+        const persistedTurnStream = await invoke<TurnStreamItem[]>(
+          'read_direct_turn_stream',
+          { projectPath: nextProjectPath },
+        ).catch(() => []);
+        replaceTurnStreamItems(persistedTurnStream);
         // 重进会话时 Rust 侧可能仍登记着上一条 Direct 回合。不接管的话界面既不显示
         // 过程卡也不给终止入口，用户再发消息只会被守卫拒绝（"已有另一条回合正在运行"）。
         await restoreRunningDirectCodexTurn(nextProjectPath);
@@ -12149,6 +12248,13 @@ export function App({
       visibleTurnIds.has(call.turnId) ||
       call.turnId === activeDirectCodexTurnRef.current?.turnId,
   );
+  // 回合流只保留「当前消息列表里确实有这个回合」的那些，外加正在跑的回合；
+  // 没有流条目的回合由视图自己回退到原来的渲染。
+  const visibleTurnStreamItems = directTurnStream.filter(
+    (item) =>
+      visibleTurnIds.has(item.turnId) ||
+      item.turnId === activeDirectCodexTurnRef.current?.turnId,
+  );
   const projectSupervisorTransientReply =
     projectSupervisorResponseStream?.accumulatedText.trim() ?? '';
   const projectSupervisorNeedsUserInput = agentRuntimeNeedsUserInput(
@@ -12635,6 +12741,7 @@ export function App({
         pendingCommand={directCodexProductRuntime ? pendingCommand : null}
         projectPath={localProject?.projectPath ?? projectPath}
         toolCalls={visibleToolCalls}
+        turnStreamItems={visibleTurnStreamItems}
         activeTurnId={
           directCodexProductRuntime
             ? (activeDirectCodexTurnRef.current?.turnId ?? null)
diff --git a/apps/ai-game-creator-shell/src/app/types.ts b/apps/ai-game-creator-shell/src/app/types.ts
index 4ba4916f6..4a5911c7a 100644
--- a/apps/ai-game-creator-shell/src/app/types.ts
+++ b/apps/ai-game-creator-shell/src/app/types.ts
@@ -1163,9 +1163,47 @@ export interface GameCreatorDirectTurnUpdateEvent {
    * 本回合当前累计的思考过程（流式，整段替换）；拿不到时字段缺席。
    */
   reasoningText?: string | null;
+  /**
+   * 「文本段 + 工具」的**顺序真相**里本次发生变化的那几条。
+   *
+   * 顺序由 `seq`（条目首次出现时钉死）决定，与落盘 `turn-stream.jsonl` 完全同一份数据，
+   * 前端不再自己猜切点。可选：老版本事件没有这个字段。
+   */
+  streamItems?: TurnStreamItem[] | null;
   updatedAt: number;
 }
 
+/** 回合流里的一个 `text` 段；`text` 是该段当前累计全文（会随 delta 增长）。 */
+export interface TurnStreamTextItem extends TurnStreamItemBase {
+  kind: 'text';
+  text: string;
+}
+
+/** 回合流里的一个 `tool` 位置标记；工具正文在 `tool-calls.jsonl`（按 `callId` 关联）。 */
+export interface TurnStreamToolItem extends TurnStreamItemBase {
+  kind: 'tool';
+  callId: string;
+}
+
+interface TurnStreamItemBase {
+  schemaVersion: string;
+  /** 幂等身份：文本段 `text:<turnId>:<itemId>`、工具 `tool:<turnId>:<callId>`。 */
+  id: string;
+  turnId: string;
+  /** 首次出现的写入序号：**顺序真相**，按它升序渲染。 */
+  seq: number;
+  /** 条目首次出现的时刻（Unix 毫秒），同 `seq` 时用它排序。 */
+  at: number;
+  updatedAt: number;
+}
+
+/**
+ * 回合流条目（`read_direct_turn_stream` 的返回元素）。
+ *
+ * 与 Rust `DirectTurnStreamItem` 同形：`text` 段 ↔ `tool` 位置标记。
+ */
+export type TurnStreamItem = TurnStreamTextItem | TurnStreamToolItem;
+
 /**
  * `read_direct_codex_active_turn` 的返回值：Rust 进程内当前登记的 Direct 活跃回合。
  *
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 405fe616d..440d43832 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
@@ -17,6 +17,7 @@ import type {
   PendingUiConfirmation,
   PlanGddDecisionAction,
   PlanGddStateViewV1,
+  TurnStreamItem,
 } from '../../app/types';
 import type {
   DesignClarificationRequest,
@@ -90,6 +91,129 @@ function directCodexTurnIdFromAssistantMessageId(messageId: string) {
   return messageId.slice(prefix.length, -suffix.length);
 }
 
+/** 从 `direct-codex:<turnId>:user` 反解回合 id；不是这个形状返回 `null`。 */
+function directCodexTurnIdFromUserMessageId(messageId: string) {
+  const prefix = 'direct-codex:';
+  const suffix = ':user';
+  if (!messageId.startsWith(prefix) || !messageId.endsWith(suffix)) {
+    return null;
+  }
+  return messageId.slice(prefix.length, -suffix.length);
+}
+
+/** 按回合分组，组内按 `seq` 升序（排序已在 App 侧完成，这里保持原顺序）。 */
+function groupTurnStreamItems(items: readonly TurnStreamItem[]) {
+  const byTurn = new Map<string, TurnStreamItem[]>();
+  for (const item of items) {
+    const turnId = item.turnId?.trim();
+    if (!turnId) {
+      continue;
+    }
+    const bucket = byTurn.get(turnId);
+    if (bucket) {
+      bucket.push(item);
+    } else {
+      byTurn.set(turnId, [item]);
+    }
+  }
+  return byTurn;
+}
+
+/** 相邻的工具流项合并成一个块；中间夹了文本段就另起一块。 */
+type TurnStreamToolRun = {
+  kind: 'tools';
+  key: string;
+  callIds: string[];
+};
+type TurnStreamRun =
+  | { kind: 'text'; key: string; text: string }
+  | TurnStreamToolRun;
+
+function turnStreamRuns(items: readonly TurnStreamItem[]) {
+  const runs: TurnStreamRun[] = [];
+  for (const item of items) {
+    if (item.kind === 'text') {
+      const text = item.text ?? '';
+      if (!text.trim()) {
+        continue;
+      }
+      runs.push({ kind: 'text', key: item.id, text });
+      continue;
+    }
+    const callId = item.callId?.trim() ?? '';
+    if (!callId) {
+      continue;
+    }
+    const last = runs[runs.length - 1];
+    if (last?.kind === 'tools') {
+      // 连续的工具合并成一块：块的身份用首个工具条目 id，块头顺序不变。
+      last.callIds.push(callId);
+      continue;
+    }
+    runs.push({ kind: 'tools', key: item.id, callIds: [callId] });
+  }
+  return runs;
+}
+
+/**
+ * 一个回合的对话流：**按条目顺序**渲染文本段与工具块。
+ *
+ * 工具是普通元素，位置在它出现的地方：文本段 → 工具块 → 文本段 → …，最后是最终回复；
+ * 连续的工具合并成一块，中间夹了文本就分块。顺序只来自 `seq`，不做任何切点猜测。
+ * 回合末尾由调用方补 `renderTurnUsage`（结束于 xxx，总耗时 xxx）。
+ */
+function TurnStreamSequence({
+  items,
+  toolCalls,
+  active,
+  userSentAt,
+  className,
+}: {
+  items: readonly TurnStreamItem[];
+  toolCalls: readonly GameCreatorDirectToolCall[];
+  /** 这个回合是否正在跑（决定工具行显示"执行中"）。 */
+  active: boolean;
+  userSentAt: number;
+  className?: string;
+}) {
+  const runs = turnStreamRuns(items);
+  const callsById = new Map<string, GameCreatorDirectToolCall>();
+  for (const call of toolCalls) {
+    const id = call.id?.trim();
+    if (id && !callsById.has(id)) {
+      callsById.set(id, call);
+    }
+  }
+  return (
+    <>
+      {runs.map((run, index) =>
+        run.kind === 'text' ? (
+          <div
+            key={run.key}
+            className={className ? `message message--assistant ${className}` : 'message message--assistant'}
+          >
+            <ChatMarkdownMessage
+              role="assistant"
+              text={run.text}
+              streaming={active && index === runs.length - 1}
+            />
+          </div>
+        ) : (
+          <ToolCallGroup
+            key={run.key}
+            calls={run.callIds
+              .map((callId) => callsById.get(callId))
+              .filter((call): call is GameCreatorDirectToolCall => Boolean(call))}
+            userSentAt={userSentAt}
+            active={active}
+            className="message-tool-call"
+          />
+        ),
+      )}
+    </>
+  );
+}
+
 type RuntimePanelProps = ComponentProps<typeof ProjectSupervisorRuntimePanel>;
 
 function directStatusTitle(status: string | null | undefined) {
@@ -152,6 +276,13 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   projectPath: string;
   /** 本回合（含历史回读）的工具调用卡片，按 `startedAt` 升序，同一 id 只会出现一次。 */
   toolCalls?: GameCreatorDirectToolCall[];
+  /**
+   * 「文本段 + 工具」的顺序真相（`turn-stream.jsonl` / 回合事件里的 `streamItems`）。
+   *
+   * 有值的回合按它渲染（文本段 → 工具块 → 文本段 → …），没有值的回合回退到
+   * 「工具块 + 整轮消息 + 整轮用量」的老渲染——老项目、缺文件、读取失败都不能白屏。
+   */
+  turnStreamItems?: TurnStreamItem[];
   /** 当前正在跑的回合 id；卡片在 assistant 消息落盘前锚到它。 */
   activeTurnId?: string | null;
   initialSupervisorMessage?: string;
@@ -222,6 +353,7 @@ export function ProjectSupervisorView({
   pendingCommand,
   projectPath,
   toolCalls = [],
+  turnStreamItems = [],
   activeTurnId = null,
   initialSupervisorMessage = '',
   showProfessionalCollaboration = true,
@@ -300,12 +432,28 @@ export function ProjectSupervisorView({
   // 工具调用折叠块按回合分组，插在**同一回合 assistant 消息之前**（Codex 是「工具在上、答复在下」）。
   // 历史回合锚到自己那条 `direct-codex:<turnId>:assistant`，不回落到别的回合；
   // 正在跑的回合还没有 assistant 消息落盘，先落在消息流末尾，等那条消息落盘后回到它之前。
+  // **只有没有回合流的回合才走这条路**：有流的回合按流自己的顺序渲染。
   const streamTurnId = activeTurnId?.trim() ?? '';
+  // 回合流（`turn-stream.jsonl`）按回合分组：有流的回合按「文本段 → 工具块 → 文本段」顺序渲染，
+  // 没有流的回合（老项目 / 缺文件 / 读取失败）留在老路径上，绝不白屏。
+  const turnStreamByTurn = groupTurnStreamItems(
+    directCodex ? turnStreamItems : [],
+  );
   const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
   const liveToolCalls: GameCreatorDirectToolCall[] = [];
   let liveToolCallTurnId = '';
+  // 正在跑的回合：它的流条目直接渲染在消息列表末尾，直到用户消息落盘、由那条消息接管。
+  const liveStreamTurnId = streamTurnId && turnStreamByTurn.has(streamTurnId)
+    ? streamTurnId
+    : '';
+  const liveStreamItems = liveStreamTurnId
+    ? (turnStreamByTurn.get(liveStreamTurnId) ?? [])
+    : [];
   if (directCodex) {
     for (const call of toolCalls) {
+      if (turnStreamByTurn.has(call.turnId)) {
+        continue;
+      }
       const expected = directCodexTurnMessageId(call.turnId, 'assistant');
       const hasPersistedAssistant = visibleMessages.some(
         (message) => message.messageId === expected,
@@ -362,7 +510,12 @@ export function ProjectSupervisorView({
     const starts = toolCalls
       .filter((call) => call.turnId === turnId && Number(call.startedAt) > 0)
       .map((call) => Number(call.startedAt));
-    return starts.length > 0 ? Math.min(...starts) : 0;
+    if (starts.length > 0) return Math.min(...starts);
+    // 纯文本回合没有工具调用：用流里最早一条的出现时刻兜底，否则整轮用量行不显示。
+    const streamStarts = (turnStreamByTurn.get(turnId) ?? [])
+      .map((item) => Number(item.at))
+      .filter((at) => Number.isFinite(at) && at > 0);
+    return streamStarts.length > 0 ? Math.min(...streamStarts) : 0;
   };
 
   const clockTimeWithSeconds = (timestamp: number) => {
@@ -510,6 +663,14 @@ export function ProjectSupervisorView({
             const anchoredTurnId = message.messageId
               ? directCodexTurnIdFromAssistantMessageId(message.messageId)
               : null;
+            const userTurnId = message.messageId
+              ? directCodexTurnIdFromUserMessageId(message.messageId)
+              : null;
+            const streamTurnIdForMessage = userTurnId ?? anchoredTurnId;
+            const turnStream = streamTurnIdForMessage
+              ? (turnStreamByTurn.get(streamTurnIdForMessage) ?? [])
+              : [];
+            const streamCovered = turnStream.length > 0;
             const nextTurnId =
               index + 1 < visibleMessages.length &&
               visibleMessages[index + 1]?.messageId
@@ -520,6 +681,8 @@ export function ProjectSupervisorView({
             // 这条消息是该回合的最后一条时，在它后面给出整轮会话的结束时间与耗时。
             const isTurnEnd =
               Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
+            const isActiveTurn =
+              Boolean(anchoredTurnId) && anchoredTurnId === activeTurnId;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
                 {anchoredToolCalls.length > 0 ? (
@@ -531,24 +694,43 @@ export function ProjectSupervisorView({
                     className="message-tool-call"
                   />
                 ) : null}
-                <div className={`message message--${message.role}`}>
-                  <ChatMarkdownMessage
-                    role={message.role}
-                    text={projectSupervisorChatMessageText(message)}
+                {/* 有回合流的回合：assistant 消息这一格交给流自己渲染——文本段 → 工具块 →
+                    文本段 → 最终回复，按条目的 `seq` 顺序出现，不再把工具抽到消息前面。 */}
+                {streamCovered ? (
+                  <TurnStreamSequence
+                    items={turnStream}
+                    toolCalls={toolCalls}
+                    active={Boolean(activeTurnId) && streamTurnIdForMessage === activeTurnId}
+                    userSentAt={userMessageUpdatedAtForTurn(
+                      streamTurnIdForMessage ?? '',
+                    )}
                   />
-                  {showDesignReasoning && message.reasoningText ? (
-                    <details
-                      className="design-agent-reasoning"
-                      aria-label="策划 Agent 思考过程"
-                    >
-                      <summary>思考过程</summary>
-                      <pre>{message.reasoningText}</pre>
-                    </details>
-                  ) : null}
-                </div>
-                {isTurnEnd && anchoredTurnId && anchoredTurnId !== activeTurnId
-                  ? renderTurnUsage(anchoredTurnId)
-                  : null}
+                ) : (
+                  <div className={`message message--${message.role}`}>
+                    <ChatMarkdownMessage
+                      role={message.role}
+                      text={projectSupervisorChatMessageText(message)}
+                    />
+                    {showDesignReasoning && message.reasoningText ? (
+                      <details
+                        className="design-agent-reasoning"
+                        aria-label="策划 Agent 思考过程"
+                      >
+                        <summary>思考过程</summary>
+                        <pre>{message.reasoningText}</pre>
+                      </details>
+                    ) : null}
+                  </div>
+                )}
+                {/* 有流的回合把用量行跟在最后一条**用户**消息之后（结束于 xxx，总耗时 xxx）；
+                    没有流的回合保持原样：跟在回合最后一条消息之后。 */}
+                {streamCovered
+                  ? streamTurnIdForMessage
+                    ? renderTurnUsage(streamTurnIdForMessage)
+                    : null
+                  : isTurnEnd && !isActiveTurn && anchoredTurnId
+                    ? renderTurnUsage(anchoredTurnId)
+                    : null}
               </Fragment>
             );
           })}
@@ -560,8 +742,22 @@ export function ProjectSupervisorView({
               className="message-tool-call"
             />
           ) : null}
+          {/* 正在跑的回合还没落盘用户消息时，流条目直接接在消息列表末尾；
+              用户消息一旦落盘，同一个回合就由上面那条用户消息负责渲染（不再重复）。 */}
+          {directCodex && liveStreamTurnId && liveStreamItems.length > 0 ? (
+            <>
+              <TurnStreamSequence
+                items={liveStreamItems}
+                toolCalls={toolCalls}
+                active
+                userSentAt={userMessageUpdatedAtForTurn(liveStreamTurnId)}
+              />
+              {renderTurnUsage(liveStreamTurnId)}
+            </>
+          ) : null}
           {liveToolCallTurnId &&
           liveToolCallTurnId !== activeTurnId &&
+          !turnStreamByTurn.has(liveToolCallTurnId) &&
           !visibleMessages.some(
             (message) =>
               message.messageId &&
@@ -580,8 +776,9 @@ export function ProjectSupervisorView({
             </details>
           ) : null}
           {/* 直连回合的流式正文：恢复为对话区里的普通 assistant 消息（不再放进状态卡片），
-              这样"边生成边显示"和"状态卡片只放状态"两件事同时成立。 */}
-          {directCodex && transientReply ? (
+              这样"边生成边显示"和"状态卡片只放状态"两件事同时成立。
+              已有回合流的回合由流自己渲染文本段，这里不再重复一份。 */}
+          {directCodex && transientReply && !liveStreamTurnId ? (
             <div
               className="message message--assistant"
               aria-label="陶泥儿实时回复"

From f1632533df88d290988b090130203c71ac55a2c7 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:47:16 +0800
Subject: [PATCH 59/67] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=97=AE=E5=80=99=E4=B8=8E=E5=AF=B9=E8=AF=9D=E5=86=85=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E8=BF=9B=E8=A1=8C=E4=B8=AD=E8=80=97=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- createDefaultChatMessages 不再插入「想做什么游戏？」占位消息（对话记录里没有信息量，且会出现在用户消息之后）
- 空对话改为按回读结果替换（新增 isEmptyConversation 判断），历史加载不受影响
- renderTurnUsage：回合进行中不再在对话里显示「本轮进行中 · 用时」，进行中的耗时由输入框上方的过程卡负责显示，避免重复；回合结束后仍显示「本轮结束于 … · 耗时 …」
- tsc 0 错误
---
 apps/ai-game-creator-shell/src/App.tsx                   | 3 +++
 .../src/features/agent-runtime/model.ts                  | 9 +++------
 .../features/project-workspace/ProjectSupervisorView.tsx | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 95053dc3e..00eb59762 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -4050,6 +4050,8 @@ export function App({
             conversationMessages,
             current,
           );
+        // 空对话（没有默认问候之后的新常态）同样应当接受回读结果。
+        const isEmptyConversation = current.length === 0;
         const hasOnlyDefaultGreeting =
           current.length === 1 &&
           current[0]?.role === 'assistant' &&
@@ -4062,6 +4064,7 @@ export function App({
           current[1]?.text === `已设置本地项目：${nextProjectPath}`;
         if (
           mode !== 'replace' &&
+          !isEmptyConversation &&
           !hasOnlyDefaultGreeting &&
           !hasOnlyOpenStatus
         ) {
diff --git a/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts b/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
index 4c331835c..fcaef751c 100644
--- a/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
+++ b/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
@@ -1327,12 +1327,9 @@ export function isMissingAgentGoalCommandError(error: unknown) {
 }
 
 export function createDefaultChatMessages(): ChatMessage[] {
-  return [
-    {
-      role: 'assistant',
-      text: '想做什么游戏？',
-    },
-  ];
+  // 默认问候「想做什么游戏？」已移除：它在对话记录里没有信息量，而且会出现在用户消息之后。
+  // 空对话由空状态提示（panels.tsx 的引导文案）承担，不再往消息列表里塞占位消息。
+  return [];
 }
 
 export function isRuntimeConfigMissingError(message: string) {
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 440d43832..ac459702d 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
@@ -536,6 +536,10 @@ export function ProjectSupervisorView({
       return null;
     }
     const running = Boolean(activeTurnId) && turnId === activeTurnId;
+    if (running) {
+      // 进行中的耗时由输入框上方的过程卡显示（"已耗时 xx"），对话里再显示一遍是重复。
+      return null;
+    }
     const endedAt = running
       ? turnUsageNow
       : Math.max(turnEndedAtFor(turnId), startedAt);

From cae6006a960377de808e9c1876faf4350f8cb1af Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:51:05 +0800
Subject: [PATCH 60/67] =?UTF-8?q?=E4=BF=AE=E6=96=87=E6=9C=AC=E6=AE=B5?=
 =?UTF-8?q?=E8=A2=AB=E6=88=AA=E6=96=AD=EF=BC=9A=E5=90=8C=E4=B8=80=20item?=
 =?UTF-8?q?=20=E7=9A=84=E6=96=87=E6=9C=AC=E6=8C=89=E6=9B=B4=E9=95=BF?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 现象：回合正文只剩前缀（如"我来"），后面的完整文本没进对话流
- 根因：文本段快照的 updatedAt 未必单调递增，而合并规则只在 updatedAt 更新（或同刻）时才替换，后到的更长文本被判为"更旧"而丢弃
- Rust（direct_turn_stream.rs）：kind=text 时更长文本优先；合并后 updated_at 取两者最大值，不回退顺序元数据
- 前端（App.tsx mergeTurnStreamItems）：同规则改为更长优先
- 验证：cargo build 0 error、tsc 0 错误
---
 .../src-tauri/src/agent/direct_turn_stream.rs                | 5 ++++-
 apps/ai-game-creator-shell/src/App.tsx                       | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
index 4b9bdbfb7..5bbdb7d20 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
@@ -211,13 +211,16 @@ fn merge_stream_snapshot(
             .map(Iterator::count)
             .unwrap_or_default()
     };
+    // 文本段按"更长优先"：同一个 item 的文本只会增长，而快照的 updated_at 未必单调递增；
+    // 只认 updated_at 更新会把后到的完整文本丢掉（实机表现：正文只剩前缀"我来"）。
     let take_incoming = incoming.updated_at > existing.updated_at
+        || (incoming.kind == "text" && text_len(incoming) > text_len(existing))
         || (incoming.updated_at == existing.updated_at && text_len(incoming) > text_len(existing));
     let mut merged = existing.clone();
     if take_incoming {
         merged.text = incoming.text.clone();
-        merged.updated_at = incoming.updated_at;
     }
+    merged.updated_at = merged.updated_at.max(incoming.updated_at);
     if merged.call_id.is_none() {
         merged.call_id = incoming.call_id.clone();
     }
diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 00eb59762..78cb692fb 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -550,8 +550,12 @@ function mergeTurnStreamItems(
     // 内容只在更新（或同刻更长）的快照上替换；`seq` 取最早，位置不许回退。
     const textLength = (value: TurnStreamItem) =>
       value.kind === 'text' ? (value.text?.length ?? 0) : 0;
+    // 文本段按"更长优先"：同一个 item 的文本只会增长，而快照的 updatedAt 未必单调递增；
+    // 只认 updatedAt 更新会把后到的完整文本丢掉（实机表现：正文只剩前缀"我来"）。
     const takeIncoming =
       normalized.updatedAt > previous.updatedAt ||
+      (normalized.kind === 'text' &&
+        textLength(normalized) > textLength(previous)) ||
       (normalized.updatedAt === previous.updatedAt &&
         textLength(normalized) > textLength(previous));
     byId.set(id, {

From 08eb475845de939bb4e392cddc69204c15cdf256 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:53:38 +0800
Subject: [PATCH 61/67] =?UTF-8?q?=E4=BF=AE=E9=87=8D=E8=BD=BD=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E5=90=8E=E5=B7=A5=E5=85=B7=E5=8D=A1=E7=89=87=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=EF=BC=88=E8=80=81=E9=A1=B9=E7=9B=AE=E5=9B=9E=E9=80=80?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根因：没有 turn-stream.jsonl 的回合走回退路径，靠 direct-codex:<turnId>:assistant 合成 id 找锚点；老项目持久化的 assistant 消息 id 是 Codex 原始 id（如 0cef4af7-…），锚不上，工具调用被丢弃
- 修法：锚不上的工具按回合收集，渲染在消息列表末尾（按首个 startedAt 排序），绝不丢失
- 一并包含：文本段按"更长优先"合并（前后端两侧），修正文只剩前缀的问题
- tsc 0 错误、cargo build 0 error
---
 .../ProjectSupervisorView.tsx                 | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

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 ac459702d..73b987cf8 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
@@ -442,6 +442,9 @@ export function ProjectSupervisorView({
   const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
   const liveToolCalls: GameCreatorDirectToolCall[] = [];
   let liveToolCallTurnId = '';
+  // 老项目里持久化的 assistant 消息 id 是 Codex 原始 id（不是 `direct-codex:<turnId>:assistant`），
+  // 因此锚不上；这些工具的回合不能丢，统一收集后渲染在列表末尾。
+  const unanchoredToolCallsByTurn = new Map<string, GameCreatorDirectToolCall[]>();
   // 正在跑的回合：它的流条目直接渲染在消息列表末尾，直到用户消息落盘、由那条消息接管。
   const liveStreamTurnId = streamTurnId && turnStreamByTurn.has(streamTurnId)
     ? streamTurnId
@@ -472,9 +475,20 @@ export function ProjectSupervisorView({
           liveToolCallTurnId = call.turnId;
         }
         liveToolCalls.push(call);
+        continue;
       }
+      const bucket = unanchoredToolCallsByTurn.get(call.turnId) ?? [];
+      bucket.push(call);
+      unanchoredToolCallsByTurn.set(call.turnId, bucket);
     }
   }
+  const unanchoredToolCalls = [...unanchoredToolCallsByTurn.entries()]
+    .sort((left, right) => {
+      const leftAt = Math.min(...left[1].map((call) => call.startedAt || 0));
+      const rightAt = Math.min(...right[1].map((call) => call.startedAt || 0));
+      return leftAt - rightAt;
+    })
+    .map(([turnId, calls]) => ({ turnId, calls }));
   // 该回合用户消息的 `updatedAt`：拿得到就在块头显示「发送 → 结束」，拿不到只显示结束时间。
   const userMessageUpdatedAtForTurn = (turnId: string) => {
     if (!turnId) {
@@ -738,6 +752,14 @@ export function ProjectSupervisorView({
               </Fragment>
             );
           })}
+          {unanchoredToolCalls.map(({ turnId, calls }) => (
+            <ToolCallGroup
+              key={`unanchored-tools-${turnId}`}
+              calls={calls}
+              userSentAt={userMessageUpdatedAtForTurn(turnId)}
+              className="message-tool-call"
+            />
+          ))}
           {liveToolCalls.length > 0 ? (
             <ToolCallGroup
               calls={liveToolCalls}

From f4890d02b51806ab70b61a648a1526f4af86bebb Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 01:02:14 +0800
Subject: [PATCH 62/67] =?UTF-8?q?=E4=BF=AE=E5=8E=86=E5=8F=B2=E5=9B=9E?=
 =?UTF-8?q?=E5=90=88=E4=B8=8D=E6=B8=B2=E6=9F=93=E6=B5=81=EF=BC=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8E=E5=9B=9E=E5=90=88=E6=8C=89=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=85=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根因：流的 key 是 turnId，而持久化历史消息的 id 是 Codex 原始 id（如 a0e105c1-…），前端用 direct-codex:<turnId>:assistant 合成 id 配对永远失败 → 有流的回合既不渲染流也不渲染工具（实机 DOM：groups=0，只有 user+assistant×2）
- 修法：回合按首次出现时间排序后与用户消息按位置配对（第 N 个回合 ↔ 第 N 个用户消息）；流序列渲染在该用户消息之后，该回合的 assistant 消息交给流（避免文本重复）；没配上用户消息的回合兜底渲染在列表末尾
- 保护：若流的文本明显短于持久化 assistant 原文（老数据被截断过），流只渲染工具块（toolsOnly），正文仍由消息渲染，避免丢内容
- tsc 0 错误
---
 .../ProjectSupervisorView.tsx                 | 114 ++++++++++++++++--
 1 file changed, 107 insertions(+), 7 deletions(-)

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 73b987cf8..22ed7d4c0 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
@@ -168,9 +168,12 @@ function TurnStreamSequence({
   active,
   userSentAt,
   className,
+  toolsOnly = false,
 }: {
   items: readonly TurnStreamItem[];
   toolCalls: readonly GameCreatorDirectToolCall[];
+  /** 只渲染工具块：当流的文本不完整（老数据被截断）时用，正文交给持久化消息渲染。 */
+  toolsOnly?: boolean;
   /** 这个回合是否正在跑（决定工具行显示"执行中"）。 */
   active: boolean;
   userSentAt: number;
@@ -188,6 +191,7 @@ function TurnStreamSequence({
     <>
       {runs.map((run, index) =>
         run.kind === 'text' ? (
+          toolsOnly ? null : (
           <div
             key={run.key}
             className={className ? `message message--assistant ${className}` : 'message message--assistant'}
@@ -198,6 +202,7 @@ function TurnStreamSequence({
               streaming={active && index === runs.length - 1}
             />
           </div>
+          )
         ) : (
           <ToolCallGroup
             key={run.key}
@@ -489,6 +494,74 @@ export function ProjectSupervisorView({
       return leftAt - rightAt;
     })
     .map(([turnId, calls]) => ({ turnId, calls }));
+  // 历史消息的 id 是 Codex 原始 id（不是 `direct-codex:<turnId>:...`），无法从 id 反解回合；
+  // 因此按位置配对：回合按首次出现时间排序后，第 N 个回合 ↔ 第 N 个用户消息。
+  const turnFirstAt = (turnId: string) => {
+    let first = Number.POSITIVE_INFINITY;
+    for (const item of turnStreamByTurn.get(turnId) ?? []) {
+      first = Math.min(first, Number(item.at) || Number.POSITIVE_INFINITY);
+    }
+    for (const call of toolCalls) {
+      if (call.turnId === turnId) {
+        first = Math.min(first, Number(call.startedAt) || Number.POSITIVE_INFINITY);
+      }
+    }
+    return Number.isFinite(first) ? first : 0;
+  };
+  const orderedStreamTurnIds = [
+    ...new Set([
+      ...turnStreamByTurn.keys(),
+      ...toolCalls.map((call) => call.turnId ?? ''),
+    ]),
+  ]
+    .filter((turnId) => Boolean(turnId.trim()))
+    .sort((left, right) => turnFirstAt(left) - turnFirstAt(right));
+  const turnIdByMessageIndex = new Map<number, string>();
+  {
+    let userIndex = -1;
+    visibleMessages.forEach((message, index) => {
+      if (message.role === 'user') {
+        userIndex += 1;
+      }
+      const turnId = orderedStreamTurnIds[userIndex];
+      if (turnId && userIndex >= 0) {
+        turnIdByMessageIndex.set(index, turnId);
+      }
+    });
+  }
+  // 每个回合的 assistant 原文长度：用于判断流的文本是否完整（老数据可能被截断）。
+  const assistantTextLengthByTurn = new Map<string, number>();
+  visibleMessages.forEach((message, index) => {
+    if (message.role !== 'assistant') {
+      return;
+    }
+    const turnId = turnIdByMessageIndex.get(index);
+    if (!turnId) {
+      return;
+    }
+    const length = projectSupervisorChatMessageText(message).length;
+    assistantTextLengthByTurn.set(
+      turnId,
+      (assistantTextLengthByTurn.get(turnId) ?? 0) + length,
+    );
+  });
+  const streamTextLengthByTurn = new Map<string, number>();
+  for (const [turnId, items] of turnStreamByTurn) {
+    let total = 0;
+    for (const item of items) {
+      if (item.kind === 'text') {
+        total += item.text?.length ?? 0;
+      }
+    }
+    streamTextLengthByTurn.set(turnId, total);
+  }
+  const mappedStreamTurnIds = new Set(turnIdByMessageIndex.values());
+  const unmappedStreamTurns = orderedStreamTurnIds.filter(
+    (turnId) =>
+      !mappedStreamTurnIds.has(turnId) &&
+      (turnStreamByTurn.get(turnId)?.length ?? 0) > 0,
+  );
+
   // 该回合用户消息的 `updatedAt`：拿得到就在块头显示「发送 → 结束」，拿不到只显示结束时间。
   const userMessageUpdatedAtForTurn = (turnId: string) => {
     if (!turnId) {
@@ -684,11 +757,30 @@ export function ProjectSupervisorView({
             const userTurnId = message.messageId
               ? directCodexTurnIdFromUserMessageId(message.messageId)
               : null;
-            const streamTurnIdForMessage = userTurnId ?? anchoredTurnId;
+            const streamTurnIdForMessage =
+              (userTurnId ?? anchoredTurnId) ??
+              turnIdByMessageIndex.get(index) ??
+              null;
             const turnStream = streamTurnIdForMessage
               ? (turnStreamByTurn.get(streamTurnIdForMessage) ?? [])
               : [];
             const streamCovered = turnStream.length > 0;
+            // 有流时只在用户消息这一格渲染流（用户消息 → 文本/工具交替，按 seq 顺序）；
+            // 该回合的 assistant 消息内容已经在流里，跳过以免重复。
+            const streamTextLength = streamTurnIdForMessage
+              ? (streamTextLengthByTurn.get(streamTurnIdForMessage) ?? 0)
+              : 0;
+            const assistantTextLength = streamTurnIdForMessage
+              ? (assistantTextLengthByTurn.get(streamTurnIdForMessage) ?? 0)
+              : 0;
+            // 流的文本明显短于持久化原文 → 视为不完整：流只画工具块，正文由消息渲染。
+            const streamTextIncomplete =
+              streamCovered &&
+              assistantTextLength > 0 &&
+              streamTextLength < assistantTextLength * 0.8;
+            const ownsStream = streamCovered && message.role === 'user';
+            const suppressForStream =
+              streamCovered && message.role !== 'user' && !streamTextIncomplete;
             const nextTurnId =
               index + 1 < visibleMessages.length &&
               visibleMessages[index + 1]?.messageId
@@ -714,10 +806,11 @@ export function ProjectSupervisorView({
                 ) : null}
                 {/* 有回合流的回合：assistant 消息这一格交给流自己渲染——文本段 → 工具块 →
                     文本段 → 最终回复，按条目的 `seq` 顺序出现，不再把工具抽到消息前面。 */}
-                {streamCovered ? (
+                {suppressForStream ? null : ownsStream ? (
                   <TurnStreamSequence
                     items={turnStream}
                     toolCalls={toolCalls}
+                    toolsOnly={streamTextIncomplete}
                     active={Boolean(activeTurnId) && streamTurnIdForMessage === activeTurnId}
                     userSentAt={userMessageUpdatedAtForTurn(
                       streamTurnIdForMessage ?? '',
@@ -742,16 +835,23 @@ export function ProjectSupervisorView({
                 )}
                 {/* 有流的回合把用量行跟在最后一条**用户**消息之后（结束于 xxx，总耗时 xxx）；
                     没有流的回合保持原样：跟在回合最后一条消息之后。 */}
-                {streamCovered
-                  ? streamTurnIdForMessage
-                    ? renderTurnUsage(streamTurnIdForMessage)
-                    : null
-                  : isTurnEnd && !isActiveTurn && anchoredTurnId
+                {ownsStream && streamTurnIdForMessage
+                  ? renderTurnUsage(streamTurnIdForMessage)
+                  : !streamCovered && isTurnEnd && !isActiveTurn && anchoredTurnId
                     ? renderTurnUsage(anchoredTurnId)
                     : null}
               </Fragment>
             );
           })}
+          {unmappedStreamTurns.map((turnId) => (
+            <TurnStreamSequence
+              key={`unmapped-stream-${turnId}`}
+              items={turnStreamByTurn.get(turnId) ?? []}
+              toolCalls={toolCalls}
+              active={Boolean(activeTurnId) && turnId === activeTurnId}
+              userSentAt={userMessageUpdatedAtForTurn(turnId)}
+            />
+          ))}
           {unanchoredToolCalls.map(({ turnId, calls }) => (
             <ToolCallGroup
               key={`unanchored-tools-${turnId}`}

From 3f558bc1c14e1715096090935d52fc0493af3dad Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 01:07:50 +0800
Subject: [PATCH 63/67] =?UTF-8?q?=E4=BF=AE=E5=8E=86=E5=8F=B2=E5=9B=9E?=
 =?UTF-8?q?=E5=90=88=E5=B7=A5=E5=85=B7=E5=8D=A1=E7=89=87=E4=B8=8E=E5=9B=9E?=
 =?UTF-8?q?=E5=90=88=E6=B5=81=E8=A2=AB=E6=95=B4=E6=89=B9=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根因：App 侧 visibleTurnIds 用 directCodexTurnIdFromAssistantMessageId 解析消息 id，该函数要求 direct-codex: 前缀且 :assistant 结尾；实际数据里用户消息是 :user 结尾、assistant 消息是 Codex 原始 id（08ca3ef7-…），一个都解不出来 → visibleToolCalls / visibleTurnStreamItems 双双被过滤为空 → 视图拿不到工具与流（实机：groups=0，重进会话后工具消失）
- 修法一：新增 directCodexTurnIdFromConversationMessageId，:user / :assistant 两种后缀都认
- 修法二：一个回合都解不出来时（老历史）不过滤，交给视图的位置配对与兜底渲染决定位置
- 已删除诊断用的 window.__AGC_DEBUG 临时钩子
- tsc 0 错误
---
 apps/ai-game-creator-shell/src/App.tsx | 27 +++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 78cb692fb..820528d4c 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -489,6 +489,26 @@ function directCodexConversationMessageId(
 }
 
 /** 从 `direct-codex:<turnId>:assistant` 反解回合 id；不是这个形状就返回 `null`。 */
+/**
+ * 从任意 direct-codex 消息 id 解出回合 id：`direct-codex:<turnId>:user` / `:assistant` 都认。
+ *
+ * 历史里 assistant 消息存的是 Codex 原始 id（没有前缀），解不出来就返回 null——
+ * 调用方必须容忍"全部解不出来"的情况，不能因此把数据整批过滤掉。
+ */
+function directCodexTurnIdFromConversationMessageId(messageId: string) {
+  if (!messageId.startsWith(DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX)) {
+    return null;
+  }
+  const rest = messageId.slice(DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX.length);
+  for (const suffix of [':user', ':assistant']) {
+    if (rest.endsWith(suffix)) {
+      const turnId = rest.slice(0, -suffix.length).trim();
+      return turnId || null;
+    }
+  }
+  return rest.trim() || null;
+}
+
 function directCodexTurnIdFromAssistantMessageId(messageId: string) {
   const suffix = ':assistant';
   if (
@@ -12250,11 +12270,15 @@ export function App({
     messages
       .map((message) => message.messageId)
       .filter((messageId): messageId is string => Boolean(messageId))
-      .map(directCodexTurnIdFromAssistantMessageId)
+      .map(directCodexTurnIdFromConversationMessageId)
       .filter((turnId): turnId is string => Boolean(turnId)),
   );
+  // 老历史里 assistant 消息是 Codex 原始 id，一个回合都解不出来：此时**不过滤**，
+  // 否则工具卡片与回合流会被整批丢掉（实机表现：重进会话后工具与流全部消失）。
+  const keepAllDirectCodexTurns = visibleTurnIds.size === 0;
   const visibleToolCalls = directToolCalls.filter(
     (call) =>
+      keepAllDirectCodexTurns ||
       visibleTurnIds.has(call.turnId) ||
       call.turnId === activeDirectCodexTurnRef.current?.turnId,
   );
@@ -12262,6 +12286,7 @@ export function App({
   // 没有流条目的回合由视图自己回退到原来的渲染。
   const visibleTurnStreamItems = directTurnStream.filter(
     (item) =>
+      keepAllDirectCodexTurns ||
       visibleTurnIds.has(item.turnId) ||
       item.turnId === activeDirectCodexTurnRef.current?.turnId,
   );

From 09791eb9e49baaa5089cb6ed2db55d6cbe7914f0 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 02:30:28 +0800
Subject: [PATCH 64/67] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=9B=9E=E5=90=88=E6=8A=95=E5=BD=B1=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=91=BD=E4=BB=A4=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

按回合唯一归属渲染正文与工具，修复完成快照冲刷和历史归并

补齐工具输入输出，Windows命令卡片隐藏PowerShell启动器包装

时间显示精确到秒，结束信息右对齐并调整输入框文案与引用按钮间距

同步回归用例与规范文档，保留实机验收待办
---
 .../src/agent/codex_app_server/mod.rs         |  60 +-
 .../src-tauri/src/agent/direct_runtime/mod.rs | 185 ++++--
 .../src-tauri/src/agent/direct_tool_calls.rs  |  72 ++-
 .../src-tauri/src/agent/direct_turn_stream.rs | 125 ++--
 apps/ai-game-creator-shell/src/App.tsx        | 151 ++---
 .../ProjectSupervisorView.tsx                 | 548 ++++--------------
 .../SupervisorChatOnlyView.tsx                |   4 +-
 .../project-workspace/ToolCallGroup.tsx       |   3 +-
 .../directTurnPresentation.ts                 | 230 ++++++++
 .../toolCallGroupPresentation.ts              |  80 ++-
 apps/ai-game-creator-shell/src/styles.css     |  43 +-
 .../appSurface/project-development.suite.ts   |   6 +-
 .../tests/appSurface/tool-call-group.suite.ts |  50 +-
 .../tests/directTurnPresentation.test.ts      | 175 ++++++
 .../tests/windowsCommandPresentation.test.ts  |  75 +++
 ...【实施计划】对话回合唯一投影-2026-09-16.md |  10 +
 .../【里程碑】对话回合唯一投影-2026-09-16.md  |  26 +
 .../shared-memory/project-overview.md         |   2 +
 ...�案】AI游戏创作智能体App实施计划-2026-06-24.md |  11 +
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |  16 +-
 20 files changed, 1143 insertions(+), 729 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
 create mode 100644 apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
 create mode 100644 apps/ai-game-creator-shell/tests/windowsCommandPresentation.test.ts
 create mode 100644 docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
 create mode 100644 docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs
index a6a01d24a..25d1591e4 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs
@@ -589,6 +589,7 @@ pub(crate) enum DirectCodexTurnObservation {
     AgentMessageSegment {
         item_id: String,
         accumulated_text: String,
+        completed: bool,
     },
     IntermediateText(String),
     /// 模型的思考过程（reasoning item 的明文摘要）：流式阶段整段替换下发。
@@ -3013,6 +3014,7 @@ impl CodexAppServerConnection {
                                 observer(DirectCodexTurnObservation::AgentMessageSegment {
                                     item_id: item_id.clone(),
                                     accumulated_text: segment_text,
+                                    completed: false,
                                 });
                             }
                         }
@@ -3148,6 +3150,27 @@ impl CodexAppServerConnection {
                                 }
                             }
                             if item_type == "agentMessage" {
+                                // 某些 app-server 实现会在工具开始后停止发送 agentMessage delta，
+                                // 但会在 item/completed 携带完整文本。把这份最终快照补进回合流，
+                                // 让流中的文本段不会停在工具前的短前缀。
+                                if completed {
+                                    if let (Some(item_id), Some(text)) = (
+                                        item.get("id").and_then(serde_json::Value::as_str),
+                                        item.get("text")
+                                            .and_then(serde_json::Value::as_str)
+                                            .filter(|value| !value.trim().is_empty()),
+                                    ) {
+                                        if let Some(observer) = direct_observer.as_deref_mut() {
+                                            observer(
+                                                DirectCodexTurnObservation::AgentMessageSegment {
+                                                    item_id: item_id.to_string(),
+                                                    accumulated_text: text.to_string(),
+                                                    completed: true,
+                                                },
+                                            );
+                                        }
+                                    }
+                                }
                                 if let Some(text) = item
                                     .get("text")
                                     .and_then(serde_json::Value::as_str)
@@ -3185,17 +3208,32 @@ impl CodexAppServerConnection {
                     }
                     Some(CodexTurnEvent::Terminal(params)) => {
                         let turn = params.get("turn").unwrap_or(&params);
-                        if final_text.is_none() {
-                            final_text = turn
-                                .get("items")
-                                .and_then(serde_json::Value::as_array)
-                                .and_then(|items| {
-                                    items.iter().rev().find_map(|item| {
-                                        (item.get("type")?.as_str()? == "agentMessage")
-                                            .then(|| item.get("text")?.as_str().map(str::to_string))
-                                            .flatten()
-                                    })
-                                });
+                        if let Some(items) = turn.get("items").and_then(serde_json::Value::as_array)
+                        {
+                            for item in items {
+                                if item.get("type").and_then(serde_json::Value::as_str)
+                                    != Some("agentMessage")
+                                {
+                                    continue;
+                                }
+                                if let Some(text) = item
+                                    .get("text")
+                                    .and_then(serde_json::Value::as_str)
+                                    .filter(|text| !text.trim().is_empty())
+                                {
+                                    final_text = Some(text.to_string());
+                                    if let (Some(item_id), Some(observer)) = (
+                                        item.get("id").and_then(serde_json::Value::as_str),
+                                        direct_observer.as_deref_mut(),
+                                    ) {
+                                        observer(DirectCodexTurnObservation::AgentMessageSegment {
+                                            item_id: item_id.to_string(),
+                                            accumulated_text: text.to_string(),
+                                            completed: true,
+                                        });
+                                    }
+                                }
+                            }
                         }
                         let status = turn
                             .get("status")
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
index 191012b97..92a7adf14 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
@@ -4505,10 +4505,13 @@ fn persist_collected_direct_tool_calls(root: &Path, collector: &DirectToolCallCo
 }
 
 /// 回合流条目落盘：与工具调用同一口径（阻塞线程池 + 项目锁）。
-fn spawn_persist_direct_turn_stream_item(root: &Path, item: &DirectTurnStreamItem) {
+fn spawn_persist_direct_turn_stream_item(
+    root: &Path,
+    item: &DirectTurnStreamItem,
+) -> tauri::async_runtime::JoinHandle<Result<(), String>> {
     let root = root.to_path_buf();
     let item = item.clone();
-    tauri::async_runtime::spawn_blocking(move || upsert_direct_turn_stream_item_at(&root, &item));
+    tauri::async_runtime::spawn_blocking(move || upsert_direct_turn_stream_item_at(&root, &item))
 }
 
 /// 文本段落盘/下发的节流间隔：文本段是"整段累计 + 原地替换"，不需要逐 delta 落盘。
@@ -4530,6 +4533,7 @@ struct DirectTurnStreamWriter {
     turn_id: String,
     seq_by_id: BTreeMap<String, u64>,
     next_seq: u64,
+    last_updated_at: u64,
     pending_text: Option<DirectTurnStreamPendingText>,
 }
 
@@ -4539,6 +4543,7 @@ impl DirectTurnStreamWriter {
             turn_id,
             seq_by_id: BTreeMap::new(),
             next_seq: 0,
+            last_updated_at: 0,
             pending_text: None,
         }
     }
@@ -4553,60 +4558,54 @@ impl DirectTurnStreamWriter {
         self.next_seq
     }
 
-    /// 文本段推进。返回需要落盘 + 下发的那份快照（节流窗口内返回 `None`）。
-    ///
-    /// 段身份（`item_id`）变化时先把上一段的收尾快照交出去：上一段最后一段文字不能丢。
+    /// 按 item 身份更新，段切换必须同时交出旧段尾快照与新段首快照。
     fn push_text(
         &mut self,
         root: &Path,
         item_id: &str,
         visible_text: &str,
         now_ms: u64,
-    ) -> Option<DirectTurnStreamItem> {
+        completed: bool,
+    ) -> Vec<DirectTurnStreamItem> {
         let now = std::time::Instant::now();
-        let mut flushed = None;
+        let mut snapshots = Vec::new();
+        self.last_updated_at = now_ms.max(self.last_updated_at.saturating_add(1));
         if self
             .pending_text
             .as_ref()
             .is_some_and(|pending| pending.item_id != item_id)
         {
-            flushed = self.take_pending_snapshot();
+            snapshots.extend(self.take_pending_snapshot());
         }
-        match self.pending_text.as_mut() {
-            Some(pending) if pending.item_id == item_id => {
-                pending.item.text = Some(sanitize_stream_text(root, visible_text));
-                pending.item.updated_at = now_ms.max(pending.item.updated_at);
-                if now.duration_since(pending.last_flush).as_millis()
+        if let Some(pending) = self.pending_text.as_mut() {
+            pending.item.text = Some(sanitize_stream_text(root, visible_text));
+            pending.item.updated_at = self.last_updated_at;
+            if completed
+                || now.duration_since(pending.last_flush).as_millis()
                     >= DIRECT_TURN_STREAM_TEXT_THROTTLE_MS
-                {
-                    pending.last_flush = now;
-                    return Some(pending.item.clone());
-                }
-            }
-            _ => {
-                let seq = self.seq_for(&direct_turn_stream_text_item_id(&self.turn_id, item_id));
-                let item = direct_turn_stream_text_item(
-                    root,
-                    &self.turn_id,
-                    item_id,
-                    visible_text,
-                    seq,
-                    now_ms,
-                    now_ms,
-                );
-                self.pending_text = Some(DirectTurnStreamPendingText {
-                    item_id: item_id.to_string(),
-                    item,
-                    last_flush: now,
-                });
-                // 新段一出现就立刻落盘 + 下发：位置由这一刻钉死。
-                return self
-                    .pending_text
-                    .as_ref()
-                    .map(|pending| pending.item.clone());
+            {
+                pending.last_flush = now;
+                snapshots.push(pending.item.clone());
             }
+        } else {
+            let seq = self.seq_for(&direct_turn_stream_text_item_id(&self.turn_id, item_id));
+            let item = direct_turn_stream_text_item(
+                root,
+                &self.turn_id,
+                item_id,
+                visible_text,
+                seq,
+                now_ms,
+                self.last_updated_at,
+            );
+            snapshots.push(item.clone());
+            self.pending_text = Some(DirectTurnStreamPendingText {
+                item_id: item_id.to_string(),
+                item,
+                last_flush: now,
+            });
         }
-        flushed
+        snapshots
     }
 
     /// 取出当前段的收尾快照（段结束 / 回合结束时调用），不再持有它。
@@ -4658,7 +4657,8 @@ async fn run_direct_game_creator_turn_inner(
         let turn_tool_calls = Arc::clone(&tool_calls);
         // 回合流：文本段与工具按**出现顺序**各占一行，位置（seq）在首次出现时钉死。
         let mut stream_writer = DirectTurnStreamWriter::new(client_turn_id.clone());
-        let mut observer = move |observation: DirectCodexTurnObservation| {
+        let mut stream_writes = Vec::new();
+        let mut observer = |observation: DirectCodexTurnObservation| {
             let status = direct_codex_observation_status(&observation, stream_enabled);
             match observation {
                 DirectCodexTurnObservation::AccumulatedText(accumulated_text) => {
@@ -4672,23 +4672,26 @@ async fn run_direct_game_creator_turn_inner(
                 DirectCodexTurnObservation::AgentMessageSegment {
                     item_id,
                     accumulated_text,
+                    completed,
                 } => {
                     // 可见文本段：同一 item 的后续 delta 就地增长，item 变了才新起一段。
                     let Some(visible_text) = project_direct_codex_visible_text(&accumulated_text)
                     else {
                         return;
                     };
-                    let Some(item) = stream_writer.push_text(
+                    let items = stream_writer.push_text(
                         &turn_root,
                         &item_id,
                         &visible_text,
                         direct_tool_call_now_ms(),
-                    ) else {
-                        return;
-                    };
-                    // 事件与落盘共用同一份快照：前端的顺序真相与文件里的顺序真相一致。
-                    spawn_persist_direct_turn_stream_item(&turn_root, &item);
-                    emitter.emit_with_stream_items(status, None, None, None, vec![item]);
+                        completed,
+                    );
+                    for item in &items {
+                        stream_writes.push(spawn_persist_direct_turn_stream_item(&turn_root, item));
+                    }
+                    if !items.is_empty() {
+                        emitter.emit_with_stream_items(status, None, None, None, items);
+                    }
                 }
                 DirectCodexTurnObservation::IntermediateText(intermediate_text) => {
                     let visible_text = if stream_enabled
@@ -4710,23 +4713,31 @@ async fn run_direct_game_creator_turn_inner(
                     // streaming 已被"用户可见正文"占用。
                     emitter.emit_with_reasoning("running", None, None, None, Some(reasoning));
                 }
-                DirectCodexTurnObservation::ToolCall(tool_call) => {
-                    // 同一个工具调用会被观察两次：`item/started`（running）与 `item/completed`
-                    // （终态）。这里**只在状态真的变化时**才再收集与下发一次，既能带上终态、
-                    // 又不会在每个 heartbeat 重发同一份快照（前端按 id 幂等合并，不会多出卡片）。
-                    //
-                    // 曾经这里用"每个 id 只发一次"去重，结果终态观察被直接丢掉：工具调用永远
-                    // 停在 running（实机表现为"命令都结束了还显示执行中"）。
+                DirectCodexTurnObservation::ToolCall(mut tool_call) => {
+                    // 同一工具的开始、完成和详情补全共用一份单调快照。
                     {
                         let collected = lock_direct_tool_call_collector(&turn_tool_calls);
                         let existing = collected
                             .iter()
                             .find(|existing| existing.id == tool_call.id);
+                        if existing.is_some_and(|call| {
+                            call.status != "running" && tool_call.status == "running"
+                        }) {
+                            return;
+                        }
                         if !super::direct_tool_calls::direct_tool_call_status_changed(
                             existing, &tool_call,
                         ) {
                             return;
                         }
+                        if let Some(existing) = existing {
+                            tool_call.updated_at = tool_call
+                                .updated_at
+                                .max(existing.updated_at.saturating_add(1));
+                            tool_call = super::direct_tool_calls::merge_tool_call_snapshot(
+                                existing, &tool_call,
+                            );
+                        }
                     }
                     {
                         let mut collected = lock_direct_tool_call_collector(&turn_tool_calls);
@@ -4734,22 +4745,27 @@ async fn run_direct_game_creator_turn_inner(
                         collected.push(tool_call.clone());
                     }
                     // 回合流：工具是**普通元素**，位置在文本段之后（或与相邻工具成块）。
-                    let stream_item =
-                        stream_writer.push_tool(&tool_call, direct_tool_call_now_ms());
-                    spawn_persist_direct_turn_stream_item(&turn_root, &stream_item);
+                    let mut items = stream_writer
+                        .take_pending_snapshot()
+                        .into_iter()
+                        .collect::<Vec<_>>();
+                    items.push(stream_writer.push_tool(&tool_call, direct_tool_call_now_ms()));
+                    for item in &items {
+                        stream_writes.push(spawn_persist_direct_turn_stream_item(&turn_root, item));
+                    }
                     emitter.emit_with_stream_items(
                         status,
                         None,
                         None,
                         Some(vec![tool_call.clone()]),
-                        vec![stream_item],
+                        items,
                     );
                     // 落盘"最新的那一份"：started 让卡片刷新后立刻出现，终态覆盖同一行。
                     spawn_persist_direct_tool_call(&turn_root, &tool_call);
                 }
             }
         };
-        direct_game_creator_codex_chat_at_with_optional_observer(
+        let reply_result = direct_game_creator_codex_chat_at_with_optional_observer(
             root,
             system_prompt,
             prompt.to_string(),
@@ -4758,7 +4774,19 @@ async fn run_direct_game_creator_turn_inner(
             audit,
             direct_user_item.clone(),
         )
-        .await
+        .await;
+        drop(observer);
+        if let Some(item) = stream_writer.take_pending_snapshot() {
+            stream_writes.push(spawn_persist_direct_turn_stream_item(&turn_root, &item));
+            emitter.emit_with_stream_items("streaming", None, None, None, vec![item]);
+        }
+        // finalize 必须看见这一轮全部快照，不能与 fire-and-forget 写任务竞争。
+        for write in stream_writes {
+            if !matches!(write.await, Ok(Ok(()))) {
+                app_log!("[turn-stream] 回合快照持久化失败");
+            }
+        }
+        reply_result
     } else {
         direct_game_creator_codex_chat_at_with_optional_observer(
             root,
@@ -4782,8 +4810,7 @@ async fn run_direct_game_creator_turn_inner(
         )
     })?;
     if let Some(emitter) = turn_emitter {
-        // 最终回复落到本回合最后一条文本段上（原地更新，不新起一段），并随事件下发：
-        // 前端据此把最后一段替换成最终可见回复，流式尾巴与最终回复不会重复。
+        // 已有 item 文本由完成事件负责；只有完全没有 item 文本才补最终回复。
         let finalized =
             finalize_direct_turn_stream_reply_at(root, emitter.turn_id(), &visible_reply)
                 .ok()
@@ -4820,6 +4847,38 @@ async fn run_direct_game_creator_turn_inner(
     Ok(visible_reply)
 }
 
+#[cfg(test)]
+mod direct_turn_stream_writer_tests {
+    use super::*;
+
+    #[test]
+    fn item_switch_returns_previous_tail_and_next_head() {
+        let mut writer = DirectTurnStreamWriter::new("turn".into());
+        let root = Path::new(".");
+        writer.push_text(root, "a", "前缀", 1000, false);
+        writer.push_text(root, "a", "完整正文", 1000, false);
+        let snapshots = writer.push_text(root, "b", "第二段", 1000, false);
+        assert_eq!(snapshots.len(), 2);
+        assert_eq!(snapshots[0].text.as_deref(), Some("完整正文"));
+        assert_eq!(snapshots[0].seq, 1);
+        assert_eq!(snapshots[1].seq, 2);
+        assert!(snapshots[1].updated_at > snapshots[0].updated_at);
+    }
+
+    #[test]
+    fn completed_snapshot_bypasses_throttle_and_keeps_item_position() {
+        let mut writer = DirectTurnStreamWriter::new("turn".into());
+        let root = Path::new(".");
+        let first = writer.push_text(root, "a", "前缀", 1000, false);
+        let completed = writer.push_text(root, "a", "完整正文", 1000, true);
+        assert_eq!(completed.len(), 1);
+        assert_eq!(completed[0].id, first[0].id);
+        assert_eq!(completed[0].seq, first[0].seq);
+        assert!(completed[0].updated_at > first[0].updated_at);
+        assert_eq!(completed[0].text.as_deref(), Some("完整正文"));
+    }
+}
+
 /// Default product path: one user message becomes one turn on the same
 /// project-bound Codex app-server thread. The client does not classify the
 /// intent or perform hidden art, preview, repair, or another LLM workflow. If
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
index b1dae74b0..82e9989e8 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_tool_calls.rs
@@ -230,9 +230,14 @@ fn first_line_bounded(value: &str, max_chars: usize) -> String {
     bounded_chars(first_line, max_chars)
 }
 
-fn optional_bounded_line(value: Option<&str>, max_chars: usize) -> Option<String> {
-    let value = value?.trim();
-    (!value.is_empty()).then(|| bounded_chars(value, max_chars))
+/// 把 app-server 中可能是字符串或 JSON 对象的工具详情统一转成可读文本。
+fn direct_tool_call_value_text(value: &Value) -> Option<String> {
+    match value {
+        Value::String(text) => (!text.trim().is_empty()).then(|| text.trim().to_string()),
+        Value::Null => None,
+        // 调用方先脱敏再截断，不能在这里截断掉敏感字段的语法边界。
+        _ => serde_json::to_string_pretty(value).ok(),
+    }
 }
 
 fn tool_call_kind(item_type: &str) -> Option<&'static str> {
@@ -325,15 +330,17 @@ fn direct_tool_call_status(item: &Value, completed: bool) -> &'static str {
     }
 }
 
-/// 同一 id 的两次观察（`item/started` / `item/completed`）是否带来了状态变化。
-///
-/// 只有状态变化时才需要再收集、再下发一次：既避免同一份快照在每个心跳重复下发，
-/// 又不会像"每个 id 只发一次"那样把终态丢掉（历史 bug：命令都结束了卡片仍显示"执行中"）。
+/// 状态或可见详情变化才下发；同状态的输入/输出补全也属于更新。
 pub(crate) fn direct_tool_call_status_changed(
     existing: Option<&DirectToolCall>,
     incoming: &DirectToolCall,
 ) -> bool {
-    !existing.is_some_and(|current| current.status == incoming.status)
+    !existing.is_some_and(|current| {
+        current.status == incoming.status
+            && current.detail == incoming.detail
+            && current.title == incoming.title
+            && current.summary == incoming.summary
+    })
 }
 
 /// 把一条 Codex item 投影成工具调用条目。非工具类 item 返回 `None`。
@@ -382,14 +389,17 @@ pub(crate) fn direct_tool_call_from_item(
         .map(str::trim)
         .filter(|command| !command.is_empty())
         .map(|command| sanitize_detail_text(root, command))
-        .map(|command| bounded_chars(&command, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS));
-    let output = item
-        .get("aggregatedOutput")
-        .or_else(|| item.get("output"))
-        .and_then(Value::as_str)
-        .map(str::trim)
-        .filter(|output| !output.is_empty())
-        .map(|output| sanitize_detail_text(root, output))
+        .map(|command| bounded_chars(&command, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS))
+        .or_else(|| {
+            item.get("arguments")
+                .and_then(direct_tool_call_value_text)
+                .map(|arguments| sanitize_detail_text(root, &arguments))
+                .map(|arguments| bounded_chars(&arguments, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS))
+        });
+    let output = ["aggregatedOutput", "output", "result", "error"]
+        .iter()
+        .find_map(|key| item.get(key).and_then(direct_tool_call_value_text))
+        .map(|output| sanitize_detail_text(root, &output))
         .map(|output| bounded_chars(&output, DIRECT_TOOL_CALL_DETAIL_MAX_CHARS));
     // `fileChange` 的路径先脱敏成"项目内相对路径"：绝对路径会被抹成 `<absolute-path>`，
     // 相对路径原样保留（契约要求 detail.changes[].path 用项目相对路径）。
@@ -408,11 +418,15 @@ pub(crate) fn direct_tool_call_from_item(
         .filter(|tool| !tool.is_empty())
         .map(|tool| sanitize_detail_text(root, tool));
     // `summary` 会落到卡片与落盘文件，它的兜底来源同样必须脱敏。
-    let summary_source = command
-        .as_deref()
-        .or_else(|| changes.first().map(|change| change.path.as_str()))
-        .or(tool.as_deref())
-        .unwrap_or_default();
+    let summary_source = (if kind == "mcp_tool" {
+        tool.as_deref()
+    } else {
+        None
+    })
+    .or(command.as_deref())
+    .or_else(|| changes.first().map(|change| change.path.as_str()))
+    .or(tool.as_deref())
+    .unwrap_or_default();
     let summary = first_line_bounded(summary_source, DIRECT_TOOL_CALL_SUMMARY_MAX_CHARS);
 
     Some(DirectToolCall {
@@ -538,7 +552,7 @@ fn status_certainty(status: &str) -> u8 {
 ///   「回合末整批落盘」与「逐条快照落盘（spawn_blocking）」两条路径竞争时，后到的
 ///   旧快照不能把已经 `completed` / `failed` 的卡片打回 `running`。
 /// - `updatedAt` 相同时终态优先，避免同一毫秒内的旧快照回退状态。
-fn merge_tool_call_snapshot(
+pub(crate) fn merge_tool_call_snapshot(
     existing: &DirectToolCall,
     incoming: &DirectToolCall,
 ) -> DirectToolCall {
@@ -550,6 +564,20 @@ fn merge_tool_call_snapshot(
     } else {
         existing.clone()
     };
+    if merged.detail.command.is_none() {
+        merged.detail.command = existing
+            .detail
+            .command
+            .clone()
+            .or(incoming.detail.command.clone());
+    }
+    if merged.detail.output.is_none() {
+        merged.detail.output = existing
+            .detail
+            .output
+            .clone()
+            .or(incoming.detail.output.clone());
+    }
     merged.started_at = [merged.started_at, existing.started_at, incoming.started_at]
         .into_iter()
         .filter(|started_at| *started_at > 0)
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
index 5bbdb7d20..a2c8f1b30 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_turn_stream.rs
@@ -8,8 +8,7 @@
 //! 文本追加 / 工具状态变化）只改内容不改 `seq`。因此并发落盘的先后顺序不会让"新工具插到
 //! 旧文本前面"——渲染顺序只由 `seq` 决定。
 //!
-//! 为什么不复用 `project.jsonl`：那条链路一个回合只投影一条 assistant 消息（整段回复），
-//! 中途的文本段没有独立记录，装不下"文本段与工具交替"的顺序。
+//! `project.jsonl` 保留原始消息；本流补充文本与工具交替的 item 顺序，不能重复展示两份正文。
 
 use crate::agent::sanitize_detail_text;
 use crate::config::{prepare_game_creator_private_path_for_read, write_game_creator_private_file};
@@ -59,6 +58,44 @@ pub(crate) struct DirectTurnStreamItem {
     pub(crate) updated_at: u64,
 }
 
+#[cfg(test)]
+mod snapshot_tests {
+    use super::*;
+
+    fn text(
+        turn: &str,
+        id: &str,
+        seq: u64,
+        at: u64,
+        updated: u64,
+        text: &str,
+    ) -> DirectTurnStreamItem {
+        direct_turn_stream_text_item(Path::new("."), turn, id, text, seq, at, updated)
+    }
+
+    #[test]
+    fn late_older_snapshot_cannot_undo_completed_text_or_position() {
+        let complete = text("turn", "item", 1, 1000, 1002, "正文");
+        let late = text("turn", "item", 9, 1001, 1001, "更长但已经过期的草稿");
+        let merged = normalize_stream_items(vec![complete, late]);
+        assert_eq!(merged.len(), 1);
+        assert_eq!(merged[0].text.as_deref(), Some("正文"));
+        assert_eq!(merged[0].seq, 1);
+        assert_eq!(merged[0].at, 1000);
+    }
+
+    #[test]
+    fn retention_does_not_treat_new_turn_seq_one_as_oldest() {
+        let mut snapshots = (1..=DIRECT_TURN_STREAM_LIMIT)
+            .map(|seq| text("old", &seq.to_string(), seq as u64, 1000, 1000, "旧"))
+            .collect::<Vec<_>>();
+        snapshots.push(text("new", "one", 1, 2000, 2000, "新"));
+        let merged = normalize_stream_items(snapshots);
+        assert_eq!(merged.len(), DIRECT_TURN_STREAM_LIMIT);
+        assert_eq!(merged.last().unwrap().turn_id, "new");
+    }
+}
+
 impl DirectTurnStreamItem {
     fn order_key(&self) -> (u64, u64, &str) {
         (self.seq, self.at, self.id.as_str())
@@ -211,10 +248,8 @@ fn merge_stream_snapshot(
             .map(Iterator::count)
             .unwrap_or_default()
     };
-    // 文本段按"更长优先"：同一个 item 的文本只会增长，而快照的 updated_at 未必单调递增；
-    // 只认 updated_at 更新会把后到的完整文本丢掉（实机表现：正文只剩前缀"我来"）。
+    // writer 保证更新时间单调；完成快照可以纠正正文，旧快照不能靠更长抢回所有权。
     let take_incoming = incoming.updated_at > existing.updated_at
-        || (incoming.kind == "text" && text_len(incoming) > text_len(existing))
         || (incoming.updated_at == existing.updated_at && text_len(incoming) > text_len(existing));
     let mut merged = existing.clone();
     if take_incoming {
@@ -233,7 +268,7 @@ fn merge_stream_snapshot(
     merged
 }
 
-/// 按 id 归并，再按 `seq` 正序裁剪到最近 `DIRECT_TURN_STREAM_LIMIT` 条。
+/// 按身份归并；跨回合按起点，回合内按 seq，不能用局部 seq 判断全局新旧。
 fn normalize_stream_items(items: Vec<DirectTurnStreamItem>) -> Vec<DirectTurnStreamItem> {
     let mut by_id: BTreeMap<String, DirectTurnStreamItem> = BTreeMap::new();
     for item in items {
@@ -244,7 +279,20 @@ fn normalize_stream_items(items: Vec<DirectTurnStreamItem>) -> Vec<DirectTurnStr
         by_id.insert(merged.id.clone(), merged);
     }
     let mut normalized = by_id.into_values().collect::<Vec<_>>();
-    normalized.sort_by(|left, right| left.order_key().cmp(&right.order_key()));
+    let mut turn_starts = BTreeMap::<String, u64>::new();
+    for item in &normalized {
+        turn_starts
+            .entry(item.turn_id.clone())
+            .and_modify(|at| *at = (*at).min(item.at))
+            .or_insert(item.at);
+    }
+    normalized.sort_by(|left, right| {
+        (turn_starts[&left.turn_id], &left.turn_id, left.order_key()).cmp(&(
+            turn_starts[&right.turn_id],
+            &right.turn_id,
+            right.order_key(),
+        ))
+    });
     if normalized.len() > DIRECT_TURN_STREAM_LIMIT {
         normalized.drain(..normalized.len() - DIRECT_TURN_STREAM_LIMIT);
     }
@@ -286,7 +334,7 @@ pub(crate) fn upsert_direct_turn_stream_item_at(
 ) -> Result<(), String> {
     enforce_project_permission_policy(root, "conversation.write")?;
     with_locked_stream_items(root, |items| {
-        items.retain(|existing| existing.id != item.id);
+        // normalize_stream_items 在锁内归并全部版本；不得提前删除比较基准。
         items.push(item.clone());
     })
 }
@@ -345,14 +393,7 @@ pub(crate) fn append_direct_turn_stream_text_at(
     })
 }
 
-/// 回合结束：把**可见回复**落到本回合最后一条文本段上。
-///
-/// - 本回合已有文本段（流式逐段落的那些）：原地把最后一段替换成最终可见回复，
-///   不新起一段——否则最终回复会和最后一段重复。
-/// - 本回合没有文本段（非流式、或整轮没有文本）：追加一段，位置排在最后。
-///
-/// `visible_reply` 由调用方先做可见性投影（去思考块、去空）。返回被写入的那一条，
-/// 调用方用它下发同一份快照。
+/// 没有任何 item 文本时补最终回复；已有 item 由完成事件负责，不能猜测覆盖某一段。
 pub(crate) fn finalize_direct_turn_stream_reply_at(
     root: &Path,
     turn_id: &str,
@@ -369,36 +410,30 @@ pub(crate) fn finalize_direct_turn_stream_reply_at(
     enforce_project_permission_policy(root, "conversation.write")?;
     let now = crate::agent::direct_tool_call_now_ms();
     with_locked_stream_items(root, |items| {
-        let last_text_id = items
+        if items
             .iter()
-            .filter(|item| item.turn_id == turn_id && item.kind == DIRECT_TURN_STREAM_KIND_TEXT)
-            .max_by(|left, right| left.order_key().cmp(&right.order_key()))
-            .map(|item| item.id.clone());
-        match last_text_id {
-            Some(id) => {
-                let item = items
-                    .iter_mut()
-                    .find(|item| item.id == id)
-                    .expect("最后一条文本段必须还在集合里");
-                // 位置不动：只替换文本与 updatedAt（原地更新，不重排）。
-                item.text = Some(sanitize_stream_text(root, visible_reply));
-                item.updated_at = now.max(item.updated_at);
-                Some(item.clone())
-            }
-            None => {
-                let next_seq = items.iter().map(|item| item.seq).max().unwrap_or(0) + 1;
-                let item = direct_turn_stream_text_item(
-                    root,
-                    turn_id,
-                    DIRECT_TURN_STREAM_FINAL_ITEM_ID,
-                    visible_reply,
-                    next_seq,
-                    now,
-                    now,
-                );
-                items.push(item.clone());
-                Some(item)
-            }
+            .any(|item| item.turn_id == turn_id && item.kind == DIRECT_TURN_STREAM_KIND_TEXT)
+        {
+            None
+        } else {
+            let next_seq = items
+                .iter()
+                .filter(|item| item.turn_id == turn_id)
+                .map(|item| item.seq)
+                .max()
+                .unwrap_or(0)
+                + 1;
+            let item = direct_turn_stream_text_item(
+                root,
+                turn_id,
+                DIRECT_TURN_STREAM_FINAL_ITEM_ID,
+                visible_reply,
+                next_seq,
+                now,
+                now,
+            );
+            items.push(item.clone());
+            Some(item)
         }
     })
 }
diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index ffb71fd7f..dcbfc49a3 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -499,29 +499,6 @@ function directCodexConversationMessageId(
   return `${DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX}${turnId}:${role}`;
 }
 
-/** 从 `direct-codex:<turnId>:assistant` 反解回合 id；不是这个形状就返回 `null`。 */
-/**
- * 从任意 direct-codex 消息 id 解出回合 id：`direct-codex:<turnId>:user` / `:assistant` 都认。
- *
- * 历史里 assistant 消息存的是 Codex 原始 id（没有前缀），解不出来就返回 null——
- * 调用方必须容忍"全部解不出来"的情况，不能因此把数据整批过滤掉。
- */
-function directCodexTurnIdFromConversationMessageId(messageId: string) {
-  if (!messageId.startsWith(DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX)) {
-    return null;
-  }
-  const rest = messageId.slice(
-    DIRECT_CODEX_CONVERSATION_MESSAGE_ID_PREFIX.length,
-  );
-  for (const suffix of [':user', ':assistant']) {
-    if (rest.endsWith(suffix)) {
-      const turnId = rest.slice(0, -suffix.length).trim();
-      return turnId || null;
-    }
-  }
-  return rest.trim() || null;
-}
-
 export const MAX_CHAT_COMPOSER_ATTACHMENTS = 8;
 
 /**
@@ -569,17 +546,15 @@ function mergeTurnStreamItems(
     // 内容只在更新（或同刻更长）的快照上替换；`seq` 取最早，位置不许回退。
     const textLength = (value: TurnStreamItem) =>
       value.kind === 'text' ? (value.text?.length ?? 0) : 0;
-    // 文本段按"更长优先"：同一个 item 的文本只会增长，而快照的 updatedAt 未必单调递增；
-    // 只认 updatedAt 更新会把后到的完整文本丢掉（实机表现：正文只剩前缀"我来"）。
+    // writer 更新时间单调；完成快照允许纠正正文，迟到旧快照不能覆盖。
     const takeIncoming =
       normalized.updatedAt > previous.updatedAt ||
-      (normalized.kind === 'text' &&
-        textLength(normalized) > textLength(previous)) ||
       (normalized.updatedAt === previous.updatedAt &&
         textLength(normalized) > textLength(previous));
     byId.set(id, {
       ...(takeIncoming ? normalized : previous),
       id,
+      updatedAt: Math.max(previous.updatedAt, normalized.updatedAt),
       seq: Math.min(previous.seq, normalized.seq),
       at:
         previous.at > 0 && normalized.at > 0
@@ -827,6 +802,7 @@ export function App({
   useEffect(() => {
     if (supervisorChatOnly) return;
     const nextProjectPath = localProject?.projectPath ?? null;
+    ensureDirectTimelineProject(nextProjectPath);
     const previousProjectPath = localProjectPathRef.current;
     localProjectPathRef.current = nextProjectPath;
     // 未绑定项目时无需触发插件宿主；这也避免启动空首页时产生无意义的 Tauri 调用。
@@ -1004,6 +980,16 @@ export function App({
     GameCreatorDirectToolCall[]
   >([]);
   const directToolCallsRef = useRef<GameCreatorDirectToolCall[]>([]);
+  const directTimelineProjectPathRef = useRef<string | null>(null);
+
+  function ensureDirectTimelineProject(project: string | null) {
+    if (directTimelineProjectPathRef.current === project) return;
+    directTimelineProjectPathRef.current = project;
+    directToolCallsRef.current = [];
+    directTurnStreamRef.current = [];
+    setDirectToolCalls([]);
+    setDirectTurnStream([]);
+  }
   /**
    * 归并一批工具调用：同 id 覆盖已有条目（`completed` 覆盖 `running`），
    * 新 id 追加（保持首次出现顺序）。实时增量与回读历史都走这里，所以同一 id 不会重复渲染。
@@ -1020,7 +1006,9 @@ export function App({
       if (!id) {
         continue;
       }
-      const existingIndex = merged.findIndex((existing) => existing.id === id);
+      const existingIndex = merged.findIndex(
+        (existing) => existing.id === id && existing.turnId === call.turnId,
+      );
       const normalized: GameCreatorDirectToolCall = {
         ...call,
         id,
@@ -1028,6 +1016,18 @@ export function App({
       };
       // 起点时间取更早的那个：`completed` 事件不一定带 startedAt。
       const existing = existingIndex >= 0 ? merged[existingIndex] : undefined;
+      if (existing) {
+        if (
+          existing.updatedAt > normalized.updatedAt ||
+          (existing.status !== 'running' && normalized.status === 'running')
+        )
+          continue;
+        normalized.detail = {
+          ...normalized.detail,
+          command: normalized.detail.command ?? existing.detail.command,
+          output: normalized.detail.output ?? existing.detail.output,
+        };
+      }
       if (
         existing &&
         existing.startedAt > 0 &&
@@ -1183,23 +1183,6 @@ export function App({
     watchRecoveredDirectCodexTurn(projectPath, clientTurnId);
   }
 
-  /** 工具调用卡片按项目维度作废：换项目 / 重开历史时整体替换，避免串项目。 */
-  function replaceDirectToolCalls(next: readonly GameCreatorDirectToolCall[]) {
-    const normalized = next
-      .filter((call) => Boolean(call.id?.trim()))
-      .map((call) => ({
-        ...call,
-        id: call.id.trim(),
-        detail: call.detail ?? { changes: [] },
-      }))
-      .sort(
-        (left, right) =>
-          left.startedAt - right.startedAt || left.id.localeCompare(right.id),
-      );
-    directToolCallsRef.current = normalized;
-    setDirectToolCalls(normalized);
-  }
-
   // 回合流（文本段 + 工具按**出现顺序**交替）：实时增量与回读历史共用一份状态，
   // 渲染顺序只由条目的 `seq` 决定，界面不再按文本长度 / 标点 / 时间窗猜切点。
   const [directTurnStream, setDirectTurnStream] = useState<TurnStreamItem[]>(
@@ -1217,15 +1200,6 @@ export function App({
     setDirectTurnStream(merged);
   }
 
-  /** 回合流按项目维度作废：换项目 / 重开历史时整体替换，避免串项目。 */
-  function replaceTurnStreamItems(next: readonly TurnStreamItem[]) {
-    const normalized = sortTurnStreamItems(
-      next.filter((item) => Boolean(item.id?.trim())),
-    );
-    directTurnStreamRef.current = normalized;
-    setDirectTurnStream(normalized);
-  }
-
   function clearDirectCodexTransientReply(projectPath: string, turnId: string) {
     const activeTurn = activeDirectCodexTurnRef.current;
     if (
@@ -2310,6 +2284,7 @@ export function App({
               : current,
           );
         }
+        ensureDirectTimelineProject(payload.projectPath);
         // 工具调用增量：字段可选，老事件（undefined）走原路径，行为不变。
         if (payload.toolCalls?.length) {
           applyDirectToolCalls(
@@ -2444,7 +2419,7 @@ export function App({
           activeDirectCodexTurnRef.current = {
             projectPath,
             turnId: activeTurn.turnId,
-            lastSequence: 0,
+            lastSequence: -1,
             receivedDirectUpdate: true,
           };
           setDirectCodexProcessKey(`${projectPath}\\u0000${activeTurn.turnId}`);
@@ -2471,7 +2446,8 @@ export function App({
         activeDirectCodexTurnRef.current = {
           projectPath,
           turnId: state.turnId,
-          lastSequence: state.lastSeq,
+          // Thread Manager 的 seq 与回合展示事件的 sequence 是两个独立序列。
+          lastSequence: -1,
           receivedDirectUpdate: true,
         };
         setDirectCodexProcessKey(`${projectPath}\u0000${state.turnId}`);
@@ -4160,7 +4136,6 @@ export function App({
           'read_direct_tool_calls',
           { projectPath: nextProjectPath },
         ).catch(() => []);
-        replaceDirectToolCalls(persistedToolCalls);
         // 回合流（顺序真相）走独立历史文件（`turn-stream.jsonl`）。与工具调用同一处：必须在
         // 读完项目对话之后、任何提前 return 之前回读。缺命令（老客户端）/ 缺文件 / 读取失败
         // 都只是"这个回合没有流"，界面回退到原来的渲染，不能因此把整个打开流程判失败。
@@ -4168,7 +4143,15 @@ export function App({
           'read_direct_turn_stream',
           { projectPath: nextProjectPath },
         ).catch(() => []);
-        replaceTurnStreamItems(persistedTurnStream);
+        if (
+          projectSupervisorHistoryLoadVersionRef.current !== loadVersion ||
+          localProjectPathRef.current !== nextProjectPath
+        )
+          return;
+        ensureDirectTimelineProject(nextProjectPath);
+        // 回读可能与实时事件交错：按同一身份合并，不能用旧磁盘快照覆盖实时状态。
+        applyDirectToolCalls(persistedToolCalls);
+        applyTurnStreamItems(persistedTurnStream);
         // 重进会话时 Rust 侧可能仍登记着上一条 Direct 回合。不接管的话界面既不显示
         // 过程卡也不给终止入口，用户再发消息只会被守卫拒绝（"已有另一条回合正在运行"）。
         await restoreRunningDirectCodexTurn(nextProjectPath);
@@ -7144,17 +7127,21 @@ export function App({
         const appendDirectAssistantMessage = (
           current: ChatMessage[],
           text: string,
+          failed = false,
         ): ChatMessage[] => {
+          const messageId = failed
+            ? `direct-codex:${clientTurnId}:failure`
+            : directAssistantMessageId;
           const nextMessage: ChatMessage = {
             role: 'assistant',
             text,
             runtimeOwned: true,
-            messageId: directAssistantMessageId,
+            messageId,
             updatedAt: Date.now(),
           };
           const withUser = appendDirectUserMessageIfMissing(current);
           const existingIndex = withUser.findIndex(
-            (message) => message.messageId === directAssistantMessageId,
+            (message) => message.messageId === messageId,
           );
           if (existingIndex < 0) {
             return [...withUser, nextMessage];
@@ -7259,7 +7246,7 @@ export function App({
             setProjectSupervisorRuntimeError('');
             setChatComposerNotice('已终止本次回合');
             setMessages((current) =>
-              appendDirectAssistantMessage(current, '已终止本次回合。'),
+              appendDirectAssistantMessage(current, '已终止本次回合。', true),
             );
             return;
           }
@@ -7295,7 +7282,7 @@ export function App({
             setDirectCodexProgress('正在记录失败原因');
             setProjectSupervisorRuntimeError(visibleMessage);
             setMessages((current) =>
-              appendDirectAssistantMessage(current, visibleMessage),
+              appendDirectAssistantMessage(current, visibleMessage, true),
             );
           }
         } finally {
@@ -12449,32 +12436,6 @@ export function App({
     0,
     messages.length - visibleMessages.length,
   );
-  // 工具调用卡片只保留「当前消息列表里确实有这个回合」的那些：实时回合一进来就能挂上，
-  // 历史回合只有对应的 assistant 消息还在列表里才渲染，避免旧卡片漂在列表尾部。
-  const visibleTurnIds = new Set(
-    messages
-      .map((message) => message.messageId)
-      .filter((messageId): messageId is string => Boolean(messageId))
-      .map(directCodexTurnIdFromConversationMessageId)
-      .filter((turnId): turnId is string => Boolean(turnId)),
-  );
-  // 老历史里 assistant 消息是 Codex 原始 id，一个回合都解不出来：此时**不过滤**，
-  // 否则工具卡片与回合流会被整批丢掉（实机表现：重进会话后工具与流全部消失）。
-  const keepAllDirectCodexTurns = visibleTurnIds.size === 0;
-  const visibleToolCalls = directToolCalls.filter(
-    (call) =>
-      keepAllDirectCodexTurns ||
-      visibleTurnIds.has(call.turnId) ||
-      call.turnId === activeDirectCodexTurnRef.current?.turnId,
-  );
-  // 回合流只保留「当前消息列表里确实有这个回合」的那些，外加正在跑的回合；
-  // 没有流条目的回合由视图自己回退到原来的渲染。
-  const visibleTurnStreamItems = directTurnStream.filter(
-    (item) =>
-      keepAllDirectCodexTurns ||
-      visibleTurnIds.has(item.turnId) ||
-      item.turnId === activeDirectCodexTurnRef.current?.turnId,
-  );
   const hasEarlierConversationMessages =
     hiddenConversationCount > 0 ||
     (directCodexProductRuntime && directHistoryHasMore);
@@ -13033,8 +12994,18 @@ export function App({
         }
         pendingCommand={directCodexProductRuntime ? pendingCommand : null}
         projectPath={localProject?.projectPath ?? projectPath}
-        toolCalls={visibleToolCalls}
-        turnStreamItems={visibleTurnStreamItems}
+        toolCalls={
+          directTimelineProjectPathRef.current === localProject?.projectPath
+            ? directToolCalls
+            : []
+        }
+        turnStreamItems={
+          directTimelineProjectPathRef.current === localProject?.projectPath
+            ? directTurnStream
+            : []
+        }
+        conversationMessages={messages}
+        hasUnloadedHistory={directHistoryHasMore}
         activeTurnId={
           directCodexProductRuntime
             ? (activeDirectCodexTurnRef.current?.turnId ?? null)
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 ef24ccc24..ed6a0f30f 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
@@ -56,6 +56,10 @@ import {
   DesignAgentPendingActions,
   DesignAgentPhaseStatus,
 } from './DesignAgentSurface';
+import {
+  buildDirectTurnPresentations,
+  type DirectTurnPresentation,
+} from './directTurnPresentation';
 import { PlanGddSurface } from './GddApprovalCard';
 import {
   pendingCommandDetail,
@@ -71,53 +75,7 @@ import {
 } from './ResourceReferenceInput';
 import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 import { ToolCallGroup } from './ToolCallGroup';
-import {
-  formatTurnDuration,
-  turnToolCallEndedAt,
-} from './toolCallGroupPresentation';
-
-/** 与 `App.tsx` 的回合消息 id 同构：`direct-codex:<turnId>:<role>`。 */
-function directCodexTurnMessageId(turnId: string, role: 'user' | 'assistant') {
-  return `direct-codex:${turnId}:${role}`;
-}
-
-/** 从 `direct-codex:<turnId>:assistant` 反解回合 id；不是这个形状返回 `null`。 */
-function directCodexTurnIdFromAssistantMessageId(messageId: string) {
-  const prefix = 'direct-codex:';
-  const suffix = ':assistant';
-  if (!messageId.startsWith(prefix) || !messageId.endsWith(suffix)) {
-    return null;
-  }
-  return messageId.slice(prefix.length, -suffix.length);
-}
-
-/** 从 `direct-codex:<turnId>:user` 反解回合 id；不是这个形状返回 `null`。 */
-function directCodexTurnIdFromUserMessageId(messageId: string) {
-  const prefix = 'direct-codex:';
-  const suffix = ':user';
-  if (!messageId.startsWith(prefix) || !messageId.endsWith(suffix)) {
-    return null;
-  }
-  return messageId.slice(prefix.length, -suffix.length);
-}
-
-/** 按回合分组，组内按 `seq` 升序（排序已在 App 侧完成，这里保持原顺序）。 */
-function groupTurnStreamItems(items: readonly TurnStreamItem[]) {
-  const byTurn = new Map<string, TurnStreamItem[]>();
-  for (const item of items) {
-    const turnId = item.turnId?.trim();
-    if (!turnId) {
-      continue;
-    }
-    const bucket = byTurn.get(turnId);
-    if (bucket) {
-      bucket.push(item);
-    } else {
-      byTurn.set(turnId, [item]);
-    }
-  }
-  return byTurn;
-}
+import { formatTurnDuration } from './toolCallGroupPresentation';
 
 /** 相邻的工具流项合并成一个块；中间夹了文本段就另起一块。 */
 type TurnStreamToolRun = {
@@ -168,12 +126,9 @@ function TurnStreamSequence({
   active,
   userSentAt,
   className,
-  toolsOnly = false,
 }: {
   items: readonly TurnStreamItem[];
   toolCalls: readonly GameCreatorDirectToolCall[];
-  /** 只渲染工具块：当流的文本不完整（老数据被截断）时用，正文交给持久化消息渲染。 */
-  toolsOnly?: boolean;
   /** 这个回合是否正在跑（决定工具行显示"执行中"）。 */
   active: boolean;
   userSentAt: number;
@@ -191,22 +146,20 @@ function TurnStreamSequence({
     <>
       {runs.map((run, index) =>
         run.kind === 'text' ? (
-          toolsOnly ? null : (
-            <div
-              key={run.key}
-              className={
-                className
-                  ? `message message--assistant ${className}`
-                  : 'message message--assistant'
-              }
-            >
-              <ChatMarkdownMessage
-                role="assistant"
-                text={run.text}
-                streaming={active && index === runs.length - 1}
-              />
-            </div>
-          )
+          <div
+            key={run.key}
+            className={
+              className
+                ? `message message--assistant ${className}`
+                : 'message message--assistant'
+            }
+          >
+            <ChatMarkdownMessage
+              role="assistant"
+              text={run.text}
+              streaming={active && index === runs.length - 1}
+            />
+          </div>
         ) : (
           <ToolCallGroup
             key={run.key}
@@ -306,6 +259,8 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   designReasoning?: string;
   designReasoningEntries?: DesignReasoningEntry[];
   visibleMessages: ChatMessage[];
+  conversationMessages?: ChatMessage[];
+  hasUnloadedHistory?: boolean;
   visibleProfessionalAgentCards: AgentStatusCard[];
   walletEntry?: ReactNode;
   workspaceStatus: string;
@@ -376,6 +331,8 @@ export function ProjectSupervisorView({
   designReasoning = '',
   designReasoningEntries = [],
   visibleMessages,
+  conversationMessages = visibleMessages,
+  hasUnloadedHistory = false,
   visibleProfessionalAgentCards,
   walletEntry,
   workspaceStatus,
@@ -442,181 +399,19 @@ export function ProjectSupervisorView({
   }, [settingsOpen]);
   const runBusy =
     runtimePanelProps.controlBusy || Boolean(directProcessDetail) || submitting;
-  // 工具调用折叠块按回合分组，插在**同一回合 assistant 消息之前**（Codex 是「工具在上、答复在下」）。
-  // 历史回合锚到自己那条 `direct-codex:<turnId>:assistant`，不回落到别的回合；
-  // 正在跑的回合还没有 assistant 消息落盘，先落在消息流末尾，等那条消息落盘后回到它之前。
-  // **只有没有回合流的回合才走这条路**：有流的回合按流自己的顺序渲染。
-  const streamTurnId = activeTurnId?.trim() ?? '';
-  // 回合流（`turn-stream.jsonl`）按回合分组：有流的回合按「文本段 → 工具块 → 文本段」顺序渲染，
-  // 没有流的回合（老项目 / 缺文件 / 读取失败）留在老路径上，绝不白屏。
-  const turnStreamByTurn = groupTurnStreamItems(
-    directCodex ? turnStreamItems : [],
-  );
-  const toolCallsByAnchor = new Map<string, GameCreatorDirectToolCall[]>();
-  const liveToolCalls: GameCreatorDirectToolCall[] = [];
-  let liveToolCallTurnId = '';
-  // 老项目里持久化的 assistant 消息 id 是 Codex 原始 id（不是 `direct-codex:<turnId>:assistant`），
-  // 因此锚不上；这些工具的回合不能丢，统一收集后渲染在列表末尾。
-  const unanchoredToolCallsByTurn = new Map<
-    string,
-    GameCreatorDirectToolCall[]
-  >();
-  // 正在跑的回合：它的流条目直接渲染在消息列表末尾，直到用户消息落盘、由那条消息接管。
-  const liveStreamTurnId =
-    streamTurnId && turnStreamByTurn.has(streamTurnId) ? streamTurnId : '';
-  const liveStreamItems = liveStreamTurnId
-    ? (turnStreamByTurn.get(liveStreamTurnId) ?? [])
+  const directTurns = directCodex
+    ? buildDirectTurnPresentations({
+        messages: conversationMessages,
+        visibleMessages,
+        items: turnStreamItems,
+        calls: toolCalls,
+        activeTurnId,
+        transientReply,
+        hasUnloadedHistory,
+      })
     : [];
-  if (directCodex) {
-    for (const call of toolCalls) {
-      if (turnStreamByTurn.has(call.turnId)) {
-        continue;
-      }
-      const expected = directCodexTurnMessageId(call.turnId, 'assistant');
-      const hasPersistedAssistant = visibleMessages.some(
-        (message) => message.messageId === expected,
-      );
-      if (hasPersistedAssistant) {
-        const bucket = toolCallsByAnchor.get(expected);
-        if (bucket) {
-          bucket.push(call);
-        } else {
-          toolCallsByAnchor.set(expected, [call]);
-        }
-        continue;
-      }
-      if (streamTurnId && call.turnId === streamTurnId) {
-        if (!liveToolCallTurnId) {
-          liveToolCallTurnId = call.turnId;
-        }
-        liveToolCalls.push(call);
-        continue;
-      }
-      const bucket = unanchoredToolCallsByTurn.get(call.turnId) ?? [];
-      bucket.push(call);
-      unanchoredToolCallsByTurn.set(call.turnId, bucket);
-    }
-  }
-  const unanchoredToolCalls = [...unanchoredToolCallsByTurn.entries()]
-    .sort((left, right) => {
-      const leftAt = Math.min(...left[1].map((call) => call.startedAt || 0));
-      const rightAt = Math.min(...right[1].map((call) => call.startedAt || 0));
-      return leftAt - rightAt;
-    })
-    .map(([turnId, calls]) => ({ turnId, calls }));
-  // 历史消息的 id 是 Codex 原始 id（不是 `direct-codex:<turnId>:...`），无法从 id 反解回合；
-  // 因此按位置配对：回合按首次出现时间排序后，第 N 个回合 ↔ 第 N 个用户消息。
-  const turnFirstAt = (turnId: string) => {
-    let first = Number.POSITIVE_INFINITY;
-    for (const item of turnStreamByTurn.get(turnId) ?? []) {
-      first = Math.min(first, Number(item.at) || Number.POSITIVE_INFINITY);
-    }
-    for (const call of toolCalls) {
-      if (call.turnId === turnId) {
-        first = Math.min(
-          first,
-          Number(call.startedAt) || Number.POSITIVE_INFINITY,
-        );
-      }
-    }
-    return Number.isFinite(first) ? first : 0;
-  };
-  const orderedStreamTurnIds = [
-    ...new Set([
-      ...turnStreamByTurn.keys(),
-      ...toolCalls.map((call) => call.turnId ?? ''),
-    ]),
-  ]
-    .filter((turnId) => Boolean(turnId.trim()))
-    .sort((left, right) => turnFirstAt(left) - turnFirstAt(right));
-  const turnIdByMessageIndex = new Map<number, string>();
-  {
-    let userIndex = -1;
-    visibleMessages.forEach((message, index) => {
-      if (message.role === 'user') {
-        userIndex += 1;
-      }
-      const turnId = orderedStreamTurnIds[userIndex];
-      if (turnId && userIndex >= 0) {
-        turnIdByMessageIndex.set(index, turnId);
-      }
-    });
-  }
-  // 每个回合的 assistant 原文长度：用于判断流的文本是否完整（老数据可能被截断）。
-  const assistantTextLengthByTurn = new Map<string, number>();
-  visibleMessages.forEach((message, index) => {
-    if (message.role !== 'assistant') {
-      return;
-    }
-    const turnId = turnIdByMessageIndex.get(index);
-    if (!turnId) {
-      return;
-    }
-    const length = projectSupervisorChatMessageText(message).length;
-    assistantTextLengthByTurn.set(
-      turnId,
-      (assistantTextLengthByTurn.get(turnId) ?? 0) + length,
-    );
-  });
-  const streamTextLengthByTurn = new Map<string, number>();
-  for (const [turnId, items] of turnStreamByTurn) {
-    let total = 0;
-    for (const item of items) {
-      if (item.kind === 'text') {
-        total += item.text?.length ?? 0;
-      }
-    }
-    streamTextLengthByTurn.set(turnId, total);
-  }
-  const mappedStreamTurnIds = new Set(turnIdByMessageIndex.values());
-  const unmappedStreamTurns = orderedStreamTurnIds.filter(
-    (turnId) =>
-      !mappedStreamTurnIds.has(turnId) &&
-      (turnStreamByTurn.get(turnId)?.length ?? 0) > 0,
-  );
-
-  // 该回合用户消息的 `updatedAt`：拿得到就在块头显示「发送 → 结束」，拿不到只显示结束时间。
-  const userMessageUpdatedAtForTurn = (turnId: string) => {
-    if (!turnId) {
-      return 0;
-    }
-    const userId = directCodexTurnMessageId(turnId, 'user');
-    const value = Number(
-      visibleMessages.find((message) => message.messageId === userId)
-        ?.updatedAt,
-    );
-    if (!Number.isFinite(value) || value <= 0) return 0;
-    // 旧快照使用 Unix 秒，新消息使用毫秒；统一到毫秒，避免出现数千万分钟。
-    return value < 100_000_000_000 ? value * 1000 : value;
-  };
-  /** 本轮会话的结束时刻：工具快照与消息里最晚的那个 updatedAt。 */
-  const turnEndedAtFor = (turnId: string) => {
-    let endedAt = turnToolCallEndedAt(
-      toolCalls.filter((call) => call.turnId === turnId),
-    );
-    for (const message of visibleMessages) {
-      const messageTurnId = message.messageId
-        ? directCodexTurnIdFromAssistantMessageId(message.messageId)
-        : null;
-      if (messageTurnId === turnId) {
-        endedAt = Math.max(endedAt, Number(message.updatedAt) || 0);
-      }
-    }
-    return endedAt < 100_000_000_000 ? endedAt * 1000 : endedAt;
-  };
-  const turnStartedAtFor = (turnId: string) => {
-    const messageStarted = userMessageUpdatedAtForTurn(turnId);
-    if (messageStarted) return messageStarted;
-    const starts = toolCalls
-      .filter((call) => call.turnId === turnId && Number(call.startedAt) > 0)
-      .map((call) => Number(call.startedAt));
-    if (starts.length > 0) return Math.min(...starts);
-    // 纯文本回合没有工具调用：用流里最早一条的出现时刻兜底，否则整轮用量行不显示。
-    const streamStarts = (turnStreamByTurn.get(turnId) ?? [])
-      .map((item) => Number(item.at))
-      .filter((at) => Number.isFinite(at) && at > 0);
-    return streamStarts.length > 0 ? Math.min(...streamStarts) : 0;
-  };
+  const turnStartedAtFor = (turnId: string) =>
+    directTurns.find((turn) => turn.turnId === turnId)?.startedAt ?? 0;
 
   const clockTimeWithSeconds = (timestamp: number) => {
     const date = new Date(timestamp);
@@ -624,39 +419,40 @@ export function ProjectSupervisorView({
     return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
   };
 
-  /** 整轮会话的结束时间与耗时（进行中时用 tick 驱的 now，所以秒数会实时跳动）。 */
-  const renderTurnUsage = (turnId: string) => {
-    if (!turnId) {
-      return null;
-    }
-    const startedAt =
-      turnStartedAtFor(turnId) ||
-      (activeTurnId === turnId ? activeTurnStartedAt : 0);
-    if (!startedAt) {
-      return null;
-    }
-    const running = Boolean(activeTurnId) && turnId === activeTurnId;
-    if (running) {
-      // 进行中的耗时由输入框上方的过程卡显示（"已耗时 xx"），对话里再显示一遍是重复。
-      return null;
-    }
-    const endedAt = running
-      ? turnUsageNow
-      : Math.max(turnEndedAtFor(turnId), startedAt);
-    const duration = formatTurnDuration(endedAt - startedAt);
+  const renderTurnUsage = (turn: DirectTurnPresentation) => {
+    if (!turn.turnId || turn.active || !turn.startedAt) return null;
+    const endedAt = Math.max(turn.endedAt, turn.startedAt);
     return (
       <p
         className="message-turn-usage"
         data-testid="turn-usage"
-        data-turn-id={turnId}
-        data-turn-running={running ? 'true' : 'false'}
+        data-turn-id={turn.turnId}
+        data-turn-running="false"
       >
-        {running
-          ? `本轮进行中 · 用时 ${duration ?? '—'}`
-          : `本轮结束于 ${endedAt ? clockTimeWithSeconds(endedAt) : '—'} · 耗时 ${duration ?? '0秒'}`}
+        {`本轮结束于 ${clockTimeWithSeconds(endedAt)} · 耗时 ${formatTurnDuration(endedAt - turn.startedAt) ?? '0秒'}`}
       </p>
     );
   };
+  const renderMessage = (message: ChatMessage, index: number) => (
+    <div
+      key={message.messageId ?? `${message.role}-${index}`}
+      className={`message message--${message.role}`}
+    >
+      <ChatMarkdownMessage
+        role={message.role}
+        text={projectSupervisorChatMessageText(message)}
+      />
+      {showDesignReasoning && message.reasoningText ? (
+        <details
+          className="design-agent-reasoning"
+          aria-label="策划 Agent 思考过程"
+        >
+          <summary>思考过程</summary>
+          <pre>{message.reasoningText}</pre>
+        </details>
+      ) : null}
+    </div>
+  );
 
   const submitButton = (
     <button
@@ -750,7 +546,7 @@ export function ProjectSupervisorView({
             </button>
           ) : null}
           {initialSupervisorMessage.trim() &&
-          !visibleMessages.some(
+          !conversationMessages.some(
             (message) =>
               message.role === 'user' &&
               message.text.trim() === initialSupervisorMessage.trim(),
@@ -762,158 +558,55 @@ export function ProjectSupervisorView({
               />
             </div>
           ) : null}
-          {visibleMessages.map((message, index) => {
-            const anchoredToolCalls = message.messageId
-              ? (toolCallsByAnchor.get(message.messageId) ?? [])
-              : [];
-            const anchoredTurnId = message.messageId
-              ? directCodexTurnIdFromAssistantMessageId(message.messageId)
-              : null;
-            const userTurnId = message.messageId
-              ? directCodexTurnIdFromUserMessageId(message.messageId)
-              : null;
-            const streamTurnIdForMessage =
-              userTurnId ??
-              anchoredTurnId ??
-              turnIdByMessageIndex.get(index) ??
-              null;
-            const turnStream = streamTurnIdForMessage
-              ? (turnStreamByTurn.get(streamTurnIdForMessage) ?? [])
-              : [];
-            const streamCovered = turnStream.length > 0;
-            // 有流时只在用户消息这一格渲染流（用户消息 → 文本/工具交替，按 seq 顺序）；
-            // 该回合的 assistant 消息内容已经在流里，跳过以免重复。
-            const streamTextLength = streamTurnIdForMessage
-              ? (streamTextLengthByTurn.get(streamTurnIdForMessage) ?? 0)
-              : 0;
-            const assistantTextLength = streamTurnIdForMessage
-              ? (assistantTextLengthByTurn.get(streamTurnIdForMessage) ?? 0)
-              : 0;
-            // 流的文本明显短于持久化原文 → 视为不完整：流只画工具块，正文由消息渲染。
-            const streamTextIncomplete =
-              streamCovered &&
-              assistantTextLength > 0 &&
-              streamTextLength < assistantTextLength * 0.8;
-            const ownsStream = streamCovered && message.role === 'user';
-            const suppressForStream =
-              streamCovered && message.role !== 'user' && !streamTextIncomplete;
-            const nextTurnId =
-              index + 1 < visibleMessages.length &&
-              visibleMessages[index + 1]?.messageId
-                ? directCodexTurnIdFromAssistantMessageId(
-                    visibleMessages[index + 1]!.messageId!,
-                  )
-                : null;
-            // 这条消息是该回合的最后一条时，在它后面给出整轮会话的结束时间与耗时。
-            const isTurnEnd =
-              Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
-            const isActiveTurn =
-              Boolean(anchoredTurnId) && anchoredTurnId === activeTurnId;
-            return (
-              <Fragment key={message.messageId ?? `${message.role}-${index}`}>
-                {anchoredToolCalls.length > 0 ? (
-                  <ToolCallGroup
-                    calls={anchoredToolCalls}
-                    userSentAt={userMessageUpdatedAtForTurn(
-                      anchoredTurnId ?? '',
-                    )}
-                    className="message-tool-call"
-                  />
-                ) : null}
-                {/* 有回合流的回合：assistant 消息这一格交给流自己渲染——文本段 → 工具块 →
-                    文本段 → 最终回复，按条目的 `seq` 顺序出现，不再把工具抽到消息前面。 */}
-                {suppressForStream ? null : ownsStream ? (
-                  <TurnStreamSequence
-                    items={turnStream}
-                    toolCalls={toolCalls}
-                    toolsOnly={streamTextIncomplete}
-                    active={
-                      Boolean(activeTurnId) &&
-                      streamTurnIdForMessage === activeTurnId
-                    }
-                    userSentAt={userMessageUpdatedAtForTurn(
-                      streamTurnIdForMessage ?? '',
-                    )}
-                  />
-                ) : (
-                  <div className={`message message--${message.role}`}>
-                    <ChatMarkdownMessage
-                      role={message.role}
-                      text={projectSupervisorChatMessageText(message)}
-                    />
-                    {showDesignReasoning && message.reasoningText ? (
-                      <details
-                        className="design-agent-reasoning"
-                        aria-label="策划 Agent 思考过程"
-                      >
-                        <summary>思考过程</summary>
-                        <pre>{message.reasoningText}</pre>
-                      </details>
-                    ) : null}
-                  </div>
-                )}
-                {/* 有流的回合把用量行跟在最后一条**用户**消息之后（结束于 xxx，总耗时 xxx）；
-                    没有流的回合保持原样：跟在回合最后一条消息之后。 */}
-                {ownsStream && streamTurnIdForMessage
-                  ? renderTurnUsage(streamTurnIdForMessage)
-                  : !streamCovered &&
-                      isTurnEnd &&
-                      !isActiveTurn &&
-                      anchoredTurnId
-                    ? renderTurnUsage(anchoredTurnId)
-                    : null}
-              </Fragment>
-            );
-          })}
-          {unmappedStreamTurns.map((turnId) => (
-            <TurnStreamSequence
-              key={`unmapped-stream-${turnId}`}
-              items={turnStreamByTurn.get(turnId) ?? []}
-              toolCalls={toolCalls}
-              active={Boolean(activeTurnId) && turnId === activeTurnId}
-              userSentAt={userMessageUpdatedAtForTurn(turnId)}
-            />
-          ))}
-          {unanchoredToolCalls.map(({ turnId, calls }) => (
-            <ToolCallGroup
-              key={`unanchored-tools-${turnId}`}
-              calls={calls}
-              userSentAt={userMessageUpdatedAtForTurn(turnId)}
-              className="message-tool-call"
-            />
-          ))}
-          {liveToolCalls.length > 0 ? (
-            <ToolCallGroup
-              calls={liveToolCalls}
-              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
-              active
-              className="message-tool-call"
-            />
-          ) : null}
-          {/* 正在跑的回合还没落盘用户消息时，流条目直接接在消息列表末尾；
-              用户消息一旦落盘，同一个回合就由上面那条用户消息负责渲染（不再重复）。 */}
-          {directCodex && liveStreamTurnId && liveStreamItems.length > 0 ? (
-            <>
-              <TurnStreamSequence
-                items={liveStreamItems}
-                toolCalls={toolCalls}
-                active
-                userSentAt={userMessageUpdatedAtForTurn(liveStreamTurnId)}
-              />
-              {renderTurnUsage(liveStreamTurnId)}
-            </>
-          ) : null}
-          {liveToolCallTurnId &&
-          liveToolCallTurnId !== activeTurnId &&
-          !turnStreamByTurn.has(liveToolCallTurnId) &&
-          !visibleMessages.some(
-            (message) =>
-              message.messageId &&
-              directCodexTurnIdFromAssistantMessageId(message.messageId) ===
-                liveToolCallTurnId,
-          )
-            ? renderTurnUsage(liveToolCallTurnId)
-            : null}
+          {directCodex
+            ? directTurns.map((turn) => (
+                <Fragment key={turn.key}>
+                  {turn.messages
+                    .filter((message) => message.role === 'user')
+                    .map(renderMessage)}
+                  {turn.source === 'stream' ? (
+                    <>
+                      <TurnStreamSequence
+                        items={turn.items}
+                        toolCalls={turn.calls}
+                        active={turn.active}
+                        userSentAt={turn.startedAt}
+                      />
+                      {turn.notices.map(renderMessage)}
+                    </>
+                  ) : (
+                    <>
+                      {turn.calls.length > 0 ? (
+                        <ToolCallGroup
+                          calls={turn.calls}
+                          userSentAt={turn.startedAt}
+                          active={turn.active}
+                          className="message-tool-call"
+                        />
+                      ) : null}
+                      {turn.messages
+                        .filter((message) => message.role !== 'user')
+                        .map(renderMessage)}
+                      {turn.transientReply ? (
+                        <div
+                          className="message message--assistant"
+                          aria-label="陶泥儿实时回复"
+                          aria-live="polite"
+                          data-runtime-owned="true"
+                        >
+                          <ChatMarkdownMessage
+                            role="assistant"
+                            text={turn.transientReply}
+                            streaming
+                          />
+                        </div>
+                      ) : null}
+                    </>
+                  )}
+                  {renderTurnUsage(turn)}
+                </Fragment>
+              ))
+            : visibleMessages.map(renderMessage)}
           {directCodex && transientReasoning ? (
             <details
               className="design-agent-reasoning"
@@ -923,23 +616,6 @@ export function ProjectSupervisorView({
               <pre>{transientReasoning}</pre>
             </details>
           ) : null}
-          {/* 直连回合的流式正文：恢复为对话区里的普通 assistant 消息（不再放进状态卡片），
-              这样"边生成边显示"和"状态卡片只放状态"两件事同时成立。
-              已有回合流的回合由流自己渲染文本段，这里不再重复一份。 */}
-          {directCodex && transientReply && !liveStreamTurnId ? (
-            <div
-              className="message message--assistant"
-              aria-label="陶泥儿实时回复"
-              aria-live="polite"
-              data-runtime-owned="true"
-            >
-              <ChatMarkdownMessage
-                role="assistant"
-                text={transientReply}
-                streaming
-              />
-            </div>
-          ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)
@@ -1160,7 +836,7 @@ export function ProjectSupervisorView({
             showTriggerButton={!directCodex}
             placeholder={
               directCodex
-                ? '告诉陶泥儿接下来要做什么，或输入 @ 选择资源'
+                ? '描述你的想法，或 @ 引用素材'
                 : '告诉项目总控接下来要做什么，或输入 @ 选择资源'
             }
             onChange={onChatInputChange}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
index 5e4a391e5..a3ec0ef0f 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
@@ -331,9 +331,7 @@ export function SupervisorChatOnlyView({
             value={chatInput}
             references={chatReferences}
             placeholder={
-              directCodex
-                ? '告诉陶泥儿接下来要做什么，或输入 @ 选择资源'
-                : '给项目总控 Agent 发消息，或输入 @ 选择资源'
+              directCodex ? '描述你的想法' : '给项目总控 Agent 发消息'
             }
             onChange={onChatInputChange}
           />
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index 1fa55de0b..35b4bff12 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -14,6 +14,7 @@ import {
   formatTurnDuration,
   toolCallDurationMs,
   toolCallGroupSummary,
+  toolCallInputText,
   toolCallRowText,
   turnToolCallDurationMs,
   turnToolCallTimeLabel,
@@ -178,7 +179,7 @@ function ToolCallRow({
     .filter(Boolean)
     .join('，');
   const changes = call.detail.changes ?? [];
-  const detailCommand = call.detail.command?.trim() ?? '';
+  const detailCommand = toolCallInputText(call);
   const detailOutput = call.detail.output?.trim() ?? '';
   const hasDetail =
     Boolean(detailCommand) || Boolean(detailOutput) || changes.length > 0;
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
new file mode 100644
index 000000000..03655588b
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
@@ -0,0 +1,230 @@
+import type {
+  ChatMessage,
+  GameCreatorDirectToolCall,
+  TurnStreamItem,
+} from '../../app/types';
+import { projectSupervisorChatMessageText } from '../agent-runtime';
+
+export function directConversationTurnId(messageId: string | null | undefined) {
+  const match = /^direct-codex:(.+):(user|assistant|failure)$/.exec(
+    messageId ?? '',
+  );
+  return match?.[1] ?? null;
+}
+
+export type DirectTurnPresentation = {
+  key: string;
+  turnId: string | null;
+  messages: ChatMessage[];
+  notices: ChatMessage[];
+  items: TurnStreamItem[];
+  calls: GameCreatorDirectToolCall[];
+  source: 'stream' | 'messages';
+  active: boolean;
+  transientReply: string;
+  startedAt: number;
+  endedAt: number;
+};
+
+function milliseconds(value: number | undefined) {
+  return value && Number.isFinite(value) && value > 0
+    ? value < 100_000_000_000
+      ? value * 1000
+      : value
+    : 0;
+}
+
+/** 完整历史先按身份归属，再决定可见回合；渲染层只消费这一个列表。 */
+export function buildDirectTurnPresentations({
+  messages,
+  visibleMessages,
+  items,
+  calls,
+  activeTurnId,
+  transientReply,
+  hasUnloadedHistory = false,
+}: {
+  messages: readonly ChatMessage[];
+  visibleMessages: readonly ChatMessage[];
+  items: readonly TurnStreamItem[];
+  calls: readonly GameCreatorDirectToolCall[];
+  activeTurnId?: string | null;
+  transientReply: string;
+  hasUnloadedHistory?: boolean;
+}): DirectTurnPresentation[] {
+  const rows = new Map<string, DirectTurnPresentation>();
+  const itemTurnIds = new Map<string, string>();
+  for (const item of items) {
+    const prefix = `text:${item.turnId}:`;
+    if (item.kind === 'text' && item.id.startsWith(prefix)) {
+      itemTurnIds.set(item.id.slice(prefix.length), item.turnId);
+    }
+  }
+  const ensure = (turnId: string | null, key: string) => {
+    const existing = rows.get(key);
+    if (existing) return existing;
+    const row: DirectTurnPresentation = {
+      key,
+      turnId,
+      messages: [],
+      notices: [],
+      items: [],
+      calls: [],
+      source: 'messages',
+      active: Boolean(turnId && turnId === activeTurnId),
+      transientReply: '',
+      startedAt: 0,
+      endedAt: 0,
+    };
+    rows.set(key, row);
+    return row;
+  };
+
+  // 原始 assistant id 可通过流 item 精确反查。旧用户记录无 turn id 时，
+  // 只用同一用户记录区间内的这种精确证据关联，不与第 N 个工具回合配对。
+  const boundaryTurnIds = new Map<number, string>();
+  let boundary = -1;
+  messages.forEach((message, index) => {
+    if (message.role === 'user') boundary = index;
+    const id =
+      directConversationTurnId(message.messageId) ??
+      itemTurnIds.get(message.messageId ?? '');
+    if (id && boundary >= 0 && !boundaryTurnIds.has(boundary)) {
+      boundaryTurnIds.set(boundary, id);
+    }
+  });
+  const visible = new Set(visibleMessages);
+  const visibleKeys = new Set<string>();
+  const seenMessages = new Set<string>();
+  boundary = -1;
+  messages.forEach((message, index) => {
+    if (message.role === 'user') boundary = index;
+    const turnId =
+      directConversationTurnId(message.messageId) ??
+      itemTurnIds.get(message.messageId ?? '') ??
+      boundaryTurnIds.get(boundary) ??
+      null;
+    const key = turnId
+      ? `turn:${turnId}`
+      : `history:${boundary < 0 ? index : boundary}`;
+    const row = ensure(turnId, key);
+    if (visible.has(message)) visibleKeys.add(key);
+    if (message.messageId && seenMessages.has(message.messageId)) return;
+    if (message.messageId) seenMessages.add(message.messageId);
+    row.messages.push(message);
+  });
+
+  const itemsByKey = new Map<string, TurnStreamItem>();
+  for (const item of items) {
+    const key = `${item.turnId}\0${item.id}`;
+    const previous = itemsByKey.get(key);
+    if (!previous || item.updatedAt >= previous.updatedAt)
+      itemsByKey.set(key, item);
+  }
+  for (const item of itemsByKey.values()) {
+    ensure(item.turnId, `turn:${item.turnId}`).items.push(item);
+  }
+  const callsByKey = new Map<string, GameCreatorDirectToolCall>();
+  for (const call of calls) {
+    const key = `${call.turnId}\0${call.id}`;
+    const previous = callsByKey.get(key);
+    if (!previous || call.updatedAt >= previous.updatedAt)
+      callsByKey.set(key, call);
+  }
+  for (const call of callsByKey.values()) {
+    ensure(call.turnId, `turn:${call.turnId}`).calls.push(call);
+  }
+  if (activeTurnId) ensure(activeTurnId, `turn:${activeTurnId}`);
+
+  for (const row of rows.values()) {
+    row.items.sort((a, b) => a.seq - b.seq || a.id.localeCompare(b.id));
+    row.calls.sort(
+      (a, b) => a.startedAt - b.startedAt || a.id.localeCompare(b.id),
+    );
+    const assistants = row.messages.filter(
+      (message) => message.role === 'assistant',
+    );
+    const rawAssistants = assistants.filter(
+      (message) =>
+        message.messageId && !directConversationTurnId(message.messageId),
+    );
+    const textIds = new Set(
+      row.items.filter((item) => item.kind === 'text').map((item) => item.id),
+    );
+    // 精确 item id 才能补齐旧快照正文；无法证明流覆盖完整历史时，整轮使用历史，
+    // 不同时渲染“部分流 + 全文”，也不按长度比例猜测是否重复。
+    const historyCovered = assistants.every(
+      (message) =>
+        Boolean(directConversationTurnId(message.messageId)) ||
+        Boolean(
+          message.messageId &&
+            textIds.has(`text:${row.turnId}:${message.messageId}`),
+        ),
+    );
+    row.source =
+      row.items.length > 0 &&
+      historyCovered &&
+      (textIds.size > 0 || assistants.length === 0)
+        ? 'stream'
+        : 'messages';
+    if (row.source === 'stream') {
+      row.notices = assistants.filter(
+        (message) =>
+          message.messageId === `direct-codex:${row.turnId}:failure` &&
+          !textIds.has(`text:${row.turnId}:failure`),
+      );
+      const historyById = new Map(
+        rawAssistants.map((message) => [
+          `text:${row.turnId}:${message.messageId}`,
+          message,
+        ]),
+      );
+      row.items = row.items.map((item) => {
+        const history = historyById.get(item.id);
+        return item.kind === 'text' && history
+          ? { ...item, text: projectSupervisorChatMessageText(history) }
+          : item;
+      });
+    }
+    if (row.source === 'messages' && rawAssistants.length > 0) {
+      const lastText = row.items.filter((item) => item.kind === 'text').at(-1);
+      const lastRaw = rawAssistants.at(-1);
+      // 最后一个原始 item 与流尾身份一致时，GUI 整轮回执不是另一条回复。
+      if (
+        lastText &&
+        lastRaw &&
+        lastText.id === `text:${row.turnId}:${lastRaw.messageId}`
+      ) {
+        row.messages = row.messages.filter(
+          (message) =>
+            message.messageId !== `direct-codex:${row.turnId}:assistant`,
+        );
+      }
+    }
+    if (row.active && row.source === 'messages' && assistants.length === 0) {
+      row.transientReply = transientReply;
+    }
+    const starts = [
+      ...row.messages
+        .filter((message) => message.role === 'user')
+        .map((message) => milliseconds(message.updatedAt)),
+      ...row.items.map((item) => milliseconds(item.at)),
+      ...row.calls.map((call) => milliseconds(call.startedAt)),
+    ].filter((at) => at > 0);
+    row.startedAt = starts.length ? Math.min(...starts) : 0;
+    row.endedAt = Math.max(
+      0,
+      ...row.messages.map((message) => milliseconds(message.updatedAt)),
+      ...row.items.map((item) => milliseconds(item.updatedAt)),
+      ...row.calls.map((call) => milliseconds(call.updatedAt)),
+    );
+  }
+  return [...rows.values()].filter(
+    (row) =>
+      row.active ||
+      visibleKeys.has(row.key) ||
+      (!hasUnloadedHistory &&
+        row.messages.length === 0 &&
+        (row.items.length > 0 || row.calls.length > 0)),
+  );
+}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
index a2a96ab88..417277bfd 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
@@ -87,6 +87,19 @@ export function toolCallRowText(call: GameCreatorDirectToolCall) {
 }
 
 function toolCallRowSummary(call: GameCreatorDirectToolCall) {
+  if (call.kind === 'command') {
+    // 历史摘要可能已被可执行文件路径占满；优先从完整、已脱敏的输入提取正文。
+    const script = windowsPowerShellCommandBody(
+      call.detail.command?.trim() || call.summary.trim(),
+    );
+    if (script) {
+      const firstLine = script.trim().split(/\r?\n/, 1)[0] ?? '';
+      const chars = Array.from(firstLine);
+      return chars.length > 120
+        ? `${chars.slice(0, 120).join('')}…`
+        : firstLine;
+    }
+  }
   const summary = call.summary.trim();
   if (summary) {
     return summary;
@@ -100,6 +113,66 @@ function toolCallRowSummary(call: GameCreatorDirectToolCall) {
   return call.title.trim();
 }
 
+/** 仅格式化卡片输入，不修改执行参数、历史记录或工具输出。 */
+export function toolCallInputText(call: GameCreatorDirectToolCall) {
+  const input = call.detail.command?.trim() ?? '';
+  return call.kind === 'command'
+    ? (windowsPowerShellCommandBody(input) ?? input)
+    : input;
+}
+
+function windowsPowerShellCommandBody(command: string): string | null {
+  const invocation = command.match(
+    /^(?:&\s+)?("[^"]+"|'[^']+'|[^\s]+)\s+([\s\S]+)$/,
+  );
+  if (!invocation) return null;
+  const executable = (invocation[1] ?? '').replace(/^(['"])(.*)\1$/, '$2');
+  if (!/(?:^|[\\/])(?:pwsh|powershell)(?:\.exe)?$/i.test(executable)) {
+    return null;
+  }
+  const args = (invocation[2] ?? '').match(
+    /^(?:(?:-NoLogo|-NoProfile|-NonInteractive|-NoExit|-STA|-MTA)\s+|(?:-ExecutionPolicy|-WindowStyle)\s+\S+\s+)*-(?:Command|c)\s+([\s\S]+)$/i,
+  );
+  if (!args?.[1]) return null;
+  return unwrapDisplayArgument(args[1].trim());
+}
+
+/** 解开命令展示字符串的单个 shell 参数，包括 shlex 的单引号拼接；不解析脚本语法。 */
+function unwrapDisplayArgument(argument: string) {
+  if (!/^['"]/.test(argument)) return argument;
+  let quote = '';
+  let result = '';
+  for (let index = 0; index < argument.length; index += 1) {
+    const char = argument.charAt(index);
+    if (quote) {
+      if (char === quote) {
+        quote = '';
+      } else if (
+        quote === '"' &&
+        char === '\\' &&
+        /["\\$`\n]/.test(argument[index + 1] ?? '')
+      ) {
+        index += 1;
+        if (argument[index] !== '\n') result += argument[index];
+      } else {
+        result += char;
+      }
+    } else if (char === "'" || char === '"') {
+      quote = char;
+    } else if (char === '\\' && index + 1 < argument.length) {
+      index += 1;
+      result += argument[index];
+    } else if (/\s/.test(char)) {
+      // 多个参数或外层还有后续命令时保留原文，避免错误拼接。
+      return argument;
+    } else {
+      result += char;
+    }
+  }
+  // 历史输入可能在 4000 字符处截断，不猜测丢失的引号。
+  return quote || !result ? argument : result;
+}
+
 /**
  * 单条工具的耗时（毫秒）。
  * `startedAt` 为 0（缺失）或 `updatedAt < startedAt`（时间倒序）时返回 `null`：
@@ -191,7 +264,7 @@ export function turnToolCallEndedAt(
   return maxUpdatedAt;
 }
 
-/** 本地 `HH:mm`；时间戳缺失（0 / 非法）返回 `null`，不编造时间。 */
+/** 本地 `HH:mm:ss`；时间戳缺失（0 / 非法）返回 `null`，不编造时间。 */
 export function formatClockTime(timestamp: number | null | undefined) {
   if (
     timestamp === null ||
@@ -204,11 +277,12 @@ export function formatClockTime(timestamp: number | null | undefined) {
   const date = new Date(timestamp);
   const hours = String(date.getHours()).padStart(2, '0');
   const minutes = String(date.getMinutes()).padStart(2, '0');
-  return `${hours}:${minutes}`;
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${hours}:${minutes}:${seconds}`;
 }
 
 /**
- * 块头时间文案：该回合结束时间（`max(updatedAt)` 的本地 `HH:mm`）；
+ * 块头时间文案：该回合结束时间（`max(updatedAt)` 的本地 `HH:mm:ss`）；
  * 能拿到同回合用户消息时间（`updatedAt > 0`）时显示「发送 → 结束」，取不到就只显示结束时间。
  */
 export function turnToolCallTimeLabel(
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 1864b3be3..6c97e3718 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -10786,16 +10786,13 @@ button.design-workspace-tree__entry:hover,
   margin-left: auto;
 }
 
-/* 左侧控件组整体左移，让 `+` 图标的**字形**与输入区文字的左边缘对齐。
-   控件钮是 28×28 的点击区、图标在其中居中（实测图标字形比按钮盒左边缘再右偏
-   (28-15)/2 ≈ 6.5px），所以光对齐按钮盒是不够的——那正是「光标比下面那排控件更靠左」
-   的成因。这里用 -7px 抵消这段居中偏移，点击区尺寸不变。 */
+/* 左侧引用按钮保留输入盒的内边距，点击区域不向外偏移。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
   .project-supervisor-composer-controls
   .project-supervisor-composer-controls-left {
-  margin-left: -7px;
+  margin-left: 0;
 }
 
 /* 模型选择钮在控制排里按流式排布，但它同时是**弹层锚点**：`.conversation-model-menu`
@@ -11064,8 +11061,21 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-composer.is-direct-codex
   .project-supervisor-stop-button {
   border-radius: 999px;
-  background: var(--platform-button-ghost-fill);
-  color: var(--platform-text-strong);
+  /* 停止是破坏性操作：用红色填充 + 红色图标，和发送/其它控件区分开。 */
+  background: rgb(197 62 62 / 14%);
+  color: #c53e3e;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-stop-button:hover:not(:disabled),
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-composer.is-direct-codex
+  .project-supervisor-stop-button:focus-visible {
+  background: rgb(197 62 62 / 22%);
+  color: #a82f2f;
 }
 
 .game-workbench-chat
@@ -12024,13 +12034,9 @@ button.design-workspace-tree__entry:hover,
    `.resource-reference-input` / `.resource-reference-input-actions` 规则决定，
    同特异性下只有靠后写的才能盖回去。
 
-   两处造成"文字和下面那排控件对不齐 / 左右留白不等于上下留白"的原因：
-   1. 输入区是两列网格（文本列 + 操作列），右侧那枚「AI 润色」按钮常年占掉 36px，
+   输入区是两列网格（文本列 + 操作列），右侧那枚「AI 润色」按钮常年占掉 36px，
       于是文字右边缘比盒内右边缘少 36px——左右留白与上下留白看着就不一致。
-      这里把输入区改成单块并把操作按钮浮到右下角，文字可用满整宽。
-   2. `+` `@` 是 28×28 点击区、图标在其中居中，lucide 视框本身还有约 3px 内缩，
-      字形比文字左边缘右偏约 5px（实测）。左侧控件组左移 12px 抵消这段偏移，
-      点击区尺寸不变。 */
+      这里把输入区改成单块并把操作按钮浮到右下角，文字可用满整宽。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
   .project-supervisor-composer.is-direct-codex
@@ -12053,14 +12059,6 @@ button.design-workspace-tree__entry:hover,
   justify-content: flex-end;
 }
 
-.game-workbench-chat
-  .project-supervisor-surface.is-direct-codex
-  .project-supervisor-composer.is-direct-codex
-  .project-supervisor-composer-controls
-  .project-supervisor-composer-controls-left {
-  margin-left: -12px;
-}
-
 /* 过程卡（「任务执行中 / 正在思考中」）现在渲染在消息列表**外**、紧贴输入盒上方（固定在
    输入框上面，不随消息滚走）。它不再继承消息列表的左右 16px 内缩，所以要自己补齐，
    才能与消息内容、输入盒两侧对齐；离开列表后列表的 padding-bottom 也不再作用于它。 */
@@ -12157,6 +12155,7 @@ button.design-workspace-tree__entry:hover,
   .message-turn-usage {
   margin: 0;
   padding: 0 2px;
+  text-align: right;
   color: var(--platform-text-soft);
   font-size: 12px;
   line-height: 1.6;
@@ -12225,4 +12224,4 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-message-list
   .message li {
   line-height: 1.5 !important;
-}
\ No newline at end of file
+}
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index db55ad9b3..69016c4e2 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -7084,9 +7084,7 @@ export function registerProjectSupervisorSurfaceTests() {
       within(supervisorSurface).queryByLabelText('项目总控 Agent 状态'),
     ).toBeNull();
     expect(
-      within(supervisorSurface).getByText(
-        '告诉陶泥儿接下来要做什么，或输入 @ 选择资源',
-      ),
+      within(supervisorSurface).getByText('描述你的想法，或 @ 引用素材'),
     ).not.toBeNull();
     expect(
       within(supervisorSurface).getByRole('button', { name: '发送' }),
@@ -9007,7 +9005,7 @@ export function registerProjectSupervisorSurfaceTests() {
     ).not.toBeNull();
     expect(
       within(emptyState as HTMLElement).getByText(
-        '告诉陶泥儿接下来要做什么，或输入 @ 选择资源',
+        '描述你的想法，或 @ 引用素材',
       ),
     ).not.toBeNull();
     expect(
diff --git a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
index cfcd782aa..f58f36587 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
@@ -58,7 +58,7 @@ export function registerToolCallGroupTests() {
       toolCallRowText(
         toolCall({ id: 'a', kind: 'command', summary: 'npm run build' }),
       ),
-    ).toBe('已运行 npm run build');
+    ).toBe('npm run build');
     expect(
       toolCallRowText(
         toolCall({
@@ -67,17 +67,17 @@ export function registerToolCallGroupTests() {
           summary: 'game/src/hero.ts',
         }),
       ),
-    ).toBe('已编辑 game/src/hero.ts');
+    ).toBe('game/src/hero.ts');
     expect(
       toolCallRowText(
         toolCall({ id: 'c', kind: 'mcp_tool', summary: 'canvas.sync' }),
       ),
-    ).toBe('已调用 canvas.sync');
+    ).toBe('canvas.sync');
     expect(
       toolCallRowText(
         toolCall({ id: 'd', kind: 'web_search', summary: '弹幕游戏玩法' }),
       ),
-    ).toBe('已搜索 弹幕游戏玩法');
+    ).toBe('弹幕游戏玩法');
     // 上下文整理不带 summary。
     expect(
       toolCallRowText(
@@ -87,12 +87,12 @@ export function registerToolCallGroupTests() {
           summary: 'should be ignored',
         }),
       ),
-    ).toBe('已整理上下文');
+    ).toBe('整理上下文');
     expect(
       toolCallRowText(
         toolCall({ id: 'f', kind: 'other', summary: '未知动作' }),
       ),
-    ).toBe('已执行 未知动作');
+    ).toBe('未知动作');
   });
 
   it('renders one collapsed block per turn and lists every tool on expand', async () => {
@@ -141,13 +141,13 @@ export function registerToolCallGroupTests() {
       'file_change',
     ]);
     expect(
-      within(rows[0] as HTMLElement).getByText('已运行 npm run build'),
+      within(rows[0] as HTMLElement).getByText('npm run build'),
     ).not.toBeNull();
     expect(
-      within(rows[1] as HTMLElement).getByText('已编辑 game/src/hero.ts'),
+      within(rows[1] as HTMLElement).getByText('game/src/hero.ts'),
     ).not.toBeNull();
-    // running 的行在行内标「执行中」。
-    expect(within(rows[1] as HTMLElement).getByText('执行中')).not.toBeNull();
+    // 已结束回合里的 running 残留快照不能继续显示「执行中」。
+    expect(within(rows[1] as HTMLElement).getByText('已执行')).not.toBeNull();
   });
 
   it('expands a row to its own detail and renders nothing for an empty turn', () => {
@@ -158,7 +158,10 @@ export function registerToolCallGroupTests() {
             id: 'a',
             kind: 'command',
             summary: 'npm run build',
-            detail: { command: 'npm run build', output: 'build ok' },
+            detail: {
+              command: "pwsh -Command 'npm run build'",
+              output: 'build ok',
+            },
           }),
           toolCall({
             id: 'b',
@@ -181,7 +184,9 @@ export function registerToolCallGroupTests() {
     // 行也是按钮：`aria-expanded` + `aria-controls` 指向自己的明细，默认折叠。
     const commandHead = within(rows[0] as HTMLElement).getByRole('button');
     expect(commandHead.getAttribute('aria-expanded')).toBe('false');
-    expect(commandHead.getAttribute('aria-label')).toBe('已运行 npm run build');
+    expect(commandHead.getAttribute('aria-label')).toBe(
+      'npm run build，已执行',
+    );
     const commandDetail = container.querySelector(
       `#${commandHead.getAttribute('aria-controls')}`,
     );
@@ -189,14 +194,15 @@ export function registerToolCallGroupTests() {
     fireEvent.click(commandHead);
     expect(commandHead.getAttribute('aria-expanded')).toBe('true');
     expect(commandDetail?.hasAttribute('hidden')).toBe(false);
+    expect(
+      commandDetail?.querySelector('.agent-tool-call-row-command')?.textContent,
+    ).toBe('npm run build');
     expect(
       within(commandDetail as HTMLElement).getByText('build ok'),
     ).not.toBeNull();
     // 文件变更明细：路径 + 变更类型。
     const fileHead = within(rows[1] as HTMLElement).getByRole('button');
-    expect(fileHead.getAttribute('aria-label')).toBe(
-      '已编辑 game/src/hero.ts，失败',
-    );
+    expect(fileHead.getAttribute('aria-label')).toBe('game/src/hero.ts，失败');
     fireEvent.click(fileHead);
     const fileDetail = container.querySelector(
       `#${fileHead.getAttribute('aria-controls')}`,
@@ -261,9 +267,9 @@ export function registerToolCallGroupTests() {
 
     // 块头时间：取得到用户消息时间就是「发送 → 结束」，取不到只显示结束时间，都取不到就不显示。
     expect(turnToolCallTimeLabel(calls, 1000)).toMatch(
-      /^\d{2}:\d{2} → \d{2}:\d{2}$/,
+      /^\d{2}:\d{2}:01 → \d{2}:\d{2}:09$/,
     );
-    expect(turnToolCallTimeLabel(calls, 0)).toMatch(/^\d{2}:\d{2}$/);
+    expect(turnToolCallTimeLabel(calls, 0)).toMatch(/^\d{2}:\d{2}:09$/);
     expect(
       turnToolCallTimeLabel([toolCall({ id: 'e', kind: 'command' })], 0),
     ).toBe(null);
@@ -309,10 +315,10 @@ export function registerToolCallGroupTests() {
     expect(head.getAttribute('aria-label')).toBe(
       '已执行 1 个命令、1 个文件变更、1 个联网搜索，用时 17秒',
     );
-    // 时间戳不写死时区：`HH:mm → HH:mm`（发送 → 结束）。
+    // 时间戳不写死时区：`HH:mm:ss → HH:mm:ss`（发送 → 结束）。
     expect(
       head.querySelector('.agent-tool-call-group-time')?.textContent,
-    ).toMatch(/^\d{2}:\d{2} → \d{2}:\d{2}$/);
+    ).toMatch(/^\d{2}:\d{2}:\d{2} → \d{2}:\d{2}:\d{2}$/);
 
     fireEvent.click(head);
     const rows = within(group).queryAllByTestId('agent-tool-call-row');
@@ -323,10 +329,10 @@ export function registerToolCallGroupTests() {
     // startedAt === updatedAt：耗时为 0 —— `data-duration-ms` 如实暴露 0，但行上不显示 `0s`。
     expect(rows[2]?.getAttribute('data-duration-ms')).toBe('0');
     expect(within(rows[2] as HTMLElement).queryByText('0s')).toBeNull();
-    // 块尾显示该回合结束时间。
+    // 时间只显示在块头，展开后不重复追加块尾时间。
     expect(
-      within(group).getByTestId('agent-tool-call-group-end-time').textContent,
-    ).toMatch(/^结束于 \d{2}:\d{2}$/);
+      within(group).queryByTestId('agent-tool-call-group-end-time'),
+    ).toBeNull();
 
     // 时间戳缺失（startedAt 为 0）：块头与行都不显示耗时。
     const missing = render(
diff --git a/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts b/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
new file mode 100644
index 000000000..9352f8134
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
@@ -0,0 +1,175 @@
+import { describe, expect, it } from 'vitest';
+
+import type {
+  ChatMessage,
+  GameCreatorDirectToolCall,
+  TurnStreamItem,
+} from '../src/app/types';
+import { buildDirectTurnPresentations } from '../src/features/project-workspace/directTurnPresentation';
+
+const user = (turn: string): ChatMessage => ({
+  role: 'user',
+  text: '只读检查',
+  messageId: `direct-codex:${turn}:user`,
+});
+const assistant = (id: string, text = '完整回复'): ChatMessage => ({
+  role: 'assistant',
+  text,
+  messageId: id,
+});
+const text = (turnId: string, id: string, seq = 1): TurnStreamItem => ({
+  schemaVersion: 'agc-turn-stream.v1',
+  kind: 'text',
+  turnId,
+  id: `text:${turnId}:${id}`,
+  text: '前缀',
+  seq,
+  at: 1_800_000_000_000,
+  updatedAt: 1_800_000_000_001,
+});
+const tool = (turnId: string): GameCreatorDirectToolCall => ({
+  schemaVersion: 'agc-tool-call.v1',
+  id: 'call',
+  turnId,
+  kind: 'mcp_tool',
+  title: '调用工具',
+  summary: '读取',
+  status: 'completed',
+  detail: { command: '{"path":"file"}', output: '内容', changes: [] },
+  startedAt: 1_800_000_000_000,
+  updatedAt: 1_800_000_000_001,
+});
+const build = (
+  messages: ChatMessage[],
+  items: TurnStreamItem[],
+  options: Partial<Parameters<typeof buildDirectTurnPresentations>[0]> = {},
+) =>
+  buildDirectTurnPresentations({
+    messages,
+    visibleMessages: messages,
+    items,
+    calls: [],
+    transientReply: '',
+    ...options,
+  });
+
+describe('DirectProject 回合唯一呈现', () => {
+  it('历史仍有未加载切片时，不把那些回合的工具流追加到当前页末尾', () => {
+    const rows = build(
+      [user('one')],
+      [text('old', 'raw-old'), text('one', 'raw')],
+      {
+        hasUnloadedHistory: true,
+      },
+    );
+    expect(rows.map((row) => row.turnId)).toEqual(['one']);
+    const active = build([], [text('live', 'raw')], {
+      hasUnloadedHistory: true,
+      activeTurnId: 'live',
+    });
+    expect(active.map((row) => row.turnId)).toEqual(['live']);
+  });
+  it('尚未落盘用户的实时回合也只产生一个 owner，不另建 live 与 unmapped 出口', () => {
+    const rows = build([], [text('one', 'raw')], {
+      activeTurnId: 'one',
+      transientReply: '同一份累计回复',
+      calls: [tool('one')],
+    });
+    expect(rows).toHaveLength(1);
+    expect(rows[0].source).toBe('stream');
+    expect(rows[0].transientReply).toBe('');
+    expect(rows[0].calls).toHaveLength(1);
+  });
+  it('同一身份用户重复快照不增加回合，不丢用户正文', () => {
+    const rows = build([user('one'), user('one')], [text('one', 'raw')]);
+    expect(rows).toHaveLength(1);
+    expect(rows[0].messages).toHaveLength(1);
+    expect(rows[0].messages[0].role).toBe('user');
+  });
+  it('用原始 item 身份补齐旧前缀，最终合成消息不另占正文出口', () => {
+    const rows = build(
+      [user('one'), assistant('raw'), assistant('direct-codex:one:assistant')],
+      [text('one', 'raw')],
+    );
+    expect(rows).toHaveLength(1);
+    expect(rows[0].source).toBe('stream');
+    expect(rows[0].items).toHaveLength(1);
+    expect(rows[0].items[0].text).toBe('完整回复');
+  });
+  it('先关联完整历史再分页，首条可见 assistant 不会失去用户归属', () => {
+    const messages = [
+      user('old'),
+      assistant('old-raw'),
+      user('one'),
+      assistant('raw'),
+    ];
+    const rows = build(messages, [text('old', 'old-raw'), text('one', 'raw')], {
+      visibleMessages: messages.slice(3),
+    });
+    expect(rows.map((row) => row.turnId)).toEqual(['one']);
+    expect(rows[0].messages[0].messageId).toBe('direct-codex:one:user');
+  });
+  it('纯文本旧回合不挤占之后有工具的回合身份', () => {
+    const rows = build(
+      [user('old'), assistant('plain'), user('one'), assistant('raw')],
+      [text('one', 'raw')],
+      { calls: [tool('one')] },
+    );
+    expect(rows.map((row) => row.turnId)).toEqual(['old', 'one']);
+    expect(rows[0].source).toBe('messages');
+    expect(rows[0].calls).toEqual([]);
+    expect(rows[1].source).toBe('stream');
+  });
+  it('没有流的原始 assistant 与工具仍归属一个回合，输入输出保留', () => {
+    const rows = build([user('one'), assistant('raw')], [], {
+      calls: [tool('one')],
+    });
+    expect(rows).toHaveLength(1);
+    expect(rows[0].source).toBe('messages');
+    expect(rows[0].calls[0].detail.output).toBe('内容');
+  });
+  it('无法证明流覆盖历史时整轮回退，不能混画部分流与全文', () => {
+    const rows = build(
+      [user('one'), assistant('raw-a'), assistant('raw-b')],
+      [text('one', 'raw-b')],
+    );
+    expect(rows[0].source).toBe('messages');
+    expect(
+      rows[0].messages.filter((message) => message.role === 'assistant'),
+    ).toHaveLength(2);
+  });
+  it('不同回合的相同文字不是重复消息，不做文本去重', () => {
+    const rows = build(
+      [user('one'), assistant('raw-one'), user('two'), assistant('raw-two')],
+      [text('one', 'raw-one'), text('two', 'raw-two')],
+    );
+    expect(rows).toHaveLength(2);
+    expect(rows.every((row) => row.source === 'stream')).toBe(true);
+  });
+  it('乱序重复快照按 seq 排列且不增加 item', () => {
+    const first = text('one', 'a');
+    const last = text('one', 'b', 3);
+    const marker: TurnStreamItem = {
+      ...text('one', 'unused', 2),
+      kind: 'tool',
+      id: 'tool:one:call',
+      callId: 'call',
+    };
+    const rows = build([user('one')], [last, marker, first, first]);
+    expect(rows[0].items.map((item) => item.seq)).toEqual([1, 2, 3]);
+  });
+  it('无流活动回合的累计文本只属于该回合，持久 assistant 到达即接管', () => {
+    expect(
+      build([user('one')], [], {
+        activeTurnId: 'one',
+        transientReply: '回复',
+      })[0].transientReply,
+    ).toBe('回复');
+    expect(
+      build([user('one'), assistant('direct-codex:one:assistant')], [], {
+        activeTurnId: 'one',
+        transientReply: '回复',
+      })[0].transientReply,
+    ).toBe('');
+  });
+});
diff --git a/apps/ai-game-creator-shell/tests/windowsCommandPresentation.test.ts b/apps/ai-game-creator-shell/tests/windowsCommandPresentation.test.ts
new file mode 100644
index 000000000..03298a17a
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/windowsCommandPresentation.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from 'vitest';
+
+import type { GameCreatorDirectToolCall } from '../src/app/types';
+import {
+  toolCallInputText,
+  toolCallRowText,
+} from '../src/features/project-workspace/toolCallGroupPresentation';
+
+function commandCall(command: string): GameCreatorDirectToolCall {
+  return {
+    schemaVersion: 'agc-tool-call.v1',
+    id: 'command',
+    turnId: 'turn',
+    kind: 'command',
+    title: '执行命令',
+    summary: command.slice(0, 120),
+    status: 'completed',
+    startedAt: 1,
+    updatedAt: 2,
+    detail: { command, output: 'pwsh -Command output must stay unchanged' },
+  };
+}
+
+describe('Windows 命令卡片展示', () => {
+  it('从 WindowsApps 路径后的完整输入提取脚本，并解开 shlex 引号拼接', () => {
+    const script = `foreach ($f in @('game/package.json','game/vite.config.js','game/index.html','game/game.js')) { Write-Output "===== $f ====="; Get-Content -Raw $f }`;
+    const argument = "'" + script.replaceAll("'", "'\"'\"'") + "'";
+    const command = String.raw`"<absolute-path> Files\WindowsApps\Microsoft.PowerShell_7.6.6.0_x64__8wekyb3d8bbwe\pwsh.exe" -Command ${argument}`;
+    const call = commandCall(command);
+    expect(toolCallInputText(call)).toBe(script);
+    expect(toolCallRowText(call)).toBe(`${script.slice(0, 120)}…`);
+    expect(call.detail.command).toBe(command);
+    expect(call.detail.output).toBe('pwsh -Command output must stay unchanged');
+  });
+
+  it.each([
+    ['pwsh -Command Get-Date', 'Get-Date'],
+    [
+      'pwsh.exe -NoLogo -NoProfile -NonInteractive -Command "Get-Date"',
+      'Get-Date',
+    ],
+    [
+      String.raw`"C:\Program Files\PowerShell\7\pwsh.exe" -c 'Get-Date'`,
+      'Get-Date',
+    ],
+    ["POWERSHELL.EXE -ExecutionPolicy Bypass -Command 'Get-Date'", 'Get-Date'],
+    [
+      String.raw`pwsh -Command "Write-Output \"hello\"; Get-Content C:\game\a.txt"`,
+      String.raw`Write-Output "hello"; Get-Content C:\game\a.txt`,
+    ],
+    ["pwsh -Command 'Get-Date\nGet-Location'", 'Get-Date\nGet-Location'],
+    ["pwsh -Command 'Get-Date…", "'Get-Date…"],
+  ])('隐藏启动器：%s', (command, script) => {
+    expect(toolCallInputText(commandCall(command))).toBe(script);
+  });
+
+  it.each([
+    'npm run build',
+    'pwsh -File game/build.ps1',
+    'pwsh -EncodedCommand ZgBvAG8A',
+    'not-pwsh.exe -Command Get-Date',
+    'echo pwsh -Command Get-Date',
+    "bash -c 'echo hello'",
+  ])('保留非目标调用：%s', (command) => {
+    expect(toolCallInputText(commandCall(command))).toBe(command);
+  });
+
+  it('不改写 MCP 工具参数', () => {
+    const call = {
+      ...commandCall('pwsh -Command Get-Date'),
+      kind: 'mcp_tool' as const,
+    };
+    expect(toolCallInputText(call)).toBe('pwsh -Command Get-Date');
+  });
+});
diff --git a/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md b/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
new file mode 100644
index 000000000..5ad0563a5
--- /dev/null
+++ b/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
@@ -0,0 +1,10 @@
+# 对话回合唯一投影实施计划
+
+对应：[对话回合唯一投影](./【里程碑】对话回合唯一投影-2026-09-16.md)。
+
+1. 前端抽取纯回合呈现投影，完整历史关联后分页；删除旧的消息锚定/实时/未归属独立渲染分支。
+2. Rust 按 item 完成边界冲刷，段切换返回全部快照；收尾等待写任务，修正 upsert 与跨回合裁剪。
+3. 核对 MCP 输入输出与同状态更新，保留现有脱敏。
+4. 自审正常、失败、历史无流、分页和重复快照路径；只执行定向 tsc、cargo check、check:encoding、check:doc-index 与 git diff --check，不运行测试；按最新授权提交到本地，不推送。
+
+风险：旧流可能只有前缀或部分回合；只依据原始 item 身份补齐，不能靠长度比例推断。实机须重启 Rust 客户端后验收。回滚只撤销本次触及的实现片段，保留工作树原有样式和输入输出修改，不改用户项目数据。
diff --git a/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md b/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md
new file mode 100644
index 000000000..502f0f244
--- /dev/null
+++ b/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md
@@ -0,0 +1,26 @@
+# 对话回合唯一投影
+
+- Version: 1
+- Status: implemented-awaiting-runtime-acceptance
+- Date: 2026-09-16
+- Parent Spec: ../../technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
+
+## 范围与评审
+
+单里程碑修复回合展示和流写入的一致性；不改工具执行、鉴权或原始历史格式。结构评审确认：唯一 turn owner、item 顺序、历史身份与分页、失败保留、工具详情更新均有明确归属；无须新增数据库或迁移历史。没有身份的旧记录不得做位置猜配。
+
+## 验收
+
+1. 一个 turn 只有一个呈现入口，用户消息不丢失。
+2. item 增量、完成、持久化和回读保持相同身份与固定顺序。
+3. 工具输入输出保留，重复快照不重复渲染。
+4. TypeScript、最小 Cargo 检查、编码和 diff 检查通过；用户要求不运行测试，实机新回合/重开/分页验收待确认。
+
+依赖：既有项目历史和 v1 turn-stream / tool-calls DTO。未完成真实 UI 验收前不进入其它里程碑。
+
+## 当前证据
+
+- 定向 TypeScript 类型检查、`cargo check --locked --bin genarrative-ai-game-creator-shell`、编码检查、文档索引检查、`git diff --check` 通过。
+- 已补充回合归属、分页、重复快照、无流回退及 writer 完成/切段、持久快照单调性/跨回合裁剪用例；按用户要求未执行测试，不能作为已通过凭证。
+- 静态自审确认视图只剩统一回合列表，不再存在 mapped/unmapped/live 三个回合流出口；失败提示使用稳定 failure 身份。
+- 真实新回合、历史重开、分页、失败/中断、工具展开输入输出仍待重启原生客户端后验收；仅本地提交，不推送。
diff --git a/docs/project-memory/shared-memory/project-overview.md b/docs/project-memory/shared-memory/project-overview.md
index 311f8b2e3..1cff50897 100644
--- a/docs/project-memory/shared-memory/project-overview.md
+++ b/docs/project-memory/shared-memory/project-overview.md
@@ -51,6 +51,8 @@ SpacetimeDB crate、SDK、CLI / standalone 与生成 bindings 按 `2.8.3` 对齐
 
 ## AGC DirectProject 与 UI workflow
 
+- DirectProject 对话先在完整历史中按回合/原始 item 身份关联，再分页渲染；每个回合只有一个呈现入口。有流按 item `seq` 交替文本和工具，无流采用历史正文；禁止位置猜配或同时展示累计回复与 item 正文。流写入单调归并，收尾等待落盘任务，不按磁盘“最后一段”猜最终回复位置。详见 AGC 实施计划的“DirectProject 回合展示唯一归属”。
+
 - AGC 安装产品名统一为“陶泥儿”，由 Tauri `productName` 控制安装项、快捷方式与 EXE 产品描述；Windows 内置 Codex 安装到顶层 `coding-agent/win-x64/`，打包资源映射与运行时查找路径必须一致。内部可执行文件名与应用 identifier 保持稳定。
 
 - 新 Web 游戏为 `game/` 下的 npm + Vite + Phaser 4.2.1 工程，使用包导入且允许其它依赖；npm 预览与导出只读取 dist，运行素材需纳入构建。单 HTML → Phaser 迁移固定走 DirectProject：文件落盘后先用受控 `project.bootstrap` 在 `game` 执行无参数 `npm install`，再用支持相对 cwd 的 `project.verify` 构建并确认 `game/dist/index.html`，已有单 HTML/Godot 不通过 JSON Generator 伪装成 npm 工程。
diff --git a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
index 2bdeedb04..94665ca40 100644
--- a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
+++ b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
@@ -4,6 +4,17 @@
 
 `chat_with_game_creator_direct_codex` 必须携带 `projectPath`、`prompt`、稳定的 `clientTurnId` 和完整 `userItem`；`creationType` 与 `attachments` 按实际输入传递。Rust 通过 `projectPath` 解析项目身份，不接收额外 `projectId`。界面测试必须核对 `userItem` 的消息身份、角色、正文及附件内容，拒绝回合用例仍验证实际返回的错误原因。重开项目的历史恢复测试使用 `read_direct_project_history_slice` 的 canonical raw items 与 `hasMore`，首屏 `limit: 20`。资源图和生成任务的读取继续遵守原有工作台恢复逻辑，不因聊天断言失败延迟、关闭或改变它们。
 
+## 2026-09-16 DirectProject 回合展示唯一归属
+
+- 交付合同：实时消息、历史回读、工具详情与最终回复先归一为按 `clientTurnId` 唯一的回合，再渲染一次。用户消息始终保留；同一回合的正文、工具和耗时不能从消息、实时尾部、未归属尾部等多个出口重复展示。
+- 归属来自 `direct-codex:{clientTurnId}:{role}`、文本流中保留的原始 item ID，以及项目历史内明确用户记录之后的 assistant 记录。先在已加载的完整消息集合中关联，再做可见分页；持久历史继续通过 canonical item 切片懒加载，`hasMore` 为真时，未加载回合的工具流不得漂到当前页尾部。禁止将第 N 个有工具回合配给第 N 条用户消息，禁止按文本长度、标点或时间窗猜测归属。缺身份的旧记录保留，不猜造其与其它回合的关联。
+- 有回合流时正文与工具位置仅来自 item 边界与 `seq`，工具详情按该回合的 `callId` 关联；没有流时同一个回合容器显示历史消息与工具。整轮累计文本仅在活动回合尚无流和持久 assistant 时作兜底，不另建实时消息出口。
+- 同一文本 item 的更新保持位置不变，段切换、工具边界和回合结束冲刷节流内快照；完成事件必须提交完整 item 内容。回合收尾等待已提交的流写入完成，不用磁盘上偶然可见的最后一段推测最终回复身份。JSONL upsert 先合并旧快照，不能先删旧值再“归并”；跨回合保留按回合时间、回合内按 `seq`，不能用各回合从 1 开始的 `seq` 做全局新旧裁剪。
+- 工具输入来自 command / MCP arguments，输出来自 aggregatedOutput / output / result，均经过现有脱敏和长度约束。状态相同但详情更新不能被丢弃。
+- Thread Manager 的原始事件 `seq` 与展示事件的 `sequence` 分开保存，不能将订阅游标用作工具/文本快照的已消费序号。发送队列保存完整结构化输入，上传附件在 Rust 端经过现有校验后并入 canonical user item。
+- 不改变模型、工具执行权限、项目原始历史或业务数据，不进行远程写入。缺失的历史流不得通过删除用户消息隐藏，也不得将已有原始正文截断为流前缀。
+- 验收覆盖：新建回合、工具与文本交替、重复快照、最终落盘、失败/中断、历史重开、分页边界、无流历史及工具输入输出。静态检查不等于实机通过；按用户要求不运行测试时，真实事件/UI 验收单独标为待验证。
+
 ## 2026-09-15 DirectProject 长回合平台会话保活
 
 DirectProject 的生图、素材处理、构建和试玩可能跨越短生命周期 access token 的有效期。普通 `/api/*` 请求和 Codex app-server 已有 401 刷新路径，但 AGC 工具由 Rust 工具桥直接使用客户端当前会话，工具内部的 401 不会自动触发前端刷新。客户端在 DirectProject 回合处于 busy 状态时每 5 分钟调用现有 `requestPlatformSessionRefresh()`；刷新仍复用单飞请求、generation 校验和 native session 安装，不改变凭据来源，也不把 401 降级为成功。刷新失败保持静默，由原始 AGC 工具错误按现有鉴权失败合同返回，避免后台保活覆盖真实错误。
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 3081ffb1d..863b64fce 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -27,7 +27,7 @@
 - **状态单调**：同一 `id` 的每条快照按 `updatedAt` 合并落盘——`updatedAt` 更旧的快照不得覆盖更新的 `status` 与 `updatedAt`。逐条快照落盘与回合末整批落盘两条路径会并发竞争，后到的旧快照不能把已经 `completed` / `failed` 的卡片打回 `running`；`updatedAt` 相同时终态优先；`startedAt` 取最早的非零值（`item/completed` 不一定带 `startedAtMs`）。
 - `title` 是折叠态的一行标题，按 kind 固定：`command` → `执行命令`、`file_change` → `编辑 N 个文件`（N = changes 去重后数量）、其余见 kind 枚举。
 - `summary` 是折叠态标题后面的短摘要：命令取命令首行（截断 120 字符），`file_change` 取首个变更路径。`summary` 的每个来源（命令、变更路径、`tool`）都必须先脱敏再落盘。
-- `detail.command` / `detail.output` 各截断到 4000 字符。
+- `detail.command` 读取原生命令或 MCP `arguments`，`detail.output` 读取 `aggregatedOutput` / `output` / `result` / `error`；对象格式化为 JSON，先脱敏再各截断到 4000 字符。展开工具行分别显示“输入”“输出”。MCP 摘要保留工具名，不把 JSON 开头的 `{` 当成摘要。状态相同但详情变化也必须更新；完成快照缺少输入字段时保留开始快照的输入。
 - **路径形状**：`detail.changes[].path` 用**项目相对路径**（如 `game/src/x.ts`，分隔符统一成 `/`）；项目外的绝对路径落成 `<absolute-path>` 占位。任何情况下都不得写出项目根目录本身、用户家目录或绝对路径的原始值。
 - **必须脱敏**（落盘前统一走 `agent/direct_tool_calls.rs` 的 `sanitize_detail_text`，顺序：项目路径归一化 → `redact_absolute_path_tokens` → `redact_secret_tokens` → `sanitize_error_context`）：
   - 前缀型密钥沿用 `redact_secret_tokens`（`sk-…`、`tnr_sk_…`、`ghp_…`、`AKIA…`、`eyJ…` 等）；
@@ -55,10 +55,10 @@ toolCalls?: DirectTurnToolCall[] | null;
 - 历史文件缺失 → 返回空数组，不报错。
 - 单行损坏 → 逐行读字节并逐行解码，跳过该行继续，不整体失败；只有损坏字节与下一行黏成一行（例如写入被截断、缺失换行）时，被丢掉的也只是那**一行**，其后的合法记录必须继续读回（与 Codex item 流一样是"尽力而为"的展示数据，不是业务真相）。
 
-### 4. 前端合并与渲染（2026-09 修订：一回合一个折叠块）
+### 4. 前端合并与渲染（回合唯一归属，连续工具成块）
 
-- 加载对话时把回读结果按 `turnId` 归并进消息流：**同一回合的工具调用收成一个折叠块**，块插在该回合 **assistant 消息之前**（Codex 是「工具在上、答复在下」），同一回合内按 `startedAt` 升序。
-- 实时回合（`directCodexProductRuntime` 且 `activeDirectCodexTurnRef` 命中）时，块跟着事件增量更新；回合的 assistant 消息还没落盘时，块落在消息流末尾（下一条 assistant 消息一落盘，块就回到它之前），回合结束后由持久化数据接管（不出现重复块，同一 `id` 每条工具只渲染一行）。
+- 加载对话时按 `turnId` 归并为唯一回合容器，用户消息保留在该回合前部。有 `turn-stream.jsonl` 时，文本与工具按 item `seq` 交替，连续工具合为一块，遇到文本另起一块；没有流的历史回合才采用“工具块 + 历史正文”。
+- 实时与回读共用同一投影，正文、工具和耗时不另建实时/未归属渲染出口。先在完整历史按消息身份关联，再分页；禁止按第 N 个工具回合匹配第 N 条用户消息。详情通过当前回合 `callId` 关联；同项目回读与实时增量幂等合并，切项目清空旧状态。完整合同见 [AGC 实施计划](./【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md) 的“DirectProject 回合展示唯一归属”。
 - 块 DOM 与交互（对齐 Codex）：
 
 ```html
@@ -67,7 +67,7 @@ toolCalls?: DirectTurnToolCall[] | null;
           aria-label="已执行 2 个命令、1 个文件变更，用时 42秒">
     <span class="agent-tool-call-group-icon" aria-hidden="true"></span>
     <span class="agent-tool-call-group-summary">已执行 2 个命令、1 个文件变更</span>
-    <span class="agent-tool-call-group-time">14:20 → 14:21</span>
+    <span class="agent-tool-call-group-time">14:20:05 → 14:21:02</span>
     <span class="agent-tool-call-group-duration">用时 42秒</span>
     <svg class="agent-tool-call-group-chevron" aria-hidden="true"></svg>
   </button>
@@ -94,9 +94,11 @@ toolCalls?: DirectTurnToolCall[] | null;
 
 - 文案规则（按 kind，不允许自由发挥）：
   - 块头汇总按 kind 计数、顺序固定 `command → file_change → mcp_tool → web_search → context_compaction → other`，标签 `命令`/`文件变更`/`工具调用`/`联网搜索`/`上下文整理`/`其他操作`，形如 `已执行 5 个命令、2 个文件变更`；空集合不渲染块。
-  - 行文案：`command` → `已运行 {summary}`、`file_change` → `已编辑 {summary}`、`mcp_tool` → `已调用 {summary}`、`web_search` → `已搜索 {summary}`、`context_compaction` → `已整理上下文`、`other` → `已执行 {summary}`；`failed` 行加 `失败` 并用现有 `--platform-*` 错误色。
+  - 行文案：展示工具摘要，不重复添加动词前缀；`context_compaction` 固定为“整理上下文”。状态单独放在行尾（执行中 / 已执行 / 失败），`failed` 使用现有 `--platform-*` 错误色；已结束回合不因残留 `running` 快照显示“执行中”。
   - 耗时：单条工具 = `startedAt` → `updatedAt`，块头总用时 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。单条格式：`<1s` → `0.4s`、`<60s` → `12.3s`（整秒省略小数）、`≥60s` → `2m 5s`；块头格式：`42秒` / `4分钟` / `5分钟 45秒`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数），耗时为 0 时同样不显示 `0s`。
-  - 时间：块头显示该回合结束时间（`max(updatedAt)` 的本地 `HH:mm`）；同一回合能拿到用户消息时间（`updatedAt > 0`）时显示 `HH:mm → HH:mm`（发送 → 结束），取不到就只显示结束时间，不编造。展开态块尾再写一行 `结束于 HH:mm`。
+  - 时间：块头显示该回合结束时间（`max(updatedAt)` 的本地 `HH:mm:ss`）；同一回合能拿到用户消息时间（`updatedAt > 0`）时显示 `HH:mm:ss → HH:mm:ss`（发送 → 结束），取不到就只显示结束时间，不编造。
+  - 回合结束时间与耗时在正文下方右对齐；Direct 对话输入框提示统一为“描述你的想法，或 @ 引用素材”，引用按钮保留输入盒的 12px 内边距，不使用负边距贴边。
+  - Windows 命令展示：仅 `command` 卡片识别 `pwsh` / `powershell`（含完整路径、`.exe`、常见启动选项）的 `-Command` / `-c` 外层包装，摘要和展开输入只展示脚本正文，并解开单个 shell 参数的引用拼接。摘要优先读取已脱敏的 `detail.command`，再按首行 120 字符截断，避免历史摘要被可执行文件路径占满。无法识别的启动方式、`-File`、`-EncodedCommand`、普通命令和 MCP 输入原样展示；执行参数、持久化原文、脱敏和输出均不改变。
   - 调试属性：块与行都带 `data-duration-ms`（原始毫秒，无法计算时为空串）与稳定 `data-testid`（块 `agent-tool-call-group`、行 `agent-tool-call-row`）。
 - 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），块头与行都是按钮：`aria-label` = 汇总 / 行文案 + 耗时；默认折叠。
 - 输入框、消息气泡、消息列表滚动模型**不变**；块只是消息流里的一个块。

From 7a7a8417339ee50bc9b94b93e2ccf4519bfe3754 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 02:57:27 +0800
Subject: [PATCH 65/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=90=88?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9B=E7=8A=B6=E6=80=81=E5=B9=B6=E6=94=B6=E8=B5=B7?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E6=89=A7=E8=A1=8C=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

活动回合快照与Direct事件统一管理生命周期，避免历史终态回放恢复忙碌态

用户消息显示发送时间，历史信封保存时间并通过独立映射回读

完成后统一折叠中间输出和工具调用，最终回复与失败提示保持可见

同步回归用例与规范文档，保留原生实机验收待办
---
 .../src/agent/direct_project_history.rs       |  80 ++++-
 .../src/agent/direct_thread_manager.rs        |   1 +
 .../src-tauri/src/commands.rs                 |   8 +-
 apps/ai-game-creator-shell/src/App.tsx        | 338 +++++++++---------
 .../ProjectSupervisorView.tsx                 | 168 +++++----
 .../project-workspace/directThreadEvents.ts   | 117 +-----
 .../directTurnPresentation.ts                 |  65 +++-
 .../toolCallGroupPresentation.ts              |   1 +
 apps/ai-game-creator-shell/src/styles.css     |  28 ++
 .../tests/directThreadEvents.test.ts          |  39 ++
 .../tests/directTurnPresentation.test.ts      |  56 ++-
 ...【实施计划】对话回合唯一投影-2026-09-16.md |   2 +
 .../【里程碑】对话回合唯一投影-2026-09-16.md  |   7 +-
 .../shared-memory/project-overview.md         |   1 +
 ...�案】AI游戏创作智能体App实施计划-2026-06-24.md |   9 +-
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |   1 +
 16 files changed, 558 insertions(+), 363 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/tests/directThreadEvents.test.ts

diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_history.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_history.rs
index 24b3aed74..130c01549 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_history.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_project_history.rs
@@ -5,6 +5,7 @@ use crate::project::{
 };
 use crate::{LocalConversationMessageRecord, LocalConversationResult};
 use serde_json::Value;
+use std::collections::BTreeMap;
 use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Read, Seek, SeekFrom};
 use std::path::{Path, PathBuf};
@@ -91,6 +92,10 @@ fn record(item: &Value) -> Result<String, String> {
     serde_json::to_string(&serde_json::json!({
         "type": DIRECT_PROJECT_HISTORY_RECORD_TYPE,
         "payload": item,
+        "recordedAt": std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .map(|duration| duration.as_millis() as u64)
+            .unwrap_or(0),
     }))
     .map_err(|error| format!("序列化 DirectProject 历史失败：{error}"))
 }
@@ -470,6 +475,13 @@ fn direct_project_message_item(role: &str, content: &str, message_id: Option<&st
 }
 
 pub(crate) fn read_direct_project_history_items_at(root: &Path) -> Result<Vec<Value>, String> {
+    Ok(read_direct_project_history_entries_at(root)?
+        .into_iter()
+        .map(|(item, _)| item)
+        .collect())
+}
+
+fn read_direct_project_history_entries_at(root: &Path) -> Result<Vec<(Value, u64)>, String> {
     let path = history_path(root);
     if !prepare_game_creator_private_path_for_read(&path, false, "DirectProject 历史")? {
         return Ok(Vec::new());
@@ -507,7 +519,13 @@ pub(crate) fn read_direct_project_history_items_at(root: &Path) -> Result<Vec<Va
         if is_direct_project_internal_context_item(&item) {
             continue;
         }
-        items.push(item);
+        items.push((
+            item,
+            parsed
+                .get("recordedAt")
+                .and_then(Value::as_u64)
+                .unwrap_or(0),
+        ));
     }
     Ok(items)
 }
@@ -516,18 +534,30 @@ pub(crate) fn read_direct_project_history_items_slice_at(
     root: &Path,
     before_item_id: Option<&str>,
     limit: usize,
-) -> Result<(Vec<Value>, bool), String> {
-    let items = read_direct_project_history_items_at(root)?;
+) -> Result<(Vec<Value>, bool, BTreeMap<String, u64>), String> {
+    let items = read_direct_project_history_entries_at(root)?;
     let end = match before_item_id {
         Some(item_id) => items
             .iter()
-            .position(|item| item.get("id").and_then(Value::as_str) == Some(item_id))
+            .position(|(item, _)| item.get("id").and_then(Value::as_str) == Some(item_id))
             .ok_or_else(|| format!("DirectProject 历史中不存在 item：{item_id}"))?,
         None => items.len(),
     };
     let bounded_limit = limit.clamp(1, 200);
     let start = end.saturating_sub(bounded_limit);
-    Ok((items[start..end].to_vec(), start > 0))
+    let slice = &items[start..end];
+    let timestamps = slice
+        .iter()
+        .filter_map(|(item, at)| {
+            let id = item.get("id").and_then(Value::as_str)?;
+            (*at > 0).then(|| (id.to_string(), *at))
+        })
+        .collect();
+    Ok((
+        slice.iter().map(|(item, _)| item.clone()).collect(),
+        start > 0,
+        timestamps,
+    ))
 }
 
 pub(crate) fn read_direct_project_last_item_id_at(root: &Path) -> Result<Option<String>, String> {
@@ -546,10 +576,10 @@ pub(crate) fn read_direct_project_chat_history_at(
     root: &Path,
 ) -> Result<LocalConversationResult, String> {
     let path = history_path(root);
-    let items = read_direct_project_history_items_at(root)?;
+    let items = read_direct_project_history_entries_at(root)?;
     let messages = items
         .into_iter()
-        .filter_map(|item| {
+        .filter_map(|(item, recorded_at)| {
             let role = item.get("role").and_then(Value::as_str)?;
             if !matches!(role, "user" | "assistant") {
                 return None;
@@ -571,7 +601,7 @@ pub(crate) fn read_direct_project_chat_history_at(
                 content,
                 agent_id: None,
                 message_id: item.get("id").and_then(Value::as_str).map(str::to_string),
-                updated_at: 0,
+                updated_at: recorded_at,
             })
         })
         .collect();
@@ -610,6 +640,40 @@ mod tests {
     const RESPONSE_ITEM_ROW: &str = r#"{"type":"response_item","payload":{"type":"message","role":"user","id":"codex-item-2","content":[{"type":"input_text","text":"再加一个按钮"}]}}"#;
     const RESPONSE_ASSISTANT_ROW: &str = r#"{"type":"response_item","payload":{"type":"message","role":"assistant","content":[{"type":"output_text","text":"已完成"}]}}"#;
 
+    #[test]
+    fn history_timestamps_survive_reload_and_idempotent_append_without_changing_raw_items() {
+        let root = init_history_project("history-time");
+        let item = json!({
+            "type": "message", "role": "user", "id": "sent-message",
+            "content": [{"type": "input_text", "text": "修改游戏"}],
+        });
+        append_direct_project_user_message_at(root.path(), &item).unwrap();
+        let (items, _, timestamps) =
+            super::read_direct_project_history_items_slice_at(root.path(), None, 20).unwrap();
+        assert_eq!(items, vec![item.clone()]);
+        assert!(timestamps["sent-message"] > 0);
+        append_direct_project_user_message_at(root.path(), &item).unwrap();
+        let (_, _, reloaded) =
+            super::read_direct_project_history_items_slice_at(root.path(), None, 20).unwrap();
+        assert_eq!(timestamps, reloaded);
+    }
+
+    #[test]
+    fn old_history_without_envelope_time_stays_unknown() {
+        let root = init_history_project("history-unknown-time");
+        write_history_lines(root.path(), &[RESPONSE_ITEM_ROW]);
+        let (_, _, timestamps) =
+            super::read_direct_project_history_items_slice_at(root.path(), None, 20).unwrap();
+        assert!(timestamps.is_empty());
+        assert_eq!(
+            read_direct_project_chat_history_at(root.path())
+                .unwrap()
+                .messages[0]
+                .updated_at,
+            0
+        );
+    }
+
     /// 判据：争用类失败会被"有界退避重试"真的吃掉，最终把条目落一行。
     ///
     /// 注入标记是"让接下来 N 次单次尝试返回争用失败"；退避表只补一次重试，所以注入 1 次
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_thread_manager.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_thread_manager.rs
index 9f5adf8f9..e3bc497ea 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_thread_manager.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_thread_manager.rs
@@ -58,6 +58,7 @@ pub(crate) struct DirectThreadConsumeResult {
 pub(crate) struct DirectThreadHistorySlice {
     pub(crate) items: Vec<Value>,
     pub(crate) has_more: bool,
+    pub(crate) item_timestamps: std::collections::BTreeMap<String, u64>,
 }
 
 #[derive(Clone, Debug)]
diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index e95d51aa3..51b826f08 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -5373,12 +5373,16 @@ pub(crate) async fn read_direct_project_history_slice(
     tauri::async_runtime::spawn_blocking(move || {
         let root = Path::new(project_path.trim());
         enforce_project_permission_policy(root, "conversation.read")?;
-        let (items, has_more) = read_direct_project_history_items_slice_at(
+        let (items, has_more, item_timestamps) = read_direct_project_history_items_slice_at(
             root,
             before_item_id.as_deref(),
             limit.unwrap_or(20),
         )?;
-        Ok(DirectThreadHistorySlice { items, has_more })
+        Ok(DirectThreadHistorySlice {
+            items,
+            has_more,
+            item_timestamps,
+        })
     })
     .await
     .map_err(|error| format!("读取 DirectProject 历史切片后台任务失败：{error}"))?
diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index dcbfc49a3..f9803ec0c 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -55,7 +55,6 @@ import type {
   DesignClarificationRequest,
   DesignEvent,
   DesignView,
-  DirectActiveTurnView,
   DirectTurnCancelView,
   GameCreatorAgentRuntimeUpdateEvent,
   GameCreatorChatAgentReply,
@@ -137,6 +136,7 @@ import {
   submitProjectSupervisorRuntimeTask,
   taskRowsFromManifest,
 } from './features/agent-runtime';
+import { DIRECT_ACTIVE_TURNS_POLL_INTERVAL_MS } from './features/agent-runtime/directActiveTurns';
 import {
   type DirectCodexTurnAttachment,
   toDirectCodexTurnAttachments,
@@ -242,8 +242,7 @@ import {
   directThreadHistoryItemsToMessages,
   type DirectThreadHistorySlice,
   type DirectThreadSubscriptionBootstrap,
-  emptyDirectThreadReducerState,
-  reduceDirectThreadEvents,
+  isDirectTurnInProgress,
 } from './features/project-workspace/directThreadEvents';
 import type { DirectCodexUserContentPart } from './features/project-workspace/generated';
 import {
@@ -321,8 +320,6 @@ const DIRECT_CODEX_ANOTHER_TURN_RUNNING_ERROR_MARKER =
 const DIRECT_CODEX_RECOVERED_TURN_STALLED_MS = 15_000;
 const DIRECT_CODEX_RECOVERED_TURN_STALLED_NOTICE =
   '该回合已无响应，可在输入盒点「终止」结束它以继续';
-const DIRECT_CODEX_RECOVERED_TURN_STARTED_DETAIL =
-  '已恢复正在运行的回合，正在等待陶泥儿的最新进度';
 // Platform access tokens are short lived. DirectProject can spend several
 // minutes in image generation, build and browser validation, so keep the
 // client-owned native session current while a turn is running. The singleflight
@@ -414,9 +411,8 @@ function directCodexActivityDetail(
         case 'finalizing':
           return '正在整理结果';
         case 'completed':
-          return '正在提交回复';
         case 'failed':
-          return '正在记录失败原因';
+          return '';
         default:
           return '正在处理任务';
       }
@@ -449,11 +445,8 @@ function directCodexProcessDetail({
   activity?: string | null;
   status: string;
 }) {
-  if (status === 'completed') {
-    return '正在提交回复';
-  }
-  if (status === 'failed') {
-    return '正在记录失败原因';
+  if (status === 'completed' || status === 'failed') {
+    return '';
   }
   if (status === 'streaming') {
     return '正在生成回复';
@@ -960,9 +953,14 @@ export function App({
     turnId: string;
     lastSequence: number;
     receivedDirectUpdate: boolean;
+    restored?: boolean;
+  } | null>(null);
+  const directActiveSnapshotVersionRef = useRef(0);
+  const directTurnLifecycleRef = useRef<{
+    reset: () => void;
+    loadHistory: (projectPath: string) => Promise<void>;
+    restore: (projectPath: string) => Promise<void>;
   } | null>(null);
-  const directThreadSubscriptionIdRef = useRef<string | null>(null);
-  const directThreadReducerStateRef = useRef(emptyDirectThreadReducerState());
   const lastDirectCodexActivityRef = useRef<string | null>(null);
   /**
    * 重进会话后从 Rust 恢复出来的回合：只有在恢复后的第一个窗口内一直收不到事件，
@@ -1069,6 +1067,7 @@ export function App({
   }
 
   function resetDirectCodexTurn() {
+    directActiveSnapshotVersionRef.current += 1;
     clearRecoveredDirectCodexTurnWatch();
     activeDirectCodexTurnRef.current = null;
     lastDirectCodexActivityRef.current = null;
@@ -1128,10 +1127,12 @@ export function App({
    * 项目时前端 `activeDirectCodexTurnRef` 是空的——界面既不订阅这一轮的事件，也不显示
    * 过程卡，用户再发消息只会被守卫拒绝。这里把后端登记的回合读回来重新接管。
    *
-   * 只读探测，不改后端回合本身；探测失败（老二进制没有这个命令、路径读不到）等于没有
-   * 回合，不影响打开项目。
+   * 只读探测，不改后端回合本身；探测失败保留当前已知状态，不视为没有活动回合。
    */
-  async function restoreRunningDirectCodexTurn(projectPath: string) {
+  async function restoreRunningDirectCodexTurn(
+    projectPath: string,
+    reconcile = false,
+  ) {
     if (!directCodexProductRuntime || !projectPath) {
       return;
     }
@@ -1139,50 +1140,87 @@ export function App({
     if (!invoke) {
       return;
     }
-    // 本组件已经接管这个项目：`/history` 之类的重复读取不能把 lastSequence 归零。
-    if (activeDirectCodexTurnRef.current?.projectPath === projectPath) {
+    const owner = activeDirectCodexTurnRef.current;
+    const sequence = owner?.lastSequence;
+    const scopeVersion = projectScopeVersionRef.current;
+    if (!reconcile && owner?.projectPath === projectPath) {
       return;
     }
-    let activeView: DirectActiveTurnView | null = null;
+    const readVersion = ++directActiveSnapshotVersionRef.current;
+    let turns: GameCreatorDirectActiveTurn[];
     try {
-      activeView = await invoke<DirectActiveTurnView | null>(
-        'read_direct_codex_active_turn',
-        { projectPath },
+      turns = await invoke<GameCreatorDirectActiveTurn[]>(
+        'list_game_creator_direct_active_turns',
       );
     } catch {
+      // 读取失败不等于没有活动回合。
       return;
     }
-    const clientTurnId = activeView?.clientTurnId?.trim();
-    if (!clientTurnId) {
-      return;
-    }
+    if (!Array.isArray(turns)) return;
     if (
       localProjectPathRef.current !== projectPath ||
-      activeDirectCodexTurnRef.current?.projectPath === projectPath
+      planningV2ActiveRef.current ||
+      designAgentLaneRef.current ||
+      projectScopeVersionRef.current !== scopeVersion ||
+      directActiveSnapshotVersionRef.current !== readVersion ||
+      activeDirectCodexTurnRef.current !== owner ||
+      owner?.lastSequence !== sequence
     ) {
       return;
     }
-    activeDirectCodexTurnRef.current = {
-      projectPath,
-      turnId: clientTurnId,
-      // 与下面发起回合的两处赋值同形（`lastSequence: -1`）：Rust 侧 emitter 的 sequence
-      // 从 1 开始，所以恢复后到达的第一批事件不会被 sequence 过滤丢掉。
-      lastSequence: -1,
-      receivedDirectUpdate: false,
-    };
+    const activeView = turns.find(
+      (turn) =>
+        projectPathsMatchForInvalidation(turn.projectPath, projectPath) &&
+        isDirectTurnInProgress(turn.status),
+    );
+    if (!activeView || !isDirectTurnInProgress(activeView.status)) {
+      // 本地刚发送但尚未进入 Rust 的请求不能被空快照取消。
+      if (owner && !owner.restored && owner.lastSequence < 0) return;
+      resetDirectCodexTurn();
+      setChatAgentBusy(false);
+      if (owner && reconcile) {
+        void loadProjectConversation(projectPath, false, 'replace');
+      }
+      return;
+    }
+    const matchingOwner = owner?.turnId === activeView.turnId ? owner : null;
+    if (owner && !matchingOwner) {
+      if (!owner.restored && owner.lastSequence < 0) return;
+      resetDirectCodexTurn();
+    }
+    if (!matchingOwner) {
+      activeDirectCodexTurnRef.current = {
+        projectPath,
+        turnId: activeView.turnId,
+        lastSequence: -1,
+        receivedDirectUpdate: false,
+        restored: true,
+      };
+      setDirectCodexProcessKey(`${projectPath}\u0000${activeView.turnId}`);
+      setProjectSupervisorRuntimeError('');
+      watchRecoveredDirectCodexTurn(projectPath, activeView.turnId);
+    }
     setChatAgentBusy(true);
-    setDirectCodexStatus('running');
-    setDirectCodexProcessKey(`${projectPath}\u0000${clientTurnId}`);
-    setDirectCodexProgress(DIRECT_CODEX_RECOVERED_TURN_STARTED_DETAIL);
-    setDirectCodexProgressUpdatedAt(Date.now());
-    setDirectCodexTransientReply('');
-    setDirectCodexTransientReasoning('');
-    directCodexTransientReplyRef.current = '';
-    setDirectCodexTransientReplyUpdatedAt(null);
-    setProjectSupervisorRuntimeError('');
-    watchRecoveredDirectCodexTurn(projectPath, clientTurnId);
+    // 活动快照不携带正文；已有实时进度不能被同序号的通用描述覆盖。
+    if (
+      !matchingOwner?.receivedDirectUpdate ||
+      activeView.sequence > matchingOwner.lastSequence
+    ) {
+      setDirectCodexStatus(activeView.status);
+      setDirectCodexProgress(
+        directCodexActivityDetail(activeView.activity, activeView.status),
+      );
+      setDirectCodexProgressUpdatedAt(activeView.updatedAt);
+    }
   }
 
+  directTurnLifecycleRef.current = {
+    reset: resetDirectCodexTurn,
+    loadHistory: (projectPath) =>
+      loadProjectConversation(projectPath, false, 'replace'),
+    restore: (projectPath) => restoreRunningDirectCodexTurn(projectPath, true),
+  };
+
   // 回合流（文本段 + 工具按**出现顺序**交替）：实时增量与回读历史共用一份状态，
   // 渲染顺序只由条目的 `seq` 决定，界面不再按文本长度 / 标点 / 时间窗猜切点。
   const [directTurnStream, setDirectTurnStream] = useState<TurnStreamItem[]>(
@@ -2306,15 +2344,10 @@ export function App({
             ? payload.updatedAt
             : Date.now();
         const processDetail = directCodexProcessDetail(payload);
-        if (payload.status === 'failed') {
-          activeDirectCodexTurnRef.current = null;
-          lastDirectCodexActivityRef.current = null;
-          setDirectCodexStatus(payload.status);
-          setDirectCodexProgress(processDetail);
-          setDirectCodexProgressUpdatedAt(updatedAt);
-          setDirectCodexTransientReply('');
-          setDirectCodexTransientReasoning('');
-          setDirectCodexTransientReplyUpdatedAt(null);
+        if (payload.status === 'failed' || payload.status === 'completed') {
+          directTurnLifecycleRef.current?.reset();
+          setChatAgentBusy(false);
+          void directTurnLifecycleRef.current?.loadHistory(payload.projectPath);
           return;
         }
         setDirectCodexStatus(payload.status);
@@ -2374,123 +2407,77 @@ export function App({
   useEffect(() => {
     const projectPath = localProject?.projectPath ?? null;
     const directInvoke = resolveTauriInvoke();
-    if (!directCodexProductRuntime || !projectPath || !directInvoke) {
-      directThreadSubscriptionIdRef.current = null;
-      directThreadReducerStateRef.current = emptyDirectThreadReducerState();
-      return;
-    }
+    if (!directCodexProductRuntime || !projectPath || !directInvoke) return;
     let disposed = false;
     let cleanup: (() => void) | null = null;
+    let subscriptionId: string | null = null;
+    let consuming = false;
+    let consumeAgain = false;
 
-    const applyReducerState = (
-      state: ReturnType<typeof emptyDirectThreadReducerState>,
-    ) => {
-      if (disposed) return;
-      directThreadReducerStateRef.current = state;
-      const running =
-        state.status === 'accepted' ||
-        state.status === 'running' ||
-        state.status === 'streaming' ||
-        state.status === 'finalizing';
-      setChatAgentBusy(running);
-      setDirectCodexStatus(state.status);
-      setDirectCodexProgress(state.progress);
-      setDirectCodexProgressUpdatedAt(Date.now());
-      if (state.accumulatedText) {
-        setDirectCodexTransientReply(state.accumulatedText);
-        directCodexTransientReplyRef.current = state.accumulatedText;
-        setDirectCodexTransientReplyUpdatedAt(Date.now());
-      } else {
-        setDirectCodexTransientReply('');
-        directCodexTransientReplyRef.current = '';
-        setDirectCodexTransientReplyUpdatedAt(null);
-      }
+    // Provider 原始事件只用于通知；运行状态始终取 client 回合快照和 Direct 事件。
+    const refreshActive = () => {
+      if (!disposed) void directTurnLifecycleRef.current?.restore(projectPath);
     };
-
     const bootstrap = async () => {
-      try {
-        const activeTurns = await directInvoke<GameCreatorDirectActiveTurn[]>(
-          'list_game_creator_direct_active_turns',
-        );
-        const activeTurn = activeTurns.find((turn) =>
-          projectPathsMatchForInvalidation(turn.projectPath, projectPath),
-        );
-        if (activeTurn && !activeDirectCodexTurnRef.current) {
-          activeDirectCodexTurnRef.current = {
-            projectPath,
-            turnId: activeTurn.turnId,
-            lastSequence: -1,
-            receivedDirectUpdate: true,
-          };
-          setDirectCodexProcessKey(`${projectPath}\\u0000${activeTurn.turnId}`);
-          setChatAgentBusy(true);
-          setDirectCodexStatus('running');
-          setDirectCodexProgress('正在处理');
-          setDirectCodexProgressUpdatedAt(Date.now());
-        }
-      } catch {
-        // 订阅 bootstrap 仍是恢复事实源；快照失败不能被改写成“没有在跑”。
-      }
       const result = await directInvoke<DirectThreadSubscriptionBootstrap>(
         'subscribe_direct_project_thread',
         { projectPath },
       );
       if (disposed) return;
-      directThreadSubscriptionIdRef.current = result.subscriptionId;
-      const state = reduceDirectThreadEvents(
-        result.events,
-        emptyDirectThreadReducerState(),
-      );
-      applyReducerState(state);
-      if (state.turnId && !activeDirectCodexTurnRef.current) {
-        activeDirectCodexTurnRef.current = {
-          projectPath,
-          turnId: state.turnId,
-          // Thread Manager 的 seq 与回合展示事件的 sequence 是两个独立序列。
-          lastSequence: -1,
-          receivedDirectUpdate: true,
-        };
-        setDirectCodexProcessKey(`${projectPath}\u0000${state.turnId}`);
-      }
+      subscriptionId = result.subscriptionId;
+      refreshActive();
     };
-
     const consume = async () => {
-      const subscriptionId = directThreadSubscriptionIdRef.current;
       if (!subscriptionId || disposed) return;
+      if (consuming) {
+        consumeAgain = true;
+        return;
+      }
+      consuming = true;
       try {
-        const result = await directInvoke<DirectThreadConsumeResult>(
-          'consume_direct_project_thread',
-          { subscriptionId },
-        );
-        if (disposed) return;
-        const state = reduceDirectThreadEvents(
-          result.events,
-          directThreadReducerStateRef.current,
-        );
-        applyReducerState(state);
+        do {
+          consumeAgain = false;
+          const result = await directInvoke<DirectThreadConsumeResult>(
+            'consume_direct_project_thread',
+            { subscriptionId },
+          );
+          if (disposed) return;
+          if (
+            result.events.some(
+              (event) =>
+                event.type === 'turn.started' ||
+                event.type === 'turn.completed',
+            )
+          ) {
+            refreshActive();
+          }
+          if (
+            result.events.some((event) => event.type === 'turn.completed') &&
+            !activeDirectCodexTurnRef.current?.receivedDirectUpdate
+          ) {
+            // 重进时若未接到 Direct 结束事件，原始 item 的落盘通知仍可补齐最终回复。
+            void directTurnLifecycleRef.current?.loadHistory(projectPath);
+          }
+        } while (consumeAgain && !disposed);
       } catch (error) {
-        if (String(error).includes('SUBSCRIPTION_EXPIRED')) {
-          directThreadSubscriptionIdRef.current = null;
+        if (!disposed && String(error).includes('SUBSCRIPTION_EXPIRED')) {
+          subscriptionId = null;
           try {
             await bootstrap();
           } catch {
-            // A later project activation or notification will retry bootstrap.
+            /* 活动快照轮询仍然有效。 */
           }
         }
+      } finally {
+        consuming = false;
       }
     };
-
     const setup = async () => {
       try {
         const unlisten = await subscribeTauriEvent<{ subscriptionId: string }>(
           'game-creator-direct-thread-notify',
           (event) => {
-            if (
-              event.payload.subscriptionId ===
-              directThreadSubscriptionIdRef.current
-            ) {
-              void consume();
-            }
+            if (event.payload.subscriptionId === subscriptionId) void consume();
           },
         );
         if (disposed) {
@@ -2499,15 +2486,21 @@ export function App({
         }
         cleanup = unlisten;
         await bootstrap();
+        await consume();
       } catch {
-        // The history view remains usable when the runtime subscription is unavailable.
+        // 历史仍可使用；订阅失败不伪造忙碌态。
       }
     };
+    refreshActive();
+    const timer = window.setInterval(
+      refreshActive,
+      DIRECT_ACTIVE_TURNS_POLL_INTERVAL_MS,
+    );
     void setup();
     return () => {
       disposed = true;
       cleanup?.();
-      directThreadSubscriptionIdRef.current = null;
+      window.clearInterval(timer);
     };
   }, [directCodexProductRuntime, localProject?.projectPath]);
 
@@ -4118,7 +4111,10 @@ export function App({
               return {
                 path: nextProjectPath,
                 agentId: null,
-                messages: directThreadHistoryItemsToMessages(slice.items),
+                messages: directThreadHistoryItemsToMessages(
+                  slice.items,
+                  slice.itemTimestamps,
+                ),
               } satisfies LocalConversationResult;
             });
           })()
@@ -7211,9 +7207,6 @@ export function App({
             setMessages((current) =>
               appendDirectAssistantMessage(current, reply),
             );
-            setDirectCodexStatus('finalizing');
-            setDirectCodexProgress('正在同步项目文件');
-            setDirectCodexProgressUpdatedAt(Date.now());
             await refreshDirectProjectManifest(directProjectPath);
           }
         } catch (error) {
@@ -7291,21 +7284,19 @@ export function App({
               await refreshManifest(directProjectPath);
             }
           } finally {
-            setChatAgentBusy(false);
-            setDirectCodexTurnCancelling(false);
-            setDirectCodexProgress('');
-            setDirectCodexStatus(null);
-            setDirectCodexProgressUpdatedAt(null);
             const activeTurn = activeDirectCodexTurnRef.current;
             if (
-              !activeTurn ||
-              (activeTurn.projectPath === directProjectPath &&
-                activeTurn.turnId === clientTurnId)
+              localProjectPathRef.current === directProjectPath &&
+              (!activeTurn ||
+                (activeTurn.projectPath === directProjectPath &&
+                  activeTurn.turnId === clientTurnId))
             ) {
+              setChatAgentBusy(false);
+              setDirectCodexTurnCancelling(false);
               resetDirectCodexTurn();
+              // 只有当前回合的收尾才能释放发送队列，不能覆盖后来启动的回合。
+              dispatchNextQueuedChatTurn();
             }
-            // 队列：本回合确实结束后，按 FIFO 自动发出下一条（不丢、不乱序）。
-            dispatchNextQueuedChatTurn();
           }
         }
         return;
@@ -12492,18 +12483,19 @@ export function App({
           if (localProjectPathRef.current !== projectPath) {
             return;
           }
-          const older = directThreadHistoryItemsToMessages(slice.items).map(
-            (message) => ({
-              role:
-                message.role === 'user'
-                  ? ('user' as const)
-                  : ('assistant' as const),
-              text: message.content,
-              runtimeOwned: true,
-              messageId: message.messageId,
-              updatedAt: message.updatedAt,
-            }),
-          );
+          const older = directThreadHistoryItemsToMessages(
+            slice.items,
+            slice.itemTimestamps,
+          ).map((message) => ({
+            role:
+              message.role === 'user'
+                ? ('user' as const)
+                : ('assistant' as const),
+            text: message.content,
+            runtimeOwned: true,
+            messageId: message.messageId,
+            updatedAt: message.updatedAt,
+          }));
           setMessages((current) => [...older, ...current]);
           setConversationVisibleCount((current) => current + older.length);
           setDirectHistoryHasMore(slice.hasMore);
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 ed6a0f30f..df18ec4e2 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
@@ -58,7 +58,9 @@ import {
 } from './DesignAgentSurface';
 import {
   buildDirectTurnPresentations,
+  directMessageTimestamp,
   type DirectTurnPresentation,
+  splitDirectTurnContent,
 } from './directTurnPresentation';
 import { PlanGddSurface } from './GddApprovalCard';
 import {
@@ -75,7 +77,10 @@ import {
 } from './ResourceReferenceInput';
 import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 import { ToolCallGroup } from './ToolCallGroup';
-import { formatTurnDuration } from './toolCallGroupPresentation';
+import {
+  formatClockTime,
+  formatTurnDuration,
+} from './toolCallGroupPresentation';
 
 /** 相邻的工具流项合并成一个块；中间夹了文本段就另起一块。 */
 type TurnStreamToolRun = {
@@ -397,8 +402,7 @@ export function ProjectSupervisorView({
     setApprovalOpen(false);
     setApprovalNotice('');
   }, [settingsOpen]);
-  const runBusy =
-    runtimePanelProps.controlBusy || Boolean(directProcessDetail) || submitting;
+  const runBusy = runtimePanelProps.controlBusy || submitting;
   const directTurns = directCodex
     ? buildDirectTurnPresentations({
         messages: conversationMessages,
@@ -433,26 +437,39 @@ export function ProjectSupervisorView({
       </p>
     );
   };
-  const renderMessage = (message: ChatMessage, index: number) => (
-    <div
-      key={message.messageId ?? `${message.role}-${index}`}
-      className={`message message--${message.role}`}
-    >
-      <ChatMarkdownMessage
-        role={message.role}
-        text={projectSupervisorChatMessageText(message)}
-      />
-      {showDesignReasoning && message.reasoningText ? (
-        <details
-          className="design-agent-reasoning"
-          aria-label="策划 Agent 思考过程"
-        >
-          <summary>思考过程</summary>
-          <pre>{message.reasoningText}</pre>
-        </details>
-      ) : null}
-    </div>
-  );
+  const renderMessage = (message: ChatMessage, index: number) => {
+    const sentAt =
+      message.role === 'user' ? directMessageTimestamp(message.updatedAt) : 0;
+    return (
+      <div
+        key={message.messageId ?? `${message.role}-${index}`}
+        className={`message message--${message.role}`}
+      >
+        <ChatMarkdownMessage
+          role={message.role}
+          text={projectSupervisorChatMessageText(message)}
+        />
+        {sentAt > 0 ? (
+          <time
+            className="message-sent-at"
+            dateTime={new Date(sentAt).toISOString()}
+            title={`发送于 ${new Date(sentAt).toLocaleString('zh-CN', { hour12: false })}`}
+          >
+            {formatClockTime(sentAt)}
+          </time>
+        ) : null}
+        {showDesignReasoning && message.reasoningText ? (
+          <details
+            className="design-agent-reasoning"
+            aria-label="策划 Agent 思考过程"
+          >
+            <summary>思考过程</summary>
+            <pre>{message.reasoningText}</pre>
+          </details>
+        ) : null}
+      </div>
+    );
+  };
 
   const submitButton = (
     <button
@@ -559,21 +576,19 @@ export function ProjectSupervisorView({
             </div>
           ) : null}
           {directCodex
-            ? directTurns.map((turn) => (
-                <Fragment key={turn.key}>
-                  {turn.messages
-                    .filter((message) => message.role === 'user')
-                    .map(renderMessage)}
-                  {turn.source === 'stream' ? (
-                    <>
-                      <TurnStreamSequence
-                        items={turn.items}
-                        toolCalls={turn.calls}
-                        active={turn.active}
-                        userSentAt={turn.startedAt}
-                      />
-                      {turn.notices.map(renderMessage)}
-                    </>
+            ? directTurns.map((turn) => {
+                const content = splitDirectTurnContent(turn);
+                const renderStream = (items: TurnStreamItem[]) => (
+                  <TurnStreamSequence
+                    items={items}
+                    toolCalls={turn.calls}
+                    active={turn.active}
+                    userSentAt={turn.startedAt}
+                  />
+                );
+                const process =
+                  turn.source === 'stream' ? (
+                    renderStream(content.processItems)
                   ) : (
                     <>
                       {turn.calls.length > 0 ? (
@@ -584,28 +599,59 @@ export function ProjectSupervisorView({
                           className="message-tool-call"
                         />
                       ) : null}
-                      {turn.messages
-                        .filter((message) => message.role !== 'user')
-                        .map(renderMessage)}
-                      {turn.transientReply ? (
-                        <div
-                          className="message message--assistant"
-                          aria-label="陶泥儿实时回复"
-                          aria-live="polite"
-                          data-runtime-owned="true"
-                        >
-                          <ChatMarkdownMessage
-                            role="assistant"
-                            text={turn.transientReply}
-                            streaming
-                          />
-                        </div>
-                      ) : null}
+                      {content.processMessages.map(renderMessage)}
                     </>
-                  )}
-                  {renderTurnUsage(turn)}
-                </Fragment>
-              ))
+                  );
+                const hasProcess =
+                  turn.source === 'stream'
+                    ? content.processItems.length > 0
+                    : turn.calls.length > 0 ||
+                      content.processMessages.length > 0;
+                return (
+                  <Fragment key={turn.key}>
+                    {turn.messages
+                      .filter((message) => message.role === 'user')
+                      .map(renderMessage)}
+                    {turn.active ? (
+                      process
+                    ) : hasProcess ? (
+                      <details
+                        className="message-turn-process"
+                        data-testid="turn-process"
+                        data-turn-id={turn.turnId}
+                      >
+                        <summary>执行过程</summary>
+                        <div className="message-turn-process-body">
+                          {process}
+                        </div>
+                      </details>
+                    ) : null}
+                    {turn.source === 'stream' ? (
+                      <>
+                        {renderStream(content.finalItems)}
+                        {turn.notices.map(renderMessage)}
+                      </>
+                    ) : (
+                      content.finalMessages.map(renderMessage)
+                    )}
+                    {turn.transientReply ? (
+                      <div
+                        className="message message--assistant"
+                        aria-label="陶泥儿实时回复"
+                        aria-live="polite"
+                        data-runtime-owned="true"
+                      >
+                        <ChatMarkdownMessage
+                          role="assistant"
+                          text={turn.transientReply}
+                          streaming
+                        />
+                      </div>
+                    ) : null}
+                    {renderTurnUsage(turn)}
+                  </Fragment>
+                );
+              })
             : visibleMessages.map(renderMessage)}
           {directCodex && transientReasoning ? (
             <details
@@ -719,7 +765,9 @@ export function ProjectSupervisorView({
           />
         ) : null}
         {directCodex &&
-        (runtimePanelProps.controlBusy || Boolean(directProcessDetail)) ? (
+        directStatus !== 'completed' &&
+        directStatus !== 'failed' &&
+        (runtimePanelProps.controlBusy || Boolean(activeTurnId)) ? (
           <section
             className={`project-supervisor-process-card${runtimePanelProps.controlBusy ? ' is-active' : ''}`}
             aria-label="陶泥儿执行过程"
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/directThreadEvents.ts b/apps/ai-game-creator-shell/src/features/project-workspace/directThreadEvents.ts
index dfcc7d117..6c1cad229 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/directThreadEvents.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/directThreadEvents.ts
@@ -21,10 +21,12 @@ export type DirectThreadConsumeResult = {
 export type DirectThreadHistorySlice = {
   items: unknown[];
   hasMore: boolean;
+  itemTimestamps?: Record<string, number>;
 };
 
 export function directThreadHistoryItemsToMessages(
   items: unknown[],
+  itemTimestamps: Readonly<Record<string, number>> = {},
 ): LocalConversationMessageRecord[] {
   return items.flatMap((raw) => {
     if (!raw || typeof raw !== 'object') return [];
@@ -51,113 +53,20 @@ export function directThreadHistoryItemsToMessages(
         content,
         agentId: null,
         messageId,
-        updatedAt: 0,
+        updatedAt: messageId ? (itemTimestamps[messageId] ?? 0) : 0,
       },
     ];
   });
 }
 
-export type DirectThreadReducerState = {
-  lastSeq: number;
-  turnId: string | null;
-  status:
-    | 'accepted'
-    | 'running'
-    | 'streaming'
-    | 'finalizing'
-    | 'completed'
-    | 'failed'
-    | null;
-  activeItemIds: Set<string>;
-  accumulatedText: string;
-  progress: string;
-};
-
-export const emptyDirectThreadReducerState = (): DirectThreadReducerState => ({
-  lastSeq: 0,
-  turnId: null,
-  status: null,
-  activeItemIds: new Set(),
-  accumulatedText: '',
-  progress: '',
-});
-
-function itemType(event: DirectThreadRawEvent) {
-  const value = event.payload.itemType;
-  return typeof value === 'string' ? value : '';
-}
-
-function activityDetail(type: string) {
-  switch (type) {
-    case 'mcpToolCall':
-      return '正在调用工具';
-    case 'commandExecution':
-      return '正在执行命令';
-    case 'fileChange':
-      return '正在写入文件';
-    case 'webSearch':
-      return '正在搜索资料';
-    case 'contextCompaction':
-      return '正在整理上下文';
-    default:
-      return '正在处理';
-  }
-}
-
-export function reduceDirectThreadEvent(
-  state: DirectThreadReducerState,
-  event: DirectThreadRawEvent,
-): DirectThreadReducerState {
-  if (!Number.isSafeInteger(event.seq) || event.seq <= state.lastSeq) {
-    return state;
-  }
-  const next: DirectThreadReducerState = {
-    ...state,
-    lastSeq: event.seq,
-    turnId: event.turnId || state.turnId,
-    activeItemIds: new Set(state.activeItemIds),
-  };
-  switch (event.type) {
-    case 'turn.started':
-      next.status = 'running';
-      next.progress = '正在处理';
-      next.accumulatedText = '';
-      next.activeItemIds = new Set();
-      break;
-    case 'item.started':
-      if (event.itemId) next.activeItemIds.add(event.itemId);
-      next.status = 'running';
-      next.progress = activityDetail(itemType(event));
-      break;
-    case 'item.delta': {
-      const delta = event.payload.delta;
-      if (typeof delta === 'string' && delta) {
-        next.accumulatedText += delta;
-        next.status = 'streaming';
-        next.progress = '正在生成回复';
-      }
-      break;
-    }
-    case 'item.completed':
-      if (event.itemId) next.activeItemIds.delete(event.itemId);
-      if (next.status === null) next.status = 'running';
-      break;
-    case 'turn.completed': {
-      const status = event.payload.status;
-      next.status = status === 'completed' ? 'completed' : 'failed';
-      next.progress =
-        status === 'completed' ? '正在提交回复' : '正在记录失败原因';
-      break;
-    }
-    default:
-      break;
-  }
-  return next;
-}
-
-export function reduceDirectThreadEvents(
-  events: DirectThreadRawEvent[],
-  initial = emptyDirectThreadReducerState(),
-) {
-  return events.reduce(reduceDirectThreadEvent, initial);
+/** 只有这些状态表示仍持有活动回合；Provider 回放的终态不是活动快照。 */
+export function isDirectTurnInProgress(
+  status: string | null | undefined,
+): status is 'accepted' | 'running' | 'streaming' | 'finalizing' {
+  return (
+    status === 'accepted' ||
+    status === 'running' ||
+    status === 'streaming' ||
+    status === 'finalizing'
+  );
 }
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
index 03655588b..217646a9f 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/directTurnPresentation.ts
@@ -26,12 +26,51 @@ export type DirectTurnPresentation = {
   endedAt: number;
 };
 
-function milliseconds(value: number | undefined) {
-  return value && Number.isFinite(value) && value > 0
-    ? value < 100_000_000_000
-      ? value * 1000
-      : value
-    : 0;
+export function directMessageTimestamp(value: number | undefined) {
+  const timestamp =
+    value && Number.isFinite(value) && value > 0
+      ? value < 100_000_000_000
+        ? value * 1000
+        : value
+      : 0;
+  return Number.isFinite(new Date(timestamp).getTime()) ? timestamp : 0;
+}
+
+/** 从唯一呈现来源分区，完成后只把最终回复及失败提示留在过程折叠区之外。 */
+export function splitDirectTurnContent(turn: DirectTurnPresentation) {
+  const assistants = turn.messages.filter(
+    (message) => message.role === 'assistant',
+  );
+  const isFailureMessage = (message: ChatMessage) =>
+    Boolean(
+      message.messageId?.endsWith(':failure') &&
+        directConversationTurnId(message.messageId),
+    );
+  const isFailureItem = (item: TurnStreamItem) =>
+    item.id === `text:${turn.turnId}:failure`;
+  const failed =
+    assistants.some(isFailureMessage) || turn.items.some(isFailureItem);
+  const lastText =
+    !turn.active && !failed
+      ? turn.items
+          .filter((item) => item.kind === 'text' && item.text.trim())
+          .at(-1)
+      : undefined;
+  const lastMessage = !turn.active && !failed ? assistants.at(-1) : undefined;
+  return {
+    processItems: turn.items.filter(
+      (item) => item !== lastText && !isFailureItem(item),
+    ),
+    finalItems: turn.items.filter(
+      (item) => item === lastText || isFailureItem(item),
+    ),
+    processMessages: assistants.filter(
+      (message) => message !== lastMessage && !isFailureMessage(message),
+    ),
+    finalMessages: assistants.filter(
+      (message) => message === lastMessage || isFailureMessage(message),
+    ),
+  };
 }
 
 /** 完整历史先按身份归属，再决定可见回合；渲染层只消费这一个列表。 */
@@ -207,16 +246,18 @@ export function buildDirectTurnPresentations({
     const starts = [
       ...row.messages
         .filter((message) => message.role === 'user')
-        .map((message) => milliseconds(message.updatedAt)),
-      ...row.items.map((item) => milliseconds(item.at)),
-      ...row.calls.map((call) => milliseconds(call.startedAt)),
+        .map((message) => directMessageTimestamp(message.updatedAt)),
+      ...row.items.map((item) => directMessageTimestamp(item.at)),
+      ...row.calls.map((call) => directMessageTimestamp(call.startedAt)),
     ].filter((at) => at > 0);
     row.startedAt = starts.length ? Math.min(...starts) : 0;
     row.endedAt = Math.max(
       0,
-      ...row.messages.map((message) => milliseconds(message.updatedAt)),
-      ...row.items.map((item) => milliseconds(item.updatedAt)),
-      ...row.calls.map((call) => milliseconds(call.updatedAt)),
+      ...row.messages.map((message) =>
+        directMessageTimestamp(message.updatedAt),
+      ),
+      ...row.items.map((item) => directMessageTimestamp(item.updatedAt)),
+      ...row.calls.map((call) => directMessageTimestamp(call.updatedAt)),
     );
   }
   return [...rows.values()].filter(
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
index 417277bfd..8dfa433df 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/toolCallGroupPresentation.ts
@@ -275,6 +275,7 @@ export function formatClockTime(timestamp: number | null | undefined) {
     return null;
   }
   const date = new Date(timestamp);
+  if (!Number.isFinite(date.getTime())) return null;
   const hours = String(date.getHours()).padStart(2, '0');
   const minutes = String(date.getMinutes()).padStart(2, '0');
   const seconds = String(date.getSeconds()).padStart(2, '0');
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 6c97e3718..ec4faaf54 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -12148,6 +12148,34 @@ button.design-workspace-tree__entry:hover,
   margin-top: 14px;
 }
 
+/* 发送时间与完成后的过程区沿用对话面板的次要信息样式。 */
+.message-sent-at {
+  display: block;
+  margin-top: 4px;
+  color: var(--platform-text-soft);
+  font-size: 11px;
+  text-align: right;
+  font-variant-numeric: tabular-nums;
+}
+
+.message-turn-process {
+  min-width: 0;
+}
+
+.message-turn-process > summary {
+  padding: 6px 0;
+  color: var(--platform-text-soft);
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.message-turn-process-body {
+  display: grid;
+  gap: 12px;
+  min-width: 0;
+  padding-top: 8px;
+}
+
 /* 整轮会话的结束时间与耗时：比消息本身更轻，属于轮次级信息。 */
 .game-workbench-chat
   .project-supervisor-surface.is-direct-codex
diff --git a/apps/ai-game-creator-shell/tests/directThreadEvents.test.ts b/apps/ai-game-creator-shell/tests/directThreadEvents.test.ts
new file mode 100644
index 000000000..128cdf135
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/directThreadEvents.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  directThreadHistoryItemsToMessages,
+  isDirectTurnInProgress,
+} from '../src/features/project-workspace/directThreadEvents';
+
+describe('Direct 回合状态与历史时间', () => {
+  it('终态和空状态不恢复为活动回合', () => {
+    for (const status of [
+      'completed',
+      'failed',
+      'interrupted',
+      null,
+      undefined,
+    ]) {
+      expect(isDirectTurnInProgress(status)).toBe(false);
+    }
+    for (const status of ['accepted', 'running', 'streaming', 'finalizing']) {
+      expect(isDirectTurnInProgress(status)).toBe(true);
+    }
+  });
+  it('按消息 id 读取信封时间，旧记录不使用当前时间补造', () => {
+    const items = [
+      {
+        type: 'message',
+        role: 'user',
+        id: 'direct-codex:turn:user',
+        content: [{ type: 'input_text', text: '帮我修改游戏' }],
+      },
+    ];
+    const timestamps = { 'direct-codex:turn:user': 1_800_000_000_001 };
+    expect(
+      directThreadHistoryItemsToMessages(items, timestamps)[0]?.updatedAt,
+    ).toBe(1_800_000_000_001);
+    expect(directThreadHistoryItemsToMessages(items)[0]?.updatedAt).toBe(0);
+    expect(items[0]).not.toHaveProperty('recordedAt');
+  });
+});
diff --git a/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts b/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
index 9352f8134..74d8c8426 100644
--- a/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
+++ b/apps/ai-game-creator-shell/tests/directTurnPresentation.test.ts
@@ -5,7 +5,11 @@ import type {
   GameCreatorDirectToolCall,
   TurnStreamItem,
 } from '../src/app/types';
-import { buildDirectTurnPresentations } from '../src/features/project-workspace/directTurnPresentation';
+import {
+  buildDirectTurnPresentations,
+  directMessageTimestamp,
+  splitDirectTurnContent,
+} from '../src/features/project-workspace/directTurnPresentation';
 
 const user = (turn: string): ChatMessage => ({
   role: 'user',
@@ -158,6 +162,56 @@ describe('DirectProject 回合唯一呈现', () => {
     const rows = build([user('one')], [last, marker, first, first]);
     expect(rows[0].items.map((item) => item.seq)).toEqual([1, 2, 3]);
   });
+  it('完成后中间文本和工具进入过程，最终回复独立且分区不重复', () => {
+    const marker: TurnStreamItem = {
+      ...text('one', 'unused', 2),
+      kind: 'tool',
+      id: 'tool:one:call',
+      callId: 'call',
+    };
+    const row = build(
+      [user('one')],
+      [text('one', 'start'), marker, text('one', 'final', 3)],
+    )[0];
+    const parts = splitDirectTurnContent(row);
+    expect(parts.processItems.map((item) => item.id)).toEqual([
+      'text:one:start',
+      'tool:one:call',
+    ]);
+    expect(parts.finalItems.map((item) => item.id)).toEqual(['text:one:final']);
+    const active = splitDirectTurnContent({ ...row, active: true });
+    expect(active.processItems).toHaveLength(3);
+    expect(active.finalItems).toEqual([]);
+  });
+  it('失败回合保留失败提示，不把末尾过程文本提升为最终回复', () => {
+    const row = build(
+      [user('one'), assistant('direct-codex:one:failure', '失败')],
+      [text('one', 'progress'), { ...text('one', 'failure', 2), text: '失败' }],
+    )[0];
+    const parts = splitDirectTurnContent(row);
+    expect(parts.processItems.map((item) => item.id)).toEqual([
+      'text:one:progress',
+    ]);
+    expect(parts.finalItems.map((item) => item.id)).toEqual([
+      'text:one:failure',
+    ]);
+  });
+  it('无流历史只保留最后一条回复，发送时间不从工具推断', () => {
+    const row = build(
+      [user('one'), assistant('progress'), assistant('final')],
+      [],
+    )[0];
+    const parts = splitDirectTurnContent(row);
+    expect(parts.processMessages.map((message) => message.messageId)).toEqual([
+      'progress',
+    ]);
+    expect(parts.finalMessages.map((message) => message.messageId)).toEqual([
+      'final',
+    ]);
+    expect(directMessageTimestamp(undefined)).toBe(0);
+    expect(directMessageTimestamp(Number.MAX_VALUE)).toBe(0);
+    expect(directMessageTimestamp(1_800_000_000_001)).toBe(1_800_000_000_001);
+  });
   it('无流活动回合的累计文本只属于该回合，持久 assistant 到达即接管', () => {
     expect(
       build([user('one')], [], {
diff --git a/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md b/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
index 5ad0563a5..c22852aec 100644
--- a/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
+++ b/docs/project-memory/plans/【实施计划】对话回合唯一投影-2026-09-16.md
@@ -2,6 +2,8 @@
 
 对应：[对话回合唯一投影](./【里程碑】对话回合唯一投影-2026-09-16.md)。
 
+本次增量顺序：先移除 Provider 回放对活动 client 回合的写入，复用活动快照同步并处理过期异步结果；再为历史信封及切片增加可选时间映射；最后在现有回合投影中分离最终回复和可折叠过程，复用 details 与工具组件。新增恢复、时间、折叠边界用例，只运行静态检查，不运行测试；按最新授权本地提交，不推送。
+
 1. 前端抽取纯回合呈现投影，完整历史关联后分页；删除旧的消息锚定/实时/未归属独立渲染分支。
 2. Rust 按 item 完成边界冲刷，段切换返回全部快照；收尾等待写任务，修正 upsert 与跨回合裁剪。
 3. 核对 MCP 输入输出与同状态更新，保留现有脱敏。
diff --git a/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md b/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md
index 502f0f244..191a6f606 100644
--- a/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md
+++ b/docs/project-memory/plans/【里程碑】对话回合唯一投影-2026-09-16.md
@@ -1,13 +1,13 @@
 # 对话回合唯一投影
 
-- Version: 1
+- Version: 2
 - Status: implemented-awaiting-runtime-acceptance
 - Date: 2026-09-16
 - Parent Spec: ../../technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
 
 ## 范围与评审
 
-单里程碑修复回合展示和流写入的一致性；不改工具执行、鉴权或原始历史格式。结构评审确认：唯一 turn owner、item 顺序、历史身份与分页、失败保留、工具详情更新均有明确归属；无须新增数据库或迁移历史。没有身份的旧记录不得做位置猜配。
+单里程碑修复回合展示和流写入的一致性；补充终态重进恢复、用户发送时间和完成后的过程折叠。评审确认：活动快照及 Direct 事件拥有生命周期，Provider 回放不创建 client 回合；JSONL 信封可选时间字段不污染原始 item，无须数据库或旧数据迁移；最终回复沿用 Runtime 的最后 assistant item 合同，失败提示不折叠。没有身份的旧记录不得做位置猜配。
 
 ## 验收
 
@@ -15,6 +15,8 @@
 2. item 增量、完成、持久化和回读保持相同身份与固定顺序。
 3. 工具输入输出保留，重复快照不重复渲染。
 4. TypeScript、最小 Cargo 检查、编码和 diff 检查通过；用户要求不运行测试，实机新回合/重开/分页验收待确认。
+5. 已结束回合重进不显示提交中，真实运行回合可恢复；跨项目/新回合迟到快照无效。
+6. 用户消息时间可刷新恢复，旧无时间记录不造值；完成后中间正文和工具统一折叠，最终回复及失败提示保持可见。
 
 依赖：既有项目历史和 v1 turn-stream / tool-calls DTO。未完成真实 UI 验收前不进入其它里程碑。
 
@@ -24,3 +26,4 @@
 - 已补充回合归属、分页、重复快照、无流回退及 writer 完成/切段、持久快照单调性/跨回合裁剪用例；按用户要求未执行测试，不能作为已通过凭证。
 - 静态自审确认视图只剩统一回合列表，不再存在 mapped/unmapped/live 三个回合流出口；失败提示使用稳定 failure 身份。
 - 真实新回合、历史重开、分页、失败/中断、工具展开输入输出仍待重启原生客户端后验收；仅本地提交，不推送。
+- 本次增量已完成生命周期来源收敛、信封发送时间和完成过程折叠；定向 TypeScript、ESLint、Cargo check、文档索引通过。新增时间幂等/旧记录、终态分类及内容分区用例但未运行；主页进入项目、重新发送/切项目竞态和自动折叠仍待原生实机验收，仅本地提交，不推送。
diff --git a/docs/project-memory/shared-memory/project-overview.md b/docs/project-memory/shared-memory/project-overview.md
index 1cff50897..8fbc7cdb0 100644
--- a/docs/project-memory/shared-memory/project-overview.md
+++ b/docs/project-memory/shared-memory/project-overview.md
@@ -52,6 +52,7 @@ SpacetimeDB crate、SDK、CLI / standalone 与生成 bindings 按 `2.8.3` 对齐
 ## AGC DirectProject 与 UI workflow
 
 - DirectProject 对话先在完整历史中按回合/原始 item 身份关联，再分页渲染；每个回合只有一个呈现入口。有流按 item `seq` 交替文本和工具，无流采用历史正文；禁止位置猜配或同时展示累计回复与 item 正文。流写入单调归并，收尾等待落盘任务，不按磁盘“最后一段”猜最终回复位置。详见 AGC 实施计划的“DirectProject 回合展示唯一归属”。
+- 回合生命周期只由活动 client 回合快照和 Direct 事件恢复；Provider 的历史终态通知不能创建活动 client 回合。消息发送时间保存在历史信封，原始 item 不混入宿主字段；完成后的中间文本和工具默认收进“执行过程”，最终回复及失败提示保持可见。
 
 - AGC 安装产品名统一为“陶泥儿”，由 Tauri `productName` 控制安装项、快捷方式与 EXE 产品描述；Windows 内置 Codex 安装到顶层 `coding-agent/win-x64/`，打包资源映射与运行时查找路径必须一致。内部可执行文件名与应用 identifier 保持稳定。
 
diff --git a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
index 94665ca40..ba1280108 100644
--- a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
+++ b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
@@ -1416,8 +1416,15 @@ DirectProject、Agent Runtime、Provider、app-server、内置 MCP、命令执
 
 ## 2026-09-15 Direct 回合跨页面生命周期与运行中项目可见性
 
-Direct 回合的所有权属于进程内项目身份锁，不属于当前页面。离开工作台或切换到首页时，正在运行的回合继续执行；重新进入项目时，前端先读取同一份只读活动回合快照，再通过 Thread Manager 订阅 bootstrap 和后续事件恢复忙碌态、进度与未完成回复。活动回合结束后移除快照并解除发送阻断；没有活动回合的项目保持原有发送行为。
+Direct 回合的所有权属于进程内项目身份锁，不属于当前页面。离开工作台或切换到首页时，正在运行的回合继续执行；重新进入项目时，只读活动回合快照负责恢复 clientTurnId 与运行状态，Direct 回合事件负责更新进度。Thread Manager 的 Provider turnId 与事件序列不得当成 clientTurnId 或展示事件序列；其通知只触发快照和历史同步，回放的终态不能重新创建活动回合或“正在提交回复”。定期复核同一份活动快照以弥补页面切换时丢失的结束事件；失败读取保留已知状态，过期读取不能覆盖新回合。活动回合结束后移除快照并解除发送阻断；没有活动回合的项目保持原有发送行为。
 
 壳层左上角的“正在运行”面板只呈现活动 Direct 回合快照，按开始时间排序，显示项目名、状态、活动时长并允许进入对应项目。快照读取失败只显示读取失败并保留上一份结果，不得改写成权限、审批或业务失败；面板不建立第二份运行真相。应用重启后的恢复、取消入口和非 Direct Agent 项目不在本合同内。
 
 活动回合快照命令是进程内 Tauri 只读命令，不进入公共 API 或持久化协议；字段包含 `projectPath / projectName / turnId / status / activity / startedAt / updatedAt / sequence`，状态和序号与既有 Direct 回合进度事件一致。
+
+### 消息时间与完成回合的过程折叠
+
+- 用户消息显示发送时刻，精确到秒。新历史信封记录接收时刻 `recordedAt`（Unix 毫秒），原始 Codex item 不增加宿主字段；历史切片通过独立 `itemTimestamps` 映射返回。幂等重复写不刷新时刻，缺时间的旧记录保持未知，不使用打开页面时刻或工具开始时刻补造。
+- 运行中的正文和工具按原有唯一回合流实时显示；完成后，除最终回复和失败提示外，中间文本与所有工具调用统一放入默认收起的“执行过程”，允许手动展开，刷新或重新进入仍默认收起。
+- 最终回复沿用 Runtime 的最后一个 assistant item 合同，不按文本长度或相似度判断。失败回合不把最后一句过程输出伪装成最终回复。无流历史按同一用户消息边界划分，只保留最后一条 assistant 回复在外；用户消息与失败提示始终保留。
+- 验收覆盖已完成回合重进、真实活动回合恢复、跨项目迟到快照、运行到完成自动收起、历史无流、失败、发送时间刷新和旧记录时间缺失。不改变实际工具执行、鉴权、数据库或用户项目内容。
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 863b64fce..6e249f891 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -58,6 +58,7 @@ toolCalls?: DirectTurnToolCall[] | null;
 ### 4. 前端合并与渲染（回合唯一归属，连续工具成块）
 
 - 加载对话时按 `turnId` 归并为唯一回合容器，用户消息保留在该回合前部。有 `turn-stream.jsonl` 时，文本与工具按 item `seq` 交替，连续工具合为一块，遇到文本另起一块；没有流的历史回合才采用“工具块 + 历史正文”。
+- 回合完成后，中间文本及所有工具块统一收进默认关闭的“执行过程”；最终回复及失败提示留在外面。展开后仍按原顺序查看中间输出和工具详情；运行中不使用外层折叠区。用户消息的发送时间从消息自身的历史时间读取，不能拿工具起点补造。
 - 实时与回读共用同一投影，正文、工具和耗时不另建实时/未归属渲染出口。先在完整历史按消息身份关联，再分页；禁止按第 N 个工具回合匹配第 N 条用户消息。详情通过当前回合 `callId` 关联；同项目回读与实时增量幂等合并，切项目清空旧状态。完整合同见 [AGC 实施计划](./【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md) 的“DirectProject 回合展示唯一归属”。
 - 块 DOM 与交互（对齐 Codex）：
 

From 60d66195989ad725e791e73c59ffb248f68bd639 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 03:03:45 +0800
Subject: [PATCH 66/67] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

正文、工具内容、执行过程和时间统一使用主题正文色

保留错误与禁用状态语义，移除硬编码字体颜色并同步文档
---
 apps/ai-game-creator-shell/src/styles.css     | 61 ++++++++++++-------
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |  1 +
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index ec4faaf54..0e5566d46 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -2738,7 +2738,7 @@ textarea {
 
 .project-supervisor-process-elapsed {
   margin-left: auto !important;
-  color: #795548 !important;
+  color: inherit;
   font-size: 13px !important;
   font-style: normal;
   font-weight: 500;
@@ -2800,7 +2800,7 @@ textarea {
   padding: 0;
   border: 0;
   background: transparent;
-  color: #2f6f4b;
+  color: inherit;
   font: inherit;
   font-size: 12px;
   cursor: pointer;
@@ -8858,7 +8858,7 @@ iframe.preview-frame {
   border: 1px solid var(--platform-button-primary-border);
   border-radius: 14px 14px 4px;
   background: var(--platform-warm-bg);
-  color: var(--platform-text-strong);
+  color: var(--platform-text-base);
 }
 
 /* 输入区是对话框内部的一块：四边内缩 12px，不贴外框、也不与外框的描边重叠。
@@ -10747,6 +10747,7 @@ button.design-workspace-tree__entry:hover,
   .resource-reference-input-placeholder {
   top: 0;
   left: 0;
+  color: var(--platform-text-soft);
 }
 
 .game-workbench-chat
@@ -11328,7 +11329,7 @@ button.design-workspace-tree__entry:hover,
   border-color: var(--platform-surface-border);
   border-radius: 14px;
   background: var(--platform-input-fill);
-  color: var(--platform-text-strong);
+  color: var(--platform-text-base);
   pointer-events: auto;
 }
 
@@ -11818,7 +11819,7 @@ button.design-workspace-tree__entry:hover,
 .agent-tool-call-group-head:hover,
 .agent-tool-call-group-head:focus-visible {
   background: var(--platform-button-ghost-fill);
-  color: var(--platform-text-strong);
+  color: inherit;
   outline: none;
 }
 
@@ -11827,7 +11828,7 @@ button.design-workspace-tree__entry:hover,
   align-items: center;
   justify-content: center;
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
 }
 
 /* 汇总压在图标后面：窄面板下靠 ellipsis 收窄，不换行、不把时间与用时挤出可视区。 */
@@ -11835,7 +11836,7 @@ button.design-workspace-tree__entry:hover,
   flex: 1 1 auto;
   min-width: 0;
   overflow: hidden;
-  color: var(--platform-text-strong);
+  color: inherit;
   font-size: 12px;
   font-weight: 600;
   text-overflow: ellipsis;
@@ -11845,7 +11846,7 @@ button.design-workspace-tree__entry:hover,
 .agent-tool-call-group-time,
 .agent-tool-call-group-duration {
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 11px;
   font-variant-numeric: tabular-nums;
   white-space: nowrap;
@@ -11853,7 +11854,7 @@ button.design-workspace-tree__entry:hover,
 
 .agent-tool-call-group-chevron {
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   transition: transform 120ms ease;
 }
 
@@ -11909,7 +11910,7 @@ button.design-workspace-tree__entry:hover,
 .agent-tool-call-row-head:hover,
 .agent-tool-call-row-head:focus-visible {
   background: var(--platform-button-ghost-fill);
-  color: var(--platform-text-strong);
+  color: inherit;
   outline: none;
 }
 
@@ -11918,7 +11919,7 @@ button.design-workspace-tree__entry:hover,
   align-items: center;
   justify-content: center;
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
 }
 
 .agent-tool-call-row-text {
@@ -11931,7 +11932,7 @@ button.design-workspace-tree__entry:hover,
 
 .agent-tool-call-row-status {
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 11px;
 }
 
@@ -11939,7 +11940,7 @@ button.design-workspace-tree__entry:hover,
 .agent-tool-call-row-duration {
   flex: 0 0 auto;
   margin-left: auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 11px;
   font-variant-numeric: tabular-nums;
   white-space: nowrap;
@@ -11947,7 +11948,7 @@ button.design-workspace-tree__entry:hover,
 
 .agent-tool-call-row-chevron {
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   transition: transform 120ms ease;
 }
 
@@ -11967,7 +11968,7 @@ button.design-workspace-tree__entry:hover,
 }
 
 .agent-tool-call-row-section > small {
-  color: #8d7668;
+  color: inherit;
   font-size: 11px;
   font-weight: 600;
 }
@@ -12008,14 +12009,14 @@ button.design-workspace-tree__entry:hover,
 
 .agent-tool-call-row-changes li small {
   flex: 0 0 auto;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 10px;
 }
 
 .agent-tool-call-group-foot {
   margin: 0;
   padding: 0 8px 2px;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 11px;
   font-variant-numeric: tabular-nums;
 }
@@ -12067,6 +12068,7 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-conversation
   > .project-supervisor-process-card {
   margin: 0 16px 8px;
+  color: var(--platform-text-base);
 }
 
 /* 直连回合的「思考过程」块：默认折叠（<details> 默认收起），展开后按步骤列过程行。
@@ -12152,7 +12154,7 @@ button.design-workspace-tree__entry:hover,
 .message-sent-at {
   display: block;
   margin-top: 4px;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 11px;
   text-align: right;
   font-variant-numeric: tabular-nums;
@@ -12160,11 +12162,12 @@ button.design-workspace-tree__entry:hover,
 
 .message-turn-process {
   min-width: 0;
+  color: var(--platform-text-base);
 }
 
 .message-turn-process > summary {
   padding: 6px 0;
-  color: var(--platform-text-soft);
+  color: inherit;
   font-size: 12px;
   cursor: pointer;
 }
@@ -12184,7 +12187,7 @@ button.design-workspace-tree__entry:hover,
   margin: 0;
   padding: 0 2px;
   text-align: right;
-  color: var(--platform-text-soft);
+  color: var(--platform-text-base);
   font-size: 12px;
   line-height: 1.6;
   font-variant-numeric: tabular-nums;
@@ -12196,7 +12199,7 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-message-list
   details[data-testid='live-reasoning'] {
   margin: 0;
-  color: var(--platform-text-soft);
+  color: var(--platform-text-base);
   font-size: 12px;
 }
 
@@ -12218,6 +12221,22 @@ button.design-workspace-tree__entry:hover,
   font-size: 12px;
   line-height: 1.5;
 }
+/* Markdown 正文继承消息颜色，层级由字号和字重表达，不混入全局段落或引用颜色。 */
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message
+  :where(p, h1, h2, h3, h4, h5, h6, ul, ol, li, blockquote, pre, code, strong, em, th, td) {
+  color: inherit;
+}
+
+.game-workbench-chat
+  .project-supervisor-surface.is-direct-codex
+  .project-supervisor-message-list
+  .message p {
+  opacity: 1;
+}
+
 /* 对话正文的行高统一为 1.5：段落、列表、列表项一致。
    面板里原本有 1.7 / 1.6 / 1.5 / 1.4 多套值，段落与列表各自命中不同规则，
    看起来"上下行高不一样"。 */
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 6e249f891..472967863 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -99,6 +99,7 @@ toolCalls?: DirectTurnToolCall[] | null;
   - 耗时：单条工具 = `startedAt` → `updatedAt`，块头总用时 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。单条格式：`<1s` → `0.4s`、`<60s` → `12.3s`（整秒省略小数）、`≥60s` → `2m 5s`；块头格式：`42秒` / `4分钟` / `5分钟 45秒`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数），耗时为 0 时同样不显示 `0s`。
   - 时间：块头显示该回合结束时间（`max(updatedAt)` 的本地 `HH:mm:ss`）；同一回合能拿到用户消息时间（`updatedAt > 0`）时显示 `HH:mm:ss → HH:mm:ss`（发送 → 结束），取不到就只显示结束时间，不编造。
   - 回合结束时间与耗时在正文下方右对齐；Direct 对话输入框提示统一为“描述你的想法，或 @ 引用素材”，引用按钮保留输入盒的 12px 内边距，不使用负边距贴边。
+  - 对话普通文字统一使用 `--platform-text-base`：用户与助手正文、工具摘要和输入输出、执行过程、发送时间及耗时同色，层级通过字号和字重表达。工具子元素继承容器颜色，失败状态保留错误色；输入提示使用主题弱文字色，禁用状态保留原有反馈，不混用硬编码灰蓝、绿色或棕色。
   - Windows 命令展示：仅 `command` 卡片识别 `pwsh` / `powershell`（含完整路径、`.exe`、常见启动选项）的 `-Command` / `-c` 外层包装，摘要和展开输入只展示脚本正文，并解开单个 shell 参数的引用拼接。摘要优先读取已脱敏的 `detail.command`，再按首行 120 字符截断，避免历史摘要被可执行文件路径占满。无法识别的启动方式、`-File`、`-EncodedCommand`、普通命令和 MCP 输入原样展示；执行参数、持久化原文、脱敏和输出均不改变。
   - 调试属性：块与行都带 `data-duration-ms`（原始毫秒，无法计算时为空串）与稳定 `data-testid`（块 `agent-tool-call-group`、行 `agent-tool-call-row`）。
 - 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），块头与行都是按钮：`aria-label` = 汇总 / 行文案 + 耗时；默认折叠。

From 5cd02aa8b093bdfbfdeb0e0f65f970b6cbf44ef4 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 03:59:27 +0800
Subject: [PATCH 67/67] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E4=BD=93=E5=AF=B9=E8=AF=9D=E5=B1=82=E7=BA=A7=E5=B9=B6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=B4=A0=E6=9D=90=E5=AF=BC=E5=87=BA=E4=B8=8E=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当前Agent与策划Agent共用正文和过程表现组件，统一思考及工具调用的小字号浅色样式
素材工具栏按实际动作分组，导出紧邻删除并修复空分组重复分隔线
文档与代码使用共享Markdown预览和代码高亮，复用按需读取与缓存
移除未调用的活跃回合查询命令，保留正式快照恢复链路
补充回归用例并同步技术方案和团队约定
---
 apps/ai-game-creator-shell/package.json       |   1 +
 .../src-tauri/src/agent/direct_runtime/mod.rs |  14 +-
 .../src-tauri/src/main.rs                     |   1 -
 apps/ai-game-creator-shell/src/app/types.ts   |  13 --
 .../ChatMarkdownMessage/codeHighlight.css     |  37 +++++
 .../components/ChatMarkdownMessage/index.tsx  |  74 +++++++--
 .../ProjectSupervisorView.tsx                 | 143 ++++++++++-------
 .../project-workspace/ToolCallGroup.tsx       |   7 +-
 .../resource-canvas/resourceCanvasChrome.css  |  35 ++++-
 .../resourceCanvasFocusModel.ts               |   4 +-
 .../resourceDocumentPreviewModel.ts           |  80 ++++++++++
 apps/ai-game-creator-shell/src/styles.css     |  28 +---
 .../ResourceDocumentPreviewDialog.tsx         |  87 +++++++++++
 .../src/view/project-development/index.tsx    | 141 ++++++++++++-----
 .../resourceCardPreviewModel.ts               |   5 +-
 .../useProjectResourceCardPreviews.ts         |  25 +--
 .../tests/AgentMessageContent.test.tsx        | 111 ++++++++++++++
 .../tests/ChatMarkdownMessage.test.tsx        |  40 +++++
 .../ResourceDocumentPreviewDialog.test.tsx    | 126 +++++++++++++++
 .../tests/appSurface/design-agent.suite.ts    |   6 +
 .../tests/appSurface/tool-call-group.suite.ts |   1 +
 .../resourceCanvasFloatingDismiss.test.tsx    |  14 ++
 .../tests/resourceCanvasToolbarModel.test.ts  |  28 ++++
 .../resourceDocumentPreviewModel.test.ts      |  74 +++++++++
 .../useProjectResourceCardPreviews.test.ts    |  59 +++++++
 ...��施计划】文档素材Markdown预览-2026-09-16.md |  17 +++
 ...�里程碑】文档素材Markdown预览-2026-09-16.md |  23 +++
 .../shared-memory/team-conventions.md         |   1 +
 ...�案】AI游戏创作智能体App实施计划-2026-06-24.md |  13 ++
 ...方案】GameAgent对话工具调用卡片-2026-09-14.md |   2 +-
 package-lock.json                             | 141 +++++++++++++++++
 .../src/components/AgentMessageContent.css    |  25 +++
 .../src/components/AgentMessageContent.tsx    |  24 +++
 packages/shared/src/components/index.ts       |   2 +
 ...ageCanvasSelectedLayerToolbarView.test.tsx | 120 ++++++++++++++-
 .../ImageCanvasSelectedLayerToolbarView.tsx   | 144 ++++++++++++------
 src/index.css                                 |  12 --
 37 files changed, 1439 insertions(+), 239 deletions(-)
 create mode 100644 apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/codeHighlight.css
 create mode 100644 apps/ai-game-creator-shell/src/features/resource-canvas/resourceDocumentPreviewModel.ts
 create mode 100644 apps/ai-game-creator-shell/src/view/project-development/ResourceDocumentPreviewDialog.tsx
 create mode 100644 apps/ai-game-creator-shell/tests/AgentMessageContent.test.tsx
 create mode 100644 apps/ai-game-creator-shell/tests/ResourceDocumentPreviewDialog.test.tsx
 create mode 100644 apps/ai-game-creator-shell/tests/resourceDocumentPreviewModel.test.ts
 create mode 100644 docs/project-memory/plans/【实施计划】文档素材Markdown预览-2026-09-16.md
 create mode 100644 docs/project-memory/plans/【里程碑】文档素材Markdown预览-2026-09-16.md
 create mode 100644 packages/shared/src/components/AgentMessageContent.css
 create mode 100644 packages/shared/src/components/AgentMessageContent.tsx

diff --git a/apps/ai-game-creator-shell/package.json b/apps/ai-game-creator-shell/package.json
index c08cb6ac9..650ebf029 100644
--- a/apps/ai-game-creator-shell/package.json
+++ b/apps/ai-game-creator-shell/package.json
@@ -57,6 +57,7 @@
     "react-colorful": "^5.8.0",
     "react-dom": "^19.0.0",
     "react-markdown": "^10.1.0",
+    "rehype-highlight": "^7.0.2",
     "remark-gfm": "^4.0.1",
     "vite": "^6.2.0",
     "zustand": "^5.0.14"
diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
index 08c7f56be..a515954cb 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs
@@ -444,7 +444,8 @@ pub(crate) fn direct_taonier_active_invocation_id_at(root: &Path) -> Result<Stri
         })
 }
 
-/// `read_direct_codex_active_turn` 的返回值：前端重进会话时用它恢复正在跑的回合。
+/// 测试读取进程内调用守卫快照，校验占用与释放生命周期。
+#[cfg(test)]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct DirectActiveTurnView {
@@ -458,6 +459,7 @@ pub(crate) struct DirectActiveTurnView {
 ///
 /// 只读，不改变互斥语义与释放时机：守卫仍然只由回合自己的 `Drop` 或
 /// [`release_stale_direct_taonier_active_invocation`] 释放。
+#[cfg(test)]
 pub(crate) fn read_direct_taonier_active_invocation_at(
     root: &Path,
 ) -> Result<Option<DirectActiveTurnView>, String> {
@@ -475,16 +477,6 @@ pub(crate) fn read_direct_taonier_active_invocation_at(
         }))
 }
 
-/// 只读命令：读取该项目当前登记的 Direct 活跃回合，供前端重进会话时恢复。
-///
-/// 不进入、不抢占、不释放守卫；没有回合时返回 `null`。
-#[tauri::command]
-pub(crate) fn read_direct_codex_active_turn(
-    project_path: String,
-) -> Result<Option<DirectActiveTurnView>, String> {
-    read_direct_taonier_active_invocation_at(Path::new(project_path.trim()))
-}
-
 /// "终止"拿不到可中断句柄时的分类，决定是否允许强制释放本地守卫。
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub(crate) enum DirectTaonierStaleGuardReason {
diff --git a/apps/ai-game-creator-shell/src-tauri/src/main.rs b/apps/ai-game-creator-shell/src-tauri/src/main.rs
index 9a6c48a3b..bec55a981 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/main.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/main.rs
@@ -2677,7 +2677,6 @@ fn main() {
             chat_with_game_creator_role_agent,
             chat_with_game_creator_role_agent_stream,
             chat_with_game_creator_direct_codex,
-            read_direct_codex_active_turn,
             cancel_direct_codex_turn,
             select_game_creator_reasoning_effort,
             start_planning_session_v2,
diff --git a/apps/ai-game-creator-shell/src/app/types.ts b/apps/ai-game-creator-shell/src/app/types.ts
index b71988918..1a8e48d72 100644
--- a/apps/ai-game-creator-shell/src/app/types.ts
+++ b/apps/ai-game-creator-shell/src/app/types.ts
@@ -1204,19 +1204,6 @@ interface TurnStreamItemBase {
  */
 export type TurnStreamItem = TurnStreamTextItem | TurnStreamToolItem;
 
-/**
- * `read_direct_codex_active_turn` 的返回值：Rust 进程内当前登记的 Direct 活跃回合。
- *
- * 重进会话时用它把前端的"当前活跃回合"接管回来，否则界面不知道有回合在跑，
- * 既不显示过程卡也不给终止入口，用户再发消息只会被守卫拒绝。
- */
-export interface DirectActiveTurnView {
-  /** 与回合事件的 `turnId` 同一个身份。 */
-  clientTurnId: string;
-  /** 这一轮登记的时刻（Unix 毫秒）。 */
-  startedAt: number;
-}
-
 /** `cancel_direct_codex_turn` 的返回值。 */
 export interface DirectTurnCancelView {
   /**
diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/codeHighlight.css b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/codeHighlight.css
new file mode 100644
index 000000000..d212361a5
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/codeHighlight.css
@@ -0,0 +1,37 @@
+/* 只作用于共享 Markdown 渲染器，不改变普通正文及用户消息的字体颜色。 */
+.agc-markdown-code .hljs-comment,
+.agc-markdown-code .hljs-quote {
+  color: #6a737d;
+}
+
+.agc-markdown-code .hljs-keyword,
+.agc-markdown-code .hljs-name,
+.agc-markdown-code .hljs-selector-tag,
+.agc-markdown-code .hljs-literal,
+.agc-markdown-code .hljs-deletion {
+  color: #a6264c;
+}
+
+.agc-markdown-code .hljs-string,
+.agc-markdown-code .hljs-regexp,
+.agc-markdown-code .hljs-addition {
+  color: #276438;
+}
+
+.agc-markdown-code .hljs-number,
+.agc-markdown-code .hljs-attr,
+.agc-markdown-code .hljs-variable,
+.agc-markdown-code .hljs-built_in {
+  color: #075a9c;
+}
+
+.agc-markdown-code .hljs-title,
+.agc-markdown-code .hljs-type,
+.agc-markdown-code .hljs-section {
+  color: #6f42a0;
+}
+
+.agc-markdown-code .hljs-meta,
+.agc-markdown-code .hljs-symbol {
+  color: #8a4c0a;
+}
diff --git a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
index d743dc2c2..d8acce153 100644
--- a/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
+++ b/apps/ai-game-creator-shell/src/components/ChatMarkdownMessage/index.tsx
@@ -1,3 +1,5 @@
+import './codeHighlight.css';
+
 import type { ErrorInfo, ReactNode } from 'react';
 import {
   Children,
@@ -7,14 +9,20 @@ import {
   useContext,
 } from 'react';
 import ReactMarkdown, { type Components } from 'react-markdown';
+import rehypeHighlight from 'rehype-highlight';
 import remarkGfm from 'remark-gfm';
 
 export type ChatMarkdownMessageProps = {
   text: string;
   role: 'assistant' | 'user';
   streaming?: boolean;
+  /** 文件预览不压缩正文空行，保留源码与文档的原始排版。 */
+  preserveBlankLines?: boolean;
 };
 
+const MAX_HIGHLIGHT_CHARACTERS = 100_000;
+const CodeBlockContext = createContext(false);
+
 /** 只压缩普通 Markdown 正文里多余的空行；代码块中的换行必须原样保留。 */
 function normalizeMarkdownBlankLines(text: string) {
   return text
@@ -183,22 +191,50 @@ const markdownComponents: Components = {
   a: ({ children }) => children,
   img: ({ alt }) => (alt?.trim() ? `图片：${alt}` : '图片已省略'),
   h1: ({ children }) => (
-    <h1 className="m-0 mt-4 !text-xl font-bold first:mt-0">{children}</h1>
+    <h1
+      className="m-0 mt-4 font-bold first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 1.25rem)' }}
+    >
+      {children}
+    </h1>
   ),
   h2: ({ children }) => (
-    <h2 className="m-0 mt-4 !text-lg font-bold first:mt-0">{children}</h2>
+    <h2
+      className="m-0 mt-4 font-bold first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 1.125rem)' }}
+    >
+      {children}
+    </h2>
   ),
   h3: ({ children }) => (
-    <h3 className="m-0 mt-3 !text-base font-semibold first:mt-0">{children}</h3>
+    <h3
+      className="m-0 mt-3 font-semibold first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 1rem)' }}
+    >
+      {children}
+    </h3>
   ),
   h4: ({ children }) => (
-    <h4 className="m-0 mt-3 !text-sm font-semibold first:mt-0">{children}</h4>
+    <h4
+      className="m-0 mt-3 font-semibold first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 0.875rem)' }}
+    >
+      {children}
+    </h4>
   ),
   h5: ({ children }) => (
-    <h5 className="m-0 mt-2 !text-sm font-medium first:mt-0">{children}</h5>
+    <h5
+      className="m-0 mt-2 font-medium first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 0.875rem)' }}
+    >
+      {children}
+    </h5>
   ),
   h6: ({ children }) => (
-    <h6 className="m-0 mt-2 !text-xs font-medium uppercase tracking-wide first:mt-0">
+    <h6
+      className="m-0 mt-2 font-medium uppercase tracking-wide first:mt-0"
+      style={{ fontSize: 'var(--agent-message-heading-size, 0.75rem)' }}
+    >
       {children}
     </h6>
   ),
@@ -213,15 +249,18 @@ const markdownComponents: Components = {
   ),
   pre: ({ children }) => (
     <pre className="m-0 mt-2 max-w-full overflow-x-auto rounded-lg bg-black/6 p-3 text-xs leading-5 first:mt-0">
-      {children}
+      <CodeBlockContext.Provider value={true}>
+        {children}
+      </CodeBlockContext.Provider>
     </pre>
   ),
-  code: ({ className, children, node: _node, ...props }) => {
-    const isBlock =
-      Boolean(className?.includes('language-')) ||
-      String(children).includes('\n');
+  code: function MarkdownCode({ className, children, node: _node, ...props }) {
+    const isBlock = useContext(CodeBlockContext);
     return isBlock ? (
-      <code {...props} className="font-mono whitespace-pre">
+      <code
+        {...props}
+        className={`agc-markdown-code font-mono whitespace-pre ${className ?? ''}`}
+      >
         {children}
       </code>
     ) : (
@@ -235,7 +274,10 @@ const markdownComponents: Components = {
   },
   table: ({ children }) => (
     <div className="mt-2 max-w-full overflow-x-auto first:mt-0">
-      <table className="min-w-full border-collapse text-left text-sm">
+      <table
+        className="min-w-full border-collapse text-left"
+        style={{ fontSize: 'var(--agent-message-table-size, 0.875rem)' }}
+      >
         {children}
       </table>
     </div>
@@ -264,6 +306,7 @@ export function ChatMarkdownMessage({
   text,
   role,
   streaming = false,
+  preserveBlankLines = false,
 }: ChatMarkdownMessageProps) {
   if (role === 'user') {
     return <span className="whitespace-pre-wrap break-words">{text}</span>;
@@ -274,11 +317,14 @@ export function ChatMarkdownMessage({
       <ReactMarkdown
         skipHtml
         remarkPlugins={[remarkGfm]}
+        rehypePlugins={
+          text.length <= MAX_HIGHLIGHT_CHARACTERS ? [rehypeHighlight] : []
+        }
         components={
           streaming ? streamingMarkdownComponents : markdownComponents
         }
       >
-        {normalizeMarkdownBlankLines(text)}
+        {preserveBlankLines ? text : normalizeMarkdownBlankLines(text)}
       </ReactMarkdown>
     </MarkdownErrorBoundary>
   );
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 b2a9a0728..4124f3a5a 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
@@ -8,6 +8,10 @@ import type {
 } from 'react';
 import { Fragment, useEffect, useRef, useState } from 'react';
 
+import {
+  AgentMessageContent,
+  type AgentMessageTone,
+} from '../../../../../packages/shared/src/components/AgentMessageContent';
 import type {
   AgentStatusCard,
   ChatMessage,
@@ -131,6 +135,7 @@ function TurnStreamSequence({
   active,
   userSentAt,
   className,
+  tone = 'body',
 }: {
   items: readonly TurnStreamItem[];
   toolCalls: readonly GameCreatorDirectToolCall[];
@@ -138,6 +143,7 @@ function TurnStreamSequence({
   active: boolean;
   userSentAt: number;
   className?: string;
+  tone?: AgentMessageTone;
 }) {
   const runs = turnStreamRuns(items);
   const callsById = new Map<string, GameCreatorDirectToolCall>();
@@ -159,11 +165,13 @@ function TurnStreamSequence({
                 : 'message message--assistant'
             }
           >
-            <ChatMarkdownMessage
-              role="assistant"
-              text={run.text}
-              streaming={active && index === runs.length - 1}
-            />
+            <AgentMessageContent tone={tone}>
+              <ChatMarkdownMessage
+                role="assistant"
+                text={run.text}
+                streaming={active && index === runs.length - 1}
+              />
+            </AgentMessageContent>
           </div>
         ) : (
           <ToolCallGroup
@@ -183,6 +191,30 @@ function TurnStreamSequence({
   );
 }
 
+/** 当前 Agent 和策划 Agent 的实时/历史思考使用同一个折叠入口。 */
+function AgentReasoning({
+  text,
+  label = '思考过程',
+  testId,
+}: {
+  text: string;
+  label?: string;
+  testId?: string;
+}) {
+  return (
+    <AgentMessageContent
+      as="details"
+      tone="process"
+      className="design-agent-reasoning"
+      aria-label={label}
+      data-testid={testId}
+    >
+      <summary>思考过程</summary>
+      <pre>{text}</pre>
+    </AgentMessageContent>
+  );
+}
+
 type RuntimePanelProps = ComponentProps<typeof ProjectSupervisorRuntimePanel>;
 
 function directStatusTitle(status: string | null | undefined) {
@@ -437,7 +469,11 @@ export function ProjectSupervisorView({
       </p>
     );
   };
-  const renderMessage = (message: ChatMessage, index: number) => {
+  const renderMessageContent = (
+    message: ChatMessage,
+    index: number,
+    tone: AgentMessageTone,
+  ) => {
     const sentAt =
       message.role === 'user' ? directMessageTimestamp(message.updatedAt) : 0;
     return (
@@ -445,10 +481,12 @@ export function ProjectSupervisorView({
         key={message.messageId ?? `${message.role}-${index}`}
         className={`message message--${message.role}`}
       >
-        <ChatMarkdownMessage
-          role={message.role}
-          text={projectSupervisorChatMessageText(message)}
-        />
+        <AgentMessageContent tone={tone}>
+          <ChatMarkdownMessage
+            role={message.role}
+            text={projectSupervisorChatMessageText(message)}
+          />
+        </AgentMessageContent>
         {sentAt > 0 ? (
           <time
             className="message-sent-at"
@@ -459,17 +497,16 @@ export function ProjectSupervisorView({
           </time>
         ) : null}
         {showDesignReasoning && message.reasoningText ? (
-          <details
-            className="design-agent-reasoning"
-            aria-label="策划 Agent 思考过程"
-          >
-            <summary>思考过程</summary>
-            <pre>{message.reasoningText}</pre>
-          </details>
+          <AgentReasoning
+            text={message.reasoningText}
+            label="策划 Agent 思考过程"
+          />
         ) : null}
       </div>
     );
   };
+  const renderMessage = (message: ChatMessage, index: number) =>
+    renderMessageContent(message, index, 'body');
 
   const submitButton = (
     <button
@@ -578,17 +615,21 @@ export function ProjectSupervisorView({
           {directCodex
             ? directTurns.map((turn) => {
                 const content = splitDirectTurnContent(turn);
-                const renderStream = (items: TurnStreamItem[]) => (
+                const renderStream = (
+                  items: TurnStreamItem[],
+                  tone: AgentMessageTone = 'body',
+                ) => (
                   <TurnStreamSequence
                     items={items}
                     toolCalls={turn.calls}
                     active={turn.active}
                     userSentAt={turn.startedAt}
+                    tone={tone}
                   />
                 );
                 const process =
                   turn.source === 'stream' ? (
-                    renderStream(content.processItems)
+                    renderStream(content.processItems, 'process')
                   ) : (
                     <>
                       {turn.calls.length > 0 ? (
@@ -599,7 +640,9 @@ export function ProjectSupervisorView({
                           className="message-tool-call"
                         />
                       ) : null}
-                      {content.processMessages.map(renderMessage)}
+                      {content.processMessages.map((message, index) =>
+                        renderMessageContent(message, index, 'process'),
+                      )}
                     </>
                   );
                 const hasProcess =
@@ -641,11 +684,13 @@ export function ProjectSupervisorView({
                         aria-live="polite"
                         data-runtime-owned="true"
                       >
-                        <ChatMarkdownMessage
-                          role="assistant"
-                          text={turn.transientReply}
-                          streaming
-                        />
+                        <AgentMessageContent>
+                          <ChatMarkdownMessage
+                            role="assistant"
+                            text={turn.transientReply}
+                            streaming
+                          />
+                        </AgentMessageContent>
                       </div>
                     ) : null}
                     {renderTurnUsage(turn)}
@@ -654,35 +699,23 @@ export function ProjectSupervisorView({
               })
             : visibleMessages.map(renderMessage)}
           {directCodex && transientReasoning ? (
-            <details
-              className="design-agent-reasoning"
-              data-testid="live-reasoning"
-            >
-              <summary>思考过程</summary>
-              <pre>{transientReasoning}</pre>
-            </details>
+            <AgentReasoning text={transientReasoning} testId="live-reasoning" />
           ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)
               .map((entry) => (
-                <details
+                <AgentReasoning
                   key={`reasoning-${entry.id}`}
-                  className="design-agent-reasoning"
-                  aria-label="策划 Agent 思考过程"
-                >
-                  <summary>思考过程</summary>
-                  <pre>{entry.text}</pre>
-                </details>
+                  text={entry.text}
+                  label="策划 Agent 思考过程"
+                />
               ))}
           {showDesignReasoning && designReasoning ? (
-            <details
-              className="design-agent-reasoning"
-              aria-label="策划 Agent 思考过程"
-            >
-              <summary>思考过程</summary>
-              <pre>{designReasoning}</pre>
-            </details>
+            <AgentReasoning
+              text={designReasoning}
+              label="策划 Agent 思考过程"
+            />
           ) : null}
           {!directCodex && transientReply ? (
             <div
@@ -693,11 +726,13 @@ export function ProjectSupervisorView({
               aria-live="polite"
               data-runtime-owned="true"
             >
-              <ChatMarkdownMessage
-                role="assistant"
-                text={transientReply}
-                streaming
-              />
+              <AgentMessageContent>
+                <ChatMarkdownMessage
+                  role="assistant"
+                  text={transientReply}
+                  streaming
+                />
+              </AgentMessageContent>
             </div>
           ) : null}
         </div>
@@ -768,7 +803,9 @@ export function ProjectSupervisorView({
         directStatus !== 'completed' &&
         directStatus !== 'failed' &&
         (runtimePanelProps.controlBusy || Boolean(activeTurnId)) ? (
-          <section
+          <AgentMessageContent
+            as="section"
+            tone="process"
             className={`project-supervisor-process-card${runtimePanelProps.controlBusy ? ' is-active' : ''}`}
             aria-label="陶泥儿执行过程"
             aria-live="polite"
@@ -825,7 +862,7 @@ export function ProjectSupervisorView({
                 ) : null}
               </div>
             ) : null}
-          </section>
+          </AgentMessageContent>
         ) : null}
         <form
           className={`project-supervisor-composer${
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
index 35b4bff12..9396c17df 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ToolCallGroup.tsx
@@ -8,6 +8,7 @@ import {
 } from 'lucide-react';
 import { useEffect, useId, useState } from 'react';
 
+import { AgentMessageContent } from '../../../../../packages/shared/src/components/AgentMessageContent';
 import type { GameCreatorDirectToolCall } from '../../app/types';
 import {
   formatToolCallDuration,
@@ -93,7 +94,9 @@ export function ToolCallGroup({
     .filter(Boolean)
     .join('，');
   return (
-    <section
+    <AgentMessageContent
+      as="section"
+      tone="process"
       className={
         className
           ? `agent-tool-call-group ${className}`
@@ -146,7 +149,7 @@ export function ToolCallGroup({
           ))}
         </ul>
       </div>
-    </section>
+    </AgentMessageContent>
   );
 }
 
diff --git a/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasChrome.css b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasChrome.css
index 9492d2093..40de7843a 100644
--- a/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasChrome.css
+++ b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasChrome.css
@@ -42,7 +42,7 @@
   position: absolute;
   z-index: 60;
   display: inline-flex;
-  max-width: min(92vw, 640px);
+  max-width: min(92vw, 800px);
   align-items: center;
   flex-wrap: nowrap;
   gap: 0.3rem;
@@ -909,6 +909,39 @@
   }
 }
 
+.game-resource-document-preview {
+  display: flex;
+  flex-direction: column;
+  width: min(960px, calc(100vw - 32px));
+  max-height: calc(100dvh - 32px);
+  min-width: 0;
+  border: 1px solid var(--platform-surface-border);
+  border-radius: 16px;
+  overflow: hidden;
+}
+
+.game-resource-document-preview__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 16px 20px;
+  border-bottom: 1px solid var(--platform-surface-border);
+}
+
+.game-resource-document-preview__header strong {
+  min-width: 0;
+  overflow-wrap: anywhere;
+}
+
+.game-resource-document-preview__body {
+  min-height: 0;
+  min-width: 0;
+  padding: 20px;
+  overflow: auto;
+  overscroll-behavior: contain;
+}
+
 /* 资源面板：独立浮层面板（预览 / 上传 / 下载 / 多选）。 */
 .game-resource-panel {
   width: min(880px, calc(100% - 32px));
diff --git a/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasFocusModel.ts b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasFocusModel.ts
index 2b737b484..a2c24def2 100644
--- a/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasFocusModel.ts
+++ b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceCanvasFocusModel.ts
@@ -87,6 +87,7 @@ export type ResourceCanvasHostOverlayState = {
   readonly isClassificationPanelOpen: boolean;
   readonly isRenameDialogOpen: boolean;
   readonly isRecoveryPanelOpen: boolean;
+  readonly isDocumentPreviewOpen?: boolean;
 };
 
 export function isResourceCanvasHostOverlayOpen(
@@ -97,7 +98,8 @@ export function isResourceCanvasHostOverlayOpen(
     overlay.isGenerationPanelOpen ||
     overlay.isClassificationPanelOpen ||
     overlay.isRenameDialogOpen ||
-    overlay.isRecoveryPanelOpen
+    overlay.isRecoveryPanelOpen ||
+    Boolean(overlay.isDocumentPreviewOpen)
   );
 }
 
diff --git a/apps/ai-game-creator-shell/src/features/resource-canvas/resourceDocumentPreviewModel.ts b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceDocumentPreviewModel.ts
new file mode 100644
index 000000000..c0bc85c78
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/features/resource-canvas/resourceDocumentPreviewModel.ts
@@ -0,0 +1,80 @@
+import {
+  projectResourceCardPreviewKind,
+  projectResourcePathExtension,
+} from '../../view/project-development/resourceCardPreviewModel';
+import type { ProjectResource } from '../../view/project-development/resourceProjectionModel';
+
+const CODE_LANGUAGES: Readonly<Record<string, string>> = {
+  ts: 'typescript',
+  tsx: 'typescript',
+  mts: 'typescript',
+  cts: 'typescript',
+  js: 'javascript',
+  jsx: 'javascript',
+  mjs: 'javascript',
+  cjs: 'javascript',
+  rs: 'rust',
+  py: 'python',
+  go: 'go',
+  java: 'java',
+  kt: 'kotlin',
+  kts: 'kotlin',
+  cs: 'csharp',
+  cpp: 'cpp',
+  cc: 'cpp',
+  cxx: 'cpp',
+  c: 'c',
+  h: 'c',
+  hpp: 'cpp',
+  swift: 'swift',
+  php: 'php',
+  rb: 'ruby',
+  lua: 'lua',
+  sh: 'bash',
+  bash: 'bash',
+  zsh: 'bash',
+  ps1: 'powershell',
+  psm1: 'powershell',
+  json: 'json',
+  jsonc: 'json',
+  yaml: 'yaml',
+  yml: 'yaml',
+  toml: 'ini',
+  xml: 'xml',
+  html: 'xml',
+  htm: 'xml',
+  vue: 'xml',
+  svelte: 'xml',
+  css: 'css',
+  scss: 'scss',
+  less: 'less',
+  sql: 'sql',
+  graphql: 'graphql',
+  gql: 'graphql',
+};
+
+export function isResourceDocumentPreviewable(resource: ProjectResource) {
+  const kind = projectResourceCardPreviewKind(resource);
+  return (
+    (kind === 'document' || kind === 'code') &&
+    (resource.content !== undefined || resource.path.trim() !== '')
+  );
+}
+
+export function resourceDocumentPreviewMarkdown(
+  resource: ProjectResource,
+  content: string,
+) {
+  if (projectResourceCardPreviewKind(resource) !== 'code') {
+    return content;
+  }
+  const language =
+    CODE_LANGUAGES[projectResourcePathExtension(resource.path) ?? ''] ?? 'text';
+  // 围栏长于源码里的任意反引号串，代码生成模板中的 Markdown 不能提前闭合代码块。
+  const longestRun = (content.match(/`+/g) ?? []).reduce(
+    (length, run) => Math.max(length, run.length),
+    0,
+  );
+  const fence = '`'.repeat(Math.max(3, longestRun + 1));
+  return `${fence}${language}\n${content}${content.endsWith('\n') ? '' : '\n'}${fence}`;
+}
diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css
index 39f4c1999..0f8ee6817 100644
--- a/apps/ai-game-creator-shell/src/styles.css
+++ b/apps/ai-game-creator-shell/src/styles.css
@@ -2913,7 +2913,6 @@ textarea {
   border: 1px solid #b9d8c5;
   border-radius: 8px;
   background: #f1f8f3;
-  color: #1f3d2a;
   overflow: hidden;
 }
 
@@ -2966,7 +2965,7 @@ textarea {
 .project-supervisor-process-elapsed {
   margin-left: auto !important;
   color: inherit;
-  font-size: 13px !important;
+  font-size: inherit;
   font-style: normal;
   font-weight: 500;
   white-space: nowrap;
@@ -2991,8 +2990,8 @@ textarea {
 
 .project-supervisor-process-card p {
   margin: 0;
-  color: #263142;
-  font-size: 13px;
+  color: inherit;
+  font-size: inherit;
   line-height: 1.55;
   display: -webkit-box;
   -webkit-box-orient: vertical;
@@ -3037,11 +3036,6 @@ textarea {
 .game-workbench-chat .project-supervisor-process-card {
   border-color: var(--platform-surface-border);
   background: var(--platform-warm-bg);
-  color: var(--platform-text-strong);
-}
-
-.game-workbench-chat .project-supervisor-process-card p {
-  color: var(--platform-text-base);
 }
 
 .project-supervisor-surface .agent-runtime-status {
@@ -11648,8 +11642,6 @@ button.design-workspace-tree__entry:hover,
 
 .design-agent-reasoning {
   margin: 8px 0;
-  color: var(--text-muted);
-  font-size: 0.82em;
 }
 .design-agent-reasoning summary {
   cursor: pointer;
@@ -11658,7 +11650,6 @@ button.design-workspace-tree__entry:hover,
   margin: 6px 0 0;
   white-space: pre-wrap;
   font: inherit;
-  opacity: 0.8;
 }
 
 /* ============================================================
@@ -11807,7 +11798,6 @@ button.design-workspace-tree__entry:hover,
   > .project-supervisor-process-card {
   border-color: var(--platform-line-soft);
   background: var(--platform-neutral-bg);
-  color: var(--platform-text-base);
 }
 
 .game-workbench-chat
@@ -12021,7 +12011,6 @@ button.design-workspace-tree__entry:hover,
   overflow: hidden;
   border-radius: 12px;
   background: var(--platform-button-secondary-fill);
-  color: var(--platform-text-base);
 }
 
 /* 块头：点整行展开，浅底条目本身是块头。 */
@@ -12209,7 +12198,7 @@ button.design-workspace-tree__entry:hover,
   border: 1px solid var(--platform-line-soft);
   border-radius: 8px;
   background: var(--platform-neutral-bg);
-  color: var(--platform-text-base);
+  color: inherit;
   font-size: 11px;
   line-height: 1.6;
   white-space: pre-wrap;
@@ -12229,7 +12218,7 @@ button.design-workspace-tree__entry:hover,
   align-items: baseline;
   gap: 6px;
   min-width: 0;
-  color: var(--platform-text-base);
+  color: inherit;
   font-size: 12px;
   overflow-wrap: anywhere;
 }
@@ -12295,7 +12284,6 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-conversation
   > .project-supervisor-process-card {
   margin: 0 16px 8px;
-  color: var(--platform-text-base);
 }
 
 /* 直连回合的「思考过程」块：默认折叠（<details> 默认收起），展开后按步骤列过程行。
@@ -12389,7 +12377,7 @@ button.design-workspace-tree__entry:hover,
 
 .message-turn-process {
   min-width: 0;
-  color: var(--platform-text-base);
+  color: var(--platform-text-soft);
 }
 
 .message-turn-process > summary {
@@ -12426,8 +12414,6 @@ button.design-workspace-tree__entry:hover,
   .project-supervisor-message-list
   details[data-testid='live-reasoning'] {
   margin: 0;
-  color: var(--platform-text-base);
-  font-size: 12px;
 }
 
 .game-workbench-chat
@@ -12445,7 +12431,7 @@ button.design-workspace-tree__entry:hover,
   white-space: pre-wrap;
   overflow-wrap: anywhere;
   font-family: inherit;
-  font-size: 12px;
+  font-size: inherit;
   line-height: 1.5;
 }
 /* Markdown 正文继承消息颜色，层级由字号和字重表达，不混入全局段落或引用颜色。 */
diff --git a/apps/ai-game-creator-shell/src/view/project-development/ResourceDocumentPreviewDialog.tsx b/apps/ai-game-creator-shell/src/view/project-development/ResourceDocumentPreviewDialog.tsx
new file mode 100644
index 000000000..74b3680de
--- /dev/null
+++ b/apps/ai-game-creator-shell/src/view/project-development/ResourceDocumentPreviewDialog.tsx
@@ -0,0 +1,87 @@
+import { X } from 'lucide-react';
+import { useEffect, useMemo } from 'react';
+
+import { PlatformActionButton } from '../../../../../packages/shared/src/components/PlatformActionButton';
+import { PlatformIconButton } from '../../../../../packages/shared/src/components/PlatformIconButton';
+import { ChatMarkdownMessage } from '../../components/ChatMarkdownMessage';
+import { ThemedModal } from '../../components/modal/ThemedModal';
+import { resourceDocumentPreviewMarkdown } from '../../features/resource-canvas/resourceDocumentPreviewModel';
+import type { ProjectResourceCardPreviewState } from './resourceCardPreviewModel';
+import type { ProjectResource } from './resourceProjectionModel';
+
+export function ResourceDocumentPreviewDialog({
+  resource,
+  identity,
+  preview,
+  onRequestPreview,
+  onClose,
+}: {
+  resource: ProjectResource;
+  identity: string;
+  preview: ProjectResourceCardPreviewState;
+  onRequestPreview: (
+    resource: ProjectResource,
+    identity: string,
+    reason: 'detail',
+  ) => void;
+  onClose: () => void;
+}) {
+  useEffect(() => {
+    onRequestPreview(resource, identity, 'detail');
+  }, [resource, identity, onRequestPreview]);
+  const content =
+    preview.status === 'loaded' ? preview.preview.content : undefined;
+  const markdown = useMemo(
+    () =>
+      content === undefined
+        ? ''
+        : resourceDocumentPreviewMarkdown(resource, content),
+    [resource, content],
+  );
+
+  return (
+    <ThemedModal
+      open
+      ariaLabel="文档预览"
+      onClose={onClose}
+      panelClassName="game-resource-document-preview"
+    >
+      <header className="game-resource-document-preview__header">
+        <strong title={resource.label}>{resource.label}</strong>
+        <PlatformIconButton
+          label="关闭文档预览"
+          title="关闭"
+          icon={<X size={18} aria-hidden="true" />}
+          onClick={onClose}
+        />
+      </header>
+      <div className="game-resource-document-preview__body">
+        {preview.status === 'idle' || preview.status === 'loading' ? (
+          <p role="status">正在加载文档…</p>
+        ) : preview.status === 'failed' ? (
+          <>
+            <p role="alert">{preview.error}</p>
+            {preview.retryable ? (
+              <PlatformActionButton
+                tone="secondary"
+                onClick={() => onRequestPreview(resource, identity, 'detail')}
+              >
+                重试
+              </PlatformActionButton>
+            ) : null}
+          </>
+        ) : content === undefined ? (
+          <p role="alert">没有可预览的文本内容</p>
+        ) : content === '' ? (
+          <p role="status">文档为空</p>
+        ) : (
+          <ChatMarkdownMessage
+            role="assistant"
+            text={markdown}
+            preserveBlankLines
+          />
+        )}
+      </div>
+    </ThemedModal>
+  );
+}
diff --git a/apps/ai-game-creator-shell/src/view/project-development/index.tsx b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
index ebb27ce44..3960acdc0 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/index.tsx
+++ b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
@@ -18,6 +18,7 @@ import { save as saveNativeFileDialog } from '@tauri-apps/plugin-dialog';
 import {
   AtSign,
   Crosshair,
+  Eye,
   FileCode2,
   FileText,
   FolderOpen,
@@ -190,6 +191,7 @@ import {
   currentVersionResourceBindingIds,
   isResourceUsedByCurrentVersion,
 } from '../../features/resource-canvas/resourceCanvasVersionBindingModel';
+import { isResourceDocumentPreviewable } from '../../features/resource-canvas/resourceDocumentPreviewModel';
 import { ResourcePromptPolishSlot } from '../../features/resource-canvas/ResourcePromptPolishSlot';
 import {
   type LocalProjectVersionReplacementCandidate,
@@ -308,6 +310,7 @@ import {
   ResourceDependencyOverlay,
   type ResourceDependencyOverlayHandle,
 } from './ResourceDependencyOverlay';
+import { ResourceDocumentPreviewDialog } from './ResourceDocumentPreviewDialog';
 import {
   canonicalProjectedResourceMediaType,
   createResourceEditRequestIdentity,
@@ -1582,6 +1585,8 @@ export default function ProjectDevelopmentView({
     createResourceCanvasHistory,
   );
   const [resourcePanelOpen, setResourcePanelOpen] = useState(false);
+  const [resourceDocumentPreviewIdentity, setResourceDocumentPreviewIdentity] =
+    useState<string | null>(null);
   /**
    * 「生成素材」浮层的本次放行类型。
    *
@@ -1939,6 +1944,7 @@ export default function ProjectDevelopmentView({
         isClassificationPanelOpen: resourceClassificationOverlayOpen,
         isRenameDialogOpen: resourceRenameAssetId !== null,
         isRecoveryPanelOpen: resourceRecoveryPanelOpen,
+        isDocumentPreviewOpen: resourceDocumentPreviewIdentity !== null,
       },
     }),
     boundaryRefs: [resourceBookManagerRef],
@@ -1966,6 +1972,7 @@ export default function ProjectDevelopmentView({
           isClassificationPanelOpen: resourceClassificationOverlayOpen,
           isRenameDialogOpen: resourceRenameAssetId !== null,
           isRecoveryPanelOpen: resourceRecoveryPanelOpen,
+          isDocumentPreviewOpen: resourceDocumentPreviewIdentity !== null,
         },
       })
     ) {
@@ -1987,6 +1994,7 @@ export default function ProjectDevelopmentView({
     resourceClassificationOverlayOpen,
     resourcePanelOpen,
     resourceRecoveryPanelOpen,
+    resourceDocumentPreviewIdentity,
     resourceRenameAssetId,
     selectedResourceIds,
     uiEditorRoute,
@@ -6350,6 +6358,27 @@ export default function ProjectDevelopmentView({
       null)
     : null;
 
+  useEffect(() => {
+    if (
+      mode !== 'resources' ||
+      uiEditorRoute ||
+      resourceDocumentPreviewIdentity !== selectedResourcePreviewIdentity
+    ) {
+      setResourceDocumentPreviewIdentity(null);
+    }
+  }, [
+    mode,
+    uiEditorRoute,
+    resourceDocumentPreviewIdentity,
+    selectedResourcePreviewIdentity,
+  ]);
+
+  useEffect(() => {
+    if (!resourceDocumentPreviewIdentity) return;
+    protectResourceCardPreview(resourceDocumentPreviewIdentity);
+    return () => protectResourceCardPreview(null);
+  }, [protectResourceCardPreview, resourceDocumentPreviewIdentity]);
+
   /**
    * 解析一次资源派生的源身份：取项目 revision，必要时把任务产物正规化成正式素材。
    *
@@ -7863,13 +7892,38 @@ export default function ProjectDevelopmentView({
                         selectedToolbarStyle &&
                         ((selectedToolbarActions?.size ?? 0) > 0 ||
                           Boolean(selectedResource?.manifestAssetId) ||
+                          Boolean(
+                            selectedResource &&
+                              isResourceDocumentPreviewable(selectedResource),
+                          ) ||
                           selectedResourceOpensUiEditor) ? (
                           <ImageCanvasSelectedLayerToolbarView
                             selectedLayer={selectedResourceLayer}
                             selectedToolbarStyle={selectedToolbarStyle}
                             supportedActions={selectedToolbarActions}
+                            downloadLabel="导出"
                             extraActions={
                               <>
+                                {selectedResource &&
+                                selectedResourcePreviewIdentity &&
+                                isResourceDocumentPreviewable(
+                                  selectedResource,
+                                ) ? (
+                                  <CanvasChromeButton
+                                    className="image-canvas-editor__floating-toolbar-text-button"
+                                    label="预览"
+                                    title="预览"
+                                    icon={<Eye className="h-4 w-4" />}
+                                    onClick={() => {
+                                      stopActiveCardMedia();
+                                      setResourceDocumentPreviewIdentity(
+                                        selectedResourcePreviewIdentity,
+                                      );
+                                    }}
+                                  >
+                                    <span>预览</span>
+                                  </CanvasChromeButton>
+                                ) : null}
                                 {selectedResourceOpensUiEditor ? (
                                   <CanvasChromeButton
                                     className="image-canvas-editor__floating-toolbar-text-button"
@@ -7998,49 +8052,36 @@ export default function ProjectDevelopmentView({
                                     <span>替换素材</span>
                                   </CanvasChromeButton>
                                 ) : null}
-                                {/*
-                                  破坏性动作排在最后，并用共享工具条同一套分隔线（
-                                  `image-canvas-editor__floating-toolbar-divider`）把它与前面的
-                                  非破坏性动作隔开。只删素材登记：磁盘文件保留，确认面板里再问一次
-                                  「是否连带删除引用它的游戏版本」。
-                                */}
-                                {selectedResource?.manifestAssetId ? (
-                                  <>
-                                    <span
-                                      aria-hidden="true"
-                                      className="image-canvas-editor__floating-toolbar-divider"
-                                    />
-                                    <CanvasChromeButton
-                                      className="image-canvas-editor__floating-toolbar-text-button"
-                                      label="删除素材"
-                                      title="删除素材"
-                                      icon={<Trash2 className="h-4 w-4" />}
-                                      disabled={
-                                        resourceAssetDeleteFlow.deleting ||
-                                        resourceAssetDeleteFlow.preparing
-                                      }
-                                      onClick={() => {
-                                        if (!selectedResource.manifestAssetId) {
-                                          return;
-                                        }
-                                        void resourceAssetDeleteFlow.requestDelete(
-                                          {
-                                            assetId:
-                                              selectedResource.manifestAssetId,
-                                            // 资源投影的 `path` 就是 manifest 资产的
-                                            // `localPath`（见 `resourceProjectionModel`），
-                                            // 与面板曾用的副标题同源。
-                                            localPath: selectedResource.path,
-                                          },
-                                        );
-                                      }}
-                                    >
-                                      <span>删除素材</span>
-                                    </CanvasChromeButton>
-                                  </>
-                                ) : null}
                               </>
                             }
+                            endActions={
+                              selectedResource?.manifestAssetId ? (
+                                <CanvasChromeButton
+                                  className="image-canvas-editor__floating-toolbar-text-button"
+                                  label="删除素材"
+                                  title="删除素材"
+                                  icon={<Trash2 className="h-4 w-4" />}
+                                  disabled={
+                                    resourceAssetDeleteFlow.deleting ||
+                                    resourceAssetDeleteFlow.preparing
+                                  }
+                                  onClick={() => {
+                                    if (!selectedResource.manifestAssetId) {
+                                      return;
+                                    }
+                                    void resourceAssetDeleteFlow.requestDelete({
+                                      assetId: selectedResource.manifestAssetId,
+                                      // 资源投影的 `path` 就是 manifest 资产的
+                                      // `localPath`（见 `resourceProjectionModel`），
+                                      // 与面板曾用的副标题同源。
+                                      localPath: selectedResource.path,
+                                    });
+                                  }}
+                                >
+                                  <span>删除素材</span>
+                                </CanvasChromeButton>
+                              ) : null
+                            }
                             onOpenQuickEditPanel={openResourceQuickEditPanel}
                             onOpenRedrawPanel={() => {}}
                             onOpenCropExpandPanel={() => {}}
@@ -8765,6 +8806,24 @@ export default function ProjectDevelopmentView({
         onFocusTask={focusResourceAssetGenerationTask}
       />
 
+      {mode === 'resources' &&
+      !uiEditorRoute &&
+      selectedResource &&
+      resourceDocumentPreviewIdentity &&
+      resourceDocumentPreviewIdentity === selectedResourcePreviewIdentity ? (
+        <ResourceDocumentPreviewDialog
+          key={resourceDocumentPreviewIdentity}
+          resource={selectedResource}
+          identity={resourceDocumentPreviewIdentity}
+          preview={
+            resourceCardPreviews.previews.get(
+              resourceDocumentPreviewIdentity,
+            ) ?? resourceCardPreviews.idlePreview
+          }
+          onRequestPreview={resourceCardPreviews.requestPreview}
+          onClose={() => setResourceDocumentPreviewIdentity(null)}
+        />
+      ) : null}
       {resourcePanelOpen ? (
         <ResourceCanvasPanelView
           entries={resourcePanelEntries}
diff --git a/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts b/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
index 2f73589f0..c336f025b 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
+++ b/apps/ai-game-creator-shell/src/view/project-development/resourceCardPreviewModel.ts
@@ -224,7 +224,8 @@ const markdownExtension = /\.(md|markdown|mdx)$/iu;
 const cardCodeExtension =
   /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs|rs|py|go|java|kt|kts|cs|cpp|cc|cxx|c|h|hpp|swift|php|rb|lua|sh|bash|zsh|ps1|psm1|json|jsonc|ya?ml|toml|xml|html?|css|scss|less|sql|graphql|gql|vue|svelte)$/iu;
 /** 纯文本：按纯文本处理，显示前几行但不做标记清理。 */
-const plainTextExtension = /\.(txt|text|csv|tsv|log|ini|conf|cfg|properties|env)$/iu;
+const plainTextExtension =
+  /\.(txt|text|csv|tsv|log|ini|conf|cfg|properties|env)$/iu;
 
 /**
  * 取路径末段的扩展名（小写、不含点）。取不到（无扩展名）时返回 `null`。
@@ -330,7 +331,7 @@ export function projectResourceCardPreviewVariant(
 }
 
 /**
- * 代码卡**不做文件读取**的判据：卡面只用路径画图标，读内容既无用又占读取槽。
+ * 卡面是否预取正文：代码卡只用路径画图标，不为卡面占读取槽；显式详情请求单独放行。
  *
  * 与 `projectResourceCardPreviewVariant` 同源，避免"卡面不画内容、却仍在后台读内容"的分叉。
  */
diff --git a/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts b/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
index fffa0bd38..f175264ba 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
+++ b/apps/ai-game-creator-shell/src/view/project-development/useProjectResourceCardPreviews.ts
@@ -26,8 +26,8 @@ import {
   projectResourceCardPreviewImageDimensions,
   type ProjectResourceCardPreviewKind,
   projectResourceCardPreviewKind,
-  projectResourceCardPreviewReadsContent,
   type ProjectResourceCardPreviewPayload,
+  projectResourceCardPreviewReadsContent,
   type ProjectResourceCardPreviewState,
   type ProjectResourceCardPreviewTransportPayload,
   projectResourceMediaPreviewCategory,
@@ -492,11 +492,7 @@ export function useProjectResourceCardPreviews(input: {
       job: PreviewJob,
     ): Promise<ProjectResourceCardPreviewTransportPayload> => {
       const kind = projectResourceCardPreviewKind(job.resource);
-      /**
-       * 这段之前的 `kind === 'document' || kind === 'code'` 双分支已收窄：代码卡在
-       * `requestPreview` 的入队门禁就被挡下（**判据同源**，见 `projectResourceCardPreviewReadsContent`），
-       * 走到这里的只可能是需要读内容的文档卡（Markdown / 纯文本）。
-       */
+      // 内联文档和按需打开的代码详情共用现有预览结果，不另建读取或缓存链路。
       if (job.resource.content !== undefined) {
         return {
           path: job.resource.path,
@@ -508,7 +504,7 @@ export function useProjectResourceCardPreviews(input: {
       const invoke = window.__TAURI__?.core?.invoke;
       if (!invoke) {
         throw new Error(
-          kind === 'document'
+          kind === 'document' || kind === 'code'
             ? '文档预览需要在客户端内打开'
             : '媒体预览需要在客户端内打开',
         );
@@ -636,16 +632,11 @@ export function useProjectResourceCardPreviews(input: {
         return;
       }
       const kind = projectResourceCardPreviewKind(resource);
-      /**
-       * 代码卡**不入队列、不读内容**：卡面只用路径画图标 + 类型标签，读回来的内容没有任何
-       * 消费方。此前代码卡与文档卡走同一条读取分支，读回一大段源码再被折成一行摘要 ——
-       * 既是"丑预览"的来源，也白占全局 3 个读取槽。
-       *
-       * 判据与卡面分流（`projectResourceCardPreviewVariant`）同源，避免"卡面不画内容、
-       * 后台仍在读内容"的分叉。这里直接 `return` 而不是入队后失败：卡停在 `idle`，
-       * 卡面照常画代码图标，不产生误导性的失败态。
-       */
-      if (!projectResourceCardPreviewReadsContent(resource)) {
+      // 代码卡不预取正文；只有显式打开详情才占读取槽，沿用同一队列和项目权限边界。
+      if (
+        !projectResourceCardPreviewReadsContent(resource) &&
+        reason !== 'detail'
+      ) {
         return;
       }
       if (
diff --git a/apps/ai-game-creator-shell/tests/AgentMessageContent.test.tsx b/apps/ai-game-creator-shell/tests/AgentMessageContent.test.tsx
new file mode 100644
index 000000000..e0287af70
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/AgentMessageContent.test.tsx
@@ -0,0 +1,111 @@
+// @vitest-environment jsdom
+
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+import { render } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+
+import { AgentMessageContent } from '../../../packages/shared/src/components/AgentMessageContent';
+import { ChatMarkdownMessage } from '../src/components/ChatMarkdownMessage';
+import {
+  declaration,
+  parseStyleSheet,
+  resolveDeclarations,
+} from './styleCascade';
+
+const sharedCss = readFileSync(
+  resolve(
+    process.cwd(),
+    'packages/shared/src/components/AgentMessageContent.css',
+  ),
+  'utf8',
+);
+const appCss = readFileSync(
+  resolve(process.cwd(), 'apps/ai-game-creator-shell/src/styles.css'),
+  'utf8',
+);
+const base = '.agent-message-content[data-agent-content]';
+const processTone = ".agent-message-content[data-agent-content='process']";
+
+describe('AgentMessageContent', () => {
+  it('正文与过程复用表现组件，保留折叠语义和宿主属性', () => {
+    const { container } = render(
+      <>
+        <AgentMessageContent>最终回复</AgentMessageContent>
+        <AgentMessageContent as="details" tone="process" aria-label="思考过程">
+          <summary>思考过程</summary>
+          <pre>先分析需求</pre>
+        </AgentMessageContent>
+      </>,
+    );
+    expect(
+      container.querySelector('[data-agent-content="body"]')?.textContent,
+    ).toBe('最终回复');
+    const details = container.querySelector('details')!;
+    expect(details.getAttribute('data-agent-content')).toBe('process');
+    expect(details.getAttribute('aria-label')).toBe('思考过程');
+    expect(details.open).toBe(false);
+  });
+
+  it('过程的标题和表格继承层级变量，不用强制字号压回正文大小', () => {
+    const { container } = render(
+      <AgentMessageContent tone="process">
+        <ChatMarkdownMessage
+          role="assistant"
+          text={
+            '# 分析\n\n| 项目 |\n| --- |\n| 内容 |\n\n```js\nconst value = 1;\n```'
+          }
+        />
+      </AgentMessageContent>,
+    );
+    expect(container.querySelector('h1')?.getAttribute('style')).toContain(
+      '--agent-message-heading-size',
+    );
+    expect(container.querySelector('table')?.getAttribute('style')).toContain(
+      '--agent-message-table-size',
+    );
+    expect(container.querySelector('pre code .hljs-keyword')).not.toBeNull();
+  });
+
+  it.each([sharedCss + appCss, appCss + sharedCss])(
+    '共享层级不受宿主 CSS 加载顺序影响',
+    (css) => {
+      const rules = parseStyleSheet(css);
+      const body = resolveDeclarations(rules, [base], 1024);
+      expect(declaration(body, 'font-size')).toBe('14px');
+      expect(declaration(body, 'color')).toContain('--platform-text-strong');
+      for (const host of [
+        ['.design-agent-reasoning'],
+        ['.agent-tool-call-group'],
+        [
+          '.project-supervisor-process-card',
+          '.game-workbench-chat .project-supervisor-process-card',
+          '.game-workbench-chat .project-supervisor-surface.is-direct-codex .project-supervisor-conversation > .project-supervisor-process-card',
+        ],
+      ]) {
+        const process = resolveDeclarations(
+          rules,
+          [base, processTone, ...host],
+          1024,
+        );
+        expect(declaration(process, 'font-size')).toBe('12px');
+        expect(declaration(process, 'color')).toContain('--platform-text-soft');
+        expect(declaration(process, '--agent-message-heading-size')).toBe(
+          '1em',
+        );
+      }
+      const failure = resolveDeclarations(
+        rules,
+        [
+          '.agent-tool-call-row-status',
+          ".agent-tool-call-group-row[data-status='failed'] .agent-tool-call-row-status",
+        ],
+        1024,
+      );
+      expect(declaration(failure, 'color')).toBe(
+        'var(--platform-button-danger-text)',
+      );
+    },
+  );
+});
diff --git a/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx b/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
index cd3a150bd..665eedee6 100644
--- a/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
+++ b/apps/ai-game-creator-shell/tests/ChatMarkdownMessage.test.tsx
@@ -16,6 +16,46 @@ function FailingChild({ shouldThrow }: { shouldThrow: boolean }) {
 }
 
 describe('ChatMarkdownMessage', () => {
+  it('代码块带语言标识及高亮节点，文件预览保留空行和 HTML 源码', () => {
+    const source =
+      'const value = "<script>alert(1)</script>";\n\n\n  return value;\n';
+    const { container } = render(
+      <ChatMarkdownMessage
+        role="assistant"
+        preserveBlankLines
+        text={`\`\`\`\`typescript\n${source}\`\`\`\``}
+      />,
+    );
+    expect(container.querySelector('pre code')?.textContent).toBe(source);
+    expect(
+      container.querySelector('code.language-typescript .hljs-keyword'),
+    ).not.toBeNull();
+    expect(container.querySelector('script')).toBeNull();
+  });
+
+  it('未知语言保留代码而不进入错误回退', () => {
+    const { container } = render(
+      <ChatMarkdownMessage
+        role="assistant"
+        text={'```unknown-language\n原始内容\n```'}
+      />,
+    );
+    expect(container.querySelector('pre code')?.textContent).toBe('原始内容\n');
+  });
+
+  it('大文件跳过高亮但保留完整代码', () => {
+    const source = 'const value = 42;\n'.repeat(6000);
+    const { container } = render(
+      <ChatMarkdownMessage
+        role="assistant"
+        preserveBlankLines
+        text={`\`\`\`js\n${source}\`\`\``}
+      />,
+    );
+    expect(container.querySelector('pre code')?.textContent).toBe(source);
+    expect(container.querySelector('.hljs-keyword')).toBeNull();
+  });
+
   it('渲染 assistant 的 GFM 内容与代码块', () => {
     const { container } = render(
       <ChatMarkdownMessage
diff --git a/apps/ai-game-creator-shell/tests/ResourceDocumentPreviewDialog.test.tsx b/apps/ai-game-creator-shell/tests/ResourceDocumentPreviewDialog.test.tsx
new file mode 100644
index 000000000..254954d60
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/ResourceDocumentPreviewDialog.test.tsx
@@ -0,0 +1,126 @@
+// @vitest-environment jsdom
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
+import type { ReactNode } from 'react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { ResourceDocumentPreviewDialog } from '../src/view/project-development/ResourceDocumentPreviewDialog';
+import type { ProjectResource } from '../src/view/project-development/resourceProjectionModel';
+
+vi.mock('../src/components/modal/ThemedModal', () => ({
+  ThemedModal: ({
+    children,
+    ariaLabel,
+  }: {
+    children: ReactNode;
+    ariaLabel: string;
+  }) => (
+    <section role="dialog" aria-label={ariaLabel}>
+      {children}
+    </section>
+  ),
+}));
+afterEach(cleanup);
+
+const resource: ProjectResource = {
+  id: 'doc',
+  path: 'docs/design.md',
+  label: '设计文档',
+  mediaType: 'text/markdown',
+  category: 'document',
+  subtype: 'document',
+  manifestAssetId: 'doc',
+  sourceLabel: '',
+  taskTitle: null,
+  producerTaskId: null,
+  externalResourceId: null,
+  referenceResourceIds: [],
+  dependencies: [],
+  dependencyDepth: 0,
+};
+
+describe('ResourceDocumentPreviewDialog', () => {
+  it('加载时通过现有详情回调请求正文，加载完成复用 Markdown 渲染', () => {
+    const onRequestPreview = vi.fn();
+    const onClose = vi.fn();
+    const props = { resource, identity: 'doc:v1', onRequestPreview, onClose };
+    const { rerender } = render(
+      <ResourceDocumentPreviewDialog
+        {...props}
+        preview={{ status: 'loading' }}
+      />,
+    );
+    expect(screen.getByRole('status').textContent).toContain('加载');
+    expect(onRequestPreview).toHaveBeenCalledWith(resource, 'doc:v1', 'detail');
+    rerender(
+      <ResourceDocumentPreviewDialog
+        {...props}
+        preview={{
+          status: 'loaded',
+          preview: {
+            path: resource.path,
+            mediaType: resource.mediaType,
+            byteLen: 10,
+            content: '# 标题\n\n**正文**',
+          },
+        }}
+      />,
+    );
+    expect(screen.getByRole('heading', { name: '标题' })).toBeTruthy();
+    fireEvent.click(screen.getByRole('button', { name: '关闭文档预览' }));
+    expect(onClose).toHaveBeenCalledOnce();
+  });
+
+  it('失败显示错误与重试，换资源进入加载态时不残留旧正文', () => {
+    const onRequestPreview = vi.fn();
+    const props = {
+      resource,
+      identity: 'doc:v1',
+      onRequestPreview,
+      onClose: vi.fn(),
+    };
+    const { rerender } = render(
+      <ResourceDocumentPreviewDialog
+        {...props}
+        preview={{
+          status: 'failed',
+          error: '文档读取失败',
+          retryable: true,
+        }}
+      />,
+    );
+    expect(screen.getByRole('alert').textContent).toBe('文档读取失败');
+    onRequestPreview.mockClear();
+    fireEvent.click(screen.getByRole('button', { name: '重试' }));
+    expect(onRequestPreview).toHaveBeenCalledWith(resource, 'doc:v1', 'detail');
+    rerender(
+      <ResourceDocumentPreviewDialog
+        {...props}
+        identity="doc:v2"
+        preview={{ status: 'loading' }}
+      />,
+    );
+    expect(screen.queryByRole('alert')).toBeNull();
+    expect(screen.getByRole('status').textContent).toContain('加载');
+  });
+
+  it('空文档显示空态而不是永久加载', () => {
+    render(
+      <ResourceDocumentPreviewDialog
+        resource={resource}
+        identity="doc:v1"
+        onRequestPreview={vi.fn()}
+        onClose={vi.fn()}
+        preview={{
+          status: 'loaded',
+          preview: {
+            path: resource.path,
+            mediaType: resource.mediaType,
+            byteLen: 0,
+            content: '',
+          },
+        }}
+      />,
+    );
+    expect(screen.getByRole('status').textContent).toBe('文档为空');
+  });
+});
diff --git a/apps/ai-game-creator-shell/tests/appSurface/design-agent.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/design-agent.suite.ts
index 499ec2464..54d9722fa 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/design-agent.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/design-agent.suite.ts
@@ -227,6 +227,7 @@ export function registerDesignAgentSurfaceTests() {
 
     const summary = await screen.findByText('思考过程');
     const details = summary.closest('details') as HTMLDetailsElement;
+    expect(details.getAttribute('data-agent-content')).toBe('process');
     expect(details.open).toBe(false);
     fireEvent.click(summary);
     expect(details.open).toBe(true);
@@ -257,6 +258,11 @@ export function registerDesignAgentSurfaceTests() {
       (summary) => summary.closest('details') as HTMLDetailsElement,
     );
     expect(details.every((element) => !element.open)).toBe(true);
+    expect(
+      details.every(
+        (element) => element.getAttribute('data-agent-content') === 'process',
+      ),
+    ).toBe(true);
     fireEvent.click(summaries[0]);
     expect(details[0].open).toBe(true);
     expect(details[1].open).toBe(false);
diff --git a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
index f58f36587..de4d266cc 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/tool-call-group.suite.ts
@@ -112,6 +112,7 @@ export function registerToolCallGroupTests() {
       '[data-testid="agent-tool-call-group"]',
     ) as HTMLElement;
     expect(group).not.toBeNull();
+    expect(group.getAttribute('data-agent-content')).toBe('process');
     const head = within(group).getByTestId('agent-tool-call-group-head');
     // 块头是一行按钮：图标 + 汇总 + 展开箭头，默认折叠，正文由 `hidden` 收起。
     expect(head.tagName).toBe('BUTTON');
diff --git a/apps/ai-game-creator-shell/tests/resourceCanvasFloatingDismiss.test.tsx b/apps/ai-game-creator-shell/tests/resourceCanvasFloatingDismiss.test.tsx
index 3064b7f02..f3a58a319 100644
--- a/apps/ai-game-creator-shell/tests/resourceCanvasFloatingDismiss.test.tsx
+++ b/apps/ai-game-creator-shell/tests/resourceCanvasFloatingDismiss.test.tsx
@@ -240,6 +240,20 @@ describe('resourceCanvasFocusModel', () => {
         hostOverlay: { ...closed, isRenameDialogOpen: true },
       }),
     ).toBe(false);
+    const documentPreviewOverlay = { ...closed, isDocumentPreviewOpen: true };
+    expect(
+      resolveResourceCanvasFocusEscapeActive({
+        ...base,
+        hostOverlay: documentPreviewOverlay,
+      }),
+    ).toBe(false);
+    expect(
+      resolveResourceCanvasFloatingPanelDismissOpen({
+        isCanvasVisible: true,
+        isFloatingPanelOpen: true,
+        hostOverlay: documentPreviewOverlay,
+      }),
+    ).toBe(false);
   });
 });
 
diff --git a/apps/ai-game-creator-shell/tests/resourceCanvasToolbarModel.test.ts b/apps/ai-game-creator-shell/tests/resourceCanvasToolbarModel.test.ts
index 3e83c916d..c130241e6 100644
--- a/apps/ai-game-creator-shell/tests/resourceCanvasToolbarModel.test.ts
+++ b/apps/ai-game-creator-shell/tests/resourceCanvasToolbarModel.test.ts
@@ -237,6 +237,34 @@ describe('resource canvas toolbar actions', () => {
     );
   });
 
+  it.each([
+    ['image/png', 'character', 'assets/hero.png'],
+    ['image/svg+xml', 'icon', 'assets/icon.svg'],
+    ['image/png', 'character-animation', 'assets/walk.png'],
+    ['video/mp4', 'video', 'assets/intro.mp4'],
+    ['audio/wav', 'sound-effect', 'assets/hit.wav'],
+    ['audio/mpeg', 'background-music', 'assets/music.mp3'],
+    ['text/html', 'ui-prototype', 'ui/menu.html'],
+    ['text/markdown', 'document', 'docs/design.md'],
+    ['application/json', 'other', 'assets/data.json'],
+    ['application/octet-stream', 'other', 'assets/model.bin'],
+  ])(
+    '%s 素材导出不依赖媒体类型、预览或 manifest 身份',
+    (mediaType, subtype, path) => {
+      expect(
+        toolbarActions(
+          createManifest(),
+          createResource({
+            mediaType,
+            subtype,
+            path,
+            manifestAssetId: null,
+          }),
+        ),
+      ).toContain('download');
+    },
+  );
+
   it('拿不到本地文件路径的资源不放行下载，避免渲染出点了报错的按钮', () => {
     const manifest = createManifest();
     expect(
diff --git a/apps/ai-game-creator-shell/tests/resourceDocumentPreviewModel.test.ts b/apps/ai-game-creator-shell/tests/resourceDocumentPreviewModel.test.ts
new file mode 100644
index 000000000..9254c9462
--- /dev/null
+++ b/apps/ai-game-creator-shell/tests/resourceDocumentPreviewModel.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  isResourceDocumentPreviewable,
+  resourceDocumentPreviewMarkdown,
+} from '../src/features/resource-canvas/resourceDocumentPreviewModel';
+import type { ProjectResource } from '../src/view/project-development/resourceProjectionModel';
+
+function resource(path: string): ProjectResource {
+  return {
+    id: path,
+    path,
+    label: path,
+    mediaType: 'text/plain',
+    category: 'document',
+    subtype: 'document',
+    manifestAssetId: 'doc',
+    sourceLabel: '',
+    taskTitle: null,
+    producerTaskId: null,
+    externalResourceId: null,
+    referenceResourceIds: [],
+    dependencies: [],
+    dependencyDepth: 0,
+  };
+}
+
+describe('resourceDocumentPreviewMarkdown', () => {
+  it('文档与空行原样进入 Markdown 渲染', () => {
+    const text = '# 标题\n\n\n|列|\n|-|\n|值|';
+    expect(
+      resourceDocumentPreviewMarkdown(resource('docs/design.md'), text),
+    ).toBe(text);
+    expect(isResourceDocumentPreviewable(resource('docs/design.md'))).toBe(
+      true,
+    );
+  });
+
+  it.each([
+    ['game/main.ts', 'typescript'],
+    ['game/main.js', 'javascript'],
+    ['assets/data.json', 'json'],
+    ['game/main.py', 'python'],
+  ])('%s 包为 %s 代码块', (path, language) => {
+    expect(
+      resourceDocumentPreviewMarkdown(resource(path), '  source\n\n\n'),
+    ).toBe(`\`\`\`${language}\n  source\n\n\n\`\`\``);
+  });
+
+  it('正文包含 Markdown 围栏时不会逃出代码块', () => {
+    const text = 'const sample = "````";\n\n\n<script>alert(1)</script>';
+    expect(
+      resourceDocumentPreviewMarkdown(resource('game/main.js'), text),
+    ).toBe(`\`\`\`\`\`javascript\n${text}\n\`\`\`\`\``);
+  });
+
+  it('图片没有文档预览入口，内联文档不要求文件路径', () => {
+    expect(
+      isResourceDocumentPreviewable({
+        ...resource('assets/image.png'),
+        mediaType: 'image/png',
+        subtype: 'image',
+      }),
+    ).toBe(false);
+    expect(
+      isResourceDocumentPreviewable({
+        ...resource(''),
+        content: '# 回执',
+        subtype: 'agent-result',
+      }),
+    ).toBe(true);
+    expect(isResourceDocumentPreviewable(resource(''))).toBe(false);
+  });
+});
diff --git a/apps/ai-game-creator-shell/tests/useProjectResourceCardPreviews.test.ts b/apps/ai-game-creator-shell/tests/useProjectResourceCardPreviews.test.ts
index feba40865..6e821454f 100644
--- a/apps/ai-game-creator-shell/tests/useProjectResourceCardPreviews.test.ts
+++ b/apps/ai-game-creator-shell/tests/useProjectResourceCardPreviews.test.ts
@@ -141,6 +141,65 @@ afterEach(() => {
 });
 
 describe('useProjectResourceCardPreviews', () => {
+  it('代码卡不预取正文，显式详情复用文本预览队列与缓存', async () => {
+    const code = resource('code', {
+      path: 'game/main.ts',
+      subtype: 'code',
+      mediaType: 'text/typescript',
+    });
+    const invoke = vi.fn(
+      async (_command: string, _args?: Record<string, unknown>) => ({
+        path: code.path,
+        mediaType: code.mediaType,
+        byteLen: 19,
+        content: 'const answer = 42;',
+      }),
+    );
+    window.__TAURI__ = {
+      core: {
+        invoke: async <Result>(
+          command: string,
+          args?: Record<string, unknown>,
+        ) => (await invoke(command, args)) as Result,
+      },
+    };
+    const { result } = renderHook(() =>
+      useProjectResourceCardPreviews({
+        projectPath: '/tmp/document-preview',
+        projectId: 'document-preview',
+        mode: 'dependency',
+        resources: [code],
+        canvasRef: { current: document.createElement('div') },
+        eagerPreviewLimit: 12,
+      }),
+    );
+    const identity = result.current.identityByResourceId.get(code.id)!;
+    act(() => result.current.requestPreview(code, identity, 'visible'));
+    expect(
+      invoke.mock.calls.some(
+        ([command]) => command === 'read_local_project_text_preview',
+      ),
+    ).toBe(false);
+    act(() => result.current.requestPreview(code, identity, 'detail'));
+    await waitFor(() =>
+      expect(result.current.previews.get(identity)?.status).toBe('loaded'),
+    );
+    expect(invoke).toHaveBeenCalledWith(
+      'read_local_project_text_preview',
+      expect.objectContaining({
+        relativePath: code.path,
+        scopeId: expect.any(String),
+        requestId: expect.any(String),
+      }),
+    );
+    act(() => result.current.requestPreview(code, identity, 'detail'));
+    expect(
+      invoke.mock.calls.filter(
+        ([command]) => command === 'read_local_project_text_preview',
+      ),
+    ).toHaveLength(1);
+  });
+
   it('prefetches initial previewable resources without requiring a detail click', async () => {
     const art = resource('initial-art');
     const invoke = vi.fn(
diff --git a/docs/project-memory/plans/【实施计划】文档素材Markdown预览-2026-09-16.md b/docs/project-memory/plans/【实施计划】文档素材Markdown预览-2026-09-16.md
new file mode 100644
index 000000000..2e917adea
--- /dev/null
+++ b/docs/project-memory/plans/【实施计划】文档素材Markdown预览-2026-09-16.md
@@ -0,0 +1,17 @@
+# 文档素材 Markdown 预览实施计划
+
+- Date: 2026-09-16
+- Status: implemented-awaiting-validation
+- Milestone: `【里程碑】文档素材Markdown预览-2026-09-16.md`
+
+## 边界与顺序
+
+1. 扩展现有 Markdown 渲染器的代码高亮，未知语言、大正文安全降级；文档模式保留原始空行。
+2. 用资源现有预览类型和扩展名生成 Markdown；代码只放行 `detail` 读取。
+3. 工具栏挂载预览入口，复用 ThemedModal 和预览缓存展示加载/空/失败状态，身份变化关闭旧预览。
+4. 补充格式转换、渲染和按需读取回归用例，不执行测试。
+5. 执行 AGC TypeScript、编码、文档索引、CSS 语法与 diff 检查。
+
+## 风险与回滚
+
+重点检查高亮 class 不被自定义 code 渲染丢弃、Markdown 围栏不吞正文、弹窗 Esc 不误清画布选中、文档切换不串内容。回滚仅移除本次入口/渲染增量，保留此前工具栏修改，不改资源数据。
diff --git a/docs/project-memory/plans/【里程碑】文档素材Markdown预览-2026-09-16.md b/docs/project-memory/plans/【里程碑】文档素材Markdown预览-2026-09-16.md
new file mode 100644
index 000000000..703167563
--- /dev/null
+++ b/docs/project-memory/plans/【里程碑】文档素材Markdown预览-2026-09-16.md
@@ -0,0 +1,23 @@
+# 文档素材 Markdown 预览
+
+- Version: 1
+- Status: implemented-awaiting-validation
+- Date: 2026-09-16
+- Parent Spec: `docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md` 的“文档与代码素材预览”。
+
+## 范围与评审
+
+单里程碑：在已有资源画布和 Markdown 渲染链路中增加只读文档/代码预览。
+边界评审：沿用现有权限、scope 与缓存身份；不改 Rust/DTO/持久化数据；代码只在详情请求读取，卡片预取不变；未知语言与大文件退回普通代码，不执行源码。无前置里程碑。
+
+## 验收
+
+- 文档/代码有预览入口，其它素材无此入口；弹窗支持关闭与滚动。
+- Markdown 标题、列表、表格可读；代码有语言高亮，反引号、缩进、空行不丢失。
+- 代码可见性预取仍不读文件；显式详情复用现有队列。
+- 加载、空文件、错误与切换身份不显示错误素材的正文。
+- AGC 类型、编码、文档索引与 diff 检查通过。按用户此前约束不运行测试，补充回归用例，实机验收单列为待验证。
+
+## 验收状态
+
+已实现入口、弹窗、队列按需读取、Markdown 代码围栏与高亮；已通过 AGC TypeScript（含新增预览测试文件的静态类型检查）、编码、文档索引、CSS 语法和 diff 检查。回归用例未执行；原生客户端读取、弹窗焦点/滚动和视觉验收仍待验证，不进入下一里程碑。
diff --git a/docs/project-memory/shared-memory/team-conventions.md b/docs/project-memory/shared-memory/team-conventions.md
index 7dec95491..98662a4e2 100644
--- a/docs/project-memory/shared-memory/team-conventions.md
+++ b/docs/project-memory/shared-memory/team-conventions.md
@@ -18,6 +18,7 @@
 
 - 修改范围保持聚焦；优先扩展现有系统、页面、组件、DTO 和脚本，不新建平行入口或业务真相。
 - UI 开发优先复用现有公共组件；跨页面或跨端重复的视觉/交互模式应沉淀到 `packages/shared`，由现有页面迁移使用，禁止在业务页复制同类 UI。共享组件只承载通用表现与交互，不下沉领域规则、后端副作用或正式业务状态。
+- AGC 当前 Agent 与策划 Agent 的消息层级共用 `packages/shared` 的 `AgentMessageContent`：正文使用 `body`，思考、中间输出与工具调用使用 `process`；宿主不按 Agent 类型重新定义过程字号和颜色，错误状态保留语义色。
 - 后端遵循 `module-*`、`spacetime-module`、`spacetime-client`、`api-server`、`platform-*`、`shared-contracts` 的现役边界。
 - 前端只负责表现、交互和临时 UI 状态；正式状态来自后端投影、API 或持久化契约。
 - 对已明确退役且无现役调用方、公开契约、持久化迁移或活跃实例的对象，不写兼容实现、维持旧行为的测试、墓碑注释或墓碑文档。
diff --git a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
index 7c9ed80f0..e861ab2f6 100644
--- a/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
+++ b/docs/technical/【技术方案】AI游戏创作智能体App实施计划-2026-06-24.md
@@ -1,5 +1,18 @@
 # AI 游戏创作智能体 App 实施计划
 
+## 资源卡选中工具栏与导出
+
+- 共享选中工具栏按实际显示的快速编辑、编辑动作、改造、导出与宿主动作组生成分隔线；空组不产生分隔线，不依赖宿主 CSS 隐藏重复线。
+- AGC 所有具有本地文件路径的素材都显示带文字的「导出」按钮，位于工具栏末组的「删除素材」之前，两者之间不插入分隔线；「重命名」继续保留在前面的常规动作组。工具栏宽度上限为 `min(92vw, 800px)`，窄屏仍可横向滚动。图片、视频、音频、动画、UI、文档及其它文件共用 `isResourceCanvasExportable`，不按媒体类型限制导出；无文件路径及虚拟项目版本不提供文件导出入口。
+- 导出继续复用 `saveProjectResourcesToDisk`：原生保存对话框选择路径，`save_local_project_asset_file` 复制原始文件字节，不转图片、不重编码、不另建 IPC。后端继续校验源文件、敏感路径和目标路径；取消不写文件，失败通过工作台提示。
+
+## 文档与代码素材预览
+
+- 文档与代码素材选中工具栏提供「预览」，打开独立、可滚动的只读弹窗；关闭、切换素材或项目后不残留旧内容。加载中、空文件与读取失败分别呈现，允许重试可重试的错误。
+- 复用资源预览队列、身份缓存、项目 scope、失效与权限校验，继续调用 `read_local_project_text_preview`。代码卡不做可见性预取，仅用户显式打开详情时读取；不新增 IPC，不扩大可读取文件范围，不增加编辑/保存能力。
+- 文档正文统一使用现有 Markdown 渲染器；代码文件以按扩展名标注语言的 Markdown 围栏代码块呈现。围栏必须长于正文内的反引号串，正文空行与缩进保持原样，不把源码当 Markdown 正文或 HTML 执行。
+- 现有 Markdown 渲染器统一提供代码高亮，保留 HTML 禁用及外链/图片安全策略；未知语言回退普通代码块。超大正文跳过高亮但不截断内容，避免流式对话或文件预览被高亮计算阻塞。
+
 ## DirectProject 用户消息契约验证
 
 `chat_with_game_creator_direct_codex` 必须携带 `projectPath`、`prompt`、稳定的 `clientTurnId` 和完整 `userItem`；`creationType` 与 `attachments` 按实际输入传递。Rust 通过 `projectPath` 解析项目身份，不接收额外 `projectId`。界面测试必须核对 `userItem` 的消息身份、角色、正文及附件内容，拒绝回合用例仍验证实际返回的错误原因。重开项目的历史恢复测试使用 `read_direct_project_history_slice` 的 canonical raw items 与 `hasMore`，首屏 `limit: 20`。资源图和生成任务的读取继续遵守原有工作台恢复逻辑，不因聊天断言失败延迟、关闭或改变它们。
diff --git a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
index 472967863..11ce76401 100644
--- a/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
+++ b/docs/technical/【技术方案】GameAgent对话工具调用卡片-2026-09-14.md
@@ -99,7 +99,7 @@ toolCalls?: DirectTurnToolCall[] | null;
   - 耗时：单条工具 = `startedAt` → `updatedAt`，块头总用时 = 该回合所有工具的 `min(startedAt)` → `max(updatedAt)`。单条格式：`<1s` → `0.4s`、`<60s` → `12.3s`（整秒省略小数）、`≥60s` → `2m 5s`；块头格式：`42秒` / `4分钟` / `5分钟 45秒`。`startedAt` 为 0 或 `updatedAt < startedAt` 时不显示耗时（不显示 `0s` / 负数），耗时为 0 时同样不显示 `0s`。
   - 时间：块头显示该回合结束时间（`max(updatedAt)` 的本地 `HH:mm:ss`）；同一回合能拿到用户消息时间（`updatedAt > 0`）时显示 `HH:mm:ss → HH:mm:ss`（发送 → 结束），取不到就只显示结束时间，不编造。
   - 回合结束时间与耗时在正文下方右对齐；Direct 对话输入框提示统一为“描述你的想法，或 @ 引用素材”，引用按钮保留输入盒的 12px 内边距，不使用负边距贴边。
-  - 对话普通文字统一使用 `--platform-text-base`：用户与助手正文、工具摘要和输入输出、执行过程、发送时间及耗时同色，层级通过字号和字重表达。工具子元素继承容器颜色，失败状态保留错误色；输入提示使用主题弱文字色，禁用状态保留原有反馈，不混用硬编码灰蓝、绿色或棕色。
+  - 当前 Agent 与策划 Agent 共用 `packages/shared` 的 `AgentMessageContent` 表现组件：正文为 14px / `--platform-text-strong`，思考、中间输出和工具调用为 12px / `--platform-text-soft`。实时与历史思考共用同一个折叠入口；工具输入输出继承过程色，失败状态保留错误色。Markdown 标题、表格及代码高亮在过程区同步弱化，最终回复和文档预览仍保留正常排版，不按 Agent 类型复制样式。输入提示与禁用状态保持原有反馈。
   - Windows 命令展示：仅 `command` 卡片识别 `pwsh` / `powershell`（含完整路径、`.exe`、常见启动选项）的 `-Command` / `-c` 外层包装，摘要和展开输入只展示脚本正文，并解开单个 shell 参数的引用拼接。摘要优先读取已脱敏的 `detail.command`，再按首行 120 字符截断，避免历史摘要被可执行文件路径占满。无法识别的启动方式、`-File`、`-EncodedCommand`、普通命令和 MCP 输入原样展示；执行参数、持久化原文、脱敏和输出均不改变。
   - 调试属性：块与行都带 `data-duration-ms`（原始毫秒，无法计算时为空串）与稳定 `data-testid`（块 `agent-tool-call-group`、行 `agent-tool-call-row`）。
 - 必须用 `<button aria-expanded>` + `hidden` 控制展开（键盘可达、可读屏），块头与行都是按钮：`aria-label` = 汇总 / 行文案 + 耗时；默认折叠。
diff --git a/package-lock.json b/package-lock.json
index 98d451a05..c05f8be30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -118,6 +118,7 @@
         "react-colorful": "^5.8.0",
         "react-dom": "^19.0.0",
         "react-markdown": "^10.1.0",
+        "rehype-highlight": "^7.0.2",
         "remark-gfm": "^4.0.1",
         "vite": "^6.2.0",
         "zustand": "^5.0.14"
@@ -13314,6 +13315,19 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hast-util-is-element": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hast-util-to-jsx-runtime": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
@@ -13341,6 +13355,22 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hast-util-to-text": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz",
+      "integrity": "sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "hast-util-is-element": "^3.0.0",
+        "unist-util-find-after": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hast-util-whitespace": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
@@ -13375,6 +13405,15 @@
         "hermes-estree": "0.33.3"
       }
     },
+    "node_modules/highlight.js": {
+      "version": "11.11.2",
+      "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.2.tgz",
+      "integrity": "sha512-oaXMACAU0kzOMXBjWpNcX+vlwSBCIAiZ9BHa7gA15NOTtT2L/l8OSZDuqS2XppOhZBPJ7hm4o8ep2kyuip2uEQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -15203,6 +15242,21 @@
         "get-func-name": "^2.0.1"
       }
     },
+    "node_modules/lowlight": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/lowlight/-/lowlight-3.3.0.tgz",
+      "integrity": "sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "devlop": "^1.0.0",
+        "highlight.js": "~11.11.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -18820,6 +18874,23 @@
         "regjsparser": "bin/parser"
       }
     },
+    "node_modules/rehype-highlight": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmmirror.com/rehype-highlight/-/rehype-highlight-7.0.2.tgz",
+      "integrity": "sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "hast-util-to-text": "^4.0.0",
+        "lowlight": "^3.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/remark-gfm": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
@@ -20520,6 +20591,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/unist-util-find-after": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz",
+      "integrity": "sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/unist-util-is": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
@@ -26376,6 +26461,7 @@
         "react-colorful": "^5.8.0",
         "react-dom": "^19.0.0",
         "react-markdown": "^10.1.0",
+        "rehype-highlight": "^7.0.2",
         "remark-gfm": "^4.0.1",
         "tailwindcss": "^4.1.14",
         "typescript": "~5.8.2",
@@ -31704,6 +31790,14 @@
         "function-bind": "^1.1.2"
       }
     },
+    "hast-util-is-element": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+      "requires": {
+        "@types/hast": "^3.0.0"
+      }
+    },
     "hast-util-to-jsx-runtime": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
@@ -31726,6 +31820,17 @@
         "vfile-message": "^4.0.0"
       }
     },
+    "hast-util-to-text": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz",
+      "integrity": "sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==",
+      "requires": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "hast-util-is-element": "^3.0.0",
+        "unist-util-find-after": "^5.0.0"
+      }
+    },
     "hast-util-whitespace": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
@@ -31752,6 +31857,11 @@
         "hermes-estree": "0.33.3"
       }
     },
+    "highlight.js": {
+      "version": "11.11.2",
+      "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.2.tgz",
+      "integrity": "sha512-oaXMACAU0kzOMXBjWpNcX+vlwSBCIAiZ9BHa7gA15NOTtT2L/l8OSZDuqS2XppOhZBPJ7hm4o8ep2kyuip2uEQ=="
+    },
     "hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -32888,6 +32998,16 @@
         "get-func-name": "^2.0.1"
       }
     },
+    "lowlight": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/lowlight/-/lowlight-3.3.0.tgz",
+      "integrity": "sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==",
+      "requires": {
+        "@types/hast": "^3.0.0",
+        "devlop": "^1.0.0",
+        "highlight.js": "~11.11.0"
+      }
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -35280,6 +35400,18 @@
         "jsesc": "~3.1.0"
       }
     },
+    "rehype-highlight": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmmirror.com/rehype-highlight/-/rehype-highlight-7.0.2.tgz",
+      "integrity": "sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==",
+      "requires": {
+        "@types/hast": "^3.0.0",
+        "hast-util-to-text": "^4.0.0",
+        "lowlight": "^3.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      }
+    },
     "remark-gfm": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
@@ -36441,6 +36573,15 @@
         "crypto-random-string": "^2.0.0"
       }
     },
+    "unist-util-find-after": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz",
+      "integrity": "sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==",
+      "requires": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      }
+    },
     "unist-util-is": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
diff --git a/packages/shared/src/components/AgentMessageContent.css b/packages/shared/src/components/AgentMessageContent.css
new file mode 100644
index 000000000..9a1d241d2
--- /dev/null
+++ b/packages/shared/src/components/AgentMessageContent.css
@@ -0,0 +1,25 @@
+.agent-message-content[data-agent-content] {
+  min-width: 0;
+  font-size: 14px;
+  line-height: 1.5;
+  color: var(--platform-text-strong, #3d1f10);
+}
+
+.agent-message-content[data-agent-content='process'] {
+  --agent-message-heading-size: 1em;
+  --agent-message-table-size: 1em;
+  font-size: 12px;
+  color: var(--platform-text-soft, #988476);
+}
+
+/* Markdown 标题和代码不能把过程内容重新放大，或带回正文的高对比度配色。 */
+.agent-message-content[data-agent-content='process']
+  :where(p, h1, h2, h3, h4, h5, h6, ul, ol, li, blockquote, pre, code, th, td) {
+  font-size: inherit;
+  line-height: inherit;
+  color: inherit;
+}
+
+.agent-message-content[data-agent-content='process'] pre code span {
+  color: inherit;
+}
diff --git a/packages/shared/src/components/AgentMessageContent.tsx b/packages/shared/src/components/AgentMessageContent.tsx
new file mode 100644
index 000000000..831ffc335
--- /dev/null
+++ b/packages/shared/src/components/AgentMessageContent.tsx
@@ -0,0 +1,24 @@
+import './AgentMessageContent.css';
+
+import type { HTMLAttributes } from 'react';
+
+export type AgentMessageTone = 'body' | 'process';
+
+/** 只表达正文/过程的视觉层级；消息身份、状态与分组由宿主决定。 */
+export function AgentMessageContent({
+  as: Tag = 'div',
+  tone = 'body',
+  className,
+  ...props
+}: HTMLAttributes<HTMLElement> & {
+  as?: 'div' | 'section' | 'details';
+  tone?: AgentMessageTone;
+}) {
+  return (
+    <Tag
+      {...props}
+      data-agent-content={tone}
+      className={['agent-message-content', className].filter(Boolean).join(' ')}
+    />
+  );
+}
diff --git a/packages/shared/src/components/index.ts b/packages/shared/src/components/index.ts
index 1196225e1..f2b1cee94 100644
--- a/packages/shared/src/components/index.ts
+++ b/packages/shared/src/components/index.ts
@@ -218,6 +218,8 @@ export { Textarea } from './ui/textarea';
 
 // Additional platform-prefixed aliases make the package discoverable beside
 // existing application adapters while keeping the public API product-neutral.
+export type { AgentMessageTone } from './AgentMessageContent';
+export { AgentMessageContent } from './AgentMessageContent';
 export type {
   ButtonProps as PlatformButtonProps,
   SwitchProps as PlatformSwitchProps,
diff --git a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
index 2f2146ed2..8b5a462fc 100644
--- a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
+++ b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
@@ -10,7 +10,10 @@ import {
 import { describe, expect, it, vi } from 'vitest';
 
 import type { CanvasLayer } from './ImageCanvasEditorTypes';
-import { ImageCanvasSelectedLayerToolbarView } from './ImageCanvasSelectedLayerToolbarView';
+import {
+  ImageCanvasSelectedLayerToolbarView,
+  type ImageCanvasSelectedToolbarAction,
+} from './ImageCanvasSelectedLayerToolbarView';
 
 function createLayer(overrides: Partial<CanvasLayer> = {}): CanvasLayer {
   return {
@@ -67,6 +70,121 @@ function renderSelectedToolbar(
 }
 
 describe('ImageCanvasSelectedLayerToolbarView', () => {
+  it('常规动作与末组分别分隔，导出紧邻删除且位于删除之前', () => {
+    const props = renderSelectedToolbar({
+      supportedActions: new Set(['quick-edit', 'download']),
+      downloadLabel: '导出',
+      extraActions: <button>引用</button>,
+      endActions: <button>删除素材</button>,
+    });
+    const toolbar = screen.getByRole('toolbar');
+    expect(
+      toolbar.querySelectorAll(
+        '.image-canvas-editor__floating-toolbar-divider',
+      ),
+    ).toHaveLength(2);
+    expect(
+      within(toolbar)
+        .getAllByRole('button')
+        .map((button) => button.textContent),
+    ).toEqual(['快速编辑', '引用', '导出', '删除素材']);
+    expect(
+      screen.getByRole('button', { name: '导出' }).nextElementSibling,
+    ).toBe(screen.getByRole('button', { name: '删除素材' }));
+    fireEvent.click(screen.getByRole('button', { name: '导出' }));
+    expect(props.onDownloadLayer).toHaveBeenCalledWith(props.selectedLayer);
+  });
+
+  it('任意动作组合都不生成相邻、开头或结尾分隔线', () => {
+    const actions: ImageCanvasSelectedToolbarAction[] = [
+      'quick-edit',
+      'crop-expand',
+      'redraw',
+      'download',
+    ];
+    for (const mediaType of ['image', 'audio', 'video'] as const) {
+      for (let mask = 0; mask < 1 << actions.length; mask += 1) {
+        for (const withExtraActions of [false, true]) {
+          renderSelectedToolbar({
+            selectedLayer: createLayer({ mediaType }),
+            supportedActions: new Set(
+              actions.filter((_, index) => (mask & (1 << index)) !== 0),
+            ),
+            extraActions: withExtraActions ? <button>信息</button> : null,
+          });
+          const toolbar = screen.getByRole('toolbar');
+          const divider = '.image-canvas-editor__floating-toolbar-divider';
+          expect(toolbar.querySelector(`${divider} + ${divider}`)).toBeNull();
+          expect(toolbar.firstElementChild?.matches(divider) ?? false).toBe(
+            false,
+          );
+          expect(toolbar.lastElementChild?.matches(divider) ?? false).toBe(
+            false,
+          );
+          cleanup();
+        }
+      }
+    }
+  });
+
+  it('空的条件动作和嵌套 Fragment 不产生空分组', () => {
+    renderSelectedToolbar({
+      supportedActions: new Set(['quick-edit', 'download']),
+      extraActions: (
+        <>
+          {null}
+          <>{false}</>
+        </>
+      ),
+      endActions: <>{null}</>,
+    });
+    const toolbar = screen.getByRole('toolbar');
+    expect(
+      toolbar.querySelectorAll(
+        '.image-canvas-editor__floating-toolbar-divider',
+      ),
+    ).toHaveLength(1);
+    expect(
+      within(toolbar)
+        .getAllByRole('button')
+        .map((button) => button.getAttribute('aria-label')),
+    ).toEqual(['快速编辑', '下载按钮']);
+    expect(toolbar.lastElementChild?.tagName).toBe('BUTTON');
+  });
+
+  it.each(['image', 'audio', 'video', 'image-sequence', undefined] as const)(
+    '%s 素材使用同一个带文字导出入口与回调',
+    (mediaType) => {
+      const props = renderSelectedToolbar({
+        selectedLayer: createLayer({ mediaType }),
+        supportedActions: new Set(['download']),
+        downloadLabel: '导出',
+        extraActions: <button>信息</button>,
+        endActions: <button>删除素材</button>,
+      });
+      const toolbar = screen.getByRole('toolbar');
+      expect(
+        within(toolbar)
+          .getAllByRole('button')
+          .map((button) => button.textContent),
+      ).toEqual(['信息', '导出', '删除素材']);
+      expect(
+        screen.getByRole('button', { name: '导出' }).nextElementSibling,
+      ).toBe(screen.getByRole('button', { name: '删除素材' }));
+      fireEvent.click(screen.getByRole('button', { name: '导出' }));
+      expect(props.onDownloadLayer).toHaveBeenCalledWith(props.selectedLayer);
+    },
+  );
+
+  it('宿主未放行下载时不展示导出入口', () => {
+    renderSelectedToolbar({
+      supportedActions: new Set(),
+      downloadLabel: '导出',
+      extraActions: <button>信息</button>,
+    });
+    expect(screen.queryByRole('button', { name: '导出' })).toBeNull();
+  });
+
   it('renders common layer actions in the Lovart toolbar order and forwards callbacks', () => {
     const props = renderSelectedToolbar();
     const toolbar = screen.getByRole('toolbar', { name: '图片工具栏' });
diff --git a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
index bdb924146..6587025c0 100644
--- a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
+++ b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
@@ -10,7 +10,13 @@ import {
   Sparkles,
   WandSparkles,
 } from 'lucide-react';
-import type { CSSProperties, ReactNode } from 'react';
+import {
+  Children,
+  type CSSProperties,
+  Fragment,
+  isValidElement,
+  type ReactNode,
+} from 'react';
 
 import { EditorIconButton } from './ImageCanvasEditorPrimitives';
 import type { CanvasLayer } from './ImageCanvasEditorTypes';
@@ -39,8 +45,12 @@ type ImageCanvasSelectedLayerToolbarViewProps = {
    * 让没有对应后端链路的画布宿主不必把「点了没反应」的按钮渲染出来。
    */
   supportedActions?: ReadonlySet<ImageCanvasSelectedToolbarAction> | null;
-  /** 宿主在工具条上追加的动作节点，渲染在下载按钮之前。 */
+  /** 宿主在工具条上追加的常规动作，渲染在下载按钮之前。 */
   extraActions?: ReactNode;
+  /** 工具栏末组动作，紧随下载按钮，与下载共用一个分组。 */
+  endActions?: ReactNode;
+  /** 提供文字时显示带文字的导出入口；缺省保持网页画布的图标按钮。 */
+  downloadLabel?: string;
   selectedLayer: CanvasLayer | null;
   selectedToolbarStyle: CSSProperties | null;
   onOpenQuickEditPanel: (layer: CanvasLayer) => void;
@@ -58,9 +68,20 @@ type ImageCanvasSelectedLayerToolbarViewProps = {
   onDownloadLayer: (layer: CanvasLayer) => void;
 };
 
+/** 条件动作通常放在 Fragment 中；空 Fragment 不能产生一个空分组。 */
+function hasToolbarActions(actions: ReactNode): boolean {
+  return Children.toArray(actions).some((action) =>
+    isValidElement<{ children?: ReactNode }>(action) && action.type === Fragment
+      ? hasToolbarActions(action.props.children)
+      : action !== '',
+  );
+}
+
 export function ImageCanvasSelectedLayerToolbarView({
   supportedActions = null,
   extraActions,
+  endActions,
+  downloadLabel,
   selectedLayer,
   selectedToolbarStyle,
   onOpenQuickEditPanel,
@@ -88,12 +109,35 @@ export function ImageCanvasSelectedLayerToolbarView({
     'redraw',
     canOpenRedrawPanel(selectedLayer),
   );
-  const extraActionDivider = extraActions ? (
+  const showDownload = isActionSupported('download', true);
+  const downloadAction = showDownload ? (
+    downloadLabel ? (
+      <CanvasChromeButton
+        className="image-canvas-editor__floating-toolbar-text-button"
+        label={downloadLabel}
+        title={downloadLabel}
+        icon={<Download className="h-4 w-4" />}
+        onClick={() => onDownloadLayer(selectedLayer)}
+      >
+        <span>{downloadLabel}</span>
+      </CanvasChromeButton>
+    ) : (
+      <EditorIconButton
+        label="下载按钮"
+        title="下载按钮"
+        icon={Download}
+        onClick={() => onDownloadLayer(selectedLayer)}
+      />
+    )
+  ) : null;
+  const hasExtraActions = hasToolbarActions(extraActions);
+  const hasEndActions = showDownload || hasToolbarActions(endActions);
+  const divider = (
     <span
       aria-hidden="true"
       className="image-canvas-editor__floating-toolbar-divider"
     />
-  ) : null;
+  );
 
   if (selectedLayer.mediaType === 'audio') {
     return (
@@ -115,16 +159,11 @@ export function ImageCanvasSelectedLayerToolbarView({
             <span>改造</span>
           </CanvasChromeButton>
         ) : null}
-        {extraActionDivider}
+        {canRedraw && hasExtraActions ? divider : null}
         {extraActions}
-        {isActionSupported('download', true) ? (
-          <EditorIconButton
-            label="下载按钮"
-            title="下载按钮"
-            icon={Download}
-            onClick={() => onDownloadLayer(selectedLayer)}
-          />
-        ) : null}
+        {(canRedraw || hasExtraActions) && hasEndActions ? divider : null}
+        {downloadAction}
+        {endActions}
       </div>
     );
   }
@@ -141,6 +180,25 @@ export function ImageCanvasSelectedLayerToolbarView({
     'character-animation',
     selectedLayer.assetKind === 'character',
   );
+  const showCropExpand =
+    canRasterEdit && isActionSupported('crop-expand', true);
+  const showRemoveBackground =
+    canRasterEdit && isActionSupported('remove-background', true);
+  const showPerfectPixel =
+    canRasterEdit && isActionSupported('perfect-pixel', true);
+  const showSplitIconSpritesheet =
+    selectedLayer.assetKind === 'icon-spritesheet' &&
+    isActionSupported('split-icon-spritesheet', true);
+  const showExtractUiDesign =
+    selectedLayer.assetKind === 'ui-design' &&
+    isActionSupported('extract-ui-design', true);
+  const hasEditingActions =
+    showCropExpand ||
+    showRemoveBackground ||
+    showPerfectPixel ||
+    showSplitIconSpritesheet ||
+    showExtractUiDesign ||
+    showCharacterAnimation;
 
   return (
     <div
@@ -151,23 +209,18 @@ export function ImageCanvasSelectedLayerToolbarView({
       onPointerDown={(event) => event.stopPropagation()}
     >
       {showQuickEdit ? (
-        <>
-          <CanvasChromeButton
-            className="image-canvas-editor__floating-toolbar-text-button"
-            label="快速编辑"
-            title="快速编辑"
-            icon={<Sparkles className="h-4 w-4" />}
-            onClick={() => onOpenQuickEditPanel(selectedLayer)}
-          >
-            <span>快速编辑</span>
-          </CanvasChromeButton>
-          <span
-            aria-hidden="true"
-            className="image-canvas-editor__floating-toolbar-divider"
-          />
-        </>
+        <CanvasChromeButton
+          className="image-canvas-editor__floating-toolbar-text-button"
+          label="快速编辑"
+          title="快速编辑"
+          icon={<Sparkles className="h-4 w-4" />}
+          onClick={() => onOpenQuickEditPanel(selectedLayer)}
+        >
+          <span>快速编辑</span>
+        </CanvasChromeButton>
       ) : null}
-      {canRasterEdit && isActionSupported('crop-expand', true) ? (
+      {showQuickEdit && hasEditingActions ? divider : null}
+      {showCropExpand ? (
         <EditorIconButton
           label="裁扩按钮"
           title="裁扩按钮"
@@ -175,7 +228,7 @@ export function ImageCanvasSelectedLayerToolbarView({
           onClick={() => onOpenCropExpandPanel(selectedLayer)}
         />
       ) : null}
-      {canRasterEdit && isActionSupported('remove-background', true) ? (
+      {showRemoveBackground ? (
         <EditorIconButton
           label="去除背景按钮"
           title="去除背景按钮"
@@ -183,7 +236,7 @@ export function ImageCanvasSelectedLayerToolbarView({
           onClick={() => onRemoveBackground(selectedLayer)}
         />
       ) : null}
-      {canRasterEdit && isActionSupported('perfect-pixel', true) ? (
+      {showPerfectPixel ? (
         <CanvasChromeButton
           className="image-canvas-editor__floating-toolbar-text-button"
           // 中文注释：保存态名称不能直接用「素材类型保存中」——icon-spritesheet 图层上
@@ -236,8 +289,7 @@ export function ImageCanvasSelectedLayerToolbarView({
           </span>
         </CanvasChromeButton>
       ) : null}
-      {selectedLayer.assetKind === 'icon-spritesheet' &&
-      isActionSupported('split-icon-spritesheet', true) ? (
+      {showSplitIconSpritesheet ? (
         <CanvasChromeButton
           className="image-canvas-editor__floating-toolbar-text-button"
           label={
@@ -274,8 +326,7 @@ export function ImageCanvasSelectedLayerToolbarView({
           </span>
         </CanvasChromeButton>
       ) : null}
-      {selectedLayer.assetKind === 'ui-design' &&
-      isActionSupported('extract-ui-design', true) ? (
+      {showExtractUiDesign ? (
         <CanvasChromeButton
           className="image-canvas-editor__floating-toolbar-text-button"
           label="提取素材"
@@ -299,10 +350,7 @@ export function ImageCanvasSelectedLayerToolbarView({
       ) : null}
       {canRedraw ? (
         <>
-          <span
-            aria-hidden="true"
-            className="image-canvas-editor__floating-toolbar-divider"
-          />
+          {showQuickEdit || hasEditingActions ? divider : null}
           <CanvasChromeButton
             className="image-canvas-editor__floating-toolbar-text-button"
             label="改造"
@@ -314,16 +362,16 @@ export function ImageCanvasSelectedLayerToolbarView({
           </CanvasChromeButton>
         </>
       ) : null}
-      {extraActionDivider}
+      {(showQuickEdit || hasEditingActions || canRedraw) && hasExtraActions
+        ? divider
+        : null}
       {extraActions}
-      {isActionSupported('download', true) ? (
-        <EditorIconButton
-          label="下载按钮"
-          title="下载按钮"
-          icon={Download}
-          onClick={() => onDownloadLayer(selectedLayer)}
-        />
-      ) : null}
+      {(showQuickEdit || hasEditingActions || canRedraw || hasExtraActions) &&
+      hasEndActions
+        ? divider
+        : null}
+      {downloadAction}
+      {endActions}
     </div>
   );
 }
diff --git a/src/index.css b/src/index.css
index 24c0918e4..322c9e7ea 100644
--- a/src/index.css
+++ b/src/index.css
@@ -5090,18 +5090,6 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
   height: 1.125rem;
 }
 
-/* 紧挨着的两条分隔线只保留一条。
-   共享工具条会在「快速编辑」之后输出一条（`ImageCanvasSelectedLayerToolbarView.tsx`
-   的 showQuickEdit 分支），并为 `extraActions` 再自动生成一条前置分隔线
-   （同文件 `extraActionDivider`）。AGC 资源卡恰好是"快速编辑可用 + 中间那些动作未接通
-   不渲染"的组合，于是这两条直接相邻，用户看到两条竖线。两条相邻的分隔线在视觉上
-   本来就没有意义，所以在样式层去重：不改任何 JSX 结构，对两端（美术画布与资源画布）
-   都成立，也不会隐藏任何真正起分隔作用的那一条。 */
-.image-canvas-editor__floating-toolbar-divider
-  + .image-canvas-editor__floating-toolbar-divider {
-  display: none;
-}
-
 .image-canvas-editor__bottom-toolbar-option-wrap {
   display: inline-flex;
 }