Skip to content

feat(goal): account the tokens a Goal spends #9301

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

Closed
qqqys wants to merge 12 commits into from
Closed

feat(goal): account the tokens a Goal spends #9301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e68ddc2
feat(goal): account the tokens a Goal spends
qqqys Aug 17, 2026
d78703d
fix(acp-bridge): include Goal tokens in replay fixture
qqqys Aug 17, 2026
2c651e1
fix(goal): clarify and test token accounting
qqqys Aug 17, 2026
d74015c
fix(goal): seed resume token meter before activation
qqqys Aug 17, 2026
5f66cb4
Merge branch 'main' into goal/a2-token-usage
wenshao Aug 17, 2026
f13cdf1
Merge branch 'main' into goal/a2-token-usage
qqqys Aug 18, 2026
12672cd
fix(goal): replay resumed telemetry once per session swap
qqqys Aug 18, 2026
981e6ca
fix(goal): keep the resume replay out of the usage aggregate it can c…
qqqys Aug 18, 2026
205c249
fix(telemetry): keep bySource prototype-free across a replay rollback
qqqys Aug 18, 2026
76ca082
fix(goal): make the meter breadcrumb visible and pin the replay handoff
qqqys Aug 19, 2026
d634859
test(goal): pin the four turn-start and replay readings round 7 re-co…
qqqys Aug 19, 2026
0d5abe8
fix(goal): keep the turn's opening meter reading until the write commits
qqqys Aug 19, 2026
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
1 change: 1 addition & 0 deletions packages/acp-bridge/src/transcript-replay.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const GOAL: GoalRecord = {
status: 'active',
evidenceCursor: { recordId: 'record-0' },
turnCount: 4,
tokensUsed: 0,
activeTimeMs: 2000,
createdAt: 100,
updatedAt: 200,
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/acp-integration/acpAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,7 @@ function goalSnapshot(
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 123,
updatedAt: 123,
...overrides,
Expand Down Expand Up @@ -17363,6 +17364,7 @@ describe('QwenAgent loadSession / unstable_resumeSession', () => {
evidenceCursor: { recordId: 'goal-state' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1,
updatedAt: 1,
},
Expand Down
24 changes: 24 additions & 0 deletions packages/cli/src/acp-integration/session/Session.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16894,6 +16894,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -16936,6 +16937,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -16999,6 +17001,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17106,6 +17109,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17312,6 +17316,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
};
Expand Down Expand Up @@ -17397,6 +17402,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
};
Expand Down Expand Up @@ -17431,6 +17437,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17501,6 +17508,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17557,6 +17565,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17688,6 +17697,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17762,6 +17772,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17821,6 +17832,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17862,6 +17874,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17923,6 +17936,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -17970,6 +17984,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18017,6 +18032,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18088,6 +18104,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18158,6 +18175,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18215,6 +18233,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18330,6 +18349,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -18440,6 +18460,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
};
Expand Down Expand Up @@ -18566,6 +18587,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -22030,6 +22052,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down Expand Up @@ -28645,6 +28668,7 @@ describe('Session', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/acp-integration/session/emitters/MessageEmitter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ describe('MessageEmitter', () => {
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 0,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: 1234,
updatedAt: 1234,
},
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/acp-integration/session/history-replay-page.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const GOAL_STATE: GoalSnapshotV2 = {
evidenceCursor: { recordId: 'goal-state' },
turnCount: 2,
activeTimeMs: 1000,
tokensUsed: 0,
createdAt: 1,
updatedAt: 2,
},
Expand Down Expand Up @@ -645,6 +646,7 @@ describe('history replay page', () => {
evidenceCursor: { recordId: 'goal-state' },
turnCount: 3,
activeTimeMs: 1234,
tokensUsed: 0,
createdAt: 10,
updatedAt: 20,
},
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/acp-integration/session/recovered-goal-update.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const hiddenSnapshot: GoalSnapshotV2 = {
evidenceCursor: { recordId: 'hidden-record' },
turnCount: 1,
activeTimeMs: 10,
tokensUsed: 0,
createdAt: 1,
updatedAt: 2,
},
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/nonInteractive/io/StreamJsonOutputAdapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const goalSnapshot: GoalSnapshotV2 = {
evidenceCursor: { recordId: 'record-1' },
turnCount: 3,
activeTimeMs: 12_000,
tokensUsed: 0,
createdAt: 1,
updatedAt: 2,
lastReason: 'keep going',
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/serve/routes/goals.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const activeGoal = (
evidenceCursor: { recordId: 'cursor-1' },
turnCount: active.iterations,
activeTimeMs: 0,
tokensUsed: 0,
createdAt: active.setAt,
updatedAt: active.setAt,
...(active.lastReason ? { lastReason: active.lastReason } : {}),
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/ui/commands/goalCommand.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ function goalSnapshot(
evidenceCursor: { recordId: 'cursor-1' },
turnCount: 3,
activeTimeMs: 1_000,
tokensUsed: 0,
createdAt: 10,
updatedAt: 20,
...overrides,
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/ui/components/GoalPill.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ function snapshot(
evidenceCursor: { recordId: null },
turnCount: 3,
activeTimeMs: 2_000,
tokensUsed: 0,
createdAt: 1_000,
updatedAt: 7_000,
...overrides,
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ describe('<HistoryItemDisplay />', () => {
evidenceCursor: { recordId: 'record-1' },
turnCount: 2,
activeTimeMs: 4_000,
tokensUsed: 0,
createdAt: 1_000,
updatedAt: 5_000,
lastReason: 'waiting for approval',
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/ui/components/messages/GoalStatusMessage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function snapshot(
evidenceCursor: { recordId: 'record-1' },
turnCount: 4,
activeTimeMs: 12_000,
tokensUsed: 0,
createdAt: 1_000,
updatedAt: 13_000,
...(lastReason ? { lastReason } : {}),
Expand Down
Loading
Loading