sitepaige-mcp-server 0.7.7 → 0.7.8

package/defaultapp/api/Auth/route.ts

@@ -9,7 +9,7 @@ import { NextResponse } from 'next/server';
 import * as crypto from 'node:crypto';
 
 import { db_init, db_query } from '../../db';
-import { upsertUser, ensureAuthTables, storeOAuthToken, validateSession, rotateSession } from '../../db-users';
+import { upsertUser, storeOAuthToken, validateSession, rotateSession } from '../../db-users';
 import { validateCsrfToken } from '../../csrf';
 
 type OAuthProvider = 'google' | 'facebook' | 'apple'  | 'github';
@@ -29,9 +29,6 @@ const USER_INFO_ENDPOINTS = {
 };
 
 export async function POST(request: Request) {
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   const db = await db_init();
   
   try {
@@ -214,9 +211,6 @@ export async function POST(request: Request) {
 }
 
 export async function GET() {
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   try {
     // Get session token from cookies
     const sessionCookie = await cookies();
@@ -308,9 +302,6 @@ export async function DELETE(request: Request) {
     );
   }
   
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   const db = await db_init();
   
   try {

package/defaultapp/db-mysql.ts

@@ -105,6 +105,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS \`Users\` (
+  \`userid\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`OAuthID\` VARCHAR(255) NOT NULL UNIQUE,
+  \`Source\` VARCHAR(20) NOT NULL CHECK(\`Source\` IN ('google', 'facebook', 'apple', 'github')),
+  \`UserName\` VARCHAR(255) NOT NULL,
+  \`Email\` VARCHAR(255),
+  \`AvatarURL\` TEXT,
+  \`UserLevel\` INTEGER NOT NULL DEFAULT 1 CHECK(\`UserLevel\` IN (0, 1, 2)),
+  \`UserTier\` INTEGER NOT NULL DEFAULT 0,
+  \`LastLoginDate\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`CreatedDate\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`IsActive\` BOOLEAN NOT NULL DEFAULT true
+);
+
+-- Indexes for Users table
+CREATE INDEX idx_users_oauthid ON \`Users\`(\`OAuthID\`);
+CREATE INDEX idx_users_email ON \`Users\`(\`Email\`);
+CREATE INDEX idx_users_usertier ON \`Users\`(\`UserTier\`);
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS \`UserSession\` (
+  \`ID\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`SessionToken\` VARCHAR(255) NOT NULL UNIQUE,
+  \`userid\` VARCHAR(36) NOT NULL,
+  \`ExpirationDate\` DATETIME NOT NULL,
+  FOREIGN KEY (\`userid\`) REFERENCES \`Users\`(\`userid\`) ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX idx_session_token ON \`UserSession\`(\`SessionToken\`);
+CREATE INDEX idx_session_user ON \`UserSession\`(\`userid\`);
+CREATE INDEX idx_session_expiry ON \`UserSession\`(\`ExpirationDate\`);
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS \`OAuthTokens\` (
+  \`ID\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`userid\` VARCHAR(36) NOT NULL,
+  \`Provider\` VARCHAR(20) NOT NULL CHECK(\`Provider\` IN ('google', 'facebook', 'apple', 'github')),
+  \`AccessToken\` TEXT NOT NULL,
+  \`RefreshToken\` TEXT,
+  \`ExpiresAt\` DATETIME,
+  \`CreatedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`UpdatedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  FOREIGN KEY (\`userid\`) REFERENCES \`Users\`(\`userid\`) ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX idx_oauth_user ON \`OAuthTokens\`(\`userid\`);
+CREATE INDEX idx_oauth_provider ON \`OAuthTokens\`(\`userid\`, \`Provider\`);`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/defaultapp/db-postgres.ts

@@ -116,6 +116,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS "Users" (
+  "userid" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "OAuthID" TEXT NOT NULL UNIQUE,
+  "Source" TEXT NOT NULL CHECK("Source" IN ('google', 'facebook', 'apple', 'github')),
+  "UserName" TEXT NOT NULL,
+  "Email" TEXT,
+  "AvatarURL" TEXT,
+  "UserLevel" INTEGER NOT NULL DEFAULT 1 CHECK("UserLevel" IN (0, 1, 2)),
+  "UserTier" INTEGER NOT NULL DEFAULT 0,
+  "LastLoginDate" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "CreatedDate" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "IsActive" BOOLEAN NOT NULL DEFAULT true
+);
+
+-- Indexes for Users table
+CREATE INDEX IF NOT EXISTS idx_users_oauthid ON "Users"("OAuthID");
+CREATE INDEX IF NOT EXISTS idx_users_email ON "Users"("Email");
+CREATE INDEX IF NOT EXISTS idx_users_usertier ON "Users"("UserTier");
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS "UserSession" (
+  "ID" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "SessionToken" VARCHAR(255) NOT NULL UNIQUE,
+  "userid" UUID NOT NULL,
+  "ExpirationDate" TIMESTAMP NOT NULL,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX IF NOT EXISTS idx_session_token ON "UserSession"("SessionToken");
+CREATE INDEX IF NOT EXISTS idx_session_user ON "UserSession"("userid");
+CREATE INDEX IF NOT EXISTS idx_session_expiry ON "UserSession"("ExpirationDate");
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS "OAuthTokens" (
+  "ID" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "userid" UUID NOT NULL,
+  "Provider" VARCHAR(20) NOT NULL CHECK("Provider" IN ('google', 'facebook', 'apple', 'github')),
+  "AccessToken" TEXT NOT NULL,
+  "RefreshToken" TEXT,
+  "ExpiresAt" TIMESTAMP,
+  "CreatedAt" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "UpdatedAt" TIMESTAMP NOT NULL DEFAULT NOW(),
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX IF NOT EXISTS idx_oauth_user ON "OAuthTokens"("userid");
+CREATE INDEX IF NOT EXISTS idx_oauth_provider ON "OAuthTokens"("userid", "Provider");`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/defaultapp/db-sqlite.ts

@@ -181,6 +181,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS "Users" (
+  "userid" TEXT PRIMARY KEY,
+  "OAuthID" TEXT NOT NULL UNIQUE,
+  "Source" TEXT NOT NULL CHECK("Source" IN ('google', 'facebook', 'apple', 'github')),
+  "UserName" TEXT NOT NULL,
+  "Email" TEXT,
+  "AvatarURL" TEXT,
+  "UserLevel" INTEGER NOT NULL DEFAULT 1 CHECK("UserLevel" IN (0, 1, 2)),
+  "UserTier" INTEGER NOT NULL DEFAULT 0,
+  "LastLoginDate" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "CreatedDate" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "IsActive" INTEGER NOT NULL DEFAULT 1
+);
+
+-- Indexes for Users table
+CREATE INDEX IF NOT EXISTS idx_users_oauthid ON "Users"("OAuthID");
+CREATE INDEX IF NOT EXISTS idx_users_email ON "Users"("Email");
+CREATE INDEX IF NOT EXISTS idx_users_usertier ON "Users"("UserTier");
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS "UserSession" (
+  "ID" TEXT PRIMARY KEY,
+  "SessionToken" TEXT NOT NULL UNIQUE,
+  "userid" TEXT NOT NULL,
+  "ExpirationDate" TEXT NOT NULL,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX IF NOT EXISTS idx_session_token ON "UserSession"("SessionToken");
+CREATE INDEX IF NOT EXISTS idx_session_user ON "UserSession"("userid");
+CREATE INDEX IF NOT EXISTS idx_session_expiry ON "UserSession"("ExpirationDate");
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS "OAuthTokens" (
+  "ID" TEXT PRIMARY KEY,
+  "userid" TEXT NOT NULL,
+  "Provider" TEXT NOT NULL CHECK("Provider" IN ('google', 'facebook', 'apple', 'github')),
+  "AccessToken" TEXT NOT NULL,
+  "RefreshToken" TEXT,
+  "ExpiresAt" TEXT,
+  "CreatedAt" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "UpdatedAt" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX IF NOT EXISTS idx_oauth_user ON "OAuthTokens"("userid");
+CREATE INDEX IF NOT EXISTS idx_oauth_provider ON "OAuthTokens"("userid", "Provider");`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/defaultapp/db-users.ts

@@ -39,147 +39,29 @@ export interface OAuthToken {
 }
 
 /**
- * Ensure the Users table exists with the correct schema
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureUsersTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-
-  // Create or migrate the Users table
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS Users (
-      userid VARCHAR(36) PRIMARY KEY NOT NULL,
-      OAuthID VARCHAR(255) NOT NULL UNIQUE,
-      Source VARCHAR(20) NOT NULL CHECK(Source IN ('google', 'facebook', 'apple', 'github')),
-      UserName VARCHAR(255) NOT NULL,
-      Email VARCHAR(255),
-      AvatarURL TEXT,
-      UserLevel INTEGER NOT NULL DEFAULT 1 CHECK(UserLevel IN (0, 1, 2)),
-      UserTier INTEGER NOT NULL DEFAULT 0,
-      LastLoginDate DATETIME NOT NULL,
-      CreatedDate DATETIME NOT NULL,
-      IsActive BOOLEAN NOT NULL DEFAULT true
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_users_oauth ON Users(OAuthID);
-    CREATE INDEX IF NOT EXISTS idx_users_permission ON Users(UserLevel);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - Users table is created by db_migrate
+  return;
 }
 
 /**
- * Ensure the UserSession table exists
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureUserSessionTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS UserSession (
-      ID VARCHAR(36) PRIMARY KEY NOT NULL,
-      SessionToken VARCHAR(255) NOT NULL UNIQUE,
-      userid VARCHAR(36) NOT NULL,
-      ExpirationDate DATETIME NOT NULL,
-      FOREIGN KEY (userid) REFERENCES Users(userid) ON DELETE CASCADE
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_session_token ON UserSession(SessionToken);
-    CREATE INDEX IF NOT EXISTS idx_session_user ON UserSession(userid);
-    CREATE INDEX IF NOT EXISTS idx_session_expiry ON UserSession(ExpirationDate);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - UserSession table is created by db_migrate
+  return;
 }
 
 /**
- * Ensure the OAuthTokens table exists
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureOAuthTokensTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS OAuthTokens (
-      ID VARCHAR(36) PRIMARY KEY NOT NULL,
-      userid VARCHAR(36) NOT NULL,
-      Provider VARCHAR(20) NOT NULL CHECK(Provider IN ('google', 'facebook', 'apple', 'github')),
-      AccessToken TEXT NOT NULL,
-      RefreshToken TEXT,
-      ExpiresAt DATETIME,
-      CreatedAt DATETIME NOT NULL,
-      UpdatedAt DATETIME NOT NULL,
-      FOREIGN KEY (userid) REFERENCES Users(userid) ON DELETE CASCADE
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_oauth_user ON OAuthTokens(userid);
-    CREATE INDEX IF NOT EXISTS idx_oauth_provider ON OAuthTokens(userid, Provider);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - OAuthTokens table is created by db_migrate
+  return;
 }
 
-/**
- * Ensure all authentication tables exist
- */
-export async function ensureAuthTables(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  // IMPORTANT: Create Users table first since UserSession and OAuthTokens have foreign keys to it
-  await ensureUsersTable();
-  await ensureUserSessionTable();
-  await ensureOAuthTokensTable();
-}
 
 /**
  * Get all users from the database

package/defaultapp/db.ts

@@ -158,6 +158,27 @@ export async function initializeDatabase(
   const client = await db_init();
   
   try {
+    // Create auth tables first (Users, UserSession, OAuthTokens)
+    const authTablesModel: Model = {
+      id: '__auth_tables__',
+      name: '__auth_tables__',
+      fields: []
+    };
+    const authTablesSql = db_migrate(authTablesModel);
+    
+    // Execute each statement separately for auth tables
+    const authStatements = authTablesSql.split(';').map(s => s.trim()).filter(s => s.length > 0);
+    for (const statement of authStatements) {
+      try {
+        await db_query(client, statement);
+      } catch (error) {
+        // Some databases might not support certain syntax, continue with other statements
+        if (!statement.includes('CREATE INDEX')) {
+          console.error('Error creating auth table:', error);
+        }
+      }
+    }
+    
     // Create tables for each model
     for (const model of models) {
       const createTableSql = db_migrate(model);

package/dist/defaultapp/api/Auth/route.ts

@@ -9,7 +9,7 @@ import { NextResponse } from 'next/server';
 import * as crypto from 'node:crypto';
 
 import { db_init, db_query } from '../../db';
-import { upsertUser, ensureAuthTables, storeOAuthToken, validateSession, rotateSession } from '../../db-users';
+import { upsertUser, storeOAuthToken, validateSession, rotateSession } from '../../db-users';
 import { validateCsrfToken } from '../../csrf';
 
 type OAuthProvider = 'google' | 'facebook' | 'apple'  | 'github';
@@ -29,9 +29,6 @@ const USER_INFO_ENDPOINTS = {
 };
 
 export async function POST(request: Request) {
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   const db = await db_init();
   
   try {
@@ -214,9 +211,6 @@ export async function POST(request: Request) {
 }
 
 export async function GET() {
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   try {
     // Get session token from cookies
     const sessionCookie = await cookies();
@@ -308,9 +302,6 @@ export async function DELETE(request: Request) {
     );
   }
   
-  // Ensure authentication tables exist
-  await ensureAuthTables();
-  
   const db = await db_init();
   
   try {

package/dist/defaultapp/db-mysql.ts

@@ -105,6 +105,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS \`Users\` (
+  \`userid\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`OAuthID\` VARCHAR(255) NOT NULL UNIQUE,
+  \`Source\` VARCHAR(20) NOT NULL CHECK(\`Source\` IN ('google', 'facebook', 'apple', 'github')),
+  \`UserName\` VARCHAR(255) NOT NULL,
+  \`Email\` VARCHAR(255),
+  \`AvatarURL\` TEXT,
+  \`UserLevel\` INTEGER NOT NULL DEFAULT 1 CHECK(\`UserLevel\` IN (0, 1, 2)),
+  \`UserTier\` INTEGER NOT NULL DEFAULT 0,
+  \`LastLoginDate\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`CreatedDate\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`IsActive\` BOOLEAN NOT NULL DEFAULT true
+);
+
+-- Indexes for Users table
+CREATE INDEX idx_users_oauthid ON \`Users\`(\`OAuthID\`);
+CREATE INDEX idx_users_email ON \`Users\`(\`Email\`);
+CREATE INDEX idx_users_usertier ON \`Users\`(\`UserTier\`);
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS \`UserSession\` (
+  \`ID\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`SessionToken\` VARCHAR(255) NOT NULL UNIQUE,
+  \`userid\` VARCHAR(36) NOT NULL,
+  \`ExpirationDate\` DATETIME NOT NULL,
+  FOREIGN KEY (\`userid\`) REFERENCES \`Users\`(\`userid\`) ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX idx_session_token ON \`UserSession\`(\`SessionToken\`);
+CREATE INDEX idx_session_user ON \`UserSession\`(\`userid\`);
+CREATE INDEX idx_session_expiry ON \`UserSession\`(\`ExpirationDate\`);
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS \`OAuthTokens\` (
+  \`ID\` VARCHAR(36) PRIMARY KEY DEFAULT (UUID()),
+  \`userid\` VARCHAR(36) NOT NULL,
+  \`Provider\` VARCHAR(20) NOT NULL CHECK(\`Provider\` IN ('google', 'facebook', 'apple', 'github')),
+  \`AccessToken\` TEXT NOT NULL,
+  \`RefreshToken\` TEXT,
+  \`ExpiresAt\` DATETIME,
+  \`CreatedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  \`UpdatedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  FOREIGN KEY (\`userid\`) REFERENCES \`Users\`(\`userid\`) ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX idx_oauth_user ON \`OAuthTokens\`(\`userid\`);
+CREATE INDEX idx_oauth_provider ON \`OAuthTokens\`(\`userid\`, \`Provider\`);`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/dist/defaultapp/db-postgres.ts

@@ -116,6 +116,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS "Users" (
+  "userid" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "OAuthID" TEXT NOT NULL UNIQUE,
+  "Source" TEXT NOT NULL CHECK("Source" IN ('google', 'facebook', 'apple', 'github')),
+  "UserName" TEXT NOT NULL,
+  "Email" TEXT,
+  "AvatarURL" TEXT,
+  "UserLevel" INTEGER NOT NULL DEFAULT 1 CHECK("UserLevel" IN (0, 1, 2)),
+  "UserTier" INTEGER NOT NULL DEFAULT 0,
+  "LastLoginDate" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "CreatedDate" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "IsActive" BOOLEAN NOT NULL DEFAULT true
+);
+
+-- Indexes for Users table
+CREATE INDEX IF NOT EXISTS idx_users_oauthid ON "Users"("OAuthID");
+CREATE INDEX IF NOT EXISTS idx_users_email ON "Users"("Email");
+CREATE INDEX IF NOT EXISTS idx_users_usertier ON "Users"("UserTier");
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS "UserSession" (
+  "ID" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "SessionToken" VARCHAR(255) NOT NULL UNIQUE,
+  "userid" UUID NOT NULL,
+  "ExpirationDate" TIMESTAMP NOT NULL,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX IF NOT EXISTS idx_session_token ON "UserSession"("SessionToken");
+CREATE INDEX IF NOT EXISTS idx_session_user ON "UserSession"("userid");
+CREATE INDEX IF NOT EXISTS idx_session_expiry ON "UserSession"("ExpirationDate");
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS "OAuthTokens" (
+  "ID" UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  "userid" UUID NOT NULL,
+  "Provider" VARCHAR(20) NOT NULL CHECK("Provider" IN ('google', 'facebook', 'apple', 'github')),
+  "AccessToken" TEXT NOT NULL,
+  "RefreshToken" TEXT,
+  "ExpiresAt" TIMESTAMP,
+  "CreatedAt" TIMESTAMP NOT NULL DEFAULT NOW(),
+  "UpdatedAt" TIMESTAMP NOT NULL DEFAULT NOW(),
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX IF NOT EXISTS idx_oauth_user ON "OAuthTokens"("userid");
+CREATE INDEX IF NOT EXISTS idx_oauth_provider ON "OAuthTokens"("userid", "Provider");`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/dist/defaultapp/db-sqlite.ts

@@ -181,6 +181,60 @@ export async function db_query(
  * @returns SQL string for creating the table
  */
 export function db_migrate(model: Model, dbType: string): string {
+  // Special handling for auth tables - create them first
+  if (model.name === '__auth_tables__') {
+    return `-- Users table (required for authentication)
+CREATE TABLE IF NOT EXISTS "Users" (
+  "userid" TEXT PRIMARY KEY,
+  "OAuthID" TEXT NOT NULL UNIQUE,
+  "Source" TEXT NOT NULL CHECK("Source" IN ('google', 'facebook', 'apple', 'github')),
+  "UserName" TEXT NOT NULL,
+  "Email" TEXT,
+  "AvatarURL" TEXT,
+  "UserLevel" INTEGER NOT NULL DEFAULT 1 CHECK("UserLevel" IN (0, 1, 2)),
+  "UserTier" INTEGER NOT NULL DEFAULT 0,
+  "LastLoginDate" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "CreatedDate" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "IsActive" INTEGER NOT NULL DEFAULT 1
+);
+
+-- Indexes for Users table
+CREATE INDEX IF NOT EXISTS idx_users_oauthid ON "Users"("OAuthID");
+CREATE INDEX IF NOT EXISTS idx_users_email ON "Users"("Email");
+CREATE INDEX IF NOT EXISTS idx_users_usertier ON "Users"("UserTier");
+
+-- UserSession table
+CREATE TABLE IF NOT EXISTS "UserSession" (
+  "ID" TEXT PRIMARY KEY,
+  "SessionToken" TEXT NOT NULL UNIQUE,
+  "userid" TEXT NOT NULL,
+  "ExpirationDate" TEXT NOT NULL,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for UserSession table
+CREATE INDEX IF NOT EXISTS idx_session_token ON "UserSession"("SessionToken");
+CREATE INDEX IF NOT EXISTS idx_session_user ON "UserSession"("userid");
+CREATE INDEX IF NOT EXISTS idx_session_expiry ON "UserSession"("ExpirationDate");
+
+-- OAuthTokens table
+CREATE TABLE IF NOT EXISTS "OAuthTokens" (
+  "ID" TEXT PRIMARY KEY,
+  "userid" TEXT NOT NULL,
+  "Provider" TEXT NOT NULL CHECK("Provider" IN ('google', 'facebook', 'apple', 'github')),
+  "AccessToken" TEXT NOT NULL,
+  "RefreshToken" TEXT,
+  "ExpiresAt" TEXT,
+  "CreatedAt" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "UpdatedAt" TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  FOREIGN KEY ("userid") REFERENCES "Users"("userid") ON DELETE CASCADE
+);
+
+-- Indexes for OAuthTokens table
+CREATE INDEX IF NOT EXISTS idx_oauth_user ON "OAuthTokens"("userid");
+CREATE INDEX IF NOT EXISTS idx_oauth_provider ON "OAuthTokens"("userid", "Provider");`;
+  }
+
   const sanitizedTableName = model.name;
   
   // Start with the model's fields

package/dist/defaultapp/db-users.ts

@@ -39,147 +39,29 @@ export interface OAuthToken {
 }
 
 /**
- * Ensure the Users table exists with the correct schema
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureUsersTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-
-  // Create or migrate the Users table
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS Users (
-      userid VARCHAR(36) PRIMARY KEY NOT NULL,
-      OAuthID VARCHAR(255) NOT NULL UNIQUE,
-      Source VARCHAR(20) NOT NULL CHECK(Source IN ('google', 'facebook', 'apple', 'github')),
-      UserName VARCHAR(255) NOT NULL,
-      Email VARCHAR(255),
-      AvatarURL TEXT,
-      UserLevel INTEGER NOT NULL DEFAULT 1 CHECK(UserLevel IN (0, 1, 2)),
-      UserTier INTEGER NOT NULL DEFAULT 0,
-      LastLoginDate DATETIME NOT NULL,
-      CreatedDate DATETIME NOT NULL,
-      IsActive BOOLEAN NOT NULL DEFAULT true
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_users_oauth ON Users(OAuthID);
-    CREATE INDEX IF NOT EXISTS idx_users_permission ON Users(UserLevel);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - Users table is created by db_migrate
+  return;
 }
 
 /**
- * Ensure the UserSession table exists
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureUserSessionTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS UserSession (
-      ID VARCHAR(36) PRIMARY KEY NOT NULL,
-      SessionToken VARCHAR(255) NOT NULL UNIQUE,
-      userid VARCHAR(36) NOT NULL,
-      ExpirationDate DATETIME NOT NULL,
-      FOREIGN KEY (userid) REFERENCES Users(userid) ON DELETE CASCADE
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_session_token ON UserSession(SessionToken);
-    CREATE INDEX IF NOT EXISTS idx_session_user ON UserSession(userid);
-    CREATE INDEX IF NOT EXISTS idx_session_expiry ON UserSession(ExpirationDate);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - UserSession table is created by db_migrate
+  return;
 }
 
 /**
- * Ensure the OAuthTokens table exists
+ * @deprecated Table creation is now handled by db_migrate in the database implementation files
  */
 export async function ensureOAuthTokensTable(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  const createTableSQL = `
-    CREATE TABLE IF NOT EXISTS OAuthTokens (
-      ID VARCHAR(36) PRIMARY KEY NOT NULL,
-      userid VARCHAR(36) NOT NULL,
-      Provider VARCHAR(20) NOT NULL CHECK(Provider IN ('google', 'facebook', 'apple', 'github')),
-      AccessToken TEXT NOT NULL,
-      RefreshToken TEXT,
-      ExpiresAt DATETIME,
-      CreatedAt DATETIME NOT NULL,
-      UpdatedAt DATETIME NOT NULL,
-      FOREIGN KEY (userid) REFERENCES Users(userid) ON DELETE CASCADE
-    );
-    
-    CREATE INDEX IF NOT EXISTS idx_oauth_user ON OAuthTokens(userid);
-    CREATE INDEX IF NOT EXISTS idx_oauth_provider ON OAuthTokens(userid, Provider);
-  `;
-  
-  // Split and execute statements separately for compatibility
-  const statements = createTableSQL.split(';').map(s => s.trim()).filter(s => s.length > 0);
-  for (const statement of statements) {
-    try {
-      await db_query(client, statement);
-    } catch (error) {
-      // Ignore errors for index creation as some databases don't support IF NOT EXISTS for indexes
-      if (!statement.includes('CREATE INDEX')) {
-        throw error;
-      }
-    }
-  }
+  // No longer needed - OAuthTokens table is created by db_migrate
+  return;
 }
 
-/**
- * Ensure all authentication tables exist
- */
-export async function ensureAuthTables(): Promise<void> {
-  // Skip table creation during build time
-  if (typeof window === 'undefined' && !process.env.HOSTNAME && process.env.NODE_ENV === 'production') {
-    return;
-  }
-  
-  const client = await db_init();
-  
-  // IMPORTANT: Create Users table first since UserSession and OAuthTokens have foreign keys to it
-  await ensureUsersTable();
-  await ensureUserSessionTable();
-  await ensureOAuthTokensTable();
-}
 
 /**
  * Get all users from the database

package/dist/defaultapp/db.ts

@@ -158,6 +158,27 @@ export async function initializeDatabase(
   const client = await db_init();
   
   try {
+    // Create auth tables first (Users, UserSession, OAuthTokens)
+    const authTablesModel: Model = {
+      id: '__auth_tables__',
+      name: '__auth_tables__',
+      fields: []
+    };
+    const authTablesSql = db_migrate(authTablesModel);
+    
+    // Execute each statement separately for auth tables
+    const authStatements = authTablesSql.split(';').map(s => s.trim()).filter(s => s.length > 0);
+    for (const statement of authStatements) {
+      try {
+        await db_query(client, statement);
+      } catch (error) {
+        // Some databases might not support certain syntax, continue with other statements
+        if (!statement.includes('CREATE INDEX')) {
+          console.error('Error creating auth table:', error);
+        }
+      }
+    }
+    
     // Create tables for each model
     for (const model of models) {
       const createTableSql = db_migrate(model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sitepaige-mcp-server",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "type": "module",
   "description": "MCP server for generating web applications using SitePaige AI. Generate frontend (FREE/12 credits) then optionally add backend (50 credits)",
   "keywords": [