Skip to content

Commit e6f78be

Browse files
committed
fix(server): stop every Claude session during shutdown
1 parent 50906db commit e6f78be

2 files changed

Lines changed: 68 additions & 16 deletions

File tree

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,57 @@ describe("ClaudeAdapterLive", () => {
16881688
);
16891689
});
16901690

1691+
it.effect("stopAll attempts every session when one process close fails", () => {
1692+
const queries: FakeClaudeQuery[] = [];
1693+
const layer = Layer.effect(
1694+
ClaudeAdapter,
1695+
Effect.gen(function* () {
1696+
const claudeConfig = decodeClaudeSettings({});
1697+
return yield* makeClaudeAdapter(claudeConfig, {
1698+
createQuery: () => {
1699+
const query = new FakeClaudeQuery();
1700+
queries.push(query);
1701+
return query;
1702+
},
1703+
});
1704+
}),
1705+
).pipe(
1706+
Layer.provideMerge(ServerConfig.layerTest("/tmp/claude-adapter-test", "/tmp")),
1707+
Layer.provideMerge(ServerSettingsService.layerTest()),
1708+
Layer.provideMerge(NodeServices.layer),
1709+
);
1710+
1711+
return Effect.gen(function* () {
1712+
const adapter = yield* ClaudeAdapter;
1713+
yield* adapter.startSession({
1714+
threadId: THREAD_ID,
1715+
provider: ProviderDriverKind.make("claudeAgent"),
1716+
runtimeMode: "full-access",
1717+
});
1718+
yield* adapter.startSession({
1719+
threadId: RESUME_THREAD_ID,
1720+
provider: ProviderDriverKind.make("claudeAgent"),
1721+
runtimeMode: "full-access",
1722+
});
1723+
const firstQuery = queries[0];
1724+
if (!firstQuery) {
1725+
return;
1726+
}
1727+
firstQuery.closeError = new Error("close failed");
1728+
1729+
const result = yield* adapter.stopAll().pipe(Effect.result);
1730+
1731+
assert.equal(result._tag, "Failure");
1732+
assert.equal(queries[0]?.closeCalls, 1);
1733+
assert.equal(queries[1]?.closeCalls, 1);
1734+
assert.equal(yield* adapter.hasSession(THREAD_ID), true);
1735+
assert.equal(yield* adapter.hasSession(RESUME_THREAD_ID), false);
1736+
}).pipe(
1737+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
1738+
Effect.provide(layer),
1739+
);
1740+
});
1741+
16911742
it.effect("keeps a resumed replacement session during slow stop cleanup", () => {
16921743
const queries: FakeClaudeQuery[] = [];
16931744
let signalUsageStarted: () => void = () => undefined;

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4493,25 +4493,26 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
44934493
return context !== undefined && !context.stopped;
44944494
});
44954495

4496-
const stopAll: ClaudeAdapterShape["stopAll"] = () =>
4497-
Effect.forEach(
4498-
sessions,
4499-
([, context]) =>
4500-
stopSessionInternal(context, {
4501-
emitExitEvent: true,
4502-
}),
4503-
{ discard: true },
4496+
const stopSessions = Effect.fn("stopSessions")(function* (
4497+
contexts: ReadonlyArray<ClaudeSessionContext>,
4498+
emitExitEvent: boolean,
4499+
) {
4500+
const results = yield* Effect.forEach(contexts, (context) =>
4501+
stopSessionInternal(context, { emitExitEvent }).pipe(Effect.result),
45044502
);
45054503

4504+
for (const result of results) {
4505+
if (result._tag === "Failure") {
4506+
return yield* Effect.fail(result.failure);
4507+
}
4508+
}
4509+
});
4510+
4511+
const stopAll: ClaudeAdapterShape["stopAll"] = () =>
4512+
stopSessions(Array.from(sessions.values()), true);
4513+
45064514
yield* Effect.addFinalizer(() =>
4507-
Effect.forEach(
4508-
sessions,
4509-
([, context]) =>
4510-
stopSessionInternal(context, {
4511-
emitExitEvent: false,
4512-
}),
4513-
{ discard: true },
4514-
).pipe(
4515+
stopSessions(Array.from(sessions.values()), false).pipe(
45154516
Effect.catch((cause) =>
45164517
Effect.logError("Failed to emit Claude session shutdown event.", { cause }),
45174518
),

0 commit comments

Comments
 (0)