From b12a81e9c2a80cf97f3aad0e6b30087de7148ab2 Mon Sep 17 00:00:00 2001 From: kdletters Date: Sat, 12 Sep 2026 20:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20AGC=20=E8=87=AA=E4=B8=BB?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E6=B5=8B=E8=AF=95=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8E=E4=BB=BB=E5=8A=A1=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=8A=A0=E5=9B=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 恢复 relaxed autonomous lane 的美术工具与写入门禁旁路 统一 Runtime 任务与事件目录的安全创建和校验 测试临时目录在 Windows 下初始化当前用户 owner --- .../agent/runtime_actions/action_execution.rs | 10 ++++--- .../agent/runtime_actions/project_gates.rs | 9 ++++--- .../src-tauri/src/agent/runtime_state.rs | 16 +++-------- .../src-tauri/src/config.rs | 27 ++++++++++++++++++- .../src-tauri/src/tests/mod.rs | 10 +++++-- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/action_execution.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/action_execution.rs index 23fd5d8e4..75e545171 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/action_execution.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/action_execution.rs @@ -66,10 +66,12 @@ pub(crate) async fn execute_game_creator_agent_runtime_tool_action_with_pending_ return blocker; } } - if let Some(blocker) = - agent_runtime_autonomous_art_director_canvas_only_action_block(agent_id, task, tool) - { - return blocker; + if !relaxed_autonomous { + if let Some(blocker) = + agent_runtime_autonomous_art_director_canvas_only_action_block(agent_id, task, tool) + { + return blocker; + } } let command_id = game_creator_agent_runtime_tool_command_id(tool); if let Some(command_id) = command_id { diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/project_gates.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/project_gates.rs index 17dbb57f2..d4e7fde49 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/project_gates.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_actions/project_gates.rs @@ -135,6 +135,12 @@ pub(crate) fn ensure_current_autonomous_ready_child_mutation_at_locked( Ok(agent_id) => agent_id, Err(_) => return Ok(()), }; + if game_creator_agent_runtime_cancel_requested_for(root, &normalized_agent_id, run_id) { + return Err("当前 Run 已收到取消请求，禁止继续修改项目".to_string()); + } + if autonomous_relaxed_run_at(root, &normalized_agent_id, run_id)? { + return Ok(()); + } let binding = read_game_creator_agent_runtime_run_profile_binding(root, &normalized_agent_id, run_id)?; let Some(binding) = binding else { @@ -151,9 +157,6 @@ pub(crate) fn ensure_current_autonomous_ready_child_mutation_at_locked( } return Ok(()); }; - if game_creator_agent_runtime_cancel_requested_for(root, &normalized_agent_id, run_id) { - return Err("当前 Run 已收到取消请求，禁止继续修改项目".to_string()); - } if binding.profile != AGENT_RUNTIME_RUN_PROFILE_AUTONOMOUS_GAME_BUILD { return Ok(()); } diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_state.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_state.rs index 48052eed0..f23bf5f5b 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_state.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/runtime_state.rs @@ -2723,12 +2723,8 @@ pub(super) fn append_game_creator_agent_runtime_event_with_action( ) -> Result<(), String> { let path = game_creator_agent_runtime_event_path(root, &state.agent_id); if let Some(parent) = path.parent() { - fs::create_dir_all(parent).map_err(|error| { - format!( - "创建 Agent Runtime 事件目录失败：{}: {error}", - parent.display() - ) - })?; + ensure_game_creator_private_directory_tree(parent, "Agent Runtime 事件目录")?; + prepare_game_creator_private_path_for_read(parent, true, "Agent Runtime 事件目录")?; } let failure_detail = matches!( event_type, @@ -3400,12 +3396,8 @@ pub(super) fn append_game_creator_agent_runtime_task_record_unlocked( } let path = game_creator_agent_runtime_task_path(root, &record.agent_id); if let Some(parent) = path.parent() { - fs::create_dir_all(parent).map_err(|error| { - format!( - "创建 Agent Runtime 任务目录失败：{}: {error}", - parent.display() - ) - })?; + ensure_game_creator_private_directory_tree(parent, "Agent Runtime 任务目录")?; + prepare_game_creator_private_path_for_read(parent, true, "Agent Runtime 任务目录")?; } let line = serde_json::to_string(&record) .map_err(|error| format!("序列化 Agent Runtime 任务失败：{error}"))?; diff --git a/apps/ai-game-creator-shell/src-tauri/src/config.rs b/apps/ai-game-creator-shell/src-tauri/src/config.rs index b1b27ae90..3240832c2 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/config.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/config.rs @@ -1296,6 +1296,8 @@ pub(crate) fn ensure_game_creator_private_directory_tree( let create_result = fs::create_dir(&directory); match create_result { Ok(()) => { + #[cfg(all(windows, test))] + initialize_windows_game_creator_directory_owner_for_current_user(&directory)?; #[cfg(windows)] if game_creator_private_path_allows_auto_elevation(&directory) { secure_windows_game_creator_path_for_current_user_with_auto_elevation( @@ -2131,8 +2133,31 @@ fn secure_windows_game_creator_path_for_current_user_with_auto_elevation_scoped( Err(error) if scope.allows_path(path) && windows_acl_error_may_need_elevation(&error) - && !error.contains("安全对象不属于当前用户") => + && (!error.contains("安全对象不属于当前用户") || { + #[cfg(test)] + { + path.file_name() + .is_some_and(|name| name == "game-creator.config.json") + || path.starts_with(std::env::temp_dir()) + || path + .ancestors() + .any(|ancestor| ancestor.join(".agent/manifest.json").is_file()) + } + #[cfg(not(test))] + { + false + } + }) => { + #[cfg(test)] + if error.contains("安全对象不属于当前用户") { + return secure_windows_game_creator_path_for_current_user_with_owner_policy( + path, + is_directory, + true, + true, + ); + } secure_windows_game_creator_path_for_current_user_with_owner_policy( path, is_directory, diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs index 7c65048ba..9d7ea9f20 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs @@ -427,10 +427,16 @@ pub(crate) fn canonical_test_tempdir(prefix: &str) -> tempfile::TempDir { let temp_root = std::env::temp_dir() .canonicalize() .expect("canonicalize test temp root"); - tempfile::Builder::new() + let temporary = tempfile::Builder::new() .prefix(prefix) .tempdir_in(temp_root) - .expect("create test temp directory under canonical root") + .expect("create test temp directory under canonical root"); + #[cfg(windows)] + crate::config::initialize_windows_game_creator_directory_owner_for_current_user( + temporary.path(), + ) + .expect("initialize test temp directory owner"); + temporary } fn agent_goal_sidecar_path_for_test(root: &Path, agent_id: &str, session_id: &str) -> PathBuf {