@readwise/cli 0.5.2 → 0.5.4

package/dist/skills.js

@@ -117,6 +117,87 @@ const PLATFORMS = {
     codex: { name: "Codex CLI", path: join(homedir(), ".codex", "skills") },
     opencode: { name: "OpenCode", path: join(homedir(), ".opencode", "skills") },
 };
+/** Interactive checkbox picker — returns selected items */
+async function pickSkills(names, descriptions) {
+    const selected = new Set(names.filter((n) => n === "readwise-cli"));
+    let cursor = 0;
+    const render = () => {
+        // Move cursor up to overwrite previous render
+        process.stderr.write(`\x1b[${names.length + 2}A\x1b[J`);
+        process.stderr.write("  Select skills to install (space toggle, a all/none, enter confirm):\n\n");
+        for (let i = 0; i < names.length; i++) {
+            const check = selected.has(names[i]) ? "\x1b[32m✔\x1b[0m" : " ";
+            const pointer = i === cursor ? "\x1b[36m❯\x1b[0m" : " ";
+            const desc = descriptions.get(names[i]) || "";
+            const descText = desc ? `  \x1b[2m${desc}\x1b[0m` : "";
+            process.stderr.write(`  ${pointer} [${check}] ${names[i]}${descText}\n`);
+        }
+    };
+    // Initial render (print blank lines first so the upward cursor move works)
+    process.stderr.write("\n".repeat(names.length + 2));
+    render();
+    return new Promise((resolve) => {
+        if (!process.stdin.isTTY) {
+            // Non-interactive: install all
+            resolve(names);
+            return;
+        }
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        const onData = (data) => {
+            const s = data.toString();
+            if (s === "\r" || s === "\n") {
+                // Enter — confirm
+                cleanup();
+                resolve([...selected]);
+                return;
+            }
+            if (s === "\x03" || s === "\x1b") {
+                // Ctrl+C or Escape — cancel
+                cleanup();
+                resolve(null);
+                return;
+            }
+            if (s === " ") {
+                // Space — toggle current
+                const name = names[cursor];
+                if (selected.has(name))
+                    selected.delete(name);
+                else
+                    selected.add(name);
+                render();
+                return;
+            }
+            if (s === "a") {
+                // 'a' — toggle all/none
+                if (selected.size === names.length)
+                    selected.clear();
+                else
+                    names.forEach((n) => selected.add(n));
+                render();
+                return;
+            }
+            if (s === "\x1b[A" || s === "k") {
+                // Up
+                cursor = (cursor - 1 + names.length) % names.length;
+                render();
+                return;
+            }
+            if (s === "\x1b[B" || s === "j") {
+                // Down
+                cursor = (cursor + 1) % names.length;
+                render();
+                return;
+            }
+        };
+        const cleanup = () => {
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+            process.stdin.removeListener("data", onData);
+        };
+        process.stdin.on("data", onData);
+    });
+}
 export function registerSkillsCommands(program) {
     const skills = program.command("skills").description("Manage Readwise skills for AI agents");
     skills
@@ -148,10 +229,11 @@ export function registerSkillsCommands(program) {
         .description("Install skills to an agent platform (claude, codex, opencode)")
         .option("--all", "Detect installed agents and install to all")
         .option("--refresh", "Force refresh from GitHub before installing")
+        .option("-y, --yes", "Skip skill selection and install all")
         .action(async (platform, opts) => {
         try {
-            const names = await getSkillNames(!!opts?.refresh);
-            if (names.length === 0) {
+            const allNames = (await getSkillNames(!!opts?.refresh)).filter((n) => n !== "readwise-mcp");
+            if (allNames.length === 0) {
                 console.error("No skills found.");
                 process.exitCode = 1;
                 return;
@@ -185,6 +267,22 @@ export function registerSkillsCommands(program) {
                 process.exitCode = 1;
                 return;
             }
+            // Let user pick which skills to install (unless --yes)
+            let names = allNames;
+            if (!opts?.yes && process.stdin.isTTY) {
+                const descs = new Map();
+                for (const n of allNames) {
+                    const fm = await readSkillFrontmatter(n);
+                    if (fm.description)
+                        descs.set(n, fm.description);
+                }
+                const picked = await pickSkills(allNames, descs);
+                if (!picked || picked.length === 0) {
+                    console.log("No skills selected.");
+                    return;
+                }
+                names = picked;
+            }
             const cache = cacheDir();
             for (const target of targets) {
                 console.log(`\nInstalling to ${target.name} (${target.path})...`);

package/dist/tui/app.js

@@ -387,6 +387,12 @@ function extractDocTitle(obj) {
     return "Untitled";
 }
 function extractDocSummary(obj) {
+    // Prefer first matched chunk text (from search results)
+    if (Array.isArray(obj.matches) && obj.matches.length > 0) {
+        const first = obj.matches[0];
+        if (first?.plaintext && typeof first.plaintext === "string")
+            return first.plaintext;
+    }
     for (const key of ["summary", "description", "note", "notes", "content"]) {
         const val = obj[key];
         if (val && typeof val === "string")
@@ -1333,7 +1339,45 @@ const SUCCESS_ICON = [
 function cardLine(text, innerW, borderFn) {
     return "  " + borderFn("│") + " " + fitWidth(text, innerW) + " " + borderFn("│");
 }
-function buildCardLines(card, ci, selected, cardWidth) {
+/** Build a regex that matches any individual word from the query (case-insensitive) */
+function searchTermRegex(query) {
+    const words = query.trim().split(/\s+/).filter((w) => w.length >= 3);
+    if (words.length === 0)
+        return null;
+    const escaped = words.map((w) => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+    return new RegExp(`(${escaped.join("|")})`, "gi");
+}
+/** Shift text so the first match is visible, returning a window of ~maxChars */
+function snippetAroundMatch(text, query, maxChars) {
+    const re = searchTermRegex(query);
+    if (!re)
+        return text.slice(0, maxChars);
+    const m = re.exec(text);
+    if (!m)
+        return text.slice(0, maxChars);
+    const matchStart = m.index;
+    // Start the window a bit before the match
+    let start = Math.max(0, matchStart - Math.floor(maxChars / 4));
+    // Snap forward to a word boundary so we don't cut mid-word
+    if (start > 0) {
+        const nextSpace = text.indexOf(" ", start);
+        if (nextSpace !== -1 && nextSpace < matchStart) {
+            start = nextSpace + 1;
+        }
+    }
+    const snippet = text.slice(start, start + maxChars);
+    // Only add leading ellipsis; trailing truncation is handled by the card renderer
+    return start > 0 ? "…" + snippet : snippet;
+}
+/** Bold all occurrences of search terms in a line */
+function highlightTerms(line, query) {
+    const re = searchTermRegex(query);
+    if (!re)
+        return line;
+    // \x1b[22;1;3;37m = undim+bold+italic+white, \x1b[22;23;2;39m = unbold+unitalic+dim+default color
+    return line.replace(re, (match) => `\x1b[22;1;3;37m${match}\x1b[22;23;2;39m`);
+}
+function buildCardLines(card, ci, selected, cardWidth, searchQuery) {
     const borderColor = selected ? style.cyan : style.dim;
     const innerW = Math.max(1, cardWidth - 4);
     const lines = [];
@@ -1383,8 +1427,19 @@ function buildCardLines(card, ci, selected, cardWidth) {
         const titleStyled = selected ? style.bold(style.cyan(titleText)) : style.bold(titleText);
         lines.push(cardLine(titleStyled, innerW, borderColor));
         if (card.summary) {
-            const summaryText = truncateVisible(card.summary, innerW);
-            lines.push(cardLine(style.dim(summaryText), innerW, borderColor));
+            const snippet = searchQuery
+                ? snippetAroundMatch(card.summary, searchQuery, innerW * 3)
+                : card.summary;
+            const wrapped = wrapText(snippet, innerW);
+            const showLines = wrapped.slice(0, 3);
+            if (wrapped.length > 3) {
+                const last = showLines[2];
+                showLines[2] = truncateVisible(last, innerW - 1) + "…";
+            }
+            for (const sl of showLines) {
+                const highlighted = searchQuery ? highlightTerms(sl, searchQuery) : sl;
+                lines.push(cardLine(style.dim(highlighted), innerW, borderColor));
+            }
         }
         if (card.meta) {
             lines.push(cardLine(style.dim(truncateVisible(card.meta, innerW)), innerW, borderColor));
@@ -1404,10 +1459,12 @@ function renderCardView(state) {
     const countInfo = style.dim(` (${state.resultCursor + 1} of ${cards.length})`);
     content.push("  " + style.bold("Results") + countInfo);
     content.push("");
+    // Extract search query from form values (try common field names)
+    const searchQuery = state.formValues["query"] || state.formValues["vector_search_term"] || state.formValues["search"] || "";
     // Build all card lines
     const allLines = [];
     for (let ci = 0; ci < cards.length; ci++) {
-        const cardContentLines = buildCardLines(cards[ci], ci, ci === state.resultCursor, cardWidth);
+        const cardContentLines = buildCardLines(cards[ci], ci, ci === state.resultCursor, cardWidth, searchQuery || undefined);
         for (const line of cardContentLines) {
             allLines.push({ line, cardIdx: ci });
         }
@@ -2408,7 +2465,8 @@ function cardLineCount(card, cardWidth) {
         const textLines = Math.min(wrapped.length, 6);
         return 2 + textLines + (card.note ? 1 : 0) + (card.meta ? 1 : 0); // top + text + note? + meta? + bottom
     }
-    return 2 + 1 + (card.summary ? 1 : 0) + (card.meta ? 1 : 0); // top + title + summary? + meta? + bottom
+    const summaryLines = card.summary ? Math.min(wrapText(card.summary, 60).length, 3) : 0;
+    return 2 + 1 + summaryLines + (card.meta ? 1 : 0); // top + title + summary + meta? + bottom
 }
 function computeCardScroll(cards, cursor, currentScroll, availableHeight) {
     const { innerWidth } = getBoxDimensions();
@@ -2777,7 +2835,17 @@ export async function runApp(tools) {
             process.stdin.removeListener("data", onData);
             resolve();
         };
-        const onData = async (data) => {
+        const runTool = (loadingState) => {
+            executeTool(loadingState).then((resultState) => {
+                // If user quit during loading, don't update state
+                if (state.view !== "loading")
+                    return;
+                state = resultState;
+                paint(renderState(state));
+                resetQuitTimer();
+            });
+        };
+        const onData = (data) => {
             const key = parseKey(data);
             if (key.ctrl && key.name === "c") {
                 cleanup();
@@ -2801,17 +2869,13 @@ export async function runApp(tools) {
             if (result === "submit") {
                 state = { ...state, view: "loading", spinnerFrame: 0 };
                 paint(renderState(state));
-                state = await executeTool(state);
-                paint(renderState(state));
-                resetQuitTimer();
+                runTool(state);
                 return;
             }
             if (result.view === "loading") {
                 state = { ...result, spinnerFrame: 0 };
                 paint(renderState(state));
-                state = await executeTool(state);
-                paint(renderState(state));
-                resetQuitTimer();
+                runTool(state);
                 return;
             }
             state = result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readwise/cli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Command-line interface for Readwise and Reader",
   "type": "module",
   "bin": {

package/src/skills.ts

@@ -129,6 +129,95 @@ const PLATFORMS: Record<string, { name: string; path: string }> = {
   opencode: { name: "OpenCode", path: join(homedir(), ".opencode", "skills") },
 };
 
+/** Interactive checkbox picker — returns selected items */
+async function pickSkills(
+  names: string[],
+  descriptions: Map<string, string>
+): Promise<string[] | null> {
+  const selected = new Set<string>(names.filter((n) => n === "readwise-cli"));
+  let cursor = 0;
+
+  const render = () => {
+    // Move cursor up to overwrite previous render
+    process.stderr.write(`\x1b[${names.length + 2}A\x1b[J`);
+    process.stderr.write("  Select skills to install (space toggle, a all/none, enter confirm):\n\n");
+    for (let i = 0; i < names.length; i++) {
+      const check = selected.has(names[i]!) ? "\x1b[32m✔\x1b[0m" : " ";
+      const pointer = i === cursor ? "\x1b[36m❯\x1b[0m" : " ";
+      const desc = descriptions.get(names[i]!) || "";
+      const descText = desc ? `  \x1b[2m${desc}\x1b[0m` : "";
+      process.stderr.write(`  ${pointer} [${check}] ${names[i]}${descText}\n`);
+    }
+  };
+
+  // Initial render (print blank lines first so the upward cursor move works)
+  process.stderr.write("\n".repeat(names.length + 2));
+  render();
+
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY) {
+      // Non-interactive: install all
+      resolve(names);
+      return;
+    }
+
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+
+    const onData = (data: Buffer) => {
+      const s = data.toString();
+
+      if (s === "\r" || s === "\n") {
+        // Enter — confirm
+        cleanup();
+        resolve([...selected]);
+        return;
+      }
+      if (s === "\x03" || s === "\x1b") {
+        // Ctrl+C or Escape — cancel
+        cleanup();
+        resolve(null);
+        return;
+      }
+      if (s === " ") {
+        // Space — toggle current
+        const name = names[cursor]!;
+        if (selected.has(name)) selected.delete(name);
+        else selected.add(name);
+        render();
+        return;
+      }
+      if (s === "a") {
+        // 'a' — toggle all/none
+        if (selected.size === names.length) selected.clear();
+        else names.forEach((n) => selected.add(n));
+        render();
+        return;
+      }
+      if (s === "\x1b[A" || s === "k") {
+        // Up
+        cursor = (cursor - 1 + names.length) % names.length;
+        render();
+        return;
+      }
+      if (s === "\x1b[B" || s === "j") {
+        // Down
+        cursor = (cursor + 1) % names.length;
+        render();
+        return;
+      }
+    };
+
+    const cleanup = () => {
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+      process.stdin.removeListener("data", onData);
+    };
+
+    process.stdin.on("data", onData);
+  });
+}
+
 export function registerSkillsCommands(program: Command): void {
   const skills = program.command("skills").description("Manage Readwise skills for AI agents");
 
@@ -161,10 +250,11 @@ export function registerSkillsCommands(program: Command): void {
     .description("Install skills to an agent platform (claude, codex, opencode)")
     .option("--all", "Detect installed agents and install to all")
     .option("--refresh", "Force refresh from GitHub before installing")
-    .action(async (platform?: string, opts?: { all?: boolean; refresh?: boolean }) => {
+    .option("-y, --yes", "Skip skill selection and install all")
+    .action(async (platform?: string, opts?: { all?: boolean; refresh?: boolean; yes?: boolean }) => {
       try {
-        const names = await getSkillNames(!!opts?.refresh);
-        if (names.length === 0) {
+        const allNames = (await getSkillNames(!!opts?.refresh)).filter((n) => n !== "readwise-mcp");
+        if (allNames.length === 0) {
           console.error("No skills found.");
           process.exitCode = 1;
           return;
@@ -199,6 +289,22 @@ export function registerSkillsCommands(program: Command): void {
           return;
         }
 
+        // Let user pick which skills to install (unless --yes)
+        let names = allNames;
+        if (!opts?.yes && process.stdin.isTTY) {
+          const descs = new Map<string, string>();
+          for (const n of allNames) {
+            const fm = await readSkillFrontmatter(n);
+            if (fm.description) descs.set(n, fm.description);
+          }
+          const picked = await pickSkills(allNames, descs);
+          if (!picked || picked.length === 0) {
+            console.log("No skills selected.");
+            return;
+          }
+          names = picked;
+        }
+
         const cache = cacheDir();
         for (const target of targets) {
           console.log(`\nInstalling to ${target.name} (${target.path})...`);

package/src/tui/app.ts

@@ -445,6 +445,11 @@ function extractDocTitle(obj: Record<string, unknown>): string {
 }
 
 function extractDocSummary(obj: Record<string, unknown>): string {
+  // Prefer first matched chunk text (from search results)
+  if (Array.isArray(obj.matches) && obj.matches.length > 0) {
+    const first = obj.matches[0] as Record<string, unknown> | undefined;
+    if (first?.plaintext && typeof first.plaintext === "string") return first.plaintext;
+  }
   for (const key of ["summary", "description", "note", "notes", "content"]) {
     const val = obj[key];
     if (val && typeof val === "string") return val;
@@ -1420,7 +1425,44 @@ function cardLine(text: string, innerW: number, borderFn: (s: string) => string)
   return "  " + borderFn("│") + " " + fitWidth(text, innerW) + " " + borderFn("│");
 }
 
-function buildCardLines(card: CardItem, ci: number, selected: boolean, cardWidth: number): string[] {
+/** Build a regex that matches any individual word from the query (case-insensitive) */
+function searchTermRegex(query: string): RegExp | null {
+  const words = query.trim().split(/\s+/).filter((w) => w.length >= 3);
+  if (words.length === 0) return null;
+  const escaped = words.map((w) => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+  return new RegExp(`(${escaped.join("|")})`, "gi");
+}
+
+/** Shift text so the first match is visible, returning a window of ~maxChars */
+function snippetAroundMatch(text: string, query: string, maxChars: number): string {
+  const re = searchTermRegex(query);
+  if (!re) return text.slice(0, maxChars);
+  const m = re.exec(text);
+  if (!m) return text.slice(0, maxChars);
+  const matchStart = m.index;
+  // Start the window a bit before the match
+  let start = Math.max(0, matchStart - Math.floor(maxChars / 4));
+  // Snap forward to a word boundary so we don't cut mid-word
+  if (start > 0) {
+    const nextSpace = text.indexOf(" ", start);
+    if (nextSpace !== -1 && nextSpace < matchStart) {
+      start = nextSpace + 1;
+    }
+  }
+  const snippet = text.slice(start, start + maxChars);
+  // Only add leading ellipsis; trailing truncation is handled by the card renderer
+  return start > 0 ? "…" + snippet : snippet;
+}
+
+/** Bold all occurrences of search terms in a line */
+function highlightTerms(line: string, query: string): string {
+  const re = searchTermRegex(query);
+  if (!re) return line;
+  // \x1b[22;1;3;37m = undim+bold+italic+white, \x1b[22;23;2;39m = unbold+unitalic+dim+default color
+  return line.replace(re, (match) => `\x1b[22;1;3;37m${match}\x1b[22;23;2;39m`);
+}
+
+function buildCardLines(card: CardItem, ci: number, selected: boolean, cardWidth: number, searchQuery?: string): string[] {
   const borderColor = selected ? style.cyan : style.dim;
   const innerW = Math.max(1, cardWidth - 4);
   const lines: string[] = [];
@@ -1471,8 +1513,19 @@ function buildCardLines(card: CardItem, ci: number, selected: boolean, cardWidth
     lines.push(cardLine(titleStyled, innerW, borderColor));
 
     if (card.summary) {
-      const summaryText = truncateVisible(card.summary, innerW);
-      lines.push(cardLine(style.dim(summaryText), innerW, borderColor));
+      const snippet = searchQuery
+        ? snippetAroundMatch(card.summary, searchQuery, innerW * 3)
+        : card.summary;
+      const wrapped = wrapText(snippet, innerW);
+      const showLines = wrapped.slice(0, 3);
+      if (wrapped.length > 3) {
+        const last = showLines[2]!;
+        showLines[2] = truncateVisible(last, innerW - 1) + "…";
+      }
+      for (const sl of showLines) {
+        const highlighted = searchQuery ? highlightTerms(sl, searchQuery) : sl;
+        lines.push(cardLine(style.dim(highlighted), innerW, borderColor));
+      }
     }
 
     if (card.meta) {
@@ -1498,10 +1551,13 @@ function renderCardView(state: AppState): string[] {
   content.push("  " + style.bold("Results") + countInfo);
   content.push("");
 
+  // Extract search query from form values (try common field names)
+  const searchQuery = state.formValues["query"] || state.formValues["vector_search_term"] || state.formValues["search"] || "";
+
   // Build all card lines
   const allLines: { line: string; cardIdx: number }[] = [];
   for (let ci = 0; ci < cards.length; ci++) {
-    const cardContentLines = buildCardLines(cards[ci]!, ci, ci === state.resultCursor, cardWidth);
+    const cardContentLines = buildCardLines(cards[ci]!, ci, ci === state.resultCursor, cardWidth, searchQuery || undefined);
     for (const line of cardContentLines) {
       allLines.push({ line, cardIdx: ci });
     }
@@ -2526,7 +2582,8 @@ function cardLineCount(card: CardItem, cardWidth: number): number {
     const textLines = Math.min(wrapped.length, 6);
     return 2 + textLines + (card.note ? 1 : 0) + (card.meta ? 1 : 0); // top + text + note? + meta? + bottom
   }
-  return 2 + 1 + (card.summary ? 1 : 0) + (card.meta ? 1 : 0); // top + title + summary? + meta? + bottom
+  const summaryLines = card.summary ? Math.min(wrapText(card.summary, 60).length, 3) : 0;
+  return 2 + 1 + summaryLines + (card.meta ? 1 : 0); // top + title + summary + meta? + bottom
 }
 
 function computeCardScroll(cards: CardItem[], cursor: number, currentScroll: number, availableHeight: number): number {
@@ -2900,7 +2957,17 @@ export async function runApp(tools: ToolDef[]): Promise<void> {
       resolve();
     };
 
-    const onData = async (data: Buffer) => {
+    const runTool = (loadingState: AppState) => {
+      executeTool(loadingState).then((resultState) => {
+        // If user quit during loading, don't update state
+        if (state.view !== "loading") return;
+        state = resultState;
+        paint(renderState(state));
+        resetQuitTimer();
+      });
+    };
+
+    const onData = (data: Buffer) => {
       const key = parseKey(data);
 
       if (key.ctrl && key.name === "c") {
@@ -2929,18 +2996,14 @@ export async function runApp(tools: ToolDef[]): Promise<void> {
       if (result === "submit") {
         state = { ...state, view: "loading", spinnerFrame: 0 };
         paint(renderState(state));
-        state = await executeTool(state);
-        paint(renderState(state));
-        resetQuitTimer();
+        runTool(state);
         return;
       }
 
       if (result.view === "loading") {
         state = { ...result, spinnerFrame: 0 };
         paint(renderState(state));
-        state = await executeTool(state);
-        paint(renderState(state));
-        resetQuitTimer();
+        runTool(state);
         return;
       }