ray-finance 0.3.3 → 0.3.4

package/dist/cli/chat.js

@@ -5,7 +5,35 @@ import { banner, formatResponse, formatDuration, formatError } from "./format.js
 function rawReadLine(prompt, belowLines) {
     return new Promise((resolve) => {
         let buf = "";
+        let cursor = 0; // cursor position within buf
         const out = process.stdout;
+        const promptLen = stripAnsi(prompt).length;
+        // Redraws the buffer from the prompt onward and repositions the cursor
+        const redraw = () => {
+            out.write("\r" + prompt + buf + "\x1b[K"); // clear to end of line
+            // Move cursor back to the correct position
+            const back = buf.length - cursor;
+            if (back > 0)
+                out.write(`\x1b[${back}D`);
+        };
+        // Find the start of the previous word boundary
+        const wordLeft = () => {
+            let p = cursor;
+            while (p > 0 && buf[p - 1] === " ")
+                p--; // skip trailing spaces
+            while (p > 0 && buf[p - 1] !== " ")
+                p--; // skip word chars
+            return p;
+        };
+        // Find the end of the next word boundary
+        const wordRight = () => {
+            let p = cursor;
+            while (p < buf.length && buf[p] !== " ")
+                p++; // skip word chars
+            while (p < buf.length && buf[p] === " ")
+                p++; // skip trailing spaces
+            return p;
+        };
         // Render: prompt on current line, then content below, then move cursor back
         out.write(prompt);
         if (belowLines.length > 0) {
@@ -32,9 +60,51 @@ function rawReadLine(prompt, belowLines) {
                     resolve("\x03");
                     return;
                 }
+                // Ctrl+A — beginning of line
+                if (code === 1) {
+                    if (cursor > 0) {
+                        out.write(`\x1b[${cursor}D`);
+                        cursor = 0;
+                    }
+                    continue;
+                }
+                // Ctrl+E — end of line
+                if (code === 5) {
+                    if (cursor < buf.length) {
+                        out.write(`\x1b[${buf.length - cursor}C`);
+                        cursor = buf.length;
+                    }
+                    continue;
+                }
+                // Ctrl+K — delete from cursor to end of line
+                if (code === 11) {
+                    buf = buf.slice(0, cursor);
+                    out.write("\x1b[K");
+                    continue;
+                }
+                // Ctrl+U — delete from cursor to beginning of line
+                if (code === 21) {
+                    buf = buf.slice(cursor);
+                    cursor = 0;
+                    redraw();
+                    continue;
+                }
+                // Ctrl+W — delete word backward
+                if (code === 23) {
+                    if (cursor > 0) {
+                        const target = wordLeft();
+                        buf = buf.slice(0, target) + buf.slice(cursor);
+                        cursor = target;
+                        redraw();
+                    }
+                    continue;
+                }
                 // Enter
                 if (code === 13) {
                     cleanup();
+                    // Move cursor to end of buf first
+                    if (cursor < buf.length)
+                        out.write(`\x1b[${buf.length - cursor}C`);
                     // Move past the below-content lines, then newline
                     for (let j = 0; j < belowLines.length; j++)
                         out.write("\x1b[1B");
@@ -44,31 +114,136 @@ function rawReadLine(prompt, belowLines) {
                 }
                 // Backspace
                 if (code === 127 || code === 8) {
-                    if (buf.length > 0) {
-                        buf = buf.slice(0, -1);
-                        out.write("\b \b");
+                    if (cursor > 0) {
+                        buf = buf.slice(0, cursor - 1) + buf.slice(cursor);
+                        cursor--;
+                        redraw();
                     }
                     continue;
                 }
-                // Skip escape sequences (arrow keys etc.)
+                // Escape sequences (arrow keys, Option+key, etc.)
                 if (code === 27) {
+                    // Option+Backspace — ESC followed by DEL (0x7f)
+                    if (i + 1 < chunk.length && chunk.charCodeAt(i + 1) === 127) {
+                        i++; // consume the DEL
+                        if (cursor > 0) {
+                            const target = wordLeft();
+                            buf = buf.slice(0, target) + buf.slice(cursor);
+                            cursor = target;
+                            redraw();
+                        }
+                        continue;
+                    }
+                    // Option+b / Option+f — ESC followed by 'b' or 'f'
+                    if (i + 1 < chunk.length && chunk[i + 1] === "b") {
+                        i++;
+                        const target = wordLeft();
+                        if (target < cursor) {
+                            out.write(`\x1b[${cursor - target}D`);
+                            cursor = target;
+                        }
+                        continue;
+                    }
+                    if (i + 1 < chunk.length && chunk[i + 1] === "f") {
+                        i++;
+                        const target = wordRight();
+                        if (target > cursor) {
+                            out.write(`\x1b[${target - cursor}C`);
+                            cursor = target;
+                        }
+                        continue;
+                    }
                     if (i + 1 < chunk.length && chunk[i + 1] === "[") {
-                        i += 2;
-                        while (i < chunk.length && chunk.charCodeAt(i) < 64)
+                        i += 2; // skip past ESC [
+                        // Collect any intermediate bytes (modifiers like "1;3")
+                        let seq = "";
+                        while (i < chunk.length && chunk.charCodeAt(i) < 64) {
+                            seq += chunk[i];
                             i++;
+                        }
+                        if (i < chunk.length) {
+                            const final = chunk[i];
+                            // Modifier keys: ;3 = Option, ;5 = Ctrl, ;9 = Cmd (Kitty protocol)
+                            const isWordMod = seq === "1;3" || seq === "1;5" || seq === "1;9";
+                            const isCmd = seq === "1;9";
+                            if (final === "D") {
+                                if (isWordMod) {
+                                    // Option/Ctrl/Cmd+Left — word backward
+                                    const target = wordLeft();
+                                    if (target < cursor) {
+                                        out.write(`\x1b[${cursor - target}D`);
+                                        cursor = target;
+                                    }
+                                }
+                                else if (cursor > 0) {
+                                    cursor--;
+                                    out.write("\x1b[D");
+                                }
+                            }
+                            else if (final === "C") {
+                                if (isWordMod) {
+                                    // Option/Ctrl/Cmd+Right — word forward
+                                    const target = wordRight();
+                                    if (target > cursor) {
+                                        out.write(`\x1b[${target - cursor}C`);
+                                        cursor = target;
+                                    }
+                                }
+                                else if (cursor < buf.length) {
+                                    cursor++;
+                                    out.write("\x1b[C");
+                                }
+                            }
+                            else if (final === "H") {
+                                // Home
+                                if (cursor > 0) {
+                                    out.write(`\x1b[${cursor}D`);
+                                    cursor = 0;
+                                }
+                            }
+                            else if (final === "F") {
+                                // End
+                                if (cursor < buf.length) {
+                                    out.write(`\x1b[${buf.length - cursor}C`);
+                                    cursor = buf.length;
+                                }
+                            }
+                            else if (final === "u") {
+                                // Kitty keyboard protocol: ESC [ codepoint ; modifier u
+                                const parts = seq.split(";");
+                                const codepoint = parseInt(parts[0], 10);
+                                const mod = parts.length > 1 ? parseInt(parts[1], 10) : 1;
+                                const hasCmd = (mod - 1) & 8; // super/cmd bit
+                                const hasCtrl = (mod - 1) & 4; // ctrl bit
+                                if (codepoint === 127 && (hasCmd || hasCtrl)) {
+                                    // Cmd+Backspace / Ctrl+Backspace — delete to line start
+                                    if (cursor > 0) {
+                                        buf = buf.slice(cursor);
+                                        cursor = 0;
+                                        redraw();
+                                    }
+                                }
+                            }
+                            // Ignore other sequences (up/down, etc.)
+                        }
                     }
                     continue;
                 }
                 // Printable characters
                 if (code >= 32) {
-                    buf += chunk[i];
-                    out.write(chunk[i]);
+                    buf = buf.slice(0, cursor) + chunk[i] + buf.slice(cursor);
+                    cursor++;
+                    redraw();
                 }
             }
         };
         process.stdin.on("data", onData);
     });
 }
+/** Strip ANSI escape codes to get visible length */
+function stripAnsi(str) {
+    return str.replace(/\x1b\[[0-9;]*m/g, "");
+}
 const THINKING_PHRASES = [
     "Thinking...",
     "Crunching numbers...",

package/dist/cli/commands.d.ts

@@ -14,3 +14,5 @@ export declare function showScore(): void;
 export declare function runAdd(): Promise<void>;
 export declare function runRemove(): Promise<void>;
 export declare function showAlerts(): void;
+export declare function showBills(days?: number): void;
+export declare function showRecap(period?: string): void;

package/dist/cli/commands.js

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import { getDb } from "../db/connection.js";
-import { getNetWorth, getTransactionsFiltered, getBudgetStatuses, getGoals, getCashFlowThisMonth, formatMoney as rawFormatMoney, categoryLabel, } from "../queries/index.js";
+import { getNetWorth, getTransactionsFiltered, getBudgetStatuses, getGoals, getCashFlowThisMonth, compareSpending, getNetWorthTrend, formatMoney as rawFormatMoney, categoryLabel, } from "../queries/index.js";
 import { getLatestScore, getAchievements, getMonthlySavings } from "../scoring/index.js";
 import { generateAlerts } from "../alerts/index.js";
 import { runDailySync } from "../daily-sync.js";
@@ -388,3 +388,138 @@ export function showAlerts() {
     }
     console.log();
 }
+export function showBills(days = 7) {
+    const db = getDb();
+    const now = new Date();
+    const todayDay = now.getDate();
+    const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
+    const endDay = todayDay + days;
+    let bills = [];
+    if (endDay <= daysInMonth) {
+        bills = db.prepare(`SELECT name, amount, day_of_month FROM recurring_bills WHERE day_of_month BETWEEN ? AND ? ORDER BY day_of_month`).all(todayDay + 1, endDay);
+    }
+    else {
+        // Wraparound into next month
+        const thisMonth = db.prepare(`SELECT name, amount, day_of_month FROM recurring_bills WHERE day_of_month BETWEEN ? AND ? ORDER BY day_of_month`).all(todayDay + 1, daysInMonth);
+        const nextMonth = db.prepare(`SELECT name, amount, day_of_month FROM recurring_bills WHERE day_of_month BETWEEN 1 AND ? ORDER BY day_of_month`).all(endDay - daysInMonth);
+        bills = [...thisMonth, ...nextMonth];
+    }
+    if (bills.length === 0) {
+        console.log(`\nNo upcoming bills in the next ${days} days.`);
+        return;
+    }
+    console.log(`\n${heading("Upcoming Bills")} ${dim(`next ${days} days`)}\n`);
+    const maxName = Math.max(...bills.map(b => b.name.length));
+    let total = 0;
+    for (const b of bills) {
+        // Calculate the actual date for this bill
+        let billDate;
+        if (b.day_of_month > todayDay) {
+            billDate = new Date(now.getFullYear(), now.getMonth(), b.day_of_month);
+        }
+        else {
+            billDate = new Date(now.getFullYear(), now.getMonth() + 1, b.day_of_month);
+        }
+        const dateStr = billDate.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+        console.log(`  ${dim(dateStr.padEnd(8))}${b.name.padEnd(maxName + 2)}${rawFormatMoney(b.amount).padStart(10)}`);
+        total += b.amount;
+    }
+    console.log(`\n  ${dim("Total due:".padEnd(maxName + 10))}${chalk.bold(rawFormatMoney(total))}`);
+    console.log();
+}
+export function showRecap(period = "last_month") {
+    const db = getDb();
+    const now = new Date();
+    const y = now.getFullYear();
+    const m = now.getMonth();
+    let start, end, label;
+    let prevStart, prevEnd;
+    if (period === "this_month") {
+        start = new Date(y, m, 1).toISOString().slice(0, 10);
+        end = now.toISOString().slice(0, 10);
+        label = now.toLocaleDateString("en-US", { month: "long", year: "numeric" }) + " (so far)";
+        prevStart = new Date(y, m - 1, 1).toISOString().slice(0, 10);
+        prevEnd = new Date(y, m, 0).toISOString().slice(0, 10);
+    }
+    else {
+        // last_month
+        start = new Date(y, m - 1, 1).toISOString().slice(0, 10);
+        end = new Date(y, m, 0).toISOString().slice(0, 10);
+        const lastMonth = new Date(y, m - 1, 1);
+        label = lastMonth.toLocaleDateString("en-US", { month: "long", year: "numeric" });
+        prevStart = new Date(y, m - 2, 1).toISOString().slice(0, 10);
+        prevEnd = new Date(y, m - 1, 0).toISOString().slice(0, 10);
+    }
+    // Spending this period
+    const spending = db.prepare(`SELECT SUM(amount) as total, COUNT(*) as count FROM transactions
+     WHERE amount > 0 AND date BETWEEN ? AND ? AND pending = 0
+     AND category NOT IN ('TRANSFER_OUT', 'TRANSFER_IN', 'LOAN_PAYMENTS')`).get(start, end);
+    // Income this period
+    const income = db.prepare(`SELECT COALESCE(SUM(ABS(amount)), 0) as total FROM transactions
+     WHERE amount < 0 AND date BETWEEN ? AND ? AND pending = 0
+     AND category NOT IN ('TRANSFER_IN')`).get(start, end);
+    const totalSpent = spending.total || 0;
+    const txnCount = spending.count || 0;
+    if (txnCount === 0) {
+        console.log(`\nNo transaction data for ${label}.`);
+        return;
+    }
+    console.log(`\n${heading("Recap")} ${dim(label)}\n`);
+    // ── Spending summary with comparison ──
+    const cmp = compareSpending(db, prevStart, prevEnd, start, end);
+    let spendLine = `  Spent ${chalk.bold(rawFormatMoney(totalSpent))} across ${txnCount} transactions`;
+    if (cmp.period1Total > 0) {
+        const pct = Math.abs(cmp.pctChange);
+        const dir = cmp.pctChange <= 0 ? chalk.green(`${pct}% less`) : chalk.red(`${pct}% more`);
+        spendLine += ` — ${dir} than prior month`;
+    }
+    console.log(spendLine);
+    // ── Income ──
+    if (income.total > 0) {
+        const net = income.total - totalSpent;
+        const savingsRate = Math.round((net / income.total) * 100);
+        console.log(`  Earned ${chalk.bold(rawFormatMoney(income.total))}  Net: ${formatMoneyColored(net)}  ${dim(`(${savingsRate}% savings rate)`)}`);
+    }
+    // ── Biggest movers ──
+    const movers = cmp.categories.filter(c => Math.abs(c.diff) >= 10).slice(0, 3);
+    if (movers.length > 0) {
+        console.log(`\n  ${heading("Biggest Movers")}`);
+        for (const mv of movers) {
+            const arrow = mv.diff > 0 ? chalk.red("↑") : chalk.green("↓");
+            const diffStr = mv.diff > 0 ? chalk.red("+" + rawFormatMoney(mv.diff)) : chalk.green("-" + rawFormatMoney(Math.abs(mv.diff)));
+            console.log(`    ${arrow} ${categoryLabel(mv.category).padEnd(18)} ${rawFormatMoney(mv.period2).padStart(10)}  ${diffStr}`);
+        }
+    }
+    // ── Top categories ──
+    const topCats = db.prepare(`SELECT category, SUM(amount) as total FROM transactions
+     WHERE amount > 0 AND date BETWEEN ? AND ? AND pending = 0
+     AND category NOT IN ('TRANSFER_OUT', 'TRANSFER_IN', 'LOAN_PAYMENTS')
+     GROUP BY category ORDER BY total DESC LIMIT 5`).all(start, end);
+    if (topCats.length > 0) {
+        console.log(`\n  ${heading("Top Categories")}`);
+        for (const c of topCats) {
+            const pct = Math.round((c.total / totalSpent) * 100);
+            console.log(`    ${categoryLabel(c.category).padEnd(18)} ${rawFormatMoney(c.total).padStart(10)}  ${dim(`${pct}%`)}`);
+        }
+    }
+    // ── Net worth change over the period ──
+    const nwTrend = getNetWorthTrend(db, 60);
+    const nwAtStart = nwTrend.find(d => d.date >= start);
+    const nwAtEnd = [...nwTrend].reverse().find(d => d.date <= end);
+    if (nwAtStart && nwAtEnd) {
+        const nwChange = nwAtEnd.net_worth - nwAtStart.net_worth;
+        const arrow = nwChange >= 0 ? chalk.green("↑") : chalk.red("↓");
+        console.log(`\n  ${heading("Net Worth")}`);
+        console.log(`    ${rawFormatMoney(nwAtStart.net_worth)} → ${chalk.bold(rawFormatMoney(nwAtEnd.net_worth))}  ${arrow} ${formatMoneyColored(nwChange)}`);
+    }
+    // ── Goals progress ──
+    const goals = getGoals(db);
+    const activeGoals = goals.filter(g => g.progress_pct < 100);
+    if (activeGoals.length > 0) {
+        console.log(`\n  ${heading("Goals")}`);
+        for (const g of activeGoals) {
+            console.log(`    ${g.name.padEnd(20)} ${progressBar(g.progress_pct, 12)}  ${dim(rawFormatMoney(g.current) + " / " + rawFormatMoney(g.target))}`);
+        }
+    }
+    console.log();
+}

package/dist/cli/completions.js

@@ -45,12 +45,13 @@ const COMMANDS = [
     { name: "goals", desc: "Show financial goals" },
     { name: "score", desc: "Show daily financial score and streaks" },
     { name: "alerts", desc: "Show financial alerts" },
+    { name: "bills", desc: "Show upcoming bills" },
+    { name: "recap", desc: "Monthly spending recap" },
     { name: "export", desc: "Export data to a backup file" },
     { name: "import", desc: "Restore data from a backup file" },
     { name: "billing", desc: "Manage your Ray subscription" },
     { name: "update", desc: "Update Ray to the latest version" },
     { name: "doctor", desc: "Check system health" },
-    { name: "completions", desc: "Install shell completions" },
 ];
 const SPENDING_PERIODS = ["this_month", "last_month", "last_30", "last_90"];
 function generateZsh() {

package/dist/cli/doctor.js

@@ -137,7 +137,7 @@ export async function runDoctor() {
         checks.push({ label: "Shell completions", status: "ok", detail: completionPath });
     }
     else {
-        checks.push({ label: "Shell completions", status: "warn", detail: `Not installed. Run ${chalk.bold("ray completions")}` });
+        checks.push({ label: "Shell completions", status: "warn", detail: "Not installed" });
     }
     // ── Node version ──
     const nodeVersion = process.version;

package/dist/cli/index.js

@@ -144,6 +144,24 @@ program
     const { showAlerts } = await import("./commands.js");
     showAlerts();
 });
+program
+    .command("bills")
+    .description("Show upcoming bills")
+    .option("-d, --days <number>", "Number of days ahead", "7")
+    .action(async (opts) => {
+    ensureConfigured();
+    const { showBills } = await import("./commands.js");
+    showBills(Number(opts.days));
+});
+program
+    .command("recap")
+    .description("Monthly spending recap")
+    .argument("[period]", "Period: this_month, last_month", "last_month")
+    .action(async (period) => {
+    ensureConfigured();
+    const { showRecap } = await import("./commands.js");
+    showRecap(period);
+});
 program
     .command("export")
     .description("Export user data (goals, budgets, memories, context) to a backup file")
@@ -168,7 +186,7 @@ program
     .action(async () => {
     ensureConfigured();
     if (!useManaged()) {
-        console.log("You're using self-hosted keys. No subscription to manage.");
+        console.log("You're using your own keys. No subscription to manage.");
         return;
     }
     const open = (await import("open")).default;
@@ -217,13 +235,6 @@ program
     const { seedDemoDb } = await import("../demo/seed.js");
     seedDemoDb(demoPath);
 });
-program
-    .command("completions")
-    .description("Install shell completions")
-    .action(async () => {
-    const { installCompletions } = await import("./completions.js");
-    installCompletions();
-});
 function ensureConfigured() {
     if (isDemoMode)
         return;
@@ -248,13 +259,14 @@ program.configureHelp({
         { name: "goals", desc: "Show financial goals" },
         { name: "score", desc: "Show daily financial score and streaks" },
         { name: "alerts", desc: "Show financial alerts" },
+        { name: "bills", desc: "Show upcoming bills" },
+        { name: "recap", desc: "Monthly spending recap" },
         { name: "export", desc: "Export data to a backup file" },
         { name: "import", desc: "Restore data from a backup file" },
         { name: "billing", desc: "Manage your Ray subscription" },
         { name: "update", desc: "Update Ray to the latest version" },
         { name: "doctor", desc: "Check system health" },
         { name: "demo", desc: "Seed a demo database with fake data" },
-        { name: "completions", desc: "Install shell completions" },
     ]),
 });
 import("./updater.js").then(m => m.checkForUpdate(version)).catch(() => { });

package/dist/daily-sync.js

@@ -145,7 +145,7 @@ export async function runDailySync(db) {
             ? db.prepare(`UPDATE transactions SET category = ?, subcategory = ? WHERE ${rule.match_field} LIKE ? AND category != ?`).run(rule.target_category, rule.target_subcategory, rule.match_pattern, rule.target_category)
             : db.prepare(`UPDATE transactions SET category = ? WHERE ${rule.match_field} LIKE ? AND category != ?`).run(rule.target_category, rule.match_pattern, rule.target_category);
         if (result.changes > 0) {
-            console.log(`  Recategorized ${result.changes} txn(s): ${rule.label}`);
+            console.log(`  Recategorized ${result.changes} txn(s): ${rule.label || rule.match_pattern}`);
             totalRecat += result.changes;
         }
     }

package/dist/queries/index.js

@@ -406,6 +406,15 @@ export function categoryLabel(cat) {
         GOVERNMENT_AND_NON_PROFIT: "Gov/Nonprofit",
         MEDICAL: "Medical",
         BANK_FEES: "Bank Fees",
+        EDUCATION: "Education",
+        INSURANCE: "Insurance",
+        BUSINESS: "Business",
+        INCOME: "Income",
+        TRANSFER_IN: "Transfer In",
+        TRANSFER_OUT: "Transfer Out",
+        HOME_IMPROVEMENT: "Home Improvement",
+        TRAVEL: "Travel",
+        OTHER: "Other",
     };
-    return labels[cat] || cat;
+    return labels[cat] || cat.split("_").map(w => w.charAt(0) + w.slice(1).toLowerCase()).join(" ");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ray-finance",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Local-first CLI that turns your bank data into a personal AI financial advisor",
   "type": "module",
   "license": "MIT",