fix(claude): Replace hardcoded Claude version (`cc_version=2.1.63`) in the `billing-header` by lang-911 · Pull Request #2109 · router-for-me/CLIProxyAPI

lang-911 · 2026-03-13T05:01:01Z

Summary

add claude-header-defaults.version as the Claude Code version source
use that version for cloaked billing-header generation and fallback Claude User-Agent
document the new config field and cover default/configured/custom-User-Agent behavior in executor tests

Testing

go test ./internal/runtime/executor -run 'Test(CheckSystemInstructionsWithMode|ApplyClaudeHeaders|ConfiguredClaudeVersion)' -count=1

gemini-code-assist · 2026-03-13T05:01:17Z

Summary of Changes

Hello, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors how the Claude Code version is managed within the application. Instead of hardcoding the version in multiple places, it introduces a centralized configuration field. This change streamlines updates to the Claude Code version, ensuring that components like billing header generation and fallback User-Agent strings consistently reflect the desired version, thereby improving maintainability and reducing potential discrepancies.

Highlights

Configurable Claude Version: Introduced a new claude-header-defaults.version configuration field to centralize the Claude Code version.
Dynamic Billing Header Generation: The Claude Code version is now dynamically sourced from the new configuration field when generating the cloaked billing-header.
Fallback User-Agent Logic: The fallback Claude User-Agent now utilizes the configured Claude Code version, improving consistency.
Enhanced Test Coverage: Added new tests to cover the behavior of default, configured, and custom User-Agent settings, ensuring correct version application.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog

config.example.yaml
- Added version field to claude-header-defaults section.
- Updated the example user-agent to reflect the new version.
internal/config/config.go
- Added a Version field to the ClaudeHeaderDefaults struct.
internal/runtime/executor/claude_executor.go
- Introduced defaultClaudeCodeVersion constant.
- Modified applyClaudeHeaders to use a new defaultClaudeUserAgent function that incorporates the configurable version.
- Updated generateBillingHeader to accept ClaudeHeaderDefaults and use the configured version.
- Modified checkSystemInstructions and checkSystemInstructionsWithMode to pass configuration for version retrieval.
- Added new helper functions claudeCodeVersion and defaultClaudeUserAgent.
internal/runtime/executor/claude_executor_test.go
- Updated existing calls to checkSystemInstructionsWithMode to pass nil for configuration where appropriate.
- Added new tests to verify the use of the configured Claude version for billing headers.
- Added new tests to confirm the configured Claude version is used for fallback User-Agent.
- Added a test to ensure a custom User-Agent is not overridden by the configured Claude version.

Activity

The author provided testing instructions for specific Go tests, indicating local verification of the changes.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request effectively removes the hardcoded Claude version by introducing a new configuration field claude-header-defaults.version. The changes are well-implemented across the configuration, main logic, and tests. The new version is correctly used for generating the billing header and as a fallback for the User-Agent header. The added tests cover the new functionality, including default behavior, configured behavior, and precedence of a custom User-Agent over the version-derived one. I have one suggestion to improve test clarity by refactoring a test case to have a single responsibility.

gemini-code-assist · 2026-03-13T05:02:56Z

internal/runtime/executor/claude_executor_test.go

+func TestConfiguredClaudeVersionDoesNotOverrideCustomUserAgent(t *testing.T) {
+	payload := []byte(`{"system":"You are a helpful assistant.","messages":[{"role":"user","content":"hi"}]}`)
+	req := httptest.NewRequest(http.MethodPost, "https://example.com/v1/messages", nil)
+	cfg := &config.Config{
+		ClaudeHeaderDefaults: config.ClaudeHeaderDefaults{
+			Version:   "2.3.4",
+			UserAgent: "claude-cli/custom-build (external, cli)",
+		},
+	}
+
+	out := checkSystemInstructionsWithMode(payload, false, cfg)
+	billingHeader := gjson.GetBytes(out, "system.0.text").String()
+	if !strings.Contains(billingHeader, "cc_version=2.3.4.") {
+		t.Fatalf("billing header should use configured Claude version, got %q", billingHeader)
+	}
+
+	applyClaudeHeaders(req, nil, "key-123", false, nil, cfg)
+
+	if got := req.Header.Get("User-Agent"); got != "claude-cli/custom-build (external, cli)" {
+		t.Fatalf("User-Agent = %q, want %q", got, "claude-cli/custom-build (external, cli)")
+	}
+}


