feat(coder/modules/claude-code): add support for aibridge #657

35C4n0r · 2026-01-13T10:39:52Z

Description

Add support for AI Bridge

Type of Change

Module Information

Path: registry/coder/modules/claude-code
New version: v4.5.0
Breaking change: [ ] Yes [ ] No

Testing & Validation

Tests pass (bun test)
Code formatted (bun fmt)
Changes tested locally

Related Issues

Closes: #649

35C4n0r · 2026-01-13T10:40:22Z

wip.

registry/coder/modules/claude-code/README.md

registry/coder/modules/claude-code/main.tf

matifali

Left some comments, but looks good. Also, what do you think about moving the AI Bridge example a bit higher before Bedrock and Vertex AI examples?

registry/coder/modules/claude-code/main.test.ts

…iguration

# Conflicts: # registry/coder/modules/claude-code/README.md # registry/coder/modules/claude-code/main.test.ts

registry/coder/modules/claude-code/scripts/install.sh

registry/coder/modules/claude-code/main.tf

DevelopmentCats · 2026-01-15T14:06:09Z

@35C4n0r other than what atif mentioned this looks good to me!

matifali

The coder_ai_task + data.coder_task.me boilerplate appears twice:

In "Usage with Tasks and Advanced Configuration"
In "Usage with tasks and AI Bridge"

Suggestion: Consolidate by showing the tasks pattern once, then have AI Bridge examples just show the enable_aibridge = true addition:

### Usage with Tasks

resource "coder_ai_task" "task" {
  count  = data.coder_workspace.me.start_count
  app_id = module.claude-code.task_app_id
}

data "coder_task" "me" {}

module "claude-code" {
  source    = "registry.coder.com/coder/claude-code/coder"
  version   = "4.5.0"
  agent_id  = coder_agent.main.id
  workdir   = "/home/coder/project"
  ai_prompt = data.coder_task.me.prompt
  
  # Optional: route through AI Bridge
  # enable_aibridge = true
}

Then the AI Bridge section can be simplified to just show standalone usage and reference that tasks work by adding enable_aibridge = true to the above example.

# Conflicts: # registry/coder/modules/claude-code/README.md

matifali

Some Last few changes and it looks good to me.

registry/coder/modules/claude-code/main.tf

registry/coder/modules/claude-code/README.md

DevelopmentCats · 2026-01-16T20:59:40Z

@35C4n0r You will also need to run bun fmt on this as well

blinkagent · 2026-01-16T21:05:09Z

The CI failure in terraform_test_all.sh is caused by main.tftest.hcl referencing the old resource name.

In this PR, the resource was renamed from coder_env.claude_api_key to coder_env.anthropic_api_key in main.tf (line 266), but main.tftest.hcl still references the old name on line 45:

assert {
  condition     = coder_env.claude_api_key[0].value == "test-api-key-123"
  error_message = "Claude API key value should match the input"
}

This needs to be updated to:

assert {
  condition     = coder_env.anthropic_api_key[0].value == "test-api-key-123"
  error_message = "Anthropic API key value should match the input"
}

Since main.tftest.hcl wasn't included in the PR diff, this file needs to be added to the changeset.

matifali · 2026-01-18T14:50:51Z

