pi-session-peek 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.1
+
+- Ctrl+N / Ctrl+P now jump between hit lines instead of hit messages. Several hits inside one long reply used to collapse into a single stop, so the preview appeared not to move. Hits already on screen are skipped, and the top-right corner shows the current hit as `hit k/n`.
+
 ## 0.2.0
 
 - The preview renders messages with pi's own Markdown renderer: headings, bold, inline code, syntax-highlighted code blocks, tables with borders and cell wrapping, lists, quotes and links now look the same as in the main transcript.

package/README.md

@@ -64,7 +64,7 @@ In TUI mode, run `/peek` and start typing. Press `Enter` on a session to continu
 | `PgUp` `PgDn` | Scroll preview by a page |
 | `Ctrl+U` `Ctrl+F` | Scroll preview by half a page |
 | `Shift+↑` `Shift+↓` | Scroll preview by three lines |
-| `Ctrl+N` `Ctrl+P` | Next / previous hit |
+| `Ctrl+N` `Ctrl+P` | Next / previous hit line outside the current view; the top-right corner shows `hit k/n` |
 | `Enter` | Resume the session |
 | `Ctrl+O` | Fork the session and open the fork |
 | `Ctrl+R` | Rename. Writes the same `session_info` entry as `/name`. |

package/README.zh-CN.md

@@ -64,7 +64,7 @@ pi 扩展以你的用户权限运行，只装信得过的包。
 | `PgUp` `PgDn` | 预览翻页 |
 | `Ctrl+U` `Ctrl+F` | 预览翻半页 |
 | `Shift+↑` `Shift+↓` | 预览滚三行 |
-| `Ctrl+N` `Ctrl+P` | 下一个 / 上一个命中 |
+| `Ctrl+N` `Ctrl+P` | 跳到当前屏幕外的下一处 / 上一处命中行，右上角显示「命中 k/n」 |
 | `Enter` | 进入会话 |
 | `Ctrl+O` | 分叉出新会话并进入 |
 | `Ctrl+R` | 重命名，写入的记录和 `/name` 一样 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-session-peek",
-  "version": "0.2.0",
+  "version": "0.2.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/i18n.ts

