@@ -59,6 +59,7 @@ import {
5959 currentGrokMaxTokensFromSessionSetup ,
6060 currentGrokModelIdFromSessionSetup ,
6161 currentGrokReasoningEffortFromSessionSetup ,
62+ grokMaxTokensByModelFromSessionSetup ,
6263 grokReasoningEffortMenusFromSessionSetup ,
6364 makeGrokAcpRuntime ,
6465 requestedGrokReasoningEffort ,
@@ -67,6 +68,7 @@ import {
6768import {
6869 extractGrokTokenUsage ,
6970 extractXAiAskUserQuestions ,
71+ grokPromptCountForTurns ,
7072 grokRewindTargetForTurnCount ,
7173 makeXAiAskUserQuestionCancelledResponse ,
7274 makeXAiAskUserQuestionResponse ,
@@ -128,6 +130,7 @@ interface GrokSessionContext {
128130 currentModelId : string | undefined ;
129131 currentReasoningEffort : string | undefined ;
130132 reasoningEffortMenus : Map < string , ReadonlyArray < string > > ;
133+ maxTokensByModel : Map < string , number > ;
131134 maxTokens : number | undefined ;
132135 stopped : boolean ;
133136}
@@ -772,6 +775,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
772775 mapAcpToAdapterError ( PROVIDER , input . threadId , "session/set_model" , cause ) ,
773776 } ) ;
774777 const boundModelId = boundSelection . modelId ;
778+ const maxTokensByModel = grokMaxTokensByModelFromSessionSetup ( started . sessionSetupResult ) ;
775779
776780 const now = yield * nowIso ;
777781 const session : ProviderSession = {
@@ -809,7 +813,10 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
809813 reasoningEffortMenus : grokReasoningEffortMenusFromSessionSetup (
810814 started . sessionSetupResult ,
811815 ) ,
812- maxTokens : currentGrokMaxTokensFromSessionSetup ( started . sessionSetupResult ) ,
816+ maxTokensByModel,
817+ maxTokens :
818+ ( boundModelId ? maxTokensByModel . get ( boundModelId ) : undefined ) ??
819+ currentGrokMaxTokensFromSessionSetup ( started . sessionSetupResult ) ,
813820 stopped : false ,
814821 } ;
815822
@@ -974,14 +981,11 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
974981 const requestedTurnModelId = turnModelSelection ?. model
975982 ? resolveGrokAcpBaseModelId ( turnModelSelection . model )
976983 : undefined ;
977- const advertisedTurnEfforts =
978- ( requestedTurnModelId
979- ? ctx . reasoningEffortMenus . get ( requestedTurnModelId )
980- : undefined ) ??
981- ( ctx . currentModelId
982- ? ctx . reasoningEffortMenus . get ( ctx . currentModelId )
983- : undefined ) ??
984- [ ] ;
984+ const advertisedTurnEfforts = requestedTurnModelId
985+ ? ( ctx . reasoningEffortMenus . get ( requestedTurnModelId ) ?? [ ] )
986+ : ctx . currentModelId
987+ ? ( ctx . reasoningEffortMenus . get ( ctx . currentModelId ) ?? [ ] )
988+ : [ ] ;
985989 const turnSelection = yield * applyGrokAcpModelSelection ( {
986990 runtime : ctx . acp ,
987991 currentModelId : ctx . currentModelId ,
@@ -995,7 +999,11 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
995999 mapAcpToAdapterError ( PROVIDER , input . threadId , "session/set_model" , cause ) ,
9961000 } ) ;
9971001 const currentModelId = turnSelection . modelId ;
1002+ ctx . currentModelId = currentModelId ;
9981003 ctx . currentReasoningEffort = turnSelection . reasoningEffort ;
1004+ if ( currentModelId ) {
1005+ ctx . maxTokens = ctx . maxTokensByModel . get ( currentModelId ) ?? ctx . maxTokens ;
1006+ }
9991007
10001008 const text = input . input ?. trim ( ) ;
10011009 const imagePromptParts = yield * Effect . forEach (
@@ -1456,55 +1464,89 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
14561464 } ) ;
14571465
14581466 const rollbackThread : GrokAdapterShape [ "rollbackThread" ] = ( threadId , numTurns ) =>
1459- Effect . gen ( function * ( ) {
1460- const ctx = yield * requireSession ( threadId ) ;
1461- if ( ! Number . isInteger ( numTurns ) || numTurns < 1 ) {
1462- return yield * new ProviderAdapterValidationError ( {
1463- provider : PROVIDER ,
1464- operation : "rollbackThread" ,
1465- issue : "numTurns must be an integer >= 1." ,
1466- } ) ;
1467- }
1468- const pointsPayload = yield * ctx . acp
1469- . request ( "_x.ai/rewind/points" , {
1470- sessionId : ctx . acpSessionId ,
1471- } )
1472- . pipe (
1473- Effect . mapError ( ( error ) =>
1474- mapAcpToAdapterError ( PROVIDER , threadId , "_x.ai/rewind/points" , error ) ,
1475- ) ,
1467+ withThreadLock (
1468+ threadId ,
1469+ Effect . gen ( function * ( ) {
1470+ const ctx = yield * requireSession ( threadId ) ;
1471+ if ( ! Number . isInteger ( numTurns ) || numTurns < 1 ) {
1472+ return yield * new ProviderAdapterValidationError ( {
1473+ provider : PROVIDER ,
1474+ operation : "rollbackThread" ,
1475+ issue : "numTurns must be an integer >= 1." ,
1476+ } ) ;
1477+ }
1478+ const promptCount = grokPromptCountForTurns ( ctx . turns , numTurns ) ;
1479+ if ( promptCount < 1 ) {
1480+ return yield * new ProviderAdapterRequestError ( {
1481+ provider : PROVIDER ,
1482+ method : "_x.ai/rewind/execute" ,
1483+ detail : "Grok has no rewind point for that many turns." ,
1484+ } ) ;
1485+ }
1486+ const acpSessionId = ctx . acpSessionId ;
1487+ const pointsPayload = yield * ctx . acp
1488+ . request ( "_x.ai/rewind/points" , {
1489+ sessionId : acpSessionId ,
1490+ } )
1491+ . pipe (
1492+ Effect . mapError ( ( error ) =>
1493+ mapAcpToAdapterError ( PROVIDER , threadId , "_x.ai/rewind/points" , error ) ,
1494+ ) ,
1495+ ) ;
1496+ const liveCtx = yield * requireSession ( threadId ) ;
1497+ if ( liveCtx . acpSessionId !== acpSessionId ) {
1498+ return yield * new ProviderAdapterRequestError ( {
1499+ provider : PROVIDER ,
1500+ method : "_x.ai/rewind/execute" ,
1501+ detail : "Grok session changed before rewind completed." ,
1502+ } ) ;
1503+ }
1504+ const target = grokRewindTargetForTurnCount (
1505+ parseGrokRewindPoints ( pointsPayload ) ,
1506+ promptCount ,
14761507 ) ;
1477- const target = grokRewindTargetForTurnCount ( parseGrokRewindPoints ( pointsPayload ) , numTurns ) ;
1478- if ( ! target ) {
1479- return yield * new ProviderAdapterRequestError ( {
1480- provider : PROVIDER ,
1481- method : "_x.ai/rewind/execute" ,
1482- detail : "Grok has no rewind point for that many turns." ,
1483- } ) ;
1484- }
1485- const executePayload = yield * ctx . acp
1486- . request ( "_x.ai/rewind/execute" , {
1487- sessionId : ctx . acpSessionId ,
1488- targetPromptIndex : target . promptIndex ,
1489- mode : "conversation_only" ,
1490- force : true ,
1491- } )
1492- . pipe (
1493- Effect . mapError ( ( error ) =>
1494- mapAcpToAdapterError ( PROVIDER , threadId , "_x.ai/rewind/execute" , error ) ,
1495- ) ,
1508+ if ( ! target ) {
1509+ return yield * new ProviderAdapterRequestError ( {
1510+ provider : PROVIDER ,
1511+ method : "_x.ai/rewind/execute" ,
1512+ detail : "Grok has no rewind point for that many turns." ,
1513+ } ) ;
1514+ }
1515+ const executePayload = yield * liveCtx . acp
1516+ . request ( "_x.ai/rewind/execute" , {
1517+ sessionId : acpSessionId ,
1518+ targetPromptIndex : target . promptIndex ,
1519+ mode : "conversation_only" ,
1520+ force : true ,
1521+ } )
1522+ . pipe (
1523+ Effect . mapError ( ( error ) =>
1524+ mapAcpToAdapterError ( PROVIDER , threadId , "_x.ai/rewind/execute" , error ) ,
1525+ ) ,
1526+ ) ;
1527+ const committedCtx = yield * requireSession ( threadId ) ;
1528+ if ( committedCtx . acpSessionId !== acpSessionId ) {
1529+ return yield * new ProviderAdapterRequestError ( {
1530+ provider : PROVIDER ,
1531+ method : "_x.ai/rewind/execute" ,
1532+ detail : "Grok session changed before rewind completed." ,
1533+ } ) ;
1534+ }
1535+ const executed = parseGrokRewindExecute ( executePayload ) ;
1536+ if ( ! executed ?. success ) {
1537+ return yield * new ProviderAdapterRequestError ( {
1538+ provider : PROVIDER ,
1539+ method : "_x.ai/rewind/execute" ,
1540+ detail : executed ?. error ?? "Grok rewind did not succeed." ,
1541+ } ) ;
1542+ }
1543+ committedCtx . turns = committedCtx . turns . slice (
1544+ 0 ,
1545+ Math . max ( 0 , committedCtx . turns . length - numTurns ) ,
14961546 ) ;
1497- const executed = parseGrokRewindExecute ( executePayload ) ;
1498- if ( ! executed ?. success ) {
1499- return yield * new ProviderAdapterRequestError ( {
1500- provider : PROVIDER ,
1501- method : "_x.ai/rewind/execute" ,
1502- detail : executed ?. error ?? "Grok rewind did not succeed." ,
1503- } ) ;
1504- }
1505- ctx . turns = ctx . turns . slice ( 0 , Math . max ( 0 , ctx . turns . length - numTurns ) ) ;
1506- return { threadId, turns : ctx . turns } ;
1507- } ) ;
1547+ return { threadId, turns : committedCtx . turns } ;
1548+ } ) ,
1549+ ) ;
15081550
15091551 const stopSession : GrokAdapterShape [ "stopSession" ] = ( threadId ) =>
15101552 withThreadLock (
0 commit comments