#85: Fix propagation of commit hashes in the case of running a command with /code from another top level Coder class variant

Author: dwash96

aider/commands.py

@@ -1493,19 +1493,12 @@ async def _generic_chat_command(self, args, edit_format, placeholder=None):
             edit_format=edit_format,
             summarize_from_coder=False,
             num_cache_warming_pings=0,
+            aider_commit_hashes=self.coder.aider_commit_hashes,
         )
 
         user_msg = args
-        await coder.run(user_msg)
-
-        # Use the provided placeholder if any
-        raise SwitchCoder(
-            edit_format=self.coder.edit_format,
-            summarize_from_coder=False,
-            from_coder=coder,
-            show_announcements=False,
-            placeholder=placeholder,
-        )
+        await coder.run(user_msg, False)
+        self.coder.aider_commit_hashes = coder.aider_commit_hashes
 
     def get_help_md(self):
         "Show help about all commands in markdown"

aider/io.py

@@ -1260,6 +1260,9 @@ def _tool_message(self, message="", strip=True, color=None):
             message = str(message).encode("ascii", errors="replace").decode("ascii")
             self.stream_print(message, style=style)
 
+    def tool_success(self, message="", strip=True):
+        self._tool_message(message, strip, self.user_input_color)
+
     def tool_error(self, message="", strip=True):
         self.num_error_outputs += 1
         self._tool_message(message, strip, self.tool_error_color)

aider/repo.py

@@ -310,7 +310,7 @@ async def commit(self, fnames=None, context=None, message=None, aider_edits=Fals
                 # Perform the commit
                 self.repo.git.commit(cmd)
                 commit_hash = self.get_head_commit_sha(short=True)
-                self.io.tool_output(f"Commit {commit_hash} {commit_message}", bold=True)
+                self.io.tool_success(f"Commit {commit_hash} {commit_message}")
                 return commit_hash, commit_message
 
         except ANY_GIT_ERROR as err: