Skip to content

Commit 0b12767

Browse files
fix(server): ACP threads accept a model change after their session detaches (pingdotgg#35951)
1 parent ff1eead commit 0b12767

2 files changed

Lines changed: 26 additions & 5 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderSwitchService.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,24 @@ it.effect.each(["stopped", "error"] as const)(
252252
),
253253
);
254254

255+
it.effect("applies a model change on next turn after a settled thread's session detached", () =>
256+
Effect.gen(function* () {
257+
const service = yield* ProviderSwitch.ProviderSwitchServiceV2;
258+
const result = yield* service.plan({
259+
projection: { ...deadNativeThreadProjection("stopped"), providerSessions: [] },
260+
targetModelSelection: { instanceId: currentInstanceId, model: "gpt-5.2-codex" },
261+
});
262+
assert.equal(result.transition.type, "switch_model_in_session");
263+
assert.deepEqual(result.releaseProviderSessionIds, []);
264+
}).pipe(
265+
Effect.provide(
266+
layerTest({ [currentInstanceId]: { continuationKey: "codex:account:primary" } }, (input) =>
267+
Effect.succeed(acpSelectionTransition(input)),
268+
),
269+
),
270+
),
271+
);
272+
255273
it.effect("rejects a model change the dead record never negotiated support for", () =>
256274
Effect.gen(function* () {
257275
const service = yield* ProviderSwitch.ProviderSwitchServiceV2;

‎apps/server/src/orchestration-v2/ProviderSwitchService.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,14 @@ export const layer: Layer.Layer<
104104
Option.isSome(targetAdapter) &&
105105
Option.isSome(currentInstance) &&
106106
(currentSession !== undefined || currentProviderThread !== undefined)
107-
? yield* targetAdapter.value.planSelectionTransition({
108-
current,
109-
target: targetModelSelection,
110-
sessionCapabilities: negotiatedCapabilities ?? currentInstance.value.capabilities,
111-
})
107+
? negotiatedCapabilities === undefined
108+
? // No session record left to switch in place; the next session starts with it.
109+
({ type: "apply_on_next_turn" } as const)
110+
: yield* targetAdapter.value.planSelectionTransition({
111+
current,
112+
target: targetModelSelection,
113+
sessionCapabilities: negotiatedCapabilities,
114+
})
112115
: undefined;
113116
const transition =
114117
Option.isNone(targetInstance) || Option.isNone(targetAdapter)

0 commit comments

Comments
 (0)