[pull] main from danny-avila:main - #215
Merged
Merged
Conversation
* feat: account for retained tool-message context usage
* docs: remove context accounting README addition
* fix: degrade tool-share accounting and count standard tool_call blocks
The retained tool share is a gauge measured on the live pre-invoke path, so
an unsafe count from a host token counter no longer throws into the model
call it only measures. `syncBudgetDerivedFields` drops the share, warns once
through the agent log, and leaves every other derived field reconciled.
Recognize v1 standard-content `tool_call` blocks alongside `tool_use`, in
both the top-level (`{ id, name }`, serialized to a Converse toolUse) and
nested (`{ tool_call: { id, name } }`) shapes. A retained invocation carrying
only such a block was treated as conversation content, undercounting
`toolMessageTokens` and losing the id-to-name association for its result.
* fix: keep the tool-share warning latch and count generic assistant calls
`projectContextUsage` calls the reconciler without a config, so a failure on
the pre-send projection path spent the process-wide latch while `emitAgentLog`
returned immediately, leaving every later live model call to drop the share in
silence. The latch is now spent only when a config can carry the event.
A `ChatMessage` with `role: 'assistant'` reports its type as `generic`, a shape
the OpenAI role converter and the default token counter both accept. The scan
skipped it and cleared the pending legacy name, so a tool-only invocation went
uncounted and its `FunctionMessage` result fell through to `unknown_tool`.
---------
Co-authored-by: Danny Avila <danny@librechat.ai>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )