Skip to content

Commit 39ed592

Browse files
committed
fix(server): keep Grok effort and rewind aligned with the live session
Do not carry an old effort onto a new model. Count steered prompts when rewinding. Lock rollback against a replaced session. Keep one default effort in the composer menu. Made with Grok 4.6.
1 parent 5f56ea5 commit 39ed592

5 files changed

Lines changed: 164 additions & 66 deletions

File tree

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

Lines changed: 98 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import {
5959
currentGrokMaxTokensFromSessionSetup,
6060
currentGrokModelIdFromSessionSetup,
6161
currentGrokReasoningEffortFromSessionSetup,
62+
grokMaxTokensByModelFromSessionSetup,
6263
grokReasoningEffortMenusFromSessionSetup,
6364
makeGrokAcpRuntime,
6465
requestedGrokReasoningEffort,
@@ -67,6 +68,7 @@ import {
6768
import {
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(

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe("parseGrokAcpModelMeta", () => {
5858
reasoningEffort: "high",
5959
totalContextTokens: 500000,
6060
reasoningEfforts: [
61-
{ id: "xhigh", value: "xhigh", label: "Extra High Effort" },
61+
{ id: "xhigh", value: "xhigh", label: "Extra High Effort", default: true },
6262
{ id: "high", value: "high", label: "High Effort", default: true },
6363
{ id: "medium", value: "medium", label: "Medium Effort" },
6464
],
@@ -67,6 +67,9 @@ describe("parseGrokAcpModelMeta", () => {
6767
expect(meta.reasoningEffort).toBe("high");
6868
expect(meta.totalContextTokens).toBe(500000);
6969
expect(meta.reasoningEfforts.map((choice) => choice.id)).toEqual(["xhigh", "high", "medium"]);
70+
expect(
71+
meta.reasoningEfforts.filter((choice) => choice.isDefault).map((choice) => choice.id),
72+
).toEqual(["high"]);
7073
expect(grokReasoningEffortCapabilities(meta.reasoningEfforts).optionDescriptors?.[0]?.id).toBe(
7174
GROK_REASONING_EFFORT_OPTION_ID,
7275
);
@@ -144,6 +147,21 @@ describe("applyGrokAcpModelSelection", () => {
144147
}),
145148
);
146149

150+
it.effect("does not carry the previous effort across a model switch", () =>
151+
Effect.gen(function* () {
152+
const { runtime, modelCalls } = makeRecordingRuntime();
153+
const result = yield* applyGrokAcpModelSelection({
154+
runtime,
155+
currentModelId: "grok-4.6",
156+
requestedModelId: "grok-4.5",
157+
currentReasoningEffort: "xhigh",
158+
mapError: (cause) => cause.message,
159+
});
160+
expect(modelCalls).toEqual([{ modelId: "grok-4.5" }]);
161+
expect(result).toEqual({ modelId: "grok-4.5", reasoningEffort: undefined });
162+
}),
163+
);
164+
147165
it.effect("calls session/set_model when only effort changes", () =>
148166
Effect.gen(function* () {
149167
const { runtime, modelCalls } = makeRecordingRuntime();

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

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ export function parseGrokAcpModelMeta(meta: unknown): GrokAcpModelMeta {
201201
}
202202
const choices = [...unique.values()];
203203
const current = trimmedString(meta.reasoningEffort);
204+
const defaultId = current ?? choices.find((choice) => choice.isDefault)?.id;
204205
const supportsReasoningEffort = meta.supportsReasoningEffort === true || choices.length > 0;
205206
const totalContextTokens =
206207
typeof meta.totalContextTokens === "number" &&
@@ -212,11 +213,12 @@ export function parseGrokAcpModelMeta(meta: unknown): GrokAcpModelMeta {
212213
return {
213214
supportsReasoningEffort,
214215
...(current ? { reasoningEffort: current } : {}),
215-
reasoningEfforts: choices.map((choice) =>
216-
current && choice.id === current && choice.isDefault !== true
217-
? { ...choice, isDefault: true }
218-
: choice,
219-
),
216+
reasoningEfforts: choices.map((choice) => ({
217+
id: choice.id,
218+
label: choice.label,
219+
...(choice.description ? { description: choice.description } : {}),
220+
...(choice.id === defaultId ? { isDefault: true } : {}),
221+
})),
220222
...(totalContextTokens !== undefined ? { totalContextTokens } : {}),
221223
};
222224
}
@@ -261,12 +263,31 @@ export function requestedGrokReasoningEffort(
261263
if (!requested) {
262264
return undefined;
263265
}
264-
if (advertised.length === 0 || advertised.includes(requested)) {
266+
if (advertised.includes(requested)) {
265267
return requested;
266268
}
267269
return undefined;
268270
}
269271

272+
export function grokMaxTokensByModelFromSessionSetup(
273+
sessionSetupResult:
274+
| EffectAcpSchema.LoadSessionResponse
275+
| EffectAcpSchema.NewSessionResponse
276+
| EffectAcpSchema.ResumeSessionResponse,
277+
): Map<string, number> {
278+
const maxTokens = new Map<string, number>();
279+
for (const model of sessionSetupResult.models?.availableModels ?? []) {
280+
const tokens = parseGrokAcpModelMeta(model._meta).totalContextTokens;
281+
if (tokens === undefined) {
282+
continue;
283+
}
284+
const slug = resolveGrokAcpBaseModelId(model.modelId);
285+
maxTokens.set(slug, tokens);
286+
maxTokens.set(model.modelId, tokens);
287+
}
288+
return maxTokens;
289+
}
290+
270291
export function grokReasoningEffortMenusFromSessionSetup(
271292
sessionSetupResult:
272293
| EffectAcpSchema.LoadSessionResponse
@@ -346,9 +367,11 @@ export function applyGrokAcpModelSelection<E>(input: {
346367
readonly mapError: (cause: EffectAcpErrors.AcpError) => E;
347368
}): Effect.Effect<GrokAcpSelection, E> {
348369
const nextModelId = input.requestedModelId ?? input.currentModelId;
349-
const nextEffort = input.requestedReasoningEffort ?? input.currentReasoningEffort;
350370
const shouldSwitchModel =
351371
input.requestedModelId !== undefined && input.requestedModelId !== input.currentModelId;
372+
const nextEffort = shouldSwitchModel
373+
? input.requestedReasoningEffort
374+
: (input.requestedReasoningEffort ?? input.currentReasoningEffort);
352375
const shouldSwitchEffort =
353376
input.requestedReasoningEffort !== undefined &&
354377
input.requestedReasoningEffort !== input.currentReasoningEffort;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { describe, expect } from "vite-plus/test";
1111
import {
1212
extractGrokTokenUsage,
1313
extractXAiAskUserQuestions,
14+
grokPromptCountForTurns,
1415
grokRewindTargetForTurnCount,
1516
makeXAiAskUserQuestionCancelledResponse,
1617
makeXAiAskUserQuestionResponse,
@@ -345,6 +346,8 @@ describe("Grok rewind and usage helpers", () => {
345346
});
346347
expect(grokRewindTargetForTurnCount(points, 1)?.promptIndex).toBe(2);
347348
expect(grokRewindTargetForTurnCount(points, 2)?.promptIndex).toBe(1);
349+
expect(grokRewindTargetForTurnCount(points, 4)).toBeUndefined();
350+
expect(grokPromptCountForTurns([{ items: [1] }, { items: [2, 3] }], 1)).toBe(2);
348351
});
349352

350353
it("reads Grok token usage from prompt _meta", () => {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,20 @@ export function grokRewindTargetForTurnCount(
506506
return undefined;
507507
}
508508
const ordered = [...points].sort((left, right) => left.promptIndex - right.promptIndex);
509-
const target = ordered[Math.max(0, ordered.length - numTurns)];
510-
return target;
509+
if (numTurns > ordered.length) {
510+
return undefined;
511+
}
512+
return ordered[ordered.length - numTurns];
513+
}
514+
515+
export function grokPromptCountForTurns(
516+
turns: ReadonlyArray<{ readonly items: ReadonlyArray<unknown> }>,
517+
numTurns: number,
518+
): number {
519+
if (!Number.isInteger(numTurns) || numTurns < 1) {
520+
return 0;
521+
}
522+
return turns.slice(-numTurns).reduce((count, turn) => count + turn.items.length, 0);
511523
}
512524

513525
export function parseGrokRewindExecute(payload: unknown): GrokRewindExecuteResult | undefined {

0 commit comments

Comments
 (0)