π OpenHands: AI-Driven Development
feat: enable sub-agent delegation via task_tool_set (#509)
Robert Brennan35555bac1150
diff --git a/__tests__/api/agent-server-adapter.test.ts b/__tests__/api/agent-server-adapter.test.tsindex 9ed1f9eacb..cb3bc972fd 100644--- a/__tests__/api/agent-server-adapter.test.ts+++ b/__tests__/api/agent-server-adapter.test.ts@@ -15,7 +15,7 @@ const {mockGetEffectiveLocalBackend,} = vi.hoisted(() => ({mockGetAgentServerWorkingDir: vi.fn(() => "/workspace/project/agent-canvas"),- mockIsAgentServerToolAvailable: vi.fn(() => true),+ mockIsAgentServerToolAvailable: vi.fn((_toolName: string) => true),mockGetEffectiveLocalBackend: vi.fn(() => ({id: "default-local",name: "Local backend",@@ -109,6 +109,7 @@ describe("buildStartConversationRequest", () => {{ name: "task_tracker", params: {} },{ name: "canvas_ui", params: {} },{ name: "browser_tool_set", params: {} },+ { name: "task_tool_set", params: {} },]);expect(payload.agent.include_default_tools).toEqual(["FinishTool",@@ -151,7 +152,7 @@ describe("buildStartConversationRequest", () => {expect(payload.agent.enable_switch_llm_tool).toBeUndefined();});- it("omits browser_tool_set when the server does not advertise browser support", () => {+ it("omits browser_tool_set and task_tool_set when the server does not advertise them", () => {mockIsAgentServerToolAvailable.mockReturnValue(false);const payload = buildStartConversationRequest({@@ -176,6 +177,34 @@ describe("buildStartConversationRequest", () => {]);});+ it("includes task_tool_set when the server advertises it but not browser tools", () => {+ mockIsAgentServerToolAvailable.mockImplementation(+ (toolName: string) => toolName === "task_tool_set",+ );++ const payload = buildStartConversationRequest({+ settings: {+ ...DEFAULT_SETTINGS,+ agent_settings: {+ ...DEFAULT_SETTINGS.agent_settings,+ llm: { model: "nested-model" },+ },+ },+ }) as {+ agent: {+ tools: Array<{ name: string; params: Record<string, unknown> }>;+ };+ };++ expect(payload.agent.tools).toEqual([+ { name: "terminal", params: {} },+ { name: "file_editor", params: {} },+ { name: "task_tracker", params: {} },+ { name: "canvas_ui", params: {} },+ { name: "task_tool_set", params: {} },+ ]);+ });+it("derives confirmation and security settings the same way as OpenHands", () => {const payload = buildStartConversationRequest({settings: {diff --git a/src/api/agent-server-adapter.ts b/src/api/agent-server-adapter.tsindex dfe59df089..676db16485 100644--- a/src/api/agent-server-adapter.ts+++ b/src/api/agent-server-adapter.ts@@ -55,6 +55,7 @@ const DEFAULT_TOOL_NAMES = [CANVAS_UI_TOOL_NAME,];const BROWSER_TOOL_SET_NAME = "browser_tool_set";+const TASK_TOOL_SET_NAME = "task_tool_set";const DEFAULT_BUILT_IN_TOOL_NAMES = ["FinishTool", "ThinkTool"];const SWITCH_LLM_TOOL_NAME = "SwitchLLMTool";@@ -349,6 +350,14 @@ function getAgentTools() {) {tools.push({ name: BROWSER_TOOL_SET_NAME, params: {} });}+ // Enables sub-agent delegation. The agent server's tool_router preloads+ // `task_tool_set` and registers the built-in subagents (code-explorer,+ // bash-runner, web-researcher, general-purpose), so exposing the tool here+ // is all the client needs to do. Older servers that don't advertise it in+ // /api/server_info's `usable_tools` are skipped via the capability probe.+ if (isAgentServerToolAvailable(TASK_TOOL_SET_NAME)) {+ tools.push({ name: TASK_TOOL_SET_NAME, params: {} });+ }return tools;}