Skip to content

Commit 360e13f

Browse files
committed
fix(server): show Grok usage limit errors
1 parent 33f9705 commit 360e13f

4 files changed

Lines changed: 134 additions & 4 deletions

File tree

‎apps/server/scripts/acp-mock-agent.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHO
2020
const emitAskQuestion = process.env.T3_ACP_EMIT_ASK_QUESTION === "1";
2121
const emitXAiAskUserQuestion = process.env.T3_ACP_EMIT_XAI_ASK_USER_QUESTION === "1";
2222
const emitXAiPromptCompleteThenHang = process.env.T3_ACP_EMIT_XAI_PROMPT_COMPLETE_THEN_HANG === "1";
23+
const emitXAiRateLimitThenHang = process.env.T3_ACP_EMIT_XAI_RATE_LIMIT_THEN_HANG === "1";
2324
const emitForeignSessionUpdates = process.env.T3_ACP_EMIT_FOREIGN_SESSION_UPDATES === "1";
2425
const hangPromptForever = process.env.T3_ACP_HANG_PROMPT_FOREVER === "1";
2526
const hangFirstPromptForever = process.env.T3_ACP_HANG_FIRST_PROMPT_FOREVER === "1";
@@ -522,6 +523,16 @@ const program = Effect.gen(function* () {
522523
return yield* Effect.never;
523524
}
524525

526+
if (emitXAiRateLimitThenHang) {
527+
writeJsonRpcNotification("_x.ai/session/prompt_complete", {
528+
sessionId: requestedSessionId,
529+
promptId: promptIdFromRequestMeta(request) ?? "mock-xai-rate-limit-prompt-1",
530+
stopReason: "rate_limit",
531+
agentResult: null,
532+
});
533+
return yield* Effect.never;
534+
}
535+
525536
if (emitXAiPromptCompleteThenHang) {
526537
writeJsonRpcNotification("session/update", {
527538
sessionId: requestedSessionId,

‎apps/server/src/provider/Layers/GrokAdapter.test.ts‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,64 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
943943
}),
944944
);
945945

946+
it.effect("surfaces Grok usage limits without clearing the selected model", () =>
947+
Effect.gen(function* () {
948+
const threadId = ThreadId.make("grok-usage-limit-error");
949+
const wrapperPath = yield* Effect.promise(() =>
950+
makeMockGrokWrapper({
951+
T3_ACP_EMIT_XAI_RATE_LIMIT_THEN_HANG: "1",
952+
}),
953+
);
954+
const adapter = yield* makeTestAdapter(wrapperPath);
955+
const runtimeEvents: ProviderRuntimeEvent[] = [];
956+
const runtimeEventsFiber = yield* Stream.runForEach(adapter.streamEvents, (event) =>
957+
Effect.sync(() => {
958+
runtimeEvents.push(event);
959+
}),
960+
).pipe(Effect.forkChild);
961+
962+
yield* adapter.startSession({
963+
threadId,
964+
provider: ProviderDriverKind.make("grok"),
965+
cwd: process.cwd(),
966+
runtimeMode: "full-access",
967+
modelSelection: { instanceId: ProviderInstanceId.make("grok"), model: "grok-build" },
968+
});
969+
970+
const error = yield* Effect.flip(
971+
adapter.sendTurn({
972+
threadId,
973+
input: "hit the usage limit",
974+
attachments: [],
975+
}),
976+
);
977+
const readySessions = yield* adapter.listSessions();
978+
const readySession = readySessions.find((session) => session.threadId === threadId);
979+
const terminalEvents = runtimeEvents.filter(
980+
(event) => event.type === "turn.completed" && event.threadId === threadId,
981+
);
982+
983+
assert.equal(error._tag, "ProviderAdapterRequestError");
984+
assert.include(error.message, "Grok usage limit reached. Try again later.");
985+
assert.equal(readySession?.status, "ready");
986+
assert.equal(readySession?.model, "grok-build");
987+
assert.isUndefined(readySession?.activeTurnId);
988+
assert.lengthOf(terminalEvents, 1);
989+
const [terminalEvent] = terminalEvents;
990+
assert.equal(terminalEvent?.type, "turn.completed");
991+
if (terminalEvent?.type === "turn.completed") {
992+
assert.equal(terminalEvent.payload.state, "failed");
993+
assert.include(
994+
terminalEvent.payload.errorMessage ?? "",
995+
"Grok usage limit reached. Try again later.",
996+
);
997+
}
998+
999+
yield* Fiber.interrupt(runtimeEventsFiber);
1000+
yield* adapter.stopSession(threadId);
1001+
}),
1002+
);
1003+
9461004
it.effect("ignores replayed session/load updates when resuming a Grok session", () =>
9471005
Effect.gen(function* () {
9481006
const threadId = ThreadId.make("grok-load-replay-filter");

‎apps/server/src/provider/acp/XAiAcpExtension.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,27 @@ describe("XAiAcpExtension", () => {
299299
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
300300
);
301301

302+
it.effect("fails a hung standard prompt from an xAI rate-limit completion", () =>
303+
Effect.gen(function* () {
304+
const runtime = yield* makePromptCompletionRuntime({
305+
T3_ACP_EMIT_XAI_RATE_LIMIT_THEN_HANG: "1",
306+
});
307+
yield* runtime.start();
308+
309+
const error = yield* Effect.flip(
310+
runtime.prompt({
311+
prompt: [{ type: "text", text: "hi" }],
312+
}),
313+
);
314+
315+
expect(error).toMatchObject({
316+
_tag: "AcpRequestError",
317+
code: -32003,
318+
errorMessage: "Grok usage limit reached. Try again later.",
319+
});
320+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
321+
);
322+
302323
it.effect("ignores stale xAI completion from an already settled prompt", () =>
303324
Effect.gen(function* () {
304325
const runtime = yield* makePromptCompletionRuntime({

‎apps/server/src/provider/acp/XAiAcpExtension.ts‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as Deferred from "effect/Deferred";
33
import * as Effect from "effect/Effect";
44
import * as Ref from "effect/Ref";
55
import * as Schema from "effect/Schema";
6+
import * as EffectAcpErrors from "effect-acp/errors";
67
import type * as EffectAcpSchema from "effect-acp/schema";
78

89
import type * as AcpSessionRuntime from "./AcpSessionRuntime.ts";
@@ -19,11 +20,15 @@ type XAiPromptCompleteNotification = typeof XAiPromptCompleteNotification.Type;
1920
interface PendingXAiPromptCompletion {
2021
readonly sessionId: string;
2122
readonly promptId: string;
22-
readonly deferred: Deferred.Deferred<EffectAcpSchema.PromptResponse>;
23+
readonly deferred: Deferred.Deferred<
24+
EffectAcpSchema.PromptResponse,
25+
EffectAcpErrors.AcpRequestError
26+
>;
2327
}
2428

2529
const completedXAiPromptIdLimit = 128;
2630
const xAiStopReasonMissingMetaKey = "xAiStopReasonMissing";
31+
const xAiRateLimitedErrorCode = -32003;
2732

2833
const XAiAskUserQuestionOption = Schema.Struct({
2934
label: Schema.String,
@@ -278,7 +283,7 @@ const registerXAiPromptCompletionFallback = (
278283
sessionId: string,
279284
promptId: string,
280285
) =>
281-
Deferred.make<EffectAcpSchema.PromptResponse>().pipe(
286+
Deferred.make<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpRequestError>().pipe(
282287
Effect.tap((deferred) =>
283288
Ref.update(pendingRef, (pending) => [...pending, { sessionId, promptId, deferred }]),
284289
),
@@ -287,7 +292,7 @@ const registerXAiPromptCompletionFallback = (
287292

288293
const unregisterXAiPromptCompletionFallback = (
289294
pendingRef: Ref.Ref<ReadonlyArray<PendingXAiPromptCompletion>>,
290-
deferred: Deferred.Deferred<EffectAcpSchema.PromptResponse>,
295+
deferred: Deferred.Deferred<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpRequestError>,
291296
) => Ref.update(pendingRef, (pending) => pending.filter((entry) => entry.deferred !== deferred));
292297

293298
const abortPendingPromptCompletions = (
@@ -358,13 +363,48 @@ const resolveXAiPromptCompletionFallback = ({
358363
return [Effect.void, pending] as const;
359364
}
360365
return [
361-
Deferred.succeed(entry.deferred, promptResponseFromXAi(notification)).pipe(Effect.asVoid),
366+
settleXAiPromptCompletion(entry.deferred, notification),
362367
[...pending.slice(0, index), ...pending.slice(index + 1)],
363368
] as const;
364369
}).pipe(Effect.flatten);
365370
}),
366371
);
367372

373+
const settleXAiPromptCompletion = (
374+
deferred: Deferred.Deferred<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpRequestError>,
375+
notification: XAiPromptCompleteNotification,
376+
) => {
377+
if (notification.stopReason === "rate_limit") {
378+
return Deferred.fail(
379+
deferred,
380+
new EffectAcpErrors.AcpRequestError({
381+
code: xAiRateLimitedErrorCode,
382+
errorMessage: "Grok usage limit reached. Try again later.",
383+
}),
384+
).pipe(Effect.asVoid);
385+
}
386+
if (notification.stopReason === "error") {
387+
return Deferred.fail(
388+
deferred,
389+
EffectAcpErrors.AcpRequestError.internalError(
390+
xAiAgentResultMessage(notification.agentResult) ?? "Grok prompt failed.",
391+
),
392+
).pipe(Effect.asVoid);
393+
}
394+
return Deferred.succeed(deferred, promptResponseFromXAi(notification)).pipe(Effect.asVoid);
395+
};
396+
397+
function xAiAgentResultMessage(value: unknown): string | undefined {
398+
if (typeof value === "string") {
399+
return trimmed(value);
400+
}
401+
if (value === null || typeof value !== "object") {
402+
return undefined;
403+
}
404+
const message = "message" in value ? value.message : undefined;
405+
return typeof message === "string" ? trimmed(message) : undefined;
406+
}
407+
368408
const rememberCompletedXAiPromptId = (
369409
completedPromptIdsRef: Ref.Ref<ReadonlyArray<string>>,
370410
response: EffectAcpSchema.PromptResponse,

0 commit comments

Comments
 (0)