fix: graph layout spacing + validator API fixes

- Use d3.tree().nodeSize() for guaranteed 100px spacing between leaves
- Center tree with xOffset calculation, horizontal scroll for narrow panels
- Fix Gemini SDK: use google-genai client API (types.Part.from_bytes)
- Add fuzzy key matching in merge (case-insensitive + feature-name fallback)
- Add response logging for Claude and Gemini validators
- Update requirements: google-genai replaces google-generativeai

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

demo/index.html

@@ -1771,13 +1771,14 @@
 
     /* ── Explainability Graph ─────────────────────────────────────── */
     #explainPanel {
-      overflow-y: auto;
+      overflow: auto;
       padding: 0;
+      position: relative;
     }
 
     .explain-svg {
       display: block;
-      width: 100%;
+      min-width: 100%;
       font-family: 'Inter', -apple-system, sans-serif;
     }
     .explain-svg text {
@@ -3450,13 +3451,15 @@
         })),
       };
 
-      const margin = { top: 30, right: 20, bottom: 60, left: 20 };
-      const width = container.clientWidth || 340;
+      const margin = { top: 30, right: 50, bottom: 60, left: 50 };
       const totalLeaves = root.children.reduce((s, c) => s + (c.children ? c.children.length : 1), 0);
-      const height = Math.max(280, totalLeaves * 35 + 120);
+      const nodeSpacingX = 100; // min horizontal space per leaf
+      const levelHeight = 90;   // vertical space between levels
+      const minWidth = Math.max(container.clientWidth || 340, totalLeaves * nodeSpacingX + margin.left + margin.right);
+      const height = Math.max(280, 3 * levelHeight + margin.top + margin.bottom);
 
       const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
-      svg.setAttribute('width', width);
+      svg.setAttribute('width', minWidth);
       svg.setAttribute('height', height);
       svg.setAttribute('class', 'explain-svg');
       container.appendChild(svg);
@@ -3466,11 +3469,18 @@
       defs.innerHTML = '<filter id="exGlow"><feGaussianBlur stdDeviation="3" result="b"/><feMerge><feMergeNode in="b"/><feMergeNode in="SourceGraphic"/></feMerge></filter>';
       svg.appendChild(defs);
 
-      // D3 layout
+      // D3 layout — use nodeSize for guaranteed spacing
       const hierarchy = d3.hierarchy(root);
-      const treeLayout = d3.tree().size([width - margin.left - margin.right, height - margin.top - margin.bottom]);
+      const treeLayout = d3.tree().nodeSize([nodeSpacingX, levelHeight]);
       treeLayout(hierarchy);
 
+      // Shift all x positions so the tree is centered (nodeSize uses 0-centered coords)
+      const allX = hierarchy.descendants().map(n => n.x);
+      const xMin = Math.min(...allX);
+      const xMax = Math.max(...allX);
+      const treeWidth = xMax - xMin;
+      const xOffset = (minWidth - margin.left - margin.right) / 2 - (xMin + treeWidth / 2);
+
       const g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
       g.setAttribute('transform', `translate(${margin.left},${margin.top})`);
       svg.appendChild(g);
