diff --git a/tests/basic/test_main.py b/tests/basic/test_main.py
index 802e5ca8b..714f6f56e 100644
--- a/tests/basic/test_main.py
+++ b/tests/basic/test_main.py
@@ -1061,6 +1061,57 @@ class TestMain(TestCase):
         self.assertEqual(
             coder.main_model.extra_params.get("thinking", {}).get("budget_tokens"), 1000
         )
+        
+    def test_list_models_includes_metadata_models(self):
+        # Test that models from model-metadata.json appear in list-models output
+        with GitTemporaryDirectory():
+            # Create a temporary model-metadata.json with test models
+            metadata_file = Path(".aider.model.metadata.json")
+            test_models = {
+                "test-provider/unique-model-name": {"max_input_tokens": 8192},
+                "another-provider/another-unique-model": {"max_input_tokens": 4096}
+            }
+            metadata_file.write_text(json.dumps(test_models))
+            
+            # Capture stdout to check the output
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                main(
+                    ["--list-models", "unique-model", "--model-metadata-file", str(metadata_file), "--yes"],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                )
+                output = mock_stdout.getvalue()
+                
+                # Check that the unique model name from our metadata file is listed
+                self.assertIn("test-provider/unique-model-name", output)
+                
+    def test_list_models_includes_all_model_sources(self):
+        # Test that models from both litellm.model_cost and model-metadata.json appear in list-models
+        with GitTemporaryDirectory():
+            # Create a temporary model-metadata.json with test models
+            metadata_file = Path(".aider.model.metadata.json")
+            test_models = {
+                "test-provider/metadata-only-model": {"max_input_tokens": 8192}
+            }
+            metadata_file.write_text(json.dumps(test_models))
+            
+            # Patch litellm.model_cost to include a test model
+            litellm_test_model = "litellm-only-model"
+            with patch("aider.models.litellm.model_cost", {
+                litellm_test_model: {"mode": "chat", "litellm_provider": "test-provider"}
+            }):
+                # Capture stdout to check the output
+                with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                    main(
+                        ["--list-models", "model", "--model-metadata-file", str(metadata_file), "--yes"],
+                        input=DummyInput(),
+                        output=DummyOutput(),
+                    )
+                    output = mock_stdout.getvalue()
+                    
+                    # Check that both models appear in the output
+                    self.assertIn("test-provider/metadata-only-model", output)
+                    self.assertIn(litellm_test_model, output)
 
     def test_check_model_accepts_settings_flag(self):
         # Test that --check-model-accepts-settings affects whether settings are applied
@@ -1082,6 +1133,31 @@ class TestMain(TestCase):
                 )
                 # Method should not be called because model doesn't support it and flag is on
                 mock_set_thinking.assert_not_called()
+                
+    def test_list_models_with_direct_resource_patch(self):
+        # Test that models from resources/model-metadata.json are included in list-models output
+        with GitTemporaryDirectory():
+            # Mock the importlib.resources.open_text to return a custom model-metadata.json
+            test_resource_models = {
+                "resource-provider/special-model": {"max_input_tokens": 8192}
+            }
+            
+            mock_file = MagicMock()
+            mock_file.read.return_value = json.dumps(test_resource_models)
+            mock_file.__enter__.return_value = mock_file
+            
+            with patch("importlib.resources.open_text", return_value=mock_file):
+                # Capture stdout to check the output
+                with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                    main(
+                        ["--list-models", "special", "--yes"],
+                        input=DummyInput(),
+                        output=DummyOutput(),
+                    )
+                    output = mock_stdout.getvalue()
+                    
+                    # Check that the resource model appears in the output
+                    self.assertIn("resource-provider/special-model", output)
 
             # When flag is off, setting should be applied regardless of support
             with patch("aider.models.Model.set_reasoning_effort") as mock_set_reasoning: