Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-code into master-nj

offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/agent.py

@@ -1,4 +1,5 @@
-import logging
+import hashlib
+import logging
 
 from langchain.agents import create_agent
 from langchain.agents.middleware import AgentMiddleware
@@ -37,7 +38,45 @@ logger = logging.getLogger(__name__)
 # 写作配置 Q&A 现在「先生成大纲并与用户多轮确认 → 再提交配置」，需要更多来回，故上限放宽。
 # 仍是兜底安全阀：到顶才用 tool_choice 强制提交，正常流程由用户确认大纲后自然提交。
 WRITING_SETUP_MAX_ROUNDS = 8
-REPORT_STRUCTURE_SETUP_MAX_ROUNDS = 8
+REPORT_STRUCTURE_SETUP_MAX_ROUNDS = 8
+
+_ES_QUERY_ROUTING_OPEN_TAG = '<skill_routing skill="es_query">'
+
+
+def _log_es_query_routing_registration(
+    *,
+    system_prompt: str,
+    app_config: AppConfig,
+    agent_id: str | None,
+    available_skills: set[str] | None,
+) -> None:
+    """Log whether the exact configured ES routing block reached this Q&A prompt."""
+    routing = app_config.skills.es_query_routing
+    configured_prompt = (routing.prompt or "").strip()
+    expected_block = (
+        f"{_ES_QUERY_ROUTING_OPEN_TAG}\n{configured_prompt}\n</skill_routing>"
+        if configured_prompt
+        else ""
+    )
+    eligible = available_skills is None or "es_query" in available_skills
+    registered = bool(expected_block) and expected_block in system_prompt
+    fingerprint = (
+        hashlib.sha256(configured_prompt.encode("utf-8")).hexdigest()[:12]
+        if configured_prompt
+        else "-"
+    )
+
+    log = logger.info if registered or not routing.enabled or not eligible else logger.warning
+    log(
+        "ES query routing prompt registration: agent_id=%s enabled=%s eligible=%s "
+        "registered=%s prompt_chars=%d prompt_sha256=%s",
+        agent_id or "default",
+        routing.enabled,
+        eligible,
+        registered,
+        len(configured_prompt),
+        fingerprint,
+    )
 
 
 def _get_runtime_config(config: RunnableConfig) -> dict:
@@ -687,8 +726,8 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
             writing_mode=writing_mode,
             writing_artifact_path=writing_artifact_path,
         )
-    else:
-        system_prompt = apply_prompt_template(
+    else:
+        system_prompt = apply_prompt_template(
             subagent_enabled=subagent_enabled,
             max_concurrent_subagents=max_concurrent_subagents,
             agent_id=agent_id,
@@ -698,12 +737,20 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
             available_skills=prompt_available_skills,
             app_config=resolved_app_config,
             memory_injection_enabled=memory_injection_enabled,
-            rag_mode_enabled=rag_mode_enabled,
-            is_notebook_mode=is_notebook_mode,
-            notebook_source_ids=notebook_source_ids,
-        )
-
-    return create_agent(
+            rag_mode_enabled=rag_mode_enabled,
+            is_notebook_mode=is_notebook_mode,
+            notebook_source_ids=notebook_source_ids,
+            is_scheduled_run=bool(cfg.get("is_scheduled_run", False)),
+        )
+
+    _log_es_query_routing_registration(
+        system_prompt=system_prompt,
+        app_config=resolved_app_config,
+        agent_id=agent_id,
+        available_skills=prompt_available_skills,
+    )
+
+    return create_agent(
         model=create_chat_model(name=model_name, thinking_enabled=thinking_enabled, reasoning_effort=reasoning_effort, force_disable_thinking=thinking_force_disabled, app_config=resolved_app_config),
         tools=default_tools,
         middleware=_build_middlewares(config, model_name=model_name, agent_name=agent_id, app_config=resolved_app_config),