From 19ffd157b446a3e3f2dc55214cc70640d2c09cd3 Mon Sep 17 00:00:00 2001
From: Hao19911125 <99091644+Hao19911125@users.noreply.github.com>
Date: Sat, 28 Feb 2026 11:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8E=BB=20message=20?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=8E=B7=E5=8F=96=E5=8F=98=E9=87=8F+?=
 =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E6=95=B4=E4=B8=AA=20vars=20=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ena-planner/ena-planner.js | 34 ++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/modules/ena-planner/ena-planner.js b/modules/ena-planner/ena-planner.js
index c925b3a..9734eab 100644
--- a/modules/ena-planner/ena-planner.js
+++ b/modules/ena-planner/ena-planner.js
@@ -716,18 +716,34 @@ async function buildWorldbookBlock(scanText) {
  * EJS rendering for worldbook entries
  * --------------------------*/
 function getChatVariables() {
-  // Try multiple paths to get ST chat variables
+  // 1) Try chat-level variables (multiple paths)
   try {
     const ctx = getContextSafe();
-    if (ctx?.chatMetadata?.variables) return ctx.chatMetadata.variables;
+    if (ctx?.chatMetadata?.variables && Object.keys(ctx.chatMetadata.variables).length) {
+      return ctx.chatMetadata.variables;
+    }
   } catch {}
   try {
-    if (window.chat_metadata?.variables) return window.chat_metadata.variables;
+    if (window.chat_metadata?.variables && Object.keys(window.chat_metadata.variables).length) {
+      return window.chat_metadata.variables;
+    }
   } catch {}
   try {
     const ctx = getContextSafe();
-    if (ctx?.chat_metadata?.variables) return ctx.chat_metadata.variables;
+    if (ctx?.chat_metadata?.variables && Object.keys(ctx.chat_metadata.variables).length) {
+      return ctx.chat_metadata.variables;
+    }
   } catch {}
+
+  // 2) Fallback: message-level variables (some presets store vars here instead)
+  try {
+    const msgVars = getLatestMessageVarTable();
+    if (msgVars && typeof msgVars === 'object' && Object.keys(msgVars).length) {
+      console.log('[EnaPlanner] Chat-level vars empty, using message-level vars as fallback');
+      return msgVars;
+    }
+  } catch {}
+
   return {};
 }
 
@@ -761,17 +777,9 @@ function buildEjsContext() {
     return value;
   }
 
-  // Compute common derived values that entries might reference
-  const fire = Number(getvar('stat_data.蒂娜.火')) || 0;
-  const ice = Number(getvar('stat_data.蒂娜.冰')) || 0;
-  const dark = Number(getvar('stat_data.蒂娜.暗')) || 0;
-  const light = Number(getvar('stat_data.蒂娜.光')) || 0;
-  const maxAttrValue = Math.max(fire, ice, dark, light);
-
   return {
     getvar, setvar,
-    fire, ice, dark, light,
-    maxAttrValue,
+    vars,
     Number, Math, JSON, String, Array, Object, parseInt, parseFloat,
     console: { log: () => {}, warn: () => {}, error: () => {} },
   };