@seedprotocol/sdk 0.7.0 → 0.7.1

package/dist/{index-DtfjeuxC.js → index-Y-yYyRBf.js}

@@ -1,16 +1,32 @@
 import { fromCallback, fromPromise, setup, assign, createActor } from 'xstate';
-import { B as BaseDb, m as models, p as properties, K as isInternalSchema, i as modelSchemas, s as schemas } from './BasePathResolver-ndE8XTpw.js';
+import { B as BaseDb, j as models, p as properties, K as isInternalSchema, g as modelSchemas, s as schemas } from './BasePathResolver-DRT09oVv.js';
 import { eq, and, isNull, or } from 'drizzle-orm';
-import './tabEvents-DYI2GU7i.js';
+import './tabEvents-C6NXS6Jl.js';
 import debug from 'debug';
 import { generateId } from './generateId-BopUwD8F.js';
-import { G as writeModelToDb, K as writePropertyToDb, O as addSchemaToDb, A as AmbiguousModelError, Q as renameModelInDb, d as TProperty } from './db-BJZN0a0a.js';
-import { j as waitForEntityIdle, T as getInvariantSafePropertyDescriptor, m as findEntity, C as ClientManagerState, I as Item, U as clearDestroySubscriptions, n as forceRemoveFromCaches, V as unloadEntity, o as runDestroyLifecycle } from './Item-zBFWQDU9.js';
-import { h as getClient } from './ClientManager-DLleL_2e.js';
+import { G as writeModelToDb, K as writePropertyToDb, O as addSchemaToDb, A as AmbiguousModelError, Q as renameModelInDb, d as TProperty } from './db-Lw0KVZmc.js';
+import { j as waitForEntityIdle, T as getInvariantSafePropertyDescriptor, m as findEntity, C as ClientManagerState, I as Item, U as clearDestroySubscriptions, n as forceRemoveFromCaches, V as unloadEntity, o as runDestroyLifecycle } from './Item-ZUAmf943.js';
+import { h as getClient } from './ClientManager-DngaZdw6.js';
 import { modelPropertiesToObject } from './model-DGMe-TTm.js';
 import { toSnakeCase } from 'drizzle-orm/casing';
 import { Type } from '@sinclair/typebox';
 
