@linxiraos/pi-mnemopi 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+## [1.1.7] - 2026-09-01
+
+- 同步上游 OMP v18.0.11（`b8ce33a58911c26bed1d84f0db9a5e2e727c49a2`）。
+
+## [1.1.6] - 2026-08-30
+
+- 同步上游 OMP v18.0.9（`cc14e04f075d`）。
+
 ## [1.1.5] - 2026-08-26
 
 - 随 1.1.5 版本线对齐发布：OMP v18.0.6 同步未触及本包，无独立功能变更。

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@linxiraos/pi-mnemopi",
-	"version": "1.1.5",
+	"version": "1.1.7",
 	"description": "Local SQLite memory engine for Oh My Pi agents",
 	"homepage": "https://linxira-os.github.io/zeta/",
 	"author": "Can Boluk",
@@ -39,10 +39,10 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@linxiraos/pi-ai": "1.1.5",
-		"@linxiraos/pi-catalog": "1.1.5",
-		"@linxiraos/pi-natives": "1.1.5",
-		"@linxiraos/pi-utils": "1.1.5"
+		"@linxiraos/pi-ai": "1.1.7",
+		"@linxiraos/pi-catalog": "1.1.7",
+		"@linxiraos/pi-natives": "1.1.7",
+		"@linxiraos/pi-utils": "1.1.7"
 	},
 	"peerDependencies": {
 		"fastembed": "2.1.0",

package/src/core/beam/helpers.ts

@@ -270,8 +270,9 @@ export function cjkLikeSearch(
 	const conditions = cjkChars.map(() => "content LIKE ? ESCAPE '\\'").join(" OR ");
 	try {
 		const rows = db
-			.query(`SELECT ${idColumn}, content FROM ${table} WHERE ${conditions} LIMIT ?`)
-			.all(...cjkChars.map(ch => `%${ch}%`), k * 5) as Record<string, unknown>[];
+			.query(`SELECT ${idColumn}, content FROM ${table} WHERE superseded_by IS NULL AND (valid_until IS NULL OR valid_until > ?)
+				   AND (${conditions}) LIMIT ?`)
+			.all(new Date().toISOString(), ...cjkChars.map(ch => `%${ch}%`), k * 5) as Record<string, unknown>[];
 		const scored: Array<{ id: string | number; score: number }> = [];
 		for (const row of rows) {
 			const content = String(row.content ?? "");
@@ -296,8 +297,12 @@ export function ftsSearch(db: Database, query: string, k = 20): FtsRankResult[]
 	if (!ftsQuery) return hasCjk(query) ? (cjkLikeSearch(db, query, k, false) as FtsRankResult[]) : [];
 	try {
 		const rows = db
-			.query("SELECT rowid, rank FROM fts_episodes WHERE fts_episodes MATCH ? ORDER BY rank, rowid LIMIT ?")
-			.all(ftsQuery, k) as Record<string, unknown>[];
+			.query(`SELECT f.rowid, f.rank FROM fts_episodes f
+				 WHERE f.fts_episodes MATCH ?
+				   AND EXISTS (SELECT 1 FROM episodic_memory e WHERE e.rowid = f.rowid AND e.superseded_by IS NULL
+			       AND (e.valid_until IS NULL OR e.valid_until > ?))
+				 ORDER BY f.rank, f.rowid LIMIT ?`)
+			.all(ftsQuery, new Date().toISOString(), k) as Record<string, unknown>[];
 		if (rows.length === 0 && hasCjk(query)) return cjkLikeSearch(db, query, k, false) as FtsRankResult[];
 		return rows.map(row => ({ rowid: Number(row.rowid), rank: Number(row.rank) }));
 	} catch {
@@ -310,8 +315,12 @@ export function ftsSearchWorking(db: Database, query: string, k = 20): WorkingFt
 	if (!ftsQuery) return hasCjk(query) ? (cjkLikeSearch(db, query, k, true) as WorkingFtsRankResult[]) : [];
 	try {
 		const rows = db
-			.query("SELECT id, rank FROM fts_working WHERE fts_working MATCH ? ORDER BY rank, id LIMIT ?")
-			.all(ftsQuery, k) as Record<string, unknown>[];
+			.query(`SELECT f.id, f.rank FROM fts_working f
+				 WHERE f.fts_working MATCH ?
+				   AND EXISTS (SELECT 1 FROM working_memory w WHERE w.id = f.id AND w.superseded_by IS NULL
+				       AND (w.valid_until IS NULL OR w.valid_until > ?))
+				 ORDER BY f.rank, f.id LIMIT ?`)
+			.all(ftsQuery, new Date().toISOString(), k) as Record<string, unknown>[];
 		if (rows.length === 0 && hasCjk(query)) return cjkLikeSearch(db, query, k, true) as WorkingFtsRankResult[];
 		return rows.map(row => ({ id: String(row.id), rank: Number(row.rank) }));
 	} catch {

package/src/core/beam/recall.ts

@@ -545,16 +545,31 @@ function ftsRows(
 ): Row[] {
 	if (!tableExists(beam, table)) return [];
 	try {
+		// Superseded rows stay in the FTS mirrors (their content never changed) but must not
+		// occupy LIMIT slots — visibility filtering would drop them AFTER they displaced live rows.
 		if (table === "fts_working") {
-			return queryAll(beam, "SELECT id, rank FROM fts_working WHERE fts_working MATCH ? ORDER BY rank, id LIMIT ?", [
-				ftsQuery(query, useSynonyms),
-				limit,
-			]);
+			return queryAll(
+				beam,
+				// Correlated EXISTS, never `id IN (SELECT ...)`: the IN form makes SQLite build a
+				// LIST SUBQUERY over the whole live table on every lexical recall, before the small
+				// LIMIT applies. Measured on a 40k-row bank with a selective query: 9.19ms vs
+				// 0.042ms. EXISTS probes the primary key only for rows MATCH actually produced.
+				`SELECT f.id, f.rank FROM fts_working f
+				 WHERE f.fts_working MATCH ?
+				   AND EXISTS (SELECT 1 FROM working_memory w WHERE w.id = f.id AND w.superseded_by IS NULL
+				       AND (w.valid_until IS NULL OR w.valid_until > ?))
+				 ORDER BY f.rank, f.id LIMIT ?`,
+				[ftsQuery(query, useSynonyms), nowIso(), limit],
+			);
 		}
 		return queryAll(
 			beam,
-			"SELECT rowid, rank FROM fts_episodes WHERE fts_episodes MATCH ? ORDER BY rank, rowid LIMIT ?",
-			[ftsQuery(query, useSynonyms), limit],
+			`SELECT f.rowid, f.rank FROM fts_episodes f
+			 WHERE f.fts_episodes MATCH ?
+			   AND EXISTS (SELECT 1 FROM episodic_memory e WHERE e.rowid = f.rowid AND e.superseded_by IS NULL
+			       AND (e.valid_until IS NULL OR e.valid_until > ?))
+			 ORDER BY f.rank, f.rowid LIMIT ?`,
+			[ftsQuery(query, useSynonyms), nowIso(), limit],
 		);
 	} catch {
 		return [];