diff --git a/python/commands/export.py b/python/commands/export.py
index 2307506..d15e533 100644
--- a/python/commands/export.py
+++ b/python/commands/export.py
@@ -695,7 +695,10 @@ class ExportCommands:
         session_lines = all_lines[session_start:]
 
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        dest = os.path.join(project_dir, f"mcp_log_{timestamp}.txt")
+        from pathlib import Path
+        logs_dir = Path(project_dir) / "logs"
+        logs_dir.mkdir(exist_ok=True)
+        dest = str(logs_dir / f"mcp_log_{timestamp}.txt")
         with open(dest, "w", encoding="utf-8") as f:
             f.writelines(session_lines)
 
diff --git a/python/commands/routing.py b/python/commands/routing.py
index d630943..5dd0101 100644
--- a/python/commands/routing.py
+++ b/python/commands/routing.py
@@ -144,9 +144,14 @@ class RoutingCommands:
             if not net:
                 net = start_pad.GetNetname() or end_pad.GetNetname() or ""
 
-            # Detect if pads are on different copper layers → need via
-            start_layer = start_pad.GetLayerName()
-            end_layer = end_pad.GetLayerName()
+            # Detect if pads are on different copper layers → need via.
+            # SMD pad.GetLayer() reports F.Cu even on flipped B.Cu footprints in
+            # KiCAD 9 SWIG. Use footprint.GetLayer() instead — it always reflects
+            # the actual placed layer after Flip().
+            fp_start = footprints[from_ref]
+            fp_end   = footprints[to_ref]
+            start_layer = self.board.GetLayerName(fp_start.GetLayer())
+            end_layer   = self.board.GetLayerName(fp_end.GetLayer())
             copper_layers = {"F.Cu", "B.Cu"}
             needs_via = (
                 start_layer in copper_layers
@@ -155,8 +160,11 @@ class RoutingCommands:
             )
 
             if needs_via:
-                # Place via at midpoint between the two pads
-                via_x = (start_pos.x + end_pos.x) / 2 / scale
+                # Place via directly below the start pad (same X).
+                # Using the geometric midpoint X causes all vias to stack at
+                # the same X when pads are back-to-back mirrored (e.g. J1/J2
+                # on F.Cu/B.Cu): midpoint is always the board center.
+                via_x = start_pos.x / scale
                 via_y = (start_pos.y + end_pos.y) / 2 / scale
 
                 # Trace on start layer: start_pad → via
diff --git a/python/kicad_interface.py b/python/kicad_interface.py
index 3435d07..40ca581 100644
--- a/python/kicad_interface.py
+++ b/python/kicad_interface.py
@@ -1679,9 +1679,11 @@ class KiCADInterface:
         """Copy the entire project folder to a snapshot directory for checkpoint/resume."""
         import shutil
         from datetime import datetime
+        from pathlib import Path
         try:
             step   = params.get("step", "")
             label  = params.get("label", "")
+            prompt_text = params.get("prompt", "")
             # Determine project directory from loaded board or explicit path
             project_dir = None
             if self.board:
@@ -1693,19 +1695,60 @@ class KiCADInterface:
             if not project_dir or not os.path.isdir(project_dir):
                 return {"success": False, "message": "Could not determine project directory for snapshot"}
 
-            base_name = Path(project_dir).name
             ts = datetime.now().strftime("%Y%m%d_%H%M%S")
