pi-copy-picker 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 1.1.0 - 2026-11-10
+
+### Added
+
+- Show the number of matching items while searching.
+
+### Changed
+
+- Refactored message target parsing without changing selection or copy behavior.
+
 ## 1.0.0 - 2026-10-31
 
 ### Added

package/README.md

@@ -1,7 +1,5 @@
 # Pi copy picker
 
-![Copy Picker gallery preview](https://raw.githubusercontent.com/tallshort/pi-copy-picker/main/gallery-preview.png)
-
 Browse and copy messages from the current Pi branch with `/copy-picker`.
 The fullscreen picker has a paginated message list above a Markdown preview.
 It selects the newest visible message and closes after a successful copy.
@@ -9,29 +7,15 @@ It selects the newest visible message and closes after a successful copy.
 ![Copy Picker fullscreen view with a selected code block and preview](https://raw.githubusercontent.com/tallshort/pi-copy-picker/main/copy-picker.png)
 
 Requires interactive TUI mode and `@earendil-works/pi-coding-agent` and `@earendil-works/pi-tui` version 1.0.0 or newer. The host supplies these optional peer dependencies.
-Type checking and tests passed with 1.0.0 and 1.4.0. Other versions are accepted but have not been verified here.
+Tests have passed with versions 1.0.0 and 1.4.0.
 
 ## Open the picker
 
-From a source checkout, load the TypeScript entry directly:
-
-```sh
-	pi -e ./src/index.ts
-```
-
-For directory installation, run these commands from the checkout. No build is required:
-
-```sh
-	pi install "$PWD"
-	pi -e .
-```
-
-After the first npm publication, install the published package with:
+Install the package in Pi:
 
 ```sh
-	pi install npm:pi-copy-picker
+pi install npm:pi-copy-picker
 ```
-
 Run `/copy-picker` in Pi. Use `/reload` or restart an existing session after installation or source changes.
 The command does not change history or tool configuration.
 
@@ -62,67 +46,18 @@ A small-window message appears below 32 columns or when the list has fewer than
 
 ## Message and clipboard behavior
 
-Each opening reads a saved `getBranch()` snapshot, including original text before compaction.
-Abandoned branches are excluded. Reopen the picker to load newer messages.
-Thinking, signatures, system messages, custom messages, and administrative entries are excluded. Assistant text records connected by tool-use steps form one reply, ending at stop, error, abort, a user message, or another history boundary. When tools are shown, unselected assistant text and tool events follow their original branch order.
-
-User cards use the chat theme's user background and text colors. Assistant cards have no background.
-The selected card has an accent border. Tool cards retain a dim border and the tool name.
-The upper list shows original Markdown source in conversation order. Headings, lists, tables, references, and blank source lines stay literal. Long context lines wrap at the list width.
-Each selected target has an accent frame with up to seven interior rows. The frame grows with its content and shrinks to fit short windows. Source lines appear in order, including code fences and punctuation. A single blank line stays blank. A run of blank lines becomes a muted `...`. If the source or its wrapped lines exceed the available rows, the last row is a muted `...`. Literal `...` remains ordinary source text. Preview and copy retain the complete selected entity. When tools are shown, a selected grouped reply frames its first segment and adds a muted `...` inside the frame if later segments contain text. Later segments remain unframed after their tool events. Preview and copy cover the whole reply. Selecting a block replaces only its original source interval. If a block spans tool events, its frame appears at the block's start and may summarize text that originally followed those events. The tool events remain in their original order, and text after the block remains visible. Changing selection centers the new frame, clamped at history ends. Reserved `...` rows indicate additional list content above and below. The bottom Pi-rendered preview shows only the selected entity.
-A local source scanner finds fenced and indented code and nonempty blockquotes. Pi's Markdown tokenizer identifies standalone inline-code lines. These are the only selectable children. A standalone inline-code line contains one nonempty span and copies its content without backticks. Inline code within a sentence does not create a separate block. Lists, headings, tables, and prose remain in the whole-message preview and copy, but do not create children.
-Search matches whole messages and tool names, so matching messages retain all their children.
-Search filters as you type. Every effective query edit clears selection and preview. Clearing the query immediately restores all messages. Down selects the first message on the visible page and Up selects the last, without needing Enter first. Repeated Enter presses do nothing until you select a message.
-While selection is inactive, the preview shows the dim, centered prompt `Use ↑/↓ to select a message`. Paging, tool visibility, preview scrolling, and resizing do not activate selection.
-Block frames leave two columns on both sides. Parent frames use the full width. Block frames have no type labels. Code excerpts show the original fence lines, language info and quote/list prefixes when they fit. Unclosed fences get no invented closing marker. Indented code keeps its source indentation without added fences. Code previews show only the highlighted body, and code copy still excludes fences and container prefixes.
-
-Source display lines and preview Markdown rendering are cached per message or block until width or theme changes. Many long messages can increase memory use until the picker closes.
-
-Whole-message copy joins original text blocks within a record with newlines and preserves surrounding whitespace. For grouped assistant records it adds enough newline characters at each seam to make a paragraph separator of at least two line breaks, preserving existing line breaks. A single record stays unchanged.
-Blockquote children copy plain text with one outer `>` prefix and at most one following space or tab removed per line. Quoted blank paragraphs stay in one target. Nested quote prefixes, internal whitespace, and line endings are preserved. Lazy continuation lines stay unchanged until an unquoted blank paragraph. Empty quotes have no child. Quote previews still render the original Markdown. Code children copy only code, without fences or Markdown quote/list prefixes. Copy removes trailing newline characters from code and quote blocks while preserving indentation, spaces, and internal line endings.
-Quote fences stop when their quote container ends. List code indentation is measured four spaces beyond the list content indentation. A dedented nonblank line ends that list context.
-The scanner covers space-indented lists and these common block forms rather than the full CommonMark grammar. Tab-expanded list indentation and lazy container continuation are not parsed as full CommonMark containers. All source remains available in the whole-message copy. Inline-code children require an unambiguous top-level paragraph token. Some valid spans in nested or otherwise ambiguous Markdown are skipped. Pi still renders and syntax-highlights the previews.
-Images are not copied. Empty messages and image-only messages show `No copyable text`.
-Tool calls copy formatted argument JSON, not the original request bytes.
-Tool results copy text blocks without their `details` field.
-Only displayed text has terminal control sequences removed. Do not paste untrusted copied text directly into a shell.
-Generated UI text is English. Original messages keep their language.
-
-Copy uses Pi's clipboard helper. Remote sessions may depend on OSC52 support in the terminal and multiplexer.
-Pi 1.4.0 limits OSC52 to 100000 Base64 characters. Large copies can fail without a local clipboard backend.
-Repeated Enter presses do not submit duplicate copies while a copy is pending. A failure leaves the picker open for retry.
+The picker reads the current branch when it opens. Reopen it to see newer messages. It excludes abandoned branches, thinking, and images.
 
-In fullscreen Pi, success uses the native transient `flash("Copied!")`.
-In regular Pi, success uses `ctx.ui.notify` with `Copied message to clipboard`, without a dismissal timer.
-Success means the helper returned, not that the terminal confirmed clipboard contents.
+Select a whole message, a code block, a standalone inline-code line, or a blockquote. The list shows Markdown source; the preview renders the selected content. Long selections are shortened in the list, but preview and copy include the complete selection.
 
-## Develop in a local sandbox
+Code copies without fences or Markdown container prefixes. Standalone inline code copies without backticks. Blockquotes copy without the outer quote marker. Images are not copied. Tool calls copy formatted arguments, and tool results copy text.
 
-On Linux with a shared virtiofs checkout, keep `node_modules` outside the checkout.
-Copy the source to a sandbox-local directory. Repeat the copy when source or metadata changes.
-Run the following from the checkout, using a fresh or dedicated `/tmp/pi-copy-picker-dev` directory:
+Search matches messages and tool names and shows the number of matching items. Changing the query clears the selection; use Up or Down to select a result before copying.
 
-```sh
-	mkdir -p /tmp/pi-copy-picker-dev
-	tar --exclude='./node_modules' --exclude='./.git' --exclude='*.tgz' -cf - . | tar -xf - -C /tmp/pi-copy-picker-dev
-	cd /tmp/pi-copy-picker-dev
-	npm ci
-	npm run check
-	npm pack
-```
+Copy uses Pi's clipboard helper. Remote sessions may require OSC 52 support in the terminal and multiplexer. Large copies may fail when no local clipboard is available. If copying fails, the picker stays open for retry.
 
-Stop if dependency installation fails. Run checks only after `npm ci` succeeds.
-`check` runs type checking, runtime tests, release guard tests, and a real tarball contract check.
-`prepack` runs the same checks. The package checker uses `--ignore-scripts` to avoid recursive packing.
-The package ships the three TypeScript source modules. Pi loads them with its TypeScript loader.
-The package checker extracts the tarball and uses Pi's loader to verify command registration.
-The entry is for Pi, not a promise that plain Node can execute the TypeScript source.
-
-`src/history.ts` converts history. `src/picker.ts` owns selection, search, scrolling, and copy state.
-`src/index.ts` registers the command. Tests use the real Input, Markdown renderer, and key parser with injected clipboard and dimensions.
-IME positioning and actual clipboard reception still need checks in your target terminal.
+Only displayed text has terminal control sequences removed. Do not paste untrusted copied text directly into a shell.
 
-For publication prerequisites and tag commands, see [Release the package](RELEASING.md).
-The [MIT license](LICENSE) and [changelog](CHANGELOG.md) ship with the package.
+## Development
 
-Maintained by tallshort. Repository: [tallshort/pi-copy-picker](https://github.com/tallshort/pi-copy-picker).
+See [Development](https://github.com/tallshort/pi-copy-picker/blob/main/DEVELOPMENT.md) for local setup and implementation details. See [Release the package](RELEASING.md) for publication instructions.

package/RELEASING.md

@@ -6,14 +6,14 @@
 2. Set `origin` fetch and push URLs to that repository. If the repository changes, update `repository.url`, `homepage`, and `bugs.url` in `package.json` before publishing.
 3. Commit the package, lockfile, docs, and workflow on `main`. Push `main`. Keep the working tree clean. Do not commit `node_modules/`. The package publishes `src/` directly.
 4. Confirm that your npm account can publish the top-level package `pi-copy-picker`. The package name is not scoped; `tallshort` is the author. Use Node 24 and npm 11.5.1 or newer. Trusted publishing requires at least Node 22.14.0 and npm 11.5.1.
-5. Follow the README's isolated install and check procedure. From the checked sandbox copy, use an interactive npm login and publish the first version manually:
+5. Follow the [development setup](https://github.com/tallshort/pi-copy-picker/blob/main/DEVELOPMENT.md) and checks. From the checked copy, use an interactive npm login and publish the first version manually:
 
 ```sh
 	npm login
 	npm publish --access public
 ```
 
-The human runs these commands. No publication has been performed by this preparation task.
+The human runs these commands.
 A package must exist before its trusted publisher can be configured. Do not expect OIDC to bootstrap an unpublished package.
 The first manual publication does not claim GitHub Actions provenance.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-copy-picker",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Fullscreen current-branch message copy picker for Pi",
   "type": "module",
   "keywords": [

package/src/history.ts

@@ -85,51 +85,28 @@ export type PickTarget = Readonly<{
   rawText: string;
 } & ({ kind: "message" } | { kind: "block"; blockKind: "quote" | "code" | "inline-code"; language?: string; sourceText: string; sourceStart: number; sourceEnd: number; fence?: { opening: string; closing?: string } })>;
 
-// Source lines keep clipboard payloads independent of rendering.
-export function toPickTargets(message: PickItem): readonly PickTarget[] {
-  const parent: PickTarget = { kind: "message", id: message.id, messageId: message.id, message, rawText: message.rawText };
-  if (message.kind !== "user" && message.kind !== "assistant") return [parent];
-  if (message.segments && message.segments.length > 1) {
-    const sourceLines = message.rawText.match(/[^\r\n]*(?:\r\n|\r|\n)|[^\r\n]+$/g) ?? [];
-    const spans: { sourceStart: number; sourceEnd: number; entryId: string }[] = [];
-    for (const segment of message.segments) {
-      const last = spans.at(-1);
-      if (last?.entryId === segment.entryId) last.sourceEnd = segment.sourceEnd;
-      else spans.push({ ...segment });
-    }
-    const blocks = spans.flatMap(segment => {
-      const start = segment.sourceStart + (message.rawText[segment.sourceStart - 1] === "\r" && message.rawText[segment.sourceStart] === "\n" ? 1 : 0);
-      const offset = (message.rawText.slice(0, start).match(/\r\n|\r|\n/g) ?? []).length;
-      return toPickTargets({ ...message, segments: undefined, rawText: message.rawText.slice(start, segment.sourceEnd) })
-        .filter((target): target is Extract<PickTarget, { kind: "block" }> => target.kind === "block")
-        .map(target => ({ ...target, message, sourceStart: target.sourceStart + offset, sourceEnd: target.sourceEnd + offset,
-          id: `${message.id}:block:${target.sourceStart + offset}`,
-          sourceText: sourceLines.slice(target.sourceStart + offset, target.sourceEnd + offset).join("") }));
-    });
-    return [parent, ...blocks];
+function segmentBlocks(message: PickItem, segments: NonNullable<PickItem["segments"]>): PickTarget[] {
+  const sourceLines = message.rawText.match(/[^\r\n]*(?:\r\n|\r|\n)|[^\r\n]+$/g) ?? [];
+  const spans: { sourceStart: number; sourceEnd: number; entryId: string }[] = [];
+  for (const segment of segments) {
+    const last = spans.at(-1);
+    if (last?.entryId === segment.entryId) last.sourceEnd = segment.sourceEnd;
+    else spans.push({ ...segment });
   }
-  const lines = message.rawText.match(/[^\r\n]*(?:\r\n|\r|\n)|[^\r\n]+$/g) ?? [];
-  const blocks: PickTarget[] = [];
-  let rich = false;
+  const blocks = spans.flatMap(segment => {
+    const start = segment.sourceStart + (message.rawText[segment.sourceStart - 1] === "\r" && message.rawText[segment.sourceStart] === "\n" ? 1 : 0);
+    const offset = (message.rawText.slice(0, start).match(/\r\n|\r|\n/g) ?? []).length;
+    return toPickTargets({ ...message, segments: undefined, rawText: message.rawText.slice(start, segment.sourceEnd) })
+      .filter((target): target is Extract<PickTarget, { kind: "block" }> => target.kind === "block")
+      .map(target => ({ ...target, message, sourceStart: target.sourceStart + offset, sourceEnd: target.sourceEnd + offset,
+        id: `${message.id}:block:${target.sourceStart + offset}`,
+        sourceText: sourceLines.slice(target.sourceStart + offset, target.sourceEnd + offset).join("") }));
+  });
+  return blocks;
+}
+
+function analyzeMarkdownLines(rawText: string, lines: string[]) {
   const content = (line: string) => line.replace(/(?:\r\n|\r|\n)$/, "");
-  const unquote = (line: string) => line.replace(/^(?: {0,3}>[ \t]?)+/, "");
-  const listIndents: number[] = [];
-  const listContext = (line: string) => {
-    const text = unquote(content(line));
-    if (!text.trim()) return;
-    const indent = /^ */.exec(text)![0].length;
-    while (listIndents.length && indent < listIndents.at(-1)!) listIndents.pop();
-    const marker = /^( *)(?:[-+*]|\d+[.)])([ \t]+)/.exec(text);
-    if (marker && indent <= (listIndents.at(-1) ?? 0) + 3) {
-      const contentIndent = marker[0].length;
-      if (listIndents.at(-1) !== contentIndent) listIndents.push(contentIndent);
-    }
-  };
-  const codeIndent = () => (listIndents.at(-1) ?? 0) + 4;
-  const fence = (line: string) => {
-    const match = /^( *)(?:([-+*]|\d+[.)])[ \t]+)?(`{3,}|~{3,})([^\r\n]*)$/.exec(unquote(content(line)));
-    return match && (match[1]!.length <= (listIndents.at(-1) ?? 0) + 3) ? match : null;
-  };
   const inlineCode = (line: string): string | undefined => {
     const text = content(line);
     const opener = /^ {0,3}(`+)(?!`)/.exec(text);
@@ -143,7 +120,6 @@ export function toPickTargets(message: PickItem): readonly PickTarget[] {
     }
     return undefined;
   };
-  const structure = (line: string) => /^(?: {0,3}(?:#{1,6}(?:\s|$)|>|[-+*]\s|\d+[.)]\s)| {4}|\t)|^ {0,3}(?:(?:\*\s*){3,}|(?:-\s*){3,}|(?:_\s*){3,})$/.test(content(line));
   const inlineCandidates = new Map<number, { line: number; raw: string; payload: string }>();
   let sourceOffset = 0;
   for (let line = 0; line < lines.length; line++) {
@@ -156,7 +132,7 @@ export function toPickTargets(message: PickItem): readonly PickTarget[] {
     sourceOffset += lines[line]!.replace(/\r\n|\r/g, "\n").length;
   }
   const inlineTargets = new Map<number, string>();
-  const normalized = message.rawText.replace(/\r\n|\r/g, "\n");
+  const normalized = rawText.replace(/\r\n|\r/g, "\n");
   const protectedLines = new Set<number>();
   {
     let offset = 0;
@@ -184,6 +160,38 @@ export function toPickTargets(message: PickItem): readonly PickTarget[] {
       offset += token.raw.length;
     }
   }
+  return { inlineTargets, protectedLines };
+}
+
+// Source lines keep clipboard payloads independent of rendering.
+export function toPickTargets(message: PickItem): readonly PickTarget[] {
+  const parent: PickTarget = { kind: "message", id: message.id, messageId: message.id, message, rawText: message.rawText };
+  if (message.kind !== "user" && message.kind !== "assistant") return [parent];
+  if (message.segments && message.segments.length > 1) return [parent, ...segmentBlocks(message, message.segments)];
+  const lines = message.rawText.match(/[^\r\n]*(?:\r\n|\r|\n)|[^\r\n]+$/g) ?? [];
+  const blocks: PickTarget[] = [];
+  let rich = false;
+  const content = (line: string) => line.replace(/(?:\r\n|\r|\n)$/, "");
+  const unquote = (line: string) => line.replace(/^(?: {0,3}>[ \t]?)+/, "");
+  const listIndents: number[] = [];
+  const listContext = (line: string) => {
+    const text = unquote(content(line));
+    if (!text.trim()) return;
+    const indent = /^ */.exec(text)![0].length;
+    while (listIndents.length && indent < listIndents.at(-1)!) listIndents.pop();
+    const marker = /^( *)(?:[-+*]|\d+[.)])([ \t]+)/.exec(text);
+    if (marker && indent <= (listIndents.at(-1) ?? 0) + 3) {
+      const contentIndent = marker[0].length;
+      if (listIndents.at(-1) !== contentIndent) listIndents.push(contentIndent);
+    }
+  };
+  const codeIndent = () => (listIndents.at(-1) ?? 0) + 4;
+  const fence = (line: string) => {
+    const match = /^( *)(?:([-+*]|\d+[.)])[ \t]+)?(`{3,}|~{3,})([^\r\n]*)$/.exec(unquote(content(line)));
+    return match && (match[1]!.length <= (listIndents.at(-1) ?? 0) + 3) ? match : null;
+  };
+  const structure = (line: string) => /^(?: {0,3}(?:#{1,6}(?:\s|$)|>|[-+*]\s|\d+[.)]\s)| {4}|\t)|^ {0,3}(?:(?:\*\s*){3,}|(?:-\s*){3,}|(?:_\s*){3,})$/.test(content(line));
+  const { inlineTargets, protectedLines } = analyzeMarkdownLines(message.rawText, lines);
   const inlineAt = (index: number) => inlineTargets.get(index);
   const add = (start: number, end: number, blockKind: "quote" | "code" | "inline-code", rawText = lines.slice(start, end).join(""), language?: string, fence?: { opening: string; closing?: string }) => {
     const sourceText = lines.slice(start, end).join("");

package/src/picker.ts

@@ -513,9 +513,12 @@ export class PickerScreen implements Component, Focusable {
       : Math.min(pageCount - 1, this.pageIndex ?? Math.ceil(this.viewportStart / this.listRows()));
     const help = "Enter copy · ←/→ prev/next page · Ctrl+T tools · PgUp/PgDn scroll preview · Esc close";
     const status = this.status();
+    const matches = this.visibleItems().length;
+    const countText = this.queryInput.getValue() ? `${matches} ${matches === 1 ? "match" : "matches"}` : "";
+    const matchCount = countText && width >= visibleWidth("type to search > ") + visibleWidth(this.queryInput.getValue()) + visibleWidth(countText) + 2 ? " " + this.theme.fg("dim", countText) : "";
     const prefix = `Page ${pageIndex + 1}/${pageCount} ${this.theme.fg("dim", `(tool messages ${this.showTools ? "included" : "excluded"})`)}, `;
-    const inputWidth = Math.min(width, visibleWidth("type to search > ") + visibleWidth(this.queryInput.getValue()) + 1);
-    const shownPrefix = truncateToWidth(prefix, Math.max(0, width - inputWidth), "");
+    const inputWidth = Math.min(width - visibleWidth(matchCount), visibleWidth("type to search > ") + visibleWidth(this.queryInput.getValue()) + 1);
+    const shownPrefix = truncateToWidth(prefix, Math.max(0, width - visibleWidth(matchCount) - inputWidth), "");
     const arrow = (show: boolean, shaded: boolean) => {
       if (!show) return "";
       const text = " " + this.theme.fg("muted", "...");
@@ -530,7 +533,7 @@ export class PickerScreen implements Component, Focusable {
     while (padding.has(visibleEnd - 1) && visibleEnd > visibleStart) visibleEnd--;
     const lines = [this.theme.fg("dim", help),
       status ? this.theme.fg(this.copyState.kind === "error" ? "error" : "muted", status)
-        : shownPrefix + this.queryInput.render(Math.max(1, width - visibleWidth(shownPrefix)))[0],
+        : shownPrefix + this.queryInput.render(Math.max(1, width - visibleWidth(shownPrefix) - visibleWidth(matchCount)))[0] + matchCount,
       arrow(stream.content.slice(0, visibleStart).some(Boolean), !!stream.userBackground[visibleStart - 1] && !!stream.userBackground[visibleStart])];
     const cardRows = stream.lines.slice(visibleStart, visibleEnd);
     if (!stream.lines.length) cardRows.push(" No matching messages");