Skip to content

Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.

fix(doc-drift): join_relative normalizes segments instead of stripping characters (#4014) (#4023)

yi111d49f82e8b36b
diff --git a/packages/core/src/repowise/core/analysis/doc_drift/resolver.py b/packages/core/src/repowise/core/analysis/doc_drift/resolver.py
index d3b49c9ed..46616ece1 100644
--- a/packages/core/src/repowise/core/analysis/doc_drift/resolver.py
+++ b/packages/core/src/repowise/core/analysis/doc_drift/resolver.py
@@ -48,8 +48,6 @@ _HTML_ANCHOR_RE = re.compile(
re.I,
)
-_PARENT_SEGMENT_RE = re.compile(r"[^/]+/\.\./")
-
@dataclass
class Resolution:
@@ -246,18 +244,30 @@ def _scan_manifests(manifest_text: dict[str, str]) -> tuple[frozenset[str], froz
def join_relative(doc: str, target: str) -> str:
- """Resolve *target* as written relative to the document that names it."""
+ """Resolve *target* as written relative to the document that names it.
+
+ Segments are normalized, not character-stripped: ``lstrip("./")`` removed
+ the leading dot of ``.github/workflows/ci.yml`` (a real repository path)
+ and rewrote ``../../other-repo/README.md`` into an internal path. A
+ ``..`` that survives normalization escapes the repository root and is kept
+ as written, so the caller reads the target as external rather than as a
+ file this repository must hold.
+ """
doc_dir = doc.rsplit("/", 1)[0] if "/" in doc else ""
if not doc_dir:
return target
- joined = f"{doc_dir}/{target}"
- # Collapse "a/b/../c" without touching the filesystem.
- while True:
- collapsed = _PARENT_SEGMENT_RE.sub("", joined, count=1)
- if collapsed == joined:
- break
- joined = collapsed
- return joined.lstrip("./")
+ parts: list[str] = []
+ for segment in f"{doc_dir}/{target}".split("/"):
+ if segment == ".":
+ continue
+ if segment == "..":
+ if parts and parts[-1] != "..":
+ parts.pop()
+ else:
+ parts.append("..")
+ continue
+ parts.append(segment)
+ return "/".join(parts)
def _exists(idx: RepoIndex, target: str) -> bool:
diff --git a/tests/unit/doc_drift/test_resolver.py b/tests/unit/doc_drift/test_resolver.py
index 0b877e14a..14fe0459d 100644
--- a/tests/unit/doc_drift/test_resolver.py
+++ b/tests/unit/doc_drift/test_resolver.py
@@ -6,7 +6,7 @@ import pytest
from repowise.core.analysis.doc_drift.extractor import extract
from repowise.core.analysis.doc_drift.models import DocReference, DriftKind, DriftVerdict
-from repowise.core.analysis.doc_drift.resolver import RepoIndex, resolve
+from repowise.core.analysis.doc_drift.resolver import RepoIndex, join_relative, resolve
TREE = frozenset(
{
@@ -163,6 +163,51 @@ def test_relative_link_resolves_against_its_own_document():
assert res.detail == "relative-to-doc"
+# ---------------------------------------------------------------------------
+# join_relative: normalize segments, never strip characters (#4014)
+# ---------------------------------------------------------------------------
+
+
+def test_join_relative_keeps_the_leading_dot_of_a_dotfile_directory():
+ assert (
+ join_relative("docs/index.md", "../.github/workflows/ci.yml") == ".github/workflows/ci.yml"
+ )
+
+
+def test_join_relative_keeps_parent_segments_that_escape_the_root():
+ assert join_relative("docs/index.md", "../../other-repo/README.md") == "../other-repo/README.md"
+
+
+def test_a_link_into_dotgithub_resolves_instead_of_reporting_drift():
+ idx = _index(tree=TREE | {".github/workflows/ci.yml"})
+ ref = DocReference(
+ DriftKind.LINK,
+ "../.github/workflows/ci.yml",
+ "../.github/workflows/ci.yml",
+ "docs/index.md",
+ 1,
+ "ctx",
+ )
+ res = resolve(idx, ref)
+ assert res.verdict is DriftVerdict.RESOLVED
+ assert res.detail == "relative-to-doc"
+ assert res.resolved_target == ".github/workflows/ci.yml"
+
+
+def test_a_link_that_escapes_the_repository_root_is_uncheckable():
+ ref = DocReference(
+ DriftKind.LINK,
+ "../../other-repo/README.md",
+ "../../other-repo/README.md",
+ "docs/index.md",
+ 1,
+ "ctx",
+ )
+ res = resolve(_index(), ref)
+ assert res.verdict is DriftVerdict.UNCHECKABLE
+ assert res.detail == "unanchored"
+
+
# ---------------------------------------------------------------------------
# Anchors: rules 4 and 5
# ---------------------------------------------------------------------------