fix(定时任务): 模板子页面空内容回退原数据，避免子页面显示不全

- 引擎 merge_with_reference：按顶层键(=子页面)逐一合并，转换结果里没抽到有效内容的
  子页面/字段回退模板原有数据（_has_content/_merge_fill 递归，列表/标量整体保留，
  字典逐键回退空分支）；整体为空等价于返回模板默认数据
- _run_html_template_reference：描述与任务prompt都为空→直接用原数据不检索；转换成功后
  对结果做 merge_with_reference 补空子页面
- _run_template_fill_attempt 同样套用 merge，空子页面一致回退
- 测试覆盖 _has_content/merge 各场景 + 端到端空子页面回退/空描述用原数据

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

offline-backend-20260512/backend/CLAUDE.md

@@ -300,7 +300,7 @@ Two on-demand/automatic refresh paths layer on top:
 
 **Unified output switches (`require_html` + `require_markdown`).** The task form no longer splits "???? / HTML ??" into separate kinds. `execution_context` now carries two **independent** booleans that may both be on: `require_html` (???? HTML) and `require_markdown` (???? Markdown). `_task_requires_html()` returns true for `require_html` **or** legacy `task_kind == "html_page"` (so old tasks need no data migration), and `_run_task_attempt()` dispatches to `_run_html_page_attempt` when it is true, else the regular agent attempt. When **both** switches are on, `_gather_html_data()` returns `(text, files)` ? the gather agent run is additionally told to save a `.md` file ? and `_run_html_page_attempt` validates it (`MarkdownRequirementError` on failure) and surfaces it alongside the generated page, so the run delivers both artifacts. The single main `prompt` doubles as the HTML page requirement (`html_config.page_prompt`); there is no separate page-prompt field. Tests: `tests/test_scheduled_task_require_html.py` + the markdown-coexistence cases in `tests/test_html_page_tasks.py`.
 
