pi-session-peek 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.1
+
+- `scanSessions` is now async: directory walking and file reads go through `fs/promises` with bounded concurrency, so opening `/peek` with hundreds of sessions no longer blocks the TUI.
+- Sessions no longer keep a second, lowercased copy of their full text for searching. Keyword filtering runs case-insensitive regexes over the messages directly, which roughly halves memory per cached session and is faster than the old `toLowerCase().includes()` scan.
+
 ## 0.3.0
 
 - Ctrl+D now prefers the system trash on every platform instead of only the `trash` CLI: Windows Recycle Bin via PowerShell, Finder on macOS, `gio trash` / `trash-put` on Linux. The file is deleted permanently only when none of them works, and the notification says which one happened.

package/index.ts

@@ -54,7 +54,7 @@ export default function (pi: ExtensionAPI) {
 
       // 当前正在用的会话不列出来
       const currentFile = ctx.sessionManager.getSessionFile();
-      const all = scanSessions().filter((s) => s.path !== currentFile);
+      const all = (await scanSessions()).filter((s) => s.path !== currentFile);
       if (!all.length) {
         ctx.ui.notify(msg("noSessions"), "info");
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-session-peek",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Pi extension: search session history in a two-pane picker with full conversation preview, then resume or fork.",
   "type": "module",
   "license": "MIT",

package/src/peek-component.ts

@@ -10,7 +10,7 @@ import {
   type MarkdownTheme,
 } from "@earendil-works/pi-tui";
 import { msg } from "./i18n.ts";
-import { anyKw, highlight, lineHasKw, parseQuery, snippet, type ParsedQuery } from "./query.ts";
+import { anyKw, highlight, kwRegExps, lineHasKw, matchesSession, parseQuery, snippet, type ParsedQuery } from "./query.ts";
 import type { PeekMsg, PeekSession } from "./sessions.ts";
 import { fmtTime, normPath, padEndVisible } from "./text.ts";
 
@@ -90,7 +90,10 @@ export class PeekComponent implements Component, Focusable {
     let out = this.all;
     if (this.scope === "current") out = out.filter((s) => this.inCurrentTree(s));
     if (since) out = out.filter((s) => s.mtime >= since);
-    if (kws.length) out = out.filter((s) => kws.every((k) => s.searchText.includes(k)));
+    if (kws.length) {
+      const res = kwRegExps(kws);
+      out = out.filter((s) => matchesSession(s, res));
+    }
     this.filtered = out;
     const idx = prev ? out.indexOf(prev) : -1;
     this.selected = idx >= 0 ? idx : keepSelection ? Math.min(this.selected, Math.max(0, out.length - 1)) : 0;
@@ -117,7 +120,6 @@ export class PeekComponent implements Component, Focusable {
             if (ok) {
               s.name = name;
               // 名字参与搜索，改完可能就不再匹配当前关键词了
-              s.searchText = (s.msgs.map((m) => m.text).join(" ") + " " + name + " " + s.cwd).toLowerCase();
               this.refilter(true);
             }
             this.invalidate();

package/src/query.ts

@@ -1,5 +1,5 @@
 import { msg, type MsgKey } from "./i18n.ts";
-import type { PeekMsg } from "./sessions.ts";
+import type { PeekMsg, PeekSession } from "./sessions.ts";
 
 // 搜索框语法：空格分隔多个词，都要命中；@7d / @24h / @2w / @1m 限定最近活动时间
 
@@ -33,6 +33,16 @@ export function parseQuery(q: string): ParsedQuery {
   return { kws, since, sinceLabel };
 }
 
+// 关键词转成不区分大小写的正则，列表过滤用。正文不预存小写副本，直接在原文上匹配
+export function kwRegExps(kws: string[]): RegExp[] {
+  return kws.map((k) => new RegExp(k.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "i"));
+}
+
+// 每个关键词都要在会话名、cwd 或某条消息里出现
+export function matchesSession(s: PeekSession, res: RegExp[]): boolean {
+  return res.every((re) => re.test(s.name) || re.test(s.cwd) || s.msgs.some((m) => re.test(m.text)));
+}
+
 // 单条消息用：命中任意一个关键词就算
 export function anyKw(lower: string, kws: string[]): boolean {
   for (const k of kws) if (lower.includes(k)) return true;

package/src/sessions.ts

@@ -1,9 +1,11 @@
-import { appendFileSync, existsSync, readdirSync, readFileSync, rmSync, statSync } from "node:fs";
+import { appendFileSync, existsSync, readFileSync, rmSync } from "node:fs";
+import { readdir, readFile, stat } from "node:fs/promises";
 import { randomBytes } from "node:crypto";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
-// 读 ~/.pi/agent/sessions 下的会话 JSONL，按 mtime 缓存；重命名和删除也在这里
+// 读 ~/.pi/agent/sessions 下的会话 JSONL，按 mtime 缓存；重命名和删除也在这里。
+// 搜索不预存小写全文：会话正文只在 msgs 里放一份，匹配时用不区分大小写的正则直接扫（见 query.ts 的 matchesSession）
 
 export interface PeekMsg {
   role: "user" | "assistant";
@@ -17,11 +19,11 @@ export interface PeekSession {
   name: string; // 最后一条 session_info 里的名字，没有则为空
   first: string; // 首条消息，列表里显示用
   msgs: PeekMsg[];
-  searchText: string; // 正文 + 会话名 + cwd，已小写
   mtime: number;
 }
 
 const sessionCache = new Map<string, PeekSession>();
+const READ_CONCURRENCY = 16; // 同时读的文件数，太高会把 libuv 线程池排满
 
 // 和 pi 一样认 PI_CODING_AGENT_DIR
 function sessionsDir(): string {
@@ -30,17 +32,17 @@ function sessionsDir(): string {
   return join(agent, "sessions");
 }
 
-function* walkJsonl(dir: string): Generator<string> {
+async function walkJsonl(dir: string, out: string[]): Promise<void> {
   let entries;
   try {
-    entries = readdirSync(dir, { withFileTypes: true });
+    entries = await readdir(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const e of entries) {
     const p = join(dir, e.name);
-    if (e.isDirectory()) yield* walkJsonl(p);
-    else if (e.name.endsWith(".jsonl")) yield p;
+    if (e.isDirectory()) await walkJsonl(p, out);
+    else if (e.name.endsWith(".jsonl")) out.push(p);
   }
 }
 
@@ -53,13 +55,7 @@ function extractText(content: unknown): string {
     .join("\n");
 }
 
-function parseSession(path: string, mtime: number): PeekSession | null {
-  let raw: string;
-  try {
-    raw = readFileSync(path, "utf8");
-  } catch {
-    return null;
-  }
+function parseSession(path: string, raw: string, mtime: number): PeekSession | null {
   let cwd = "";
   let time = "";
   let name = "";
@@ -101,36 +97,48 @@ function parseSession(path: string, mtime: number): PeekSession | null {
     msgs,
     mtime,
     first: msgs[0].text.replace(/\s+/g, " ").slice(0, 80),
-    searchText: (msgs.map((m) => m.text).join(" ") + " " + name + " " + cwd).toLowerCase(),
   };
 }
 
-/** 全部会话，按最后修改时间倒序；文件没变的直接用缓存 */
-export function scanSessions(): PeekSession[] {
-  const seen = new Set<string>();
-  const out: PeekSession[] = [];
+// 单个文件：mtime 没变直接用缓存，否则重新读和解析
+async function loadSession(file: string): Promise<PeekSession | null> {
+  let mtime: number;
+  try {
+    mtime = (await stat(file)).mtimeMs;
+  } catch {
+    return null;
+  }
+  const hit = sessionCache.get(file);
+  if (hit && hit.mtime === mtime) return hit;
+  let raw: string;
+  try {
+    raw = await readFile(file, "utf8");
+  } catch {
+    return null;
+  }
+  const parsed = parseSession(file, raw, mtime);
+  if (parsed) sessionCache.set(file, parsed);
+  return parsed;
+}
 
-  for (const file of walkJsonl(sessionsDir())) {
-    seen.add(file);
-    let mtime = 0;
-    try {
-      mtime = statSync(file).mtimeMs;
-    } catch {
-      continue;
-    }
-    const hit = sessionCache.get(file);
-    if (hit && hit.mtime === mtime) {
-      out.push(hit);
-      continue;
-    }
-    const parsed = parseSession(file, mtime);
-    if (parsed) {
-      sessionCache.set(file, parsed);
-      out.push(parsed);
+/** 全部会话，按最后修改时间倒序；文件没变的直接用缓存。
+ * 目录遍历和文件读取都走异步 I/O，几百个会话也不会把 TUI 卡住 */
+export async function scanSessions(): Promise<PeekSession[]> {
+  const files: string[] = [];
+  await walkJsonl(sessionsDir(), files);
+
+  const out: PeekSession[] = [];
+  let next = 0;
+  const worker = async () => {
+    while (next < files.length) {
+      const s = await loadSession(files[next++]);
+      if (s) out.push(s);
     }
-  }
+  };
+  await Promise.all(Array.from({ length: Math.min(READ_CONCURRENCY, files.length) }, worker));
 
   // 文件已经不在了的，从缓存里去掉
+  const seen = new Set(files);
   for (const key of [...sessionCache.keys()]) {
     if (!seen.has(key)) sessionCache.delete(key);
   }