dsh-session-recall 0.2.0 → 0.3.0

package/README.md

@@ -33,7 +33,7 @@ recall({ query, session_id })            → search the events of one session
 recall({ query, limit, cursor })         → page through results
 ```
 
-Each hit carries the session id, title (best-effort), date, and a match snippet; the result renders as a native search card in the Web UI (`SearchMatchesResultView`). Because the FTS `unicode61` tokenizer indexes an uninterrupted CJK run as a single token, a short Chinese phrase inside a longer sentence would otherwise never match the index — so a zero-hit CJK query automatically falls back to an exact substring scan over session text (the `sessionQuery.filterEvents` literal text clause), and the hint reports when that path matched.
+Each hit carries the session id, title (best-effort), date, and a match snippet; the result renders as a native search card in the Web UI (`SearchMatchesResultView`). Because the FTS `unicode61` tokenizer indexes an uninterrupted CJK run as a single token, a short Chinese phrase inside a longer sentence would otherwise never match the index — so a zero-hit CJK query automatically falls back to a substring scan over session text (the `sessionQuery.filterEvents` literal text clause). Every whitespace-separated term must match, so `简历 模板` still recovers `简历模板`; the hint reports when that path matched.
 
 ## Scoping (the authorization gap)
 
@@ -89,7 +89,7 @@ Every failure returns a friendly `hint` instead of a raw exception: a disabled i
 ## Known limitations
 
 - First search after startup walks the durable logs to build the index (the tool description warns the model); subsequent searches are incremental.
-- `unicode61` matches whole tokens/phrases, not substrings — `AI` does not match `BRAID`. CJK queries that get zero full-text hits fall back to an exact substring scan (`filterEvents`), and the hint reports when that path matched; a multi-word CJK phrase still has to survive the tokenizer's whole-run indexing.
+- `unicode61` matches whole tokens/phrases, not substrings — `AI` does not match `BRAID`. CJK queries that get zero full-text hits fall back to a substring scan (`filterEvents`) whose whitespace-separated terms are ANDed, so `简历 模板` also recovers `简历模板`; the hint reports when that path matched.
 - One process must own the index file (single-writer SQLite, per the official backend).
 - Matches return transcript text verbatim — there is no credential or local-path redaction. A token or sensitive path pasted into an earlier session can be surfaced by a matching search. Default cwd scoping and `allowAllProjects: false` are the only containment; fingerprinting or redaction is future work.
 

package/README.zh.md

@@ -33,7 +33,7 @@ recall({ query, session_id })            → 只搜指定会话内的事件
 recall({ query, limit, cursor })         → 翻页
 ```
 
-每条命中带会话 id、标题（尽力补全）、日期、命中摘录；结果在 Web UI 里渲染成原生搜索卡片（`SearchMatchesResultView`）。因为 FTS 的 `unicode61` 分词器会把连续中文当成一个 token，短中文短语一旦嵌在长句里就匹配不到索引——所以 CJK 查询零命中时会自动回退到对会话文本的**精确子串扫描**（走 `sessionQuery.filterEvents` 的字面文本子句），hint 会说明这条回退路径是否命中。
+每条命中带会话 id、标题（尽力补全）、日期、命中摘录；结果在 Web UI 里渲染成原生搜索卡片（`SearchMatchesResultView`）。因为 FTS 的 `unicode61` 分词器会把连续中文当成一个 token，短中文短语一旦嵌在长句里就匹配不到索引——所以 CJK 查询零命中时会自动回退到对会话文本的子串扫描（走 `sessionQuery.filterEvents` 的字面文本子句），空格拆出的每个词都必须命中，因此 `简历 模板` 也能找回 `简历模板`；hint 会说明这条回退路径是否命中。
 
 ## 授权边界（官方明确留给工具层的责任）
 
@@ -89,7 +89,7 @@ dsh plugin --profile web add github:kittimzhe/dsh-session-recall
 ## 已知限制
 
 - 启动后第一次搜索会扫全量日志建索引（工具描述里已警告模型）；之后增量更新。
-- `unicode61` 按完整 token/短语匹配，不支持子串——`AI` 匹配不到 `BRAID`。CJK 查询零命中时会回退到精确子串扫描（`filterEvents`），hint 会说明是否命中；多词中文短语仍受"连续中文＝一个 token"的约束。
+- `unicode61` 按完整 token/短语匹配，不支持子串——`AI` 匹配不到 `BRAID`。CJK 查询零命中时会回退到子串扫描（`filterEvents`），空格分隔的各词按 AND 语义都必须命中，因此 `简历 模板` 也能找回 `简历模板`；hint 会说明是否命中。
 - 索引文件单进程独占（官方后端的单写者 SQLite 约束）。
 - 命中结果按原文照摘，**没有任何凭据或本地路径脱敏**——更早的会话里粘贴过的 token 或敏感路径可能被检索出来。目前只有默认 cwd 收窄与 `allowAllProjects: false` 两道闸；指纹识别/脱敏是后续增强。
 

