pi-session-peek 0.2.1 → 0.3.1

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, 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);
   }
@@ -167,19 +175,43 @@ export function renameSession(path: string, name: string): void {
   appendFileSync(path, sep + JSON.stringify(entry) + "\n", "utf8");
 }
 
-// 先试 trash（能恢复），不行再直接删。trashExec 由调用方传入，方便测试
+export type DeleteResult = "trash" | "rm" | false;
+
+// 各平台把文件送进回收站的命令，按顺序试。trash（trash-cli / brew trash）放最前面，装了就说明用户想用它；
+// 后面是系统自带的途径：Windows 走 PowerShell 的 VisualBasic FileSystem，macOS 走 Finder，Linux 走 gio / trash-put
+export function trashCommands(path: string, platform: NodeJS.Platform = process.platform): [string, string[]][] {
+  const cmds: [string, string[]][] = [["trash", [path]]];
+  if (platform === "win32") {
+    const script =
+      "Add-Type -AssemblyName Microsoft.VisualBasic; " +
+      `[Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile('${path.replace(/'/g, "''")}', 'OnlyErrorDialogs', 'SendToRecycleBin')`;
+    const args = ["-NoProfile", "-NonInteractive", "-Command", script];
+    cmds.push(["powershell", args], ["pwsh", args]);
+  } else if (platform === "darwin") {
+    cmds.push(["osascript", ["-e", `tell application "Finder" to delete POSIX file "${path.replace(/[\\"]/g, "\\$&")}"`]]);
+  } else {
+    cmds.push(["gio", ["trash", path]], ["trash-put", [path]]);
+  }
+  return cmds;
+}
+
+// 优先进回收站（能恢复），每个途径都不行再直接删。exec 由调用方传入，方便测试；
+// 命令退出码为 0 但文件还在也当失败，继续试下一个
 export async function deleteSession(
   path: string,
-  trashExec: (cmd: string, args: string[]) => Promise<{ code: number }>,
-): Promise<boolean> {
-  try {
-    const r = await trashExec("trash", [path]);
-    if (r.code === 0) return true;
-  } catch {
+  exec: (cmd: string, args: string[]) => Promise<{ code: number }>,
+  platform: NodeJS.Platform = process.platform,
+): Promise<DeleteResult> {
+  for (const [cmd, args] of trashCommands(path, platform)) {
+    try {
+      const r = await exec(cmd, args);
+      if (r.code === 0 && !existsSync(path)) return "trash";
+    } catch {
+    }
   }
   try {
     rmSync(path, { force: true });
-    return true;
+    return "rm";
   } catch {
     return false;
   }