Skip to content

Commit 88b5fb4

Browse files
fix(acp): preserve active and fresh rollback snapshots
1 parent 5d2d86b commit 88b5fb4

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎packages/provider-acp/src/server/adapter.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7366,9 +7366,11 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
73667366
snapshotInput.providerThread.appThreadId,
73677367
);
73687368
const sessionId = yield* nativeThreadId(driver, snapshotInput.providerThread);
7369+
const activeTurnForSession =
7370+
(yield* Ref.get(activeTurn))?.nativeThreadId === sessionId;
73697371
if (
73707372
(yield* Ref.get(activeSessionId)) !== sessionId ||
7371-
(yield* Ref.get(hydratedSessionId)) !== sessionId
7373+
((yield* Ref.get(hydratedSessionId)) !== sessionId && !activeTurnForSession)
73727374
) {
73737375
if (!capabilities.threads.canReadThreadSnapshot) {
73747376
return yield* new ProviderAdapter.ProviderAdapterProtocolError({
@@ -7459,6 +7461,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
74597461
);
74607462
yield* Ref.set(runtimeRestartRequired, false);
74617463
yield* Ref.set(activeSessionId, candidate.sessionId);
7464+
yield* Ref.set(hydratedSessionId, candidate.sessionId);
74627465
yield* Ref.set(activeSessionSetup, candidate);
74637466
yield* Ref.set(activeSelection, null);
74647467
yield* Ref.set(activeInteractionMode, null);

0 commit comments

Comments
 (0)