fix: stack profile file mounts onto profile git-mounts to avoid masking

When a config profile declares both a git_mount and a mounts entry for the same directory (e.g. ~/.pi), the generated bind-mounts would mask each other inside the container. Instead, copy the static profile files into the instance-scoped git-mount source directory so the container sees both the cloned repo contents and the static files through a single bind-mount. - Add _stack_profile_mounts_with_git_mounts helper to merge overlapping profile mounts into git-mount sources. - Integrate stacking into start_tool_instance after resolving both mount types. - Add unit tests for exact, descendant, non-overlapping, and file cases.
2026-06-15 12:50:19 +00:00
parent 6a61669294
commit 3358af57c2
2 changed files with 236 additions and 2 deletions
@@ -6,6 +6,7 @@ import pytest

 from src.services.tool.instance_service import (
    _get_repository_mount_name,
+    _stack_profile_mounts_with_git_mounts,
    modify_compose_file,
    prepare_manifest_instance,
 )
@@ -85,6 +86,159 @@ class TestGetRepositoryMountName:
        assert _get_repository_mount_name(repo) == "my-cool-repo"


+@pytest.mark.unit
+class TestStackProfileMountsWithGitMounts:
+    """Tests for _stack_profile_mounts_with_git_mounts."""
+
+    def test_exact_overlap_merges_profile_files_into_git_source(
+        self, tmp_path
+    ) -> None:
+        """When a profile mount targets the same directory as a git mount,
+        the profile files should be copied into the git-mount source so the
+        container sees both sets of files through one bind mount."""
+        git_source = tmp_path / "git" / "repo-clone"
+        git_source.mkdir(parents=True)
+        (git_source / "existing.txt").write_text("from git")
+
+        profile_source = tmp_path / "profile" / "home_user_.pi"
+        profile_source.mkdir(parents=True)
+        (profile_source / "settings.json").write_text("{}")
+
+        profile_mounts = [
+            {
+                "source": str(profile_source),
+                "target": "/home/user/.pi",
+                "type": "bind",
+                "readonly": False,
+            }
+        ]
+        git_mount_volumes = [
+            {"source": str(git_source), "target": "/home/user/.pi", "type": "bind"}
+        ]
+
+        result = _stack_profile_mounts_with_git_mounts(
+            profile_mounts, git_mount_volumes
+        )
+
+        assert result == []
+        assert (git_source / "existing.txt").read_text() == "from git"
+        assert (git_source / "settings.json").read_text() == "{}"
+
+    def test_descendant_overlap_copies_into_subdirectory(self, tmp_path) -> None:
+        """Profile mounts targeting a child directory are copied into the
+        corresponding subdirectory of the git-mount source."""
+        git_source = tmp_path / "git"
+        git_source.mkdir()
+        (git_source / "README").write_text("repo")
+
+        profile_source = tmp_path / "profile" / "agent"
+        profile_source.mkdir(parents=True)
+        (profile_source / "settings.json").write_text("x")
+
+        profile_mounts = [
+            {
+                "source": str(profile_source),
+                "target": "/home/user/.pi/agent",
+                "type": "bind",
+            }
+        ]
+        git_mount_volumes = [
+            {"source": str(git_source), "target": "/home/user/.pi", "type": "bind"}
+        ]
+
+        result = _stack_profile_mounts_with_git_mounts(
+            profile_mounts, git_mount_volumes
+        )
+
+        assert result == []
+        assert (git_source / "agent" / "settings.json").read_text() == "x"
+        assert (git_source / "README").read_text() == "repo"
+
+    def test_non_overlapping_mounts_left_untouched(self, tmp_path) -> None:
+        """Profile mounts that do not overlap a git mount are returned as-is."""
+        git_source = tmp_path / "git"
+        git_source.mkdir()
+
+        profile_source = tmp_path / "profile"
+        profile_source.mkdir()
+        (profile_source / "config").write_text("c")
+
+        profile_mounts = [
+            {
+                "source": str(profile_source),
+                "target": "/home/user/.config",
+                "type": "bind",
+            }
+        ]
+        git_mount_volumes = [
+            {"source": str(git_source), "target": "/home/user/.pi", "type": "bind"}
+        ]
+
+        result = _stack_profile_mounts_with_git_mounts(
+            profile_mounts, git_mount_volumes
+        )
+
+        assert result == profile_mounts
+
+    def test_git_source_file_does_not_consume_profile_mount(self, tmp_path) -> None:
+        """If the overlapping git-mount source is a file, the profile mount
+        cannot be merged and must be kept."""
+        git_source = tmp_path / "file.txt"
+        git_source.write_text("file")
+
+        profile_source = tmp_path / "profile"
+        profile_source.mkdir()
+        (profile_source / "settings.json").write_text("{}")
+
+        profile_mounts = [
+            {
+                "source": str(profile_source),
+                "target": "/home/user/.pi",
+                "type": "bind",
+            }
+        ]
+        git_mount_volumes = [
+            {
+                "source": str(git_source),
+                "target": "/home/user/.pi/file.txt",
+                "type": "bind",
+            }
+        ]
+
+        result = _stack_profile_mounts_with_git_mounts(
+            profile_mounts, git_mount_volumes
+        )
+
+        assert result == profile_mounts
+
+    def test_profile_source_file_copied_into_git_source(self, tmp_path) -> None:
+        """A profile mount that supplies a single file is copied into the
+        git-mount source directory."""
+        git_source = tmp_path / "git"
+        git_source.mkdir()
+
+        profile_source = tmp_path / "settings.json"
+        profile_source.write_text("{}")
+
+        profile_mounts = [
+            {
+                "source": str(profile_source),
+                "target": "/home/user/.pi/settings.json",
+                "type": "bind",
+            }
+        ]
+        git_mount_volumes = [
+            {"source": str(git_source), "target": "/home/user/.pi", "type": "bind"}
+        ]
+
+        result = _stack_profile_mounts_with_git_mounts(
+            profile_mounts, git_mount_volumes
+        )
+
+        assert result == []
+        assert (git_source / "settings.json").read_text() == "{}"
+
+
@pytest.mark.unit
 async def test_prepare_manifest_instance_uses_workspace_path_basename():
    """WORKSPACE_NAME must be the repo-named workspace directory, not workspace.name."""