From 09a561e3e7d2a97e52ea8a2eb6056810715e7b3a Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Mon, 20 Jul 2026 14:03:51 -0600
Subject: [PATCH] fix(phase-29): jtbl_family_bank auto-isolates on the span-fit
 wall too

Previously only auto-isolated on NON-CONTIGUOUS carve collisions; the span-fit
wall ('table starts do not fit the span', when --like's merged span doesn't match
a sibling's jtbl layout) fell through to carve-fail. jr_isolate unblocks it too
(byte-proven: func_8017AE2C ov_SC01_000 member BANKED). The distinct table-count-
drift error ('more rodata .align than pad specs') stays excluded (not isolate-fixable).
---
 tools/jtbl_family_bank.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/jtbl_family_bank.py b/tools/jtbl_family_bank.py
index 6dac44552..806660141 100644
--- a/tools/jtbl_family_bank.py
+++ b/tools/jtbl_family_bank.py
@@ -136,8 +136,15 @@ def bank(func, from_ov, from_addr, to_ov, to_addr):
     if sh(f"make --no-print-directory extract BINARY={to_ov}").returncode:
         revert(to_ov, keep_regions=keep); return "extract0-fail", ""
     r = sh(f"python3 tools/jtbl_carve.py {to_ov} --func {to_func} --like {from_ov}")
-    if r.returncode and "NON-CONTIGUOUS" in (r.stdout + r.stderr):
-        # the §8b same-subseg wall -> isolate this core, re-extract, retry the carve
+    _carve_out = r.stdout + r.stderr
+    # Auto-isolate on EITHER §8b same-subseg wall: the NON-CONTIGUOUS collision, OR the span-fit wall
+    # ("do not fit the span" — the --like structure transfer's merged span doesn't match this sibling's
+    # actual jtbl layout because another matched fn's tables share the subseg). Phase-29 finding: jr_isolate
+    # unblocks the span-fit case too (byte-proven on func_8017AE2C's exemplar), same as non-contiguous —
+    # splitting the fn into its own subseg shrinks the carve span to just its tables, which then fit.
+    # NOTE: the DISTINCT "more rodata .align than pad specs" table-count-drift error is NOT isolate-fixable
+    # and is deliberately excluded here (it falls through to carve-fail).
+    if r.returncode and ("NON-CONTIGUOUS" in _carve_out or "do not fit the span" in _carve_out):
         if isolate(to_ov, to_func).returncode:
             revert(to_ov, keep_regions=keep); return "isolate-fail", ""
         if sh(f"make --no-print-directory extract BINARY={to_ov}").returncode: