Cleaned up bugs made during merging

Author: VitjanZ

memory_management.py

@@ -62,11 +62,6 @@ def list_memory_files(memory_folder: str) -> list[str]:
                 names.append(os.path.relpath(full_path, memory_folder))
         return sorted(names)
 
-    @staticmethod
-    def memory_folder_for(conformance_tests_folder: str, module_name: str) -> str:
-        """Return the .memory folder path for a module (the per-module memory root)."""
-        return os.path.join(conformance_tests_folder, module_name, CODEPLAIN_MEMORY_SUBFOLDER)
-
     @staticmethod
     def write_agent_memory_file(
         memory_folder: str, file_name: str, content: str, subfolder: str = AGENT_MEMORY_SUBFOLDER
@@ -116,9 +111,9 @@ def sync_global_memories(target_memory_folder: str, source_memory_folders: list[
             console.debug(f"Synced {copied} global memory note(s) into {target_global}.")
         return copied
 
-    def __init__(self, codeplain_api, module_name: str, conformance_tests_folder: str):
+    def __init__(self, codeplain_api, memory_folder: str):
         self.codeplain_api = codeplain_api
-        self.memory_folder = MemoryManager.memory_folder_for(conformance_tests_folder, module_name)
+        self.memory_folder = memory_folder
 
     def create_conformance_tests_memory(
         self, render_context: RenderContext, exit_code: int, conformance_tests_issue: str

module_renderer.py

@@ -155,10 +155,7 @@ def _sync_global_memories(self, memory_manager: MemoryManager) -> None:
         within a full render (modules rendered earlier feed later ones) and across renders.
         """
         all_modules = self.plain_module.all_required_modules + [self.plain_module]
-        source_memory_folders = [
-            MemoryManager.memory_folder_for(self.args.conformance_tests_folder, module.module_name)
-            for module in all_modules
-        ]
+        source_memory_folders = [module.module_memory_folder for module in all_modules]
         MemoryManager.sync_global_memories(memory_manager.memory_folder, source_memory_folders)
 
     def render_module(self) -> None:

render_machine/actions/review_conformance_fix_action.py

@@ -302,20 +302,26 @@ def _commit_approved_fix(self, render_context: RenderContext, tracked_paths: lis
         )
 
         candidate_repos = [os.path.abspath(render_context.build_folder)]
-        conformance_root = os.path.abspath(render_context.conformance_tests.conformance_tests_folder)
-        # Conformance repos are per module; derive the touched ones from the tracked
-        # paths, plus the current testing module's repo for side effects (e.g. files
-        # written by run_command) that were never routed through the tracked tools.
+        modules_base_folder = os.path.abspath(render_context.conformance_tests.modules_base_folder)
+        # Conformance repos are per module (<modules_base>/<module>/tests); derive the
+        # touched ones from the tracked paths, plus the current testing module's repo
+        # for side effects (e.g. files written by run_command) that were never routed
+        # through the tracked tools.
         conformance_module_folders = {
             os.path.abspath(
                 render_context.conformance_tests.get_module_conformance_tests_folder(ctx.current_testing_module_name)
             )
         }
         for path in tracked_paths:
             absolute_path = os.path.abspath(path)
-            if absolute_path.startswith(conformance_root + os.sep):
-                module_dir = os.path.relpath(absolute_path, conformance_root).split(os.sep)[0]
-                conformance_module_folders.add(os.path.join(conformance_root, module_dir))
+            if not absolute_path.startswith(modules_base_folder + os.sep):
+                continue
+            module_name = os.path.relpath(absolute_path, modules_base_folder).split(os.sep)[0]
+            tests_folder = os.path.abspath(
+                render_context.conformance_tests.get_module_conformance_tests_folder(module_name)
+            )
+            if absolute_path.startswith(tests_folder + os.sep):
+                conformance_module_folders.add(tests_folder)
         candidate_repos.extend(sorted(conformance_module_folders))
 
         committed_repos = []

render_machine/agent/tools.py

@@ -168,31 +168,32 @@ def _get_allowed_write_folders(render_context: RenderContext) -> list[str]:
                 ctx.get_current_conformance_test_folder_name(),
             )
             folders.append(os.path.normpath(os.path.abspath(folder)))
-    elif render_context.conformance_tests_folder:
-        folders.append(os.path.normpath(os.path.abspath(render_context.conformance_tests_folder)))
+    elif render_context.should_run_conformance_tests():
+        module_tests_folder = render_context.conformance_tests.get_module_conformance_tests_folder(
+            render_context.module_name
+        )
+        folders.append(os.path.normpath(os.path.abspath(module_tests_folder)))
 
     return folders
 
 
 def _get_allowed_read_folders(render_context: RenderContext) -> list[str]:
     """Return normalized absolute paths of folders the agent can read from.
 
-    This is the write set, plus the module's memory folder, plus the whole
-    conformance-tests root. Agents may browse and read persisted memory notes (via
+    This is the write set, plus the module's memory folder, plus every module's
+    conformance-tests folder. Agents may browse and read persisted memory notes (via
     read_file/grep/ls_files) on demand, but may only add to them through the dedicated
     write_memory tool — so the memory folder is intentionally readable here while staying
-    out of the write set. The conformance-tests root is readable (read-only) so agents can
-    consult sibling modules' conformance tests as reference examples of how a conformance
+    out of the write set. Sibling modules' conformance-tests folders are readable
+    (read-only) so agents can consult them as reference examples of how a conformance
     test project for this project is laid out, built, and wired to run in isolation.
     """
     folders = list(_get_allowed_write_folders(render_context))
     memory_manager = getattr(render_context, "memory_manager", None)
     memory_folder = getattr(memory_manager, "memory_folder", None) if memory_manager else None
     if memory_folder:
         folders.append(os.path.normpath(os.path.abspath(memory_folder)))
-    conformance_root = getattr(render_context, "conformance_tests_folder", None)
-    if conformance_root:
-        folders.append(os.path.normpath(os.path.abspath(conformance_root)))
+    folders.extend(_get_all_module_tests_folders(render_context))
     return folders
 
 
@@ -235,8 +236,7 @@ def build_sandbox_contract(render_context: RenderContext) -> str:
         if script
     ]
     modules_root = _get_modules_root(render_context)
-    conformance_root = getattr(render_context, "conformance_tests_folder", None)
-    conformance_root = os.path.normpath(os.path.abspath(conformance_root)) if conformance_root else None
+    sibling_tests_folders = _get_all_module_tests_folders(render_context)
 
     lines = ["You can WRITE (create/edit/delete files) ONLY inside these folders:"]
     lines.extend(f"- {folder}" for folder in write_folders)
@@ -249,9 +249,9 @@ def build_sandbox_contract(render_context: RenderContext) -> str:
         lines.append("- The test/setup scripts (read-only harness files):")
         lines.extend(f"  - {script}" for script in scripts)
     lines.append("- Temporary files under /tmp and /var/folders (e.g. saved test output).")
-    if conformance_root:
+    if sibling_tests_folders:
         lines.append(
-            f"- Every module's conformance tests under the conformance-tests root ({conformance_root}) "
+            f"- Every module's conformance tests ({os.path.join(modules_root, '<module>', 'tests')}) "
             "(read-only). Sibling modules' conformance tests can be a good source of information — they "
             "already build and pass in this project's test harness. Explore them with ls_files/grep to "
             "find a relevant one rather than reading them all."
@@ -284,14 +284,27 @@ def build_sandbox_contract(render_context: RenderContext) -> str:
 
 
 def _get_modules_root(render_context: RenderContext) -> str:
-    """Return the directory that holds all per-module build folders.
+    """Return the directory that holds all per-module folders.
 
-    Build folders are constructed as ``<modules_root>/<module_name>`` (e.g.
-    ``plain_modules/module_2``), so the modules root is the build folder's parent. Its
-    other children are sibling module folders, which contain confusing near-duplicates
-    of the current build folder's code.
+    Module folders are constructed as ``<modules_root>/<module_name>`` (e.g.
+    ``plain_modules/module_2``), each holding the module's ``code/`` (the build folder)
+    and ``tests/`` trees. Sibling module folders contain confusing near-duplicates of
+    the current build folder's code.
     """
-    return os.path.dirname(os.path.normpath(os.path.abspath(render_context.build_folder)))
+    return os.path.normpath(os.path.abspath(render_context.plain_module.build_folder))
+
+
+def _get_all_module_tests_folders(render_context: RenderContext) -> list[str]:
+    """Return the existing conformance-tests folders of every module under the modules root."""
+    modules_root = _get_modules_root(render_context)
+    if not os.path.isdir(modules_root):
+        return []
+    folders = []
+    for module_name in sorted(os.listdir(modules_root)):
+        tests_folder = render_context.conformance_tests.get_module_conformance_tests_folder(module_name)
+        if os.path.isdir(tests_folder):
+            folders.append(os.path.normpath(os.path.abspath(tests_folder)))
+    return folders
 
 
 def _check_read_access(full_path: str, render_context: RenderContext) -> str | None:

tests/test_agent_tools.py

@@ -18,14 +18,21 @@
 from render_machine.agent import tools
 from render_machine.agent.agent_runner import TERMINAL_TOOLS
 from render_machine.agent.tool_executor import DEFAULT_TOOLS
+from render_machine.conformance_tests import CONFORMANCE_TESTS_DEFINITION_FILE_NAME, ConformanceTests
 
 
 def _fake_render_context(build_folder: str) -> SimpleNamespace:
     """Minimal render-context stand-in accepted by the file tools."""
+    modules_root = os.path.dirname(os.path.normpath(os.path.abspath(build_folder)))
     return SimpleNamespace(
         build_folder=build_folder,
+        plain_module=SimpleNamespace(build_folder=modules_root),
         conformance_tests_running_context=None,
-        conformance_tests_folder=None,
+        conformance_tests=ConformanceTests(
+            modules_base_folder=modules_root,
+            conformance_tests_definition_file_name=CONFORMANCE_TESTS_DEFINITION_FILE_NAME,
+        ),
+        should_run_conformance_tests=lambda: False,
         memory_manager=None,
         conformance_tests_script=None,
         prepare_environment_script=None,
@@ -251,7 +258,6 @@ def test_tracking_conformance_test_file_change_does_not_rearm_preparation(projec
     Path(test_path).write_text("assert True\n", encoding="utf-8")
 
     render_context = _fake_render_context(build_folder)
-    render_context.conformance_tests_folder = conformance_folder
     render_context.conformance_tests_running_context = _conformance_ctx()
 
     tools._track_file_change(test_path, render_context)