diff --git a/CHANGELOG.md b/CHANGELOG.md index a41488d..a8b6079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). --- +## [1.10.6] — 2026-11-05 + +### Docs +- **Ask before opening a PR or stacking one (CLAUDE.md §0).** Claude asks @gitluis before opening any new PR, drafts included. Stacking a PR on another unmerged PR is allowed once he agrees; otherwise a PR branches from `master` and targets `master`. +- **Syncing with `master` renumbers a taken version (§0).** When a PR is out of date or conflicts with `master`, Claude merges `master` in. If the PR's version is already on `master`, Claude renumbers it to the next free version in a new commit, and comments on the PR. +- **Every change gets a version and a changelog entry (§17)**, documentation included. Documentation counts as a patch. + +--- + ## [1.10.5] — 2026-11-02 ### Fixed diff --git a/CLAUDE.md b/CLAUDE.md index d895c1b..9b37f87 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -18,16 +18,32 @@ Nothing reaches `master` except through a reviewed pull request. This is the own ### What every PR includes -- **CHANGELOG and version** bumped per §17. +- **CHANGELOG and version** bumped per §17: the next version after `master`'s at the time the PR is opened. - **A description** with a summary, the cause (for bugs), what changed, how it was tested, and a "please check before merging" list. - **Tests run** before opening the PR (headless browser checks against `samples/`). Report results honestly, including anything not verified. -### Stacked PRs +### Ask before opening a PR or stacking one -- **When a change depends on an unmerged PR,** branch from that PR's branch and set it as the new PR's base. Say so at the top of the description. +- **Ask @gitluis before opening any new PR, drafts included.** Say what it covers, its branch and its version. Open it only after he agrees. +- **Stacking is allowed, but ask first.** When a change depends on an unmerged PR, name that PR and say why the change needs it before branching from it. Stack only after he agrees, and note his OK at the top of the PR description. +- **Without an agreed stack,** a PR branches from the latest `master` and targets `master`. + +### Stacked PRs (only when @gitluis has agreed to the stack) + +- **Branch from the PR it depends on** and set that branch as the new PR's base. Say so at the top of the description. - **When an earlier PR in the stack gets new commits,** merge it forward into every later branch so the stack stays consistent. - **Merge in order.** After a base PR merges, retarget the next PR to `master` if GitHub doesn't do it automatically. +### Syncing with `master` and version numbers + +PRs that aren't stacked can be merged in any order, so two open PRs may pick the same version number. @gitluis usually approves in a PR comment and merges himself. When GitHub won't merge a PR because it's out of date or conflicts with `master`, he asks Claude to fix it. Claude then: + +1. **Merges the latest `master` into the PR's branch** and resolves conflicts. In CHANGELOG, keep `master`'s entries and put the PR's entry above them. +2. **Checks the PR's version.** If `master` already has that number or a higher one, renumber to the next version after `master`'s. Update the CHANGELOG heading and date and every spot in §17, in a new commit on the PR. +3. **Comments on the PR** with what changed: the conflicts resolved and, if renumbered, the old and new version. + +These new commits need @gitluis's fresh approval before merging (below). + ### Approval before merging A PR is merged only after Luis approves it, in one of two ways: @@ -59,7 +75,7 @@ Until then, this section is the rule. FinLens is a **single-origin, zero-build, vanilla JavaScript personal finance dashboard** that runs entirely in the browser. There is no server, no npm, no bundler, no framework, and no TypeScript. The entry point is `index.html`; everything else is a plain `.js` file in the `js/` folder. -**Current version:** v1.10.5 (updated in `index.html` footer, `README.md`, and `CHANGELOG.md` on every release). +**Current version:** v1.10.6 (updated in `index.html` footer, `README.md`, and `CHANGELOG.md` on every release). **What it does:** Imports CSV exports from Ally Bank (Checking + Savings) and Chase credit cards, parses and normalizes them into a unified transaction model, and renders a multi-tab financial dashboard with budgeting, debt tracking, savings forecasting, investment planning, and Claude-powered AI analysis. @@ -760,7 +776,7 @@ dayjs(t.date).format('MMM D') // 'Apr 26' ## 17. Changelog Discipline -Every change — no matter how small — must have an entry in `CHANGELOG.md` following the existing format: +**Every change gets a new version number and its own `CHANGELOG.md` entry — documentation, minor changes, bug fixes, major changes and new features alike. No exceptions.** Entries follow the existing format: ```markdown ## [X.Y.Z] — YYYY-MM-DD @@ -769,7 +785,7 @@ Every change — no matter how small — must have an entry in `CHANGELOG.md` fo - **Feature name** — what changed and why, referencing affected functions/files. ``` -Bump the patch version for bug fixes, minor version for new features, major version for architectural changes. +Bump the **patch** version for bug fixes, documentation and other minor changes, the **minor** version for new features, and the **major** version for architectural changes. A PR picks its number when it's opened; if `master` takes that number first, the PR is renumbered when it's synced (§0). **On every version bump, all four of these must be updated — no exceptions:** @@ -798,7 +814,7 @@ Multiple Chase card files can be loaded simultaneously. Each gets a unique `acco --- -*Last updated: v1.10.5 — 2026-11-02 (no section changes: Import Logs race fix; v1.10.4: §8, §13 single `~` is literal; §21 excerpts escape `~`; v1.10.3: §13 refusals; §21 declined runs; v1.10.2: §13 summary states its dates; §21 per-month derivations; v1.10.1: §13 `AI_MAX_TOKENS`, thinking and cut-off answers; v1.10.0: §21 AI Eval added; §13 `callClaude()` raw mode; v1.9.6: §14 folder access lasts until the last tab closes, not one page load; v1.9.5: §7 chart guard; v1.9.4: views-db.js changelog reads CRLF checkouts; v1.9.3: §14 folder permission: re-request on click, Reconnect banner, browser copy wins; v1.9.2: §0 branch, PR and approval workflow added; v1.9.1: §4.5 rehydrate transactions loaded from JSON; v1.9.0: §20 Data & Reset added; v1.8.1: §10 re-upload dedup rewritten for the occurrence-suffix fix; v1.8.0: AI Analysis restored with API-key and output hardening; `renderMarkdown()` added; `samples/` added; §1–3, §13, §14, §17 corrected to match the code)* +*Last updated: v1.10.6 — 2026-11-05 (§0 ask before opening a PR or stacking one; syncing with `master` renumbers a taken version; §17 every change gets a version; v1.10.5: no section changes, Import Logs race fix; v1.10.4: §8, §13 single `~` is literal; §21 excerpts escape `~`; v1.10.3: §13 refusals; §21 declined runs; v1.10.2: §13 summary states its dates; §21 per-month derivations; v1.10.1: §13 `AI_MAX_TOKENS`, thinking and cut-off answers; v1.10.0: §21 AI Eval added; §13 `callClaude()` raw mode; v1.9.6: §14 folder access lasts until the last tab closes, not one page load; v1.9.5: §7 chart guard; v1.9.4: views-db.js changelog reads CRLF checkouts; v1.9.3: §14 folder permission: re-request on click, Reconnect banner, browser copy wins; v1.9.2: §0 branch, PR and approval workflow added; v1.9.1: §4.5 rehydrate transactions loaded from JSON; v1.9.0: §20 Data & Reset added; v1.8.1: §10 re-upload dedup rewritten for the occurrence-suffix fix; v1.8.0: AI Analysis restored with API-key and output hardening; `renderMarkdown()` added; `samples/` added; §1–3, §13, §14, §17 corrected to match the code)* --- diff --git a/README.md b/README.md index 1cd3fc5..93476e1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > A zero-install, browser-native finance dashboard. Drop in your bank CSVs, get instant clarity on your money. -**Version:** v1.10.5 · **Stack:** Vanilla JS, HTML, CSS · **Install:** None +**Version:** v1.10.6 · **Stack:** Vanilla JS, HTML, CSS · **Install:** None --- @@ -260,4 +260,4 @@ See [CHANGELOG.md](CHANGELOG.md) for the full release history. --- -*FinLens v1.10.5 — Built for one person's finances, designed to be useful for anyone's.* +*FinLens v1.10.6 — Built for one person's finances, designed to be useful for anyone's.* diff --git a/index.html b/index.html index ee48405..11f0685 100644 --- a/index.html +++ b/index.html @@ -326,7 +326,7 @@
diff --git a/js/views-settings.js b/js/views-settings.js index 6f7d389..eadf7c2 100644 --- a/js/views-settings.js +++ b/js/views-settings.js @@ -49,7 +49,7 @@ function _renderGeneralSettings(root) { -