Skip to content

Commit 938a082

Browse files
juliusmarmingecodex
andcommitted
Preserve provider binding when stopping sessions
- Keep persisted provider bindings on stop/reap - Remove obsolete `preserveBinding` stop flag Co-authored-by: codex <[email protected]>
1 parent 560da15 commit 938a082

11 files changed

Lines changed: 61 additions & 232 deletions

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts‎

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -750,58 +750,6 @@ describe("ProviderCommandReactor", () => {
750750
});
751751
});
752752

753-
it("rejects a first turn when requested provider conflicts with the thread model", async () => {
754-
const harness = await createHarness({
755-
threadModelSelection: { provider: "codex", model: "gpt-5-codex" },
756-
});
757-
const now = new Date().toISOString();
758-
759-
await Effect.runPromise(
760-
harness.engine.dispatch({
761-
type: "thread.turn.start",
762-
commandId: CommandId.make("cmd-turn-start-provider-first"),
763-
threadId: ThreadId.make("thread-1"),
764-
message: {
765-
messageId: asMessageId("user-message-provider-first"),
766-
role: "user",
767-
text: "hello claude",
768-
attachments: [],
769-
},
770-
modelSelection: {
771-
provider: "claudeAgent",
772-
model: "claude-opus-4-6",
773-
},
774-
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
775-
runtimeMode: "approval-required",
776-
createdAt: now,
777-
}),
778-
);
779-
780-
await waitFor(async () => {
781-
const readModel = await Effect.runPromise(harness.engine.getReadModel());
782-
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
783-
return (
784-
thread?.activities.some((activity) => activity.kind === "provider.turn.start.failed") ??
785-
false
786-
);
787-
});
788-
789-
expect(harness.startSession).not.toHaveBeenCalled();
790-
expect(harness.sendTurn).not.toHaveBeenCalled();
791-
792-
const readModel = await Effect.runPromise(harness.engine.getReadModel());
793-
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
794-
expect(thread?.session).toBeNull();
795-
expect(
796-
thread?.activities.find((activity) => activity.kind === "provider.turn.start.failed"),
797-
).toMatchObject({
798-
summary: "Provider turn start failed",
799-
payload: {
800-
detail: expect.stringContaining("cannot switch to 'claudeAgent'"),
801-
},
802-
});
803-
});
804-
805753
it("preserves the active session model when in-session model switching is unsupported", async () => {
806754
const harness = await createHarness({ sessionModelSwitch: "unsupported" });
807755
const now = new Date().toISOString();
@@ -1100,78 +1048,6 @@ describe("ProviderCommandReactor", () => {
11001048
});
11011049
});
11021050