@@ -3478,7 +3488,8 @@
       // Edges
       hierarchy.links().forEach(link => {
         const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-        const sx = link.source.x, sy = link.source.y, tx = link.target.x, ty = link.target.y;
+        const sx = link.source.x + xOffset, sy = link.source.y;
+        const tx = link.target.x + xOffset, ty = link.target.y;
         const my = (sy + ty) / 2;
         path.setAttribute('d', `M${sx},${sy} C${sx},${my} ${tx},${my} ${tx},${ty}`);
         path.setAttribute('fill', 'none');
@@ -3493,7 +3504,7 @@
       hierarchy.descendants().forEach(node => {
         const d = node.data;
         const ng = document.createElementNS('http://www.w3.org/2000/svg', 'g');
-        ng.setAttribute('transform', `translate(${node.x},${node.y})`);
+        ng.setAttribute('transform', `translate(${node.x + xOffset},${node.y})`);
 
         if (node.depth === 0) {
           drawExRoot(ng, d);

models/isr/explainer.py

@@ -218,6 +218,7 @@ class ISRExplainer:
             )
 
             raw = response.content[0].text
+            logger.info("Claude raw response: %s", raw[:200] if raw else "empty")
             return parse_llm_json(raw)
         except Exception:
             logger.exception("Claude validation failed")
@@ -232,10 +233,10 @@ class ISRExplainer:
 
         try:
             import base64
-            import google.generativeai as genai
+            from google import genai
+            from google.genai import types
 
-            genai.configure(api_key=api_key)
-            model = genai.GenerativeModel("gemini-2.0-flash")
+            client = genai.Client(api_key=api_key)
 
             user_text = self._build_metadata_text(metadata, mission)
             user_text += f"\n\nPrimary analyst's feature tree:\n```json\n{json.dumps(tree, indent=2)}\n```"
@@ -245,20 +246,24 @@ class ISRExplainer:
             frame_bytes = base64.b64decode(frame_b64)
 
             response = await asyncio.to_thread(
-                model.generate_content,
-                [
-                    _VALIDATOR_SYSTEM_PROMPT + "\n\n" + user_text,
-                    {"mime_type": "image/jpeg", "data": crop_bytes},
-                    "\n[Full frame context]:",
-                    {"mime_type": "image/jpeg", "data": frame_bytes},
+                client.models.generate_content,
+                model="gemini-2.0-flash",
+                contents=[
+                    types.Content(role="user", parts=[
+                        types.Part.from_text(_VALIDATOR_SYSTEM_PROMPT + "\n\n" + user_text),
+                        types.Part.from_bytes(data=crop_bytes, mime_type="image/jpeg"),
+                        types.Part.from_text("\n[Full frame context]:"),
+                        types.Part.from_bytes(data=frame_bytes, mime_type="image/jpeg"),
+                    ]),
                 ],
-                generation_config=genai.GenerationConfig(
+                config=types.GenerateContentConfig(
                     max_output_tokens=1024,
                     temperature=0.3,
                 ),
             )
 
             raw = response.text
+            logger.info("Gemini raw response: %s", raw[:200] if raw else "empty")
             return parse_llm_json(raw)
         except Exception:
             logger.exception("Gemini validation failed")
@@ -302,14 +307,14 @@ class ISRExplainer:
                 feat_agreed = 0
 
                 if claude and "feature_validations" in claude:
-                    cv = claude["feature_validations"].get(feat_key)
+                    cv = self._find_validation(claude["feature_validations"], feat_key, feat["name"])
                     if cv:
                         validators["claude"] = cv
                         if cv.get("agree"):
                             feat_agreed += 1
 
                 if gemini and "feature_validations" in gemini:
-                    gv = gemini["feature_validations"].get(feat_key)
+                    gv = self._find_validation(gemini["feature_validations"], feat_key, feat["name"])
                     if gv:
                         validators["gemini"] = gv
                         if gv.get("agree"):
@@ -329,3 +334,24 @@ class ISRExplainer:
         }
 
         return tree
+
+    @staticmethod
+    def _find_validation(validations: dict, exact_key: str, feat_name: str) -> Optional[dict]:
+        """Find validation by exact key first, then fuzzy match on feature name."""
+        # Exact match
+        val = validations.get(exact_key)
+        if val:
+            return val
+        # Fuzzy: try case-insensitive exact key
+        lower_key = exact_key.lower()
+        for k, v in validations.items():
+            if k.lower() == lower_key:
+                return v
+        # Fuzzy: match by feature name alone (validator may omit category)
+        lower_name = feat_name.lower()
+        for k, v in validations.items():
+            parts = k.split("/")
+            candidate = parts[-1].lower() if parts else k.lower()
+            if candidate == lower_name:
+                return v
+        return None

requirements.txt

@@ -17,4 +17,4 @@ psutil
 dill
 openai>=1.0.0
 anthropic>=0.40.0
-google-generativeai>=0.8.0
+google-genai>=1.0.0