Skip to content

Commit dbe14d8

Browse files
codexMats Varnskühler
andcommitted
fix(server): preserve Claude fallback state
Co-authored-by: Mats Varnskühler <[email protected]>
1 parent 980e884 commit dbe14d8

2 files changed

Lines changed: 123 additions & 24 deletions

File tree

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

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,16 +2100,34 @@ describe("ClaudeAdapterLive", () => {
21002100
);
21012101
});
21022102

2103-
it.effect("keeps the session available when process close fails", () => {
2103+
it.effect("keeps the session and stream available when process close fails", () => {
21042104
const harness = makeHarness();
2105+
let availableDuringClose: boolean | undefined;
2106+
let sendFailedDuringClose: boolean | undefined;
21052107
return Effect.gen(function* () {
21062108
const adapter = yield* ClaudeAdapter;
2109+
const runtimeContext = yield* Effect.context<never>();
2110+
const runSync = Effect.runSyncWith(runtimeContext);
21072111
const session = yield* adapter.startSession({
21082112
threadId: THREAD_ID,
21092113
provider: ProviderDriverKind.make("claudeAgent"),
21102114
runtimeMode: "full-access",
21112115
});
2112-
harness.query.closeError = new Error("close failed");
2116+
(harness.query as { close: () => void }).close = () => {
2117+
harness.query.closeCalls += 1;
2118+
availableDuringClose = runSync(adapter.hasSession(session.threadId));
2119+
sendFailedDuringClose =
2120+
runSync(
2121+
adapter
2122+
.sendTurn({
2123+
threadId: session.threadId,
2124+
input: "reject during close",
2125+
attachments: [],
2126+
})
2127+
.pipe(Effect.result),
2128+
)._tag === "Failure";
2129+
throw new Error("close failed");
2130+
};
21132131

21142132
const result = yield* adapter.interruptTurn(session.threadId).pipe(Effect.result);
21152133

@@ -2118,8 +2136,17 @@ describe("ClaudeAdapterLive", () => {
21182136
assert.equal(result.failure._tag, "ProviderAdapterProcessError");
21192137
}
21202138
assert.equal(harness.query.closeCalls, 1);
2139+
assert.equal(availableDuringClose, true);
2140+
assert.equal(sendFailedDuringClose, true);
21212141
assert.equal(yield* adapter.hasSession(session.threadId), true);
21222142
assert.equal((yield* adapter.listSessions())[0]?.status, "ready");
2143+
2144+
const warningFiber = yield* Stream.filter(
2145+
adapter.streamEvents,
2146+
(event) => event.type === "runtime.warning" && event.payload.message === "still running",
2147+
).pipe(Stream.runHead, Effect.forkChild);
2148+
harness.query.emit(highPriorityNotification("still running", "after-close-failure"));
2149+
assert.equal((yield* Fiber.join(warningFiber))._tag, "Some");
21232150
}).pipe(
21242151
Effect.provideService(Random.Random, makeDeterministicRandomService()),
21252152
Effect.provide(harness.layer),
@@ -4697,6 +4724,61 @@ describe("ClaudeAdapterLive", () => {
46974724
);
46984725
});
46994726

4727+
it.effect("uses result usage when authoritative context usage has no active total", () => {
4728+
const harness = makeHarness();
4729+
harness.query.stubContextUsage({
4730+
totalTokens: 0,
4731+
maxTokens: 200_000,
4732+
isAutoCompactEnabled: true,
4733+
} as SDKControlGetContextUsageResponse);
4734+
4735+
return Effect.gen(function* () {
4736+
const adapter = yield* ClaudeAdapter;
4737+
const runtimeEventsFiber = yield* Stream.takeUntil(
4738+
adapter.streamEvents,
4739+
(event) => event.type === "turn.completed",
4740+
).pipe(Stream.runCollect, Effect.forkChild);
4741+
yield* adapter.startSession({
4742+
threadId: THREAD_ID,
4743+
provider: ProviderDriverKind.make("claudeAgent"),
4744+
runtimeMode: "full-access",
4745+
});
4746+
yield* adapter.sendTurn({
4747+
threadId: THREAD_ID,
4748+
input: "use result fallback",
4749+
attachments: [],
4750+
});
4751+
harness.query.emit({
4752+
type: "result",
4753+
subtype: "success",
4754+
is_error: false,
4755+
duration_ms: 1234,
4756+
duration_api_ms: 1200,
4757+
num_turns: 1,
4758+
result: "done",
4759+
stop_reason: "end_turn",
4760+
session_id: "sdk-session-empty-context-usage",
4761+
usage: {
4762+
input_tokens: 1_000,
4763+
output_tokens: 500,
4764+
},
4765+
} as unknown as SDKMessage);
4766+
4767+
const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
4768+
assert.equal(harness.query.getContextUsageCalls, 1);
4769+
assert.deepEqual(tokenUsageEvents(runtimeEvents).at(-1)?.payload.usage, {
4770+
usedTokens: 1_500,
4771+
lastUsedTokens: 1_500,
4772+
inputTokens: 1_000,
4773+
outputTokens: 500,
4774+
maxTokens: 200_000,
4775+
});
4776+
}).pipe(
4777+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
4778+
Effect.provide(harness.layer),
4779+
);
4780+
});
4781+
47004782
it.effect("clamps oversized Claude usage to the reported context window", () => {
47014783
const harness = makeHarness();
47024784
return Effect.gen(function* () {

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

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ interface ClaudeSessionContext {
322322
lastThreadStartedId: string | undefined;
323323
resumeHandshakePending: boolean;
324324
resumeUsageRefreshNeeded: boolean;
325+
stopInProgress: boolean;
325326
stopped: boolean;
326327
}
327328

@@ -2377,7 +2378,6 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
23772378
context.resumeHandshakePending = false;
23782379
}
23792380
const resultContextWindow = maxClaudeContextWindowFromModelUsage(result?.modelUsage);
2380-
const maxTokens = resultContextWindow ?? context.lastKnownContextWindow;
23812381
const reportedTotalProcessedTokens = claudeTotalProcessedTokens(result?.usage);
23822382
const accumulatedTotalProcessedTokens =
23832383
reportedTotalProcessedTokens !== undefined
@@ -2395,6 +2395,10 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
23952395
accumulatedTotalProcessedTokens ?? context.lastKnownTotalProcessedTokens,
23962396
modelRevision,
23972397
);
2398+
const maxTokens =
2399+
contextUsageObservation?.contextWindow ??
2400+
resultContextWindow ??
2401+
context.lastKnownContextWindow;
23982402
const resultUsageRecord =
23992403
result?.usage && typeof result.usage === "object" && !Array.isArray(result.usage)
24002404
? (result.usage as Record<string, unknown>)
@@ -2449,10 +2453,13 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
24492453
: {}),
24502454
}
24512455
: undefined);
2452-
const usageObservation: ClaudeTokenUsageObservation = contextUsageObservation ?? {
2453-
modelRevision,
2456+
const observationContextWindow = contextUsageObservation?.contextWindow ?? resultContextWindow;
2457+
const usageObservation: ClaudeTokenUsageObservation = {
2458+
modelRevision: contextUsageObservation?.modelRevision ?? modelRevision,
24542459
usage: usageSnapshot,
2455-
...(resultContextWindow !== undefined ? { contextWindow: resultContextWindow } : {}),
2460+
...(observationContextWindow !== undefined
2461+
? { contextWindow: observationContextWindow }
2462+
: {}),
24562463
};
24572464

24582465
const turnState = resumeHandshake ? undefined : context.turnState;
@@ -2464,7 +2471,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
24642471
});
24652472
if (
24662473
resumeHandshake &&
2467-
contextUsageObservation !== undefined &&
2474+
contextUsageObservation?.usage !== undefined &&
24682475
usageAccepted &&
24692476
!context.modelTransitionInFlight &&
24702477
context.modelRevision === usageObservation.modelRevision
@@ -3843,40 +3850,47 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
38433850
readonly terminalOnCloseFailure?: boolean;
38443851
},
38453852
) {
3846-
if (context.stopped) return;
3853+
if (context.stopped || context.stopInProgress) return;
38473854

38483855
// Schedule process termination before any cleanup that can wait on the
38493856
// provider. The SDK closes stdin, then escalates from SIGTERM to SIGKILL.
38503857
const terminalOnCloseFailure = options?.terminalOnCloseFailure === true;
3851-
const closeResult = yield* Effect.uninterruptible(
3858+
const closeError = yield* Effect.uninterruptible(
38523859
Effect.gen(function* () {
3853-
context.stopped = true;
38543860
if (terminalOnCloseFailure) {
3861+
context.stopped = true;
38553862
yield* Deferred.succeed(context.stopSignal, undefined);
3863+
} else {
3864+
context.stopInProgress = true;
38563865
}
3857-
const result = yield* Effect.try({
3858-
try: () => context.query.close(),
3859-
catch: (cause) =>
3860-
new ProviderAdapterProcessError({
3866+
const error = yield* Effect.sync(() => {
3867+
try {
3868+
context.query.close();
3869+
context.stopped = true;
3870+
return undefined;
3871+
} catch (cause) {
3872+
return new ProviderAdapterProcessError({
38613873
provider: PROVIDER,
38623874
threadId: context.session.threadId,
38633875
detail: "Failed to close Claude runtime query.",
38643876
cause,
3865-
}),
3866-
}).pipe(Effect.result);
3867-
if (result._tag === "Success" && !terminalOnCloseFailure) {
3877+
});
3878+
} finally {
3879+
context.stopInProgress = false;
3880+
}
3881+
});
3882+
if (!error && !terminalOnCloseFailure) {
38683883
yield* Deferred.succeed(context.stopSignal, undefined);
38693884
}
3870-
return result;
3885+
return error;
38713886
}),
38723887
);
3873-
if (closeResult._tag === "Failure") {
3888+
if (closeError) {
38743889
if (!terminalOnCloseFailure) {
3875-
context.stopped = false;
3876-
return yield* closeResult.failure;
3890+
return yield* closeError;
38773891
}
38783892
yield* Effect.logError("Failed to close interrupted Claude model control.", {
3879-
cause: closeResult.failure,
3893+
cause: closeError,
38803894
});
38813895
}
38823896

@@ -3980,7 +3994,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
39803994
}),
39813995
);
39823996
}
3983-
if (context.stopped || context.session.status === "closed") {
3997+
if (context.stopInProgress || context.stopped || context.session.status === "closed") {
39843998
return Effect.fail(
39853999
new ProviderAdapterSessionClosedError({
39864000
provider: PROVIDER,
@@ -3995,7 +4009,9 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
39954009
context: ClaudeSessionContext,
39964010
): Effect.Effect<void, ProviderAdapterSessionClosedError> =>
39974011
Effect.suspend(() =>
3998-
context.stopped || sessions.get(context.session.threadId) !== context
4012+
context.stopInProgress ||
4013+
context.stopped ||
4014+
sessions.get(context.session.threadId) !== context
39994015
? Effect.fail(
40004016
new ProviderAdapterSessionClosedError({
40014017
provider: PROVIDER,
@@ -4654,6 +4670,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
46544670
lastThreadStartedId: undefined,
46554671
resumeHandshakePending: existingResumeSessionId !== undefined,
46564672
resumeUsageRefreshNeeded: existingResumeSessionId !== undefined,
4673+
stopInProgress: false,
46574674
stopped: false,
46584675
};
46594676
yield* Ref.set(contextRef, context);

0 commit comments

Comments
 (0)