@@ -3,6 +3,7 @@ import * as Deferred from "effect/Deferred";
33import * as Effect from "effect/Effect" ;
44import * as Ref from "effect/Ref" ;
55import * as Schema from "effect/Schema" ;
6+ import * as EffectAcpErrors from "effect-acp/errors" ;
67import type * as EffectAcpSchema from "effect-acp/schema" ;
78
89import type * as AcpSessionRuntime from "./AcpSessionRuntime.ts" ;
@@ -19,11 +20,15 @@ type XAiPromptCompleteNotification = typeof XAiPromptCompleteNotification.Type;
1920interface 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
2529const completedXAiPromptIdLimit = 128 ;
2630const xAiStopReasonMissingMetaKey = "xAiStopReasonMissing" ;
31+ const xAiRateLimitedErrorCode = - 32003 ;
2732
2833const 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
288293const 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
293298const 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+
368408const rememberCompletedXAiPromptId = (
369409 completedPromptIdsRef : Ref . Ref < ReadonlyArray < string > > ,
370410 response : EffectAcpSchema . PromptResponse ,
0 commit comments