Skip to content

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
codex/fix-code-conflicts-in-pr-#82
Mar 7, 2026
Merged

Resolve PR #82 merge conflicts and restore tool-call parsing (invoke/argument and XML arguments)#84
CJackHwang merged 1 commit intocodex/linear-mention-cja-10-ds2api-go-runtime-jsfrom
codex/fix-code-conflicts-in-pr-#82

Conversation

@CJackHwang
Copy link
Owner

Motivation

  • Merge origin/dev into the PR branch produced conflicts in the tool-call parsing tests and introduced regressions that caused compat fixtures to fail.
  • Ensure Go-side parsing behavior matches expected compat fixtures (XML <arguments>, <invoke> with <argument> payloads) and keep the mismatched-markup regression test.

Description

  • Resolved merge conflict in internal/util/toolcalls_test.go and retained the mismatched-markup rejection test (TestParseToolCallsDoesNotAcceptMismatchedMarkupTags).
  • Added invokeArgumentPattern and extended parseInvokeFunctionCallStyle in internal/util/toolcalls_parse_markup.go to handle <argument> elements both with and without name attributes, including JSON unwrapping for unnamed <argument> bodies.
  • Added a fallback merge in parseSingleXMLToolCall that uses parseMarkupSingleToolCall to preserve payloads inside <arguments>{...}</arguments> when the XML path yields empty params, restoring expected fixture behavior.

Testing

  • Ran go test ./internal/util ./internal/compat, which initially exposed the regression and then passed after the fixes (final result: passed).
  • Ran go test ./... after fixes, and the full test suite passed (all packages reported ok or [no test files]).

Codex Task

@vercel
Copy link

vercel bot commented Mar 7, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
ds2api Ready Ready Preview, Comment Mar 7, 2026 6:30pm

@chatgpt-codex-connector
Copy link

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@CJackHwang CJackHwang merged commit 8aad100 into codex/linear-mention-cja-10-ds2api-go-runtime-js Mar 7, 2026
3 checks passed
@CJackHwang CJackHwang deleted the codex/fix-code-conflicts-in-pr-#82 branch March 7, 2026 18:31
@CJackHwang CJackHwang restored the codex/fix-code-conflicts-in-pr-#82 branch March 7, 2026 18:38
@CJackHwang CJackHwang deleted the codex/fix-code-conflicts-in-pr-#82 branch March 9, 2026 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant