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/codex_app_server/mod.rs

@@ -2840,22 +2840,8 @@ impl CodexAppServerConnection {
             codex_app_server_text_prompt(&request)
                 .map_err(platform_llm::LlmError::InvalidRequest)?
         };
-        let input = if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
-            if let Some(item) = direct_user_item {
-                let canonical: DirectCodexUserItem = serde_json::from_value(item.clone())
-                    .map_err(|error| platform_llm::LlmError::InvalidRequest(error.to_string()))?;
-                direct_codex_user_item_to_codex_turn_input(
-                    &self.inner.workspace_path,
-                    &canonical,
-                    self.inner._skill_roots.as_deref().unwrap_or_default(),
-                )
-                .map_err(platform_llm::LlmError::InvalidRequest)?
-            } else {
-                codex_app_server_turn_input(&request, &prompt, &self.inner.workspace_path).await?
-            }
-        } else {
-            codex_app_server_turn_input(&request, &prompt, &self.inner.workspace_path).await?
-        };
+        let input =
+            codex_app_server_turn_input(&request, &prompt, &self.inner.workspace_path).await?;
         let _direct_tool_bridge_turn_guard =
             if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
                 Some(

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

@@ -5,12 +5,11 @@ mod validation;
 mod wire;
 
 pub(crate) use model::{
-    DirectCodexUserAttachmentReferencePart, DirectCodexUserContentPart, DirectCodexUserItem,
-    DirectCodexUserMessageEnvelope, DirectCodexUserMessageItem, DirectCodexUserRole,
-    DirectCodexUserRuntimeRegionPart,
+    DirectCodexUserContentPart, DirectCodexUserItem, DirectCodexUserMessageEnvelope,
+    DirectCodexUserMessageItem, DirectCodexUserRole, DirectCodexUserRuntimeRegionPart,
 };
 pub(crate) use validation::validate_direct_codex_user_item;
 pub(crate) use wire::{
-    direct_codex_user_item_to_codex_turn_input, direct_codex_user_item_to_prompt,
-    direct_codex_user_item_to_response_item, direct_codex_user_item_to_wire_input,
+    direct_codex_user_item_to_prompt, direct_codex_user_item_to_response_item,
+    direct_codex_user_item_to_wire_input,
 };

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

@@ -34,25 +34,8 @@ pub(crate) enum DirectCodexUserContentPart {
     InputText { text: String },
     #[serde(rename = "agc_resource_reference")]
     AgcResourceReference { resource_id: String },
-    #[serde(rename = "agc_skill_reference")]
-    AgcSkillReference { name: 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

@@ -12,7 +12,7 @@ pub(crate) const MAX_DIRECT_CODEX_REFERENCES: usize = 32;
 pub(crate) fn validate_direct_codex_user_item(
     root: &Path,
     item: &DirectCodexUserItem,
-) -> Result<GameCreationAppManifest, String> {
+) -> Result<(), String> {
     let DirectCodexUserItem::Message(message) = item;
     if !matches!(message.role, DirectCodexUserRole::User) {
         return Err("DirectProject 只接受 user message item".to_string());
@@ -36,42 +36,16 @@ pub(crate) fn validate_direct_codex_user_item(
                 reference_count = reference_count.saturating_add(1);
                 validate_resource_id_and_manifest(&manifest, resource_id)?;
             }
-            DirectCodexUserContentPart::AgcSkillReference { name } => {
-                let name = name.trim();
-                if name.is_empty()
-                    || name.chars().count() > 120
-                    || matches!(name, "." | "..")
-                    || name.chars().any(|character| {
-                        character.is_control()
-                            || character.is_whitespace()
-                            || matches!(character, '/' | '\\' | ':' | '$')
-                    })
-                {
-                    return Err("引用的 Skill 名称无效，请移除后重新选择".to_string());
-                }
-            }
             DirectCodexUserContentPart::AgcRuntimeRegionReference(reference) => {
                 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 {
         return Err(format!("一次最多引用 {MAX_DIRECT_CODEX_REFERENCES} 个素材"));
     }
-    Ok(manifest)
+    Ok(())
 }
 
 pub(crate) fn validate_resource_id_and_manifest(

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

@@ -1,10 +1,6 @@
-use super::model::{
-    DirectCodexUserContentPart, DirectCodexUserItem, DirectCodexUserRuntimeRegionPart,
-};
+use super::model::{DirectCodexUserContentPart, DirectCodexUserItem};
 use super::validation::validate_direct_codex_user_item;
-use crate::agent::{
-    read_manifest_for_project, sanitize_attachment_local_path, GameCreationAppManifest,
-};
+use crate::agent::{read_manifest_for_project, sanitize_attachment_local_path};
 use serde_json::Value;
 use std::path::Path;
 
@@ -55,47 +51,6 @@ fn direct_codex_user_item_to_response_content(
         .collect()
 }
 
-fn resource_reference_summary(
-    manifest: &GameCreationAppManifest,
-    resource_id: &str,
-) -> Result<String, String> {
-    let resource_id = resource_id.trim();
-    let asset = manifest
-        .assets
-        .iter()
-        .find(|asset| asset.id == resource_id)
-        .ok_or_else(|| "引用的素材已不存在，请移除后重新选择".to_string())?;
-    let path = sanitize_attachment_local_path(&asset.local_path)
-        .ok_or_else(|| "引用的素材路径无效，请移除后重新选择".to_string())?;
-    Ok(format!(
-        "[素材引用 resourceId={resource_id}；项目路径={path}]"
-    ))
-}
-
-fn runtime_region_summary(reference: &DirectCodexUserRuntimeRegionPart) -> String {
-    let resources = reference
-        .resource_ids
-        .iter()
-        .map(|id| id.trim())
-        .collect::<Vec<_>>()
-        .join(",");
-    let mut summary = format!("[运行画面区域：名称={} ", reference.label.trim());
-    if let Some(run_id) = reference.run_id.as_deref() {
-        summary.push_str(&format!("运行标识={} ", run_id.trim()));
-    }
-    if let Some(role) = reference.element_role.as_deref() {
-        summary.push_str(&format!("角色={} ", role.trim()));
-    }
-    if let Some(text) = reference.text.as_deref() {
-        summary.push_str(&format!("文本={} ", text.trim()));
-    }
-    if !resources.is_empty() {
-        summary.push_str(&format!("关联素材={resources}"));
-    }
-    summary.push(']');
-    summary
-}
-
 /// 将 canonical user item 转为 app-server `turn/start.input` 可接受的文本数组。
 /// AGC 私有 part 只在这里投影为安全摘要，canonical item 本身不被修改。
 pub(crate) fn direct_codex_user_item_to_wire_input(
@@ -110,25 +65,38 @@ pub(crate) fn direct_codex_user_item_to_wire_input(
         let text = match part {
             DirectCodexUserContentPart::InputText { text } => text.clone(),
             DirectCodexUserContentPart::AgcResourceReference { resource_id } => {
-                resource_reference_summary(&manifest, resource_id)?
-            }
-            DirectCodexUserContentPart::AgcSkillReference { name } => {
-                format!("${}", name.trim())
+                let asset = manifest
+                    .assets
+                    .iter()
+                    .find(|asset| asset.id == resource_id.trim())
+                    .ok_or_else(|| "引用的素材已不存在，请移除后重新选择".to_string())?;
+                let path = sanitize_attachment_local_path(&asset.local_path)
+                    .ok_or_else(|| "引用的素材路径无效，请移除后重新选择".to_string())?;
+                format!(
+                    "[素材引用 resourceId={}；项目路径={path}]",
+                    resource_id.trim()
+                )
             }
             DirectCodexUserContentPart::AgcRuntimeRegionReference(reference) => {
-                runtime_region_summary(reference)
-            }
-            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()));
+                let resources = reference
+                    .resource_ids
+                    .iter()
+                    .map(|id| id.trim())
+                    .collect::<Vec<_>>()
+                    .join(",");
+                let mut summary = format!("[运行画面区域：名称={} ", reference.label.trim());
+                if let Some(run_id) = reference.run_id.as_deref() {
+                    summary.push_str(&format!("运行标识={} ", run_id.trim()));
+                }
+                if let Some(role) = reference.element_role.as_deref() {
+                    summary.push_str(&format!("角色={} ", role.trim()));
+                }
+                if let Some(text) = reference.text.as_deref() {
+                    summary.push_str(&format!("文本={} ", text.trim()));
+                }
+                if !resources.is_empty() {
+                    summary.push_str(&format!("关联素材={resources}"));
                 }
-                summary.push_str(&format!("；状态={}", reference.status.trim()));
                 summary.push(']');
                 summary
             }
@@ -138,66 +106,6 @@ pub(crate) fn direct_codex_user_item_to_wire_input(
     Ok(Value::Array(input))
 }
 
-pub(crate) fn direct_codex_user_item_to_codex_turn_input(
-    root: &Path,
-    item: &DirectCodexUserItem,
-    skill_roots: &[std::path::PathBuf],
-) -> Result<Value, String> {
-    let manifest = validate_direct_codex_user_item(root, item)?;
-    let DirectCodexUserItem::Message(message) = item;
-    let mut input = Vec::with_capacity(message.content.len());
-    for part in &message.content {
-        match part {
-            DirectCodexUserContentPart::InputText { text } => {
-                input.push(serde_json::json!({ "type": "text", "text": text }));
-            }
-            DirectCodexUserContentPart::AgcResourceReference { resource_id } => {
-                input.push(serde_json::json!({
-                    "type": "text",
-                    "text": resource_reference_summary(&manifest, resource_id)?,
-                }));
-            }
-            DirectCodexUserContentPart::AgcSkillReference { name } => {
-                let name = name.trim();
-                let path = skill_roots
-                    .iter()
-                    .map(|root| root.join(name).join("SKILL.md"))
-                    .find(|path| path.is_file())
-                    .ok_or_else(|| "引用的 Skill 当前不可用，请重新选择".to_string())?;
-                input.push(serde_json::json!({
-                    "type": "skill",
-                    "name": name,
-                    "path": path,
-                }));
-            }
-            DirectCodexUserContentPart::AgcRuntimeRegionReference(reference) => {
-                input.push(serde_json::json!({
-                    "type": "text",
-                    "text": runtime_region_summary(reference),
-                }));
-            }
-            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(']');
-                input.push(serde_json::json!({
-                    "type": "text",
-                    "text": summary,
-                }));
-            }
-        }
-    }
-    Ok(Value::Array(input))
-}
-
 pub(crate) fn direct_codex_user_item_to_prompt(
     root: &Path,
     item: &DirectCodexUserItem,
@@ -266,26 +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"));
-    }
 }

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/agent/skill_pack.rs

@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use sha2::{Digest, Sha256};
 use std::borrow::Cow;
 use std::collections::BTreeSet;
@@ -121,13 +121,6 @@ struct AgcSkillManifestEntry {
     sha256: String,
 }
 
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AgcSkillCatalogEntry {
-    pub(crate) name: String,
-    pub(crate) description: String,
-}
-
 fn is_safe_skill_relative_path(value: &str) -> bool {
     let path = Path::new(value);
     !value.is_empty()
@@ -241,21 +234,6 @@ pub(crate) fn agc_skill_pack_fingerprint() -> Result<String, String> {
     Ok(format!("{:x}", Sha256::digest(canonical_manifest.as_ref())))
 }
 
-/// 返回当前客户端随 AGC 一起启用的内置 Skill 候选。
-///
-/// 前端不得复制审核清单；Skill 名称和描述统一从经过校验的资源 manifest 派生。
-#[tauri::command]
-pub(crate) fn list_agc_skill_catalog() -> Result<Vec<AgcSkillCatalogEntry>, String> {
-    Ok(validated_skill_pack_manifest()?
-        .skills
-        .into_iter()
-        .map(|entry| AgcSkillCatalogEntry {
-            name: entry.name,
-            description: entry.purpose,
-        })
-        .collect())
-}
-
 pub(crate) fn render_agc_skill_pack_index() -> Result<String, String> {
     let manifest = validated_skill_pack_manifest()?;
     let mut lines = vec![format!(
@@ -350,19 +328,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn skill_catalog_is_derived_from_the_validated_manifest() {
-        let catalog = list_agc_skill_catalog().expect("skill catalog");
-        assert_eq!(catalog.len(), AGC_SKILL_PACK_EXPECTED_NAMES.len());
-        for expected_name in AGC_SKILL_PACK_EXPECTED_NAMES {
-            let entry = catalog
-                .iter()
-                .find(|entry| entry.name == expected_name)
-                .expect("expected bundled skill");
-            assert!(!entry.description.trim().is_empty());
-        }
-    }
-
     #[test]
     fn skill_content_digest_is_stable_across_lf_and_crlf() {
         fn digest(bytes: &[u8]) -> String {

apps/ai-game-creator-shell/src-tauri/src/main.rs

@@ -2655,7 +2655,6 @@ fn main() {
             pick_client_extension_file,
             pick_client_extension_directory,
             list_client_extensions,
-            list_agc_skill_catalog,
             import_client_extension,
             set_client_extension_enabled,
             rename_client_extension,

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/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,
@@ -912,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/ResourceReferenceChip.tsx

@@ -4,16 +4,6 @@ import { X } from 'lucide-react';
 
 import type { ChatReference } from './resourceReferences';
 
-function chipTitle(reference: ChatReference) {
-  if (reference.type === 'resource') {
-    return `${reference.label} · ${reference.kind}`;
-  }
-  if (reference.type === 'skill') {
-    return `${reference.name} · Skill`;
-  }
-  return `${reference.label} · 运行区域`;
-}
-
 export function ResourceReferenceChip({
   reference,
   nodeKey,
@@ -31,19 +21,18 @@ export function ResourceReferenceChip({
       data-runtime-region-reference={
         reference.type === 'runtime-region' ? 'true' : undefined
       }
-      data-skill-reference-name={
-        reference.type === 'skill' ? reference.name : undefined
-      }
       contentEditable={false}
-      title={chipTitle(reference)}
+      title={
+        reference.type === 'resource'
+          ? `${reference.label} · ${reference.kind}`
+          : `${reference.label} · 运行区域`
+      }
     >
-      <span aria-hidden="true">{reference.type === 'skill' ? '$' : '@'}</span>
-      <span className="resource-reference-chip-label">
-        {reference.type === 'skill' ? reference.name : reference.label}
-      </span>
+      <span aria-hidden="true">@</span>
+      <span className="resource-reference-chip-label">{reference.label}</span>
       <button
         type="button"
-        aria-label={`移除引用 ${reference.type === 'skill' ? reference.name : reference.label}`}
+        aria-label={`移除引用 ${reference.label}`}
         onMouseDown={(event) => event.preventDefault()}
         onClick={() => {
           editor.update(() => {