pi-copy-message 1.0.7 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Unreleased
+
+## 1.0.9 - 2026-07-11
+
+- Update the local Pi development baseline and compatibility documentation to 0.80.6.
+- Read current branch-summary, compaction-summary, and visible custom-message session entries in `/copy-message`; hidden custom messages stay excluded.
+- Honor configured Pi selection keybindings before local picker shortcuts and render their effective hints.
+
+## 1.0.8 - 2026-06-24
+
+- Add `/copy-message` and `/copy-user` argument completions for `latest`/`last`/`newest` and `--with-meta`/`--with-metadata`/`--with-role`.
+- Bound clipboard commands with a 3s timeout so a wedged `xclip`/`wl-copy` daemon cannot hang the command.
+- Drop the obsolete `basic-ftp` npm override (no longer in the dependency tree).
+- Align pi core peer dependencies with package guidance (non-optional wildcard peers; pi aliases them to its bundled copies at load time).
+- Update the local pi development baseline to `0.80.2` and refresh the npm lockfile.
+
 ## 1.0.7 - 2026-06-23
 
 - updated the local pi development baseline to `@earendil-works/pi-coding-agent` / `@earendil-works/pi-tui` `0.80.1` and refreshed the npm lockfile

package/README.md

@@ -15,6 +15,7 @@ A [pi](https://github.com/earendil-works/pi-mono) extension that adds `/copy-mes
 - Hides tool/bash messages by default
 - Supports type-to-filter search across role and message text, with `time:<term>` for timestamp search
 - Supports Home/End jumps for oldest/newest visible messages
+- Uses Pi's configured selection bindings for navigation, copy, and cancel
 - Includes fast paths: `/copy-message latest`, `/copy-message last`, and `/copy-message newest`
 - Supports direct numbered copies like `/copy-message 3`
 - Supports metadata copies with `--with-meta`, `--with-metadata`, or `--with-role`
@@ -90,8 +91,8 @@ Copy with role and timestamp metadata instead of raw text only:
 
 | Key | Action |
 |---|---|
-| `↑` | Move to older visible message |
-| `↓` | Move to newer visible message |
+| Configured `tui.select.up` (default: `↑`) | Move to older visible message |
+| Configured `tui.select.down` (default: `↓`) | Move to newer visible message |
 | `Home` | Jump to oldest visible message |
 | `End` | Jump to newest visible message |
 | Type text | Filter visible messages |
@@ -102,8 +103,8 @@ Copy with role and timestamp metadata instead of raw text only:
 | `Ctrl+T` | Toggle tool/bash messages |
 | `Tab` | Toggle a wrapped preview of the selected message |
 | `Alt+M` | Toggle raw vs metadata copy format |
-| `Enter` | Copy selected message text |
-| `Esc` | Cancel |
+| Configured `tui.select.confirm` (default: `Enter`) | Copy selected message text |
+| Configured `tui.select.cancel` (default: `Esc`/`Ctrl+C`) | Cancel |
 
 ## Behavior notes
 
@@ -112,6 +113,8 @@ Copy with role and timestamp metadata instead of raw text only:
 - Search preserves your original selected message and restores it when the search is cleared.
 - General search does not match timestamps; use `time:<term>` when you want to search by displayed time.
 - Filter labels honor the active pi theme.
+- Selection key hints show the active Pi bindings. Configured selection actions take precedence if they collide with the picker's filter, preview, or format shortcuts.
+- Hidden custom messages are excluded in both current `custom_message` entries and legacy message-wrapped entries; only messages with `display: true` can appear or be copied.
 - Copy notifications include the role and a short preview so you can verify what was copied.
 - `/copy-message latest` respects default visibility: user and assistant messages are visible, tool/bash messages are hidden. If only hidden messages exist, it falls back to the newest message so the command still does something useful.
 - `/copy-message` with no direct selector requires interactive TUI mode because the picker is a custom TUI component.
@@ -119,11 +122,11 @@ Copy with role and timestamp metadata instead of raw text only:
 
 ## Compatibility
 
-- Tested with pi 0.80.1
+- Tested with pi 0.80.6
 - Supported Node.js range for local repo tooling: `>=22.19.0`
 - `.nvmrc` pins Node 22.19.0 for local development
 
-This package keeps pi core packages as optional wildcard peers per current pi package guidance. Local development uses `@earendil-works/pi-coding-agent` and `@earendil-works/pi-tui` as dev dependencies for typechecking and tests.
+This package keeps pi core packages as wildcard peers (`*`) per pi package guidance. Pi aliases these imports to its own bundled copies when loading the extension, so the package never bundles or shadows pi core. Local development uses `@earendil-works/pi-coding-agent` and `@earendil-works/pi-tui` as dev dependencies for typechecking and tests.
 
 ## Development
 

package/extensions/copy-message.ts

@@ -1,5 +1,6 @@
 import { spawnSync } from "node:child_process";
-import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionCommandContext, KeybindingsManager } from "@earendil-works/pi-coding-agent";
+import type { AutocompleteItem } from "@earendil-works/pi-tui";
 import { matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 const MAX_VISIBLE_MESSAGES = 8;
@@ -109,14 +110,25 @@ function formatTime(timestamp: unknown): string {
 function entryToCopyableMessage(entry: unknown): CopyableMessage | undefined {
 	if (entry === null || typeof entry !== "object") return undefined;
 	const record = entry as Record<string, unknown>;
-	if (record.type !== "message") return undefined;
-	if (record.message === null || typeof record.message !== "object") return undefined;
+	let role: string;
+	let text: string;
 
-	const message = record.message as Record<string, unknown>;
-	const role = typeof message.role === "string" ? message.role : "message";
-	const text = textFromMessage(message);
-	if (!text.trim()) return undefined;
+	if (record.type === "message" && record.message !== null && typeof record.message === "object") {
+		const message = record.message as Record<string, unknown>;
+		role = typeof message.role === "string" ? message.role : "message";
+		if (role === "custom" && message.display !== true) return undefined;
+		text = textFromMessage(message);
+	} else if (record.type === "branch_summary" || record.type === "compaction") {
+		role = record.type === "branch_summary" ? "branchSummary" : "compactionSummary";
+		text = typeof record.summary === "string" ? record.summary : "";
+	} else if (record.type === "custom_message" && record.display === true) {
+		role = "custom";
+		text = textFromContent(record.content);
+	} else {
+		return undefined;
+	}
 
+	if (!text.trim()) return undefined;
 	return {
 		id: typeof record.id === "string" ? record.id : "unknown",
 		role,
@@ -183,20 +195,25 @@ const clipboardCommands: ClipboardCommand[] = [
 	{ name: "xsel", args: ["--clipboard", "--input"], enabled: () => true },
 ];
 
+const CLIPBOARD_TIMEOUT_MS = 3000;
 const commandExistsCache = new Map<string, boolean>();
 
 function commandExists(command: string): boolean {
 	const cached = commandExistsCache.get(command);
 	if (cached !== undefined) return cached;
 
-	const result = spawnSync("sh", ["-c", "command -v \"$1\" >/dev/null 2>&1", "sh", command], { stdio: "ignore" });
+	const result = spawnSync("sh", ["-c", "command -v \"$1\" >/dev/null 2>&1", "sh", command], {
+		stdio: "ignore",
+		timeout: CLIPBOARD_TIMEOUT_MS,
+		killSignal: "SIGKILL",
+	});
 	const exists = result.status === 0;
 	commandExistsCache.set(command, exists);
 	return exists;
 }
 
 function copyWith(command: string, args: string[], text: string): boolean {
-	const result = spawnSync(command, args, { input: text, encoding: "utf8" });
+	const result = spawnSync(command, args, { input: text, encoding: "utf8", timeout: CLIPBOARD_TIMEOUT_MS, killSignal: "SIGKILL" });
 	return !result.error && result.status === 0;
 }
 
@@ -344,10 +361,58 @@ function renderPeekLines(message: CopyableMessage, width: number, theme: CopyMes
 	return lines;
 }
 
-function helpLine(width: number): string {
-	if (width < 48) return "↑↓ · Tab peek · Alt+M meta · Enter · Esc";
-	if (width < 74) return "↑↓ nav · Home/End · Tab peek · Ctrl+U/A/T filters · Enter · Esc";
-	return "type search · ↑↓ navigate · Home/End · Tab peek · Ctrl+U/A/T filters · Alt+M meta · Enter · Esc";
+type PickerKeybindings = Pick<KeybindingsManager, "getKeys" | "matches">;
+
+function bindingHint(keybindings: PickerKeybindings | undefined, action: "up" | "down" | "confirm" | "cancel"): string {
+	const id = `tui.select.${action}` as const;
+	if (!keybindings) return { up: "up", down: "down", confirm: "enter", cancel: "escape/ctrl+c" }[action];
+	const keys = keybindings.getKeys(id);
+	return keys.reduce((shortest, key) => visibleWidth(key) < visibleWidth(shortest) ? key : shortest, keys[0] ?? "unbound");
+}
+
+function helpLines(width: number, keybindings?: PickerKeybindings): string[] {
+	const up = bindingHint(keybindings, "up");
+	const down = bindingHint(keybindings, "down");
+	const confirm = bindingHint(keybindings, "confirm");
+	const cancel = bindingHint(keybindings, "cancel");
+	const available = (data: string) =>
+		!keybindings ||
+		!(keybindings.matches(data, "tui.select.up") ||
+			keybindings.matches(data, "tui.select.down") ||
+			keybindings.matches(data, "tui.select.confirm") ||
+			keybindings.matches(data, "tui.select.cancel"));
+	const peek = available("\t") ? "Tab peek" : undefined;
+	const filters = [
+		{ hint: "U", data: "\x15" },
+		{ hint: "A", data: "\x01" },
+		{ hint: "T", data: "\x14" },
+	].filter(({ data }) => available(data));
+	const filterHint = filters.length > 0 ? `Ctrl+${filters.map(({ hint }) => hint).join("/")} filters` : undefined;
+	const meta = available("\x1bm") ? "Alt+M meta" : undefined;
+	const jumps = [
+		{ hint: "Home", data: "\x1b[H" },
+		{ hint: "End", data: "\x1b[F" },
+	].filter(({ data }) => available(data));
+	const jumpHint = jumps.length > 0 ? `${jumps.map(({ hint }) => hint).join("/")} jump` : undefined;
+	const join = (...hints: Array<string | undefined>) => hints.filter(Boolean).join(" · ");
+	const core = width < 74 ? [`${up}/${down} nav`, `${confirm} copy`, `${cancel} cancel`] : [`${up} older`, `${down} newer`, `${confirm} copy`, `${cancel} cancel`];
+	const optional: string[] = [];
+
+	if (visibleWidth(join(...core)) > width) {
+		const lines: string[] = [];
+		for (const hint of [`${up} older`, `${down} newer`, `${confirm} copy`, `${cancel} cancel`]) {
+			const candidate = join(lines.at(-1), hint);
+			if (lines.length === 0 || visibleWidth(candidate) > width) lines.push(hint);
+			else lines[lines.length - 1] = candidate;
+		}
+		return lines;
+	}
+
+	for (const hint of width < 74 ? [jumpHint, peek, filterHint, meta] : ["type search", jumpHint, peek, filterHint, meta]) {
+		if (hint && visibleWidth(join(...optional, hint, ...core)) <= width) optional.push(hint);
+	}
+
+	return [join(...optional, ...core)];
 }
 
 type PickerInputResult = "copy" | "cancel" | "render" | "none";
@@ -380,7 +445,7 @@ export class CopyMessagePickerState {
 		return selected ? formatMessageForCopy(selected, this.format) : undefined;
 	}
 
-	render(width: number, theme: CopyMessageTheme): string[] {
+	render(width: number, theme: CopyMessageTheme, keybindings?: PickerKeybindings): string[] {
 		const maxVisible = Math.min(this.visibleMessages.length, MAX_VISIBLE_MESSAGES);
 		const start = maxVisible === 0 ? 0 : Math.max(0, Math.min(this.selectedIndex - maxVisible + 1, this.visibleMessages.length - maxVisible));
 		const end = Math.min(this.visibleMessages.length, start + maxVisible);
@@ -411,12 +476,24 @@ export class CopyMessagePickerState {
 		const position = this.visibleMessages.length === 0 ? "0/0" : `${this.selectedIndex + 1}/${this.visibleMessages.length}`;
 		lines.push(`${theme.fg("dim", `(${position})`)} · ${userState} · ${assistantState} · ${toolState} · ${formatState} · ${searchState}`);
 		lines.push("");
-		lines.push(hotkeyHint(theme, helpLine(width)));
+		lines.push(...helpLines(width, keybindings).map((line) => hotkeyHint(theme, line)));
 		lines.push("");
 		return lines.map((line) => truncateToWidth(line, width, ""));
 	}
 
-	handleInput(data: string): PickerInputResult {
+	handleInput(data: string, keybindings?: PickerKeybindings): PickerInputResult {
+		if (keybindings?.matches(data, "tui.select.up")) {
+			this.move(-1);
+			return "render";
+		}
+		if (keybindings?.matches(data, "tui.select.down")) {
+			this.move(1);
+			return "render";
+		}
+		if (keybindings?.matches(data, "tui.select.confirm")) {
+			return this.visibleMessages.length > 0 ? "copy" : "none";
+		}
+		if (keybindings?.matches(data, "tui.select.cancel")) return "cancel";
 		if (matchesKey(data, "ctrl+t")) {
 			this.visibility.showTools = !this.visibility.showTools;
 			this.refreshMessages();
@@ -448,11 +525,11 @@ export class CopyMessagePickerState {
 			this.setSearch(this.search + data);
 			return "render";
 		}
-		if (matchesKey(data, "up")) {
+		if (!keybindings && matchesKey(data, "up")) {
 			this.move(-1);
 			return "render";
 		}
-		if (matchesKey(data, "down")) {
+		if (!keybindings && matchesKey(data, "down")) {
 			this.move(1);
 			return "render";
 		}
@@ -464,10 +541,10 @@ export class CopyMessagePickerState {
 			this.jumpToBottom();
 			return "render";
 		}
-		if (matchesKey(data, "enter") || matchesKey(data, "return")) {
+		if (!keybindings && (matchesKey(data, "enter") || matchesKey(data, "return"))) {
 			return this.visibleMessages.length > 0 ? "copy" : "none";
 		}
-		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+		if (!keybindings && (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))) {
 			return "cancel";
 		}
 		return "none";
@@ -513,6 +590,9 @@ export class CopyMessagePickerState {
 	}
 }
 
+const COPY_METADATA_FLAGS = ["--with-meta", "--with-metadata", "--with-role"];
+const COPY_LATEST_SELECTORS = ["latest", "last", "newest"];
+
 type ParsedCopyMessageArgs = {
 	format: CopyFormat;
 	selector?: "latest" | { number: number };
@@ -521,11 +601,11 @@ type ParsedCopyMessageArgs = {
 function parseCopyArgs(args: string | undefined): ParsedCopyMessageArgs {
 	const result: ParsedCopyMessageArgs = { format: "raw" };
 	for (const token of (args ?? "").trim().toLowerCase().split(/\s+/).filter(Boolean)) {
-		if (token === "--with-meta" || token === "--with-metadata" || token === "--with-role") {
+		if (COPY_METADATA_FLAGS.includes(token)) {
 			result.format = "metadata";
 			continue;
 		}
-		if (token === "last" || token === "latest" || token === "newest") {
+		if (COPY_LATEST_SELECTORS.includes(token)) {
 			result.selector = "latest";
 			continue;
 		}
@@ -536,16 +616,26 @@ function parseCopyArgs(args: string | undefined): ParsedCopyMessageArgs {
 	return result;
 }
 
+export function copyArgumentCompletions(prefix: string, includeSelectors: boolean): AutocompleteItem[] | null {
+	if (/^\d+$/.test(prefix)) return null;
+	const candidates = includeSelectors ? [...COPY_LATEST_SELECTORS, ...COPY_METADATA_FLAGS] : COPY_METADATA_FLAGS;
+	const normalized = prefix.toLowerCase();
+	const items = candidates
+		.filter((candidate) => candidate.startsWith(normalized))
+		.map((candidate) => ({ value: candidate, label: candidate }));
+	return items.length > 0 ? items : null;
+}
+
 async function pickMessage(ctx: ExtensionCommandContext, messages: CopyableMessage[], initialFormat: CopyFormat) {
-	return ctx.ui.custom<{ message: CopyableMessage; text: string } | null>((tui, theme, _keybindings, done) => {
+	return ctx.ui.custom<{ message: CopyableMessage; text: string } | null>((tui, theme, keybindings, done) => {
 		const state = new CopyMessagePickerState(messages, initialFormat);
 		return {
 			render(width: number) {
-				return state.render(width, theme);
+				return state.render(width, theme, keybindings);
 			},
 			invalidate() {},
 			handleInput(data: string) {
-				const result = state.handleInput(data);
+				const result = state.handleInput(data, keybindings);
 				if (result === "copy") {
 					const selected = state.selectedMessage();
 					const text = state.selectedCopyText();
@@ -593,6 +683,7 @@ function copyMostRecentUserMessage(ctx: Pick<ExtensionCommandContext, "sessionMa
 export default function copyMessageExtension(pi: Pick<ExtensionAPI, "registerCommand">) {
 	pi.registerCommand("copy-message", {
 		description: "Select a session message and copy its text to the clipboard",
+		getArgumentCompletions: (argumentPrefix) => copyArgumentCompletions(argumentPrefix, true),
 		handler: async (args, ctx) => {
 			const parsedArgs = parseCopyArgs(args);
 			const messages = collectCopyableMessages(ctx);
@@ -631,6 +722,7 @@ export default function copyMessageExtension(pi: Pick<ExtensionAPI, "registerCom
 
 	pi.registerCommand("copy-user", {
 		description: "Copy the most recent user message to the clipboard",
+		getArgumentCompletions: (argumentPrefix) => copyArgumentCompletions(argumentPrefix, false),
 		handler: async (args, ctx) => {
 			copyMostRecentUserMessage(ctx, parseCopyArgs(args).format);
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-copy-message",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Pi extension with a searchable TUI picker for copying raw session messages",
   "author": "Mitch Fultz (https://github.com/fitchmultz)",
   "license": "MIT",
@@ -44,15 +44,12 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.80.1",
-    "@earendil-works/pi-tui": "^0.80.1",
+    "@earendil-works/pi-coding-agent": "^0.80.6",
+    "@earendil-works/pi-tui": "^0.80.6",
     "@types/node": "^25.9.1",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3"
   },
-  "overrides": {
-    "basic-ftp": "6.0.1"
-  },
   "pi": {
     "extensions": [
       "./extensions"
@@ -62,13 +59,5 @@
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@earendil-works/pi-tui": {
-      "optional": true
-    }
   }
 }