Fix HTML-escaped tool-call args and preserve upstream token usage (stream & non-stream)

[CJackHwang]

Motivation

• Tool-call XML/markup arguments were containing HTML-escaped entities (e.g. >) which caused command execution deviations when parsed as tool arguments.
• Upstream responses sometimes report token usage using input_tokens/output_tokens or string-valued numbers, causing third-party clients (e.g. Vercel deployments) to show inaccurate token counts when the translator fell back to estimated values.

Description

• Unescape HTML entities at parse completion for tool calls by applying html.UnescapeString to Name and recursively to Input values in internal/toolcall/toolcalls_parse.go so arguments like > become > again.
• Extend streaming usage extraction in internal/translatorcliproxy/stream_writer.go so extractOpenAIUsage also considers input_tokens/output_tokens and accepts string-encoded numeric fields by updating toInt to parse string via strconv.Atoi.
• Preserve upstream usage in non-stream translation by adding extractOpenAIUsageFromJSON and injectNonStreamUsageMetadata in internal/translatorcliproxy/bridge.go and applying usage metadata into converted responses for Claude (usage.input_tokens/output_tokens) and Gemini (usageMetadata) so translated non-stream responses carry the original token counts.
• Add tests to cover the fixes: TestParseToolCallsUnescapesHTMLEntityArguments in internal/toolcall/toolcalls_test.go, TestExtractOpenAIUsageSupportsResponsesUsageFields in internal/translatorcliproxy/stream_writer_test.go, and TestFromOpenAINonStreamPreservesResponsesUsageShape in internal/translatorcliproxy/bridge_test.go.

Testing

• Ran go test ./internal/translatorcliproxy ./internal/toolcall and both packages passed (ok ds2api/internal/translatorcliproxy and ok ds2api/internal/toolcall).
• Added unit tests mentioned above and they succeeded in the test run.

---

Codex Task

[vercel]

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

Project	Deployment	Actions	Updated (UTC)
ds2api	Ready	Preview, Comment	Apr 7, 2026 4:55am

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 77a401fb19

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".