Skip to content

Commit 4cd367c

Browse files
fix(claude): keep reading events when session close fails
1 parent bcb01cb commit 4cd367c

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
@@ -4128,6 +4128,67 @@ describe("ClaudeAdapterLive", () => {
41284128
);
41294129
});
41304130

4131+
it.effect("keeps reading events when closing a signed-out session fails", () => {
4132+
const harness = makeHarness();
4133+
return Effect.gen(function* () {
4134+
const adapter = yield* ClaudeAdapter;
4135+
const closeFailure = yield* Deferred.make<void>();
4136+
const runtimeEventsFiber = yield* adapter.streamEvents.pipe(
4137+
Stream.tap((event) =>
4138+
event.type === "runtime.error" &&
4139+
event.payload.message === "Failed to close Claude runtime query."
4140+
? Deferred.succeed(closeFailure, undefined).pipe(Effect.ignore)
4141+
: Effect.void,
4142+
),
4143+
Stream.takeUntil((event) => event.type === "session.exited"),
4144+
Stream.runCollect,
4145+
Effect.forkChild,
4146+
);
4147+
yield* adapter.startSession({
4148+
threadId: THREAD_ID,
4149+
provider: ProviderDriverKind.make("claudeAgent"),
4150+
runtimeMode: "full-access",
4151+
});
4152+
harness.query.closeError = new Error("close failed");
4153+
yield* adapter.sendTurn({ threadId: THREAD_ID, input: "hello", attachments: [] });
4154+
harness.query.emit(AUTH_FAILURE_ASSISTANT);
4155+
harness.query.emit({
4156+
type: "result",
4157+
subtype: "success",
4158+
is_error: true,
4159+
errors: [],
4160+
session_id: "sdk-session-auth",
4161+
uuid: "result-auth-close-failed",
4162+
} as unknown as SDKMessage);
4163+
yield* Deferred.await(closeFailure);
4164+
assert.equal(yield* adapter.hasSession(THREAD_ID), true);
4165+
assert.equal(harness.query.closeCalls, 1);
4166+
4167+
harness.query.closeError = undefined;
4168+
yield* adapter.sendTurn({ threadId: THREAD_ID, input: "retry", attachments: [] });
4169+
harness.query.emit({
4170+
...AUTH_FAILURE_ASSISTANT,
4171+
uuid: "00000000-0000-0000-0000-000000000002",
4172+
});
4173+
harness.query.emit({
4174+
type: "result",
4175+
subtype: "success",
4176+
is_error: true,
4177+
errors: [],
4178+
session_id: "sdk-session-auth",
4179+
uuid: "result-auth-retry",
4180+
} as unknown as SDKMessage);
4181+
const events = Array.from(yield* Fiber.join(runtimeEventsFiber));
4182+
assert.equal(events.filter((event) => event.type === "turn.completed").length, 2);
4183+
assert.equal(events.filter((event) => event.type === "session.exited").length, 1);
4184+
assert.equal(harness.query.closeCalls, 2);
4185+
assert.equal(yield* adapter.hasSession(THREAD_ID), false);
4186+
}).pipe(
4187+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
4188+
Effect.provide(harness.layer),
4189+
);
4190+
});
4191+
41314192
it.effect("keeps the session after a failure that is not an authentication failure", () => {
41324193
const harness = makeHarness();
41334194
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
@@ -3504,10 +3504,16 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
35043504
// in again. Stopping it lets the next turn resume from the persisted
35053505
// cursor on a fresh CLI that picks up the current credentials.
35063506
if (status === "failed" && turn?.authenticationFailureMessage !== undefined) {
3507-
yield* Effect.logInfo("claude.session.stopped.authentication-failed", {
3508-
threadId: context.session.threadId,
3509-
});
3510-
yield* stopSessionInternal(context, { emitExitEvent: true });
3507+
yield* stopSessionInternal(context, { emitExitEvent: true }).pipe(
3508+
Effect.tap(() =>
3509+
Effect.logInfo("claude.session.stopped.authentication-failed", {
3510+
threadId: context.session.threadId,
3511+
}),
3512+
),
3513+
// A failed close leaves the session registered for another stop attempt,
3514+
// so its stream must keep running to process subsequent turns.
3515+
Effect.catch((error) => emitRuntimeError(context, error.detail)),
3516+
);
35113517
}
35123518
});
35133519

0 commit comments

Comments
 (0)