-
Notifications
You must be signed in to change notification settings - Fork 34
feat(chat): Enforce a hard conversation spend cap #1068
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.
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
Open
sentry-junior
wants to merge
5
commits into
main
Choose a base branch
from
feat/turn-spend-cap
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
85afa61
feat(chat): Enforce a hard conversation spend cap
sentry-junior[bot] 1addbca
fix(chat): Stop over-budget turns with static response
sentry-junior[bot] be50d49
fix(chat): Propagate spend limits from agent events
sentry-junior[bot] 1e2ebff
fix(chat): Persist capped turn usage
dcramer 0b3f74a
fix(chat): Preserve mixed cost totals
dcramer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import type { AgentTurnUsage } from "@/chat/usage"; | ||
|
|
||
| export const TURN_SPEND_LIMIT_RESPONSE = | ||
| "I stopped this conversation because it reached its configured spend limit."; | ||
|
|
||
| /** Terminal failure raised when one agent turn reaches its configured USD cap. */ | ||
| export class TurnSpendLimitExceededError extends Error { | ||
| constructor(readonly maxSpendUsd: number) { | ||
| super(`Agent turn reached spend limit ($${maxSpendUsd.toFixed(6)})`); | ||
| this.name = "TurnSpendLimitExceededError"; | ||
| } | ||
| } | ||
|
|
||
| /** Terminal failure raised when a configured cap cannot verify provider spend. */ | ||
| export class TurnSpendCostUnavailableError extends Error { | ||
| constructor() { | ||
| super("Agent turn provider usage omitted cost data"); | ||
| this.name = "TurnSpendCostUnavailableError"; | ||
| } | ||
| } | ||
|
|
||
| /** Return whether an error should stop the turn with the static spend-limit response. */ | ||
| export function isTurnSpendLimitError( | ||
| error: unknown, | ||
| ): error is TurnSpendLimitExceededError | TurnSpendCostUnavailableError { | ||
| return ( | ||
| error instanceof TurnSpendLimitExceededError || | ||
| error instanceof TurnSpendCostUnavailableError | ||
| ); | ||
| } | ||
|
|
||
| /** Return the provider-reported total USD cost, deriving it from components when needed. */ | ||
| export function agentTurnCostUsd(usage: AgentTurnUsage | undefined): number { | ||
| if (!usage?.cost) return 0; | ||
| if (usage.cost.total !== undefined) return usage.cost.total; | ||
| return ( | ||
| (usage.cost.input ?? 0) + | ||
| (usage.cost.output ?? 0) + | ||
| (usage.cost.cacheRead ?? 0) + | ||
| (usage.cost.cacheWrite ?? 0) | ||
| ); | ||
| } | ||
|
|
||
| /** Throw once reported turn cost reaches the cap or cannot be verified. */ | ||
| export function enforceTurnSpendLimit(args: { | ||
| maxSpendUsd: number | undefined; | ||
| usage: AgentTurnUsage | undefined; | ||
| }): void { | ||
| if (args.maxSpendUsd === undefined || args.usage === undefined) { | ||
| return; | ||
| } | ||
| if (!args.usage.cost || Object.keys(args.usage.cost).length === 0) { | ||
| throw new TurnSpendCostUnavailableError(); | ||
| } | ||
| if (agentTurnCostUsd(args.usage) >= args.maxSpendUsd) { | ||
| throw new TurnSpendLimitExceededError(args.maxSpendUsd); | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.