This test combines two separate concerns: testing checkSystemInstructionsWithMode and applyClaudeHeaders. The check for checkSystemInstructionsWithMode is already covered in TestCheckSystemInstructionsWithMode_UsesConfiguredClaudeVersion, making it redundant here.

To improve clarity and focus, this test should only verify the behavior of applyClaudeHeaders regarding the User-Agent.

Consider renaming the test to something more direct, like TestApplyClaudeHeaders_UsesConfiguredUserAgent, and simplifying its body to focus on that single responsibility.

func TestApplyClaudeHeaders_UsesConfiguredUserAgent(t *testing.T) { req := httptest.NewRequest(http.MethodPost, "https://example.com/v1/messages", nil) cfg := &config.Config{ ClaudeHeaderDefaults: config.ClaudeHeaderDefaults{ Version: "2.3.4", UserAgent: "claude-cli/custom-build (external, cli)", }, } applyClaudeHeaders(req, nil, "key-123", false, nil, cfg) if got := req.Header.Get("User-Agent"); got != "claude-cli/custom-build (external, cli)" { t.Fatalf("User-Agent = %q, want %q", got, "claude-cli/custom-build (external, cli)") } }

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e724b940c4

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

internal/runtime/executor/claude_executor.go

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 918f7d5083

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

internal/runtime/executor/claude_executor.go

luispater

Blocking: CountTokens() still calls checkSystemInstructions(body), and in this PR that helper forwards nil config. As a result, /v1/messages/count_tokens will continue to emit cc_version=2.1.63.* even when claude-header-defaults.version is configured, while the fallback User-Agent on the same request can already advertise the configured version. That leaves the hardcoded version partially in place and creates an internal version mismatch. Please thread e.cfg through this path as well and add coverage for the count_tokens flow.

Superseded by the corrected review submitted immediately after this one.

lang-911 · 2026-03-15T16:15:34Z

@luispater Addressed in b6afc1b.

Changes made:

CountTokens() now uses checkSystemInstructionsWithMode(body, false, e.cfg) instead of the nil-config wrapper, so /v1/messages/count_tokens picks up claude-header-defaults.version
removed the stale checkSystemInstructions(...) helper that always forwarded nil
added a regression test covering configured Claude version on the count_tokens flow
simplified the custom User-Agent test so it only checks applyClaudeHeaders

Validation:

go test ./internal/runtime/executor -run 'Test(CheckSystemInstructionsWithMode|ClaudeExecutor_CountTokens|ApplyClaudeHeaders)' -count=1

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b6afc1b516

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

internal/runtime/executor/claude_executor.go

gemini-code-assist bot reviewed Mar 13, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

internal/runtime/executor/claude_executor.go Outdated Show resolved Hide resolved

lang-911 changed the title ~~Replace hardcoded Claude version~~ fix(claude): Replace hardcoded Claude version (cc_version=2.1.63) in the billing-header Mar 13, 2026

lang-911 force-pushed the fix/use-config-version-for-claude branch from e724b94 to 918f7d5 Compare March 13, 2026 05:07

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

internal/runtime/executor/claude_executor.go Outdated Show resolved Hide resolved

This comment was marked as duplicate.

Sign in to view

luispater requested changes Mar 14, 2026

View reviewed changes

Replace hardcoded Claude version

9229cbe

lang-911 force-pushed the fix/use-config-version-for-claude branch from 918f7d5 to 9229cbe Compare March 15, 2026 16:07

Fix count_tokens Claude version config

b6afc1b

chatgpt-codex-connector bot reviewed Mar 15, 2026

View reviewed changes

internal/runtime/executor/claude_executor.go Show resolved Hide resolved

Escape Claude billing header system block

7681622

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(claude): Replace hardcoded Claude version (`cc_version=2.1.63`) in the `billing-header`#2109

fix(claude): Replace hardcoded Claude version (`cc_version=2.1.63`) in the `billing-header`#2109
lang-911 wants to merge 3 commits intorouter-for-me:mainfrom
lang-911:fix/use-config-version-for-claude

lang-911 commented Mar 13, 2026

Uh oh!

gemini-code-assist bot commented Mar 13, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Mar 13, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

This comment was marked as duplicate.

Uh oh!

luispater left a comment

Uh oh!

lang-911 commented Mar 15, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

lang-911 commented Mar 13, 2026

Summary

Testing

Uh oh!

gemini-code-assist bot commented Mar 13, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Mar 13, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

This comment was marked as duplicate.

Uh oh!

luispater left a comment

Choose a reason for hiding this comment

Uh oh!

lang-911 commented Mar 15, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants