@papillon6814/copi 0.4.2 → 0.5.0

package/README.md

@@ -26,7 +26,7 @@ copi migrate --resolve [--dry-run]
 copi help
 ```
 
-`setup` requires an interactive terminal. It first asks where copi may look: the Pi agent directories (`~/.pi/agent`, `~/.pi/agent-*`, `~/.pi/agent_*` and `~/.agents`; the default), this project only, or both. Settings and packages declared by those Pi profiles are expanded too, so configured paths elsewhere under `HOME` may be read; setup never walks your whole `HOME`. Symbolic links are not followed, and worktree checkout copies (`.worktrees`, `.claude/worktrees`, `.config/superpowers/worktrees`, `.treehouse`) are skipped. Selecting the current project scopes discovery to that project; when the current directory is `HOME` itself, only the Pi agent directories are offered. Candidates with the same kind, name and content are merged into one row marked `(+N identical copies)`; the kept row prefers a source under `~/.pi` or `~/.agents`. Copi then asks for explicit authorization before searching; declining performs no search. Search warnings are summarized (for example, resources found outside the selected roots are counted rather than listed one by one), and missing files are skipped silently.
+`setup` requires an interactive terminal. It first asks where copi may look: the Pi agent directories (`~/.pi/agent`, `~/.pi/agent-*`, `~/.pi/agent_*` and `~/.agents`; the default), this project only, or both. Settings and packages declared by those Pi profiles are expanded too, so configured paths elsewhere under `HOME` may be read; setup never walks your whole `HOME`. Symbolic links are not followed, and worktree checkout copies (`.worktrees`, `.claude/worktrees`, `.config/superpowers/worktrees`, `.treehouse`) are skipped. Selecting the current project scopes discovery to that project; when the current directory is `HOME` itself, only the Pi agent directories are offered. Candidates with the same kind, name and content are merged into one row marked `(+N identical copies)`; the kept row prefers a source under `~/.pi` or `~/.agents`. Copi then asks for explicit authorization before searching; declining performs no search. Search warnings are summarized (for example, resources found outside the selected roots are counted rather than listed one by one), and missing files are skipped silently. The resource list is split into Skills, Agents, Instructions and Settings tabs (←/→ switch tabs, ↑/↓ move, Tab selects (Space types into the filter), typing filters the current tab, Enter confirms the selection across all tabs); below the list a masked preview of the focused row shows the first lines of the file (or a skill's `SKILL.md`) with size, modification date and destination. Selecting a row only makes it a candidate for review; nothing is saved until the final confirmation.
 
 Candidates are listed with a source label, size and modification date, and entries whose name matches an already saved resource are marked `already saved`. After you select resources, name conflicts are resolved right away, before any preview: keep one of the same-named selections, rename the display name only (the files, body and destination are not changed), skip the resource (keeping the saved copy), or go back to the list.
 

package/dist/src/resource-picker.d.ts

@@ -0,0 +1,54 @@
+import { Prompt } from "@clack/core";
+import { CANCEL_SYMBOL } from "@clack/prompts";
+import type { ResourceCandidate, ResourceKind } from "./types.ts";
+export type ResourceTab = "Skills" | "Agents" | "Instructions" | "Settings";
+export declare function tabOf(kind: ResourceKind): ResourceTab;
+export interface PickerRow {
+    candidate: ResourceCandidate;
+    /** Already safe for display (callers pass safeDisplay output). */
+    label: string;
+    /** Already safe for display: size · modified · destination. */
+    details: string;
+}
+export interface PickerOptions {
+    message: string;
+    rows: readonly PickerRow[];
+    initialValues?: readonly string[];
+    /** Masks and neutralizes control characters; applied to every preview line. */
+    sanitize: (text: string) => string;
+    previewLines?: number;
+    signal?: AbortSignal;
+    input?: NodeJS.ReadableStream;
+    output?: NodeJS.WritableStream;
+}
+/** The file whose head the preview shows: the file itself, or a skill directory's regular SKILL.md (never a symlink). */
+export declare function previewFile(candidate: ResourceCandidate): string | undefined;
+/** Masked head of the preview file: at most `lines` lines, plus a "… N more lines" marker when truncated. */
+export declare function previewText(candidate: ResourceCandidate, lines: number, sanitize: (text: string) => string): {
+    title: string;
+    body: string[];
+};
+/** Cut to `width` terminal columns (CJK counts double), never splitting a code point. */
+export declare function clip(text: string, width: number): string;
+/** Keep head and tail within `width` columns, so trailing markers such as "(+1 identical copy)" stay visible. */
+export declare function clipMiddle(text: string, width: number): string;
+/**
+ * A tabbed multi-select for setup: ←/→ switch kind tabs, ↑/↓ move, Tab toggles, typing filters the current tab,
+ * Backspace deletes, Enter confirms the selection across all tabs. Shows a masked preview of the focused row.
+ */
+export declare class ResourcePickerPrompt extends Prompt<string[]> {
+    private readonly options;
+    readonly tabs: ResourceTab[];
+    tab: number;
+    cursor: number;
+    filter: string;
+    readonly selected: Set<string>;
+    private readonly rowsByTab;
+    private readonly previews;
+    constructor(options: PickerOptions);
+    visibleRows(): PickerRow[];
+    private handleKey;
+    private preview;
+    draw(): string;
+}
+export declare function resourcePicker(options: PickerOptions): Promise<string[] | typeof CANCEL_SYMBOL>;

package/dist/src/resource-picker.js

@@ -0,0 +1,239 @@
+import { isCancel as isCoreCancel, Prompt } from "@clack/core";
+import { CANCEL_SYMBOL, S_BAR, S_BAR_END, S_CHECKBOX_INACTIVE, S_CHECKBOX_SELECTED, symbol } from "@clack/prompts";
+import stringWidth from "fast-string-width";
+import { closeSync, constants, fstatSync, lstatSync, openSync, readSync } from "node:fs";
+import path from "node:path";
+import { styleText } from "node:util";
+import { maskSensitiveText } from "./inspect.js";
+const tabOrder = ["Skills", "Agents", "Instructions", "Settings"];
+export function tabOf(kind) {
+    if (kind === "skill")
+        return "Skills";
+    if (kind === "subagent")
+        return "Agents";
+    if (kind === "instruction")
+        return "Instructions";
+    return "Settings";
+}
+const previewReadBytes = 64 * 1024;
+/** The file whose head the preview shows: the file itself, or a skill directory's regular SKILL.md (never a symlink). */
+export function previewFile(candidate) {
+    try {
+        const stat = lstatSync(candidate.sourcePath);
+        if (stat.isFile())
+            return candidate.sourcePath;
+        if (!stat.isDirectory())
+            return undefined;
+        const skill = path.join(candidate.sourcePath, "SKILL.md");
+        return lstatSync(skill, { throwIfNoEntry: false })?.isFile() ? skill : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Masked head of the preview file: at most `lines` lines, plus a "… N more lines" marker when truncated. */
+export function previewText(candidate, lines, sanitize) {
+    const file = previewFile(candidate);
+    if (!file)
+        return { title: "no previewable file", body: [] };
+    const title = sanitize(path.relative(path.dirname(candidate.sourcePath), file) || path.basename(file));
+    let fd;
+    try {
+        // No symlink following and no blocking on FIFOs swapped in after the lstat above.
+        fd = openSync(file, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
+        if (!fstatSync(fd).isFile())
+            return { title, body: ["[unreadable]"] };
+        const buffer = Buffer.alloc(previewReadBytes);
+        const read = readSync(fd, buffer, 0, previewReadBytes, 0);
+        const bytes = buffer.subarray(0, read);
+        if (bytes.includes(0))
+            return { title, body: ["[binary file]"] };
+        let text;
+        // Streaming decode drops a multi-byte character cut at the read limit instead of rejecting valid UTF-8.
+        try {
+            text = new TextDecoder("utf-8", { fatal: true }).decode(bytes, { stream: read === previewReadBytes });
+        }
+        catch {
+            return { title, body: ["[not UTF-8 text]"] };
+        }
+        const all = maskSensitiveText(text).replace(/\r\n/g, "\n").split("\n");
+        if (all.at(-1) === "")
+            all.pop();
+        const shown = all.slice(0, lines).map(sanitize);
+        const more = all.length - lines;
+        if (more > 0)
+            shown.push(`… ${more}${read === previewReadBytes ? "+" : ""} more ${more === 1 && read < previewReadBytes ? "line" : "lines"}`);
+        return { title, body: shown };
+    }
+    catch {
+        return { title, body: ["[unreadable]"] };
+    }
+    finally {
+        if (fd !== undefined)
+            closeSync(fd);
+    }
+}
+/** Cut to `width` terminal columns (CJK counts double), never splitting a code point. */
+export function clip(text, width) {
+    if (stringWidth(text) <= width)
+        return text;
+    let out = "";
+    for (const char of text) {
+        if (stringWidth(out + char) > width - 1)
+            break;
+        out += char;
+    }
+    return `${out}…`;
+}
+/** Keep head and tail within `width` columns, so trailing markers such as "(+1 identical copy)" stay visible. */
+export function clipMiddle(text, width) {
+    if (stringWidth(text) <= width)
+        return text;
+    const chars = [...text];
+    let head = "", tail = "";
+    for (let i = 0, j = chars.length - 1; i <= j;) {
+        if (stringWidth(head) <= stringWidth(tail)) {
+            if (stringWidth(head + chars[i] + tail) > width - 1)
+                break;
+            head += chars[i++];
+        }
+        else {
+            if (stringWidth(head + chars[j] + tail) > width - 1)
+                break;
+            tail = chars[j--] + tail;
+        }
+    }
+    return `${head}…${tail}`;
+}
+/**
+ * A tabbed multi-select for setup: ←/→ switch kind tabs, ↑/↓ move, Tab toggles, typing filters the current tab,
+ * Backspace deletes, Enter confirms the selection across all tabs. Shows a masked preview of the focused row.
+ */
+export class ResourcePickerPrompt extends Prompt {
+    options;
+    tabs;
+    tab = 0;
+    cursor = 0;
+    filter = "";
+    selected;
+    rowsByTab;
+    previews = new Map();
+    constructor(options) {
+        super({
+            render() { return this.draw(); },
+            ...(options.signal ? { signal: options.signal } : {}),
+            ...(options.input ? { input: options.input } : {}),
+            ...(options.output ? { output: options.output } : {}),
+        }, false);
+        this.options = options;
+        this.rowsByTab = new Map(tabOrder.map((tab) => [tab, options.rows.filter((row) => tabOf(row.candidate.kind) === tab)]));
+        this.tabs = tabOrder.filter((tab) => (this.rowsByTab.get(tab) ?? []).length > 0);
+        const known = new Set(options.rows.map((row) => row.candidate.id));
+        this.selected = new Set((options.initialValues ?? []).filter((id) => known.has(id)));
+        this.value = [...this.selected];
+        // Coming back to the list (e.g. "Go back"), open the first tab that holds a previous selection.
+        const firstSelectedTab = this.tabs.findIndex((tab) => (this.rowsByTab.get(tab) ?? []).some((row) => this.selected.has(row.candidate.id)));
+        if (firstSelectedTab >= 0)
+            this.tab = firstSelectedTab;
+        this.on("key", (char, key) => this.handleKey(char, key.name));
+    }
+    visibleRows() {
+        const rows = this.rowsByTab.get(this.tabs[this.tab]) ?? [];
+        const needle = this.filter.toLowerCase();
+        return needle ? rows.filter((row) => row.label.toLowerCase().includes(needle)) : rows;
+    }
+    handleKey(char, name) {
+        const rows = this.visibleRows();
+        if (name === "left" || name === "right") {
+            if (this.tabs.length > 0)
+                this.tab = (this.tab + (name === "left" ? this.tabs.length - 1 : 1)) % this.tabs.length;
+            this.cursor = 0;
+            this.filter = "";
+        }
+        else if (name === "up") {
+            this.cursor = rows.length === 0 ? 0 : (this.cursor + rows.length - 1) % rows.length;
+        }
+        else if (name === "down") {
+            this.cursor = rows.length === 0 ? 0 : (this.cursor + 1) % rows.length;
+        }
+        else if (name === "tab") {
+            const row = rows[this.cursor];
+            if (row) {
+                if (this.selected.has(row.candidate.id))
+                    this.selected.delete(row.candidate.id);
+                else
+                    this.selected.add(row.candidate.id);
+            }
+        }
+        else if (name === "backspace") {
+            this.filter = this.filter.slice(0, -1);
+            this.cursor = 0;
+        }
+        else if (name !== "return" && char !== undefined && [...char].length === 1 && this.options.sanitize(char) === char && char >= " ") {
+            this.filter += char;
+            this.cursor = 0;
+        }
+        // Keep the submitted value in canonical row order.
+        this.value = this.options.rows.map((row) => row.candidate.id).filter((id) => this.selected.has(id));
+    }
+    preview(row) {
+        let cached = this.previews.get(row.candidate.id);
+        if (!cached) {
+            cached = previewText(row.candidate, this.options.previewLines ?? 6, this.options.sanitize);
+            this.previews.set(row.candidate.id, cached);
+        }
+        return cached;
+    }
+    draw() {
+        const width = Math.max(20, (process.stdout.columns ?? 100) - 4);
+        const bar = styleText("cyan", S_BAR);
+        const title = `${symbol(this.state)}  ${this.options.message}`;
+        if (this.state === "submit")
+            return `${styleText("gray", S_BAR)}\n${title}\n${styleText("gray", S_BAR)}  ${styleText("dim", `${this.selected.size} items selected`)}`;
+        if (this.state === "cancel")
+            return `${styleText("gray", S_BAR)}\n${title}\n${styleText("gray", S_BAR)}  ${styleText(["strikethrough", "dim"], `${this.selected.size} items selected`)}`;
+        const lines = [styleText("gray", S_BAR), title];
+        const tabLine = this.tabs.map((tab, index) => {
+            const rows = this.rowsByTab.get(tab) ?? [];
+            const picked = rows.filter((row) => this.selected.has(row.candidate.id)).length;
+            const text = `${tab} ${rows.length}${picked ? ` (${picked} selected)` : ""}`;
+            return index === this.tab ? styleText(["inverse", "bold"], ` ${text} `) : styleText("dim", ` ${text} `);
+        }).join(styleText("gray", "│"));
+        lines.push(`${bar}  ${tabLine}`);
+        lines.push(`${bar}  ${styleText("dim", "Search:")} ${clip(this.options.sanitize(this.filter), width - 10)}${styleText("inverse", " ")}`);
+        const rows = this.visibleRows();
+        const maxRows = Math.max(3, Math.min(10, (process.stdout.rows ?? 30) - 20));
+        const start = Math.min(Math.max(0, this.cursor - Math.floor(maxRows / 2)), Math.max(0, rows.length - maxRows));
+        if (rows.length === 0)
+            lines.push(`${bar}  ${styleText("yellow", "No matches found")}`);
+        if (start > 0)
+            lines.push(`${bar}  ${styleText("dim", "…")}`);
+        for (const [offset, row] of rows.slice(start, start + maxRows).entries()) {
+            const index = start + offset;
+            const box = this.selected.has(row.candidate.id) ? styleText("green", S_CHECKBOX_SELECTED) : styleText("dim", S_CHECKBOX_INACTIVE);
+            // Middle truncation keeps both the name and trailing markers such as "(+1 identical copy)".
+            const text = clipMiddle(row.label, width - 4);
+            lines.push(`${bar}  ${box} ${index === this.cursor ? styleText("underline", text) : text}`);
+        }
+        if (start + maxRows < rows.length)
+            lines.push(`${bar}  ${styleText("dim", "…")}`);
+        const focused = rows[this.cursor];
+        if (focused) {
+            const preview = this.preview(focused);
+            lines.push(bar);
+            lines.push(`${bar}  ${styleText("dim", clipMiddle(`── Preview: ${preview.title} (masked) · ${focused.details} ──`, width))}`);
+            for (const line of preview.body)
+                lines.push(`${bar}  ${styleText("dim", clip(line, width))}`);
+        }
+        lines.push(`${bar}  ${styleText("dim", "←/→ tabs • ↑/↓ move • Tab: select • Enter: confirm • Type: to search")}`);
+        lines.push(styleText("cyan", S_BAR_END));
+        return lines.join("\n");
+    }
+}
+export async function resourcePicker(options) {
+    const result = await new ResourcePickerPrompt(options).prompt();
+    // Translate core's cancel into the symbol @clack/prompts' isCancel recognizes, even if two core copies were installed.
+    if (isCoreCancel(result))
+        return CANCEL_SYMBOL;
+    return result ?? [];
+}

package/dist/src/wizard.js

@@ -8,6 +8,7 @@ import { candidateHint, candidateLabels, collapseIdenticalCandidates, contentFin
 import { inspectPreparedResource, maskSensitiveText } from "./inspect.js";
 import { assertNameAvailable, assertNoNameConflicts, findNameConflicts, nameKey } from "./names.js";
 import { executeApply, planApply } from "./apply.js";
+import { resourcePicker } from "./resource-picker.js";
 /** Mask display metadata too, and render controls literally rather than executing VT sequences. */
 export function safeDisplay(value) {
     return maskSensitiveText(value)
@@ -507,20 +508,21 @@ export async function runSetup(libraryDir, roots) {
         "(suspected secrets need approval one by one; No skips that resource) \u2192 final confirmation.",
         `Copies are saved to ${displayPath(libraryDir, homeDir)} only if you answer Yes at the final confirmation.`,
         "Ctrl-C at any point saves nothing, and your original files are never changed.",
-        "Row: [kind] name \u2014 where it was found. The focused row also shows size \u00b7 modified \u00b7 destination.",
+        "Tabs group resources by kind; the masked preview below the list follows the focused row.",
     ].join("\n"), "Choosing resources");
     let previousSelection = [];
     let resolvedCandidates;
     while (true) {
-        const selectedIds = await autocompleteMultiselect({
-            message: "Select resources to review and save as copied snapshots",
-            options: sortedCandidates.map((candidate) => {
-                const label = candidateLabelMap.get(candidate.id) + identicalCopiesSuffix(identicalCopies.get(candidate.id));
-                return { value: candidate.id, label, hint: candidateHint(candidate, candidateStats.get(candidate.id) ?? {}, homeDir, process.stdout.columns, label.length) };
-            }),
-            required: false,
+        const selectedIds = await resourcePicker({
+            message: `Select resources to review and save as copied snapshots ${multiselectKeyHint}`,
+            rows: sortedCandidates.map((candidate) => ({
+                candidate,
+                label: safeDisplay(candidateLabelMap.get(candidate.id) + identicalCopiesSuffix(identicalCopies.get(candidate.id))),
+                details: safeDisplay(candidateHint(candidate, candidateStats.get(candidate.id) ?? {}, homeDir, undefined, 0)),
+            })),
             initialValues: previousSelection,
-            placeholder: "Filter resources...",
+            sanitize: safeDisplay,
+            ...inheritedSignal(),
         });
         if (isCancel(selectedIds)) {
             cancel("Setup cancelled; no resources were saved.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papillon6814/copi",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Collect and organize reusable Pi coding-agent resources",
   "license": "MIT",
   "type": "module",
@@ -26,8 +26,10 @@
     "check": "npm run build && npm test && npm pack --dry-run"
   },
   "dependencies": {
+    "@clack/core": "1.5.1",
     "@clack/prompts": "^1.8.1",
-    "diff": "^9.0.0"
+    "diff": "^9.0.0",
+    "fast-string-width": "^3.0.2"
   },
   "devDependencies": {
     "@types/node": "^22.15.30",