glidepath 0.4.0__tar.gz → 0.5.0__tar.gz

{glidepath-0.4.0 → glidepath-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glidepath
-Version: 0.4.0
+Version: 0.5.0
 Summary: Desktop retirement and investment planner (UK-first, region-extensible).
 Keywords: retirement,pension,financial-planning,investment,uk,sipp,isa,monte-carlo
 Author: James Williams
@@ -201,8 +201,11 @@ Releases are `vX.Y.Z` tags on `main`. Each one is published to
 trusted publishing with PEP 740 attestations, and as a GitHub Release
 carrying its notes from
 [`CHANGELOG.md`](https://github.com/williajm/glidepath/blob/main/CHANGELOG.md)
-with the same artifacts attached. There are no packaged binary builds
-(installer/exe) yet — install from PyPI as above.
+with the same artifacts attached, each carrying signed build
+provenance — verify a downloaded file with
+`gh attestation verify <file> -R williajm/glidepath`. There are no
+packaged binary builds (installer/exe) yet — install from PyPI as
+above.
 
 ## Data licences
 

{glidepath-0.4.0 → glidepath-0.5.0}/README.md

@@ -173,8 +173,11 @@ Releases are `vX.Y.Z` tags on `main`. Each one is published to
 trusted publishing with PEP 740 attestations, and as a GitHub Release
 carrying its notes from
 [`CHANGELOG.md`](https://github.com/williajm/glidepath/blob/main/CHANGELOG.md)
-with the same artifacts attached. There are no packaged binary builds
-(installer/exe) yet — install from PyPI as above.
+with the same artifacts attached, each carrying signed build
+provenance — verify a downloaded file with
+`gh attestation verify <file> -R williajm/glidepath`. There are no
+packaged binary builds (installer/exe) yet — install from PyPI as
+above.
 
 ## Data licences
 

{glidepath-0.4.0 → glidepath-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "glidepath"
-version = "0.4.0"
+version = "0.5.0"
 description = "Desktop retirement and investment planner (UK-first, region-extensible)."
 readme = "README.md"
 # MIT code plus one CC BY-NC-SA 4.0 data file (returns_history.toml —
@@ -61,6 +61,7 @@ dev = [
     "pre-commit",
     "pytest",
     "pytest-cov",
+    "pytest-qt",
     "pytest-timeout",
     "ruff",
 ]
@@ -73,7 +74,7 @@ build-backend = "uv_build"
 [tool.uv]
 # Supply-chain cooldown: resolution ignores anything published to PyPI after
 # this timestamp (now minus 7 days). Updated ONLY by `make deps`.
-exclude-newer = "2026-08-01T17:09:10Z"
+exclude-newer = "2026-08-06T18:44:36Z"
 
 # PyPI is the ONLY permitted index (supply-chain policy; see CLAUDE.md).
 [[tool.uv.index]]
@@ -153,6 +154,9 @@ pythonpath = ["scripts", "tests"]
 # GUI suite waits on worker pools for up to 60s, so the ceiling sits
 # safely above that while still cutting a wedged run short.
 timeout = 120
+# pytest-qt would autodetect PySide6 anyway; pinning the binding keeps the
+# plugin from ever picking up a stray PyQt installed into the venv.
+qt_api = "pyside6"
 markers = [
     "gui: exercises the PySide6 shell on the offscreen Qt platform",
     "slow: long-running engine sweeps (Monte Carlo, backtest, solvers); deselect with -m 'not slow'",

glidepath-0.5.0/src/glidepath/__init__.py

@@ -0,0 +1,11 @@
+"""glidepath: a desktop retirement and investment planner (UK-first).
+
+``[project] version`` in pyproject.toml is the single version source
+(rewritten only by ``make bump``, planning §4.10); it reaches the
+installed distribution as metadata, and ``__version__`` merely reads
+it back — never state a version here.
+"""
+
+from importlib.metadata import version
+
+__version__ = version("glidepath")

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/app/copy.py

@@ -113,8 +113,11 @@ HELP_GUIDE_SECTIONS: Final[tuple[tuple[str, str], ...]] = (
             "reproduce. "
             'The "When can I retire?" card answers with the earliest '
             "retirement age at which the plan sustains a target income — "
-            "a replacement rate you choose (66% of your employment income "
-            "by default) — on the selected run mode's basis: met with no "
+            "a replacement rate you choose (66% of your gross employment "
+            "income by default), enforced as after-tax spending money, so "
+            "the target is deliberately more demanding than the same "
+            "share of your take-home pay — on the selected run mode's "
+            "basis: met with no "
             "shortfall deterministically, or with at least your chosen "
             "Monte Carlo success rate. "
             'The "How much can I draw down?" card asks the same question '
@@ -124,6 +127,25 @@ HELP_GUIDE_SECTIONS: Final[tuple[tuple[str, str], ...]] = (
             "on the same selected basis."
         ),
     ),
+    (
+        "How spending is funded",
+        (
+            "In the projection, income already in payment — defined "
+            "benefit pension, state pension, annuity income — meets your "
+            "net spending need first, after the tax it bears. Whatever "
+            "remains is withdrawn from your wrappers in one fixed order: "
+            "general accounts and cash first (every pound left in them "
+            "keeps accruing income tax), then ISAs and LISAs, then "
+            "already-crystallised pension funds, and uncrystallised "
+            "pension funds last. This order is a deliberate "
+            "simplification — it is not configurable and the app never "
+            "searches for a personally optimal withdrawal sequence, "
+            "which would amount to tax advice. In some years a "
+            "different order could use an allowance this one leaves "
+            "idle, so treat the projection as a consistent baseline, "
+            "not the best achievable outcome."
+        ),
+    ),
     (
         "Scenarios — compare what-ifs",
         (

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/app/drawdown.py

@@ -169,11 +169,14 @@ class DrawdownAnswer:
 
     ``income`` is the highest sustainable net annual income in today's
     money, or ``None`` when not even zero spending survives the plan's
-    outflows. The rest is the manifest side: the retirement age the
-    answer assumed and whose it was (``person_position``, the
-    household position), the searched bracket's upper bound, and the
-    basis — ``seed``, ``paths``, and ``target_success_rate`` are
-    carried only for a Monte Carlo basis.
+    outflows. ``pot`` is the household's total wrapper balances as
+    stated at solve time — the denominator presenting the answer as a
+    starting withdrawal rate, recorded here so the rate always
+    describes the plan the answer was solved on. The rest is the
+    manifest side: the retirement age the answer assumed and whose it
+    was (``person_position``, the household position), the searched
+    bracket's upper bound, and the basis — ``seed``, ``paths``, and
+    ``target_success_rate`` are carried only for a Monte Carlo basis.
     """
 
     income: Money | None
@@ -184,6 +187,7 @@ class DrawdownAnswer:
     paths: int | None = None
     target_success_rate: Decimal | None = None
     person_position: int = 0
+    pot: Money | None = None
 
 
 @dataclass(frozen=True)
@@ -296,6 +300,7 @@ def state_with_drawdown(
         paths=inputs.paths,
         target_success_rate=inputs.target_success_rate,
         person_position=inputs.person_position,
+        pot=_household_pot(household),
     )
     changes: dict[str, Any] = {"drawdown": answer, "drawdown_error": None}
     return replace(base, **changes) if changes else base
@@ -358,7 +363,7 @@ def _headline(answer: DrawdownAnswer) -> str:
 
 
 def _detail(answer: DrawdownAnswer) -> str:
-    """The assumed age, searched bracket, and basis under the headline."""
+    """The assumed age, searched bracket, rate, and basis under the headline."""
     retiring = (
         f"Retiring at age {answer.age}"
         if answer.person_position == 0
@@ -376,7 +381,41 @@ def _detail(answer: DrawdownAnswer) -> str:
             f" Monte Carlo success over {answer.paths} paths"
             f" (seed {answer.seed})."
         )
-    return f"{target}\n{basis}"
+    rate = _rate_line(answer)
+    lines = [target, rate, basis] if rate else [target, basis]
+    return "\n".join(lines)
+
+
+def _rate_line(answer: DrawdownAnswer) -> str:
+    """The answer as a starting withdrawal rate of today's pot, if any.
+
+    Blank when nothing is sustainable or the household holds no
+    wrapper balances to take a rate of. The rate is derived from the
+    answer, never asserted: the product ships no "safe withdrawal
+    rate" figure — this line only lets users compare the computed
+    answer against rules of thumb they know.
+    """
+    if answer.income is None or answer.pot is None or answer.pot.amount <= 0:
+        return ""
+    rate = answer.income.amount / answer.pot.amount
+    return (
+        f"A starting withdrawal rate of {format_percent(rate)} of"
+        f" today's total pot ({format_money(answer.pot)})."
+    )
+
+
+def _household_pot(household: Household) -> Money:
+    """Every wrapper balance across the household, as stated.
+
+    The whole household's pot — the §4.11 "our pot" meaning — since
+    the sustainable income is drawn from every accessible source, not
+    the tested person's alone.
+    """
+    total = Money(Decimal(0))
+    for person in household.persons:
+        for wrapper in person.wrappers:
+            total = total + wrapper.balance.value
+    return total
 
 
 def _age_echo(answer: DrawdownAnswer | None, household: Household | None) -> str:

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/app/retirement.py

@@ -333,8 +333,8 @@ def _detail(answer: RetirementAnswer) -> str:
         else "searched your partner's ages"
     )
     target = (
-        f"Target income {format_money(answer.target_income)} a year"
-        f" — {format_percent(answer.replacement_rate)} of employment income"
+        f"Target income {format_money(answer.target_income)} a year after tax"
+        f" — {format_percent(answer.replacement_rate)} of gross employment income"
         f" {format_money(answer.employment_income)} — {searched}"
         f" {answer.minimum_age} to {answer.maximum_age}."
     )

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/core/engine.py

@@ -2653,7 +2653,12 @@ class _PersonProjection:
         offset is netted of only the marginal tax the retirement
         layers add on top of it: the no-portfolio assessment less one
         of employment income alone, which once retired is identically
-        the whole assessment. The offset excludes the portfolio-income
+        the whole assessment. The employment-only baseline is net of
+        net-pay deductions, matching their treatment in the full
+        assessment: a gross baseline would understate the marginal
+        tax by the contribution's relief, leaking that relief — which
+        in reality lands in out-of-model take-home pay — into
+        in-model cash. The offset excludes the portfolio-income
         layers: their tax is charged to the taxable wrappers at close,
         never to the need.
         """
@@ -2665,17 +2670,18 @@ class _PersonProjection:
             + income.annuity_lump_sum
             + pension_lump_sum
         )
-        if self._taxable_income <= income.employment:
+        employment_taxable = max(income.employment - self._net_pay_deductions, _ZERO)
+        if self._taxable_income <= employment_taxable:
             return gross
         full = self.region.tax.assess(
             period, self._tax_input(include_portfolio=False)
         ).tax_due
         employment_only = _ZERO
-        if income.employment > _ZERO:
+        if employment_taxable > _ZERO:
             employment_only = self.region.tax.assess(
                 period,
                 self._tax_input(
-                    non_savings_override=income.employment, include_portfolio=False
+                    non_savings_override=employment_taxable, include_portfolio=False
                 ),
             ).tax_due
         return gross - (full - employment_only)
@@ -3106,7 +3112,7 @@ class _PersonProjection:
         (:meth:`_charge_portfolio_tax`), never to the spending need.
         ``non_savings_override`` replaces the accumulated non-savings
         income — the employment-only baseline of the pre-retirement
-        income offset (:meth:`_pre_retirement_income_tax`).
+        income offset (:meth:`_income_offset_net`).
         """
         non_savings = (
             self._taxable_income
@@ -3247,8 +3253,14 @@ class _PersonProjection:
         captured at the period open) and its closing entitlement — the
         credited value carried to the period end at the same
         revaluation the next boundary's advance applies — for the
-        region to value (planning §5.2); a stream whose benefits start
-        by the period end has crystallised and generates no input.
+        region to value (planning §5.2). A stream whose benefits
+        commence *within* the period still generates an input per the
+        HMRC closing-value adjustment (PTM054500): its closing
+        entitlement is the credited value revalued only to the
+        commencement date, so the final year's accrual is measured
+        rather than discarded. Only a stream already in payment at the
+        period's first day generates nothing — its accrual was
+        measured in the year it crystallised.
         ``total_income`` is the period's full taxable picture before
         member pension deductions — net-pay amounts added back, the
         portfolio-income layers included — so the region's income
@@ -3276,10 +3288,17 @@ class _PersonProjection:
         cpi = returns.cpi.value
         arrangements: list[DbArrangementInput] = []
         for stream, opening in zip(self._db_streams, self._db_openings, strict=True):
-            if stream.start <= period.end:
+            if stream.start <= period.start:
                 continue
+            revalued_share = fraction
+            if stream.start <= period.end:
+                # Commencement year: revalue only to the start date —
+                # the §4.1 whole-month share of the period before it.
+                revalued_share = service_active_fraction(
+                    stream.start, period, self.config.today, self.run.horizon_end()
+                )
             closing = stream.accrued_annual * (
-                _ONE + stream.basis.annual_rate(cpi) * fraction
+                _ONE + stream.basis.annual_rate(cpi) * revalued_share
             )
             arrangements.append(
                 DbArrangementInput(opening_annual=opening, closing_annual=closing)

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/__init__.py

@@ -70,6 +70,7 @@ from glidepath.regions.uk.schema import (
     NmpaStep,
     PensionRules,
     ReturnsHistoryFile,
+    SavingsRate,
     SavingsRules,
     SpaAgeBand,
     SpaBand,
@@ -147,6 +148,7 @@ __all__ = [
     "NmpaStep",
     "PensionRules",
     "ReturnsHistoryFile",
+    "SavingsRate",
     "SavingsRules",
     "ScottishBandsPolicy",
     "SpaAgeBand",

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/data/age_rules.toml

@@ -3,7 +3,7 @@
 # re-verified against the live gov.uk timetable page on 2026-08-02; the
 # death-benefit age boundary against the live gov.uk page on 2026-08-12.
 
-schema_version = 4
+schema_version = 5
 
 [meta]
 verified_on = 2026-08-12

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/data/assumptions_default.toml

@@ -4,7 +4,7 @@
 # user-overridable in the app; §6 announced-policy items are facts, these
 # are estimates.
 
-schema_version = 4
+schema_version = 5
 
 [meta]
 verified_on = 2026-08-12

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/data/returns_history.toml

@@ -14,7 +14,7 @@
 # Cite Jordà, Schularick & Taylor (2017) and, for the return series,
 # Jordà, Knoll, Kuvshinov, Schularick & Taylor (2019).
 
-schema_version = 4
+schema_version = 5
 
 [meta]
 verified_on = 2026-08-05

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/data/tax_year_2026_27.toml

@@ -5,7 +5,7 @@
 # all from the primary sources below; never edit a figure without
 # re-verifying and updating [meta].
 
-schema_version = 4
+schema_version = 5
 
 [meta]
 tax_year    = "2026/27"
@@ -84,12 +84,20 @@ lisa_bonus_rate  = "0.25"
 lisa_withdrawal_charge = "0.25"
 
 # Nil rates consume band width (§6); savings above them are taxed at the
-# rUK band rates until the separate savings rates land in the 2027/28 file.
+# rates below, aligned positionally with the rUK bands (savings income
+# stacks on the rUK ladder UK-wide). For 2026/27 they equal the main
+# rates; the separate 22/42/47 rates (Budget 2025 OOTLAR, from 6 April
+# 2027) land in the 2027/28 file.
 [savings]
 starting_rate_limit = "5000"  # reduced £1 per £1 of non-savings income above the PA
 psa_basic      = "1000"
 psa_higher     = "500"
 psa_additional = "0"
+rates = [
+  { name = "basic", rate = "0.20" },
+  { name = "higher", rate = "0.40" },
+  { name = "additional", rate = "0.45" },
+]
 
 # Rates align positionally with the rUK bands (dividends are UK-wide).
 # 2026/27 figures include the Budget 2025 +2ppt change, in force.

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/extension.py

@@ -368,12 +368,14 @@ def _indexed_savings(savings: SavingsRules, factor: Decimal) -> SavingsRules:
     The starting-rate limit is legislated frozen with the rUK schedule
     (planning §6), and the PSA amounts follow the same reserved policy;
     a zero tier (the additional-rate PSA) stays zero under any factor.
+    The savings rates never extrapolate, like every other rate.
     """
     return SavingsRules(
         starting_rate_limit=_indexed_money(savings.starting_rate_limit, factor),
         psa_basic=_indexed_money(savings.psa_basic, factor),
         psa_higher=_indexed_money(savings.psa_higher, factor),
         psa_additional=_indexed_money(savings.psa_additional, factor),
+        rates=savings.rates,
     )
 
 

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/loader.py

@@ -39,6 +39,7 @@ from glidepath.regions.uk.schema import (
     NmpaStep,
     PensionRules,
     ReturnsHistoryFile,
+    SavingsRate,
     SavingsRules,
     SpaAgeBand,
     SpaBand,
@@ -349,9 +350,19 @@ def _parse_isa(raw: object, context: str) -> IsaRules:
     return rules
 
 
+def _parse_named_rate(raw: object, context: str) -> tuple[str, Rate]:
+    """Parse one ``{name, rate}`` entry of a layer's ``rates`` array."""
+    table = _Table(raw, context)
+    name = _string(table.take("name"), f"{context}.name")
+    rate = _fraction(table.take("rate"), f"{context}.rate")
+    table.finish()
+    return name, rate
+
+
 def _parse_savings(raw: object, context: str) -> SavingsRules:
     """Parse the ``[savings]`` table."""
     table = _Table(raw, context)
+    rates_raw = _array(table.take("rates"), f"{context}.rates")
     rules = SavingsRules(
         starting_rate_limit=_money(
             table.take("starting_rate_limit"), f"{context}.starting_rate_limit"
@@ -361,27 +372,22 @@ def _parse_savings(raw: object, context: str) -> SavingsRules:
         psa_additional=_money(
             table.take("psa_additional"), f"{context}.psa_additional"
         ),
+        rates=tuple(
+            SavingsRate(*_parse_named_rate(item, f"{context}.rates[{index}]"))
+            for index, item in enumerate(rates_raw)
+        ),
     )
     table.finish()
     return rules
 
 
-def _parse_dividend_rate(raw: object, context: str) -> DividendRate:
-    """Parse one entry of the ``dividend.rates`` array."""
-    table = _Table(raw, context)
-    name = _string(table.take("name"), f"{context}.name")
-    rate = _fraction(table.take("rate"), f"{context}.rate")
-    table.finish()
-    return DividendRate(name=name, rate=rate)
-
-
 def _parse_dividend(raw: object, context: str) -> DividendRules:
     """Parse the ``[dividend]`` table."""
     table = _Table(raw, context)
     allowance = _money(table.take("allowance"), f"{context}.allowance")
     rates_raw = _array(table.take("rates"), f"{context}.rates")
     rates = tuple(
-        _parse_dividend_rate(item, f"{context}.rates[{index}]")
+        DividendRate(*_parse_named_rate(item, f"{context}.rates[{index}]"))
         for index, item in enumerate(rates_raw)
     )
     table.finish()

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/schema.py

@@ -21,13 +21,13 @@ if TYPE_CHECKING:
     from collections.abc import Iterator
     from decimal import Decimal
 
-SCHEMA_VERSION = 4
+SCHEMA_VERSION = 5
 """The data-file schema version this code understands.
 
-v2 (#97): tax-year files lose the ``[state_pension]`` table and
-``age_rules.toml`` the ``[new_state_pension]`` table — the state
-pension amount is the user's stated DWP forecast, never a shipped
-rate.
+v5 (#189): tax-year files gain ``savings.rates`` — a savings rate
+schedule aligned positionally with the rUK bands, so the separate
+savings-income rates enacted from 2027/28 (22/42/47, Budget 2025
+OOTLAR) can ship as data in the 2027/28 file.
 
 v4 (roadmap 9.33): ``age_rules.toml`` gains the ``[death_benefits]``
 table — the age boundary below which a deceased member's pension
@@ -37,6 +37,11 @@ passes as income-tax-free beneficiary drawdown (planning §6
 v3 (#173): tax-year files gain the ``[marriage_allowance]`` table —
 the s55B transferable amount and the per-schedule recipient band
 gates (roadmap 9.32).
+
+v2 (#97): tax-year files lose the ``[state_pension]`` table and
+``age_rules.toml`` the ``[new_state_pension]`` table — the state
+pension amount is the user's stated DWP forecast, never a shipped
+rate.
 """
 
 _TAX_YEAR_FORMAT = re.compile(r"\d{4}/\d{2}")
@@ -231,30 +236,49 @@ class IsaRules:
     lisa_withdrawal_charge: Rate
 
 
+@dataclass(frozen=True, slots=True)
+class SavingsRate:
+    """One savings rate, aligned positionally with the rUK band ladder."""
+
+    name: str
+    rate: Rate
+
+    def __post_init__(self) -> None:
+        """Reject unnamed rates."""
+        if not self.name:
+            _fail("SavingsRate", "name must not be empty")
+
+
 @dataclass(frozen=True, slots=True)
 class SavingsRules:
-    """Savings-income nil rates for one tax year (planning §6, roadmap 9.2).
+    """Savings-income rules for one tax year (planning §6, roadmap 9.2).
 
     ``starting_rate_limit`` is the 0% starting rate for savings band,
     reduced £1 per £1 of non-savings taxable income above the personal
     allowance. The ``psa_*`` fields are the personal savings allowance
     by the band the taxpayer's income reaches — nil *rates*, not
-    deductions: nil-rated income still consumes band width (§6). Savings
-    income above the nil rates is taxed at the rUK band rates until the
-    separate savings rates take effect (2027/28, shipped as data then).
+    deductions: nil-rated income still consumes band width (§6).
+    ``rates`` tax the savings income above the nil rates: they map
+    positionally onto the rUK income-tax bands (savings income stacks
+    on the rUK ladder UK-wide, §6) — one rate per band, enforced by
+    :class:`TaxYearFile`. Through 2026/27 they equal the main rates;
+    the separate 22/42/47 rates land in the 2027/28 file (#189).
     """
 
     starting_rate_limit: Money
     psa_basic: Money
     psa_higher: Money
     psa_additional: Money
+    rates: tuple[SavingsRate, ...]
 
     def __post_init__(self) -> None:
-        """Require descending PSA tiers — the statutory shape."""
+        """Require descending PSA tiers and at least one rate."""
         if not self.psa_basic >= self.psa_higher >= self.psa_additional:
             _fail(
                 "SavingsRules", "PSA tiers must satisfy basic >= higher >= additional"
             )
+        if not self.rates:
+            _fail("SavingsRules", "at least one savings rate is required")
 
 
 @dataclass(frozen=True, slots=True)
@@ -334,6 +358,11 @@ class TaxYearFile:
                 "TaxYearFile",
                 "dividend.rates must align one-to-one with the rUK bands",
             )
+        if len(self.savings.rates) != len(self.income_tax_ruk.bands):
+            _fail(
+                "TaxYearFile",
+                "savings.rates must align one-to-one with the rUK bands",
+            )
         gates = (
             (self.marriage_allowance.recipient_top_band_ruk, self.income_tax_ruk),
             (

{glidepath-0.4.0 → glidepath-0.5.0}/src/glidepath/regions/uk/tax.py

@@ -218,7 +218,10 @@ class UkTaxSystem:
         The recipient's result gains the ITA 2007 s55B tax reducer as
         a negative no-income line: the rUK basic-rate percentage of
         the transferable amount, capped at their income-tax liability,
-        never refundable, never a PA transfer in computation.
+        never refundable. The transferor is re-assessed with their
+        personal allowance reduced by the transferable amount
+        (s55B(6)), so the household result nets any cost of the
+        surrender.
         """
         results = tuple(entry.result for entry in assessments)
         if len(assessments) != _COUPLE:
@@ -229,9 +232,9 @@ class UkTaxSystem:
                 year, assessments[transferor], assessments[recipient]
             )
             if adjusted is not None:
+                pair = {transferor: adjusted[0], recipient: adjusted[1]}
                 return tuple(
-                    adjusted if index == recipient else result
-                    for index, result in enumerate(results)
+                    pair.get(index, result) for index, result in enumerate(results)
                 )
         return results
 
@@ -297,7 +300,7 @@ def _permitted_recipient_bands(
             break
     ruk_gate = year.marriage_allowance.recipient_top_band_ruk
     for index, band in enumerate(year.income_tax_ruk.bands):
-        permitted.add(_savings_band_name(index, band))
+        permitted.add(f"savings_{year.savings.rates[index].name}")
         permitted.add(f"dividend_{year.dividend.rates[index].name}")
         if band.name == ruk_gate:
             break
@@ -308,17 +311,22 @@ def _marriage_allowance_adjusted(
     year: TaxYearFile,
     transferor: HouseholdAssessment,
     recipient: HouseholdAssessment,
-) -> TaxResult | None:
-    """The recipient's result with the s55B reducer, or ``None``.
+) -> tuple[TaxResult, TaxResult] | None:
+    """Both partners' results under the s55 election, or ``None``.
 
     Eligibility (planning §6 "Couples"): the transferor's income sits
-    within their personal allowance (zero taxable income — the PA is
-    never actually transferred in computation, a recorded
-    simplification when their income falls inside the transferable
-    band), and the recipient is liable at no rate above the data
-    file's band gates. Annual-allowance-charge lines are ignored on
-    both sides of the test and the cap: the s55B reducer lands at step
-    6 of the ITA 2007 s23 calculation, before the step-7 charge.
+    within their personal allowance (zero taxable income), and the
+    recipient is liable at no rate above the data file's band gates.
+    The recipient gains the s55B tax reducer; the transferor is
+    re-assessed with their personal allowance reduced by the
+    transferable amount (ITA 2007 s55B(6)), so when their income sits
+    inside the transferable band the reported household benefit nets
+    their cost — GOV.UK's worked example: £252 off the recipient,
+    £38 due from a transferor on £11,500. Annual-allowance-charge
+    lines are ignored on both sides of the test and the cap — the
+    s55B reducer lands at step 6 of the ITA 2007 s23 calculation,
+    before the step-7 charge — and the transferor's charge lines are
+    carried over the re-assessment unchanged.
     """
     if transferor.result.taxable_income > _ZERO:
         return None
@@ -339,12 +347,43 @@ def _marriage_allowance_adjusted(
     reducer_line = TaxLine(
         band=MARRIAGE_ALLOWANCE_BAND, rate=rate, taxed=_ZERO, tax=-reduction
     )
-    return TaxResult(
+    adjusted_recipient = TaxResult(
         tax_due=result.tax_due - reduction,
         taxable_income=result.taxable_income,
         tax_free_allowance=result.tax_free_allowance,
         lines=(*lines, reducer_line),
     )
+    return _transferor_reassessed(year, transferor), adjusted_recipient
+
+
+def _transferor_reassessed(
+    year: TaxYearFile, transferor: HouseholdAssessment
+) -> TaxResult:
+    """The transferor's assessment with the s55B(6) reduced allowance.
+
+    The re-assessment prices the income tax their surrendered
+    allowance exposes; any annual-allowance-charge lines from the
+    original result are appended unchanged — the engine prices that
+    freestanding charge separately, and the election never re-prices
+    it.
+    """
+    assessed = _assess_year(
+        year,
+        transferor.tax_input,
+        allowance_reduction=year.marriage_allowance.transferable_amount,
+    )
+    charge_lines = tuple(
+        line
+        for line in transferor.result.lines
+        if line.band.startswith(_AA_CHARGE_PREFIX)
+    )
+    charge_tax = sum((line.tax for line in charge_lines), start=_ZERO)
+    return TaxResult(
+        tax_due=assessed.tax_due + charge_tax,
+        taxable_income=assessed.taxable_income,
+        tax_free_allowance=assessed.tax_free_allowance,
+        lines=(*assessed.lines, *charge_lines),
+    )
 
 
 def _tapered_allowance(
@@ -440,11 +479,6 @@ def _band_own_rate(_index: int, band: TaxBand) -> Rate:
     return band.rate
 
 
-def _savings_band_name(_index: int, band: TaxBand) -> str:
-    """A savings line label: the band name under the layer prefix."""
-    return f"savings_{band.name}"
-
-
 def _aa_charge_band_name(_index: int, band: TaxBand) -> str:
     """An annual-allowance-charge line label under the layer prefix."""
     return f"{_AA_CHARGE_PREFIX}{band.name}"
@@ -482,15 +516,17 @@ def _savings_lines(
     taxable_non_savings: Money,
     total_taxable: Money,
 ) -> tuple[Money, tuple[TaxLine, ...]]:
-    """The savings layer: starting rate, PSA, then the band rates.
+    """The savings layer: starting rate, PSA, then the savings rates.
 
     The layer stacks directly above the non-savings taxable income on
     the rUK ladder. The starting rate for savings covers what remains
     of its limit after non-savings taxable income eats it £1 per £1
     (planning §6); the PSA nil rate follows; the remainder is charged
-    at the rUK band rates (savings rates separate from the main rates
-    ship as data from 2027/28, §6). Returns the ladder position after
-    the layer plus the layer's lines.
+    at the year's savings rates, aligned positionally with the rUK
+    bands (schema invariant) — equal to the main rates through
+    2026/27, the separate enacted rates from the 2027/28 file (§6,
+    #189). Returns the ladder position after the layer plus the
+    layer's lines.
     """
     lines: list[TaxLine] = []
     position = taxable_non_savings
@@ -512,8 +548,8 @@ def _savings_lines(
                 bands,
                 start=position,
                 amount=remaining,
-                line_name=_savings_band_name,
-                line_rate=_band_own_rate,
+                line_name=lambda index, _band: f"savings_{savings.rates[index].name}",
+                line_rate=lambda index, _band: savings.rates[index].rate,
             )
         )
         position = position + remaining
@@ -553,7 +589,9 @@ def _dividend_lines(
     return tuple(lines)
 
 
-def _assess_year(year: TaxYearFile, tax_input: TaxInput) -> TaxResult:
+def _assess_year(
+    year: TaxYearFile, tax_input: TaxInput, allowance_reduction: Money = _ZERO
+) -> TaxResult:
     """Assess one period's categorised income (module docstring).
 
     The personal allowance is set against income in the stacking order
@@ -561,7 +599,9 @@ def _assess_year(year: TaxYearFile, tax_input: TaxInput) -> TaxResult:
     each category's taxable remainder is charged through its layer.
     Savings and dividends always stack on the rUK ladder, above the
     non-savings taxable income, whatever schedule taxed that income
-    (planning §6).
+    (planning §6). ``allowance_reduction`` takes the marriage
+    allowance transferor's surrendered amount off the tapered
+    allowance (ITA 2007 s55B(6)), floored at zero.
     """
     schedule = _schedule_for(year, tax_input.residency)
     ras_gross = tax_input.relief_at_source_contributions
@@ -569,7 +609,9 @@ def _assess_year(year: TaxYearFile, tax_input: TaxInput) -> TaxResult:
     savings = tax_input.savings_income
     dividends = tax_input.dividend_income
     adjusted_net_income = max(non_savings + savings + dividends - ras_gross, _ZERO)
-    allowance = _tapered_allowance(schedule, adjusted_net_income)
+    allowance = max(
+        _tapered_allowance(schedule, adjusted_net_income) - allowance_reduction, _ZERO
+    )
     taxable_non_savings = max(non_savings - allowance, _ZERO)
     allowance_left = max(allowance - non_savings, _ZERO)
     taxable_savings = max(savings - allowance_left, _ZERO)

glidepath-0.4.0/src/glidepath/__init__.py

@@ -1,3 +0,0 @@
-"""glidepath: a desktop retirement and investment planner (UK-first)."""
-
-__version__ = "0.1.0"