draftwright 0.4.13__tar.gz → 0.4.14__tar.gz

{draftwright-0.4.13 → draftwright-0.4.14}/CHANGELOG.md

@@ -2,8 +2,27 @@
 
 ## Unreleased
 
+### Added
+
+- New lint code `annotation_ink_overlap`: reports another annotation's line-work —
+  a dimension line, an extension line or a leader shaft — drawn through a label's
+  text, which `annotation_overlap` cannot see because it compares label boxes to
+  each other and to nothing else. Measured as the longest connected stroke path
+  crossing the label's exact polygon (or its axis-aligned box), in millimetres,
+  with a 0.5 mm floor. It scores on legibility, so
+  dense sheets that previously scored clean now score lower — 17 findings on
+  NIST CTC-02 AP203 alone, every sampled one confirmed a real defect by rendering.
+  Repair does not yet act on it (#1333) and the corridor solve does not yet avoid
+  it (#1334) (#1321, #1332).
+
 ### Changed
 
+- `annotation_overlap` now reports the whole defect when the same pair also draws
+  line-work through one of the two labels: the message names the crosser, the label
+  crossed and the millimetres, and replaces the "use `label_offset_x`" remedy, which
+  is the advice that case contradicts. `LintIssue.suggestion` is `None` for those
+  issues rather than a snippet that re-places the text (#1321, #1332).
+
 - Recogniser integration now uses only the exact `b123d-recognisers` dependency in
   `pyproject.toml` and `uv.lock`. The separate release-evidence record, dependency-bump workflow,
   candidate-checkout harness, and release-time capability-version rewrites have been removed;

{draftwright-0.4.13 → draftwright-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: draftwright
-Version: 0.4.13
+Version: 0.4.14
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -685,7 +685,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: <3.15,>=3.10
 Requires-Dist: antlr4-python3-runtime<4.10
 Requires-Dist: b123d-recognisers==0.3.1
-Requires-Dist: build123d-drafting-helpers>=0.14.1
+Requires-Dist: build123d-drafting-helpers>=0.14.2
 Requires-Dist: build123d<0.11,>=0.9.0; python_full_version < '3.13'
 Requires-Dist: build123d<0.12,>=0.11; python_full_version >= '3.13'
 Requires-Dist: numpy>=1.24

{draftwright-0.4.13 → draftwright-0.4.14}/docs/reference/recogniser-capabilities.md

@@ -64,3 +64,34 @@ pass.
 `bosses` is the fully consumed reference family. `repeating-radial-profiles` is the opposite
 reference: it remains geometry-only critique evidence for a separately authored gear declaration,
 with no inferred gear feature added to fill the table.
+
+## Passage compatibility boundary
+
+The installed `b123d-recognisers==0.3.1` release already contains the `passages` family introduced
+in 0.2.6. Draftwright declares its schema-v1 `Passage` output exhaustively but deliberately keeps
+the family `unsupported`, with the drafting decision tracked by issue #1245. This is a truthful
+consumer disposition: the geometry remains visible in the aggregate inventory, while Draftwright
+does not invent an IR feature, DSL declaration, generated code, drawing annotation, or completeness
+requirement for it.
+
+Draftwright's exact dependency pin must remain on a reviewed released version in the interval
+`>=0.2.6,<0.4.0` until the separately reviewed F4b transition is ready. The lower boundary ensures
+the installed manifest really contains `passages`; the upper boundary prevents accidental adoption
+of the planned 0.4 compatibility change.
+
+The reviewed future 0.4 model is a distinct migration, not latent behavior in this declaration:
+
+- `SectionPassage` will be the authoritative physical output and aggregate census source;
+- legacy `Passage` values will be an accepted-only compatibility projection;
+- `recognise_passages(..., ledger=...)` will be a fail-loud unavailable compatibility operation;
+- the writer-free `recognise_passages` name will remain public but non-authoritative; and
+- rich split-junction passages can supersede a currently rendered Slot claim, moving ownership to
+  the Passage family through `SLOT_SUPERSEDED_BY_PASSAGE`; and
+- the capability contract must represent those API and per-output roles exhaustively before the
+  dependency pin can cross 0.4.
+
+That migration must update the package release, Draftwright adapter and declaration model,
+validator, tests, exact pin, and lockfile together. The current validator remains unchanged and
+fail closed; there is no forward declaration or stale-manifest exception. Crossing 0.4 also
+requires #1245 to decide what those newly Passage-owned occurrences draw, or an explicit reviewed
+decision to accept the resulting loss of the existing Slot callout.

{draftwright-0.4.13 → draftwright-0.4.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.4.13"
+version = "0.4.14"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -17,7 +17,7 @@ dependencies = [
     # 3.13+. Mirrors pzfreo/build123d-mcp's dependency handling.
     "build123d>=0.9.0,<0.11 ; python_full_version < '3.13'",
     "build123d>=0.11,<0.12 ; python_full_version >= '3.13'",
-    "build123d-drafting-helpers>=0.14.1",
+    "build123d-drafting-helpers>=0.14.2",
     "b123d-recognisers==0.3.1",
     "numpy>=1.24",
     # PNG raster export (SVG→PDF→PNG). Both permissively licensed (Pillow HPND; pypdfium2

{draftwright-0.4.13 → draftwright-0.4.14}/src/draftwright/_core.py

@@ -358,7 +358,10 @@ _QUOTED_RE = re.compile(r"'([^']*)'")
 
 @functools.lru_cache(maxsize=512)
 def _text_size(
-    text: str, font_size: float, font_path: str | None = PLEX_MONO, font: str = "Arial"
+    text: str,
+    font_size: float,
+    font_path: str | None = PLEX_MONO,
+    font: str = "Arial",
 ) -> tuple[float, float]:
     """Measured rendered (width, height) (page-mm) of *text* at *font_size*.
 

{draftwright-0.4.13 → draftwright-0.4.14}/src/draftwright/annotations/_common.py

@@ -19,17 +19,21 @@ from typing import Any
 from build123d_drafting.helpers import DEFAULT_FONT_PATH, Dimension, Note, SafeDimension
 
 from draftwright._core import (  # noqa: F401 — _anno_box re-exported (#700)
+    _MARGIN,
     _anno_box,
     _decode_hole_location_fact,
+    _dim,
     _text_size,
     place_annotation,
 )
 from draftwright._geometry import (  # noqa: F401
     _boxes_overlap,
+    _segment_clip_extent,
     _segment_clips_box,
     _segment_crosses_box,
 )
 from draftwright.layout import StripCandidate, plan_strip
+from draftwright.linting.ink_overlap import MIN_CROSSING_MM, crossable_region, crossing_length
 from draftwright.linting.issues import LintIssue
 from draftwright.linting.structural import (
     _ann_box,
@@ -40,6 +44,9 @@ from draftwright.model.compiled import resolve_feature
 _log = logging.getLogger(__name__)
 
 
+_LABEL_INK_CLEARANCE_MM = 0.25
+
+
 def _with_hole_location_coverage(annotation, coverage):
     """Attach exact compiler location/member facts to a rendered annotation.
 
@@ -1458,6 +1465,321 @@ def box_within_page_and_clear(bb, page_box, obstacles) -> bool:
     )
 
 
+def prevent_dimension_label_ink(
+    dimensions,
+    *,
+    page=None,
+    immutable=(),
+    obstacles=(),
+):
+    """Choose small along-line label offsets for a just-built dimension batch.
+
+    Corridor candidates used to reserve only their stacking tier while they were being
+    solved.  Their *eventual* decomposed ink became an obstacle after commit, but siblings
+    built in the same batch could therefore put an extension line or an external-arrow tip
+    through one another's labels (#1334).  Immediate step-length chains have the identical
+    gap: they build the whole row before any member is visible to strip occupancy.
+
+    This is the shared, bounded candidate-selection seam for both producers.  It inspects
+    the same public ``segments``/exact-label-region arithmetic as the lint backstop.
+    A clean batch returns the same objects immediately.  Only a conflicting batch explores
+    a bounded set of analytically-derived label centres, rebuilding the selected survivors
+    through their ``_dw_spec``.  No full lint scan and no CAD boolean participates.
+
+    The label *centre* stays within half a millimetre of its measured span (rather than
+    requiring the whole label to fit inside it).  That distinction matters for short
+    dimensions: their text is wider than the measured span by construction, yet a small
+    shift can keep a shared witness out of the digits without making the label read as its
+    neighbour's.  If the bounded choices cannot improve the batch, the natural deterministic
+    placement survives and the normal ``annotation_ink_overlap`` lint remains explicit
+    evidence of the infeasible fallback.  Names in *immutable* are never shifted (pins win).
+    Fixed *obstacles* do not make an existing contact this local batch's responsibility, but
+    no selected move may introduce a new label contact with one.
+
+    Returns ``[(name, dimension), ...]`` in input order.
+    """
+
+    original = list(dimensions)
+    if len(original) < 2:
+        return original
+    immutable = set(immutable)
+    obstacles = tuple(obstacles)
+
+    def _axis_info(dim):
+        spec = getattr(dim, "_dw_spec", None)
+        label = getattr(dim, "label_bbox", None)
+        if spec is None or label is None:
+            return None
+        dx = float(spec.p2[0]) - float(spec.p1[0])
+        dy = float(spec.p2[1]) - float(spec.p1[1])
+        if min(abs(dx), abs(dy)) > 0.1 or max(abs(dx), abs(dy)) <= 1e-9:
+            return None  # rotated labels need polygonal motion, not an AABB-axis solve
+        axis = 1 if abs(dy) > abs(dx) else 0
+        other = 1 - axis
+        return axis, other, spec
+
+    infos = [_axis_info(dim) for _name, dim in original]
+    if not any(info is not None for info in infos):
+        return original
+
+    box_cache: dict[int, Any] = {}
+    segments_cache: dict[int, Any] = {}
+    tips_cache: dict[int, Any] = {}
+
+    def _box(dim):
+        key = id(dim)
+        if key in box_cache:
+            return box_cache[key]
+        raw = getattr(dim, "label_bbox", None)
+        box_cache[key] = tuple(float(value) for value in raw) if raw is not None else None
+        return box_cache[key]
+
+    def _segments(dim):
+        key = id(dim)
+        if key in segments_cache:
+            return segments_cache[key]
+        try:
+            segments_cache[key] = tuple(
+                (
+                    (float(first[0]), float(first[1])),
+                    (float(second[0]), float(second[1])),
+                )
+                for first, second in (getattr(dim, "segments", ()) or ())
+            )
+        except Exception:  # noqa: BLE001 — optional metadata fails closed to lint
+            segments_cache[key] = ()
+        return segments_cache[key]
+
+    def _arrow_tips(dim, info):
+        """Dimension terminator tips from its measured endpoints and dim-line ordinate.
+
+        Helpers expose line pieces but not the filled arrow triangles.  Their tips remain
+        exactly the two measured ordinates on the label's dimension line; treating the tip
+        attachment as label-blocking catches the short-span arrow-through-digit case without
+        inflating every shaft into a coarse full-geometry box.
+        """
+        key = id(dim)
+        if key in tips_cache:
+            return tips_cache[key]
+        if info is None or (label := _box(dim)) is None:
+            return ()
+        axis, other, spec = info
+        line = (label[other] + label[other + 2]) / 2.0
+        result = []
+        for point in (spec.p1, spec.p2):
+            tip = [0.0, 0.0]
+            tip[axis] = float(point[axis])
+            tip[other] = line
+            result.append(tuple(tip))
+        tips_cache[key] = tuple(result)
+        return tips_cache[key]
+
+    natural_obstacle_hits = [
+        frozenset(
+            obstacle_index
+            for obstacle_index, obstacle in enumerate(obstacles)
+            if label is not None and _boxes_overlap(label, obstacle)
+        )
+        for _name, dim in original
+        for label in (_box(dim),)
+    ]
+
+    def _conflicts(batch):
+        """Stable conflict tokens; their count is the local solve's primary objective."""
+        labels = [_box(dim) for _name, dim in batch]
+        segs = [_segments(dim) for _name, dim in batch]
+        regions = [
+            crossable_region(label, item=dim, segments=segments)
+            for (_name, dim), label, segments in zip(batch, labels, segs, strict=True)
+        ]
+        tips = [_arrow_tips(dim, info) for (_name, dim), info in zip(batch, infos, strict=True)]
+        found: set[tuple] = set()
+        for target, (label, region) in enumerate(zip(labels, regions, strict=True)):
+            if label is None or region is None:
+                continue
+            # Helpers expose no arrow polygons.  The foreign dimension's exact
+            # attachment tips still participate, closing the line-metadata gap without
+            # guessing the orientation of this dimension's own inside/outside arrows.
+            for source, source_tips in enumerate(tips):
+                if source == target:
+                    continue
+                info = infos[target]
+                if info is None:
+                    continue
+                axis, other, _spec = info
+                for tip_index, tip in enumerate(source_tips):
+                    if (
+                        label[axis] + _LABEL_INK_CLEARANCE_MM
+                        < tip[axis]
+                        < label[axis + 2] - _LABEL_INK_CLEARANCE_MM
+                        and label[other] - 1e-6 < tip[other] < label[other + 2] + 1e-6
+                    ):
+                        found.add(("arrow", source, tip_index, target))
+            for source, source_segments in enumerate(segs):
+                if source == target:
+                    continue  # the helper deliberately cuts its own line around its label
+                if crossing_length(source_segments, region) >= MIN_CROSSING_MM:
+                    found.add(("line", source, target))
+            for obstacle_index, obstacle in enumerate(obstacles):
+                if obstacle_index not in natural_obstacle_hits[target] and _boxes_overlap(
+                    label, obstacle
+                ):
+                    found.add(("fixed", obstacle_index, target))
+        for left, left_box in enumerate(labels):
+            if left_box is None:
+                continue
+            for right in range(left + 1, len(labels)):
+                right_box = labels[right]
+                if right_box is not None and _boxes_overlap(left_box, right_box):
+                    found.add(("label", left, right))
+        return frozenset(found)
+
+    natural_centres = []
+    for (_name, dim), info in zip(original, infos, strict=True):
+        label = _box(dim)
+        natural_centres.append(
+            None if info is None or label is None else (label[info[0]] + label[info[0] + 2]) / 2.0
+        )
+
+    def _objective(batch):
+        conflicts = _conflicts(batch)
+        fixed_conflicts = sum(conflict[0] == "fixed" for conflict in conflicts)
+        offsets = []
+        for (_name, dim), info, natural in zip(batch, infos, natural_centres, strict=True):
+            label = _box(dim)
+            offsets.append(
+                0.0
+                if info is None or natural is None or label is None
+                else abs((label[info[0]] + label[info[0] + 2]) / 2.0 - natural)
+            )
+        return (
+            fixed_conflicts,
+            len(conflicts),
+            round(sum(offsets), 9),
+            round(max(offsets, default=0.0), 9),
+            tuple(round(value, 9) for value in offsets),
+        ), conflicts
+
+    current = list(original)
+    current_objective, conflicts = _objective(current)
+    if not conflicts:
+        return current  # overwhelmingly common path: no extra Dimension construction
+
+    cache: dict[tuple[int, float], Any] = {}
+
+    def _rebuild(index, centre):
+        key = (index, round(centre, 6))
+        if key in cache:
+            return cache[key]
+        name, dim = original[index]
+        info = infos[index]
+        natural = natural_centres[index]
+        if info is None or natural is None:
+            return dim
+        axis, _other, spec = info
+        direction = 1.0 if float(spec.p2[axis]) >= float(spec.p1[axis]) else -1.0
+        kwargs = dict(spec.kwargs)
+        kwargs["label_offset_x"] = (
+            kwargs.get("label_offset_x", 0.0) + (centre - natural) * direction
+        )
+        rebuilt = _dim(spec.p1, spec.p2, spec.side, spec.distance, spec.draft, **kwargs)
+        # The producer attaches semantic evidence before the corridor commits the
+        # survivor. Rebuilding only the rendered Dimension must not erase that evidence:
+        # hole-table escalation and coverage lint read these riders from the final object.
+        # Copy semantic namespaces, never helper geometry internals; `_dw_spec` belongs to
+        # the rebuilt placement and must remain the one `_dim` just created.
+        for attr, value in vars(dim).items():
+            if attr.startswith("covers_") or (attr.startswith("_dw_") and attr != "_dw_spec"):
+                setattr(rebuilt, attr, value)
+        cache[key] = rebuilt
+        return rebuilt
+
+    def _centres_for(index, batch):
+        info = infos[index]
+        target = batch[index][1]
+        label = _box(target)
+        if info is None or label is None:
+            return ()
+        axis, other, spec = info
+        current_centre = (label[axis] + label[axis + 2]) / 2.0
+        half = (label[axis + 2] - label[axis]) / 2.0
+        # The centre remains attached to its own measured span.  A half-millimetre
+        # overhang admits the minimum clear position for text wider than a short span.
+        lo, hi = sorted((float(spec.p1[axis]), float(spec.p2[axis])))
+        lo -= MIN_CROSSING_MM
+        hi += MIN_CROSSING_MM
+        if page is not None:
+            lo = max(lo, float(page[axis]) + half)
+            hi = min(hi, float(page[axis + 2]) - half)
+        if lo > hi:
+            return ()
+        choices = {min(max(current_centre, lo), hi), lo, hi}
+        for source, ((_name, dim), source_info) in enumerate(zip(batch, infos, strict=True)):
+            source_label = _box(dim)
+            if source != index and source_label is not None:
+                # Existing labels are obstacles too; moving out of line-work must not
+                # exchange one illegibility defect for text-on-text.
+                if (
+                    source_label[other] < label[other + 2]
+                    and source_label[other + 2] > label[other]
+                ):
+                    choices.add(source_label[axis] - half - _LABEL_INK_CLEARANCE_MM)
+                    choices.add(source_label[axis + 2] + half + _LABEL_INK_CLEARANCE_MM)
+            if source == index:
+                continue
+            for tip in _arrow_tips(dim, source_info):
+                if label[other] - 1e-6 <= tip[other] <= label[other + 2] + 1e-6:
+                    choices.add(tip[axis] - half - _LABEL_INK_CLEARANCE_MM)
+                    choices.add(tip[axis] + half + _LABEL_INK_CLEARANCE_MM)
+            # Clip each foreign segment only to this label's fixed-axis band.  The
+            # resulting projection is the exact interval its centre must clear.
+            band = [-1e9, -1e9, 1e9, 1e9]
+            band[other], band[other + 2] = label[other], label[other + 2]
+            for segment in _segments(dim):
+                clipped = _segment_clip_extent(segment[0], segment[1], tuple(band), pad=0.0)
+                if clipped is None:
+                    continue
+                choices.add(clipped[axis] - half - _LABEL_INK_CLEARANCE_MM)
+                choices.add(clipped[axis + 2] + half + _LABEL_INK_CLEARANCE_MM)
+        bounded = {min(max(value, lo), hi) for value in choices if math.isfinite(value)}
+        # Bound exceptional work.  Nearest candidates are the meaningful drafting
+        # alternatives; the two association bounds remain present explicitly.
+        nearest = sorted(bounded, key=lambda value: (abs(value - current_centre), value))[:16]
+        return tuple(dict.fromkeys([*nearest, lo, hi]))
+
+    # Deterministic steepest descent.  Every accepted move strictly improves the
+    # lexicographic objective, so it terminates even when the layout is infeasible.
+    for _iteration in range(max(1, 2 * len(current))):
+        involved: set[int] = set()
+        for conflict in conflicts:
+            if conflict[0] == "arrow":
+                involved.update((conflict[1], conflict[3]))  # source + crossed label
+            elif conflict[0] == "line":
+                involved.update((conflict[1], conflict[2]))  # source + crossed label
+            elif conflict[0] == "fixed":
+                involved.add(conflict[2])
+            else:  # label/label
+                involved.update((conflict[1], conflict[2]))
+        best = None
+        for index in sorted(involved):
+            name, _dim_obj = original[index]
+            if name in immutable or infos[index] is None:
+                continue
+            for centre in _centres_for(index, current):
+                trial = list(current)
+                trial[index] = (name, _rebuild(index, centre))
+                objective, trial_conflicts = _objective(trial)
+                key = (objective, index, round(centre, 9))
+                if objective < current_objective and (best is None or key < best[0]):
+                    best = (key, trial, objective, trial_conflicts)
+        if best is None:
+            break
+        _key, current, current_objective, conflicts = best
+        if not conflicts:
+            break
+    return current
+
+
 # ── The corridor priority ladder (#894) ───────────────────────────────────────
 # `CorridorCandidate.priority` is an over-capacity survival rank, and a rank only
 # means anything RELATIVE to the other rungs. Defining the whole ladder here — beside
@@ -2126,6 +2448,19 @@ def place_strip_candidates(
         tp["free_segments"] = [list(s) for s in segs]
     todo = list(cands)
 
+    def _real_box_conflict(name, real):
+        """Return the hard-obstacle reason for a built survivor, if any."""
+        if real is None:
+            return None
+        if not force and _box_hits(real, blockers):
+            return "real_box_corridor_blocked"
+        fb = (forbid or {}).get(name)
+        if fb is not None and _box_hits(real, (fb,)):
+            return "real_box_forbid"
+        if _box_hits(real, out_of_band):
+            return "real_box_out_of_band"
+        return None
+
     def _take_for_segment(items, n):
         if len(items) <= n:
             return items, []
@@ -2210,6 +2545,7 @@ def place_strip_candidates(
             accepted.append(((name, build), pos))
         return accepted, rejected
 
+    solved = []
     for seg_lo, seg_hi in segs:
         if not todo:
             break
@@ -2231,43 +2567,60 @@ def place_strip_candidates(
         for (name, build), pos in accepted:
             dim = build(pos)
             real = _geom_box(dim)
-            if real is not None:
-                if not force and _box_hits(real, blockers):
-                    if tp is not None:
-                        tp["rejected"].append(
-                            {"name": name, "reason": "real_box_corridor_blocked"}
-                        )
-                    rejected_total.append((name, build))
-                    continue
-                fb = (forbid or {}).get(name)
-                if fb is not None and _box_hits(real, (fb,)):
-                    if tp is not None:
-                        tp["rejected"].append({"name": name, "reason": "real_box_forbid"})
-                    rejected_total.append((name, build))
-                    continue
-                # A survivor whose real geometry escaped the batch's predicted
-                # perpendicular band could overlap an obstacle the carve was never
-                # shown (review #679) — the one collision class the stacking-axis
-                # model cannot tolerate. Never fires while predictions are accurate.
-                if _box_hits(real, out_of_band):
-                    if tp is not None:
-                        tp["rejected"].append({"name": name, "reason": "real_box_out_of_band"})
-                    rejected_total.append((name, build))
-                    continue
+            if reason := _real_box_conflict(name, real):
+                if tp is not None:
+                    tp["rejected"].append({"name": name, "reason": reason})
+                rejected_total.append((name, build))
+                continue
             placed.append((name, dim))
             if tp is not None:
                 tp["placed"].append({"name": name, "pos": pos})
         todo = todo + rejected_total
-        for name, dim in placed:
-            # Record feature provenance (ADR 0010): the drain-time seam for corridor-placed
-            # dims — `features` maps this batch's names to their source IR feature.
-            ctx.place(
-                dim,
-                name,
-                view=view,
-                feature=(features or {}).get(name),
-                measurement=(measurements or {}).get(name),
-            )
+        solved.extend(placed)
+
+    if len(solved) > 1:
+        assert len({name for name, _dim_obj in solved}) == len(solved), (
+            "strip survivor names must be unique before label selection"
+        )
+        natural_solved = dict(solved)
+        adjusted = prevent_dimension_label_ink(
+            solved,
+            page=(
+                (
+                    _MARGIN,
+                    _MARGIN,
+                    float(dwg.page_w) - _MARGIN,
+                    float(dwg.page_h) - _MARGIN,
+                )
+                if hasattr(dwg, "page_w") and hasattr(dwg, "page_h")
+                else None
+            ),
+            immutable={name for name, _dim_obj in solved if (anchored or {}).get(name, False)},
+        )
+        # A label shift normally stays inside the dimension's measured span and
+        # therefore inside its already-validated footprint.  Keep the validation
+        # contract explicit nevertheless: if an unusual helper/style grows the real
+        # box into a hard obstacle, retain the natural survivor.  The lint backstop then
+        # records the infeasible ink conflict instead of this prevention step trading
+        # it for a structural collision.
+        solved = []
+        for name, dim in adjusted:
+            natural = natural_solved[name]
+            if dim is natural:
+                solved.append((name, dim))
+                continue
+            real = _geom_box(dim)
+            solved.append((name, natural if _real_box_conflict(name, real) else dim))
+    for name, dim in solved:
+        # Record feature provenance (ADR 0010): the drain-time seam for corridor-placed
+        # dims — `features` maps this batch's names to their source IR feature.
+        ctx.place(
+            dim,
+            name,
+            view=view,
+            feature=(features or {}).get(name),
+            measurement=(measurements or {}).get(name),
+        )
     if tp is not None:
         tp["unplaced"] = [n for n, _ in todo]
         trace.end_pass(tp)  # folds a standalone pass's items; no-op when corridor-nested

{draftwright-0.4.13 → draftwright-0.4.14}/src/draftwright/annotations/from_model.py

@@ -81,6 +81,7 @@ from draftwright.annotations._common import (
     full_strip_message,
     leader_callout_geometry,
     place_strip_candidates,
+    prevent_dimension_label_ink,
     register_corridor,
     strip_free_span,
     strip_obstacles,
@@ -3686,8 +3687,22 @@ def _draw_step_chain(
                 )
             )
 
-    # Room guard: if any dim would fall off the drawable page, place NONE.
     page = (_MARGIN, _MARGIN, dwg.page_w - _MARGIN, dwg.page_h - _MARGIN)
+    # The chain is one placement batch: until commit, no sibling's extension line or
+    # terminator exists in strip occupancy.  Select small along-line label offsets against
+    # the complete batch before the room guard (#1334).  Measurement provenance stays paired
+    # by name; only the rendered Dimension survivor changes.
+    measurements_by_name = {name: measurements for name, _dim_obj, measurements in candidates}
+    candidates = [
+        (name, dim, measurements_by_name[name])
+        for name, dim in prevent_dimension_label_ink(
+            [(name, dim) for name, dim, _measurements in candidates],
+            page=page,
+            obstacles=strip_obstacles(dwg, view=view, crossable=CROSSABLE_TYPES),
+        )
+    ]
+
+    # Room guard: if any dim would fall off the drawable page, place NONE.
     for _, dim, _measurements in candidates:
         box = _anno_box(dim)
         if box is not None and not (