diff --git a/packages/provider-grok/src/server/xaiAcpExtension.test.ts b/packages/provider-grok/src/server/xaiAcpExtension.test.ts
index b1a24b2cff81f..c03090cb1a830 100644
--- a/packages/provider-grok/src/server/xaiAcpExtension.test.ts
+++ b/packages/provider-grok/src/server/xaiAcpExtension.test.ts
@@ -702,6 +702,48 @@ describe("XAiAcpExtension", () => {
]);
});
+ it("gives each task of a wait_all MultiResult its own status and output", () => {
+ const subagentId = "01a1e5fc-0e49-72b0-8841-27bfa3df8b6b";
+ const failedShellId = "call-7c835a60-7bf5-4284-a5c7-cf42a4212ece-29";
+ const runningShellId = "1fd59a86-519d-4cdf-bce0-0918577c976c";
+ expect(
+ extractXAiBackgroundTaskCompletion({
+ toolCallId: "call-multi-wait",
+ title: "get_command_or_subagent_output",
+ status: "completed",
+ data: {
+ rawInput: {
+ variant: "TaskOutput",
+ task_ids: [subagentId, failedShellId, runningShellId],
+ timeout_ms: 3_000_000,
+ },
+ rawOutput: {
+ type: "TaskOutput",
+ MultiResult: {
+ mode: "wait_all",
+ results: [
+ {
+ task_id: subagentId,
+ status: "completed",
+ exit_code: 0,
+ output:
+ "idRequest changes.\nx",
+ },
+ { task_id: failedShellId, exit_code: 2, output: "" },
+ { task_id: runningShellId, status: "running", output: "partial\n" },
+ ],
+ summary: "2/3 tasks completed (wait_all)",
+ },
+ },
+ },
+ }),
+ ).toEqual([
+ { taskId: subagentId, status: "completed", appendOutput: "Request changes." },
+ { taskId: failedShellId, status: "failed", appendOutput: "" },
+ { taskId: runningShellId, status: "running", appendOutput: "partial" },
+ ]);
+ });
+
it("keeps every requested monitor running when a completed poll has no terminal task status", () => {
expect(
extractXAiBackgroundTaskCompletion({
diff --git a/packages/provider-grok/src/server/xaiAcpExtension.ts b/packages/provider-grok/src/server/xaiAcpExtension.ts
index 7181d1927923c..fb59bbd3c1a5f 100644
--- a/packages/provider-grok/src/server/xaiAcpExtension.ts
+++ b/packages/provider-grok/src/server/xaiAcpExtension.ts
@@ -309,6 +309,8 @@ export function extractXAiBackgroundTaskCompletion(toolCall: AcpToolCallState):
}> {
const rawInput = unknownRecord(toolCall.data.rawInput);
if (!isXAiGetSubagentOutputTool(toolCall, rawInput)) return [];
+ const multiResults = multiResultCompletionsFromGetOutputTool(toolCall);
+ if (multiResults !== undefined) return multiResults;
const text = xAiToolOutputText(toolCall);
const status = statusFromGetOutputTool(toolCall, text);
const appendOutput = resultFromGetOutputTool(toolCall, text) ?? "";
@@ -836,6 +838,35 @@ function statusFromGetOutputTool(
return "running";
}
+function multiResultCompletionsFromGetOutputTool(toolCall: AcpToolCallState):
+ | ReadonlyArray<{
+ readonly taskId: string;
+ readonly status: "running" | "completed" | "failed";
+ readonly appendOutput: string;
+ }>
+ | undefined {
+ const rawOutput = unknownRecord(toolCall.data.rawOutput);
+ const multi = unknownRecord(rawOutput?.MultiResult) ?? unknownRecord(rawOutput?.multiResult);
+ if (multi === undefined || !Array.isArray(multi.results)) return undefined;
+ return multi.results.flatMap((entry) => {
+ const result = unknownRecord(entry);
+ const taskId = nonEmptyString(result?.task_id) ?? nonEmptyString(result?.taskId);
+ if (result === undefined || taskId === undefined) return [];
+ const row: AcpToolCallState = {
+ ...toolCall,
+ status: "completed",
+ data: { ...toolCall.data, rawOutput: { type: "TaskOutput", Result: result } },
+ };
+ return [
+ {
+ taskId,
+ status: statusFromGetOutputTool(row, undefined),
+ appendOutput: resultFromGetOutputTool(row, undefined) ?? "",
+ },
+ ];
+ });
+}
+
/** Spawn ACKs return immediately; keep subagents running until a child or hydration terminal. */
export function extractXAiAcpSubagentUpdate(
toolCall: AcpToolCallState,