Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions packages/provider-grok/src/server/xaiAcpExtension.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"<subagent_meta>id</subagent_meta>Request changes.\n<subagent_result>x</subagent_result>",
},
{ 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({
Expand Down
31 changes: 31 additions & 0 deletions packages/provider-grok/src/server/xaiAcpExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) ?? "";
Expand Down Expand Up @@ -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,
Expand Down
Loading