From bab301d85990b1a7318c5bf3f89276dcd12618ff Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 3 Nov 2026 21:31:24 +0000 Subject: [PATCH 1/4] docs: PRs are independent by default; stacking needs Luis's confirmation --- CLAUDE.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index d895c1b..3f693d2 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -22,9 +22,15 @@ Nothing reaches `master` except through a reviewed pull request. This is the own - **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 +### Independent PRs — no stacking without permission -- **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. +- **Every new PR is independent.** Branch from the latest `master` and target `master`. Never base a new PR on another open PR's branch. +- **If a change can't be done without an unmerged PR, stop and ask Luis first.** Name the PR it depends on and why it can't wait for that merge or be done on its own. Stack only after he confirms, and note his confirmation at the top of the PR description. +- **PRs opened before this rule (2026-11-03) stay as they are.** Don't rebase, retarget or restructure an existing stack to fit this rule unless Luis asks. + +### Stacked PRs (only when Luis has approved 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. From c59737222a2c98285a0b970c435bf285c335621a Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 3 Nov 2026 21:47:47 +0000 Subject: [PATCH 2/4] docs: pick the version number when a PR is finalized; every change gets a version Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013Z8iBZ2KQLeHeYms5c9reX --- CHANGELOG.md | 9 +++++++++ CLAUDE.md | 20 +++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a41488d..23d9929 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). --- +## [Unreleased] + +### Docs +- **PRs are independent by default (CLAUDE.md §0).** Every new PR branches from `master` and targets `master`. Stacking a PR on another unmerged PR needs Luis's confirmation first. Stacks opened before 2026-11-03 stay as they are. +- **Version numbers are picked at merge time (§0, §17).** An open PR's changelog entry sits under `[Unreleased]`. When the PR is finalized, Claude merges in `master`, assigns the next version, updates every version spot and comments the chosen version 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 3f693d2..0378bc4 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -18,7 +18,7 @@ Nothing reaches `master` except through a reviewed pull request. This is the own ### What every PR includes -- **CHANGELOG and version** bumped per §17. +- **A CHANGELOG entry under `## [Unreleased]`** (§17), and the bump type (patch, minor or major) stated in the description. The version number itself is picked when the PR is finalized (below). - **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. @@ -34,6 +34,18 @@ Nothing reaches `master` except through a reviewed pull request. This is the own - **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. +### Finalizing a PR: the version number + +Open PRs don't claim a version number, because independent PRs would all claim the same one. The number is picked just before merging: + +1. **When Luis says a PR is ready to merge** (or asks to finalize it), Claude merges the latest `master` into the branch. +2. **Claude picks the next version** from `master`'s current version and the PR's bump type, renames `## [Unreleased]` to `## [X.Y.Z] — YYYY-MM-DD`, and updates every version spot listed in §17. This is one commit, pushed to the PR. +3. **Claude comments on the PR** with the version chosen: the version, the bump type, the `master` version it builds on, and the finalize commit. +4. **Luis approves that commit**, and the PR merges (approval rules below). + +- **If Luis merges on GitHub himself,** he asks Claude to finalize first. A PR whose CHANGELOG still says `[Unreleased]` isn't ready to merge. +- **After any merge,** the other open PRs merge `master` in before they're finalized. In CHANGELOG, keep `master`'s new versioned entry and put the PR's own `[Unreleased]` entry above it. + ### Approval before merging A PR is merged only after Luis approves it, in one of two ways: @@ -766,7 +778,9 @@ 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.** + +While a PR is open, its entry sits under `## [Unreleased]`; the number and date are filled in when it's finalized (§0). The finished entry follows the existing format: ```markdown ## [X.Y.Z] — YYYY-MM-DD @@ -775,7 +789,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. **On every version bump, all four of these must be updated — no exceptions:** From 39641b560cf463423b850f4248b6add7b682cb2c Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 3 Nov 2026 22:30:38 +0000 Subject: [PATCH 3/4] docs: drop finalize step; renumber a taken version when syncing with master; v1.10.6 Replaces the [Unreleased]/finalize-at-merge rule from the previous commit. A PR picks the next version after master's when opened; when it's synced with master and that number is taken, it's renumbered in a new commit. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013Z8iBZ2KQLeHeYms5c9reX --- CHANGELOG.md | 6 +++--- CLAUDE.md | 26 +++++++++++--------------- README.md | 4 ++-- index.html | 2 +- js/views-settings.js | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23d9929..29802fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). --- -## [Unreleased] +## [1.10.6] — 2026-11-03 ### Docs -- **PRs are independent by default (CLAUDE.md §0).** Every new PR branches from `master` and targets `master`. Stacking a PR on another unmerged PR needs Luis's confirmation first. Stacks opened before 2026-11-03 stay as they are. -- **Version numbers are picked at merge time (§0, §17).** An open PR's changelog entry sits under `[Unreleased]`. When the PR is finalized, Claude merges in `master`, assigns the next version, updates every version spot and comments the chosen version on the PR. +- **PRs are independent by default (CLAUDE.md §0).** Every new PR branches from `master` and targets `master`, so PRs can be merged in any order. Stacking a PR on another unmerged PR needs Luis's confirmation first. Stacks opened before 2026-11-03 stay as they are. +- **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. --- diff --git a/CLAUDE.md b/CLAUDE.md index 0378bc4..ad468b0 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -18,7 +18,7 @@ Nothing reaches `master` except through a reviewed pull request. This is the own ### What every PR includes -- **A CHANGELOG entry under `## [Unreleased]`** (§17), and the bump type (patch, minor or major) stated in the description. The version number itself is picked when the PR is finalized (below). +- **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. @@ -34,17 +34,15 @@ Nothing reaches `master` except through a reviewed pull request. This is the own - **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. -### Finalizing a PR: the version number +### Syncing with `master` and version numbers -Open PRs don't claim a version number, because independent PRs would all claim the same one. The number is picked just before merging: +Independent PRs can be merged in any order, so two open PRs may pick the same version number. Luis 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. **When Luis says a PR is ready to merge** (or asks to finalize it), Claude merges the latest `master` into the branch. -2. **Claude picks the next version** from `master`'s current version and the PR's bump type, renames `## [Unreleased]` to `## [X.Y.Z] — YYYY-MM-DD`, and updates every version spot listed in §17. This is one commit, pushed to the PR. -3. **Claude comments on the PR** with the version chosen: the version, the bump type, the `master` version it builds on, and the finalize commit. -4. **Luis approves that commit**, and the PR merges (approval rules below). +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. -- **If Luis merges on GitHub himself,** he asks Claude to finalize first. A PR whose CHANGELOG still says `[Unreleased]` isn't ready to merge. -- **After any merge,** the other open PRs merge `master` in before they're finalized. In CHANGELOG, keep `master`'s new versioned entry and put the PR's own `[Unreleased]` entry above it. +These new commits need Luis's fresh approval before merging (below). ### Approval before merging @@ -77,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. @@ -778,9 +776,7 @@ dayjs(t.date).format('MMM D') // 'Apr 26' ## 17. Changelog Discipline -**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.** - -While a PR is open, its entry sits under `## [Unreleased]`; the number and date are filled in when it's finalized (§0). The finished entry follows 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 @@ -789,7 +785,7 @@ While a PR is open, its entry sits under `## [Unreleased]`; the number and date - **Feature name** — what changed and why, referencing affected functions/files. ``` -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. +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:** @@ -818,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-03 (§0 independent PRs, no stacking without permission; 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 @@
⚙️ Settings
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) { -
FinLens v1.10.5 ·${State.transactions.length} transactions loaded${State.lastRefresh?' · Refreshed '+dayjs(State.lastRefresh).format('MMM D, YYYY h:mm A'):''}
`; +
FinLens v1.10.6 ·${State.transactions.length} transactions loaded${State.lastRefresh?' · Refreshed '+dayjs(State.lastRefresh).format('MMM D, YYYY h:mm A'):''}
`; root.appendChild(displayCard); /* ---- Anthropic API Key ---- */ From 6f88f6ba6aa73c06b217346266070cfd9d3ba836 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 5 Nov 2026 15:16:11 +0000 Subject: [PATCH 4/4] docs: ask before opening a PR or stacking one, instead of independent-only PRs Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013Z8iBUZ1y4fG6SBtXbANs4 --- CHANGELOG.md | 4 ++-- CLAUDE.md | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29802fb..a8b6079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). --- -## [1.10.6] — 2026-11-03 +## [1.10.6] — 2026-11-05 ### Docs -- **PRs are independent by default (CLAUDE.md §0).** Every new PR branches from `master` and targets `master`, so PRs can be merged in any order. Stacking a PR on another unmerged PR needs Luis's confirmation first. Stacks opened before 2026-11-03 stay as they are. +- **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. diff --git a/CLAUDE.md b/CLAUDE.md index ad468b0..9b37f87 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -22,13 +22,13 @@ Nothing reaches `master` except through a reviewed pull request. This is the own - **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. -### Independent PRs — no stacking without permission +### Ask before opening a PR or stacking one -- **Every new PR is independent.** Branch from the latest `master` and target `master`. Never base a new PR on another open PR's branch. -- **If a change can't be done without an unmerged PR, stop and ask Luis first.** Name the PR it depends on and why it can't wait for that merge or be done on its own. Stack only after he confirms, and note his confirmation at the top of the PR description. -- **PRs opened before this rule (2026-11-03) stay as they are.** Don't rebase, retarget or restructure an existing stack to fit this rule unless Luis asks. +- **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 Luis has approved the stack) +### 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. @@ -36,13 +36,13 @@ Nothing reaches `master` except through a reviewed pull request. This is the own ### Syncing with `master` and version numbers -Independent PRs can be merged in any order, so two open PRs may pick the same version number. Luis 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: +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 Luis's fresh approval before merging (below). +These new commits need @gitluis's fresh approval before merging (below). ### Approval before merging @@ -814,7 +814,7 @@ Multiple Chase card files can be loaded simultaneously. Each gets a unique `acco --- -*Last updated: v1.10.6 — 2026-11-03 (§0 independent PRs, no stacking without permission; 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)* +*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)* ---