pi-session-peek 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.1
+
+- Terminal escape sequences and control characters in message text, tool arguments and session names are stripped when parsing, so a pasted colour dump or an OSC sequence in a reply can no longer break the preview layout or reach the terminal.
+- While a delete or rename is still running, `Ctrl+D`, `Ctrl+R`, `Enter`, `Ctrl+O` and double-click are ignored, so the same file cannot be deleted twice or resumed mid-delete.
+- Delete: if a trash command times out but the file is already gone, the result is reported as "moved to trash" instead of falling through to a permanent delete.
+- The scan follows the session directory pi is actually using (`--session-dir`, `$PI_CODING_AGENT_SESSION_DIR` or `sessionDir` in settings), and forks are written there too. With the default layout all projects are still listed.
+- The parse cache is keyed on file size as well as mtime, so two quick writes within the same timestamp tick no longer serve stale content.
+- Rename strips newlines from the new name, matching pi's own `/name`, so the appended record always stays on one line.
+
 ## 0.5.0
 
 - Mouse support in both panes. Click a session to select it, double-click to resume, wheel over the list to move the selection, wheel over the preview to scroll it (`Alt` for five times faster), click the scope label to toggle it, click the search box or rename line to move the cursor. Pi only enables mouse reporting in fullscreen mode, so in the regular mode the picker turns it on itself while open and locates itself on screen with a cursor position query; the terminal's own text selection is unavailable meanwhile (usually `Shift` restores it). `PI_SESSION_PEEK_MOUSE=0` disables it.

package/README.md

@@ -128,7 +128,7 @@ On Windows PowerShell: `$env:PI_SESSION_PEEK_LANG = "en"` before starting pi. Th
 - The mouse needs a terminal that supports SGR mouse reporting and the cursor position report (`CSI 6 n`). Windows Terminal, iTerm2, kitty, WezTerm, Alacritty, GNOME Terminal and VS Code all do; the legacy Windows console does not.
 - The preview shows the last 500 messages of very long sessions. Hits in earlier messages are still counted and announced.
 - `pi --peek` without a value is rejected by pi at startup. Use `pi --rp` to open without a keyword.
-- Only sessions under `~/.pi/agent/sessions` (or `$PI_CODING_AGENT_DIR/sessions`) are scanned.
+- With the default layout every project under `~/.pi/agent/sessions` (or `$PI_CODING_AGENT_DIR/sessions`) is scanned. If pi runs with a custom session directory (`--session-dir`, `$PI_CODING_AGENT_SESSION_DIR` or `sessionDir` in settings), only that directory is scanned and forks are written there.
 
 ## 🗂️ Package layout
 

package/README.zh-CN.md

@@ -128,7 +128,7 @@ Windows PowerShell 里先执行 `$env:PI_SESSION_PEEK_LANG = "en"` 再启动 pi
 - 鼠标需要终端支持 SGR 鼠标上报和光标位置回报（`CSI 6 n`）。Windows Terminal、iTerm2、kitty、WezTerm、Alacritty、GNOME Terminal、VS Code 都支持，老式 Windows 控制台不支持。
 - 特别长的会话预览只显示最后 500 条消息，更早的命中仍会计数并提示。
 - `pi --peek` 不带值会被 pi 在启动时拒绝，不带关键词请用 `pi --rp`。
-- 只扫描 `~/.pi/agent/sessions`（或 `$PI_CODING_AGENT_DIR/sessions`）下的会话。
+- pi 默认布局下扫描 `~/.pi/agent/sessions`（或 `$PI_CODING_AGENT_DIR/sessions`）下所有项目的会话。pi 用了自定义会话目录（`--session-dir`、`$PI_CODING_AGENT_SESSION_DIR` 或 settings 里的 `sessionDir`）时只扫描那个目录，分叉也写到那里。
 
 ## 🗂️ 目录结构
 

package/index.ts

@@ -3,7 +3,7 @@ import { basename } from "node:path";
 import { msg } from "./src/i18n.ts";
 import { attachMouse } from "./src/mouse.ts";
 import { PeekComponent } from "./src/peek-component.ts";
-import { deleteSession, renameSession, scanSessions, type PeekSession } from "./src/sessions.ts";
+import { deleteSession, renameSession, scanRoot, scanSessions, sessionsDir, type PeekSession } from "./src/sessions.ts";
 
 // 这里只做注册：/peek 命令、--peek / --rp 启动参数，以及把删除 / 重命名 / 分叉注入给组件
 
