-
Notifications
You must be signed in to change notification settings - Fork 2.6k
fix: handle null/undefined token values in ContextCondenseRow to prevent UI crash #6916
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
Merged
Merged
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,6 +11,11 @@ export const ContextCondenseRow = ({ cost, prevContextTokens, newContextTokens, | |||||||||||
| const { t } = useTranslation() | ||||||||||||
| const [isExpanded, setIsExpanded] = useState(false) | ||||||||||||
|
|
||||||||||||
| // Handle null/undefined token values to prevent crashes | ||||||||||||
| const prevTokens = prevContextTokens ?? 0 | ||||||||||||
| const newTokens = newContextTokens ?? 0 | ||||||||||||
| const displayCost = cost ?? 0 | ||||||||||||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While defaulting to 0 prevents the crash, could this be misleading to users? When data is unavailable, showing "0 tokens" might imply no tokens were used, when actually the data is missing. Would it be clearer to display "--" or "N/A" when values are null/undefined?
Suggested change
|
||||||||||||
|
|
||||||||||||
| return ( | ||||||||||||
| <div className="mb-2"> | ||||||||||||
| <div | ||||||||||||
|
|
@@ -33,9 +38,11 @@ export const ContextCondenseRow = ({ cost, prevContextTokens, newContextTokens, | |||||||||||
| <span className="codicon codicon-compress text-blue-400" /> | ||||||||||||
| <span className="font-bold text-vscode-foreground">{t("chat:contextCondense.title")}</span> | ||||||||||||
| <span className="text-vscode-descriptionForeground text-sm"> | ||||||||||||
| {prevContextTokens.toLocaleString()} → {newContextTokens.toLocaleString()} {t("tokens")} | ||||||||||||
| {prevTokens.toLocaleString()} → {newTokens.toLocaleString()} {t("tokens")} | ||||||||||||
| </span> | ||||||||||||
| <VSCodeBadge className={cost > 0 ? "opacity-100" : "opacity-0"}>${cost.toFixed(2)}</VSCodeBadge> | ||||||||||||
| <VSCodeBadge className={displayCost > 0 ? "opacity-100" : "opacity-0"}> | ||||||||||||
| ${displayCost.toFixed(2)} | ||||||||||||
| </VSCodeBadge> | ||||||||||||
| </div> | ||||||||||||
| <span className={`codicon codicon-chevron-${isExpanded ? "up" : "down"}`}></span> | ||||||||||||
| </div> | ||||||||||||
|
|
||||||||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice we're treating these values as optional here, but the Zod schema in
packages/types/src/message.tsdefines them as required fields. This creates a type safety issue.Is this intentional? The schema has:
If these values can indeed be null/undefined in practice, we should update the schema to use
.number().optional()to maintain type consistency across the codebase.