@lix-js/sdk 0.5.0-preview.0 → 0.5.0-preview.1

package/dist/state/schema.js

@@ -1,8 +1,42 @@
 import { validateStateMutation } from "./validate-state-mutation.js";
-import { handleStateMutation } from "./handle-state-mutation.js";
-import { createLixOwnLogSync } from "../log/create-lix-own-log.js";
-import { createChangesetForTransaction } from "./create-changeset-for-transaction.js";
+import { sql } from "kysely";
+import { insertTransactionState } from "./insert-transaction-state.js";
+import { executeSync } from "../database/execute-sync.js";
+import { applyMaterializeStateSchema } from "./materialize-state.js";
+import { applyResolvedStateView } from "./resolved-state-view.js";
+import { applyStateCacheSchema } from "./cache/schema.js";
+import { isStaleStateCache } from "./cache/is-stale-state-cache.js";
+import { markStateCacheAsFresh } from "./cache/mark-state-cache-as-stale.js";
+import { applyUntrackedStateSchema } from "./untracked/schema.js";
+import { commit } from "./commit.js";
+import { parseStatePk, serializeStatePk } from "./primary-key.js";
+import { uuidV7 } from "../deterministic/uuid-v7.js";
+import { LixLogSchema } from "../log/schema.js";
+import { shouldLog } from "../log/create-lix-own-log.js";
+import { populateStateCache } from "./cache/populate-state-cache.js";
+// import { createLixOwnLogSync } from "../log/create-lix-own-log.js";
+// Virtual table schema definition
+const VTAB_CREATE_SQL = `CREATE TABLE x(
+	_pk HIDDEN TEXT NOT NULL PRIMARY KEY,
+	entity_id TEXT,
+	schema_key TEXT,
+	file_id TEXT,
+	version_id TEXT,
+	plugin_key TEXT,
+	snapshot_content TEXT,
+	schema_version TEXT,
+	created_at TEXT,
+	updated_at TEXT,
+	inherited_from_version_id TEXT,
+	change_id TEXT,
+	untracked INTEGER,
+	commit_id TEXT
+) WITHOUT ROWID;`;
 export function applyStateDatabaseSchema(sqlite, db, hooks) {
+    applyMaterializeStateSchema(sqlite);
+    applyStateCacheSchema({ sqlite });
+    applyUntrackedStateSchema({ sqlite });
+    applyResolvedStateView({ sqlite, db });
     sqlite.createFunction({
         name: "validate_snapshot_content",
         deterministic: true,
@@ -24,196 +58,72 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
     const module = new capi.sqlite3_module();
     // Store cursor state
     const cursorStates = new Map();
-    // Cache initialization state to avoid repeated table existence checks
-    let loggingInitialized = null;
-    const canLog = () => {
-        if (loggingInitialized === null) {
-            try {
-                const tableExists = sqlite.exec({
-                    sql: "SELECT 1 FROM sqlite_master WHERE type='table' AND name='key_value'",
-                    returnValue: "resultRows",
-                });
-                loggingInitialized = tableExists && tableExists.length > 0;
-            }
-            catch {
-                loggingInitialized = false;
-            }
-        }
-        return loggingInitialized;
-    };
-    const create_temp_change_table_sql = `
-  -- add a table we use within the transaction
-  CREATE TEMP TABLE IF NOT EXISTS internal_change_in_transaction (
-    id TEXT PRIMARY KEY DEFAULT (uuid_v7()),
-    entity_id TEXT NOT NULL,
-    schema_key TEXT NOT NULL,
-    schema_version TEXT NOT NULL,
-    file_id TEXT NOT NULL,
-    plugin_key TEXT NOT NULL,
-	  version_id TEXT NOT NULL,
-    snapshot_content BLOB,
-    created_at TEXT DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL CHECK (created_at LIKE '%Z'),
-	--- NOTE schena_key must be unique per entity_id and file_id
-	UNIQUE(entity_id, file_id, schema_key, version_id)
-  ) STRICT;
-
-`;
-    sqlite.exec(create_temp_change_table_sql);
+    // Guard flag to prevent recursion when logging
+    let loggingIsInProgress = false;
+    /**
+     * Flag to prevent recursion when updating cache state.
+     *
+     * The guard ensures that while we're marking cache as fresh, any nested state queries
+     * bypass the cache and use materialized state directly, preventing recursion.
+     *
+     * Why is this needed is unclear. Queries are executed in sync. Why concurrent
+     * reads simultaneously update the cache is not clear. Given that state
+     * materialization is rare, this workaround has been deemed sufficient.
+     *
+     * This is a temporary fix and should be revisited in the future.
+     */
+    let isUpdatingCacheState = false;
     module.installMethods({
-        xCreate: (db, _pAux, _argc, _argv, pVTab) => {
-            const sql = `CREATE TABLE x(
-				entity_id TEXT,
-				schema_key TEXT,
-				file_id TEXT,
-				version_id TEXT,
-				plugin_key TEXT,
-				snapshot_content TEXT,
-				schema_version TEXT,
-				created_at TEXT,
-				updated_at TEXT,
-				inherited_from_version_id TEXT,
-				change_id TEXT,
-				untracked INTEGER
-			)`;
-            const result = capi.sqlite3_declare_vtab(db, sql);
+        xCreate: (dbHandle, _pAux, _argc, _argv, pVTab) => {
+            const result = capi.sqlite3_declare_vtab(dbHandle, VTAB_CREATE_SQL);
             if (result !== capi.SQLITE_OK) {
                 return result;
             }
             sqlite.sqlite3.vtab.xVtab.create(pVTab);
             return capi.SQLITE_OK;
         },
-        xConnect: (db, _pAux, _argc, _argv, pVTab) => {
-            const sql = `CREATE TABLE x(
-				entity_id TEXT,
-				schema_key TEXT,
-				file_id TEXT,
-				version_id TEXT,
-				plugin_key TEXT,
-				snapshot_content TEXT,
-				schema_version TEXT,
-				created_at TEXT,
-				updated_at TEXT,
-				inherited_from_version_id TEXT,
-				change_id TEXT,
-				untracked INTEGER
-			)`;
-            const result = capi.sqlite3_declare_vtab(db, sql);
+        xConnect: (dbHandle, _pAux, _argc, _argv, pVTab) => {
+            const result = capi.sqlite3_declare_vtab(dbHandle, VTAB_CREATE_SQL);
             if (result !== capi.SQLITE_OK) {
                 return result;
             }
+            // wiping all rows on connect simulates a temp table for internal_change_in_transaction.
+            // we need to clear any existing changes on connect in case a transaction remained open.
+            // otherwise, the lix can't boot up properly and will throw an error.
+            //
+            // an open transaction can happen if the storage layer crashes or is not properly shut down.
+            //
+            // PS internal_change_in_transaction is not a temp table because sqlite
+            // prohibits access to temp tables from virtual tables
+            executeSync({
+                lix: { sqlite },
+                query: db.deleteFrom("internal_change_in_transaction"),
+            });
             sqlite.sqlite3.vtab.xVtab.create(pVTab);
             return capi.SQLITE_OK;
         },
         xBegin: () => {
-            // assert that we are not already in a transaction (the internal_change_in_transaction table is empty)
-            if (sqlite.exec({
-                sql: "SELECT * FROM internal_change_in_transaction",
-                returnValue: "resultRows",
-            }).length > 0) {
-                const errorMessage = "Transaction already in progress";
-                if (canLog()) {
-                    createLixOwnLogSync({
-                        lix: { sqlite, db: db },
-                        key: "lix_state_xbegin_error",
-                        level: "error",
-                        message: `xBegin error: ${errorMessage}`,
-                    });
-                }
-                throw new Error(errorMessage);
-            }
+            // TODO comment in after all internal v-table logic uses underlying state view
+            // // assert that we are not already in a transaction (the internal_change_in_transaction table is empty)
+            // const existingChangesInTransaction = executeSync({
+            // 	lix: { sqlite },
+            // 	query: db.selectFrom("internal_change_in_transaction").selectAll(),
+            // });
+            // if (existingChangesInTransaction.length > 0) {
+            // 	const errorMessage = "Transaction already in progress";
+            // 	if (canLog()) {
+            // 		createLixOwnLogSync({
+            // 			lix: { sqlite, db: db as any },
+            // 			key: "lix_state_xbegin_error",
+            // 			level: "error",
+            // 			message: `xBegin error: ${errorMessage}`,
+            // 		});
+            // 	}
+            // 	throw new Error(errorMessage);
+            // }
         },
         xCommit: () => {
-            const currentTime = new Date().toISOString();
-            // Insert each row from internal_change_in_transaction into internal_snapshot and internal_change,
-            // using the same id for snapshot_id in internal_change as in internal_snapshot.
-            const changesWithoutChangeSets = sqlite.exec({
-                sql: `
-						SELECT 
-							id, 
-							entity_id, 
-							schema_key, 
-							schema_version, 
-							file_id, 
-							plugin_key, 
-							version_id, 
-							CASE 
-								WHEN snapshot_content IS NOT NULL THEN json(snapshot_content) 
-								ELSE NULL 
-							END as snapshot_content, 
-							created_at 
-						FROM internal_change_in_transaction 
-						ORDER BY version_id
-					`,
-                returnValue: "resultRows",
-            });
-            // Group changes by version_id
-            const changesByVersion = new Map();
-            for (const changeWithoutChangeset of changesWithoutChangeSets) {
-                const version_id = changeWithoutChangeset[6];
-                if (!changesByVersion.has(version_id)) {
-                    changesByVersion.set(version_id, []);
-                }
-                changesByVersion.get(version_id).push({
-                    id: changeWithoutChangeset[0],
-                    entity_id: changeWithoutChangeset[1],
-                    schema_key: changeWithoutChangeset[2],
-                    schema_version: changeWithoutChangeset[3],
-                    file_id: changeWithoutChangeset[4],
-                    plugin_key: changeWithoutChangeset[5],
-                    snapshot_content: changeWithoutChangeset[7],
-                    created_at: changeWithoutChangeset[8],
-                });
-            }
-            // Process each version's changes to create changesets
-            for (const [version_id, versionChanges] of changesByVersion) {
-                // Create changeset and edges for this version's transaction
-                createChangesetForTransaction(sqlite, db, currentTime, version_id, versionChanges);
-            }
-            const changesToRealize = sqlite.exec({
-                sql: "SELECT id, entity_id, schema_key, schema_version, file_id, plugin_key, version_id, snapshot_content, created_at FROM internal_change_in_transaction ORDER BY version_id",
-                returnValue: "resultRows",
-            });
-            for (const changeToRealize of changesToRealize) {
-                const [id, entity_id, schema_key, schema_version, file_id, plugin_key, 
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                version_id, snapshot_content, created_at,] = changeToRealize;
-                let snapshot_id = "no-content";
-                if (snapshot_content) {
-                    // Insert into internal_snapshot
-                    const result = sqlite.exec({
-                        sql: `INSERT OR IGNORE INTO internal_snapshot (content) VALUES (?) RETURNING id`,
-                        bind: [snapshot_content],
-                        returnValue: "resultRows",
-                    });
-                    // Get the 'id' column of the newly created row
-                    if (result && result.length > 0) {
-                        snapshot_id = result[0][0]; // assuming 'id' is the first column
-                    }
-                }
-                // Insert into internal_change
-                sqlite.exec({
-                    sql: `INSERT INTO internal_change (id, entity_id, schema_key, schema_version, file_id, plugin_key, snapshot_id, created_at)
-							   VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-                    bind: [
-                        id,
-                        entity_id,
-                        schema_key,
-                        schema_version,
-                        file_id,
-                        plugin_key,
-                        snapshot_id,
-                        created_at,
-                    ],
-                    returnValue: "resultRows",
-                });
-            }
-            sqlite.exec({
-                sql: "DELETE FROM internal_change_in_transaction",
-                returnValue: "resultRows",
-            });
-            // Emit state commit hook after transaction is successfully committed
-            hooks._emit("state_commit");
-            return capi.SQLITE_OK;
+            return commit({ lix: { sqlite, db: db, hooks } });
         },
         xRollback: () => {
             sqlite.exec({
@@ -221,7 +131,70 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
                 returnValue: "resultRows",
             });
         },
-        xBestIndex: () => {
+        xBestIndex: (pVTab, pIdxInfo) => {
+            const idxInfo = sqlite.sqlite3.vtab.xIndexInfo(pIdxInfo);
+            // Track which columns have equality constraints
+            const usableConstraints = [];
+            let argIndex = 0;
+            // Column mapping (matching the CREATE TABLE order in xCreate/xConnect)
+            const columnMap = [
+                "_pk", // 0 (HIDDEN column)
+                "entity_id", // 1
+                "schema_key", // 2
+                "file_id", // 3
+                "version_id", // 4
+                "plugin_key", // 5
+                "snapshot_content", // 6
+                "schema_version", // 7
+                "created_at", // 8
+                "updated_at", // 9
+                "inherited_from_version_id", // 10
+                "change_id", // 11
+                "untracked", // 12
+                "commit_id", // 13
+            ];
+            // Process constraints
+            // @ts-expect-error - idxInfo.$nConstraint is not defined in the type
+            for (let i = 0; i < idxInfo.$nConstraint; i++) {
+                // @ts-expect-error - idxInfo.nthConstraint is not defined in the type
+                const constraint = idxInfo.nthConstraint(i);
+                // Only handle equality constraints that are usable
+                if (constraint.$op === capi.SQLITE_INDEX_CONSTRAINT_EQ &&
+                    constraint.$usable) {
+                    const columnName = columnMap[constraint.$iColumn];
+                    if (columnName) {
+                        usableConstraints.push(columnName);
+                        // Mark this constraint as used
+                        // @ts-expect-error - idxInfo.nthConstraintUsage is not defined in the type
+                        idxInfo.nthConstraintUsage(i).$argvIndex = ++argIndex;
+                    }
+                }
+            }
+            const fullTableCost = 1000000; // Default cost for full table scan
+            const fullTableRows = 10000000;
+            // Set the index string to pass column names to xFilter
+            if (usableConstraints.length > 0) {
+                const idxStr = usableConstraints.join(",");
+                // @ts-expect-error - idxInfo.$idxStr is not defined in the type
+                idxInfo.$idxStr = sqlite.sqlite3.wasm.allocCString(idxStr, false);
+                // @ts-expect-error - idxInfo.$needToFreeIdxStr is not defined in the type
+                idxInfo.$needToFreeIdxStr = 1; // We don't need SQLite to free this string
+                // Lower cost when we can use filters (more selective)
+                // @ts-expect-error - idxInfo.$estimatedCost is not defined in the type
+                idxInfo.$estimatedCost =
+                    fullTableCost / (usableConstraints.length + 1);
+                // @ts-expect-error - idxInfo.$estimatedRows is not defined in the type
+                idxInfo.$estimatedRows = Math.ceil(fullTableRows / (usableConstraints.length + 1));
+            }
+            else {
+                // @ts-expect-error - idxInfo.$needToFreeIdxStr is not defined in the type
+                idxInfo.$needToFreeIdxStr = 0;
+                // Higher cost for full table scan
+                // @ts-expect-error - idxInfo.$estimatedCost is not defined in the type
+                idxInfo.$estimatedCost = fullTableCost;
+                // @ts-expect-error - idxInfo.$estimatedRows is not defined in the type
+                idxInfo.$estimatedRows = fullTableRows;
+            }
             return capi.SQLITE_OK;
         },
         xDisconnect: () => {
@@ -242,235 +215,115 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
             cursorStates.delete(pCursor);
             return capi.SQLITE_OK;
         },
-        xFilter: (pCursor) => {
+        xFilter: (pCursor, idxNum, idxStrPtr, argc, argv) => {
             const cursorState = cursorStates.get(pCursor);
-            // Try cache first - UNION with priority: untracked > tracked > inherited
-            const cacheResults = sqlite.exec({
-                sql: `
-						-- 1. Untracked state (highest priority)
-						SELECT entity_id, schema_key, file_id, version_id, plugin_key,
-							   snapshot_content, schema_version, created_at, updated_at,
-							   NULL as inherited_from_version_id, 'untracked' as change_id, 1 as untracked
-						FROM internal_state_all_untracked
-						
-						UNION ALL
-						
-						-- 2. Tracked state (second priority) - only if no untracked exists
-						SELECT entity_id, schema_key, file_id, version_id, plugin_key, 
-							   snapshot_content, schema_version, created_at, updated_at,
-							   inherited_from_version_id, change_id, 0 as untracked
-						FROM internal_state_cache
-						WHERE inheritance_delete_marker = 0  -- Hide copy-on-write deletions
-						AND NOT EXISTS (
-							SELECT 1 FROM internal_state_all_untracked unt
-							WHERE unt.entity_id = internal_state_cache.entity_id
-							  AND unt.schema_key = internal_state_cache.schema_key
-							  AND unt.file_id = internal_state_cache.file_id
-							  AND unt.version_id = internal_state_cache.version_id
-						)
-						
-						UNION ALL
-						
-						-- 3. Inherited state (lowest priority) - only if no untracked or tracked exists
-						SELECT isc.entity_id, isc.schema_key, isc.file_id, 
-							   vi.version_id, -- Return child version_id
-							   isc.plugin_key, isc.snapshot_content, isc.schema_version, 
-							   isc.created_at, isc.updated_at,
-							   vi.parent_version_id as inherited_from_version_id, isc.change_id, 0 as untracked
-						FROM (
-							-- Get version inheritance relationships from cache
-							SELECT 
-								json_extract(isc_v.snapshot_content, '$.id') AS version_id,
-								json_extract(isc_v.snapshot_content, '$.inherits_from_version_id') AS parent_version_id
-							FROM internal_state_cache isc_v
-							WHERE isc_v.schema_key = 'lix_version'
-						) vi
-						JOIN internal_state_cache isc ON isc.version_id = vi.parent_version_id
-						WHERE vi.parent_version_id IS NOT NULL
-						-- Only inherit entities that exist (not deleted) in parent
-						AND isc.inheritance_delete_marker = 0
-						-- Don't inherit if child has tracked state
-						AND NOT EXISTS (
-							SELECT 1 FROM internal_state_cache child_isc
-							WHERE child_isc.version_id = vi.version_id
-							  AND child_isc.entity_id = isc.entity_id
-							  AND child_isc.schema_key = isc.schema_key
-							  AND child_isc.file_id = isc.file_id
-						)
-						-- Don't inherit if child has untracked state
-						AND NOT EXISTS (
-							SELECT 1 FROM internal_state_all_untracked unt
-							WHERE unt.version_id = vi.version_id
-							  AND unt.entity_id = isc.entity_id
-							  AND unt.schema_key = isc.schema_key
-							  AND unt.file_id = isc.file_id
-						)
-					`,
-                returnValue: "resultRows",
-            });
-            cursorState.results = cacheResults || [];
-            cursorState.rowIndex = 0;
-            // Cache miss - populate cache with actual recursive state query
-            if (cursorState.results.length === 0) {
-                if (canLog()) {
-                    createLixOwnLogSync({
-                        lix: { sqlite, db: db },
-                        key: "lix_state_cache_miss",
-                        level: "debug",
-                        message: `Cache miss detected - materializing state from CTE`,
-                    });
-                }
-                // Run the expensive recursive CTE to materialize state
-                // Include deletions when populating cache so inheritance blocking works
-                const stateResults = selectStateViaCTE(sqlite, {}, true);
-                // Populate cache with materialized state results
-                if (stateResults && stateResults.length > 0) {
-                    let cachePopulated = false;
-                    for (const row of stateResults) {
-                        // CTE returns rows as arrays, so access by index
-                        const entity_id = Array.isArray(row) ? row[0] : row.entity_id;
-                        const schema_key = Array.isArray(row) ? row[1] : row.schema_key;
-                        const file_id = Array.isArray(row) ? row[2] : row.file_id;
-                        const plugin_key = Array.isArray(row) ? row[3] : row.plugin_key;
-                        const snapshot_content = Array.isArray(row)
-                            ? row[4]
-                            : row.snapshot_content;
-                        const schema_version = Array.isArray(row)
-                            ? row[5]
-                            : row.schema_version;
-                        const version_id = Array.isArray(row) ? row[6] : row.version_id;
-                        const created_at = Array.isArray(row) ? row[7] : row.created_at;
-                        const updated_at = Array.isArray(row) ? row[8] : row.updated_at;
-                        const inherited_from_version_id = Array.isArray(row)
-                            ? row[9]
-                            : row.inherited_from_version_id;
-                        const change_id = Array.isArray(row) ? row[10] : row.change_id;
-                        // Skip rows with null entity_id (no actual state data found)
-                        if (!entity_id) {
-                            continue;
-                        }
-                        const isDeletion = snapshot_content === null;
-                        // TODO the CTE should not return inherited entities (optimization for later)
-                        // Skip inherited entities - they should be resolved via inheritance logic, not stored as duplicates
-                        if (inherited_from_version_id !== null &&
-                            inherited_from_version_id !== undefined) {
-                            continue;
+            const idxStr = sqlite.sqlite3.wasm.cstrToJs(idxStrPtr);
+            // Debug: Track recursion depth
+            const recursionKey = "_vtab_recursion_depth";
+            // @ts-expect-error - using global for debugging
+            const currentDepth = (globalThis[recursionKey] || 0) + 1;
+            // @ts-expect-error - using global for debugging
+            globalThis[recursionKey] = currentDepth;
+            if (currentDepth > 10) {
+                // @ts-expect-error - using global for debugging
+                globalThis[recursionKey] = 0; // Reset
+                throw new Error(`Virtual table recursion depth exceeded: ${currentDepth}`);
+            }
+            try {
+                // Extract filter arguments if provided
+                const filters = {};
+                if (argc > 0 && argv) {
+                    const args = sqlite.sqlite3.capi.sqlite3_values_to_js(argc, argv);
+                    // Parse idxStr to understand which columns are being filtered
+                    // idxStr format: "column1,column2,..."
+                    if (idxStr) {
+                        const columns = idxStr.split(",").filter((c) => c.length > 0);
+                        for (let i = 0; i < Math.min(columns.length, args.length); i++) {
+                            if (args[i] !== null) {
+                                filters[columns[i]] = args[i]; // Keep original type
+                            }
                         }
-                        sqlite.exec({
-                            sql: `INSERT OR REPLACE INTO internal_state_cache 
-									  (entity_id, schema_key, file_id, version_id, plugin_key, snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, inheritance_delete_marker, change_id)
-									  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-                            bind: [
-                                entity_id,
-                                schema_key,
-                                file_id,
-                                version_id,
-                                plugin_key,
-                                isDeletion
-                                    ? null
-                                    : typeof snapshot_content === "string"
-                                        ? snapshot_content
-                                        : JSON.stringify(snapshot_content),
-                                schema_version,
-                                created_at,
-                                updated_at,
-                                inherited_from_version_id === null ||
-                                    inherited_from_version_id === undefined
-                                    ? null
-                                    : inherited_from_version_id,
-                                isDeletion ? 1 : 0,
-                                change_id || "unknown-change-id",
-                            ],
-                        });
-                        cachePopulated = true;
                     }
-                    if (cachePopulated && canLog()) {
-                        createLixOwnLogSync({
-                            lix: { sqlite, db: db },
-                            key: "lix_state_cache_populated",
-                            level: "debug",
-                            message: `Cache populated with ${stateResults?.length || 0} rows from CTE`,
-                        });
+                }
+                // If we're updating cache state, we must use resolved state view directly to avoid recursion
+                if (isUpdatingCacheState) {
+                    // Query directly from resolved state view which handles inheritance correctly
+                    let query = db
+                        .selectFrom("internal_resolved_state_all")
+                        .selectAll();
+                    // Apply filters
+                    for (const [column, value] of Object.entries(filters)) {
+                        query = query.where(column, "=", value);
                     }
+                    const stateResults = executeSync({
+                        lix: { sqlite },
+                        query,
+                    });
+                    cursorState.results = stateResults || [];
+                    cursorState.rowIndex = 0;
+                    return capi.SQLITE_OK;
                 }
-                // Re-query cache after population
-                // Re-query after population with priority: untracked > tracked > inherited
-                const newResults = sqlite.exec({
-                    sql: `
-							-- 1. Untracked state (highest priority)
-							SELECT entity_id, schema_key, file_id, version_id, plugin_key,
-								   snapshot_content, schema_version, created_at, updated_at,
-								   NULL as inherited_from_version_id, 'untracked' as change_id, 1 as untracked
-							FROM internal_state_all_untracked
-							
-							UNION ALL
-							
-							-- 2. Tracked state (second priority) - only if no untracked exists
-							SELECT entity_id, schema_key, file_id, version_id, plugin_key, 
-								   snapshot_content, schema_version, created_at, updated_at,
-								   inherited_from_version_id, change_id, 0 as untracked
-							FROM internal_state_cache
-							WHERE inheritance_delete_marker = 0  -- Hide copy-on-write deletions
-							AND NOT EXISTS (
-								SELECT 1 FROM internal_state_all_untracked unt
-								WHERE unt.entity_id = internal_state_cache.entity_id
-								  AND unt.schema_key = internal_state_cache.schema_key
-								  AND unt.file_id = internal_state_cache.file_id
-								  AND unt.version_id = internal_state_cache.version_id
-							)
-							
-							UNION ALL
-							
-							-- 3. Inherited state (lowest priority) - only if no untracked or tracked exists
-							SELECT isc.entity_id, isc.schema_key, isc.file_id, 
-								   vi.version_id, -- Return child version_id
-								   isc.plugin_key, isc.snapshot_content, isc.schema_version, 
-								   isc.created_at, isc.updated_at,
-								   vi.parent_version_id as inherited_from_version_id, isc.change_id, 0 as untracked
-							FROM (
-								-- Get version inheritance relationships from cache
-								SELECT 
-									json_extract(isc_v.snapshot_content, '$.id') AS version_id,
-									json_extract(isc_v.snapshot_content, '$.inherits_from_version_id') AS parent_version_id
-								FROM internal_state_cache isc_v
-								WHERE isc_v.schema_key = 'lix_version'
-							) vi
-							JOIN internal_state_cache isc ON isc.version_id = vi.parent_version_id
-							WHERE vi.parent_version_id IS NOT NULL
-							-- Only inherit entities that exist (not deleted) in parent
-							AND isc.inheritance_delete_marker = 0
-							-- Don't inherit if child has tracked state
-							AND NOT EXISTS (
-								SELECT 1 FROM internal_state_cache child_isc
-								WHERE child_isc.version_id = vi.version_id
-								  AND child_isc.entity_id = isc.entity_id
-								  AND child_isc.schema_key = isc.schema_key
-								  AND child_isc.file_id = isc.file_id
-							)
-							-- Don't inherit if child has untracked state
-							AND NOT EXISTS (
-								SELECT 1 FROM internal_state_all_untracked unt
-								WHERE unt.version_id = vi.version_id
-								  AND unt.entity_id = isc.entity_id
-								  AND unt.schema_key = isc.schema_key
-								  AND unt.file_id = isc.file_id
-							)
-						`,
-                    returnValue: "resultRows",
+                // Normal path: check cache staleness
+                const cacheIsStale = isStaleStateCache({
+                    lix: { sqlite, db: db },
                 });
-                cursorState.results = newResults || [];
-            }
-            else {
-                if (canLog()) {
-                    createLixOwnLogSync({
-                        lix: { sqlite, db: db },
-                        key: "lix_state_cache_hit",
+                // Try cache first - but only if it's not stale
+                let cacheResults = null;
+                if (!cacheIsStale) {
+                    // Select directly from resolved state view using Kysely
+                    let query = db
+                        .selectFrom("internal_resolved_state_all")
+                        .selectAll();
+                    // Apply filters
+                    for (const [column, value] of Object.entries(filters)) {
+                        query = query.where(column, "=", value);
+                    }
+                    cacheResults = executeSync({
+                        lix: { sqlite },
+                        query,
+                    });
+                }
+                cursorState.results = cacheResults || [];
+                cursorState.rowIndex = 0;
+                if (cacheIsStale) {
+                    // Populate cache directly with materialized state
+                    populateStateCache(sqlite);
+                    // Log the cache miss
+                    insertVTableLog({
+                        sqlite,
+                        db: db,
+                        key: "lix_state_cache_miss",
                         level: "debug",
-                        message: `Cache hit - returning ${cursorState.results.length} cached rows`,
+                        message: `Cache miss detected - materialized state`,
                     });
+                    // Mark cache as fresh after population
+                    isUpdatingCacheState = true;
+                    try {
+                        markStateCacheAsFresh({ lix: { sqlite, db: db } });
+                    }
+                    finally {
+                        isUpdatingCacheState = false;
+                    }
+                    let query = db
+                        .selectFrom("internal_resolved_state_all")
+                        .selectAll();
+                    // Apply filters
+                    for (const [column, value] of Object.entries(filters)) {
+                        query = query.where(column, "=", value);
+                    }
+                    const newResults = executeSync({
+                        lix: { sqlite },
+                        query,
+                    });
+                    cursorState.results = newResults || [];
                 }
+                return capi.SQLITE_OK;
+            }
+            finally {
+                // Always decrement recursion depth
+                // @ts-expect-error - using global for debugging
+                globalThis[recursionKey] = currentDepth - 1;
             }
-            return capi.SQLITE_OK;
         },
         xNext: (pCursor) => {
             const cursorState = cursorStates.get(pCursor);
@@ -488,9 +341,28 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
                 capi.sqlite3_result_null(pContext);
                 return capi.SQLITE_OK;
             }
+            // Handle primary key column (_pk)
+            if (iCol === 0) {
+                if (Array.isArray(row)) {
+                    // For array results, _pk is at index 0
+                    capi.sqlite3_result_js(pContext, row[0]);
+                }
+                else if (row._pk) {
+                    // If row already has _pk, use it
+                    capi.sqlite3_result_js(pContext, row._pk);
+                }
+                else {
+                    // Generate primary key from row data
+                    const tag = row.untracked ? "U" : "C";
+                    const primaryKey = serializeStatePk(tag, row.file_id, row.entity_id, row.version_id);
+                    capi.sqlite3_result_js(pContext, primaryKey);
+                }
+                return capi.SQLITE_OK;
+            }
             // Handle array-style results from SQLite exec
             let value;
             if (Array.isArray(row)) {
+                // For array results, composite_key is at index 0, so we use iCol directly
                 value = row[iCol];
             }
             else {
@@ -503,54 +375,54 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
                 capi.sqlite3_result_null(pContext);
                 return capi.SQLITE_OK;
             }
-            if (value === null || value === undefined) {
+            if (value === null) {
                 capi.sqlite3_result_null(pContext);
             }
-            else if (typeof value === "object") {
-                capi.sqlite3_result_js(pContext, JSON.stringify(value));
-            }
             else {
                 capi.sqlite3_result_js(pContext, value);
             }
             return capi.SQLITE_OK;
         },
-        xRowid: (pCursor, pRowid) => {
-            const cursorState = cursorStates.get(pCursor);
-            sqlite.sqlite3.vtab.xRowid(pRowid, cursorState.rowIndex);
-            return capi.SQLITE_OK;
+        xRowid: () => {
+            // For WITHOUT ROWID tables, xRowid should not be called
+            // But if it is, we return an error
+            return capi.SQLITE_ERROR;
         },
         xUpdate: (_pVTab, nArg, ppArgv) => {
             try {
                 // Extract arguments using the proper SQLite WASM API
                 const args = sqlite.sqlite3.capi.sqlite3_values_to_js(nArg, ppArgv);
-                // DELETE operation: nArg = 1, args[0] = old rowid
+                // DELETE operation: nArg = 1, args[0] = old primary key
                 if (nArg === 1) {
-                    // For DELETE, we need the old row data to pass to handleStateMutation
-                    // We can't get this from the virtual table directly, so we'll need to
-                    // handle DELETE differently:
-                    // we query the row by rowid and pass it to handleStateMutation
-                    handleStateDelete(sqlite, args[0], db);
+                    const oldPk = args[0];
+                    if (!oldPk) {
+                        throw new Error("Missing primary key for DELETE operation");
+                    }
+                    // Use handleStateDelete for all cases - it handles both tracked and untracked
+                    handleStateDelete(sqlite, oldPk, db);
                     return capi.SQLITE_OK;
                 }
-                // INSERT operation: nArg = N+2, args[0] = NULL, args[1] = new rowid
-                // UPDATE operation: nArg = N+2, args[0] = old rowid, args[1] = new rowid
-                const isInsert = args[0] === null || args[0] === undefined;
-                const isUpdate = args[0] !== null && args[0] !== undefined;
+                // INSERT operation: nArg = N+2, args[0] = NULL, args[1] = new primary key
+                // UPDATE operation: nArg = N+2, args[0] = old primary key, args[1] = new primary key
+                const isInsert = args[0] === null;
+                const isUpdate = args[0] !== null;
                 if (!isInsert && !isUpdate) {
                     throw new Error("Invalid xUpdate operation");
                 }
                 // Extract column values (args[2] through args[N+1])
-                // Column order: entity_id, schema_key, file_id, version_id, plugin_key,
+                // Column order: _pk, entity_id, schema_key, file_id, version_id, plugin_key,
                 //               snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, change_id, untracked
-                const entity_id = args[2];
-                const schema_key = args[3];
-                const file_id = args[4];
-                const version_id = args[5];
-                const plugin_key = args[6];
-                const snapshot_content = args[7];
-                const schema_version = args[8];
-                // Skip created_at (args[9]), updated_at (args[10]), inherited_from_version_id (args[11]), change_id (args[12])
-                const untracked = args[13] ?? false;
+                const entity_id = args[3];
+                const schema_key = args[4];
+                const file_id = args[5];
+                const version_id = args[6];
+                const plugin_key = args[7];
+                // this is an update where we have a snapshot_content
+                // the snapshot_content is a JSON string as returned by SQlite
+                const snapshot_content = args[8];
+                const schema_version = args[9];
+                // Skip created_at (args[10]), updated_at (args[11]), inherited_from_version_id (args[12]), change_id (args[13])
+                const untracked = args[14] ?? false;
                 // assert required fields
                 if (!entity_id || !schema_key || !file_id || !plugin_key) {
                     throw new Error("Missing required fields for state mutation");
@@ -558,99 +430,75 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
                 if (!version_id) {
                     throw new Error("version_id is required for state mutation");
                 }
-                // Ensure snapshot_content is a string
-                const snapshotStr = typeof snapshot_content === "string"
-                    ? snapshot_content
-                    : JSON.stringify(snapshot_content);
                 // Call validation function (same logic as triggers)
-                const storedSchemaResult = sqlite.exec({
-                    sql: "SELECT value FROM stored_schema WHERE key = ?",
-                    bind: [String(schema_key)],
-                    returnValue: "resultRows",
-                });
-                const storedSchema = storedSchemaResult && storedSchemaResult.length > 0
-                    ? storedSchemaResult[0][0]
-                    : null;
+                const storedSchema = getStoredSchema(sqlite, db, schema_key);
                 validateStateMutation({
                     lix: { sqlite, db: db },
                     schema: storedSchema ? JSON.parse(storedSchema) : null,
-                    snapshot_content: JSON.parse(snapshotStr),
+                    snapshot_content: JSON.parse(snapshot_content),
                     operation: isInsert ? "insert" : "update",
                     entity_id: String(entity_id),
                     version_id: String(version_id),
                     untracked: Boolean(untracked),
                 });
-                // Route based on untracked flag
-                if (untracked) {
-                    // Handle untracked mutation - write directly to untracked table
-                    sqlite.exec({
-                        sql: `INSERT OR REPLACE INTO internal_state_all_untracked 
-								  (entity_id, schema_key, file_id, version_id, plugin_key, snapshot_content, schema_version)
-								  VALUES (?, ?, ?, ?, ?, ?, ?)`,
-                        bind: [
-                            String(entity_id),
-                            String(schema_key),
-                            String(file_id),
-                            String(version_id),
-                            String(plugin_key),
-                            snapshotStr,
-                            String(schema_version),
-                        ],
-                    });
-                }
-                else {
-                    // Handle tracked mutation - normal change control
-                    // If there's existing untracked state, delete it first (tracked overrides untracked)
-                    sqlite.exec({
-                        sql: `DELETE FROM internal_state_all_untracked 
-								  WHERE entity_id = ? AND schema_key = ? AND file_id = ? AND version_id = ?`,
-                        bind: [
-                            String(entity_id),
-                            String(schema_key),
-                            String(file_id),
-                            String(version_id),
-                        ],
-                    });
-                    // Call handleStateMutation (same logic as triggers)
-                    handleStateMutation(sqlite, db, String(entity_id), String(schema_key), String(file_id), String(plugin_key), snapshotStr, String(version_id), String(schema_version));
-                }
-                // TODO: This cache copying logic is a temporary workaround for shared change sets.
-                // The proper solution requires improving cache miss logic to handle change set sharing
+                // Use insertTransactionState which handles both tracked and untracked entities
+                insertTransactionState({
+                    lix: { sqlite, db },
+                    data: {
+                        entity_id: String(entity_id),
+                        schema_key: String(schema_key),
+                        file_id: String(file_id),
+                        plugin_key: String(plugin_key),
+                        snapshot_content,
+                        schema_version: String(schema_version),
+                        version_id: String(version_id),
+                        untracked: Boolean(untracked),
+                    },
+                });
+                // TODO: This cache copying logic is a temporary workaround for shared commits.
+                // The proper solution requires improving cache miss logic to handle commit sharing
                 // without duplicating entries. See: https://github.com/opral/lix-sdk/issues/309
                 //
-                // Handle cache copying for new versions that share change sets
+                // Handle cache copying for new versions that share commits
                 if (isInsert && String(schema_key) === "lix_version") {
-                    const versionData = JSON.parse(snapshotStr);
+                    const versionData = JSON.parse(snapshot_content);
                     const newVersionId = versionData.id;
-                    const changeSetId = versionData.change_set_id;
-                    if (newVersionId && changeSetId) {
-                        // Find other versions that already use this change set
-                        const existingVersionsWithSameChangeSet = sqlite.exec({
+                    const commitId = versionData.commit_id;
+                    if (newVersionId && commitId) {
+                        // Find other versions that point to the same commit
+                        const existingVersionsWithSameCommit = sqlite.exec({
                             sql: `
 									SELECT json_extract(snapshot_content, '$.id') as version_id
 									FROM internal_state_cache 
 									WHERE schema_key = 'lix_version' 
-									  AND json_extract(snapshot_content, '$.change_set_id') = ?
+									  AND json_extract(snapshot_content, '$.commit_id') = ?
 									  AND json_extract(snapshot_content, '$.id') != ?
 								`,
-                            bind: [changeSetId, newVersionId],
+                            bind: [commitId, newVersionId],
                             returnValue: "resultRows",
                         });
-                        // If there are existing versions with the same change set, copy their cache entries
-                        if (existingVersionsWithSameChangeSet &&
-                            existingVersionsWithSameChangeSet.length > 0) {
-                            const sourceVersionId = existingVersionsWithSameChangeSet[0][0]; // Take first existing version
+                        // If there are existing versions with the same commit, copy their cache entries
+                        if (existingVersionsWithSameCommit &&
+                            existingVersionsWithSameCommit.length > 0) {
+                            const sourceVersionId = existingVersionsWithSameCommit[0][0]; // Take first existing version
                             // Copy cache entries from source version to new version
+                            // IMPORTANT: When copying cache entries, we need to mark them as inherited
+                            // if they don't have an inherited_from_version_id already
                             sqlite.exec({
                                 sql: `
 										INSERT OR IGNORE INTO internal_state_cache 
-										(entity_id, schema_key, file_id, version_id, plugin_key, snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, inheritance_delete_marker, change_id)
+										(entity_id, schema_key, file_id, version_id, plugin_key, snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, inheritance_delete_marker, change_id, commit_id)
 										SELECT 
-											entity_id, schema_key, file_id, ?, plugin_key, snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, inheritance_delete_marker, change_id
+											entity_id, schema_key, file_id, ?, plugin_key, snapshot_content, schema_version, created_at, updated_at, 
+											CASE 
+												WHEN inherited_from_version_id IS NULL THEN ?
+												ELSE inherited_from_version_id
+											END as inherited_from_version_id,
+											inheritance_delete_marker, change_id, commit_id
 										FROM internal_state_cache
 										WHERE version_id = ? AND schema_key != 'lix_version'
 									`,
-                                bind: [newVersionId, sourceVersionId],
+                                bind: [newVersionId, sourceVersionId, sourceVersionId],
                             });
                         }
                     }
@@ -660,31 +508,14 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
                 // Log error for debugging
-                if (canLog()) {
-                    createLixOwnLogSync({
-                        lix: { sqlite, db: db },
-                        key: "lix_state_xupdate_error",
-                        level: "error",
-                        message: `xUpdate error: ${errorMessage}`,
-                    });
-                }
-                throw error; //new Error("test");
-                // const vtab = sqlite.sqlite3.vtab.xVtab.get(_pVTab);
-                // // Set proper error message on the virtual table
-                // if (vtab) {
-                // 	// Free any existing error message first
-                // 	if (vtab.zErrMsg) {
-                // 		capi.sqlite3_free(vtab.zErrMsg);
-                // 	}
-                // 	// Allocate new error message using sqlite3_malloc
-                // 	const errorBytes = new TextEncoder().encode(errorMessage + "\0");
-                // 	const errorPtr = capi.sqlite3_malloc(errorBytes.length);
-                // 	if (errorPtr) {
-                // 		sqlite.sqlite3.wasm.heap8u().set(errorBytes, errorPtr);
-                // 		vtab.zErrMsg = errorPtr;
-                // 	}
-                // }
-                // return capi.SQLITE_ERROR;
+                insertVTableLog({
+                    sqlite,
+                    db: db,
+                    key: "lix_state_xupdate_error",
+                    level: "error",
+                    message: `xUpdate error: ${errorMessage}`,
+                });
+                throw error; // Re-throw to propagate error
             }
         },
     }, false);
@@ -694,7 +525,19 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
     // Create state view that filters to active version only
     sqlite.exec(`
 		CREATE VIEW IF NOT EXISTS state AS
-		SELECT *
+		SELECT 
+			entity_id,
+			schema_key,
+			file_id,
+			plugin_key,
+			snapshot_content,
+			schema_version,
+			created_at,
+			updated_at,
+			inherited_from_version_id,
+			change_id,
+			untracked,
+			commit_id
 		FROM state_all
 		WHERE version_id IN (SELECT version_id FROM active_version);
 
@@ -703,11 +546,33 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
 		INSTEAD OF INSERT ON state
 		BEGIN
 			INSERT INTO state_all (
-				entity_id, schema_key, file_id, version_id, plugin_key,
-				snapshot_content, schema_version, created_at, updated_at, inherited_from_version_id, change_id, untracked
+				entity_id,
+				schema_key,
+				file_id,
+				version_id,
+				plugin_key,
+				snapshot_content,
+				schema_version,
+				created_at,
+				updated_at,
+				inherited_from_version_id,
+				change_id,
+				untracked,
+				commit_id
 			) VALUES (
-				NEW.entity_id, NEW.schema_key, NEW.file_id, NEW.version_id, NEW.plugin_key,
-				NEW.snapshot_content, NEW.schema_version, NEW.created_at, NEW.updated_at, NEW.inherited_from_version_id, NEW.change_id, NEW.untracked
+				NEW.entity_id,
+				NEW.schema_key,
+				NEW.file_id,
+				(SELECT version_id FROM active_version),
+				NEW.plugin_key,
+				NEW.snapshot_content,
+				NEW.schema_version,
+				NEW.created_at,
+				NEW.updated_at,
+				NEW.inherited_from_version_id,
+				NEW.change_id,
+				NEW.untracked,
+				NEW.commit_id
 			);
 		END;
 
@@ -719,7 +584,7 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
 				entity_id = NEW.entity_id,
 				schema_key = NEW.schema_key,
 				file_id = NEW.file_id,
-				version_id = NEW.version_id,
+				version_id = (SELECT version_id FROM active_version),
 				plugin_key = NEW.plugin_key,
 				snapshot_content = NEW.snapshot_content,
 				schema_version = NEW.schema_version,
@@ -727,108 +592,145 @@ export function applyStateDatabaseSchema(sqlite, db, hooks) {
 				updated_at = NEW.updated_at,
 				inherited_from_version_id = NEW.inherited_from_version_id,
 				change_id = NEW.change_id,
-				untracked = NEW.untracked
+				untracked = NEW.untracked,
+				commit_id = NEW.commit_id
 			WHERE
 				entity_id = OLD.entity_id
 				AND schema_key = OLD.schema_key
 				AND file_id = OLD.file_id
-				AND version_id = OLD.version_id;
+				AND version_id = (SELECT version_id FROM active_version);
 		END;
 
 		CREATE TRIGGER IF NOT EXISTS state_delete
 		INSTEAD OF DELETE ON state
 		BEGIN
+			-- Delete from state_all (handles both tracked and untracked entities)
 			DELETE FROM state_all
-			WHERE entity_id = OLD.entity_id
+			WHERE 
+				entity_id = OLD.entity_id
 				AND schema_key = OLD.schema_key
 				AND file_id = OLD.file_id
-				AND version_id = OLD.version_id;
+				AND version_id = (SELECT version_id FROM active_version);
 		END;
 	`);
-    // Create the cache table for performance optimization and the untracked state table
-    const sql = `
-  CREATE TABLE IF NOT EXISTS internal_state_cache (
-    entity_id TEXT NOT NULL,
-    schema_key TEXT NOT NULL,
-    file_id TEXT NOT NULL,
-    version_id TEXT NOT NULL,
-    plugin_key TEXT NOT NULL,
-    snapshot_content TEXT, -- Allow NULL for deletions
-    schema_version TEXT NOT NULL,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL,
-    inherited_from_version_id TEXT,
-    inheritance_delete_marker INTEGER DEFAULT 0, -- Flag for copy-on-write deletion markers
-    change_id TEXT, -- Allow NULL during migration and for deletion markers 
-    PRIMARY KEY (entity_id, schema_key, file_id, version_id)
-  );
-
-  -- Table for untracked state that bypasses change control
-  CREATE TABLE IF NOT EXISTS internal_state_all_untracked (
-    entity_id TEXT NOT NULL,
-    schema_key TEXT NOT NULL,
-    file_id TEXT NOT NULL,
-    version_id TEXT NOT NULL,
-    plugin_key TEXT NOT NULL,
-    snapshot_content TEXT NOT NULL, -- JSON content
-    schema_version TEXT NOT NULL,
-    created_at TEXT DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL CHECK (created_at LIKE '%Z'),
-    updated_at TEXT DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL CHECK (updated_at LIKE '%Z'),
-    PRIMARY KEY (entity_id, schema_key, file_id, version_id)
-  ) STRICT;
-
-  -- Trigger to update updated_at on untracked state changes
-  CREATE TRIGGER IF NOT EXISTS internal_state_all_untracked_update_timestamp
-  AFTER UPDATE ON internal_state_all_untracked
-  BEGIN
-    UPDATE internal_state_all_untracked 
-    SET updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
-    WHERE entity_id = NEW.entity_id 
-      AND schema_key = NEW.schema_key 
-      AND file_id = NEW.file_id 
-      AND version_id = NEW.version_id;
-  END;
-`;
-    return sqlite.exec(sql);
+    /**
+     * Insert a log entry directly using insertTransactionState to avoid recursion
+     * when logging from within the virtual table methods.
+     */
+    function insertVTableLog(args) {
+        if (loggingIsInProgress) {
+            return;
+        }
+        // preventing recursivly logging that we inserted a log entry
+        // with this flag
+        loggingIsInProgress = true;
+        // Check log levels directly from internal state tables to avoid recursion
+        const logLevelsResult = executeSync({
+            lix: { sqlite: args.sqlite },
+            query: args.db
+                .selectFrom("internal_resolved_state_all")
+                .select(sql `json_extract(snapshot_content, '$.value')`.as("value"))
+                .where("schema_key", "=", "lix_key_value")
+                .where(sql `json_extract(snapshot_content, '$.key')`, "=", "lix_log_levels")
+                .limit(1),
+        });
+        const logLevelsValue = logLevelsResult[0]?.value;
+        // Check if the level is allowed
+        if (!shouldLog(logLevelsValue, args.level)) {
+            return;
+        }
+        // Create log entry data
+        const lix = { sqlite: args.sqlite, db: args.db };
+        const logData = {
+            id: uuidV7({ lix }),
+            key: args.key,
+            message: args.message,
+            level: args.level,
+        };
+        // Insert log using insertTransactionState
+        insertTransactionState({
+            lix,
+            data: {
+                entity_id: logData.id,
+                schema_key: LixLogSchema["x-lix-key"],
+                file_id: "lix",
+                plugin_key: "lix_own_entity",
+                snapshot_content: JSON.stringify(logData),
+                schema_version: LixLogSchema["x-lix-version"],
+                // Using global and untracked for vtable logs.
+                // if we need to track them, we can change this later
+                version_id: "global",
+                untracked: true,
+            },
+        });
+        loggingIsInProgress = false;
+    }
 }
-export function handleStateDelete(sqlite, rowId, db) {
-    const rowToDelete = sqlite.exec({
-        sql: "SELECT * FROM state_all WHERE rowid = ?",
-        bind: [rowId],
-        returnValue: "resultRows",
+export function handleStateDelete(sqlite, primaryKey, db) {
+    // Query the row to delete using the resolved state view with Kysely
+    const rowToDelete = executeSync({
+        lix: { sqlite },
+        query: db
+            .selectFrom("internal_resolved_state_all")
+            .select([
+            "entity_id",
+            "schema_key",
+            "file_id",
+            "version_id",
+            "plugin_key",
+            "snapshot_content",
+            "schema_version",
+            "untracked",
+            "inherited_from_version_id",
+        ])
+            .where("_pk", "=", primaryKey),
     })[0];
-    const entity_id = rowToDelete[0];
-    const schema_key = rowToDelete[1];
-    const file_id = rowToDelete[2];
-    const version_id = rowToDelete[3];
-    const plugin_key = rowToDelete[4];
-    const snapshot_content = rowToDelete[5];
-    const schema_version = rowToDelete[6];
-    // Column indices: created_at[7], updated_at[8], inherited_from_version_id[9], change_id[10], untracked[11]
-    const untracked = rowToDelete[11];
-    // If entity is untracked, just delete it without creating changes
+    if (!rowToDelete) {
+        throw new Error(`Row not found for primary key: ${primaryKey}`);
+    }
+    const entity_id = rowToDelete.entity_id;
+    const schema_key = rowToDelete.schema_key;
+    const file_id = rowToDelete.file_id;
+    const version_id = rowToDelete.version_id;
+    const plugin_key = rowToDelete.plugin_key;
+    const snapshot_content = rowToDelete.snapshot_content;
+    const schema_version = rowToDelete.schema_version;
+    const untracked = rowToDelete.untracked;
+    // If entity is untracked, handle differently based on whether it's inherited
     if (untracked) {
-        // Delete from untracked table
-        sqlite.exec({
-            sql: `DELETE FROM internal_state_all_untracked 
-				  WHERE entity_id = ? AND schema_key = ? AND file_id = ? AND version_id = ?`,
-            bind: [
-                String(entity_id),
-                String(schema_key),
-                String(file_id),
-                String(version_id),
-            ],
-        });
+        // Parse the primary key to check if it's inherited untracked (UI tag)
+        const parsed = parseStatePk(primaryKey);
+        if (parsed.tag === "UI") {
+            // For inherited untracked, create a tombstone to block inheritance
+            insertTransactionState({
+                lix: { sqlite, db },
+                data: {
+                    entity_id: String(entity_id),
+                    schema_key: String(schema_key),
+                    file_id: String(file_id),
+                    plugin_key: String(plugin_key),
+                    snapshot_content: null, // Deletion tombstone
+                    schema_version: String(schema_version),
+                    version_id: String(version_id),
+                    untracked: true,
+                },
+            });
+        }
+        else {
+            // For direct untracked (U tag), just delete from untracked table
+            executeSync({
+                lix: { sqlite },
+                query: db
+                    .deleteFrom("internal_state_all_untracked")
+                    .where("entity_id", "=", String(entity_id))
+                    .where("schema_key", "=", String(schema_key))
+                    .where("file_id", "=", String(file_id))
+                    .where("version_id", "=", String(version_id)),
+            });
+        }
         return;
     }
-    const storedSchemaResult = sqlite.exec({
-        sql: "SELECT value FROM stored_schema WHERE key = ?",
-        bind: [String(schema_key)],
-        returnValue: "resultRows",
-    });
-    const storedSchema = storedSchemaResult && storedSchemaResult.length > 0
-        ? storedSchemaResult[0][0]
-        : null;
+    const storedSchema = getStoredSchema(sqlite, db, schema_key);
     validateStateMutation({
         lix: { sqlite, db: db },
         schema: storedSchema ? JSON.parse(storedSchema) : null,
@@ -837,12 +739,37 @@ export function handleStateDelete(sqlite, rowId, db) {
         entity_id: String(entity_id),
         version_id: String(version_id),
     });
-    handleStateMutation(sqlite, db, String(entity_id), String(schema_key), String(file_id), String(plugin_key), null, // No snapshot content for DELETE
-    String(version_id), String(schema_version));
+    insertTransactionState({
+        lix: { sqlite, db },
+        data: {
+            entity_id: String(entity_id),
+            schema_key: String(schema_key),
+            file_id: String(file_id),
+            plugin_key: String(plugin_key),
+            snapshot_content: null, // No snapshot content for DELETE
+            schema_version: String(schema_version),
+            version_id: String(version_id),
+            untracked: false, // tracked entity
+        },
+    });
 }
 // Helper functions for the virtual table
+function getStoredSchema(sqlite, db, schemaKey) {
+    // Query directly from internal_resolved_state_all to avoid vtable recursion
+    const result = executeSync({
+        lix: { sqlite },
+        query: db
+            .selectFrom("internal_resolved_state_all")
+            .select(sql `json_extract(snapshot_content, '$.value')`.as("value"))
+            .where("schema_key", "=", "lix_stored_schema")
+            .where(sql `json_extract(snapshot_content, '$.key')`, "=", String(schemaKey))
+            .limit(1),
+    });
+    return result && result.length > 0 ? result[0].value : null;
+}
 function getColumnName(columnIndex) {
     const columns = [
+        "_pk",
         "entity_id",
         "schema_key",
         "file_id",
@@ -855,198 +782,8 @@ function getColumnName(columnIndex) {
         "inherited_from_version_id",
         "change_id",
         "untracked",
+        "commit_id",
     ];
     return columns[columnIndex] || "unknown";
 }
-function selectStateViaCTE(sqlite, filters, includeDeletions = false) {
-    let sql = `
-		WITH
-			all_changes_with_snapshots AS (
-				-- Include committed changes
-				SELECT ic.id, ic.entity_id, ic.schema_key, ic.file_id, ic.plugin_key,
-					   ic.schema_version, 
-					   CASE 
-					     WHEN ic.snapshot_id = 'no-content' THEN NULL
-					     ELSE json(s.content)
-					   END AS snapshot_content 
-				FROM internal_change ic
-				LEFT JOIN internal_snapshot s ON ic.snapshot_id = s.id
-				
-				UNION ALL
-				
-				-- Include changes from current transaction
-				SELECT ict.id, ict.entity_id, ict.schema_key, ict.file_id, ict.plugin_key,
-					   ict.schema_version, ict.snapshot_content
-				FROM internal_change_in_transaction ict
-				
-				UNION ALL
-				
-				-- Include untracked state (pseudo-changes with special change_id)
-				SELECT 'untracked-' || unt.entity_id || '-' || unt.schema_key AS id,
-					   unt.entity_id, unt.schema_key, unt.file_id, unt.plugin_key,
-					   unt.schema_version, json(unt.snapshot_content) AS snapshot_content
-				FROM internal_state_all_untracked unt
-			),
-			root_cs_of_all_versions AS (
-				SELECT json_extract(v.snapshot_content, '$.change_set_id') AS version_change_set_id, 
-					   v.entity_id AS version_id
-				FROM all_changes_with_snapshots v
-				WHERE v.schema_key = 'lix_version'
-			),
-			reachable_cs_from_roots(id, version_id) AS (
-				SELECT version_change_set_id, version_id FROM root_cs_of_all_versions
-				UNION
-				SELECT json_extract(e.snapshot_content, '$.parent_id'), r.version_id
-				FROM all_changes_with_snapshots e 
-				JOIN reachable_cs_from_roots r ON json_extract(e.snapshot_content, '$.child_id') = r.id
-				WHERE e.schema_key = 'lix_change_set_edge'
-			),
-			cse_in_reachable_cs AS (
-				SELECT json_extract(ias.snapshot_content, '$.entity_id') AS target_entity_id,
-					   json_extract(ias.snapshot_content, '$.file_id') AS target_file_id,
-					   json_extract(ias.snapshot_content, '$.schema_key') AS target_schema_key, 
-					   json_extract(ias.snapshot_content, '$.change_id') AS target_change_id,
-					   json_extract(ias.snapshot_content, '$.change_set_id') AS cse_origin_change_set_id,
-					   rcs.version_id
-				FROM all_changes_with_snapshots ias
-				JOIN reachable_cs_from_roots rcs ON json_extract(ias.snapshot_content, '$.change_set_id') = rcs.id
-				WHERE ias.schema_key = 'lix_change_set_element'
-			),
-			leaf_target_snapshots AS (
-				SELECT target_change.entity_id, target_change.schema_key, target_change.file_id,
-					   target_change.plugin_key, target_change.snapshot_content AS snapshot_content,
-					   target_change.schema_version, r.version_id, target_change.id as change_id
-				FROM cse_in_reachable_cs r 
-				INNER JOIN all_changes_with_snapshots target_change ON r.target_change_id = target_change.id
-				WHERE NOT EXISTS (
-					WITH RECURSIVE descendants_of_current_cs(id) AS ( 
-						SELECT r.cse_origin_change_set_id 
-						UNION
-						SELECT json_extract(edge.snapshot_content, '$.child_id')
-						FROM all_changes_with_snapshots edge
-						JOIN descendants_of_current_cs d ON json_extract(edge.snapshot_content, '$.parent_id') = d.id
-						WHERE edge.schema_key = 'lix_change_set_edge'
-						  AND json_extract(edge.snapshot_content, '$.child_id') IN (
-						  	SELECT id FROM reachable_cs_from_roots WHERE version_id = r.version_id
-						  )
-					)
-					SELECT 1 FROM cse_in_reachable_cs newer_r 
-					WHERE newer_r.target_entity_id = r.target_entity_id 
-					  AND newer_r.target_file_id = r.target_file_id       
-					  AND newer_r.target_schema_key = r.target_schema_key 
-					  AND newer_r.version_id = r.version_id
-					  AND (newer_r.cse_origin_change_set_id != r.cse_origin_change_set_id OR newer_r.target_change_id != r.target_change_id) 
-					  AND newer_r.cse_origin_change_set_id IN descendants_of_current_cs
-				)
-			),
-			-- Get version inheritance relationships
-			version_inheritance AS (
-				SELECT DISTINCT
-					v.entity_id AS version_id,
-					json_extract(v.snapshot_content, '$.inherits_from_version_id') AS parent_version_id
-				FROM all_changes_with_snapshots v
-				WHERE v.schema_key = 'lix_version'
-			),
-			-- Combine direct entities with inherited entities
-			all_entities AS (
-				-- Direct entities from leaf_target_snapshots 
-				SELECT 
-					entity_id, schema_key, file_id, plugin_key, snapshot_content, schema_version,
-					version_id, version_id as visible_in_version, NULL as inherited_from_version_id, change_id
-				FROM leaf_target_snapshots
-				
-				UNION ALL
-				
-				-- Inherited entities from parent versions
-				SELECT 
-					ls.entity_id, ls.schema_key, ls.file_id, ls.plugin_key, ls.snapshot_content, ls.schema_version,
-					vi.version_id, -- Use child version_id for testing
-					vi.version_id as visible_in_version, -- Make visible in child version
-					vi.parent_version_id as inherited_from_version_id, ls.change_id
-				FROM version_inheritance vi
-				JOIN leaf_target_snapshots ls ON ls.version_id = vi.parent_version_id
-				WHERE vi.parent_version_id IS NOT NULL
-				AND ls.snapshot_content IS NOT NULL -- Don't inherit deleted entities
-				-- Don't inherit if child already has this entity (including deletion markers)
-				-- Use a more comprehensive check that includes both leaf snapshots and direct inheritance blocking
-				AND NOT EXISTS (
-					-- Check if there's ANY change for this entity in the child version
-					-- This includes creation, update, AND deletion changes
-					SELECT 1 FROM leaf_target_snapshots child_ls
-					WHERE child_ls.version_id = vi.version_id
-					  AND child_ls.entity_id = ls.entity_id
-					  AND child_ls.schema_key = ls.schema_key
-					  AND child_ls.file_id = ls.file_id
-				)
-				-- Additional safeguard: check that no change set element exists for this entity in child
-				AND NOT EXISTS (
-					SELECT 1 FROM cse_in_reachable_cs cse
-					JOIN all_changes_with_snapshots target_change ON cse.target_change_id = target_change.id
-					WHERE cse.version_id = vi.version_id
-					  AND target_change.entity_id = ls.entity_id
-					  AND target_change.schema_key = ls.schema_key
-					  AND target_change.file_id = ls.file_id
-				)
-			),
-		-- Prioritize direct entities over inherited ones, then deduplicate
-		prioritized_entities AS (
-			SELECT *,
-				   -- Priority: direct entities (inherited_from_version_id IS NULL) over inherited
-				   CASE WHEN inherited_from_version_id IS NULL THEN 1 ELSE 2 END as priority,
-				   -- Row number for deduplication within same priority
-				   ROW_NUMBER() OVER (
-					   PARTITION BY entity_id, schema_key, file_id, visible_in_version 
-					   ORDER BY CASE WHEN inherited_from_version_id IS NULL THEN 1 ELSE 2 END,
-					            -- Among inherited entities, prefer those with earlier timestamps
-					            version_id
-				   ) as rn
-			FROM all_entities ae
-			-- Don't filter out entities with null snapshot_content here
-			-- We need deletion markers to be included for proper inheritance blocking
-		)
-		SELECT DISTINCT
-			pe.entity_id,
-			pe.schema_key,
-			pe.file_id,
-			pe.plugin_key,
-			pe.snapshot_content,
-			pe.schema_version,
-			pe.version_id,
-			(SELECT MIN(ic.created_at) FROM internal_change ic 
-			 WHERE ic.entity_id = pe.entity_id AND ic.schema_key = pe.schema_key AND ic.file_id = pe.file_id) AS created_at,
-			COALESCE(
-				(SELECT MAX(ic.created_at) FROM internal_change ic 
-				 WHERE ic.entity_id = pe.entity_id AND ic.schema_key = pe.schema_key AND ic.file_id = pe.file_id
-				   AND ic.id IN (SELECT cse.target_change_id FROM cse_in_reachable_cs cse WHERE cse.version_id = pe.version_id)),
-				(SELECT MIN(ic.created_at) FROM internal_change ic 
-				 WHERE ic.entity_id = pe.entity_id AND ic.schema_key = pe.schema_key AND ic.file_id = pe.file_id)
-			) AS updated_at,
-			pe.inherited_from_version_id,
-			pe.change_id
-		FROM prioritized_entities pe
-		WHERE pe.rn = 1
-		${includeDeletions ? "" : "-- Filter out deletion markers from final results\n		AND pe.snapshot_content IS NOT NULL"}
-	`;
-    const bindings = [];
-    const conditions = [];
-    Object.entries(filters).forEach(([key, value]) => {
-        if (key === "version_id") {
-            // For version_id filter, use visible_in_version
-            conditions.push(`ae.visible_in_version = ?`);
-        }
-        else {
-            conditions.push(`ae.${key} = ?`);
-        }
-        bindings.push(value);
-    });
-    if (conditions.length > 0) {
-        sql += " AND " + conditions.join(" AND ");
-    }
-    const result = sqlite.exec({
-        sql,
-        bind: bindings,
-        returnValue: "resultRows",
-    });
-    return result || [];
-}
 //# sourceMappingURL=schema.js.map