glidepath 0.2.1__tar.gz → 0.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glidepath
-Version: 0.2.1
+Version: 0.4.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
@@ -12,11 +12,13 @@ Classifier: Environment :: Win32 (MS Windows)
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Financial and Insurance Industry
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Office/Business :: Financial :: Investment
-Requires-Dist: pyside6>=6.11.1
+Classifier: Typing :: Typed
+Requires-Dist: pyside6==6.11.1
 Requires-Python: >=3.14
 Project-URL: Homepage, https://williajm.github.io/glidepath/
 Project-URL: Repository, https://github.com/williajm/glidepath
@@ -24,8 +26,10 @@ Project-URL: Changelog, https://github.com/williajm/glidepath/blob/main/CHANGELO
 Project-URL: Issues, https://github.com/williajm/glidepath/issues
 Description-Content-Type: text/markdown
 
+<!-- Image and badge URLs are absolute so the README renders on PyPI,
+     which does not resolve repository-relative paths. -->
 <p align="center">
-  <img src="src/glidepath/gui/assets/wordmark.png" alt="glidepath" width="420">
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/src/glidepath/gui/assets/wordmark.png" alt="glidepath" width="420">
 </p>
 
 [![CI](https://github.com/williajm/glidepath/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/williajm/glidepath/actions/workflows/ci.yml)
@@ -35,7 +39,7 @@ Description-Content-Type: text/markdown
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
-[![License: MIT](https://img.shields.io/github/license/williajm/glidepath)](LICENSE)
+[![License: MIT + CC BY-NC-SA 4.0 data](https://img.shields.io/badge/license-MIT%20%2B%20CC%20BY--NC--SA%204.0%20data-blue)](https://github.com/williajm/glidepath/blob/main/LICENSE)
 
 <p align="center">
   <a href="https://williajm.github.io/glidepath/"><b>williajm.github.io/glidepath</b></a>
@@ -48,14 +52,14 @@ stated, a **decision** you made, or an **assumption** the app defaulted
 nothing is transmitted.
 
 <p align="center">
-  <img src="docs/screenshots/charts.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/charts.png"
        alt="The charts tab: the Monte Carlo fan chart — nested percentile bands deepening toward the median line — beside the success-rate readout and the retirement-age and backtest cards"
        width="800">
 </p>
 
 *(All screenshots show example data, not anyone's real finances.)*
 
-What it models today (single person, UK):
+What it models today (UK, single or couple):
 
 - **Wrappers** — workplace DC, SIPP, S&S ISA, LISA, GIA and cash, with
   UK contribution relief mechanics and dividend/savings taxation.
@@ -65,6 +69,14 @@ What it models today (single person, UK):
   including deferral.
 - **Tax** — rUK and Scottish income tax from verified 2026/27 data
   files; pension allowances (AA/taper/MPAA, lump-sum allowance).
+- **Couples** — an optional partner, modelled end to end: one pooled
+  household decumulation drawing tax-efficiently across both partners'
+  wrappers with each person taxed individually (mixed rUK/Scottish
+  residency included), the marriage allowance claimed when eligible,
+  optional survivor modelling ("model death at age" — pensions pass as
+  beneficiary drawdown, ISAs via the additional permitted
+  subscription, DB schemes at their survivor fraction), and joint-life
+  annuities paying a 50/66/100% survivor income.
 - **Projection** — deterministic or Monte Carlo runs from the app:
   success rate, probability of ruin, ending-pot percentiles, and a
   probability fan chart on its own tab, reproducible from a seed. With
@@ -94,7 +106,7 @@ a choice you make; anything estimated lives in the assumptions
 inspector instead:
 
 <p align="center">
-  <img src="docs/screenshots/facts.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/facts.png"
        alt="The facts tab: the About you, Household spending, and State pension cards of the entry form, with the example plan's values filled in"
        width="800">
 </p>
@@ -104,7 +116,7 @@ choices in effect, and every assumption the run used with its value,
 default/overridden status, source, and date:
 
 <p align="center">
-  <img src="docs/screenshots/stated_vs_assumed.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/stated_vs_assumed.png"
        alt="The stated-vs-assumed tab: tables of stated facts, choices in effect, assumptions used with sources, and the plan structure"
        width="800">
 </p>
@@ -169,7 +181,7 @@ fine.)
 ## Everyday commands
 
 ```sh
-make check   # all merge gates: ruff, format, mypy --strict, pytest (>=90% cov), dep age
+make check   # all merge gates: ruff, format, mypy --strict, pytest (>=96% cov), dep age
 make fix     # auto-fix lint issues and reformat
 make test    # tests with coverage
 make deps    # the ONLY way to add/upgrade dependencies (7-day cooldown lock)
@@ -184,9 +196,13 @@ clean `make check` locally does not quite guarantee a green pipeline. See
 
 ## Releases
 
-Releases are `vX.Y.Z` tags on `main`; each GitHub Release carries its
-notes from [`CHANGELOG.md`](CHANGELOG.md). There are no packaged builds
-yet — run from source as above.
+Releases are `vX.Y.Z` tags on `main`. Each one is published to
+[PyPI](https://pypi.org/project/glidepath/) as an sdist and wheel via
+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.
 
 ## Data licences
 

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

@@ -1,5 +1,7 @@
+<!-- Image and badge URLs are absolute so the README renders on PyPI,
+     which does not resolve repository-relative paths. -->
 <p align="center">
-  <img src="src/glidepath/gui/assets/wordmark.png" alt="glidepath" width="420">
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/src/glidepath/gui/assets/wordmark.png" alt="glidepath" width="420">
 </p>
 
 [![CI](https://github.com/williajm/glidepath/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/williajm/glidepath/actions/workflows/ci.yml)
@@ -9,7 +11,7 @@
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
-[![License: MIT](https://img.shields.io/github/license/williajm/glidepath)](LICENSE)
+[![License: MIT + CC BY-NC-SA 4.0 data](https://img.shields.io/badge/license-MIT%20%2B%20CC%20BY--NC--SA%204.0%20data-blue)](https://github.com/williajm/glidepath/blob/main/LICENSE)
 
 <p align="center">
   <a href="https://williajm.github.io/glidepath/"><b>williajm.github.io/glidepath</b></a>
@@ -22,14 +24,14 @@ stated, a **decision** you made, or an **assumption** the app defaulted
 nothing is transmitted.
 
 <p align="center">
-  <img src="docs/screenshots/charts.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/charts.png"
        alt="The charts tab: the Monte Carlo fan chart — nested percentile bands deepening toward the median line — beside the success-rate readout and the retirement-age and backtest cards"
        width="800">
 </p>
 
 *(All screenshots show example data, not anyone's real finances.)*
 
-What it models today (single person, UK):
+What it models today (UK, single or couple):
 
 - **Wrappers** — workplace DC, SIPP, S&S ISA, LISA, GIA and cash, with
   UK contribution relief mechanics and dividend/savings taxation.
@@ -39,6 +41,14 @@ What it models today (single person, UK):
   including deferral.
 - **Tax** — rUK and Scottish income tax from verified 2026/27 data
   files; pension allowances (AA/taper/MPAA, lump-sum allowance).
+- **Couples** — an optional partner, modelled end to end: one pooled
+  household decumulation drawing tax-efficiently across both partners'
+  wrappers with each person taxed individually (mixed rUK/Scottish
+  residency included), the marriage allowance claimed when eligible,
+  optional survivor modelling ("model death at age" — pensions pass as
+  beneficiary drawdown, ISAs via the additional permitted
+  subscription, DB schemes at their survivor fraction), and joint-life
+  annuities paying a 50/66/100% survivor income.
 - **Projection** — deterministic or Monte Carlo runs from the app:
   success rate, probability of ruin, ending-pot percentiles, and a
   probability fan chart on its own tab, reproducible from a seed. With
@@ -68,7 +78,7 @@ a choice you make; anything estimated lives in the assumptions
 inspector instead:
 
 <p align="center">
-  <img src="docs/screenshots/facts.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/facts.png"
        alt="The facts tab: the About you, Household spending, and State pension cards of the entry form, with the example plan's values filled in"
        width="800">
 </p>
@@ -78,7 +88,7 @@ choices in effect, and every assumption the run used with its value,
 default/overridden status, source, and date:
 
 <p align="center">
-  <img src="docs/screenshots/stated_vs_assumed.png"
+  <img src="https://raw.githubusercontent.com/williajm/glidepath/main/docs/screenshots/stated_vs_assumed.png"
        alt="The stated-vs-assumed tab: tables of stated facts, choices in effect, assumptions used with sources, and the plan structure"
        width="800">
 </p>
@@ -143,7 +153,7 @@ fine.)
 ## Everyday commands
 
 ```sh
-make check   # all merge gates: ruff, format, mypy --strict, pytest (>=90% cov), dep age
+make check   # all merge gates: ruff, format, mypy --strict, pytest (>=96% cov), dep age
 make fix     # auto-fix lint issues and reformat
 make test    # tests with coverage
 make deps    # the ONLY way to add/upgrade dependencies (7-day cooldown lock)
@@ -158,9 +168,13 @@ clean `make check` locally does not quite guarantee a green pipeline. See
 
 ## Releases
 
-Releases are `vX.Y.Z` tags on `main`; each GitHub Release carries its
-notes from [`CHANGELOG.md`](CHANGELOG.md). There are no packaged builds
-yet — run from source as above.
+Releases are `vX.Y.Z` tags on `main`. Each one is published to
+[PyPI](https://pypi.org/project/glidepath/) as an sdist and wheel via
+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.
 
 ## Data licences
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "glidepath"
-version = "0.2.1"
+version = "0.4.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 —
@@ -27,13 +27,21 @@ classifiers = [
     "Environment :: X11 Applications :: Qt",
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: Financial and Insurance Industry",
-    "Operating System :: OS Independent",
+    # The platforms the suite actually runs on (ci.yml); no macOS claim
+    # until it is tested there.
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.14",
     "Topic :: Office/Business :: Financial :: Investment",
+    "Typing :: Typed",
 ]
+# glidepath is an application, not a library: the runtime dependency is
+# pinned exactly so `uv tool install glidepath` installs the same PySide6
+# the release was tested against (uv.lock does not apply to end users).
+# Bump the pin only via `make deps`.
 dependencies = [
-    "pyside6>=6.11.1",
+    "pyside6==6.11.1",
 ]
 
 [project.urls]
@@ -65,7 +73,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-07-30T09:40:45Z"
+exclude-newer = "2026-08-01T17:09:10Z"
 
 # PyPI is the ONLY permitted index (supply-chain policy; see CLAUDE.md).
 [[tool.uv.index]]
@@ -91,34 +99,16 @@ convention = "google"
 [tool.ruff.lint.mccabe]
 max-complexity = 10
 
+# BLE001 (app/ slow-run transitions) and PLR0913 (§5.2 runner signatures)
+# are granted inline at the specific lines that earned them, not file-wide,
+# so new violations elsewhere in those modules still fail lint.
 [tool.ruff.lint.per-file-ignores]
 "src/glidepath/core/randomness.py" = [
     "S311", # Seeded Monte Carlo simulation draws, never security material (planning §4.6).
 ]
-"src/glidepath/core/montecarlo.py" = [
-    "PLR0913", # run_paths/sustainable_income take the §5.2 engine quartet plus keyword-only run knobs; bundling would obscure the run(plan, assumptions, region, config) shape.
-]
-"src/glidepath/core/backtest.py" = [
-    "PLR0913", # run_windows and its chunk worker mirror the §5.2 runner signature (see core/montecarlo.py).
-]
 "scripts/build_returns_history.py" = [
     "S314", # xml.etree parses the JST workbook the developer supplies locally, never untrusted input.
 ]
-"src/glidepath/core/retirement.py" = [
-    "PLR0913", # earliest_retirement_age mirrors the §5.2 runner signature (see core/montecarlo.py).
-]
-"src/glidepath/app/montecarlo.py" = [
-    "BLE001", # The slow-run transition must fold ANY failure into state (§4.7): an exception escaping past the shell's worker thread holds the in-flight guard forever.
-]
-"src/glidepath/app/retirement.py" = [
-    "BLE001", # Same in-flight-guard rationale as app/montecarlo.py.
-]
-"src/glidepath/app/drawdown.py" = [
-    "BLE001", # Same in-flight-guard rationale as app/montecarlo.py.
-]
-"src/glidepath/app/backtest.py" = [
-    "BLE001", # Same in-flight-guard rationale as app/montecarlo.py.
-]
 "tests/**" = [
     "S101",    # pytest tests use bare assert by design.
     "PLR2004", # Literal expected values in assertions are idiomatic in tests.
@@ -133,12 +123,15 @@ max-complexity = 10
 # --- mypy -------------------------------------------------------------------
 [tool.mypy]
 strict = true
-warn_unused_ignores = true
+# Not implied by strict: flags code mypy can prove unreachable — high-yield
+# in Decimal/None-narrowing-heavy code.
+warn_unreachable = true
 python_version = "3.14"
 files = ["src", "tests", "scripts"]
 # Lets the tests' top-level script imports (e.g. `import check_dep_age`)
-# resolve to scripts/ — mirrors pytest's pythonpath below.
-mypy_path = ["scripts"]
+# and the shared test factories (`import factories`) resolve — mirrors
+# pytest's pythonpath below.
+mypy_path = ["scripts", "tests"]
 
 # --- pytest / coverage ------------------------------------------------------
 [tool.pytest.ini_options]
@@ -152,9 +145,10 @@ addopts = [
     "--cov-report=xml",
 ]
 testpaths = ["tests"]
-# scripts/ is not a package; tests import the operational scripts (the
-# gates behind `make deps`/`make bump`/releases) as top-level modules.
-pythonpath = ["scripts"]
+# Neither scripts/ nor tests/ is a package; tests import the operational
+# scripts (the gates behind `make deps`/`make bump`/releases) and the
+# shared test-data factories (tests/factories.py) as top-level modules.
+pythonpath = ["scripts", "tests"]
 # Fail a stuck test fast instead of hanging CI for the runner limit: the
 # GUI suite waits on worker pools for up to 60s, so the ceiling sits
 # safely above that while still cutting a wedged run short.

{glidepath-0.2.1 → glidepath-0.4.0}/src/glidepath/app/__init__.py

@@ -105,6 +105,7 @@ from glidepath.app.firstrun import (
 )
 from glidepath.app.forms import (
     ENTITY_ID_KEY,
+    OWNER_KEY,
     ChoiceOption,
     FactsFormData,
     FactsFormResult,
@@ -112,6 +113,7 @@ from glidepath.app.forms import (
     FieldKind,
     FieldSpec,
     FormError,
+    PersonFormData,
     PlanEntityIds,
     SectionSpec,
     build_facts_form_view_model,
@@ -147,6 +149,13 @@ from glidepath.app.montecarlo import (
     run_mode_key,
     state_with_monte_carlo,
 )
+from glidepath.app.outlook import (
+    NO_OUTLOOK_MESSAGE,
+    OUTLOOK_HEADING,
+    OUTLOOK_NO_PLAN_MESSAGE,
+    OutlookPanelViewModel,
+    build_outlook_panel,
+)
 from glidepath.app.plan import (
     OVERRIDE_SOURCE,
     OverrideOutcome,
@@ -235,9 +244,13 @@ __all__ = [
     "NO_BACKTEST_MESSAGE",
     "NO_DRAWDOWN_MESSAGE",
     "NO_MONTE_CARLO_MESSAGE",
+    "NO_OUTLOOK_MESSAGE",
     "NO_PROJECTION_MESSAGE",
     "NO_RETIREMENT_MESSAGE",
+    "OUTLOOK_HEADING",
+    "OUTLOOK_NO_PLAN_MESSAGE",
     "OVERRIDE_SOURCE",
+    "OWNER_KEY",
     "REPORT_EXPORT_FAILED_PREFIX",
     "REPORT_NOT_WRITTEN_MESSAGE",
     "RETIREMENT_NO_INCOME_MESSAGE",
@@ -284,8 +297,10 @@ __all__ = [
     "LoadOutcome",
     "MonteCarloMetric",
     "MonteCarloPanelViewModel",
+    "OutlookPanelViewModel",
     "OverrideOutcome",
     "OverrideRow",
+    "PersonFormData",
     "PlanEntityIds",
     "PlanReport",
     "PlanState",
@@ -310,6 +325,7 @@ __all__ = [
     "build_drawdown_panel",
     "build_facts_form_view_model",
     "build_inspector_view_model",
+    "build_outlook_panel",
     "build_plan_report",
     "build_retirement_panel",
     "build_scenarios_view_model",

{glidepath-0.2.1 → glidepath-0.4.0}/src/glidepath/app/backtest.py

@@ -132,7 +132,7 @@ def state_with_backtest(state: PlanState, *, today: date) -> PlanState:
             config,
             series=series,
         )
-    except Exception as exc:
+    except Exception as exc:  # noqa: BLE001
         # Broad by design, mirroring the Monte Carlo transition: an
         # escape past the shell's worker thread would leave the
         # in-flight guard held (buttons disabled, spinner running)

{glidepath-0.2.1 → glidepath-0.4.0}/src/glidepath/app/charts.py

@@ -10,7 +10,6 @@ inflation source (planning §5.2). Amounts stay ``Decimal`` here:
 converting them to plot coordinates is shell mechanics (§4.7).
 """
 
-from collections import Counter
 from dataclasses import dataclass
 from decimal import Decimal
 from typing import TYPE_CHECKING, Final
@@ -25,6 +24,7 @@ from glidepath.app.drawdown import (
     DrawdownPanelViewModel,
     build_drawdown_panel,
 )
+from glidepath.app.labels import numbered_unique
 from glidepath.app.montecarlo import (
     DEFAULT_RUN_MODE,
     FAN_MEDIAN_LABEL,
@@ -32,6 +32,10 @@ from glidepath.app.montecarlo import (
     MonteCarloPanelViewModel,
     build_monte_carlo_panel,
 )
+from glidepath.app.outlook import (
+    OutlookPanelViewModel,
+    build_outlook_panel,
+)
 from glidepath.app.retirement import (
     RetirementPanelViewModel,
     build_retirement_panel,
@@ -54,6 +58,7 @@ if TYPE_CHECKING:
         AssetAllocation,
         BacktestResult,
         EntityId,
+        Household,
         MonteCarloResult,
         Period,
         PeriodReportRow,
@@ -208,9 +213,9 @@ class ChartsViewModel:
     """The projection charts screen (roadmap 8.4).
 
     ``categories`` labels the shared x axis — one label per projected
-    period: the period-start year with the person's age at period
-    start alongside (roadmap 9.11; year alone until couples activate,
-    9.4 — a two-person period has no single age to show). ``message``
+    period: the period-start year with each person's age at period
+    start alongside (roadmap 9.11; both ages in household order for a
+    couple, e.g. ``2032 · 60/58`` — roadmap 9.31). ``message``
     carries the empty-state copy when there is nothing to chart; it
     is blank whenever ``charts`` is populated. ``allocation_note``
     states the asset allocation each wrapper actually ran — stated
@@ -227,6 +232,7 @@ class ChartsViewModel:
     message: str
     allocation_note: str
     monte_carlo: MonteCarloPanelViewModel
+    outlook: OutlookPanelViewModel
     retirement: RetirementPanelViewModel
     drawdown: DrawdownPanelViewModel
     backtest: BacktestPanelViewModel
@@ -366,6 +372,7 @@ def build_charts_view_model(
             monte_carlo=build_monte_carlo_panel(
                 state, mode, ending_pot_deflator=None, basis_suffix=suffix
             ),
+            outlook=build_outlook_panel(state),
             retirement=build_retirement_panel(state, mode),
             drawdown=build_drawdown_panel(state, mode),
             backtest=build_backtest_panel(
@@ -379,7 +386,7 @@ def build_charts_view_model(
     bands = _chart_bands(state, grouped, backtest_year)
     final_rows = next(reversed(grouped.values()))
     charts = [
-        _balances_chart(grouped, suffix, bands),
+        _balances_chart(grouped, suffix, bands, state.household),
         _income_chart(grouped, suffix),
         _tax_chart(grouped, suffix),
     ]
@@ -403,6 +410,7 @@ def build_charts_view_model(
             ending_pot_deflator=final_rows[0].balance_deflator,
             basis_suffix=suffix,
         ),
+        outlook=build_outlook_panel(state),
         retirement=build_retirement_panel(state, mode),
         drawdown=build_drawdown_panel(state, mode),
         backtest=build_backtest_panel(
@@ -493,7 +501,9 @@ def _allocation_note(
     household = state.household
     if household is None:
         return ""
-    labels = wrapper_display_labels(row for rows in grouped.values() for row in rows)
+    labels = wrapper_display_labels(
+        (row for rows in grouped.values() for row in rows), household
+    )
     glide = _glide_note(state)
     parts = []
     for person in household.persons:
@@ -512,17 +522,15 @@ def _allocation_note(
 
 
 def _category_label(period: Period, rows: list[PeriodReportRow]) -> str:
-    """One period's x-axis label: its start year, with the person's age.
+    """One period's x-axis label: its start year, with the persons' ages.
 
     ``2032 · 60`` reads the horizon in ages as well as calendar years
-    (roadmap 9.11). Only a single-person period carries an age — a
-    two-person household has no one age to label with (revisit with
-    couples activation, 9.4).
+    (roadmap 9.11); a two-person period labels both ages in household
+    order — ``2032 · 60/58`` (roadmap 9.31).
     """
     year = str(period.start.year)
-    if len(rows) == 1:
-        return f"{year} · {rows[0].age_at_period_start}"
-    return year
+    ages = "/".join(str(row.age_at_period_start) for row in rows)
+    return f"{year} · {ages}" if ages else year
 
 
 def _rows_by_period(
@@ -573,29 +581,34 @@ def _chart(
     )
 
 
-def wrapper_display_labels(rows: Iterable[PeriodReportRow]) -> dict[EntityId, str]:
+def wrapper_display_labels(
+    rows: Iterable[PeriodReportRow], household: Household | None = None
+) -> dict[EntityId, str]:
     """A display label per wrapper, in first-seen order.
 
-    The wrapper's kind name alone when unique; numbered in first-seen
-    order when the household holds several of one kind (entity ids are
-    generated UUIDs, so they are never shown as copy). Shared with the
-    cash-flow export (9.19), which columns its balances the same way
-    the balances chart stacks them.
+    A wrapper the user named shows its own label; the rest read their
+    kind name (entity ids are generated UUIDs, so they are never shown
+    as copy). Any name repeated across the final set — several unnamed
+    wrappers of one kind, a label colliding with a kind name, or one
+    label given twice in a hand-edited plan file — is numbered in
+    first-seen order (:func:`~glidepath.app.labels.numbered_unique`).
+    Shared with the cash-flow export (9.19), which columns its
+    balances the same way the balances chart stacks them.
     """
-    kinds: dict[EntityId, str] = {}
+    named: dict[EntityId, str] = {}
+    if household is not None:
+        named = {
+            wrapper.id: wrapper.label
+            for person in household.persons
+            for wrapper in person.wrappers
+            if wrapper.label is not None
+        }
+    bases: dict[EntityId, str] = {}
     for row in rows:
         for entry in row.wrapper_balances:
-            kinds.setdefault(entry.wrapper_id, format_wrapper_kind(entry.kind))
-    counts = Counter(kinds.values())
-    numbered: Counter[str] = Counter()
-    labels: dict[EntityId, str] = {}
-    for wrapper_id, kind in kinds.items():
-        if counts[kind] == 1:
-            labels[wrapper_id] = kind
-        else:
-            numbered[kind] += 1
-            labels[wrapper_id] = f"{kind} {numbered[kind]}"
-    return labels
+            base = named.get(entry.wrapper_id) or format_wrapper_kind(entry.kind)
+            bases.setdefault(entry.wrapper_id, base)
+    return numbered_unique(bases)
 
 
 def _deflated(
@@ -716,10 +729,13 @@ def _balances_chart(
     grouped: dict[Period, list[PeriodReportRow]],
     suffix: str,
     bands: tuple[ChartBand, ...],
+    household: Household | None,
 ) -> ChartSpec:
     """Closing balance per wrapper per period, stacked to the total."""
     series = []
-    labels = wrapper_display_labels(row for rows in grouped.values() for row in rows)
+    labels = wrapper_display_labels(
+        (row for rows in grouped.values() for row in rows), household
+    )
     for wrapper_id, label in labels.items():
         values = []
         for rows in grouped.values():

{glidepath-0.2.1 → glidepath-0.4.0}/src/glidepath/app/display.py

@@ -70,6 +70,8 @@ ASSUMPTION_NAMES: Final[Mapping[str, str]] = {
         "Annuity rate (inflation-linked, single life, age 65)"
     ),
     "annuity.age_adjustment": "Annuity rate age adjustment",
+    "db.survivor_fraction": "DB survivor pension fraction",
+    "spending.survivor_multiplier": "Survivor spending multiplier",
 }
 """Human display names for the shipped assumption keys (roadmap 8.3).
 
@@ -127,6 +129,13 @@ def format_recorded(moment: datetime) -> str:
     return moment.date().isoformat()
 
 
+def _format_temporal(value: date) -> str:
+    """A datetime (a recorded-on moment, and a date subclass) or a date."""
+    if isinstance(value, datetime):
+        return format_recorded(value)
+    return format_date(value)
+
+
 def format_value(value: object) -> str:
     """Any fact, decision, or assumption value as display text.
 
@@ -134,12 +143,12 @@ def format_value(value: object) -> str:
     numbers, enum choices, policy strings, and structured tables
     (rendered as compact ``key=value`` pairs, truncated when long).
     """
+    if isinstance(value, bool):  # before any numeric type: bool is an int
+        return "Yes" if value else "No"
     if isinstance(value, Money):
         return format_money(value)
-    if isinstance(value, datetime):  # before date: datetime is a date subclass
-        return format_recorded(value)
     if isinstance(value, date):
-        return format_date(value)
+        return _format_temporal(value)
     if isinstance(value, Enum):
         generic = str(value.name).replace("_", " ").capitalize()
         return _ENUM_LABELS.get(value, generic)