Finalize Dream QA agent hardening

app.py

@@ -1,5 +1,9 @@
 import os
 
+from gradio.routes import App
+from fastapi import Request
+from fastapi.responses import JSONResponse, RedirectResponse
+
 from dream_customs import zerogpu  # noqa: F401
 from dream_customs.ui.app import build_demo
 
@@ -7,6 +11,50 @@ from dream_customs.ui.app import build_demo
 demo = build_demo()
 
 
+_ORIGINAL_CREATE_APP = App.create_app
+
+
+def _install_gradio_api_aliases(app, blocks) -> None:
+    existing_paths = {getattr(route, "path", "") for route in app.routes}
+
+    if "/gradio_api/info" not in existing_paths:
+        @app.get("/gradio_api/info", include_in_schema=False)
+        async def gradio_api_info_alias() -> JSONResponse:
+            """Compatibility for Hugging Face's generated agents.md schema URL."""
+
+            return JSONResponse(blocks.get_api_info())
+
+    async def _redirect_to_gradio4_path(request: Request) -> RedirectResponse:
+        suffix = request.url.path.removeprefix("/gradio_api")
+        target = suffix or "/"
+        if request.url.query:
+            target = f"{target}?{request.url.query}"
+        return RedirectResponse(url=target, status_code=307)
+
+    for alias_path in (
+        "/gradio_api/queue/join",
+        "/gradio_api/queue/data",
+        "/gradio_api/upload",
+    ):
+        if alias_path not in existing_paths:
+            app.add_api_route(
+                alias_path,
+                _redirect_to_gradio4_path,
+                methods=["GET", "POST"],
+                include_in_schema=False,
+            )
+
+
+def _create_app_with_gradio_api_aliases(blocks, app_kwargs=None, auth_dependency=None):
+    app = _ORIGINAL_CREATE_APP(blocks, app_kwargs=app_kwargs, auth_dependency=auth_dependency)
+    _install_gradio_api_aliases(app, blocks)
+    return app
+
+
+App.create_app = staticmethod(_create_app_with_gradio_api_aliases)
+_install_gradio_api_aliases(demo.app, demo)
+
+
 if __name__ == "__main__":
     demo.launch(
         server_name=os.getenv("GRADIO_SERVER_NAME", "0.0.0.0"),

dream_customs/pipeline.py

@@ -1,3 +1,4 @@
+import json
 import re
 from datetime import date
 from typing import Dict, List, Optional, Tuple
@@ -100,6 +101,90 @@ _ANCHOR_STOPWORDS = {
 }
 
 _ZH_ANCHOR_MARKERS = [
+    "高楼边缘",
+    "高楼",
+    "边缘",
+    "掉进海里",
+    "掉进海",
+    "海里",
+    "海",
+    "小孩找不到家",
+    "小孩",
+    "找不到家",
+    "潮湿的森林",
+    "潮湿森林",
+    "戴面具的人",
+    "面具",
+    "追逐",
+    "被追逐",
+    "犯的错误",
+    "过去犯的错误",
+    "错误",
+    "自责",
+    "重演",
+    "心率",
+    "噩梦",
+    "失眠",
+    "红色的门",
+    "红色门",
+    "海边",
+    "海浪",
+    "森林",
+    "白色猫",
+    "黑猫",
+    "猫",
+    "空白路牌",
+    "路牌",
+    "大雾",
+    "雾很大",
+    "雾",
+    "红色胡同",
+    "胡同",
+    "便签",
+    "草图",
+    "蓝色的小屋",
+    "小屋",
+    "红色邮箱",
+    "邮箱",
+    "红蓝两条路",
+    "两条路",
+    "旧房子",
+    "天花板",
+    "掉灰",
+    "考试",
+    "掉队",
+    "旧钥匙",
+    "钥匙",
+    "没名字的人",
+    "陌生的人",
+    "白色走廊",
+    "旧图书馆",
+    "图书馆",
+    "红色楼梯",
+    "楼梯",
+    "大雨",
+    "窗",
+    "家门",
+    "旧家",
+    "楼顶",
+    "漆黑的走廊",
+    "漆黑走廊",
+    "黑暗走廊",
+    "走廊",
+    "教室",
+    "老师",
+    "交作业",
+    "作业",
+    "门牌子",
+    "门牌",
+    "脚步声",
+    "心跳",
+    "大雪地",
+    "雪地",
+    "地铁站",
+    "地铁",
+    "安全帽",
+    "男生",
     "电梯按钮",
     "融化的按钮",
     "按钮融化",
@@ -118,6 +203,92 @@ _ZH_ANCHOR_MARKERS = [
 ]
 
 _ZH_TO_EN_PHRASES = {
+    "高楼边缘": "high-rise edge",
+    "高楼": "high-rise",
+    "边缘": "edge",
+    "掉进海里": "falling into the sea",
+    "掉进海": "falling into the sea",
+    "海里": "sea",
+    "海": "sea",
+    "小孩找不到家": "child unable to find home",
+    "小孩": "child",
+    "找不到家": "unable to find home",
+    "潮湿的森林": "wet forest",
+    "潮湿森林": "wet forest",
+    "戴面具的人": "masked person",
+    "面具": "mask",
+    "追逐": "chase",
+    "被追逐": "chase",
+    "犯的错误": "past mistake",
+    "过去犯的错误": "past mistake",
+    "错误": "mistake",
+    "自责": "self-blame",
+    "重演": "replay",
+    "心率": "fast heartbeat",
+    "噩梦": "nightmare",
+    "失眠": "insomnia",
+    "红色的门": "red door",
+    "红色门": "red door",
+    "海边": "seaside",
+    "海浪": "wave",
+    "大雾": "heavy fog",
+    "雾很大": "heavy fog",
+    "雾": "fog",
+    "森林": "forest",
+    "白色猫": "white cat",
+    "黑猫": "black cat",
+    "猫": "cat",
+    "路牌": "road sign",
+    "空白路牌": "blank road sign",
+    "红色胡同": "red alley",
+    "胡同": "alley",
+    "便签": "note",
+    "草图": "sketch",
+    "蓝色的小屋": "blue small house",
+    "小屋": "small house",
+    "红色邮箱": "red mailbox",
+    "邮箱": "mailbox",
+    "红蓝两条路": "red and blue roads",
+    "两条路": "two roads",
+    "旧房子": "old house",
+    "天花板": "ceiling",
+    "掉灰": "falling dust",
+    "考试": "exam",
+    "掉队": "falling behind",
+    "旧钥匙": "old key",
+    "钥匙": "key",
+    "没名字的人": "nameless person",
+    "陌生的人": "stranger",
+    "白色走廊": "white hallway",
+    "旧图书馆": "old library",
+    "图书馆": "library",
+    "红色楼梯": "red staircase",
+    "楼梯": "staircase",
+    "大雨": "heavy rain",
+    "雨": "rain",
+    "开着的窗": "open window",
+    "窗": "window",
+    "家门": "home door",
+    "旧家": "old home",
+    "楼顶": "rooftop",
+    "漆黑的走廊": "dark hallway",
+    "漆黑走廊": "dark hallway",
+    "黑暗走廊": "dark hallway",
+    "走廊": "hallway",
+    "教室": "classroom",
+    "老师": "teacher",
+    "交作业": "assignment",
+    "作业": "assignment",
+    "门牌子": "door sign",
+    "门牌": "door sign",
+    "脚步声": "footsteps",
+    "心跳": "heartbeat",
+    "大雪地": "snowfield",
+    "雪地": "snow",
+    "地铁站": "subway station",
+    "地铁": "subway",
+    "安全帽": "hard hat",
+    "男生": "young man",
     "电梯按钮": "elevator button",
     "融化的按钮": "melted button",
     "按钮融化": "melted button",
@@ -145,6 +316,92 @@ def _dedupe_preserve_order(items: List[str]) -> List[str]:
     return result
 
 
+_PLACEHOLDER_ANCHORS = {
+    "梦里的那个细节",
+    "梦里的细节",
+    "那个细节",
+    "dream detail",
+    "that dream detail",
+    "that that dream detail",
+    "the dream detail",
+    "dream",
+    "dream fragment",
+}
+
+
+def _is_placeholder_anchor(text: str) -> bool:
+    clean = re.sub(r"\s+", " ", (text or "").strip().lower())
+    return not clean or clean in _PLACEHOLDER_ANCHORS or "dream detail" in clean or "梦里的那个细节" in clean
+
+
+def _remove_placeholder_anchors(items: List[str]) -> List[str]:
+    return [item for item in items if not _is_placeholder_anchor(item)]
+
+
+_VISUAL_CLUE_PREFIXES = (
+    "Scene:",
+    "Object:",
+    "Visible text:",
+    "Spatial relation:",
+    "Mood cue:",
+    "Uncertain detail:",
+    "Surprising detail:",
+)
+
+
+def _flatten_visual_value(value) -> List[str]:
+    if isinstance(value, str):
+        return [value]
+    if isinstance(value, list):
+        items: List[str] = []
+        for item in value:
+            items.extend(_flatten_visual_value(item))
+        return items
+    if isinstance(value, dict):
+        items = []
+        for item in value.values():
+            items.extend(_flatten_visual_value(item))
+        return items
+    return []
+
+
+def _clean_visual_clue_text(clue: str) -> str:
+    clean = (clue or "").strip()
+    if not clean:
+        return ""
+    try:
+        parsed = json.loads(clean)
+    except json.JSONDecodeError:
+        parsed = None
+    if parsed is not None:
+        flattened = _flatten_visual_value(parsed)
+        clean = ", ".join(item for item in flattened if item.strip())
+    for prefix in _VISUAL_CLUE_PREFIXES:
+        if clean.lower().startswith(prefix.lower()):
+            clean = clean[len(prefix) :].strip()
+            break
+    clean = re.sub(r"\b(scene_summary|objects|visible_text|spatial_relations|mood_cues|uncertain_details|surprising_detail)\b", " ", clean)
+    clean = re.sub(r"[{}\[\]\"']", " ", clean)
+    clean = re.sub(r"\s+", " ", clean).strip(" .,:;!?()")
+    return clean
+
+
+def _visual_anchor_candidates(intake: DreamIntake) -> List[str]:
+    candidates: List[str] = []
+    for clue in intake.visual_clues:
+        clean = _clean_visual_clue_text(clue)
+        if not clean:
+            continue
+        for phrase in re.split(r"\s*(?:,|;|，|；|/|\n)\s*", clean):
+            phrase = phrase.strip(" .,:;!?()[]{}")
+            if not phrase:
+                continue
+            if len(phrase) > 48:
+                phrase = phrase[:48].rsplit(" ", 1)[0].strip() or phrase[:48].strip()
+            candidates.append(phrase)
+    return _dedupe_preserve_order(candidates)
+
+
 def _extract_dream_anchors(intake: DreamIntake) -> List[str]:
     raw_text = " ".join(
         [
@@ -156,6 +413,8 @@ def _extract_dream_anchors(intake: DreamIntake) -> List[str]:
     )
     text = raw_text.lower()
     candidates: List[str] = []
+    visual_candidates = _visual_anchor_candidates(intake)
+    candidates.extend(visual_candidates[:3])
     for marker in _ZH_ANCHOR_MARKERS:
         if marker in raw_text:
             candidates.append(marker)
@@ -167,22 +426,29 @@ def _extract_dream_anchors(intake: DreamIntake) -> List[str]:
         r"paper|papers|promise|promises|window|windows|suitcase|suitcases|"
         r"clerk|clerks|sunrise|elevator|elevators|button|buttons|hallway|"
         r"gate|gates|floor|floors|stamp|stamps|number|numbers|exam|exams|"
-        r"pencil|pencils|train|trains|door|doors|phone|phones|water|shoe|shoes|"
-        r"stairwell|stairwells|room|rooms|key|keys|note|notes|rain|moon|moons|curtain|curtains"
+        r"pencil|pencils|train|trains|door|doors|subway|station|stations|snow|snowfield|"
+        r"hat|hats|phone|phones|water|shoe|shoes|"
+        r"stairwell|stairwells|room|rooms|key|keys|note|notes|rain|moon|moons|curtain|curtains|"
+        r"email|emails|meeting|meetings|deadline|deadlines|classroom|classrooms|teacher|teachers|"
+        r"assignment|assignments|homework|message|messages|airport|airports|glass|bird|birds|child|children|"
+        r"cat|cats|forest|forests|sign|signs|alley|alleys|mailbox|mailboxes|sketch|sketches|ceiling|ceilings"
         r")\b"
     )
     for match in pair_pattern.finditer(text):
         modifier, noun = match.groups()
-        phrase = f"{modifier} {noun.rstrip('s')}"
+        normalized_noun = noun[:-1] if noun.endswith("s") and not noun.endswith("ss") else noun
+        phrase = f"{modifier} {normalized_noun}"
         if modifier not in _ANCHOR_STOPWORDS:
             candidates.append(phrase)
 
     noun_pattern = re.compile(
         r"\b(customs|suitcase|clerk|sunrise|elevator|button|hallway|gate|stamp|number|floor|"
-        r"exam|pencil|train|door|phone|water|shoe|stairwell|room|key|note|rain|moon|curtain|sleep|dream)\b"
+        r"exam|pencil|train|door|subway|station|snow|snowfield|hat|phone|water|shoe|stairwell|"
+        r"room|key|note|rain|moon|curtain|sleep|dream|email|meeting|deadline|classroom|teacher|"
+        r"assignment|homework|message|airport|glass|bird|child|cat|forest|sign|alley|mailbox|sketch|ceiling)\b"
     )
     candidates.extend(match.group(1) for match in noun_pattern.finditer(text))
-    candidates.extend(clue.lower() for clue in intake.visual_clues if clue.strip())
+    candidates.extend(visual_candidates)
 
     return _dedupe_preserve_order(candidates)[:5]
 
@@ -191,7 +457,7 @@ def _english_anchor_text(text: str) -> str:
     clean = text or ""
     for source, target in sorted(_ZH_TO_EN_PHRASES.items(), key=lambda item: len(item[0]), reverse=True):
         clean = clean.replace(source, target)
-    clean = re.sub(r"[\u4e00-\u9fff]+", "dream detail", clean)
+    clean = re.sub(r"[\u4e00-\u9fff]+", " dream fragment ", clean)
     clean = re.sub(r"\s+", " ", clean).strip(" .,:;!?\"'()[]{}")
     return clean
 
@@ -224,6 +490,18 @@ def _clean_english_today_tip_language(card: TodayTipCard) -> TodayTipCard:
     return cleaned
 
 
+def _clean_placeholder_phrase(text: str) -> str:
+    clean = text or ""
+    clean = clean.replace("梦里的那个细节", "梦境片段").replace("那个细节", "梦境片段")
+    clean = re.sub(r"(?<=[A-Za-z])dream\s+detail", " dream detail", clean, flags=re.IGNORECASE)
+    clean = re.sub(r"dream\s+detail(?=[A-Za-z])", "dream detail ", clean, flags=re.IGNORECASE)
+    clean = re.sub(r"\b(?:the\s+)?that\s+dream\s+detail\b", "the dream fragment", clean, flags=re.IGNORECASE)
+    clean = re.sub(r"\bdream detail(?:dream detail|dream)*\b", "dream fragment", clean, flags=re.IGNORECASE)
+    clean = re.sub(r"\bthe\s+the\s+", "the ", clean, flags=re.IGNORECASE)
+    clean = re.sub(r"\s+", " ", clean)
+    return clean.strip()
+
+
 def _primary_anchor(intake: DreamIntake, language: str = "en") -> str:
     anchors = _anchors_for_language(intake, language)
     if anchors:
@@ -236,6 +514,13 @@ def _secondary_anchor(intake: DreamIntake, language: str = "en") -> str:
     return anchors[1] if len(anchors) > 1 else _primary_anchor(intake, language)
 
 
+def _anchor_with_article(anchor: str) -> str:
+    clean = (anchor or "").strip()
+    if clean.lower().startswith(("the ", "a ", "an ")):
+        return clean
+    return f"the {clean}"
+
+
 def _title_anchor(text: str) -> str:
     return " ".join(part.capitalize() for part in text.split())
 
@@ -249,17 +534,30 @@ def _summary_from_intake(intake: DreamIntake, language: str = "en") -> str:
     clean = re.sub(r"\s+", " ", merged).strip()
     if len(clean) > 72:
         clean = clean[:69].rstrip() + "..."
+    if not _is_zh(language):
+        clean = _clean_placeholder_phrase(_english_anchor_text(clean))
     if not _is_zh(language):
         return clean if clean.lower().startswith(("i ", "you ")) else f"You dreamed about {clean}"
-    return f"你梦见{clean}" if not clean.startswith(("你", "我", "I ", "i ")) else clean
+    if clean.startswith(("你", "我", "I ", "i ")) or any(marker in clean[:12] for marker in ("梦见", "梦到")):
+        return clean
+    return f"你梦见{clean}"
 
 
 def _main_question_from_intake(intake: DreamIntake, language: str = "en") -> str:
     if intake.main_question.strip():
         return intake.main_question.strip()
+    task = _task_focus(intake.merged_text(), language)
+    if task:
+        if not _is_zh(language):
+            return f"How can I make the {task} feel smaller and more doable today?"
+        return f"今天怎样把「{task}」变成更小、更能开始的一步？"
+    if _has_prophecy_frame(intake.merged_text()):
+        if not _is_zh(language):
+            return "How can I treat this dream as a feeling to notice, not a prediction?"
+        return "我怎样把这个梦当作一种感受来照顾，而不是当成预兆？"
     primary = _primary_anchor(intake, language)
     if not _is_zh(language):
-        return f"What might the {primary} be asking me to notice today?"
+        return f"What might {_anchor_with_article(primary)} be asking me to notice today?"
     return f"这个梦里的「{primary}」可能在提醒我什么？"
 
 
@@ -268,8 +566,8 @@ def _fallback_interpretation(intake: DreamIntake, language: str = "en") -> str:
     secondary = _secondary_anchor(intake, language)
     if not _is_zh(language):
         return (
-            f"Maybe this dream is not giving you a fixed answer. It is placing the {primary} "
-            f"beside the {secondary} so you can notice one small stuck point today."
+            f"Maybe this dream is not giving you a fixed answer. It is placing {_anchor_with_article(primary)} "
+            f"beside {_anchor_with_article(secondary)} so you can notice one small stuck point today."
         )
     return (
         f"也许这个梦不是在给你一个确定答案，而是把「{primary}」和「{secondary}」放到一起，"
@@ -281,7 +579,7 @@ def _grounded_today_tip(intake: DreamIntake, language: str = "en") -> str:
     primary = _primary_anchor(intake, language)
     if not _is_zh(language):
         return (
-            f"For today, borrow one action from the {primary}: open the task, write only the first line, "
+            f"For today, borrow one action from {_anchor_with_article(primary)}: open the task, write only the first line, "
             "and let that be enough for now."
         )
     return f"今天先从「{primary}」借一个动作：只做最小的第一步，不急着把整件事完成。"
@@ -292,9 +590,21 @@ def _answer_based_tiny_action(answers: str, language: str = "en") -> str:
     if _is_zh(language):
         if "邮件" in lowered or "email" in lowered:
             return "给自己 5 分钟，只打开那封邮件，写��第一句话；今天不要求立刻发出。"
+        if "消息" in lowered or "发消息" in lowered:
+            return "给自己 5 分钟，只写一条诚实的进度消息草稿；今天先不要求把整件事做完。"
+        if "作业" in lowered or "草稿" in lowered:
+            return "给自己 5 分钟，只打开草稿，写下下一小段或一个待补的标题。"
         return ""
     if "email" in lowered or "message" in lowered:
         return "Set a five-minute timer, open the email, and write only the first sentence. You do not have to send it yet."
+    if "assignment" in lowered or "homework" in lowered or "draft" in lowered:
+        return "Set a five-minute timer, open the draft, and write only the next small heading or first sentence."
+    if "presentation" in lowered or "speech" in lowered or "rehearse" in lowered:
+        return "Set a five-minute timer and rehearse only the first minute, then stop and write one note for tomorrow."
+    if "deadline" in lowered or "application" in lowered:
+        return "Set a five-minute timer, open the application checklist, and mark only the next missing item."
+    if "apolog" in lowered:
+        return "Set a five-minute timer and draft one honest apology sentence without sending it yet."
     return ""
 
 
@@ -303,12 +613,27 @@ def _answer_based_today_tip(answers: str, anchor: str, language: str = "en") ->
     if _is_zh(language):
         if "邮件" in lowered or "email" in lowered:
             return f"今天把「{anchor}」当成允许慢慢开始的按钮：只打开那封邮件，先写第一句话。"
+        if "消息" in lowered or "发消息" in lowered:
+            return f"今天把「{anchor}」当成一个小门牌：先给对方发一条进度消息，不要求马上完成全部。"
+        if "作业" in lowered or "草稿" in lowered:
+            return f"今天把「{anchor}」当成一个可以靠近的教室门口：只打开草稿，补上下一小段。"
         return ""
     if "email" in lowered or "message" in lowered:
         return (
             f"For today, treat the {anchor} as permission to start gently: "
             "open the overdue email and write only the first sentence."
         )
+    if "assignment" in lowered or "homework" in lowered or "draft" in lowered:
+        return (
+            f"For today, treat the {anchor} as a smaller doorway: open the draft "
+            "and write only the next tiny piece."
+        )
+    if "presentation" in lowered or "speech" in lowered or "rehearse" in lowered:
+        return f"For today, let the {anchor} narrow the work: rehearse only the first minute of the presentation."
+    if "deadline" in lowered or "application" in lowered:
+        return f"For today, let the {anchor} become a checklist: open the application and choose one missing item."
+    if "apolog" in lowered:
+        return f"For today, let the {anchor} become one repair step: draft a single apology sentence."
     return ""
 
 
@@ -319,6 +644,8 @@ def _answer_based_interpretation(answers: str, anchor: str, language: str = "en"
             return f"也许「{anchor}」不是在催你立刻完成什么，而是在提醒你：那封邮件可以先从一句话开始。"
         if "消息" in lowered or "message" in lowered:
             return f"也许「{anchor}」不是在催你立刻回应什么，而是在提醒你：那条消息可以先从一句草稿开始。"
+        if "作业" in lowered or "草稿" in lowered:
+            return f"也许「{anchor}」不是在说你已经来不及，而是在提醒你：草稿可以先从下一小段开始。"
         return ""
     if "email" in lowered:
         return (
@@ -330,6 +657,26 @@ def _answer_based_interpretation(answers: str, anchor: str, language: str = "en"
             f"Maybe the {anchor} is not asking you to answer every message at once. "
             "It is pointing to the gentler threshold: opening one thread and drafting one first sentence."
         )
+    if "assignment" in lowered or "homework" in lowered or "draft" in lowered:
+        return (
+            f"Maybe the {anchor} is not asking you to finish the whole assignment at once. "
+            "It is pointing to the gentler threshold: opening the draft and adding one small piece."
+        )
+    if "presentation" in lowered or "speech" in lowered or "rehearse" in lowered:
+        return (
+            f"Maybe the {anchor} is not asking you to perfect the whole presentation tonight. "
+            "It is pointing to the gentler threshold: rehearsing the first minute once."
+        )
+    if "deadline" in lowered or "application" in lowered:
+        return (
+            f"Maybe the {anchor} is not asking you to finish the whole application in one push. "
+            "It is pointing to the gentler threshold: finding the next missing item."
+        )
+    if "apolog" in lowered:
+        return (
+            f"Maybe the {anchor} is not asking you to repair everything at once. "
+            "It is pointing to the gentler threshold: drafting one honest sentence."
+        )
     return ""
 
 
@@ -350,7 +697,16 @@ def _anchor_in_text(text: str, anchors: List[str]) -> bool:
 
 def _text_uses_anchor(text: str, anchors: List[str]) -> bool:
     clean = (text or "").lower()
-    return any(anchor in clean for anchor in anchors)
+    for anchor in anchors:
+        item = anchor.lower().strip()
+        if not item or _is_placeholder_anchor(item):
+            continue
+        if item in clean:
+            return True
+        tokens = [token for token in re.split(r"[\s,，。:：;；、]+", item) if len(token) >= 3]
+        if any(token in clean for token in tokens):
+            return True
+    return False
 
 
 def _is_generic_visitor_name(text: str, intake: DreamIntake) -> bool:
@@ -499,6 +855,107 @@ def _grounded_question(intake: DreamIntake, question: str, language: str = "en")
     )
 
 
+def _question_for_declared_real_task(intake: DreamIntake, language: str = "en") -> str:
+    merged = intake.merged_text().lower()
+    primary = _primary_anchor(intake, language)
+    prophecy_question = _question_for_prophecy_frame(intake, language)
+    if prophecy_question:
+        return prophecy_question
+    if not _is_zh(language):
+        if "email" in merged:
+            return f"When the {primary} shows up beside the overdue email, what would make opening that email feel smaller today?"
+        if any(term in merged for term in ["assignment", "homework", "draft"]):
+            return f"When the {primary} shows up beside the assignment, what is the smallest useful piece you could start today?"
+        if any(term in merged for term in ["presentation", "speech", "rehearse"]):
+            return f"When the {primary} shows up beside the presentation, what would make the first minute easier to rehearse?"
+        if any(term in merged for term in ["deadline", "application"]):
+            return f"When the {primary} shows up beside the deadline, what is the next missing item you can safely choose?"
+        if "apolog" in merged:
+            return f"When the {primary} shows up beside the apology, what is one honest sentence you could draft first?"
+        if "message" in merged:
+            return f"When the {primary} shows up beside that message, what is one sentence you could safely draft today?"
+        return ""
+    if "邮件" in merged or "email" in merged:
+        return f"当「{primary}」和那封邮件连在一起时，今天怎样才能让打开它这件事变小一点？"
+    if "作业" in merged or "草稿" in merged:
+        return f"当「{primary}」和作业连在一起时，今天最小、最安全的一步可以是什么？"
+    if "演讲" in merged or "汇报" in merged:
+        return f"当「{primary}」和演讲连在一起时，今晚只排练开头一分钟可以怎么做？"
+    if "申请" in merged or "截止" in merged:
+        return f"当「{primary}」和截止时间连在一起时，今天可以先确认哪一个缺口？"
+    if "道歉" in merged:
+        return f"当「{primary}」和道歉连在一起时，今天可以先写哪一句真诚草稿？"
+    if "消息" in merged or "发消息" in merged:
+        return f"当「{primary}」和那条消息连在一起时，今天可以先写哪一句草稿？"
+    return ""
+
+
+def _has_prophecy_frame(text: str) -> bool:
+    lowered = (text or "").lower()
+    return any(
+        term in lowered
+        for term in [
+            "sign something bad",
+            "bad will happen",
+            "omen",
+            "prophecy",
+            "predict",
+            "预兆",
+            "征兆",
+            "坏事",
+            "会不会发生",
+        ]
+    )
+
+
+def _question_for_prophecy_frame(intake: DreamIntake, language: str = "en") -> str:
+    if not _has_prophecy_frame(intake.merged_text()):
+        return ""
+    primary = _primary_anchor(intake, language)
+    if not _is_zh(language):
+        return (
+            f"Rather than treating the {primary} as a prediction, what feeling did it leave in your body "
+            "when you woke up?"
+        )
+    return f"先不把「{primary}」当成预兆。醒来时，它在你身体里留下的最明显感受是什么？"
+
+
+def _task_focus(text: str, language: str = "en") -> str:
+    lowered = (text or "").lower()
+    if _is_zh(language):
+        for term in ["演讲", "汇报", "申请", "截止", "道歉", "作业", "草稿", "邮件", "消息"]:
+            if term in lowered:
+                return term
+        return ""
+    task_terms = [
+        ("presentation", ["presentation", "speech", "rehearse"]),
+        ("application deadline", ["application", "deadline"]),
+        ("apology", ["apolog"]),
+        ("assignment", ["assignment", "homework", "draft"]),
+        ("email", ["email"]),
+        ("message", ["message"]),
+    ]
+    for label, terms in task_terms:
+        if any(term in lowered for term in terms):
+            return label
+    return ""
+
+
+def _is_low_context_intake(intake: DreamIntake) -> bool:
+    merged = intake.merged_text()
+    dream_text = intake.dream_text.strip()
+    if not dream_text:
+        return False
+    cjk_count = sum(1 for char in dream_text if "\u4e00" <= char <= "\u9fff")
+    word_count = len(re.findall(r"[A-Za-z0-9'-]+", dream_text))
+    return (word_count and word_count <= 7) or (cjk_count and cjk_count <= 12)
+
+
+def _is_skip_answer(answers: str, language: str = "en") -> bool:
+    lowered = (answers or "").lower()
+    return "user chose to skip" in lowered or "用户选择跳过" in lowered
+
+
 def _grounded_followup_question(intake: DreamIntake, language: str = "en") -> str:
     primary = _primary_anchor(intake, language)
     if not _is_zh(language):
@@ -589,7 +1046,7 @@ def build_qa_state(
     answers: Optional[List[str]] = None,
     language: str = "en",
 ) -> DreamQAState:
-    anchors = _anchors_for_language(intake, language)
+    anchors = _remove_placeholder_anchors(_anchors_for_language(intake, language))
     return DreamQAState(
         dream_summary=_summary_from_intake(intake, language),
         main_question=_main_question_from_intake(intake, language),
@@ -602,8 +1059,11 @@ def build_qa_state(
 
 def _polish_today_tip(card: TodayTipCard, intake: DreamIntake, answers: str = "", language: str = "en") -> TodayTipCard:
     polished = card.model_copy(deep=True)
-    intake_anchors = _anchors_for_language(intake, language)
-    card_anchors = (
+    answer_lines = [line.strip() for line in (answers or "").splitlines() if line.strip()]
+    if answer_lines:
+        polished.user_answers = answer_lines
+    intake_anchors = _remove_placeholder_anchors(_anchors_for_language(intake, language))
+    card_anchors = _remove_placeholder_anchors(
         polished.dream_anchors
         if _is_zh(language)
         else _dedupe_preserve_order([_english_anchor_text(anchor) for anchor in polished.dream_anchors])
@@ -613,39 +1073,94 @@ def _polish_today_tip(card: TodayTipCard, intake: DreamIntake, answers: str = ""
     else:
         anchors = card_anchors or intake_anchors
     if not anchors:
-        anchors = [_primary_anchor(intake, language)]
+        anchors = _remove_placeholder_anchors([_primary_anchor(intake, language)])
+    if not anchors:
+        anchors = ["梦境片段" if _is_zh(language) else "dream fragment"]
     polished.dream_anchors = anchors
-    if not polished.dream_summary.strip():
+    for field in (
+        "dream_summary",
+        "main_question",
+        "interpretation",
+        "today_tip",
+        "tiny_action",
+        "caring_note",
+        "safety_note",
+    ):
+        setattr(polished, field, _clean_placeholder_phrase(getattr(polished, field)))
+    if not polished.dream_summary.strip() or _is_placeholder_anchor(polished.dream_summary) or not _text_uses_anchor(polished.dream_summary, anchors):
         polished.dream_summary = _summary_from_intake(intake, language)
-    if not polished.main_question.strip():
+    if (
+        not polished.main_question.strip()
+        or _is_placeholder_anchor(polished.main_question)
+        or not _text_uses_anchor(polished.main_question, anchors)
+    ):
         polished.main_question = _main_question_from_intake(intake, language)
     answer_interpretation = _answer_based_interpretation(answers, _answer_bridge_anchor(anchors), language)
     if answer_interpretation:
         polished.interpretation = answer_interpretation
+    elif _has_prophecy_frame(intake.merged_text()):
+        anchor = _answer_bridge_anchor(anchors)
+        polished.interpretation = (
+            f"Maybe the {anchor} is best treated as a fear-shaped image, not as evidence that something bad will happen."
+            if not _is_zh(language)
+            else f"也许「{anchor}」更适合被当作一种害怕的画面，而不是坏事会发生的证据。"
+        )
+    elif _is_low_context_intake(intake) and _is_skip_answer(answers, language):
+        anchor = _answer_bridge_anchor(anchors)
+        polished.interpretation = (
+            f"With only a few details, I would keep this very light: the {anchor} is one clue to notice, not enough for a firm reading."
+            if not _is_zh(language)
+            else f"目前线索很少，先把「{anchor}」当作一个可以继续补充的线索，而不是确定解读。"
+        )
     elif not polished.interpretation.strip() or not _anchor_in_text(polished.interpretation, anchors):
         polished.interpretation = _fallback_interpretation(intake, language)
     generic_tip_markers = ["drink water", "hydrate", "多休息", "保持积极", "take a walk"]
     answer_tip = _answer_based_today_tip(answers, anchors[0], language)
-    if (
-        answer_tip
-        and ("email" in (answers or "").lower() or "邮件" in (answers or "").lower())
-    ):
+    if answer_tip:
         polished.today_tip = answer_tip
+    elif _has_prophecy_frame(intake.merged_text()):
+        anchor = anchors[0]
+        polished.today_tip = (
+            f"For today, do not test whether the {anchor} is a sign. Name one ordinary worry it resembles, then choose one small calming step."
+            if not _is_zh(language)
+            else f"今天先不要验证「{anchor}」是不是预兆；写下它像哪一种普通担心，再选一个很小的安定动作。"
+        )
+    elif _is_low_context_intake(intake) and _is_skip_answer(answers, language):
+        anchor = anchors[0]
+        polished.today_tip = (
+            f"For today, keep the {anchor} as a note, not a conclusion: add one concrete detail before you act on the dream."
+            if not _is_zh(language)
+            else f"今天先把「{anchor}」当作记录，不当作结论：再补一个具体细节，然后再行动。"
+        )
     elif (
         not polished.today_tip.strip()
         or any(marker in polished.today_tip.lower() for marker in generic_tip_markers)
+        or _is_placeholder_anchor(polished.today_tip)
         or not _anchor_in_text(polished.today_tip, anchors)
     ):
         polished.today_tip = _grounded_today_tip(intake, language)
     hard_action_markers = ["address it immediately", "fix it immediately", "solve it immediately"]
     answer_action = _answer_based_tiny_action(answers, language)
-    if answer_action and (
+    if answer_action:
+        polished.tiny_action = answer_action
+    elif _has_prophecy_frame(intake.merged_text()):
+        polished.tiny_action = (
+            "Spend five minutes writing: what did I feel, what ordinary worry could it echo, and what can I do safely today?"
+            if not _is_zh(language)
+            else "用 5 分钟写下：我醒来时感觉到了什么？它像哪种普通担心？今天我能安全做哪一小步？"
+        )
+    elif _is_low_context_intake(intake) and _is_skip_answer(answers, language):
+        polished.tiny_action = (
+            "Add one missing detail: color, body feeling, repeated object, or what happened just before waking."
+            if not _is_zh(language)
+            else "补一个缺失细节：颜色、身体感受、重复物件，或醒来前最后发生的事。"
+        )
+    elif (
         not polished.tiny_action.strip()
+        or _is_placeholder_anchor(polished.tiny_action)
+        or not _anchor_in_text(polished.tiny_action, anchors)
         or any(marker in polished.tiny_action.lower() for marker in hard_action_markers)
-        or "email" in (answers or "").lower()
     ):
-        polished.tiny_action = answer_action
-    elif not polished.tiny_action.strip() or any(marker in polished.tiny_action.lower() for marker in hard_action_markers):
         if _is_zh(language):
             polished.tiny_action = f"用 5 分钟写下：今天和「{anchors[0]}」有关的第一小步是什么？"
         else:
@@ -656,16 +1171,40 @@ def _polish_today_tip(card: TodayTipCard, intake: DreamIntake, answers: str = ""
             if _is_zh(language)
             else "You do not have to solve the whole dream this morning; noticing one detail is enough."
         )
+    elif any(
+        marker in polished.caring_note.lower()
+        for marker in ["does not indicate any real-life concerns", "does not indicate any real life concerns"]
+    ):
+        polished.caring_note = (
+            "你刚才提到的现实困扰值得被温柔对待；今天先照顾一个很小的入口。"
+            if _is_zh(language)
+            else "The real concern you named deserves gentle handling; today, start with one small doorway into it."
+        )
+    elif not _is_zh(language) and any(marker in polished.caring_note.lower() for marker in ["whole building", "one floor at a time"]):
+        polished.caring_note = "You do not have to solve the whole dream this morning; start by noticing one detail and one small next step."
+    elif _is_zh(language) and "所有楼层" in polished.caring_note:
+        polished.caring_note = "你不需要一醒来就解释完整个梦；先照顾一个细节和一个很小的下一步就好。"
     merged = "\n".join([intake.merged_text(), answers or ""])
-    polished.safety_note = safety_note() if needs_escalation(merged) else ""
+    polished.safety_note = safety_note(language) if needs_escalation(merged) else ""
     if not _is_zh(language):
         polished = _clean_english_today_tip_language(polished)
     return polished
 
 
-def generate_today_tip(intake: DreamIntake, answers: str, text_client, language: str = "en") -> TodayTipCard:
+def generate_today_tip(
+    intake: DreamIntake,
+    answers: str,
+    text_client,
+    language: str = "en",
+    followup_questions: Optional[List[str]] = None,
+) -> TodayTipCard:
     language = _normalize_language(language)
-    qa_state = build_qa_state(intake, answers=[answer for answer in [answers] if answer], language=language)
+    qa_state = build_qa_state(
+        intake,
+        questions=followup_questions or [],
+        answers=[answer for answer in [answers] if answer],
+        language=language,
+    )
     prompt = today_tip_prompt(qa_state, language=language)
     try:
         if hasattr(text_client, "generate_today_tip"):
@@ -694,6 +1233,9 @@ def generate_today_tip(intake: DreamIntake, answers: str, text_client, language:
                 interpretation=_fallback_interpretation(intake, language),
                 today_tip=_grounded_today_tip(intake, language),
             )
+    card.followup_questions = qa_state.followup_questions
+    if qa_state.user_answers:
+        card.user_answers = qa_state.user_answers
     return _polish_today_tip(card, intake, answers, language)
 
 
@@ -760,6 +1302,7 @@ def _supports_model_led_pact(text_client) -> bool:
 def create_session(language: str = "en") -> CustomsSession:
     language = _normalize_language(language)
     return CustomsSession(
+        language=language,
         events=[
             TimelineEvent(
                 role="system",
@@ -827,6 +1370,7 @@ def add_evidence(
 ) -> CustomsSession:
     language = _normalize_language(language)
     next_session = session.model_copy(deep=True)
+    next_session.language = language
     added_items: List[EvidenceItem] = []
 
     if dream_text and dream_text.strip():
@@ -950,6 +1494,7 @@ def add_evidence(
 def ask_questions(session: CustomsSession, text_client, force_another: bool = False, language: str = "en") -> CustomsSession:
     language = _normalize_language(language)
     next_session = session.model_copy(deep=True)
+    next_session.language = language
     if not next_session.intake.merged_text():
         next_session.phase = "error"
         next_session.events.append(
@@ -971,6 +1516,9 @@ def ask_questions(session: CustomsSession, text_client, force_another: bool = Fa
     )
     negotiation = text_client.generate_negotiation(prompt)
     questions = [question for question in negotiation.get("questions", []) if question]
+    task_question = _question_for_declared_real_task(next_session.intake, language)
+    if task_question:
+        questions = [task_question] + [question for question in questions if question != task_question]
     fresh_questions = [question for question in questions if question not in next_session.question_history]
     if force_another and not fresh_questions:
         fresh_questions = [
@@ -1018,6 +1566,7 @@ def ask_questions(session: CustomsSession, text_client, force_another: bool = Fa
 def answer_question(session: CustomsSession, answer: str, language: str = "en") -> CustomsSession:
     language = _normalize_language(language)
     next_session = session.model_copy(deep=True)
+    next_session.language = language
     if not answer or not answer.strip():
         next_session.phase = "error"
         next_session.events.append(
@@ -1037,6 +1586,7 @@ def answer_question(session: CustomsSession, answer: str, language: str = "en")
 def skip_question(session: CustomsSession, language: str = "en") -> CustomsSession:
     language = _normalize_language(language)
     next_session = session.model_copy(deep=True)
+    next_session.language = language
     skip_text = "用户选择跳过这个追问。" if _is_zh(language) else "The user chose to skip this question."
     next_session.answer_history.append(skip_text)
     next_session.phase = "ask"
@@ -1050,6 +1600,7 @@ def skip_question(session: CustomsSession, language: str = "en") -> CustomsSessi
 def finish_today_tip(session: CustomsSession, text_client, language: str = "en") -> CustomsSession:
     language = _normalize_language(language)
     next_session = session.model_copy(deep=True)
+    next_session.language = language
     if not next_session.intake.merged_text():
         next_session.phase = "error"
         next_session.events.append(
@@ -1064,7 +1615,13 @@ def finish_today_tip(session: CustomsSession, text_client, language: str = "en")
         )
         return next_session
     answers = next_session.answers_text()
-    card = generate_today_tip(next_session.intake, answers, text_client, language=language)
+    card = generate_today_tip(
+        next_session.intake,
+        answers,
+        text_client,
+        language=language,
+        followup_questions=next_session.question_history,
+    )
     next_session.qa_state = build_qa_state(
         next_session.intake, next_session.question_history, next_session.answer_history, language=language
     )

dream_customs/safety.py

@@ -1,17 +1,38 @@
 ESCALATION_TERMS = (
     "hurt myself",
     "kill myself",
+    "do not want to wake up",
+    "don't want to wake up",
+    "didn't want to wake up",
+    "hopeless",
+    "can't go on",
+    "cannot go on",
     "suicide",
     "self-harm",
     "hurt someone",
     "many nights",
+    "three nights",
+    "3 nights",
+    "can't sleep",
+    "cannot sleep",
     "cannot function",
     "panic attack",
     "想伤害自己",
     "自杀",
     "自残",
+    "不想醒来",
+    "不想活",
+    "活不下去",
+    "轻生",
+    "绝望",
+    "撑不住",
+    "崩溃",
     "伤害别人",
     "很多天睡不着",
+    "连续3晚",
+    "连续 3 晚",
+    "连续三晚",
+    "连续很多天",
     "无法正常生活",
     "无法生活",
 )
@@ -22,7 +43,13 @@ def needs_escalation(text: str) -> bool:
     return any(term in lowered for term in ESCALATION_TERMS)
 
 
-def safety_note() -> str:
+def safety_note(language: str = "en") -> str:
+    if language == "zh":
+        return (
+            "这段梦和醒来后的感受听起来已经超过了一个轻量梦境反思工具适合独自处理的范围。"
+            "如果你感到不安全、连续很多天睡不着，或担心自己可能伤害自己或别人，请现在联系一个可信任的人，"
+            "或寻求专业支持。"
+        )
     return (
         "This dream sounds heavier than a playful reflection tool should handle. "
         "If you feel unsafe, cannot sleep for many nights, or worry you may hurt "

dream_customs/schema.py

@@ -219,6 +219,7 @@ class TimelineEvent(BaseModel):
 
 class CustomsSession(BaseModel):
     phase: SessionPhase = "empty"
+    language: str = "en"
     intake: DreamQuestionIntake = Field(default_factory=DreamQuestionIntake)
     qa_state: DreamQAState = Field(default_factory=DreamQAState)
     evidence_items: list[EvidenceItem] = Field(default_factory=list)

dream_customs/ui/actions.py

@@ -15,10 +15,24 @@ from dream_customs.pipeline import (
     skip_question,
 )
 from dream_customs.render import render_today_tip_card
-from dream_customs.schema import CustomsSession, TodayTipCard
+from dream_customs.schema import CustomsSession, TimelineEvent, TodayTipCard
 from dream_customs.ui.copy import copy_for, normalize_language
 
 
+def _looks_mostly_chinese(text: str) -> bool:
+    clean = text or ""
+    cjk_count = sum(1 for char in clean if "\u4e00" <= char <= "\u9fff")
+    latin_count = sum(1 for char in clean if char.isascii() and char.isalpha())
+    return cjk_count >= 4 and cjk_count >= latin_count
+
+
+def _resolve_language_for_input(language: str, dream_text: str = "") -> str:
+    normalized = normalize_language(language)
+    if normalized == "en" and _looks_mostly_chinese(dream_text):
+        return "zh"
+    return normalized
+
+
 def _state_json(session: CustomsSession) -> str:
     return json.dumps(session.model_dump(mode="json"), ensure_ascii=False)
 
@@ -44,13 +58,40 @@ def _trim_to_one_visible_question(session: CustomsSession, previous_count: int)
 
 
 def _card_plain_text(card: TodayTipCard, language: str) -> str:
+    structured = json.dumps(
+        {
+            "dream_summary": card.dream_summary,
+            "main_question": card.main_question,
+            "dream_anchors": card.dream_anchors,
+            "followup_questions": card.followup_questions,
+            "user_answers": card.user_answers,
+            "interpretation": card.interpretation,
+            "today_tip": card.today_tip,
+            "tiny_action": card.tiny_action,
+            "caring_note": card.caring_note,
+            "safety_note": card.safety_note,
+        },
+        ensure_ascii=False,
+        indent=2,
+    )
     if language == "zh":
-        return card.to_plain_text()
+        text = card.to_plain_text()
+        if card.followup_questions:
+            text += "\n追问记录: " + " / ".join(card.followup_questions)
+        if card.user_answers:
+            text += "\n用户回答: " + " / ".join(card.user_answers)
+        if card.followup_questions and card.user_answers:
+            text += "\n追问线索: 你的回答已进入今日小 Tips 的解读与行动建议。"
+        text += "\n模型说明: 文本推理由 MiniCPM5-1B 路线生成；图片线索由 MiniCPM-V-4.6 路线理解。"
+        text += f"\n\n结构化结果 JSON:\n{structured}"
+        return text
     lines = [
         "Today Tip",
         f"Dream summary: {card.dream_summary}",
         f"Question: {card.main_question}",
         f"Dream anchors: {', '.join(card.dream_anchors)}",
+        f"Follow-up questions: {' / '.join(card.followup_questions)}",
+        f"User answers: {' / '.join(card.user_answers)}",
         f"Interpretation: {card.interpretation}",
         f"Today Tip: {card.today_tip}",
     ]
@@ -60,6 +101,10 @@ def _card_plain_text(card: TodayTipCard, language: str) -> str:
         lines.append(f"Caring note: {card.caring_note}")
     if card.safety_note:
         lines.append(f"Safety note: {card.safety_note}")
+    if card.followup_questions and card.user_answers:
+        lines.append("Reasoning trail: Your follow-up answer shaped the interpretation and Today Tip.")
+    lines.append("Model note: text via MiniCPM5-1B route; visual clues via MiniCPM-V-4.6 route.")
+    lines.extend(["", "Structured result JSON:", structured])
     return "\n".join(lines)
 
 
@@ -79,11 +124,23 @@ def _view_payload(
     **settings,
 ) -> Dict[str, Any]:
     language = normalize_language(language)
-    copy = copy_for(language)
-    card = session.sealed_tip or session.draft_tip
+    session_language = normalize_language(getattr(session, "language", language))
+    if session_language != language and session.phase != "empty":
+        language = session_language
     error = _latest_error(session)
-    status = "error" if error else "tip" if session.sealed_tip else "ask" if session.question_history else "record"
-    return {
+    if error:
+        status = "error"
+    elif session.phase == "ask" and session.question_history:
+        status = "ask"
+    elif session.sealed_tip:
+        status = "tip"
+    elif session.question_history:
+        status = "ask"
+    else:
+        status = "record"
+    copy = copy_for(language)
+    card = None if status == "ask" else session.sealed_tip or session.draft_tip
+    payload = {
         "status": status,
         "phase": session.phase,
         "language": language,
@@ -94,8 +151,34 @@ def _view_payload(
         "card_html": _render_today_pass(card, language) if card else "",
         "error": error,
         "notice": _notice_for_status(status, error, language),
+        "dream_summary": "",
+        "main_question": "",
+        "dream_anchors": [],
+        "followup_questions": list(session.question_history),
+        "user_answers": list(session.answer_history),
+        "interpretation": "",
+        "today_tip": "",
+        "tiny_action": "",
+        "caring_note": "",
+        "safety_note": "",
         "debug": json.loads(_debug_json(session, text_backend, vision_backend, **settings)),
     }
+    if card:
+        payload.update(
+            {
+                "dream_summary": card.dream_summary,
+                "main_question": card.main_question,
+                "dream_anchors": card.dream_anchors,
+                "followup_questions": card.followup_questions,
+                "user_answers": card.user_answers,
+                "interpretation": card.interpretation,
+                "today_tip": card.today_tip,
+                "tiny_action": card.tiny_action,
+                "caring_note": card.caring_note,
+                "safety_note": card.safety_note,
+            }
+        )
+    return payload
 
 
 def _view(
@@ -115,7 +198,10 @@ def _view(
 def _notice_for_status(status: str, error: str = "", language: str = "en") -> str:
     copy = copy_for(language)
     if status == "error":
-        return error or copy["notice_error"]
+        base = error or copy["notice_error"]
+        if language == "zh":
+            return f"{base} 你可以保留文字再点一次继续，或点击重新开始；Text-only 路径仍可用。"
+        return f"{base} You can keep the text and try Continue again, or start over; the text-only path still works."
     if status == "ask":
         return copy["notice_ask"]
     if status == "tip":
@@ -143,7 +229,23 @@ def submit_dream_action(
     language: str = "en",
     **settings,
 ) -> Tuple[str, str]:
-    language = normalize_language(language)
+    language = _resolve_language_for_input(language, dream_text)
+    if not (dream_text or "").strip() and not _file_path(image_value) and not _file_path(audio_value):
+        session = create_session(language=language)
+        session.phase = "error"
+        session.events.append(
+            TimelineEvent(
+                role="error",
+                title="还没有梦境材料" if language == "zh" else "No dream material yet",
+                body=(
+                    "请先写一句梦境，或上传图片/语音；这样今日小 Tips 才能引用真实细节。"
+                    if language == "zh"
+                    else "Write at least one dream sentence, or add image/voice evidence, so the Today Tip can use real details."
+                ),
+                status="empty",
+            )
+        )
+        return _view(session, text_backend, vision_backend, language=language, **settings)
     text_client, vision_client, asr_client = _clients(text_backend, vision_backend, **settings)
     session = add_evidence(
         create_session(language=language),
@@ -169,8 +271,9 @@ def skip_to_card_action(
     language: str = "en",
     **settings,
 ) -> Tuple[str, str]:
-    language = normalize_language(language)
-    session = skip_question(_session_from_state(state), language=language)
+    session = _session_from_state(state)
+    language = normalize_language(getattr(session, "language", language))
+    session = skip_question(session, language=language)
     return _seal_view(session, text_backend, vision_backend, language=language, **settings)
 
 
@@ -182,8 +285,9 @@ def answer_to_card_action(
     language: str = "en",
     **settings,
 ) -> Tuple[str, str]:
-    language = normalize_language(language)
-    session = answer_question(_session_from_state(state), answer or "", language=language)
+    session = _session_from_state(state)
+    language = normalize_language(getattr(session, "language", language))
+    session = answer_question(session, answer or "", language=language)
     if session.phase == "error":
         return _view(session, text_backend, vision_backend, language=language, **settings)
     return _seal_view(session, text_backend, vision_backend, language=language, **settings)
@@ -197,8 +301,8 @@ def revise_card_action(
     language: str = "en",
     **settings,
 ) -> Tuple[str, str]:
-    language = normalize_language(language)
     session = _session_from_state(state)
+    language = normalize_language(getattr(session, "language", language))
     if session.sealed_tip and not session.draft_tip:
         session.draft_tip = session.sealed_tip
     text_client, _vision_client, _asr_client = _clients(text_backend, vision_backend, **settings)
@@ -223,5 +327,6 @@ def _seal_view(
     **settings,
 ) -> Tuple[str, str]:
     text_client, _vision_client, _asr_client = _clients(text_backend, vision_backend, **settings)
+    language = normalize_language(getattr(session, "language", language))
     session = finish_today_tip(session, text_client, language=language)
     return _view(session, text_backend, vision_backend, language=language, **settings)

dream_customs/ui/app.py

@@ -88,8 +88,13 @@ VOICE_JS = r"""
     button.dataset.bound = "true";
 
     const messageFor = (key, fallback) => button.dataset[key] || fallback;
+    let checkingTimer = null;
 
     const setStatus = (message, mode) => {
+      if (mode !== "listening" && checkingTimer) {
+        window.clearTimeout(checkingTimer);
+        checkingTimer = null;
+      }
       if (status) {
         status.textContent = message;
         status.dataset.mode = mode || "";
@@ -119,16 +124,30 @@ VOICE_JS = r"""
       }
 
       setStatus(messageFor("checking", "Checking microphone permission..."), "listening");
+      let latestTranscript = "";
 
       const recognition = new Recognition();
       recognition.lang = button.dataset.language === "zh" ? "zh-CN" : "en-US";
       recognition.interimResults = true;
       recognition.continuous = false;
       recognition.maxAlternatives = 1;
-
-      let latestTranscript = "";
+      checkingTimer = window.setTimeout(() => {
+        if (button.dataset.mode === "listening" && !latestTranscript) {
+          setStatus(messageFor("timeout", "Voice is taking too long here. You can keep typing the dream instead."), "error");
+          try {
+            recognition.stop();
+          } catch (_error) {
+            // Best-effort stop for browsers that leave speech recognition pending.
+          }
+          textarea.focus();
+        }
+      }, 3000);
 
       recognition.onstart = () => {
+        if (checkingTimer) {
+          window.clearTimeout(checkingTimer);
+          checkingTimer = null;
+        }
         setStatus(messageFor("listening", "Listening. Say the dream fragment when you are ready."), "listening");
       };
 
@@ -143,6 +162,10 @@ VOICE_JS = r"""
       };
 
       recognition.onerror = (event) => {
+        if (checkingTimer) {
+          window.clearTimeout(checkingTimer);
+          checkingTimer = null;
+        }
         const message = event.error === "not-allowed"
           ? messageFor("permission", "Microphone permission was denied. Allow recording and try again.")
           : messageFor("empty", "I did not catch that. Tap the microphone again if you want to retry.");
@@ -150,6 +173,10 @@ VOICE_JS = r"""
       };
 
       recognition.onend = () => {
+        if (checkingTimer) {
+          window.clearTimeout(checkingTimer);
+          checkingTimer = null;
+        }
         if (latestTranscript) {
           appendTranscript(latestTranscript);
           setStatus(messageFor("done", "Added to the dream note."), "done");
@@ -468,6 +495,33 @@ def _agent_dream_qa(dream_text: str, mood: str = "", answer: str = "", language:
     """
 
     language = normalize_language(language)
+    contract = {
+        "schema_version": "dream_qa.agent.v1",
+        "route_mode": "text_only_queue",
+        "api_name": "/agent_dream_qa",
+        "expected_fields": ["dream_text", "mood", "answer", "language"],
+        "media_note": "Image and voice clues are available in the Gradio UI path; this public agent endpoint is intentionally text-only.",
+    }
+    if not isinstance(dream_text, str) or not dream_text.strip():
+        return {
+            "status": "error",
+            "phase": "error",
+            "language": language,
+            "error_code": "missing_dream_text",
+            "error": "dream_text is required.",
+            "notice": "Provide dream_text as a non-empty string, then call the queue endpoint again.",
+            "dream_summary": "",
+            "main_question": "",
+            "dream_anchors": [],
+            "followup_questions": [],
+            "user_answers": [],
+            "interpretation": "",
+            "today_tip": "",
+            "tiny_action": "",
+            "caring_note": "",
+            "safety_note": "",
+            "api_contract": contract,
+        }
     state, view_json = submit_dream_action(
         dream_text=dream_text,
         image_value=None,
@@ -479,6 +533,7 @@ def _agent_dream_qa(dream_text: str, mood: str = "", answer: str = "", language:
     )
     view = json.loads(view_json)
     if view.get("status") != "ask":
+        view["api_contract"] = contract
         return view
     if answer and answer.strip():
         _state, view_json = answer_to_card_action(
@@ -495,7 +550,9 @@ def _agent_dream_qa(dream_text: str, mood: str = "", answer: str = "", language:
             vision_backend=DEFAULT_VISION_BACKEND,
             language=language,
         )
-    return json.loads(view_json)
+    result = json.loads(view_json)
+    result["api_contract"] = contract
+    return result
 
 
 def _active_step_for_status(status: str) -> int:
@@ -560,6 +617,7 @@ def _mic_html(language: str = DEFAULT_LANGUAGE) -> str:
     aria-label="{escape(copy['mic_idle'])}"
     data-language="{escape(language)}"
     data-checking="{escape('正在请求麦克风权限...' if language == 'zh' else 'Checking microphone permission...')}"
+    data-timeout="{escape('语音识别等待太久了。你可以先继续手动输入梦境。' if language == 'zh' else 'Voice is taking too long here. You can keep typing the dream instead.')}"
     data-unsupported="{escape(copy['mic_unsupported'])}"
     data-permission="{escape(copy['mic_permission'])}"
     data-listening="{escape(copy['mic_listening'])}"

dream_customs/ui/copy.py

@@ -8,7 +8,7 @@ LANGUAGE_OPTIONS = [
 APP_COPY = {
     "en": {
         "title": "Dream QA",
-        "subtitle": "Record a dream, answer or skip one gentle question, and leave with one grounded Today Tip.",
+        "subtitle": "A Thousand Token Wood-style dream Q&A: record a dream, answer or skip one gentle question, and leave with one grounded Today Tip.",
         "brand_subtitle": "Dream Customs",
         "steps": ["Record", "Question", "Interpret", "Today Tip"],
         "notice_record": "Write a sentence, a few lines, or add image/voice clues. Text-only always works.",
@@ -64,7 +64,7 @@ APP_COPY = {
     },
     "zh": {
         "title": "梦境问答台",
-        "subtitle": "一步步整理梦境疑惑，回答或跳过温和追问，最后得到一个引用梦境细节的今日小 Tips。",
+        "subtitle": "Thousand Token Wood 式梦境问答：一步步整理梦境疑惑，回答或跳过温和追问，最后得到一个引用梦境细节的今日小 Tips。",
         "brand_subtitle": "Dream Customs",
         "steps": ["记录", "追问", "解读", "今日 Tip"],
         "notice_record": "写一句、几行，或上传图片/语音。Text-only 路径始终可用。",

dream_customs/ui/styles.py

@@ -970,6 +970,44 @@ a.built-with[href*="gradio.app"] {
   font-size: 0.82rem !important;
 }
 
+.dc-debug-panel,
+.dc-debug-panel .block,
+.dc-debug-panel .wrap,
+.dc-debug-panel .container,
+.dc-debug-panel .cm-editor,
+.dc-debug-panel .cm-scroller,
+.dc-debug-panel .cm-content,
+.dc-dev,
+.dc-dev .block,
+.dc-dev .wrap,
+.dc-dev .container,
+.dc-dev-advanced,
+.dc-dev-advanced .block,
+.dc-dev-advanced .wrap,
+.dc-dev-advanced .container {
+  max-width: 100% !important;
+  min-width: 0 !important;
+  overflow-x: hidden !important;
+}
+
+.dc-debug-panel .cm-scroller,
+.dc-debug-panel pre {
+  overflow-x: auto !important;
+}
+
+.dc-debug-panel .cm-line,
+.dc-debug-panel .cm-content,
+.dc-debug-panel code,
+.dc-debug-panel pre {
+  overflow-wrap: anywhere !important;
+  white-space: pre-wrap !important;
+  word-break: break-word !important;
+}
+
+.dc-debug-panel .cm-line {
+  max-width: 100% !important;
+}
+
 @keyframes dc-mic-pulse {
   0% {
     box-shadow: 0 0 0 0 rgba(11, 91, 100, 0.32);

tests/test_agent_readiness.py

@@ -1,6 +1,17 @@
 from scripts.evaluate_agent_readiness import _agent_api_result, _load_agents_doc
 
 
+def test_gradio_api_info_alias_matches_agent_endpoint():
+    from fastapi.testclient import TestClient
+
+    from app import demo
+
+    response = TestClient(demo.app).get("/gradio_api/info")
+
+    assert response.status_code == 200
+    assert "/agent_dream_qa" in response.json()["named_endpoints"]
+
+
 def test_agents_doc_is_present_and_agent_facing():
     result = _load_agents_doc("agents.md", None, timeout=1)
 
@@ -32,6 +43,45 @@ def test_agent_api_requires_text_only_public_endpoint():
     assert result["agent_input_types"] == ["textbox", "textbox", "textbox", "textbox"]
 
 
+def test_agent_dream_qa_returns_stable_flat_contract():
+    from dream_customs.ui.app import _agent_dream_qa
+
+    result = _agent_dream_qa(
+        "I dreamed of a red room with no door.",
+        mood="Uneasy",
+        answer="I woke up nervous.",
+        language="en",
+    )
+
+    assert result["api_contract"]["schema_version"] == "dream_qa.agent.v1"
+    assert result["api_contract"]["route_mode"] == "text_only_queue"
+    assert result["api_contract"]["expected_fields"] == ["dream_text", "mood", "answer", "language"]
+    assert "text-only" in result["api_contract"]["media_note"]
+    for key in [
+        "dream_summary",
+        "main_question",
+        "dream_anchors",
+        "followup_questions",
+        "user_answers",
+        "interpretation",
+        "today_tip",
+        "tiny_action",
+        "caring_note",
+        "safety_note",
+    ]:
+        assert key in result
+
+
+def test_agent_dream_qa_rejects_empty_text_with_structured_error():
+    from dream_customs.ui.app import _agent_dream_qa
+
+    result = _agent_dream_qa("", mood="Uneasy", answer="", language="en")
+
+    assert result["status"] == "error"
+    assert result["error_code"] == "missing_dream_text"
+    assert result["api_contract"]["expected_fields"] == ["dream_text", "mood", "answer", "language"]
+
+
 def test_agent_api_fails_if_media_schema_is_public():
     config = {
         "components": [

tests/test_dream_qa_refactor.py

@@ -115,8 +115,8 @@ def test_mobile_action_payload_uses_today_tip_not_clearance_pass():
     view = json.loads(view_json)
 
     assert view["status"] == "tip"
-    assert view["card_title"] == "Today Tip"
-    assert "elevator" in view["card_text"].lower() or "14" in view["card_text"]
+    assert view["card_title"] == "今日小 Tips"
+    assert "电梯" in view["card_text"] or "14" in view["card_text"]
     assert "clearance" not in view["card_text"].lower()
     assert "permit" not in view["card_html"].lower()
     assert "sealed" not in view["card_html"].lower()

tests/test_pipeline.py

@@ -13,13 +13,14 @@ from dream_customs.pipeline import (
     draft_pact,
     generate_negotiation,
     generate_pact,
+    generate_today_tip,
     intake_from_modalities,
     revise_pact,
     seal_pact,
     skip_question,
 )
 from dream_customs.prompts import pact_prompt
-from dream_customs.schema import PactCard, VisionWitness
+from dream_customs.schema import PactCard, TodayTipCard, VisionWitness
 
 
 def test_dated_permit_id_uses_runtime_date_and_preserves_serial():
@@ -90,6 +91,144 @@ def test_generate_pact_adds_safety_note_for_distress():
     assert card.safety_note
 
 
+def test_generate_today_tip_repairs_placeholder_and_stale_model_anchors():
+    class StaleHostedTextClient:
+        def generate_today_tip(self, prompt):
+            return TodayTipCard(
+                dream_summary="I dreamed the elevator button melted and the floor number stayed on 14.",
+                main_question="What might that dream detail be asking me to notice today?",
+                dream_anchors=["that dream detail"],
+                followup_questions=["What did the elevator feel like?"],
+                user_answers=[],
+                interpretation="Maybe that dream detail points to a stuck point.",
+                today_tip="For today, borrow one action from that dream detail and write one line.",
+                tiny_action="Spend five minutes with that dream detail.",
+                caring_note="Noticing one dream detail is enough.",
+                safety_note="",
+            )
+
+    intake = build_intake(
+        dream_text="昨晚我梦见自己在一片大雪地里找不到出口，反复回头看到一扇红色的门却打不开。",
+        mood="Neutral",
+    )
+
+    card = generate_today_tip(intake, "", StaleHostedTextClient(), language="zh")
+    combined = "\n".join(
+        [
+            card.dream_summary,
+            card.main_question,
+            ",".join(card.dream_anchors),
+            card.interpretation,
+            card.today_tip,
+            card.tiny_action,
+        ]
+    )
+
+    assert "梦里的那个细节" not in combined
+    assert "that dream detail" not in combined
+    assert "电梯" not in combined
+    assert "红色" in combined or "雪地" in combined
+    assert card.dream_anchors[0] in {"红色的门", "红色门", "大雪地", "雪地"}
+
+
+def test_generate_today_tip_keeps_answer_history_and_removes_placeholder_text():
+    class PlaceholderTextClient:
+        def generate_today_tip(self, prompt):
+            return TodayTipCard(
+                dream_summary="You dreamed about that dream detail.",
+                main_question="What might the that dream detail be asking me to notice today?",
+                dream_anchors=["that dream detail"],
+                followup_questions=[],
+                user_answers=[],
+                interpretation="Maybe that dream detail points to a stuck point.",
+                today_tip="For today, borrow one action from the that dream detail.",
+                tiny_action="Spend five minutes with that dream detail.",
+                caring_note="This dream detail does not indicate any real-life concerns.",
+                safety_note="",
+            )
+
+    intake = build_intake(
+        dream_text="I dreamed I was in a white hallway looking for a classroom while the teacher kept asking for homework.",
+        mood="Uneasy",
+    )
+
+    card = generate_today_tip(
+        intake,
+        "I should message my group lead and send a rough draft tonight.",
+        PlaceholderTextClient(),
+        language="en",
+    )
+    combined = "\n".join(
+        [
+            card.dream_summary,
+            card.main_question,
+            ",".join(card.dream_anchors),
+            "\n".join(card.user_answers),
+            card.interpretation,
+            card.today_tip,
+            card.tiny_action,
+            card.caring_note,
+        ]
+    ).lower()
+
+    assert "that dream detail" not in combined
+    assert "white hallway" in combined or "classroom" in combined or "teacher" in combined
+    assert "group lead" in combined
+    assert "message" in combined
+    assert "does not indicate any real-life concerns" not in combined
+
+
+def test_generate_today_tip_adds_safety_note_for_repeated_insomnia_without_self_harm():
+    intake = build_intake(
+        dream_text="我昨晚反复梦见自己在一条漆黑的走廊里走，醒来后心跳很快，已经连续3晚都睡不好。",
+        mood="焦虑",
+    )
+
+    card = generate_today_tip(intake, "我想知道今晚能不能睡好一点。", FakeTextClient(), language="zh")
+
+    assert card.safety_note
+    assert "可信任的人" in card.safety_note
+
+
+def test_generate_today_tip_adds_chinese_safety_note_for_hopeless_text():
+    intake = build_intake(dream_text="我梦到站在高楼边缘，醒来后不想醒来，很绝望。")
+
+    card = generate_today_tip(intake, "", FakeTextClient(), language="zh")
+
+    assert card.safety_note
+    assert "可信任的人" in card.safety_note
+
+
+def test_chinese_short_and_sensitive_fragments_keep_real_anchors():
+    cases = [
+        ("昨晚梦见掉进海里。", ["海", "掉进海里"]),
+        ("昨晚梦到一个小孩找不到家。", ["小孩", "找不到家"]),
+        ("我总是自责，梦里不断重演过去犯的错误。", ["自责", "错误", "重演"]),
+        ("梦见有很多追逐场景，醒来心率很快。", ["追逐", "心率"]),
+    ]
+
+    for dream_text, expected_markers in cases:
+        card = generate_today_tip(
+            build_intake(dream_text=dream_text, mood="焦虑"),
+            "用户选择跳过这个追问。",
+            FakeTextClient(),
+            language="zh",
+        )
+        combined = "\n".join(
+            [
+                card.dream_summary,
+                ",".join(card.dream_anchors),
+                card.interpretation,
+                card.today_tip,
+                card.tiny_action,
+            ]
+        )
+
+        assert any(marker in combined for marker in expected_markers)
+        assert "梦里的那个细节" not in combined
+        assert "that dream detail" not in combined
+
+
 def test_generate_pact_polishes_unclear_model_output_into_daily_tip():
     class UnclearTextClient:
         def generate_pact(self, prompt):
@@ -354,6 +493,49 @@ def test_add_evidence_prefers_vision_witness_report():
     assert "flat clue should not win" not in session.intake.visual_clues
 
 
+def test_visual_witness_clues_drive_questions_and_today_tip():
+    class RedStairVision:
+        def extract_witness(self, image_path):
+            return VisionWitness(
+                scene_summary="A red staircase inside an old library.",
+                objects=["red staircase", "yellow sticky note"],
+                visible_text=["CALL HOME"],
+                surprising_detail="Rain is drawn outside the window.",
+            )
+
+        def extract_clues(self, image_path):
+            return ["flat fallback should not win"]
+
+    session = add_evidence(
+        create_session(),
+        dream_text="I only remember a dream fragment.",
+        image_path="note.png",
+        mood="Uneasy",
+        vision_client=RedStairVision(),
+        asr_client=FakeASRClient(),
+        language="en",
+    )
+    session = ask_questions(session, FakeTextClient(), language="en")
+    session = answer_question(session, "The sticky note felt urgent.", language="en")
+    session = skip_question(session, language="en")
+    text = "\n".join([session.question_history[0], ",".join(session.qa_state.dream_anchors)]).lower()
+
+    assert "red staircase" in text or "old library" in text or "yellow sticky note" in text
+
+    card = generate_today_tip(
+        session.intake,
+        session.answers_text(),
+        FakeTextClient(),
+        language="en",
+        followup_questions=session.question_history,
+    )
+    combined = "\n".join([card.dream_summary, ",".join(card.dream_anchors), card.today_tip]).lower()
+
+    assert "red staircase" in combined or "old library" in combined or "yellow sticky note" in combined
+    assert "scene_summary" not in combined
+    assert "objects" not in combined
+
+
 def test_witness_failure_keeps_text_path_alive():
     class BrokenWitnessVision:
         def extract_witness(self, image_path):

tests/test_safety.py

@@ -13,5 +13,13 @@ def test_chinese_severe_insomnia_escalates():
     assert needs_escalation("我已经很多天睡不着，感觉无法正常生活。")
 
 
+def test_chinese_hopeless_text_escalates():
+    assert needs_escalation("醒来后我不想醒来，很绝望，感觉自己撑不住。")
+
+
 def test_safety_note_mentions_professional_support():
     assert "professional support" in safety_note().lower()
+
+
+def test_chinese_safety_note_mentions_support():
+    assert "可信任的人" in safety_note("zh")

tests/test_ui_actions.py

@@ -2,7 +2,13 @@ import json
 import inspect
 from datetime import date
 
-from dream_customs.ui.actions import answer_to_card_action, initial_mobile_state, skip_to_card_action, submit_dream_action
+from dream_customs.ui.actions import (
+    answer_to_card_action,
+    initial_mobile_state,
+    revise_card_action,
+    skip_to_card_action,
+    submit_dream_action,
+)
 import dream_customs.ui.app as ui_app
 from dream_customs.ui.app import _reset
 from dream_customs.ui.copy import DEFAULT_MOOD, PROCESSING_NOTE
@@ -30,6 +36,7 @@ def test_runtime_settings_are_collapsed_for_public_flow():
 
 def test_voice_input_keeps_modal_asr_component_but_uses_inline_mic_button():
     source = inspect.getsource(ui_app.build_demo)
+    app_source = inspect.getsource(ui_app)
 
     assert "audio_input = gr.Audio(" in source
     assert 'sources=["upload"]' in source
@@ -40,6 +47,9 @@ def test_voice_input_keeps_modal_asr_component_but_uses_inline_mic_button():
     assert "mic_html = gr.HTML(_mic_html(DEFAULT_LANGUAGE))" in source
     assert "audio_input = gr.State(None)" not in source
     assert 'value=DEFAULT_ASR_BACKEND' in source
+    assert 'data-timeout="' in ui_app._mic_html("en")
+    assert "Voice is taking too long here" in ui_app._mic_html("en")
+    assert "window.setTimeout" in app_source
 
 
 def test_image_upload_is_composer_plus_drawer():
@@ -90,6 +100,7 @@ def test_hero_subtitle_explains_app_instead_of_legacy_name():
     hero_html = ui_app._hero_html()
 
     assert "grounded Today Tip" in hero_html
+    assert "Thousand Token Wood" in hero_html
     assert "Dream Customs" not in hero_html
 
 
@@ -205,6 +216,57 @@ def test_mobile_mvp_submit_then_skip_generates_today_tip():
     assert "Today Tip" in view["card_html"]
 
 
+def test_mobile_mvp_empty_submit_stays_on_record_with_clear_error():
+    state, view_json = submit_dream_action(
+        dream_text="",
+        mood="Neutral",
+        text_backend="demo",
+        vision_backend="demo",
+    )
+    view = json.loads(view_json)
+
+    assert view["status"] == "error"
+    assert view["phase"] == "error"
+    assert "at least one dream sentence" in view["notice"]
+    assert "try Continue again" in view["notice"]
+    assert view["debug"]["session"]["answer_history"] == []
+    assert json.loads(state)["phase"] == "error"
+
+
+def test_mobile_mvp_auto_switches_chinese_input_to_chinese_result():
+    state, view_json = submit_dream_action(
+        dream_text="梦里我在一片雾很大的森林里追着一只白色猫跑，周围有很多空白路牌。",
+        mood="焦虑",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+
+    assert view["language"] == "zh"
+    assert json.loads(state)["language"] == "zh"
+    assert view["status"] == "ask"
+    assert "白色猫" in view["question"] or "森林" in view["question"] or "路牌" in view["question"]
+
+    _state, view_json = answer_to_card_action(
+        state,
+        "我其实很在意工作里的选择，梦里看到空白路牌让我很不安。",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+    combined = "\n".join([view["card_text"], view["card_html"]])
+
+    assert view["language"] == "zh"
+    assert view["card_title"] == "今日小 Tips"
+    assert "that dream detail" not in combined
+    assert "dream detail" not in combined
+    assert "追问记录" in view["card_text"]
+    assert "用户回答" in view["card_text"]
+    assert "MiniCPM5-1B" in view["card_text"]
+
+
 def test_mobile_mvp_zh_language_switch_keeps_chinese_today_tip():
     state, _view_json = submit_dream_action(
         dream_text="我梦到电梯按钮融化，楼层数字停在 14。",
@@ -224,6 +286,8 @@ def test_mobile_mvp_zh_language_switch_keeps_chinese_today_tip():
     assert view["language"] == "zh"
     assert view["card_title"] == "今日小 Tips"
     assert "今日小 Tips" in view["card_html"]
+    assert "结构化结果 JSON" in view["card_text"]
+    assert '"dream_summary"' in view["card_text"]
 
 
 def test_mobile_mvp_answer_to_card_generates_today_tip():
@@ -245,6 +309,11 @@ def test_mobile_mvp_answer_to_card_generates_today_tip():
     assert view["status"] == "tip"
     assert view["phase"] == "tip"
     assert "It may be asking me to slow down." in view["debug"]["session"]["answer_history"]
+    assert "Follow-up questions:" in view["card_text"]
+    assert "User answers:" in view["card_text"]
+    assert "MiniCPM5-1B" in view["card_text"]
+    assert "Structured result JSON:" in view["card_text"]
+    assert '"today_tip"' in view["card_text"]
 
 
 def test_english_today_tip_has_no_chinese_anchor_leakage():
@@ -300,3 +369,118 @@ def test_english_interpretation_uses_user_answer_before_tip():
 
     assert "overdue email" in interpretation_line.lower()
     assert "floor 14" in interpretation_line.lower()
+
+
+def test_prophecy_framing_is_grounded_before_and_after_tip():
+    state, view_json = submit_dream_action(
+        dream_text="I dreamed of a black wave and woke thinking: is this a sign something bad will happen?",
+        mood="Uneasy",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+
+    assert view["status"] == "ask"
+    assert "prediction" in view["question"].lower()
+
+    _state, view_json = answer_to_card_action(
+        state,
+        "It left a tight feeling in my chest, and I want a grounded answer.",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+    combined = "\n".join([view["card_text"], view["card_html"]]).lower()
+
+    assert "not as evidence that something bad will happen" in combined
+    assert "do not test whether" in combined
+    assert "treat it as a prophecy" not in combined
+
+
+def test_clear_presentation_task_shapes_today_tip():
+    state, view_json = submit_dream_action(
+        dream_text=(
+            "I dreamed of cracked glass before a presentation. "
+            "I need to rehearse the first minute tonight."
+        ),
+        mood="Uneasy",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+
+    assert view["status"] == "ask"
+    assert "presentation" in view["question"].lower()
+
+    _state, view_json = answer_to_card_action(
+        state,
+        "I need to rehearse the first minute tonight.",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+    combined = "\n".join([view["card_text"], view["card_html"]]).lower()
+
+    assert "presentation" in combined
+    assert "first minute" in combined
+    assert "cracked glass" in view["dream_anchors"]
+    assert "cracked gla" not in view["dream_anchors"]
+    assert "reasoning trail" in combined
+
+
+def test_low_context_skip_stays_low_confidence():
+    state, _view_json = submit_dream_action(
+        dream_text="red room, no door, woke nervous",
+        mood="Uneasy",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+
+    _state, view_json = skip_to_card_action(
+        state,
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+    combined = "\n".join([view["card_text"], view["card_html"]]).lower()
+
+    assert "not enough for a firm reading" in combined
+    assert "add one concrete detail" in combined
+    assert "elevator" not in combined
+
+
+def test_revise_card_returns_to_question_state_without_old_card():
+    state, _view_json = submit_dream_action(
+        dream_text="I dreamed the elevator buttons melted and the elevator never came.",
+        mood="Foggy",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    state, _view_json = answer_to_card_action(
+        state,
+        "It may be asking me to slow down.",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+
+    _state, view_json = revise_card_action(
+        state,
+        "Try another angle.",
+        text_backend="demo",
+        vision_backend="demo",
+        language="en",
+    )
+    view = json.loads(view_json)
+
+    assert view["status"] == "ask"
+    assert view["notice"]
+    assert view["question"]
+    assert view["card_text"] == ""