ugly-app 0.1.1040 → 0.1.1041

package/README.md

@@ -616,7 +616,7 @@ export const collections = defineCollections({
 - `trackKeys?` — fields usable as NATS routing keys for scoped `trackDocs` subscriptions.
 - `getter?(ids)` — batch resolver for collections with no local table (e.g. `userPublic` resolves via ugly.bot).
 - `skipReadValidation?` — opt out of per-row zod validation on reads for very hot collections. Writes are always validated. Global kill-switch: `UGLY_DB_VALIDATE_READS=0`.
-- `search?: { fields, language? }` — full-text index over the named JSONB paths (Neon: Postgres FTS; D1: SQLite FTS5, ranked by bm25).
+- `search?: { fields, language? }` — full-text index over the named JSONB paths (Neon: Postgres FTS; D1: SQLite FTS5, ranked by bm25). On D1 this provisions two extra tables per collection — the `"<collection>_fts"` mirror and a small `"<collection>_ftsid"` `_id`→rowid map. The map is not optional bookkeeping: FTS5 can only seek on `rowid`, so without it every write full-scans the whole index (it once accounted for 98.8% of the account's D1 rows read). Don't hand-write against `_fts`; go through `searchDocs`.
 - `vector?: { dimensions, metric?, filterable? }` — ANN index. Vector supplied out-of-band at write time (`setDoc(c, doc, { vec })`) — never stored in the doc JSON. Query with `getDocs(c, filter, { near })`.
 
 All documents extend `DBObject`: `{ _id, version, created, updated }`.

package/dist/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.1.1040";
+export declare const CLI_VERSION = "0.1.1041";
 //# sourceMappingURL=version.d.ts.map

package/dist/cli/version.js

@@ -1,3 +1,3 @@
 // Auto-generated by prebuild — do not edit manually
-export const CLI_VERSION = "0.1.1040";
+export const CLI_VERSION = "0.1.1041";
 //# sourceMappingURL=version.js.map

package/dist/server/sqlite/SqliteFts.d.ts

@@ -1,6 +1,8 @@
 import type { SqliteExec } from './SqliteExec.js';
 /** `<collection>_fts` — the FTS5 mirror table for a collection (name validated). */
 export declare function ftsTableName(collection: string): string;
+/** `<collection>_ftsid` — the `_id → rowid` map for the mirror (see header). */
+export declare function ftsIdTableName(collection: string): string;
 /**
  * FTS5 tokenizer for a Postgres-style `language`. FTS5 ships no snowball
  * stemmers; map `english` → the built-in `porter` stemmer (closest to PG
@@ -9,13 +11,14 @@ export declare function ftsTableName(collection: string): string;
  * documented recall difference vs Neon's snowball configs, not a bug.
  */
 export declare function ftsTokenizer(language?: string): string;
-/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`. */
+/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`,
+ *  its `_id → rowid` map, and the one-time adoption of a pre-map mirror. */
 export declare function ensureFtsTable(exec: SqliteExec, collection: string, fields: string[], language?: string): Promise<void>;
-/** Mirror one doc into the FTS index (delete-then-insert, keyed by `_id`). */
+/** Mirror one doc into the FTS index (delete-then-insert, keyed by `rowid`). */
 export declare function ftsUpsert(exec: SqliteExec, collection: string, fields: string[], doc: Record<string, unknown> & {
     _id: string;
 }): Promise<void>;
-/** Remove a doc from the FTS index. */
+/** Remove a doc from the FTS index and release its rowid. */
 export declare function ftsDelete(exec: SqliteExec, collection: string, id: string): Promise<void>;
 /**
  * Turn free-text user input into a safe FTS5 MATCH expression. Mirrors

package/dist/server/sqlite/SqliteFts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteFts.d.ts","sourceRoot":"","sources":["../../../src/server/sqlite/SqliteFts.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQlD,oFAAoF;AACpF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAKtD;AA0BD,iFAAiF;AACjF,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,8EAA8E;AAC9E,wBAAsB,SAAS,CAC7B,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,uCAAuC;AACvC,wBAAsB,SAAS,CAC7B,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ7D;AAqBD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,CAAC,EAAE,CAAC,CAmCd"}
+{"version":3,"file":"SqliteFts.d.ts","sourceRoot":"","sources":["../../../src/server/sqlite/SqliteFts.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQlD,oFAAoF;AACpF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGzD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAKtD;AAyDD;4EAC4E;AAC5E,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAuBD,gFAAgF;AAChF,wBAAsB,SAAS,CAC7B,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,6DAA6D;AAC7D,wBAAsB,SAAS,CAC7B,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ7D;AAqBD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,CAAC,EAAE,CAAC,CAmCd"}

package/dist/server/sqlite/SqliteFts.js

@@ -10,11 +10,33 @@
  * source of truth; the FTS table is a pure mirror kept in sync in JS on every
  * write (no triggers — VACUUM-safe and identical on better-sqlite3 and D1).
  *
+ * # Why a side `"<collection>_ftsid"` map exists
+ *
+ * An FTS5 virtual table has exactly ONE key its query planner can seek on:
+ * `rowid`. Every other column — `_id` included, even declared UNINDEXED — is a
+ * full-index SCAN. The mirror was originally maintained with
+ * `DELETE FROM "<c>_fts" WHERE _id = ?`, so EVERY document write read every row
+ * of the index: O(collection size) per write, growing quadratically as a
+ * collection and its write rate grow together. Measured on the live account
+ * over 30 days that one statement shape was 107.3 B of 108.6 B D1 rows read
+ * (98.8%) across three apps — ugly-style's `catalogProduct_fts` alone did
+ * 1.5 M deletes × 54 K rows = 81 B — and was ~60% of the Cloudflare bill.
+ *
+ * So the mirror is keyed by rowid, and `"<collection>_ftsid"` holds the stable
+ * `_id → rowid` mapping: `rid INTEGER PRIMARY KEY` (a rowid alias, so it
+ * survives VACUUM, unlike the base table's implicit rowid) and a UNIQUE `_id`.
+ * Both directions are B-tree seeks, so a write reads ~2 rows instead of ~54,000.
+ *
+ * The map cannot be derived from the base table on demand: `DB.routedDeleteDoc`
+ * deletes the base row BEFORE calling `deleteSearch`, so by then there is no row
+ * left to read a rowid from. It has to be tracked independently.
+ *
  * Ranking uses `bm25()` (lower = better; SQLite returns negative scores), which
  * is NOT numerically comparable to Postgres `ts_rank`. Stemming differs too
  * (`porter`/`unicode61` vs snowball) — a documented recall difference, not a bug.
  */
 import { translateFilter } from './SqliteFilter.js';
+import { ensureD1MigrationsTable } from './SqliteMigrations.js';
 const VALID_NAME = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function assertSafeName(name) {
     if (!VALID_NAME.test(name))
@@ -25,6 +47,11 @@ export function ftsTableName(collection) {
     assertSafeName(collection);
     return `${collection}_fts`;
 }
+/** `<collection>_ftsid` — the `_id → rowid` map for the mirror (see header). */
+export function ftsIdTableName(collection) {
+    assertSafeName(collection);
+    return `${collection}_ftsid`;
+}
 /**
  * FTS5 tokenizer for a Postgres-style `language`. FTS5 ships no snowball
  * stemmers; map `english` → the built-in `porter` stemmer (closest to PG
@@ -63,28 +90,79 @@ function textValue(doc, field) {
         return v.map(scalarText).join(' ');
     return scalarText(v);
 }
-/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`. */
+/**
+ * Adopt an FTS table that predates the `_ftsid` map by copying its EXISTING
+ * rowids into the map, so legacy rows keep working with rowid-keyed writes —
+ * no rebuild, no reindex, no window where the collection is unsearchable.
+ *
+ * One full scan of the mirror, once per collection ever. The run-once marker
+ * goes in `_migrations` (same table the D1 migration runner uses) and is written
+ * only AFTER the copy succeeds, so a partial failure simply re-runs — the copy
+ * is `INSERT OR IGNORE`, so re-running converges instead of double-applying.
+ */
+async function seedFtsIdMap(exec, collection) {
+    const marker = `fts_rowid_map:${collection}`;
+    await ensureD1MigrationsTable(exec);
+    const done = await exec.all(`SELECT name FROM _migrations WHERE name = ?`, [marker]);
+    if (done.length > 0)
+        return;
+    await exec.run(`INSERT OR IGNORE INTO "${ftsIdTableName(collection)}" (rid, _id) ` +
+        `SELECT rowid, _id FROM "${ftsTableName(collection)}"`);
+    await exec.run(`INSERT OR IGNORE INTO _migrations (name, applied_at) VALUES (?, ?)`, [marker, Date.now()]);
+}
+/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`,
+ *  its `_id → rowid` map, and the one-time adoption of a pre-map mirror. */
 export async function ensureFtsTable(exec, collection, fields, language) {
     const table = ftsTableName(collection);
     const cols = safeFields(fields).map((f) => `"${f}"`);
     const colDefs = ['_id UNINDEXED', ...cols].join(', ');
     await exec.run(`CREATE VIRTUAL TABLE IF NOT EXISTS "${table}" USING fts5(` +
         `${colDefs}, tokenize='${ftsTokenizer(language)}')`);
+    // `rid INTEGER PRIMARY KEY` aliases the rowid, so ids are stable across
+    // VACUUM; UNIQUE `_id` makes the reverse lookup a seek, not a scan.
+    await exec.run(`CREATE TABLE IF NOT EXISTS "${ftsIdTableName(collection)}" (
+      rid INTEGER PRIMARY KEY,
+      _id TEXT NOT NULL UNIQUE
+    )`);
+    await seedFtsIdMap(exec, collection);
 }
-/** Mirror one doc into the FTS index (delete-then-insert, keyed by `_id`). */
+/** The mirror rowid for `_id`, allocating one on first sight. Two B-tree seeks. */
+async function ftsRowid(exec, collection, id) {
+    const idTable = ftsIdTableName(collection);
+    await exec.run(`INSERT OR IGNORE INTO "${idTable}" (_id) VALUES (?)`, [id]);
+    const rows = await exec.all(`SELECT rid FROM "${idTable}" WHERE _id = ?`, [id]);
+    const row = rows[0];
+    // The INSERT above guarantees a row; a miss means the map table is gone or
+    // the write was rolled back under us — surface it rather than mirror blind.
+    if (!row) {
+        throw new Error(`[fts] no mirror rowid for ${collection}/${id}`);
+    }
+    return row.rid;
+}
+/** Mirror one doc into the FTS index (delete-then-insert, keyed by `rowid`). */
 export async function ftsUpsert(exec, collection, fields, doc) {
     const table = ftsTableName(collection);
     const cols = safeFields(fields);
-    await exec.run(`DELETE FROM "${table}" WHERE _id = ?`, [doc._id]);
+    const rid = await ftsRowid(exec, collection, doc._id);
+    await exec.run(`DELETE FROM "${table}" WHERE rowid = ?`, [rid]);
     const colList = ['_id', ...cols].map((c) => `"${c}"`).join(', ');
     const marks = ['_id', ...cols].map(() => '?').join(', ');
     const values = [doc._id, ...cols.map((f) => textValue(doc, f))];
-    await exec.run(`INSERT INTO "${table}" (${colList}) VALUES (${marks})`, values);
+    await exec.run(`INSERT INTO "${table}" (rowid, ${colList}) VALUES (?, ${marks})`, [rid, ...values]);
 }
-/** Remove a doc from the FTS index. */
+/** Remove a doc from the FTS index and release its rowid. */
 export async function ftsDelete(exec, collection, id) {
-    const table = ftsTableName(collection);
-    await exec.run(`DELETE FROM "${table}" WHERE _id = ?`, [id]);
+    const idTable = ftsIdTableName(collection);
+    const rows = await exec.all(`SELECT rid FROM "${idTable}" WHERE _id = ?`, [id]);
+    // Unmapped id: nothing was ever mirrored under it, so there is nothing to
+    // delete. (Never fall back to `WHERE _id = ?` — that is the full scan.)
+    const rid = rows[0]?.rid;
+    if (rid === undefined)
+        return;
+    await exec.run(`DELETE FROM "${ftsTableName(collection)}" WHERE rowid = ?`, [
+        rid,
+    ]);
+    await exec.run(`DELETE FROM "${idTable}" WHERE rid = ?`, [rid]);
 }
 /**
  * Turn free-text user input into a safe FTS5 MATCH expression. Mirrors

package/dist/server/sqlite/SqliteFts.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteFts.js","sourceRoot":"","sources":["../../../src/server/sqlite/SqliteFts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqliteFts.js","sourceRoot":"","sources":["../../../src/server/sqlite/SqliteFts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ugly-app",
   "packageManager": "pnpm@10.34.5",
-  "version": "0.1.1040",
+  "version": "0.1.1041",
   "type": "module",
   "comment:files": "Allowlist what ships to npm. dist = runtime; src = sourcemap targets (dist/*.js.map reference ../../src/); templates = CLI scaffold. Everything else at repo root (.pgdata local Postgres, coverage, assets/icons sources, test/, test-results/) is excluded by omission. The !negations strip the scaffold's installed deps + cruft (templates/node_modules is 200MB+ and must never ship). package.json/README/LICENSE ship automatically.",
   "files": [
@@ -72,7 +72,7 @@
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "prebuild": "node -e \"const p=JSON.parse(require('fs').readFileSync('package.json','utf8'));require('fs').writeFileSync('src/cli/version.ts','// Auto-generated by prebuild \u2014 do not edit manually\\nexport const CLI_VERSION = '+JSON.stringify(p.version)+';\\n');\" && rm -rf dist",
+    "prebuild": "node -e \"const p=JSON.parse(require('fs').readFileSync('package.json','utf8'));require('fs').writeFileSync('src/cli/version.ts','// Auto-generated by prebuild — do not edit manually\\nexport const CLI_VERSION = '+JSON.stringify(p.version)+';\\n');\" && rm -rf dist",
     "build": "tsc && chmod +x dist/cli/index.js && cp src/markdown/client/*.css dist/markdown/client/ && mkdir -p dist/cli/publish/recipes && cp -R src/cli/publish/recipes/. dist/cli/publish/recipes/ && mkdir -p dist/native/server/taskHost && cp src/native/server/taskHost/*.mjs dist/native/server/taskHost/ && esbuild src/inspect/agent/bundle-entry.ts --bundle --format=iife --platform=browser --minify --outfile=dist/inspect/agent-bundle.js --footer:js='//# sourceURL=ugly-inspect-agent.js' && esbuild src/inspect/host-bundle-entry.ts --bundle --format=iife --platform=browser --minify --outfile=dist/inspect/host-bundle.js",
     "test": "vitest run",
     "test:e2e": "E2E=1 vitest run tests/cli/e2e-integration.test.ts",

package/src/cli/version.ts

@@ -1,2 +1,2 @@
 // Auto-generated by prebuild — do not edit manually
-export const CLI_VERSION = "0.1.1040";
+export const CLI_VERSION = "0.1.1041";

package/src/server/sqlite/SqliteFts.test.ts

@@ -0,0 +1,197 @@
+/**
+ * FTS5 mirror maintenance — rowid-keyed upsert/delete.
+ *
+ * The cost regression these tests exist to prevent: an FTS5 virtual table can
+ * only satisfy an equality constraint on `rowid`. A `DELETE … WHERE _id = ?`
+ * (where `_id` is an ordinary UNINDEXED FTS column) is answered by a FULL SCAN
+ * of the index, so every document write costs O(rows-in-collection) rows read.
+ * In production that single statement was 98.8% of all D1 rows read.
+ */
+import { describe, it, expect, beforeEach } from 'vitest';
+import {
+  ensureFtsTable,
+  ftsUpsert,
+  ftsDelete,
+  ftsTableName,
+  ftsIdTableName,
+} from './SqliteFts.js';
+import { makeBetterSqliteExec, type SqliteExec } from './SqliteExec.js';
+
+/** Wraps an exec and records every statement it runs. */
+function spyOn(exec: SqliteExec): { exec: SqliteExec; sql: string[] } {
+  const sql: string[] = [];
+  return {
+    sql,
+    exec: {
+      all: (s, p) => {
+        sql.push(s);
+        return exec.all(s, p);
+      },
+      run: (s, p) => {
+        sql.push(s);
+        return exec.run(s, p);
+      },
+    },
+  };
+}
+
+const FIELDS = ['title', 'body'];
+
+async function ftsRows(
+  exec: SqliteExec,
+  c: string,
+): Promise<{ rowid: number; _id: string }[]> {
+  return exec.all(`SELECT rowid, _id FROM "${ftsTableName(c)}" ORDER BY rowid`);
+}
+
+describe('ftsUpsert / ftsDelete are rowid-keyed', () => {
+  let exec: SqliteExec;
+
+  beforeEach(async () => {
+    exec = await makeBetterSqliteExec();
+    await ensureFtsTable(exec, 'article', FIELDS);
+  });
+
+  it('creates the _id→rowid map table alongside the FTS table', async () => {
+    const rows = await exec.all<{ name: string }>(
+      `SELECT name FROM sqlite_master WHERE name IN (?, ?)`,
+      [ftsTableName('article'), ftsIdTableName('article')],
+    );
+    expect(rows.map((r) => r.name).sort()).toEqual(
+      ['article_fts', 'article_ftsid'].sort(),
+    );
+  });
+
+  it('re-upserting the same _id replaces in place (no duplicate rows)', async () => {
+    await ftsUpsert(exec, 'article', FIELDS, {
+      _id: 'a1',
+      title: 'first',
+      body: 'x',
+    });
+    await ftsUpsert(exec, 'article', FIELDS, {
+      _id: 'a1',
+      title: 'second',
+      body: 'x',
+    });
+    const rows = await ftsRows(exec, 'article');
+    expect(rows).toHaveLength(1);
+    const hit = await exec.all<{ title: string }>(
+      `SELECT title FROM "article_fts" WHERE "article_fts" MATCH ?`,
+      ['"second"'],
+    );
+    expect(hit).toHaveLength(1);
+  });
+
+  it('reuses the SAME rowid across upserts of one _id', async () => {
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'v1' });
+    const [first] = await ftsRows(exec, 'article');
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'v2' });
+    const [second] = await ftsRows(exec, 'article');
+    expect(second.rowid).toBe(first.rowid);
+  });
+
+  it('gives distinct _ids distinct rowids', async () => {
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'one' });
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a2', title: 'two' });
+    const rows = await ftsRows(exec, 'article');
+    expect(rows).toHaveLength(2);
+    expect(rows[0].rowid).not.toBe(rows[1].rowid);
+  });
+
+  it('ftsDelete removes the row and frees the map entry', async () => {
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'gone' });
+    await ftsDelete(exec, 'article', 'a1');
+    expect(await ftsRows(exec, 'article')).toHaveLength(0);
+    const map = await exec.all(`SELECT * FROM "article_ftsid"`);
+    expect(map).toHaveLength(0);
+  });
+
+  it('ftsDelete on an unknown _id is a no-op', async () => {
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'keep' });
+    await ftsDelete(exec, 'article', 'nope');
+    expect(await ftsRows(exec, 'article')).toHaveLength(1);
+  });
+
+  // The actual cost guard.
+  it('never filters the FTS table by _id (that is a full index scan)', async () => {
+    const s = spyOn(exec);
+    await ftsUpsert(s.exec, 'article', FIELDS, { _id: 'a1', title: 'x' });
+    await ftsUpsert(s.exec, 'article', FIELDS, { _id: 'a1', title: 'y' });
+    await ftsDelete(s.exec, 'article', 'a1');
+    const offenders = s.sql.filter((q) =>
+      /"article_fts"\s+WHERE\s+_id/i.test(q),
+    );
+    expect(offenders).toEqual([]);
+    // …and every FTS mutation is keyed by rowid instead.
+    const ftsWrites = s.sql.filter((q) =>
+      /(DELETE|INSERT).+"article_fts"/i.test(q),
+    );
+    expect(ftsWrites.length).toBeGreaterThan(0);
+    for (const q of ftsWrites) expect(q).toMatch(/rowid/i);
+  });
+});
+
+describe('legacy FTS tables (written before the map existed)', () => {
+  it('seeds the map from existing rowids, so upsert replaces instead of duplicating', async () => {
+    const exec = await makeBetterSqliteExec();
+    // Build the table the OLD way: no map, rowids auto-assigned by FTS5.
+    await exec.run(
+      `CREATE VIRTUAL TABLE "article_fts" USING fts5(_id UNINDEXED, "title", "body", tokenize='porter unicode61 remove_diacritics 2')`,
+    );
+    for (const id of ['old1', 'old2', 'old3']) {
+      await exec.run(
+        `INSERT INTO "article_fts" (_id, "title", "body") VALUES (?, ?, ?)`,
+        [id, `title ${id}`, 'body'],
+      );
+    }
+
+    await ensureFtsTable(exec, 'article', FIELDS);
+
+    const map = await exec.all<{ rid: number; _id: string }>(
+      `SELECT rid, _id FROM "article_ftsid" ORDER BY rid`,
+    );
+    expect(map.map((m) => m._id)).toEqual(['old1', 'old2', 'old3']);
+
+    // A legacy doc must now update in place, not duplicate.
+    await ftsUpsert(exec, 'article', FIELDS, {
+      _id: 'old2',
+      title: 'rewritten',
+      body: 'body',
+    });
+    const rows = await ftsRows(exec, 'article');
+    expect(rows).toHaveLength(3);
+    expect(rows.filter((r) => r._id === 'old2')).toHaveLength(1);
+
+    // …and a legacy doc must be deletable.
+    await ftsDelete(exec, 'article', 'old1');
+    expect(await ftsRows(exec, 'article')).toHaveLength(2);
+  });
+
+  it('seeding is idempotent and does not re-scan once recorded', async () => {
+    const exec = await makeBetterSqliteExec();
+    await exec.run(
+      `CREATE VIRTUAL TABLE "article_fts" USING fts5(_id UNINDEXED, "title", "body", tokenize='porter unicode61 remove_diacritics 2')`,
+    );
+    await exec.run(
+      `INSERT INTO "article_fts" (_id, "title", "body") VALUES (?, ?, ?)`,
+      ['old1', 't', 'b'],
+    );
+    await ensureFtsTable(exec, 'article', FIELDS);
+
+    const s = spyOn(exec);
+    await ensureFtsTable(s.exec, 'article', FIELDS);
+    const seeded = s.sql.filter((q) =>
+      /INSERT\s+OR\s+IGNORE.+SELECT\s+rowid/i.test(q),
+    );
+    expect(seeded).toEqual([]);
+    const map = await exec.all(`SELECT * FROM "article_ftsid"`);
+    expect(map).toHaveLength(1);
+  });
+
+  it('a brand-new empty collection is not treated as legacy', async () => {
+    const exec = await makeBetterSqliteExec();
+    await ensureFtsTable(exec, 'article', FIELDS);
+    await ftsUpsert(exec, 'article', FIELDS, { _id: 'a1', title: 'x' });
+    expect(await ftsRows(exec, 'article')).toHaveLength(1);
+  });
+});

package/src/server/sqlite/SqliteFts.ts

@@ -10,11 +10,33 @@
  * source of truth; the FTS table is a pure mirror kept in sync in JS on every
  * write (no triggers — VACUUM-safe and identical on better-sqlite3 and D1).
  *
+ * # Why a side `"<collection>_ftsid"` map exists
+ *
+ * An FTS5 virtual table has exactly ONE key its query planner can seek on:
+ * `rowid`. Every other column — `_id` included, even declared UNINDEXED — is a
+ * full-index SCAN. The mirror was originally maintained with
+ * `DELETE FROM "<c>_fts" WHERE _id = ?`, so EVERY document write read every row
+ * of the index: O(collection size) per write, growing quadratically as a
+ * collection and its write rate grow together. Measured on the live account
+ * over 30 days that one statement shape was 107.3 B of 108.6 B D1 rows read
+ * (98.8%) across three apps — ugly-style's `catalogProduct_fts` alone did
+ * 1.5 M deletes × 54 K rows = 81 B — and was ~60% of the Cloudflare bill.
+ *
+ * So the mirror is keyed by rowid, and `"<collection>_ftsid"` holds the stable
+ * `_id → rowid` mapping: `rid INTEGER PRIMARY KEY` (a rowid alias, so it
+ * survives VACUUM, unlike the base table's implicit rowid) and a UNIQUE `_id`.
+ * Both directions are B-tree seeks, so a write reads ~2 rows instead of ~54,000.
+ *
+ * The map cannot be derived from the base table on demand: `DB.routedDeleteDoc`
+ * deletes the base row BEFORE calling `deleteSearch`, so by then there is no row
+ * left to read a rowid from. It has to be tracked independently.
+ *
  * Ranking uses `bm25()` (lower = better; SQLite returns negative scores), which
  * is NOT numerically comparable to Postgres `ts_rank`. Stemming differs too
  * (`porter`/`unicode61` vs snowball) — a documented recall difference, not a bug.
  */
 import { translateFilter } from './SqliteFilter.js';
+import { ensureD1MigrationsTable } from './SqliteMigrations.js';
 import type { SqliteExec } from './SqliteExec.js';
 
 const VALID_NAME = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
@@ -29,6 +51,12 @@ export function ftsTableName(collection: string): string {
   return `${collection}_fts`;
 }
 
+/** `<collection>_ftsid` — the `_id → rowid` map for the mirror (see header). */
+export function ftsIdTableName(collection: string): string {
+  assertSafeName(collection);
+  return `${collection}_ftsid`;
+}
+
 /**
  * FTS5 tokenizer for a Postgres-style `language`. FTS5 ships no snowball
  * stemmers; map `english` → the built-in `porter` stemmer (closest to PG
@@ -67,7 +95,39 @@ function textValue(doc: Record<string, unknown>, field: string): string {
   return scalarText(v);
 }
 
-/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`. */
+/**
+ * Adopt an FTS table that predates the `_ftsid` map by copying its EXISTING
+ * rowids into the map, so legacy rows keep working with rowid-keyed writes —
+ * no rebuild, no reindex, no window where the collection is unsearchable.
+ *
+ * One full scan of the mirror, once per collection ever. The run-once marker
+ * goes in `_migrations` (same table the D1 migration runner uses) and is written
+ * only AFTER the copy succeeds, so a partial failure simply re-runs — the copy
+ * is `INSERT OR IGNORE`, so re-running converges instead of double-applying.
+ */
+async function seedFtsIdMap(
+  exec: SqliteExec,
+  collection: string,
+): Promise<void> {
+  const marker = `fts_rowid_map:${collection}`;
+  await ensureD1MigrationsTable(exec);
+  const done = await exec.all<{ name: string }>(
+    `SELECT name FROM _migrations WHERE name = ?`,
+    [marker],
+  );
+  if (done.length > 0) return;
+  await exec.run(
+    `INSERT OR IGNORE INTO "${ftsIdTableName(collection)}" (rid, _id) ` +
+      `SELECT rowid, _id FROM "${ftsTableName(collection)}"`,
+  );
+  await exec.run(
+    `INSERT OR IGNORE INTO _migrations (name, applied_at) VALUES (?, ?)`,
+    [marker, Date.now()],
+  );
+}
+
+/** Idempotent `CREATE VIRTUAL TABLE IF NOT EXISTS "<c>_fts" USING fts5(...)`,
+ *  its `_id → rowid` map, and the one-time adoption of a pre-map mirror. */
 export async function ensureFtsTable(
   exec: SqliteExec,
   collection: string,
@@ -81,9 +141,39 @@ export async function ensureFtsTable(
     `CREATE VIRTUAL TABLE IF NOT EXISTS "${table}" USING fts5(` +
       `${colDefs}, tokenize='${ftsTokenizer(language)}')`,
   );
+  // `rid INTEGER PRIMARY KEY` aliases the rowid, so ids are stable across
+  // VACUUM; UNIQUE `_id` makes the reverse lookup a seek, not a scan.
+  await exec.run(
+    `CREATE TABLE IF NOT EXISTS "${ftsIdTableName(collection)}" (
+      rid INTEGER PRIMARY KEY,
+      _id TEXT NOT NULL UNIQUE
+    )`,
+  );
+  await seedFtsIdMap(exec, collection);
 }
 
-/** Mirror one doc into the FTS index (delete-then-insert, keyed by `_id`). */
+/** The mirror rowid for `_id`, allocating one on first sight. Two B-tree seeks. */
+async function ftsRowid(
+  exec: SqliteExec,
+  collection: string,
+  id: string,
+): Promise<number> {
+  const idTable = ftsIdTableName(collection);
+  await exec.run(`INSERT OR IGNORE INTO "${idTable}" (_id) VALUES (?)`, [id]);
+  const rows = await exec.all<{ rid: number }>(
+    `SELECT rid FROM "${idTable}" WHERE _id = ?`,
+    [id],
+  );
+  const row = rows[0];
+  // The INSERT above guarantees a row; a miss means the map table is gone or
+  // the write was rolled back under us — surface it rather than mirror blind.
+  if (!row) {
+    throw new Error(`[fts] no mirror rowid for ${collection}/${id}`);
+  }
+  return row.rid;
+}
+
+/** Mirror one doc into the FTS index (delete-then-insert, keyed by `rowid`). */
 export async function ftsUpsert(
   exec: SqliteExec,
   collection: string,
@@ -92,24 +182,36 @@ export async function ftsUpsert(
 ): Promise<void> {
   const table = ftsTableName(collection);
   const cols = safeFields(fields);
-  await exec.run(`DELETE FROM "${table}" WHERE _id = ?`, [doc._id]);
+  const rid = await ftsRowid(exec, collection, doc._id);
+  await exec.run(`DELETE FROM "${table}" WHERE rowid = ?`, [rid]);
   const colList = ['_id', ...cols].map((c) => `"${c}"`).join(', ');
   const marks = ['_id', ...cols].map(() => '?').join(', ');
   const values = [doc._id, ...cols.map((f) => textValue(doc, f))];
   await exec.run(
-    `INSERT INTO "${table}" (${colList}) VALUES (${marks})`,
-    values,
+    `INSERT INTO "${table}" (rowid, ${colList}) VALUES (?, ${marks})`,
+    [rid, ...values],
   );
 }
 
-/** Remove a doc from the FTS index. */
+/** Remove a doc from the FTS index and release its rowid. */
 export async function ftsDelete(
   exec: SqliteExec,
   collection: string,
   id: string,
 ): Promise<void> {
-  const table = ftsTableName(collection);
-  await exec.run(`DELETE FROM "${table}" WHERE _id = ?`, [id]);
+  const idTable = ftsIdTableName(collection);
+  const rows = await exec.all<{ rid: number }>(
+    `SELECT rid FROM "${idTable}" WHERE _id = ?`,
+    [id],
+  );
+  // Unmapped id: nothing was ever mirrored under it, so there is nothing to
+  // delete. (Never fall back to `WHERE _id = ?` — that is the full scan.)
+  const rid = rows[0]?.rid;
+  if (rid === undefined) return;
+  await exec.run(`DELETE FROM "${ftsTableName(collection)}" WHERE rowid = ?`, [
+    rid,
+  ]);
+  await exec.run(`DELETE FROM "${idTable}" WHERE rid = ?`, [rid]);
 }
 
 /**