Resolve PR #82 merge conflicts and restore tool-call parsing (invoke/argument and XML arguments)#84
Merged
CJackHwang merged 1 commit intocodex/linear-mention-cja-10-ds2api-go-runtime-jsfrom Mar 7, 2026
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits. |
8aad100
into
codex/linear-mention-cja-10-ds2api-go-runtime-js
3 checks passed
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.
Motivation
origin/devinto the PR branch produced conflicts in the tool-call parsing tests and introduced regressions that caused compat fixtures to fail.<arguments>,<invoke>with<argument>payloads) and keep the mismatched-markup regression test.Description
internal/util/toolcalls_test.goand retained the mismatched-markup rejection test (TestParseToolCallsDoesNotAcceptMismatchedMarkupTags).invokeArgumentPatternand extendedparseInvokeFunctionCallStyleininternal/util/toolcalls_parse_markup.goto handle<argument>elements both with and withoutnameattributes, including JSON unwrapping for unnamed<argument>bodies.parseSingleXMLToolCallthat usesparseMarkupSingleToolCallto preserve payloads inside<arguments>{...}</arguments>when the XML path yields empty params, restoring expected fixture behavior.Testing
go test ./internal/util ./internal/compat, which initially exposed the regression and then passed after the fixes (final result: passed).go test ./...after fixes, and the full test suite passed (all packages reportedokor[no test files]).Codex Task