pi-session-peek 0.5.2 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.7.0
+
+- `Ctrl+E` cycles the preview between all messages, only your messages and only the AI's replies. The header of the preview shows the active filter and the message count follows it; hits on the hidden side are not counted or jumped to. The session list is unaffected.
+  `Ctrl+E` 在预览里循环切换 全部对话 → 只看我发的 → 只看 AI 回答。预览首行显示当前过滤状态，消息数跟着变；被隐藏一侧的命中不计数、不跳转。左栏列表不受影响。
+
+## 0.6.0
+
+- Search: plain terms match the working directory again, but only in the all-projects scope. The current-directory scope keeps the 0.5.2 behaviour (conversation and session name only), since every session there shares the same path prefix.
+  搜索：普通词重新支持匹配工作目录，但仅在「全部项目」范围下生效；当前目录树范围保持 0.5.2 的行为（只匹配对话和会话名），因为该范围下所有会话共享同一段路径前缀。
+- `Ctrl+Y` replaces `Ctrl+F` for scrolling the preview down half a page. In pi's fullscreen mode `Ctrl+F` is captured by pi's own transcript search on Windows/WSL before the picker ever sees it.
+  预览向下翻半页由 `Ctrl+F` 改为 `Ctrl+Y`：pi 全屏模式下 `Ctrl+F` 会被 pi 自己的全文搜索（Windows/WSL）先行截获，选择器根本收不到。
+- The picker now declares `capturesViewportInput`, so in pi's fullscreen mode `PgUp` / `PgDn` reach the picker instead of scrolling pi's transcript.
+  选择器现在声明了 `capturesViewportInput`，pi 全屏模式下 `PgUp` / `PgDn` 会送达选择器，不再被 pi 截去滚动主对话记录。
+
 ## 0.5.2
 
 - Wheel over the list now scrolls the list like a scrollbar instead of moving the selection. The selection stays where it is and comes back into view on `↑` / `↓`, a click, a new filter or a delete.

package/README.md

@@ -64,10 +64,11 @@ In TUI mode, run `/peek` and start typing. Press `Enter` on a session to continu
 | `Tab` | Current directory tree ↔ all projects |
 | `↑` `↓` | Select session |
 | `PgUp` `PgDn` | Scroll preview by a page |
-| `Ctrl+U` `Ctrl+F` | Scroll preview by half a page |
+| `Ctrl+U` `Ctrl+Y` | Scroll preview by half a page |
 | `Shift+↑` `Shift+↓` | Scroll preview by three lines |
 | `Ctrl+N` `Ctrl+P` | Next / previous hit line outside the current view; the top-right corner shows `hit k/n` |
 | `Ctrl+T` | Show / hide tool calls in the preview. Each call is one line with the tool name and its main argument (command, path, URL, query). Results are never shown. |
+| `Ctrl+E` | Cycle the preview through all messages → only yours → only the AI's. The message count follows the filter. Purely a view filter: the session list is unaffected, and hits on the hidden side are not counted or jumped to. |
 | `Enter` | Resume the session |
 | `Ctrl+O` | Fork the session and open the fork |
 | `Ctrl+R` | Rename. Writes the same `session_info` entry as `/name`. |
@@ -107,7 +108,7 @@ The filter is case-insensitive and matches anywhere in the text. Whitespace sepa
 
 Quotes are the escape hatch: `"-foo"`, `"a|b"`, `"name:x"` and `"/x/"` search for those characters literally. A regex that fails to compile is searched as plain text. Only positive terms are highlighted in the preview, and `name:` / `dir:` terms never touch the conversation, so `name:auth` alone shows the full conversation with no highlights.
 
-The search index holds user and assistant messages and the session name. The working directory is matched only by `dir:` / `cwd:` terms: with the current-directory scope every session shares the same path prefix, so a plain word from the path would match all of them. The index does not hold tool call arguments or tool results, and the tool lines shown by `Ctrl+T` are never matched or highlighted.
+The search index holds user and assistant messages and the session name. Plain words also match the working directory, but only in the all-projects scope: with the current-directory scope every session shares the same path prefix, so a plain word from the path would match all of them; use `dir:` / `cwd:` to match the path in that scope. The index does not hold tool call arguments or tool results, and the tool lines shown by `Ctrl+T` are never matched or highlighted.
 
 ## 🌐 Language
 
