Bug/resolver context fix (#5115)

openhands/resolver/issue_definitions.py

@@ -576,9 +576,7 @@ class PRHandler(IssueHandler):
         # Format thread comments if they exist
         thread_context = ''
         if issue.thread_comments:
-            thread_context = '\n\nPR Thread Comments:\n' + '\n---\n'.join(
-                issue.thread_comments
-            )
+            thread_context = '\n---\n'.join(issue.thread_comments)
             images.extend(self._extract_image_urls(thread_context))
 
         instruction = template.render(

openhands/resolver/prompts/resolve/basic-followup.jinja

@@ -3,7 +3,7 @@ The feedback may be addressed to specific code files. In this case the file loca
 Please update the code based on the feedback for the repository in /workspace.
 An environment has been set up for you to start working. You may assume all necessary tools are installed.
 
-# Issues addressed 
+# Issues addressed
 {{ issues }}
 
 # Review comments
@@ -15,10 +15,13 @@ An environment has been set up for you to start working. You may assume all nece
 # Review thread files
 {{ files }}
 
+# PR Thread Comments
+{{ thread_context }}
+
 IMPORTANT: You should ONLY interact with the environment provided to you AND NEVER ASK FOR HUMAN HELP.
 You SHOULD INCLUDE PROPER INDENTATION in your edit commands.{% if repo_instruction %}
 
 Some basic information about this repository:
 {{ repo_instruction }}{% endif %}
 
-When you think you have fixed the issue through code changes, please finish the interaction.
+When you think you have fixed the issue through code changes, please finish the interaction.