-**Template-fill mode (JSON → 固定 HTML 模板填充).** A third execution mode, distinct from the free-form `require_html` render pipeline: convert a user-supplied JSON into a **fixed** HTML template's data structure and fill it. Triggered when `execution_context.template_config.template_id` is set (chosen in the task form after selecting the built-in **「模板数据转换器」** agent `template-json-builder`). `_task_template_id()` reads it and `_run_task_attempt()` dispatches to `_run_template_fill_attempt` **before** the `require_html` check. Pipeline: take the source (the task `prompt`, pasted or uploaded .json) — which may be **pure JSON, plain text, or text-with-embedded-JSON** (`template_fill.extract_embedded_json` pre-extracts any embedded `{…}`/`[…]` with a string-aware balanced scan and surfaces it as a labeled block while keeping the full original text; plain text → no block, the model reads it semantically) → load the selected agent's `SOUL.md`+model and run a **direct** `_invoke_conversion_model` call (system=SOUL, human=conversion prompt carrying the template's compact **schema skeleton** + the recognized-JSON block + source) → `extract_json_object` → `template_fill.validate_data` (top-level keys + container types) → **on failure feed the structure errors + `field_coverage_gaps` back and retry up to `_MAX_TEMPLATE_FILL_RETRIES`=2** → `template_fill.fill_template` replaces the template's `const DATA={…}` line (and refreshes `MANIFEST.系统.更新时间`) → archive `index.html` + persist a `scheduled_html_pages` row → return `format:"html"` (reusing the existing HTML preview at `/runs/{id}/html`). Any terminal failure raises `TemplateFillError` → run marked failed (no retry, message shown). **Pure engine** `deerflow/runtime/scheduler/template_fill.py` (harness, no `app.*`): the template registry (`TEMPLATES`: id=`no1` name=`no.1` 台湾滨海防卫大屏, and id=`no2` name=`no.2` 台湾飞行部队平台 with **`convertible=False`** — a 「只展示」 template that renders its existing HTML **as-is**, no model/validation/fill, until conversion is wired in later; `_run_template_fill_attempt` short-circuits to `read_template_text` for it, and `list_templates`/`is_convertible` expose the flag so the form hides the JSON input), `list_templates`/`reference_data`/`schema_skeleton_json`/`validate_data`/`field_coverage_gaps`/`fill_template` — **the template's own embedded `DATA` is the schema source of truth** (parsed at load, 1-sample-per-array skeleton fed to the LLM, top-level structure as the validation basis); template HTML files live under `runtime/scheduler/templates/<id>/`, add a `TemplateSpec` to register a no.2. The agent is seeded like the AI-writing ones: `app/gateway/routers/_template_builder_seed.py` + `_template_builder_seed_assets/template-json-builder/{config.yaml,SOUL.md}`, called from the lifespan before `_sync_legacy_agents` (which upserts it into the `agents` table as built-in/published so it shows in `/api/agents` → the task form's 执行智能体 dropdown). Template list API: `GET /api/scheduled-tasks/html-templates` → `{templates:[{id,name,description,convertible}]}` (open). **Debug-render API** `POST /api/scheduled-tasks/template-fill/render` `{template_id, text?|data?}` → `{ok, display_only?, errors, gaps, html}` (open): no model call — `extract_embedded_json(text)` (or `data`) → `validate_data` → `fill_template`, returning the filled HTML **plus** the validation errors/field-gaps (fills even when invalid so you can see the effect). Powers the chat-page debug button below; non-convertible templates return their raw HTML. **Templates as `require_html` 参考收藏页面 (use the REAL template, all sub-pages)**: the 参考收藏页面 list in the task form also offers the templates (value `tpl:<id>`, e.g. `tpl:no1`). These templates are **JS-driven multi-page SPAs** (sub-pages/tabs are rendered by script from `DATA`), so a free-form model render would only ever produce the main page and **drop every sub-page**. Therefore, when `_run_html_page_attempt` sees a `tpl:<id>` reference (`template_fill.reference_template_id` parses it; distinguishes a template marker from a real favorite id), it short-circuits **before** the free-form pipeline to `_run_html_template_reference`, which renders the **actual template file** (all sub-pages intact): convertible templates gather real data (`_gather_html_data`) → convert to the template `DATA` (`_convert_to_template_data`, shared with template-fill mode) → `fill_template`; non-convertible templates (no.2) output the raw template as-is; a conversion failure falls back to the template's default data so the page + sub-pages always render. Archive/persist/result are shared via `_finalize_template_html`. (The earlier `style_reference` CSS-extraction approach was removed — it lost the sub-pages.) Frontend: when the agent dropdown = `template-json-builder` the form hides the HTML/Markdown switchLine truncated
+**Template-fill mode (JSON → 固定 HTML 模板填充).** A third execution mode, distinct from the free-form `require_html` render pipeline: convert a user-supplied JSON into a **fixed** HTML template's data structure and fill it. Triggered when `execution_context.template_config.template_id` is set (chosen in the task form after selecting the built-in **「模板数据转换器」** agent `template-json-builder`). `_task_template_id()` reads it and `_run_task_attempt()` dispatches to `_run_template_fill_attempt` **before** the `require_html` check. Pipeline: take the source (the task `prompt`, pasted or uploaded .json) — which may be **pure JSON, plain text, or text-with-embedded-JSON** (`template_fill.extract_embedded_json` pre-extracts any embedded `{…}`/`[…]` with a string-aware balanced scan and surfaces it as a labeled block while keeping the full original text; plain text → no block, the model reads it semantically) → load the selected agent's `SOUL.md`+model and run a **direct** `_invoke_conversion_model` call (system=SOUL, human=conversion prompt carrying the template's compact **schema skeleton** + the recognized-JSON block + source) → `extract_json_object` → `template_fill.validate_data` (top-level keys + container types) → **on failure feed the structure errors + `field_coverage_gaps` back and retry up to `_MAX_TEMPLATE_FILL_RETRIES`=2** → `template_fill.fill_template` replaces the template's `const DATA={…}` line (and refreshes `MANIFEST.系统.更新时间`) → archive `index.html` + persist a `scheduled_html_pages` row → return `format:"html"` (reusing the existing HTML preview at `/runs/{id}/html`). Any terminal failure raises `TemplateFillError` → run marked failed (no retry, message shown). **Pure engine** `deerflow/runtime/scheduler/template_fill.py` (harness, no `app.*`): the template registry (`TEMPLATES`: id=`no1` name=`no.1` 台湾滨海防卫大屏, and id=`no2` name=`no.2` 台湾飞行部队平台 with **`convertible=False`** — a 「只展示」 template that renders its existing HTML **as-is**, no model/validation/fill, until conversion is wired in later; `_run_template_fill_attempt` short-circuits to `read_template_text` for it, and `list_templates`/`is_convertible` expose the flag so the form hides the JSON input), `list_templates`/`reference_data`/`schema_skeleton_json`/`validate_data`/`field_coverage_gaps`/`fill_template` — **the template's own embedded `DATA` is the schema source of truth** (parsed at load, 1-sample-per-array skeleton fed to the LLM, top-level structure as the validation basis); template HTML files live under `runtime/scheduler/templates/<id>/`, add a `TemplateSpec` to register a no.2. The agent is seeded like the AI-writing ones: `app/gateway/routers/_template_builder_seed.py` + `_template_builder_seed_assets/template-json-builder/{config.yaml,SOUL.md}`, called from the lifespan before `_sync_legacy_agents` (which upserts it into the `agents` table as built-in/published so it shows in `/api/agents` → the task form's 执行智能体 dropdown). Template list API: `GET /api/scheduled-tasks/html-templates` → `{templates:[{id,name,description,convertible}]}` (open). **Debug-render API** `POST /api/scheduled-tasks/template-fill/render` `{template_id, text?|data?}` → `{ok, display_only?, errors, gaps, html}` (open): no model call — `extract_embedded_json(text)` (or `data`) → `validate_data` → `fill_template`, returning the filled HTML **plus** the validation errors/field-gaps (fills even when invalid so you can see the effect). Powers the chat-page debug button below; non-convertible templates return their raw HTML. **Templates as `require_html` 参考收藏页面 (use the REAL template, all sub-pages)**: the 参考收藏页面 list in the task form also offers the templates (value `tpl:<id>`, e.g. `tpl:no1`). These templates are **JS-driven multi-page SPAs** (sub-pages/tabs are rendered by script from `DATA`), so a free-form model render would only ever produce the main page and **drop every sub-page**. Therefore, when `_run_html_page_attempt` sees a `tpl:<id>` reference (`template_fill.reference_template_id` parses it; distinguishes a template marker from a real favorite id), it short-circuits **before** the free-form pipeline to `_run_html_template_reference`, which renders the **actual template file** (all sub-pages intact): convertible templates gather real data (`_gather_html_data`) → convert to the template `DATA` (`_convert_to_template_data`, shared with template-fill mode) → **`merge_with_reference`** (per top-level key = per sub-page: any sub-page/field with no extracted content falls back to the template's **original** data, so sub-pages never render blank) → `fill_template`; non-convertible templates (no.2) output the raw template as-is; if the task prompt **and** description are both empty, or gather/conversion yields nothing, it uses the template's original data outright. `merge_with_reference` is alsoLine truncated
 
 ### Per-user Prompts & UI Preferences
 

offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/service.py

@@ -1585,6 +1585,23 @@ class ScheduledTaskService:
                 used_default=True,
             )
 
