Merge branch 'main' into fix/episodic-memory

Author: wang-boyu

.github/ISSUE_TEMPLATE/asking-help.md

@@ -11,11 +11,12 @@ about: Let us know if something is broken on Mesa-LLM
 <!-- A clear and concise description of what you expected to happen -->
 
 **To Reproduce**
-<!-- Steps to reproduce the bug, or a link to a project where the bug is visible -->
+<!-- Steps to reproduce the bug, or a link to a project where the bug is visible
+Include a Minimal reproducible example: https://stackoverflow.com/help/minimal-reproducible-example -->
 
 **Additional context**
 <!--
     Add any other context here.
     Any details about your specific platform:
     * If the problem is in the browser, what browser, version, and OS?
--->
+-->

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Questions, ideas, showcases and more
+    url: https://github.com/mesa/mesa-llm/discussions
+    about: Discuss Mesa-LLM, ask questions, share ideas, and showcase your projects

.github/ISSUE_TEMPLATE/config.yml

@@ -10,5 +10,8 @@ about: Suggest a new feature for Mesa-LLM
 **Describe the solution you'd like**
 <!-- A clear and concise description of what you want to happen. -->
 
+**Are you planning to open a PR for this?**
+<!-- For enhancements/new features, please wait for maintainer approval on this issue/discussion before opening a PR. -->
+
 **Additional context**
-<!-- Add any other context, links, etc. about the feature here. -->
+<!-- Add any other context, links, etc. about the feature here. -->

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,23 @@
+> [!NOTE]
+> Use this template for bug fixes only. For enhancements/new features, use the feature template and get maintainer approval in an issue/discussion before opening a PR.
+
+### Pre-PR Checklist
+- [ ] This PR is a bug fix, not a new feature or enhancement.
+
+### Summary
+<!-- Provide a brief summary of the bug and its impact. -->
+
+### Bug / Issue
+<!-- Link to the related issue(s) and describe the bug. Include details like the context, what was expected, and what actually happened. -->
+
+### Implementation
+<!-- Describe the changes made to resolve the issue. Highlight any important parts of the code that were modified. -->
+
+### Testing
+<!-- Detail the testing performed to verify the fix. Include information on test cases, steps taken, and any relevant results.
+
+If you're fixing the visualisation, add before/after screenshots. -->
+
+### Additional Notes
+<!-- Add any additional information that may be relevant for the reviewers, such as potential side effects, dependencies, or related work.
+-->

.github/PULL_REQUEST_TEMPLATE/bug.md

@@ -0,0 +1,25 @@
+> [!IMPORTANT]
+> For enhancements and new features, include the issue/discussion where a maintainer approved this work before opening a PR. Unapproved feature/enhancement PRs may be closed.
+
+### Pre-PR Checklist
+- [ ] I linked an issue/discussion where a maintainer approved this enhancement/feature for implementation.
+
+### Approval Link
+<!-- Link to the issue/discussion comment where a maintainer confirmed this is ready for a PR. -->
+
+### Summary
+<!-- Provide a concise summary of the feature and its purpose. -->
+
+### Motive
+<!-- Explain the reasoning behind this feature. Include details on the problem it addresses or the enhancement it provides. -->
+
+### Implementation
+<!-- Describe how the feature was implemented. Include details on the approach taken, important decisions made, and code changes. -->
+
+### Usage Examples
+<!-- Provide code snippets or examples demonstrating how to use the new feature. Highlight key scenarios where this feature will be beneficial.
+
+If you're modifying the visualisation, add before/after screenshots. -->
+
+### Additional Notes
+<!-- Add any additional information that may be relevant for the reviewers, such as potential side effects, dependencies, or related work. -->

.github/PULL_REQUEST_TEMPLATE/feature.md

@@ -0,0 +1,6 @@
+Thanks for opening a PR! Please click the `Preview` tab and select a PR template:
+
+- [🐛 Bug fix](?expand=1&template=bug.md)
+- [🛠 Feature/enhancement](?expand=1&template=feature.md)
+
+Feature/enhancement PRs require prior maintainer approval in an issue or discussion before they are accepted.

.github/pull_request_template.md

@@ -11,8 +11,12 @@ In no particular order, examples include:
 - Documentation improvements
 - Tutorials
 
+> [!NOTE]
+> For Mesa-wide contribution process and development expectations, see [Mesa CONTRIBUTING].
+
 [Mesa-LLM discussions]: https://github.com/mesa/mesa-llm/discussions
 [issue]: https://github.com/mesa/mesa-llm/issues
+[Mesa CONTRIBUTING]: https://github.com/mesa/mesa/blob/main/CONTRIBUTING.md
 
 **To submit a contribution**
 

CONTRIBUTING.md

@@ -18,20 +18,13 @@
 }
 
 
-class MockCell:
-    """Mock cell with coordinate attribute"""
-
-    def __init__(self, coordinate):
-        self.coordinate = coordinate
-
-
 @pytest.fixture(autouse=True)
 def mock_environment():
     """Ensure tests don't depend on real environment variables"""
     with patch.dict(
         os.environ,
         {
-            "GEMINI_API_KEY": "dummy",
+            "GEMINI_API_KEY": "test_gemini_key",
             "PROVIDER_API_KEY": "test_key",
             "OPENAI_API_KEY": "test_openai_key",
         },

tests/conftest.py

@@ -8,6 +8,7 @@
 from mesa_llm.llm_agent import LLMAgent
 from mesa_llm.parallel_stepping import step_agents_parallel
 from mesa_llm.reasoning.reasoning import Reasoning
+from tests.conftest import build_llm_response
 
 logger = logging.getLogger(__name__)
 
@@ -53,10 +54,7 @@ async def test_parallel_memory_consolidation(self, mock_agenerate):
 
         async def slow_response(*args, **kwargs):
             await asyncio.sleep(1)
-            mock_resp = MagicMock()
-            mock_resp.choices = [MagicMock()]
-            mock_resp.choices[0].message.content = "summary"
-            return mock_resp
+            return build_llm_response(content="summary")
 
         mock_agenerate.side_effect = slow_response