mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-01 10:56:02 +00:00
09d9cf53d2
invoke_acp_agent had no timeout anywhere in its call path, and ACPAgentConfig had no timeout field. If the ACP agent subprocess answers initialize/new_session correctly but then hangs inside prompt(), the tool call - and therefore the whole agent turn - blocks indefinitely, with the child process left running. MCP stdio servers already guard against this class of hang via tool_call_timeout; ACP agent invocations had no equivalent. Add ACPAgentConfig.timeout_seconds (default 1800, ge=1), mirroring the shape/default of subagents.timeout_seconds, and wrap the conn.prompt() call in asyncio.wait_for(). On TimeoutError, return a clear error instead of hanging; exiting the spawn_agent_process context block triggers the ACP library's own graceful-then-forceful subprocess cleanup, so the hung process is actually terminated.
63 lines
2.6 KiB
Python
63 lines
2.6 KiB
Python
"""ACP (Agent Client Protocol) agent configuration loaded from config.yaml."""
|
|
|
|
import logging
|
|
from collections.abc import Mapping
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ACPAgentConfig(BaseModel):
|
|
"""Configuration for a single ACP-compatible agent."""
|
|
|
|
command: str = Field(description="Command to launch the ACP agent subprocess")
|
|
args: list[str] = Field(default_factory=list, description="Additional command arguments")
|
|
env: dict[str, str] = Field(default_factory=dict, description="Environment variables to inject into the agent subprocess. Values starting with $ are resolved from host environment variables.")
|
|
description: str = Field(description="Description of the agent's capabilities (shown in tool description)")
|
|
model: str | None = Field(default=None, description="Model hint passed to the agent (optional)")
|
|
auto_approve_permissions: bool = Field(
|
|
default=False,
|
|
description=(
|
|
"When True, DeerFlow automatically approves all ACP permission requests from this agent "
|
|
"(allow_once preferred over allow_always). When False (default), all permission requests "
|
|
"are denied — the agent must be configured to operate without requesting permissions."
|
|
),
|
|
)
|
|
timeout_seconds: int = Field(
|
|
default=1800,
|
|
ge=1,
|
|
description=(
|
|
"Maximum time in seconds to wait for the agent to respond to a single invoke_acp_agent "
|
|
"call before the invocation is aborted and the subprocess is terminated. Mirrors "
|
|
"subagents.timeout_seconds (default: 1800 = 30 minutes) — without this backstop, an ACP "
|
|
"agent subprocess that hangs after initialize/new_session blocks the tool call, and "
|
|
"therefore the whole agent turn, indefinitely."
|
|
),
|
|
)
|
|
|
|
|
|
_acp_agents: dict[str, ACPAgentConfig] = {}
|
|
|
|
|
|
def get_acp_agents() -> dict[str, ACPAgentConfig]:
|
|
"""Get the currently configured ACP agents.
|
|
|
|
Returns:
|
|
Mapping of agent name -> ACPAgentConfig. Empty dict if no ACP agents are configured.
|
|
"""
|
|
return _acp_agents
|
|
|
|
|
|
def load_acp_config_from_dict(config_dict: Mapping[str, Mapping[str, object]] | None) -> None:
|
|
"""Load ACP agent configuration from a dictionary (typically from config.yaml).
|
|
|
|
Args:
|
|
config_dict: Mapping of agent name -> config fields.
|
|
"""
|
|
global _acp_agents
|
|
if config_dict is None:
|
|
config_dict = {}
|
|
_acp_agents = {name: ACPAgentConfig(**cfg) for name, cfg in config_dict.items()}
|
|
logger.info("ACP config loaded: %d agent(s): %s", len(_acp_agents), list(_acp_agents.keys()))
|