thatcher 1.0.7 → 1.0.34

package/src/ui/notifications-renderer.js

@@ -3,7 +3,7 @@ import { esc, TOAST_SCRIPT, emptyRow } from '@/ui/render-helpers.js';
 
 function fmtDate(ts) {
   if (!ts) return '-';
-  return new Date(typeof ts === 'number' && ts < 2e10 ? ts * 1000 : ts).toLocaleString();
+  return new Date(typeof ts === 'number' && ts < 2e10 ? ts * 1000 : ts).toLocaleString('en-ZA');
 }
 
 function notifRow(n) {
@@ -11,14 +11,14 @@ function notifRow(n) {
   const typeLabels = { review_notification: 'Review', highlight_response: 'Highlight', rfi_response: 'RFI', general: 'General' };
   const typeLabel = typeLabels[n.type] || n.type || '-';
   const entityLink = n.entity_type === 'review' && n.entity_id
-    ? `<a href="/review/${esc(n.entity_id)}" class="text-primary text-sm" style="text-decoration:underline">View</a>`
+    ? `<a href="/review/${esc(n.entity_id)}" class="text-sm" style="text-decoration:underline;color:var(--color-primary)">View</a>`
     : '';
-  return `<tr class="hover${isRead ? ' opacity-60' : ''}" data-notif-id="${esc(n.id)}">
-    <td class="text-xs text-base-content/40 w-32">${fmtDate(n.created_at)}</td>
+  return `<tr class="hover${isRead ? ' is-read' : ''}" data-notif-id="${esc(n.id)}" data-notif-row="true">
+    <td class="text-xs text-base-content/60 w-32">${fmtDate(n.created_at)}</td>
     <td class="text-xs"><span class="badge badge-flat-secondary">${esc(typeLabel)}</span></td>
     <td class="text-sm max-w-md">${esc(n.message || '-')}</td>
     <td>${entityLink}</td>
-    <td>${isRead ? '<span class="text-xs text-base-content/30">Read</span>' : `<button data-action="markRead" data-args='["${esc(n.id)}"]' class="btn btn-ghost btn-xs">Mark read</button>`}</td>
+    <td>${isRead ? '<span class="text-xs text-base-content/70">Read</span>' : `<button data-action="markRead" data-args='["${esc(n.id)}"]' class="btn btn-ghost btn-xs">Mark read</button>`}</td>
   </tr>`;
 }
 
@@ -28,13 +28,13 @@ export function renderNotificationsPage(user, notifs = []) {
   const content = `
     <div class="page-header">
       <h1 class="page-title">Notifications</h1>
-      <button data-action="markAllRead" class="btn btn-ghost btn-sm">Mark All Read</button>
+      <button data-action="markAllRead" class="btn btn-primary-clean btn-sm">Mark All Read</button>
     </div>
     <div class="card-clean">
       <div class="card-clean-body">
         <div class="table-wrap">
           <table class="data-table">
-            <thead><tr><th>Time</th><th>Type</th><th>Message</th><th></th><th></th></tr></thead>
+            <thead><tr><th>Time</th><th>Type</th><th>Message</th><th>Link</th><th>Actions</th></tr></thead>
             <tbody>${rows}</tbody>
           </table>
         </div>
@@ -43,8 +43,9 @@ export function renderNotificationsPage(user, notifs = []) {
   `;
 
   const script = `${TOAST_SCRIPT}
-window.markRead=async function(id){try{await fetch('/api/notifications',{method:'PATCH',headers:{'Content-Type':'application/json'},credentials:'include',body:JSON.stringify({id})});var row=document.querySelector('[data-notif-id="'+id+'"]');if(row){row.classList.add('opacity-60');var btn=row.querySelector('button');if(btn)btn.replaceWith(document.createTextNode('Read'))}var count=document.getElementById('notif-count');if(count){var c=parseInt(count.textContent||'0',10)-1;if(c<=0)count.style.display='none';else count.textContent=c}}catch(e){showToast('Error','error')}};
-window.markAllRead=async function(){try{await fetch('/api/notifications',{method:'PATCH',headers:{'Content-Type':'application/json'},credentials:'include',body:JSON.stringify({})});document.querySelectorAll('[data-notif-id]').forEach(function(row){row.classList.add('opacity-60');var btn=row.querySelector('button');if(btn)btn.replaceWith(document.createTextNode('Read'))});var count=document.getElementById('notif-count');if(count)count.style.display='none';showToast('All marked read','success')}catch(e){showToast('Error','error')}};`;
+window.markRead=async function(id){var row=document.querySelector('[data-notif-id="'+id+'"]');var b=row&&row.querySelector('button[data-action="markRead"]');if(b){if(b.disabled)return;b.disabled=true}try{await fetch('/api/notifications',{method:'PATCH',headers:{'Content-Type':'application/json'},credentials:'include',body:JSON.stringify({id})});if(row){row.classList.add('is-read');if(b)b.replaceWith(document.createTextNode('Read'))}var count=document.getElementById('notif-count');if(count){var c=parseInt(count.textContent||'0',10)-1;if(c<=0)count.style.display='none';else count.textContent=c}}catch(e){if(b)b.disabled=false;showToast('Error','error')}};
+window.markAllRead=async function(){var b=document.querySelector('button[data-action="markAllRead"]');if(b){if(b.disabled)return;window.loadingBtn(b,true,'Marking...')}try{await fetch('/api/notifications',{method:'PATCH',headers:{'Content-Type':'application/json'},credentials:'include',body:JSON.stringify({})});document.querySelectorAll('[data-notif-id]').forEach(function(row){row.classList.add('is-read');var btn=row.querySelector('button');if(btn)btn.replaceWith(document.createTextNode('Read'))});var count=document.getElementById('notif-count');if(count)count.style.display='none';showToast('All marked read','success')}catch(e){if(b)window.loadingBtn(b,false);showToast('Error','error')}};
+document.querySelectorAll('[data-notif-row]').forEach(function(row){row.addEventListener('keydown',function(e){if(e.key==='Enter'||e.key===' '){e.preventDefault();var btn=row.querySelector('button[data-action="markRead"]');if(btn)btn.click();else window.markRead(row.getAttribute('data-notif-id'))}})});`;
 
-  return page(user, 'Notifications | Moonlanding', null, content, [script]);
+  return page(user, 'Notifications | Thatcher', null, content, [script]);
 }

package/src/ui/page-handler-admin.js

@@ -1,4 +1,4 @@
-import { list, get } from '@/lib/query-engine.js';
+import { list, get } from '@/lib/busybase-store.js';
 import { renderAuditDashboard, renderSystemHealth, renderAccessDenied, generateHtml, REDIRECT } from '@/ui/renderer.js';
 import { renderSettingsHome, renderSettingsSystem, renderSettingsUsers, renderSettingsTeams, renderSettingsRfiSections } from '@/ui/settings-renderer.js';
 import { renderSettingsTemplates, renderSettingsNotifications, renderSettingsIntegrations, renderSettingsChecklists, renderSettingsRecreation, renderSettingsEntityTypes, renderSettingsEngagementTypes } from '@/ui/settings-renderer-advanced.js';
@@ -24,97 +24,106 @@ export async function handleAdminPage(normalized, segments, user) {
   if (!isPartner(user)) return renderAccessDenied(user, 'admin', 'view');
 
   if (normalized === '/admin/settings') {
-    const config = await getSystemConfig();
-    const counts = await getSettingsCounts();
-    return renderSettingsHome(user, config, counts);
+    try {
+      const config = await getSystemConfig();
+      const counts = await getSettingsCounts();
+      return renderSettingsHome(user, config, counts);
+    } catch (err) {
+      console.error('Failed to load admin settings:', err);
+      return generateHtml('Settings', '<div class="empty-state"><div class="empty-state-title">Failed to load. Refresh.</div><div class="empty-state-desc">The settings could not be loaded. Please refresh the page to try again.</div></div>', []);
+    }
   }
   if (normalized === '/admin/settings/system') { const config = await getSystemConfig(); return renderSettingsSystem(user, config); }
-  if (normalized === '/admin/settings/users') { return renderSettingsUsers(user, list('user', {})); }
+  if (normalized === '/admin/settings/users') { return renderSettingsUsers(user, await list('user', {})); }
   if (normalized === '/admin/settings/teams') {
     const { renderSettingsTeams: _rt } = await lazyRenderer('settings-renderer.js');
-    return _rt(user, list('team', {}), list('user', {}));
+    return _rt(user, await list('team', {}), await list('user', {}));
   }
   if (normalized === '/admin/settings/rfi-sections') {
-    let sections = []; try { sections = list('rfi_section', {}); } catch {}
+    let sections = []; try { sections = await list('rfi_section', {}); } catch {}
     return renderSettingsRfiSections(user, sections);
   }
   if (normalized === '/admin/settings/rfi-templates') {
     const { renderSettingsRfiTemplates } = await lazyRenderer('settings-renderer-rfi-templates.js');
-    let templates = []; try { templates = list('rfi_template', {}); } catch {}
+    let templates = []; try { templates = await list('rfi_template', {}); } catch {}
     return renderSettingsRfiTemplates(user, templates);
   }
   if (normalized === '/admin/settings/templates') {
-    let templates = []; try { templates = list('review_template', {}); } catch {}
+    let templates = []; try { templates = await list('review_template', {}); } catch {}
     return renderSettingsTemplates(user, templates);
   }
   if (normalized === '/admin/settings/notifications') { return renderSettingsNotifications(user, await getSystemConfig()); }
   if (normalized === '/admin/settings/integrations') {
     let intSettings = {};
-    try { const { getDatabase } = await import('@/lib/database-core.js'); const row = getDatabase().prepare('SELECT value FROM system_settings WHERE key = ?').get('integration_settings'); intSettings = row ? JSON.parse(row.value) : {}; } catch {}
+    try { const row = await get('system_settings', 'integration_settings'); intSettings = row?.value ? JSON.parse(row.value) : {}; } catch {}
     return renderSettingsIntegrations(user, intSettings);
   }
   if (normalized === '/admin/settings/checklists') {
-    let checklists = []; try { checklists = list('checklist', {}); } catch {}
+    let checklists = []; try { checklists = await list('checklist', {}); } catch {}
     return renderSettingsChecklists(user, checklists);
   }
   if (normalized === '/admin/settings/recreation') {
     return renderSettingsRecreation(user);
   }
   if (normalized === '/admin/settings/entity-types') {
-    let items = []; try { items = list('entity_type', {}); } catch {}
+    let items = []; try { items = await list('entity_type', {}); } catch {}
     return renderSettingsEntityTypes(user, items);
   }
   if (normalized === '/admin/settings/engagement-types') {
-    let items = []; try { items = list('engagement_type', {}); } catch {}
+    let items = []; try { items = await list('engagement_type', {}); } catch {}
     return renderSettingsEngagementTypes(user, items);
   }
   if (normalized === '/admin/settings/permissions') {
-    let permissions = []; try { permissions = list('permission', {}); } catch {}
+    let permissions = []; try { permissions = await list('permission', {}); } catch {}
     return renderSettingsMwrPermissions(user, permissions);
   }
   if (normalized === '/admin/settings/review') { return renderSettingsReviewSettings(user, await getSystemConfig()); }
   if (normalized === '/admin/settings/file-review') {
     let frSettings = {};
-    try { const { getDatabase } = await import('@/lib/database-core.js'); const row = getDatabase().prepare('SELECT value FROM system_settings WHERE key = ?').get('file_review_settings'); frSettings = row ? JSON.parse(row.value) : {}; } catch {}
+    try { const row = await get('system_settings', 'file_review_settings'); frSettings = row?.value ? JSON.parse(row.value) : {}; } catch {}
     return renderSettingsFileReview(user, await getSystemConfig(), frSettings);
   }
   if (normalized.startsWith('/admin/settings/templates/') && segments.length === 4) {
     const templateId = segments[3];
     let template = {}, sections = [];
-    try { template = get('review_template', templateId) || {}; sections = list('review_template_section', {}).filter(s => s.review_template_id === templateId); } catch {}
+    try { template = await get('review_template', templateId) || {}; sections = (await list('review_template_section', {})).filter(s => s.review_template_id === templateId); } catch {}
     return renderSettingsTemplateManage(user, template, sections);
   }
   if (normalized === '/admin/settings/checklists/manage') {
     let checklists = [];
-    try { checklists = list('checklist', {}).map(c => { let items = []; try { items = list('checklist_item', {}).filter(i => i.checklist_id === c.id); } catch {} return { ...c, total_items: items.length }; }); } catch {}
+    try {
+      const cls = await list('checklist', {});
+      const allItems = await list('checklist_item', {});
+      checklists = cls.map(c => ({ ...c, total_items: allItems.filter(i => i.checklist_id === c.id).length }));
+    } catch {}
     return renderChecklistsManagement(user, checklists);
   }
   if (normalized === '/admin/build-logs') {
-    let logs = []; try { logs = list('build_log', {}); } catch {}
+    let logs = []; try { logs = await list('build_log', {}); } catch {}
     const content = renderBuildLogsContent(logs);
     return generateHtml('Build Logs', content, []);
   }
   if (normalized === '/admin/health') { return renderSystemHealth(user, await getSystemHealth()); }
   if (normalized === '/admin/settings/users/new') {
     const { renderSettingsUserDetail } = await lazyRenderer('settings-user-team-renderer.js');
-    return renderSettingsUserDetail(user, {}, list('team', {}));
+    return renderSettingsUserDetail(user, {}, await list('team', {}));
   }
   if (segments.length === 4 && segments[2] === 'users' && segments[3] !== 'new') {
     const { renderSettingsUserDetail: _rUD } = await lazyRenderer('settings-user-team-renderer.js');
-    return _rUD(user, get('user', segments[3]) || {}, list('team', {}));
+    return _rUD(user, await get('user', segments[3]) || {}, await list('team', {}));
   }
   if (normalized === '/admin/settings/teams/new') {
     const { renderSettingsTeamDetail } = await lazyRenderer('settings-user-team-renderer.js');
-    return renderSettingsTeamDetail(user, {}, list('user', {}));
+    return renderSettingsTeamDetail(user, {}, await list('user', {}));
   }
   if (segments.length === 4 && segments[2] === 'teams' && segments[3] !== 'new') {
     const { renderSettingsTeamDetail: _rTD } = await lazyRenderer('settings-user-team-renderer.js');
-    return _rTD(user, get('team', segments[3]) || {}, list('user', {}));
+    return _rTD(user, await get('team', segments[3]) || {}, await list('user', {}));
   }
   if (normalized === '/admin/jobs') {
     let jobs = [];
     try { const { getConfigEngineSync } = await import('@/lib/config-generator-engine.js'); const engine = getConfigEngineSync(); const config = engine.getConfig(); jobs = (config.jobs || []).map(j => ({ ...j, status: j.enabled === false ? 'disabled' : 'scheduled' })); } catch {}
-    let logs = []; try { logs = list('job_log', {}).slice(0, 20); } catch {}
+    let logs = []; try { logs = (await list('job_log', {})).slice(0, 20); } catch {}
     return renderJobManagement(user, jobs, logs);
   }
   return null;

package/src/ui/page-handler-helpers.js

@@ -1,4 +1,7 @@
-import { list, get, count } from '@/lib/query-engine.js';
+import { list, get, count } from '@/lib/busybase-store.js';
+import { createLogger } from '@/lib/logger.js';
+
+const log = createLogger('[PageHandlerHelpers]');
 import { getConfigEngineSync } from '@/lib/config-generator-engine.js';
 
 export function resolveEnumOptions(spec) {
@@ -14,28 +17,28 @@ export function resolveEnumOptions(spec) {
   return resolvedSpec;
 }
 
-export function getRefOptions(spec) {
+export async function getRefOptions(spec) {
   const refOptions = {};
   for (const [fieldKey, field] of Object.entries(spec.fields || {}).filter(([k, f]) => f.type === 'ref' && f.ref)) {
-    try { refOptions[fieldKey] = list(field.ref, {}).map(r => ({ value: r.id, label: r.name || r.title || r.label || r.email || r.id })); }
+    try { refOptions[fieldKey] = (await list(field.ref, {})).map(r => ({ value: r.id, label: r.name || r.title || r.label || r.email || r.id })); }
     catch { refOptions[fieldKey] = []; }
   }
   return refOptions;
 }
 
+// busybase-store's list()/get() already attach `<field>_display` for ref fields (the
+// old LEFT JOIN equivalent), so this is now a sync pass-through: it just guarantees a
+// `_display` key exists (falling back to the raw id) without issuing any query.
 export function resolveRefFields(items, spec) {
   try {
     const refFields = Object.entries(spec.fields || {}).filter(([k, f]) => f.type === 'ref' && f.ref);
     if (!refFields.length) return items;
-    const refCaches = {};
-    for (const [fieldKey, field] of refFields) {
-      const refIds = [...new Set(items.map(i => i[fieldKey]).filter(Boolean))];
-      if (refIds.length) try { refCaches[fieldKey] = Object.fromEntries(list(field.ref, {}).map(r => [r.id, r.name || r.title || r.label || r.id])); } catch {}
-    }
     return items.map(item => {
       const resolved = { ...item };
       for (const [fieldKey] of refFields) {
-        if (item[fieldKey] && refCaches[fieldKey]) resolved[`${fieldKey}_display`] = refCaches[fieldKey][item[fieldKey]] || item[fieldKey];
+        if (item[fieldKey] && resolved[`${fieldKey}_display`] === undefined) {
+          resolved[`${fieldKey}_display`] = item[fieldKey];
+        }
       }
       return resolved;
     });
@@ -44,11 +47,11 @@ export function resolveRefFields(items, spec) {
 
 export async function getDashboardStats(user) {
   try {
-    const engagements = list('engagement', {});
-    const clients = list('client', {});
+    const engagements = await list('engagement', {});
+    const clients = await list('client', {});
     const clientMap = Object.fromEntries(clients.map(c => [c.id, c.name]));
-    const rfis = list('rfi', {});
-    const reviews = list('review', {});
+    const rfis = await list('rfi', {});
+    const reviews = await list('review', {});
     const myRfis = user ? rfis.filter(r => r.assigned_to === user.id) : [];
     const now = Math.floor(Date.now() / 1000);
     const overdueRfis = rfis.filter(r => r.status !== 'closed' && r.due_date && r.due_date < now).map(r => ({ ...r, daysOverdue: Math.floor((now - r.due_date) / 86400) }));
@@ -60,7 +63,7 @@ export async function getDashboardStats(user) {
 export async function getSettingsCounts() {
   const counts = {};
   const entities = { users: 'user', teams: 'team', rfiSections: 'rfi_section', templates: 'review_template', checklists: 'checklist', recreation: 'permission_audit', rfiTemplates: 'rfi_template' };
-  for (const [key, entity] of Object.entries(entities)) { try { counts[key] = count(entity); } catch { counts[key] = 0; } }
+  for (const [key, entity] of Object.entries(entities)) { try { counts[key] = await count(entity); } catch { counts[key] = 0; } }
   return counts;
 }
 
@@ -75,27 +78,28 @@ export async function getSystemConfig() {
 
 export async function getAuditData() {
   try {
-    const audits = list('permission_audit', {});
+    const audits = await list('permission_audit', {});
     const cutoff = Math.floor(Date.now() / 1000) - 30 * 86400;
     const recent = audits.filter(a => (a.timestamp || a.created_at) > cutoff);
     return { summary: { total_actions: recent.length, grants: recent.filter(a => a.action === 'grant').length, revokes: recent.filter(a => a.action === 'revoke').length, role_changes: recent.filter(a => a.action === 'role_change').length }, recentActivity: audits.slice(0, 50) };
   } catch { return { summary: {}, recentActivity: [] }; }
 }
 
-export function getClientDashboardStats(clientId) {
+export async function getClientDashboardStats(clientId) {
   try {
-    const engagements = list('engagement', {}).filter(e => e.client_id === clientId);
-    const rfis = list('rfi', {}).filter(r => engagements.some(e => e.id === r.engagement_id));
-    const reviews = list('review', {}).filter(r => engagements.some(e => e.id === r.engagement_id));
-    const users = list('user', {}).filter(u => u.client_id === clientId);
+    const engagements = await list('engagement', { client_id: clientId });
+    const engIds = new Set(engagements.map(e => e.id));
+    const rfis = (await list('rfi', {})).filter(r => engIds.has(r.engagement_id));
+    const reviews = (await list('review', {})).filter(r => engIds.has(r.engagement_id));
+    const users = await list('user', { client_id: clientId });
     return { engagements: engagements.length, activeRfis: rfis.filter(r => r.status !== 'closed' && r.status !== 'completed').length, users: users.length, reviews: reviews.length, engagementList: engagements.slice(0, 10) };
-  } catch { return { engagements: 0, activeRfis: 0, users: 0, reviews: 0, engagementList: [] }; }
+  } catch (err) { log.error('getClientDashboardStats failed', { clientId, message: err?.message || String(err) }); return { engagements: 0, activeRfis: 0, users: 0, reviews: 0, engagementList: [] }; }
 }
 
 export async function getSystemHealth() {
   try {
     const entityCounts = {};
-    for (const e of ['user','client','engagement','rfi','review','team']) { try { entityCounts[e] = count(e); } catch { entityCounts[e] = 0; } }
+    for (const e of ['user','client','engagement','rfi','review','team']) { try { entityCounts[e] = await count(e); } catch { entityCounts[e] = 0; } }
     const u = process.uptime();
     return { database: { status: 'Connected', type: 'SQLite' }, server: { port: 3004, uptime: `${Math.floor(u/3600)}h ${Math.floor((u%3600)/60)}m` }, entities: entityCounts };
   } catch { return {}; }
@@ -104,7 +108,7 @@ export async function getSystemHealth() {
 export function renderBuildLogsContent(logs) {
   const rows = (logs || []).map(l => {
     const sts = l.status === 'success' ? '<span class="pill pill-success">Success</span>' : l.status === 'failed' ? '<span class="pill pill-danger">Failed</span>' : `<span class="pill pill-warning">${l.status || 'pending'}</span>`;
-    const ts = l.created_at ? new Date(l.created_at * 1000).toLocaleString() : '-';
+    const ts = l.created_at ? new Date(l.created_at * 1000).toLocaleString('en-ZA') : '-';
     return `<tr><td style="padding:8px 12px">${l.version||'-'}</td><td style="padding:8px 12px">${sts}</td><td style="padding:8px 12px;font-size:0.78rem;color:var(--color-text-muted)">${ts}</td><td style="padding:8px 12px">${l.duration?l.duration+'s':'-'}</td><td style="padding:8px 12px;font-size:0.78rem">${l.message||'-'}</td></tr>`;
   }).join('');
   return `<div style="margin-bottom:24px"><h1 class="page-title">Build Logs</h1></div><div class="table-wrap" style="overflow-x:auto"><table class="data-table"><thead><tr><th>Version</th><th>Status</th><th>Time</th><th>Duration</th><th>Message</th></tr></thead><tbody>${rows||'<tr><td colspan="5" style="padding:32px;text-align:center;color:var(--color-text-muted)">No build logs</td></tr>'}</tbody></table></div>`;

package/src/ui/page-handler-reviews.js

@@ -1,6 +1,8 @@
-import { list, get } from '@/lib/query-engine.js';
+import { list, get } from '@/lib/busybase-store.js';
+import { createLogger } from '@/lib/logger.js';
 import { getSpec } from '@/config/spec-helpers.js';
-import { getDatabase } from '@/lib/database-core.js';
+
+const log = createLogger('[PageHandlerReviews]');
 import { renderEntityList, renderAccessDenied } from '@/ui/renderer.js';
 import { renderSectionReport, renderReviewListTabbed } from '@/ui/review-renderer.js';
 import { renderChecklistDetails, renderChecklistsHome } from '@/ui/checklist-renderer.js';
@@ -21,14 +23,14 @@ async function lazyRenderer(name) {
   return import(`file://${__dirname_rv}${name}?t=${t}`);
 }
 
-export function handleFilteredReviewList(user, filter) {
+export async function handleFilteredReviewList(user, filter) {
   if (!canList(user, 'review')) return renderAccessDenied(user, 'review', 'list');
   const spec = getSpec('review'); if (!spec) return null;
-  let items = list('review', {});
+  const where = filter === 'archive' ? { status: 'archived' } : {};
+  let items = await list('review', where);
   if (filter === 'active') items = items.filter(r => r.status === 'active' || r.status === 'open');
   else if (filter === 'priority') { const pids = user.priority_reviews || []; items = items.filter(r => pids.includes(r.id)); }
   else if (filter === 'history') items = items.filter(r => r.status === 'closed' || r.status === 'completed');
-  else if (filter === 'archive') items = items.filter(r => r.status === 'archived');
   return renderEntityList('review', resolveRefFields(items, spec), spec, user);
 }
 
@@ -40,25 +42,27 @@ export async function handleReviewRoutes(normalized, segments, user, req) {
 
   if (normalized === '/reviews' || normalized === '/review') {
     if (!canList(user, 'review')) return renderAccessDenied(user, 'review', 'list');
-    let reviews = []; try { reviews = getDatabase().prepare('SELECT * FROM review ORDER BY updated_at DESC').all(); } catch { try { reviews = list('review', {}); } catch {} }
-    const engMap = {}; try { list('engagement', {}).forEach(e => { engMap[e.id] = e.name; }); } catch {}
+    let reviews = []; try { reviews = await list('review', {}, { sort: { field: 'updated_at', dir: 'DESC' } }); } catch {}
+    const engMap = {}; try { (await list('engagement', {})).forEach(e => { engMap[e.id] = e.name; }); } catch {}
     return renderReviewListTabbed(user, reviews.map(r => ({ ...r, engagement_name: engMap[r.engagement_id] || r.engagement_name || null })));
   }
 
   if (segments[0] === 'review' && segments.length === 3 && segments[2] === 'sections') {
     const reviewId = segments[1];
     if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view');
-    const review = get('review', reviewId) || getDatabase().prepare('SELECT * FROM review WHERE id=?').get(reviewId);
+    const review = await get('review', reviewId);
     if (!review) return null;
     let sections = [];
-    try { sections = list('review_section', {}).filter(s => s.review_id === reviewId); } catch (e) { console.error('Failed to fetch sections', e); }
+    try { sections = (await list('review_section', { review_id: reviewId })); } catch (e) { log.error('Failed to fetch sections', { reviewId, message: e?.message || String(e) }); }
     return renderSectionReport(user, review, sections);
   }
 
   if (normalized === '/reviews/analytics' || normalized === '/review/analytics') {
     if (!canList(user, 'review')) return renderAccessDenied(user, 'review', 'list');
     let reviews = [], highlights = [], activity = [];
-    try { reviews = list('review', {}); } catch {} try { highlights = list('highlight', {}); } catch {} try { activity = list('activity_log', {}).slice(0, 50); } catch {}
+    try { reviews = await list('review', {}); } catch {}
+    try { highlights = await list('highlight', {}); } catch {}
+    try { activity = (await list('activity_log', {})).slice(0, 50); } catch {}
     return renderReviewAnalytics(user, { reviews, highlights, recentActivity: activity });
   }
 
@@ -67,40 +71,41 @@ export async function handleReviewRoutes(normalized, segments, user, req) {
     const url = new URL(req.url, `http://${req.headers.host||'localhost'}`);
     const leftId = url.searchParams.get('left'), rightId = url.searchParams.get('right');
     if (leftId && rightId) {
-      const leftReview = get('review', leftId), rightReview = get('review', rightId);
+      const leftReview = await get('review', leftId), rightReview = await get('review', rightId);
       if (!leftReview || !rightReview) return null;
       let leftH = [], rightH = [];
-      try { leftH = list('highlight', {}).filter(h => h.review_id === leftId); } catch {} try { rightH = list('highlight', {}).filter(h => h.review_id === rightId); } catch {}
+      try { const all = await list('highlight', {}); leftH = all.filter(h => h.review_id === leftId); rightH = all.filter(h => h.review_id === rightId); } catch {}
       return renderReviewComparison(user, leftReview, rightReview, leftH, rightH);
     }
-    let reviews = []; try { reviews = list('review', {}); } catch {}
+    let reviews = []; try { reviews = await list('review', {}); } catch {}
     return renderComparisonPicker(user, reviews);
   }
 
   if (normalized === '/reviews/tenders' || normalized === '/review/tenders') {
     if (!canList(user, 'review')) return renderAccessDenied(user, 'review', 'list');
     let tenders = [], reviews = [];
-    try { tenders = list('tender', {}); } catch {} try { reviews = list('review', {}); } catch {}
+    try { tenders = await list('tender', {}); } catch {}
+    try { reviews = await list('review', {}); } catch {}
     return renderTenderDashboard(user, tenders.map(t => { const r = reviews.find(rev => rev.id === t.review_id); return { ...t, review_name: r?.name || r?.title || '' }; }), reviews);
   }
 
   if (normalized === '/reviews/batch' || normalized === '/review/batch') {
     if (!canEdit(user, 'review')) return renderAccessDenied(user, 'review', 'edit');
-    let reviews = []; try { reviews = list('review', {}); } catch {}
+    let reviews = []; try { reviews = await list('review', {}); } catch {}
     const spec = getSpec('review'); if (spec) reviews = resolveRefFields(reviews, spec);
     return renderBatchOperations(user, reviews);
   }
 
   if (segments[0] === 'review' && segments.length === 3) {
     const reviewId = segments[1], action = segments[2];
-    const getReview = (id) => get('review', id) || getDatabase().prepare('SELECT * FROM review WHERE id=?').get(id);
+    const getReview = (id) => get('review', id);
     if (action === 'pdf') {
       if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view');
-      const review = getReview(reviewId); if (!review) return null;
+      const review = await getReview(reviewId); if (!review) return null;
       let h = [], s = [];
-      try { h = list('highlight', {}).filter(x => x.review_id === reviewId); } catch {}
-      try { s = list('review_section', {}).filter(x => x.review_id === reviewId); } catch {}
-      // Flatten bounding_rect JSON → x/y/width/height for the overlay renderer.
+      try { h = (await list('highlight', {})).filter(x => x.review_id === reviewId); } catch {}
+      try { s = (await list('review_section', {})).filter(x => x.review_id === reviewId); } catch {}
+      // Flatten bounding_rect JSON -> x/y/width/height for the overlay renderer.
       h = h.map((x) => {
         let br = null; try { br = typeof x.bounding_rect === 'string' ? JSON.parse(x.bounding_rect) : x.bounding_rect; } catch {}
         let rects = []; try { rects = typeof x.rects === 'string' ? JSON.parse(x.rects) : (x.rects || []); } catch {}
@@ -116,16 +121,31 @@ export async function handleReviewRoutes(normalized, segments, user, req) {
       });
       return renderPdfViewer(user, review, h, s);
     }
-    if (action === 'editor') { if (!canEdit(user, 'review')) return renderAccessDenied(user, 'review', 'edit'); const review = getReview(reviewId); if (!review) return null; return renderPdfEditorPlaceholder(user, review); }
-    if (action === 'highlights') { if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view'); const review = getReview(reviewId); if (!review) return null; let h = []; try { h = list('highlight', {}).filter(x => x.review_id === reviewId); } catch {} const rm = {}; for (const x of h) { try { rm[x.id] = list('highlight_response', {}).filter(r => r.highlight_id === x.id); } catch { rm[x.id] = []; } } return renderHighlightThreading(user, review, h, rm); }
-    if (action === 'resolution') { if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view'); const review = getReview(reviewId); if (!review) return null; let s = []; try { s = list('review_section', {}).filter(x => x.review_id === reviewId); } catch {} const hbs = {}; for (const sec of s) { try { hbs[sec.id] = list('highlight', {}).filter(h => h.review_id === reviewId && h.section_id === sec.id); } catch { hbs[sec.id] = []; } } return renderSectionResolution(user, review, s, hbs); }
+    if (action === 'editor') { if (!canEdit(user, 'review')) return renderAccessDenied(user, 'review', 'edit'); const review = await getReview(reviewId); if (!review) return null; return renderPdfEditorPlaceholder(user, review); }
+    if (action === 'highlights') {
+      if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view');
+      const review = await getReview(reviewId); if (!review) return null;
+      let h = []; try { h = (await list('highlight', {})).filter(x => x.review_id === reviewId); } catch {}
+      const rm = {}; const allResp = await list('highlight_response', {}).catch(() => []);
+      for (const x of h) rm[x.id] = allResp.filter(r => r.highlight_id === x.id);
+      return renderHighlightThreading(user, review, h, rm);
+    }
+    if (action === 'resolution') {
+      if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view');
+      const review = await getReview(reviewId); if (!review) return null;
+      let s = []; try { s = (await list('review_section', {})).filter(x => x.review_id === reviewId); } catch {}
+      const allH = await list('highlight', {}).catch(() => []);
+      const hbs = {};
+      for (const sec of s) hbs[sec.id] = allH.filter(h => h.review_id === reviewId && h.section_id === sec.id);
+      return renderSectionResolution(user, review, s, hbs);
+    }
     if (action === 'edit') {
       if (!canEdit(user, 'review')) return renderAccessDenied(user, 'review', 'edit');
-      const review = get('review', reviewId) || getDatabase().prepare('SELECT * FROM review WHERE id=?').get(reviewId);
+      const review = await get('review', reviewId);
       if (!review) return null;
       let engagements = [], teams = [];
-      try { engagements = list('engagement', {}); } catch {}
-      try { teams = list('team', {}); } catch {}
+      try { engagements = await list('engagement', {}); } catch {}
+      try { teams = await list('team', {}); } catch {}
       const { renderReviewEdit } = await lazyRenderer('review-edit-renderer.js');
       return renderReviewEdit(user, review, engagements, teams);
     }
@@ -135,13 +155,19 @@ export async function handleReviewRoutes(normalized, segments, user, req) {
   if (segments.length === 2 && segments[0] === 'review' && segments[1] !== 'new') {
     const reviewId = segments[1];
     if (!canView(user, 'review')) return renderAccessDenied(user, 'review', 'view');
-    const review = get('review', reviewId) || getDatabase().prepare('SELECT * FROM review WHERE id=?').get(reviewId); if (!review) return null;
+    const review = await get('review', reviewId); if (!review) return null;
     let highlights = [], collaborators = [], checklists = [], sections = [], tenders = [];
-    try { highlights = list('highlight', {}).filter(h => h.review_id === reviewId); } catch {}
-    try { collaborators = list('collaborator', {}).filter(c => c.review_id === reviewId); } catch {}
-    try { checklists = list('checklist', {}).filter(c => c.review_id === reviewId).map(c => { let items = []; try { items = list('checklist_item', {}).filter(i => i.checklist_id === c.id); } catch {} return { ...c, total_items: items.length, completed_items: items.filter(i => i.completed).length }; }); } catch {}
-    try { sections = list('review_section', {}).filter(s => s.review_id === reviewId); } catch {}
-    try { tenders = list('tender', {}).filter(t => t.review_id === reviewId); } catch {}
+    try { highlights = (await list('highlight', {})).filter(h => h.review_id === reviewId); } catch {}
+    try { collaborators = (await list('collaborator', {})).filter(c => c.review_id === reviewId); } catch {}
+    try {
+      const allItems = await list('checklist_item', {});
+      checklists = (await list('checklist', {})).filter(c => c.review_id === reviewId).map(c => {
+        const items = allItems.filter(i => i.checklist_id === c.id);
+        return { ...c, total_items: items.length, completed_items: items.filter(i => i.completed).length };
+      });
+    } catch {}
+    try { sections = (await list('review_section', {})).filter(s => s.review_id === reviewId); } catch {}
+    try { tenders = (await list('tender', {})).filter(t => t.review_id === reviewId); } catch {}
     const { renderReviewDetail } = await lazyRenderer('review-detail-renderer.js');
     return renderReviewDetail(user, review, highlights, collaborators, checklists, sections, tenders);
   }
@@ -149,15 +175,25 @@ export async function handleReviewRoutes(normalized, segments, user, req) {
   if (segments[0] === 'checklist' && segments.length === 2 && segments[1] !== 'new') {
     const checklistId = segments[1];
     if (!canView(user, 'checklist')) return renderAccessDenied(user, 'checklist', 'view');
-    const checklist = get('checklist', checklistId); if (!checklist) return null;
-    let items = []; try { items = getDatabase().prepare('SELECT * FROM checklist_item WHERE checklist_id=? ORDER BY "order" ASC, created_at ASC').all(checklistId); } catch {}
+    const checklist = await get('checklist', checklistId); if (!checklist) return null;
+    let items = [];
+    try { items = (await list('checklist_item', { checklist_id: checklistId })).sort((a, b) => (a.order ?? 0) - (b.order ?? 0) || (a.created_at ?? 0) - (b.created_at ?? 0)); } catch {}
     return renderChecklistDetails(user, checklist, items);
   }
 
   if (normalized === '/checklists' || normalized === '/checklist') {
     if (!canList(user, 'checklist')) return renderAccessDenied(user, 'checklist', 'list');
     let checklists = [];
-    try { const db = getDatabase(); const stats = db.prepare('SELECT checklist_id, COUNT(*) as total, SUM(CASE WHEN is_done=1 THEN 1 ELSE 0 END) as done FROM checklist_item GROUP BY checklist_id').all(); const statsMap = Object.fromEntries(stats.map(s => [s.checklist_id, s])); checklists = list('checklist', {}).map(c => ({ ...c, total_items: statsMap[c.id]?.total || 0, completed_items: statsMap[c.id]?.done || 0 })); } catch {}
+    try {
+      // Old GROUP BY checklist_id (total + done) -> client-side aggregate.
+      const allItems = await list('checklist_item', {});
+      const statsMap = {};
+      for (const it of allItems) {
+        const s = statsMap[it.checklist_id] || (statsMap[it.checklist_id] = { total: 0, done: 0 });
+        s.total++; if (it.is_done === 1 || it.is_done === true || it.completed) s.done++;
+      }
+      checklists = (await list('checklist', {})).map(c => ({ ...c, total_items: statsMap[c.id]?.total || 0, completed_items: statsMap[c.id]?.done || 0 }));
+    } catch {}
     return renderChecklistsHome(user, checklists);
   }
 

package/src/ui/page-handler-rfi.js

@@ -1,5 +1,4 @@
-import { list, get } from '@/lib/query-engine.js';
-import { getDatabase } from '@/lib/database-core.js';
+import { list, get } from '@/lib/busybase-store.js';
 import { canView, canList, isClerk, isPartner } from '@/ui/permissions-ui.js';
 import { renderAccessDenied } from '@/ui/renderer.js';
 import { renderRfiList } from '@/ui/rfi-list-renderer.js';
@@ -9,31 +8,46 @@ const lazyR = (name) => import(`file://${__dirname_rfi}${name}?t=${globalThis.__
 
 export async function handleRfiDetail(user, rfiId) {
   if (!canView(user, 'rfi')) return renderAccessDenied(user, 'rfi', 'view');
-  const db = getDatabase();
-  const rfi = db.prepare('SELECT * FROM rfis WHERE id=?').get(rfiId) || get('rfi', rfiId); if (!rfi) return null;
-  let questions = []; try { questions = db.prepare('SELECT q.*, (SELECT COUNT(*) FROM rfi_responses r WHERE r.question_id=q.id) as response_count FROM rfi_questions q WHERE q.rfi_id=?').all(rfiId); } catch { try { questions = list('rfi_question', {}).filter(q => q.rfi_id === rfiId); } catch {} }
-  let sections = []; try { sections = list('rfi_section', {}).filter(s => s.rfi_id === rfiId || s.engagement_id === rfi.engagement_id); } catch {}
-  let engagement = null; try { if (rfi.engagement_id) engagement = get('engagement', rfi.engagement_id); } catch {}
+  const rfi = await get('rfi', rfiId); if (!rfi) return null;
+  let questions = [];
+  try {
+    questions = (await list('rfi_question', { rfi_id: rfiId }));
+    // Old correlated subquery (response_count per question) -> client-side aggregate.
+    const responses = await list('rfi_response', {});
+    const counts = {};
+    for (const r of responses) counts[r.question_id] = (counts[r.question_id] || 0) + 1;
+    questions = questions.map(q => ({ ...q, response_count: counts[q.id] || 0 }));
+  } catch {}
+  let sections = []; try {
+    const [bySectionId, byEngId] = await Promise.all([
+      list('rfi_section', { rfi_id: rfiId }),
+      list('rfi_section', { engagement_id: rfi.engagement_id }),
+    ]);
+    const seen = new Set(); sections = [...bySectionId, ...byEngId].filter(s => seen.has(s.id) ? false : seen.add(s.id));
+  } catch {}
+  let engagement = null; try { if (rfi.engagement_id) engagement = await get('engagement', rfi.engagement_id); } catch {}
   const { renderRfiDetail } = await lazyR('rfi-detail-renderer.js');
   return renderRfiDetail(user, rfi, questions, sections, engagement);
 }
 
 export async function handleRfiList(user) {
   if (!canList(user, 'rfi')) return renderAccessDenied(user, 'rfi', 'list');
-  let rfis = []; try { rfis = getDatabase().prepare('SELECT * FROM rfis ORDER BY created_at ASC').all(); } catch {}
-  let engagements = []; try { engagements = list('engagement', {}); } catch {}
+  let rfis = []; try { rfis = await list('rfi', {}, { sort: { field: 'created_at', dir: 'ASC' } }); } catch {}
+  let engagements = []; try { engagements = await list('engagement', {}); } catch {}
   if (isClerk(user)) rfis = rfis.filter(r => engagements.filter(e => e.assigned_to === user.id || e.team_id === user.team_id).some(e => e.id === r.engagement_id));
   return renderRfiList(user, rfis.map((r, i) => ({ ...r, display_name: 'RFI #' + (i + 1) })), engagements);
 }
 
 export async function handleRfiReport(user, rfiId, res) {
-  const db = getDatabase();
   let rfi = null, questions = [], responses = [], engagement = null;
-  try { rfi = get('rfi', rfiId) || db.prepare('SELECT * FROM rfis WHERE id=?').get(rfiId); } catch {}
+  try { rfi = await get('rfi', rfiId); } catch {}
   if (!rfi) return null;
-  try { questions = db.prepare('SELECT * FROM rfi_questions WHERE rfi_id=? ORDER BY created_at ASC').all(rfiId); } catch {}
-  try { const qIds = questions.map(q => q.id); if (qIds.length) { const ph = qIds.map(() => '?').join(','); responses = db.prepare(`SELECT * FROM rfi_responses WHERE question_id IN (${ph})`).all(...qIds); } } catch {}
-  try { engagement = rfi.engagement_id ? (get('engagement', rfi.engagement_id) || db.prepare('SELECT * FROM engagement WHERE id=?').get(rfi.engagement_id)) : null; } catch {}
+  try { questions = await list('rfi_question', { rfi_id: rfiId }, { sort: { field: 'created_at', dir: 'ASC' } }); } catch {}
+  try {
+    const qIds = new Set(questions.map(q => q.id));
+    if (qIds.size) responses = (await list('rfi_response', {})).filter(r => qIds.has(r.question_id));
+  } catch {}
+  try { engagement = rfi.engagement_id ? await get('engagement', rfi.engagement_id) : null; } catch {}
   const { renderRfiReport } = await lazyR('rfi-report-renderer.js');
   const html = renderRfiReport(user, rfi, engagement, questions, responses);
   res.setHeader('Content-Type', 'text/html; charset=utf-8');