thatcher 1.0.7 → 1.0.34

package/src/app/api/email/unallocated/route.js

@@ -1,5 +1,8 @@
 import { NextResponse } from '@/lib/next-polyfills';
-import { getDatabase } from '@/lib/database-core';
+import { createLogger } from '@/lib/logger.js';
+import { list } from '@/engine';
+
+const log = createLogger('[EmailUnallocated]');
 
 export async function GET(request) {
   try {
@@ -11,17 +14,11 @@ export async function GET(request) {
     const limit = parseInt(searchParams.get('limit') || '50', 10);
     const offset = parseInt(searchParams.get('offset') || '0', 10);
 
-    const db = getDatabase();
-
-    const emails = db.prepare(`
-      SELECT *
-      FROM email
-      WHERE allocated = 0
-      ORDER BY received_at DESC
-      LIMIT ? OFFSET ?
-    `).all(limit, offset);
-
-    const total = db.prepare('SELECT COUNT(*) as count FROM email WHERE allocated = 0').get();
+    // Unallocated emails, newest first, paginated (busybase + in-memory slice).
+    const all = (await list('email', {}, { sort: { field: 'received_at', dir: 'DESC' } }))
+      .filter(e => !e.allocated || e.allocated === 0);
+    const total = { count: all.length };
+    const emails = all.slice(offset, offset + limit);
 
     const emailsWithParsedAttachments = emails.map(email => ({
       ...email,
@@ -38,7 +35,7 @@ export async function GET(request) {
     });
 
   } catch (error) {
-    console.error('[EMAIL_UNALLOCATED] Error:', error);
+    log.error('error:', { message: error.message });
     return NextResponse.json(
       { error: 'Internal server error', message: error.message },
       { status: 500 }

package/src/app/api/files/[id]/route.js

@@ -1,4 +1,7 @@
 import { NextResponse } from '@/lib/next-polyfills';
+import { createLogger } from '@/lib/logger.js';
+
+const log = createLogger('[FilesAPI]');
 import { requireUser } from '@/engine.server';
 import { permissionService } from '@/services/permission.service';
 import { get } from '@/engine';
@@ -32,7 +35,7 @@ export async function GET(request, { params }) {
       },
     });
   } catch (error) {
-    console.error('File download error:', error);
+    log.error('file download error:', { message: error.message });
     return NextResponse.json({ error: error.message }, { status: HTTP.INTERNAL_ERROR });
   }
 }

package/src/app/api/formula/[[...path]]/route.js

@@ -1,7 +1,3 @@
-/**
- * Formula API Routes - HyperFormula operations via HTTP
- */
-
 import { getHyperFormulaService, createHyperFormulaService } from '@/lib/hyperformula-service.js';
 import { createLogger } from '@/lib/logger.js';
 

package/src/app/api/health/route.js

@@ -1,6 +1,9 @@
+import { createLogger } from '@/lib/logger.js';
 import fs from 'fs'
+
+const log = createLogger('[Health]');
 import path from 'path'
-import { getDatabase } from '@/engine'
+import { count } from '@/engine'
 import { getAllMetrics } from '@/lib/metrics-collector.js'
 import { getDatabaseStats } from '@/lib/db-monitor.js'
 import { getCurrentResources } from '@/lib/resource-monitor.js'
@@ -19,11 +22,10 @@ function getLastSyncAt() {
 
 export const GET = async (request) => {
   try {
-    const db = getDatabase()
     const start = process.hrtime.bigint()
 
-    db.prepare('SELECT 1').get()
-    db.pragma('wal_checkpoint(PASSIVE)')
+    // busybase liveness probe (replaces the SQLite SELECT 1 + wal_checkpoint).
+    try { await count('user', {}); } catch { /* table may not exist yet; still alive */ }
 
     const dbLatency = Number(process.hrtime.bigint() - start) / 1000000
     const url = new URL(request.url)
@@ -48,7 +50,7 @@ export const GET = async (request) => {
       const user = await getUser()
       if (user && (user.role === 'admin' || user.role === 'partner')) {
         health.metrics = getAllMetrics()
-        health.database.stats = getDatabaseStats()
+        try { health.database.stats = getDatabaseStats() } catch { health.database.stats = null }
         health.resources = getCurrentResources()
         health.alerts = getRecentAlerts(10)
         health.memory = {
@@ -68,7 +70,7 @@ export const GET = async (request) => {
       }
     )
   } catch (error) {
-    console.error('[Health] Check failed:', error)
+    log.error('check failed:', { message: error.message })
     return new Response(
       JSON.stringify({
         status: 'error',
@@ -85,11 +87,10 @@ export const GET = async (request) => {
 
 export const HEAD = async (request) => {
   try {
-    const db = getDatabase()
-    db.prepare('SELECT 1').get()
+    await count('user', {})
     return new Response(null, { status: 200 })
   } catch (error) {
-    console.error('[Health] Check failed:', error)
+    log.error('check failed:', { message: error.message })
     return new Response(null, { status: 503 })
   }
 }

package/src/app/api/metrics/route.js

@@ -27,7 +27,7 @@ export const GET = async (request) => {
     }
 
     if (type === 'all' || type === 'database') {
-      data.database = getDatabaseStats()
+      try { data.database = getDatabaseStats() } catch { data.database = null }
     }
 
     if (type === 'all' || type === 'resources') {

package/src/cli.js

@@ -39,7 +39,7 @@ async function main() {
       console.log('[Thatcher] Running migrations...');
       const t1 = new Thatcher({});
       await t1.init();
-      console.log('✓ Migrations complete');
+      console.log('[Thatcher] Migrations complete');
       break;
 
     case 'validate':
@@ -47,11 +47,11 @@ async function main() {
       try {
         const t2 = new Thatcher({});
         await t2.init();
-        console.log('✓ Configuration is valid');
+        console.log('[Thatcher] Configuration is valid');
         console.log(`  Entities: ${t2.getAllEntities().length}`);
         console.log(`  Workflows: ${Object.keys(t2.config?.workflows || {}).length}`);
       } catch (err) {
-        console.error('✗ Configuration error:', err.message);
+        console.error('[Thatcher] Configuration error:', err.message);
         process.exit(1);
       }
       break;
@@ -200,7 +200,7 @@ thresholds:
 `;
 
   fs.writeFileSync(path.join(exampleDir, 'thatcher.config.yml'), config);
-  console.log(`✓ Example config written to ${exampleDir}/`);
+  console.log(`[Thatcher] Example config written to ${exampleDir}/`);
   console.log('  cd', exampleDir);
   console.log('  thatcher start');
 }

package/src/config/config-loader.js

@@ -1,20 +1,13 @@
-/**
- * Configuration loading and management
- * Adapted from moonlanding/src/config/
- */
+// Adapted from moonlanding/src/config/
 
 import fs from 'fs';
 import path from 'path';
 import yaml from 'js-yaml';
 
-/**
- * Load configuration from YAML file or object
- */
 export async function loadConfig(configSource) {
   let config;
 
   if (typeof configSource === 'string') {
-    // File path
     const configPath = path.resolve(process.cwd(), configSource);
     if (!fs.existsSync(configPath)) {
       throw new Error(`Configuration file not found: ${configPath}`);
@@ -22,7 +15,6 @@ export async function loadConfig(configSource) {
     const content = fs.readFileSync(configPath, 'utf-8');
     config = yaml.load(content);
   } else if (typeof configSource === 'object') {
-    // Raw object
     config = configSource;
   } else {
     throw new Error('Config must be a file path or object');
@@ -31,9 +23,6 @@ export async function loadConfig(configSource) {
   return config;
 }
 
-/**
- * Validate required configuration sections
- */
 export function validateConfig(config) {
   const errors = [];
 
@@ -42,7 +31,6 @@ export function validateConfig(config) {
     return errors;
   }
 
-  // Check required sections
   const requiredSections = ['entities', 'roles', 'permission_templates'];
   for (const section of requiredSections) {
     if (!config[section]) {
@@ -50,7 +38,6 @@ export function validateConfig(config) {
     }
   }
 
-  // Validate roles
   if (config.roles) {
     const roleNames = Object.keys(config.roles);
     if (roleNames.length === 0) {
@@ -58,7 +45,6 @@ export function validateConfig(config) {
     }
   }
 
-  // Validate entities
   if (config.entities) {
     for (const [entityName, entityDef] of Object.entries(config.entities)) {
       if (!entityDef.fields && !entityDef.children) {
@@ -70,9 +56,6 @@ export function validateConfig(config) {
   return errors;
 }
 
-/**
- * Get configuration with defaults applied
- */
 export function getConfigWithDefaults(userConfig) {
   const defaults = {
     system: {
@@ -96,9 +79,6 @@ export function getConfigWithDefaults(userConfig) {
   return deepMerge(defaults, userConfig);
 }
 
-/**
- * Deep merge utility
- */
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {

package/src/config/constants.js

@@ -1,11 +1,3 @@
-/**
- * Core constants for Thatcher SDK
- * HTTP codes, status values, display limits, etc.
- */
-
-/**
- * HTTP status codes
- */
 export const HTTP = {
   OK: 200,
   CREATED: 201,
@@ -21,9 +13,6 @@ export const HTTP = {
   SERVICE_UNAVAILABLE: 503,
 };
 
-/**
- * Error message templates
- */
 export const ERROR_MESSAGES = {
   notFound: (entity = 'Resource') => `${entity} not found`,
   invalidRequest: (reason = 'Invalid request') => reason,
@@ -33,9 +22,6 @@ export const ERROR_MESSAGES = {
   },
 };
 
-/**
- * Success message templates
- */
 export const SUCCESS_MESSAGES = {
   created: (entity = 'Item') => `${entity} created successfully`,
   updated: (entity = 'Item') => `${entity} updated successfully`,
@@ -43,23 +29,14 @@ export const SUCCESS_MESSAGES = {
   saved: 'Changes saved successfully',
 };
 
-/**
- * Record status constants
- */
 export const RECORD_STATUS = {
   ACTIVE: 'active',
   DELETED: 'deleted',
   ARCHIVED: 'archived',
 };
 
-/**
- * Email status
- */
 export const EMAIL_STATUS = 'pending';
 
-/**
- * Display/UI constants
- */
 export const DISPLAY = {
   MAX_API_CALLS_HISTORY: 100,
   API_TIMEOUT_MS: 30000,
@@ -74,17 +51,11 @@ export const DISPLAY = {
   DEBOUNCE_FORM_CHANGE_MS: 500,
 };
 
-/**
- * Validation patterns
- */
 export const VALIDATION = {
   EMAIL_REGEX: /^[^\s@]+@[^\s@]+\.[^\s@]+$/,
   PASSWORD_MIN_LENGTH: 8,
 };
 
-/**
- * Log prefixes for structured logging
- */
 export const LOG_PREFIXES = {
   API: '[API]',
   DB: '[DB]',
@@ -97,9 +68,6 @@ export const LOG_PREFIXES = {
   database: '[DB]',
 };
 
-/**
- * SQL type mapping
- */
 export const SQL_TYPES = {
   id: 'TEXT PRIMARY KEY',
   text: 'TEXT',
@@ -116,9 +84,6 @@ export const SQL_TYPES = {
   enum: 'TEXT',
 };
 
-/**
- * Authentication scopes (Google, etc.)
- */
 export const AUTH_SCOPES = {
   google: [
     'https://www.googleapis.com/auth/userinfo.email',

package/src/config/env.js

@@ -1,29 +1,15 @@
-/**
- * Environment configuration
- * Provides typed access to environment variables with defaults
- */
-
-/**
- * Get environment variable with optional default
- */
 function getEnv(key, defaultValue = null) {
   const val = process.env[key];
   if (val === undefined || val === null) return defaultValue;
   return val;
 }
 
-/**
- * Get boolean from env
- */
 function getEnvBool(key, defaultValue = false) {
   const val = getEnv(key);
   if (val === null) return defaultValue;
   return val === 'true' || val === '1';
 }
 
-/**
- * Get number from env
- */
 function getEnvInt(key, defaultValue = 0) {
   const val = getEnv(key);
   if (val === null) return defaultValue;
@@ -31,9 +17,6 @@ function getEnvInt(key, defaultValue = 0) {
   return isNaN(num) ? defaultValue : num;
 }
 
-/**
- * Configuration object builder
- */
 export function buildConfig(overrides = {}) {
   const config = {
     db: {
@@ -107,34 +90,21 @@ export function buildConfig(overrides = {}) {
   return config;
 }
 
-/**
- * Check if Google OAuth is configured
- */
 export function hasGoogleAuth(config) {
   const cfg = config?.auth?.google || buildConfig().auth.google;
   return !!(cfg.clientId && cfg.clientSecret);
 }
 
-/**
- * Check if Drive integration is configured
- */
 export function hasDriveConfig(config) {
   const cfg = config?.drive || buildConfig().drive;
   return !!cfg.rootFolderId;
 }
 
-/**
- * Check if email sending is configured
- */
 export function hasEmailConfig(config) {
   const cfg = config?.email || buildConfig().email;
   return !!(cfg.smtp.user && cfg.smtp.password);
 }
 
-/**
- * Validate environment configuration
- * Returns array of warnings (non-fatal)
- */
 export function validateEnv(config = buildConfig()) {
   const warnings = [];
 

package/src/config/spec-helpers.js

@@ -1,14 +1,7 @@
-/**
- * Spec Helpers - Utility functions for entity specifications
- * Provides easy access to entity specs, navigation, and derived properties
- */
-
-/**
- * Get entity spec by name
- * @param {string} name - Entity name
- * @param {object} configEngine - Config engine instance
- * @returns {object|null} Entity specification or null if not found
- */
+import { createLogger } from '../lib/logger.js';
+
+const log = createLogger('[SpecHelpers]');
+
 export function getSpec(name, configEngine) {
   // Callers across the framework invoke getSpec(name) without threading the engine
   // (moon's getSpec self-resolved it). Fall back to the singleton when omitted.
@@ -26,11 +19,6 @@ export function getSpec(name, configEngine) {
   }
 }
 
-/**
- * Get all navigable entities (top-level, non-embedded)
- * @param {object} configEngine
- * @returns {Array} Sorted array of entity specs
- */
 export function getNavItems(configEngine) {
   try {
     const allEntities = configEngine.getAllEntities();
@@ -45,16 +33,11 @@ export function getNavItems(configEngine) {
         href: `/${s.name}`,
       }));
   } catch (error) {
-    console.error('[spec-helpers] getNavItems error:', error.message);
+    log.error('getNavItems error:', { message: error.message });
     return [];
   }
 }
 
-/**
- * Get child entity definitions for a parent spec
- * @param {object} spec - Parent entity spec
- * @returns {Array} Child entity configs
- */
 export function getChildEntities(spec) {
   if (!spec.children) return [];
   return Object.entries(spec.children).map(([key, child]) => ({
@@ -67,57 +50,26 @@ export function getChildEntities(spec) {
   }));
 }
 
-/**
- * Get parent entity name
- * @param {object} spec
- * @returns {string|null}
- */
 export function getParentEntity(spec) {
   return spec.parent || null;
 }
 
-/**
- * Get default sort configuration
- * @param {object} spec
- * @returns {{field: string, dir: string}}
- */
 export function getDefaultSort(spec) {
   return spec.list?.defaultSort || { field: 'created_at', dir: 'desc' };
 }
 
-/**
- * Get available filters for entity
- * @param {object} spec
- * @returns {Array}
- */
 export function getAvailableFilters(spec) {
   return spec.list?.filters || [];
 }
 
-/**
- * Get page size for entity
- * @param {object} spec
- * @returns {number}
- */
 export function getPageSize(spec, systemPagination = { default_page_size: 20 }) {
   return spec.list?.pageSize || systemPagination.default_page_size;
 }
 
-/**
- * Get entity label (singular or plural)
- * @param {object} spec
- * @param {boolean} plural
- * @returns {string}
- */
 export function getEntityLabel(spec, plural = false) {
   return plural ? (spec.labelPlural || spec.label) : spec.label;
 }
 
-/**
- * Get default initial state for entity (empty record with defaults)
- * @param {object} spec
- * @returns {object}
- */
 export function getInitialState(spec) {
   const state = {};
   for (const [key, field] of Object.entries(spec.fields)) {
@@ -139,73 +91,32 @@ export function getInitialState(spec) {
   return state;
 }
 
-/**
- * Check if entity is embedded (used in parent contexts)
- * @param {object} spec
- * @returns {boolean}
- */
 export function isEmbeddedEntity(spec) {
   return spec.embedded === true;
 }
 
-/**
- * Check if entity is a top-level parent
- * @param {object} spec
- * @returns {boolean}
- */
 export function isParentEntity(spec) {
   return !spec.embedded && !spec.parent;
 }
 
-/**
- * Check if entity has child relationships
- * @param {object} spec
- * @returns {boolean}
- */
 export function hasChildRelationships(spec) {
   return !!spec.children && Object.keys(spec.children).length > 0;
 }
 
-/**
- * Get entity options (enums, picklists)
- * @param {object} spec
- * @param {string} optionKey
- * @returns {Array}
- */
 export function getOptions(spec, optionKey) {
   return spec.options?.[optionKey] || [];
 }
 
-/**
- * Get display label for an option value
- * @param {object} spec
- * @param {string} optionKey
- * @param {string} value
- * @returns {string}
- */
 export function getOptionLabel(spec, optionKey, value) {
   const option = getOptions(spec, optionKey).find(o => o.value === value);
   return option?.label || String(value);
 }
 
-/**
- * Get color for an option value (for UI badges)
- * @param {object} spec
- * @param {string} optionKey
- * @param {string} value
- * @returns {string}
- */
 export function getOptionColor(spec, optionKey, value) {
   const option = getOptions(spec, optionKey).find(o => o.value === value);
   return option?.color || 'gray';
 }
 
-/**
- * Build navigation structure for menus
- * @param {object} configEngine
- * @param {object} user - Optional user for permission filtering
- * @returns {Array} Navigation items
- */
 export function buildNavigation(configEngine, user = null) {
   try {
     const allEntities = configEngine.getAllEntities();
@@ -232,7 +143,7 @@ export function buildNavigation(configEngine, user = null) {
 
     return items;
   } catch (error) {
-    console.error('[spec-helpers] buildNavigation error:', error.message);
+    log.error('buildNavigation error:', { message: error.message });
     return [];
   }
 }

package/src/engine.js

@@ -0,0 +1,23 @@
+// Previously `@/engine` resolved to a non-existent module; this barrel makes it
+// concrete and points the data layer at busybase-store.
+
+// Data layer (busybase)
+export {
+  list, get, getBy, count, listWithPagination, searchWithPagination, search,
+  create, update, remove, bulkCreate, getChildren, batchGetChildren,
+  setBusyBaseClient,
+} from '@/lib/busybase-store.js';
+
+// IDs / time
+export { genId, now } from '@/lib/id-helpers.js';
+
+// Auth helpers
+export { hashPassword, verifyPassword } from '@/engine.server.js';
+
+// Audit
+export { logAction } from '@/lib/busybase-audit.js';
+
+// Legacy SQLite shims (data layer is busybase now). busybase is schemaless so there
+// is no migration step; migrate() is a no-op kept for callers that still invoke it.
+export function migrate() { /* no-op: busybase creates tables lazily on first insert */ }
+