fix: address PR review feedback from CodeRabbit

- Fix FK column reload to use display-order indices (respects user column reordering)
- Remove force-unwrap in JSON highlight debounce (use local variable)
- Add purgeStaleEntries to connectionId(for:) and window(for:) in WindowLifecycleMonitor
- Fix audit doc date typo and inconsistent checkbox states

Author: datlechin

TablePro/Core/Services/Infrastructure/WindowLifecycleMonitor.swift

@@ -108,7 +108,8 @@ internal final class WindowLifecycleMonitor {
 
     /// Look up the connectionId for a given windowId.
     internal func connectionId(for windowId: UUID) -> UUID? {
-        entries[windowId]?.connectionId
+        purgeStaleEntries()
+        return entries[windowId]?.connectionId
     }
 
     /// Check if any windows are registered for a connection.
@@ -137,7 +138,8 @@ internal final class WindowLifecycleMonitor {
 
     /// Look up the NSWindow for a given windowId.
     internal func window(for windowId: UUID) -> NSWindow? {
-        entries[windowId]?.window
+        purgeStaleEntries()
+        return entries[windowId]?.window
     }
 
     /// Update the preview flag for a registered window.

TablePro/Views/Results/DataGridView.swift

@@ -471,16 +471,25 @@ struct DataGridView: NSViewRepresentable {
         if needsFullReload {
             tableView.reloadData()
         } else if metadataChanged {
-            // FK metadata arrived (Phase 2) — reload only FK columns to show arrow buttons
+            // FK metadata arrived (Phase 2) — reload only FK columns to show arrow buttons.
+            // Use display-order indices from tableView.tableColumns (respects user column reordering).
             let fkColumnIndices = IndexSet(
-                rowProvider.columns.enumerated().compactMap { index, columnName in
-                    rowProvider.columnForeignKeys[columnName] != nil ? index + 1 : nil
+                tableView.tableColumns.enumerated().compactMap { displayIndex, tableColumn in
+                    guard tableColumn.identifier.rawValue != "__rowNumber__",
+                          let modelIndex = Self.columnIndex(from: tableColumn.identifier),
+                          modelIndex < rowProvider.columns.count else { return nil }
+                    let columnName = rowProvider.columns[modelIndex]
+                    return rowProvider.columnForeignKeys[columnName] != nil ? displayIndex : nil
                 }
             )
             if !fkColumnIndices.isEmpty {
                 let visibleRange = tableView.rows(in: tableView.visibleRect)
-                let visibleRows = IndexSet(integersIn: visibleRange.location..<(visibleRange.location + visibleRange.length))
-                tableView.reloadData(forRowIndexes: visibleRows, columnIndexes: fkColumnIndices)
+                if visibleRange.length > 0 {
+                    let visibleRows = IndexSet(
+                        integersIn: visibleRange.location..<(visibleRange.location + visibleRange.length)
+                    )
+                    tableView.reloadData(forRowIndexes: visibleRows, columnIndexes: fkColumnIndices)
+                }
             }
         } else if versionChanged {
             // Granular reload: only reload rows that changed

TablePro/Views/Results/JSONEditorContentView.swift

@@ -213,11 +213,12 @@ private struct JSONSyntaxTextView: NSViewRepresentable {
 
             // Debounce syntax highlighting to avoid 4 regex passes per keystroke
             highlightWorkItem?.cancel()
-            highlightWorkItem = DispatchWorkItem { [weak textView] in
+            let workItem = DispatchWorkItem { [weak textView] in
                 guard let textView else { return }
                 JSONSyntaxTextView.applyHighlighting(to: textView)
             }
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: highlightWorkItem!)
+            highlightWorkItem = workItem
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: workItem)
         }
     }
 }

docs/development/performance-audit.md

@@ -1,6 +1,6 @@
 # Performance Audit — TablePro
 
-**Date:** 2025-03-18
+**Date:** 2026-03-18
 **Related Issue:** [#368 — High CPU Usage by TablePro on macOS](https://github.com/datlechin/TablePro/issues/368)
 **Status:** Phase 1-4 fixes applied (16/17 medium+ issues fixed) — build verified
 
@@ -91,7 +91,7 @@ Secondary contributors include main-thread I/O blocking (Keychain, plugin loadin
 
 ### HIGH-6: N+1 Default `fetchAllColumns`/`fetchAllForeignKeys` at Both Protocol Layers
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **Files:** `DatabaseDriver.swift:247-262`, `PluginDatabaseDriver.swift:168-185`
 
@@ -113,7 +113,7 @@ Default implementations loop per-table with one query each. A schema with 200 ta
 
 ### MED-2: `NSWindow.didUpdateNotification` Fires on Every Event Loop Cycle
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **File:** `EditorEventRouter.swift:83-92`
 
@@ -125,7 +125,7 @@ Default implementations loop per-table with one query each. A schema with 200 ta
 
 ### MED-3: SSH Relay Poll at 100ms Intervals
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **File:** `LibSSH2TunnelFactory.swift:488`
 
@@ -137,7 +137,7 @@ Jump-host channel relay uses `poll()` with 100ms timeout, waking 10x/second even
 
 ### MED-4: Column Layout Write-Back Triggers Extra Tab Persistence Save
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **Files:** `DataGridView.swift:389-396`, `MainContentView.swift:293-295`
 
@@ -181,7 +181,7 @@ Jump-host channel relay uses `poll()` with 100ms timeout, waking 10x/second even
 
 ### MED-9: `[[String?]]` → `[QueryResultRow]` Full Copy After Every Query
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **File:** `MainContentCoordinator.swift:840-845`
 
@@ -209,7 +209,7 @@ Jump-host channel relay uses `poll()` with 100ms timeout, waking 10x/second even
 
 ### MED-12: `DateFormattingService.format` Called Per Cell Per Reload
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **File:** `DataGridCellFactory.swift:333-336`
 
@@ -253,7 +253,7 @@ Every visible date cell re-formats on every `reloadData`, even when the value ha
 
 ### MED-17: `multiColumnSortIndices` Pre-builds 300K String Copies for Large Datasets
 
-- [ ] **Fix applied**
+- [ ] **Fix pending**
 
 **File:** `MainContentCoordinator.swift:1190-1195`