@xopcai/xopc 0.0.409 → 0.0.410

package/dist/src/storage/sqlite/fts.js

@@ -7,10 +7,19 @@ function escapeFts5Query(raw) {
 	return `"${trimmed.replace(/"/g, "\"\"")}"`;
 }
 /** Build a syntax-safe, recall-oriented query for natural-language memory search. */
-function buildFts5SearchQuery(raw) {
+function sessionSearchTerms(raw) {
 	const terms = raw.normalize("NFKC").match(/[\p{L}\p{N}_]+/gu)?.map((term) => term.toLowerCase()).filter((term) => term.length > 1 && !FTS_SEARCH_STOP_WORDS.has(term));
-	if (!terms?.length) return escapeFts5Query(raw);
-	return [...new Set(terms)].slice(0, 12).map((term) => escapeFts5Query(term)).join(" OR ");
+	return [...new Set(terms?.length ? terms : [raw.trim()])].slice(0, 12);
+}
+function buildFts5SearchQuery(raw) {
+	return sessionSearchTerms(raw).map(escapeFts5Query).join(" OR ");
+}
+/** unicode61 does not split Han words; use literal substrings for those terms. */
+function sessionHanSearchTerms(raw) {
+	return sessionSearchTerms(raw).filter((term) => /\p{Script=Han}/u.test(term));
+}
+function escapeSqlLike(raw) {
+	return raw.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
 }
 /** Normalize FTS5 BM25 ranks, where a more-negative rank is a better match. */
 function fts5RankToScore(rank, bestRank, worstRank) {
@@ -61,4 +70,4 @@ var init_fts = __esmMin((() => {
 }));
 //#endregion
 init_fts();
-export { buildFts5SearchQuery, escapeFts5Query, fts5RankToScore, init_fts };
+export { buildFts5SearchQuery, escapeFts5Query, escapeSqlLike, fts5RankToScore, init_fts, sessionHanSearchTerms, sessionSearchTerms };

package/dist/src/storage/sqlite/session-repository.js

@@ -10,7 +10,7 @@ import { buildGlobalSessionStats, init_row_mappers, metadataToSessionInsert, ses
 import { cancelConnectionObjective, init_connection_wait_repository } from "./connection-wait-repository.js";
 import { init_changes, notifyUserContextChange } from "../../user-context/changes.js";
 import { SESSION_PURPOSE_SQL, SESSION_SOURCE_SQL, init_session_identity_sql } from "./session-identity-sql.js";
-import { buildFts5SearchQuery, init_fts } from "./fts.js";
+import { buildFts5SearchQuery, escapeSqlLike, init_fts, sessionHanSearchTerms } from "./fts.js";
 import { SESSION_COLUMNS, SESSION_FROM_JOIN, getSessionMetadata, init_session_read_repository, readSessionRow } from "./session-read-repository.js";
 import { randomUUID } from "node:crypto";
 //#region src/storage/sqlite/session-repository.ts
@@ -166,14 +166,17 @@ function listSessionMetadata(query = {}) {
 	if (query.search?.trim()) {
 		const rawSearch = query.search.trim();
 		const like = `%${rawSearch.toLowerCase()}%`;
+		const hanTerms = sessionHanSearchTerms(rawSearch);
 		conditions.push(`(s.conversation_id IN (
       SELECT conversation_id FROM transcript_fts WHERE transcript_fts MATCH ?
-    ) OR LOWER(s.conversation_id) LIKE ?
+    ) ${hanTerms.length ? `OR s.conversation_id IN (
+      SELECT conversation_id FROM transcript_fts WHERE ${hanTerms.map(() => "content LIKE ? ESCAPE '\\'").join(" OR ")}
+    )` : ""} OR LOWER(s.conversation_id) LIKE ?
       OR LOWER(COALESCE(s.name, '')) LIKE ?
       OR LOWER(s.source_channel) LIKE ?
       OR LOWER(s.source_chat_id) LIKE ?
       OR LOWER(s.tags_json) LIKE ?)`);
-		params.push(buildFts5SearchQuery(rawSearch), like, like, like, like, like);
+		params.push(buildFts5SearchQuery(rawSearch), ...hanTerms.map((term) => `%${escapeSqlLike(term)}%`), like, like, like, like, like);
 	}
 	const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 	const sortColumn = sessionSortColumn(query.sortBy);

package/dist/src/storage/sqlite/transcript-repository.d.ts

@@ -34,6 +34,7 @@ export declare function searchSessionTranscript(conversationId: string, query: s
     limit?: number;
     beforeSeq?: number;
     orderBySeq?: boolean;
+    matchMode?: 'keyword' | 'phrase';
 }): SessionTranscriptRecallMatch[];
 export declare function loadTranscriptRowsForSession(conversationId: string): TranscriptStoredRow[];
 export declare function loadTranscriptHistoryRowsForSession(conversationId: string): TranscriptStoredRow[];

package/dist/src/storage/sqlite/transcript-repository.js

@@ -3,7 +3,7 @@ import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "
 import { readCurrentTranscriptId } from "./session-instance-repository.js";
 import { buildSessionContextForLlm, init_session_context_for_llm, isRuntimeOnlyTranscriptMessage } from "../../session/session-context-for-llm.js";
 import { classifyStoredRow, estimateTokensFromMessages, extractFtsContent, init_row_mappers, transcriptEntryRowToStoredRow } from "./row-mappers.js";
-import { escapeFts5Query, init_fts } from "./fts.js";
+import { buildFts5SearchQuery, escapeFts5Query, escapeSqlLike, init_fts, sessionHanSearchTerms } from "./fts.js";
 import { getCurrentTranscriptId, init_session_repository } from "./session-repository.js";
 import { createHash, randomUUID } from "node:crypto";
 //#region src/storage/sqlite/transcript-repository.ts
@@ -167,25 +167,27 @@ function searchSessionTranscript(conversationId, query, options = {}) {
 	const limit = Math.min(20, Math.max(1, options.limit ?? 8));
 	const beforeSeq = options.beforeSeq ?? Number.MAX_SAFE_INTEGER;
 	const db = getSqliteDatabase();
+	const phrase = options.matchMode !== "keyword";
+	const hanTerms = phrase ? [] : sessionHanSearchTerms(normalized);
 	const ftsRows = db.prepare(`SELECT e.entry_id, e.seq, e.role, e.created_at, f.content
        FROM transcript_fts f
        JOIN transcript_entries e
          ON e.transcript_id = f.transcript_id AND e.entry_id = f.entry_id
-       WHERE transcript_fts MATCH ?
+       WHERE (transcript_fts MATCH ?)
          AND f.transcript_id = ?
          AND e.entry_kind <> 'compaction'
          AND e.seq < ?
        ORDER BY ${options.orderBySeq ? "e.seq DESC" : "bm25(transcript_fts), e.seq DESC"}
-       LIMIT ?`).all(escapeFts5Query(normalized), transcriptId, beforeSeq, limit);
-	const escapedLike = normalized.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
-	const literalRows = db.prepare(`SELECT entry_id, seq, role, created_at, payload_json AS content
-       FROM transcript_entries
-       WHERE transcript_id = ?
-         AND entry_kind <> 'compaction'
-         AND seq < ?
-         AND payload_json LIKE ? ESCAPE '\\'
-       ORDER BY seq DESC
-       LIMIT ?`).all(transcriptId, beforeSeq, `%${escapedLike}%`, limit);
+       LIMIT ?`).all(phrase ? escapeFts5Query(normalized) : buildFts5SearchQuery(normalized), transcriptId, beforeSeq, limit);
+	const literalTerms = [normalized, ...hanTerms];
+	const literalRows = phrase ? db.prepare(`SELECT entry_id, seq, role, created_at, payload_json AS content
+    FROM transcript_entries WHERE transcript_id = ? AND entry_kind <> 'compaction' AND seq < ?
+      AND payload_json LIKE ? ESCAPE '\\' ORDER BY seq DESC LIMIT ?`).all(transcriptId, beforeSeq, `%${escapeSqlLike(normalized)}%`, limit) : db.prepare(`SELECT e.entry_id, e.seq, e.role, e.created_at, f.content
+    FROM transcript_fts f JOIN transcript_entries e
+      ON e.transcript_id = f.transcript_id AND e.entry_id = f.entry_id
+    WHERE f.transcript_id = ? AND e.entry_kind <> 'compaction' AND e.seq < ?
+      AND (${literalTerms.map(() => "f.content LIKE ? ESCAPE '\\'").join(" OR ")})
+    ORDER BY e.seq DESC LIMIT ?`).all(transcriptId, beforeSeq, ...literalTerms.map((term) => `%${escapeSqlLike(term)}%`), limit);
 	const seen = /* @__PURE__ */ new Set();
 	const matches = [...ftsRows, ...literalRows].flatMap((row) => {
 		const result = row;

package/dist/src/user-model/capture/semantic.d.ts

@@ -34,6 +34,23 @@ export interface ParsedCollaborationRuleCandidate {
 }
 export interface UserModelInterpretation {
     knowledge?: WorkCandidate[];
+    knowledgeDeletions?: Array<{
+        targetKnowledgeIds: string[];
+        boundary: string;
+        reread?: {
+            subject: string;
+            property: 'date_time' | 'price';
+        };
+        evidenceRefs: string[];
+        evidence: Array<{
+            ref: string;
+            quote: string;
+        }>;
+        retained?: Array<{
+            targetKnowledgeId: string;
+            spans: string[];
+        }>;
+    }>;
     intent: UserModelCaptureIntent;
     assertions: ParsedAssertionOperation[];
     goals?: ParsedGoalCandidate[];
@@ -48,4 +65,4 @@ export interface InterpretationParseFailure {
         code: string;
     }>;
 }
-export declare function parseUserModelInterpretation(raw: string, evidence: CaptureEvidence[], allowedTargetIds?: string[], onInvalid?: (failure: InterpretationParseFailure) => void): UserModelInterpretation | null;
+export declare function parseUserModelInterpretation(raw: string, evidence: CaptureEvidence[], allowedTargetIds?: string[], onInvalid?: (failure: InterpretationParseFailure) => void, allowedKnowledgeIds?: string[]): UserModelInterpretation | null;

package/dist/src/user-model/capture/semantic.js

@@ -154,6 +154,18 @@ const CollaborationRuleSchema = z.object({
 }).merge(GroundingSchema).strict();
 const InterpretationSchema = z.object({
 	knowledge: z.array(WorkCandidateSchema).max(8).default([]),
+	knowledgeDeletions: z.array(z.object({
+		targetKnowledgeIds: z.array(z.string().min(1)).min(1).max(16),
+		boundary: z.string().min(4).max(600),
+		reread: z.object({
+			subject: z.string().min(1).max(160),
+			property: z.enum(["date_time", "price"])
+		}).strict().optional(),
+		retained: z.array(z.object({
+			targetKnowledgeId: z.string().min(1),
+			spans: z.array(z.string().min(1).max(600)).min(1).max(8)
+		}).strict()).max(8).default([])
+	}).merge(GroundingSchema).strict()).max(4).default([]),
 	intent: z.enum(USER_MODEL_CAPTURE_INTENTS),
 	assertions: z.array(AssertionOperationSchema).max(8),
 	goals: z.array(GoalSchema).max(4).default([]),
@@ -184,7 +196,7 @@ function groundedEvidenceRefs(item, evidenceByRef) {
 		return source?.role === "user" && comparable(source.text).includes(comparable(claim.quote));
 	}) ? [...new Set(item.evidence.map((claim) => claim.ref))] : void 0;
 }
-function parseUserModelInterpretation(raw, evidence, allowedTargetIds = [], onInvalid) {
+function parseUserModelInterpretation(raw, evidence, allowedTargetIds = [], onInvalid, allowedKnowledgeIds = []) {
 	if (!raw.trim()) {
 		onInvalid?.({
 			reason: "empty_output",
@@ -296,6 +308,19 @@ function parseUserModelInterpretation(raw, evidence, allowedTargetIds = [], onIn
 	});
 	return {
 		knowledge: parsed.knowledge,
+		knowledgeDeletions: parsed.knowledgeDeletions.flatMap((item) => {
+			const evidenceRefs = groundedEvidenceRefs(item, evidenceByRef);
+			if (!evidenceRefs || (item.intent ?? parsed.intent) !== "forget") return [];
+			const targetKnowledgeIds = [...new Set(item.targetKnowledgeIds.filter((id) => allowedKnowledgeIds.includes(id)))];
+			return targetKnowledgeIds.length ? [{
+				targetKnowledgeIds,
+				boundary: item.boundary,
+				evidenceRefs,
+				evidence: item.evidence,
+				retained: item.retained.filter((retained) => targetKnowledgeIds.includes(retained.targetKnowledgeId)),
+				...item.reread && item.evidence.some((claim) => claim.quote.includes(item.reread.subject)) ? { reread: item.reread } : {}
+			}] : [];
+		}),
 		intent: parsed.intent,
 		assertions,
 		goals,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xopcai/xopc",
-  "version": "0.0.409",
+  "version": "0.0.410",
   "description": "Local-first personal AI with Ada, task delegation, files, projects, workflows, and automations. Use cloud or local models.",
   "type": "module",
   "main": "dist/src/index.js",
@@ -170,12 +170,12 @@
     "xlsx": "file:web/vendor/xlsx-0.20.3.tgz",
     "@xopcai/browser-control-contract": "0.1.0",
     "@xopcai/computer-control-contract": "0.1.0",
-    "@xopcai/endpoint-tools-client": "0.0.0",
     "@xopcai/endpoint-tools-protocol": "0.0.0",
     "@xopcai/gateway-contract": "0.0.0",
     "@xopcai/image-providers": "0.1.0",
     "@xopcai/realtime-client": "0.0.0",
-    "@xopcai/realtime-protocol": "0.0.0"
+    "@xopcai/realtime-protocol": "0.0.0",
+    "@xopcai/endpoint-tools-client": "0.0.0"
   },
   "scripts": {
     "generate:device-tools": "tsx scripts/devices/generate-mobile-tools.mts",