+/**
+ * Common getters and utilities for entity classes
+ * These work with any entity that has a getService() method returning an XState actor
+ */
+/**
+ * Get the current state value from an entity's service
+ */
+/**
+ * Whether an actor has been stopped (unload, destroy, or Schema eviction). Async work started by an
+ * entity (DB lookups, retry timers) must check this before sending, since a stopped actor ignores
+ * events and XState warns about every one of them.
+ */
+function isActorStopped(actor) {
+    return actor.getSnapshot().status === 'stopped';
+}
+
 const logger$7 = debug('seedSdk:model:actors:loadOrCreateModel');
 /**
  * Create ModelProperty instances for all property IDs to ensure they're cached
@@ -22,7 +38,7 @@ const createPropertyInstances = async (propertyFileIds) => {
         return;
     }
     try {
-        const mod = await import('./ModelProperty-lth9L37R.js');
+        const mod = await import('./ModelProperty-6llK4MTH.js');
         const ModelProperty = mod?.ModelProperty ?? mod?.default;
         if (!ModelProperty) {
             logger$7('createPropertyInstances: ModelProperty not available from dynamic import');
@@ -53,7 +69,7 @@ const createPropertyInstances = async (propertyFileIds) => {
         // Don't throw - this is best-effort to pre-populate cache
     }
 };
-const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
+const loadOrCreateModel = fromCallback(({ sendBack, input: { context }, self }) => {
     const _loadOrCreateModel = async () => {
         const { modelName, schemaName, id, _idFromSchema } = context; // id is now the schemaFileId (string)
         if (!modelName || !schemaName) {
@@ -88,10 +104,10 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
                 if (!modelRecord) {
                     // Model names are only unique per schema: prefer this schema's row, and otherwise only
                     // consider same-name rows that no schema claims yet (never another schema's model).
-                    const _mod_0 = await import('./BasePathResolver-ndE8XTpw.js');
+                    const _mod_0 = await import('./BasePathResolver-DRT09oVv.js');
                     const _ns_0 = _mod_0.R;
                     const { modelSchemas } = _ns_0;
-                    const _mod_1 = await import('./BasePathResolver-ndE8XTpw.js');
+                    const _mod_1 = await import('./BasePathResolver-DRT09oVv.js');
                     const _ns_1 = _mod_1.Q;
                     const { schemas: schemasTable } = _ns_1;
                     let dbModels = await db
@@ -196,7 +212,9 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
                         .map((record) => record.schemaFileId)
                         .filter((id) => id !== null && id !== undefined);
                     if (propertyFileIds.length > 0) {
-                        await createPropertyInstances(propertyFileIds);
+                        // Not for a model stopped meanwhile (unloaded, or evicted with its schema)
+                        if (!isActorStopped(self))
+                            await createPropertyInstances(propertyFileIds);
                     }
                     // Generate schemaFileId if not set
                     if (!schemaFileId) {
@@ -237,10 +255,13 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
         // Step 2: Fallback to Schema context (only if database doesn't have the model)
         // This handles the case where model exists in schema file but not yet in database
         try {
-            const _mod_2 = await import('./Schema-DOhlrQ-N.js');
+            const _mod_2 = await import('./Schema-D-Ud-XYw.js');
             const _ns_2 = _mod_2.b;
             const schemaMod = _ns_2;
             const { Schema } = schemaMod;
+            // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+            if (isActorStopped(self))
+                return;
             const schema = Schema.create(schemaName, { waitForReady: false });
             const schemaSnapshot = schema.getService().getSnapshot();
             // Wait for schema to load if it's still loading
@@ -385,11 +406,11 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
                     }
                     // Also check database for models (in case they're persisted but not in Schema context)
                     if (db) {
-                        const _mod_3 = await import('./BasePathResolver-ndE8XTpw.js');
+                        const _mod_3 = await import('./BasePathResolver-DRT09oVv.js');
                         const _ns_3 = _mod_3.R;
                         const modelSchemaSchemaMod = _ns_3;
                         const { modelSchemas } = modelSchemaSchemaMod;
-                        const _mod_4 = await import('./BasePathResolver-ndE8XTpw.js');
+                        const _mod_4 = await import('./BasePathResolver-DRT09oVv.js');
                         const _ns_4 = _mod_4.Q;
                         const schemaSchemaMod = _ns_4;
                         const { schemas: schemasTable } = schemaSchemaMod;
@@ -485,12 +506,14 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
         }
         // Mark schema as draft when a new model is created so saveNewVersion() can persist it
         try {
-            const _mod_5 = await import('./Schema-DOhlrQ-N.js');
+            const _mod_5 = await import('./Schema-D-Ud-XYw.js');
             const _ns_5 = _mod_5.b;
             const schemaMod = _ns_5;
             const { Schema } = schemaMod;
-            const schema = Schema.create(schemaName, { waitForReady: false });
-            schema.getService().send({ type: 'markAsDraft', propertyKey: 'schema:models' });
+            if (!isActorStopped(self)) {
+                const schema = Schema.create(schemaName, { waitForReady: false });
+                schema.getService().send({ type: 'markAsDraft', propertyKey: 'schema:models' });
+            }
         }
         catch (err) {
             logger$7(`Failed to mark schema as draft after creating model: ${err}`);
@@ -511,7 +534,7 @@ const loadOrCreateModel = fromCallback(({ sendBack, input: { context } }) => {
 const logger$6 = debug('seedSdk:model:actors:validateModel');
 // Validation timeout in milliseconds (10 seconds)
 const VALIDATION_TIMEOUT_MS = 10000;
-const validateModel = fromCallback(({ sendBack, input: { context } }) => {
+const validateModel = fromCallback(({ sendBack, input: { context }, self }) => {
     let hasResponded = false;
     // Timeout handler to ensure we always respond
     const timeoutId = setTimeout(() => {
@@ -531,10 +554,10 @@ const validateModel = fromCallback(({ sendBack, input: { context } }) => {
     const _validateModel = async () => {
         try {
             // Use dynamic imports to break circular dependencies
-            const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+            const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
             const { SchemaValidationService } = validationServiceMod;
             const validationService = new SchemaValidationService();
-            const _mod_6 = await import('./Schema-DOhlrQ-N.js');
+            const _mod_6 = await import('./Schema-D-Ud-XYw.js');
             const _ns_6 = _mod_6.b;
             const schemaMod = _ns_6;
             const { Schema } = schemaMod;
@@ -551,6 +574,9 @@ const validateModel = fromCallback(({ sendBack, input: { context } }) => {
             // If we have schema name, validate against schema
             // CRITICAL: Use validateModelAgainstSchema which doesn't require the model to be in schema context
             // This allows validation BEFORE registration, preventing update loops
+            // Stopped meanwhile (unloaded, or evicted with its schema): don't load the schema again
+            if (isActorStopped(self))
+                return;
             if (context.schemaName) {
                 try {
                     const schema = Schema.create(context.schemaName, {
@@ -633,7 +659,11 @@ const validateModel = fromCallback(({ sendBack, input: { context } }) => {
 });
 
 const logger$5 = debug('seedSdk:model:actors:createModelProperties');
-const createModelProperties = fromCallback(({ sendBack, input }) => {
+const createModelProperties = fromCallback(({ sendBack, input, self }) => {
+    // The model was stopped (unloaded, or evicted with its schema by Schema.destroy / test cleanup) while
+    // this ran: stopping it stops this actor too, but can't cancel the awaits below. A stopped model
+    // creates no properties (they'd be cached for a model that's gone, and write rows under it).
+    const stopped = () => isActorStopped(self);
     const _createProperties = async () => {
         const { context, propertyDefinitions } = input;
         const { id, _dbId, modelName, schemaName } = context;
@@ -646,7 +676,7 @@ const createModelProperties = fromCallback(({ sendBack, input }) => {
             return;
         }
         logger$5(`Creating ${Object.keys(propertyDefinitions).length} properties for model "${modelName}" (id: ${_dbId})`);
-        const mod = await import('./ModelProperty-lth9L37R.js');
+        const mod = await import('./ModelProperty-6llK4MTH.js');
         const ModelProperty = mod?.ModelProperty ?? mod?.default;
         if (!ModelProperty) {
             logger$5('ModelProperty not available from dynamic import');
@@ -687,7 +717,7 @@ const createModelProperties = fromCallback(({ sendBack, input }) => {
                     }
                     else if (refModelName) {
                         // Fallback: resolve the ref by name within this model's schema
-                        const _mod_7 = await import('./db-BJZN0a0a.js');
+                        const _mod_7 = await import('./db-Lw0KVZmc.js');
                         const _ns_7 = _mod_7.Y;
                         const { resolveModelRecord } = _ns_7;
                         const refModelRecord = await resolveModelRecord(refModelName, { schemaName }, db);
@@ -702,6 +732,10 @@ const createModelProperties = fromCallback(({ sendBack, input }) => {
                     // Continue without refModelId - it will be resolved later in _initializeOriginalValues
                 }
             }
+            if (stopped()) {
+                logger$5(`Model "${modelName}" was stopped while creating its properties; not creating the rest`);
+                return;
+            }
             // Create ModelProperty instance
             // This will load from DB if it exists, or create new instance
             // The property should already be in DB from writeModelToDb
@@ -740,6 +774,37 @@ const createModelProperties = fromCallback(({ sendBack, input }) => {
     };
 });
 
+/**
+ * Eviction epochs: lets work that was started before a schema's Model/ModelProperty instances were
+ * evicted (Schema.destroy, test cleanup) tell, when it finishes, that it must not put instances for
+ * that schema back in the caches. Stopping the evicted actors can't cancel such work (a DB lookup
+ * that ends in Model.create, a model's property creation), and finishing it after the eviction would
+ * rebuild instances from rows that are about to be deleted, which then write themselves again.
+ *
+ * Capture `currentEvictionEpoch()` when the work starts; before creating or caching an instance, skip
+ * it when `schemaEvictedSince(schemaName, epoch)`. Work started after an eviction is unaffected.
+ */
+let epoch = 0;
+const lastEvictionBySchema = new Map();
+function currentEvictionEpoch() {
+    return epoch;
+}
+/** Called by Model.evictForSchema. */
+function recordSchemaEviction(schemaName) {
+    epoch += 1;
+    lastEvictionBySchema.set(schemaName, epoch);
+}
+/** True when the schema's instances were evicted after `since` (an epoch from currentEvictionEpoch). */
+function schemaEvictedSince(schemaName, since) {
+    if (epoch === since || !schemaName)
+        return false;
+    return (lastEvictionBySchema.get(schemaName) ?? 0) > since;
+}
+/** True when any schema was evicted after `since` (cheap check before looking up which schemas apply). */
+function anyEvictionSince(since) {
+    return epoch !== since;
+}
+
 const logger$4 = debug('seedSdk:write:validateEntity');
 // XState v5 type inference bug: fromPromise types are inverted
 // We use type assertion to work around this
