Upload app.py

app.py

@@ -188,6 +188,27 @@ def process_user_input(user_input: str, chat_history: list, game_session: dict):
     # 1. NLU 解析
     intent = nlu.parse_intent(user_input)
 
+    # 1.5 预校验：立即驳回违反一致性的操作（不调用 LLM，不消耗回合）
+    is_valid, rejection_msg = gs.pre_validate_action(intent)
+    if not is_valid:
+        chat_history.append({"role": "user", "content": user_input})
+        options = game_session.get("current_options", [])
+        options = _ensure_min_options(options, 3)
+        options_text = _format_options(options)
+        rejection_content = (
+            f"⚠️ **行动被驳回**：{rejection_msg}\n\n"
+            f"请重新选择行动，或输入其他指令。\n\n{options_text}"
+        )
+        chat_history.append({"role": "assistant", "content": rejection_content})
+        btn_updates = _get_button_updates(options)
+        yield (
+            chat_history,
+            _format_status_panel(gs),
+            btn_updates[0], btn_updates[1], btn_updates[2],
+            game_session,
+        )
+        return
+
     # 2. 添加用户消息 + 空的 assistant 消息（用于流式填充）
     chat_history.append({"role": "user", "content": user_input})
     chat_history.append({"role": "assistant", "content": "⏳ 正在生成..."})
@@ -570,15 +591,43 @@ def _format_status_panel(gs: GameState) -> str:
     else:
         inventory_text = "空"
 
-    # 活跃任务
+    # 活跃任务（完整展示：描述、子目标、奖励、来源）
     active_quests = [q for q in w.quests.values() if q.status == "active"]
     if active_quests:
-        quest_lines = []
+        quest_blocks = []
         for q in active_quests:
             done = sum(1 for v in q.objectives.values() if v)
             total = len(q.objectives)
-            quest_lines.append(f"{q.title}（{done}/{total}）")
-        quest_text = "<br>".join(quest_lines)
+            tag = "主线" if q.quest_type == "main" else "支线" if q.quest_type == "side" else "🟡 " + q.quest_type
+            # 子目标列表
+            obj_lines = "".join(
+                f"<br>&nbsp;&nbsp;{'✅' if v else '⬜'} {k}"
+                for k, v in q.objectives.items()
+            )
+            # 奖励摘要
+            reward_parts = []
+            if q.rewards.gold:
+                reward_parts.append(f"{q.rewards.gold}💰")
+            if q.rewards.experience:
+                reward_parts.append(f"{q.rewards.experience}经验")
+            if q.rewards.items:
+                reward_parts.append("、".join(q.rewards.items))
+            if q.rewards.unlock_skill:
+                reward_parts.append(f"技能:{q.rewards.unlock_skill}")
+            if q.rewards.title:
+                reward_parts.append(f"称号:{q.rewards.title}")
+            reward_str = " | ".join(reward_parts) if reward_parts else "无"
+
+            block = (
+                f"<details open><summary><b>{tag} {q.title}</b>（{done}/{total}）</summary>"
+                f"<span style='font-size:0.82em;color:#888;'>来源: {q.giver_npc or '未知'}</span><br>"
+                f"<span style='font-size:0.82em;'>{q.description}</span>"
+                f"{obj_lines}"
+                f"<br><span style='font-size:0.82em;color:#4a6;'>奖励: {reward_str}</span>"
+                f"</details>"
+            )
+            quest_blocks.append(block)
+        quest_text = "".join(quest_blocks)
     else:
         quest_text = "无活跃任务"
 
@@ -640,7 +689,7 @@ def _format_status_panel(gs: GameState) -> str:
 </span>
 </div>
 
-<div>
+<div style="grid-column: 1 / -1;">
 <h4 style="margin:4px 0 2px 0;">📜 任务</h4>
 <span style="font-size:0.85em;">
 {quest_text}