Skip to content

Commit 9be2c8e

Browse files
willsheldonclaude
andcommitted
fix(server): forget a deleted thread's provider binding
The provider runtime table keeps one row per thread that has ever run an agent, and nothing pruned it. A deleted thread kept its binding for the life of the install, so the table grew without bound and every full scan of it paid for threads the user removed long ago. The thread deletion reactor now removes the binding after it stops the provider session. The order matters: stopping a session ends in a directory upsert, so removing first would re-insert the row this cleanup exists to drop. Removal reuses the repository's existing `deleteByThreadId`, which until now had no production caller, and failures are logged like the reactor's other cleanup steps rather than failing the deletion. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
1 parent 357b8d5 commit 9be2c8e

9 files changed

Lines changed: 92 additions & 1 deletion

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
ProviderService,
2121
type ProviderServiceShape,
2222
} from "../../provider/Services/ProviderService.ts";
23+
import { ProviderSessionDirectory } from "../../provider/Services/ProviderSessionDirectory.ts";
2324
import * as TerminalManager from "../../terminal/Manager.ts";
2425
import {
2526
OrchestrationEngineService,
@@ -108,8 +109,12 @@ describe("ThreadDeletionReactor drain", () => {
108109
const terminalManager = {
109110
close: () => Effect.void,
110111
} as unknown as TerminalManager.TerminalManager["Service"];
112+
const directory = {
113+
remove: () => Effect.void,
114+
} as unknown as ProviderSessionDirectory["Service"];
111115
const layer = ThreadDeletionReactorLive.pipe(
112116
Layer.provide(Layer.succeed(ProviderService, providerService)),
117+
Layer.provide(Layer.succeed(ProviderSessionDirectory, directory)),
113118
Layer.provide(Layer.succeed(TerminalManager.TerminalManager, terminalManager)),
114119
Layer.provide(Layer.succeed(OrchestrationEngineService, engine)),
115120
);
@@ -136,4 +141,47 @@ describe("ThreadDeletionReactor drain", () => {
136141
).pipe(Effect.provide(layer));
137142
}),
138143
);
144+
145+
effectIt.effect("forgets the provider binding after stopping the session", () =>
146+
Effect.gen(function* () {
147+
// Stopping a session ends in a directory upsert, so removing the binding
148+
// first would let the stop re-insert the row this cleanup exists to drop.
149+
const cleanups: Array<string> = [];
150+
const engine = {
151+
latestSequence: Effect.succeed(0),
152+
streamDomainEvents: Stream.make(deletedEvent(1)),
153+
} as unknown as OrchestrationEngineShape;
154+
const providerService = {
155+
stopSession: (input: { readonly threadId: ThreadId }) =>
156+
Effect.sync(() => {
157+
cleanups.push(`stop:${input.threadId}`);
158+
}),
159+
} as unknown as ProviderServiceShape;
160+
const terminalManager = {
161+
close: () => Effect.void,
162+
} as unknown as TerminalManager.TerminalManager["Service"];
163+
const directory = {
164+
remove: (removedThreadId: ThreadId) =>
165+
Effect.sync(() => {
166+
cleanups.push(`remove:${removedThreadId}`);
167+
}),
168+
} as unknown as ProviderSessionDirectory["Service"];
169+
const layer = ThreadDeletionReactorLive.pipe(
170+
Layer.provide(Layer.succeed(ProviderService, providerService)),
171+
Layer.provide(Layer.succeed(ProviderSessionDirectory, directory)),
172+
Layer.provide(Layer.succeed(TerminalManager.TerminalManager, terminalManager)),
173+
Layer.provide(Layer.succeed(OrchestrationEngineService, engine)),
174+
);
175+
176+
yield* Effect.scoped(
177+
Effect.gen(function* () {
178+
const reactor = yield* ThreadDeletionReactor;
179+
yield* reactor.start();
180+
yield* reactor.drainThrough(1);
181+
182+
expect(cleanups).toEqual([`stop:${threadId}`, `remove:${threadId}`]);
183+
}),
184+
).pipe(Effect.provide(layer));
185+
}),
186+
);
139187
});

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import * as Stream from "effect/Stream";
77
import * as SubscriptionRef from "effect/SubscriptionRef";
88

