rv-bible-cli 0.1.5 → 0.1.6

package/README.md

@@ -114,6 +114,7 @@ When you read a chapter in a terminal, rvb opens a full-screen interactive reade
 |-----|--------|
 | `j` / `k` / arrows | scroll up/down |
 | `Space` / `b` | page down/up |
+| `Tab` / `Shift+Tab` | scroll down / up by a quarter of the chapter |
 | `g` / `G` | jump to top / bottom |
 | left / right | prev / next chapter (even across books) |
 | `f` | toggle footnotes on/off |
@@ -134,18 +135,22 @@ When you read a chapter in a terminal, rvb opens a full-screen interactive reade
 Deep-dive into footnotes and cross-references. Press `d` while reading any chapter.
 
 - A cursor highlights the current verse
-- The bottom panel shows all footnotes for that verse with numbered cross-references
+- The bottom panel shows the **full** footnote text for that verse — header line with marker + word + numbered cross-references, then the wrapped commentary body underneath
 - **Type a number** to follow a cross-reference — you'll jump to that chapter and land on the exact verse
 - Press `[` to go back to where you were
 - Study mode stays active as you navigate — it's designed for chaining through references
+- If a verse has very long notes, the panel caps at half your terminal height — use `,` / `.` to scroll within it
 
 | Key | Action |
 |-----|--------|
-| up / down | move between verses |
+| up / down | move cursor up / down one verse |
 | left / right | prev / next chapter |
 | type number | follow a cross-reference |
 | `v` then up/down then `c` | select a range and copy |
 | `c` | copy current verse |
+| `Tab` / `Shift+Tab` | jump cursor by a quarter of the chapter |
+| `g` / `G` | cursor to first / last verse |
+| `,` / `.` | scroll the footnote panel up / down (when it overflows) |
 | `f` / `o` | toggle footnotes / outline |
 | `/` | find text |
 | `:` | jump to a book |

package/dist/format.d.ts

@@ -8,6 +8,7 @@ export declare function getZoom(): number;
 export declare function zoomIn(): void;
 export declare function zoomOut(): void;
 export declare function zoomReset(): void;
+export declare function wrapWords(text: string, maxWidth: number, ansi?: boolean): string[];
 export declare function renderFootnoteBlock(footnotes: Footnote[]): string;
 export declare function renderNoteDisplayAll(verse: Verse, footnotes: Footnote[], bookName: string): string;
 export declare function renderNoteDisplay(verse: Verse, fn: Footnote, bookName: string): string;

package/dist/format.js

@@ -118,7 +118,7 @@ function visibleLength(s) {
 // ── Word-wrap helper ─────────────────────────────────────────────────────────
 // Wraps plain `text` to `maxWidth` columns. Returns array of line strings.
 // Use visibleLength=true when words may contain ANSI escape codes.
-function wrapWords(text, maxWidth, ansi = false) {
+export function wrapWords(text, maxWidth, ansi = false) {
     if (maxWidth < 20)
         return [text];
     const words = text.split(' ');

package/dist/index.js

@@ -2,6 +2,8 @@
 import { program } from 'commander';
 import chalk from 'chalk';
 import clipboard from 'clipboardy';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
 import { parseRefList, resolveBook } from './parser.js';
 import { getVersesByRef, getSectionHeaders, getFootnotesForChapter, getFootnotesForVerses, getFootnote, getVerse, getBookInfo, getAllBooks, isInConcordance, getTopicVerses, searchFTS, } from './db.js';
 import { renderVerses, renderVerseInline, renderFootnoteBlock, renderNoteDisplay, renderNoteDisplayAll, stripMarkers, highlightTerms, } from './format.js';
@@ -10,10 +12,12 @@ import { getLastRead, saveLastRead } from './state.js';
 function stripAnsi(s) {
     return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
+// Read version from package.json (single source of truth — avoids drift)
+const pkg = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
 program
     .name('rv')
     .description('Recovery Version Bible CLI')
-    .version('0.1.0')
+    .version(pkg.version)
     .enablePositionalOptions();
 // Formats a ParsedRef + book name into a display label: "John 3", "John 3:16", "John 3:16–18"
 function formatRefLabel(ref, bookName) {

package/dist/ui/Pager.js

@@ -4,7 +4,7 @@ import { render, Box, Text, useInput, useApp, useStdout } from 'ink';
 import chalk from 'chalk';
 import clipboard from 'clipboardy';
 import { getVersesByRef, getSectionHeaders, getFootnotesForChapter, getFootnotesForVerses, getCrossRefsForVerse, getBookInfo, getAllBooks, } from '../db.js';
-import { renderVerses, stripMarkers, highlightTerms, toSuperscript, zoomIn, zoomOut, zoomReset, getZoom } from '../format.js';
+import { renderVerses, stripMarkers, highlightTerms, toSuperscript, wrapWords, zoomIn, zoomOut, zoomReset, getZoom } from '../format.js';
 import { saveLastRead, getLastRead } from '../state.js';
 import { resolveBook } from '../parser.js';
 import { getNextChapter, getPrevChapter } from './nav.js';
@@ -144,6 +144,7 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
     const [studyCursorIdx, setStudyCursorIdx] = useState(0);
     const [studySelStart, setStudySelStart] = useState(null);
     const [studyRefInput, setStudyRefInput] = useState(''); // multi-digit ref number
+    const [panelScrollOffset, setPanelScrollOffset] = useState(0); // scroll within study panel when notes overflow cap
     const studyActiveRef = useRef(false); // persists across navigate so study mode survives ref follows
     const pendingVerseRef = useRef(null); // target verse to jump to after navigate
     // Flash message
@@ -215,10 +216,13 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         const panelLines = [];
         const verseLabel = `${bookName} ${chapter}:${v.verse}`;
         panelLines.push(`  ${chalk.bold(verseLabel)} ${chalk.dim(`— ${fns.length} note${fns.length === 1 ? '' : 's'}`)}`);
+        const BODY_INDENT = '     '; // 5 spaces — visually under the word, after marker
+        const bodyWidth = Math.max(20, cols - BODY_INDENT.length);
         for (const fn of fns) {
             // Extract the word the marker attaches to (first word after "Book ch:v word" in footnote text)
-            const fnTextParts = fn.text.split(/\s+/);
+            const fnTextParts = fn.text.trim().split(/\s+/);
             const word = fnTextParts[2] ?? ''; // "Joh 3:16 loved ..." → "loved"
+            const noteBody = fnTextParts.slice(3).join(' ').trim(); // everything after "Book ch:v word"
             const markerDisp = toSuperscript(fn.marker);
             const refs = refsByMarker.get(fn.marker) ?? [];
             // Deduplicate refs by target
@@ -230,42 +234,74 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
                 seen.add(key);
                 return true;
             });
-            if (uniqueRefs.length === 0) {
-                // Study note with no cross-refs — show truncated text
-                const notePreview = fn.text.length > 60 ? fn.text.substring(0, 57) + '...' : fn.text;
-                panelLines.push(`  ${chalk.cyan(markerDisp)} ${chalk.dim(word)}  ${chalk.dim(notePreview)}`);
+            // Build numbered ref labels (mutates studyRefs)
+            const refLabels = [];
+            for (const r of uniqueRefs) {
+                const refNum = studyRefs.length + 1;
+                const tgtBookName = getBookInfo(r.tgt_book)?.abbr ?? r.tgt_book;
+                const label = `${tgtBookName} ${r.tgt_chapter}:${r.tgt_verse}`;
+                studyRefs.push({
+                    num: refNum, marker: fn.marker,
+                    tgt_book: r.tgt_book, tgt_chapter: r.tgt_chapter, tgt_verse: r.tgt_verse, label,
+                });
+                refLabels.push(`${chalk.yellow(`[${refNum}]`)} ${chalk.dim(label)}`);
             }
-            else {
-                // Build numbered ref labels
-                const refLabels = [];
-                for (const r of uniqueRefs) {
-                    const refNum = studyRefs.length + 1;
-                    const tgtBookName = getBookInfo(r.tgt_book)?.abbr ?? r.tgt_book;
-                    const label = `${tgtBookName} ${r.tgt_chapter}:${r.tgt_verse}`;
-                    studyRefs.push({
-                        num: refNum, marker: fn.marker,
-                        tgt_book: r.tgt_book, tgt_chapter: r.tgt_chapter, tgt_verse: r.tgt_verse, label,
-                    });
-                    refLabels.push(`${chalk.yellow(`[${refNum}]`)} ${chalk.dim(label)}`);
+            // Header line: marker + word + refs (refs may be empty)
+            const refsPart = refLabels.length > 0 ? `  ${refLabels.join('  ')}` : '';
+            panelLines.push(`  ${chalk.cyan(markerDisp)} ${chalk.dim(word)}${refsPart}`);
+            // Body: wrap full note text under hanging indent, dim style. No truncation.
+            if (noteBody) {
+                const wrapped = wrapWords(noteBody, bodyWidth);
+                for (const wl of wrapped) {
+                    panelLines.push(`${BODY_INDENT}${chalk.dim(wl)}`);
                 }
-                // Compact: marker + word + refs on one line (wrap if needed)
-                const hasStudyNote = fn.text.length > 80;
-                const noteHint = hasStudyNote ? chalk.dim(' (note)') : '';
-                panelLines.push(`  ${chalk.cyan(markerDisp)} ${chalk.dim(word)}${noteHint}  ${refLabels.join('  ')}`);
             }
         }
         return { lines: panelLines, refs: studyRefs };
-    }, [mode, studyCursorIdx, verseMap, verses, book, chapter, bookName]);
+    }, [mode, studyCursorIdx, verseMap, verses, book, chapter, bookName, cols]);
+    // ── Study panel sizing & scroll (cap at 50% of screen, scrollable on overflow) ──
+    const panelLinesAll = studyPanel.lines;
+    const panelMaxH = Math.max(3, Math.floor(rows * 0.5));
+    const panelOverflow = panelLinesAll.length > panelMaxH;
+    const panelContentSlots = panelOverflow ? panelMaxH - 1 : panelLinesAll.length; // reserve 1 line for indicator
+    const maxPanelScroll = Math.max(0, panelLinesAll.length - panelContentSlots);
+    const panelScrollClamped = Math.max(0, Math.min(panelScrollOffset, maxPanelScroll));
+    const panelVisibleLines = panelLinesAll.slice(panelScrollClamped, panelScrollClamped + panelContentSlots);
+    const panelDisplayH = panelLinesAll.length > 0 ? panelVisibleLines.length + (panelOverflow ? 1 : 0) : 0;
     // ── Viewport height (shrinks when study panel is visible) ────────────
-    const studyPanelH = studyPanel.lines.length > 0 ? studyPanel.lines.length + 1 : 0; // +1 for separator
+    const studyPanelH = panelDisplayH > 0 ? panelDisplayH + 1 : 0; // +1 for separator above panel
     const hasFooter2 = mode === 'normal' || mode === 'study';
     const chromeH = 3 + (hasFooter2 ? 2 : 1) + studyPanelH; // header + sep + footer(s) + sep + panel
     const viewportH = Math.max(1, rows - chromeH);
+    // Reset panel scroll when the verse cursor changes or when leaving study mode
+    useEffect(() => {
+        setPanelScrollOffset(0);
+    }, [studyCursorIdx, book, chapter, mode]);
     // Clamp scroll when content or viewport changes
     const maxScroll = Math.max(0, lines.length - viewportH);
     useEffect(() => {
         setScrollOffset(prev => Math.min(prev, maxScroll));
     }, [maxScroll]);
+    // Keep the study-mode cursor verse fully visible above the footnote panel.
+    // Triggers when cursor moves OR viewport shrinks (panel grew with longer notes).
+    useEffect(() => {
+        if (mode !== 'study' || verseMap.length === 0)
+            return;
+        const entry = verseMap[studyCursorIdx];
+        if (!entry)
+            return;
+        setScrollOffset(prev => {
+            // Cursor verse extends below the visible viewport — pull it in from the bottom
+            if (entry.endLine >= prev + viewportH) {
+                return Math.max(0, entry.endLine - viewportH + 1);
+            }
+            // Cursor verse starts above the visible viewport — pull it in from the top
+            if (entry.startLine < prev) {
+                return entry.startLine;
+            }
+            return prev;
+        });
+    }, [studyCursorIdx, viewportH, mode, verseMap]);
     // ── Search highlights ────────────────────────────────────────────────────
     const displayLines = useMemo(() => {
         if (!searchSubmitted || searchMatches.length === 0)
@@ -288,6 +324,20 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         setStudyCursorIdx(0);
     }, []);
     const navigate = useCallback((newBook, newChapter, pushHistory = true) => {
+        const sameChapter = newBook === bookRef.current && newChapter === chapterRef.current;
+        // Same-chapter cross-ref follow: jump cursor directly. Don't reset state via
+        // restoreMode (would clobber cursor to 0), don't push to history (cursor isn't tracked there).
+        if (sameChapter && pendingVerseRef.current) {
+            const target = pendingVerseRef.current;
+            pendingVerseRef.current = null;
+            let idx = verseMap.findIndex(e => e.verse === target);
+            if (idx < 0)
+                idx = verseMap.findIndex(e => e.verse.startsWith(target));
+            if (idx >= 0)
+                setStudyCursorIdx(idx);
+            saveLastRead(newBook, newChapter);
+            return;
+        }
         if (pushHistory) {
             historyRef.current = [...historyRef.current, { book: bookRef.current, chapter: chapterRef.current, scroll: scrollRef.current }];
             forwardRef.current = [];
@@ -297,7 +347,7 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         setScrollOffset(0);
         restoreMode();
         saveLastRead(newBook, newChapter);
-    }, [restoreMode]);
+    }, [restoreMode, verseMap]);
     const goBack = useCallback(() => {
         const hist = historyRef.current;
         if (hist.length === 0)
@@ -342,6 +392,11 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
     const scrollUp = useCallback(() => scrollTo(scrollOffset - 1), [scrollOffset, scrollTo]);
     const pageDown = useCallback(() => scrollTo(scrollOffset + viewportH - 2), [scrollOffset, viewportH, scrollTo]);
     const pageUp = useCallback(() => scrollTo(scrollOffset - viewportH + 2), [scrollOffset, viewportH, scrollTo]);
+    // Quarter-of-chapter slider — 4 presses spans top to bottom regardless of length
+    const scrollQuarter = useCallback((dir) => {
+        const q = Math.max(1, Math.floor(lines.length * 0.25));
+        scrollTo(scrollOffset + dir * q);
+    }, [lines.length, scrollOffset, scrollTo]);
     // ── Copy helpers ─────────────────────────────────────────────────────────
     const doCopy = useCallback(async () => {
         const lo = selStart !== null ? Math.min(selStart, cursorIdx) : cursorIdx;
@@ -598,26 +653,23 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
                 return;
             }
             if (input === 'j' || key.downArrow) {
-                setStudyCursorIdx(prev => {
-                    const next = Math.min(prev + 1, verseMap.length - 1);
-                    const entry = verseMap[next];
-                    if (entry && entry.startLine >= scrollOffset + viewportH) {
-                        scrollTo(entry.startLine - viewportH + 3);
-                    }
-                    return next;
-                });
+                setStudyCursorIdx(prev => Math.min(prev + 1, verseMap.length - 1));
                 setStudyRefInput('');
                 return;
             }
             if (input === 'k' || key.upArrow) {
-                setStudyCursorIdx(prev => {
-                    const next = Math.max(prev - 1, 0);
-                    const entry = verseMap[next];
-                    if (entry && entry.startLine < scrollOffset) {
-                        scrollTo(entry.startLine);
-                    }
-                    return next;
-                });
+                setStudyCursorIdx(prev => Math.max(prev - 1, 0));
+                setStudyRefInput('');
+                return;
+            }
+            // Cursor to first / last verse (cursor-visible effect handles scroll)
+            if (input === 'g') {
+                setStudyCursorIdx(0);
+                setStudyRefInput('');
+                return;
+            }
+            if (input === 'G') {
+                setStudyCursorIdx(Math.max(0, verseMap.length - 1));
                 setStudyRefInput('');
                 return;
             }
@@ -632,6 +684,23 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
                 setZoomState(getZoom());
                 return;
             }
+            // Quarter-of-chapter cursor jump (cursor-visible effect handles scroll)
+            if (key.tab) {
+                const step = Math.max(1, Math.floor(verseMap.length / 4));
+                const dir = key.shift ? -1 : 1;
+                setStudyCursorIdx(prev => Math.max(0, Math.min(verseMap.length - 1, prev + dir * step)));
+                setStudyRefInput('');
+                return;
+            }
+            // Panel scroll (only meaningful when notes panel overflows)
+            if (input === ',') {
+                setPanelScrollOffset(prev => Math.max(0, prev - 1));
+                return;
+            }
+            if (input === '.') {
+                setPanelScrollOffset(prev => Math.min(maxPanelScroll, prev + 1));
+                return;
+            }
             // Number keys: build ref number, then follow on Enter or after short delay
             if (input && /^[0-9]$/.test(input)) {
                 const newInput = studyRefInput + input;
@@ -786,6 +855,14 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
             scrollTo(maxScroll);
             return;
         }
+        if (key.tab && key.shift) {
+            scrollQuarter(-1);
+            return;
+        }
+        if (key.tab) {
+            scrollQuarter(1);
+            return;
+        }
         if (input === 'n' || key.rightArrow) {
             if (searchSubmitted && searchMatches.length > 0) {
                 nextMatch();
@@ -1011,7 +1088,8 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         const sNoteFlag = notes ? chalk.cyan('f notes') : chalk.dim('f notes');
         const sOutlineFlag = outline ? chalk.cyan('o outline') : chalk.dim('o outline');
         footer1 = `  ${chalk.cyan('STUDY')}${inputHint}${rangeHint}  ${chalk.dim('# ref · v range · c copy ·')} ${sNoteFlag} ${chalk.dim('·')} ${sOutlineFlag} ${chalk.dim('· / find')}`;
-        footer2 = `  ${chalk.dim('↑↓ verse · ←→ ch · : goto · [/] back/fwd · d exit')}`;
+        const panelHint = panelOverflow ? chalk.dim(' · ,/. note') : '';
+        footer2 = `  ${chalk.dim('↑↓ verse · Tab/⇧Tab quarter · g/G top/bot · ←→ ch · : goto · [/] back/fwd · d exit')}${panelHint}`;
     }
     else if (mode === 'copy') {
         const rangeHint = selStart !== null ? chalk.dim(' (range active)') : '';
@@ -1021,13 +1099,21 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         const noteFlag = notes ? chalk.cyan('f notes') : chalk.dim('f notes');
         const outlineFlag = outline ? chalk.cyan('o outline') : chalk.dim('o outline');
         footer1 = `  ${noteFlag} ${chalk.dim('·')} ${outlineFlag} ${chalk.dim('· d study · c copy · / find')}`;
-        footer2 = `  ${chalk.dim('↑↓ scroll · ←→ ch · +/- width · : goto · H home · [/] back/fwd · q quit')}`;
+        footer2 = `  ${chalk.dim('↑↓ scroll · Tab/⇧Tab quarter · g/G top/bot · ←→ ch · +/- width · : goto · H home · [/] back/fwd · q quit')}`;
     }
     const separator = chalk.dim('· '.repeat(Math.floor(cols / 2)));
     // ── Render ───────────────────────────────────────────────────────────────
-    const studyPanelContent = studyPanel.lines.length > 0
-        ? studyPanel.lines.join('\n')
-        : null;
+    let studyPanelContent = null;
+    if (panelLinesAll.length > 0) {
+        const parts = [panelVisibleLines.join('\n')];
+        if (panelOverflow) {
+            const lo = panelScrollClamped + 1;
+            const hi = panelScrollClamped + panelVisibleLines.length;
+            const total = panelLinesAll.length;
+            parts.push(chalk.dim(`  ── ${lo}–${hi} of ${total} · ,/. scroll ──`));
+        }
+        studyPanelContent = parts.join('\n');
+    }
     return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { children: header }), _jsx(Text, { children: separator }), _jsx(Box, { flexGrow: 1, overflow: "hidden", children: _jsx(Text, { children: content }) }), _jsx(Text, { children: separator }), studyPanelContent && _jsx(Text, { children: studyPanelContent }), studyPanelContent && _jsx(Text, { children: separator }), _jsx(Text, { children: footer1 }), footer2 && _jsx(Text, { children: footer2 })] }));
 }
 // ── Launcher ─────────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rv-bible-cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Fast, offline terminal Bible reader for the Recovery Version. Footnotes, cross-references, concordance search, interactive pager.",
   "type": "module",
   "main": "dist/index.js",