Merge remote-tracking branch 'origin/master' into ji

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

@@ -312,6 +312,37 @@ def _build_middlewares(
 
     middlewares.append(SetupAgentApprovalMiddleware())
 
+    # SkillStopMiddleware — intercepts skill invocations and halts execution
+    # when a configured skill is about to run. Request-level options
+    # (skill_stop_names / skill_stop_message) take precedence; static
+    # config in ``app_config.skill_stop`` is the fallback.
+    skill_stop_names = cfg.get("skill_stop_names")
+    skill_stop_message = cfg.get("skill_stop_message")
+    if skill_stop_names:
+        from deerflow.agents.middlewares.skill_stop_middleware import SkillStopMiddleware
+
+        middlewares.append(
+            SkillStopMiddleware(
+                skill_names=skill_stop_names,
+                skills_root=resolved_app_config.skills.container_path or "/mnt/skills",
+                stop_message=skill_stop_message,
+                stop_on_match=True,
+            )
+        )
+        logger.info("SkillStopMiddleware enabled (from request): %s", skill_stop_names)
+    elif resolved_app_config.skill_stop.enabled and resolved_app_config.skill_stop.skill_names:
+        from deerflow.agents.middlewares.skill_stop_middleware import SkillStopMiddleware
+
+        middlewares.append(
+            SkillStopMiddleware(
+                skill_names=resolved_app_config.skill_stop.skill_names,
+                skills_root=resolved_app_config.skills.container_path or "/mnt/skills",
+                stop_message=resolved_app_config.skill_stop.stop_message,
+                stop_on_match=resolved_app_config.skill_stop.stop_on_match,
+            )
+        )
+        logger.info("SkillStopMiddleware enabled (from config): %s", resolved_app_config.skill_stop.skill_names)
+
     # ClarificationMiddleware should always be last
     middlewares.append(ClarificationMiddleware())
     return middlewares
@@ -346,6 +377,7 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
     if not isinstance(writing_artifact_path, str) or not writing_artifact_path.strip():
         writing_artifact_path = None
     agent_id = validate_agent_id(cfg.get("agent_id") or cfg.get("agent_name"))
+    requested_excluded_tools = cfg.get("excluded_tools") or None
 
     try:
         agent_config = load_agent_config(agent_id) if not is_bootstrap else None
@@ -416,6 +448,7 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
                 model_name=model_name,
                 subagent_enabled=subagent_enabled,
                 is_scheduled_run=cfg.get("is_scheduled_run", False),
+                excluded_tools=requested_excluded_tools,
                 app_config=resolved_app_config,
             )
             + [setup_agent],
@@ -442,6 +475,7 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
             groups=agent_config.tool_groups if agent_config else None,
             subagent_enabled=subagent_enabled,
             is_scheduled_run=cfg.get("is_scheduled_run", False),
+            excluded_tools=requested_excluded_tools,
             app_config=resolved_app_config,
         ),
         middleware=_build_middlewares(config, model_name=model_name, agent_name=agent_id, app_config=resolved_app_config),