1103-
it("rejects provider changes after a thread is already bound to a session provider", async () => {
1104-
const harness = await createHarness();
1105-
const now = new Date().toISOString();
1106-
1107-
await Effect.runPromise(
1108-
harness.engine.dispatch({
1109-
type: "thread.turn.start",
1110-
commandId: CommandId.make("cmd-turn-start-provider-switch-1"),
1111-
threadId: ThreadId.make("thread-1"),
1112-
message: {
1113-
messageId: asMessageId("user-message-provider-switch-1"),
1114-
role: "user",
1115-
text: "first",
1116-
attachments: [],
1117-
},
1118-
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1119-
runtimeMode: "approval-required",
1120-
createdAt: now,
1121-
}),
1122-
);
1123-
1124-
await waitFor(() => harness.startSession.mock.calls.length === 1);
1125-
await waitFor(() => harness.sendTurn.mock.calls.length === 1);
1126-
1127-
await Effect.runPromise(
1128-
harness.engine.dispatch({
1129-
type: "thread.turn.start",
1130-
commandId: CommandId.make("cmd-turn-start-provider-switch-2"),
1131-
threadId: ThreadId.make("thread-1"),
1132-
message: {
1133-
messageId: asMessageId("user-message-provider-switch-2"),
1134-
role: "user",
1135-
text: "second",
1136-
attachments: [],
1137-
},
1138-
modelSelection: {
1139-
provider: "claudeAgent",
1140-
model: "claude-opus-4-6",
1141-
},
1142-
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
1143-
runtimeMode: "approval-required",
1144-
createdAt: now,
1145-
}),
1146-
);
1147-
1148-
await waitFor(async () => {
1149-
const readModel = await Effect.runPromise(harness.engine.getReadModel());
1150-
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
1151-
return (
1152-
thread?.activities.some((activity) => activity.kind === "provider.turn.start.failed") ??
1153-
false
1154-
);
1155-
});
1156-
1157-
expect(harness.startSession.mock.calls.length).toBe(1);
1158-
expect(harness.sendTurn.mock.calls.length).toBe(1);
1159-
expect(harness.stopSession.mock.calls.length).toBe(0);
1160-
1161-
const readModel = await Effect.runPromise(harness.engine.getReadModel());
1162-
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
1163-
expect(thread?.session?.threadId).toBe("thread-1");
1164-
expect(thread?.session?.providerName).toBe("codex");
1165-
expect(thread?.session?.runtimeMode).toBe("approval-required");
1166-
expect(
1167-
thread?.activities.find((activity) => activity.kind === "provider.turn.start.failed"),
1168-
).toMatchObject({
1169-
payload: {
1170-
detail: expect.stringContaining("cannot switch to 'claudeAgent'"),
1171-
},
1172-
});
1173-
});
1174-
11751051
it("does not stop the active session when restart fails before rebind", async () => {
11761052
const harness = await createHarness();
11771053
const now = new Date().toISOString();

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -236,18 +236,7 @@ const make = Effect.gen(function* () {
236236
? thread.session.providerName
237237
: undefined;
238238
const requestedModelSelection = options?.modelSelection;
239-
const threadProvider: ProviderKind = currentProvider ?? thread.modelSelection.provider;
240-
if (
241-
requestedModelSelection !== undefined &&
242-
requestedModelSelection.provider !== threadProvider
243-
) {
244-
return yield* new ProviderAdapterRequestError({
245-
provider: threadProvider,
246-
method: "thread.turn.start",
247-
detail: `Thread '${threadId}' is bound to provider '${threadProvider}' and cannot switch to '${requestedModelSelection.provider}'.`,
248-
});
249-
}
250-
const preferredProvider: ProviderKind = currentProvider ?? threadProvider;
239+
const preferredProvider: ProviderKind = currentProvider ?? thread.modelSelection.provider;
251240
const desiredModelSelection = requestedModelSelection ?? thread.modelSelection;
252241
const effectiveCwd = resolveThreadWorkspaceCwd({
253242
thread,
@@ -293,9 +282,6 @@ const make = Effect.gen(function* () {
293282
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
294283
if (existingSessionThreadId) {
295284
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
296-
const providerChanged =
297-
requestedModelSelection !== undefined &&
298-
requestedModelSelection.provider !== currentProvider;
299285
const sessionModelSwitch =
300286
currentProvider === undefined
301287
? "in-session"
@@ -312,17 +298,15 @@ const make = Effect.gen(function* () {
312298

313299
if (
314300
!runtimeModeChanged &&
315-
!providerChanged &&
316301
!shouldRestartForModelChange &&
317302
!shouldRestartForModelSelectionChange
318303
) {
319304
return existingSessionThreadId;
320305
}
321306

322-
const resumeCursor =
323-
providerChanged || shouldRestartForModelChange
324-
? undefined
325-
: (activeSession?.resumeCursor ?? undefined);
307+
const resumeCursor = shouldRestartForModelChange
308+
? undefined
309+
: (activeSession?.resumeCursor ?? undefined);
326310
yield* Effect.logInfo("provider command reactor restarting provider session", {
327311
threadId,
328312
existingSessionThreadId,
@@ -331,7 +315,6 @@ const make = Effect.gen(function* () {
331315
currentRuntimeMode: thread.session?.runtimeMode,
332316
desiredRuntimeMode: thread.runtimeMode,
333317
runtimeModeChanged,
334-
providerChanged,
335318
modelChanged,
336319
shouldRestartForModelChange,
337320
shouldRestartForModelSelectionChange,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
144144
getProvider: () =>
145145
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
146146
getBinding: () => Effect.succeed(Option.none()),
147-
remove: () => Effect.void,
148147
listThreadIds: () => Effect.succeed([]),
149148
listBindings: () => Effect.succeed([]),
150149
});

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

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
TurnId,
1919
} from "@t3tools/contracts";
2020
import { it, assert, vi } from "@effect/vitest";
21-
import { assertFailure } from "@effect/vitest/utils";
2221

2322
import { Effect, Fiber, Layer, Metric, Option, PubSub, Ref, Stream } from "effect";
2423
import * as SqlClient from "effect/unstable/sql/SqlClient";
@@ -574,20 +573,31 @@ routing.layer("ProviderServiceLive routing", (it) => {
574573
});
575574

576575
yield* provider.stopSession({ threadId: session.threadId });
577-
const sendAfterStop = yield* Effect.result(
578-
provider.sendTurn({
579-
threadId: session.threadId,
580-
input: "after-stop",
581-
attachments: [],
582-
}),
583-
);
584-
assertFailure(
585-
sendAfterStop,
586-
new ProviderValidationError({
587-
operation: "ProviderService.sendTurn",
588-
issue: `Cannot route thread '${session.threadId}' because no persisted provider binding exists.`,
589-
}),
590-
);
576+
routing.codex.startSession.mockClear();
577+
routing.codex.sendTurn.mockClear();
578+
579+
yield* provider.sendTurn({
580+
threadId: session.threadId,
581+
input: "after-stop",
582+
attachments: [],
583+
});
584+
585+
assert.equal(routing.codex.startSession.mock.calls.length, 1);
586+
const resumedStartInput = routing.codex.startSession.mock.calls[0]?.[0];
587+
assert.equal(typeof resumedStartInput === "object" && resumedStartInput !== null, true);
588+
if (resumedStartInput && typeof resumedStartInput === "object") {
589+
const startPayload = resumedStartInput as {
590+
provider?: string;
591+
cwd?: string;
592+
resumeCursor?: unknown;
593+
threadId?: string;
594+
};
595+
assert.equal(startPayload.provider, "codex");
596+
assert.equal(startPayload.cwd, "/tmp/project");
597+
assert.deepEqual(startPayload.resumeCursor, session.resumeCursor);
598+
assert.equal(startPayload.threadId, session.threadId);
599+
}
600+
assert.equal(routing.codex.sendTurn.mock.calls.length, 1);
591601
}),
592602
);
593603

@@ -631,7 +641,7 @@ routing.layer("ProviderServiceLive routing", (it) => {
631641
}),
632642
);
633643

634-
it.effect("preserves the persisted binding when stopping a session for idle reaping", () =>
644+
it.effect("preserves the persisted binding when stopping a session", () =>
635645
Effect.gen(function* () {
636646
const provider = yield* ProviderService;
637647
const runtimeRepository = yield* ProviderSessionRuntimeRepository;
@@ -643,10 +653,7 @@ routing.layer("ProviderServiceLive routing", (it) => {
643653
runtimeMode: "full-access",
644654
});
645655

646-
yield* provider.stopSession({
647-
threadId: initial.threadId,
648-
preserveBinding: true,
649-
});
656+
yield* provider.stopSession({ threadId: initial.threadId });
650657

651658
const persistedAfterStop = yield* runtimeRepository.getByThreadId({
652659
threadId: initial.threadId,

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -620,18 +620,14 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
620620
if (routed.isActive) {
621621
yield* routed.adapter.stopSession(routed.threadId);
622622
}
623-
if (input.preserveBinding === true) {
624-
yield* directory.upsert({
625-
threadId: input.threadId,
626-
provider: routed.adapter.provider,
627-
status: "stopped",
628-
runtimePayload: {
629-
activeTurnId: null,
630-
},
631-
});
632-
} else {
633-
yield* directory.remove(input.threadId);
634-
}
623+
yield* directory.upsert({
624+
threadId: input.threadId,
625+
provider: routed.adapter.provider,
626+
status: "stopped",
627+
runtimePayload: {
628+
activeTurnId: null,
629+
},
630+
});
635631
yield* analytics.record("provider.session.stopped", {
636632
provider: routed.adapter.provider,
637633
});

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import path from "node:path";
55
import * as NodeServices from "@effect/platform-node/NodeServices";
66
import { ThreadId } from "@t3tools/contracts";
77
import { it, assert } from "@effect/vitest";
8-
import { assertFailure, assertSome } from "@effect/vitest/utils";
8+
import { assertSome } from "@effect/vitest/utils";
99
import { Effect, Layer, Option } from "effect";
1010
import * as SqlClient from "effect/unstable/sql/SqlClient";
1111

@@ -15,7 +15,6 @@ import {
1515
} from "../../persistence/Layers/Sqlite.ts";
1616
import { ProviderSessionRuntimeRepositoryLive } from "../../persistence/Layers/ProviderSessionRuntime.ts";
1717
import { ProviderSessionRuntimeRepository } from "../../persistence/Services/ProviderSessionRuntime.ts";
18-
import { ProviderSessionDirectoryPersistenceError } from "../Errors.ts";
1918
import { ProviderSessionDirectory } from "../Services/ProviderSessionDirectory.ts";
2019
import { ProviderSessionDirectoryLive } from "./ProviderSessionDirectory.ts";
2120

@@ -31,7 +30,7 @@ function makeDirectoryLayer<E, R>(persistenceLayer: Layer.Layer<SqlClient.SqlCli
3130
}
3231

3332
it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryLive", (it) => {
34-
it("upserts, reads, and removes thread bindings", () =>
33+
it("upserts and reads thread bindings", () =>
3534
Effect.gen(function* () {
3635
const directory = yield* ProviderSessionDirectory;
3736
const runtimeRepository = yield* ProviderSessionRuntimeRepository;
@@ -76,16 +75,6 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL
7675

7776
const threadIds = yield* directory.listThreadIds();
7877
assert.deepEqual(threadIds, [nextThreadId]);
79-
80-
yield* directory.remove(nextThreadId);
81-
const missingProvider = yield* directory.getProvider(nextThreadId).pipe(Effect.result);
82-
assertFailure(
83-
missingProvider,
84-
new ProviderSessionDirectoryPersistenceError({
85-
operation: "ProviderSessionDirectory.getProvider",
86-
detail: `No persisted provider binding found for thread '${nextThreadId}'.`,
87-
}),
88-
);
8978
}));
9079

9180
it("persists runtime fields and merges payload updates", () =>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,6 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
145145
),
146146
);
147147

148-
const remove: ProviderSessionDirectoryShape["remove"] = (threadId) =>
149-
repository
150-
.deleteByThreadId({ threadId })
151-
.pipe(
152-
Effect.mapError(toPersistenceError("ProviderSessionDirectory.remove:deleteByThreadId")),
153-
);
154-
155148
const listThreadIds: ProviderSessionDirectoryShape["listThreadIds"] = () =>
156149
repository.list().pipe(
157150
Effect.mapError(toPersistenceError("ProviderSessionDirectory.listThreadIds:list")),
@@ -174,7 +167,6 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
174167
upsert,
175168
getProvider,
176169
getBinding,
177-
remove,
178170
listThreadIds,
179171
listBindings,
180172
} satisfies ProviderSessionDirectoryShape;

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,7 @@ describe("ProviderSessionReaper", () => {
214214

215215
await waitFor(() => harness.stopSession.mock.calls.length === 1);
216216

217-
expect(harness.stopSession.mock.calls[0]?.[0]).toEqual({
218-
threadId,
219-
preserveBinding: true,
220-
});
217+
expect(harness.stopSession.mock.calls[0]?.[0]).toEqual({ threadId });
221218
expect(harness.stoppedThreadIds.has(threadId)).toBe(true);
222219
});
223220

0 commit comments

Comments
 (0)