Skip to content

Commit 2c7267a

Browse files
t3dotggclaude
andauthored
fix(server): stop the reaper from silently killing live background subagents (pingdotgg#5677)
Co-authored-by: Claude Fable 5 <[email protected]>
1 parent daf8ee0 commit 2c7267a

2 files changed

Lines changed: 77 additions & 18 deletions

File tree

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

Lines changed: 64 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ function makeReadModel(
6868
readonly lastError: string | null;
6969
readonly updatedAt: string;
7070
} | null;
71+
readonly backgroundLiveness?: "working" | "monitoring" | null;
7172
}>,
7273
) {
7374
const now = "2026-01-01T00:00:00.000Z";
@@ -109,6 +110,7 @@ function makeReadModel(
109110
latestTurn: null,
110111
messages: [],
111112
session: thread.session,
113+
backgroundLiveness: thread.backgroundLiveness ?? null,
112114
activities: [],
113115
proposedPlans: [],
114116
checkpoints: [],
@@ -135,6 +137,14 @@ describe("ProviderSessionReaper", () => {
135137
runtime = null;
136138
});
137139

140+
// Shared start sequence so each test adds no manual Effect runners
141+
// (no-manual-effect-runtime-in-tests tracks this file's legacy count).
142+
async function startReaper() {
143+
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
144+
scope = await Effect.runPromise(Scope.make("sequential"));
145+
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
146+
}
147+
138148
async function createHarness(input: {
139149
readonly readModel: ReturnType<typeof makeReadModel>;
140150
readonly stopSessionImplementation?: (input: {
@@ -261,9 +271,7 @@ describe("ProviderSessionReaper", () => {
261271
}),
262272
);
263273

264-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
265-
scope = await Effect.runPromise(Scope.make("sequential"));
266-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
274+
await startReaper();
267275

268276
await waitFor(() => harness.stopSession.mock.calls.length === 1);
269277

@@ -311,9 +319,55 @@ describe("ProviderSessionReaper", () => {
311319
}),
312320
);
313321

314-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
315-
scope = await Effect.runPromise(Scope.make("sequential"));
316-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
322+
await startReaper();
323+
await Effect.runPromise(drainFibers);
324+
325+
expect(harness.stopSession).not.toHaveBeenCalled();
326+
const remaining = await runtime!.runPromise(repository.getByThreadId({ threadId }));
327+
expect(Option.isSome(remaining)).toBe(true);
328+
});
329+
330+
it("skips stale sessions while background work is still live", async () => {
331+
const threadId = ThreadId.make("thread-reaper-background-work");
332+
const now = "2026-01-01T00:00:00.000Z";
333+
const harness = await createHarness({
334+
readModel: makeReadModel([
335+
{
336+
id: threadId,
337+
session: {
338+
threadId,
339+
status: "ready",
340+
providerName: "claudeAgent",
341+
runtimeMode: "full-access",
342+
activeTurnId: null,
343+
lastError: null,
344+
updatedAt: now,
345+
},
346+
backgroundLiveness: "working",
347+
},
348+
]),
349+
});
350+
const repository = await runtime!.runPromise(
351+
Effect.service(ProviderSessionRuntime.ProviderSessionRuntimeRepository),
352+
);
353+
354+
await runtime!.runPromise(
355+
repository.upsert({
356+
threadId,
357+
providerName: "claudeAgent",
358+
providerInstanceId: null,
359+
adapterKey: "claudeAgent",
360+
runtimeMode: "full-access",
361+
status: "running",
362+
lastSeenAt: "2026-04-14T00:00:00.000Z",
363+
resumeCursor: {
364+
opaque: "resume-background-work",
365+
},
366+
runtimePayload: null,
367+
}),
368+
);
369+
370+
await startReaper();
317371
await Effect.runPromise(drainFibers);
318372

319373
expect(harness.stopSession).not.toHaveBeenCalled();
@@ -360,9 +414,7 @@ describe("ProviderSessionReaper", () => {
360414
}),
361415
);
362416

363-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
364-
scope = await Effect.runPromise(Scope.make("sequential"));
365-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
417+
await startReaper();
366418
await Effect.runPromise(drainFibers);
367419

368420
expect(harness.stopSession).not.toHaveBeenCalled();
@@ -409,9 +461,7 @@ describe("ProviderSessionReaper", () => {
409461
}),
410462
);
411463

412-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
413-
scope = await Effect.runPromise(Scope.make("sequential"));
414-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
464+
await startReaper();
415465
await Effect.runPromise(drainFibers);
416466

417467
expect(harness.stopSession).not.toHaveBeenCalled();
@@ -495,9 +545,7 @@ describe("ProviderSessionReaper", () => {
495545
}),
496546
);
497547

498-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
499-
scope = await Effect.runPromise(Scope.make("sequential"));
500-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
548+
await startReaper();
501549

502550
await waitFor(() => harness.stopSession.mock.calls.length === 2);
503551

@@ -578,9 +626,7 @@ describe("ProviderSessionReaper", () => {
578626
}),
579627
);
580628

581-
const reaper = await runtime!.runPromise(Effect.service(ProviderSessionReaper));
582-
scope = await Effect.runPromise(Scope.make("sequential"));
583-
await Effect.runPromise(reaper.start().pipe(Scope.provide(scope)));
629+
await startReaper();
584630

585631
await waitFor(() => harness.stopSession.mock.calls.length === 2);
586632

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,19 @@ const makeProviderSessionReaper = (options?: ProviderSessionReaperLiveOptions) =
7171
continue;
7272
}
7373

74+
// The turn can settle while background work runs on (subagent
75+
// fleets, workflow runs, Monitor watch loops). Those live inside the
76+
// provider process, so stopping the session would kill them silently,
77+
// and nothing bumps lastSeenAt between turns.
78+
if (thread?.backgroundLiveness != null) {
79+
yield* Effect.logDebug("provider.session.reaper.skipped-background-work", {
80+
threadId: binding.threadId,
81+
backgroundLiveness: thread.backgroundLiveness,
82+
idleDurationMs,
83+
});
84+
continue;
85+
}
86+
7487
const reaped = yield* providerService.stopSession({ threadId: binding.threadId }).pipe(
7588
Effect.tap(() =>
7689
Effect.logInfo("provider.session.reaped", {

0 commit comments

Comments
 (0)