+        # 用户的描述与任务 prompt 都为空 → 不检索/不转换,直接用模板原有数据。
+        prompt = str(task.get("prompt") or "").strip()
+        description = str(task.get("description") or "").strip()
+        if not prompt and not description:
+            data_obj = template_fill.reference_data(tpl_id)
+            return await self._finalize_template_html(
+                task,
+                spec=spec,
+                template_id=tpl_id,
+                html=template_fill.fill_template(tpl_id, data_obj, update_date=scheduled_for.astimezone(ZoneInfo(task.get("timezone") or "UTC")).date()),
+                run_id=run_id,
+                scheduled_for=scheduled_for,
+                content=f"未提供描述，已用模板「{spec.name}」原有数据（含全部子页面）",
+                source_chars=0,
+                used_default=True,
+            )
+
         # 可转换模板：检索真实数据(复用 gather) → 转换成模板 DATA → 填进真模板。
         data_text, _files = await self._gather_html_data(
             task, runtime_thread_id=runtime_thread_id, scheduled_for=scheduled_for, run_id=run_id
@@ -1597,10 +1614,12 @@ class ScheduledTaskService:
             used_default = True
         else:
             try:
-                data_obj = await self._convert_to_template_data(
+                converted = await self._convert_to_template_data(
                     tpl_id, source, model_name=model_name, soul=None, run_id=run_id
                 )
-                content = f"已检索数据并套用模板「{spec.name}」（含全部子页面）"
+                # 子页面没抽到有效内容的,回退模板原有数据,避免子页面空白。
+                data_obj = template_fill.merge_with_reference(tpl_id, converted)
+                content = f"已检索数据并套用模板「{spec.name}」（空子页面回退原数据，含全部子页面）"
             except TemplateFillError:
                 logger.warning("模板参考转换失败,回退默认数据 run=%s tpl=%s", run_id, tpl_id, exc_info=True)
                 data_obj = template_fill.reference_data(tpl_id)
@@ -1685,9 +1704,11 @@ class ScheduledTaskService:
                 except Exception:
                     model_name = None
 
-            data_obj = await self._convert_to_template_data(
+            converted = await self._convert_to_template_data(
                 template_id, source, model_name=model_name, soul=soul, run_id=run_id
             )
+            # 子页面没抽到有效内容的,回退模板原有数据,避免子页面空白。
+            data_obj = template_fill.merge_with_reference(template_id, converted)
             content = f"已根据源数据填充模板「{spec.name}」生成页面"
             used_default = False
 

offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/template_fill.py

@@ -302,6 +302,50 @@ def field_coverage_gaps(template_id: str, obj: Any, *, max_items: int = 40) -> l
     return gaps
 
 
+def _has_content(value: Any) -> bool:
+    """该值是否含「有效内容」(用于判断子页面 / 字段是否抽到东西)。
+
+    空 / None / 空串 / 全空的列表或字典 视为无内容;数字(含 0)、布尔、非空字符串
+    视为有内容。
+    """
+    if value is None:
+        return False
+    if isinstance(value, str):
+        return bool(value.strip())
+    if isinstance(value, (list, tuple)):
+        return any(_has_content(v) for v in value)
+    if isinstance(value, dict):
+        return any(_has_content(v) for v in value.values())
+    return True  # 数字 / 布尔 / 其它标量
+
+
+def _merge_fill(got: Any, ref: Any) -> Any:
+    """用 ``got`` 覆盖,但 ``got`` 里「没有有效内容」的部分回退 ``ref``。
+
+    字典逐键递归(空分支回退);列表/标量有内容就整体保留 ``got``(列表不逐元素合并,
+    避免与原模板元素错配)。
+    """
+    if not _has_content(got):
+        return ref
+    if isinstance(ref, dict) and isinstance(got, dict):
+        out = dict(got)  # 保留 got 里 ref 没有的额外键
+        for key, ref_val in ref.items():
+            out[key] = _merge_fill(got.get(key), ref_val)
+        return out
+    return got
+
+
+def merge_with_reference(template_id: str, data: Any) -> dict[str, Any]:
+    """用转换结果覆盖,但「没抽到有效内容」的子页面 / 字段回退模板原有数据。
+
+    顶层键即子页面:某子页面(及其内部空字段)无有效内容时,用模板自带的原始数据补上,
+    保证页面与子页面不空白。整体为空时等价于返回模板默认数据。
+    """
+    ref = reference_data(template_id)
+    merged = _merge_fill(data, ref)
+    return merged if isinstance(merged, dict) else dict(ref)
+
+
 def _dump_const(var: str, obj: Any) -> str:
     body = json.dumps(obj, ensure_ascii=False)
     return f"const {var}={body};"