Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 52 additions & 5 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import {
addClaudeLedgerUsage,
claudeLedgerDelta,
claudeModelLedger,
claudeResumedLedgerDelta,
mergeOmittedLedgerModels,
claudeReportedContextWindows,
normalizeClaudeTurnTokenUsage,
type ClaudeLedgerUsage,
Expand Down Expand Up @@ -5113,6 +5115,7 @@ interface ClaudeLiveQueryContext {
handedOffSubagents: ReadonlySet<ActiveClaudeSubagent>;
// The SDK's per-process model ledger at the last result; a new process starts at zero.
modelLedger: ClaudeModelLedger | undefined;
resumedLedgerPending: boolean;
// Per process, not per session: a relative temp dir follows the cwd this CLI
// was launched in, and a later turn's cwd can differ.
readonly taskOutputRoot: string | undefined;
Expand Down Expand Up @@ -5852,6 +5855,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
const queryContext = yield* Ref.make<ClaudeLiveQueryContext | null>(null);
// Wake buffers replay result frames, so ledger growth is measured once on arrival.
const resultLedgerUsage = new WeakMap<SDKMessage, ClaudeLedgerUsage>();
const lastModelLedgers = new Map<string, ClaudeModelLedger | null>();
const resultsReportingNewContextWindow = new WeakSet<SDKMessage>();
// A worktree handoff changes the project settings even within one session.
let bypassCache: { cwd: string | null; availability: ClaudeBypassAvailability } | null =
Expand Down Expand Up @@ -6226,9 +6230,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
const budget = pdfBudgets.get(nativeThreadId);
const hasAppliedTitle = appliedSessionTitles.has(nativeThreadId);
const recordedTitle = providerThread.nativeMetadata?.title;
if (budget === undefined && !hasAppliedTitle && recordedTitle === undefined) {
const hasModelLedger = lastModelLedgers.has(nativeThreadId);
if (
budget === undefined &&
!hasAppliedTitle &&
recordedTitle === undefined &&
!hasModelLedger
) {
return providerThread;
}
const modelLedger = lastModelLedgers.get(nativeThreadId);
return {
...providerThread,
nativeMetadata: {
Expand All @@ -6247,6 +6258,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
: recordedTitle === undefined
? {}
: { title: null }),
...(hasModelLedger
? {
claudeModelLedger:
modelLedger === null || modelLedger === undefined
? null
: Object.fromEntries(modelLedger),
}
: {}),
},
};
};
Expand Down Expand Up @@ -12874,6 +12893,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
),
),
modelLedger: new Map(),
resumedLedgerPending: shouldResume,
taskOutputRoot: claudeTaskOutputRoot(
adapterOptions.environment,
path,
Expand Down Expand Up @@ -12926,13 +12946,31 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
}
if (message.type === "result") {
const ledger = claudeModelLedger(message.modelUsage);
const growth = claudeLedgerDelta(context.modelLedger, ledger);
const resumedFirstResult = context.resumedLedgerPending;
context.resumedLedgerPending = false;
const growth = resumedFirstResult
? claudeResumedLedgerDelta(
lastModelLedgers.get(context.nativeThreadId) ?? undefined,
ledger,
message.usage,
)
: claudeLedgerDelta(context.modelLedger, ledger);
if (growth !== undefined) resultLedgerUsage.set(message, growth);
// A ledger that went backwards cannot anchor the next turn's growth.
context.modelLedger =
growth === undefined && context.modelLedger !== undefined
const resumedBaseline = resumedFirstResult
? mergeOmittedLedgerModels(
lastModelLedgers.get(context.nativeThreadId) ?? undefined,
ledger,
)
: undefined;
context.modelLedger = resumedFirstResult
? resumedBaseline
: growth === undefined && context.modelLedger !== undefined
? undefined
: ledger;
lastModelLedgers.set(
context.nativeThreadId,
resumedFirstResult ? (resumedBaseline ?? null) : (ledger ?? null),
);
for (const [model, window] of claudeReportedContextWindows(
message.modelUsage,
)) {
Expand Down Expand Up @@ -13058,6 +13096,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
const used = turnInput.providerThread.nativeMetadata?.claudeAttachmentBudget;
pdfBudgets.set(nativeThreadId, makeClaudeAttachmentBudget(used));
}
if (!lastModelLedgers.has(nativeThreadId)) {
const recordedLedger = turnInput.providerThread.nativeMetadata?.claudeModelLedger;
if (recordedLedger !== undefined) {
lastModelLedgers.set(
nativeThreadId,
recordedLedger === null ? null : new Map(Object.entries(recordedLedger)),
);
}
}
if (!appliedSessionTitles.has(nativeThreadId)) {
const recordedTitle = turnInput.providerThread.nativeMetadata?.title;
if (recordedTitle !== undefined && recordedTitle !== null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{"type":"transcript_start","provider":"claudeAgent","protocol":"claude-agent-sdk.query","version":"0.2.111","scenario":"claude_idle_resume_restored_ledger","metadata":{"prompts":["Respond with exactly: idle resume first turn complete","Respond with exactly: idle resume second turn complete"],"model":"claude-sonnet-4-6","nativeSessionId":"1d1e5e55-1041-4e40-8e40-000000000001","queryMode":"restart","tools":"claude_code","permissionMode":"bypassPermissions","generatedBy":"manual-replay-from-thread-d0fe9018 runs 6-8 (idle-released session must reopen with resume, 2026-07-02T20:46:05Z)"}}
{"type":"expect_outbound","label":"query.open:1","frame":{"type":"query.open","options":{"model":"claude-sonnet-4-6","tools":{"type":"preset","preset":"claude_code"},"permissionMode":"bypassPermissions","allowDangerouslySkipPermissions":true,"sessionId":"1d1e5e55-1041-4e40-8e40-000000000001","settings":{"showThinkingSummaries":true}}}}
{"type":"expect_outbound","label":"prompt.offer:1","frame":{"type":"prompt.offer","message":{"type":"user","message":{"role":"user","content":"Respond with exactly: idle resume first turn complete"},"parent_tool_use_id":null}}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"hook_started","hook_id":"96353a54-8984-4e77-8060-b1dc6b030cf6","hook_name":"SessionStart:startup","hook_event":"SessionStart","uuid":"ffbfcc28-dd82-4c2a-a99f-58e5af6e393e","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"hook_response","hook_id":"96353a54-8984-4e77-8060-b1dc6b030cf6","hook_name":"SessionStart:startup","hook_event":"SessionStart","output":"","stdout":"","stderr":"","exit_code":0,"outcome":"success","uuid":"bbf29fb9-d4b3-4ab2-b0e3-9d2aa833099c","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"init","agents":[],"apiKeySource":"none","claude_code_version":"2.1.111","cwd":"/tmp/claude-replay-claude_idle_resume","tools":[],"mcp_servers":[],"model":"claude-sonnet-4-6","permissionMode":"bypassPermissions","slash_commands":[],"output_style":"default","skills":[],"plugins":[],"fast_mode_state":"off","uuid":"f468f37d-e0e6-43cf-bcd7-71e34045083e","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"assistant","frame":{"type":"assistant","message":{"model":"claude-sonnet-4-6","id":"msg_01DKpWHtEMhugcX5nJwxKfeM","type":"message","role":"assistant","content":[{"type":"text","text":"idle resume first turn complete"}],"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":3,"cache_creation_input_tokens":0,"cache_read_input_tokens":11792,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"output_tokens":1,"service_tier":"standard","inference_geo":"not_available"},"context_management":null},"parent_tool_use_id":null,"session_id":"1d1e5e55-1041-4e40-8e40-000000000001","uuid":"7e96c9db-0543-4276-b97d-ced7f53b93c4"}}
{"type":"emit_inbound","label":"rate_limit_event","frame":{"type":"rate_limit_event","rate_limit_info":{"status":"allowed"},"uuid":"28620e49-aa10-42fa-a7f9-768c9c79c093","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"result","frame":{"type":"result","subtype":"success","is_error":false,"api_error_status":null,"duration_ms":2809,"duration_api_ms":2523,"num_turns":1,"result":"idle resume first turn complete","stop_reason":"end_turn","session_id":"1d1e5e55-1041-4e40-8e40-000000000001","total_cost_usd":0.0036516,"usage":{"input_tokens":3,"cache_creation_input_tokens":0,"cache_read_input_tokens":11792,"output_tokens":7,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[{"input_tokens":3,"output_tokens":7,"cache_read_input_tokens":11792,"cache_creation_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-sonnet-4-6":{"inputTokens":3,"outputTokens":7,"cacheReadInputTokens":11792,"cacheCreationInputTokens":0,"webSearchRequests":0,"costUSD":0.0036516,"contextWindow":200000,"maxOutputTokens":32000}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","uuid":"d88c31ae-a8fd-4ed4-a168-96cfd3b0edd7"}}
{"type":"runtime_exit","status":"success"}
{"type":"expect_outbound","label":"query.open:2","frame":{"type":"query.open","options":{"model":"claude-sonnet-4-6","tools":{"type":"preset","preset":"claude_code"},"permissionMode":"bypassPermissions","allowDangerouslySkipPermissions":true,"resume":"1d1e5e55-1041-4e40-8e40-000000000001","settings":{"showThinkingSummaries":true}}}}
{"type":"expect_outbound","label":"prompt.offer:2","frame":{"type":"prompt.offer","message":{"type":"user","message":{"role":"user","content":"Respond with exactly: idle resume second turn complete"},"parent_tool_use_id":null}}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"hook_started","hook_id":"4db1e61e-de28-49ee-b7ef-c375670d0aae","hook_name":"SessionStart:resume","hook_event":"SessionStart","uuid":"66e900fe-b02e-41a0-ac08-92260125b13d","session_id":"377e06a0-fe46-420e-bfaa-b4b9fcc8b871"}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"hook_response","hook_id":"4db1e61e-de28-49ee-b7ef-c375670d0aae","hook_name":"SessionStart:resume","hook_event":"SessionStart","output":"","stdout":"","stderr":"","exit_code":0,"outcome":"success","uuid":"03f2754d-daee-4128-b180-c1a39faa03f0","session_id":"377e06a0-fe46-420e-bfaa-b4b9fcc8b871"}}
{"type":"emit_inbound","label":"system","frame":{"type":"system","subtype":"init","agents":[],"apiKeySource":"none","claude_code_version":"2.1.111","cwd":"/tmp/claude-replay-claude_idle_resume","tools":[],"mcp_servers":[],"model":"claude-sonnet-4-6","permissionMode":"bypassPermissions","slash_commands":[],"output_style":"default","skills":[],"plugins":[],"fast_mode_state":"off","uuid":"5e1d64c9-a2ca-4ad1-ba2c-546ba18d1785","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"assistant","frame":{"type":"assistant","message":{"model":"claude-sonnet-4-6","id":"msg_01CiTVsN2HCfqr6Ge166z8hv","type":"message","role":"assistant","content":[{"type":"text","text":"idle resume second turn complete"}],"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":3,"cache_creation_input_tokens":0,"cache_read_input_tokens":11811,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"output_tokens":7,"service_tier":"standard","inference_geo":"not_available"},"context_management":null},"parent_tool_use_id":null,"session_id":"1d1e5e55-1041-4e40-8e40-000000000001","uuid":"e821cdff-a217-4fb3-b1d0-f89387dbac41"}}
{"type":"emit_inbound","label":"rate_limit_event","frame":{"type":"rate_limit_event","rate_limit_info":{"status":"allowed"},"uuid":"21e2dfd3-a7f5-48d1-a343-ddb1be3198c8","session_id":"1d1e5e55-1041-4e40-8e40-000000000001"}}
{"type":"emit_inbound","label":"result","frame":{"type":"result","subtype":"success","is_error":false,"api_error_status":null,"duration_ms":2103,"duration_api_ms":1644,"num_turns":1,"result":"idle resume second turn complete","stop_reason":"end_turn","session_id":"1d1e5e55-1041-4e40-8e40-000000000001","total_cost_usd":0.0073089,"usage":{"input_tokens":3,"cache_creation_input_tokens":0,"cache_read_input_tokens":11811,"output_tokens":7,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[{"input_tokens":3,"output_tokens":7,"cache_read_input_tokens":11811,"cache_creation_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-sonnet-4-6":{"inputTokens":6,"outputTokens":14,"cacheReadInputTokens":23603,"cacheCreationInputTokens":0,"webSearchRequests":0,"costUSD":0.0073089,"contextWindow":200000,"maxOutputTokens":32000}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","uuid":"a876579c-a18c-4237-ba4e-6105b2162bbb"}}
{"type":"runtime_exit","status":"success"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { assert } from "@effect/vitest";
import type { ProviderReplayTranscript } from "@t3tools/contracts";

import type { OrchestratorV2ScenarioResult } from "../../OrchestratorScenario.ts";
import {
assertBaseProjection,
assertSemanticProjectionIntegrity,
assertUserMessagesInclude,
projectionFor,
} from "../shared.ts";
import {
CLAUDE_IDLE_RESUME_PROMPT_1,
CLAUDE_IDLE_RESUME_PROMPT_2,
} from "../claude_idle_resume/input.ts";

export function assertClaudeIdleResumeRestoredLedgerOutput(
result: OrchestratorV2ScenarioResult,
transcript: ProviderReplayTranscript,
) {
assertBaseProjection({
result,
transcript,
runCount: 2,
runStatuses: ["completed", "completed"],
});

const projection = projectionFor(result, transcript.scenario);
assertSemanticProjectionIntegrity(projection);
assertUserMessagesInclude(projection, [CLAUDE_IDLE_RESUME_PROMPT_1, CLAUDE_IDLE_RESUME_PROMPT_2]);

const [first, second] = projection.providerTurns.map((turn) => turn.turnTokenUsage);
assert.deepInclude(first, {
usageStatus: "complete",
inputTokens: 11_795,
outputTokens: 7,
otherUsage: { inputTokens: 0, outputTokens: 0 },
});
assert.deepInclude(second, { usageStatus: "complete", inputTokens: 11_814, outputTokens: 7 });
assert.notProperty(second, "otherUsage");
}
16 changes: 16 additions & 0 deletions apps/server/src/orchestration-v2/testkit/fixtures/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { claudeCompactAfterResumeWakeInput } from "./claude_compact_after_resume
import { assertClaudeCompactAfterResumeWakeOutput } from "./claude_compact_after_resume_wake/output.ts";
import { claudeIdleResumeInput } from "./claude_idle_resume/input.ts";
import { assertClaudeIdleResumeOutput } from "./claude_idle_resume/output.ts";
import { assertClaudeIdleResumeRestoredLedgerOutput } from "./claude_idle_resume_restored_ledger/output.ts";
import { claudeLocalBashTaskInput } from "./claude_local_bash_task/input.ts";
import { assertClaudeLocalBashTaskOutput } from "./claude_local_bash_task/output.ts";
import { claudeNestedBackgroundSubagentWakeInput } from "./claude_nested_background_subagent_wake/input.ts";
Expand Down Expand Up @@ -510,6 +511,21 @@ export const ORCHESTRATOR_REPLAY_FIXTURES: ReadonlyArray<OrchestratorReplayFixtu
},
],
},
{
name: "claude_idle_resume_restored_ledger",
buildInput: claudeIdleResumeInput,
providers: [
{
driver: ProviderDriverKind.make("claudeAgent"),
transcriptFile: new URL(
"./claude_idle_resume_restored_ledger/claude_transcript.ndjson",
import.meta.url,
),
modelSelection: CLAUDE_MODEL_SELECTION,
assertOutput: assertClaudeIdleResumeRestoredLedgerOutput,
},
],
},
{
name: "claude_result_is_error",
buildInput: claudeResultIsErrorInput,
Expand Down
42 changes: 42 additions & 0 deletions apps/server/src/provider/ClaudeTurnTokenUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,48 @@ export function claudeLedgerDelta(
return { inputTokens, outputTokens };
}

/**
* A resumed process's first result can omit a model the saved ledger still has.
* Keep that model's last total, so its return later is growth rather than a recount from zero.
*/
export function mergeOmittedLedgerModels(
previous: ClaudeModelLedger | undefined,
current: ClaudeModelLedger | undefined,
): ClaudeModelLedger | undefined {
if (current === undefined) return previous;
if (previous === undefined) return current;
const merged = new Map(current);
for (const [model, before] of previous) {
if (!merged.has(model)) merged.set(model, before);
}
return merged;
}

export function claudeResumedLedgerDelta(
previousProcess: ClaudeModelLedger | undefined,
current: ClaudeModelLedger | undefined,
resultUsage: unknown,
): ClaudeLedgerUsage | undefined {
const fromZero = claudeLedgerDelta(new Map(), current);
if (previousProcess === undefined || fromZero === undefined) return undefined;
const usage = (resultUsage ?? {}) as Record<string, unknown>;
const resultInput = BILLED_USAGE_FIELDS.filter((field) => field !== "output_tokens").reduce(
(sum, field) => sum + (finiteNonNegativeInteger(usage[field]) ?? 0),
0,
);
const resultOutput = finiteNonNegativeInteger(usage.output_tokens) ?? 0;
if (fromZero.inputTokens > resultInput || fromZero.outputTokens > resultOutput) return undefined;
const sincePreviousProcess = claudeLedgerDelta(previousProcess, current);
if (
sincePreviousProcess !== undefined &&
sincePreviousProcess.inputTokens >= resultInput &&
sincePreviousProcess.outputTokens >= resultOutput
) {
return undefined;
}
return fromZero;
}

export function addClaudeLedgerUsage(
left: ClaudeLedgerUsage | undefined,
right: ClaudeLedgerUsage | undefined,
Expand Down
Loading
Loading