registry/coder/modules/claude-code/README.md

 ```

-### Usage with Tasks and Advanced Configuration
+### Usage with AI Bridge Configuration


Suggested change

### Usage with AI Bridge Configuration

### Usage with AI Bridge

matifali · 2026-01-18T14:53:32Z

registry/coder/modules/claude-code/main.tf

+
+  validation {
+    condition     = !(var.enable_aibridge && length(var.claude_api_key) > 0)
+    error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."


Suggested change

error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."

error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using Coder credentials."

matifali · 2026-01-18T14:53:55Z

registry/coder/modules/claude-code/main.tf

+
+  validation {
+    condition     = !(var.enable_aibridge && length(var.claude_code_oauth_token) > 0)
+    error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."


Suggested change

error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."

error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using Coder credentials."

matifali · 2026-01-18T14:54:53Z

registry/coder/modules/claude-code/main.tf

+}
+
+# https://code.claude.com/docs/en/settings#environment-variables
+resource "coder_env" "anthropic_auth_token" {


Do we still need this as we are writing the API key to the config file?

matifali · 2026-01-18T14:57:06Z

registry/coder/modules/claude-code/scripts/install.sh


-  if [ -z "${CLAUDE_API_KEY:-}" ]; then
-    echo "Note: CLAUDE_API_KEY not set, skipping authentication setup"
+  if [ -z "${CLAUDE_API_KEY:-}" ] && [ "$ARG_ENABLE_AIBRIDGE" = "false" ]; then


I think we should keep the logic simple here and simply use the key from the AI Bridge. No need to make this conditional on the AI Bridge. This should simply write the key wherever it came from.

Copilot

Pull request overview

This pull request adds support for AI Bridge to the Claude Code module, enabling centralized LLM proxy management through Coder's AI Bridge feature. This is a Premium Coder feature that allows Claude Code to route API requests through Coder's proxy instead of directly to Anthropic's API.

Changes:

Added enable_aibridge variable with validation to prevent conflicts with existing authentication methods
Configured environment variables (ANTHROPIC_BASE_URL and ANTHROPIC_AUTH_TOKEN) when AI Bridge is enabled
Updated documentation with usage examples and integration guidance

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File	Description
registry/coder/modules/claude-code/main.tf	Added `enable_aibridge` variable with mutual exclusivity validations for `claude_api_key` and `claude_code_oauth_token`; added environment variable resources for AI Bridge configuration
registry/coder/modules/claude-code/scripts/install.sh	Added `ARG_ENABLE_AIBRIDGE` parameter handling; modified authentication setup to skip API key requirement when AI Bridge is enabled
registry/coder/modules/claude-code/README.md	Updated version to 4.5.0 across all examples; added comprehensive AI Bridge documentation with standalone and tasks usage examples

Copilot · 2026-01-18T15:01:01Z

registry/coder/modules/claude-code/main.tf

+variable "enable_aibridge" {
+  type        = bool
+  description = "Use AI Bridge for Claude Code. https://coder.com/docs/ai-coder/ai-bridge"
+  default     = false
+
+  validation {
+    condition     = !(var.enable_aibridge && length(var.claude_api_key) > 0)
+    error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."
+  }
+
+  validation {
+    condition     = !(var.enable_aibridge && length(var.claude_code_oauth_token) > 0)
+    error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."
+  }
+}


The new enable_aibridge feature lacks test coverage. Consider adding tests to verify:

That ANTHROPIC_BASE_URL and ANTHROPIC_AUTH_TOKEN environment variables are set correctly when enable_aibridge is true

That the validation rules preventing claude_api_key and claude_code_oauth_token from being used with enable_aibridge work as expected

That the shell script properly handles the ARG_ENABLE_AIBRIDGE parameter and skips API key setup when aibridge is enabled

Copilot · 2026-01-18T15:01:02Z

registry/coder/modules/claude-code/scripts/install.sh

 printf "ARG_MCP: %s\n" "$ARG_MCP"
 printf "ARG_ALLOWED_TOOLS: %s\n" "$ARG_ALLOWED_TOOLS"
 printf "ARG_DISALLOWED_TOOLS: %s\n" "$ARG_DISALLOWED_TOOLS"
+printf "ARG_ENABLE_AIBRIDGE %s\n" "$ARG_ENABLE_AIBRIDGE"


Missing colon after printf format specifier. The line should be:
printf "ARG_ENABLE_AIBRIDGE: %s\n" "$ARG_ENABLE_AIBRIDGE"

This is inconsistent with all other printf statements in the same section (lines 25-34) which include a colon after the variable name.

Suggested change

printf "ARG_ENABLE_AIBRIDGE %s\n" "$ARG_ENABLE_AIBRIDGE"

printf "ARG_ENABLE_AIBRIDGE: %s\n" "$ARG_ENABLE_AIBRIDGE"

Copilot · 2026-01-18T15:01:02Z

registry/coder/modules/claude-code/scripts/install.sh

-  if [ -z "${CLAUDE_API_KEY:-}" ]; then
-    echo "Note: CLAUDE_API_KEY not set, skipping authentication setup"
+  if [ -z "${CLAUDE_API_KEY:-}" ] && [ "$ARG_ENABLE_AIBRIDGE" = "false" ]; then
+    echo "Note: CLAUDE_API_KEY or enable_aibridge not set, skipping authentication setup"


The error message is misleading. It says "CLAUDE_API_KEY or enable_aibridge not set" but the logic checks if BOTH are not set (API key is empty AND aibridge is false). The message should more accurately reflect this condition, such as: "Note: Neither CLAUDE_API_KEY nor enable_aibridge is set, skipping authentication setup"

Suggested change

echo "Note: CLAUDE_API_KEY or enable_aibridge not set, skipping authentication setup"

echo "Note: Neither CLAUDE_API_KEY nor enable_aibridge is set, skipping authentication setup"

35C4n0r added 2 commits January 13, 2026 10:34

feat(coder/modules/claude-code): add support for aibridge

db4cbed

chore: bump version

11203a4

35C4n0r marked this pull request as draft January 13, 2026 10:40

35C4n0r self-assigned this Jan 13, 2026

matifali reviewed Jan 13, 2026

View reviewed changes

dannykopping reviewed Jan 13, 2026

View reviewed changes

registry/coder/modules/claude-code/main.test.ts Outdated Show resolved Hide resolved

35C4n0r added 11 commits January 14, 2026 11:04

fix: use precondition instead of check

2efe178

fix: refactor and bun fmt

4963d31

add validation block

3328805

feat: add ARG_ENABLE_AIBRIDGE support to installation script and conf…

4aad195

…iguration

feat: restore tests

0ed44f4

Merge branch 'main' into 35C4n0r/feat-claude-aibridge

3dbed9a

# Conflicts: # registry/coder/modules/claude-code/README.md # registry/coder/modules/claude-code/main.test.ts

bun fmt

3dfd968

bun fmt

2e76f43

bun fmt

a59a423

bun fmt

28fc496

bump version

8a4b5e3

35C4n0r marked this pull request as ready for review January 15, 2026 06:08

35C4n0r requested review from DevelopmentCats, dannykopping and matifali January 15, 2026 06:47

matifali reviewed Jan 15, 2026

View reviewed changes

registry/coder/modules/claude-code/scripts/install.sh Show resolved Hide resolved

registry/coder/modules/claude-code/main.tf Outdated Show resolved Hide resolved

feat: update validation error message

f40c16d

matifali reviewed Jan 16, 2026

View reviewed changes

35C4n0r added 2 commits January 16, 2026 15:42

chore: update README.md

64a790c

Merge branch 'main' into 35C4n0r/feat-claude-aibridge

a9d3304

# Conflicts: # registry/coder/modules/claude-code/README.md

matifali requested changes Jan 16, 2026

View reviewed changes

registry/coder/modules/claude-code/main.tf Show resolved Hide resolved

matifali reviewed Jan 16, 2026

View reviewed changes

registry/coder/modules/claude-code/README.md Outdated Show resolved Hide resolved

35C4n0r force-pushed the 35C4n0r/feat-claude-aibridge branch from 23573ee to a9d3304 Compare January 17, 2026 11:58

chore: rearrange README.md

d6e77ae

35C4n0r requested a review from matifali January 17, 2026 12:25

matifali reviewed Jan 18, 2026

View reviewed changes

matifali requested a review from Copilot January 18, 2026 14:57

Copilot started reviewing on behalf of matifali January 18, 2026 14:58 View session

Copilot AI reviewed Jan 18, 2026

View reviewed changes

	### Usage with AI Bridge Configuration
	### Usage with AI Bridge

	error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."
	error_message = "claude_api_key cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using Coder credentials."

	error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using their Coder credentials."
	error_message = "claude_code_oauth_token cannot be provided when enable_aibridge is true. AI Bridge automatically authenticates the client using Coder credentials."

	printf "ARG_ENABLE_AIBRIDGE %s\n" "$ARG_ENABLE_AIBRIDGE"
	printf "ARG_ENABLE_AIBRIDGE: %s\n" "$ARG_ENABLE_AIBRIDGE"

	echo "Note: CLAUDE_API_KEY or enable_aibridge not set, skipping authentication setup"
	echo "Note: Neither CLAUDE_API_KEY nor enable_aibridge is set, skipping authentication setup"

feat(coder/modules/claude-code): add support for aibridge #657

Are you sure you want to change the base?

feat(coder/modules/claude-code): add support for aibridge #657

Conversation

35C4n0r commented Jan 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of Change

Module Information

Testing & Validation

Related Issues

Uh oh!

35C4n0r commented Jan 13, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

matifali left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DevelopmentCats commented Jan 15, 2026

Uh oh!

matifali left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matifali left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DevelopmentCats commented Jan 16, 2026

Uh oh!

blinkagent bot commented Jan 16, 2026

Uh oh!

matifali Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

matifali Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

matifali Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

matifali Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

matifali Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

35C4n0r commented Jan 13, 2026 •

edited

Loading

matifali left a comment •

edited

Loading

matifali left a comment •

edited

Loading