fix: escape * and ? in glob-to-regex and add runtime type check for candidatesTokenCount#1851
Open
fix2015 wants to merge 1 commit into
Open
fix: escape * and ? in glob-to-regex and add runtime type check for candidatesTokenCount#1851fix2015 wants to merge 1 commit into
fix2015 wants to merge 1 commit into
Conversation
…andidatesTokenCount
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
Two independent bugs:
1.
globPatternToRegexmissing*and?in regex escape character classIn the backslash-escape branch of
globPatternToRegex, the regex metacharacter set[{}()+.\\[\]^$|]does not include*and?. When a glob pattern contains\*or\?(backslash-escaped literals), the resulting regex leaves*or?unescaped, turning them into quantifiers instead of literal matches.Affected files:
packages/kaos/src/internal.ts(line 223)packages/agent-core-v2/src/_base/execEnv/globPattern.ts(line 46)2. Unsafe type assertion for
candidatesTokenCount(usageMetadata['candidatesTokenCount'] as number) ?? 0— theas numbercast silences TypeScript but does not protect at runtime. If the field isundefined, the cast producesundefined(notnumber), and??correctly falls back to0only by accident of JS semantics. If the field is a non-number truthy value, it passes through unchecked. The adjacentpromptTokenCountandcachedContentTokenCountfields already use a propertypeofguard; this field should match.Affected files:
packages/kosong/src/providers/google-genai.ts(line 635)packages/agent-core-v2/src/app/llmProtocol/providers/google-genai.ts(line 546)Fix
*?to the regex character class:[{}()+.\\[\]^$|*?](usageMetadata['candidatesTokenCount'] as number) ?? 0withtypeof usageMetadata['candidatesTokenCount'] === 'number' ? usageMetadata['candidatesTokenCount'] : 0