Skip to content

Commit 46e3745

Browse files
committed
fix(kiro): report context pressure for compaction
1 parent 357acee commit 46e3745

5 files changed

Lines changed: 65 additions & 6 deletions

File tree

‎src/adapters/kiro.ts‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,9 @@ function mergeKiroUsage(first: OcxUsage | undefined, second: OcxUsage | undefine
491491
return {
492492
inputTokens: first.inputTokens + second.inputTokens,
493493
outputTokens: first.outputTokens + second.outputTokens,
494+
...(typeof first.contextInputTokens === "number" || typeof second.contextInputTokens === "number"
495+
? { contextInputTokens: Math.max(first.contextInputTokens ?? 0, second.contextInputTokens ?? 0) }
496+
: {}),
494497
...(totalTokens !== undefined ? { totalTokens } : {}),
495498
...(sumOptional("cachedInputTokens") !== undefined ? { cachedInputTokens: sumOptional("cachedInputTokens") } : {}),
496499
...(sumOptional("cacheReadInputTokens") !== undefined ? { cacheReadInputTokens: sumOptional("cacheReadInputTokens") } : {}),
@@ -534,6 +537,7 @@ async function* parseKiroAttempt(
534537
nameMap: Map<string, string> | undefined,
535538
conversationId: string | undefined,
536539
previousAssistantText?: string,
540+
contextInputTokens?: number,
537541
): AsyncGenerator<AdapterEvent, KiroAttemptResult> {
538542
const emptyResult = (): KiroAttemptResult => ({ assistantText: "", sawReasoning: false });
539543
if (!response.body) {
@@ -560,11 +564,20 @@ async function* parseKiroAttempt(
560564
const providerState = (): { kiro: { conversationId: string } } | undefined =>
561565
returnedConversationId ? { kiro: { conversationId: returnedConversationId } } : undefined;
562566

563-
const usage = (): OcxUsage => authoritativeUsage ?? ({
567+
const contextUsageInputFloor = (): number | undefined => {
568+
if (contextUsagePercentage === undefined || !contextWindow) return undefined;
569+
const floor = Math.ceil(contextWindow * Math.min(contextUsagePercentage, 100) / 100);
570+
return Number.isFinite(floor) && floor > 0 ? floor : undefined;
571+
};
572+
const usage = (): OcxUsage => {
573+
const contextFloor = Math.max(contextInputTokens ?? 0, contextUsageInputFloor() ?? 0);
574+
const base = authoritativeUsage ?? {
564575
inputTokens,
565576
outputTokens: estimateTokens(outputChars, modelId),
566577
estimated: true,
567-
});
578+
};
579+
return contextFloor > 0 ? { ...base, contextInputTokens: contextFloor } : base;
580+
};
568581

569582
const classifiedTerminal = (failure: KiroErrorClassification): AdapterEvent => ({
570583
type: "error",
@@ -970,6 +983,7 @@ export async function* parseKiroStream(
970983
conversationId?: string,
971984
completionMode: KiroCompletionMode = "disabled",
972985
fallbackFactory?: KiroFallbackFactory,
986+
contextInputTokens?: number,
973987
): AsyncGenerator<AdapterEvent> {
974988
const first = parseKiroAttempt(
975989
response,
@@ -979,6 +993,8 @@ export async function* parseKiroStream(
979993
contextWindow,
980994
nameMap,
981995
conversationId,
996+
undefined,
997+
contextInputTokens,
982998
);
983999
let firstNext = await first.next();
9841000
while (!firstNext.done) {
@@ -1043,6 +1059,7 @@ export async function* parseKiroStream(
10431059
fallback.nameMap,
10441060
fallback.conversationId,
10451061
firstResult.assistantText,
1062+
contextInputTokens,
10461063
);
10471064
let secondNext = await second.next();
10481065
while (!secondNext.done) {
@@ -1080,6 +1097,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
10801097
// Per-request closure (resolveAdapter builds a fresh adapter per request — server.ts:440 — so this
10811098
// is race-free) carrying the heuristic input-token estimate from buildRequest into the stream.
10821099
let inputTokens = 0;
1100+
let contextInputTokens = 0;
10831101
let modelId: string | undefined;
10841102
let contextWindow: number | undefined;
10851103
let toolNameMap: Map<string, string> | undefined;
@@ -1097,6 +1115,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
10971115
conversationId: string;
10981116
completionMode: KiroCompletionMode;
10991117
inputTokens: number;
1118+
contextInputTokens: number;
11001119
}> => {
11011120
if (typeof provider.apiKey !== "string" || provider.apiKey.trim() === "") {
11021121
throw new Error("kiro token missing — run ocx login kiro");
@@ -1141,6 +1160,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
11411160
conversationId: built.conversationId,
11421161
completionMode: built.completionMode,
11431162
inputTokens: estimateKiroInputTokens(parsed),
1163+
contextInputTokens: estimateKiroLogInputTokens(parsed),
11441164
};
11451165
};
11461166

@@ -1191,6 +1211,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
11911211
modelId = parsed.modelId;
11921212
contextWindow = configuredKiroContextWindow(provider, parsed.modelId);
11931213
inputTokens = built.inputTokens;
1214+
contextInputTokens = built.contextInputTokens;
11941215
toolNameMap = built.nameMap;
11951216
conversationId = built.conversationId;
11961217
completionMode = built.completionMode;
@@ -1209,6 +1230,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
12091230
conversationId,
12101231
completionMode,
12111232
completionMode === "required" ? fallbackFactory : undefined,
1233+
contextInputTokens,
12121234
);
12131235
},
12141236

@@ -1239,6 +1261,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
12391261
conversationId,
12401262
completionMode,
12411263
completionMode === "required" ? fallbackFactory : undefined,
1264+
contextInputTokens,
12421265
)) events.push(e);
12431266
return events;
12441267
},

‎src/bridge.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ function sseEvent(name: string, data: Record<string, unknown>): string {
1515

1616
function responsesUsage(usage: OcxUsage | undefined): Record<string, unknown> {
1717
if (!usage) return { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
18-
// inputTokens is already inclusive of cache read/write (types.ts convention).
19-
const inputTokens = usage.inputTokens;
18+
// Stateful providers may report per-turn billing usage separately from whole-conversation
19+
// context pressure. Responses clients use input_tokens to trigger compaction, so prefer the
20+
// latter on the wire while persistence/cost accounting keeps using inputTokens.
21+
const inputTokens = Math.max(usage.inputTokens, usage.contextInputTokens ?? 0);
2022
const out: Record<string, unknown> = {
2123
input_tokens: inputTokens,
2224
output_tokens: usage.outputTokens,
23-
total_tokens: usageDisplayTotalTokens(usage) ?? inputTokens + usage.outputTokens,
25+
total_tokens: usage.contextInputTokens !== undefined
26+
? inputTokens + usage.outputTokens
27+
: usageDisplayTotalTokens(usage) ?? inputTokens + usage.outputTokens,
2428
};
2529
const inputDetails: Record<string, number> = {};
2630
if (usage.cachedInputTokens !== undefined) {

‎src/types.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,13 @@ export interface OcxUrlCitation {
306306
export interface OcxUsage {
307307
inputTokens: number;
308308
outputTokens: number;
309+
/**
310+
* Provider-private context pressure for clients that trigger compaction from Responses usage.
311+
* This is intentionally separate from `inputTokens`: stateful providers such as Kiro bill/report
312+
* only the current turn while also exposing the whole conversation's context occupancy.
313+
* Persistence and cost accounting must continue to use `inputTokens`.
314+
*/
315+
contextInputTokens?: number;
309316
totalTokens?: number;
310317
cachedInputTokens?: number;
311318
cacheReadInputTokens?: number;

‎tests/bridge.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,27 @@ describe("Responses bridge reasoning and usage parity", () => {
129129
});
130130
});
131131

132+
test("context input override drives Responses compaction without changing billing usage", async () => {
133+
const frames = await collectSse(bridgeToResponsesSSE(replay([
134+
{
135+
type: "done",
136+
usage: {
137+
inputTokens: 58,
138+
contextInputTokens: 226_000,
139+
outputTokens: 12,
140+
estimated: true,
141+
},
142+
},
143+
]), "kiro/claude-opus-5"));
144+
145+
const completed = frames.find(f => f.event === "response.completed")?.data.response as Record<string, unknown>;
146+
expect(completed.usage).toEqual({
147+
input_tokens: 226_000,
148+
output_tokens: 12,
149+
total_tokens: 226_012,
150+
});
151+
});
152+
132153
test("Anthropic cache read and write tokens pass through Responses usage without re-adding", async () => {
133154
const frames = await collectSse(bridgeToResponsesSSE(replay([
134155
{

‎tests/kiro-stream.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ describe("kiro adapter — parseStream", () => {
777777
);
778778
expect(done).toEqual({
779779
inputTokens: 15,
780+
contextInputTokens: 200,
780781
cachedInputTokens: 3,
781782
cacheReadInputTokens: 3,
782783
cacheCreationInputTokens: 2,
@@ -823,7 +824,7 @@ describe("kiro adapter — parseStream", () => {
823824
expect((events[0] as { message: string }).message).toContain("Compact or reduce the history");
824825
});
825826

826-
test("Kiro contextUsagePercentage remains diagnostic and does not override totals", async () => {
827+
test("Kiro contextUsagePercentage drives context pressure without overriding turn totals", async () => {
827828
const adapter = createKiroAdapter(provider);
828829
await adapter.buildRequest(parsedWith([{ role: "user", content: "x".repeat(700) }]));
829830
const done = await doneUsage(
@@ -836,6 +837,7 @@ describe("kiro adapter — parseStream", () => {
836837
expect(done.outputTokens).toBe(100);
837838
expect(done.totalTokens).toBeUndefined();
838839
expect(done.estimated).toBe(true);
840+
expect(done.contextInputTokens).toBe(50_000);
839841
});
840842

841843
test("Kiro auto ignores provider-level context window and falls back to heuristic totals", async () => {
@@ -875,6 +877,7 @@ describe("kiro adapter — parseStream", () => {
875877
expect(longBody.length).toBeGreaterThan(shortBody.length + 10_000);
876878
expect(longUsage.inputTokens).toBe(shortUsage.inputTokens);
877879
expect(longUsage.inputTokens).toBe(estimateTokens(latest, "claude-sonnet-4.5"));
880+
expect(longUsage.contextInputTokens).toBeGreaterThan(shortUsage.contextInputTokens ?? 0);
878881
});
879882

880883
test("request log usage estimates the full Codex context while SSE usage stays current-turn", async () => {
@@ -891,6 +894,7 @@ describe("kiro adapter — parseStream", () => {
891894
expect(usage.inputTokens).toBe(estimateTokens(latest, "claude-sonnet-4.5"));
892895
expect(request.usageLog?.estimated).toBe(true);
893896
expect(request.usageLog?.inputTokens).toBeGreaterThan(usage.inputTokens + 4000);
897+
expect(usage.contextInputTokens).toBe(request.usageLog?.inputTokens);
894898
});
895899

896900
test("resumed payload preserves the complete locally expanded history", async () => {

0 commit comments

Comments
 (0)