`39c0fab`

Anchor workspace mirror paths

Authored by

espadonne 2 weeks ago

SHA: 39c0fab3d89a9ba5f52b2ce6c3d9628786961b9d
Parents: 07b7555
Tree: baa5aaf

2 changed files

Status	File	+	-
M	`src/loader/runtime/hooks.py`	32	1
M	`tests/test_permissions.py`	9	0

src/loader/runtime/hooks.pymodified

          require_existing = context.tool_call.name in {"read", "glob", "grep", "edit", "patch"}
          resolved: str | None = None
 +        injected_messages: list[str] = []
          if raw_path.startswith("/"):
              resolved = self._resolve_workspace_mirror_path(
                  raw_path,
                  require_existing=require_existing,
+             )
 +            if resolved is not None:
 +                injected_messages.append(
 +                    self._workspace_mirror_correction_message(raw_path, resolved)
 +                )
          elif not raw_path.startswith("~"):
              resolved = self._resolve_recent_context_path(
                  raw_path,
          updated_arguments = dict(arguments)
          updated_arguments[argument_key] = resolved
 -        return HookResult(updated_arguments=updated_arguments)
 +        return HookResult(
 +            updated_arguments=updated_arguments,
 +            injected_messages=injected_messages,
 +        )
      def _argument_key(self, tool_name: str) -> str | None:
          if tool_name in self._FILE_TOOLS:
                  return str(remapped)
          return None
 +    def _workspace_mirror_correction_message(self, raw_path: str, resolved_path: str) -> str:
 +        raw_name = Path(str(raw_path)).name or str(raw_path)
 +        resolved_root = self._describe_anchor_root(resolved_path)
 +        return (
 +            "[Path anchor correction] A repo-local mirror path was remapped to the established "
 +            f"output root under `{resolved_root}`. Keep future file/search tool calls on that "
 +            f"external root and use `{raw_name}` there instead of re-anchoring work to the "
 +            "workspace checkout."
 +        )
++
 +    def _describe_anchor_root(self, path_value: str) -> str:
 +        resolved = Path(path_value).expanduser()
 +        try:
 +            candidate = resolved.resolve(strict=False)
 +        except Exception:
 +            candidate = resolved
++
 +        parts = candidate.parts
 +        if "Loader" in parts:
 +            loader_index = parts.index("Loader")
 +            return str(Path(*parts[: loader_index + 1]))
 +        return str(candidate.parent)
++
  _OBSERVATION_TOOLS = frozenset({"read", "glob", "grep", "bash"})
  _MUTATION_TOOLS = frozenset({"write", "edit", "patch", "bash"})

tests/test_permissions.pymodified

      assert result.updated_arguments is not None
      assert Path(result.updated_arguments["file_path"]).resolve() == expected_external_path.resolve()
 +    resolved_loader_root = (external_root / "Loader").resolve()
 +    assert result.injected_messages == [
 +        (
 +            "[Path anchor correction] A repo-local mirror path was remapped to the "
 +            f"established output root under `{resolved_loader_root}`. Keep future "
 +            "file/search tool calls on that external root and use `index.html` there "
 +            "instead of re-anchoring work to the workspace checkout."
 +        )
 +    ]
  class FakeSession: