akm-cli 0.9.17-alpha.3 → 0.9.17-alpha.4

package/dist/storage/repositories/index-entry-schema.js

@@ -2,17 +2,26 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
- * The single canonical contract for the derived `entries` generation.
+ * The derived `entries` layout: DDL plus the layout marker.
  *
- * `index.db` is regenerable, so callers compare one normalized PRAGMA
- * fingerprint and discard any generation that differs. This module owns both
- * the DDL and its expected fingerprint so schema creation, writable opens,
- * serving preflights, and read-only evaluator tooling cannot drift into
- * separate definitions of "current".
+ * `index_meta.version` is a layout marker. An older layout is never refused:
+ * readers serve what is there, and the writable opener (`ensureSchema`,
+ * `index-schema.ts`) brings it up to date in place — added and dropped
+ * columns, retired tables dropped, a one-time full-text rebuild — without
+ * touching embeddings, utility scores, graph rows, or the LLM enrichment
+ * cache. A newer layout is refused, naming the upgrade.
  */
-// v23 adds an isolated fragment FTS population. v22 is the last shipped
-// generation and is intentionally rebuilt rather than migrated in place.
-export const CANONICAL_INDEX_DB_VERSION = 23;
+// 25: vectors live only in `embeddings`; the sqlite-vec mirror `entries_vec`
+// is dropped (`dropVecMirror`, index-schema.ts), and so is the fragment FTS
+// table `entry_fragments_fts`, which search no longer reads. `entries` keeps
+// a hash of each entry's embedding input (`embed_hash`) instead of the text
+// (`search_text`); the text is derived from `document_json` when embedding.
+// 24: the FTS5 tables are contentless (`content=''`) — the indexed text lives
+// once, in `entries` / `entry_fragments`, and FTS rows are keyed by rowid only.
+// 23 and earlier stored a second copy of every indexed field in FTS5's own
+// content shadow tables. `ensureFtsLayout` (index-schema.ts) rebuilds the FTS
+// tables from the stored entries when it finds the older layout.
+export const CANONICAL_INDEX_DB_VERSION = 25;
 export const CANONICAL_ENTRY_SCHEMA_SQL = `
   CREATE TABLE IF NOT EXISTS entries (
     id            INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -25,8 +34,8 @@ export const CANONICAL_ENTRY_SCHEMA_SQL = `
     file_path     TEXT NOT NULL,
     content_hash  TEXT,
     document_json TEXT NOT NULL,
-    search_text   TEXT NOT NULL,
-    derived_from  TEXT
+    derived_from  TEXT,
+    embed_hash    TEXT
   );
 
   CREATE INDEX IF NOT EXISTS idx_entries_bundle ON entries(bundle_id);
@@ -34,279 +43,84 @@ export const CANONICAL_ENTRY_SCHEMA_SQL = `
   CREATE INDEX IF NOT EXISTS idx_entries_file_path ON entries(file_path);
   CREATE INDEX IF NOT EXISTS idx_entries_derived_from ON entries(derived_from);
 
-  -- Keep parent metadata and body fragments in separate FTS populations.
-  -- Combining them changes parent-document IDF and conjunction semantics.
-  CREATE VIRTUAL TABLE IF NOT EXISTS entries_fts USING fts5(
-    entry_id UNINDEXED,
-    name,
-    description,
-    tags,
-    hints,
-    content,
-    tokenize='porter unicode61'
-  );
-
   CREATE TABLE IF NOT EXISTS entry_fragments (
     entry_id INTEGER PRIMARY KEY REFERENCES entries(id) ON DELETE CASCADE,
     safe_markdown TEXT NOT NULL
   );
-
-  CREATE VIRTUAL TABLE IF NOT EXISTS entry_fragments_fts USING fts5(
-    entry_id UNINDEXED,
-    fragment_id UNINDEXED,
-    fragment_ordinal UNINDEXED,
-    content,
-    tokenize='porter unicode61'
-  );
 `;
-const CANONICAL_ENTRY_SCHEMA_FINGERPRINT = {
-    tableSql: "CREATE TABLE entries ( id INTEGER PRIMARY KEY AUTOINCREMENT, item_ref TEXT NOT NULL UNIQUE, bundle_id TEXT NOT NULL, component_id TEXT NOT NULL, concept_id TEXT NOT NULL, adapter_id TEXT NOT NULL, type TEXT NOT NULL, file_path TEXT NOT NULL, content_hash TEXT, document_json TEXT NOT NULL, search_text TEXT NOT NULL, derived_from TEXT )",
-    sqliteSequenceTable: true,
-    sqliteSequenceValid: true,
-    columns: [
-        { cid: 0, name: "id", type: "INTEGER", notNull: 0, defaultValue: null, primaryKeyPosition: 1, hidden: 0 },
-        {
-            cid: 1,
-            name: "item_ref",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 2,
-            name: "bundle_id",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 3,
-            name: "component_id",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 4,
-            name: "concept_id",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 5,
-            name: "adapter_id",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        { cid: 6, name: "type", type: "TEXT", notNull: 1, defaultValue: null, primaryKeyPosition: 0, hidden: 0 },
-        {
-            cid: 7,
-            name: "file_path",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 8,
-            name: "content_hash",
-            type: "TEXT",
-            notNull: 0,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 9,
-            name: "document_json",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 10,
-            name: "search_text",
-            type: "TEXT",
-            notNull: 1,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-        {
-            cid: 11,
-            name: "derived_from",
-            type: "TEXT",
-            notNull: 0,
-            defaultValue: null,
-            primaryKeyPosition: 0,
-            hidden: 0,
-        },
-    ],
-    indexes: [
-        {
-            name: "idx_entries_bundle",
-            unique: 0,
-            origin: "c",
-            partial: 0,
-            columns: [
-                { sequence: 0, cid: 2, name: "bundle_id", descending: 0, collation: "BINARY", key: 1 },
-                { sequence: 1, cid: -1, name: null, descending: 0, collation: "BINARY", key: 0 },
-            ],
-        },
-        {
-            name: "idx_entries_derived_from",
-            unique: 0,
-            origin: "c",
-            partial: 0,
-            columns: [
-                { sequence: 0, cid: 11, name: "derived_from", descending: 0, collation: "BINARY", key: 1 },
-                { sequence: 1, cid: -1, name: null, descending: 0, collation: "BINARY", key: 0 },
-            ],
-        },
-        {
-            name: "idx_entries_file_path",
-            unique: 0,
-            origin: "c",
-            partial: 0,
-            columns: [
-                { sequence: 0, cid: 7, name: "file_path", descending: 0, collation: "BINARY", key: 1 },
-                { sequence: 1, cid: -1, name: null, descending: 0, collation: "BINARY", key: 0 },
-            ],
-        },
-        {
-            name: "idx_entries_type",
-            unique: 0,
-            origin: "c",
-            partial: 0,
-            columns: [
-                { sequence: 0, cid: 6, name: "type", descending: 0, collation: "BINARY", key: 1 },
-                { sequence: 1, cid: -1, name: null, descending: 0, collation: "BINARY", key: 0 },
-            ],
-        },
-        {
-            name: "sqlite_autoindex_entries_1",
-            unique: 1,
-            origin: "u",
-            partial: 0,
-            columns: [
-                { sequence: 0, cid: 1, name: "item_ref", descending: 0, collation: "BINARY", key: 1 },
-                { sequence: 1, cid: -1, name: null, descending: 0, collation: "BINARY", key: 0 },
-            ],
-        },
-    ],
-    searchSurfaces: {
-        entriesFtsSql: "CREATE VIRTUAL TABLE entries_fts USING fts5( entry_id UNINDEXED, name, description, tags, hints, content, tokenize='porter unicode61' )",
-        fragmentSourceSql: "CREATE TABLE entry_fragments ( entry_id INTEGER PRIMARY KEY REFERENCES entries(id) ON DELETE CASCADE, safe_markdown TEXT NOT NULL )",
-        fragmentsFtsSql: "CREATE VIRTUAL TABLE entry_fragments_fts USING fts5( entry_id UNINDEXED, fragment_id UNINDEXED, fragment_ordinal UNINDEXED, content, tokenize='porter unicode61' )",
-    },
-};
+// The FTS table is contentless: FTS5 keeps only the inverted index, and a row
+// is addressed by its rowid (`entries_fts.rowid = entries.id`, see
+// index-fts-repository.ts). `contentless_delete=1` lets a row be deleted by
+// rowid alone — an external-content table would instead need the exact text
+// originally indexed, which is derived in JS from `document_json`
+// (`buildSearchFields`) and would corrupt the index the first time that
+// derivation changed. The UNINDEXED columns store nothing and read back NULL;
+// they stay declared so the insert statements and the readers'
+// `COALESCE(f.entry_id, f.rowid)` joins are valid against both this layout
+// and the content-bearing one older releases wrote — which is also the
+// layout written when the linked SQLite predates `contentless_delete` (3.43,
+// e.g. the macOS 13 system library Bun links there).
+const CONTENTLESS_OPTIONS = "content='', contentless_delete=1,";
+export function entriesFtsDdl(contentless) {
+    return `
+  CREATE VIRTUAL TABLE IF NOT EXISTS entries_fts USING fts5(
+    entry_id UNINDEXED, name, description, tags, hints, content,
+    ${contentless ? CONTENTLESS_OPTIONS : ""} tokenize='porter unicode61'
+  );`;
+}
+/** Whether the linked SQLite's FTS5 supports `contentless_delete` (3.43.0+). */
+export function supportsContentlessDelete(db) {
+    const version = db.prepare("SELECT sqlite_version() AS version").get().version;
+    const [major = 0, minor = 0] = version.split(".").map(Number);
+    return major > 3 || (major === 3 && minor >= 43);
+}
 function sqlString(value) {
     return `'${value.replaceAll("'", "''")}'`;
 }
-function normalizeSchemaSql(value) {
-    if (value == null)
-        return null;
-    return value.replace(/\s+/g, " ").trim();
-}
-function readNamedTableSql(db, name) {
+export function readTableSql(db, name) {
     const row = db.prepare(`SELECT sql FROM sqlite_master WHERE type = 'table' AND name = ${sqlString(name)}`).get();
-    return normalizeSchemaSql(row?.sql);
-}
-export function readEntrySchemaFingerprint(db) {
-    const sqliteSequenceTable = db.prepare("SELECT 1 AS present FROM sqlite_master WHERE type = 'table' AND name = 'sqlite_sequence'").get() !=
-        null;
-    const maxId = Number(db.prepare("SELECT COALESCE(MAX(id), 0) AS maxId FROM entries").get().maxId);
-    const sequenceRow = sqliteSequenceTable
-        ? db.prepare("SELECT seq FROM sqlite_sequence WHERE name = 'entries'").get()
-        : undefined;
-    const sqliteSequenceValid = sqliteSequenceTable &&
-        (maxId === 0 ? sequenceRow == null || Number(sequenceRow.seq) >= 0 : Number(sequenceRow?.seq) >= maxId);
-    const columns = db.prepare("PRAGMA table_xinfo(entries)").all().map((column) => ({
-        cid: Number(column.cid),
-        name: column.name,
-        type: column.type.trim().toUpperCase(),
-        notNull: Number(column.notnull),
-        defaultValue: column.dflt_value === null ? null : String(column.dflt_value),
-        primaryKeyPosition: Number(column.pk),
-        hidden: Number(column.hidden),
-    }));
-    const indexes = db.prepare("PRAGMA index_list(entries)").all()
-        .map((index) => ({
-        name: index.name,
-        unique: Number(index.unique),
-        origin: index.origin,
-        partial: Number(index.partial),
-        columns: db.prepare(`PRAGMA index_xinfo(${sqlString(index.name)})`).all()
-            .sort((left, right) => Number(left.seqno) - Number(right.seqno))
-            .map((column) => ({
-            sequence: Number(column.seqno),
-            cid: Number(column.cid),
-            name: column.name,
-            descending: Number(column.desc),
-            collation: column.coll,
-            key: Number(column.key),
-        })),
-    }))
-        .sort((left, right) => left.name.localeCompare(right.name));
-    return {
-        tableSql: readNamedTableSql(db, "entries"),
-        sqliteSequenceTable,
-        sqliteSequenceValid,
-        columns,
-        indexes,
-        searchSurfaces: {
-            entriesFtsSql: readNamedTableSql(db, "entries_fts"),
-            fragmentSourceSql: readNamedTableSql(db, "entry_fragments"),
-            fragmentsFtsSql: readNamedTableSql(db, "entry_fragments_fts"),
-        },
-    };
+    return row?.sql ?? null;
 }
-export function hasCanonicalEntrySchema(db) {
-    try {
-        return JSON.stringify(readEntrySchemaFingerprint(db)) === JSON.stringify(CANONICAL_ENTRY_SCHEMA_FINGERPRINT);
-    }
-    catch {
-        return false;
-    }
+export function tableExists(db, name) {
+    return readTableSql(db, name) !== null;
 }
-export function classifyIndexGeneration(db) {
-    let storedVersion;
-    try {
-        const row = db.prepare("SELECT value FROM index_meta WHERE key = 'version'").get();
-        storedVersion = row?.value;
-    }
-    catch {
-        storedVersion = undefined;
-    }
-    if (storedVersion === String(CANONICAL_INDEX_DB_VERSION) && hasCanonicalEntrySchema(db)) {
-        return { status: "canonical", storedVersion };
-    }
-    const storedNumeric = storedVersion === undefined ? undefined : Number(storedVersion);
-    if (storedNumeric !== undefined && Number.isFinite(storedNumeric) && storedNumeric > CANONICAL_INDEX_DB_VERSION) {
-        return { status: "newer", storedVersion };
-    }
-    return { status: "older", storedVersion };
+/**
+ * Columns this release's readers need in `entries` (layout 21+). The writable
+ * opener adds `embed_hash` to an older table, so it is not required here.
+ */
+const REQUIRED_ENTRY_COLUMNS = [
+    "id",
+    "item_ref",
+    "bundle_id",
+    "component_id",
+    "concept_id",
+    "adapter_id",
+    "type",
+    "file_path",
+    "content_hash",
+    "document_json",
+    "derived_from",
+];
+/** Required `entries` columns the table lacks; every column when there is no `entries` table. */
+export function missingEntryColumns(db) {
+    const present = new Set(db.prepare("PRAGMA table_info(entries)").all().map((c) => c.name));
+    return REQUIRED_ENTRY_COLUMNS.filter((column) => !present.has(column));
 }
-export function isCanonicalIndexGeneration(db) {
+/**
+ * Whether an index database has an `entries` table this release can read. A
+ * fresh or empty file has none; an index older than layout 21 has one keyed
+ * by columns this release no longer reads, and serves nothing until the next
+ * `akm index` recreates it.
+ */
+export function hasCurrentEntriesTable(db) {
     try {
-        return classifyIndexGeneration(db).status === "canonical";
+        return missingEntryColumns(db).length === 0;
     }
     catch {
         return false;
     }
 }
+/** True when an FTS5 table's DDL declares the contentless layout this release writes. */
+export function isContentlessFtsDdl(sql) {
+    return sql !== null && /content\s*=\s*''/.test(sql);
+}