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(ingestion): resolve a package language tie by name, not walk order (#2028)

Azhar Dewjiab63e8ac932b
diff --git a/packages/core/src/repowise/core/ingestion/traverser.py b/packages/core/src/repowise/core/ingestion/traverser.py
index c343b4cbb..9ea07d756 100644
--- a/packages/core/src/repowise/core/ingestion/traverser.py
+++ b/packages/core/src/repowise/core/ingestion/traverser.py
@@ -1243,7 +1243,13 @@ def _scan_package_dir(
pass
language: LanguageTag = "unknown"
if counts:
- language = max(counts, key=lambda k: counts[k]) # type: ignore[assignment]
+ # Tie-break by name, not by insertion order. counts is populated in
+ # walk order and walk_repo does not sort dirnames, so a bare
+ # max handed an exact tie returned whichever language the filesystem
+ # happened to yield first — a different answer on different machines,
+ # and on the same machine after an unrelated file was added. Highest
+ # count wins; equal counts resolve to the alphabetically first name.
+ language = min(counts, key=lambda k: (-counts[k], k)) # type: ignore[assignment]
return language, sorted(entry_points)
diff --git a/tests/unit/ingestion/test_traverser.py b/tests/unit/ingestion/test_traverser.py
index 923994cba..f0474bf86 100644
--- a/tests/unit/ingestion/test_traverser.py
+++ b/tests/unit/ingestion/test_traverser.py
@@ -1226,10 +1226,11 @@ class TestPackageScanPruning:
pkg = self._pkg(tmp_path, "node_modules/\n") # dist/ deliberately tracked
dist = pkg / "dist"
dist.mkdir()
- # Outnumber the one real source rather than tie with it: `walk_repo`
- # does not sort dirnames, so on a tie `max(counts, key=...)` returns
- # whichever language the filesystem happened to yield first. That made
- # this pass locally and fail on CI.
+ # Outnumber the one real source rather than tie with it, so this test
+ # asserts pruning and not tie-breaking. Ties are now resolved by name
+ # (see test_an_exact_language_tie_does_not_depend_on_walk_order); before
+ # that they followed filesystem order, which is what made this pass
+ # locally and fail on CI.
for i in range(5):
(dist / f"chunk{i}.js").write_text("var a=1;\n", encoding="utf-8")
@@ -1241,6 +1242,49 @@ class TestPackageScanPruning:
assert unpruned == "javascript"
assert pruned == "typescript"
+ def test_an_exact_language_tie_does_not_depend_on_walk_order(
+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ """A tie must resolve the same way whatever order the filesystem yields.
+
+ counts is built in walk order and walk_repo does not sort
+ dirnames, so a bare max returned whichever tied language came
+ first — machine-dependent, and unstable on one machine as unrelated
+ files are added. Drive both orders through the same package and require
+ one answer.
+ """
+ # Built by hand rather than via _pkg: that helper ships a src/index.ts,
+ # which makes typescript win outright and there is no tie left to test.
+ (tmp_path / ".gitignore").write_text("", encoding="utf-8")
+ pkg = tmp_path / "pkg"
+ pkg.mkdir()
+ (pkg / "package.json").write_text('{"name": "p"}', encoding="utf-8")
+ (pkg / "a.js").write_text("var a=1;\n", encoding="utf-8")
+ (pkg / "b.ts").write_text("const b: number = 1;\n", encoding="utf-8")
+
+ # ``_scan_package_dir`` imports walk_repo inside the function body, so
+ # the patch has to land on the source module, not on the traverser.
+ from repowise.core import fs_walk
+
+ real_walk = fs_walk.walk_repo
+
+ def walk_in(order: list[str]):
+ def _walk(directory, **kwargs):
+ for dirpath, dirnames, filenames in real_walk(directory, **kwargs):
+ known = [f for f in order if f in filenames]
+ rest = [f for f in filenames if f not in order]
+ yield dirpath, dirnames, known + rest
+
+ return _walk
+
+ monkeypatch.setattr(fs_walk, "walk_repo", walk_in(["a.js", "b.ts"]))
+ js_first, _ = _scan_package_dir(pkg, tmp_path, is_pruned=_never_pruned)
+
+ monkeypatch.setattr(fs_walk, "walk_repo", walk_in(["b.ts", "a.js"]))
+ ts_first, _ = _scan_package_dir(pkg, tmp_path, is_pruned=_never_pruned)
+
+ assert js_first == ts_first
+
def test_a_package_with_nothing_indexed_reports_unknown(self, tmp_path: Path) -> None:
"""The one shape where the answer gets smaller rather than sharper."""
pkg = self._pkg(tmp_path, "pkg/src/\n")