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 bf6f38b50..03305e4a1 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/agent.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/agent.rs
@@ -35,8 +35,8 @@ mod runtime_tools;
 mod skill_pack;
 use codex_app_server::*;
 pub(crate) use codex_app_server::{
-    direct_codex_canonical_project_identity, direct_game_creator_codex_chat_at,
-    direct_game_creator_home_codex_chat,
+    direct_codex_canonical_project_identity_for_commands as direct_codex_canonical_project_identity,
+    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/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/codex_app_server/mod.rs
index 25f9c73bf..b20b55556 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
@@ -13,7 +13,8 @@ use uuid::Uuid;
 mod direct_project_history_wire;
 use direct_project_history_wire::build_direct_project_history_injection_params;
 mod direct_project_identity;
-pub(crate) use direct_project_identity::direct_codex_canonical_project_identity;
+pub(crate) use direct_project_identity::direct_codex_canonical_project_identity as direct_codex_canonical_project_identity_for_commands;
+use direct_project_identity::*;
 
 const GAME_CREATOR_CODEX_APP_SERVER_PROVIDER_ID: &str = "genarrative_agc";
 const GAME_CREATOR_CODEX_APP_SERVER_API_KEY_ENV: &str = "GENARRATIVE_AGC_CODEX_API_KEY";
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 071f65da4..b2701dba8 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
@@ -263,7 +263,7 @@ impl DirectThreadManager {
             }
             "turn.started" | "turn.completed" => {
                 thread.lifecycle_anchor = Some(event.clone());
-                event.event_type == "turn.completed"
+                true
             }
             "approval.requested" | "request.requested" | "ask.requested" => {
                 if let Some(request_id) = request_id(event) {