From 2a3e8c4852d71dffb8a405f3dcd529a22e565432 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Wed, 15 Apr 2026 10:04:13 +0200
Subject: [PATCH] Update scene validation to include current scene entities

---
 src/document/scene-document-validation.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/document/scene-document-validation.ts b/src/document/scene-document-validation.ts
index 449080cf..e3549d63 100644
--- a/src/document/scene-document-validation.ts
+++ b/src/document/scene-document-validation.ts
@@ -4719,11 +4719,14 @@ function validateProjectDialogue(
 function validateProjectSequence(
   sequence: ProjectSequence,
   path: string,
-  projectResources: Pick<ProjectDocument, "scenes">,
+  projectResources: Pick<ProjectDocument, "scenes"> & {
+    currentSceneEntities?: SceneDocument["entities"];
+  },
   context: ProjectSchedulerValidationContext,
   diagnostics: SceneDiagnostic[]
 ) {
   const projectScenes = projectResources.scenes ?? {};
+  const currentSceneEntities = projectResources.currentSceneEntities ?? {};
 
   if (sequence.title.trim().length === 0) {
     diagnostics.push(
@@ -4772,6 +4775,14 @@ function validateProjectSequence(
           }
         }
 
+        if (targetNpc === null) {
+          const candidate = currentSceneEntities[effect.npcEntityId];
+
+          if (candidate?.kind === "npc") {
+            targetNpc = candidate;
+          }
+        }
+
         if (targetNpc === null) {
           diagnostics.push(
             createDiagnostic(
@@ -5207,7 +5218,7 @@ export function validateSceneDocument(
     validateProjectSequence(
       sequence,
       path,
-      { scenes: {} },
+      { scenes: {}, currentSceneEntities: document.entities },
       projectSchedulerValidationContext,
       diagnostics
     );