diff --git a/apps/server/src/mcp/McpHttpServer.test.ts b/apps/server/src/mcp/McpHttpServer.test.ts index 5801a210ba6c..761991fd4876 100644 --- a/apps/server/src/mcp/McpHttpServer.test.ts +++ b/apps/server/src/mcp/McpHttpServer.test.ts @@ -680,6 +680,34 @@ it.effect("decodes null optional arguments the way it decodes omitted ones", () }).pipe(Effect.provide(layerRecordingTools(calls))); }); +it.effect("decodes a JSON-stringified delegate target as the same object", () => { + const calls: Array = []; + return Effect.gen(function* () { + const task = "Inspect"; + const target = { + providerInstanceId: "codex", + model: "gpt-6.2-sol", + options: { reasoningEffort: "medium" }, + }; + yield* callTool("delegate_task", { task, target }); + yield* callTool("delegate_task", { task, target: JSON.stringify(target) }); + + for (const invalidTarget of ["{model:", '{"model":42}']) { + const error = yield* Effect.flip(callTool("delegate_task", { task, target: invalidTarget })); + expect(error).toBeInstanceOf(McpSchema.InvalidParams); + } + expect(calls).toHaveLength(2); + expect(calls[0]).toEqual({ + task, + target: { + ...target, + options: [{ id: "reasoningEffort", value: "medium" }], + }, + }); + expect(calls[1]).toEqual(calls[0]); + }).pipe(Effect.provide(layerRecordingTools(calls))); +}); + it.effect("rejects arguments a tool does not declare instead of dropping them", () => { const calls: Array = []; return Effect.gen(function* () { diff --git a/packages/contracts/src/orchestratorMcp.ts b/packages/contracts/src/orchestratorMcp.ts index ed6a62bf1eb7..d7c607744d4a 100644 --- a/packages/contracts/src/orchestratorMcp.ts +++ b/packages/contracts/src/orchestratorMcp.ts @@ -170,7 +170,10 @@ export type OrchestratorMcpTerminalDelegatedTaskStatus = export const OrchestratorMcpDelegateTaskInput = Schema.Struct({ task: OrchestratorMcpPrompt, - target: Schema.optional(OrchestratorMcpTarget), + // Some providers send the whole target object as JSON text. + target: Schema.optional( + Schema.Union([OrchestratorMcpTarget, Schema.fromJsonString(OrchestratorMcpTarget)]), + ), title: Schema.optional(OrchestratorMcpTitle), role: Schema.optional(OrchestratorMcpTaskRole), isolation: Schema.optional(