Skip to content

Use last-turn token usage for ACP context updates #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
egor-baranov merged 1 commit into from
Apr 23, 2026
Merged

Use last-turn token usage for ACP context updates #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/CodexCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export class CodexCommands {
const accountText = this.formatAccountInfo(sessionState.account);
const tokenUsageText = this.formatTokenUsage(sessionState.totalTokenUsage);
const contextWindowText = this.formatContextWindow(
sessionState.totalTokenUsage,
sessionState.lastTokenUsage,
sessionState.modelContextWindow
);

Expand Down
2 changes: 1 addition & 1 deletion src/CodexEventHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ export class CodexEventHandler {
private createUsageUpdate(params: ThreadTokenUsageUpdatedNotification): UpdateSessionEvent | null {
this.handleTokenUsageUpdated(params);

const used = this.sessionState.totalTokenUsage?.totalTokens;
const used = this.sessionState.lastTokenUsage?.totalTokens;
const size = this.sessionState.modelContextWindow;
if (used == null || size == null || size <= 0) {
return null;
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/CodexACPAgent/data/token-usage-session-update-multiple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"sessionId": "test-session-id",
"update": {
"sessionUpdate": "usage_update",
"used": 2000,
"used": 1000,
"size": 128000
}
}
Expand All @@ -32,7 +32,7 @@
"sessionId": "test-session-id",
"update": {
"sessionUpdate": "usage_update",
"used": 3500,
"used": 1500,
"size": 128000
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/CodexACPAgent/data/token-usage-session-update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sessionId": "test-session-id",
"update": {
"sessionUpdate": "usage_update",
"used": 5000,
"used": 2500,
"size": 128000
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/CodexACPAgent/token-usage-events.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ describe('Token Usage Events', () => {
};
}

it('should emit usage_update with cumulative context usage', async () => {
it('should emit usage_update with latest turn usage as a context proxy', async () => {
const events = await setupPromptAndReturnEvents([
createTokenUsageNotification(sessionId, {
total: {
Expand All @@ -214,7 +214,7 @@ describe('Token Usage Events', () => {
await expect(`${JSON.stringify(events[0], null, 2)}\n`).toMatchFileSnapshot('data/token-usage-session-update.json');
});

it('should emit latest cumulative usage from multiple updates', async () => {
it('should emit latest turn usage from multiple updates', async () => {
const events = await setupPromptAndReturnEvents([
createTokenUsageNotification(sessionId, {
total: { totalTokens: 1000, inputTokens: 800, cachedInputTokens: 0, outputTokens: 200, reasoningOutputTokens: 0 },
Expand Down
Loading