Update command prefixing:

- Allow interpolating model crafted commands with {} in command_prefix (not really just a prefix any more lol)

Author: dwash96

aider/coders/base_coder.py

@@ -3843,9 +3843,7 @@ async def handle_shell_commands(self, commands_str, group):
             if not command or command.startswith("#"):
                 continue
 
-            if command and getattr(self.args, "command_prefix", None):
-                command_prefix = getattr(self.args, "command_prefix", None)
-                command = f"{command_prefix} {command}"
+            command = self.format_command_with_prefix(command)
 
             self.io.tool_output()
             self.io.tool_output(f"Running {command}")
@@ -3864,3 +3862,32 @@ async def handle_shell_commands(self, commands_str, group):
             line_plural = "line" if num_lines == 1 else "lines"
             self.io.tool_output(f"Added {num_lines} {line_plural} of output to the chat.")
             return accumulated_output
+
+    def format_command_with_prefix(self, command):
+        """
+        Format a command with a command prefix.
+
+        If the command prefix contains a {} placeholder, replace it with the command.
+        Otherwise, append the command to the prefix with a space.
+
+        Args:
+            command (str): The command to format
+
+        Returns:
+            str: The formatted command
+        """
+        command_prefix = None
+
+        if command and getattr(self.args, "command_prefix", None):
+            command_prefix = getattr(self.args, "command_prefix", None)
+
+        if not command_prefix:
+            return command
+
+        # Check if the prefix contains a {} placeholder
+        if "{}" in command_prefix:
+            # Replace the {} placeholder with the command
+            return command_prefix.replace("{}", command)
+        else:
+            # Append the command to the prefix with a space
+            return f"{command_prefix} {command}"

aider/commands.py

@@ -2160,6 +2160,13 @@ def cmd_load_session(self, args):
         session_manager = sessions.SessionManager(self.coder, self.io)
         session_manager.load_session(args.strip())
 
+    def cmd_command_prefix(self, args=""):
+        """Change Command Prefix For All Running Commands"""
+        if not args.strip():
+            setattr(self.coder.args, "command_prefix", "")
+
+        setattr(self.coder.args, "command_prefix", args.strip())
+
     def cmd_copy_context(self, args=None):
         """Copy the current chat context as markdown, suitable to paste into a web UI"""
 

aider/tools/command.py

@@ -32,9 +32,7 @@ async def execute(cls, coder, command_string):
             # Ask for confirmation before executing.
             # allow_never=True enables the 'Always' option.
             # confirm_ask handles remembering the 'Always' choice based on the subject.
-            if command_string and getattr(coder.args, "command_prefix", None):
-                command_prefix = getattr(coder.args, "command_prefix", None)
-                command_string = f"{command_prefix} {command_string}"
+            command_string = coder.format_command_with_prefix(command_string)
 
             confirmed = (
                 True

aider/tools/command_interactive.py

@@ -31,9 +31,7 @@ async def execute(cls, coder, command_string):
         Execute an interactive shell command using run_cmd (which uses pexpect/PTY).
         """
         try:
-            if command_string and getattr(coder.args, "command_prefix", None):
-                command_prefix = getattr(coder.args, "command_prefix", None)
-                command_string = f"{command_prefix} {command_string}"
+            command_string = coder.format_command_with_prefix(command_string)
 
             confirmed = (
                 True