thatcher 1.0.6 → 1.0.33

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');

package/src/ui/page-handler.js

@@ -1,8 +1,7 @@
 import { getUser, setCurrentRequest } from '@/engine.server.js';
 import { hasGoogleAuth } from '@/config/env.js';
 import { getSpec } from '@/config/spec-helpers.js';
-import { list, get } from '@/lib/query-engine.js';
-import { getDatabase } from '@/lib/database-core.js';
+import { list, get } from '@/lib/busybase-store.js';
 import { renderLogin, renderDashboard, renderEntityList, renderEntityDetail, renderEntityForm, renderAccessDenied, renderPasswordReset, renderPasswordResetConfirm, REDIRECT } from '@/ui/renderer.js';
 import { renderClientDashboard, renderClientList } from '@/ui/client-renderer.js';
 import { canList, canView, canCreate, canEdit, isPartner, isClerk, isClientUser, canClientAccessEntity } from '@/ui/permissions-ui.js';
@@ -25,25 +24,32 @@ function reqUrl(req) {
 
 async function handleEngagementDetail(user, engId) {
   if (!canView(user, 'engagement')) return renderAccessDenied(user, 'engagement', 'view');
-  const db = getDatabase();
-  const engagement = get('engagement', engId) || db.prepare('SELECT * FROM engagement WHERE id=?').get(engId);
+  const engagement = await get('engagement', engId);
   if (!engagement) return null;
-  let client = null; try { client = engagement.client_id ? get('client', engagement.client_id) : null; } catch {}
-  let rfis = []; try { rfis = db.prepare('SELECT * FROM rfis WHERE engagement_id=?').all(engId); } catch { try { rfis = list('rfi', {}).filter(r => r.engagement_id === engId); } catch {} }
-  let sections = []; try { sections = db.prepare('SELECT * FROM rfi_section WHERE engagement_id=? ORDER BY sort_order ASC').all(engId); } catch {}
-  let team = null; try { team = engagement.team_id ? get('team', engagement.team_id) : null; } catch {}
+  let client = null; try { client = engagement.client_id ? await get('client', engagement.client_id) : null; } catch {}
+  let rfis = []; try { rfis = await list('rfi', { engagement_id: engId }); } catch {}
+  let sections = [];
+  try {
+    sections = await list('rfi_section', { engagement_id: engId }, { sort: { field: 'sort_order', dir: 'ASC' } });
+  } catch {}
+  let team = null; try { team = engagement.team_id ? await get('team', engagement.team_id) : null; } catch {}
   let assignedUsers = [];
-  try { const ids = JSON.parse(engagement.users || '[]'); const um = Object.fromEntries(db.prepare('SELECT id, name, email FROM users').all().map(u => [u.id, u.name || u.email])); assignedUsers = ids.map(id => ({ id, name: um[id] || null })).filter(u => u.name); } catch {}
+  try {
+    const ids = JSON.parse(engagement.users || '[]');
+    const users = await list('user', {});
+    const um = Object.fromEntries(users.map(u => [u.id, u.name || u.email]));
+    assignedUsers = ids.map(id => ({ id, name: um[id] || null })).filter(u => u.name);
+  } catch {}
   const { renderEngagementDetail } = await lazyRenderer('engagement-detail-renderer.js');
   return renderEngagementDetail(user, { ...engagement, team_name: team?.name || engagement.team_name, client_name: client?.name || engagement.client_name, assigned_users_resolved: assignedUsers }, client, rfis, sections);
 }
 async function handleEngagementList(user, req) {
   if (!canList(user, 'engagement')) return renderAccessDenied(user, 'engagement', 'list');
-  let engagements = list('engagement', {});
-  const clientMap = Object.fromEntries(list('client', {}).map(c => [c.id, c.name]));
+  let engagements = await list('engagement', {});
+  const clientMap = Object.fromEntries((await list('client', {})).map(c => [c.id, c.name]));
   engagements = engagements.map(e => ({ ...e, client_name: clientMap[e.client_id] || e.client_name || '-' }));
   const spec = getSpec('engagement'); if (spec) engagements = resolveRefFields(engagements, spec);
-  let teams = []; try { teams = list('team', {}); } catch {}
+  let teams = []; try { teams = await list('team', {}); } catch {}
   const teamMap = Object.fromEntries(teams.map(t => [t.id, t.name]));
   engagements = engagements.map(e => ({ ...e, team_name: teamMap[e.team_id] || e.team_name || '-' }));
   const years = [...new Set(engagements.map(e => { if (!e.year) return null; const m = String(e.year).match(/\b(20\d{2}|19\d{2})\b/); return m ? m[1] : null; }).filter(Boolean))].sort().reverse();
@@ -53,10 +59,10 @@ async function handleEngagementList(user, req) {
 async function handleSearch(user, req) {
   const url = reqUrl(req);
   const q = url.searchParams.get('q') || '', entityFilter = url.searchParams.get('entity') || '', statusFilter = url.searchParams.get('status') || '';
-  let teams = []; try { teams = list('team', {}); } catch {}
+  let teams = []; try { teams = await list('team', {}); } catch {}
   const results = {};
   for (const eName of (entityFilter ? [entityFilter] : ['engagement', 'client', 'rfi', 'review'])) {
-    try { let items = list(eName, {}); if (q) items = items.filter(i => JSON.stringify(i).toLowerCase().includes(q.toLowerCase())); if (statusFilter) items = items.filter(i => i.status === statusFilter); const spec = getSpec(eName); if (spec) items = resolveRefFields(items, spec); results[eName] = items.slice(0, 50); } catch {}
+    try { let items = await list(eName, {}); if (q) items = items.filter(i => JSON.stringify(i).toLowerCase().includes(q.toLowerCase())); if (statusFilter) items = items.filter(i => i.status === statusFilter); const spec = getSpec(eName); if (spec) items = resolveRefFields(items, spec); results[eName] = items.slice(0, 50); } catch {}
   }
   return renderAdvancedSearch(user, results, { teams, stages: ['info_gathering', 'commencement', 'team_execution', 'partner_review', 'finalization', 'closeout'] });
 }
@@ -67,10 +73,10 @@ async function handleGenericEntityView(user, entityName, id) {
     if (!canCreate(user, entityName)) return renderAccessDenied(user, entityName, 'create');
     const resolvedSpec = resolveEnumOptions(spec);
     const { renderEntityForm: lazyEntityForm } = await lazyRenderer('entity-renderer.js');
-    return lazyEntityForm(entityName, null, resolvedSpec, user, true, getRefOptions(resolvedSpec));
+    return lazyEntityForm(entityName, null, resolvedSpec, user, true, await getRefOptions(resolvedSpec));
   }
   if (!canView(user, entityName)) return renderAccessDenied(user, entityName, 'view');
-  const item = get(entityName, id); if (!item) return null;
+  const item = await get(entityName, id); if (!item) return null;
   if (item.team_id && user.team_id && item.team_id !== user.team_id && !isPartner(user)) return renderAccessDenied(user, entityName, 'view');
   if (isClientUser(user) && user.client_id && item.client_id && item.client_id !== user.client_id) return renderAccessDenied(user, entityName, 'view');
   const [resolvedItem] = resolveRefFields([item], spec);
@@ -79,14 +85,14 @@ async function handleGenericEntityView(user, entityName, id) {
 }
 async function handleClientSubRoute(user, clientId, subRoute) {
   if (!canView(user, 'client')) return renderAccessDenied(user, 'client', 'view');
-  const client = get('client', clientId); if (!client) return null;
+  const client = await get('client', clientId); if (!client) return null;
   if (isClientUser(user) && user.client_id && user.client_id !== clientId) return renderAccessDenied(user, 'client', 'view');
-  if (subRoute === 'dashboard' || subRoute === 'users') return renderClientDashboard(user, client, getClientDashboardStats(clientId));
+  if (subRoute === 'dashboard' || subRoute === 'users') return renderClientDashboard(user, client, await getClientDashboardStats(clientId));
   if (subRoute === 'progress') {
-    let engagements = []; try { engagements = list('engagement', {}).filter(e => e.client_id === clientId); } catch {}
+    let engagements = []; try { engagements = (await list('engagement', {})).filter(e => e.client_id === clientId); } catch {}
     const spec = getSpec('engagement'); if (spec) engagements = resolveRefFields(engagements, spec);
     let rfiStats = { total: 0, responded: 0, overdue: 0 };
-    try { const allRfis = list('rfi', {}).filter(r => engagements.some(e => e.id === r.engagement_id)); const now = Math.floor(Date.now() / 1000); rfiStats = { total: allRfis.length, responded: allRfis.filter(r => r.status === 'responded' || r.status === 'completed').length, overdue: allRfis.filter(r => r.due_date && r.due_date < now && r.status !== 'closed').length }; } catch {}
+    try { const allRfis = (await list('rfi', {})).filter(r => engagements.some(e => e.id === r.engagement_id)); const now = Math.floor(Date.now() / 1000); rfiStats = { total: allRfis.length, responded: allRfis.filter(r => r.status === 'responded' || r.status === 'completed').length, overdue: allRfis.filter(r => r.due_date && r.due_date < now && r.status !== 'closed').length }; } catch {}
     return renderClientProgress(user, client, engagements, rfiStats);
   }
   return null;
@@ -94,11 +100,11 @@ async function handleClientSubRoute(user, clientId, subRoute) {
 async function handleGenericEntityEdit(user, entityName, id) {
   const spec = getSpec(entityName); if (!spec) return null;
   if (!canEdit(user, entityName)) return renderAccessDenied(user, entityName, 'edit');
-  const item = get(entityName, id); if (!item) return null;
+  const item = await get(entityName, id); if (!item) return null;
   if (item.team_id && user.team_id && item.team_id !== user.team_id && !isPartner(user)) return renderAccessDenied(user, entityName, 'edit');
   const resolvedSpec = resolveEnumOptions(spec);
   const { renderEntityForm: lazyEntityForm } = await lazyRenderer('entity-renderer.js');
-  return lazyEntityForm(entityName, item, resolvedSpec, user, false, getRefOptions(resolvedSpec));
+  return lazyEntityForm(entityName, item, resolvedSpec, user, false, await getRefOptions(resolvedSpec));
 }
 export async function handlePage(pathname, req, res) {
   setCurrentRequest(req);
@@ -119,18 +125,31 @@ export async function handlePage(pathname, req, res) {
   const user = await getUser();
   if (!user) { res.writeHead(302, { Location: '/login' }); res.end(); return REDIRECT; }
   if (normalized === '/unauthorized') return renderAccessDenied(user, 'system', 'access');
-  if (normalized === '/notifications') { let notifs=[]; try{notifs=getDatabase().prepare('SELECT * FROM notification WHERE user_id=? ORDER BY created_at DESC LIMIT 100').all(user.id)}catch{} const{renderNotificationsPage}=await lazyRenderer('notifications-renderer.js'); return renderNotificationsPage(user,notifs); }
+  if (normalized === '/notifications') { let notifs=[]; try{notifs=await list('notification',{user_id:user.id},{sort:{field:'created_at',dir:'DESC'},limit:100})}catch{} const{renderNotificationsPage}=await lazyRenderer('notifications-renderer.js'); return renderNotificationsPage(user,notifs); }
   if (normalized === '/' || normalized === '/dashboard') return renderDashboard(user, await getDashboardStats(user));
   if (normalized.startsWith('/admin/') || normalized === '/admin/jobs') return handleAdminPage(normalized, segments, user);
   if (segments[0] === 'client' && segments.length === 3 && ['dashboard', 'users', 'progress'].includes(segments[2])) return handleClientSubRoute(user, segments[1], segments[2]);
   if (isClerk(user) && segments.length >= 1 && ['user', 'team'].includes(segments[0])) return renderAccessDenied(user, segments[0], 'list');
   if (normalized === '/mwr' || normalized === '/mwr/home') {
     if (!canList(user, 'review')) return renderAccessDenied(user, 'review', 'list');
-    const db = getDatabase();
     let myReviews = [], sharedReviews = [], recentActivity = [];
-    try { myReviews = db.prepare('SELECT * FROM review WHERE created_by=? OR assigned_to=? ORDER BY updated_at DESC LIMIT 100').all(user.id, user.id); } catch { try { myReviews = list('review', {}).filter(r => r.created_by === user.id || r.assigned_to === user.id); } catch {} }
-    try { sharedReviews = db.prepare('SELECT r.* FROM review r JOIN collaborator c ON c.review_id=r.id WHERE c.user_id=? ORDER BY r.updated_at DESC LIMIT 100').all(user.id); } catch {}
-    try { recentActivity = db.prepare("SELECT * FROM audit_logs WHERE entity_type='review' ORDER BY timestamp DESC LIMIT 50").all(); } catch {}
+    // OR across two columns: busybase eq() is single-column, so fetch + filter in JS.
+    try {
+      const reviews = await list('review', {}, { sort: { field: 'updated_at', dir: 'DESC' } });
+      myReviews = reviews.filter(r => r.created_by === user.id || r.assigned_to === user.id).slice(0, 100);
+    } catch {}
+    // Old JOIN collaborator -> two-step: collaborator rows for this user, then their reviews.
+    try {
+      const collabs = await list('collaborator', { user_id: user.id });
+      const ids = new Set(collabs.map(c => c.review_id));
+      if (ids.size) {
+        const reviews = await list('review', {}, { sort: { field: 'updated_at', dir: 'DESC' } });
+        sharedReviews = reviews.filter(r => ids.has(r.id)).slice(0, 100);
+      }
+    } catch {}
+    try {
+      recentActivity = (await list('audit_logs', { entity_type: 'review' }, { sort: { field: 'created_at', dir: 'DESC' } })).slice(0, 50);
+    } catch {}
     const all = [...myReviews, ...sharedReviews];
     const stats = { myReviews, sharedReviews, recentActivity, totalReviews: all.length, activeReviews: all.filter(r => (r.status||'open') !== 'archived' && (r.status||'open') !== 'completed' && (r.status||'open') !== 'closed').length, flaggedReviews: all.filter(r => r.flagged).length, overdueReviews: 0 };
     const { renderMwrHome } = await lazyRenderer('review-mwr-renderer.js');
@@ -151,18 +170,16 @@ export async function handlePage(pathname, req, res) {
     return renderFlexUpView(user);
   }
   if (normalized === '/ml-console') {
-    const db = getDatabase();
     let candidates = []; let reviewMap = {};
     try {
-      candidates = db.prepare(`SELECT * FROM highlight
-        WHERE (comment IS NOT NULL AND comment != '')
-        AND (comment LIKE '%?' OR length(comment) > 40)
-        ORDER BY created_at DESC LIMIT 50`).all();
+      // Old: highlights with a non-trivial comment (LIKE '%?' OR length>40), newest 50.
+      const all = await list('highlight', {}, { sort: { field: 'created_at', dir: 'DESC' } });
+      candidates = all.filter(c => c.comment && (c.comment.includes('?') || c.comment.length > 40)).slice(0, 50);
       const revIds = [...new Set(candidates.map((c) => c.review_id))];
       if (revIds.length) {
-        const ph = revIds.map(() => '?').join(',');
-        const rows = db.prepare(`SELECT id, name FROM review WHERE id IN (${ph})`).all(...revIds);
-        reviewMap = Object.fromEntries(rows.map((r) => [r.id, r.name || '-']));
+        const reviews = await list('review', {});
+        const byId = new Map(reviews.map(r => [r.id, r.name || '-']));
+        reviewMap = Object.fromEntries(revIds.map(id => [id, byId.get(id) || '-']));
       }
     } catch {}
     const { renderMlConsole } = await lazyRenderer('ml-console-renderer.js');
@@ -171,19 +188,19 @@ export async function handlePage(pathname, req, res) {
   if (segments.length === 2 && (segments[0] === 'engagements' || segments[0] === 'engagement') && segments[1] !== 'new') return handleEngagementDetail(user, segments[1]);
   if (segments[0] === 'engagement' && segments.length === 3 && segments[2] === 'letter') {
     if (!canView(user, 'engagement')) return renderAccessDenied(user, 'engagement', 'view');
-    const engagement = get('engagement', segments[1]); if (!engagement) return null;
+    const engagement = await get('engagement', segments[1]); if (!engagement) return null;
     return renderLetterWorkflow(user, engagement);
   }
   if (segments[0] === 'engagement' && segments.length === 3 && segments[2] === 'report') {
     if (!canView(user, 'engagement')) return renderAccessDenied(user, 'engagement', 'view');
-    const engId = segments[1]; const engagement = get('engagement', engId); if (!engagement) return null;
-    const db = getDatabase(); let client=null,team=null,rfis=[],reviews=[],highlights=[],activity=[];
-    try{client=engagement.client_id?get('client',engagement.client_id):null}catch{}
-    try{team=engagement.team_id?get('team',engagement.team_id):null}catch{}
-    try{rfis=db.prepare('SELECT * FROM rfi WHERE engagement_id=? ORDER BY created_at DESC').all(engId)}catch{}
-    try{reviews=db.prepare('SELECT * FROM review WHERE engagement_id=? ORDER BY created_at DESC').all(engId)}catch{}
-    try{const rids=reviews.map(r=>r.id);if(rids.length){const ph=rids.map(()=>'?').join(',');highlights=db.prepare(`SELECT * FROM highlight WHERE review_id IN (${ph})`).all(...rids)}}catch{}
-    try{activity=db.prepare("SELECT * FROM audit_logs WHERE entity_type='engagement' AND entity_id=? ORDER BY timestamp DESC LIMIT 20").all(engId)}catch{}
+    const engId = segments[1]; const engagement = await get('engagement', engId); if (!engagement) return null;
+    let client=null,team=null,rfis=[],reviews=[],highlights=[],activity=[];
+    try{client=engagement.client_id?await get('client',engagement.client_id):null}catch{}
+    try{team=engagement.team_id?await get('team',engagement.team_id):null}catch{}
+    try{rfis=await list('rfi',{engagement_id:engId},{sort:{field:'created_at',dir:'DESC'}})}catch{}
+    try{reviews=await list('review',{engagement_id:engId},{sort:{field:'created_at',dir:'DESC'}})}catch{}
+    try{const rids=new Set(reviews.map(r=>r.id));if(rids.size){const allHl=await list('highlight',{});highlights=allHl.filter(h=>rids.has(h.review_id))}}catch{}
+    try{activity=(await list('audit_logs',{entity_type:'engagement',entity_id:engId},{sort:{field:'created_at',dir:'DESC'}})).slice(0,20)}catch{}
     const{renderFlexupReport}=await lazyRenderer('flexup-report-renderer.js');
     return renderFlexupReport(user,engagement,client,rfis,reviews,highlights,activity,team);
   }
@@ -192,7 +209,7 @@ export async function handlePage(pathname, req, res) {
   if (segments.length === 1 && segments[0] === 'rfi') return handleRfiList(user);
   if (segments.length === 1 && segments[0] === 'client') {
     if (!canList(user, 'client')) return renderAccessDenied(user, 'client', 'list');
-    let clients = list('client', {});
+    let clients = await list('client', {});
     if (isClientUser(user) && user.client_id) clients = clients.filter(c => c.id === user.client_id);
     return renderClientList(user, clients);
   }
@@ -201,7 +218,7 @@ export async function handlePage(pathname, req, res) {
     const spec = getSpec(entityName); if (!spec) return null;
     if (isClientUser(user) && !canClientAccessEntity(user, entityName)) return renderAccessDenied(user, entityName, 'list');
     if (!canList(user, entityName)) return renderAccessDenied(user, entityName, 'list');
-    let items = list(entityName, {});
+    let items = await list(entityName, {});
     if (isClientUser(user) && user.client_id) items = items.filter(item => { if (item.client_id) return item.client_id === user.client_id; if (item.assigned_to) return item.assigned_to === user.id; return true; });
     const { renderEntityList: lazyEntityList } = await lazyRenderer('entity-renderer.js');
     return lazyEntityList(entityName, resolveRefFields(items, spec), spec, user);
@@ -209,8 +226,8 @@ export async function handlePage(pathname, req, res) {
   if (segments.length === 2 && segments[0] === 'client' && segments[1] !== 'new') {
     if (!canView(user, 'client')) return renderAccessDenied(user, 'client', 'view');
     if (isClientUser(user) && user.client_id && user.client_id !== segments[1]) return renderAccessDenied(user, 'client', 'view');
-    const client = get('client', segments[1]); if (!client) return null;
-    return renderClientDashboard(user, client, getClientDashboardStats(segments[1]));
+    const client = await get('client', segments[1]); if (!client) return null;
+    return renderClientDashboard(user, client, await getClientDashboardStats(segments[1]));
   }
   if (segments.length === 2) return handleGenericEntityView(user, segments[0], segments[1]);
   if (segments.length === 3 && segments[2] === 'edit') return handleGenericEntityEdit(user, segments[0], segments[1]);