@@ -183,6 +184,10 @@ git push --follow-tags
 
 `npm version` first checks that the working tree is clean and stops with `Git working directory not clean.` otherwise, so everything, including `CHANGELOG.md`, has to be committed before the bump. Untracked files are fine. It then runs the hooks declared in `package.json`: `preversion` checks that `CHANGELOG.md` has a non-empty `## Unreleased` section and runs `npm run check`, aborting the bump before anything is touched if either fails; `version` runs `scripts/release-changelog.mjs`, which renames `## Unreleased` to the new version and stages the file. npm then commits `package.json`, the lockfile and `CHANGELOG.md` as `chore: release X.Y.Z` (message set in `.npmrc`) and tags it `vX.Y.Z`.
 
+## 🔗 Friend links
+
+- [LinuxDo — sincere, friendly, united, professional](https://linux.do)
+
 ## 📄 License
 
 MIT. See [`LICENSE`](./LICENSE).

package/README.zh-CN.md

@@ -64,10 +64,11 @@ pi 扩展以你的用户权限运行，只装信得过的包。
 | `Tab` | 当前目录树 ↔ 全部项目 |
 | `↑` `↓` | 选会话 |
 | `PgUp` `PgDn` | 预览翻页 |
-| `Ctrl+U` `Ctrl+F` | 预览翻半页 |
+| `Ctrl+U` `Ctrl+Y` | 预览翻半页 |
 | `Shift+↑` `Shift+↓` | 预览滚三行 |
 | `Ctrl+N` `Ctrl+P` | 跳到当前屏幕外的下一处 / 上一处命中行，右上角显示「命中 k/n」 |
 | `Ctrl+T` | 预览里显示 / 隐藏工具调用。每次调用一行：工具名和主参数（命令、路径、URL、查询词）。不显示结果。 |
+| `Ctrl+E` | 预览在 全部对话 → 只看我发的 → 只看 AI 回答 之间循环，消息数跟着过滤变。只是显示过滤：左栏列表不受影响，被隐藏一侧的命中不计数、不跳转。 |
 | `Enter` | 进入会话 |
 | `Ctrl+O` | 分叉出新会话并进入 |
 | `Ctrl+R` | 重命名，写入的记录和 `/name` 一样 |
@@ -107,7 +108,7 @@ pi 扩展以你的用户权限运行，只装信得过的包。
 
 引号是万能转义：`"-foo"`、`"a|b"`、`"name:x"`、`"/x/"` 都按字面搜这些字符。正则写错了就当普通文字搜。预览里只高亮正向的词，`name:` / `dir:` 的词不碰对话正文，所以只输入 `name:auth` 时右栏显示完整对话、没有高亮。
 
-索引里有用户和助手的消息和会话名。工作目录只由 `dir:` / `cwd:` 匹配：当前目录树范围下所有会话的路径都带同一段前缀，普通词一碰到路径就会命中全部会话。没有工具调用的参数和结果，`Ctrl+T` 显示的工具行也不参与匹配和高亮。
+索引里有用户和助手的消息和会话名。普通词在「全部项目」范围下也匹配工作目录；当前目录树范围下所有会话的路径都带同一段前缀，普通词一碰到路径就会命中全部会话，所以这个范围下不匹配路径，要搜路径用 `dir:` / `cwd:`。没有工具调用的参数和结果，`Ctrl+T` 显示的工具行也不参与匹配和高亮。
 
 ## 🌐 界面语言
 
@@ -183,6 +184,10 @@ git push --follow-tags
 
 `npm version` 一上来先检查 git 工作区是否干净，不干净就报 `Git working directory not clean.` 退出，所以 `CHANGELOG.md` 在内的所有改动都要先提交（未跟踪的文件不影响）。然后才跑 `package.json` 里声明的钩子：`preversion` 先确认 `CHANGELOG.md` 里有非空的 `## Unreleased` 段落，再跑 `npm run check`，任一不通过就在改动任何文件之前中止；`version` 跑 `scripts/release-changelog.mjs`，把 `## Unreleased` 改成新版本号并 `git add`。然后 npm 把 `package.json`、lockfile 和 `CHANGELOG.md` 一起提交成 `chore: release X.Y.Z`（提交信息定义在 `.npmrc`），并打上 `vX.Y.Z` 的 tag。
 
+## 🔗 友情链接
+
+- [LinuxDo — 真诚、友善、团结、专业](https://linux.do)
+
 ## 📄 许可证
 
 MIT，见 [`LICENSE`](./LICENSE)。

package/package.json

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

@@ -28,11 +28,13 @@ const zh = {
   truncated: "（会话过长，仅显示最后 {n} 条）",
   hitInTruncated: "关键词命中在未显示的更早消息中",
   hitOnlyMeta: "关键词仅命中会话名，对话正文无匹配",
+  viewUser: " • 只看我发的[^E]",
+  viewAi: " • 只看 AI[^E]",
   you: "👤 你",
   ai: "🤖 AI",
   renamePrefix: "✏ 重命名: ",
   confirmDelete: "⚠ 删除会话 [{desc}]？按 y / Enter 确认，任意其他键取消",
-  footer: "↑↓ 选择  PgUp/Dn·^U/^F·⇧↑↓ 滚动  ^N/^P 命中  ^T 工具  Tab 范围  ^D 删除  ^R 改名  ^O 分叉  Enter 进入  Esc/^C 关闭  🖱 点选·双击进入·拖选·滚轮",
+  footer: "↑↓ 选择  PgUp/Dn·^U/^Y·⇧↑↓ 滚动  ^N/^P 命中  ^T 工具  ^E 角色  Tab 范围  ^D 删除  ^R 改名  ^O 分叉  Enter 进入  Esc/^C 关闭  🖱 点选·双击进入·拖选·滚轮",
   selHint: "▭ 已选 {n} 行  ^C 复制  点击别处取消",
   copied: "✓ 已复制 {n} 行",
   copyFailed: "✗ 复制失败",
@@ -71,11 +73,13 @@ const en: Record<keyof typeof zh, string> = {
   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, not the conversation",
+  viewUser: " • mine only[^E]",
+  viewAi: " • AI only[^E]",
   you: "👤 You",
   ai: "🤖 AI",
   renamePrefix: "✏ Rename: ",
   confirmDelete: "⚠ Delete session [{desc}]? y / Enter to confirm, any other key to cancel",
-  footer: "↑↓ select  PgUp/Dn·^U/^F·⇧↑↓ scroll  ^N/^P hits  ^T tools  Tab scope  ^D del  ^R rename  ^O fork  Enter open  Esc close  🖱 click·dbl-click·drag·wheel",
+  footer: "↑↓ select  PgUp/Dn·^U/^Y·⇧↑↓ scroll  ^N/^P hits  ^T tools  ^E role  Tab scope  ^D del  ^R rename  ^O fork  Enter open  Esc close  🖱 click·dbl-click·drag·wheel",
   selHint: "▭ {n} lines selected  ^C copy  click elsewhere to clear",
   copied: "✓ Copied {n} lines",
   copyFailed: "✗ Copy failed",

package/src/peek-component.ts

@@ -14,7 +14,7 @@ import { msg } from "./i18n.ts";
 import { DragSelect } from "./drag-select.ts";
 import { BODY_TOP, bodyRows, paneWidths } from "./layout.ts";
 import { buildList, followSelection, listRows, visibleItems } from "./list.ts";
-import { buildPreview, initialOffset, nextMatchTarget, type RenderCache } from "./preview.ts";
+import { buildPreview, initialOffset, nextMatchTarget, type RenderCache, type RoleFilter } from "./preview.ts";
 import { matchesSession, parseQuery, roleTerms, type ParsedQuery, type RoleTerms } from "./query.ts";
 import { bounds, highlightColumns, rowColumns, selectionText, type Selection } from "./selection.ts";
 import type { PeekSession } from "./sessions.ts";
@@ -29,6 +29,9 @@ const WHEEL_ITEMS = 1; // 滚轮每格滚几个列表项（每项两行）。只
 const HINT_MS = 1500; // 底部"已复制"提示停留时间
 
 export class PeekComponent implements Component, Focusable {
+  // 声明了它，pi 全屏模式才把 PageUp/PageDown 等视口按键交给组件（shouldDeferViewportInput），
+  // 否则被 pi 截去滚主对话记录。Ctrl+F 例外：pi 的全文搜索绑定在 defer 检查之前，永远到不了组件
+  readonly capturesViewportInput = true;
   private input: Input;
   private scope: "current" | "all";
   private filtered: PeekSession[] = [];
@@ -38,6 +41,7 @@ export class PeekComponent implements Component, Focusable {
   private previewOffset = 0;
   private previewKey = ""; // 预览缓存的键（会话 + 关键词 + 宽度 + 工具开关），置空强制重建
   private showTools = false; // Ctrl+T：预览里显示每次工具调用的一行摘要
+  private roleFilter: RoleFilter = "all"; // Ctrl+E：预览只看自己发的 / 只看 AI / 全部，循环切换
   private previewLines: string[] = [];
   private matchLines: number[] = []; // 预览里含关键词的行（升序），Ctrl+N / Ctrl+P 用
   private rendered: RenderCache = new WeakMap(); // 每条消息渲染好的行，按宽度缓存
@@ -122,7 +126,7 @@ 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 (terms.length) out = out.filter((s) => matchesSession(s, terms));
+    if (terms.length) out = out.filter((s) => matchesSession(s, terms, this.scope === "all"));
     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;
@@ -271,7 +275,7 @@ export class PeekComponent implements Component, Focusable {
       this.invalidate();
       return;
     }
-    if (matchesKey(data, Key.pageDown) || matchesKey(data, Key.ctrl("f"))) {
+    if (matchesKey(data, Key.pageDown) || matchesKey(data, Key.ctrl("y"))) {
       const step = matchesKey(data, Key.pageDown) ? this.bodyHeight() : Math.max(1, this.bodyHeight() >> 1);
       this.previewOffset += step;
       this.invalidate();
@@ -294,6 +298,13 @@ export class PeekComponent implements Component, Focusable {
       this.invalidate();
       return;
     }
+    if (matchesKey(data, Key.ctrl("e"))) {
+      this.roleFilter = this.roleFilter === "all" ? "user" : this.roleFilter === "user" ? "assistant" : "all";
+      this.previewKey = "";
+      this.drag.clear();
+      this.invalidate();
+      return;
+    }
     if (matchesKey(data, Key.ctrl("n"))) {
       this.jumpMatch(1);
       return;
@@ -482,13 +493,13 @@ export class PeekComponent implements Component, Focusable {
     return { rt, hasBody: rt.user.length > 0 || rt.assistant.length > 0 };
   }
 
-  // 右栏。预览键（会话 + 关键词 + 宽度 + 工具开关）没变就复用；变了重建，滚动位置放到首个命中处或底部
+  // 右栏。预览键（会话 + 关键词 + 宽度 + 工具开关 + 角色过滤）没变就复用；变了重建，滚动位置放到首个命中处或底部
   private rebuildPreview(rw: number, rt: RoleTerms): void {
     const s = this.filtered[this.selected];
-    const key = s ? `${s.path}|${this.getQuery()}|${rw}|${this.showTools ? "t" : ""}` : "none";
+    const key = s ? `${s.path}|${this.getQuery()}|${rw}|${this.showTools ? "t" : ""}|${this.roleFilter}` : "none";
     if (key === this.previewKey) return;
     this.previewKey = key;
-    const p = buildPreview(s, rt, rw, this.showTools, this.theme, this.mdTheme, this.rendered);
+    const p = buildPreview(s, rt, rw, this.showTools, this.theme, this.mdTheme, this.rendered, this.roleFilter);
     this.previewLines = p.lines;
     this.matchLines = p.matchLines;
     this.previewOffset = initialOffset(p, this.bodyHeight());

package/src/preview.ts

@@ -38,6 +38,9 @@ export interface Preview {
   matchLines: number[]; // 含关键词的行（升序），Ctrl+N / Ctrl+P 用
 }
 
+// 预览只画哪个角色的消息：全部 / 只看我发的 / 只看 AI。只影响预览，不影响左栏过滤（搜索语法的 user: / ai: 管那个）
+export type RoleFilter = "all" | "user" | "assistant";
+
 // 右栏内容。没有会话时只有一行提示
 export function buildPreview(
   s: PeekSession | undefined,
@@ -47,16 +50,18 @@ export function buildPreview(
   t: PeekTheme,
   mdTheme: MarkdownTheme,
   cache: RenderCache,
+  role: RoleFilter = "all",
 ): Preview {
   if (!s) return { lines: [t.fg("dim", msg("noMatch"))], matchLines: [] };
 
   const lines: string[] = [];
   const matchLines: number[] = [];
-  // 消息数只算有文字的，纯工具轮次不计
-  const textCount = s.msgs.reduce((n, m) => n + (m.text ? 1 : 0), 0);
+  // 消息数只算有文字的，纯工具轮次不计；角色过滤时只算画出来的那一侧
+  const textCount = s.msgs.reduce((n, m) => n + (m.text && (role === "all" || m.role === role) ? 1 : 0), 0);
   lines.push(
     truncateToWidth(
-      t.fg("dim", `${s.cwd} • ${msg("msgCount", { n: textCount })}${s.name ? " • " + s.name : ""}`),
+      t.fg("dim", `${s.cwd} • ${msg("msgCount", { n: textCount })}${s.name ? " • " + s.name : ""}`) +
+        (role !== "all" ? t.fg("warning", msg(role === "user" ? "viewUser" : "viewAi")) : ""),
       rw,
     ),
   );
@@ -88,6 +93,7 @@ export function buildPreview(
 
   let prevRole: PeekMsg["role"] | undefined; // 上一条画出来的消息的角色
   for (const m of msgs) {
+    if (role !== "all" && m.role !== role) continue; // Ctrl+E 角色过滤：另一侧的消息整条不画
     const tools = showTools ? (m.tools ?? []) : [];
     if (!m.text && !tools.length) continue; // 工具隐藏时，只有工具调用的 AI 轮次整条跳过
     const terms = rt[m.role]; // user: 的词只在用户消息里高亮，ai: 的只在 AI 回复里

package/src/query.ts

@@ -4,7 +4,7 @@ import type { PeekMsg, PeekSession } from "./sessions.ts";
 import { stylePrefix, type PeekTheme } from "./theme.ts";
 
 // 搜索框语法。空白分隔多个词，全部满足才算（AND）。每个词可以是：
-//   foo            子串，大小写不敏感，在对话正文和会话名里找；不看工作目录（见 termHits）
+//   foo            子串，大小写不敏感，在对话正文和会话名里找；全局范围下还看工作目录（见 termHits）
 //   "foo bar"      短语，引号里的一段空白匹配正文里任意一段空白（含换行）
 //   a|b            任一命中（OR）；要搜字面的 | 就加引号
 //   /re/           正则（JS 语法，自动带 i 和 m 标志，不能含空白，用 \s 代替）；写错了按普通文字搜
@@ -116,7 +116,7 @@ function hit(re: RegExp, s: string): boolean {
   return execFrom(re, s, 0) !== null;
 }
 
-function termHits(s: PeekSession, t: Term): boolean {
+function termHits(s: PeekSession, t: Term, includeCwd: boolean): boolean {
   switch (t.field) {
     case "name":
       return hit(t.re, s.name);
@@ -126,16 +126,17 @@ function termHits(s: PeekSession, t: Term): boolean {
     case "assistant":
       return s.msgs.some((m) => m.role === t.field && hit(t.re, m.text));
     default:
-      // 普通词不看工作目录：当前目录树范围下所有会话的路径都带同一段前缀，路径里的词会命中全部会话。
-      // 要搜路径用 dir:。pi 自带的选择器会把 cwd 拼进搜索文本，这里是有意不同
-      return hit(t.re, s.name) || s.msgs.some((m) => hit(t.re, m.text));
+      // 普通词只在全局范围看工作目录：当前目录树范围下所有会话都带同一段前缀，路径词会命中全部会话。
+      // 当前范围下要搜路径仍可用 dir:
+      return hit(t.re, s.name) || s.msgs.some((m) => hit(t.re, m.text)) || (includeCwd && hit(t.re, s.cwd));
   }
 }
 
 // 每个词都要满足：普通词在会话名或某条消息里出现，排除词则哪里都不出现；带前缀的只看对应的地方。
+// includeCwd：普通词是否也匹配工作目录，调用方传 scope === "all"
 // 正文不预存小写副本，直接在原文上用不区分大小写的正则匹配
-export function matchesSession(s: PeekSession, terms: Term[]): boolean {
-  return terms.every((t) => termHits(s, t) !== t.negate);
+export function matchesSession(s: PeekSession, terms: Term[], includeCwd = false): boolean {
+  return terms.every((t) => termHits(s, t, includeCwd) !== t.negate);
 }
 
 // 单段文字用：命中任意一个词就算