99
import { ProviderService } from "../../provider/Services/ProviderService.ts";
10+
import { ProviderSessionDirectory } from "../../provider/Services/ProviderSessionDirectory.ts";
1011
import * as TerminalManager from "../../terminal/Manager.ts";
1112
import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
1213
import {
@@ -41,6 +42,7 @@ export const logCleanupCauseUnlessInterrupted = <R, E>({
4142
const make = Effect.gen(function* () {
4243
const orchestrationEngine = yield* OrchestrationEngineService;
4344
const providerService = yield* ProviderService;
45+
const providerSessionDirectory = yield* ProviderSessionDirectory;
4446
const terminalManager = yield* TerminalManager.TerminalManager;
4547

4648
const stopProviderSession = (threadId: ThreadDeletedEvent["payload"]["threadId"]) =>
@@ -50,6 +52,15 @@ const make = Effect.gen(function* () {
5052
threadId,
5153
});
5254

55+
// Nothing else prunes the runtime table, so a deleted thread would keep its
56+
// binding for the life of the install.
57+
const forgetProviderBinding = (threadId: ThreadDeletedEvent["payload"]["threadId"]) =>
58+
logCleanupCauseUnlessInterrupted({
59+
effect: providerSessionDirectory.remove(threadId),
60+
message: "thread deletion cleanup skipped provider binding removal",
61+
threadId,
62+
});
63+
5364
const closeThreadTerminals = (threadId: ThreadDeletedEvent["payload"]["threadId"]) =>
5465
logCleanupCauseUnlessInterrupted({
5566
effect: terminalManager.close({ threadId, deleteHistory: true }),
@@ -62,6 +73,7 @@ const make = Effect.gen(function* () {
6273
) {
6374
const { threadId } = event.payload;
6475
yield* stopProviderSession(threadId);
76+
yield* forgetProviderBinding(threadId);
6577
yield* closeThreadTerminals(threadId);
6678
});
6779

‎apps/server/src/project/AgentSessionImporter.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
231231
upsert: (binding) => Effect.sync(() => void bindings.push(binding)),
232232
getProvider: () => Effect.die("unused"),
233233
recordImportedTranscript: () => Effect.void,
234+
remove: () => Effect.void,
234235
getBinding: () => Effect.succeed(Option.none()),
235236
listThreadIds: () => Effect.die("unused"),
236237
listBindings: () => Effect.die("unused"),
@@ -336,6 +337,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
336337
upsert: () => Effect.die("must not bind a scanner skip"),
337338
getProvider: () => Effect.die("unused"),
338339
recordImportedTranscript: () => Effect.die("unused"),
340+
remove: () => Effect.void,
339341
getBinding: () => Effect.die("must not read a scanner skip binding"),
340342
listThreadIds: () => Effect.die("unused"),
341343
listBindings: () => Effect.die("unused"),
@@ -413,6 +415,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
413415
},
414416
getProvider: () => Effect.die("unused"),
415417
recordImportedTranscript: () => Effect.void,
418+
remove: () => Effect.void,
416419
getBinding: () =>
417420
Effect.succeed(bindings[0] === undefined ? Option.none() : Option.some(bindings[0])),
418421
listThreadIds: () => Effect.die("unused"),
@@ -455,6 +458,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
455458
upsert: () => Effect.die("must not replace an active binding"),
456459
getProvider: () => Effect.die("unused"),
457460
recordImportedTranscript: () => Effect.void,
461+
remove: () => Effect.void,
458462
getBinding: () => Effect.succeed(Option.some(runningBinding)),
459463
listThreadIds: () => Effect.die("unused"),
460464
listBindings: () => Effect.die("unused"),
@@ -510,6 +514,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
510514
upsert: () => Effect.die("must not bind malformed or wrong-project sessions"),
511515
getProvider: () => Effect.die("unused"),
512516
recordImportedTranscript: () => Effect.die("unused"),
517+
remove: () => Effect.void,
513518
getBinding: () => Effect.succeed(Option.none()),
514519
listThreadIds: () => Effect.die("unused"),
515520
listBindings: () => Effect.die("unused"),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
226226
getProvider: () =>
227227
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
228228
getBinding: () => Effect.succeed(Option.none()),
229+
remove: () => Effect.void,
229230
listThreadIds: () => Effect.succeed([]),
230231
listBindings: () => Effect.succeed([]),
231232
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
524524
getProvider: () =>
525525
Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
526526
getBinding: () => Effect.succeed(Option.none()),
527+
remove: () => Effect.void,
527528
listThreadIds: () => Effect.succeed([]),
528529
listBindings: () => Effect.succeed([]),
529530
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4402,6 +4402,7 @@ const boundedListing = makeProviderServiceLayer({
44024402
recordImportedTranscript: () => Effect.die("unused"),
44034403
getProvider: () => Effect.die("ProviderService.listSessions does not use getProvider"),
44044404
getBinding,
4405+
remove: () => Effect.void,
44054406
listThreadIds,
44064407
listBindings: () => Effect.die("ProviderService.listSessions does not use listBindings"),
44074408
},

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
178178
Effect.mapError(toPersistenceError("ProviderSessionDirectory.recordImportedTranscript")),
179179
);
180180

181+
const remove: ProviderSessionDirectoryShape["remove"] = (threadId) =>
182+
repository
183+
.deleteByThreadId({ threadId })
184+
.pipe(
185+
Effect.mapError(toPersistenceError("ProviderSessionDirectory.remove:deleteByThreadId")),
186+
);
187+
181188
const listThreadIds: ProviderSessionDirectoryShape["listThreadIds"] = () =>
182189
repository.list().pipe(
183190
Effect.mapError(toPersistenceError("ProviderSessionDirectory.listThreadIds:list")),
@@ -201,6 +208,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
201208
recordImportedTranscript,
202209
getProvider,
203210
getBinding,
211+
remove,
204212
listThreadIds,
205213
listBindings,
206214
} satisfies ProviderSessionDirectoryShape;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ export interface ProviderSessionDirectoryShape {
6565
threadId: ThreadId,
6666
) => Effect.Effect<Option.Option<ProviderRuntimeBinding>, ProviderSessionDirectoryReadError>;
6767

68+
/** Forgets a thread's runtime binding, for example when the thread is deleted. */
69+
readonly remove: (
70+
threadId: ThreadId,
71+
) => Effect.Effect<void, ProviderSessionDirectoryPersistenceError>;
72+
6873
readonly listThreadIds: () => Effect.Effect<
6974
ReadonlyArray<ThreadId>,
7075
ProviderSessionDirectoryPersistenceError

‎apps/server/src/serverRuntimeStartup.reconcile.test.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ it.effect("marks active running sessions that have persisted resume state", () =
152152
),
153153
upsert: (binding) => Effect.sync(() => upserts.push(binding)),
154154
recordImportedTranscript: () => Effect.die("unused"),
155+
remove: () => Effect.void,
155156
getProvider: () => Effect.die("unused"),
156157
listThreadIds: () => Effect.die("unused"),
157158
listBindings: () => Effect.succeed([]),
@@ -281,6 +282,7 @@ it.effect.each(
281282
),
282283
),
283284
recordImportedTranscript: () => Effect.die("unused"),
285+
remove: () => Effect.void,
284286
getProvider: () => Effect.die("unused"),
285287
listThreadIds: () => Effect.die("unused"),
286288
listBindings: () => Effect.succeed([]),
@@ -365,7 +367,6 @@ it.effect.each(
365367
);
366368
}),
367369
);
368-
369370
it.effect("does not continue archived or deleted marked sessions", () => {
370371
const archived = makeThread(
371372
"thread-continue-archived",
@@ -414,6 +415,7 @@ it.effect("does not continue archived or deleted marked sessions", () => {
414415
},
415416
upsert: () => Effect.void,
416417
recordImportedTranscript: () => Effect.die("unused"),
418+
remove: () => Effect.void,
417419
getProvider: () => Effect.die("unused"),
418420
listThreadIds: () => Effect.die("unused"),
419421
listBindings: () => Effect.succeed([]),
@@ -470,6 +472,7 @@ it.effect("retries continuation preparation before settling a persistent failure
470472
),
471473
upsert: () => Effect.void,
472474
recordImportedTranscript: () => Effect.die("unused"),
475+
remove: () => Effect.void,
473476
getProvider: () => Effect.die("unused"),
474477
listThreadIds: () => Effect.die("unused"),
475478
listBindings: () => Effect.succeed([]),
@@ -542,6 +545,7 @@ it.effect("reconciles multiple active and archived orphans but skips live sessio
542545
),
543546
upsert: (binding) => Effect.sync(() => upserts.push(binding)),
544547
recordImportedTranscript: () => Effect.die("unused"),
548+
remove: () => Effect.void,
545549
getProvider: () => Effect.die("unused"),
546550
listThreadIds: () => Effect.die("unused"),
547551
listBindings: () => Effect.succeed([]),
@@ -622,6 +626,7 @@ it.effect(
622626
),
623627
upsert: () => Effect.fail(writeFailure),
624628
recordImportedTranscript: () => Effect.die("unused"),
629+
remove: () => Effect.void,
625630
getProvider: () => Effect.die("unused"),
626631
listThreadIds: () => Effect.die("unused"),
627632
listBindings: () => Effect.succeed([]),
@@ -660,6 +665,7 @@ it.effect("retries failed projections and continues after a persistent failure",
660665
getBinding: () => Effect.succeed(Option.none()),
661666
upsert: () => Effect.void,
662667
recordImportedTranscript: () => Effect.die("unused"),
668+
remove: () => Effect.void,
663669
getProvider: () => Effect.die("unused"),
664670
listThreadIds: () => Effect.die("unused"),
665671
listBindings: () => Effect.succeed([]),
@@ -710,6 +716,7 @@ it.effect("does not fail startup when the live provider session inventory cannot
710716
getBinding: () => Effect.die("unused"),
711717
upsert: () => Effect.die("unused"),
712718
recordImportedTranscript: () => Effect.die("unused"),
719+
remove: () => Effect.void,
713720
getProvider: () => Effect.die("unused"),
714721
listThreadIds: () => Effect.die("unused"),
715722
listBindings: () => Effect.succeed([]),
@@ -776,6 +783,7 @@ for (const scenario of [
776783
upserts.push(binding);
777784
}),
778785
recordImportedTranscript: () => Effect.die("unused"),
786+
remove: () => Effect.void,
779787
getProvider: () => Effect.die("unused"),
780788
listThreadIds: () => Effect.die("unused"),
781789
listBindings: () => Effect.succeed([]),
@@ -850,6 +858,7 @@ for (const preparedStatus of [
850858
yield* Deferred.succeed(cleared, undefined);
851859
}),
852860
recordImportedTranscript: () => Effect.die("unused"),
861+
remove: () => Effect.void,
853862
getProvider: () => Effect.die("unused"),
854863
listThreadIds: () => Effect.die("unused"),
855864
listBindings: () =>
@@ -956,6 +965,7 @@ it.effect("settles failed opt-in recovery without retrying the provider turn", (
956965
binding = next;
957966
}),
958967
recordImportedTranscript: () => Effect.die("unused"),
968+
remove: () => Effect.void,
959969
getProvider: () => Effect.die("unused"),
960970
listThreadIds: () => Effect.die("unused"),
961971
listBindings: () => Effect.succeed([]),

0 commit comments

Comments
 (0)