@@ -55,7 +55,10 @@ export default function (pi: ExtensionAPI) {
 
       // 当前正在用的会话不列出来
       const currentFile = ctx.sessionManager.getSessionFile();
-      const all = (await scanSessions()).filter((s) => s.path !== currentFile);
+      // 扫描范围跟着 pi 实际在用的会话目录走（--session-dir / 环境变量 / settings.json 都在里面）
+      const root = scanRoot(ctx.sessionManager.getSessionDir());
+      const customDir = root !== sessionsDir() ? root : undefined;
+      const all = (await scanSessions(root)).filter((s) => s.path !== currentFile);
       if (!all.length) {
         ctx.ui.notify(msg("noSessions"), "info");
         return;
@@ -118,7 +121,8 @@ export default function (pi: ExtensionAPI) {
       if (picked.action === "fork") {
         // 和 pi --fork 一样：把全部记录复制到新文件，header 里记下 parentSession
         try {
-          const forked = SessionManager.forkFrom(picked.s.path, ctx.cwd);
+          // 自定义了会话目录时分叉也放进去，别写回默认目录
+          const forked = SessionManager.forkFrom(picked.s.path, ctx.cwd, customDir);
           target = forked.getSessionFile() ?? target;
           ctx.ui.notify(msg("forked", { file: basename(target) }), "info");
         } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-session-peek",
-  "version": "0.5.0",
+  "version": "0.5.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

@@ -39,6 +39,7 @@ export class PeekComponent implements Component, Focusable {
   private rendered = new WeakMap<PeekMsg, { w: number; lines: string[] }>(); // 每条消息渲染好的行，按宽度缓存
   private confirmingDelete = false; // Ctrl+D 之后等待确认
   private renaming = false; // Ctrl+R 之后正在输入名字
+  private busy = false; // 删除 / 重命名的异步回调还没回来：期间不能再删、改名、进入或分叉，免得对同一个文件动两次
   private renameInput: Input;
   private cachedWidth = -1;
   private cachedLines: string[] = [];
@@ -162,13 +163,19 @@ export class PeekComponent implements Component, Focusable {
         this.renaming = false;
         this.focused = this._focused;
         this.invalidate();
-        if (s && name && this.onRename) {
+        if (s && name && this.onRename && !this.busy) {
+          this.busy = true;
           void this.onRename(s, name).then((ok) => {
             if (ok) {
               s.name = name;
               // 名字参与搜索，改完可能就不再匹配当前关键词了
               this.refilter(true);
             }
+          }).catch(() => {
+            // 回调自己负责提示；这里吞掉，别变成 unhandled rejection
+          }).finally(() => {
+            // 放在 finally：回调抛了错也要解锁，否则删除 / 改名 / 进入全部永久失效
+            this.busy = false;
             this.invalidate();
             this.requestRender?.();
           });
@@ -191,7 +198,8 @@ export class PeekComponent implements Component, Focusable {
       this.invalidate();
       if (data === "y" || data === "Y" || matchesKey(data, Key.enter)) {
         const s = this.filtered[this.selected];
-        if (s && this.onDelete) {
+        if (s && this.onDelete && !this.busy) {
+          this.busy = true;
           void this.onDelete(s).then((ok) => {
             if (ok) {
               let i = this.all.indexOf(s);
@@ -203,6 +211,9 @@ export class PeekComponent implements Component, Focusable {
               this.previewKey = "";
               this.clearSelection();
             }
+          }).catch(() => {
+          }).finally(() => {
+            this.busy = false;
             this.invalidate();
             this.requestRender?.();
           });
@@ -220,7 +231,7 @@ export class PeekComponent implements Component, Focusable {
       return;
     }
     if (matchesKey(data, Key.ctrl("d"))) {
-      if (this.filtered.length && this.onDelete) {
+      if (this.filtered.length && this.onDelete && !this.busy) {
         this.confirmingDelete = true;
         this.invalidate();
       }
@@ -228,7 +239,7 @@ export class PeekComponent implements Component, Focusable {
     }
     if (matchesKey(data, Key.ctrl("r"))) {
       const s = this.filtered[this.selected];
-      if (s && this.onRename) {
+      if (s && this.onRename && !this.busy) {
         this.renaming = true;
         this.renameInput.setValue(s.name || "");
         this.focused = this._focused;
@@ -295,12 +306,12 @@ export class PeekComponent implements Component, Focusable {
     }
     if (matchesKey(data, Key.enter)) {
       const s = this.filtered[this.selected];
-      if (s) this.onResume?.(s);
+      if (s && !this.busy) this.onResume?.(s);
       return;
     }
     if (matchesKey(data, Key.ctrl("o"))) {
       const s = this.filtered[this.selected];
-      if (s) this.onFork?.(s);
+      if (s && !this.busy) this.onFork?.(s);
       return;
     }
     // 其余按键交给搜索框
@@ -374,7 +385,7 @@ export class PeekComponent implements Component, Focusable {
       // 单击在 press 里已经选中了，双击才进入
       const s = this.filtered[itemAt()];
       if (!s) return undefined;
-      if (!this.renaming && (ev.clickCount ?? 1) >= 2) this.onResume?.(s);
+      if (!this.renaming && !this.busy && (ev.clickCount ?? 1) >= 2) this.onResume?.(s);
       return { handled: true, render: false };
     }
     if (ev.type !== "press") return undefined;

package/src/sessions.ts

@@ -2,7 +2,8 @@ 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";
+import { dirname, join } from "node:path";
+import { normPath } from "./text.ts";
 
 // 读 ~/.pi/agent/sessions 下的会话 JSONL，按 mtime 缓存；重命名和删除也在这里。
 // 搜索不预存小写全文：会话正文只在 msgs 里放一份，匹配时用不区分大小写的正则直接扫（见 query.ts 的 matchesSession）
@@ -26,18 +27,29 @@ export interface PeekSession {
   first: string; // 首条消息，列表里显示用
   msgs: PeekMsg[];
   mtime: number;
+  size: number; // 和 mtime 一起当缓存键：mtime 粒度粗的文件系统上连续两次写入可能同一个 mtime
 }
 
 const sessionCache = new Map<string, PeekSession>();
 const READ_CONCURRENCY = 16; // 同时读的文件数，太高会把 libuv 线程池排满
 
-// 和 pi 一样认 PI_CODING_AGENT_DIR
-function sessionsDir(): string {
-  const env = process.env.PI_CODING_AGENT_DIR;
-  const agent = env ? (env.startsWith("~") ? join(homedir(), env.slice(1)) : env) : join(homedir(), ".pi", "agent");
+const expandTilde = (p: string) => (p.startsWith("~") ? join(homedir(), p.slice(1)) : p);
+
+// 默认布局下所有项目的会话根目录：和 pi 一样认 PI_CODING_AGENT_DIR，下面每个 cwd 一个子目录
+export function sessionsDir(env: NodeJS.ProcessEnv = process.env): string {
+  const agent = env.PI_CODING_AGENT_DIR ? expandTilde(env.PI_CODING_AGENT_DIR) : join(homedir(), ".pi", "agent");
   return join(agent, "sessions");
 }
 
+/** 要扫描的根目录。pi 的 getSessionDir() 是参数、环境变量、settings.json 合并后的结果：
+ * 默认布局时它是 <root>/sessions/<按 cwd 编码的子目录>，取上一级才能看到所有项目；
+ * 用户自定义了目录（--session-dir 等）时就是那个目录本身，直接扫它 */
+export function scanRoot(currentSessionDir: string | undefined, env: NodeJS.ProcessEnv = process.env): string {
+  const root = sessionsDir(env);
+  if (!currentSessionDir) return root;
+  return normPath(dirname(currentSessionDir)) === normPath(root) ? root : currentSessionDir;
+}
+
 async function walkJsonl(dir: string, out: string[]): Promise<void> {
   let entries;
   try {
@@ -52,13 +64,20 @@ async function walkJsonl(dir: string, out: string[]): Promise<void> {
   }
 }
 
+// 终端转义序列（CSI / OSC / DCS / APC 等）和除 \t \n 外的 C0 控制字符。正文里带这些会原样写到屏幕上：
+// 排版错乱、宽度算错，OSC 52 之类的还能改剪贴板 / 窗口标题
+const CONTROL_RE = /\x1b(?:\[[0-?]*[ -/]*[@-~]|[\]P_^X][^\x07\x1b]*(?:\x07|\x1b\\)?|[@-Z\\-_])|[\x00-\x08\x0b-\x1f\x7f]/g;
+export const sanitizeText = (s: string) => s.replace(/\r\n?/g, "\n").replace(CONTROL_RE, "");
+
 function extractText(content: unknown): string {
-  if (typeof content === "string") return content;
+  if (typeof content === "string") return sanitizeText(content);
   if (!Array.isArray(content)) return "";
-  return content
-    .filter((c: any) => c?.type === "text" && typeof c.text === "string")
-    .map((c: any) => c.text)
-    .join("\n");
+  return sanitizeText(
+    content
+      .filter((c: any) => c?.type === "text" && typeof c.text === "string")
+      .map((c: any) => c.text)
+      .join("\n"),
+  );
 }
 
 // 工具调用的主参数：按常见键名找第一个字符串，都没有就取第一个字符串参数。不存结果，bash 输出动辄几十 KB
@@ -71,7 +90,7 @@ export function toolSummary(args: unknown): string {
   let v = TOOL_ARG_KEYS.map((k) => o[k]).find((x) => typeof x === "string" && x.trim());
   if (typeof v !== "string") v = Object.values(o).find((x) => typeof x === "string" && (x as string).trim());
   if (typeof v !== "string") return "";
-  return v.replace(/\s+/g, " ").trim().slice(0, TOOL_SUMMARY_MAX);
+  return sanitizeText(v).replace(/\s+/g, " ").trim().slice(0, TOOL_SUMMARY_MAX);
 }
 
 function extractTools(content: unknown): PeekTool[] {
@@ -81,7 +100,7 @@ function extractTools(content: unknown): PeekTool[] {
     .map((c: any) => ({ name: c.name, summary: toolSummary(c.arguments) }));
 }
 
-function parseSession(path: string, raw: string, mtime: number): PeekSession | null {
+function parseSession(path: string, raw: string, mtime: number, size: number): PeekSession | null {
   let cwd = "";
   let time = "";
   let name = "";
@@ -98,7 +117,7 @@ function parseSession(path: string, raw: string, mtime: number): PeekSession | n
       }
       if (line.includes('"type":"session_info"')) {
         const o = JSON.parse(line);
-        if (typeof o.name === "string" && o.name) name = o.name;
+        if (typeof o.name === "string") name = sanitizeText(o.name).trim(); // 空名字是显式清掉
         continue;
       }
       // 先用子串粗筛，省掉大部分行的 JSON.parse
@@ -127,6 +146,7 @@ function parseSession(path: string, raw: string, mtime: number): PeekSession | n
     name,
     msgs,
     mtime,
+    size,
     first: firstText.text.replace(/\s+/g, " ").slice(0, 80),
   };
 }
@@ -134,29 +154,32 @@ function parseSession(path: string, raw: string, mtime: number): PeekSession | n
 // 单个文件：mtime 没变直接用缓存，否则重新读和解析
 async function loadSession(file: string): Promise<PeekSession | null> {
   let mtime: number;
+  let size: number;
   try {
-    mtime = (await stat(file)).mtimeMs;
+    const st = await stat(file);
+    mtime = st.mtimeMs;
+    size = st.size;
   } catch {
     return null;
   }
   const hit = sessionCache.get(file);
-  if (hit && hit.mtime === mtime) return hit;
+  if (hit && hit.mtime === mtime && hit.size === size) return hit;
   let raw: string;
   try {
     raw = await readFile(file, "utf8");
   } catch {
     return null;
   }
-  const parsed = parseSession(file, raw, mtime);
+  const parsed = parseSession(file, raw, mtime, size);
   if (parsed) sessionCache.set(file, parsed);
   return parsed;
 }
 
 /** 全部会话，按最后修改时间倒序；文件没变的直接用缓存。
  * 目录遍历和文件读取都走异步 I/O，几百个会话也不会把 TUI 卡住 */
-export async function scanSessions(): Promise<PeekSession[]> {
+export async function scanSessions(root: string = sessionsDir()): Promise<PeekSession[]> {
   const files: string[] = [];
-  await walkJsonl(sessionsDir(), files);
+  await walkJsonl(root, files);
 
   const out: PeekSession[] = [];
   let next = 0;
@@ -179,6 +202,7 @@ export async function scanSessions(): Promise<PeekSession[]> {
 
 // 和 pi 自带的 /name 写同一种 session_info 记录，parentId 用文件里最后一条记录的 id
 export function renameSession(path: string, name: string): void {
+  name = sanitizeText(name).replace(/\n+/g, " ").trim(); // 和 pi 的 appendSessionInfo 一样，换行不能进 JSONL 的一行
   const raw = readFileSync(path, "utf8");
   const lines = raw.split("\n");
   let parentId: string | null = null;
@@ -227,18 +251,21 @@ export function trashCommands(path: string, platform: NodeJS.Platform = process.
 }
 
 // 优先进回收站（能恢复），每个途径都不行再直接删。exec 由调用方传入，方便测试；
-// 命令退出码为 0 但文件还在也当失败，继续试下一个
+// 命令退出码为 0 但文件还在也当失败，继续试下一个。命令超时被杀但其实已经把文件移走了的，
+// 事后再看一眼文件，别把"已进回收站"报成"永久删除"
 export async function deleteSession(
   path: string,
   exec: (cmd: string, args: string[]) => Promise<{ code: number }>,
   platform: NodeJS.Platform = process.platform,
 ): Promise<DeleteResult> {
+  const wasThere = existsSync(path);
   for (const [cmd, args] of trashCommands(path, platform)) {
     try {
       const r = await exec(cmd, args);
       if (r.code === 0 && !existsSync(path)) return "trash";
     } catch {
     }
+    if (wasThere && !existsSync(path)) return "trash";
   }
   try {
     rmSync(path, { force: true });