Moa

aider/args.py

@@ -179,6 +179,12 @@ def get_parser(default_config_files, git_root):
         default=[],
     )
     group = parser.add_argument_group("Model settings")
+    group.add_argument(
+        "--moa",
+        metavar="MODEL",
+        nargs="+",
+        help="Use Mixture of Architects with multiple models",
+    )
     group.add_argument(
         "--list-models",
         "--models",

aider/coders/__init__.py

@@ -6,6 +6,7 @@
 from .editor_editblock_coder import EditorEditBlockCoder
 from .editor_whole_coder import EditorWholeFileCoder
 from .help_coder import HelpCoder
+from .mixture_of_architects_coder import MixtureOfArchitectsCoder
 from .udiff_coder import UnifiedDiffCoder
 from .wholefile_coder import WholeFileCoder
 
@@ -23,4 +24,5 @@
     ArchitectCoder,
     EditorEditBlockCoder,
     EditorWholeFileCoder,
+    MixtureOfArchitectsCoder,
 ]

aider/coders/base_coder.py

@@ -162,6 +162,15 @@ def create(
 
             kwargs = use_kwargs
 
+        # Check for mixture of architects case first
+        if "architect_models" in kwargs:
+            for coder in coders.__all__:
+                if coder.edit_format == "mixture":
+                    res = coder(main_model, io, **kwargs)
+                    res.original_kwargs = dict(kwargs)
+                    return res
+
+        # Normal case - find coder matching edit_format
         for coder in coders.__all__:
             if hasattr(coder, "edit_format") and coder.edit_format == edit_format:
                 res = coder(main_model, io, **kwargs)
@@ -210,6 +219,12 @@ def get_announcements(self):
             output = f"Weak model: {weak_model.name}"
             lines.append(output)
 
+        # Mixture of Architects info
+        if self.edit_format == "mixture" and hasattr(self, "architects"):
+            for arch in self.architects[1:]:  # Skip alpha since it's already shown as main model
+                output = f"Architect {arch.name.upper()}: {arch.model.name}"
+                lines.append(output)
+
         # Repo
         if self.repo:
             rel_repo_dir = self.repo.get_rel_repo_dir()
@@ -1097,6 +1112,10 @@ def format_chat_chunks(self):
             chunks.system = [
                 dict(role="system", content=main_sys),
             ]
+        elif self.main_model.use_developer_message:
+            chunks.system = [
+                dict(role="developer", content=main_sys),
+            ]
         else:
             chunks.system = [
                 dict(role="user", content=main_sys),