@seedprotocol/sdk 0.4.3 → 0.4.4

package/dist/{Schema-DeKabJ0T.js → Schema-ClTcpgbt.js}

@@ -1,9 +1,9 @@
 import { fromCallback, setup, assign, createActor } from 'xstate';
-import { p as BaseDb, W as schemas, aC as addSchemaToDb, af as generateId, aA as listCompleteSchemaFiles, s as BaseFileManager, aD as loadModelsFromDbForSchema, ad as getLatestSchemaVersion, M as Model, a2 as addModelsToDb, q as models, G as modelSchemas, r as properties, ae as writeProcessMachine, ag as createReactiveProxy, ah as findEntity, am as loadAllSchemasFromDb, aE as isInternalSchema, aF as ConflictError, aG as unloadEntity, aH as setupEntityLiveQuery } from './json-I3vJhXo8.js';
+import { aG as SEED_PROTOCOL_SCHEMA_NAME, p as BaseDb, W as schemas, aH as addSchemaToDb, ag as generateId, ae as createModelsFromJson, a2 as addModelsToDb, q as models, G as modelSchemas, r as properties, aE as listCompleteSchemaFiles, s as BaseFileManager, aI as loadModelsFromDbForSchema, ad as getLatestSchemaVersion, aJ as isInternalSchema, aK as createModelFromJson, M as Model, af as writeProcessMachine, ah as waitForEntityIdle, ai as createReactiveProxy, aj as findEntity, aq as loadAllSchemasFromDb, aL as ConflictError, aM as unloadEntity, aN as clearDestroySubscriptions, ak as forceRemoveFromCaches, al as runDestroyLifecycle, aO as setupEntityLiveQuery } from './ClientManager-DoHUt8tU.js';
 import { eq, desc, and } from 'drizzle-orm';
 import debug from 'debug';
-import { SchemaValidationService } from './SchemaValidationService-cTlURuDt.js';
-import { M as ModelProperty, c as convertPropertyToSchemaUpdate, u as updateModelProperties } from './ModelProperty-Cr3BmgkC.js';
+import { SchemaValidationService } from './SchemaValidationService-BfoEiHNr.js';
+import { M as ModelProperty, c as convertPropertyToSchemaUpdate, w as writeFullSchemaNewVersion, u as updateModelProperties } from './ModelProperty-gjcA83Mq.js';
 import 'pluralize';
 import 'rxjs';
 import 'lodash-es';
@@ -12,9 +12,9 @@ import '@sinclair/typebox';
 import 'arweave';
 import 'eventemitter3';
 import 'drizzle-orm/sqlite-core';
-import 'ethers';
 import 'nanoid';
 import 'nanoid-dictionary';
+import 'ethers';
 import '@sinclair/typebox/value';
 import 'reflect-metadata';
 
