@@ -126,6 +126,7 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
126126coderPrompt string
127127appStatusSlug string
128128testBinaryName string
129+ llmAgentURL url.URL
129130
130131deprecatedCoderMCPClaudeAPIKey string
131132)
@@ -164,6 +165,9 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
164165if appStatusSlug != "" {
165166configureClaudeEnv [envAppStatusSlug ]= appStatusSlug
166167}
168+ if llmAgentURL .String ()!= "" {
169+ configureClaudeEnv [envLLMAgentURL ]= llmAgentURL .String ()
170+ }
167171if deprecatedSystemPromptEnv ,ok := os .LookupEnv ("SYSTEM_PROMPT" );ok {
168172cliui .Warnf (inv .Stderr ,"SYSTEM_PROMPT is deprecated, use CODER_MCP_CLAUDE_SYSTEM_PROMPT instead" )
169173systemPrompt = deprecatedSystemPromptEnv
@@ -262,6 +266,12 @@ func (r *RootCmd) mcpConfigureClaudeCode() *serpent.Command {
262266Flag :"claude-app-status-slug" ,
263267Value :serpent .StringOf (& appStatusSlug ),
264268},
269+ {
270+ Flag :"llm-agent-url" ,
271+ Description :"The URL of the LLM agent API, used to listen for status updates." ,
272+ Env :envLLMAgentURL ,
273+ Value :serpent .URLOf (& llmAgentURL ),
274+ },
265275{
266276Name :"test-binary-name" ,
267277Description :"Only used for testing." ,
@@ -446,7 +456,9 @@ func (r *RootCmd) mcpServer() *serpent.Command {
446456defer srv .queue .Close ()
447457
448458cliui .Infof (inv .Stderr ,"Failed to watch screen events" )
449- // Start the reporter, watcher, and server.
459+ // Start the reporter, watcher, and server. These are all tied to the
460+ // lifetime of the MCP server, which is itself tied to the lifetime of the
461+ // LLM agent.
450462if srv .agentClient != nil && appStatusSlug != "" {
451463srv .startReporter (ctx ,inv )
452464if srv .llmClient != nil {