Skip to content

Commit f0aeb0f

Browse files
fix(claude): keep reading events when session close fails
1 parent 5a516c2 commit f0aeb0f

2 files changed

Lines changed: 71 additions & 4 deletions

File tree

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3893,6 +3893,67 @@ describe("ClaudeAdapterLive", () => {
38933893
);
38943894
});
38953895

3896+
it.effect("keeps reading events when closing a signed-out session fails", () => {
3897+
const harness = makeHarness();
3898+
return Effect.gen(function* () {
3899+
const adapter = yield* ClaudeAdapter;
3900+
const closeFailure = yield* Deferred.make<void>();
3901+
const runtimeEventsFiber = yield* adapter.streamEvents.pipe(
3902+
Stream.tap((event) =>
3903+
event.type === "runtime.error" &&
3904+
event.payload.message === "Failed to close Claude runtime query."
3905+
? Deferred.succeed(closeFailure, undefined).pipe(Effect.ignore)
3906+
: Effect.void,
3907+
),
3908+
Stream.takeUntil((event) => event.type === "session.exited"),
3909+
Stream.runCollect,
3910+
Effect.forkChild,
3911+
);
3912+
yield* adapter.startSession({
3913+
threadId: THREAD_ID,
3914+
provider: ProviderDriverKind.make("claudeAgent"),
3915+
runtimeMode: "full-access",
3916+
});
3917+
harness.query.closeError = new Error("close failed");
3918+
yield* adapter.sendTurn({ threadId: THREAD_ID, input: "hello", attachments: [] });
3919+
harness.query.emit(AUTH_FAILURE_ASSISTANT);
3920+
harness.query.emit({
3921+
type: "result",
3922+
subtype: "success",
3923+
is_error: true,
3924+
errors: [],
3925+
session_id: "sdk-session-auth",
3926+
uuid: "result-auth-close-failed",
3927+
} as unknown as SDKMessage);
3928+
yield* Deferred.await(closeFailure);
3929+
assert.equal(yield* adapter.hasSession(THREAD_ID), true);
3930+
assert.equal(harness.query.closeCalls, 1);
3931+
3932+
harness.query.closeError = undefined;
3933+
yield* adapter.sendTurn({ threadId: THREAD_ID, input: "retry", attachments: [] });
3934+
harness.query.emit({
3935+
...AUTH_FAILURE_ASSISTANT,
3936+
uuid: "00000000-0000-0000-0000-000000000002",
3937+
});
3938+
harness.query.emit({
3939+
type: "result",
3940+
subtype: "success",
3941+
is_error: true,
3942+
errors: [],
3943+
session_id: "sdk-session-auth",
3944+
uuid: "result-auth-retry",
3945+
} as unknown as SDKMessage);
3946+
const events = Array.from(yield* Fiber.join(runtimeEventsFiber));
3947+
assert.equal(events.filter((event) => event.type === "turn.completed").length, 2);
3948+
assert.equal(events.filter((event) => event.type === "session.exited").length, 1);
3949+
assert.equal(harness.query.closeCalls, 2);
3950+
assert.equal(yield* adapter.hasSession(THREAD_ID), false);
3951+
}).pipe(
3952+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
3953+
Effect.provide(harness.layer),
3954+
);
3955+
});
3956+
38963957
it.effect("keeps the session after a failure that is not an authentication failure", () => {
38973958
const harness = makeHarness();
38983959
return Effect.gen(function* () {

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3412,10 +3412,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
34123412
// in again. Stopping it lets the next turn resume from the persisted
34133413
// cursor on a fresh CLI that picks up the current credentials.
34143414
if (status === "failed" && turn?.authenticationFailureMessage !== undefined) {
3415-
yield* Effect.logInfo("claude.session.stopped.authentication-failed", {
3416-
threadId: context.session.threadId,
3417-
});
3418-
yield* stopSessionInternal(context, { emitExitEvent: true });
3415+
yield* stopSessionInternal(context, { emitExitEvent: true }).pipe(
3416+
Effect.tap(() =>
3417+
Effect.logInfo("claude.session.stopped.authentication-failed", {
3418+
threadId: context.session.threadId,
3419+
}),
3420+
),
3421+
// A failed close leaves the session registered for another stop attempt,
3422+
// so its stream must keep running to process subsequent turns.
3423+
Effect.catch((error) => emitRuntimeError(context, error.detail)),
3424+
);
34193425
}
34203426
});
34213427

0 commit comments

Comments
 (0)