@@ -32,13 +32,12 @@ const getModelIdsForSchema$1 = async (schemaId) => {
         return [];
     }
     try {
-        const { modelSchemas, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
         const modelRecords = await db
             .select({
-            modelFileId: modelsTable.schemaFileId,
+            modelFileId: models.schemaFileId,
         })
             .from(modelSchemas)
-            .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+            .innerJoin(models, eq(modelSchemas.modelId, models.id))
             .where(eq(modelSchemas.schemaId, schemaId));
         const modelIds = modelRecords
             .map((row) => row.modelFileId)
@@ -61,7 +60,7 @@ const createModelInstances$2 = async (modelIds) => {
         return;
     }
     try {
-        const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
+        const { Model } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
         // Create instances for all model IDs in parallel
         // Model.createById() will check cache first, then query DB and create if needed
         const createPromises = modelIds.map(async (modelFileId) => {
@@ -101,13 +100,11 @@ const verifyPropertiesPersisted = async (modelId, modelName, maxRetries = 10, re
     if (!db) {
         throw new Error('Database not available for property verification');
     }
-    const { properties: propertiesTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
-    const { eq } = await import('drizzle-orm');
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         const props = await db
             .select()
-            .from(propertiesTable)
-            .where(eq(propertiesTable.modelId, modelId))
+            .from(properties)
+            .where(eq(properties.modelId, modelId))
             .limit(1);
         if (props.length > 0) {
             logger$c(`Verified properties exist for model "${modelName}" (modelId: ${modelId}) after ${attempt + 1} attempt(s)`);
@@ -169,15 +166,14 @@ const getSchemaFilePath$1 = (name, version, schemaFileId) => {
 const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
     const _loadOrCreateSchema = async () => {
         const { schemaName } = context;
-        // Check if this is an internal SDK schema (should not create files in app directory)
-        const { isInternalSchema, SEED_PROTOCOL_SCHEMA_NAME } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aQ; });
+        // Check if this is an internal SDK schema (should not create files in app directory) — use static import so consumer bundles resolve correctly
         const isInternal = isInternalSchema(schemaName);
         if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
             // For Seed Protocol, always load from internal file, never create new
             logger$c(`Loading internal Seed Protocol schema from SDK`);
             console.log('[loadOrCreateSchema] Loading internal Seed Protocol schema from SDK');
             try {
-                const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                 const schemaFile = internalSchema.default;
                 console.log('[loadOrCreateSchema] Loaded schema file, models count:', Object.keys(schemaFile.models || {}).length);
                 // Check if it exists in database, if not, add it
@@ -202,8 +198,6 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         logger$c(`Added Seed Protocol schema to database`);
                         // Also add models and properties to database
                         // Convert to JsonImportSchema format for processing
-                        const { createModelsFromJson } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
-                        const { addModelsToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
                         const importData = {
                             name: schemaName,
                             models: Object.fromEntries(Object.entries(schemaFile.models || {}).map(([modelName, model]) => [
@@ -292,15 +286,13 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                             logger$c(`Added ${Object.keys(modelDefinitions).length} models and their properties to database for Seed Protocol schema`);
                             // Verify properties are persisted (important for browser environments)
                             // Query the database to get model IDs that were just created
-                            const { modelSchemas } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aO; });
-                            const { models: modelsTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
                             const modelLinks = await db
                                 .select({
                                 modelId: modelSchemas.modelId,
-                                modelName: modelsTable.name,
+                                modelName: models.name,
                             })
                                 .from(modelSchemas)
-                                .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                                .innerJoin(models, eq(modelSchemas.modelId, models.id))
                                 .where(eq(modelSchemas.schemaId, schemaRecord.id));
                             // Verify properties for at least one model (Seed model if available)
                             const seedModelLink = modelLinks.find((link) => link.modelName === 'Seed');
@@ -317,17 +309,14 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         // Schema exists, but always ensure models/properties are in database
                         // This handles the case where schema was added but models weren't (from previous code)
                         // or where models were added but properties weren't
-                        const { modelSchemas } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aO; });
-                        const { models: modelsTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
-                        const { properties: propertiesTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
                         // Check if models are linked to the schema
                         const modelLinks = await db
                             .select({
                             modelId: modelSchemas.modelId,
-                            modelName: modelsTable.name,
+                            modelName: models.name,
                         })
                             .from(modelSchemas)
-                            .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                            .innerJoin(models, eq(modelSchemas.modelId, models.id))
                             .where(eq(modelSchemas.schemaId, schemaRecord.id));
                         // Check if we have all expected models
                         const expectedModelNames = Object.keys(schemaFile.models || {});
@@ -343,8 +332,8 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                 if (link.modelId) {
                                     const props = await db
                                         .select()
-                                        .from(propertiesTable)
-                                        .where(eq(propertiesTable.modelId, link.modelId))
+                                        .from(properties)
+                                        .where(eq(properties.modelId, link.modelId))
                                         .limit(1);
                                     if (props.length === 0) {
                                         missingProperties = true;
@@ -358,8 +347,6 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         if (missingModels.length > 0 || missingProperties || modelLinks.length === 0) {
                             logger$c(`Seed Protocol schema exists but models/properties incomplete (missing models: ${missingModels.length}, missing properties: ${missingProperties}), adding them now`);
                             console.log(`[loadOrCreateSchema] Adding models/properties: missingModels=${missingModels.length}, missingProperties=${missingProperties}, modelLinks=${modelLinks.length}`);
-                            const { createModelsFromJson } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
-                            const { addModelsToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
                             // Convert SchemaFileFormat to JsonImportSchema format
                             // Schema format: { dataType, ref, refValueType, storageType, localStorageDir, filenameSuffix }
                             // JSON import format: { type, model, items, storage: { type, path, extension } }
@@ -463,10 +450,10 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                                     updatedModelLinks = await db
                                         .select({
                                         modelId: modelSchemas.modelId,
-                                        modelName: modelsTable.name,
+                                        modelName: models.name,
                                     })
                                         .from(modelSchemas)
-                                        .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                                        .innerJoin(models, eq(modelSchemas.modelId, models.id))
                                         .where(eq(modelSchemas.schemaId, schemaRecord.id));
                                     const linkedModelNames = updatedModelLinks
                                         .map((link) => link.modelName)
@@ -686,7 +673,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                     // Ensure models are populated (fallback for seed-protocol if missing)
                     if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                         try {
-                            const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                            const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                             const internalSchemaFile = internalSchema.default;
                             mergedModels = { ...(internalSchemaFile.models || {}) };
                             logger$c(`Populated models for seed-protocol schema from internal file`);
@@ -881,7 +868,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                     // Ensure models are populated (fallback for seed-protocol if missing)
                     if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                         try {
-                            const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                            const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                             const internalSchemaFile = internalSchema.default;
                             mergedModels = { ...(internalSchemaFile.models || {}) };
                             logger$c(`Populated models for seed-protocol schema from internal file`);
@@ -953,7 +940,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                         // Ensure models are populated (fallback for seed-protocol if missing)
                         if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                             try {
-                                const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                                const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                                 const internalSchemaFile = internalSchema.default;
                                 mergedModels = { ...(internalSchemaFile.models || {}) };
                                 logger$c(`Populated models for seed-protocol schema from internal file`);
@@ -1022,7 +1009,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
                 // If schemaData is missing, try to load from internal schema file for seed-protocol
                 if (!dbSchema.schemaData && schemaName === 'Seed Protocol') {
                     try {
-                        const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                        const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                         const schemaFile = internalSchema.default;
                         logger$c(`Found seed-protocol schema in internal file (schemaData missing, using internal schema)`);
                         // Update database with schemaData for future loads
@@ -1131,7 +1118,7 @@ const loadOrCreateSchema = fromCallback(({ sendBack, input: { context } }) => {
             // Ensure models are populated (fallback for seed-protocol if missing)
             if ((!mergedModels || Object.keys(mergedModels).length === 0) && schemaName === 'Seed Protocol') {
                 try {
-                    const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                    const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                     const internalSchemaFile = internalSchema.default;
                     mergedModels = { ...(internalSchemaFile.models || {}) };
                     logger$c(`Populated models for seed-protocol schema from internal file`);
@@ -1448,14 +1435,16 @@ const addModelsMachine = setup({
         createModelInstances: fromCallback(({ sendBack, input }) => {
             const _createInstances = async () => {
                 const { Schema } = await Promise.resolve().then(function () { return Schema$1; });
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { models: modelsTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
+                const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
+                const { models: modelsTable } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aQ; });
                 const { eq } = await import('drizzle-orm');
-                const { generateId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aL; });
+                const { generateId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aS; });
                 const debug = (await import('debug')).default;
                 const logger = debug('seedSdk:schema:addModels:createInstances');
                 const schemaName = input.schemaContext.metadata?.name || input.schemaContext.schemaName;
-                const schemaInstance = Schema.create(schemaName);
+                const schemaInstance = Schema.create(schemaName, {
+                    waitForReady: false,
+                });
                 const modelInstances = new Map();
                 // Get instance state to store model instances
                 const { schemaInstanceState } = await Promise.resolve().then(function () { return Schema$1; });
@@ -1492,7 +1481,10 @@ const addModelsMachine = setup({
                         }
                         // Create new Model instance with modelFileId
                         // Model.create() will set _modelFileId in the context automatically
-                        const modelInstance = Model.create(modelName, schemaName, { modelFileId });
+                        const modelInstance = Model.create(modelName, schemaName, {
+                            modelFileId,
+                            waitForReady: false,
+                        });
                         const service = modelInstance.getService();
                         logger(`Created Model instance for "${modelName}" with modelFileId "${modelFileId}"`);
                         // Wait for the Model service to finish loading (loadOrCreateModel completes)
@@ -1673,10 +1665,8 @@ const addModelsMachine = setup({
             const _persist = async () => {
                 const debug = (await import('debug')).default;
                 const logger = debug('seedSdk:schema:addModels:persist');
-                const { createModelFromJson } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
-                const { addModelsToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { schemas: schemasTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aN; });
+                const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
+                const { schemas: schemasTable } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aU; });
                 const { eq } = await import('drizzle-orm');
                 // Only process in browser environment where store is available
                 if (typeof window === 'undefined') {
@@ -1991,13 +1981,12 @@ const getModelIdsForSchema = async (schemaId) => {
         return [];
     }
     try {
-        const { modelSchemas, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
         const modelRecords = await db
             .select({
-            modelFileId: modelsTable.schemaFileId,
+            modelFileId: models.schemaFileId,
         })
             .from(modelSchemas)
-            .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+            .innerJoin(models, eq(modelSchemas.modelId, models.id))
             .where(eq(modelSchemas.schemaId, schemaId));
         const modelIds = modelRecords
             .map((row) => row.modelFileId)
@@ -2035,7 +2024,12 @@ const createModelInstances$1 = async (modelIds) => {
         return;
     }
     try {
-        const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
+        const mod = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
+        const Model = mod?.Model ?? mod?.default;
+        if (!Model) {
+            logger$b('Model not available from dynamic import');
+            return;
+        }
         const createPromises = modelIds.map(async (modelFileId) => {
             try {
                 const model = await Model.createById(modelFileId);
@@ -2070,13 +2064,12 @@ const checkExistingSchema = fromCallback(({ sendBack, input: { context } }) => {
             });
             return;
         }
-        // Check if this is an internal SDK schema (Seed Protocol)
-        const { isInternalSchema, SEED_PROTOCOL_SCHEMA_NAME } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aQ; });
+        // Check if this is an internal SDK schema (Seed Protocol) — use static import so consumer bundles resolve correctly
         const isInternal = isInternalSchema(schemaName);
         if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
             // For Seed Protocol, check if it exists in database
             try {
-                const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                 const schemaFile = internalSchema.default;
                 if (db && schemaFile.id) {
                     const existing = await db
@@ -2427,15 +2420,14 @@ const writeSchemaToDb = fromCallback(({ sendBack, input }) => {
     const _write = async () => {
         const { schemaName, schemaFile, existingDbSchema } = input;
         try {
-            // Check if this is an internal SDK schema (Seed Protocol)
-            const { isInternalSchema, SEED_PROTOCOL_SCHEMA_NAME } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aQ; });
+            // Check if this is an internal SDK schema (Seed Protocol) — use static import so consumer bundles resolve correctly
             const isInternal = isInternalSchema(schemaName);
             let finalSchema;
             let schemaRecord;
             if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
                 // For Seed Protocol, load from internal file
                 logger$a(`Loading internal Seed Protocol schema from SDK`);
-                const internalSchema = await import('./json-I3vJhXo8.js').then(function (n) { return n.aU; });
+                const internalSchema = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aZ; });
                 finalSchema = internalSchema.default;
                 const db = BaseDb.getAppDb();
                 if (db && finalSchema.id) {
@@ -2631,10 +2623,6 @@ const writeModelsToDb = fromCallback(({ sendBack, input }) => {
         const { schema, schemaRecord, schemaName } = input;
         try {
             // Check if models already exist in database
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const { modelSchemas } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aO; });
-            const { models: modelsTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
-            const { eq } = await import('drizzle-orm');
             const db = BaseDb.getAppDb();
             if (!db) {
                 throw new Error('Database not available');
@@ -2643,10 +2631,10 @@ const writeModelsToDb = fromCallback(({ sendBack, input }) => {
             const modelLinks = await db
                 .select({
                 modelId: modelSchemas.modelId,
-                modelName: modelsTable.name,
+                modelName: models.name,
             })
                 .from(modelSchemas)
-                .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                .innerJoin(models, eq(modelSchemas.modelId, models.id))
                 .where(eq(modelSchemas.schemaId, schemaRecord.id));
             // Check if we have all expected models
             const expectedModelNames = Object.keys(schema.models || {});
@@ -2662,9 +2650,9 @@ const writeModelsToDb = fromCallback(({ sendBack, input }) => {
                 for (const link of modelLinks) {
                     if (link.modelId) {
                         const modelRecord = await db
-                            .select({ schemaFileId: modelsTable.schemaFileId })
-                            .from(modelsTable)
-                            .where(eq(modelsTable.id, link.modelId))
+                            .select({ schemaFileId: models.schemaFileId })
+                            .from(models)
+                            .where(eq(models.id, link.modelId))
                             .limit(1);
                         if (modelRecord.length > 0 && modelRecord[0].schemaFileId) {
                             modelFileIds.push(modelRecord[0].schemaFileId);
@@ -2677,10 +2665,7 @@ const writeModelsToDb = fromCallback(({ sendBack, input }) => {
                 });
                 return;
             }
-            // Convert SchemaFileFormat to JsonImportSchema format
-            const { createModelsFromJson } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aW; });
-            // Check if this is Seed Protocol schema (has different format)
-            const { isInternalSchema, SEED_PROTOCOL_SCHEMA_NAME } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aQ; });
+            // Check if this is Seed Protocol schema (has different format) — use static import so consumer bundles resolve correctly
             const isInternal = isInternalSchema(schemaName);
             let importData;
             if (isInternal && schemaName === SEED_PROTOCOL_SCHEMA_NAME) {
@@ -2910,7 +2895,7 @@ const createModelInstances = fromCallback(({ sendBack, input }) => {
             return;
         }
         try {
-            const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
+            const { Model } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
             // Create instances for all model IDs in parallel
             // Model.createById() will check cache first, then query DB and create if needed
             const createPromises = modelIds.map(async (modelFileId) => {
@@ -2995,7 +2980,7 @@ const verifyModelInstancesInCache = fromCallback(({ sendBack, input }) => {
         }
         try {
             const result = await verifyWithRetry$2(async () => {
-                const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
+                const { Model } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
                 // Check each model ID in the cache
                 const verifiedInstances = [];
                 const missingIds = [];
@@ -3051,8 +3036,8 @@ const writePropertiesToDb = fromCallback(({ sendBack, input }) => {
     const _write = async () => {
         const { modelIds } = input;
         try {
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const { models: modelsTable, properties: propertiesTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aJ; });
+            const { BaseDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aP; });
+            const { models: modelsTable, properties: propertiesTable } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aQ; });
             const { eq } = await import('drizzle-orm');
             const db = BaseDb.getAppDb();
             if (!db) {
@@ -3238,8 +3223,15 @@ const createPropertyInstances = fromCallback(({ sendBack, input }) => {
             return;
         }
         try {
-            const { ModelProperty } = await import('./ModelProperty-Cr3BmgkC.js').then(function (n) { return n.b; });
-            const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
+            const modProp = await import('./ModelProperty-gjcA83Mq.js').then(function (n) { return n.b; });
+            const ModelProperty = modProp?.ModelProperty ?? modProp?.default;
+            const modModel = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aX; });
+            const Model = modModel?.Model ?? modModel?.default;
+            if (!ModelProperty || !Model) {
+                logger$2('ModelProperty or Model not available from dynamic import');
+                sendBack({ type: 'instancesCreated', count: 0 });
+                return;
+            }
             // Properties are typically loaded when Model instances are loaded
             // But we can verify they exist by checking Model instances
             let successCount = 0;
@@ -3338,7 +3330,11 @@ const verifyPropertyInstancesInCache = fromCallback(({ sendBack, input }) => {
         }
         try {
             const result = await verifyWithRetry(async () => {
-                const { ModelProperty } = await import('./ModelProperty-Cr3BmgkC.js').then(function (n) { return n.b; });
+                const mod = await import('./ModelProperty-gjcA83Mq.js').then(function (n) { return n.b; });
+                const ModelProperty = mod?.ModelProperty ?? mod?.default;
+                if (!ModelProperty) {
+                    throw new Error('ModelProperty not available from dynamic import');
+                }
                 // Check each property ID in the cache
                 const verifiedInstances = [];
                 const missingIds = [];
@@ -3498,6 +3494,23 @@ const schemaMachine = setup({
                 return newContext;
             }),
         },
+        destroyStarted: {
+            actions: assign({ _destroyInProgress: true, _destroyError: null }),
+        },
+        destroyDone: {
+            actions: assign({ _destroyInProgress: false }),
+        },
+        destroyError: {
+            actions: assign(({ event }) => ({
+                _destroyInProgress: false,
+                _destroyError: event.error instanceof Error
+                    ? { message: event.error.message, name: event.error.name }
+                    : { message: String(event.error) },
+            })),
+        },
+        clearDestroyError: {
+            actions: assign({ _destroyError: null }),
+        },
     },
     states: {
         loading: {
@@ -4091,10 +4104,12 @@ class Schema {
         });
         // Note: Property getters/setters are now handled by the Proxy in create()
     }
-    static create(schemaName) {
+    static create(schemaName, options) {
         if (!schemaName) {
             throw new Error('Schema name is required');
         }
+        const waitForReady = options?.waitForReady !== false;
+        const readyTimeout = options?.readyTimeout ?? 5000;
         // First, check if we have an instance cached by name
         if (this.instanceCacheByName.has(schemaName)) {
             const { instance, refCount } = this.instanceCacheByName.get(schemaName);
@@ -4102,7 +4117,9 @@ class Schema {
                 instance,
                 refCount: refCount + 1,
             });
-            return instance;
+            if (!waitForReady)
+                return instance;
+            return waitForEntityIdle(instance, { timeout: readyTimeout }).then(() => instance);
         }
         // Create new instance
         const newInstance = new this(schemaName);
@@ -4425,9 +4442,10 @@ class Schema {
             instance: proxiedInstance,
             refCount: 1,
         });
-        // The proxiedInstance is Proxied<Schema> which preserves all methods
-        // TypeScript recognizes this as Schema with all methods intact
-        return proxiedInstance;
+        const schema = proxiedInstance;
+        if (!waitForReady)
+            return schema;
+        return waitForEntityIdle(schema, { timeout: readyTimeout }).then(() => schema);
     }
     /**
      * Update the cache to use schemaFileId as the key instead of schemaName
@@ -4464,7 +4482,7 @@ class Schema {
             });
             return instance;
         }
-        return undefined;
+        return null;
     }
     /**
      * Clear all cached Schema instances.
@@ -4511,17 +4529,15 @@ class Schema {
             return cachedInstance;
         }
         // Query database to get schema name from ID
-        const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-        const { schemas: schemasTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aN; });
         const db = BaseDb.getAppDb();
         if (!db) {
             throw new Error('Database not available');
         }
         const dbSchemas = await db
             .select()
-            .from(schemasTable)
-            .where(eq(schemasTable.schemaFileId, schemaFileId))
-            .orderBy(desc(schemasTable.version))
+            .from(schemas)
+            .where(eq(schemas.schemaFileId, schemaFileId))
+            .orderBy(desc(schemas.version))
             .limit(1);
         if (dbSchemas.length === 0) {
             throw new Error(`Schema with ID "${schemaFileId}" not found in database`);
@@ -4568,7 +4584,7 @@ class Schema {
      * @returns Array of Schema instances
      */
     static async all(options = {}) {
-        const { includeAllVersions = false, includeInternal = false } = options;
+        const { includeAllVersions = false, includeInternal = false, waitForReady = false, readyTimeout = 5000, } = options;
         try {
             // Use loadAllSchemasFromDb as single source of truth
             // This intelligently merges database and file data, including drafts
@@ -4651,13 +4667,18 @@ class Schema {
                     }
                     catch (error) {
                         // Fallback to creating by name if createById fails
-                        schemaInstances.push(this.create(schemaName));
+                        schemaInstances.push(this.create(schemaName, { waitForReady: false }));
                     }
                 }
                 else {
-                    schemaInstances.push(this.create(schemaName));
+                    schemaInstances.push(this.create(schemaName, { waitForReady: false }));
                 }
             }
+            if (waitForReady && schemaInstances.length > 0) {
+                await Promise.all(schemaInstances.map((s) => waitForEntityIdle(s, {
+                    timeout: readyTimeout,
+                })));
+            }
             return schemaInstances;
         }
         catch (error) {
@@ -4695,7 +4716,12 @@ class Schema {
             // Create Schema instances for each unique schema name
             const schemaInstances = [];
             for (const schemaName of uniqueSchemaNames) {
-                schemaInstances.push(this.create(schemaName));
+                schemaInstances.push(this.create(schemaName, { waitForReady: false }));
+            }
+            if (waitForReady && schemaInstances.length > 0) {
+                await Promise.all(schemaInstances.map((s) => waitForEntityIdle(s, {
+                    timeout: readyTimeout,
+                })));
             }
             return schemaInstances;
         }
@@ -4738,6 +4764,7 @@ class Schema {
      */
     get models() {
         const context = this._getSnapshotContext();
+        const schemaName = context.schemaName;
         // Get model IDs from service context (reactive state)
         const liveQueryIds = context._liveQueryModelIds || [];
         // Get pending model IDs (not yet in DB)
@@ -4746,15 +4773,27 @@ class Schema {
         const pendingIds = [];
         // Combine and deduplicate
         const allModelIds = [...new Set([...liveQueryIds, ...pendingIds])];
-        // Get Model instances from static cache
+        // Get Model instances from static cache (from schema load)
+        const seen = new Set();
         const modelInstances = [];
         for (const modelFileId of allModelIds) {
             const model = Model.getById(modelFileId);
-            if (model) {
+            if (model && modelFileId && !seen.has(modelFileId)) {
                 modelInstances.push(model);
+                seen.add(modelFileId);
+            }
+        }
+        // Include models created at runtime via Model.create() that belong to this schema
+        // (they may not be in _liveQueryModelIds until schema context is updated)
+        if (schemaName) {
+            const cachedForSchema = Model.getCachedInstancesForSchema(schemaName);
+            for (const model of cachedForSchema) {
+                const id = model.id;
+                if (id && !seen.has(id)) {
+                    modelInstances.push(model);
+                    seen.add(id);
+                }
             }
-            // Note: Cannot create models asynchronously in this synchronous getter
-            // Models will be created elsewhere when needed
         }
         // Return a new array reference (snapshot at time of access)
         return [...modelInstances];
@@ -4871,9 +4910,7 @@ class Schema {
             throw new ConflictError(errorMessage, conflictCheck);
         }
         const context = this._getSnapshotContext();
-        const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-        const { schemas: schemasTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aN; });
-        const { addSchemaToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
+        const { addSchemaToDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
         if (!context._isDraft || !context._editedProperties || context._editedProperties.size === 0) {
             logger('No changes to save');
             return '';
@@ -4913,6 +4950,11 @@ class Schema {
             createdAt: new Date(currentSchema.metadata.createdAt).getTime(),
             updatedAt: new Date(currentSchema.metadata.updatedAt).getTime(),
         }, currentSchema.id, JSON.stringify(currentSchema, null, 2), true);
+        const dbSchema = await db
+            .select()
+            .from(schemas)
+            .where(eq(schemas.name, this.schemaName))
+            .limit(1);
         // Collect all edited properties and convert them to SchemaPropertyUpdate format
         const propertyUpdates = [];
         for (const propertyKey of context._editedProperties) {
@@ -4941,6 +4983,32 @@ class Schema {
             propertyUpdates.push(propertyUpdate);
         }
         if (propertyUpdates.length === 0) {
+            // When only new models were added, _editedProperties contains 'schema:models' and we write the full schema
+            if (context._editedProperties.has('schema:models')) {
+                const newFilePath = await writeFullSchemaNewVersion(this.schemaName, currentSchema);
+                const { BaseFileManager } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aR; });
+                const fileContent = await BaseFileManager.readFileAsString(newFilePath);
+                const publishedSchema = JSON.parse(fileContent);
+                if (dbSchema.length > 0) {
+                    await db
+                        .update(schemas)
+                        .set({
+                        isDraft: false,
+                        isEdited: false,
+                        schemaFileId: publishedSchema.id,
+                        schemaData: JSON.stringify(publishedSchema, null, 2),
+                        version: publishedSchema.version,
+                        updatedAt: new Date(publishedSchema.metadata.updatedAt).getTime(),
+                    })
+                        .where(eq(schemas.id, dbSchema[0].id));
+                }
+                this._service.send({
+                    type: 'clearDraft',
+                    _dbUpdatedAt: new Date(publishedSchema.metadata.updatedAt).getTime(),
+                    _dbVersion: publishedSchema.version,
+                });
+                return newFilePath;
+            }
             logger('No valid property updates to save');
             return '';
         }
@@ -4948,18 +5016,13 @@ class Schema {
         const newFilePath = await updateModelProperties(this.schemaName, propertyUpdates);
         // STEP 3: After file is written, update database to mark as published (isDraft = false)
         // Load the file to get the final schema with IDs
-        const { BaseFileManager } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aK; });
+        const { BaseFileManager } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aR; });
         const fileContent = await BaseFileManager.readFileAsString(newFilePath);
         const publishedSchema = JSON.parse(fileContent);
         // Update database record: set isDraft = false and update schemaFileId
-        const dbSchema = await db
-            .select()
-            .from(schemasTable)
-            .where(eq(schemasTable.name, this.schemaName))
-            .limit(1);
         if (dbSchema.length > 0) {
             await db
-                .update(schemasTable)
+                .update(schemas)
                 .set({
                 isDraft: false,
                 isEdited: false, // Clear isEdited flag after saving to file
@@ -4968,7 +5031,7 @@ class Schema {
                 version: publishedSchema.version,
                 updatedAt: new Date(publishedSchema.metadata.updatedAt).getTime(),
             })
-                .where(eq(schemasTable.id, dbSchema[0].id));
+                .where(eq(schemas.id, dbSchema[0].id));
         }
         else {
             // Create new record if it doesn't exist (shouldn't happen, but safety)
@@ -4987,7 +5050,6 @@ class Schema {
             _dbVersion: publishedSchema.version,
         });
         // Clear edited flags on all ModelProperty instances and in database
-        const { properties: propertiesTable, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
         for (const propertyKey of context._editedProperties) {
             const [modelName, propertyName] = propertyKey.split(':');
             const cacheKey = `${modelName}:${propertyName}`;
@@ -5005,23 +5067,23 @@ class Schema {
                     if (db && modelName && propertyName) {
                         // Find model by name
                         const modelRecords = await db
-                            .select({ id: modelsTable.id })
-                            .from(modelsTable)
-                            .where(eq(modelsTable.name, modelName))
+                            .select({ id: models.id })
+                            .from(models)
+                            .where(eq(models.name, modelName))
                             .limit(1);
                         if (modelRecords.length > 0) {
                             // Find property by name and modelId
                             const propertyRecords = await db
-                                .select({ id: propertiesTable.id })
-                                .from(propertiesTable)
-                                .where(and(eq(propertiesTable.name, propertyName), eq(propertiesTable.modelId, modelRecords[0].id)))
+                                .select({ id: properties.id })
+                                .from(properties)
+                                .where(and(eq(properties.name, propertyName), eq(properties.modelId, modelRecords[0].id)))
                                 .limit(1);
                             if (propertyRecords.length > 0) {
                                 // Clear isEdited flag in database
                                 await db
-                                    .update(propertiesTable)
+                                    .update(properties)
                                     .set({ isEdited: false })
-                                    .where(eq(propertiesTable.id, propertyRecords[0].id));
+                                    .where(eq(properties.id, propertyRecords[0].id));
                             }
                         }
                     }
@@ -5035,19 +5097,18 @@ class Schema {
         try {
             if (db && context._dbId) {
                 // Get all models for this schema
-                const { modelSchemas, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
                 const modelRecords = await db
-                    .select({ id: modelsTable.id })
+                    .select({ id: models.id })
                     .from(modelSchemas)
-                    .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                    .innerJoin(models, eq(modelSchemas.modelId, models.id))
                     .where(eq(modelSchemas.schemaId, context._dbId));
                 // Clear isEdited flag for all models
                 for (const modelRecord of modelRecords) {
                     if (modelRecord.id) {
                         await db
-                            .update(modelsTable)
+                            .update(models)
                             .set({ isEdited: false })
-                            .where(eq(modelsTable.id, modelRecord.id));
+                            .where(eq(models.id, modelRecord.id));
                     }
                 }
             }
@@ -5151,8 +5212,8 @@ class Schema {
             if (shouldRecheck) {
                 try {
                     // Use dynamic import for browser compatibility (require() doesn't work in browsers)
-                    const { getClient } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aV; });
-                    const { ClientManagerState } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aM; });
+                    const { getClient } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.a_; });
+                    const { ClientManagerState } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aT; });
                     const client = getClient();
                     const clientSnapshot = client.getService().getSnapshot();
                     // Check if state is IDLE (primary check) - isInitialized is set in entry action so should be true
@@ -5223,10 +5284,8 @@ class Schema {
                     _editedProperties: new Set(),
                 };
             }
-            const { addSchemaToDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aR; });
-            const { generateId } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aL; });
-            const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-            const { schemas: schemasTable } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aN; });
+            const { addSchemaToDb } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aW; });
+            const { generateId } = await import('./ClientManager-DoHUt8tU.js').then(function (n) { return n.aS; });
             const db = BaseDb.getAppDb();
             if (!db) {
                 throw new Error('Database not found');
@@ -5246,8 +5305,8 @@ class Schema {
                 logger(`Looking up schema by schemaFileId: ${context.id}`);
                 const schemasById = await db
                     .select()
-                    .from(schemasTable)
-                    .where(eq(schemasTable.schemaFileId, context.id)) // id is now the schemaFileId (string)
+                    .from(schemas)
+                    .where(eq(schemas.schemaFileId, context.id)) // id is now the schemaFileId (string)
                     .limit(1);
                 if (schemasById.length > 0) {
                     const foundRecord = schemasById[0];
@@ -5267,8 +5326,8 @@ class Schema {
                 logger(`Looking up schema by name "${lookupName}" (oldName: ${oldName}, finalNewName: ${finalNewName})`);
                 const existingSchemas = await db
                     .select()
-                    .from(schemasTable)
-                    .where(eq(schemasTable.name, lookupName))
+                    .from(schemas)
+                    .where(eq(schemas.name, lookupName))
                     .limit(10); // Get multiple to find drafts
                 logger(`Found ${existingSchemas.length} records with name "${lookupName}"`);
                 // If name changed, prefer draft records; otherwise prefer any record
@@ -5358,14 +5417,14 @@ class Schema {
                         saveDraftLogger(`Setting schemaFileId to ${finalSchemaFileId} (was null)`);
                     }
                     await db
-                        .update(schemasTable)
+                        .update(schemas)
                         .set(updateData)
-                        .where(eq(schemasTable.id, existingSchemaRecord.id));
+                        .where(eq(schemas.id, existingSchemaRecord.id));
                     // Verify what was saved by reading it back
                     const verifyRecord = await db
                         .select()
-                        .from(schemasTable)
-                        .where(eq(schemasTable.id, existingSchemaRecord.id))
+                        .from(schemas)
+                        .where(eq(schemas.id, existingSchemaRecord.id))
                         .limit(1);
                     if (verifyRecord.length > 0 && verifyRecord[0].schemaData) {
                         try {
@@ -5375,15 +5434,15 @@ class Schema {
                                 saveDraftLogger(`ERROR: isDraft is not true after save! Expected true, got ${verifyRecord[0].isDraft}. This will cause the schema to load from file instead of database!`);
                                 // Try to fix it immediately
                                 await db
-                                    .update(schemasTable)
+                                    .update(schemas)
                                     .set({ isDraft: true })
-                                    .where(eq(schemasTable.id, existingSchemaRecord.id));
+                                    .where(eq(schemas.id, existingSchemaRecord.id));
                                 saveDraftLogger(`Attempted to fix isDraft by setting it to true again`);
                                 // Verify the fix
                                 const fixedRecord = await db
                                     .select()
-                                    .from(schemasTable)
-                                    .where(eq(schemasTable.id, existingSchemaRecord.id))
+                                    .from(schemas)
+                                    .where(eq(schemas.id, existingSchemaRecord.id))
                                     .limit(1);
                                 if (fixedRecord.length > 0) {
                                     saveDraftLogger(`After fix attempt: isDraft=${fixedRecord[0].isDraft}`);
@@ -5425,8 +5484,8 @@ class Schema {
                     // Try to find by looking for ANY draft with the old name (even if it doesn't match exactly)
                     const allDrafts = await db
                         .select()
-                        .from(schemasTable)
-                        .where(eq(schemasTable.name, oldName))
+                        .from(schemas)
+                        .where(eq(schemas.name, oldName))
                         .limit(1);
                     if (allDrafts.length > 0 && allDrafts[0].id) {
                         const foundRecord = allDrafts[0];
@@ -5434,7 +5493,7 @@ class Schema {
                         // Update the existing record with the new name
                         // CRITICAL: Ensure schemaFileId matches schema.id
                         await db
-                            .update(schemasTable)
+                            .update(schemas)
                             .set({
                             name: finalNewName,
                             schemaData: JSON.stringify(currentSchema, null, 2),
@@ -5443,7 +5502,7 @@ class Schema {
                             updatedAt: new Date(currentSchema.metadata.updatedAt).getTime(),
                             isDraft: true, // Ensure it's marked as a draft when saving via _saveDraftToDb
                         })
-                            .where(eq(schemasTable.id, foundRecord.id));
+                            .where(eq(schemas.id, foundRecord.id));
                         // Update context with id (schemaFileId) and conflict detection metadata
                         try {
                             const snapshot = this._service.getSnapshot();
@@ -5554,6 +5613,68 @@ class Schema {
             }
         }
     }
+    /**
+     * Destroy the schema instance completely: remove from caches, delete from database (cascade),
+     * and stop the service. Uses shared destroy helpers.
+     */
+    async destroy() {
+        const context = this._getSnapshotContext();
+        const schemaFileId = context.id;
+        const schemaName = context.schemaName;
+        clearDestroySubscriptions(this, {
+            instanceState: schemaInstanceState,
+            onUnload: () => schemaInstanceState.delete(this),
+        });
+        const cacheKeys = [];
+        if (schemaFileId)
+            cacheKeys.push(schemaFileId);
+        if (schemaName)
+            cacheKeys.push(schemaName);
+        forceRemoveFromCaches(this, {
+            getCacheKeys: () => cacheKeys,
+            caches: [
+                Schema.instanceCacheById,
+                Schema.instanceCacheByName,
+            ],
+        });
+        await runDestroyLifecycle(this, {
+            getService: (instance) => instance._service,
+            doDestroy: async () => {
+                const db = BaseDb.getAppDb();
+                if (!db || !schemaFileId)
+                    return;
+                const schemaRecords = await db
+                    .select({ id: schemas.id })
+                    .from(schemas)
+                    .where(eq(schemas.schemaFileId, schemaFileId));
+                if (schemaRecords.length === 0)
+                    return;
+                const schemaIds = schemaRecords
+                    .map((r) => r.id)
+                    .filter((id) => id != null);
+                if (schemaIds.length === 0)
+                    return;
+                const { inArray } = await import('drizzle-orm');
+                const joinRows = await db
+                    .select({ modelId: modelSchemas.modelId })
+                    .from(modelSchemas)
+                    .where(inArray(modelSchemas.schemaId, schemaIds));
+                const modelIds = [
+                    ...new Set(joinRows
+                        .map((r) => r.modelId)
+                        .filter((id) => id != null)),
+                ];
+                await db.delete(modelSchemas).where(inArray(modelSchemas.schemaId, schemaIds));
+                for (const modelId of modelIds) {
+                    await db.delete(properties).where(eq(properties.modelId, modelId));
+                }
+                for (const modelId of modelIds) {
+                    await db.delete(models).where(eq(models.id, modelId));
+                }
+                await db.delete(schemas).where(eq(schemas.schemaFileId, schemaFileId));
+            },
+        });
+    }
     /**
      * Set up liveQuery subscription to watch for model changes in the database
      * This enables cross-instance synchronization (e.g., changes in other tabs/windows)
@@ -5565,9 +5686,6 @@ class Schema {
         }
         setupEntityLiveQuery(this, {
             getEntityId: async (schema) => {
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { schemas: schemasTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
-                const { eq } = await import('drizzle-orm');
                 const db = BaseDb.getAppDb();
                 if (!db) {
                     return undefined;
@@ -5579,8 +5697,8 @@ class Schema {
                 }
                 const schemaRecords = await db
                     .select()
-                    .from(schemasTable)
-                    .where(eq(schemasTable.name, schemaName))
+                    .from(schemas)
+                    .where(eq(schemas.name, schemaName))
                     .limit(1);
                 if (schemaRecords.length === 0 || !schemaRecords[0].id) {
                     return undefined;
@@ -5588,9 +5706,6 @@ class Schema {
                 return schemaRecords[0].id;
             },
             buildQuery: async (schemaId) => {
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { modelSchemas, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
-                const { eq } = await import('drizzle-orm');
                 const db = BaseDb.getAppDb();
                 if (!db) {
                     throw new Error('Database not available');
@@ -5598,11 +5713,11 @@ class Schema {
                 return BaseDb.liveQuery(db
                     .select({
                     modelId: modelSchemas.modelId,
-                    modelName: modelsTable.name,
-                    modelFileId: modelsTable.schemaFileId,
+                    modelName: models.name,
+                    modelFileId: models.schemaFileId,
                 })
                     .from(modelSchemas)
-                    .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                    .innerJoin(models, eq(modelSchemas.modelId, models.id))
                     .where(eq(modelSchemas.schemaId, typeof schemaId === 'string' ? parseInt(schemaId, 10) : schemaId)));
             },
             extractEntityIds: (rows) => rows.map(row => row.modelFileId).filter(Boolean),
@@ -5662,15 +5777,11 @@ class Schema {
                 }
             },
             createChildInstances: async (ids) => {
-                const { Model } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aS; });
                 for (const id of ids) {
                     await Model.createById(id);
                 }
             },
             queryInitialData: async (schemaId) => {
-                const { BaseDb } = await import('./json-I3vJhXo8.js').then(function (n) { return n.aI; });
-                const { modelSchemas, models: modelsTable } = await import('./index-r45w9hEq.js').then(function (n) { return n.s; });
-                const { eq } = await import('drizzle-orm');
                 const db = BaseDb.getAppDb();
                 if (!db) {
                     return [];
@@ -5681,11 +5792,11 @@ class Schema {
                         const initialModels = await db
                             .select({
                             modelId: modelSchemas.modelId,
-                            modelName: modelsTable.name,
-                            modelFileId: modelsTable.schemaFileId,
+                            modelName: models.name,
+                            modelFileId: models.schemaFileId,
                         })
                             .from(modelSchemas)
-                            .innerJoin(modelsTable, eq(modelSchemas.modelId, modelsTable.id))
+                            .innerJoin(models, eq(modelSchemas.modelId, models.id))
                             .where(eq(modelSchemas.schemaId, typeof schemaId === 'string' ? parseInt(schemaId, 10) : schemaId));
                         logger(`[Schema._setupLiveQuerySubscription] Initial query found ${initialModels.length} models`);
                         if (initialModels.length > 0) {
@@ -5742,4 +5853,4 @@ var Schema$1 = /*#__PURE__*/Object.freeze({
 });
 
 export { Schema, schemaInstanceState };
-//# sourceMappingURL=Schema-DeKabJ0T.js.map
+//# sourceMappingURL=Schema-ClTcpgbt.js.map