fix(cli): exp mcp: do not add coder_report_task if agent token not available

johnstcn · johnstcn · commit 00e705a8b144 · 2025-04-11T18:37:57.000+01:00
diff --git a/cli/exp_mcp.go b/cli/exp_mcp.go
@@ -402,7 +402,9 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
 	// Create a new context for the tools with all relevant information.
 	clientCtx := toolsdk.WithClient(ctx, client)
 	// Get the workspace agent token from the environment.
+	var hasAgentClient bool
 	if agentToken, err := getAgentToken(fs); err == nil && agentToken != "" {
+		hasAgentClient = true
 		agentClient := agentsdk.New(client.URL)
 		agentClient.SetSessionToken(agentToken)
 		clientCtx = toolsdk.WithAgentClient(clientCtx, agentClient)
@@ -417,6 +419,11 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
 
 	// Register tools based on the allowlist (if specified)
 	for _, tool := range toolsdk.All {
+		// Skip adding the coder_report_task tool if there is no agent client
+		if !hasAgentClient && tool.Tool.Name == "coder_report_task" {
+			cliui.Warnf(inv.Stderr, "Task reporting not available")
+			continue
+		}
 		if len(allowedTools) == 0 || slices.ContainsFunc(allowedTools, func(t string) bool {
 			return t == tool.Tool.Name
 		}) {