@@ -747,6 +812,20 @@ const validateEntity = fromPromise(async ({ input }) => {
     // Type assertion to fix XState v5 type inference bug
     // Convert through unknown to avoid type overlap error
     const entityInput = input;
+    // Validation awaits imports before looking up the schema; the entity can be evicted with its
+    // schema meanwhile (Schema.destroy, test cleanup). Schema.create would then load the evicted
+    // schema again, and its load re-creates the schema's models from rows being deleted.
+    const evictionEpoch = currentEvictionEpoch();
+    /** The schema to validate against; throws (validation then skips the schema check) once it was evicted. */
+    const schemaForValidation = async (schemaName) => {
+        const _mod_8 = await import('./Schema-D-Ud-XYw.js');
+        const _ns_8 = _mod_8.b;
+        const { Schema } = _ns_8;
+        if (schemaEvictedSince(schemaName, evictionEpoch)) {
+            throw new Error(`Schema "${schemaName}" was evicted during validation`);
+        }
+        return Schema.create(schemaName, { waitForReady: false });
+    };
     const _validate = async () => {
         try {
             const msg = `[validateEntity] Starting validation for ${entityInput.entityType}`;
@@ -757,7 +836,7 @@ const validateEntity = fromPromise(async ({ input }) => {
                 const structureMsg = `[validateEntity] Validating model structure`;
                 logger$4(structureMsg);
                 // Use existing Model validation
-                const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+                const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
                 const { SchemaValidationService } = validationServiceMod;
                 const validationService = new SchemaValidationService();
                 // Validate model structure
@@ -775,13 +854,7 @@ const validateEntity = fromPromise(async ({ input }) => {
                     if (entityInput.entityData.schemaName) {
                         try {
                             logger$4(`[validateEntity] Validating model against schema "${entityInput.entityData.schemaName}"`);
-                            const _mod_8 = await import('./Schema-DOhlrQ-N.js');
-                            const _ns_8 = _mod_8.b;
-                            const schemaMod = _ns_8;
-                            const { Schema } = schemaMod;
-                            const schema = Schema.create(entityInput.entityData.schemaName, {
-                                waitForReady: false,
-                            });
+                            const schema = await schemaForValidation(entityInput.entityData.schemaName);
                             const schemaSnapshot = schema.getService().getSnapshot();
                             const schemaStatus = schemaSnapshot.value;
                             logger$4(`[validateEntity] Schema status: ${schemaStatus}`);
@@ -813,7 +886,7 @@ const validateEntity = fromPromise(async ({ input }) => {
             }
             else if (entityInput.entityType === 'modelProperty') {
                 // Use existing ModelProperty validation
-                const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+                const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
                 const { SchemaValidationService } = validationServiceMod;
                 const validationService = new SchemaValidationService();
                 // Validate property structure
@@ -828,13 +901,7 @@ const validateEntity = fromPromise(async ({ input }) => {
                     // If schema name and model name provided, validate against schema
                     if (entityInput.entityData._schemaName && entityInput.entityData.modelName) {
                         try {
-                            const _mod_9 = await import('./Schema-DOhlrQ-N.js');
-                            const _ns_9 = _mod_9.b;
-                            const schemaMod = _ns_9;
-                            const { Schema } = schemaMod;
-                            const schema = Schema.create(entityInput.entityData._schemaName, {
-                                waitForReady: false,
-                            });
+                            const schema = await schemaForValidation(entityInput.entityData._schemaName);
                             const schemaSnapshot = schema.getService().getSnapshot();
                             const schemaStatus = schemaSnapshot.value;
                             if (schemaStatus === 'idle') {
@@ -859,7 +926,7 @@ const validateEntity = fromPromise(async ({ input }) => {
             }
             else if (entityInput.entityType === 'schema') {
                 // Schema validation - use existing validation
-                const validationServiceMod = await import('./SchemaValidationService-DDKr5piy.js');
+                const validationServiceMod = await import('./SchemaValidationService-IoS7JquP.js');
                 const { SchemaValidationService } = validationServiceMod;
                 const validationService = new SchemaValidationService();
                 const schemaResult = validationService.validateSchema(entityInput.entityData);
@@ -948,7 +1015,7 @@ const writeToDatabase = fromCallback(({ sendBack, input }) => {
                 // initial write completes is not overwritten by the stale requestWrite payload.
                 let dataToWrite = input.entityData;
                 try {
-                    const mod = await import('./ModelProperty-lth9L37R.js');
+                    const mod = await import('./ModelProperty-6llK4MTH.js');
                     const ModelProperty = mod?.ModelProperty ?? mod?.default;
                     if (ModelProperty && typeof ModelProperty.getById === 'function') {
                         const instance = ModelProperty.getById(input.entityId);
@@ -1331,16 +1398,23 @@ const modelMachine = setup({
                     ({ context, event, self }) => {
                         if (event._liveQueryPropertyIds !== undefined) {
                             const newPropertyIds = event._liveQueryPropertyIds;
+                            // The model can be evicted with its schema (Schema.destroy, test cleanup) before the
+                            // timer and import below run: then create nothing, and drop lookups an eviction overtakes.
+                            const evictionEpoch = currentEvictionEpoch();
                             // Use setTimeout to check after assign has been applied
                             setTimeout(() => {
-                                self.getSnapshot();
+                                const snapshot = self.getSnapshot();
+                                if (snapshot.status === 'stopped')
+                                    return;
                                 // Create ModelProperty instances for any new property IDs
                                 if (Array.isArray(newPropertyIds) && newPropertyIds.length > 0) {
                                     // Import and create instances asynchronously (fire-and-forget)
-                                    import('./ModelProperty-lth9L37R.js').then(({ ModelProperty }) => {
+                                    import('./ModelProperty-6llK4MTH.js').then(({ ModelProperty }) => {
+                                        if (self.getSnapshot().status === 'stopped')
+                                            return;
                                         const createPromises = newPropertyIds.map(async (propertyFileId) => {
                                             try {
-                                                const property = await ModelProperty.createById(propertyFileId);
+                                                const property = await ModelProperty.createById(propertyFileId, { evictionEpoch });
                                                 if (property) {
                                                     logger$1(`[modelMachine] Created/cached ModelProperty instance for propertyFileId "${propertyFileId}" after _liveQueryPropertyIds update`);
                                                 }
@@ -1638,22 +1712,6 @@ class ConflictError extends Error {
     }
 }
 
-/**
- * Common getters and utilities for entity classes
- * These work with any entity that has a getService() method returning an XState actor
- */
-/**
- * Get the current state value from an entity's service
- */
-/**
- * Whether an actor has been stopped (unload, destroy, or Schema eviction). Async work started by an
- * entity (DB lookups, retry timers) must check this before sending, since a stopped actor ignores
- * events and XState warns about every one of them.
- */
-function isActorStopped(actor) {
-    return actor.getSnapshot().status === 'stopped';
-}
-
 /**
  * Set up liveQuery subscription for an entity
  * This enables cross-instance synchronization (e.g., changes in other tabs/windows)
@@ -1679,7 +1737,10 @@ function setupEntityLiveQuery(instance, config) {
                 const initialIds = config.extractEntityIds(initialRows);
                 if (initialIds.length > 0) {
                     logger(`Initial query returned ${initialIds.length} entities`);
-                    // Create child instances if provided
+                    // Create child instances if provided (not for a stopped entity: an unloaded or evicted
+                    // parent must not re-cache its children)
+                    if (isActorStopped(instance.getService()))
+                        return;
                     if (config.createChildInstances) {
                         await config.createChildInstances(initialIds);
                     }
@@ -1710,7 +1771,9 @@ function setupEntityLiveQuery(instance, config) {
                         }
                         logger(`Query returned ${rows.length} rows`);
                         const ids = config.extractEntityIds(rows);
-                        // Create child instances if provided (before updating context)
+                        // Create child instances if provided (before updating context; not for a stopped entity)
+                        if (isActorStopped(instance.getService()))
+                            return;
                         if (config.createChildInstances && ids.length > 0) {
                             await config.createChildInstances(ids);
                         }
@@ -1851,7 +1914,7 @@ const saveDraftLogger = debug('seedSdk:model:saveDraftToDb');
 // Lazy import cache for ModelProperty to avoid circular dependency
 // Eagerly start loading to minimize delay on first access
 let ModelPropertyClass = null;
-const modelPropertyImportPromise = import('./ModelProperty-lth9L37R.js')
+const modelPropertyImportPromise = import('./ModelProperty-6llK4MTH.js')
     .then(module => {
     ModelPropertyClass = module.ModelProperty;
     return ModelPropertyClass;
@@ -1867,7 +1930,7 @@ function getModelProperty() {
     return ModelPropertyClass;
 }
 // Lazy import for Schema to avoid circular dependency
-const schemaImportPromise = (async () => { const _mod_12 = await import('./Schema-DOhlrQ-N.js'); return _mod_12.b; })()
+const schemaImportPromise = (async () => { const _mod_11 = await import('./Schema-D-Ud-XYw.js'); return _mod_11.b; })()
     .then(module => module.Schema)
     .catch(() => null);
 // WeakMap to store mutable state per Model instance
@@ -2365,6 +2428,9 @@ class Model {
                             resolve();
                         }, 10000);
                     });
+                    // Unloaded or evicted (e.g. Schema.destroy) while it loaded: a stopped model never writes
+                    if (isActorStopped(proxiedInstance._service))
+                        return;
                     // Only write if validation passed (model is in idle state, not error)
                     const finalSnapshot = proxiedInstance._service.getSnapshot();
                     if (finalSnapshot.value === 'idle' && (!finalSnapshot.context._validationErrors || finalSnapshot.context._validationErrors.length === 0)) {
@@ -2488,8 +2554,8 @@ class Model {
                                 }
                                 logger(`WARNING: Could not verify schema exists in database: ${error}. Proceeding anyway.`);
                             }
-                            // Track pending write
-                            Model.trackPendingWrite(finalSnapshot.context.id, schemaId); // id is now the schemaFileId (string)
+                            const pendingModelFileId = finalSnapshot.context.id;
+                            const pendingSchemaId = schemaId;
                             // Wait for writeProcess to be spawned (it's spawned in idle state entry action)
                             // Retry a few times if writeProcess isn't available yet
                             let retries = 0;
@@ -2500,6 +2566,8 @@ class Model {
                                     return;
                                 const currentSnapshot = proxiedInstance._service.getSnapshot();
                                 if (currentSnapshot.context.writeProcess) {
+                                    // Track pending write (only once it really starts: a stopped model leaves none behind)
+                                    Model.trackPendingWrite(pendingModelFileId, pendingSchemaId); // id is now the schemaFileId (string)
                                     logger(`Triggering write process for model "${finalSnapshot.context.modelName}" (schemaId: ${schemaId})`);
                                     // Use pending property definitions if available, otherwise convert from ModelProperty instances
                                     let propertiesObject = {};
@@ -2720,6 +2788,7 @@ class Model {
         if (scope.modelFileId || scope.schemaName) {
             const db = BaseDb.getAppDb();
             if (db) {
+                const evictionEpoch = currentEvictionEpoch();
                 try {
                     const rows = await db
                         .select({
@@ -2736,6 +2805,9 @@ class Model {
                         .limit(1);
                     const record = rows[0];
                     if (record?.modelName && record.schemaName && record.modelFileId) {
+                        // Its schema was evicted while we read the row: don't bring the model back.
+                        if (schemaEvictedSince(record.schemaName, evictionEpoch))
+                            return undefined;
                         return this.create(record.modelName, record.schemaName, { id: record.modelFileId });
                     }
                 }
@@ -2754,7 +2826,7 @@ class Model {
      * @param schemaName - Optional schema name (will query DB if not provided)
      * @returns The Model instance if found, undefined otherwise
      */
-    static async getByNameAsync(modelName, schemaName) {
+    static async getByNameAsync(modelName, schemaName, options) {
         // First try cache
         const cached = this.getByName(modelName, schemaName);
         if (cached) {
@@ -2766,11 +2838,12 @@ class Model {
             if (!db) {
                 return undefined;
             }
+            const evictionEpoch = options?.evictionEpoch ?? currentEvictionEpoch();
             try {
                 // Query model by name (throws AmbiguousModelError when several schemas define it)
-                const _mod_10 = await import('./db-BJZN0a0a.js');
-                const _ns_10 = _mod_10.Y;
-                const { resolveModelRecord } = _ns_10;
+                const _mod_9 = await import('./db-Lw0KVZmc.js');
+                const _ns_9 = _mod_9.Y;
+                const { resolveModelRecord } = _ns_9;
                 const resolved = await resolveModelRecord(modelName, {}, db);
                 if (!resolved?.schemaFileId) {
                     return undefined;
@@ -2793,6 +2866,10 @@ class Model {
                 if (!record.modelName || !record.schemaName || !record.modelFileId) {
                     return undefined;
                 }
+                // Its schema was evicted while we read the row: don't bring the model back.
+                if (schemaEvictedSince(record.schemaName, evictionEpoch)) {
+                    return undefined;
+                }
                 // Create model instance (will be cached)
                 return this.create(record.modelName, record.schemaName, {
                     id: record.modelFileId, // id is now the schemaFileId (string)
@@ -2814,7 +2891,7 @@ class Model {
      * @param modelFileId - The model file ID to look up
      * @returns The Model instance if found, undefined otherwise
      */
-    static async createById(modelFileId) {
+    static async createById(modelFileId, options) {
         if (!modelFileId) {
             return undefined;
         }
@@ -2830,6 +2907,7 @@ class Model {
             logger(`Model.createById: Database not available for ID "${modelFileId}"`);
             return undefined;
         }
+        const evictionEpoch = options?.evictionEpoch ?? currentEvictionEpoch();
         try {
             // Query model by schemaFileId and join to get schema name
             const modelRecords = await db
@@ -2852,6 +2930,12 @@ class Model {
                 logger(`Model.createById: Missing modelName or schemaName for ID "${modelFileId}"`);
                 return undefined;
             }
+            // Its schema was evicted while we read the row (e.g. a Schema live query in flight during
+            // Schema.destroy or test cleanup): don't bring the model back.
+            if (schemaEvictedSince(schemaName, evictionEpoch)) {
+                logger(`Model.createById: schema "${schemaName}" was evicted during the lookup of "${modelFileId}"`);
+                return undefined;
+            }
             // Step 3: Create model using existing create method (which will handle caching)
             logger(`Model.createById: Creating model "${modelName}" in schema "${schemaName}" from ID "${modelFileId}"`);
             return this.create(modelName, schemaName, {
@@ -2906,6 +2990,7 @@ class Model {
             logger(`Model.createBySchemaId: Database not available for schema "${schemaIdentifier}"`);
             return [];
         }
+        const evictionEpoch = currentEvictionEpoch();
         try {
             // Query all models for this schema - support both schemaFileId and schema name
             const modelRecords = await db
@@ -2928,6 +3013,10 @@ class Model {
                 if (!record.modelName || !record.schemaName || !record.modelFileId) {
                     continue;
                 }
+                // Its schema was evicted while we read the rows: don't bring its models back.
+                if (schemaEvictedSince(record.schemaName, evictionEpoch)) {
+                    continue;
+                }
                 // Check cache first
                 const cached = this.getById(record.modelFileId);
                 if (cached) {
@@ -3374,6 +3463,8 @@ class Model {
      * @returns names of the evicted models (so callers can evict their ModelProperty instances)
      */
     static evictForSchema(schemaName) {
+        // Work already running for this schema's models must not re-cache them when it finishes.
+        recordSchemaEviction(schemaName);
         const instances = new Set();
         for (const { instance } of this.instanceCacheById.values())
             instances.add(instance);
@@ -3526,9 +3617,9 @@ class Model {
                             return undefined;
                         }
                         // Model names are only unique per schema: find this model's row by its id (schemaFileId).
-                        const _mod_11 = await import('./db-BJZN0a0a.js');
-                        const _ns_11 = _mod_11.Y;
-                        const { resolveModelRecord } = _ns_11;
+                        const _mod_10 = await import('./db-Lw0KVZmc.js');
+                        const _ns_10 = _mod_10.Y;
+                        const { resolveModelRecord } = _ns_10;
                         const modelRecord = await resolveModelRecord(modelName, { modelFileId: context.id, schemaName: context.schemaName }, db);
                         if (!modelRecord?.id) {
                             return undefined;
@@ -3731,5 +3822,5 @@ var Model$1 = /*#__PURE__*/Object.freeze({
 const TModelValues = Type.Record(Type.String(), Type.Any());
 const TModelSchema = Type.Record(Type.String(), TProperty);
 
-export { ConflictError as C, Model as M, TModelSchema as T, TModelValues as a, writeToDatabase$1 as b, Model$1 as c, isActorStopped as i, setupEntityLiveQuery as s, writeProcessMachine as w };
-//# sourceMappingURL=index-DtfjeuxC.js.map
+export { ConflictError as C, Model as M, TModelSchema as T, TModelValues as a, anyEvictionSince as b, currentEvictionEpoch as c, setupEntityLiveQuery as d, writeToDatabase$1 as e, Model$1 as f, isActorStopped as i, schemaEvictedSince as s, writeProcessMachine as w };
+//# sourceMappingURL=index-Y-yYyRBf.js.map