@@ -127,6 +127,7 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
127127appStatusSlug string
128128testBinaryName string
129129aiAgentAPIURL url.URL
130+ claudeUseBedrock string
130131
131132deprecatedCoderMCPClaudeAPIKey string
132133)
@@ -154,14 +155,15 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
154155configureClaudeEnv [envAgentURL ]= agentClient .SDK .URL .String ()
155156configureClaudeEnv [envAgentToken ]= agentClient .SDK .SessionToken ()
156157}
157- if claudeAPIKey == "" {
158- if deprecatedCoderMCPClaudeAPIKey = ="" {
159- cliui .Warnf (inv .Stderr ,"CLAUDE_API_KEY isnot set. " )
160- } else {
161- cliui . Warnf ( inv . Stderr , "CODER_MCP_CLAUDE_API_KEY is deprecated, use CLAUDE_API_KEY instead" )
162- claudeAPIKey = deprecatedCoderMCPClaudeAPIKey
163- }
158+
159+ if deprecatedCoderMCPClaudeAPIKey ! ="" {
160+ cliui .Warnf (inv .Stderr ,"CODER_MCP_CLAUDE_API_KEY isdeprecated, use CLAUDE_API_KEY instead " )
161+ claudeAPIKey = deprecatedCoderMCPClaudeAPIKey
162+ }
163+ if claudeAPIKey == "" && claudeUseBedrock != "1" {
164+ cliui . Warnf ( inv . Stderr , "CLAUDE_API_KEY is not set." )
164165}
166+
165167if appStatusSlug != "" {
166168configureClaudeEnv [envAppStatusSlug ]= appStatusSlug
167169}
@@ -280,6 +282,14 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
280282Value :serpent .StringOf (& testBinaryName ),
281283Hidden :true ,
282284},
285+ {
286+ Name :"claude-code-use-bedrock" ,
287+ Description :"Use Amazon Bedrock." ,
288+ Env :"CLAUDE_CODE_USE_BEDROCK" ,
289+ Flag :"claude-code-use-bedrock" ,
290+ Value :serpent .StringOf (& claudeUseBedrock ),
291+ Hidden :true ,
292+ },
283293},
284294}
285295return cmd