Merge remote-tracking branch 'origin/master' into feat/ui-editor-v3

# Conflicts:
#	docs/project-memory/shared-memory/pitfalls.md

.husky/pre-commit

@@ -1 +1,4 @@
+# Git 在链接工作树里执行 Hook 时会注入 GIT_DIR 等仓库定位变量，优先级高于 cwd；
+# 子进程（npm、lint-staged、测试夹具）会继承它们并写到真实仓库，故在入口统一清除。
+unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE GIT_COMMON_DIR GIT_PREFIX GIT_CONFIG_PARAMETERS GIT_CEILING_DIRECTORIES
 npm run format:staged

.husky/pre-push

@@ -1 +1,4 @@
+# Git 在链接工作树里执行 Hook 时会注入 GIT_DIR 等仓库定位变量，优先级高于 cwd；
+# 钩子链（npm → check:repository-ci → 测试夹具）会继承它们并写到真实仓库，故在入口统一清除。
+unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE GIT_COMMON_DIR GIT_PREFIX GIT_CONFIG_PARAMETERS GIT_CEILING_DIRECTORIES
 npm run check:pre-push-master -- "$@"

apps/ai-game-creator-shell/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genarrative/ai-game-creator-shell",
   "private": true,
-  "version": "0.1.29",
+  "version": "0.1.45",
   "type": "module",
   "scripts": {
     "dev": "node scripts/start-tauri-dev.mjs",

apps/ai-game-creator-shell/src-tauri/Cargo.lock

@@ -1725,7 +1725,7 @@ dependencies = [
 
 [[package]]
 name = "genarrative-ai-game-creator-shell"
-version = "0.1.29"
+version = "0.1.45"
 dependencies = [
  "agent-runtime-core",
  "axum",

apps/ai-game-creator-shell/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "genarrative-ai-game-creator-shell"
-version = "0.1.29"
+version = "0.1.45"
 edition = "2021"
 publish = false
 

apps/ai-game-creator-shell/src-tauri/capabilities/main.json

@@ -1,11 +1,12 @@
 {
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "main",
-  "description": "AI 游戏创作主窗口允许读取系统剪贴板图片，用于粘贴素材附件；允许弹出原生打开/保存对话框用于素材上传与导出。",
+  "description": "AI 游戏创作主窗口允许读写系统剪贴板，用于粘贴素材附件和复制生成文件路径；允许弹出原生打开/保存对话框用于素材上传与导出。",
   "windows": ["client"],
   "permissions": [
     "clipboard-manager:allow-read-image",
     "clipboard-manager:allow-read-text",
+    "clipboard-manager:allow-write-text",
     "core:image:allow-rgba",
     "core:image:allow-size",
     "core:resources:allow-close",

apps/ai-game-creator-shell/src-tauri/src/agent/direct_codex_user_item/mod.rs

@@ -5,9 +5,8 @@ mod validation;
 mod wire;
 
 pub(crate) use model::{
-    DirectCodexUserAttachmentReferencePart, DirectCodexUserContentPart, DirectCodexUserItem,
+    DirectCodexUserContentPart, DirectCodexUserItem, DirectCodexUserMessageEnvelope,
-    DirectCodexUserMessageEnvelope, DirectCodexUserMessageItem, DirectCodexUserRole,
+    DirectCodexUserMessageItem, DirectCodexUserRole, DirectCodexUserRuntimeRegionPart,
-    DirectCodexUserRuntimeRegionPart,
 };
 pub(crate) use validation::validate_direct_codex_user_item;
 pub(crate) use wire::{

apps/ai-game-creator-shell/src-tauri/src/agent/direct_codex_user_item/model.rs

@@ -36,21 +36,6 @@ pub(crate) enum DirectCodexUserContentPart {
     AgcResourceReference { resource_id: String },
     #[serde(rename = "agc_runtime_region_reference")]
     AgcRuntimeRegionReference(DirectCodexUserRuntimeRegionPart),
-    /// Uploaded project attachment kept inline in canonical content.
-    #[serde(rename = "agc_attachment_reference")]
-    AgcAttachmentReference(DirectCodexUserAttachmentReferencePart),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase", deny_unknown_fields)]
-#[ts(export, export_to = concat!(env!("CARGO_MANIFEST_DIR"), "/../src/features/project-workspace/generated/"))]
-pub(crate) struct DirectCodexUserAttachmentReferencePart {
-    pub(crate) name: String,
-    pub(crate) media_type: String,
-    #[ts(type = "number")]
-    pub(crate) size: u64,
-    pub(crate) local_path: String,
-    pub(crate) status: String,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]

apps/ai-game-creator-shell/src-tauri/src/agent/direct_codex_user_item/validation.rs

@@ -20,16 +20,18 @@ pub(crate) fn validate_direct_codex_user_item(
     if message.id.trim().is_empty() {
         return Err("DirectProject user item 缺少稳定 id".to_string());
     }
-    // 有效输入只判一整条 content：单个纯空白 `input_text` 是合法 part —— 编辑器里的段落
+    if message.content.is_empty() {
-    // 分隔、软换行与 chip 后的分隔空格就是这样落进 canonical content 的，前端不为它过滤。
-    if !content_has_meaningful_input(&message.content) {
         return Err("DirectProject user item content 不能为空".to_string());
     }
     let manifest = read_manifest_for_project(root)?;
     let mut reference_count = 0usize;
     for part in &message.content {
         match part {
-            DirectCodexUserContentPart::InputText { .. } => {}
+            DirectCodexUserContentPart::InputText { text } => {
+                if text.trim().is_empty() {
+                    return Err("DirectProject input_text 不能为空".to_string());
+                }
+            }
             DirectCodexUserContentPart::AgcResourceReference { resource_id } => {
                 reference_count = reference_count.saturating_add(1);
                 validate_resource_id_and_manifest(&manifest, resource_id)?;
@@ -38,18 +40,6 @@ pub(crate) fn validate_direct_codex_user_item(
                 reference_count = reference_count.saturating_add(1);
                 validate_runtime_region_reference(&manifest, reference)?;
             }
-            DirectCodexUserContentPart::AgcAttachmentReference(reference) => {
-                if reference.name.trim().is_empty() {
-                    return Err("附件缺少文件名".to_string());
-                }
-                if !reference.local_path.trim().is_empty() {
-                    sanitize_attachment_local_path(&reference.local_path)
-                        .ok_or_else(|| "附件项目路径无效".to_string())?;
-                }
-                if !matches!(reference.status.trim(), "imported" | "failed") {
-                    return Err("附件状态无效".to_string());
-                }
-            }
         }
     }
     if reference_count > MAX_DIRECT_CODEX_REFERENCES {
@@ -58,14 +48,6 @@ pub(crate) fn validate_direct_codex_user_item(
     Ok(())
 }
 
-/// 整条 content 是否还有有效输入：任何一段非空白文本、或任何一个非文本 part 都算。
-pub(crate) fn content_has_meaningful_input(content: &[DirectCodexUserContentPart]) -> bool {
-    content.iter().any(|part| match part {
-        DirectCodexUserContentPart::InputText { text } => !text.trim().is_empty(),
-        _ => true,
-    })
-}
-
 pub(crate) fn validate_resource_id_and_manifest(
     manifest: &GameCreationAppManifest,
     resource_id: &str,
@@ -104,48 +86,3 @@ fn validate_runtime_region_reference(
     }
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::content_has_meaningful_input;
-    use crate::agent::direct_codex_user_item::model::DirectCodexUserContentPart;
-
-    fn input_text(text: &str) -> DirectCodexUserContentPart {
-        DirectCodexUserContentPart::InputText {
-            text: text.to_string(),
-        }
-    }
-
-    #[test]
-    fn only_all_blank_content_counts_as_empty_input() {
-        // 空数组与「整条只有空白」是同一种空输入。
-        assert!(!content_has_meaningful_input(&[]));
-        assert!(!content_has_meaningful_input(&[input_text(" \n ")]));
-        assert!(!content_has_meaningful_input(&[
-            input_text("\n"),
-            input_text("  "),
-        ]));
-    }
-
-    #[test]
-    fn whitespace_parts_are_valid_next_to_meaningful_input() {
-        // 段落分隔 / 软换行 / chip 后的分隔空格都是合法的单个 part。
-        assert!(content_has_meaningful_input(&[
-            input_text("\n"),
-            input_text("看"),
-        ]));
-        assert!(content_has_meaningful_input(&[
-            input_text("看"),
-            input_text("\n\n"),
-        ]));
-    }
-
-    #[test]
-    fn non_text_parts_always_count_as_input() {
-        assert!(content_has_meaningful_input(&[
-            DirectCodexUserContentPart::AgcResourceReference {
-                resource_id: "asset-hero".to_string(),
-            },
-        ]));
-    }
-}

apps/ai-game-creator-shell/src-tauri/src/agent/direct_codex_user_item/wire.rs

@@ -100,20 +100,6 @@ pub(crate) fn direct_codex_user_item_to_wire_input(
                 summary.push(']');
                 summary
             }
-            DirectCodexUserContentPart::AgcAttachmentReference(reference) => {
-                let mut summary = format!(
-                    "[附件：名称={}；类型={}；大小={} 字节",
-                    reference.name.trim(),
-                    reference.media_type.trim(),
-                    reference.size
-                );
-                if !reference.local_path.trim().is_empty() {
-                    summary.push_str(&format!("；项目路径={}", reference.local_path.trim()));
-                }
-                summary.push_str(&format!("；状态={}", reference.status.trim()));
-                summary.push(']');
-                summary
-            }
         };
         input.push(serde_json::json!({ "type": "text", "text": text }));
     }
@@ -144,8 +130,7 @@ pub(crate) fn direct_codex_user_item_to_prompt(
 
 #[cfg(test)]
 mod tests {
-    use super::{direct_codex_user_item_to_response_item, direct_codex_user_item_to_wire_input};
+    use super::direct_codex_user_item_to_response_item;
-    use crate::agent::direct_codex_user_item::model::DirectCodexUserItem;
     use serde_json::json;
     use std::path::Path;
 
@@ -189,70 +174,4 @@ mod tests {
         .expect_err("history item without type must fail");
         assert!(error.contains("缺少 type"), "{error}");
     }
-
-    #[test]
-    fn attachment_parts_remain_in_canonical_order_when_projected() {
-        let root = tempfile::tempdir().expect("temp project");
-        crate::init_local_game_project_at(root.path(), "wire-test", "wire 投影测试")
-            .expect("init project");
-        let item = json!({
-            "type": "message",
-            "role": "user",
-            "id": "turn-1:user",
-            "content": [
-                {"type": "input_text", "text": "先看"},
-                {"type": "agc_attachment_reference", "name": "notes.txt", "mediaType": "text/plain", "size": 4, "localPath": "assets/notes.txt", "status": "imported"}
-            ]
-        });
-        let projected = direct_codex_user_item_to_response_item(root.path(), &item)
-            .expect("user response item should project");
-        let content = projected["content"].as_array().expect("content array");
-        assert_eq!(content.len(), 2);
-        assert!(content[0]["text"].as_str().unwrap().contains("先看"));
-        assert!(content[1]["text"].as_str().unwrap().contains("notes.txt"));
-    }
-
-    #[test]
-    fn whitespace_only_text_parts_survive_validation() {
-        let root = tempfile::tempdir().expect("temp project");
-        crate::init_local_game_project_at(root.path(), "wire-test", "wire 投影测试")
-            .expect("init project");
-        let item: DirectCodexUserItem = serde_json::from_value(json!({
-            "type": "message",
-            "role": "user",
-            "id": "turn-1:user",
-            "content": [
-                {"type": "input_text", "text": "先看"},
-                {"type": "input_text", "text": "\n"},
-                {"type": "input_text", "text": "   "}
-            ]
-        }))
-        .expect("deserialize user item");
-        let wire = direct_codex_user_item_to_wire_input(root.path(), &item)
-            .expect("whitespace-only part next to real text must pass");
-        let parts = wire.as_array().expect("wire input array");
-        assert_eq!(parts.len(), 3);
-        assert_eq!(parts[1]["text"].as_str(), Some("\n"));
-        assert_eq!(parts[2]["text"].as_str(), Some("   "));
-    }
-
-    #[test]
-    fn all_blank_content_is_rejected() {
-        let root = tempfile::tempdir().expect("temp project");
-        crate::init_local_game_project_at(root.path(), "wire-test", "wire 投影测试")
-            .expect("init project");
-        let item: DirectCodexUserItem = serde_json::from_value(json!({
-            "type": "message",
-            "role": "user",
-            "id": "turn-1:user",
-            "content": [
-                {"type": "input_text", "text": "\n"},
-                {"type": "input_text", "text": "  "}
-            ]
-        }))
-        .expect("deserialize user item");
-        let error = direct_codex_user_item_to_wire_input(root.path(), &item)
-            .expect_err("all-blank content must fail closed");
-        assert!(error.contains("不能为空"), "{error}");
-    }
 }

apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/user_input.rs

@@ -31,9 +31,10 @@ pub(crate) fn normalize_direct_client_turn_id(
 pub(crate) async fn chat_with_game_creator_direct_codex(
     project_path: String,
     prompt: String,
-    user_item: DirectCodexUserItem,
+    mut user_item: DirectCodexUserItem,
     creation_type: Option<String>,
     client_turn_id: Option<String>,
+    attachments: Option<Vec<DirectCodexTurnAttachment>>,
 ) -> Result<String, String> {
     let root = Path::new(project_path.trim());
     let turn_id = normalize_direct_client_turn_id(client_turn_id.as_deref())?;
@@ -42,7 +43,24 @@ pub(crate) async fn chat_with_game_creator_direct_codex(
         redact_agent_runtime_error(root, &format!("恢复上一轮陶泥儿整包事务失败：{error}"), 500)
     })?;
     let turn_emitter = DirectGameCreatorTurnUpdateEmitter::new(root, turn_id.clone());
-    let mut audit = DirectCodexTurnAudit::start(root, &turn_id, &prompt, &[]);
+    let mut audit = DirectCodexTurnAudit::start(
+        root,
+        &turn_id,
+        &prompt,
+        attachments.as_deref().unwrap_or_default(),
+    );
+    let attachments = attachments.unwrap_or_default();
+    if !attachments.is_empty() {
+        let attachment_context =
+            render_direct_codex_user_prompt("", &attachments).map_err(|error| {
+                audit.finish(false);
+                error
+            })?;
+        let DirectCodexUserItem::Message(message) = &mut user_item;
+        message.content.push(DirectCodexUserContentPart::InputText {
+            text: attachment_context,
+        });
+    }
     validate_direct_codex_user_item(root, &user_item).map_err(|error| {
         audit.finish(false);
         error

apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/merge.rs

@@ -172,6 +172,7 @@ mod materialize {
     use crate::ui_editor::layout::node::{
         Node as LayoutNode, NodeMetadata, NodeSource, StageStatus,
     };
+    use crate::ui_editor::layout::offset::NodeOffset;
     use crate::ui_editor::layout::transform::Transform;
     use crate::ui_editor::state::{State, UITree};
     use crate::ui_editor::utils::{random_node_id, NodeId, UIDesignImageId};
@@ -302,6 +303,7 @@ mod materialize {
                         component: None,
                         children_display_mode: ChildrenDisplayMode::Exclusive,
                         children: members.into_iter().map(|member| member.node).collect(),
+                        offset: NodeOffset::default(),
                     },
                     priority,
                     src_ui_design,

apps/ai-game-creator-shell/src-tauri/src/ui_editor/commands/recognition.rs

@@ -9,6 +9,7 @@ use crate::ui_editor::layout::children_display_mode::ChildrenDisplayMode;
 use crate::ui_editor::layout::control_layout::ControlLayout;
 use crate::ui_editor::layout::dimension::UIRect;
 use crate::ui_editor::layout::node::{Node as LayoutNode, NodeMetadata, NodeSource, StageStatus};
+use crate::ui_editor::layout::offset::NodeOffset;
 use crate::ui_editor::layout::transform::Transform;
 use crate::ui_editor::resource::ui_design_image::UIDesignImage;
 use crate::ui_editor::state::{State, UITree};
@@ -322,6 +323,7 @@ fn convert_node(
         component: source.component.clone().into_option(),
         children_display_mode: ChildrenDisplayMode::Stack,
         children,
+        offset: NodeOffset::default(),
     })
 }
 
@@ -858,6 +860,7 @@ pub(crate) async fn recognize_ui_impl_with_provider(
                 component: recognition_root.component.into_option(),
                 children_display_mode: ChildrenDisplayMode::Stack,
                 children,
+                offset: NodeOffset::default(),
             };
             // Tree identity and root identity are assigned by Rust, never chosen by the model.
             ui_trees.push(UITree {

apps/ai-game-creator-shell/src-tauri/src/ui_editor/layout/mod.rs

@@ -2,4 +2,5 @@ pub mod children_display_mode;
 pub mod control_layout;
 pub mod dimension;
 pub mod node;
+pub mod offset;
 pub mod transform;

apps/ai-game-creator-shell/src-tauri/src/ui_editor/layout/node.rs

@@ -1,6 +1,7 @@
 use crate::ui_editor::component::Component;
 use crate::ui_editor::layout::children_display_mode::ChildrenDisplayMode;
 use crate::ui_editor::layout::control_layout::ControlLayout;
+use crate::ui_editor::layout::offset::NodeOffset;
 use crate::ui_editor::utils::NodeId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -14,6 +15,7 @@ pub struct Node {
     pub component: Option<Component>,
     pub children_display_mode: ChildrenDisplayMode,
     pub children: Vec<Node>,
+    pub offset: NodeOffset,
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, TS)]

apps/ai-game-creator-shell/src-tauri/src/ui_editor/layout/offset.rs

@@ -0,0 +1,18 @@
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, TS)]
+#[ts(export, export_to = concat!(env!("CARGO_MANIFEST_DIR"), "/../src/features/ui-editor/types/"))]
+pub struct NodeOffset {
+    pub min: [f32; 2],
+    pub max: [f32; 2],
+}
+
+impl Default for NodeOffset {
+    fn default() -> Self {
+        Self {
+            min: [0.0, 0.0],
+            max: [0.0, 0.0],
+        }
+    }
+}

apps/ai-game-creator-shell/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "陶泥儿",
-  "version": "0.1.29",
+  "version": "0.1.45",
   "identifier": "world.genarrative.ai-game-creator",
   "build": {
     "beforeDevCommand": "npm --prefix ../.. run agc:serve",

apps/ai-game-creator-shell/src/components/RichTextInput.tsx

@@ -1,102 +0,0 @@
-import { LexicalComposer } from '@lexical/react/LexicalComposer';
-import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
-import { ContentEditable } from '@lexical/react/LexicalContentEditable';
-import { LexicalErrorBoundary } from '@lexical/react/LexicalErrorBoundary';
-import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
-import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin';
-import {
-  COMMAND_PRIORITY_HIGH,
-  type EditorState,
-  KEY_ENTER_COMMAND,
-  type Klass,
-  type LexicalNode,
-} from 'lexical';
-import type { ReactElement, ReactNode, Ref } from 'react';
-import { useEffect } from 'react';
-
-type RichTextInputProps = {
-  namespace: string;
-  nodes: Klass<LexicalNode>[];
-  initialEditorState?: EditorState | null;
-  contentEditable?: ReactElement<typeof ContentEditable>;
-  placeholder?: ReactElement;
-  containerClassName?: string;
-  containerRef?: Ref<HTMLDivElement>;
-  disabled?: boolean;
-  onChange?: (editorState: EditorState) => void;
-  onEnter?: () => void;
-  children?: ReactNode;
-};
-
-function SubmitOnEnter({ onEnter }: { onEnter?: () => void }) {
-  const [editor] = useLexicalComposerContext();
-
-  useEffect(() => {
-    if (!onEnter) return undefined;
-    return editor.registerCommand(
-      KEY_ENTER_COMMAND,
-      (event) => {
-        if (!event || event.shiftKey || event.isComposing) return false;
-        event.preventDefault();
-        onEnter();
-        return true;
-      },
-      COMMAND_PRIORITY_HIGH,
-    );
-  }, [editor, onEnter]);
-
-  return null;
-}
-
-function SetEditorEditable({ disabled }: { disabled: boolean }) {
-  const [editor] = useLexicalComposerContext();
-
-  useEffect(() => {
-    editor.setEditable(!disabled);
-  }, [disabled, editor]);
-
-  return null;
-}
-
-export default function RichTextInput({
-  namespace,
-  nodes,
-  initialEditorState,
-  contentEditable = <ContentEditable />,
-  placeholder,
-  containerClassName,
-  containerRef,
-  disabled = false,
-  onChange,
-  onEnter,
-  children,
-}: RichTextInputProps) {
-  return (
-    <LexicalComposer
-      initialConfig={{
-        namespace,
-        nodes,
-        editorState: initialEditorState ?? undefined,
-        onError: (error) => {
-          throw error;
-        },
-      }}
-    >
-      <div
-        ref={containerRef}
-        className={containerClassName}
-        data-disabled={disabled ? 'true' : undefined}
-      >
-        <RichTextPlugin
-          contentEditable={contentEditable}
-          placeholder={placeholder}
-          ErrorBoundary={LexicalErrorBoundary}
-        />
-        {children}
-        <SetEditorEditable disabled={disabled} />
-        <SubmitOnEnter onEnter={onEnter} />
-        {onChange ? <OnChangePlugin onChange={onChange} /> : null}
-      </div>
-    </LexicalComposer>
-  );
-}

apps/ai-game-creator-shell/src/features/project-workspace/ComposerControls.tsx

@@ -19,7 +19,6 @@ import {
 import type { RefObject } from 'react';
 import { useEffect, useRef, useState } from 'react';
 
-import type { GameCreationAppAssetManifestEntry } from '../../../../../packages/shared/src/contracts/gameCreationApp';
 import { resolveTauriInvoke } from '../../app/tauri';
 import type {
   GameCreatorAppConfigView,
@@ -193,12 +192,9 @@ export function ComposerPendingAttachments({
 /** 队列 chip：回合运行中入队的消息，按 FIFO 顺序展示，可单条取消。 */
 export function ComposerTurnQueue({
   turns,
-  assets,
   onCancel,
 }: {
   turns: readonly QueuedChatTurn[];
-  /** 与聊天消息渲染同源的素材清单：chip 文案里的 `@` 引用按它展开成显示名。 */
-  assets: readonly GameCreationAppAssetManifestEntry[];
   onCancel: (id: string) => void;
 }) {
   if (turns.length === 0) {
@@ -215,11 +211,11 @@ export function ComposerTurnQueue({
             {index + 1}
           </span>
           <span className="project-supervisor-composer-queue-text">
-            {queuedChatTurnLabel(turn, assets)}
+            {queuedChatTurnLabel(turn)}
           </span>
           <button
             type="button"
-            aria-label={`取消排队消息 ${queuedChatTurnLabel(turn, assets)}`}
+            aria-label={`取消排队消息 ${queuedChatTurnLabel(turn)}`}
             title="取消这条排队消息"
             onClick={() => onCancel(turn.id)}
           >

apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx

@@ -79,7 +79,7 @@ import {
   ResourceReferenceInput,
   type ResourceReferenceInputHandle,
 } from './ResourceReferenceInput';
-import type { ChatComposerDraft } from './resourceReferences';
+import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 import { ToolCallGroup } from './ToolCallGroup';
 import {
   formatClockTime,
@@ -242,6 +242,8 @@ type ProjectSupervisorViewProps = RuntimePanelProps & {
   attachments?: DirectCodexTurnAttachment[];
   /** 上传/校验附件的提示文案（失败与成功都用它，空串不渲染）。 */
   attachmentNotice?: string;
+  chatInput: string;
+  chatReferences: ChatReference[];
   chatProjectAssets: import('../../../../../packages/shared/src/contracts/gameCreationApp').GameCreationAppAssetManifestEntry[];
   composerRef?: RefObject<ResourceReferenceInputHandle | null>;
   directCodex?: boolean;
@@ -325,6 +327,8 @@ export function ProjectSupervisorView({
   activeVersionId = null,
   attachments = [],
   attachmentNotice = '',
+  chatInput,
+  chatReferences,
   chatProjectAssets,
   composerRef,
   directCodex = false,
@@ -889,7 +893,6 @@ export function ProjectSupervisorView({
         >
           <ComposerTurnQueue
             turns={directCodex ? queuedTurns : []}
-            assets={chatProjectAssets}
             onCancel={(id) => onCancelQueuedTurn?.(id)}
           />
           <ComposerPendingAttachments
@@ -913,6 +916,8 @@ export function ProjectSupervisorView({
               Boolean(designView?.session.pendingClarification)
             }
             rows={3}
+            value={chatInput}
+            references={chatReferences}
             showTriggerButton={!directCodex}
             placeholder={
               directCodex

apps/ai-game-creator-shell/src/features/project-workspace/ProjectWorkspaceChatPane.tsx

@@ -55,7 +55,7 @@ import {
   ResourceReferenceInput,
   type ResourceReferenceInputHandle,
 } from './ResourceReferenceInput';
-import type { ChatComposerDraft } from './resourceReferences';
+import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 
 type ProjectWorkspaceChatPaneProps = {
   activeVersionId?: string | null;
@@ -65,6 +65,8 @@ type ProjectWorkspaceChatPaneProps = {
   cancelProjectCreateInNonEmptyFolder: () => void;
   cancelUiCommandConfirmation: () => void;
   chatAgentBusy: boolean;
+  chatInput: string;
+  chatReferences: ChatReference[];
   chatProjectAssets: GameCreationAppAssetManifestEntry[];
   composerRef?: Ref<ResourceReferenceInputHandle>;
   chatInputRef: RefObject<HTMLDivElement | null>;
@@ -213,6 +215,8 @@ export function ProjectWorkspaceChatPane({
   cancelProjectCreateInNonEmptyFolder,
   cancelUiCommandConfirmation,
   chatAgentBusy,
+  chatInput,
+  chatReferences,
   chatProjectAssets,
   composerRef,
   chatInputRef,
@@ -958,6 +962,8 @@ export function ProjectWorkspaceChatPane({
             projectPath={projectPath}
             disabled={chatAgentBusy || projectSupervisorNeedsUserInput}
             multiline={false}
+            value={chatInput}
+            references={chatReferences}
             placeholder="例如：像素风横版动作小游戏，或输入 @ 选择资源"
             onChange={onChatComposerChange}
           />

apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx

@@ -33,7 +33,7 @@ import {
   ResourceReferenceInput,
   type ResourceReferenceInputHandle,
 } from './ResourceReferenceInput';
-import type { ChatComposerDraft } from './resourceReferences';
+import type { ChatComposerDraft, ChatReference } from './resourceReferences';
 
 type RuntimeControlProps = ComponentProps<
   typeof ProjectSupervisorRuntimeControls
@@ -44,6 +44,8 @@ const CHAT_SCROLL_BOTTOM_THRESHOLD = 24;
 type SupervisorChatOnlyViewProps = {
   activeVersionId?: string | null;
   chatAgentBusy: boolean;
+  chatInput: string;
+  chatReferences: ChatReference[];
   chatProjectAssets: import('../../../../../packages/shared/src/contracts/gameCreationApp').GameCreationAppAssetManifestEntry[];
   composerRef?: Ref<ResourceReferenceInputHandle>;
   directCodex?: boolean;
@@ -80,6 +82,8 @@ type SupervisorChatOnlyViewProps = {
 export function SupervisorChatOnlyView({
   activeVersionId = null,
   chatAgentBusy,
+  chatInput,
+  chatReferences,
   chatProjectAssets,
   composerRef,
   directCodex = false,
@@ -324,6 +328,8 @@ export function SupervisorChatOnlyView({
             projectPath={projectPath}
             disabled={chatAgentBusy || needsUserInput}
             rows={3}
+            value={chatInput}
+            references={chatReferences}
             placeholder={
               directCodex ? '描述你的想法' : '给项目总控 Agent 发消息'
             }

apps/ai-game-creator-shell/src/features/project-workspace/chatComposerQueue.ts

@@ -4,33 +4,36 @@
  * 回合运行中用户再次发送时，消息进入 FIFO 队列而不是被丢弃；当前回合结束后按入队顺序
  * 依次发出。队列项能在输入盒上方单独取消。这里只放与 React 无关的纯逻辑，便于单测。
  */
-import type { GameCreationAppAssetManifestEntry } from '../../../../../packages/shared/src/contracts/gameCreationApp';
+import type { DirectCodexTurnAttachment } from '../app-shell/directCodexTurnAttachments';
-import type { DirectCodexUserItem } from './generated';
+import type { DirectCodexUserContentPart } from './generated';
-import { directCodexContentToPromptText } from './resourceReferences';
+import type { ChatReference } from './resourceReferences';
 
 /** 队列上限：满了以后拒绝入队并给出可读提示，而不是静默丢消息。 */
 export const MAX_QUEUED_CHAT_TURNS = 5;
 
 export type QueuedChatTurn = {
   id: string;
-  clientTurnId: string;
+  prompt: string;
-  userItem: DirectCodexUserItem;
+  attachments: DirectCodexTurnAttachment[];
+  references: ChatReference[];
+  content?: DirectCodexUserContentPart[];
   createdAt: number;
 };
 
 export function createQueuedChatTurn(input: {
   id: string;
-  clientTurnId: string;
+  prompt: string;
-  userItem: DirectCodexUserItem;
+  attachments?: readonly DirectCodexTurnAttachment[];
+  references?: readonly ChatReference[];
+  content?: readonly DirectCodexUserContentPart[];
   createdAt: number;
 }): QueuedChatTurn {
   return {
     id: input.id,
-    clientTurnId: input.clientTurnId,
+    prompt: input.prompt,
-    userItem: {
+    attachments: [...(input.attachments ?? [])],
-      ...input.userItem,
+    references: [...(input.references ?? [])],
-      content: [...input.userItem.content],
+    content: [...(input.content ?? [])],
-    },
     createdAt: input.createdAt,
   };
 }
@@ -74,30 +77,16 @@ export function chatQueueFullNotice(): string {
   return `队列已满（最多 ${MAX_QUEUED_CHAT_TURNS} 条），请等当前回合结束后再发送`;
 }
 
-/**
+/** 队列 chip 上显示的文字：单行、有长度上限。 */
- * 队列 chip 上显示的文字：与真实消息同一个派生（`directCodexContentToPromptText`），
+export function queuedChatTurnLabel(turn: QueuedChatTurn): string {
- * 再压成单行并限长。
+  const text = turn.prompt.trim().replace(/\s+/gu, ' ');
- *
- * `assets` 与聊天消息渲染同源（`manifest.assets`）且必填：`@` 引用按显示名展开，chip
- * 与消息正文逐字一致，不会露出 `@asset:…` 这种内部 id。
- */
-export function queuedChatTurnLabel(
-  turn: QueuedChatTurn,
-  assets: readonly GameCreationAppAssetManifestEntry[],
-): string {
-  const text = directCodexContentToPromptText(turn.userItem.content, assets)
-    .trim()
-    .replace(/\s+/gu, ' ');
   if (text) {
     return text.length > 24 ? `${text.slice(0, 24)}…` : text;
   }
-  const attachment = turn.userItem.content.find(
+  if (turn.attachments.length > 0) {
-    (part) => part.type === 'agc_attachment_reference',
+    return `附件 · ${turn.attachments[0]?.name ?? '未命名'}`;
-  );
-  if (attachment?.type === 'agc_attachment_reference') {
-    return `附件 · ${attachment.name || '未命名'}`;
   }
-  if (turn.userItem.content.some((part) => part.type !== 'input_text')) {
+  if (turn.references.length > 0) {
     return '素材引用';
   }
   return '未命名消息';