From 4e9119a0e09a4feb370e752ebdf698fb4c8f1d69 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@geomagical.com>
Date: Wed, 10 May 2023 11:34:34 -0700
Subject: [PATCH] Refactor the cmd_ commands into Coder

---
 aider/coder.py    |  6 +++++-
 aider/commands.py | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/aider/coder.py b/aider/coder.py
index 576285030..443171543 100755
--- a/aider/coder.py
+++ b/aider/coder.py
@@ -40,7 +40,7 @@ class Coder:
         else:
             self.console = Console(force_terminal=True, no_color=True)
 
-        self.commands = Commands(self.console)
+        self.commands = Commands(self.console, self)
 
         self.main_model = main_model
         if main_model == "gpt-3.5-turbo":
@@ -475,3 +475,7 @@ class Coder:
         self.last_modified = self.get_last_modified()
 
         return commit_hash, commit_message
+
+    def cmd_ls(self, args):
+        "List files and show their chat status"
+        print("ls")
diff --git a/aider/commands.py b/aider/commands.py
index 4ed902f50..9e02492a9 100644
--- a/aider/commands.py
+++ b/aider/commands.py
@@ -1,25 +1,23 @@
 class Commands:
-    def __init__(self, console):
+    def __init__(self, console, obj):
         self.console = console
+        self.obj = obj
 
-    def cmd_help(self, args):
+    def help(self):
         "Show help about all commands"
         commands = self.get_commands()
         for cmd in commands:
             cmd_method_name = f"cmd_{cmd[1:]}"
-            cmd_method = getattr(self, cmd_method_name, None)
+            cmd_method = getattr(self.obj, cmd_method_name, None)
             if cmd_method:
                 description = cmd_method.__doc__
                 self.console.print(f"{cmd} {description}")
             else:
                 self.console.print(f"{cmd} No description available.")
-    def cmd_ls(self, args):
-        "List files and show their chat status"
-        print("ls")
 
     def get_commands(self):
-        commands = []
-        for attr in dir(self):
+        commands = ["/help"]
+        for attr in dir(self.obj):
             if attr.startswith("cmd_"):
                 commands.append("/" + attr[4:])
 
@@ -27,7 +25,7 @@ class Commands:
 
     def do_run(self, cmd_name, args):
         cmd_method_name = f"cmd_{cmd_name}"
-        cmd_method = getattr(self, cmd_method_name, None)
+        cmd_method = getattr(self.obj, cmd_method_name, None)
         if cmd_method:
             cmd_method(args)
         else:
@@ -45,7 +43,10 @@ class Commands:
         matching_commands = [cmd for cmd in all_commands if cmd.startswith(first_word)]
 
         if len(matching_commands) == 1:
-            self.do_run(matching_commands[0][1:], rest_inp)
+            if matching_commands[0] == "/help":
+                self.help()
+            else:
+                self.do_run(matching_commands[0][1:], rest_inp)
         elif len(matching_commands) > 1:
             self.console.print("[red]Ambiguous command:", ", ".join(matching_commands))
         else: