Skip to content

Commit 6192355

Browse files
fix(acp): preserve active and fresh rollback snapshots
1 parent 76de5ab commit 6192355

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
@@ -7307,9 +7307,11 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
73077307
snapshotInput.providerThread.appThreadId,
73087308
);
73097309
const sessionId = yield* nativeThreadId(driver, snapshotInput.providerThread);
7310+
const activeTurnForSession =
7311+
(yield* Ref.get(activeTurn))?.nativeThreadId === sessionId;
73107312
if (
73117313
(yield* Ref.get(activeSessionId)) !== sessionId ||
7312-
(yield* Ref.get(hydratedSessionId)) !== sessionId
7314+
((yield* Ref.get(hydratedSessionId)) !== sessionId && !activeTurnForSession)
73137315
) {
73147316
if (!capabilities.threads.canReadThreadSnapshot) {
73157317
return yield* new ProviderAdapter.ProviderAdapterProtocolError({
@@ -7400,6 +7402,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
74007402
);
74017403
yield* Ref.set(runtimeRestartRequired, false);
74027404
yield* Ref.set(activeSessionId, candidate.sessionId);
7405+
yield* Ref.set(hydratedSessionId, candidate.sessionId);
74037406
yield* Ref.set(activeSessionSetup, candidate);
74047407
yield* Ref.set(activeSelection, null);
74057408
yield* Ref.set(activeInteractionMode, null);

0 commit comments

Comments
 (0)