Skip to content

Commit 4228daa

Browse files
committed
fix(grok): delay epoch discard until steer prep succeeds
A failed empty steer advanced discardBeforeEpoch before the replacement prompt prepared, so the live prompt skipped ACP and settled without turn.completed. Discard the previous epoch only after prep succeeds. Made by Grok 4.6 via the Grok harness.
1 parent cdd570f commit 4228daa

2 files changed

Lines changed: 101 additions & 5 deletions

File tree

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

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,6 +1277,99 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
12771277
}).pipe(TestClock.withLive),
12781278
);
12791279

1280+
it.effect("keeps the original prompt running when a steer fails during preparation", () =>
1281+
Effect.gen(function* () {
1282+
const threadId = ThreadId.make("grok-failed-steer-keeps-original-prompt");
1283+
const tempDir = yield* Effect.promise(() =>
1284+
NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "grok-acp-failed-steer-")),
1285+
);
1286+
const requestLogPath = NodePath.join(tempDir, "requests.ndjson");
1287+
const wrapperPath = yield* Effect.promise(() =>
1288+
makeMockGrokWrapper({
1289+
T3_ACP_HANG_FIRST_PROMPT_FOREVER: "1",
1290+
T3_ACP_REQUEST_LOG_PATH: requestLogPath,
1291+
}),
1292+
);
1293+
const adapter = yield* makeTestAdapter(wrapperPath);
1294+
1295+
const runtimeEvents: ProviderRuntimeEvent[] = [];
1296+
const firstTurnStarted = yield* Deferred.make<TurnId>();
1297+
const turnCompleted = yield* Deferred.make<void>();
1298+
const runtimeEventsFiber = yield* Stream.runForEach(adapter.streamEvents, (event) =>
1299+
Effect.gen(function* () {
1300+
runtimeEvents.push(event);
1301+
if (String(event.threadId) !== String(threadId)) {
1302+
return;
1303+
}
1304+
if (event.type === "turn.started" && event.turnId !== undefined) {
1305+
yield* Deferred.succeed(firstTurnStarted, event.turnId).pipe(Effect.ignore);
1306+
return;
1307+
}
1308+
if (event.type === "turn.completed") {
1309+
yield* Deferred.succeed(turnCompleted, undefined).pipe(Effect.ignore);
1310+
}
1311+
}),
1312+
).pipe(Effect.forkChild);
1313+
1314+
yield* adapter.startSession({
1315+
threadId,
1316+
provider: ProviderDriverKind.make("grok"),
1317+
cwd: process.cwd(),
1318+
runtimeMode: "full-access",
1319+
});
1320+
1321+
const firstSendTurnFiber = yield* adapter
1322+
.sendTurn({ threadId, input: "hang until a failed steer", attachments: [] })
1323+
.pipe(Effect.forkChild);
1324+
const firstTurnId = yield* Deferred.await(firstTurnStarted).pipe(Effect.timeout("2 seconds"));
1325+
1326+
const steerError = yield* Effect.flip(
1327+
adapter.sendTurn({
1328+
threadId,
1329+
input: " ",
1330+
attachments: [],
1331+
}),
1332+
);
1333+
yield* waitForFileContent(requestLogPath, 80, '"method":"session/prompt"');
1334+
for (let yieldAttempt = 0; yieldAttempt < 8; yieldAttempt += 1) {
1335+
yield* Effect.yieldNow;
1336+
}
1337+
1338+
const sessionsAfterFailedSteer = yield* adapter.listSessions();
1339+
const sessionAfterFailedSteer = sessionsAfterFailedSteer.find(
1340+
(session) => session.threadId === threadId,
1341+
);
1342+
const completedBeforeInterrupt = runtimeEvents.filter(
1343+
(event): event is Extract<ProviderRuntimeEvent, { type: "turn.completed" }> =>
1344+
event.type === "turn.completed" && String(event.threadId) === String(threadId),
1345+
);
1346+
1347+
yield* adapter.interruptTurn(threadId, firstTurnId).pipe(Effect.timeout("2 seconds"));
1348+
yield* Fiber.join(firstSendTurnFiber).pipe(Effect.timeout("3 seconds"));
1349+
yield* Deferred.await(turnCompleted).pipe(Effect.timeout("3 seconds"));
1350+
1351+
const turnCompletedEvents = runtimeEvents.filter(
1352+
(event): event is Extract<ProviderRuntimeEvent, { type: "turn.completed" }> =>
1353+
event.type === "turn.completed" && String(event.threadId) === String(threadId),
1354+
);
1355+
const readySessions = yield* adapter.listSessions();
1356+
const readySession = readySessions.find((session) => session.threadId === threadId);
1357+
1358+
assert.equal(steerError._tag, "ProviderAdapterValidationError");
1359+
assert.equal(sessionAfterFailedSteer?.status, "running");
1360+
assert.equal(String(sessionAfterFailedSteer?.activeTurnId), String(firstTurnId));
1361+
assert.lengthOf(completedBeforeInterrupt, 0);
1362+
assert.lengthOf(turnCompletedEvents, 1);
1363+
assert.equal(String(turnCompletedEvents[0]?.turnId), String(firstTurnId));
1364+
assert.equal(turnCompletedEvents[0]?.payload.state, "cancelled");
1365+
assert.equal(readySession?.status, "ready");
1366+
assert.isUndefined(readySession?.activeTurnId);
1367+
1368+
yield* Fiber.interrupt(runtimeEventsFiber);
1369+
yield* adapter.stopSession(threadId);
1370+
}).pipe(TestClock.withLive),
1371+
);
1372+
12801373
it.effect("does not double-complete when interrupt wins before a prompt starts ACP", () =>
12811374
Effect.gen(function* () {
12821375
const threadId = ThreadId.make("grok-interrupt-before-prompt-start");

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,11 +1488,6 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
14881488
ctx.promptsInFlight += 1;
14891489
ctx.promptEpoch += 1;
14901490
const promptEpoch = ctx.promptEpoch;
1491-
if (steeringTurnId !== undefined) {
1492-
ctx.discardBeforeEpoch = promptEpoch;
1493-
yield* settlePendingApprovalsAsCancelled(ctx.pendingApprovals);
1494-
yield* settlePendingUserInputsAsCancelled(ctx.pendingUserInputs);
1495-
}
14961491
// Bind the turn id before cooperative yields so interruptTurn can
14971492
// settle this prompt even if stop arrives during preparation.
14981493
ctx.activeTurnId = turnId;
@@ -1626,6 +1621,14 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
16261621
turnId,
16271622
payload: displayModel ? { model: displayModel } : {},
16281623
});
1624+
} else {
1625+
// Discard the previous epoch only after this replacement is
1626+
// ready. A failed steer must not skip the live prompt, which
1627+
// settles without a terminal event when emitTurnCompletion is
1628+
// false.
1629+
yield* settlePendingApprovalsAsCancelled(ctx.pendingApprovals);
1630+
yield* settlePendingUserInputsAsCancelled(ctx.pendingUserInputs);
1631+
ctx.discardBeforeEpoch = promptEpoch;
16291632
}
16301633

16311634
return {

0 commit comments

Comments
 (0)