sourcecode 1.69.0__tar.gz → 1.70.0__tar.gz

{sourcecode-1.69.0 → sourcecode-1.70.0}/CHANGELOG.md

@@ -1,5 +1,66 @@
 # Changelog
 
+## [1.70.0] — 2026-07-01
+
+### Fixed — reliability & internal-consistency on a large Spring 5 / Hibernate 5 repo (openmrs-core field test)
+
+A full migration audit of **openmrs-core** (`7c0144ad2`, branch `2.9.x`; ~866
+production files, Maven multi-module, Spring Framework 5 + Hibernate 5, classic
+WAR, **no Spring Boot**) surfaced four reproducible defects where a headline value
+was wrong or internally contradictory. Each fix targets the **root cause** and,
+where certainty is not achievable, degrades to an explicit low-confidence / `null`
+signal rather than asserting a concrete-but-false value. New regression coverage
+across four suites.
+
+- **`migrate-check` — Hibernate version confused a sibling artifact's version (BUG #1, CRITICAL).**
+  Hibernate ORM was resolved by scanning for *any* `<hibernate*version>` property
+  and keeping the **newest**, so on openmrs `${hibernateSearchVersion}=6.2.4.Final`
+  (Hibernate **Search**, a different artifact) beat `${hibernateVersion}=5.6.15.Final`
+  (Hibernate **ORM**). The tool declared the repo "already on Hibernate 6", set
+  `migration_applicable:false`, and silently **dropped the 28.9–95.6 person-day**
+  rewrite range from `estimated_effort_days` (under-reporting 1.5–2.6×). Resolution
+  is now **anchored to the `hibernate-core`/`hibernate-orm` dependency** — the
+  `<version>` on that coordinate, resolving a `${property}` to the *specific*
+  referenced property, and the Gradle coordinate. The property fallback (BOM-managed
+  repos) **excludes sibling artifacts** (Search/Validator/Envers/OGM/…). openmrs now
+  resolves `5.6.15.Final` / major 5 / `migration_applicable:true`, and
+  `estimated_effort_days` includes the Hibernate rewrite range via a new
+  `effort_breakdown` block. The same-name contradiction (`hibernate_readiness:100`
+  at root vs `0` nested) is removed: the nested field is renamed
+  **`rewrite_zone_readiness`** (raw rewrite-zone score, independent of applicability),
+  leaving the document-root `hibernate_readiness` as the single authoritative,
+  applicability-gated score.
+
+- **`impact-chain` — a class's own methods counted as "direct callers" (BUG #2, HIGH).**
+  For a class-level seed, the BFS folds in every method key of the class, so internal
+  method→method calls leaked into `direct_callers`. On `ConceptServiceImpl` this
+  reported **24 direct callers (22 of them own members)**, inflating `risk_score` to
+  `20.0`/`high` — ~12× the real blast radius. Callers whose owning class is a seed
+  class are now excluded (they are *members*, not external callers); the count is
+  surfaced as `self_referential_excluded` plus an `analysis_warnings` entry.
+  `ConceptServiceImpl` now reports **2 external callers**, `risk_score` recomputed to
+  `8.5`/`medium`.
+
+- **`export --integrations` — a user class classified as a JDK API by bare name (BUG #3, MEDIUM).**
+  `org.openmrs.util.HttpClient` (a thin wrapper over `java.net.HttpURLConnection`)
+  was labeled `jdk-httpclient` purely because its simple name matches
+  `java.net.http.HttpClient`. The client is now resolved by the **fully-qualified
+  import** — `jdk-httpclient` only when `java.net.http.HttpClient` is actually
+  imported and the file does not declare its own — otherwise it degrades to a
+  low-confidence **`custom-http-wrapper`**. Pure type-declaration sites (field,
+  parameter, return type such as `setImplementationIdHttpClient(HttpClient c)`) are
+  no longer emitted as network-invocation evidence; only constructions / static calls
+  count.
+
+- **`--compact` — "rest api" headline unsupported by the `endpoints` command (BUG #4, LOW).**
+  The `architecture_summary` label is driven by HTTP-framework **presence** (Spring
+  MVC on the classpath), so openmrs was headlined "Java rest api" while the
+  authoritative `endpoints` command found **only 3 endpoints** (one a test module,
+  one medium-confidence `router_dsl`). The summary now consults the same endpoint
+  extractor and, below a high-confidence-endpoint threshold, degrades to a qualified,
+  consistent phrasing ("HTTP framework present; only N endpoints detected — see
+  `endpoints`") instead of overclaiming (Java/Kotlin repos only).
+
 ## [1.69.0] — 2026-06-30
 
 ### Fixed — framing & symbol-graph fidelity on a non-framework Java library (JobRunr field test)
@@ -57,8 +118,16 @@ suites.
   emits the misleading "No stereotype detected — may be a plain class or utility" for
   a structurally central non-annotated class: it infers a low-confidence stereotype
   from in-degree, lifecycle methods, and naming (e.g. `BackgroundJobServer` →
-  "Likely server/orchestrator … lifecycle methods detected (start/stop)"). JobRunr
-  `project_type` "api" → "library", `frameworks` `["Quarkus"]` → `[]`.
+  "Likely server/orchestrator … lifecycle methods detected (start/stop)"). Finally
+  the `architecture_summary` no longer prints a phantom "MVC pattern with
+  controller, model, view layers" for a non-web library: MVC now requires a real
+  View layer (it was inferred from a `handlers` dir + a `model` dir with no view),
+  a bundled SPA under `src/main/resources/.../frontend` is no longer counted as a
+  backend view layer, `testFixtures` source roots are excluded, and View detection
+  recognizes template files (`.html`/etc.) that the code-extension filter dropped.
+  JobRunr `project_type` "api" → "library", `frameworks` `["Quarkus"]` → `[]`,
+  architecture "MVC … controller, model, view" → "Layered … controller, repository,
+  infrastructure".
 
 ## [1.68.0] — 2026-06-30
 

{sourcecode-1.69.0 → sourcecode-1.70.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sourcecode
-Version: 1.69.0
+Version: 1.70.0
 Summary: Persistent structural context and ultra-fast repeated analysis for AI coding agents
 License-File: LICENSE
 Keywords: agents,ai,codebase,context,developer-tools,llm

{sourcecode-1.69.0 → sourcecode-1.70.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sourcecode"
-version = "1.69.0"
+version = "1.70.0"
 description = "Persistent structural context and ultra-fast repeated analysis for AI coding agents"
 readme = "README.md"
 requires-python = ">=3.9"

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/__init__.py

@@ -1,3 +1,3 @@
 """sourcecode — Deterministic codebase context maps for AI coding agents."""
 
-__version__ = "1.69.0"
+__version__ = "1.70.0"

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/architecture_analyzer.py

@@ -38,7 +38,15 @@ _CODE_EXTENSIONS = {
 }
 _GENERIC_NAMES = {"utils", "helpers", "common", "shared", "misc", "core", "root", ""}
 
-_TEST_DIRS: frozenset[str] = frozenset({"tests", "test", "spec", "specs", "__tests__", "e2e"})
+_TEST_DIRS: frozenset[str] = frozenset({
+    "tests", "test", "spec", "specs", "__tests__", "e2e",
+    # Gradle/Maven test-fixture source roots are test code, not runtime architecture.
+    "testfixtures", "testfixture",
+})
+# Always-vendored asset trees — never a backend code layer at any depth.
+_ASSET_DIRS: frozenset[str] = frozenset({
+    "node_modules", "bower_components",
+})
 _BENCHMARK_DIRS: frozenset[str] = frozenset({
     "benchmark", "benchmarks", "bench",
     "example", "examples",
@@ -50,7 +58,7 @@ _BENCHMARK_DIRS: frozenset[str] = frozenset({
 _DOCS_DIRS: frozenset[str] = frozenset({"docs", "doc", "documentation", "wiki"})
 _TOOLING_DIRS: frozenset[str] = frozenset({"scripts", "script", "tools", "tool", "ci"})
 # All dirs that are not part of the runtime source architecture
-_NON_SOURCE_DIRS: frozenset[str] = _TEST_DIRS | _BENCHMARK_DIRS | _DOCS_DIRS | _TOOLING_DIRS
+_NON_SOURCE_DIRS: frozenset[str] = _TEST_DIRS | _BENCHMARK_DIRS | _DOCS_DIRS | _TOOLING_DIRS | _ASSET_DIRS
 
 # Exact file stems that signal a specific architectural layer
 _LAYER_STEM_EXACT: dict[str, str] = {
@@ -150,6 +158,15 @@ LAYER_PATTERNS: dict[str, dict[str, list[str]]] = {
     },
 }
 
+# Layer keys a pattern MUST match to qualify, regardless of score. BUG (JobRunr
+# field test): "mvc" was inferred from a controller-ish dir (`handlers`) plus a
+# `model` dir, with NO view layer — that is not MVC (a library with no templates/
+# pages/components is at most layered). MVC's defining trait is the View, so require
+# it; without it the pattern falls through to layered / a weaker match.
+_PATTERN_REQUIRED_KEYS: dict[str, frozenset[str]] = {
+    "mvc": frozenset({"view"}),
+}
+
 # Higher value = wins when score ties
 _PATTERN_PRIORITY: dict[str, int] = {
     "cqrs":               8,
@@ -245,8 +262,12 @@ class ArchitectureAnalyzer:
         # Step 2: domain clustering
         domains = self._cluster_domains(filtered)
 
-        # Step 3: layer detection
-        pattern, layers = self._detect_layers(filtered)
+        # Step 3: layer detection. Feed the FULL path list (not the code-extension
+        # `filtered` set): a View layer is template files (.html/.jinja/.ejs…) that
+        # `filtered` would drop, hiding the very layer that distinguishes MVC.
+        # _detect_layers applies its own non-source/asset/test dir filtering, so
+        # bundled frontend trees and test fixtures are still excluded.
+        pattern, layers = self._detect_layers(sm.file_paths)
         if pattern in (None, "flat", "unknown"):
             if pattern == "flat":
                 limitations.append("Layer pattern not detected: project has a flat directory structure")
@@ -518,10 +539,18 @@ class ArchitectureAnalyzer:
         return domains
 
     def _detect_layers(self, paths: list[str]) -> tuple[str, list[ArchitectureLayer]]:
-        # Exclude non-source paths (tests, benchmarks, docs, tooling) from layer scoring
+        # Exclude non-source paths (tests, benchmarks, docs, tooling, vendored assets)
+        # from layer scoring. Also exclude anything under a `resources/` segment: in
+        # Maven/Gradle layouts `src/main/resources/**` is bundled config/assets — e.g.
+        # JobRunr ships a React dashboard SPA at
+        # `core/src/main/resources/org/jobrunr/dashboard/frontend/src/components`, whose
+        # `components` dir would otherwise be miscounted as a backend MVC "view" layer.
         source_paths = [
             p for p in paths
-            if not any(part.lower() in _NON_SOURCE_DIRS for part in p.replace("\\", "/").split("/"))
+            if not any(
+                part.lower() in _NON_SOURCE_DIRS or part.lower() == "resources"
+                for part in p.replace("\\", "/").split("/")
+            )
         ]
         if not source_paths:
             return "unknown", []
@@ -544,6 +573,10 @@ class ArchitectureAnalyzer:
                 matched_dirs = [d for d in dir_names if d in keywords]
                 if matched_dirs:
                     matched[layer_key] = matched_dirs
+            # A pattern with unmet required keys cannot qualify (e.g. mvc needs a view).
+            required = _PATTERN_REQUIRED_KEYS.get(pattern_name)
+            if required and not required.issubset(matched.keys()):
+                continue
             score = len(matched)
             priority = _PATTERN_PRIORITY.get(pattern_name, 0)
             if (score, priority) > (best_score, best_priority):

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/architecture_summary.py

@@ -23,6 +23,14 @@ _JAVA_EXTENSIONS = {".java", ".kt", ".scala"}
 
 _CORE_DETECTION_MODULES = {"scanner", "detectors", "classifier", "workspace"}
 
+# BUG #4 (v1.70.0): the "REST API" project-type label is driven by HTTP-framework
+# PRESENCE (Spring MVC / JAX-RS on the classpath), not by an actual endpoint count.
+# The `--compact` summary is the first (often only) thing an agent reads, so it must
+# not assert "rest api" when the authoritative `endpoints` command finds almost no
+# high-confidence surface. Below this many high-confidence endpoints we degrade the
+# headline to a qualified, consistent phrasing instead of overclaiming.
+_MIN_REST_ENDPOINTS_FOR_LABEL = 5
+
 _OPTIONAL_LABEL_MAP: dict[str, str] = {
     "DependencyAnalyzer": "dependencias",
     "GraphAnalyzer": "grafo de módulos",
@@ -41,6 +49,7 @@ class ArchitectureSummarizer:
 
     def __init__(self, root: Path) -> None:
         self.root = root
+        self._endpoint_support_cache: tuple[int, int] | None = None
 
     def generate(self, sm: SourceMap) -> str | None:
         try:
@@ -185,9 +194,39 @@ class ArchitectureSummarizer:
 
         fw_str = f" using {', '.join(fw_names)}" if fw_names else ""
         if runtime:
+            # BUG #4: never assert "rest api" in the headline unless the endpoints
+            # command actually backs it (Java/Kotlin only — that is where we have an
+            # authoritative extractor). Degrade to a qualified, consistent phrasing.
+            if sm.project_type == "api" and primary.stack in {"java", "kotlin"}:
+                total, high = self._endpoint_support()
+                if high < _MIN_REST_ENDPOINTS_FOR_LABEL:
+                    plural = "s" if total != 1 else ""
+                    return (
+                        f"{stack_label} application{fw_str} "
+                        f"(HTTP framework present; only {total} endpoint{plural} "
+                        f"detected — see `endpoints`)."
+                    )
             return f"{stack_label} {runtime.lower()}{fw_str}."
         return f"{stack_label} project{fw_str}."
 
+    def _endpoint_support(self) -> tuple[int, int]:
+        """Return (total, high_confidence) endpoint counts from the canonical
+        Java endpoint extractor — the same source the `endpoints` command uses,
+        so the summary cannot diverge from it. Cached; failure degrades to (0, 0)."""
+        if self._endpoint_support_cache is not None:
+            return self._endpoint_support_cache
+        total, high = 0, 0
+        try:
+            from sourcecode.repository_ir import extract_java_endpoints
+            data = extract_java_endpoints(self.root)
+            eps = data.get("endpoints", [])
+            total = data.get("total", len(eps))
+            high = sum(1 for e in eps if (e.get("confidence") or "high") == "high")
+        except Exception:
+            total, high = 0, 0
+        self._endpoint_support_cache = (total, high)
+        return self._endpoint_support_cache
+
     def _describe_arch_pattern(self, arch: Any) -> str:
         pattern_labels = {
             "clean": "Clean Architecture",

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/hibernate_strat.py

@@ -262,15 +262,33 @@ def _scan_build_dependency(root: Path) -> tuple[bool, list[str]]:
 # ≥ 6 the 5→6 axis does NOT apply (the migration is already done). When it cannot
 # be resolved the axis degrades to a low-confidence hypothesis (no headline).
 _HIB_VER = r"(\d+\.\d+(?:\.\d+)?(?:[.\-][\w]+)*)"  # 6.2.13.Final, 5.6.15, 6.2
+_HIB_VER_ANCHORED = re.compile(r"^" + _HIB_VER + r"$")
 _HIB_PROP_RE = re.compile(
     r"<((?:[\w.\-]*hibernate[\w.\-]*?)\.?version)>\s*" + _HIB_VER + r"\s*</\1>",
     re.IGNORECASE,
 )
-_HIB_COORD_VERSION_RE = re.compile(
-    r"<artifactId>\s*hibernate-(?:core|orm)\s*</artifactId>\s*"
-    r"(?:<[^>]+>[^<]*</[^>]+>\s*)*?<version>\s*" + _HIB_VER,
+# A Hibernate property is ONLY a proxy for the ORM version when it is not the
+# version of a sibling Hibernate artifact (Search, Validator, Envers, OGM, …).
+# Those ship on their own version line (e.g. hibernate-search 6.x on a
+# hibernate-core 5.x project) and must never be mistaken for the ORM version.
+# BUG #1 (v1.70.0): openmrs pinned hibernate-core to 5.6.15 via ${hibernateVersion}
+# while ${hibernateSearchVersion}=6.2.4 — the old "newest wins" scan picked the
+# Search version and declared the project already on Hibernate 6.
+_HIB_NON_CORE_PROP_RE = re.compile(
+    r"search|validator|envers|ogm|reactive|spatial|jpamodelgen|"
+    r"jpa-?model|gradle|tool|commons|metamodel",
+    re.IGNORECASE,
+)
+# Anchor: capture the <version> declared inside the hibernate-core/orm
+# <dependency> block (the value may be a literal or a ${property} reference).
+_HIB_CORE_DEP_RE = re.compile(
+    r"<dependency>(?P<body>(?:(?!</dependency>).)*?"
+    r"<artifactId>\s*hibernate-(?:core|orm)\s*</artifactId>"
+    r"(?:(?!</dependency>).)*?)</dependency>",
     re.IGNORECASE | re.DOTALL,
 )
+_VERSION_TAG_RE = re.compile(r"<version>\s*([^<]+?)\s*</version>", re.IGNORECASE)
+_PROP_REF_RE = re.compile(r"^\$\{([^}]+)\}$")
 _HIB_GRADLE_VERSION_RE = re.compile(
     r"org\.hibernate(?:\.orm)?:hibernate-(?:core|orm):" + _HIB_VER,
     re.IGNORECASE,
@@ -290,37 +308,88 @@ def _ver_key(full: str) -> tuple[int, int]:
     return (major, minor)
 
 
+def _lookup_maven_property(texts: list[str], name: str) -> Optional[str]:
+    """Resolve a single Maven property by exact tag name across build files."""
+    pat = re.compile(
+        r"<" + re.escape(name) + r">\s*([^<]+?)\s*</" + re.escape(name) + r">",
+        re.IGNORECASE,
+    )
+    for t in texts:
+        m = pat.search(t)
+        if m:
+            return m.group(1).strip()
+    return None
+
+
+def _resolve_version_expr(texts: list[str], expr: str, depth: int = 0) -> Optional[str]:
+    """Resolve a <version> value that may be a literal or a ${property} chain."""
+    expr = expr.strip()
+    ref = _PROP_REF_RE.match(expr)
+    if ref:
+        if depth > 5:
+            return None
+        val = _lookup_maven_property(texts, ref.group(1))
+        if val is None:
+            return None
+        return _resolve_version_expr(texts, val, depth + 1)
+    return expr if _HIB_VER_ANCHORED.match(expr) else None
+
+
 def _resolve_hibernate_version(root: Path) -> tuple[Optional[str], Optional[int], str]:
     """Return (full_version_string, major, confidence) for the effective Hibernate.
 
-    confidence is "high" when a version was resolved from a build descriptor,
-    "none" when none could be determined (degrade to hypothesis). The newest
-    declared Hibernate wins in a multi-module build.
+    Resolution order (BUG #1 — never trust a same-named-but-different artifact):
+      1. The <version> anchored to the hibernate-core / hibernate-orm dependency
+         (literal, or a ${property} resolved to that specific property), and the
+         Gradle org.hibernate(.orm):hibernate-(core|orm) coordinate. HIGH conf.
+      2. Fallback: a <hibernate*version> property that is NOT a sibling-artifact
+         version (Search/Validator/Envers/…). HIGH conf.
+      3. None resolvable → degrade to hypothesis (confidence "none").
+    The newest qualifying version wins in a multi-module build.
     """
     import os
-    best_full: Optional[str] = None
+    texts: list[str] = []
     for dirpath, dirnames, filenames in os.walk(root):
         dirnames[:] = [d for d in dirnames if d not in _SKIP_BUILD_SCAN_DIRS]
         for fname in filenames:
             if fname not in _BUILD_FILE_NAMES:
                 continue
             try:
-                text = (Path(dirpath) / fname).read_text(encoding="utf-8", errors="replace")
+                texts.append(
+                    (Path(dirpath) / fname).read_text(encoding="utf-8", errors="replace")
+                )
             except OSError:
                 continue
-            fulls: list[str] = []
-            for m in _HIB_PROP_RE.finditer(text):
-                fulls.append(m.group(2))
-            for m in _HIB_COORD_VERSION_RE.finditer(text):
-                fulls.append(m.group(1))
-            for m in _HIB_GRADLE_VERSION_RE.finditer(text):
-                fulls.append(m.group(1))
-            for full in fulls:
-                if best_full is None or _ver_key(full) > _ver_key(best_full):
-                    best_full = full
-    if best_full is None:
+    if not texts:
         return None, None, "none"
-    return best_full, _ver_key(best_full)[0], "high"
+
+    # 1. Anchored to the hibernate-core / hibernate-orm coordinate.
+    anchored: list[str] = []
+    for text in texts:
+        for dep in _HIB_CORE_DEP_RE.finditer(text):
+            vm = _VERSION_TAG_RE.search(dep.group("body"))
+            if vm:
+                resolved = _resolve_version_expr(texts, vm.group(1))
+                if resolved:
+                    anchored.append(resolved)
+        for m in _HIB_GRADLE_VERSION_RE.finditer(text):
+            anchored.append(m.group(1))
+    if anchored:
+        best = max(anchored, key=_ver_key)
+        return best, _ver_key(best)[0], "high"
+
+    # 2. Fallback: a Hibernate *property* that is not a sibling-artifact version.
+    prop_cands: list[str] = []
+    for text in texts:
+        for m in _HIB_PROP_RE.finditer(text):
+            if _HIB_NON_CORE_PROP_RE.search(m.group(1)):
+                continue
+            prop_cands.append(m.group(2))
+    if prop_cands:
+        best = max(prop_cands, key=_ver_key)
+        return best, _ver_key(best)[0], "high"
+
+    return None, None, "none"
 
 # Escalation markers — dynamic / reflection-based persistence construction.
 _ABSTRACTION_CLASS_RE = re.compile(
@@ -495,7 +564,13 @@ class HibernateStratification:
             "classification": self.classification,
             "classification_label": self.classification_label,
             "stratified": True,
-            "hibernate_readiness": self.readiness,
+            # BUG #1 (v1.70.0): renamed from "hibernate_readiness" to avoid a
+            # same-name contradiction with the document-level migrate-check field.
+            # This is the RAW 5→6 rewrite-zone readiness (independent of whether the
+            # axis applies). The authoritative, applicability-gated migration score
+            # lives at the document root as "hibernate_readiness"; consult that one
+            # for decisions. They diverge by design when the axis is N/A.
+            "rewrite_zone_readiness": self.readiness,
             "risk_matrix": [r.to_dict() for r in self.risk_matrix],
             "module_exposure_map": self.module_exposure,
             "incompatible_patterns": self.incompatible_patterns,

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/integration_detector.py

@@ -200,6 +200,27 @@ def detect_integrations(file_paths: "list[str]", root: Path) -> dict:
         has_mail_import = bool(_MAIL_IMPORT_RE.search(text))
         naming_factory = _classify_naming_factory(text)
 
+        # BUG #3 (v1.70.0): "HttpClient" is a simple name that collides with
+        # user-defined classes (e.g. org.openmrs.util.HttpClient, a thin wrapper over
+        # java.net.HttpURLConnection — a completely different API from the JDK 11+
+        # java.net.http.HttpClient). Resolve the JDK client by its FULLY-QUALIFIED
+        # import, never by the bare class name. When the file imports/declares a
+        # different HttpClient (or none can be resolved), degrade to a low-confidence
+        # "custom-http-wrapper" rather than asserting a JDK client that isn't there.
+        import_fqns = set(
+            re.findall(r"^\s*import\s+(?:static\s+)?([\w.]+)\s*;", text, re.MULTILINE)
+        )
+        http_jdk_imported = (
+            "java.net.http.HttpClient" in import_fqns or "java.net.http.*" in import_fqns
+        )
+        declares_own_httpclient = bool(
+            re.search(r"\b(?:class|interface|enum)\s+HttpClient\b", text)
+        )
+        http_other_import = any(
+            fqn.endswith(".HttpClient") and not fqn.startswith("java.net.http.")
+            for fqn in import_fqns
+        )
+
         # Token clients — per line, skipping imports/package/comment noise.
         # First pass records the declaration site and any variable name bound to
         # the client, so a later call site (where the URL literal usually lives)
@@ -241,6 +262,27 @@ def detect_integrations(file_paths: "list[str]", root: Path) -> dict:
                         kind, client, confidence = (
                             "naming-directory-unknown", "jndi-dircontext", "low",
                         )
+                # BUG #3: resolve the ambiguous bare "HttpClient" by its import, and
+                # suppress pure type-declaration sites (field / parameter / return
+                # type) — only a construction or static call is a real network site.
+                if client == "jdk-httpclient":
+                    if not (http_jdk_imported and not declares_own_httpclient):
+                        # Not the JDK client (own class, third-party, or unresolvable).
+                        client, confidence = "custom-http-wrapper", "low"
+                        if declares_own_httpclient or http_other_import:
+                            confidence = "low"
+                    is_construction = bool(
+                        re.search(r"\bnew\s+HttpClient\b", line)
+                    ) or bool(re.search(r"\bHttpClient\s*\.", line))
+                    if not is_construction:
+                        # Type-declaration only (e.g. `HttpClient field;`,
+                        # `void setX(HttpClient c)`): track the var for the URL
+                        # second pass but do NOT emit it as an invocation site.
+                        tok = m.group(0)
+                        decl = re.search(re.escape(tok) + r"\s+(\w+)\b", line)
+                        if decl:
+                            var_to_client[decl.group(1)] = (kind, client)
+                        continue
                 _add(kind, client, _extract_target(line), rel, lineno, confidence)
                 tok = m.group(0)
                 # `Type name` (field/local decl) and `name = new Type(` forms.

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/migrate_check.py

@@ -1287,6 +1287,7 @@ class MigrationReport:
     readiness_aggregate: dict = field(default_factory=dict)
     blocking_count: int = 0
     estimated_effort_days: float = 0.0
+    effort_breakdown: dict = field(default_factory=dict)
     # Tri-state: True = Boot 2 confirmed, False = Boot 3+ confirmed,
     # None = could not determine. Absence of evidence is never reported as True.
     spring_boot_2_detected: Optional[bool] = None
@@ -1499,13 +1500,32 @@ class MigrationReport:
 
         # BUG #5: effort over MAIN findings only — N/A axes (Hibernate-6 phantom,
         # test fixtures) no longer pad the estimate.
-        self.estimated_effort_days = round(
+        _file_effort = (
             len(critical_files) * 0.5
             + len(high_files) * 0.25
             + len(medium_files) * 0.1
-            + len(low_files) * 0.05,
-            1,
+            + len(low_files) * 0.05
         )
+        # BUG #1 (v1.70.0): when the Hibernate 5→6 axis APPLIES, fold its measured
+        # rewrite effort (risk_matrix → total_effort_range_days) into the headline
+        # estimate. Previously a Hibernate-5 project whose ${hibernateVersion} was
+        # misread as 6 set migration_applicable=False, which silently DROPPED this
+        # 28.9–95.6 person-day range from estimated_effort_days, under-reporting the
+        # real cost 1.5–2.6×. We add the range midpoint and expose the breakdown.
+        _hib_effort = 0.0
+        if _hibernate_applies and hib is not None:
+            _r = hib.total_effort_range_days or {}
+            _lo, _hi = _r.get("low"), _r.get("high")
+            if isinstance(_lo, (int, float)) and isinstance(_hi, (int, float)):
+                _hib_effort = (float(_lo) + float(_hi)) / 2.0
+        self.estimated_effort_days = round(_file_effort + _hib_effort, 1)
+        self.effort_breakdown = {
+            "findings_effort_days": round(_file_effort, 1),
+            "hibernate_rewrite_effort_days": round(_hib_effort, 1),
+            "hibernate_rewrite_range": (
+                hib.total_effort_range_days if (_hibernate_applies and hib is not None) else None
+            ),
+        }
 
         # BUG #6 / #8: hygiene + non-blocking buckets, surfaced separately.
         self.hygiene_findings = sum(
@@ -1561,6 +1581,7 @@ class MigrationReport:
             "headline_blocker": self.headline_blocker,
             "blocking_count": self.blocking_count,
             "estimated_effort_days": self.estimated_effort_days,
+            "effort_breakdown": self.effort_breakdown,
             "hygiene_findings": self.hygiene_findings,
             "non_blocking": self.non_blocking,
             "spring_present": self.spring_present,

{sourcecode-1.69.0 → sourcecode-1.70.0}/src/sourcecode/spring_impact.py

@@ -121,6 +121,8 @@ class ImpactChainResult:
     resolution: str = "not_found"              # "exact" | "class_expanded" | "partial" | "not_found"
     direct_callers: list[str] = field(default_factory=list)
     indirect_callers: list[str] = field(default_factory=list)
+    # BUG #2: count of own-class members dropped from callers (members, not callers).
+    self_referential_excluded: int = 0
     implementations: list[str] = field(default_factory=list)  # in-repo subtypes of queried interface/base
     endpoints_affected: list[AffectedEndpoint] = field(default_factory=list)
     transaction_boundary: Optional[dict] = None   # TransactionBoundary.to_dict() or None
@@ -144,6 +146,7 @@ class ImpactChainResult:
             "resolution": self.resolution,
             "direct_callers": self.direct_callers,
             "indirect_callers": self.indirect_callers,
+            "self_referential_excluded": self.self_referential_excluded,
             "implementations": self.implementations,
             "endpoints_affected": [ep.to_dict() for ep in self.endpoints_affected],
             "transaction_boundary": self.transaction_boundary,
@@ -471,6 +474,15 @@ def _bfs_callers(
     indirect: list[str] = []
     was_truncated = False
 
+    # BUG #2 (v1.70.0): a class's OWN members are not "callers" of that class — they
+    # are members. When the seed is a class node, _edges_for folds in every method
+    # key of that class, so internal method→method calls (e.g.
+    # ConceptServiceImpl#purgeConcept → ConceptServiceImpl#saveConcept) were leaking
+    # into direct_callers and inflating the blast radius ~12×. Exclude any caller
+    # whose owning class is one of the seed classes.
+    seed_classes: set[str] = {normalize_owner_fqn(s) for s in seed_fqns}
+    self_excluded: int = 0
+
     # BUG-004: index class FQN → list of method-level keys in reverse_graph.
     # Callers of Foo#doWork are stored under reverse_graph["Foo#doWork"], never
     # under reverse_graph["Foo"].  Without this index, BFS silently terminates
@@ -506,7 +518,9 @@ def _bfs_callers(
     for seed in seed_fqns:
         for etype, fqn_list in _edges_for(seed):
             if etype not in _SKIP_EDGE_TYPES:
-                unique_direct_callers.update(fqn_list)
+                unique_direct_callers.update(
+                    c for c in fqn_list if normalize_owner_fqn(c) not in seed_classes
+                )
 
     effective_depth = 1 if len(unique_direct_callers) > _BFS_CALLER_CAP else max_depth
     if effective_depth < max_depth:
@@ -516,8 +530,14 @@ def _bfs_callers(
     queue: list[tuple[str, int]] = [(s, 0) for s in seed_fqns]
 
     def _add_caller(caller: str, depth: int) -> None:
+        nonlocal self_excluded
         if caller in visited:
             return
+        # BUG #2: a member of a seed class is not an external caller — drop it.
+        if normalize_owner_fqn(caller) in seed_classes:
+            visited.add(caller)
+            self_excluded += 1
+            return
         visited.add(caller)
         if depth == 0:
             direct.append(caller)
@@ -542,7 +562,7 @@ def _bfs_callers(
                 else:
                     _add_caller(caller, depth)
 
-    return direct, indirect, was_truncated
+    return direct, indirect, was_truncated, self_excluded
 
 
 # ---------------------------------------------------------------------------
@@ -888,9 +908,15 @@ class ImpactOrchestrator:
                 )
 
         # ── 2. BFS through reverse graph ─────────────────────────────────
-        direct_callers, indirect_callers, truncated = _bfs_callers(
+        direct_callers, indirect_callers, truncated, self_excluded = _bfs_callers(
             seed_fqns, cir.reverse_graph, depth, impl_graph=impl_graph
         )
+        if self_excluded:
+            warnings.append(
+                f"Self-referential exclusion (BUG #2): {self_excluded} member(s) of the "
+                f"analyzed class were dropped from callers — a class's own methods are "
+                f"members, not external callers (they do not count toward blast radius)."
+            )
         if truncated:
             warnings.append(
                 "Hub-class guard active: symbol has > 500 direct callers — "
@@ -1083,6 +1109,7 @@ class ImpactOrchestrator:
             resolution=resolution,
             direct_callers=direct_callers,
             indirect_callers=indirect_callers,
+            self_referential_excluded=self_excluded,
             implementations=sorted(subtype_classes_added),
             endpoints_affected=endpoints_affected,
             transaction_boundary=tx_boundary,