Skip to content

feat(server): show Grok subagents in the Agents panel #6410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
t3dotgg wants to merge 1 commit into
base: t3code/audit-grok-build-gaps
Choose a base branch
from
+353 −0
Open

feat(server): show Grok subagents in the Agents panel #6410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 54 additions & 0 deletions apps/server/scripts/acp-mock-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const emitInterleavedAssistantToolCalls =
const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHOLDERS === "1";
const emitAskQuestion = process.env.T3_ACP_EMIT_ASK_QUESTION === "1";
const emitXAiAskUserQuestion = process.env.T3_ACP_EMIT_XAI_ASK_USER_QUESTION === "1";
const emitXAiSubagent = process.env.T3_ACP_EMIT_XAI_SUBAGENT === "1";
const emitXAiPromptCompleteThenHang = process.env.T3_ACP_EMIT_XAI_PROMPT_COMPLETE_THEN_HANG === "1";
const emitForeignSessionUpdates = process.env.T3_ACP_EMIT_FOREIGN_SESSION_UPDATES === "1";
const hangPromptForever = process.env.T3_ACP_HANG_PROMPT_FOREVER === "1";
Expand Down Expand Up @@ -832,6 +833,59 @@ const program = Effect.gen(function* () {
return { stopReason: "end_turn" };
}

if (emitXAiSubagent) {
yield* agent.client.sessionUpdate({
sessionId: requestedSessionId,
update: {
sessionUpdate: "tool_call",
toolCallId: "spawn-subagent-tool-1",
title: "spawn_subagent",
kind: "other",
status: "pending",
rawInput: {
description: "Map current Cursor ACP",
prompt: "Research the Cursor adapter.",
},
},
});
writeJsonRpcNotification("_x.ai/session/update", {
sessionId: requestedSessionId,
update: {
sessionUpdate: "subagent_spawned",
subagent_id: "mock-subagent-1",
parent_session_id: requestedSessionId,
child_session_id: "mock-subagent-1",
subagent_type: "explore",
description: "Map current Cursor ACP",
role: "explore",
model: "grok-4.6",
capability_mode: "read-only",
},
});
writeJsonRpcNotification("_x.ai/session/update", {
sessionId: requestedSessionId,
update: {
sessionUpdate: "subagent_finished",
subagent_id: "mock-subagent-1",
child_session_id: "mock-subagent-1",
status: "completed",
tool_calls: 12,
turns: 1,
duration_ms: 1500,
tokens_used: 4096,
output: "Cursor still uses ACP. Grok should keep the shared stack.",
},
});
yield* agent.client.sessionUpdate({
sessionId: requestedSessionId,
update: {
sessionUpdate: "agent_message_chunk",
content: { type: "text", text: "spawned an explorer" },
},
});
return { stopReason: "end_turn" };
}

if (emitForeignSessionUpdates) {
yield* agent.client.sessionUpdate({
sessionId: requestedSessionId,
Expand Down
62 changes: 62 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,4 +1313,66 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
yield* adapter.stopSession(threadId);
}),
);

it.effect("maps xAI subagent spawn and finish onto the Agents task events", () =>
Effect.gen(function* () {
const threadId = ThreadId.make("grok-subagent-roster");
const wrapperPath = yield* Effect.promise(() =>
makeMockGrokWrapper({ T3_ACP_EMIT_XAI_SUBAGENT: "1" }),
);
const adapter = yield* makeTestAdapter(wrapperPath);
const started =
yield* Deferred.make<Extract<ProviderRuntimeEvent, { type: "task.started" }>>();
const completed =
yield* Deferred.make<Extract<ProviderRuntimeEvent, { type: "task.completed" }>>();
const toolTitles = yield* Ref.make<ReadonlyArray<string>>([]);
const eventsFiber = yield* Stream.runForEach(adapter.streamEvents, (event) => {
if (String(event.threadId) !== String(threadId)) {
return Effect.void;
}
if (event.type === "task.started") {
return Deferred.succeed(started, event).pipe(Effect.ignore);
}
if (event.type === "task.completed") {
return Deferred.succeed(completed, event).pipe(Effect.ignore);
}
if (
(event.type === "item.updated" || event.type === "item.completed") &&
typeof event.payload.title === "string"
) {
return Ref.update(toolTitles, (titles) => [...titles, event.payload.title ?? ""]);
}
return Effect.void;
}).pipe(Effect.forkChild);

yield* adapter.startSession({
threadId,
provider: ProviderDriverKind.make("grok"),
cwd: process.cwd(),
runtimeMode: "full-access",
modelSelection: { instanceId: ProviderInstanceId.make("grok"), model: "grok-build" },
});
yield* adapter.sendTurn({ threadId, input: "use subagents", attachments: [] });

const startedEvent = yield* Deferred.await(started);
const completedEvent = yield* Deferred.await(completed);
assert.equal(String(startedEvent.payload.taskId), "mock-subagent-1");
assert.equal(startedEvent.payload.taskType, "local_agent");
assert.equal(startedEvent.payload.role, "explore");
assert.equal(startedEvent.payload.title, "Map current Cursor ACP");
assert.equal(startedEvent.payload.model, "grok-4.6");
assert.equal(completedEvent.payload.status, "completed");
assert.equal(completedEvent.payload.typedUsage?.totalTokens, 4096);
assert.equal(completedEvent.payload.typedUsage?.toolUses, 12);
assert.equal(
completedEvent.payload.summary,
"Cursor still uses ACP. Grok should keep the shared stack.",
);
const titles = yield* Ref.get(toolTitles);
assert.isFalse(titles.includes("spawn_subagent"));

yield* Fiber.interrupt(eventsFiber);
yield* adapter.stopSession(threadId);
}),
);
});
149 changes: 149 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
ProviderDriverKind,
ProviderInstanceId,
RuntimeRequestId,
RuntimeTaskId,
type ThreadId,
TurnId,
} from "@t3tools/contracts";
Expand Down Expand Up @@ -68,14 +69,20 @@ import {
import {
extractGrokTokenUsage,
extractXAiAskUserQuestions,
GROK_SUBAGENT_TASK_TYPE,
grokPromptCountForTurns,
grokRewindTargetForTurnCount,
grokSubagentCompletedStatus,
grokSubagentResultSummary,
isGrokSpawnSubagentToolTitle,
makeXAiAskUserQuestionCancelledResponse,
makeXAiAskUserQuestionResponse,
parseGrokRewindExecute,
parseGrokRewindPoints,
parseXAiKnownSubagentUpdate,
promptResponseHasMissingXAiStopReason,
XAiAskUserQuestionRequest,
XAiSessionUpdateNotification,
} from "../acp/XAiAcpExtension.ts";
import { type GrokAdapterShape } from "../Services/GrokAdapter.ts";
import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
Expand Down Expand Up @@ -132,6 +139,7 @@ interface GrokSessionContext {
reasoningEffortMenus: Map<string, ReadonlyArray<string>>;
maxTokensByModel: Map<string, number>;
maxTokens: number | undefined;
spawnSubagentToolIds: Set<string>;
stopped: boolean;
}

Expand Down Expand Up @@ -239,6 +247,99 @@ export function grokPromptSettlementBelongsToContext(input: {
);
}

const emitGrokSubagentSessionUpdate = (input: {
readonly threadId: ThreadId;
readonly method: string;
readonly params: XAiSessionUpdateNotification;
readonly sessions: ReadonlyMap<ThreadId, GrokSessionContext>;
readonly offerRuntimeEvent: (event: ProviderRuntimeEvent) => Effect.Effect<void>;
readonly makeEventStamp: () => Effect.Effect<{ eventId: EventId; createdAt: string }>;
readonly logNative: (threadId: ThreadId, method: string, payload: unknown) => Effect.Effect<void>;
}) =>
Effect.gen(function* () {
const update = parseXAiKnownSubagentUpdate(input.params.update);
if (update === undefined) {
return;
}
yield* input.logNative(input.threadId, input.method, input.params);
const turnId = resolveSessionCallbackTurnId(input.sessions, input.threadId);
const stamp = yield* input.makeEventStamp();

if (update.sessionUpdate === "subagent_spawned") {
const role = update.role?.trim() || update.subagent_type?.trim() || undefined;
const title = update.description?.trim() || undefined;
yield* input.offerRuntimeEvent({
type: "task.started",
...stamp,
provider: PROVIDER,
threadId: input.threadId,
turnId,
payload: {
taskId: RuntimeTaskId.make(update.subagent_id),
taskType: GROK_SUBAGENT_TASK_TYPE,
...(update.description?.trim() ? { description: update.description.trim() } : {}),
...(title ? { title } : {}),
...(role ? { role } : {}),
...(update.model?.trim() ? { model: update.model.trim() } : {}),
},
raw: {
source: "acp.grok.extension",
method: input.method,
payload: input.params,
},
});
return;
}

const summary = grokSubagentResultSummary(update.output);
const totalTokens =
typeof update.tokens_used === "number" &&
Number.isFinite(update.tokens_used) &&
update.tokens_used >= 0
? Math.trunc(update.tokens_used)
: undefined;
const toolUses =
typeof update.tool_calls === "number" &&
Number.isFinite(update.tool_calls) &&
update.tool_calls >= 0
? Math.trunc(update.tool_calls)
: undefined;
const durationMs =
typeof update.duration_ms === "number" &&
Number.isFinite(update.duration_ms) &&
update.duration_ms >= 0
? Math.trunc(update.duration_ms)
: undefined;
const typedUsage =
totalTokens !== undefined || toolUses !== undefined || durationMs !== undefined
? {
totalTokens: totalTokens ?? 0,
...(toolUses !== undefined ? { toolUses } : {}),
...(durationMs !== undefined ? { durationMs } : {}),
}
: undefined;

@cursor cursor Bot Aug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zero tokens when usage partial

Low Severity

When subagent_finished includes duration_ms or tool_calls but omits tokens_used, typedUsage is still emitted with totalTokens forced to 0. The Agents panel can then show a misleading zero-token total even though token usage was simply absent.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit f3070ff. Configure here.


yield* input.offerRuntimeEvent({
type: "task.completed",
...stamp,
provider: PROVIDER,
threadId: input.threadId,
turnId,
payload: {
taskId: RuntimeTaskId.make(update.subagent_id),
status: grokSubagentCompletedStatus(update.status),
taskType: GROK_SUBAGENT_TASK_TYPE,
...(summary ? { summary } : {}),
...(typedUsage ? { typedUsage } : {}),
},
raw: {
source: "acp.grok.extension",
method: input.method,
payload: input.params,
},
});
});

export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapterLiveOptions) {
return Effect.gen(function* () {
const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("grok");
Expand Down Expand Up @@ -683,6 +784,46 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
),
{ discard: true },
);
yield* Effect.forEach(
["_x.ai/session/update", "x.ai/session/update"] as const,
(method) =>
Effect.all(
[
acp.handleExtNotification(method, XAiSessionUpdateNotification, (params) =>
mapAcpCallbackFailure(
emitGrokSubagentSessionUpdate({
threadId: input.threadId,
method,
params,
sessions,
offerRuntimeEvent: (event) =>
offerRuntimeEvent(event).pipe(Effect.asVoid),
makeEventStamp: () => makeEventStamp().pipe(Effect.orDie),
logNative: (threadId, loggedMethod, payload) =>
logNative(threadId, loggedMethod, payload).pipe(Effect.orDie),
}),
),
),
acp.handleExtRequest(method, XAiSessionUpdateNotification, (params) =>
mapAcpCallbackFailure(
emitGrokSubagentSessionUpdate({
threadId: input.threadId,
method,
params,
sessions,
offerRuntimeEvent: (event) =>
offerRuntimeEvent(event).pipe(Effect.asVoid),
makeEventStamp: () => makeEventStamp().pipe(Effect.orDie),
logNative: (threadId, loggedMethod, payload) =>
logNative(threadId, loggedMethod, payload).pipe(Effect.orDie),
}).pipe(Effect.as({})),
),
),
],
{ discard: true },
),
{ discard: true },
);
yield* acp.handleRequestPermission((params) =>
mapAcpCallbackFailure(
Effect.gen(function* () {
Expand Down Expand Up @@ -817,6 +958,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
maxTokens:
(boundModelId ? maxTokensByModel.get(boundModelId) : undefined) ??
currentGrokMaxTokensFromSessionSetup(started.sessionSetupResult),
spawnSubagentToolIds: new Set<string>(),
stopped: false,
};

Expand Down Expand Up @@ -884,6 +1026,13 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
);
return;
case "ToolCallUpdated":
if (
isGrokSpawnSubagentToolTitle(event.toolCall.title) ||
ctx.spawnSubagentToolIds.has(event.toolCall.toolCallId)
) {
ctx.spawnSubagentToolIds.add(event.toolCall.toolCallId);
return;
}
yield* offerRuntimeEvent(
makeAcpToolCallEvent({
stamp,
Expand Down
12 changes: 12 additions & 0 deletions apps/server/src/provider/acp/XAiAcpExtension.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import {
extractXAiAskUserQuestions,
grokPromptCountForTurns,
grokRewindTargetForTurnCount,
grokSubagentCompletedStatus,
grokSubagentResultSummary,
isGrokSpawnSubagentToolTitle,
makeXAiAskUserQuestionCancelledResponse,
makeXAiAskUserQuestionResponse,
makeXAiPromptCompletionRuntime,
Expand Down Expand Up @@ -350,6 +353,15 @@ describe("Grok rewind and usage helpers", () => {
expect(grokPromptCountForTurns([{ items: [1] }, { items: [2, 3] }], 1)).toBe(2);
});

it("maps Grok subagent finish status and trims the result", () => {
expect(grokSubagentCompletedStatus("completed")).toBe("completed");
expect(grokSubagentCompletedStatus("failed")).toBe("failed");
expect(grokSubagentCompletedStatus("cancelled")).toBe("stopped");
expect(isGrokSpawnSubagentToolTitle("spawn_subagent")).toBe(true);
expect(isGrokSpawnSubagentToolTitle("read_file")).toBe(false);
expect(grokSubagentResultSummary(` ${"a".repeat(2001)} `)?.endsWith("...")).toBe(true);
});

it("reads Grok token usage from prompt _meta", () => {
expect(
extractGrokTokenUsage({
Expand Down
Loading
Loading