+
+            # Save prompt + log into logs/ subdirectory before snapshotting
+            logs_dir = Path(project_dir) / "logs"
+            logs_dir.mkdir(exist_ok=True)
+
+            prompt_file = None
+            if prompt_text:
+                prompt_filename = f"PROMPT_step{step}_{ts}.md" if step else f"PROMPT_{ts}.md"
+                prompt_file = logs_dir / prompt_filename
+                prompt_file.write_text(prompt_text, encoding="utf-8")
+                logger.info(f"Prompt saved: {prompt_file}")
+
+            # Copy current MCP session log into logs/ before snapshotting
+            import platform
+            system = platform.system()
+            if system == "Windows":
+                mcp_log_dir = os.path.join(os.environ.get("APPDATA", ""), "Claude", "logs")
+            elif system == "Darwin":
+                mcp_log_dir = os.path.expanduser("~/Library/Logs/Claude")
+            else:
+                mcp_log_dir = os.path.expanduser("~/.config/Claude/logs")
+            mcp_log_src = os.path.join(mcp_log_dir, "mcp-server-kicad.log")
+            mcp_log_dest = None
+            if os.path.exists(mcp_log_src):
+                with open(mcp_log_src, "r", encoding="utf-8", errors="replace") as f:
+                    all_lines = f.readlines()
+                session_start = 0
+                for i, line in enumerate(all_lines):
+                    if "Initializing server" in line:
+                        session_start = i
+                session_lines = all_lines[session_start:]
+                log_filename = f"mcp_log_step{step}_{ts}.txt" if step else f"mcp_log_{ts}.txt"
+                mcp_log_dest = logs_dir / log_filename
+                with open(mcp_log_dest, "w", encoding="utf-8") as f:
+                    f.writelines(session_lines)
+                logger.info(f"MCP session log saved: {mcp_log_dest} ({len(session_lines)} lines)")
+
+            base_name = Path(project_dir).name
             suffix_parts = [p for p in [f"step{step}" if step else "", label, ts] if p]
             snapshot_name = base_name + "_snapshot_" + "_".join(suffix_parts)
-            snapshot_dir = str(Path(project_dir).parent / snapshot_name)
+            snapshots_base = Path(project_dir) / "snapshots"
+            snapshots_base.mkdir(exist_ok=True)
+            snapshot_dir = str(snapshots_base / snapshot_name)
 
-            shutil.copytree(project_dir, snapshot_dir)
+            shutil.copytree(project_dir, snapshot_dir, ignore=shutil.ignore_patterns("snapshots"))
             logger.info(f"Project snapshot saved: {snapshot_dir}")
             return {
                 "success": True,
                 "message": f"Snapshot saved: {snapshot_name}",
                 "snapshotPath": snapshot_dir,
                 "sourceDir": project_dir,
+                "promptSaved": str(prompt_file) if prompt_file else None,
+                "mcpLogSaved": str(mcp_log_dest) if mcp_log_dest else None,
             }
         except Exception as e:
             logger.error(f"snapshot_project error: {e}")
diff --git a/src/server.ts b/src/server.ts
index 4f93cbd..4596693 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -232,7 +232,9 @@ export class KiCADMcpServer {
     logger.info("Registering KiCAD tools, resources, and prompts...");
 
     // Register router tools FIRST (for tool discovery and execution)
-    registerRouterTools(this.server, this.callKicadScript.bind(this));
+    // NOTE: Router disabled — causes Claude to hallucinate tool schemas via search_tools/execute_tool.
+    // All tools are registered directly below and are immediately visible to Claude.
+    // registerRouterTools(this.server, this.callKicadScript.bind(this));
 
     // Register all tools
     registerProjectTools(this.server, this.callKicadScript.bind(this));
diff --git a/src/tools/project.ts b/src/tools/project.ts
index 4a1b739..1e59179 100644
--- a/src/tools/project.ts
+++ b/src/tools/project.ts
@@ -84,8 +84,9 @@ export function registerProjectTools(server: McpServer, callKicadScript: Functio
     {
       step: z.string().describe("Step number or identifier, e.g. '1' or '2'"),
       label: z.string().describe("Short label for this checkpoint, e.g. 'schematic_ok' or 'layout_ok'"),
+      prompt: z.string().optional().describe("Full prompt text to save as PROMPT_step{step}_{timestamp}.md alongside the snapshot"),
     },
-    async (args: { step: string; label: string }) => {
+    async (args: { step: string; label: string; prompt?: string }) => {
       const result = await callKicadScript("snapshot_project", args);
       return {
         content: [{