Skip to content

Commit 1754184

Browse files
committed
fix(grok): avoid applying reasoning effort during steers
1 parent 7d734a9 commit 1754184

4 files changed

Lines changed: 65 additions & 8 deletions

File tree

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,60 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
270270
}),
271271
);
272272

273+
it.effect("does not set reasoning effort while steering an active prompt", () =>
274+
Effect.gen(function* () {
275+
const threadId = ThreadId.make("grok-steer-keeps-active-effort");
276+
const tempDir = yield* Effect.promise(() =>
277+
NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "grok-acp-steer-effort-")),
278+
);
279+
const requestLogPath = NodePath.join(tempDir, "requests.ndjson");
280+
const wrapperPath = yield* Effect.promise(() =>
281+
makeMockGrokWrapper({
282+
T3_ACP_PROMPT_DELAY_MS: "250",
283+
T3_ACP_REQUEST_LOG_PATH: requestLogPath,
284+
}),
285+
);
286+
const adapter = yield* makeTestAdapter(wrapperPath);
287+
const modelSelection = {
288+
instanceId: ProviderInstanceId.make("grok"),
289+
model: "grok-build",
290+
options: [{ id: "reasoningEffort", value: "high" }],
291+
};
292+
293+
yield* adapter.startSession({
294+
threadId,
295+
provider: ProviderDriverKind.make("grok"),
296+
cwd: process.cwd(),
297+
runtimeMode: "full-access",
298+
});
299+
300+
const firstPromptFiber = yield* adapter
301+
.sendTurn({
302+
threadId,
303+
input: "start long-running work",
304+
attachments: [],
305+
modelSelection,
306+
})
307+
.pipe(Effect.forkChild);
308+
yield* waitForFileContent(requestLogPath, 80, '"method":"session/prompt"');
309+
310+
yield* adapter.sendTurn({
311+
threadId,
312+
input: "steer the active work",
313+
attachments: [],
314+
modelSelection,
315+
});
316+
yield* Fiber.join(firstPromptFiber);
317+
318+
const requests = yield* Effect.promise(() => readJsonLines(requestLogPath));
319+
yield* adapter.stopSession(threadId);
320+
assert.lengthOf(
321+
requests.filter((request) => request.method === "session/set_model"),
322+
1,
323+
);
324+
}).pipe(TestClock.withLive),
325+
);
326+
273327
it.effect("restores ready without completing an unstarted turn when preparation fails", () =>
274328
Effect.gen(function* () {
275329
const threadId = ThreadId.make("grok-preparation-failure-while-connecting");

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,11 +949,14 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
949949
const requestedTurnModelId = turnModelSelection?.model
950950
? resolveGrokAcpBaseModelId(turnModelSelection.model)
951951
: undefined;
952+
// Grok cannot apply effort through set_model while an existing prompt is active.
953+
const turnOptionsToApply =
954+
steeringTurnId === undefined ? turnModelSelection?.options : undefined;
952955
const currentModelId = yield* applyGrokAcpModelSelection({
953956
runtime: ctx.acp,
954957
currentModelId: ctx.currentModelId,
955958
requestedModelId: requestedTurnModelId,
956-
selections: turnModelSelection?.options,
959+
selections: turnOptionsToApply,
957960
mapError: (cause) =>
958961
mapAcpToAdapterError(PROVIDER, input.threadId, "session/set_model", cause),
959962
});

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,18 @@ describe("buildGrokDiscoveredModelsFromSessionModelState", () => {
9595
});
9696

9797
expect(models.map((model) => model.slug)).toEqual(["model-a", "model-b"]);
98-
expect(models[0]?.capabilities.optionDescriptors?.[0]).toMatchObject({
98+
const modelADescriptor = models[0]?.capabilities?.optionDescriptors?.[0];
99+
const modelBDescriptor = models[1]?.capabilities?.optionDescriptors?.[0];
100+
expect(modelADescriptor).toMatchObject({
99101
id: "reasoningEffort",
100102
currentValue: "effort-b",
101103
});
102-
expect(models[1]?.capabilities.optionDescriptors?.[0]).toMatchObject({
104+
expect(modelBDescriptor).toMatchObject({
103105
id: "reasoningEffort",
104106
currentValue: "only",
105107
});
106-
if (models[1]?.capabilities.optionDescriptors?.[0]?.type === "select") {
107-
expect(models[1].capabilities.optionDescriptors[0].options.map((o) => o.id)).toEqual([
108-
"only",
109-
]);
108+
if (modelBDescriptor?.type === "select") {
109+
expect(modelBDescriptor.options.map((option) => option.id)).toEqual(["only"]);
110110
}
111111
});
112112
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export function applyGrokAcpModelSelection<E>(input: {
116116
readonly runtime: Pick<AcpSessionRuntime.AcpSessionRuntime["Service"], "setSessionModel">;
117117
readonly currentModelId: string | undefined;
118118
readonly requestedModelId: string | undefined;
119-
readonly selections?: ReadonlyArray<ProviderOptionSelection> | null;
119+
readonly selections?: ReadonlyArray<ProviderOptionSelection> | null | undefined;
120120
readonly mapError: (cause: EffectAcpErrors.AcpError) => E;
121121
}): Effect.Effect<string | undefined, E> {
122122
const targetModelId = input.requestedModelId ?? input.currentModelId;

0 commit comments

Comments
 (0)