package/lib/index.js

@@ -47,6 +47,10 @@ function hasCJK(text) {
 function normalizeQuery(text) {
 	return text.trim().replaceAll(/\s+/g, " ");
 }
+/** Split into whitespace-separated terms, dropping empty pieces. */
+function splitTerms(text) {
+	return text.split(/\s+/u).filter((term) => term.length > 0);
+}
 /** First line of `text` with control characters stripped, clipped to `limit` code points. */
 function firstLineClipped(text, limit) {
 	const line = text.split("\n", 1)[0] ?? "";
@@ -155,7 +159,7 @@ function cjkZeroHitHint(query, zeroHits, enabled) {
 const RECALL_TOOL_DESCRIPTION = [
 	"Search the FULL TEXT of past and current session transcripts on this machine (your own conversation history with this user).",
 	"Use it when the user refers to earlier work (\"that bug we fixed last week\", \"the font we chose for my resume\") or when prior context was compacted away.",
-	"Matches whole words/phrases for English and code identifiers; a zero-hit Chinese (CJK) query automatically falls back to an exact substring scan. Returns the best-matching event snippet per session plus the session id.",
+	"Matches whole words/phrases for English and code identifiers; a zero-hit Chinese (CJK) query automatically falls back to a substring scan in which every whitespace-separated term must match. Returns the best-matching event snippet per session plus the session id.",
 	"Then use the read tool on files, or ask the user, to go deeper — this tool only points at history, it does not resume sessions.",
 	"Scoping: by default only sessions started in the current project directory; pass all_projects=true to search everywhere.",
 	"The first search after startup may be slow while the index builds."
@@ -241,6 +245,23 @@ function eventItems(page, sessionId) {
 /** Snippet window kept consistent with the tool's text projection. */
 const CJK_SNIPPET_CHARS = 120;
 /**
+* Decompose a query into ANDed literal-text clauses. A space-separated CJK
+* query like "简历 模板" must match each term as a substring (so it recovers
+* "简历模板"), not a whitespace-joined literal (which would require the space
+* to be present verbatim). `highlight` is the first term, guaranteed present
+* whenever the ANDed scan matches.
+*/
+function cjkTextFilters(query) {
+	const terms = splitTerms(query);
+	return {
+		filters: terms.map((term) => ({
+			kind: "text",
+			text: term
+		})),
+		highlight: terms[0] ?? query
+	};
+}
+/**
 * CJK substring-scan fallback for zero-hit full-text searches. SQLite FTS5's
 * `unicode61` tokenizer treats an uninterrupted CJK run as one token, so a
 * short Chinese phrase inside a longer sentence never matches the index. The
@@ -255,10 +276,8 @@ async function cjkScanSessions(engine, query, agentCwd, wantAll, scanMax, limit,
 	const items = [];
 	for (const record of candidates.slice(0, scanMax)) {
 		if (items.length >= limit) break;
-		const docs = await engine.filterEvents(record.header.id, [{
-			kind: "text",
-			text: query
-		}]);
+		const { filters, highlight } = cjkTextFilters(query);
+		const docs = await engine.filterEvents(record.header.id, filters);
 		if (docs.length === 0) continue;
 		const doc = docs[0];
 		if (doc === void 0) continue;
@@ -274,7 +293,7 @@ async function cjkScanSessions(engine, query, agentCwd, wantAll, scanMax, limit,
 				seq: doc.seq,
 				type: doc.type,
 				time: doc.time,
-				snippet: snippetAround(doc.text, query, CJK_SNIPPET_CHARS)
+				snippet: snippetAround(doc.text, highlight, CJK_SNIPPET_CHARS)
 			}
 		});
 	}
@@ -390,10 +409,8 @@ function createRecallTool(config, engine) {
 					let items = eventItems(page, sessionId);
 					let hint = null;
 					if (items.length === 0 && hasCJK(query) && cfg.cjkFallback) {
-						const docs = await engine.filterEvents(sessionId, [{
-							kind: "text",
-							text: query
-						}]);
+						const { filters, highlight } = cjkTextFilters(query);
+						const docs = await engine.filterEvents(sessionId, filters);
 						if (docs.length > 0) items = docs.slice(0, limit).map((doc) => ({
 							sessionId,
 							id8: id8(sessionId),
@@ -406,7 +423,7 @@ function createRecallTool(config, engine) {
 								seq: doc.seq,
 								type: doc.type,
 								time: doc.time,
-								snippet: snippetAround(doc.text, query, CJK_SNIPPET_CHARS)
+								snippet: snippetAround(doc.text, highlight, CJK_SNIPPET_CHARS)
 							}
 						}));
 						hint = items.length > 0 ? cjkFallbackHint(items.length, cfg.cjkHint) : cjkZeroHitHint(query, true, cfg.cjkHint);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-session-recall",
   "description": "Cross-session full-text recall for DeepSeek Harness: the model-facing `recall` tool searches past session transcripts through ctx.sessionQuery",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },