Release 2.5.8: freeze past target snapshot, fix paid-bill logic, align Dougie with dashboard

Author: rollecode

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.5.8: 2026-04-20
+
+* Snapshot discretionary target per day so past chart colors stop drifting
+* Count bills as paid only when actually paid, not when due day has passed
+* Dougie uses priority bills and debts in without-bills mode to match dashboard
+* Dougie no longer states the daily budget is 0 euros when reservations compress it to zero
+
 ### 2.5.7: 2026-04-19
 
 * Clamp due day to last day of month so day 31 incomes/bills work in shorter months

src/app/(app)/dashboard/page.tsx

@@ -285,7 +285,7 @@ export default function DashboardPage() {
   // Separate bills from discretionary for accurate projection
   const totalBillsAmount = bills.filter((b) => b.is_active).reduce((s, b) => s + b.amount, 0);
   const paidBillsAmount = bills
-    .filter((b) => b.is_active && (matchedBillIds.has(b.id) || b.due_day < today))
+    .filter((b) => b.is_active && b.is_paid)
     .reduce((s, b) => s + b.amount, 0);
   const unpaidBillsAmount = totalBillsAmount - paidBillsAmount;
   const discretionarySpending = Math.max(0, realSpendingTotal - paidBillsAmount);
@@ -539,7 +539,7 @@ export default function DashboardPage() {
         monthExpenses={Math.round((totalBillsAmount + debtMonthly + investmentMonthly + savingRate + (dailyDiscretionary * daysInMonth)) * 100) / 100}
         trendPercent={trendPercent}
         budgetBreakdown={budgetResult.tightestSegment}
-        streakProps={{ dailyBudget, todaySpent: todaySpentAll }}
+        streakProps={{ dailyBudget, todaySpent: todaySpentAll, discretionaryTarget: discretionaryTargetPerDay }}
       />
 
       <div className="page-grid-2">

src/app/api/chat/route.ts

@@ -93,7 +93,7 @@ export async function POST(request: Request) {
             .filter((a: any) => a.type === "otherDebt" && a.balance < 0)
             .map((a: any) => {
               const override = debtOverrideMap[a.id];
-              return { name: a.name, remaining: Math.abs(a.balance), rate: override?.interest_rate ?? 0, minimumPayment: override?.minimum_payment ?? 0, dueDay: override?.due_day ?? 0 };
+              return { name: a.name, remaining: Math.abs(a.balance), rate: override?.interest_rate ?? 0, minimumPayment: override?.minimum_payment ?? 0, dueDay: override?.due_day ?? 0, isPriority: !!override?.is_priority };
             });
 
           // Get investment accounts with overrides
@@ -224,9 +224,12 @@ export async function POST(request: Request) {
             resolveDay,
           };
 
-          // Apply bills setting: auto, always, or never
+          // Apply bills setting: auto, always, or never. Priority items always reserved.
+          const priorityBills = unpaidBills.filter((b: any) => b.isPriority).map((b: any) => ({ amount: b.amount, dueDay: b.dueDay }));
+          const priorityDebts = allDebtItems.filter((_: unknown, i: number) => debts[i]?.isPriority);
+          const allPriorityBills = enrichedBills.filter((b: any) => b.isPriority).map((b: any) => ({ amount: b.amount, dueDay: b.dueDay }));
           const budgetWithBills = calculateDailyBudget(budgetParams);
-          const budgetWithoutBills = calculateDailyBudget({ ...budgetParams, unpaidBills: [], debts: [] });
+          const budgetWithoutBills = calculateDailyBudget({ ...budgetParams, unpaidBills: priorityBills, debts: priorityDebts, allBills: allPriorityBills, allDebts: priorityDebts });
           let dailyBudget: number;
           if (billsSetting === "auto") {
             const totalUnpaid = budgetParams.unpaidBills.reduce((s: number, b: { amount: number }) => s + b.amount, 0) + budgetParams.debts.reduce((s: number, d: { amount: number }) => s + d.amount, 0);

src/app/api/daily-budget-history/route.ts

@@ -8,7 +8,7 @@ export async function GET() {
     if (!user) return NextResponse.json({ history: [] }, { status: 401 });
 
     const db = getDb();
-    const history = db.prepare("SELECT date, budget, spent FROM daily_budget_history ORDER BY date DESC LIMIT 31").all();
+    const history = db.prepare("SELECT date, budget, spent, discretionary_target FROM daily_budget_history ORDER BY date DESC LIMIT 31").all();
     console.debug("[daily-budget-history] Loaded", (history as unknown[]).length, "entries");
     return NextResponse.json({ history });
   } catch (error) {
@@ -22,16 +22,16 @@ export async function POST(request: Request) {
     const user = await getSession();
     if (!user) return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
 
-    const { date, budget, spent } = await request.json();
+    const { date, budget, spent, discretionary_target } = await request.json();
     if (!date || budget === undefined) return NextResponse.json({ error: "date and budget required" }, { status: 400 });
 
     const db = getDb();
     db.prepare(`
-      INSERT INTO daily_budget_history (date, budget, spent) VALUES (?, ?, ?)
-      ON CONFLICT(date) DO UPDATE SET budget = excluded.budget, spent = excluded.spent
-    `).run(date, budget, spent || 0);
+      INSERT INTO daily_budget_history (date, budget, spent, discretionary_target) VALUES (?, ?, ?, ?)
+      ON CONFLICT(date) DO UPDATE SET budget = excluded.budget, spent = excluded.spent, discretionary_target = excluded.discretionary_target
+    `).run(date, budget, spent || 0, discretionary_target || 0);
 
-    console.debug("[daily-budget-history] Saved", date, "budget:", budget, "spent:", spent);
+    console.debug("[daily-budget-history] Saved", date, "budget:", budget, "spent:", spent, "target:", discretionary_target);
     return NextResponse.json({ success: true });
   } catch (error) {
     console.error("[daily-budget-history] POST error:", error);

src/app/api/summary/route.ts

@@ -167,7 +167,7 @@ export async function GET(request: Request) {
     // Better projection: separate bills from discretionary spending
     const totalBillsAmount = recurringBills.reduce((s, b) => s + b.amount, 0);
     const paidBillsAmount = recurringBills
-      .filter((b) => matchedBillIds.has(b.id) || b.due_day < now.getDate())
+      .filter((b) => matchedBillIds.has(b.id))
       .reduce((s, b) => s + b.amount, 0);
     const unpaidBillsAmount = totalBillsAmount - paidBillsAmount;
     const discretionarySpending = Math.max(0, monthActivity - paidBillsAmount);

src/components/dashboard/daily-allowance.tsx

@@ -29,6 +29,7 @@ interface DailyAllowanceProps {
   streakProps?: {
     dailyBudget: number;
     todaySpent: number;
+    discretionaryTarget?: number;
   };
   thresholds?: { tight: number; normal: number; good: number };
   budgetBreakdown?: {

src/components/dashboard/savings-streak.tsx

@@ -8,6 +8,7 @@ import { useState, useEffect, useRef } from "react";
 interface SavingsStreakProps {
   dailyBudget: number;
   todaySpent: number;
+  discretionaryTarget?: number;
 }
 
 interface HistoryEntry {
@@ -16,7 +17,7 @@ interface HistoryEntry {
   spent: number;
 }
 
-export function SavingsStreak({ dailyBudget, todaySpent }: SavingsStreakProps) {
+export function SavingsStreak({ dailyBudget, todaySpent, discretionaryTarget }: SavingsStreakProps) {
   const { locale, fmt } = useLocale();
   const [history, setHistory] = useState<HistoryEntry[]>([]);
   const savedRef = useRef(false);
@@ -41,9 +42,9 @@ export function SavingsStreak({ dailyBudget, todaySpent }: SavingsStreakProps) {
     fetch("/api/daily-budget-history", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ date: todayDate, budget: dailyBudget, spent: todaySpent }),
+      body: JSON.stringify({ date: todayDate, budget: dailyBudget, spent: todaySpent, discretionary_target: discretionaryTarget || 0 }),
     }).catch(() => {});
-  }, [dailyBudget, todaySpent]);
+  }, [dailyBudget, todaySpent, discretionaryTarget]);
 
   // Last 7 days from history
   const days: { day: number; month: number; status: "fire" | "fail" | "today" | "nodata"; budget: number; spent: number }[] = [];

src/components/dashboard/spending-flow.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { useEffect, useState } from "react";
 import { useLocale } from "@/lib/locale-context";
 import {
   AreaChart,
@@ -21,6 +22,13 @@ interface SpendingFlowProps {
   dailyBudget: number;
 }
 
+interface SnapshotEntry {
+  date: string;
+  budget: number;
+  spent: number;
+  discretionary_target: number;
+}
+
 function ratioToColor(r: number): string {
   // r = actual/target. Under 1.0 = good, over = bad
   // 0-0.95 green, 0.95-1.0 green→yellow, 1.0-1.03 yellow→red, 1.03+ red
@@ -51,9 +59,39 @@ export function SpendingFlow({
   dailyBudget,
 }: SpendingFlowProps) {
   const { locale, fmt } = useLocale();
+  const [snapshots, setSnapshots] = useState<SnapshotEntry[]>([]);
+
+  useEffect(() => {
+    fetch("/api/daily-budget-history")
+      .then((r) => r.json())
+      .then((data) => { if (data.history) setSnapshots(data.history); })
+      .catch(() => {});
+  }, []);
+
+  // Build per-day target lookup from snapshots: day-of-month -> frozen target
+  const now = new Date();
+  const monthPrefix = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`;
+  const snapshotByDay: Record<number, number> = {};
+  for (const s of snapshots) {
+    if (s.date.startsWith(monthPrefix) && s.discretionary_target > 0) {
+      const day = parseInt(s.date.split("-")[2], 10);
+      snapshotByDay[day] = s.discretionary_target;
+    }
+  }
+
   // Target = daily budget (from cash flow simulation) * days in month
   const target = dailyBudget * daysInMonth;
 
+  // Cumulative target by day from frozen snapshots, falling back to live targetPerDay
+  // when a day has no snapshot yet (today and future)
+  const cumulativeTargetByDay: Record<number, number> = {};
+  let runningTarget = 0;
+  for (let d = 1; d <= daysInMonth; d++) {
+    const perDay = snapshotByDay[d] > 0 ? snapshotByDay[d] : targetPerDay;
+    runningTarget += perDay;
+    cumulativeTargetByDay[d] = runningTarget;
+  }
+
   const data: { day: number; label: string; actual?: number; projected?: number; target?: number }[] = [];
   let cumulative = 0;
 
@@ -66,7 +104,7 @@ export function SpendingFlow({
         day: d,
         label: `${d}.`,
         actual: discretionary,
-        target: targetPerDay > 0 ? Math.round(targetPerDay * d) : undefined,
+        target: cumulativeTargetByDay[d] > 0 ? Math.round(cumulativeTargetByDay[d]) : undefined,
       });
     } else {
       // Projection based on discretionary daily rate (already excludes bills)
@@ -77,7 +115,7 @@ export function SpendingFlow({
         day: d,
         label: `${d}.`,
         projected: Math.round(projected),
-        target: targetPerDay > 0 ? Math.round(targetPerDay * d) : undefined,
+        target: cumulativeTargetByDay[d] > 0 ? Math.round(cumulativeTargetByDay[d]) : undefined,
       });
     }
   }
@@ -89,14 +127,22 @@ export function SpendingFlow({
   const lastActual = data[daysPassed - 1]?.actual || 0;
   const monthEndTarget = target > 0 ? target : 0;
 
-  const todayTarget = targetPerDay > 0 ? Math.round(targetPerDay * daysPassed) : 0;
+  // Use cumulative snapshot for the "today" comparison so past target shifts don't move the bubble
+  const cumulativeToToday = (() => {
+    let sum = 0;
+    for (let d = 1; d <= daysPassed; d++) {
+      sum += snapshotByDay[d] > 0 ? snapshotByDay[d] : targetPerDay;
+    }
+    return sum;
+  })();
+  const todayTarget = cumulativeToToday > 0 ? Math.round(cumulativeToToday) : 0;
   const todayDiff = todayTarget - lastActual;
   const todayRatio = todayTarget > 0 ? lastActual / todayTarget : 0;
   const ballColor = targetPerDay > 0 ? ratioToColor(todayRatio) : "#818cf8";
 
   const gradientStops = data.filter((d) => d.actual !== undefined).map((d, i, arr) => {
     const pos = arr.length > 1 ? i / (arr.length - 1) : 0.5;
-    const dayTarget = targetPerDay > 0 ? targetPerDay * d.day : 0;
+    const dayTarget = cumulativeTargetByDay[d.day] || 0;
     const r = dayTarget > 0 ? (d.actual || 0) / dayTarget : 0;
     return { pos, color: ratioToColor(r) };
   });

src/lib/ai/finance-advisor.ts

@@ -102,6 +102,7 @@ ADVICE STYLE:
 - When asked "can I afford X", consider all unpaid obligations, upcoming bills, and savings goals before answering.
 - If spending would leave less than 3 days worth of daily budget as buffer, advise against it.
 - Acknowledge must-pay obligations first, then discretionary spending.
+- NEVER tell the user their daily budget is 0 euros, even when the number is literally 0. A 0 euro daily budget means tight reservations against current balance, not that they are broke. Reason from balance, upcoming income, and pending obligations. Give a practical euro amount they can safely spend today based on those real factors, not the raw daily budget figure.
 
 FORMATTING RULES (always follow):
 - NEVER use em-dashes (—) or en-dashes (–). Use commas, periods, or line breaks instead.

src/lib/db.ts

@@ -160,6 +160,7 @@ function initializeDb(db: Database.Database) {
       date TEXT PRIMARY KEY,
       budget REAL NOT NULL DEFAULT 0,
       spent REAL NOT NULL DEFAULT 0,
+      discretionary_target REAL NOT NULL DEFAULT 0,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
 
@@ -369,6 +370,13 @@ function initializeDb(db: Database.Database) {
     db.exec("ALTER TABLE payee_matches ADD COLUMN max_amount REAL DEFAULT 0");
   }
 
+  // Add discretionary_target column to daily_budget_history if missing
+  const dbhCols = db.prepare("PRAGMA table_info(daily_budget_history)").all() as { name: string }[];
+  if (dbhCols.length > 0 && !dbhCols.some((c) => c.name === "discretionary_target")) {
+    console.info("[db] Adding discretionary_target column to daily_budget_history");
+    db.exec("ALTER TABLE daily_budget_history ADD COLUMN discretionary_target REAL NOT NULL DEFAULT 0");
+  }
+
   // Add image_thumb column to chat_messages if missing
   const chatCols = db.prepare("PRAGMA table_info(chat_messages)").all() as { name: string }[];
   if (!chatCols.some((c) => c.name === "image_thumb")) {