@@ -23,6 +23,7 @@ const zh = {
   matchCount: "  匹配 {n}/{total}",
   noMatch: "没有匹配的会话",
   msgCount: "{n} 条消息",
+  hitPos: " 命中 {k}/{n}",
   truncated: "（会话过长，仅显示最后 {n} 条）",
   hitInTruncated: "关键词命中在未显示的更早消息中",
   hitOnlyMeta: "关键词仅命中会话名或目录，对话正文无匹配",
@@ -61,6 +62,7 @@ const en: Record<keyof typeof zh, string> = {
   matchCount: "  {n}/{total} matched",
   noMatch: "No matching sessions",
   msgCount: "{n} messages",
+  hitPos: " hit {k}/{n}",
   truncated: "(long session, showing the last {n} messages)",
   hitInTruncated: "Keyword hits are in earlier messages not shown here",
   hitOnlyMeta: "Keyword matched only the session name or directory, not the conversation",

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, parseQuery, snippet, type ParsedQuery } from "./query.ts";
+import { anyKw, highlight, lineHasKw, parseQuery, snippet, type ParsedQuery } from "./query.ts";
 import type { PeekMsg, PeekSession } from "./sessions.ts";
 import { fmtTime, normPath, padEndVisible } from "./text.ts";
 
@@ -25,7 +25,7 @@ export class PeekComponent implements Component, Focusable {
   private previewOffset = 0;
   private previewKey = ""; // 预览缓存的键（会话 + 关键词 + 宽度），置空强制重建
   private previewLines: string[] = [];
-  private matchLines: number[] = []; // 预览里命中消息所在的行，Ctrl+N / Ctrl+P 用
+  private matchLines: number[] = []; // 预览里含关键词的行（升序），Ctrl+N / Ctrl+P 用
   private rendered = new WeakMap<PeekMsg, { w: number; lines: string[] }>(); // 每条消息渲染好的行，按宽度缓存
   private confirmingDelete = false; // Ctrl+D 之后等待确认
   private renaming = false; // Ctrl+R 之后正在输入名字
@@ -250,15 +250,18 @@ export class PeekComponent implements Component, Focusable {
     this.invalidate();
   }
 
-  // 预览里跳到下一个 / 上一个命中，到头了回绕
+  // 预览里跳到当前视口之外的下一个 / 上一个命中行，到头了回绕。同一屏里的多个命中算一处，
+  // 否则一段里连着几行都命中要按好几次才过得去
   private jumpMatch(dir: 1 | -1): void {
     if (!this.matchLines.length) return;
-    const cur = this.previewOffset + 2;
+    const H = this.bodyHeight();
+    const top = this.previewOffset;
+    const bottom = Math.min(top + H, this.previewLines.length) - 1;
     let target: number | undefined;
     if (dir === 1) {
-      target = this.matchLines.find((l) => l > cur) ?? this.matchLines[0];
+      target = this.matchLines.find((l) => l > bottom) ?? this.matchLines[0];
     } else {
-      target = [...this.matchLines].reverse().find((l) => l < cur) ?? this.matchLines[this.matchLines.length - 1];
+      target = [...this.matchLines].reverse().find((l) => l < top) ?? this.matchLines[this.matchLines.length - 1];
     }
     if (target !== undefined) {
       this.previewOffset = Math.max(0, target - 2);
@@ -383,7 +386,7 @@ export class PeekComponent implements Component, Focusable {
 
     for (const m of msgs) {
       const isMatch = kws.length > 0 && anyKw(m.text.toLowerCase(), kws);
-      if (isMatch) this.matchLines.push(lines.length);
+      const head = lines.length;
       if (m.role === "user") {
         lines.push(
           t.bg("userMessageBg", padEndVisible(t.bold(t.fg("accent", fillLabel(msg("you")))), rw)),
@@ -392,7 +395,13 @@ export class PeekComponent implements Component, Focusable {
         lines.push(t.fg("muted", fillLabel(msg("ai"))));
       }
       // 先渲染再高亮：往 markdown 源码里插转义码会把链接、代码块的语法弄坏
-      for (const l of this.renderMsg(m, rw)) lines.push(isMatch ? highlight(l, kws, t) : l);
+      const before = this.matchLines.length;
+      for (const l of this.renderMsg(m, rw)) {
+        if (isMatch && lineHasKw(l, kws)) this.matchLines.push(lines.length);
+        lines.push(isMatch ? highlight(l, kws, t) : l);
+      }
+      // 关键词被折行拆开时哪一行都找不到，退回到消息标题行，别把这条消息漏掉
+      if (isMatch && this.matchLines.length === before) this.matchLines.push(head);
       lines.push("");
     }
 
@@ -435,13 +444,15 @@ export class PeekComponent implements Component, Focusable {
     const maxOff = Math.max(0, this.previewLines.length - H);
     if (this.previewOffset > maxOff) this.previewOffset = maxOff;
     const rightRows = this.previewLines.slice(this.previewOffset, this.previewOffset + H);
-    const scrollInfo =
-      this.previewLines.length > H
-        ? t.fg(
-            "dim",
-            ` (${this.previewOffset + 1}-${Math.min(this.previewOffset + H, this.previewLines.length)}/${this.previewLines.length})`,
-          )
-        : "";
+    // 右上角：有命中时显示"第几处/共几处"（视口内第一个命中的序号），行数多时再加行号范围
+    const end = Math.min(this.previewOffset + H, this.previewLines.length);
+    let info = "";
+    if (this.matchLines.length) {
+      const i = this.matchLines.findIndex((l) => l >= this.previewOffset && l < end);
+      info += msg("hitPos", { k: i >= 0 ? String(i + 1) : "-", n: this.matchLines.length });
+    }
+    if (this.previewLines.length > H) info += ` (${this.previewOffset + 1}-${end}/${this.previewLines.length})`;
+    const scrollInfo = info ? t.fg("dim", info) : "";
 
     for (let i = 0; i < H; i++) {
       const l = leftRows[i] ?? " ".repeat(lw);

package/src/query.ts

@@ -96,6 +96,11 @@ function applySgr(st: Sgr, seq: string): void {
   }
 }
 
+// 渲染后的一行（可带 ANSI）里有没有关键词，预览按行记命中用
+export function lineHasKw(line: string, kws: string[]): boolean {
+  return kws.length > 0 && anyKw(line.replace(ESC_RE, "").toLowerCase(), kws);
+}
+
 // 在一行文字里高亮关键词，返回带 ANSI 的字符串。
 // 输入可以是已经渲染过、带样式的行：转义序列不参与匹配也不会被切断；高亮结束时把原来的
 // 前景色 / 粗体 / 下划线恢复回去，所以放在标题、链接等样式里面也不会把后面的文字弄丢样式。